From f0d237d9c2237ab64f8f3adb8f96d569b76270e3 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Thu, 7 May 2015 00:49:41 +0300 Subject: [PATCH] Added a new property for the line number of the end of a declaration. Signed-off-by: Dimitar Dobrev --- src/AST/Declaration.cs | 6 +- src/Core/Parser/ASTConverter.cs | 3 +- src/CppParser/AST.cpp | 6 +- src/CppParser/AST.h | 3 +- src/CppParser/Bindings/CLI/AST.cpp | 18 +- src/CppParser/Bindings/CLI/AST.h | 8 +- .../CSharp/i686-apple-darwin12.4.0/AST.cs | 750 ++++++++++-------- .../Bindings/CSharp/i686-pc-win32-msvc/AST.cs | 742 +++++++++-------- .../CSharp/x86_64-apple-darwin12.4.0/AST.cs | 750 ++++++++++-------- .../Bindings/CSharp/x86_64-linux-gnu/AST.cs | 750 ++++++++++-------- src/CppParser/Parser.cpp | 53 +- src/CppParser/Parser.h | 1 + src/Generator.Tests/AST/TestAST.cs | 4 +- 13 files changed, 1733 insertions(+), 1361 deletions(-) diff --git a/src/AST/Declaration.cs b/src/AST/Declaration.cs index 0632d603..f785367e 100644 --- a/src/AST/Declaration.cs +++ b/src/AST/Declaration.cs @@ -55,7 +55,8 @@ namespace CppSharp.AST { public SourceLocation Location; - public int LineNumber { get; set; } + public int LineNumberStart { get; set; } + public int LineNumberEnd { get; set; } private DeclarationContext @namespace; public DeclarationContext OriginalNamespace; @@ -342,7 +343,8 @@ namespace CppSharp.AST PreprocessedEntities = new List( declaration.PreprocessedEntities); OriginalPtr = declaration.OriginalPtr; - LineNumber = declaration.LineNumber; + this.LineNumberStart = declaration.LineNumberStart; + this.LineNumberEnd = declaration.LineNumberEnd; } public override string ToString() diff --git a/src/Core/Parser/ASTConverter.cs b/src/Core/Parser/ASTConverter.cs index f66bc2d0..8e155f53 100644 --- a/src/Core/Parser/ASTConverter.cs +++ b/src/Core/Parser/ASTConverter.cs @@ -727,7 +727,8 @@ namespace CppSharp _decl.Name = decl.Name; _decl.Namespace = Visit(decl._Namespace) as AST.DeclarationContext; _decl.Location = new SourceLocation(decl.Location.ID); - _decl.LineNumber = decl.LineNumber; + _decl.LineNumberStart = decl.LineNumberStart; + _decl.LineNumberEnd = decl.LineNumberEnd; _decl.DebugText = decl.DebugText; _decl.IsIncomplete = decl.IsIncomplete; _decl.IsDependent = decl.IsDependent; diff --git a/src/CppParser/AST.cpp b/src/CppParser/AST.cpp index 247fa57e..f571740b 100644 --- a/src/CppParser/AST.cpp +++ b/src/CppParser/AST.cpp @@ -147,7 +147,8 @@ Declaration::Declaration(DeclarationKind kind) , Access(AccessSpecifier::Public) , _Namespace(0) , Location(0) - , LineNumber(0) + , LineNumberStart(0) + , LineNumberEnd(0) , Comment(0) , IsIncomplete(false) , IsDependent(false) @@ -162,7 +163,8 @@ Declaration::Declaration(const Declaration& rhs) , Access(rhs.Access) , _Namespace(rhs._Namespace) , Location(rhs.Location.ID) - , LineNumber(rhs.LineNumber) + , LineNumberStart(rhs.LineNumberStart) + , LineNumberEnd(rhs.LineNumberEnd) , Name(rhs.Name) , Comment(rhs.Comment) , DebugText(rhs.DebugText) diff --git a/src/CppParser/AST.h b/src/CppParser/AST.h index a916dc26..817fce8f 100644 --- a/src/CppParser/AST.h +++ b/src/CppParser/AST.h @@ -390,7 +390,8 @@ public: AccessSpecifier Access; DeclarationContext* _Namespace; SourceLocation Location; - int LineNumber; + int LineNumberStart; + int LineNumberEnd; STRING(Name) RawComment* Comment; STRING(DebugText) diff --git a/src/CppParser/Bindings/CLI/AST.cpp b/src/CppParser/Bindings/CLI/AST.cpp index 330f1331..2d301a43 100644 --- a/src/CppParser/Bindings/CLI/AST.cpp +++ b/src/CppParser/Bindings/CLI/AST.cpp @@ -1222,14 +1222,24 @@ void CppSharp::Parser::AST::Declaration::Location::set(CppSharp::Parser::SourceL ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->Location = _marshal0; } -int CppSharp::Parser::AST::Declaration::LineNumber::get() +int CppSharp::Parser::AST::Declaration::LineNumberStart::get() { - return ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->LineNumber; + return ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->LineNumberStart; } -void CppSharp::Parser::AST::Declaration::LineNumber::set(int value) +void CppSharp::Parser::AST::Declaration::LineNumberStart::set(int value) { - ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->LineNumber = value; + ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->LineNumberStart = value; +} + +int CppSharp::Parser::AST::Declaration::LineNumberEnd::get() +{ + return ((::CppSharp::CppParser::AST::Declaration*)NativePtr)->LineNumberEnd; +} + +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() diff --git a/src/CppParser/Bindings/CLI/AST.h b/src/CppParser/Bindings/CLI/AST.h index 75375cf3..066d733d 100644 --- a/src/CppParser/Bindings/CLI/AST.h +++ b/src/CppParser/Bindings/CLI/AST.h @@ -1029,7 +1029,13 @@ namespace CppSharp void set(CppSharp::Parser::SourceLocation); } - property int LineNumber + property int LineNumberStart + { + int get(); + void set(int); + } + + property int LineNumberEnd { int get(); void set(int); 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 714aeb6a..156961aa 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 @@ -3031,7 +3031,7 @@ namespace CppSharp public unsafe partial class Declaration : IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 88)] + [StructLayout(LayoutKind.Explicit, Size = 92)] public partial struct Internal { [FieldOffset(0)] @@ -3047,24 +3047,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -3139,7 +3142,7 @@ namespace CppSharp private static Declaration.Internal* __CopyValue(Declaration.Internal native) { - var ret = Marshal.AllocHGlobal(88); + var ret = Marshal.AllocHGlobal(92); CppSharp.Parser.AST.Declaration.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Declaration.Internal*) ret; } @@ -3157,7 +3160,7 @@ namespace CppSharp public Declaration(CppSharp.Parser.AST.DeclarationKind kind) { - __Instance = Marshal.AllocHGlobal(88); + __Instance = Marshal.AllocHGlobal(92); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3291,16 +3294,29 @@ namespace CppSharp } } - public int LineNumber + public int LineNumberStart { get { - return ((Internal*) __Instance)->LineNumber; + return ((Internal*) __Instance)->LineNumberStart; } set { - ((Internal*) __Instance)->LineNumber = value; + ((Internal*) __Instance)->LineNumberStart = value; + } + } + + public int LineNumberEnd + { + get + { + return ((Internal*) __Instance)->LineNumberEnd; + } + + set + { + ((Internal*) __Instance)->LineNumberEnd = value; } } @@ -3385,7 +3401,7 @@ namespace CppSharp public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 200)] + [StructLayout(LayoutKind.Explicit, Size = 204)] public new partial struct Internal { [FieldOffset(0)] @@ -3401,27 +3417,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(196)] + [FieldOffset(200)] public bool IsAnonymous; [SuppressUnmanagedCodeSecurity] @@ -3614,7 +3633,7 @@ namespace CppSharp private static DeclarationContext.Internal* __CopyValue(DeclarationContext.Internal native) { - var ret = Marshal.AllocHGlobal(200); + var ret = Marshal.AllocHGlobal(204); CppSharp.Parser.AST.DeclarationContext.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (DeclarationContext.Internal*) ret; } @@ -3633,7 +3652,7 @@ namespace CppSharp public DeclarationContext(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(200); + __Instance = Marshal.AllocHGlobal(204); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3880,7 +3899,7 @@ namespace CppSharp public unsafe partial class TypedefDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 96)] + [StructLayout(LayoutKind.Explicit, Size = 100)] public new partial struct Internal { [FieldOffset(0)] @@ -3896,27 +3915,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -3949,7 +3971,7 @@ namespace CppSharp private static TypedefDecl.Internal* __CopyValue(TypedefDecl.Internal native) { - var ret = Marshal.AllocHGlobal(96); + var ret = Marshal.AllocHGlobal(100); CppSharp.Parser.AST.TypedefDecl.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (TypedefDecl.Internal*) ret; } @@ -3968,7 +3990,7 @@ namespace CppSharp public TypedefDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(96); + __Instance = Marshal.AllocHGlobal(100); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -3998,7 +4020,7 @@ namespace CppSharp public unsafe partial class Friend : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 92)] + [StructLayout(LayoutKind.Explicit, Size = 96)] public new partial struct Internal { [FieldOffset(0)] @@ -4014,27 +4036,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public global::System.IntPtr Declaration; [SuppressUnmanagedCodeSecurity] @@ -4067,7 +4092,7 @@ namespace CppSharp private static Friend.Internal* __CopyValue(Friend.Internal native) { - var ret = Marshal.AllocHGlobal(92); + var ret = Marshal.AllocHGlobal(96); CppSharp.Parser.AST.Friend.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Friend.Internal*) ret; } @@ -4086,7 +4111,7 @@ namespace CppSharp public Friend() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(92); + __Instance = Marshal.AllocHGlobal(96); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4317,7 +4342,7 @@ namespace CppSharp public unsafe partial class Parameter : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 108)] + [StructLayout(LayoutKind.Explicit, Size = 112)] public new partial struct Internal { [FieldOffset(0)] @@ -4333,39 +4358,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(96)] + [FieldOffset(100)] public bool IsIndirect; - [FieldOffset(97)] + [FieldOffset(101)] public bool HasDefaultValue; - [FieldOffset(100)] + [FieldOffset(104)] public uint Index; - [FieldOffset(104)] + [FieldOffset(108)] public global::System.IntPtr DefaultArgument; [SuppressUnmanagedCodeSecurity] @@ -4398,7 +4426,7 @@ namespace CppSharp private static Parameter.Internal* __CopyValue(Parameter.Internal native) { - var ret = Marshal.AllocHGlobal(108); + var ret = Marshal.AllocHGlobal(112); CppSharp.Parser.AST.Parameter.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Parameter.Internal*) ret; } @@ -4417,7 +4445,7 @@ namespace CppSharp public Parameter() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(108); + __Instance = Marshal.AllocHGlobal(112); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4499,7 +4527,7 @@ namespace CppSharp public unsafe partial class Function : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 152)] + [StructLayout(LayoutKind.Explicit, Size = 156)] public new partial struct Internal { [FieldOffset(0)] @@ -4515,54 +4543,57 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(96)] + [FieldOffset(100)] public bool IsReturnIndirect; - [FieldOffset(97)] + [FieldOffset(101)] public bool HasThisReturn; - [FieldOffset(98)] + [FieldOffset(102)] public bool IsVariadic; - [FieldOffset(99)] + [FieldOffset(103)] public bool IsInline; - [FieldOffset(100)] + [FieldOffset(104)] public bool IsPure; - [FieldOffset(101)] + [FieldOffset(105)] public bool IsDeleted; - [FieldOffset(104)] + [FieldOffset(108)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(132)] + [FieldOffset(136)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(148)] + [FieldOffset(152)] public global::System.IntPtr SpecializationInfo; [SuppressUnmanagedCodeSecurity] @@ -4635,7 +4666,7 @@ namespace CppSharp private static Function.Internal* __CopyValue(Function.Internal native) { - var ret = Marshal.AllocHGlobal(152); + var ret = Marshal.AllocHGlobal(156); CppSharp.Parser.AST.Function.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Function.Internal*) ret; } @@ -4654,7 +4685,7 @@ namespace CppSharp public Function() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(152); + __Instance = Marshal.AllocHGlobal(156); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4862,7 +4893,7 @@ namespace CppSharp public unsafe partial class Method : CppSharp.Parser.AST.Function, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 180)] + [StructLayout(LayoutKind.Explicit, Size = 184)] public new partial struct Internal { [FieldOffset(0)] @@ -4878,90 +4909,93 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(96)] + [FieldOffset(100)] public bool IsReturnIndirect; - [FieldOffset(97)] + [FieldOffset(101)] public bool HasThisReturn; - [FieldOffset(98)] + [FieldOffset(102)] public bool IsVariadic; - [FieldOffset(99)] + [FieldOffset(103)] public bool IsInline; - [FieldOffset(100)] + [FieldOffset(104)] public bool IsPure; - [FieldOffset(101)] + [FieldOffset(105)] public bool IsDeleted; - [FieldOffset(104)] + [FieldOffset(108)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(132)] + [FieldOffset(136)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(148)] + [FieldOffset(152)] public global::System.IntPtr SpecializationInfo; - [FieldOffset(152)] + [FieldOffset(156)] public global::System.IntPtr AccessDecl; - [FieldOffset(156)] + [FieldOffset(160)] public bool IsVirtual; - [FieldOffset(157)] + [FieldOffset(161)] public bool IsStatic; - [FieldOffset(158)] + [FieldOffset(162)] public bool IsConst; - [FieldOffset(159)] + [FieldOffset(163)] public bool IsImplicit; - [FieldOffset(160)] + [FieldOffset(164)] public bool IsExplicit; - [FieldOffset(161)] + [FieldOffset(165)] public bool IsOverride; - [FieldOffset(164)] + [FieldOffset(168)] public CppSharp.Parser.AST.CXXMethodKind MethodKind; - [FieldOffset(168)] + [FieldOffset(172)] public bool IsDefaultConstructor; - [FieldOffset(169)] + [FieldOffset(173)] public bool IsCopyConstructor; - [FieldOffset(170)] + [FieldOffset(174)] public bool IsMoveConstructor; - [FieldOffset(172)] + [FieldOffset(176)] public CppSharp.Parser.AST.QualifiedType.Internal ConversionType; [SuppressUnmanagedCodeSecurity] @@ -4994,7 +5028,7 @@ namespace CppSharp private static Method.Internal* __CopyValue(Method.Internal native) { - var ret = Marshal.AllocHGlobal(180); + var ret = Marshal.AllocHGlobal(184); CppSharp.Parser.AST.Method.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Method.Internal*) ret; } @@ -5013,7 +5047,7 @@ namespace CppSharp public Method() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(180); + __Instance = Marshal.AllocHGlobal(184); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5186,7 +5220,7 @@ namespace CppSharp public unsafe partial class Enumeration : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 224)] + [StructLayout(LayoutKind.Explicit, Size = 228)] public new partial struct Internal { [FieldOffset(0)] @@ -5202,36 +5236,39 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(196)] + [FieldOffset(200)] public bool IsAnonymous; - [FieldOffset(200)] + [FieldOffset(204)] public CppSharp.Parser.AST.Enumeration.EnumModifiers Modifiers; - [FieldOffset(204)] + [FieldOffset(208)] public global::System.IntPtr Type; - [FieldOffset(208)] + [FieldOffset(212)] public global::System.IntPtr BuiltinType; [SuppressUnmanagedCodeSecurity] @@ -5280,7 +5317,7 @@ namespace CppSharp public unsafe partial class Item : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 108)] + [StructLayout(LayoutKind.Explicit, Size = 112)] public new partial struct Internal { [FieldOffset(0)] @@ -5296,27 +5333,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; + + [FieldOffset(20)] + public int LineNumberEnd; - [FieldOffset(32)] + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(100)] + [FieldOffset(104)] public ulong Value; [SuppressUnmanagedCodeSecurity] @@ -5359,7 +5399,7 @@ namespace CppSharp private static Item.Internal* __CopyValue(Item.Internal native) { - var ret = Marshal.AllocHGlobal(108); + var ret = Marshal.AllocHGlobal(112); CppSharp.Parser.AST.Enumeration.Item.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Item.Internal*) ret; } @@ -5378,7 +5418,7 @@ namespace CppSharp public Item() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(108); + __Instance = Marshal.AllocHGlobal(112); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5437,7 +5477,7 @@ namespace CppSharp private static Enumeration.Internal* __CopyValue(Enumeration.Internal native) { - var ret = Marshal.AllocHGlobal(224); + var ret = Marshal.AllocHGlobal(228); CppSharp.Parser.AST.Enumeration.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Enumeration.Internal*) ret; } @@ -5456,7 +5496,7 @@ namespace CppSharp public Enumeration() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(224); + __Instance = Marshal.AllocHGlobal(228); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5539,7 +5579,7 @@ namespace CppSharp public unsafe partial class Variable : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 108)] + [StructLayout(LayoutKind.Explicit, Size = 112)] public new partial struct Internal { [FieldOffset(0)] @@ -5555,27 +5595,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(100)] + [FieldOffset(104)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -5618,7 +5661,7 @@ namespace CppSharp private static Variable.Internal* __CopyValue(Variable.Internal native) { - var ret = Marshal.AllocHGlobal(108); + var ret = Marshal.AllocHGlobal(112); CppSharp.Parser.AST.Variable.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Variable.Internal*) ret; } @@ -5637,7 +5680,7 @@ namespace CppSharp public Variable() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(108); + __Instance = Marshal.AllocHGlobal(112); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5818,7 +5861,7 @@ namespace CppSharp public unsafe partial class Field : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 112)] + [StructLayout(LayoutKind.Explicit, Size = 116)] public new partial struct Internal { [FieldOffset(0)] @@ -5834,39 +5877,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(96)] + [FieldOffset(100)] public uint Offset; - [FieldOffset(100)] + [FieldOffset(104)] public global::System.IntPtr Class; - [FieldOffset(104)] + [FieldOffset(108)] public bool IsBitField; - [FieldOffset(108)] + [FieldOffset(112)] public uint BitWidth; [SuppressUnmanagedCodeSecurity] @@ -5899,7 +5945,7 @@ namespace CppSharp private static Field.Internal* __CopyValue(Field.Internal native) { - var ret = Marshal.AllocHGlobal(112); + var ret = Marshal.AllocHGlobal(116); CppSharp.Parser.AST.Field.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Field.Internal*) ret; } @@ -5918,7 +5964,7 @@ namespace CppSharp public Field() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(112); + __Instance = Marshal.AllocHGlobal(116); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6000,7 +6046,7 @@ namespace CppSharp public unsafe partial class AccessSpecifierDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 88)] + [StructLayout(LayoutKind.Explicit, Size = 92)] public new partial struct Internal { [FieldOffset(0)] @@ -6016,24 +6062,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -6066,7 +6115,7 @@ namespace CppSharp private static AccessSpecifierDecl.Internal* __CopyValue(AccessSpecifierDecl.Internal native) { - var ret = Marshal.AllocHGlobal(88); + var ret = Marshal.AllocHGlobal(92); CppSharp.Parser.AST.AccessSpecifierDecl.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (AccessSpecifierDecl.Internal*) ret; } @@ -6085,7 +6134,7 @@ namespace CppSharp public AccessSpecifierDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(88); + __Instance = Marshal.AllocHGlobal(92); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6102,7 +6151,7 @@ namespace CppSharp public unsafe partial class Class : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 264)] + [StructLayout(LayoutKind.Explicit, Size = 268)] public new partial struct Internal { [FieldOffset(0)] @@ -6118,57 +6167,60 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(196)] + [FieldOffset(200)] public bool IsAnonymous; - [FieldOffset(248)] + [FieldOffset(252)] public bool IsPOD; - [FieldOffset(249)] + [FieldOffset(253)] public bool IsAbstract; - [FieldOffset(250)] + [FieldOffset(254)] public bool IsUnion; - [FieldOffset(251)] + [FieldOffset(255)] public bool IsDynamic; - [FieldOffset(252)] + [FieldOffset(256)] public bool IsPolymorphic; - [FieldOffset(253)] + [FieldOffset(257)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(254)] + [FieldOffset(258)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(255)] + [FieldOffset(259)] public bool HasNonTrivialDestructor; - [FieldOffset(256)] + [FieldOffset(260)] public bool IsExternCContext; - [FieldOffset(260)] + [FieldOffset(264)] public global::System.IntPtr Layout; [SuppressUnmanagedCodeSecurity] @@ -6281,7 +6333,7 @@ namespace CppSharp private static Class.Internal* __CopyValue(Class.Internal native) { - var ret = Marshal.AllocHGlobal(264); + var ret = Marshal.AllocHGlobal(268); CppSharp.Parser.AST.Class.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Class.Internal*) ret; } @@ -6300,7 +6352,7 @@ namespace CppSharp public Class() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(264); + __Instance = Marshal.AllocHGlobal(268); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6555,7 +6607,7 @@ namespace CppSharp public unsafe partial class Template : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 104)] + [StructLayout(LayoutKind.Explicit, Size = 108)] public new partial struct Internal { [FieldOffset(0)] @@ -6571,27 +6623,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6649,7 +6704,7 @@ namespace CppSharp private static Template.Internal* __CopyValue(Template.Internal native) { - var ret = Marshal.AllocHGlobal(104); + var ret = Marshal.AllocHGlobal(108); CppSharp.Parser.AST.Template.Internal.cctor_3(ret, new global::System.IntPtr(&native)); return (Template.Internal*) ret; } @@ -6668,7 +6723,7 @@ namespace CppSharp public Template(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(104); + __Instance = Marshal.AllocHGlobal(108); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -6677,7 +6732,7 @@ namespace CppSharp public Template() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(104); + __Instance = Marshal.AllocHGlobal(108); __ownsNativeInstance = true; Internal.ctor_1(__Instance); } @@ -6734,7 +6789,7 @@ namespace CppSharp public unsafe partial class ClassTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 116)] + [StructLayout(LayoutKind.Explicit, Size = 120)] public new partial struct Internal { [FieldOffset(0)] @@ -6750,27 +6805,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6823,7 +6881,7 @@ namespace CppSharp private static ClassTemplate.Internal* __CopyValue(ClassTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(116); + var ret = Marshal.AllocHGlobal(120); CppSharp.Parser.AST.ClassTemplate.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (ClassTemplate.Internal*) ret; } @@ -6842,7 +6900,7 @@ namespace CppSharp public ClassTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(116); + __Instance = Marshal.AllocHGlobal(120); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6886,7 +6944,7 @@ namespace CppSharp public unsafe partial class ClassTemplateSpecialization : CppSharp.Parser.AST.Class, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 284)] + [StructLayout(LayoutKind.Explicit, Size = 288)] public new partial struct Internal { [FieldOffset(0)] @@ -6902,63 +6960,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(196)] + [FieldOffset(200)] public bool IsAnonymous; - [FieldOffset(248)] + [FieldOffset(252)] public bool IsPOD; - [FieldOffset(249)] + [FieldOffset(253)] public bool IsAbstract; - [FieldOffset(250)] + [FieldOffset(254)] public bool IsUnion; - [FieldOffset(251)] + [FieldOffset(255)] public bool IsDynamic; - [FieldOffset(252)] + [FieldOffset(256)] public bool IsPolymorphic; - [FieldOffset(253)] + [FieldOffset(257)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(254)] + [FieldOffset(258)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(255)] + [FieldOffset(259)] public bool HasNonTrivialDestructor; - [FieldOffset(256)] + [FieldOffset(260)] public bool IsExternCContext; - [FieldOffset(260)] + [FieldOffset(264)] public global::System.IntPtr Layout; - [FieldOffset(264)] + [FieldOffset(268)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(280)] + [FieldOffset(284)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7011,7 +7072,7 @@ namespace CppSharp private static ClassTemplateSpecialization.Internal* __CopyValue(ClassTemplateSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(284); + var ret = Marshal.AllocHGlobal(288); CppSharp.Parser.AST.ClassTemplateSpecialization.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (ClassTemplateSpecialization.Internal*) ret; } @@ -7030,7 +7091,7 @@ namespace CppSharp public ClassTemplateSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(284); + __Instance = Marshal.AllocHGlobal(288); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7100,7 +7161,7 @@ namespace CppSharp public unsafe partial class ClassTemplatePartialSpecialization : CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 284)] + [StructLayout(LayoutKind.Explicit, Size = 288)] public new partial struct Internal { [FieldOffset(0)] @@ -7116,63 +7177,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(196)] + [FieldOffset(200)] public bool IsAnonymous; - [FieldOffset(248)] + [FieldOffset(252)] public bool IsPOD; - [FieldOffset(249)] + [FieldOffset(253)] public bool IsAbstract; - [FieldOffset(250)] + [FieldOffset(254)] public bool IsUnion; - [FieldOffset(251)] + [FieldOffset(255)] public bool IsDynamic; - [FieldOffset(252)] + [FieldOffset(256)] public bool IsPolymorphic; - [FieldOffset(253)] + [FieldOffset(257)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(254)] + [FieldOffset(258)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(255)] + [FieldOffset(259)] public bool HasNonTrivialDestructor; - [FieldOffset(256)] + [FieldOffset(260)] public bool IsExternCContext; - [FieldOffset(260)] + [FieldOffset(264)] public global::System.IntPtr Layout; - [FieldOffset(264)] + [FieldOffset(268)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(280)] + [FieldOffset(284)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7205,7 +7269,7 @@ namespace CppSharp private static ClassTemplatePartialSpecialization.Internal* __CopyValue(ClassTemplatePartialSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(284); + var ret = Marshal.AllocHGlobal(288); CppSharp.Parser.AST.ClassTemplatePartialSpecialization.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (ClassTemplatePartialSpecialization.Internal*) ret; } @@ -7224,7 +7288,7 @@ namespace CppSharp public ClassTemplatePartialSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(284); + __Instance = Marshal.AllocHGlobal(288); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7241,7 +7305,7 @@ namespace CppSharp public unsafe partial class FunctionTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 116)] + [StructLayout(LayoutKind.Explicit, Size = 120)] public new partial struct Internal { [FieldOffset(0)] @@ -7257,27 +7321,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -7330,7 +7397,7 @@ namespace CppSharp private static FunctionTemplate.Internal* __CopyValue(FunctionTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(116); + var ret = Marshal.AllocHGlobal(120); CppSharp.Parser.AST.FunctionTemplate.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (FunctionTemplate.Internal*) ret; } @@ -7349,7 +7416,7 @@ namespace CppSharp public FunctionTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(116); + __Instance = Marshal.AllocHGlobal(120); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7564,7 +7631,7 @@ namespace CppSharp public unsafe partial class Namespace : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 200)] + [StructLayout(LayoutKind.Explicit, Size = 204)] public new partial struct Internal { [FieldOffset(0)] @@ -7580,30 +7647,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(196)] + [FieldOffset(200)] public bool IsAnonymous; - [FieldOffset(197)] + [FieldOffset(201)] public bool IsInline; [SuppressUnmanagedCodeSecurity] @@ -7636,7 +7706,7 @@ namespace CppSharp private static Namespace.Internal* __CopyValue(Namespace.Internal native) { - var ret = Marshal.AllocHGlobal(200); + var ret = Marshal.AllocHGlobal(204); CppSharp.Parser.AST.Namespace.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Namespace.Internal*) ret; } @@ -7655,7 +7725,7 @@ namespace CppSharp public Namespace() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(200); + __Instance = Marshal.AllocHGlobal(204); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7685,7 +7755,7 @@ namespace CppSharp public unsafe partial class PreprocessedEntity : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 92)] + [StructLayout(LayoutKind.Explicit, Size = 96)] public new partial struct Internal { [FieldOffset(0)] @@ -7701,27 +7771,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7754,7 +7827,7 @@ namespace CppSharp private static PreprocessedEntity.Internal* __CopyValue(PreprocessedEntity.Internal native) { - var ret = Marshal.AllocHGlobal(92); + var ret = Marshal.AllocHGlobal(96); CppSharp.Parser.AST.PreprocessedEntity.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (PreprocessedEntity.Internal*) ret; } @@ -7773,7 +7846,7 @@ namespace CppSharp public PreprocessedEntity() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(92); + __Instance = Marshal.AllocHGlobal(96); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7803,7 +7876,7 @@ namespace CppSharp public unsafe partial class MacroDefinition : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 104)] + [StructLayout(LayoutKind.Explicit, Size = 108)] public new partial struct Internal { [FieldOffset(0)] @@ -7819,27 +7892,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7882,7 +7958,7 @@ namespace CppSharp private static MacroDefinition.Internal* __CopyValue(MacroDefinition.Internal native) { - var ret = Marshal.AllocHGlobal(104); + var ret = Marshal.AllocHGlobal(108); CppSharp.Parser.AST.MacroDefinition.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (MacroDefinition.Internal*) ret; } @@ -7901,7 +7977,7 @@ namespace CppSharp public MacroDefinition() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(104); + __Instance = Marshal.AllocHGlobal(108); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7935,7 +8011,7 @@ namespace CppSharp public unsafe partial class MacroExpansion : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 108)] + [StructLayout(LayoutKind.Explicit, Size = 112)] public new partial struct Internal { [FieldOffset(0)] @@ -7951,30 +8027,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(88)] + [FieldOffset(92)] public CppSharp.Parser.AST.MacroLocation MacroLocation; - [FieldOffset(104)] + [FieldOffset(108)] public global::System.IntPtr Definition; [SuppressUnmanagedCodeSecurity] @@ -8017,7 +8096,7 @@ namespace CppSharp private static MacroExpansion.Internal* __CopyValue(MacroExpansion.Internal native) { - var ret = Marshal.AllocHGlobal(108); + var ret = Marshal.AllocHGlobal(112); CppSharp.Parser.AST.MacroExpansion.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (MacroExpansion.Internal*) ret; } @@ -8036,7 +8115,7 @@ namespace CppSharp public MacroExpansion() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(108); + __Instance = Marshal.AllocHGlobal(112); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -8083,7 +8162,7 @@ namespace CppSharp public unsafe partial class TranslationUnit : CppSharp.Parser.AST.Namespace, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 228)] + [StructLayout(LayoutKind.Explicit, Size = 232)] public new partial struct Internal { [FieldOffset(0)] @@ -8099,33 +8178,36 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(36)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(52)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(53)] public bool IsDependent; - [FieldOffset(52)] + [FieldOffset(56)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(56)] + [FieldOffset(60)] public uint DefinitionOrder; - [FieldOffset(72)] + [FieldOffset(76)] public global::System.IntPtr OriginalPtr; - [FieldOffset(196)] + [FieldOffset(200)] public bool IsAnonymous; - [FieldOffset(197)] + [FieldOffset(201)] public bool IsInline; - [FieldOffset(212)] + [FieldOffset(216)] public bool IsSystemHeader; [SuppressUnmanagedCodeSecurity] @@ -8188,7 +8270,7 @@ namespace CppSharp private static TranslationUnit.Internal* __CopyValue(TranslationUnit.Internal native) { - var ret = Marshal.AllocHGlobal(228); + var ret = Marshal.AllocHGlobal(232); CppSharp.Parser.AST.TranslationUnit.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (TranslationUnit.Internal*) ret; } @@ -8207,7 +8289,7 @@ namespace CppSharp public TranslationUnit() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(228); + __Instance = Marshal.AllocHGlobal(232); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } 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 22a9b7d9..74defd52 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs @@ -3031,7 +3031,7 @@ namespace CppSharp public unsafe partial class Declaration : IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 124)] + [StructLayout(LayoutKind.Explicit, Size = 128)] public partial struct Internal { [FieldOffset(0)] @@ -3047,24 +3047,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -3139,7 +3142,7 @@ namespace CppSharp private static Declaration.Internal* __CopyValue(Declaration.Internal native) { - var ret = Marshal.AllocHGlobal(124); + var ret = Marshal.AllocHGlobal(128); CppSharp.Parser.AST.Declaration.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Declaration.Internal*) ret; } @@ -3157,7 +3160,7 @@ namespace CppSharp public Declaration(CppSharp.Parser.AST.DeclarationKind kind) { - __Instance = Marshal.AllocHGlobal(124); + __Instance = Marshal.AllocHGlobal(128); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3291,16 +3294,29 @@ namespace CppSharp } } - public int LineNumber + public int LineNumberStart + { + get + { + return ((Internal*) __Instance)->LineNumberStart; + } + + set + { + ((Internal*) __Instance)->LineNumberStart = value; + } + } + + public int LineNumberEnd { get { - return ((Internal*) __Instance)->LineNumber; + return ((Internal*) __Instance)->LineNumberEnd; } set { - ((Internal*) __Instance)->LineNumber = value; + ((Internal*) __Instance)->LineNumberEnd = value; } } @@ -3385,7 +3401,7 @@ namespace CppSharp public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 232)] + [StructLayout(LayoutKind.Explicit, Size = 236)] public new partial struct Internal { [FieldOffset(0)] @@ -3401,27 +3417,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsAnonymous; [SuppressUnmanagedCodeSecurity] @@ -3614,7 +3633,7 @@ namespace CppSharp private static DeclarationContext.Internal* __CopyValue(DeclarationContext.Internal native) { - var ret = Marshal.AllocHGlobal(232); + var ret = Marshal.AllocHGlobal(236); CppSharp.Parser.AST.DeclarationContext.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (DeclarationContext.Internal*) ret; } @@ -3633,7 +3652,7 @@ namespace CppSharp public DeclarationContext(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(232); + __Instance = Marshal.AllocHGlobal(236); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3880,7 +3899,7 @@ namespace CppSharp public unsafe partial class TypedefDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 132)] + [StructLayout(LayoutKind.Explicit, Size = 136)] public new partial struct Internal { [FieldOffset(0)] @@ -3896,27 +3915,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -3949,7 +3971,7 @@ namespace CppSharp private static TypedefDecl.Internal* __CopyValue(TypedefDecl.Internal native) { - var ret = Marshal.AllocHGlobal(132); + var ret = Marshal.AllocHGlobal(136); CppSharp.Parser.AST.TypedefDecl.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (TypedefDecl.Internal*) ret; } @@ -3968,7 +3990,7 @@ namespace CppSharp public TypedefDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(132); + __Instance = Marshal.AllocHGlobal(136); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -3998,7 +4020,7 @@ namespace CppSharp public unsafe partial class Friend : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 128)] + [StructLayout(LayoutKind.Explicit, Size = 132)] public new partial struct Internal { [FieldOffset(0)] @@ -4014,27 +4036,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public global::System.IntPtr Declaration; [SuppressUnmanagedCodeSecurity] @@ -4067,7 +4092,7 @@ namespace CppSharp private static Friend.Internal* __CopyValue(Friend.Internal native) { - var ret = Marshal.AllocHGlobal(128); + var ret = Marshal.AllocHGlobal(132); CppSharp.Parser.AST.Friend.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Friend.Internal*) ret; } @@ -4086,7 +4111,7 @@ namespace CppSharp public Friend() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(128); + __Instance = Marshal.AllocHGlobal(132); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4317,7 +4342,7 @@ namespace CppSharp public unsafe partial class Parameter : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 144)] + [StructLayout(LayoutKind.Explicit, Size = 148)] public new partial struct Internal { [FieldOffset(0)] @@ -4333,39 +4358,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(132)] + [FieldOffset(136)] public bool IsIndirect; - [FieldOffset(133)] + [FieldOffset(137)] public bool HasDefaultValue; - [FieldOffset(136)] + [FieldOffset(140)] public uint Index; - [FieldOffset(140)] + [FieldOffset(144)] public global::System.IntPtr DefaultArgument; [SuppressUnmanagedCodeSecurity] @@ -4398,7 +4426,7 @@ namespace CppSharp private static Parameter.Internal* __CopyValue(Parameter.Internal native) { - var ret = Marshal.AllocHGlobal(144); + var ret = Marshal.AllocHGlobal(148); CppSharp.Parser.AST.Parameter.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Parameter.Internal*) ret; } @@ -4417,7 +4445,7 @@ namespace CppSharp public Parameter() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(144); + __Instance = Marshal.AllocHGlobal(148); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4499,7 +4527,7 @@ namespace CppSharp public unsafe partial class Function : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 212)] + [StructLayout(LayoutKind.Explicit, Size = 216)] public new partial struct Internal { [FieldOffset(0)] @@ -4515,54 +4543,57 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(132)] + [FieldOffset(136)] public bool IsReturnIndirect; - [FieldOffset(133)] + [FieldOffset(137)] public bool HasThisReturn; - [FieldOffset(134)] + [FieldOffset(138)] public bool IsVariadic; - [FieldOffset(135)] + [FieldOffset(139)] public bool IsInline; - [FieldOffset(136)] + [FieldOffset(140)] public bool IsPure; - [FieldOffset(137)] + [FieldOffset(141)] public bool IsDeleted; - [FieldOffset(140)] + [FieldOffset(144)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(192)] + [FieldOffset(196)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(208)] + [FieldOffset(212)] public global::System.IntPtr SpecializationInfo; [SuppressUnmanagedCodeSecurity] @@ -4635,7 +4666,7 @@ namespace CppSharp private static Function.Internal* __CopyValue(Function.Internal native) { - var ret = Marshal.AllocHGlobal(212); + var ret = Marshal.AllocHGlobal(216); CppSharp.Parser.AST.Function.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Function.Internal*) ret; } @@ -4654,7 +4685,7 @@ namespace CppSharp public Function() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(212); + __Instance = Marshal.AllocHGlobal(216); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4862,7 +4893,7 @@ namespace CppSharp public unsafe partial class Method : CppSharp.Parser.AST.Function, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 240)] + [StructLayout(LayoutKind.Explicit, Size = 244)] public new partial struct Internal { [FieldOffset(0)] @@ -4878,90 +4909,93 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(132)] + [FieldOffset(136)] public bool IsReturnIndirect; - [FieldOffset(133)] + [FieldOffset(137)] public bool HasThisReturn; - [FieldOffset(134)] + [FieldOffset(138)] public bool IsVariadic; - [FieldOffset(135)] + [FieldOffset(139)] public bool IsInline; - [FieldOffset(136)] + [FieldOffset(140)] public bool IsPure; - [FieldOffset(137)] + [FieldOffset(141)] public bool IsDeleted; - [FieldOffset(140)] + [FieldOffset(144)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(192)] + [FieldOffset(196)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(208)] + [FieldOffset(212)] public global::System.IntPtr SpecializationInfo; - [FieldOffset(212)] + [FieldOffset(216)] public global::System.IntPtr AccessDecl; - [FieldOffset(216)] + [FieldOffset(220)] public bool IsVirtual; - [FieldOffset(217)] + [FieldOffset(221)] public bool IsStatic; - [FieldOffset(218)] + [FieldOffset(222)] public bool IsConst; - [FieldOffset(219)] + [FieldOffset(223)] public bool IsImplicit; - [FieldOffset(220)] + [FieldOffset(224)] public bool IsExplicit; - [FieldOffset(221)] + [FieldOffset(225)] public bool IsOverride; - [FieldOffset(224)] + [FieldOffset(228)] public CppSharp.Parser.AST.CXXMethodKind MethodKind; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsDefaultConstructor; - [FieldOffset(229)] + [FieldOffset(233)] public bool IsCopyConstructor; - [FieldOffset(230)] + [FieldOffset(234)] public bool IsMoveConstructor; - [FieldOffset(232)] + [FieldOffset(236)] public CppSharp.Parser.AST.QualifiedType.Internal ConversionType; [SuppressUnmanagedCodeSecurity] @@ -4994,7 +5028,7 @@ namespace CppSharp private static Method.Internal* __CopyValue(Method.Internal native) { - var ret = Marshal.AllocHGlobal(240); + var ret = Marshal.AllocHGlobal(244); CppSharp.Parser.AST.Method.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Method.Internal*) ret; } @@ -5013,7 +5047,7 @@ namespace CppSharp public Method() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(240); + __Instance = Marshal.AllocHGlobal(244); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5186,7 +5220,7 @@ namespace CppSharp public unsafe partial class Enumeration : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 256)] + [StructLayout(LayoutKind.Explicit, Size = 260)] public new partial struct Internal { [FieldOffset(0)] @@ -5202,36 +5236,39 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsAnonymous; - [FieldOffset(232)] + [FieldOffset(236)] public CppSharp.Parser.AST.Enumeration.EnumModifiers Modifiers; - [FieldOffset(236)] + [FieldOffset(240)] public global::System.IntPtr Type; - [FieldOffset(240)] + [FieldOffset(244)] public global::System.IntPtr BuiltinType; [SuppressUnmanagedCodeSecurity] @@ -5296,24 +5333,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; [FieldOffset(152)] @@ -5437,7 +5477,7 @@ namespace CppSharp private static Enumeration.Internal* __CopyValue(Enumeration.Internal native) { - var ret = Marshal.AllocHGlobal(256); + var ret = Marshal.AllocHGlobal(260); CppSharp.Parser.AST.Enumeration.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Enumeration.Internal*) ret; } @@ -5456,7 +5496,7 @@ namespace CppSharp public Enumeration() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(256); + __Instance = Marshal.AllocHGlobal(260); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5539,7 +5579,7 @@ namespace CppSharp public unsafe partial class Variable : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 156)] + [StructLayout(LayoutKind.Explicit, Size = 160)] public new partial struct Internal { [FieldOffset(0)] @@ -5555,27 +5595,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(148)] + [FieldOffset(152)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -5618,7 +5661,7 @@ namespace CppSharp private static Variable.Internal* __CopyValue(Variable.Internal native) { - var ret = Marshal.AllocHGlobal(156); + var ret = Marshal.AllocHGlobal(160); CppSharp.Parser.AST.Variable.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Variable.Internal*) ret; } @@ -5637,7 +5680,7 @@ namespace CppSharp public Variable() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(156); + __Instance = Marshal.AllocHGlobal(160); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5818,7 +5861,7 @@ namespace CppSharp public unsafe partial class Field : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 148)] + [StructLayout(LayoutKind.Explicit, Size = 152)] public new partial struct Internal { [FieldOffset(0)] @@ -5834,39 +5877,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(132)] + [FieldOffset(136)] public uint Offset; - [FieldOffset(136)] + [FieldOffset(140)] public global::System.IntPtr Class; - [FieldOffset(140)] + [FieldOffset(144)] public bool IsBitField; - [FieldOffset(144)] + [FieldOffset(148)] public uint BitWidth; [SuppressUnmanagedCodeSecurity] @@ -5899,7 +5945,7 @@ namespace CppSharp private static Field.Internal* __CopyValue(Field.Internal native) { - var ret = Marshal.AllocHGlobal(148); + var ret = Marshal.AllocHGlobal(152); CppSharp.Parser.AST.Field.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Field.Internal*) ret; } @@ -5918,7 +5964,7 @@ namespace CppSharp public Field() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(148); + __Instance = Marshal.AllocHGlobal(152); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6000,7 +6046,7 @@ namespace CppSharp public unsafe partial class AccessSpecifierDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 124)] + [StructLayout(LayoutKind.Explicit, Size = 128)] public new partial struct Internal { [FieldOffset(0)] @@ -6016,24 +6062,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -6066,7 +6115,7 @@ namespace CppSharp private static AccessSpecifierDecl.Internal* __CopyValue(AccessSpecifierDecl.Internal native) { - var ret = Marshal.AllocHGlobal(124); + var ret = Marshal.AllocHGlobal(128); CppSharp.Parser.AST.AccessSpecifierDecl.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (AccessSpecifierDecl.Internal*) ret; } @@ -6085,7 +6134,7 @@ namespace CppSharp public AccessSpecifierDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(124); + __Instance = Marshal.AllocHGlobal(128); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6102,7 +6151,7 @@ namespace CppSharp public unsafe partial class Class : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 296)] + [StructLayout(LayoutKind.Explicit, Size = 300)] public new partial struct Internal { [FieldOffset(0)] @@ -6118,57 +6167,60 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsAnonymous; - [FieldOffset(280)] + [FieldOffset(284)] public bool IsPOD; - [FieldOffset(281)] + [FieldOffset(285)] public bool IsAbstract; - [FieldOffset(282)] + [FieldOffset(286)] public bool IsUnion; - [FieldOffset(283)] + [FieldOffset(287)] public bool IsDynamic; - [FieldOffset(284)] + [FieldOffset(288)] public bool IsPolymorphic; - [FieldOffset(285)] + [FieldOffset(289)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(286)] + [FieldOffset(290)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(287)] + [FieldOffset(291)] public bool HasNonTrivialDestructor; - [FieldOffset(288)] + [FieldOffset(292)] public bool IsExternCContext; - [FieldOffset(292)] + [FieldOffset(296)] public global::System.IntPtr Layout; [SuppressUnmanagedCodeSecurity] @@ -6281,7 +6333,7 @@ namespace CppSharp private static Class.Internal* __CopyValue(Class.Internal native) { - var ret = Marshal.AllocHGlobal(296); + var ret = Marshal.AllocHGlobal(300); CppSharp.Parser.AST.Class.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Class.Internal*) ret; } @@ -6300,7 +6352,7 @@ namespace CppSharp public Class() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(296); + __Instance = Marshal.AllocHGlobal(300); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6555,7 +6607,7 @@ namespace CppSharp public unsafe partial class Template : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 140)] + [StructLayout(LayoutKind.Explicit, Size = 144)] public new partial struct Internal { [FieldOffset(0)] @@ -6571,27 +6623,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6649,7 +6704,7 @@ namespace CppSharp private static Template.Internal* __CopyValue(Template.Internal native) { - var ret = Marshal.AllocHGlobal(140); + var ret = Marshal.AllocHGlobal(144); CppSharp.Parser.AST.Template.Internal.cctor_3(ret, new global::System.IntPtr(&native)); return (Template.Internal*) ret; } @@ -6668,7 +6723,7 @@ namespace CppSharp public Template(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(140); + __Instance = Marshal.AllocHGlobal(144); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -6677,7 +6732,7 @@ namespace CppSharp public Template() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(140); + __Instance = Marshal.AllocHGlobal(144); __ownsNativeInstance = true; Internal.ctor_1(__Instance); } @@ -6734,7 +6789,7 @@ namespace CppSharp public unsafe partial class ClassTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 152)] + [StructLayout(LayoutKind.Explicit, Size = 156)] public new partial struct Internal { [FieldOffset(0)] @@ -6750,27 +6805,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6823,7 +6881,7 @@ namespace CppSharp private static ClassTemplate.Internal* __CopyValue(ClassTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(152); + var ret = Marshal.AllocHGlobal(156); CppSharp.Parser.AST.ClassTemplate.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (ClassTemplate.Internal*) ret; } @@ -6842,7 +6900,7 @@ namespace CppSharp public ClassTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(152); + __Instance = Marshal.AllocHGlobal(156); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6886,7 +6944,7 @@ namespace CppSharp public unsafe partial class ClassTemplateSpecialization : CppSharp.Parser.AST.Class, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 316)] + [StructLayout(LayoutKind.Explicit, Size = 320)] public new partial struct Internal { [FieldOffset(0)] @@ -6902,63 +6960,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsAnonymous; - [FieldOffset(280)] + [FieldOffset(284)] public bool IsPOD; - [FieldOffset(281)] + [FieldOffset(285)] public bool IsAbstract; - [FieldOffset(282)] + [FieldOffset(286)] public bool IsUnion; - [FieldOffset(283)] + [FieldOffset(287)] public bool IsDynamic; - [FieldOffset(284)] + [FieldOffset(288)] public bool IsPolymorphic; - [FieldOffset(285)] + [FieldOffset(289)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(286)] + [FieldOffset(290)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(287)] + [FieldOffset(291)] public bool HasNonTrivialDestructor; - [FieldOffset(288)] + [FieldOffset(292)] public bool IsExternCContext; - [FieldOffset(292)] + [FieldOffset(296)] public global::System.IntPtr Layout; - [FieldOffset(296)] + [FieldOffset(300)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(312)] + [FieldOffset(316)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7011,7 +7072,7 @@ namespace CppSharp private static ClassTemplateSpecialization.Internal* __CopyValue(ClassTemplateSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(316); + var ret = Marshal.AllocHGlobal(320); CppSharp.Parser.AST.ClassTemplateSpecialization.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (ClassTemplateSpecialization.Internal*) ret; } @@ -7030,7 +7091,7 @@ namespace CppSharp public ClassTemplateSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(316); + __Instance = Marshal.AllocHGlobal(320); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7100,7 +7161,7 @@ namespace CppSharp public unsafe partial class ClassTemplatePartialSpecialization : CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 316)] + [StructLayout(LayoutKind.Explicit, Size = 320)] public new partial struct Internal { [FieldOffset(0)] @@ -7116,63 +7177,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsAnonymous; - [FieldOffset(280)] + [FieldOffset(284)] public bool IsPOD; - [FieldOffset(281)] + [FieldOffset(285)] public bool IsAbstract; - [FieldOffset(282)] + [FieldOffset(286)] public bool IsUnion; - [FieldOffset(283)] + [FieldOffset(287)] public bool IsDynamic; - [FieldOffset(284)] + [FieldOffset(288)] public bool IsPolymorphic; - [FieldOffset(285)] + [FieldOffset(289)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(286)] + [FieldOffset(290)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(287)] + [FieldOffset(291)] public bool HasNonTrivialDestructor; - [FieldOffset(288)] + [FieldOffset(292)] public bool IsExternCContext; - [FieldOffset(292)] + [FieldOffset(296)] public global::System.IntPtr Layout; - [FieldOffset(296)] + [FieldOffset(300)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(312)] + [FieldOffset(316)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7205,7 +7269,7 @@ namespace CppSharp private static ClassTemplatePartialSpecialization.Internal* __CopyValue(ClassTemplatePartialSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(316); + var ret = Marshal.AllocHGlobal(320); CppSharp.Parser.AST.ClassTemplatePartialSpecialization.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (ClassTemplatePartialSpecialization.Internal*) ret; } @@ -7224,7 +7288,7 @@ namespace CppSharp public ClassTemplatePartialSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(316); + __Instance = Marshal.AllocHGlobal(320); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7241,7 +7305,7 @@ namespace CppSharp public unsafe partial class FunctionTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 152)] + [StructLayout(LayoutKind.Explicit, Size = 156)] public new partial struct Internal { [FieldOffset(0)] @@ -7257,27 +7321,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -7330,7 +7397,7 @@ namespace CppSharp private static FunctionTemplate.Internal* __CopyValue(FunctionTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(152); + var ret = Marshal.AllocHGlobal(156); CppSharp.Parser.AST.FunctionTemplate.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (FunctionTemplate.Internal*) ret; } @@ -7349,7 +7416,7 @@ namespace CppSharp public FunctionTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(152); + __Instance = Marshal.AllocHGlobal(156); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7564,7 +7631,7 @@ namespace CppSharp public unsafe partial class Namespace : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 236)] + [StructLayout(LayoutKind.Explicit, Size = 240)] public new partial struct Internal { [FieldOffset(0)] @@ -7580,30 +7647,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsAnonymous; - [FieldOffset(232)] + [FieldOffset(236)] public bool IsInline; [SuppressUnmanagedCodeSecurity] @@ -7636,7 +7706,7 @@ namespace CppSharp private static Namespace.Internal* __CopyValue(Namespace.Internal native) { - var ret = Marshal.AllocHGlobal(236); + var ret = Marshal.AllocHGlobal(240); CppSharp.Parser.AST.Namespace.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Namespace.Internal*) ret; } @@ -7655,7 +7725,7 @@ namespace CppSharp public Namespace() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(236); + __Instance = Marshal.AllocHGlobal(240); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7685,7 +7755,7 @@ namespace CppSharp public unsafe partial class PreprocessedEntity : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 128)] + [StructLayout(LayoutKind.Explicit, Size = 132)] public new partial struct Internal { [FieldOffset(0)] @@ -7701,27 +7771,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7754,7 +7827,7 @@ namespace CppSharp private static PreprocessedEntity.Internal* __CopyValue(PreprocessedEntity.Internal native) { - var ret = Marshal.AllocHGlobal(128); + var ret = Marshal.AllocHGlobal(132); CppSharp.Parser.AST.PreprocessedEntity.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (PreprocessedEntity.Internal*) ret; } @@ -7773,7 +7846,7 @@ namespace CppSharp public PreprocessedEntity() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(128); + __Instance = Marshal.AllocHGlobal(132); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7803,7 +7876,7 @@ namespace CppSharp public unsafe partial class MacroDefinition : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 152)] + [StructLayout(LayoutKind.Explicit, Size = 156)] public new partial struct Internal { [FieldOffset(0)] @@ -7819,27 +7892,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7882,7 +7958,7 @@ namespace CppSharp private static MacroDefinition.Internal* __CopyValue(MacroDefinition.Internal native) { - var ret = Marshal.AllocHGlobal(152); + var ret = Marshal.AllocHGlobal(156); CppSharp.Parser.AST.MacroDefinition.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (MacroDefinition.Internal*) ret; } @@ -7901,7 +7977,7 @@ namespace CppSharp public MacroDefinition() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(152); + __Instance = Marshal.AllocHGlobal(156); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7935,7 +8011,7 @@ namespace CppSharp public unsafe partial class MacroExpansion : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 156)] + [StructLayout(LayoutKind.Explicit, Size = 160)] public new partial struct Internal { [FieldOffset(0)] @@ -7951,30 +8027,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(124)] + [FieldOffset(128)] public CppSharp.Parser.AST.MacroLocation MacroLocation; - [FieldOffset(152)] + [FieldOffset(156)] public global::System.IntPtr Definition; [SuppressUnmanagedCodeSecurity] @@ -8017,7 +8096,7 @@ namespace CppSharp private static MacroExpansion.Internal* __CopyValue(MacroExpansion.Internal native) { - var ret = Marshal.AllocHGlobal(156); + var ret = Marshal.AllocHGlobal(160); CppSharp.Parser.AST.MacroExpansion.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (MacroExpansion.Internal*) ret; } @@ -8036,7 +8115,7 @@ namespace CppSharp public MacroExpansion() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(156); + __Instance = Marshal.AllocHGlobal(160); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -8083,7 +8162,7 @@ namespace CppSharp public unsafe partial class TranslationUnit : CppSharp.Parser.AST.Namespace, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 276)] + [StructLayout(LayoutKind.Explicit, Size = 280)] public new partial struct Internal { [FieldOffset(0)] @@ -8099,33 +8178,36 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(16)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(44)] + [FieldOffset(20)] + public int LineNumberEnd; + + [FieldOffset(48)] public global::System.IntPtr Comment; - [FieldOffset(72)] + [FieldOffset(76)] public bool IsIncomplete; - [FieldOffset(73)] + [FieldOffset(77)] public bool IsDependent; - [FieldOffset(76)] + [FieldOffset(80)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(80)] + [FieldOffset(84)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(100)] public global::System.IntPtr OriginalPtr; - [FieldOffset(228)] + [FieldOffset(232)] public bool IsAnonymous; - [FieldOffset(232)] + [FieldOffset(236)] public bool IsInline; - [FieldOffset(260)] + [FieldOffset(264)] public bool IsSystemHeader; [SuppressUnmanagedCodeSecurity] @@ -8188,7 +8270,7 @@ namespace CppSharp private static TranslationUnit.Internal* __CopyValue(TranslationUnit.Internal native) { - var ret = Marshal.AllocHGlobal(276); + var ret = Marshal.AllocHGlobal(280); CppSharp.Parser.AST.TranslationUnit.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (TranslationUnit.Internal*) ret; } @@ -8207,7 +8289,7 @@ namespace CppSharp public TranslationUnit() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(276); + __Instance = Marshal.AllocHGlobal(280); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } 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 57db128c..851ff7be 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 @@ -3030,7 +3030,7 @@ namespace CppSharp public unsafe partial class Declaration : IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 160)] + [StructLayout(LayoutKind.Explicit, Size = 168)] public partial struct Internal { [FieldOffset(0)] @@ -3046,24 +3046,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -3138,7 +3141,7 @@ namespace CppSharp private static Declaration.Internal* __CopyValue(Declaration.Internal native) { - var ret = Marshal.AllocHGlobal(160); + var ret = Marshal.AllocHGlobal(168); CppSharp.Parser.AST.Declaration.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Declaration.Internal*) ret; } @@ -3156,7 +3159,7 @@ namespace CppSharp public Declaration(CppSharp.Parser.AST.DeclarationKind kind) { - __Instance = Marshal.AllocHGlobal(160); + __Instance = Marshal.AllocHGlobal(168); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3290,16 +3293,29 @@ namespace CppSharp } } - public int LineNumber + public int LineNumberStart { get { - return ((Internal*) __Instance)->LineNumber; + return ((Internal*) __Instance)->LineNumberStart; } set { - ((Internal*) __Instance)->LineNumber = value; + ((Internal*) __Instance)->LineNumberStart = value; + } + } + + public int LineNumberEnd + { + get + { + return ((Internal*) __Instance)->LineNumberEnd; + } + + set + { + ((Internal*) __Instance)->LineNumberEnd = value; } } @@ -3384,7 +3400,7 @@ namespace CppSharp public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 384)] + [StructLayout(LayoutKind.Explicit, Size = 392)] public new partial struct Internal { [FieldOffset(0)] @@ -3400,27 +3416,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(376)] + [FieldOffset(384)] public bool IsAnonymous; [SuppressUnmanagedCodeSecurity] @@ -3613,7 +3632,7 @@ namespace CppSharp private static DeclarationContext.Internal* __CopyValue(DeclarationContext.Internal native) { - var ret = Marshal.AllocHGlobal(384); + var ret = Marshal.AllocHGlobal(392); CppSharp.Parser.AST.DeclarationContext.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (DeclarationContext.Internal*) ret; } @@ -3632,7 +3651,7 @@ namespace CppSharp public DeclarationContext(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(384); + __Instance = Marshal.AllocHGlobal(392); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3879,7 +3898,7 @@ namespace CppSharp public unsafe partial class TypedefDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 176)] + [StructLayout(LayoutKind.Explicit, Size = 184)] public new partial struct Internal { [FieldOffset(0)] @@ -3895,27 +3914,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -3948,7 +3970,7 @@ namespace CppSharp private static TypedefDecl.Internal* __CopyValue(TypedefDecl.Internal native) { - var ret = Marshal.AllocHGlobal(176); + var ret = Marshal.AllocHGlobal(184); CppSharp.Parser.AST.TypedefDecl.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (TypedefDecl.Internal*) ret; } @@ -3967,7 +3989,7 @@ namespace CppSharp public TypedefDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(176); + __Instance = Marshal.AllocHGlobal(184); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -3997,7 +4019,7 @@ namespace CppSharp public unsafe partial class Friend : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 168)] + [StructLayout(LayoutKind.Explicit, Size = 176)] public new partial struct Internal { [FieldOffset(0)] @@ -4013,27 +4035,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public global::System.IntPtr Declaration; [SuppressUnmanagedCodeSecurity] @@ -4066,7 +4091,7 @@ namespace CppSharp private static Friend.Internal* __CopyValue(Friend.Internal native) { - var ret = Marshal.AllocHGlobal(168); + var ret = Marshal.AllocHGlobal(176); CppSharp.Parser.AST.Friend.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Friend.Internal*) ret; } @@ -4085,7 +4110,7 @@ namespace CppSharp public Friend() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(168); + __Instance = Marshal.AllocHGlobal(176); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4316,7 +4341,7 @@ namespace CppSharp public unsafe partial class Parameter : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 192)] + [StructLayout(LayoutKind.Explicit, Size = 200)] public new partial struct Internal { [FieldOffset(0)] @@ -4332,39 +4357,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(176)] + [FieldOffset(184)] public bool IsIndirect; - [FieldOffset(177)] + [FieldOffset(185)] public bool HasDefaultValue; - [FieldOffset(180)] + [FieldOffset(188)] public uint Index; - [FieldOffset(184)] + [FieldOffset(192)] public global::System.IntPtr DefaultArgument; [SuppressUnmanagedCodeSecurity] @@ -4397,7 +4425,7 @@ namespace CppSharp private static Parameter.Internal* __CopyValue(Parameter.Internal native) { - var ret = Marshal.AllocHGlobal(192); + var ret = Marshal.AllocHGlobal(200); CppSharp.Parser.AST.Parameter.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Parameter.Internal*) ret; } @@ -4416,7 +4444,7 @@ namespace CppSharp public Parameter() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(192); + __Instance = Marshal.AllocHGlobal(200); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4498,7 +4526,7 @@ namespace CppSharp public unsafe partial class Function : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 280)] + [StructLayout(LayoutKind.Explicit, Size = 288)] public new partial struct Internal { [FieldOffset(0)] @@ -4514,54 +4542,57 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(176)] + [FieldOffset(184)] public bool IsReturnIndirect; - [FieldOffset(177)] + [FieldOffset(185)] public bool HasThisReturn; - [FieldOffset(178)] + [FieldOffset(186)] public bool IsVariadic; - [FieldOffset(179)] + [FieldOffset(187)] public bool IsInline; - [FieldOffset(180)] + [FieldOffset(188)] public bool IsPure; - [FieldOffset(181)] + [FieldOffset(189)] public bool IsDeleted; - [FieldOffset(184)] + [FieldOffset(192)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(240)] + [FieldOffset(248)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(272)] + [FieldOffset(280)] public global::System.IntPtr SpecializationInfo; [SuppressUnmanagedCodeSecurity] @@ -4634,7 +4665,7 @@ namespace CppSharp private static Function.Internal* __CopyValue(Function.Internal native) { - var ret = Marshal.AllocHGlobal(280); + var ret = Marshal.AllocHGlobal(288); CppSharp.Parser.AST.Function.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Function.Internal*) ret; } @@ -4653,7 +4684,7 @@ namespace CppSharp public Function() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(280); + __Instance = Marshal.AllocHGlobal(288); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4861,7 +4892,7 @@ namespace CppSharp public unsafe partial class Method : CppSharp.Parser.AST.Function, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 320)] + [StructLayout(LayoutKind.Explicit, Size = 328)] public new partial struct Internal { [FieldOffset(0)] @@ -4877,90 +4908,93 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(176)] + [FieldOffset(184)] public bool IsReturnIndirect; - [FieldOffset(177)] + [FieldOffset(185)] public bool HasThisReturn; - [FieldOffset(178)] + [FieldOffset(186)] public bool IsVariadic; - [FieldOffset(179)] + [FieldOffset(187)] public bool IsInline; - [FieldOffset(180)] + [FieldOffset(188)] public bool IsPure; - [FieldOffset(181)] + [FieldOffset(189)] public bool IsDeleted; - [FieldOffset(184)] + [FieldOffset(192)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(240)] + [FieldOffset(248)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(272)] + [FieldOffset(280)] public global::System.IntPtr SpecializationInfo; - [FieldOffset(280)] + [FieldOffset(288)] public global::System.IntPtr AccessDecl; - [FieldOffset(288)] + [FieldOffset(296)] public bool IsVirtual; - [FieldOffset(289)] + [FieldOffset(297)] public bool IsStatic; - [FieldOffset(290)] + [FieldOffset(298)] public bool IsConst; - [FieldOffset(291)] + [FieldOffset(299)] public bool IsImplicit; - [FieldOffset(292)] + [FieldOffset(300)] public bool IsExplicit; - [FieldOffset(293)] + [FieldOffset(301)] public bool IsOverride; - [FieldOffset(296)] + [FieldOffset(304)] public CppSharp.Parser.AST.CXXMethodKind MethodKind; - [FieldOffset(300)] + [FieldOffset(308)] public bool IsDefaultConstructor; - [FieldOffset(301)] + [FieldOffset(309)] public bool IsCopyConstructor; - [FieldOffset(302)] + [FieldOffset(310)] public bool IsMoveConstructor; - [FieldOffset(304)] + [FieldOffset(312)] public CppSharp.Parser.AST.QualifiedType.Internal ConversionType; [SuppressUnmanagedCodeSecurity] @@ -4993,7 +5027,7 @@ namespace CppSharp private static Method.Internal* __CopyValue(Method.Internal native) { - var ret = Marshal.AllocHGlobal(320); + var ret = Marshal.AllocHGlobal(328); CppSharp.Parser.AST.Method.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Method.Internal*) ret; } @@ -5012,7 +5046,7 @@ namespace CppSharp public Method() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(320); + __Instance = Marshal.AllocHGlobal(328); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5185,7 +5219,7 @@ namespace CppSharp public unsafe partial class Enumeration : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 424)] + [StructLayout(LayoutKind.Explicit, Size = 432)] public new partial struct Internal { [FieldOffset(0)] @@ -5201,36 +5235,39 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(376)] + [FieldOffset(384)] public bool IsAnonymous; - [FieldOffset(380)] + [FieldOffset(388)] public CppSharp.Parser.AST.Enumeration.EnumModifiers Modifiers; - [FieldOffset(384)] + [FieldOffset(392)] public global::System.IntPtr Type; - [FieldOffset(392)] + [FieldOffset(400)] public global::System.IntPtr BuiltinType; [SuppressUnmanagedCodeSecurity] @@ -5279,7 +5316,7 @@ namespace CppSharp public unsafe partial class Item : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 192)] + [StructLayout(LayoutKind.Explicit, Size = 200)] public new partial struct Internal { [FieldOffset(0)] @@ -5295,27 +5332,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; + + [FieldOffset(24)] + public int LineNumberEnd; - [FieldOffset(48)] + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(184)] + [FieldOffset(192)] public ulong Value; [SuppressUnmanagedCodeSecurity] @@ -5358,7 +5398,7 @@ namespace CppSharp private static Item.Internal* __CopyValue(Item.Internal native) { - var ret = Marshal.AllocHGlobal(192); + var ret = Marshal.AllocHGlobal(200); CppSharp.Parser.AST.Enumeration.Item.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Item.Internal*) ret; } @@ -5377,7 +5417,7 @@ namespace CppSharp public Item() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(192); + __Instance = Marshal.AllocHGlobal(200); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5436,7 +5476,7 @@ namespace CppSharp private static Enumeration.Internal* __CopyValue(Enumeration.Internal native) { - var ret = Marshal.AllocHGlobal(424); + var ret = Marshal.AllocHGlobal(432); CppSharp.Parser.AST.Enumeration.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Enumeration.Internal*) ret; } @@ -5455,7 +5495,7 @@ namespace CppSharp public Enumeration() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(424); + __Instance = Marshal.AllocHGlobal(432); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5538,7 +5578,7 @@ namespace CppSharp public unsafe partial class Variable : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 200)] + [StructLayout(LayoutKind.Explicit, Size = 208)] public new partial struct Internal { [FieldOffset(0)] @@ -5554,27 +5594,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(184)] + [FieldOffset(192)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -5617,7 +5660,7 @@ namespace CppSharp private static Variable.Internal* __CopyValue(Variable.Internal native) { - var ret = Marshal.AllocHGlobal(200); + var ret = Marshal.AllocHGlobal(208); CppSharp.Parser.AST.Variable.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Variable.Internal*) ret; } @@ -5636,7 +5679,7 @@ namespace CppSharp public Variable() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(200); + __Instance = Marshal.AllocHGlobal(208); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5817,7 +5860,7 @@ namespace CppSharp public unsafe partial class Field : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 200)] + [StructLayout(LayoutKind.Explicit, Size = 208)] public new partial struct Internal { [FieldOffset(0)] @@ -5833,39 +5876,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(176)] + [FieldOffset(184)] public uint Offset; - [FieldOffset(184)] + [FieldOffset(192)] public global::System.IntPtr Class; - [FieldOffset(192)] + [FieldOffset(200)] public bool IsBitField; - [FieldOffset(196)] + [FieldOffset(204)] public uint BitWidth; [SuppressUnmanagedCodeSecurity] @@ -5898,7 +5944,7 @@ namespace CppSharp private static Field.Internal* __CopyValue(Field.Internal native) { - var ret = Marshal.AllocHGlobal(200); + var ret = Marshal.AllocHGlobal(208); CppSharp.Parser.AST.Field.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Field.Internal*) ret; } @@ -5917,7 +5963,7 @@ namespace CppSharp public Field() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(200); + __Instance = Marshal.AllocHGlobal(208); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5999,7 +6045,7 @@ namespace CppSharp public unsafe partial class AccessSpecifierDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 160)] + [StructLayout(LayoutKind.Explicit, Size = 168)] public new partial struct Internal { [FieldOffset(0)] @@ -6015,24 +6061,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -6065,7 +6114,7 @@ namespace CppSharp private static AccessSpecifierDecl.Internal* __CopyValue(AccessSpecifierDecl.Internal native) { - var ret = Marshal.AllocHGlobal(160); + var ret = Marshal.AllocHGlobal(168); CppSharp.Parser.AST.AccessSpecifierDecl.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (AccessSpecifierDecl.Internal*) ret; } @@ -6084,7 +6133,7 @@ namespace CppSharp public AccessSpecifierDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(160); + __Instance = Marshal.AllocHGlobal(168); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6101,7 +6150,7 @@ namespace CppSharp public unsafe partial class Class : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 504)] + [StructLayout(LayoutKind.Explicit, Size = 512)] public new partial struct Internal { [FieldOffset(0)] @@ -6117,57 +6166,60 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(376)] + [FieldOffset(384)] public bool IsAnonymous; - [FieldOffset(480)] + [FieldOffset(488)] public bool IsPOD; - [FieldOffset(481)] + [FieldOffset(489)] public bool IsAbstract; - [FieldOffset(482)] + [FieldOffset(490)] public bool IsUnion; - [FieldOffset(483)] + [FieldOffset(491)] public bool IsDynamic; - [FieldOffset(484)] + [FieldOffset(492)] public bool IsPolymorphic; - [FieldOffset(485)] + [FieldOffset(493)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(486)] + [FieldOffset(494)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(487)] + [FieldOffset(495)] public bool HasNonTrivialDestructor; - [FieldOffset(488)] + [FieldOffset(496)] public bool IsExternCContext; - [FieldOffset(496)] + [FieldOffset(504)] public global::System.IntPtr Layout; [SuppressUnmanagedCodeSecurity] @@ -6280,7 +6332,7 @@ namespace CppSharp private static Class.Internal* __CopyValue(Class.Internal native) { - var ret = Marshal.AllocHGlobal(504); + var ret = Marshal.AllocHGlobal(512); CppSharp.Parser.AST.Class.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Class.Internal*) ret; } @@ -6299,7 +6351,7 @@ namespace CppSharp public Class() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(504); + __Instance = Marshal.AllocHGlobal(512); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6554,7 +6606,7 @@ namespace CppSharp public unsafe partial class Template : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 192)] + [StructLayout(LayoutKind.Explicit, Size = 200)] public new partial struct Internal { [FieldOffset(0)] @@ -6570,27 +6622,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6648,7 +6703,7 @@ namespace CppSharp private static Template.Internal* __CopyValue(Template.Internal native) { - var ret = Marshal.AllocHGlobal(192); + var ret = Marshal.AllocHGlobal(200); CppSharp.Parser.AST.Template.Internal.cctor_3(ret, new global::System.IntPtr(&native)); return (Template.Internal*) ret; } @@ -6667,7 +6722,7 @@ namespace CppSharp public Template(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(192); + __Instance = Marshal.AllocHGlobal(200); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -6676,7 +6731,7 @@ namespace CppSharp public Template() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(192); + __Instance = Marshal.AllocHGlobal(200); __ownsNativeInstance = true; Internal.ctor_1(__Instance); } @@ -6733,7 +6788,7 @@ namespace CppSharp public unsafe partial class ClassTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 216)] + [StructLayout(LayoutKind.Explicit, Size = 224)] public new partial struct Internal { [FieldOffset(0)] @@ -6749,27 +6804,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6822,7 +6880,7 @@ namespace CppSharp private static ClassTemplate.Internal* __CopyValue(ClassTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(216); + var ret = Marshal.AllocHGlobal(224); CppSharp.Parser.AST.ClassTemplate.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (ClassTemplate.Internal*) ret; } @@ -6841,7 +6899,7 @@ namespace CppSharp public ClassTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(216); + __Instance = Marshal.AllocHGlobal(224); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6885,7 +6943,7 @@ namespace CppSharp public unsafe partial class ClassTemplateSpecialization : CppSharp.Parser.AST.Class, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 544)] + [StructLayout(LayoutKind.Explicit, Size = 552)] public new partial struct Internal { [FieldOffset(0)] @@ -6901,63 +6959,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(376)] + [FieldOffset(384)] public bool IsAnonymous; - [FieldOffset(480)] + [FieldOffset(488)] public bool IsPOD; - [FieldOffset(481)] + [FieldOffset(489)] public bool IsAbstract; - [FieldOffset(482)] + [FieldOffset(490)] public bool IsUnion; - [FieldOffset(483)] + [FieldOffset(491)] public bool IsDynamic; - [FieldOffset(484)] + [FieldOffset(492)] public bool IsPolymorphic; - [FieldOffset(485)] + [FieldOffset(493)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(486)] + [FieldOffset(494)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(487)] + [FieldOffset(495)] public bool HasNonTrivialDestructor; - [FieldOffset(488)] + [FieldOffset(496)] public bool IsExternCContext; - [FieldOffset(496)] + [FieldOffset(504)] public global::System.IntPtr Layout; - [FieldOffset(504)] + [FieldOffset(512)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(536)] + [FieldOffset(544)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7010,7 +7071,7 @@ namespace CppSharp private static ClassTemplateSpecialization.Internal* __CopyValue(ClassTemplateSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(544); + var ret = Marshal.AllocHGlobal(552); CppSharp.Parser.AST.ClassTemplateSpecialization.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (ClassTemplateSpecialization.Internal*) ret; } @@ -7029,7 +7090,7 @@ namespace CppSharp public ClassTemplateSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(544); + __Instance = Marshal.AllocHGlobal(552); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7099,7 +7160,7 @@ namespace CppSharp public unsafe partial class ClassTemplatePartialSpecialization : CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 544)] + [StructLayout(LayoutKind.Explicit, Size = 552)] public new partial struct Internal { [FieldOffset(0)] @@ -7115,63 +7176,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(376)] + [FieldOffset(384)] public bool IsAnonymous; - [FieldOffset(480)] + [FieldOffset(488)] public bool IsPOD; - [FieldOffset(481)] + [FieldOffset(489)] public bool IsAbstract; - [FieldOffset(482)] + [FieldOffset(490)] public bool IsUnion; - [FieldOffset(483)] + [FieldOffset(491)] public bool IsDynamic; - [FieldOffset(484)] + [FieldOffset(492)] public bool IsPolymorphic; - [FieldOffset(485)] + [FieldOffset(493)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(486)] + [FieldOffset(494)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(487)] + [FieldOffset(495)] public bool HasNonTrivialDestructor; - [FieldOffset(488)] + [FieldOffset(496)] public bool IsExternCContext; - [FieldOffset(496)] + [FieldOffset(504)] public global::System.IntPtr Layout; - [FieldOffset(504)] + [FieldOffset(512)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(536)] + [FieldOffset(544)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7204,7 +7268,7 @@ namespace CppSharp private static ClassTemplatePartialSpecialization.Internal* __CopyValue(ClassTemplatePartialSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(544); + var ret = Marshal.AllocHGlobal(552); CppSharp.Parser.AST.ClassTemplatePartialSpecialization.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (ClassTemplatePartialSpecialization.Internal*) ret; } @@ -7223,7 +7287,7 @@ namespace CppSharp public ClassTemplatePartialSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(544); + __Instance = Marshal.AllocHGlobal(552); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7240,7 +7304,7 @@ namespace CppSharp public unsafe partial class FunctionTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 216)] + [StructLayout(LayoutKind.Explicit, Size = 224)] public new partial struct Internal { [FieldOffset(0)] @@ -7256,27 +7320,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -7329,7 +7396,7 @@ namespace CppSharp private static FunctionTemplate.Internal* __CopyValue(FunctionTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(216); + var ret = Marshal.AllocHGlobal(224); CppSharp.Parser.AST.FunctionTemplate.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (FunctionTemplate.Internal*) ret; } @@ -7348,7 +7415,7 @@ namespace CppSharp public FunctionTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(216); + __Instance = Marshal.AllocHGlobal(224); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7563,7 +7630,7 @@ namespace CppSharp public unsafe partial class Namespace : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 384)] + [StructLayout(LayoutKind.Explicit, Size = 392)] public new partial struct Internal { [FieldOffset(0)] @@ -7579,30 +7646,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(376)] + [FieldOffset(384)] public bool IsAnonymous; - [FieldOffset(377)] + [FieldOffset(385)] public bool IsInline; [SuppressUnmanagedCodeSecurity] @@ -7635,7 +7705,7 @@ namespace CppSharp private static Namespace.Internal* __CopyValue(Namespace.Internal native) { - var ret = Marshal.AllocHGlobal(384); + var ret = Marshal.AllocHGlobal(392); CppSharp.Parser.AST.Namespace.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Namespace.Internal*) ret; } @@ -7654,7 +7724,7 @@ namespace CppSharp public Namespace() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(384); + __Instance = Marshal.AllocHGlobal(392); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7684,7 +7754,7 @@ namespace CppSharp public unsafe partial class PreprocessedEntity : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 168)] + [StructLayout(LayoutKind.Explicit, Size = 176)] public new partial struct Internal { [FieldOffset(0)] @@ -7700,27 +7770,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7753,7 +7826,7 @@ namespace CppSharp private static PreprocessedEntity.Internal* __CopyValue(PreprocessedEntity.Internal native) { - var ret = Marshal.AllocHGlobal(168); + var ret = Marshal.AllocHGlobal(176); CppSharp.Parser.AST.PreprocessedEntity.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (PreprocessedEntity.Internal*) ret; } @@ -7772,7 +7845,7 @@ namespace CppSharp public PreprocessedEntity() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(168); + __Instance = Marshal.AllocHGlobal(176); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7802,7 +7875,7 @@ namespace CppSharp public unsafe partial class MacroDefinition : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 192)] + [StructLayout(LayoutKind.Explicit, Size = 200)] public new partial struct Internal { [FieldOffset(0)] @@ -7818,27 +7891,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7881,7 +7957,7 @@ namespace CppSharp private static MacroDefinition.Internal* __CopyValue(MacroDefinition.Internal native) { - var ret = Marshal.AllocHGlobal(192); + var ret = Marshal.AllocHGlobal(200); CppSharp.Parser.AST.MacroDefinition.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (MacroDefinition.Internal*) ret; } @@ -7900,7 +7976,7 @@ namespace CppSharp public MacroDefinition() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(192); + __Instance = Marshal.AllocHGlobal(200); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7934,7 +8010,7 @@ namespace CppSharp public unsafe partial class MacroExpansion : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 200)] + [StructLayout(LayoutKind.Explicit, Size = 208)] public new partial struct Internal { [FieldOffset(0)] @@ -7950,30 +8026,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.MacroLocation MacroLocation; - [FieldOffset(192)] + [FieldOffset(200)] public global::System.IntPtr Definition; [SuppressUnmanagedCodeSecurity] @@ -8016,7 +8095,7 @@ namespace CppSharp private static MacroExpansion.Internal* __CopyValue(MacroExpansion.Internal native) { - var ret = Marshal.AllocHGlobal(200); + var ret = Marshal.AllocHGlobal(208); CppSharp.Parser.AST.MacroExpansion.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (MacroExpansion.Internal*) ret; } @@ -8035,7 +8114,7 @@ namespace CppSharp public MacroExpansion() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(200); + __Instance = Marshal.AllocHGlobal(208); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -8082,7 +8161,7 @@ namespace CppSharp public unsafe partial class TranslationUnit : CppSharp.Parser.AST.Namespace, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 440)] + [StructLayout(LayoutKind.Explicit, Size = 448)] public new partial struct Internal { [FieldOffset(0)] @@ -8098,33 +8177,36 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(48)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(56)] public global::System.IntPtr Comment; - [FieldOffset(80)] + [FieldOffset(88)] public bool IsIncomplete; - [FieldOffset(81)] + [FieldOffset(89)] public bool IsDependent; - [FieldOffset(88)] + [FieldOffset(96)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(96)] + [FieldOffset(104)] public uint DefinitionOrder; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr OriginalPtr; - [FieldOffset(376)] + [FieldOffset(384)] public bool IsAnonymous; - [FieldOffset(377)] + [FieldOffset(385)] public bool IsInline; - [FieldOffset(408)] + [FieldOffset(416)] public bool IsSystemHeader; [SuppressUnmanagedCodeSecurity] @@ -8187,7 +8269,7 @@ namespace CppSharp private static TranslationUnit.Internal* __CopyValue(TranslationUnit.Internal native) { - var ret = Marshal.AllocHGlobal(440); + var ret = Marshal.AllocHGlobal(448); CppSharp.Parser.AST.TranslationUnit.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (TranslationUnit.Internal*) ret; } @@ -8206,7 +8288,7 @@ namespace CppSharp public TranslationUnit() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(440); + __Instance = Marshal.AllocHGlobal(448); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } 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 9241db78..f4c660ab 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs @@ -3030,7 +3030,7 @@ namespace CppSharp public unsafe partial class Declaration : IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 112)] + [StructLayout(LayoutKind.Explicit, Size = 120)] public partial struct Internal { [FieldOffset(0)] @@ -3046,24 +3046,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -3138,7 +3141,7 @@ namespace CppSharp private static Declaration.Internal* __CopyValue(Declaration.Internal native) { - var ret = Marshal.AllocHGlobal(112); + var ret = Marshal.AllocHGlobal(120); CppSharp.Parser.AST.Declaration.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Declaration.Internal*) ret; } @@ -3156,7 +3159,7 @@ namespace CppSharp public Declaration(CppSharp.Parser.AST.DeclarationKind kind) { - __Instance = Marshal.AllocHGlobal(112); + __Instance = Marshal.AllocHGlobal(120); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3290,16 +3293,29 @@ namespace CppSharp } } - public int LineNumber + public int LineNumberStart + { + get + { + return ((Internal*) __Instance)->LineNumberStart; + } + + set + { + ((Internal*) __Instance)->LineNumberStart = value; + } + } + + public int LineNumberEnd { get { - return ((Internal*) __Instance)->LineNumber; + return ((Internal*) __Instance)->LineNumberEnd; } set { - ((Internal*) __Instance)->LineNumber = value; + ((Internal*) __Instance)->LineNumberEnd = value; } } @@ -3384,7 +3400,7 @@ namespace CppSharp public unsafe partial class DeclarationContext : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 360)] + [StructLayout(LayoutKind.Explicit, Size = 368)] public new partial struct Internal { [FieldOffset(0)] @@ -3400,27 +3416,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(352)] + [FieldOffset(360)] public bool IsAnonymous; [SuppressUnmanagedCodeSecurity] @@ -3613,7 +3632,7 @@ namespace CppSharp private static DeclarationContext.Internal* __CopyValue(DeclarationContext.Internal native) { - var ret = Marshal.AllocHGlobal(360); + var ret = Marshal.AllocHGlobal(368); CppSharp.Parser.AST.DeclarationContext.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (DeclarationContext.Internal*) ret; } @@ -3632,7 +3651,7 @@ namespace CppSharp public DeclarationContext(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(360); + __Instance = Marshal.AllocHGlobal(368); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -3879,7 +3898,7 @@ namespace CppSharp public unsafe partial class TypedefDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 128)] + [StructLayout(LayoutKind.Explicit, Size = 136)] public new partial struct Internal { [FieldOffset(0)] @@ -3895,27 +3914,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -3948,7 +3970,7 @@ namespace CppSharp private static TypedefDecl.Internal* __CopyValue(TypedefDecl.Internal native) { - var ret = Marshal.AllocHGlobal(128); + var ret = Marshal.AllocHGlobal(136); CppSharp.Parser.AST.TypedefDecl.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (TypedefDecl.Internal*) ret; } @@ -3967,7 +3989,7 @@ namespace CppSharp public TypedefDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(128); + __Instance = Marshal.AllocHGlobal(136); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -3997,7 +4019,7 @@ namespace CppSharp public unsafe partial class Friend : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 120)] + [StructLayout(LayoutKind.Explicit, Size = 128)] public new partial struct Internal { [FieldOffset(0)] @@ -4013,27 +4035,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public global::System.IntPtr Declaration; [SuppressUnmanagedCodeSecurity] @@ -4066,7 +4091,7 @@ namespace CppSharp private static Friend.Internal* __CopyValue(Friend.Internal native) { - var ret = Marshal.AllocHGlobal(120); + var ret = Marshal.AllocHGlobal(128); CppSharp.Parser.AST.Friend.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Friend.Internal*) ret; } @@ -4085,7 +4110,7 @@ namespace CppSharp public Friend() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(120); + __Instance = Marshal.AllocHGlobal(128); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4316,7 +4341,7 @@ namespace CppSharp public unsafe partial class Parameter : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 144)] + [StructLayout(LayoutKind.Explicit, Size = 152)] public new partial struct Internal { [FieldOffset(0)] @@ -4332,39 +4357,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(128)] + [FieldOffset(136)] public bool IsIndirect; - [FieldOffset(129)] + [FieldOffset(137)] public bool HasDefaultValue; - [FieldOffset(132)] + [FieldOffset(140)] public uint Index; - [FieldOffset(136)] + [FieldOffset(144)] public global::System.IntPtr DefaultArgument; [SuppressUnmanagedCodeSecurity] @@ -4397,7 +4425,7 @@ namespace CppSharp private static Parameter.Internal* __CopyValue(Parameter.Internal native) { - var ret = Marshal.AllocHGlobal(144); + var ret = Marshal.AllocHGlobal(152); CppSharp.Parser.AST.Parameter.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Parameter.Internal*) ret; } @@ -4416,7 +4444,7 @@ namespace CppSharp public Parameter() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(144); + __Instance = Marshal.AllocHGlobal(152); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4498,7 +4526,7 @@ namespace CppSharp public unsafe partial class Function : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 200)] + [StructLayout(LayoutKind.Explicit, Size = 208)] public new partial struct Internal { [FieldOffset(0)] @@ -4514,54 +4542,57 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(128)] + [FieldOffset(136)] public bool IsReturnIndirect; - [FieldOffset(129)] + [FieldOffset(137)] public bool HasThisReturn; - [FieldOffset(130)] + [FieldOffset(138)] public bool IsVariadic; - [FieldOffset(131)] + [FieldOffset(139)] public bool IsInline; - [FieldOffset(132)] + [FieldOffset(140)] public bool IsPure; - [FieldOffset(133)] + [FieldOffset(141)] public bool IsDeleted; - [FieldOffset(136)] + [FieldOffset(144)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(192)] + [FieldOffset(200)] public global::System.IntPtr SpecializationInfo; [SuppressUnmanagedCodeSecurity] @@ -4634,7 +4665,7 @@ namespace CppSharp private static Function.Internal* __CopyValue(Function.Internal native) { - var ret = Marshal.AllocHGlobal(200); + var ret = Marshal.AllocHGlobal(208); CppSharp.Parser.AST.Function.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Function.Internal*) ret; } @@ -4653,7 +4684,7 @@ namespace CppSharp public Function() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(200); + __Instance = Marshal.AllocHGlobal(208); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -4861,7 +4892,7 @@ namespace CppSharp public unsafe partial class Method : CppSharp.Parser.AST.Function, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 240)] + [StructLayout(LayoutKind.Explicit, Size = 248)] public new partial struct Internal { [FieldOffset(0)] @@ -4877,90 +4908,93 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal ReturnType; - [FieldOffset(128)] + [FieldOffset(136)] public bool IsReturnIndirect; - [FieldOffset(129)] + [FieldOffset(137)] public bool HasThisReturn; - [FieldOffset(130)] + [FieldOffset(138)] public bool IsVariadic; - [FieldOffset(131)] + [FieldOffset(139)] public bool IsInline; - [FieldOffset(132)] + [FieldOffset(140)] public bool IsPure; - [FieldOffset(133)] + [FieldOffset(141)] public bool IsDeleted; - [FieldOffset(136)] + [FieldOffset(144)] public CppSharp.Parser.AST.CXXOperatorKind OperatorKind; - [FieldOffset(160)] + [FieldOffset(168)] public CppSharp.Parser.AST.CallingConvention CallingConvention; - [FieldOffset(192)] + [FieldOffset(200)] public global::System.IntPtr SpecializationInfo; - [FieldOffset(200)] + [FieldOffset(208)] public global::System.IntPtr AccessDecl; - [FieldOffset(208)] + [FieldOffset(216)] public bool IsVirtual; - [FieldOffset(209)] + [FieldOffset(217)] public bool IsStatic; - [FieldOffset(210)] + [FieldOffset(218)] public bool IsConst; - [FieldOffset(211)] + [FieldOffset(219)] public bool IsImplicit; - [FieldOffset(212)] + [FieldOffset(220)] public bool IsExplicit; - [FieldOffset(213)] + [FieldOffset(221)] public bool IsOverride; - [FieldOffset(216)] + [FieldOffset(224)] public CppSharp.Parser.AST.CXXMethodKind MethodKind; - [FieldOffset(220)] + [FieldOffset(228)] public bool IsDefaultConstructor; - [FieldOffset(221)] + [FieldOffset(229)] public bool IsCopyConstructor; - [FieldOffset(222)] + [FieldOffset(230)] public bool IsMoveConstructor; - [FieldOffset(224)] + [FieldOffset(232)] public CppSharp.Parser.AST.QualifiedType.Internal ConversionType; [SuppressUnmanagedCodeSecurity] @@ -4993,7 +5027,7 @@ namespace CppSharp private static Method.Internal* __CopyValue(Method.Internal native) { - var ret = Marshal.AllocHGlobal(240); + var ret = Marshal.AllocHGlobal(248); CppSharp.Parser.AST.Method.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Method.Internal*) ret; } @@ -5012,7 +5046,7 @@ namespace CppSharp public Method() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(240); + __Instance = Marshal.AllocHGlobal(248); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5185,7 +5219,7 @@ namespace CppSharp public unsafe partial class Enumeration : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 400)] + [StructLayout(LayoutKind.Explicit, Size = 408)] public new partial struct Internal { [FieldOffset(0)] @@ -5201,36 +5235,39 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(352)] + [FieldOffset(360)] public bool IsAnonymous; - [FieldOffset(356)] + [FieldOffset(364)] public CppSharp.Parser.AST.Enumeration.EnumModifiers Modifiers; - [FieldOffset(360)] + [FieldOffset(368)] public global::System.IntPtr Type; - [FieldOffset(368)] + [FieldOffset(376)] public global::System.IntPtr BuiltinType; [SuppressUnmanagedCodeSecurity] @@ -5279,7 +5316,7 @@ namespace CppSharp public unsafe partial class Item : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 128)] + [StructLayout(LayoutKind.Explicit, Size = 136)] public new partial struct Internal { [FieldOffset(0)] @@ -5295,27 +5332,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; + + [FieldOffset(24)] + public int LineNumberEnd; - [FieldOffset(32)] + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(120)] + [FieldOffset(128)] public ulong Value; [SuppressUnmanagedCodeSecurity] @@ -5358,7 +5398,7 @@ namespace CppSharp private static Item.Internal* __CopyValue(Item.Internal native) { - var ret = Marshal.AllocHGlobal(128); + var ret = Marshal.AllocHGlobal(136); CppSharp.Parser.AST.Enumeration.Item.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Item.Internal*) ret; } @@ -5377,7 +5417,7 @@ namespace CppSharp public Item() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(128); + __Instance = Marshal.AllocHGlobal(136); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5436,7 +5476,7 @@ namespace CppSharp private static Enumeration.Internal* __CopyValue(Enumeration.Internal native) { - var ret = Marshal.AllocHGlobal(400); + var ret = Marshal.AllocHGlobal(408); CppSharp.Parser.AST.Enumeration.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Enumeration.Internal*) ret; } @@ -5455,7 +5495,7 @@ namespace CppSharp public Enumeration() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(400); + __Instance = Marshal.AllocHGlobal(408); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5538,7 +5578,7 @@ namespace CppSharp public unsafe partial class Variable : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 136)] + [StructLayout(LayoutKind.Explicit, Size = 144)] public new partial struct Internal { [FieldOffset(0)] @@ -5554,27 +5594,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(120)] + [FieldOffset(128)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; [SuppressUnmanagedCodeSecurity] @@ -5617,7 +5660,7 @@ namespace CppSharp private static Variable.Internal* __CopyValue(Variable.Internal native) { - var ret = Marshal.AllocHGlobal(136); + var ret = Marshal.AllocHGlobal(144); CppSharp.Parser.AST.Variable.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Variable.Internal*) ret; } @@ -5636,7 +5679,7 @@ namespace CppSharp public Variable() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(136); + __Instance = Marshal.AllocHGlobal(144); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5817,7 +5860,7 @@ namespace CppSharp public unsafe partial class Field : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 152)] + [StructLayout(LayoutKind.Explicit, Size = 160)] public new partial struct Internal { [FieldOffset(0)] @@ -5833,39 +5876,42 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.QualifiedType.Internal QualifiedType; - [FieldOffset(128)] + [FieldOffset(136)] public uint Offset; - [FieldOffset(136)] + [FieldOffset(144)] public global::System.IntPtr Class; - [FieldOffset(144)] + [FieldOffset(152)] public bool IsBitField; - [FieldOffset(148)] + [FieldOffset(156)] public uint BitWidth; [SuppressUnmanagedCodeSecurity] @@ -5898,7 +5944,7 @@ namespace CppSharp private static Field.Internal* __CopyValue(Field.Internal native) { - var ret = Marshal.AllocHGlobal(152); + var ret = Marshal.AllocHGlobal(160); CppSharp.Parser.AST.Field.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Field.Internal*) ret; } @@ -5917,7 +5963,7 @@ namespace CppSharp public Field() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(152); + __Instance = Marshal.AllocHGlobal(160); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -5999,7 +6045,7 @@ namespace CppSharp public unsafe partial class AccessSpecifierDecl : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 112)] + [StructLayout(LayoutKind.Explicit, Size = 120)] public new partial struct Internal { [FieldOffset(0)] @@ -6015,24 +6061,27 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; [SuppressUnmanagedCodeSecurity] @@ -6065,7 +6114,7 @@ namespace CppSharp private static AccessSpecifierDecl.Internal* __CopyValue(AccessSpecifierDecl.Internal native) { - var ret = Marshal.AllocHGlobal(112); + var ret = Marshal.AllocHGlobal(120); CppSharp.Parser.AST.AccessSpecifierDecl.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (AccessSpecifierDecl.Internal*) ret; } @@ -6084,7 +6133,7 @@ namespace CppSharp public AccessSpecifierDecl() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(112); + __Instance = Marshal.AllocHGlobal(120); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6101,7 +6150,7 @@ namespace CppSharp public unsafe partial class Class : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 480)] + [StructLayout(LayoutKind.Explicit, Size = 488)] public new partial struct Internal { [FieldOffset(0)] @@ -6117,57 +6166,60 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(352)] + [FieldOffset(360)] public bool IsAnonymous; - [FieldOffset(456)] + [FieldOffset(464)] public bool IsPOD; - [FieldOffset(457)] + [FieldOffset(465)] public bool IsAbstract; - [FieldOffset(458)] + [FieldOffset(466)] public bool IsUnion; - [FieldOffset(459)] + [FieldOffset(467)] public bool IsDynamic; - [FieldOffset(460)] + [FieldOffset(468)] public bool IsPolymorphic; - [FieldOffset(461)] + [FieldOffset(469)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(462)] + [FieldOffset(470)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(463)] + [FieldOffset(471)] public bool HasNonTrivialDestructor; - [FieldOffset(464)] + [FieldOffset(472)] public bool IsExternCContext; - [FieldOffset(472)] + [FieldOffset(480)] public global::System.IntPtr Layout; [SuppressUnmanagedCodeSecurity] @@ -6280,7 +6332,7 @@ namespace CppSharp private static Class.Internal* __CopyValue(Class.Internal native) { - var ret = Marshal.AllocHGlobal(480); + var ret = Marshal.AllocHGlobal(488); CppSharp.Parser.AST.Class.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Class.Internal*) ret; } @@ -6299,7 +6351,7 @@ namespace CppSharp public Class() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(480); + __Instance = Marshal.AllocHGlobal(488); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6554,7 +6606,7 @@ namespace CppSharp public unsafe partial class Template : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 144)] + [StructLayout(LayoutKind.Explicit, Size = 152)] public new partial struct Internal { [FieldOffset(0)] @@ -6570,27 +6622,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6648,7 +6703,7 @@ namespace CppSharp private static Template.Internal* __CopyValue(Template.Internal native) { - var ret = Marshal.AllocHGlobal(144); + var ret = Marshal.AllocHGlobal(152); CppSharp.Parser.AST.Template.Internal.cctor_2(ret, new global::System.IntPtr(&native)); return (Template.Internal*) ret; } @@ -6667,7 +6722,7 @@ namespace CppSharp public Template(CppSharp.Parser.AST.DeclarationKind kind) : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(144); + __Instance = Marshal.AllocHGlobal(152); __ownsNativeInstance = true; var arg0 = kind; Internal.ctor_0(__Instance, arg0); @@ -6676,7 +6731,7 @@ namespace CppSharp public Template() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(144); + __Instance = Marshal.AllocHGlobal(152); __ownsNativeInstance = true; Internal.ctor_1(__Instance); } @@ -6733,7 +6788,7 @@ namespace CppSharp public unsafe partial class ClassTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 168)] + [StructLayout(LayoutKind.Explicit, Size = 176)] public new partial struct Internal { [FieldOffset(0)] @@ -6749,27 +6804,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -6822,7 +6880,7 @@ namespace CppSharp private static ClassTemplate.Internal* __CopyValue(ClassTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(168); + var ret = Marshal.AllocHGlobal(176); CppSharp.Parser.AST.ClassTemplate.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (ClassTemplate.Internal*) ret; } @@ -6841,7 +6899,7 @@ namespace CppSharp public ClassTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(168); + __Instance = Marshal.AllocHGlobal(176); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -6885,7 +6943,7 @@ namespace CppSharp public unsafe partial class ClassTemplateSpecialization : CppSharp.Parser.AST.Class, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 520)] + [StructLayout(LayoutKind.Explicit, Size = 528)] public new partial struct Internal { [FieldOffset(0)] @@ -6901,63 +6959,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(352)] + [FieldOffset(360)] public bool IsAnonymous; - [FieldOffset(456)] + [FieldOffset(464)] public bool IsPOD; - [FieldOffset(457)] + [FieldOffset(465)] public bool IsAbstract; - [FieldOffset(458)] + [FieldOffset(466)] public bool IsUnion; - [FieldOffset(459)] + [FieldOffset(467)] public bool IsDynamic; - [FieldOffset(460)] + [FieldOffset(468)] public bool IsPolymorphic; - [FieldOffset(461)] + [FieldOffset(469)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(462)] + [FieldOffset(470)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(463)] + [FieldOffset(471)] public bool HasNonTrivialDestructor; - [FieldOffset(464)] + [FieldOffset(472)] public bool IsExternCContext; - [FieldOffset(472)] + [FieldOffset(480)] public global::System.IntPtr Layout; - [FieldOffset(480)] + [FieldOffset(488)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(512)] + [FieldOffset(520)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7010,7 +7071,7 @@ namespace CppSharp private static ClassTemplateSpecialization.Internal* __CopyValue(ClassTemplateSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(520); + var ret = Marshal.AllocHGlobal(528); CppSharp.Parser.AST.ClassTemplateSpecialization.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (ClassTemplateSpecialization.Internal*) ret; } @@ -7029,7 +7090,7 @@ namespace CppSharp public ClassTemplateSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(520); + __Instance = Marshal.AllocHGlobal(528); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7099,7 +7160,7 @@ namespace CppSharp public unsafe partial class ClassTemplatePartialSpecialization : CppSharp.Parser.AST.ClassTemplateSpecialization, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 520)] + [StructLayout(LayoutKind.Explicit, Size = 528)] public new partial struct Internal { [FieldOffset(0)] @@ -7115,63 +7176,66 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(352)] + [FieldOffset(360)] public bool IsAnonymous; - [FieldOffset(456)] + [FieldOffset(464)] public bool IsPOD; - [FieldOffset(457)] + [FieldOffset(465)] public bool IsAbstract; - [FieldOffset(458)] + [FieldOffset(466)] public bool IsUnion; - [FieldOffset(459)] + [FieldOffset(467)] public bool IsDynamic; - [FieldOffset(460)] + [FieldOffset(468)] public bool IsPolymorphic; - [FieldOffset(461)] + [FieldOffset(469)] public bool HasNonTrivialDefaultConstructor; - [FieldOffset(462)] + [FieldOffset(470)] public bool HasNonTrivialCopyConstructor; - [FieldOffset(463)] + [FieldOffset(471)] public bool HasNonTrivialDestructor; - [FieldOffset(464)] + [FieldOffset(472)] public bool IsExternCContext; - [FieldOffset(472)] + [FieldOffset(480)] public global::System.IntPtr Layout; - [FieldOffset(480)] + [FieldOffset(488)] public global::System.IntPtr TemplatedDecl; - [FieldOffset(512)] + [FieldOffset(520)] public CppSharp.Parser.AST.TemplateSpecializationKind SpecializationKind; [SuppressUnmanagedCodeSecurity] @@ -7204,7 +7268,7 @@ namespace CppSharp private static ClassTemplatePartialSpecialization.Internal* __CopyValue(ClassTemplatePartialSpecialization.Internal native) { - var ret = Marshal.AllocHGlobal(520); + var ret = Marshal.AllocHGlobal(528); CppSharp.Parser.AST.ClassTemplatePartialSpecialization.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (ClassTemplatePartialSpecialization.Internal*) ret; } @@ -7223,7 +7287,7 @@ namespace CppSharp public ClassTemplatePartialSpecialization() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(520); + __Instance = Marshal.AllocHGlobal(528); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7240,7 +7304,7 @@ namespace CppSharp public unsafe partial class FunctionTemplate : CppSharp.Parser.AST.Template, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 168)] + [StructLayout(LayoutKind.Explicit, Size = 176)] public new partial struct Internal { [FieldOffset(0)] @@ -7256,27 +7320,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public global::System.IntPtr TemplatedDecl; [SuppressUnmanagedCodeSecurity] @@ -7329,7 +7396,7 @@ namespace CppSharp private static FunctionTemplate.Internal* __CopyValue(FunctionTemplate.Internal native) { - var ret = Marshal.AllocHGlobal(168); + var ret = Marshal.AllocHGlobal(176); CppSharp.Parser.AST.FunctionTemplate.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (FunctionTemplate.Internal*) ret; } @@ -7348,7 +7415,7 @@ namespace CppSharp public FunctionTemplate() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(168); + __Instance = Marshal.AllocHGlobal(176); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7563,7 +7630,7 @@ namespace CppSharp public unsafe partial class Namespace : CppSharp.Parser.AST.DeclarationContext, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 360)] + [StructLayout(LayoutKind.Explicit, Size = 368)] public new partial struct Internal { [FieldOffset(0)] @@ -7579,30 +7646,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(352)] + [FieldOffset(360)] public bool IsAnonymous; - [FieldOffset(353)] + [FieldOffset(361)] public bool IsInline; [SuppressUnmanagedCodeSecurity] @@ -7635,7 +7705,7 @@ namespace CppSharp private static Namespace.Internal* __CopyValue(Namespace.Internal native) { - var ret = Marshal.AllocHGlobal(360); + var ret = Marshal.AllocHGlobal(368); CppSharp.Parser.AST.Namespace.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (Namespace.Internal*) ret; } @@ -7654,7 +7724,7 @@ namespace CppSharp public Namespace() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(360); + __Instance = Marshal.AllocHGlobal(368); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7684,7 +7754,7 @@ namespace CppSharp public unsafe partial class PreprocessedEntity : CppSharp.Parser.AST.Declaration, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 120)] + [StructLayout(LayoutKind.Explicit, Size = 128)] public new partial struct Internal { [FieldOffset(0)] @@ -7700,27 +7770,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7753,7 +7826,7 @@ namespace CppSharp private static PreprocessedEntity.Internal* __CopyValue(PreprocessedEntity.Internal native) { - var ret = Marshal.AllocHGlobal(120); + var ret = Marshal.AllocHGlobal(128); CppSharp.Parser.AST.PreprocessedEntity.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (PreprocessedEntity.Internal*) ret; } @@ -7772,7 +7845,7 @@ namespace CppSharp public PreprocessedEntity() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(120); + __Instance = Marshal.AllocHGlobal(128); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7802,7 +7875,7 @@ namespace CppSharp public unsafe partial class MacroDefinition : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 128)] + [StructLayout(LayoutKind.Explicit, Size = 136)] public new partial struct Internal { [FieldOffset(0)] @@ -7818,27 +7891,30 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.MacroLocation MacroLocation; [SuppressUnmanagedCodeSecurity] @@ -7881,7 +7957,7 @@ namespace CppSharp private static MacroDefinition.Internal* __CopyValue(MacroDefinition.Internal native) { - var ret = Marshal.AllocHGlobal(128); + var ret = Marshal.AllocHGlobal(136); CppSharp.Parser.AST.MacroDefinition.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (MacroDefinition.Internal*) ret; } @@ -7900,7 +7976,7 @@ namespace CppSharp public MacroDefinition() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(128); + __Instance = Marshal.AllocHGlobal(136); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -7934,7 +8010,7 @@ namespace CppSharp public unsafe partial class MacroExpansion : CppSharp.Parser.AST.PreprocessedEntity, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 136)] + [StructLayout(LayoutKind.Explicit, Size = 144)] public new partial struct Internal { [FieldOffset(0)] @@ -7950,30 +8026,33 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(112)] + [FieldOffset(120)] public CppSharp.Parser.AST.MacroLocation MacroLocation; - [FieldOffset(128)] + [FieldOffset(136)] public global::System.IntPtr Definition; [SuppressUnmanagedCodeSecurity] @@ -8016,7 +8095,7 @@ namespace CppSharp private static MacroExpansion.Internal* __CopyValue(MacroExpansion.Internal native) { - var ret = Marshal.AllocHGlobal(136); + var ret = Marshal.AllocHGlobal(144); CppSharp.Parser.AST.MacroExpansion.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (MacroExpansion.Internal*) ret; } @@ -8035,7 +8114,7 @@ namespace CppSharp public MacroExpansion() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(136); + __Instance = Marshal.AllocHGlobal(144); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } @@ -8082,7 +8161,7 @@ namespace CppSharp public unsafe partial class TranslationUnit : CppSharp.Parser.AST.Namespace, IDisposable { - [StructLayout(LayoutKind.Explicit, Size = 400)] + [StructLayout(LayoutKind.Explicit, Size = 408)] public new partial struct Internal { [FieldOffset(0)] @@ -8098,33 +8177,36 @@ namespace CppSharp public CppSharp.Parser.SourceLocation.Internal Location; [FieldOffset(20)] - public int LineNumber; + public int LineNumberStart; - [FieldOffset(32)] + [FieldOffset(24)] + public int LineNumberEnd; + + [FieldOffset(40)] public global::System.IntPtr Comment; - [FieldOffset(48)] + [FieldOffset(56)] public bool IsIncomplete; - [FieldOffset(49)] + [FieldOffset(57)] public bool IsDependent; - [FieldOffset(56)] + [FieldOffset(64)] public global::System.IntPtr CompleteDeclaration; - [FieldOffset(64)] + [FieldOffset(72)] public uint DefinitionOrder; - [FieldOffset(96)] + [FieldOffset(104)] public global::System.IntPtr OriginalPtr; - [FieldOffset(352)] + [FieldOffset(360)] public bool IsAnonymous; - [FieldOffset(353)] + [FieldOffset(361)] public bool IsInline; - [FieldOffset(368)] + [FieldOffset(376)] public bool IsSystemHeader; [SuppressUnmanagedCodeSecurity] @@ -8187,7 +8269,7 @@ namespace CppSharp private static TranslationUnit.Internal* __CopyValue(TranslationUnit.Internal native) { - var ret = Marshal.AllocHGlobal(400); + var ret = Marshal.AllocHGlobal(408); CppSharp.Parser.AST.TranslationUnit.Internal.cctor_1(ret, new global::System.IntPtr(&native)); return (TranslationUnit.Internal*) ret; } @@ -8206,7 +8288,7 @@ namespace CppSharp public TranslationUnit() : this((Internal*) null) { - __Instance = Marshal.AllocHGlobal(400); + __Instance = Marshal.AllocHGlobal(408); __ownsNativeInstance = true; Internal.ctor_0(__Instance); } diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp index 8b238854..8b5cc078 100644 --- a/src/CppParser/Parser.cpp +++ b/src/CppParser/Parser.cpp @@ -2434,20 +2434,7 @@ Friend* Parser::WalkFriend(clang::FriendDecl *FD) if (FriendDecl) { - F->Declaration = WalkDeclarationDef(FriendDecl); - if (F->Declaration) - { - for (auto it = FriendDecl->redecls_begin(); it != FriendDecl->redecls_end(); it++) - { - if (it->getLocation() != FriendDecl->getLocation()) - { - auto DecomposedLoc = C->getSourceManager().getDecomposedLoc(it->getLocation()); - F->Declaration->LineNumber = C->getSourceManager().getLineNumber( - DecomposedLoc.first, DecomposedLoc.second); - break; - } - } - } + F->Declaration = GetDeclarationFromFriend(FriendDecl); } //auto TL = FD->getFriendType()->getTypeLoc(); @@ -2762,8 +2749,11 @@ void Parser::HandleDeclaration(clang::Decl* D, Declaration* Decl) Decl->OriginalPtr = (void*) D; Decl->USR = GetDeclUSR(D); Decl->Location = SourceLocation(D->getLocation().getRawEncoding()); - auto DecomposedLoc = C->getSourceManager().getDecomposedLoc(D->getLocation()); - Decl->LineNumber = C->getSourceManager().getLineNumber(DecomposedLoc.first, DecomposedLoc.second); + auto& SM = C->getSourceManager(); + auto DecomposedLocStart = SM.getDecomposedLoc(D->getLocation()); + Decl->LineNumberStart = SM.getLineNumber(DecomposedLocStart.first, DecomposedLocStart.second); + auto DecomposedLocEnd = SM.getDecomposedLoc(D->getLocEnd()); + Decl->LineNumberEnd = SM.getLineNumber(DecomposedLocEnd.first, DecomposedLocEnd.second); if (Decl->PreprocessedEntities.empty() && !D->isImplicit()) { @@ -3517,3 +3507,34 @@ ParserTargetInfo* Parser::GetTargetInfo() return parserTargetInfo; } + +Declaration* Parser::GetDeclarationFromFriend(clang::NamedDecl* FriendDecl) +{ + Declaration* Decl = WalkDeclarationDef(FriendDecl); + if (!Decl) return nullptr; + + int MinLineNumberStart = std::numeric_limits::max(); + int MinLineNumberEnd = std::numeric_limits::max(); + auto& SM = C->getSourceManager(); + for (auto it = FriendDecl->redecls_begin(); it != FriendDecl->redecls_end(); it++) + { + if (it->getLocation() != FriendDecl->getLocation()) + { + auto DecomposedLocStart = SM.getDecomposedLoc(it->getLocation()); + int NewLineNumberStart = SM.getLineNumber(DecomposedLocStart.first, DecomposedLocStart.second); + auto DecomposedLocEnd = SM.getDecomposedLoc(it->getLocEnd()); + int NewLineNumberEnd = SM.getLineNumber(DecomposedLocEnd.first, DecomposedLocEnd.second); + if (NewLineNumberStart < MinLineNumberStart) + { + MinLineNumberStart = NewLineNumberStart; + MinLineNumberEnd = NewLineNumberEnd; + } + } + } + if (MinLineNumberStart < std::numeric_limits::max()) + { + Decl->LineNumberStart = MinLineNumberStart; + Decl->LineNumberEnd = MinLineNumberEnd; + } + return Decl; +} \ No newline at end of file diff --git a/src/CppParser/Parser.h b/src/CppParser/Parser.h index 39972304..7624a4d1 100644 --- a/src/CppParser/Parser.h +++ b/src/CppParser/Parser.h @@ -144,6 +144,7 @@ private: llvm::object::basic_symbol_iterator Begin, llvm::object::basic_symbol_iterator End, CppSharp::CppParser::NativeLibrary*& NativeLib); + Declaration* GetDeclarationFromFriend(clang::NamedDecl* FriendDecl); }; } } \ No newline at end of file diff --git a/src/Generator.Tests/AST/TestAST.cs b/src/Generator.Tests/AST/TestAST.cs index 1555e3e8..65a5548f 100644 --- a/src/Generator.Tests/AST/TestAST.cs +++ b/src/Generator.Tests/AST/TestAST.cs @@ -237,13 +237,13 @@ namespace CppSharp.Generator.Tests.AST [Test] public void TestLineNumber() { - Assert.AreEqual(63, AstContext.FindClass("HiddenInNamespace").First().LineNumber); + Assert.AreEqual(63, AstContext.FindClass("HiddenInNamespace").First().LineNumberStart); } [Test] public void TestLineNumberOfFriend() { - Assert.AreEqual(83, AstContext.FindFunction("operator+").First().LineNumber); + Assert.AreEqual(83, AstContext.FindFunction("operator+").First().LineNumberStart); } [Test]