Skip to content

Commit 450a26a

Browse files
ddobrevddobrev
committed
Revert "Removed an unused field and redundant parameters from the parser."
This reverts commit 51a109d. # Conflicts: # src/CppParser/CppParser.cpp # src/CppParser/CppParser.h # src/CppParser/Parser.cpp # src/CppParser/Parser.h Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent 254cc0d commit 450a26a

File tree

10 files changed

+425
-8
lines changed

10 files changed

+425
-8
lines changed

‎src/CppParser/Bindings/CLI/CppParser.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace CppSharp
1818
enum struct SourceLocationKind;
1919
ref class ClangParser;
2020
ref class CppParserOptions;
21+
ref class Parser;
2122
ref class ParserDiagnostic;
2223
ref class ParserResult;
2324
ref class ParserTargetInfo;

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

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17899,6 +17899,53 @@ public enum SourceLocationKind
1789917899
User = 4
1790017900
}
1790117901

17902+
public unsafe partial class Parser
17903+
{
17904+
[StructLayout(LayoutKind.Explicit, Size = 0)]
17905+
public partial struct __Internal
17906+
{
17907+
}
17908+
17909+
public global::System.IntPtr __Instance { get; protected set; }
17910+
17911+
protected int __PointerAdjustment;
17912+
internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser>();
17913+
protected void*[] __OriginalVTables;
17914+
17915+
protected bool __ownsNativeInstance;
17916+
17917+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
17918+
{
17919+
return new global::CppSharp.Parser.Parser(native.ToPointer(), skipVTables);
17920+
}
17921+
17922+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17923+
{
17924+
return new global::CppSharp.Parser.Parser(native, skipVTables);
17925+
}
17926+
17927+
private static void* __CopyValue(global::CppSharp.Parser.Parser.__Internal native)
17928+
{
17929+
var ret = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.Parser.__Internal));
17930+
*(global::CppSharp.Parser.Parser.__Internal*) ret = native;
17931+
return ret.ToPointer();
17932+
}
17933+
17934+
private Parser(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17935+
: this(__CopyValue(native), skipVTables)
17936+
{
17937+
__ownsNativeInstance = true;
17938+
NativeToManagedMap[__Instance] = this;
17939+
}
17940+
17941+
protected Parser(void* native, bool skipVTables = false)
17942+
{
17943+
if (native == null)
17944+
return;
17945+
__Instance = new global::System.IntPtr(native);
17946+
}
17947+
}
17948+
1790217949
public unsafe partial class CppParserOptions : IDisposable
1790317950
{
1790417951
[StructLayout(LayoutKind.Explicit, Size = 148)]
@@ -18751,7 +18798,7 @@ public int ColumnNumber
1875118798

1875218799
public unsafe partial class ParserResult : IDisposable
1875318800
{
18754-
[StructLayout(LayoutKind.Explicit, Size = 24)]
18801+
[StructLayout(LayoutKind.Explicit, Size = 28)]
1875518802
public partial struct __Internal
1875618803
{
1875718804
[FieldOffset(0)]
@@ -18766,6 +18813,9 @@ public partial struct __Internal
1876618813
[FieldOffset(20)]
1876718814
internal global::System.IntPtr targetInfo;
1876818815

18816+
[FieldOffset(24)]
18817+
internal global::System.IntPtr codeParser;
18818+
1876918819
[SuppressUnmanagedCodeSecurity]
1877018820
[DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
1877118821
EntryPoint="_ZN8CppSharp9CppParser12ParserResultC2Ev")]
@@ -18947,6 +18997,24 @@ public void ClearDiagnostics()
1894718997
}
1894818998
}
1894918999

