From b50001b2ea16950bbf44f42d0ec4ad98565ff5da Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Thu, 21 Apr 2016 18:07:29 +0300 Subject: [PATCH] Wrapped the unified symbol resolutions (USR) of declarations. Signed-off-by: Dimitar Dobrev --- src/Core/Parser/ASTConverter.cs | 1 + src/CppParser/AST.cpp | 1 + src/CppParser/AST.h | 4 +- src/CppParser/Bindings/CLI/AST.cpp | 34 +- src/CppParser/Bindings/CLI/AST.h | 38 +- .../CSharp/i686-apple-darwin12.4.0/AST.cs | 496 +++++++++--------- .../Bindings/CSharp/i686-pc-win32-msvc/AST.cs | 496 +++++++++--------- .../CSharp/x86_64-apple-darwin12.4.0/AST.cs | 496 +++++++++--------- .../Bindings/CSharp/x86_64-linux-gnu/AST.cs | 220 ++++---- .../CSharp/x86_64-pc-win32-msvc/AST.cs | 496 +++++++++--------- 10 files changed, 1217 insertions(+), 1065 deletions(-) diff --git a/src/Core/Parser/ASTConverter.cs b/src/Core/Parser/ASTConverter.cs index b2d6422d..eab04765 100644 --- a/src/Core/Parser/ASTConverter.cs +++ b/src/Core/Parser/ASTConverter.cs @@ -795,6 +795,7 @@ namespace CppSharp _decl.Access = VisitAccessSpecifier(decl.Access); _decl.Name = decl.Name; + _decl.USR = decl.USR; _decl.Namespace = Visit(decl._Namespace) as AST.DeclarationContext; _decl.Location = new SourceLocation(decl.Location.ID); _decl.LineNumberStart = decl.LineNumberStart; diff --git a/src/CppParser/AST.cpp b/src/CppParser/AST.cpp index f0b2fe24..875e86e3 100644 --- a/src/CppParser/AST.cpp +++ b/src/CppParser/AST.cpp @@ -224,6 +224,7 @@ Declaration::~Declaration() } DEF_STRING(Declaration, Name) +DEF_STRING(Declaration, USR) DEF_STRING(Declaration, DebugText) DEF_VECTOR(Declaration, PreprocessedEntity*, PreprocessedEntities) diff --git a/src/CppParser/AST.h b/src/CppParser/AST.h index fb299bb6..980160cb 100644 --- a/src/CppParser/AST.h +++ b/src/CppParser/AST.h @@ -388,7 +388,7 @@ public: int LineNumberStart; int LineNumberEnd; STRING(Name) - RawComment* Comment; + STRING(USR) STRING(DebugText) bool IsIncomplete; bool IsDependent; @@ -397,7 +397,7 @@ public: unsigned DefinitionOrder; VECTOR(PreprocessedEntity*, PreprocessedEntities) void* OriginalPtr; - std::string USR; + RawComment* Comment; }; class Class; diff --git a/src/CppParser/Bindings/CLI/AST.cpp b/src/CppParser/Bindings/CLI/AST.cpp index d821d652..0c4619c1 100644 --- a/src/CppParser/Bindings/CLI/AST.cpp +++ b/src/CppParser/Bindings/CLI/AST.cpp @@ -1505,6 +1505,20 @@ void CppSharp::Parser::AST::Declaration::Name::set(System::String^ s) ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->setName(arg0); } +System::String^ CppSharp::Parser::AST::Declaration::USR::get() +{ + auto __ret = ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->getUSR(); + if (__ret == nullptr) return nullptr; + return (__ret == 0 ? nullptr : clix::marshalString(__ret)); +} + +void CppSharp::Parser::AST::Declaration::USR::set(System::String^ s) +{ + auto _arg0 = clix::marshalString(s); + auto arg0 = _arg0.c_str(); + ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->setUSR(arg0); +} + System::String^ CppSharp::Parser::AST::Declaration::DebugText::get() { auto __ret = ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->getDebugText(); @@ -1587,16 +1601,6 @@ void CppSharp::Parser::AST::Declaration::LineNumberEnd::set(int value) ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->LineNumberEnd = value; } -CppSharp::Parser::AST::RawComment^ CppSharp::Parser::AST::Declaration::Comment::get() -{ - return (((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Comment == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::RawComment((::CppSharp::CppParser::AST::RawComment*)((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Comment); -} - -void CppSharp::Parser::AST::Declaration::Comment::set(CppSharp::Parser::AST::RawComment^ value) -{ - ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Comment = (::CppSharp::CppParser::AST::RawComment*)value->NativePtr; -} - bool CppSharp::Parser::AST::Declaration::IsIncomplete::get() { return ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->IsIncomplete; @@ -1657,6 +1661,16 @@ void CppSharp::Parser::AST::Declaration::OriginalPtr::set(::System::IntPtr value ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->OriginalPtr = (void*)value; } +CppSharp::Parser::AST::RawComment^ CppSharp::Parser::AST::Declaration::Comment::get() +{ + return (((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Comment == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::RawComment((::CppSharp::CppParser::AST::RawComment*)((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Comment); +} + +void CppSharp::Parser::AST::Declaration::Comment::set(CppSharp::Parser::AST::RawComment^ value) +{ + ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Comment = (::CppSharp::CppParser::AST::RawComment*)value->NativePtr; +} + CppSharp::Parser::AST::DeclarationContext::DeclarationContext(::CppSharp::CppParser::AST::DeclarationContext* native) : CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native) { diff --git a/src/CppParser/Bindings/CLI/AST.h b/src/CppParser/Bindings/CLI/AST.h index c566f6f9..2ca89c05 100644 --- a/src/CppParser/Bindings/CLI/AST.h +++ b/src/CppParser/Bindings/CLI/AST.h @@ -295,6 +295,16 @@ namespace CppSharp IntPtr = 16 }; + public enum struct MacroLocation + { + Unknown = 0, + ClassHead = 1, + ClassBody = 2, + FunctionHead = 3, + FunctionParameters = 4, + FunctionBody = 5 + }; + public enum struct RawCommentKind { Invalid = 0, @@ -326,16 +336,6 @@ namespace CppSharp VerbatimBlockLineComment = 14 }; - public enum struct MacroLocation - { - Unknown = 0, - ClassHead = 1, - ClassBody = 2, - FunctionHead = 3, - FunctionParameters = 4, - FunctionBody = 5 - }; - public enum struct ArchType { UnknownArch = 0, @@ -1125,6 +1125,12 @@ namespace CppSharp void set(System::String^); } + property System::String^ USR + { + System::String^ get(); + void set(System::String^); + } + property System::String^ DebugText { System::String^ get(); @@ -1172,12 +1178,6 @@ namespace CppSharp void set(int); } - property CppSharp::Parser::AST::RawComment^ Comment - { - CppSharp::Parser::AST::RawComment^ get(); - void set(CppSharp::Parser::AST::RawComment^); - } - property bool IsIncomplete { bool get(); @@ -1214,6 +1214,12 @@ namespace CppSharp void set(::System::IntPtr); } + property CppSharp::Parser::AST::RawComment^ Comment + { + CppSharp::Parser::AST::RawComment^ get(); + void set(CppSharp::Parser::AST::RawComment^); + } + CppSharp::Parser::AST::PreprocessedEntity^ getPreprocessedEntities(unsigned int i); void addPreprocessedEntities(CppSharp::Parser::AST::PreprocessedEntity^ s); 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 88f71672..e8926c70 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 @@ -200,6 +200,16 @@ namespace CppSharp IntPtr = 16 } + public enum MacroLocation + { + Unknown = 0, + ClassHead = 1, + ClassBody = 2, + FunctionHead = 3, + FunctionParameters = 4, + FunctionBody = 5 + } + public enum RawCommentKind { Invalid = 0, @@ -231,16 +241,6 @@ namespace CppSharp VerbatimBlockLineComment = 14 } - public enum MacroLocation - { - Unknown = 0, - ClassHead = 1, - ClassBody = 2, - FunctionHead = 3, - FunctionParameters = 4, - FunctionBody = 5 - } - public enum ArchType { UnknownArch = 0, @@ -3262,27 +3262,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST11DeclarationC2ENS1_15DeclarationKindE")] @@ -3323,6 +3323,16 @@ namespace CppSharp EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration7setNameEPKc")] internal static extern void setName_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration6getUSREv")] + internal static extern global::System.IntPtr getUSR_0(global::System.IntPtr instance); + + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration6setUSREPKc")] + internal static extern void setUSR_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration12getDebugTextEv")] @@ -3452,6 +3462,22 @@ namespace CppSharp } } + public string USR + { + get + { + var __ret = Internal.getUSR_0((__Instance + __PointerAdjustment)); + return Marshal.PtrToStringAnsi(__ret); + } + + set + { + var arg0 = Marshal.StringToHGlobalAnsi(value); + Internal.setUSR_0((__Instance + __PointerAdjustment), arg0); + Marshal.FreeHGlobal(arg0); + } + } + public string DebugText { get @@ -3560,24 +3586,6 @@ namespace CppSharp } } - public CppSharp.Parser.AST.RawComment Comment - { - get - { - CppSharp.Parser.AST.RawComment __result0; - if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; - else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) - __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; - else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); - return __result0; - } - - set - { - ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; - } - } - public bool IsIncomplete { get @@ -3660,6 +3668,24 @@ namespace CppSharp ((Internal*) __Instance)->OriginalPtr = (global::System.IntPtr) value; } } + + public CppSharp.Parser.AST.RawComment Comment + { + get + { + CppSharp.Parser.AST.RawComment __result0; + if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; + else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) + __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; + else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); + return __result0; + } + + set + { + ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; + } + } } public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable @@ -3685,27 +3711,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(200)] public byte IsAnonymous; @@ -4250,27 +4276,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -4390,27 +4416,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public global::System.IntPtr Declaration; @@ -5161,27 +5187,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -5370,27 +5396,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -5785,27 +5811,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -6102,27 +6128,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(200)] public byte IsAnonymous; @@ -6202,27 +6228,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(104)] public ulong Value; @@ -6514,27 +6540,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(104)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -6834,27 +6860,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -7043,27 +7069,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST19AccessSpecifierDeclC2Ev")] @@ -7167,27 +7193,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(200)] public byte IsAnonymous; @@ -7671,27 +7697,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public global::System.IntPtr TemplatedDecl; @@ -7884,27 +7910,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public uint Depth; @@ -8057,27 +8083,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public uint Depth; @@ -8206,27 +8232,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public uint Depth; @@ -8408,27 +8434,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public global::System.IntPtr TemplatedDecl; @@ -8588,27 +8614,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(200)] public byte IsAnonymous; @@ -8831,27 +8857,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(200)] public byte IsAnonymous; @@ -8994,27 +9020,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(92)] public global::System.IntPtr TemplatedDecl; @@ -9375,27 +9401,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(200)] public byte IsAnonymous; @@ -9996,27 +10022,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(36)] - public global::System.IntPtr Comment; - - [FieldOffset(52)] + [FieldOffset(60)] public byte IsIncomplete; - [FieldOffset(53)] + [FieldOffset(61)] public byte IsDependent; - [FieldOffset(54)] + [FieldOffset(62)] public byte IsImplicit; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(60)] + [FieldOffset(68)] public uint DefinitionOrder; - [FieldOffset(76)] + [FieldOffset(84)] public global::System.IntPtr OriginalPtr; + [FieldOffset(88)] + public global::System.IntPtr Comment; + [FieldOffset(200)] public byte IsAnonymous; 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 a6cb9845..3d5520d2 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs @@ -200,6 +200,16 @@ namespace CppSharp IntPtr = 16 } + public enum MacroLocation + { + Unknown = 0, + ClassHead = 1, + ClassBody = 2, + FunctionHead = 3, + FunctionParameters = 4, + FunctionBody = 5 + } + public enum RawCommentKind { Invalid = 0, @@ -231,16 +241,6 @@ namespace CppSharp VerbatimBlockLineComment = 14 } - public enum MacroLocation - { - Unknown = 0, - ClassHead = 1, - ClassBody = 2, - FunctionHead = 3, - FunctionParameters = 4, - FunctionBody = 5 - } - public enum ArchType { UnknownArch = 0, @@ -3262,27 +3262,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, EntryPoint="??0Declaration@AST@CppParser@CppSharp@@QAE@W4DeclarationKind@123@@Z")] @@ -3323,6 +3323,16 @@ namespace CppSharp EntryPoint="?setName@Declaration@AST@CppParser@CppSharp@@QAEXPBD@Z")] internal static extern void setName_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, + EntryPoint="?getUSR@Declaration@AST@CppParser@CppSharp@@QAEPBDXZ")] + internal static extern global::System.IntPtr getUSR_0(global::System.IntPtr instance); + + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, + EntryPoint="?setUSR@Declaration@AST@CppParser@CppSharp@@QAEXPBD@Z")] + internal static extern void setUSR_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, EntryPoint="?getDebugText@Declaration@AST@CppParser@CppSharp@@QAEPBDXZ")] @@ -3452,6 +3462,22 @@ namespace CppSharp } } + public string USR + { + get + { + var __ret = Internal.getUSR_0((__Instance + __PointerAdjustment)); + return Marshal.PtrToStringAnsi(__ret); + } + + set + { + var arg0 = Marshal.StringToHGlobalAnsi(value); + Internal.setUSR_0((__Instance + __PointerAdjustment), arg0); + Marshal.FreeHGlobal(arg0); + } + } + public string DebugText { get @@ -3560,24 +3586,6 @@ namespace CppSharp } } - public CppSharp.Parser.AST.RawComment Comment - { - get - { - CppSharp.Parser.AST.RawComment __result0; - if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; - else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) - __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; - else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); - return __result0; - } - - set - { - ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; - } - } - public bool IsIncomplete { get @@ -3660,6 +3668,24 @@ namespace CppSharp ((Internal*) __Instance)->OriginalPtr = (global::System.IntPtr) value; } } + + public CppSharp.Parser.AST.RawComment Comment + { + get + { + CppSharp.Parser.AST.RawComment __result0; + if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; + else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) + __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; + else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); + return __result0; + } + + set + { + ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; + } + } } public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable @@ -3685,27 +3711,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(232)] public byte IsAnonymous; @@ -4250,27 +4276,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -4390,27 +4416,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public global::System.IntPtr Declaration; @@ -5161,27 +5187,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -5370,27 +5396,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -5785,27 +5811,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -6102,27 +6128,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(232)] public byte IsAnonymous; @@ -6202,27 +6228,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(152)] public ulong Value; @@ -6514,27 +6540,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(152)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -6834,27 +6860,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -7043,27 +7069,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall, EntryPoint="??0AccessSpecifierDecl@AST@CppParser@CppSharp@@QAE@XZ")] @@ -7167,27 +7193,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(232)] public byte IsAnonymous; @@ -7671,27 +7697,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public global::System.IntPtr TemplatedDecl; @@ -7884,27 +7910,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public uint Depth; @@ -8057,27 +8083,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public uint Depth; @@ -8206,27 +8232,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public uint Depth; @@ -8408,27 +8434,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public global::System.IntPtr TemplatedDecl; @@ -8588,27 +8614,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(232)] public byte IsAnonymous; @@ -8831,27 +8857,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(232)] public byte IsAnonymous; @@ -8994,27 +9020,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public global::System.IntPtr TemplatedDecl; @@ -9375,27 +9401,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(232)] public byte IsAnonymous; @@ -9996,27 +10022,27 @@ namespace CppSharp [FieldOffset(20)] public int LineNumberEnd; - [FieldOffset(48)] - public global::System.IntPtr Comment; - - [FieldOffset(76)] + [FieldOffset(96)] public byte IsIncomplete; - [FieldOffset(77)] + [FieldOffset(97)] public byte IsDependent; - [FieldOffset(78)] + [FieldOffset(98)] public byte IsImplicit; - [FieldOffset(80)] + [FieldOffset(100)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(84)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(100)] + [FieldOffset(120)] public global::System.IntPtr OriginalPtr; + [FieldOffset(124)] + public global::System.IntPtr Comment; + [FieldOffset(232)] public byte IsAnonymous; diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/AST.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/AST.cs index 95fccb3d..6ef403c6 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/AST.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/AST.cs @@ -200,6 +200,16 @@ namespace CppSharp IntPtr = 16 } + public enum MacroLocation + { + Unknown = 0, + ClassHead = 1, + ClassBody = 2, + FunctionHead = 3, + FunctionParameters = 4, + FunctionBody = 5 + } + public enum RawCommentKind { Invalid = 0, @@ -231,16 +241,6 @@ namespace CppSharp VerbatimBlockLineComment = 14 } - public enum MacroLocation - { - Unknown = 0, - ClassHead = 1, - ClassBody = 2, - FunctionHead = 3, - FunctionParameters = 4, - FunctionBody = 5 - } - public enum ArchType { UnknownArch = 0, @@ -3261,27 +3261,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST11DeclarationC2ENS1_15DeclarationKindE")] @@ -3322,6 +3322,16 @@ namespace CppSharp EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration7setNameEPKc")] internal static extern void setName_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration6getUSREv")] + internal static extern global::System.IntPtr getUSR_0(global::System.IntPtr instance); + + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration6setUSREPKc")] + internal static extern void setUSR_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration12getDebugTextEv")] @@ -3451,6 +3461,22 @@ namespace CppSharp } } + public string USR + { + get + { + var __ret = Internal.getUSR_0((__Instance + __PointerAdjustment)); + return Marshal.PtrToStringAnsi(__ret); + } + + set + { + var arg0 = Marshal.StringToHGlobalAnsi(value); + Internal.setUSR_0((__Instance + __PointerAdjustment), arg0); + Marshal.FreeHGlobal(arg0); + } + } + public string DebugText { get @@ -3559,24 +3585,6 @@ namespace CppSharp } } - public CppSharp.Parser.AST.RawComment Comment - { - get - { - CppSharp.Parser.AST.RawComment __result0; - if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; - else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) - __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; - else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); - return __result0; - } - - set - { - ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; - } - } - public bool IsIncomplete { get @@ -3659,6 +3667,24 @@ namespace CppSharp ((Internal*) __Instance)->OriginalPtr = (global::System.IntPtr) value; } } + + public CppSharp.Parser.AST.RawComment Comment + { + get + { + CppSharp.Parser.AST.RawComment __result0; + if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; + else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) + __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; + else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); + return __result0; + } + + set + { + ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; + } + } } public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable @@ -3684,27 +3710,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(384)] public byte IsAnonymous; @@ -4249,27 +4275,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -4389,27 +4415,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public global::System.IntPtr Declaration; @@ -5160,27 +5186,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -5369,27 +5395,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -5784,27 +5810,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -6101,27 +6127,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(384)] public byte IsAnonymous; @@ -6201,27 +6227,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public ulong Value; @@ -6513,27 +6539,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -6833,27 +6859,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -7042,27 +7068,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST19AccessSpecifierDeclC2Ev")] @@ -7166,27 +7192,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(384)] public byte IsAnonymous; @@ -7670,27 +7696,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public global::System.IntPtr TemplatedDecl; @@ -7883,27 +7909,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public uint Depth; @@ -8056,27 +8082,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public uint Depth; @@ -8205,27 +8231,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public uint Depth; @@ -8407,27 +8433,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public global::System.IntPtr TemplatedDecl; @@ -8587,27 +8613,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(384)] public byte IsAnonymous; @@ -8830,27 +8856,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(384)] public byte IsAnonymous; @@ -8993,27 +9019,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(168)] public global::System.IntPtr TemplatedDecl; @@ -9374,27 +9400,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(384)] public byte IsAnonymous; @@ -9995,27 +10021,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(56)] - public global::System.IntPtr Comment; - - [FieldOffset(88)] + [FieldOffset(104)] public byte IsIncomplete; - [FieldOffset(89)] + [FieldOffset(105)] public byte IsDependent; - [FieldOffset(90)] + [FieldOffset(106)] public byte IsImplicit; - [FieldOffset(96)] + [FieldOffset(112)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(104)] + [FieldOffset(120)] public uint DefinitionOrder; - [FieldOffset(136)] + [FieldOffset(152)] public global::System.IntPtr OriginalPtr; + [FieldOffset(160)] + public global::System.IntPtr Comment; + [FieldOffset(384)] public byte IsAnonymous; 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 657df888..518a0fc6 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs @@ -200,6 +200,16 @@ namespace CppSharp IntPtr = 16 } + public enum MacroLocation + { + Unknown = 0, + ClassHead = 1, + ClassBody = 2, + FunctionHead = 3, + FunctionParameters = 4, + FunctionBody = 5 + } + public enum RawCommentKind { Invalid = 0, @@ -231,16 +241,6 @@ namespace CppSharp VerbatimBlockLineComment = 14 } - public enum MacroLocation - { - Unknown = 0, - ClassHead = 1, - ClassBody = 2, - FunctionHead = 3, - FunctionParameters = 4, - FunctionBody = 5 - } - public enum ArchType { UnknownArch = 0, @@ -3261,9 +3261,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -3282,6 +3279,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST11DeclarationC2ENS1_15DeclarationKindE")] @@ -3322,6 +3322,16 @@ namespace CppSharp EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration7setNameEPKc")] internal static extern void setName_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration6getUSREv")] + internal static extern global::System.IntPtr getUSR_0(global::System.IntPtr instance); + + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration6setUSREPKc")] + internal static extern void setUSR_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST11Declaration12getDebugTextEv")] @@ -3451,6 +3461,22 @@ namespace CppSharp } } + public string USR + { + get + { + var __ret = Internal.getUSR_0((__Instance + __PointerAdjustment)); + return Marshal.PtrToStringAnsi(__ret); + } + + set + { + var arg0 = Marshal.StringToHGlobalAnsi(value); + Internal.setUSR_0((__Instance + __PointerAdjustment), arg0); + Marshal.FreeHGlobal(arg0); + } + } + public string DebugText { get @@ -3559,24 +3585,6 @@ namespace CppSharp } } - public CppSharp.Parser.AST.RawComment Comment - { - get - { - CppSharp.Parser.AST.RawComment __result0; - if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; - else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) - __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; - else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); - return __result0; - } - - set - { - ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; - } - } - public bool IsIncomplete { get @@ -3659,6 +3667,24 @@ namespace CppSharp ((Internal*) __Instance)->OriginalPtr = (global::System.IntPtr) value; } } + + public CppSharp.Parser.AST.RawComment Comment + { + get + { + CppSharp.Parser.AST.RawComment __result0; + if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; + else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) + __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; + else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); + return __result0; + } + + set + { + ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; + } + } } public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable @@ -3684,9 +3710,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -3705,6 +3728,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(360)] public byte IsAnonymous; @@ -4249,9 +4275,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -4270,6 +4293,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -4389,9 +4415,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -4410,6 +4433,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public global::System.IntPtr Declaration; @@ -5160,9 +5186,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -5181,6 +5204,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -5369,9 +5395,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -5390,6 +5413,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -5784,9 +5810,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -5805,6 +5828,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -6101,9 +6127,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -6122,6 +6145,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(360)] public byte IsAnonymous; @@ -6201,9 +6227,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -6222,6 +6245,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public ulong Value; @@ -6513,9 +6539,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -6534,6 +6557,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -6833,9 +6859,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -6854,6 +6877,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -7042,9 +7068,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -7063,6 +7086,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="_ZN8CppSharp9CppParser3AST19AccessSpecifierDeclC2Ev")] @@ -7166,9 +7192,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -7187,6 +7210,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(360)] public byte IsAnonymous; @@ -7670,9 +7696,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -7691,6 +7714,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public global::System.IntPtr TemplatedDecl; @@ -7883,9 +7909,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -7904,6 +7927,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public uint Depth; @@ -8056,9 +8082,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -8077,6 +8100,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public uint Depth; @@ -8205,9 +8231,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -8226,6 +8249,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public uint Depth; @@ -8407,9 +8433,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -8428,6 +8451,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public global::System.IntPtr TemplatedDecl; @@ -8587,9 +8613,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -8608,6 +8631,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(360)] public byte IsAnonymous; @@ -8830,9 +8856,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -8851,6 +8874,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(360)] public byte IsAnonymous; @@ -8993,9 +9019,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -9014,6 +9037,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(120)] public global::System.IntPtr TemplatedDecl; @@ -9374,9 +9400,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -9395,6 +9418,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(360)] public byte IsAnonymous; @@ -9995,9 +10021,6 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(40)] - public global::System.IntPtr Comment; - [FieldOffset(56)] public byte IsIncomplete; @@ -10016,6 +10039,9 @@ namespace CppSharp [FieldOffset(104)] public global::System.IntPtr OriginalPtr; + [FieldOffset(112)] + public global::System.IntPtr Comment; + [FieldOffset(360)] public byte IsAnonymous; diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/AST.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/AST.cs index 118aef56..df0bcc19 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/AST.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/AST.cs @@ -200,6 +200,16 @@ namespace CppSharp IntPtr = 16 } + public enum MacroLocation + { + Unknown = 0, + ClassHead = 1, + ClassBody = 2, + FunctionHead = 3, + FunctionParameters = 4, + FunctionBody = 5 + } + public enum RawCommentKind { Invalid = 0, @@ -231,16 +241,6 @@ namespace CppSharp VerbatimBlockLineComment = 14 } - public enum MacroLocation - { - Unknown = 0, - ClassHead = 1, - ClassBody = 2, - FunctionHead = 3, - FunctionParameters = 4, - FunctionBody = 5 - } - public enum ArchType { UnknownArch = 0, @@ -3262,27 +3262,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="??0Declaration@AST@CppParser@CppSharp@@QEAA@W4DeclarationKind@123@@Z")] @@ -3323,6 +3323,16 @@ namespace CppSharp EntryPoint="?setName@Declaration@AST@CppParser@CppSharp@@QEAAXPEBD@Z")] internal static extern void setName_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="?getUSR@Declaration@AST@CppParser@CppSharp@@QEAAPEBDXZ")] + internal static extern global::System.IntPtr getUSR_0(global::System.IntPtr instance); + + [SuppressUnmanagedCodeSecurity] + [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, + EntryPoint="?setUSR@Declaration@AST@CppParser@CppSharp@@QEAAXPEBD@Z")] + internal static extern void setUSR_0(global::System.IntPtr instance, global::System.IntPtr s); + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="?getDebugText@Declaration@AST@CppParser@CppSharp@@QEAAPEBDXZ")] @@ -3452,6 +3462,22 @@ namespace CppSharp } } + public string USR + { + get + { + var __ret = Internal.getUSR_0((__Instance + __PointerAdjustment)); + return Marshal.PtrToStringAnsi(__ret); + } + + set + { + var arg0 = Marshal.StringToHGlobalAnsi(value); + Internal.setUSR_0((__Instance + __PointerAdjustment), arg0); + Marshal.FreeHGlobal(arg0); + } + } + public string DebugText { get @@ -3560,24 +3586,6 @@ namespace CppSharp } } - public CppSharp.Parser.AST.RawComment Comment - { - get - { - CppSharp.Parser.AST.RawComment __result0; - if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; - else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) - __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; - else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); - return __result0; - } - - set - { - ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; - } - } - public bool IsIncomplete { get @@ -3660,6 +3668,24 @@ namespace CppSharp ((Internal*) __Instance)->OriginalPtr = (global::System.IntPtr) value; } } + + public CppSharp.Parser.AST.RawComment Comment + { + get + { + CppSharp.Parser.AST.RawComment __result0; + if (((Internal*) __Instance)->Comment == IntPtr.Zero) __result0 = null; + else if (CppSharp.Parser.AST.RawComment.NativeToManagedMap.ContainsKey(((Internal*) __Instance)->Comment)) + __result0 = (CppSharp.Parser.AST.RawComment) CppSharp.Parser.AST.RawComment.NativeToManagedMap[((Internal*) __Instance)->Comment]; + else __result0 = CppSharp.Parser.AST.RawComment.__CreateInstance(((Internal*) __Instance)->Comment); + return __result0; + } + + set + { + ((Internal*) __Instance)->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; + } + } } public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable @@ -3685,27 +3711,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(400)] public byte IsAnonymous; @@ -4250,27 +4276,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -4390,27 +4416,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public global::System.IntPtr Declaration; @@ -5161,27 +5187,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -5370,27 +5396,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -5785,27 +5811,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; @@ -6102,27 +6128,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(400)] public byte IsAnonymous; @@ -6202,27 +6228,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(224)] public ulong Value; @@ -6514,27 +6540,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(224)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -6834,27 +6860,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; @@ -7043,27 +7069,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [SuppressUnmanagedCodeSecurity] [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl, EntryPoint="??0AccessSpecifierDecl@AST@CppParser@CppSharp@@QEAA@XZ")] @@ -7167,27 +7193,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(400)] public byte IsAnonymous; @@ -7671,27 +7697,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public global::System.IntPtr TemplatedDecl; @@ -7884,27 +7910,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public uint Depth; @@ -8057,27 +8083,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public uint Depth; @@ -8206,27 +8232,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public uint Depth; @@ -8408,27 +8434,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public global::System.IntPtr TemplatedDecl; @@ -8588,27 +8614,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(400)] public byte IsAnonymous; @@ -8831,27 +8857,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(400)] public byte IsAnonymous; @@ -8994,27 +9020,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(192)] public global::System.IntPtr TemplatedDecl; @@ -9375,27 +9401,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(400)] public byte IsAnonymous; @@ -9996,27 +10022,27 @@ namespace CppSharp [FieldOffset(24)] public int LineNumberEnd; - [FieldOffset(64)] - public global::System.IntPtr Comment; - - [FieldOffset(104)] + [FieldOffset(128)] public byte IsIncomplete; - [FieldOffset(105)] + [FieldOffset(129)] public byte IsDependent; - [FieldOffset(106)] + [FieldOffset(130)] public byte IsImplicit; - [FieldOffset(112)] + [FieldOffset(136)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(120)] + [FieldOffset(144)] public uint DefinitionOrder; - [FieldOffset(152)] + [FieldOffset(176)] public global::System.IntPtr OriginalPtr; + [FieldOffset(184)] + public global::System.IntPtr Comment; + [FieldOffset(400)] public byte IsAnonymous;