Skip to content

Commit ea7023d

Browse files
committed
Remove ParserOptions.Abi since its misleading as it serves no purpose.
1 parent f35bd75 commit ea7023d

File tree

15 files changed

+63
-190
lines changed

15 files changed

+63
-190
lines changed

src/CLI/Generator.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ public void Setup(Driver driver)
135135
{
136136
var parserOptions = driver.ParserOptions;
137137
parserOptions.TargetTriple = triple;
138-
parserOptions.Abi = abi;
139138
parserOptions.Verbose = options.Verbose;
140139

141140
var driverOptions = driver.Options;

src/CppParser/Bindings/CLI/CppParser.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -431,16 +431,6 @@ void CppSharp::Parser::CppParserOptions::CurrentDir::set(System::String^ value)
431431
((::CppSharp::CppParser::CppParserOptions*)NativePtr)->currentDir = clix::marshalString<clix::E_UTF8>(value);
432432
}
433433

434-
CppSharp::Parser::AST::CppAbi CppSharp::Parser::CppParserOptions::Abi::get()
435-
{
436-
return (CppSharp::Parser::AST::CppAbi)((::CppSharp::CppParser::CppParserOptions*)NativePtr)->abi;
437-
}
438-
439-
void CppSharp::Parser::CppParserOptions::Abi::set(CppSharp::Parser::AST::CppAbi value)
440-
{
441-
((::CppSharp::CppParser::CppParserOptions*)NativePtr)->abi = (::CppSharp::CppParser::AST::CppAbi)value;
442-
}
443-
444434
bool CppSharp::Parser::CppParserOptions::NoStandardIncludes::get()
445435
{
446436
return ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->noStandardIncludes;

src/CppParser/Bindings/CLI/CppParser.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ namespace CppSharp
2424
ref class ParserTargetInfo;
2525
namespace AST
2626
{
27-
enum struct CppAbi;
2827
ref class ASTContext;
2928
ref class NativeLibrary;
3029
}
@@ -157,12 +156,6 @@ namespace CppSharp
157156
void set(System::String^);
158157
}
159158