19000+
public global::CppSharp.Parser.Parser CodeParser
19001+
{
19002+
get
19003+
{
19004+
global::CppSharp.Parser.Parser __result0;
19005+
if (((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser == IntPtr.Zero) __result0 = null;
19006+
else if (global::CppSharp.Parser.Parser.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser))
19007+
__result0 = (global::CppSharp.Parser.Parser) global::CppSharp.Parser.Parser.NativeToManagedMap[((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser];
19008+
else __result0 = global::CppSharp.Parser.Parser.__CreateInstance(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser);
19009+
return __result0;
19010+
}
19011+
19012+
set
19013+
{
19014+
((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
19015+
}
19016+
}
19017+
1895019018
public uint DiagnosticsCount
1895119019
{
1895219020
get

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

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17899,6 +17899,53 @@ public enum SourceLocationKind
1789917899
User = 4
1790017900
}
1790117901

17902+
public unsafe partial class Parser
17903+
{
17904+
[StructLayout(LayoutKind.Explicit, Size = 0)]
17905+
public partial struct __Internal
17906+
{
17907+
}
17908+
17909+
public global::System.IntPtr __Instance { get; protected set; }
17910+
17911+
protected int __PointerAdjustment;
17912+
internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser>();
17913+
protected void*[] __OriginalVTables;
17914+
17915+
protected bool __ownsNativeInstance;
17916+
17917+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
17918+
{
17919+
return new global::CppSharp.Parser.Parser(native.ToPointer(), skipVTables);
17920+
}
17921+
17922+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17923+
{
17924+
return new global::CppSharp.Parser.Parser(native, skipVTables);
17925+
}
17926+
17927+
private static void* __CopyValue(global::CppSharp.Parser.Parser.__Internal native)
17928+
{
17929+
var ret = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.Parser.__Internal));
17930+
*(global::CppSharp.Parser.Parser.__Internal*) ret = native;
17931+
return ret.ToPointer();
17932+
}
17933+
17934+
private Parser(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17935+
: this(__CopyValue(native), skipVTables)
17936+
{
17937+
__ownsNativeInstance = true;
17938+
NativeToManagedMap[__Instance] = this;
17939+
}
17940+
17941+
protected Parser(void* native, bool skipVTables = false)
17942+
{
17943+
if (native == null)
17944+
return;
17945+
__Instance = new global::System.IntPtr(native);
17946+
}
17947+
}
17948+
1790217949
public unsafe partial class CppParserOptions : IDisposable
1790317950
{
1790417951
[StructLayout(LayoutKind.Explicit, Size = 184)]
@@ -18751,7 +18798,7 @@ public int ColumnNumber
1875118798

1875218799
public unsafe partial class ParserResult : IDisposable
1875318800
{
18754-
[StructLayout(LayoutKind.Explicit, Size = 24)]
18801+
[StructLayout(LayoutKind.Explicit, Size = 28)]
1875518802
public partial struct __Internal
1875618803
{
1875718804
[FieldOffset(0)]
@@ -18766,6 +18813,9 @@ public partial struct __Internal
1876618813
[FieldOffset(20)]
1876718814
internal global::System.IntPtr targetInfo;
1876818815

18816+
[FieldOffset(24)]
18817+
internal global::System.IntPtr codeParser;
18818+
1876918819
[SuppressUnmanagedCodeSecurity]
1877018820
[DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
1877118821
EntryPoint="??0ParserResult@CppParser@CppSharp@@QAE@XZ")]
@@ -18947,6 +18997,24 @@ public void ClearDiagnostics()
1894718997
}
1894818998
}
1894918999

19000+
public global::CppSharp.Parser.Parser CodeParser
19001+
{
19002+
get
19003+
{
19004+
global::CppSharp.Parser.Parser __result0;
19005+
if (((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser == IntPtr.Zero) __result0 = null;
19006+
else if (global::CppSharp.Parser.Parser.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser))
19007+
__result0 = (global::CppSharp.Parser.Parser) global::CppSharp.Parser.Parser.NativeToManagedMap[((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser];
19008+
else __result0 = global::CppSharp.Parser.Parser.__CreateInstance(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser);
19009+
return __result0;
19010+
}
19011+
19012+
set
19013+
{
19014+
((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
19015+
}
19016+
}
19017+
1895019018
public uint DiagnosticsCount
1895119019
{
1895219020
get

‎src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17898,6 +17898,53 @@ public enum SourceLocationKind
1789817898
User = 4
1789917899
}
1790017900

17901+
public unsafe partial class Parser
17902+
{
17903+
[StructLayout(LayoutKind.Explicit, Size = 0)]
17904+
public partial struct __Internal
17905+
{
17906+
}
17907+
17908+
public global::System.IntPtr __Instance { get; protected set; }
17909+
17910+
protected int __PointerAdjustment;
17911+
internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser>();
17912+
protected void*[] __OriginalVTables;
17913+
17914+
protected bool __ownsNativeInstance;
17915+
17916+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
17917+
{
17918+
return new global::CppSharp.Parser.Parser(native.ToPointer(), skipVTables);
17919+
}
17920+
17921+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17922+
{
17923+
return new global::CppSharp.Parser.Parser(native, skipVTables);
17924+
}
17925+
17926+
private static void* __CopyValue(global::CppSharp.Parser.Parser.__Internal native)
17927+
{
17928+
var ret = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.Parser.__Internal));
17929+
*(global::CppSharp.Parser.Parser.__Internal*) ret = native;
17930+
return ret.ToPointer();
17931+
}
17932+
17933+
private Parser(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17934+
: this(__CopyValue(native), skipVTables)
17935+
{
17936+
__ownsNativeInstance = true;
17937+
NativeToManagedMap[__Instance] = this;
17938+
}
17939+
17940+
protected Parser(void* native, bool skipVTables = false)
17941+
{
17942+
if (native == null)
17943+
return;
17944+
__Instance = new global::System.IntPtr(native);
17945+
}
17946+
}
17947+
1790117948
public unsafe partial class CppParserOptions : IDisposable
1790217949
{
1790317950
[StructLayout(LayoutKind.Explicit, Size = 288)]
@@ -18750,7 +18797,7 @@ public int ColumnNumber
1875018797

1875118798
public unsafe partial class ParserResult : IDisposable
1875218799
{
18753-
[StructLayout(LayoutKind.Explicit, Size = 48)]
18800+
[StructLayout(LayoutKind.Explicit, Size = 56)]
1875418801
public partial struct __Internal
1875518802
{
1875618803
[FieldOffset(0)]
@@ -18765,6 +18812,9 @@ public partial struct __Internal
1876518812
[FieldOffset(40)]
1876618813
internal global::System.IntPtr targetInfo;
1876718814

18815+
[FieldOffset(48)]
18816+
internal global::System.IntPtr codeParser;
18817+
1876818818
[SuppressUnmanagedCodeSecurity]
1876918819
[DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
1877018820
EntryPoint="_ZN8CppSharp9CppParser12ParserResultC2Ev")]
@@ -18946,6 +18996,24 @@ public void ClearDiagnostics()
1894618996
}
1894718997
}
1894818998

18999+
public global::CppSharp.Parser.Parser CodeParser
19000+
{
19001+
get
19002+
{
19003+
global::CppSharp.Parser.Parser __result0;
19004+
if (((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser == IntPtr.Zero) __result0 = null;
19005+
else if (global::CppSharp.Parser.Parser.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser))
19006+
__result0 = (global::CppSharp.Parser.Parser) global::CppSharp.Parser.Parser.NativeToManagedMap[((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser];
19007+
else __result0 = global::CppSharp.Parser.Parser.__CreateInstance(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser);
19008+
return __result0;
19009+
}
19010+
19011+
set
19012+
{
19013+
((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
19014+
}
19015+
}
19016+
1894919017
public uint DiagnosticsCount
1895019018
{
1895119019
get

‎src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17898,6 +17898,53 @@ public enum SourceLocationKind
1789817898
User = 4
1789917899
}
1790017900

17901+
public unsafe partial class Parser
17902+
{
17903+
[StructLayout(LayoutKind.Explicit, Size = 0)]
17904+
public partial struct __Internal
17905+
{
17906+
}
17907+
17908+
public global::System.IntPtr __Instance { get; protected set; }
17909+
17910+
protected int __PointerAdjustment;
17911+
internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::CppSharp.Parser.Parser>();
17912+
protected void*[] __OriginalVTables;
17913+
17914+
protected bool __ownsNativeInstance;
17915+
17916+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
17917+
{
17918+
return new global::CppSharp.Parser.Parser(native.ToPointer(), skipVTables);
17919+
}
17920+
17921+
internal static global::CppSharp.Parser.Parser __CreateInstance(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17922+
{
17923+
return new global::CppSharp.Parser.Parser(native, skipVTables);
17924+
}
17925+
17926+
private static void* __CopyValue(global::CppSharp.Parser.Parser.__Internal native)
17927+
{
17928+
var ret = Marshal.AllocHGlobal(sizeof(global::CppSharp.Parser.Parser.__Internal));
17929+
*(global::CppSharp.Parser.Parser.__Internal*) ret = native;
17930+
return ret.ToPointer();
17931+
}
17932+
17933+
private Parser(global::CppSharp.Parser.Parser.__Internal native, bool skipVTables = false)
17934+
: this(__CopyValue(native), skipVTables)
17935+
{
17936+
__ownsNativeInstance = true;
17937+
NativeToManagedMap[__Instance] = this;
17938+
}
17939+
17940+
protected Parser(void* native, bool skipVTables = false)
17941+
{
17942+
if (native == null)
17943+
return;
17944+
__Instance = new global::System.IntPtr(native);
17945+
}
17946+
}
17947+
1790117948
public unsafe partial class CppParserOptions : IDisposable
1790217949
{
1790317950
[StructLayout(LayoutKind.Explicit, Size = 312)]
@@ -18750,7 +18797,7 @@ public int ColumnNumber
1875018797

1875118798
public unsafe partial class ParserResult : IDisposable
1875218799
{
18753-
[StructLayout(LayoutKind.Explicit, Size = 48)]
18800+
[StructLayout(LayoutKind.Explicit, Size = 56)]
1875418801
public partial struct __Internal
1875518802
{
1875618803
[FieldOffset(0)]
@@ -18765,6 +18812,9 @@ public partial struct __Internal
1876518812
[FieldOffset(40)]
1876618813
internal global::System.IntPtr targetInfo;
1876718814

18815+
[FieldOffset(48)]
18816+
internal global::System.IntPtr codeParser;
18817+
1876818818
[SuppressUnmanagedCodeSecurity]
1876918819
[DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
1877018820
EntryPoint="_ZN8CppSharp9CppParser12ParserResultC2Ev")]
@@ -18946,6 +18996,24 @@ public void ClearDiagnostics()
1894618996
}
1894718997
}
1894818998

18999+
public global::CppSharp.Parser.Parser CodeParser
19000+
{
19001+
get
19002+
{
19003+
global::CppSharp.Parser.Parser __result0;
19004+
if (((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser == IntPtr.Zero) __result0 = null;
19005+
else if (global::CppSharp.Parser.Parser.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser))
19006+
__result0 = (global::CppSharp.Parser.Parser) global::CppSharp.Parser.Parser.NativeToManagedMap[((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser];
19007+
else __result0 = global::CppSharp.Parser.Parser.__CreateInstance(((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser);
19008+
return __result0;
19009+
}
19010+
19011+
set
19012+
{
19013+
((global::CppSharp.Parser.ParserResult.__Internal*) __Instance)->codeParser = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
19014+
}
19015+
}
19016+
1894919017
public uint DiagnosticsCount
1895019018
{
1895119019
get

0 commit comments

Comments
 (0)