From af101c5f60dd684711f4bf0965b5a8b8100ac994 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Thu, 4 Sep 2014 00:47:45 +0300 Subject: [PATCH] Fixed a bug when converting name-spaces. Signed-off-by: Dimitar Dobrev --- src/Core/Parser/ASTConverter.cs | 1 + .../CSharp/i686-apple-darwin12.4.0/AST.cs | 87 +++++++++++-------- .../i686-apple-darwin12.4.0/CppParser.cs | 5 +- .../CSharp/i686-apple-darwin12.4.0/Sources.cs | 3 +- .../Bindings/CSharp/i686-pc-win32-msvc/AST.cs | 87 +++++++++++-------- .../CSharp/i686-pc-win32-msvc/CppParser.cs | 5 +- .../CSharp/i686-pc-win32-msvc/Sources.cs | 3 +- .../Bindings/CSharp/x86_64-linux-gnu/AST.cs | 87 +++++++++++-------- .../CSharp/x86_64-linux-gnu/CppParser.cs | 5 +- .../CSharp/x86_64-linux-gnu/Sources.cs | 3 +- 10 files changed, 163 insertions(+), 123 deletions(-) diff --git a/src/Core/Parser/ASTConverter.cs b/src/Core/Parser/ASTConverter.cs index 211d5414..6a09a77f 100644 --- a/src/Core/Parser/ASTConverter.cs +++ b/src/Core/Parser/ASTConverter.cs @@ -811,6 +811,7 @@ namespace CppSharp var _namespace = new AST.Namespace(); VisitDeclaration(decl, _namespace); VisitDeclContext(decl, _namespace); + _namespace.IsInline = decl.IsInline; return _namespace; } diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs index 537c3a57..430375ff 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs @@ -479,7 +479,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(3); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Qualifiers), new UIntPtr(3)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TypeQualifiers(__instance); + return new CppSharp.Parser.AST.TypeQualifiers(__instance); } set @@ -631,7 +631,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -786,7 +786,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ReturnType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -882,7 +882,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedPointee), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -967,7 +967,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Pointee), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1108,7 +1108,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Modified), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1125,7 +1125,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Equivalent), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1201,7 +1201,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Decayed), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1218,7 +1218,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Original), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1235,7 +1235,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Pointee), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1342,7 +1342,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Type), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1469,7 +1469,7 @@ namespace CppSharp Internal.getArguments_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(20); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(20)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -1717,7 +1717,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Parser.AST.TemplateParameter.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Parameter)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateParameter(__instance); + return new CppSharp.Parser.AST.TemplateParameter(__instance); } set @@ -1832,7 +1832,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Replacement), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -2284,7 +2284,7 @@ namespace CppSharp Internal.getComponents_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(12); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(12)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableComponent(__instance); + return new CppSharp.Parser.AST.VTableComponent(__instance); } public void addComponents(CppSharp.Parser.AST.VTableComponent s) @@ -2428,7 +2428,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(12); CppSharp.Parser.AST.VTableLayout.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Layout)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableLayout(__instance); + return new CppSharp.Parser.AST.VTableLayout(__instance); } set @@ -2542,7 +2542,7 @@ namespace CppSharp Internal.getVFTables_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(28); CppSharp.Parser.AST.VFTableInfo.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VFTableInfo(__instance); + return new CppSharp.Parser.AST.VFTableInfo(__instance); } public void addVFTables(CppSharp.Parser.AST.VFTableInfo s) @@ -2587,7 +2587,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(12); CppSharp.Parser.AST.VTableLayout.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Layout)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableLayout(__instance); + return new CppSharp.Parser.AST.VTableLayout(__instance); } set @@ -3047,6 +3047,9 @@ namespace CppSharp [FieldOffset(68)] public void* OriginalPtr; + [FieldOffset(168)] + public Std.Map Anonymous; + [FieldOffset(180)] public bool IsAnonymous; @@ -3527,7 +3530,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -3549,11 +3552,6 @@ namespace CppSharp [FieldOffset(4)] public global::System.IntPtr Decl; - [SuppressUnmanagedCodeSecurity] - [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, - EntryPoint="_ZN8CppSharp9CppParser3AST9StatementC2ERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEENS1_14StatementClassEPNS1_11DeclarationE")] - internal static extern void ctor_0(global::System.IntPtr instance, global::System.IntPtr str, CppSharp.Parser.AST.StatementClass Class, global::System.IntPtr decl); - [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST9StatementC2ERKS2_")] @@ -3663,11 +3661,6 @@ namespace CppSharp [FieldOffset(4)] public global::System.IntPtr Decl; - [SuppressUnmanagedCodeSecurity] - [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, - EntryPoint="_ZN8CppSharp9CppParser3AST10ExpressionC2ERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEENS1_14StatementClassEPNS1_11DeclarationE")] - internal static extern void ctor_0(global::System.IntPtr instance, global::System.IntPtr str, CppSharp.Parser.AST.StatementClass Class, global::System.IntPtr decl); - [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST10ExpressionC2ERKS2_")] @@ -3800,7 +3793,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4084,7 +4077,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ReturnType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4528,7 +4521,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ConversionType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4574,6 +4567,9 @@ namespace CppSharp [FieldOffset(68)] public void* OriginalPtr; + [FieldOffset(168)] + public Std.Map Anonymous; + [FieldOffset(180)] public bool IsAnonymous; @@ -4787,7 +4783,7 @@ namespace CppSharp Internal.getItems_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(104); CppSharp.Parser.AST.Enumeration.Item.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.Enumeration.Item(__instance); + return new CppSharp.Parser.AST.Enumeration.Item(__instance); } public void addItems(CppSharp.Parser.AST.Enumeration.Item s) @@ -4971,7 +4967,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -5181,7 +5177,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -5336,6 +5332,9 @@ namespace CppSharp [FieldOffset(68)] public void* OriginalPtr; + [FieldOffset(168)] + public Std.Map Anonymous; + [FieldOffset(180)] public bool IsAnonymous; @@ -5871,7 +5870,7 @@ namespace CppSharp Internal.getParameters_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(16); CppSharp.Parser.AST.TemplateParameter.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateParameter(__instance); + return new CppSharp.Parser.AST.TemplateParameter(__instance); } public void addParameters(CppSharp.Parser.AST.TemplateParameter s) @@ -6074,6 +6073,9 @@ namespace CppSharp [FieldOffset(68)] public void* OriginalPtr; + [FieldOffset(168)] + public Std.Map Anonymous; + [FieldOffset(180)] public bool IsAnonymous; @@ -6182,7 +6184,7 @@ namespace CppSharp Internal.getArguments_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(20); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(20)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -6271,6 +6273,9 @@ namespace CppSharp [FieldOffset(68)] public void* OriginalPtr; + [FieldOffset(168)] + public Std.Map Anonymous; + [FieldOffset(180)] public bool IsAnonymous; @@ -6574,7 +6579,7 @@ namespace CppSharp Internal.getArguments_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(20); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(20)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -6678,6 +6683,9 @@ namespace CppSharp [FieldOffset(68)] public void* OriginalPtr; + [FieldOffset(168)] + public Std.Map Anonymous; + [FieldOffset(180)] public bool IsAnonymous; @@ -7111,6 +7119,9 @@ namespace CppSharp [FieldOffset(68)] public void* OriginalPtr; + [FieldOffset(168)] + public Std.Map Anonymous; + [FieldOffset(180)] public bool IsAnonymous; diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs index b0eb974d..d0e49f00 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs @@ -719,6 +719,9 @@ namespace CppSharp [FieldOffset(20)] public global::System.IntPtr Library; + [FieldOffset(24)] + public global::System.IntPtr CodeParser; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser12ParserResultC2Ev")] @@ -796,7 +799,7 @@ namespace CppSharp Internal.getDiagnostics_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(36); CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.ParserDiagnostic(__instance); + return new CppSharp.Parser.ParserDiagnostic(__instance); } public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s) diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Sources.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Sources.cs index b0451379..1ddf423b 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Sources.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Sources.cs @@ -76,8 +76,7 @@ namespace CppSharp { get; - set - ; + set; } } } diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs index 6fc55c58..9575d83f 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs @@ -479,7 +479,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(3); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Qualifiers), new UIntPtr(3)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TypeQualifiers(__instance); + return new CppSharp.Parser.AST.TypeQualifiers(__instance); } set @@ -631,7 +631,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -786,7 +786,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ReturnType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -882,7 +882,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedPointee), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -967,7 +967,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Pointee), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1108,7 +1108,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Modified), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1125,7 +1125,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Equivalent), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1201,7 +1201,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Decayed), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1218,7 +1218,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Original), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1235,7 +1235,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Pointee), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1342,7 +1342,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Type), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1469,7 +1469,7 @@ namespace CppSharp Internal.getArguments_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(20); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(20)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -1717,7 +1717,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(28); CppSharp.Parser.AST.TemplateParameter.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Parameter)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateParameter(__instance); + return new CppSharp.Parser.AST.TemplateParameter(__instance); } set @@ -1832,7 +1832,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Replacement), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -2284,7 +2284,7 @@ namespace CppSharp Internal.getComponents_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(12); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(12)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableComponent(__instance); + return new CppSharp.Parser.AST.VTableComponent(__instance); } public void addComponents(CppSharp.Parser.AST.VTableComponent s) @@ -2428,7 +2428,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(12); CppSharp.Parser.AST.VTableLayout.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Layout)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableLayout(__instance); + return new CppSharp.Parser.AST.VTableLayout(__instance); } set @@ -2542,7 +2542,7 @@ namespace CppSharp Internal.getVFTables_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(32); CppSharp.Parser.AST.VFTableInfo.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VFTableInfo(__instance); + return new CppSharp.Parser.AST.VFTableInfo(__instance); } public void addVFTables(CppSharp.Parser.AST.VFTableInfo s) @@ -2587,7 +2587,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(12); CppSharp.Parser.AST.VTableLayout.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Layout)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableLayout(__instance); + return new CppSharp.Parser.AST.VTableLayout(__instance); } set @@ -3047,6 +3047,9 @@ namespace CppSharp [FieldOffset(92)] public void* OriginalPtr; + [FieldOffset(204)] + public Std.Map Anonymous; + [FieldOffset(212)] public bool IsAnonymous; @@ -3527,7 +3530,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -3549,11 +3552,6 @@ namespace CppSharp [FieldOffset(4)] public global::System.IntPtr Decl; - [SuppressUnmanagedCodeSecurity] - [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Statement@AST@CppParser@CppSharp@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4StatementClass@123@PAVDeclaration@123@@Z")] - internal static extern global::System.IntPtr ctor_0(global::System.IntPtr instance, global::System.IntPtr str, CppSharp.Parser.AST.StatementClass Class, global::System.IntPtr decl); - [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, EntryPoint="??0Statement@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] @@ -3663,11 +3661,6 @@ namespace CppSharp [FieldOffset(4)] public global::System.IntPtr Decl; - [SuppressUnmanagedCodeSecurity] - [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, - EntryPoint="??0Expression@AST@CppParser@CppSharp@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4StatementClass@123@PAVDeclaration@123@@Z")] - internal static extern global::System.IntPtr ctor_0(global::System.IntPtr instance, global::System.IntPtr str, CppSharp.Parser.AST.StatementClass Class, global::System.IntPtr decl); - [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, EntryPoint="??0Expression@AST@CppParser@CppSharp@@QAE@ABV0123@@Z")] @@ -3800,7 +3793,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4084,7 +4077,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ReturnType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4528,7 +4521,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ConversionType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4574,6 +4567,9 @@ namespace CppSharp [FieldOffset(92)] public void* OriginalPtr; + [FieldOffset(204)] + public Std.Map Anonymous; + [FieldOffset(212)] public bool IsAnonymous; @@ -4787,7 +4783,7 @@ namespace CppSharp Internal.getItems_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(152); CppSharp.Parser.AST.Enumeration.Item.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.Enumeration.Item(__instance); + return new CppSharp.Parser.AST.Enumeration.Item(__instance); } public void addItems(CppSharp.Parser.AST.Enumeration.Item s) @@ -4971,7 +4967,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -5181,7 +5177,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(8); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(8)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -5336,6 +5332,9 @@ namespace CppSharp [FieldOffset(92)] public void* OriginalPtr; + [FieldOffset(204)] + public Std.Map Anonymous; + [FieldOffset(212)] public bool IsAnonymous; @@ -5871,7 +5870,7 @@ namespace CppSharp Internal.getParameters_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(28); CppSharp.Parser.AST.TemplateParameter.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateParameter(__instance); + return new CppSharp.Parser.AST.TemplateParameter(__instance); } public void addParameters(CppSharp.Parser.AST.TemplateParameter s) @@ -6074,6 +6073,9 @@ namespace CppSharp [FieldOffset(92)] public void* OriginalPtr; + [FieldOffset(204)] + public Std.Map Anonymous; + [FieldOffset(212)] public bool IsAnonymous; @@ -6182,7 +6184,7 @@ namespace CppSharp Internal.getArguments_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(20); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(20)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -6271,6 +6273,9 @@ namespace CppSharp [FieldOffset(92)] public void* OriginalPtr; + [FieldOffset(204)] + public Std.Map Anonymous; + [FieldOffset(212)] public bool IsAnonymous; @@ -6574,7 +6579,7 @@ namespace CppSharp Internal.getArguments_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(20); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(20)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -6678,6 +6683,9 @@ namespace CppSharp [FieldOffset(92)] public void* OriginalPtr; + [FieldOffset(204)] + public Std.Map Anonymous; + [FieldOffset(212)] public bool IsAnonymous; @@ -7111,6 +7119,9 @@ namespace CppSharp [FieldOffset(92)] public void* OriginalPtr; + [FieldOffset(204)] + public Std.Map Anonymous; + [FieldOffset(212)] public bool IsAnonymous; diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs index b4205ac0..f65eb0b2 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs @@ -719,6 +719,9 @@ namespace CppSharp [FieldOffset(20)] public global::System.IntPtr Library; + [FieldOffset(24)] + public global::System.IntPtr CodeParser; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@XZ")] @@ -796,7 +799,7 @@ namespace CppSharp Internal.getDiagnostics_0(__Instance, new IntPtr(&__ret), i); var __instance = Marshal.AllocHGlobal(60); CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.ParserDiagnostic(__instance); + return new CppSharp.Parser.ParserDiagnostic(__instance); } public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s) diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs index f0c4bdc1..82a4b9aa 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs @@ -76,8 +76,7 @@ namespace CppSharp { get; - set - ; + set; } } } diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs index c659e861..c307baa5 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs @@ -479,7 +479,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(3); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Qualifiers), new UIntPtr(3)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TypeQualifiers(__instance); + return new CppSharp.Parser.AST.TypeQualifiers(__instance); } set @@ -631,7 +631,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -786,7 +786,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ReturnType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -882,7 +882,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedPointee), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -967,7 +967,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Pointee), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1108,7 +1108,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Modified), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1125,7 +1125,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Equivalent), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1201,7 +1201,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Decayed), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1218,7 +1218,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Original), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1235,7 +1235,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Pointee), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1342,7 +1342,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Type), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -1469,7 +1469,7 @@ namespace CppSharp Internal.getArguments_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(40); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(40)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -1717,7 +1717,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Parser.AST.TemplateParameter.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Parameter)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateParameter(__instance); + return new CppSharp.Parser.AST.TemplateParameter(__instance); } set @@ -1832,7 +1832,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->Replacement), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -2283,7 +2283,7 @@ namespace CppSharp var __ret = Internal.getComponents_0(__Instance, i); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableComponent(__instance); + return new CppSharp.Parser.AST.VTableComponent(__instance); } public void addComponents(CppSharp.Parser.AST.VTableComponent s) @@ -2427,7 +2427,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(24); CppSharp.Parser.AST.VTableLayout.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Layout)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableLayout(__instance); + return new CppSharp.Parser.AST.VTableLayout(__instance); } set @@ -2541,7 +2541,7 @@ namespace CppSharp Internal.getVFTables_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(40); CppSharp.Parser.AST.VFTableInfo.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VFTableInfo(__instance); + return new CppSharp.Parser.AST.VFTableInfo(__instance); } public void addVFTables(CppSharp.Parser.AST.VFTableInfo s) @@ -2586,7 +2586,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(24); CppSharp.Parser.AST.VTableLayout.Internal.cctor_1(__instance, new global::System.IntPtr(&__ptr->Layout)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.VTableLayout(__instance); + return new CppSharp.Parser.AST.VTableLayout(__instance); } set @@ -3046,6 +3046,9 @@ namespace CppSharp [FieldOffset(96)] public void* OriginalPtr; + [FieldOffset(280)] + public Std.Map Anonymous; + [FieldOffset(328)] public bool IsAnonymous; @@ -3526,7 +3529,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -3548,11 +3551,6 @@ namespace CppSharp [FieldOffset(8)] public global::System.IntPtr Decl; - [SuppressUnmanagedCodeSecurity] - [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, - EntryPoint="_ZN8CppSharp9CppParser3AST9StatementC2ERKSsNS1_14StatementClassEPNS1_11DeclarationE")] - internal static extern void ctor_0(global::System.IntPtr instance, global::System.IntPtr str, CppSharp.Parser.AST.StatementClass Class, global::System.IntPtr decl); - [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST9StatementC2ERKS2_")] @@ -3662,11 +3660,6 @@ namespace CppSharp [FieldOffset(8)] public global::System.IntPtr Decl; - [SuppressUnmanagedCodeSecurity] - [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, - EntryPoint="_ZN8CppSharp9CppParser3AST10ExpressionC2ERKSsNS1_14StatementClassEPNS1_11DeclarationE")] - internal static extern void ctor_0(global::System.IntPtr instance, global::System.IntPtr str, CppSharp.Parser.AST.StatementClass Class, global::System.IntPtr decl); - [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST10ExpressionC2ERKS2_")] @@ -3799,7 +3792,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4083,7 +4076,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ReturnType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4527,7 +4520,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->ConversionType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -4573,6 +4566,9 @@ namespace CppSharp [FieldOffset(96)] public void* OriginalPtr; + [FieldOffset(280)] + public Std.Map Anonymous; + [FieldOffset(328)] public bool IsAnonymous; @@ -4786,7 +4782,7 @@ namespace CppSharp Internal.getItems_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(128); CppSharp.Parser.AST.Enumeration.Item.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.Enumeration.Item(__instance); + return new CppSharp.Parser.AST.Enumeration.Item(__instance); } public void addItems(CppSharp.Parser.AST.Enumeration.Item s) @@ -4970,7 +4966,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -5180,7 +5176,7 @@ namespace CppSharp var __ptr = (Internal*)__Instance.ToPointer(); var __instance = Marshal.AllocHGlobal(16); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ptr->QualifiedType), new UIntPtr(16)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.QualifiedType(__instance); + return new CppSharp.Parser.AST.QualifiedType(__instance); } set @@ -5335,6 +5331,9 @@ namespace CppSharp [FieldOffset(96)] public void* OriginalPtr; + [FieldOffset(280)] + public Std.Map Anonymous; + [FieldOffset(328)] public bool IsAnonymous; @@ -5870,7 +5869,7 @@ namespace CppSharp Internal.getParameters_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(16); CppSharp.Parser.AST.TemplateParameter.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateParameter(__instance); + return new CppSharp.Parser.AST.TemplateParameter(__instance); } public void addParameters(CppSharp.Parser.AST.TemplateParameter s) @@ -6073,6 +6072,9 @@ namespace CppSharp [FieldOffset(96)] public void* OriginalPtr; + [FieldOffset(280)] + public Std.Map Anonymous; + [FieldOffset(328)] public bool IsAnonymous; @@ -6181,7 +6183,7 @@ namespace CppSharp Internal.getArguments_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(40); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(40)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -6270,6 +6272,9 @@ namespace CppSharp [FieldOffset(96)] public void* OriginalPtr; + [FieldOffset(280)] + public Std.Map Anonymous; + [FieldOffset(328)] public bool IsAnonymous; @@ -6573,7 +6578,7 @@ namespace CppSharp Internal.getArguments_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(40); CppSharp.Runtime.Helpers.memcpy(__instance, new IntPtr(&__ret), new UIntPtr(40)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.AST.TemplateArgument(__instance); + return new CppSharp.Parser.AST.TemplateArgument(__instance); } public void addArguments(CppSharp.Parser.AST.TemplateArgument s) @@ -6677,6 +6682,9 @@ namespace CppSharp [FieldOffset(96)] public void* OriginalPtr; + [FieldOffset(280)] + public Std.Map Anonymous; + [FieldOffset(328)] public bool IsAnonymous; @@ -7110,6 +7118,9 @@ namespace CppSharp [FieldOffset(96)] public void* OriginalPtr; + [FieldOffset(280)] + public Std.Map Anonymous; + [FieldOffset(328)] public bool IsAnonymous; diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs index 351bb78f..934ec1db 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs @@ -719,6 +719,9 @@ namespace CppSharp [FieldOffset(40)] public global::System.IntPtr Library; + [FieldOffset(48)] + public global::System.IntPtr CodeParser; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser12ParserResultC2Ev")] @@ -796,7 +799,7 @@ namespace CppSharp Internal.getDiagnostics_0(new IntPtr(&__ret), __Instance, i); var __instance = Marshal.AllocHGlobal(32); CppSharp.Parser.ParserDiagnostic.Internal.cctor_1(__instance, new global::System.IntPtr(&__ret)); - return (__instance == IntPtr.Zero) ? null : new CppSharp.Parser.ParserDiagnostic(__instance); + return new CppSharp.Parser.ParserDiagnostic(__instance); } public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s) diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Sources.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Sources.cs index b0451379..1ddf423b 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Sources.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Sources.cs @@ -76,8 +76,7 @@ namespace CppSharp { get; - set - ; + set; } } }