Browse Source

Merge pull request #415 from ddobrev/master

Restored the full qualifying when printing types
pull/417/head
João Matos 10 years ago
parent
commit
23568ead84
  1. 268
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs
  2. 8
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs
  3. 2
      src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Target.cs
  4. 268
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs
  5. 8
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs
  6. 2
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Target.cs
  7. 266
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs
  8. 8
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs
  9. 2
      src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Target.cs
  10. 6
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  11. 2
      src/Generator/Passes/RenameRootNamespaces.cs

268
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs

File diff suppressed because it is too large Load Diff

8
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs

@ -247,7 +247,7 @@ namespace CppSharp @@ -247,7 +247,7 @@ namespace CppSharp
private static ParserOptions.Internal* __CopyValue(ParserOptions.Internal native)
{
var ret = Marshal.AllocHGlobal(116);
ParserOptions.Internal.cctor_2(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserOptions.Internal.cctor_2(ret, new global::System.IntPtr(&native));
return (ParserOptions.Internal*) ret;
}
@ -658,7 +658,7 @@ namespace CppSharp @@ -658,7 +658,7 @@ namespace CppSharp
private static ParserDiagnostic.Internal* __CopyValue(ParserDiagnostic.Internal native)
{
var ret = Marshal.AllocHGlobal(36);
ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
return (ParserDiagnostic.Internal*) ret;
}
@ -839,7 +839,7 @@ namespace CppSharp @@ -839,7 +839,7 @@ namespace CppSharp
private static ParserResult.Internal* __CopyValue(ParserResult.Internal native)
{
var ret = Marshal.AllocHGlobal(28);
ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
return (ParserResult.Internal*) ret;
}
@ -878,7 +878,7 @@ namespace CppSharp @@ -878,7 +878,7 @@ namespace CppSharp
public CppSharp.Parser.ParserDiagnostic getDiagnostics(uint i)
{
var __ret = new ParserDiagnostic.Internal();
var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
Internal.getDiagnostics_0(new IntPtr(&__ret), __Instance, i);
return CppSharp.Parser.ParserDiagnostic.__CreateInstance(__ret);
}

2
src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Target.cs

@ -187,7 +187,7 @@ namespace CppSharp @@ -187,7 +187,7 @@ namespace CppSharp
private static ParserTargetInfo.Internal* __CopyValue(ParserTargetInfo.Internal native)
{
var ret = Marshal.AllocHGlobal(164);
ParserTargetInfo.Internal.cctor_2(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserTargetInfo.Internal.cctor_2(ret, new global::System.IntPtr(&native));
return (ParserTargetInfo.Internal*) ret;
}

268
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs

File diff suppressed because it is too large Load Diff

8
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs

@ -247,7 +247,7 @@ namespace CppSharp @@ -247,7 +247,7 @@ namespace CppSharp
private static ParserOptions.Internal* __CopyValue(ParserOptions.Internal native)
{
var ret = Marshal.AllocHGlobal(140);
ParserOptions.Internal.cctor_2(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserOptions.Internal.cctor_2(ret, new global::System.IntPtr(&native));
return (ParserOptions.Internal*) ret;
}
@ -658,7 +658,7 @@ namespace CppSharp @@ -658,7 +658,7 @@ namespace CppSharp
private static ParserDiagnostic.Internal* __CopyValue(ParserDiagnostic.Internal native)
{
var ret = Marshal.AllocHGlobal(60);
ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
return (ParserDiagnostic.Internal*) ret;
}
@ -839,7 +839,7 @@ namespace CppSharp @@ -839,7 +839,7 @@ namespace CppSharp
private static ParserResult.Internal* __CopyValue(ParserResult.Internal native)
{
var ret = Marshal.AllocHGlobal(28);
ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
return (ParserResult.Internal*) ret;
}
@ -878,7 +878,7 @@ namespace CppSharp @@ -878,7 +878,7 @@ namespace CppSharp
public CppSharp.Parser.ParserDiagnostic getDiagnostics(uint i)
{
var __ret = new ParserDiagnostic.Internal();
var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
Internal.getDiagnostics_0(__Instance, new IntPtr(&__ret), i);
return CppSharp.Parser.ParserDiagnostic.__CreateInstance(__ret);
}

2
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Target.cs

@ -187,7 +187,7 @@ namespace CppSharp @@ -187,7 +187,7 @@ namespace CppSharp
private static ParserTargetInfo.Internal* __CopyValue(ParserTargetInfo.Internal native)
{
var ret = Marshal.AllocHGlobal(176);
ParserTargetInfo.Internal.cctor_2(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserTargetInfo.Internal.cctor_2(ret, new global::System.IntPtr(&native));
return (ParserTargetInfo.Internal*) ret;
}

266
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs

File diff suppressed because it is too large Load Diff

8
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs

@ -247,7 +247,7 @@ namespace CppSharp @@ -247,7 +247,7 @@ namespace CppSharp
private static ParserOptions.Internal* __CopyValue(ParserOptions.Internal native)
{
var ret = Marshal.AllocHGlobal(192);
ParserOptions.Internal.cctor_1(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserOptions.Internal.cctor_1(ret, new global::System.IntPtr(&native));
return (ParserOptions.Internal*) ret;
}
@ -658,7 +658,7 @@ namespace CppSharp @@ -658,7 +658,7 @@ namespace CppSharp
private static ParserDiagnostic.Internal* __CopyValue(ParserDiagnostic.Internal native)
{
var ret = Marshal.AllocHGlobal(32);
ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(ret, new global::System.IntPtr(&native));
return (ParserDiagnostic.Internal*) ret;
}
@ -839,7 +839,7 @@ namespace CppSharp @@ -839,7 +839,7 @@ namespace CppSharp
private static ParserResult.Internal* __CopyValue(ParserResult.Internal native)
{
var ret = Marshal.AllocHGlobal(56);
ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserResult.Internal.cctor_1(ret, new global::System.IntPtr(&native));
return (ParserResult.Internal*) ret;
}
@ -878,7 +878,7 @@ namespace CppSharp @@ -878,7 +878,7 @@ namespace CppSharp
public CppSharp.Parser.ParserDiagnostic getDiagnostics(uint i)
{
var __ret = new ParserDiagnostic.Internal();
var __ret = new CppSharp.Parser.ParserDiagnostic.Internal();
Internal.getDiagnostics_0(new IntPtr(&__ret), __Instance, i);
return CppSharp.Parser.ParserDiagnostic.__CreateInstance(__ret);
}

2
src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Target.cs

@ -187,7 +187,7 @@ namespace CppSharp @@ -187,7 +187,7 @@ namespace CppSharp
private static ParserTargetInfo.Internal* __CopyValue(ParserTargetInfo.Internal native)
{
var ret = Marshal.AllocHGlobal(160);
ParserTargetInfo.Internal.cctor_0(ret, new global::System.IntPtr(&native));
CppSharp.Parser.ParserTargetInfo.Internal.cctor_0(ret, new global::System.IntPtr(&native));
return (ParserTargetInfo.Internal*) ret;
}

6
src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@ -133,12 +133,6 @@ namespace CppSharp.Generators.CSharp @@ -133,12 +133,6 @@ namespace CppSharp.Generators.CSharp
if (reference.GenerationKind == GenerationKind.Generate && Options.GenerateLibraryNamespace)
refNames.Push(Options.OutputNamespace);
while (refNames.Count > 1 && ctxNames.Count > 1 &&refNames.Peek() == ctxNames.Peek())
{
refNames.Pop();
ctxNames.Pop();
}
return string.Join(".", refNames);
}

2
src/Generator/Passes/RenameRootNamespaces.cs

@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
using CppSharp.AST;
using System;
using System.Collections.Generic;
namespace CppSharp.Passes
{

Loading…
Cancel
Save