160-
property CppSharp::Parser::AST::CppAbi Abi
161-
{
162-
CppSharp::Parser::AST::CppAbi get();
163-
void set(CppSharp::Parser::AST::CppAbi);
164-
}
165-
166159
property bool NoStandardIncludes
167160
{
168161
bool get();

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47028,7 +47028,7 @@ protected Parser(void* native, bool skipVTables = false)
4702847028

4702947029
public unsafe partial class CppParserOptions : IDisposable
4703047030
{
47031-
[StructLayout(LayoutKind.Explicit, Size = 152)]
47031+
[StructLayout(LayoutKind.Explicit, Size = 148)]
4703247032
public partial struct __Internal
4703347033
{
4703447034
[FieldOffset(0)]
@@ -47071,30 +47071,27 @@ public partial struct __Internal
4707147071
internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C currentDir;
4707247072

4707347073
[FieldOffset(140)]
47074-
internal global::CppSharp.Parser.AST.CppAbi abi;
47075-
47076-
[FieldOffset(144)]
4707747074
internal byte noStandardIncludes;
4707847075

47079-
[FieldOffset(145)]
47076+
[FieldOffset(141)]
4708047077
internal byte noBuiltinIncludes;
4708147078

47082-
[FieldOffset(146)]
47079+
[FieldOffset(142)]
4708347080
internal byte microsoftMode;
4708447081

47085-
[FieldOffset(147)]
47082+
[FieldOffset(143)]
4708647083
internal byte verbose;
4708747084

47088-
[FieldOffset(148)]
47085+
[FieldOffset(144)]
4708947086
internal byte unityBuild;
4709047087

47091-
[FieldOffset(149)]
47088+
[FieldOffset(145)]
4709247089
internal byte skipPrivateDeclarations;
4709347090

47094-
[FieldOffset(150)]
47091+
[FieldOffset(146)]
4709547092
internal byte skipLayoutInfo;
4709647093

47097-
[FieldOffset(151)]
47094+
[FieldOffset(147)]
4709847095
internal byte skipFunctionBodies;
4709947096

4710047097
[SuppressUnmanagedCodeSecurity]
@@ -47556,19 +47553,6 @@ public string CurrentDir
4755647553
}
4755747554
}
4755847555

47559-
public global::CppSharp.Parser.AST.CppAbi Abi
47560-
{
47561-
get
47562-
{
47563-
return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->abi;
47564-
}
47565-
47566-
set
47567-
{
47568-
((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->abi = value;
47569-
}
47570-
}
47571-
4757247556
public bool NoStandardIncludes
4757347557
{
4757447558
get

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47028,7 +47028,7 @@ protected Parser(void* native, bool skipVTables = false)
4702847028

4702947029
public unsafe partial class CppParserOptions : IDisposable
4703047030
{
47031-
[StructLayout(LayoutKind.Explicit, Size = 188)]
47031+
[StructLayout(LayoutKind.Explicit, Size = 184)]
4703247032
public partial struct __Internal
4703347033
{
4703447034
[FieldOffset(0)]
@@ -47071,30 +47071,27 @@ public partial struct __Internal
4707147071
internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C currentDir;
4707247072

4707347073
[FieldOffset(176)]
47074-
internal global::CppSharp.Parser.AST.CppAbi abi;
47075-
47076-
[FieldOffset(180)]
4707747074
internal byte noStandardIncludes;
4707847075

47079-
[FieldOffset(181)]
47076+
[FieldOffset(177)]
4708047077
internal byte noBuiltinIncludes;
4708147078

47082-
[FieldOffset(182)]
47079+
[FieldOffset(178)]
4708347080
internal byte microsoftMode;
4708447081

47085-
[FieldOffset(183)]
47082+
[FieldOffset(179)]
4708647083
internal byte verbose;
4708747084

47088-
[FieldOffset(184)]
47085+
[FieldOffset(180)]
4708947086
internal byte unityBuild;
4709047087

47091-
[FieldOffset(185)]
47088+
[FieldOffset(181)]
4709247089
internal byte skipPrivateDeclarations;
4709347090

47094-
[FieldOffset(186)]
47091+
[FieldOffset(182)]
4709547092
internal byte skipLayoutInfo;
4709647093

47097-
[FieldOffset(187)]
47094+
[FieldOffset(183)]
4709847095
internal byte skipFunctionBodies;
4709947096

4710047097
[SuppressUnmanagedCodeSecurity]
@@ -47556,19 +47553,6 @@ public string CurrentDir
4755647553
}
4755747554
}
4755847555

47559-
public global::CppSharp.Parser.AST.CppAbi Abi
47560-
{
47561-
get
47562-
{
47563-
return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->abi;
47564-
}
47565-
47566-
set
47567-
{
47568-
((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->abi = value;
47569-
}
47570-
}
47571-
4757247556
public bool NoStandardIncludes
4757347557
{
4757447558
get

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47027,7 +47027,7 @@ protected Parser(void* native, bool skipVTables = false)
4702747027

4702847028
public unsafe partial class CppParserOptions : IDisposable
4702947029
{
47030-
[StructLayout(LayoutKind.Explicit, Size = 296)]
47030+
[StructLayout(LayoutKind.Explicit, Size = 288)]
4703147031
public partial struct __Internal
4703247032
{
4703347033
[FieldOffset(0)]
@@ -47070,30 +47070,27 @@ public partial struct __Internal
4707047070
internal global::Std.BasicString.__Internalc__N_std_N___1_S_basic_string__C___N_std_N___1_S_char_traits__C___N_std_N___1_S_allocator__C currentDir;
4707147071

4707247072
[FieldOffset(280)]
47073-
internal global::CppSharp.Parser.AST.CppAbi abi;
47074-
47075-
[FieldOffset(284)]
4707647073
internal byte noStandardIncludes;
4707747074

47078-
[FieldOffset(285)]
47075+
[FieldOffset(281)]
4707947076
internal byte noBuiltinIncludes;
4708047077

47081-
[FieldOffset(286)]
47078+
[FieldOffset(282)]
4708247079
internal byte microsoftMode;
4708347080

47084-
[FieldOffset(287)]
47081+
[FieldOffset(283)]
4708547082
internal byte verbose;
4708647083

47087-
[FieldOffset(288)]
47084+
[FieldOffset(284)]
4708847085
internal byte unityBuild;
4708947086

47090-
[FieldOffset(289)]
47087+
[FieldOffset(285)]
4709147088
internal byte skipPrivateDeclarations;
4709247089

47093-
[FieldOffset(290)]
47090+
[FieldOffset(286)]
4709447091
internal byte skipLayoutInfo;
4709547092

47096-
[FieldOffset(291)]
47093+
[FieldOffset(287)]
4709747094
internal byte skipFunctionBodies;
4709847095

4709947096
[SuppressUnmanagedCodeSecurity]
@@ -47555,19 +47552,6 @@ public string CurrentDir
4755547552
}
4755647553
}
4755747554

47558-
public global::CppSharp.Parser.AST.CppAbi Abi
47559-
{
47560-
get
47561-
{
47562-
return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->abi;
47563-
}
47564-
47565-
set
47566-
{
47567-
((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->abi = value;
47568-
}
47569-
}
47570-
4757147555
public bool NoStandardIncludes
4757247556
{
4757347557
get

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47027,7 +47027,7 @@ protected Parser(void* native, bool skipVTables = false)
4702747027

4702847028
public unsafe partial class CppParserOptions : IDisposable
4702947029
{
47030-
[StructLayout(LayoutKind.Explicit, Size = 320)]
47030+
[StructLayout(LayoutKind.Explicit, Size = 312)]
4703147031
public partial struct __Internal
4703247032
{
4703347033
[FieldOffset(0)]
@@ -47070,30 +47070,27 @@ public partial struct __Internal
4707047070
internal global::Std.BasicString.__Internalc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C currentDir;
4707147071

4707247072
[FieldOffset(304)]
47073-
internal global::CppSharp.Parser.AST.CppAbi abi;
47074-
47075-
[FieldOffset(308)]
4707647073
internal byte noStandardIncludes;
4707747074

47078-
[FieldOffset(309)]
47075+
[FieldOffset(305)]
4707947076
internal byte noBuiltinIncludes;
4708047077

47081-
[FieldOffset(310)]
47078+
[FieldOffset(306)]
4708247079
internal byte microsoftMode;
4708347080

47084-
[FieldOffset(311)]
47081+
[FieldOffset(307)]
4708547082
internal byte verbose;
4708647083

47087-
[FieldOffset(312)]
47084+
[FieldOffset(308)]
4708847085
internal byte unityBuild;
4708947086

47090-
[FieldOffset(313)]
47087+
[FieldOffset(309)]
4709147088
internal byte skipPrivateDeclarations;
4709247089

47093-
[FieldOffset(314)]
47090+
[FieldOffset(310)]
4709447091
internal byte skipLayoutInfo;
4709547092

47096-
[FieldOffset(315)]
47093+
[FieldOffset(311)]
4709747094
internal byte skipFunctionBodies;
4709847095

4709947096
[SuppressUnmanagedCodeSecurity]
@@ -47555,19 +47552,6 @@ public string CurrentDir
4755547552
}
4755647553
}
4755747554

47558-
public global::CppSharp.Parser.AST.CppAbi Abi
47559-
{
47560-
get
47561-
{
47562-
return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->abi;
47563-
}
47564-
47565-
set
47566-
{
47567-
((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->abi = value;
47568-
}
47569-
}
47570-
4757147555
public bool NoStandardIncludes
4757247556
{
4757347557
get

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47027,7 +47027,7 @@ protected Parser(void* native, bool skipVTables = false)
4702747027

4702847028
public unsafe partial class CppParserOptions : IDisposable
4702947029
{
47030-
[StructLayout(LayoutKind.Explicit, Size = 248)]
47030+
[StructLayout(LayoutKind.Explicit, Size = 240)]
4703147031
public partial struct __Internal
4703247032
{
4703347033
[FieldOffset(0)]
@@ -47070,30 +47070,27 @@ public partial struct __Internal
4707047070
internal global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C currentDir;
4707147071

4707247072
[FieldOffset(232)]
47073-
internal global::CppSharp.Parser.AST.CppAbi abi;
47074-
47075-
[FieldOffset(236)]
4707647073
internal byte noStandardIncludes;
4707747074

47078-
[FieldOffset(237)]
47075+
[FieldOffset(233)]
4707947076
internal byte noBuiltinIncludes;
4708047077

47081-
[FieldOffset(238)]
47078+
[FieldOffset(234)]
4708247079
internal byte microsoftMode;
4708347080

47084-
[FieldOffset(239)]
47081+
[FieldOffset(235)]
4708547082
internal byte verbose;
4708647083

47087-
[FieldOffset(240)]
47084+
[FieldOffset(236)]
4708847085
internal byte unityBuild;
4708947086

47090-
[FieldOffset(241)]
47087+
[FieldOffset(237)]
4709147088
internal byte skipPrivateDeclarations;
4709247089

47093-
[FieldOffset(242)]
47090+
[FieldOffset(238)]
4709447091
internal byte skipLayoutInfo;
4709547092

47096-
[FieldOffset(243)]
47093+
[FieldOffset(239)]
4709747094
internal byte skipFunctionBodies;
4709847095

4709947096
[SuppressUnmanagedCodeSecurity]
@@ -47555,19 +47552,6 @@ public string CurrentDir
4755547552
}
4755647553
}
4755747554

47558-
public global::CppSharp.Parser.AST.CppAbi Abi
47559-
{
47560-
get
47561-
{
47562-
return ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->abi;
47563-
}
47564-
47565-
set
47566-
{
47567-
((global::CppSharp.Parser.CppParserOptions.__Internal*)__Instance)->abi = value;
47568-
}
47569-
}
47570-
4757147555
public bool NoStandardIncludes
4757247556
{
4757347557
get

0 commit comments

Comments
 (0)