Skip to content

Commit 3ea7e97

Browse files
committed
Re-generated the parser bindings and bootstrap code.
1 parent e0875c7 commit 3ea7e97

File tree

15 files changed

+13357
-16183
lines changed

15 files changed

+13357
-16183
lines changed

src/AST/Stmt.cs

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ public Stmt()
149149
public SourceRange SourceRange { get; set; }
150150
public SourceLocation BeginLoc { get; set; }
151151
public SourceLocation EndLoc { get; set; }
152-
public Stmt StripLabelLikeStatements { get; set; }
153152

154153
public abstract T Visit<T>(IStmtVisitor<T> visitor);
155154
}

src/CppParser/Bindings/CLI/Stmt.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,6 @@ void CppSharp::Parser::AST::Stmt::EndLoc::set(CppSharp::Parser::SourceLocation v
113113
((::CppSharp::CppParser::AST::Stmt*)NativePtr)->endLoc = _marshal0;
114114
}
115115

116-
CppSharp::Parser::AST::Stmt^ CppSharp::Parser::AST::Stmt::StripLabelLikeStatements::get()
117-
{
118-
return (((::CppSharp::CppParser::AST::Stmt*)NativePtr)->stripLabelLikeStatements == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::Stmt((::CppSharp::CppParser::AST::Stmt*)((::CppSharp::CppParser::AST::Stmt*)NativePtr)->stripLabelLikeStatements);
119-
}
120-
121-
void CppSharp::Parser::AST::Stmt::StripLabelLikeStatements::set(CppSharp::Parser::AST::Stmt^ value)
122-
{
123-
((::CppSharp::CppParser::AST::Stmt*)NativePtr)->stripLabelLikeStatements = (::CppSharp::CppParser::AST::Stmt*)value->NativePtr;
124-
}
125-
126116
CppSharp::Parser::AST::DeclStmt::DeclStmt(::CppSharp::CppParser::AST::DeclStmt* native)
127117
: CppSharp::Parser::AST::Stmt((::CppSharp::CppParser::AST::Stmt*)native)
128118
{

src/CppParser/Bindings/CLI/Stmt.h

-6
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,6 @@ namespace CppSharp
239239
void set(CppSharp::Parser::SourceLocation);
240240
}
241241

242-
property CppSharp::Parser::AST::Stmt^ StripLabelLikeStatements
243-
{
244-
CppSharp::Parser::AST::Stmt^ get();
245-
void set(CppSharp::Parser::AST::Stmt^);
246-
}
247-
248242
static operator CppSharp::Parser::AST::Stmt^(CppSharp::Parser::AST::StmtClass klass);
249243

250244
protected:

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

+2,214-2,640
Large diffs are not rendered by default.

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

+2,210-2,636
Large diffs are not rendered by default.

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

+2,234-2,660
Large diffs are not rendered by default.

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

+2,233-2,659
Large diffs are not rendered by default.

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

+2,233-2,659
Large diffs are not rendered by default.

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

+2,233-2,659
Large diffs are not rendered by default.

src/CppParser/ParseExpr.cpp

-95
Large diffs are not rendered by default.

src/CppParser/ParseStmt.cpp

-30
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
2626
{
2727
auto S = const_cast<clang::DeclStmt*>(llvm::cast<clang::DeclStmt>(Stmt));
2828
auto _S = new AST::DeclStmt();
29-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
3029
_S->isSingleDecl = S->isSingleDecl();
3130
if (S->isSingleDecl())
3231
_S->singleDecl = static_cast<AST::Declaration*>(WalkDeclaration(S->getSingleDecl()));
@@ -42,7 +41,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
4241
{
4342
auto S = const_cast<clang::NullStmt*>(llvm::cast<clang::NullStmt>(Stmt));
4443
auto _S = new AST::NullStmt();
45-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
4644
_S->hasLeadingEmptyMacro = S->hasLeadingEmptyMacro();
4745
_Stmt = _S;
4846
break;
@@ -51,7 +49,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
5149
{
5250
auto S = const_cast<clang::CompoundStmt*>(llvm::cast<clang::CompoundStmt>(Stmt));
5351
auto _S = new AST::CompoundStmt();
54-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
5552
_S->body_empty = S->body_empty();
5653
_S->size = S->size();
5754
_S->body_front = static_cast<AST::Stmt*>(WalkStatement(S->body_front()));
@@ -68,7 +65,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
6865
{
6966
auto S = const_cast<clang::CaseStmt*>(llvm::cast<clang::CaseStmt>(Stmt));
7067
auto _S = new AST::CaseStmt();
71-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
7268
_S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
7369
_S->lHS = static_cast<AST::Expr*>(WalkExpression(S->getLHS()));
7470
_S->rHS = static_cast<AST::Expr*>(WalkExpression(S->getRHS()));
@@ -81,7 +77,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
8177
{
8278
auto S = const_cast<clang::DefaultStmt*>(llvm::cast<clang::DefaultStmt>(Stmt));
8379
auto _S = new AST::DefaultStmt();
84-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
8580
_S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
8681
_S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
8782
_Stmt = _S;
@@ -91,7 +86,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
9186
{
9287
auto S = const_cast<clang::LabelStmt*>(llvm::cast<clang::LabelStmt>(Stmt));
9388
auto _S = new AST::LabelStmt();
94-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
9589
_S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
9690
_S->name = S->getName();
9791
_Stmt = _S;
@@ -101,7 +95,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
10195
{
10296
auto S = const_cast<clang::AttributedStmt*>(llvm::cast<clang::AttributedStmt>(Stmt));
10397
auto _S = new AST::AttributedStmt();
104-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
10598
_S->subStmt = static_cast<AST::Stmt*>(WalkStatement(S->getSubStmt()));
10699
_Stmt = _S;
107100
break;
@@ -110,7 +103,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
110103
{
111104
auto S = const_cast<clang::IfStmt*>(llvm::cast<clang::IfStmt>(Stmt));
112105
auto _S = new AST::IfStmt();
113-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
114106
_S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
115107
_S->then = static_cast<AST::Stmt*>(WalkStatement(S->getThen()));
116108
_S->_else = static_cast<AST::Stmt*>(WalkStatement(S->getElse()));
@@ -128,7 +120,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
128120
{
129121
auto S = const_cast<clang::SwitchStmt*>(llvm::cast<clang::SwitchStmt>(Stmt));
130122
auto _S = new AST::SwitchStmt();
131-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
132123
_S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
133124
_S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
134125
_S->init = static_cast<AST::Stmt*>(WalkStatement(S->getInit()));
@@ -143,7 +134,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
143134
{
144135
auto S = const_cast<clang::WhileStmt*>(llvm::cast<clang::WhileStmt>(Stmt));
145136
auto _S = new AST::WhileStmt();
146-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
147137
_S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
148138
_S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
149139
_S->hasVarStorage = S->hasVarStorage();
@@ -155,7 +145,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
155145
{
156146
auto S = const_cast<clang::DoStmt*>(llvm::cast<clang::DoStmt>(Stmt));
157147
auto _S = new AST::DoStmt();
158-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
159148
_S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
160149
_S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
161150
_Stmt = _S;
@@ -165,7 +154,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
165154
{
166155
auto S = const_cast<clang::ForStmt*>(llvm::cast<clang::ForStmt>(Stmt));
167156
auto _S = new AST::ForStmt();
168-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
169157
_S->init = static_cast<AST::Stmt*>(WalkStatement(S->getInit()));
170158
_S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
171159
_S->inc = static_cast<AST::Expr*>(WalkExpression(S->getInc()));
@@ -178,15 +166,13 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
178166
{
179167
auto S = const_cast<clang::GotoStmt*>(llvm::cast<clang::GotoStmt>(Stmt));
180168
auto _S = new AST::GotoStmt();
181-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
182169
_Stmt = _S;
183170
break;
184171
}
185172
case clang::Stmt::IndirectGotoStmtClass:
186173
{
187174
auto S = const_cast<clang::IndirectGotoStmt*>(llvm::cast<clang::IndirectGotoStmt>(Stmt));
188175
auto _S = new AST::IndirectGotoStmt();
189-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
190176
_S->target = static_cast<AST::Expr*>(WalkExpression(S->getTarget()));
191177
_Stmt = _S;
192178
break;
@@ -195,23 +181,20 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
195181
{
196182
auto S = const_cast<clang::ContinueStmt*>(llvm::cast<clang::ContinueStmt>(Stmt));
197183
auto _S = new AST::ContinueStmt();
198-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
199184
_Stmt = _S;
200185
break;
201186
}
202187
case clang::Stmt::BreakStmtClass:
203188
{
204189
auto S = const_cast<clang::BreakStmt*>(llvm::cast<clang::BreakStmt>(Stmt));
205190
auto _S = new AST::BreakStmt();
206-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
207191
_Stmt = _S;
208192
break;
209193
}
210194
case clang::Stmt::ReturnStmtClass:
211195
{
212196
auto S = const_cast<clang::ReturnStmt*>(llvm::cast<clang::ReturnStmt>(Stmt));
213197
auto _S = new AST::ReturnStmt();
214-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
215198
_S->retValue = static_cast<AST::Expr*>(WalkExpression(S->getRetValue()));
216199
_Stmt = _S;
217200
break;
@@ -220,7 +203,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
220203
{
221204
auto S = const_cast<clang::GCCAsmStmt*>(llvm::cast<clang::GCCAsmStmt>(Stmt));
222205
auto _S = new AST::GCCAsmStmt();
223-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
224206
_S->simple = S->isSimple();
225207
_S->_volatile = S->isVolatile();
226208
_S->numOutputs = S->getNumOutputs();
@@ -244,7 +226,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
244226
{
245227
auto S = const_cast<clang::MSAsmStmt*>(llvm::cast<clang::MSAsmStmt>(Stmt));
246228
auto _S = new AST::MSAsmStmt();
247-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
248229
_S->simple = S->isSimple();
249230
_S->_volatile = S->isVolatile();
250231
_S->numOutputs = S->getNumOutputs();
@@ -271,7 +252,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
271252
{
272253
auto S = const_cast<clang::SEHExceptStmt*>(llvm::cast<clang::SEHExceptStmt>(Stmt));
273254
auto _S = new AST::SEHExceptStmt();
274-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
275255
_S->filterExpr = static_cast<AST::Expr*>(WalkExpression(S->getFilterExpr()));
276256
_S->block = static_cast<AST::CompoundStmt*>(WalkStatement(S->getBlock()));
277257
_Stmt = _S;
@@ -281,7 +261,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
281261
{
282262
auto S = const_cast<clang::SEHFinallyStmt*>(llvm::cast<clang::SEHFinallyStmt>(Stmt));
283263
auto _S = new AST::SEHFinallyStmt();
284-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
285264
_S->block = static_cast<AST::CompoundStmt*>(WalkStatement(S->getBlock()));
286265
_Stmt = _S;
287266
break;
@@ -290,7 +269,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
290269
{
291270
auto S = const_cast<clang::SEHTryStmt*>(llvm::cast<clang::SEHTryStmt>(Stmt));
292271
auto _S = new AST::SEHTryStmt();
293-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
294272
_S->isCXXTry = S->getIsCXXTry();
295273
_S->tryBlock = static_cast<AST::CompoundStmt*>(WalkStatement(S->getTryBlock()));
296274
_S->handler = static_cast<AST::Stmt*>(WalkStatement(S->getHandler()));
@@ -303,15 +281,13 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
303281
{
304282
auto S = const_cast<clang::SEHLeaveStmt*>(llvm::cast<clang::SEHLeaveStmt>(Stmt));
305283
auto _S = new AST::SEHLeaveStmt();
306-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
307284
_Stmt = _S;
308285
break;
309286
}
310287
case clang::Stmt::CapturedStmtClass:
311288
{
312289
auto S = const_cast<clang::CapturedStmt*>(llvm::cast<clang::CapturedStmt>(Stmt));
313290
auto _S = new AST::CapturedStmt();
314-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
315291
_S->capturedStmt = static_cast<AST::Stmt*>(WalkStatement(S->getCapturedStmt()));
316292
_S->capture_size = S->capture_size();
317293
for (auto _E : S->capture_inits())
@@ -326,7 +302,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
326302
{
327303
auto S = const_cast<clang::CXXCatchStmt*>(llvm::cast<clang::CXXCatchStmt>(Stmt));
328304
auto _S = new AST::CXXCatchStmt();
329-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
330305
_S->caughtType = GetQualifiedType(S->getCaughtType());
331306
_S->handlerBlock = static_cast<AST::Stmt*>(WalkStatement(S->getHandlerBlock()));
332307
_Stmt = _S;
@@ -336,7 +311,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
336311
{
337312
auto S = const_cast<clang::CXXTryStmt*>(llvm::cast<clang::CXXTryStmt>(Stmt));
338313
auto _S = new AST::CXXTryStmt();
339-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
340314
_S->tryBlock = static_cast<AST::CompoundStmt*>(WalkStatement(S->getTryBlock()));
341315
_S->numHandlers = S->getNumHandlers();
342316
_Stmt = _S;
@@ -346,7 +320,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
346320
{
347321
auto S = const_cast<clang::CXXForRangeStmt*>(llvm::cast<clang::CXXForRangeStmt>(Stmt));
348322
auto _S = new AST::CXXForRangeStmt();
349-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
350323
_S->init = static_cast<AST::Stmt*>(WalkStatement(S->getInit()));
351324
_S->rangeInit = static_cast<AST::Expr*>(WalkExpression(S->getRangeInit()));
352325
_S->cond = static_cast<AST::Expr*>(WalkExpression(S->getCond()));
@@ -363,7 +336,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
363336
{
364337
auto S = const_cast<clang::MSDependentExistsStmt*>(llvm::cast<clang::MSDependentExistsStmt>(Stmt));
365338
auto _S = new AST::MSDependentExistsStmt();
366-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
367339
_S->isIfExists = S->isIfExists();
368340
_S->isIfNotExists = S->isIfNotExists();
369341
_S->subStmt = static_cast<AST::CompoundStmt*>(WalkStatement(S->getSubStmt()));
@@ -374,7 +346,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
374346
{
375347
auto S = const_cast<clang::CoroutineBodyStmt*>(llvm::cast<clang::CoroutineBodyStmt>(Stmt));
376348
auto _S = new AST::CoroutineBodyStmt();
377-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
378349
_S->hasDependentPromiseType = S->hasDependentPromiseType();
379350
_S->body = static_cast<AST::Stmt*>(WalkStatement(S->getBody()));
380351
_S->promiseDeclStmt = static_cast<AST::Stmt*>(WalkStatement(S->getPromiseDeclStmt()));
@@ -395,7 +366,6 @@ AST::Stmt* Parser::WalkStatement(const clang::Stmt* Stmt)
395366
{
396367
auto S = const_cast<clang::CoreturnStmt*>(llvm::cast<clang::CoreturnStmt>(Stmt));
397368
auto _S = new AST::CoreturnStmt();
398-
_S->stripLabelLikeStatements = static_cast<AST::Stmt*>(WalkStatement(S->stripLabelLikeStatements()));
399369
_S->isImplicit = S->isImplicit();
400370
_S->operand = static_cast<AST::Expr*>(WalkExpression(S->getOperand()));
401371
_S->promiseCall = static_cast<AST::Expr*>(WalkExpression(S->getPromiseCall()));

src/CppParser/Stmt.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Stmt::Stmt()
1616
, sourceRange(SourceRange())
1717
, beginLoc(SourceLocation())
1818
, endLoc(SourceLocation())
19-
, stripLabelLikeStatements(nullptr)
2019
{
2120
}
2221

@@ -25,7 +24,6 @@ Stmt::Stmt(StmtClass klass)
2524
, sourceRange(SourceRange())
2625
, beginLoc(SourceLocation())
2726
, endLoc(SourceLocation())
28-
, stripLabelLikeStatements(nullptr)
2927
{
3028
}
3129

src/CppParser/Stmt.h

-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ class CS_API Stmt
155155
SourceRange sourceRange;
156156
SourceLocation beginLoc;
157157
SourceLocation endLoc;
158-
Stmt* stripLabelLikeStatements;
159158
};
160159

161160
class CS_API DeclStmt : public Stmt

0 commit comments

Comments
 (0)