comparison dmd/statement.h @ 1607:207a8a438dea

Merge DMD r253: refactor: Argument => Parameter --- dmd/arrayop.c | 30 ++++---- dmd/arraytypes.h | 2 +- dmd/class.c | 8 +- dmd/declaration.c | 10 ++-- dmd/declaration.h | 16 ++-- dmd/doc.c | 12 ++-- dmd/dsymbol.c | 4 +- dmd/expression.c | 48 +++++++------- dmd/expression.h | 32 +++++----- dmd/func.c | 78 +++++++++++----------- dmd/init.c | 2 +- dmd/interpret.c | 8 +- dmd/mtype.c | 190 ++++++++++++++++++++++++++-------------------------- dmd/mtype.h | 32 +++++----- dmd/opover.c | 34 +++++----- dmd/parse.c | 40 ++++++------ dmd/parse.h | 2 +- dmd/statement.c | 90 +++++++++++++------------- dmd/statement.h | 14 ++-- dmd/struct.c | 8 +- dmd/template.c | 30 ++++---- gen/functions.cpp | 10 ++-- gen/functions.h | 2 +- gen/tocall.cpp | 10 ++-- gen/typinf.cpp | 6 +- 25 files changed, 359 insertions(+), 359 deletions(-)
author Leandro Lucarella <llucax@gmail.com>
date Wed, 06 Jan 2010 15:18:20 -0300
parents def7a1d494fd
children 44b145be2ef5
comparison
equal deleted inserted replaced
1606:1b24e9c7cc26 1607:207a8a438dea
36 struct InlineCostState; 36 struct InlineCostState;
37 struct InlineDoState; 37 struct InlineDoState;
38 struct InlineScanState; 38 struct InlineScanState;
39 struct ReturnStatement; 39 struct ReturnStatement;
40 struct CompoundStatement; 40 struct CompoundStatement;
41 struct Argument; 41 struct Parameter;
42 struct StaticAssert; 42 struct StaticAssert;
43 struct AsmStatement; 43 struct AsmStatement;
44 struct AsmBlockStatement; 44 struct AsmBlockStatement;
45 struct GotoStatement; 45 struct GotoStatement;
46 struct ScopeStatement; 46 struct ScopeStatement;
352 }; 352 };
353 353
354 struct ForeachStatement : Statement 354 struct ForeachStatement : Statement
355 { 355 {
356 enum TOK op; // TOKforeach or TOKforeach_reverse 356 enum TOK op; // TOKforeach or TOKforeach_reverse
357 Arguments *arguments; // array of Argument*'s 357 Parameters *arguments; // array of Parameter*'s
358 Expression *aggr; 358 Expression *aggr;
359 Statement *body; 359 Statement *body;
360 360
361 VarDeclaration *key; 361 VarDeclaration *key;
362 VarDeclaration *value; 362 VarDeclaration *value;
364 FuncDeclaration *func; // function we're lexically in 364 FuncDeclaration *func; // function we're lexically in
365 365
366 Array cases; // put breaks, continues, gotos and returns here 366 Array cases; // put breaks, continues, gotos and returns here
367 Array gotos; // forward referenced goto's go here 367 Array gotos; // forward referenced goto's go here
368 368
369 ForeachStatement(Loc loc, enum TOK op, Arguments *arguments, Expression *aggr, Statement *body); 369 ForeachStatement(Loc loc, enum TOK op, Parameters *arguments, Expression *aggr, Statement *body);
370 Statement *syntaxCopy(); 370 Statement *syntaxCopy();
371 Statement *semantic(Scope *sc); 371 Statement *semantic(Scope *sc);
372 int hasBreak(); 372 int hasBreak();
373 int hasContinue(); 373 int hasContinue();
374 int usesEH(); 374 int usesEH();
384 384
385 #if DMDV2 385 #if DMDV2
386 struct ForeachRangeStatement : Statement 386 struct ForeachRangeStatement : Statement
387 { 387 {
388 enum TOK op; // TOKforeach or TOKforeach_reverse 388 enum TOK op; // TOKforeach or TOKforeach_reverse
389 Argument *arg; // loop index variable 389 Parameter *arg; // loop index variable
390 Expression *lwr; 390 Expression *lwr;
391 Expression *upr; 391 Expression *upr;
392 Statement *body; 392 Statement *body;
393 393
394 VarDeclaration *key; 394 VarDeclaration *key;
395 395
396 ForeachRangeStatement(Loc loc, enum TOK op, Argument *arg, 396 ForeachRangeStatement(Loc loc, enum TOK op, Parameter *arg,
397 Expression *lwr, Expression *upr, Statement *body); 397 Expression *lwr, Expression *upr, Statement *body);
398 Statement *syntaxCopy(); 398 Statement *syntaxCopy();
399 Statement *semantic(Scope *sc); 399 Statement *semantic(Scope *sc);
400 int hasBreak(); 400 int hasBreak();
401 int hasContinue(); 401 int hasContinue();
411 }; 411 };
412 #endif 412 #endif
413 413
414 struct IfStatement : Statement 414 struct IfStatement : Statement
415 { 415 {
416 Argument *arg; 416 Parameter *arg;
417 Expression *condition; 417 Expression *condition;
418 Statement *ifbody; 418 Statement *ifbody;
419 Statement *elsebody; 419 Statement *elsebody;
420 420
421 VarDeclaration *match; // for MatchExpression results 421 VarDeclaration *match; // for MatchExpression results
422 422
423 IfStatement(Loc loc, Argument *arg, Expression *condition, Statement *ifbody, Statement *elsebody); 423 IfStatement(Loc loc, Parameter *arg, Expression *condition, Statement *ifbody, Statement *elsebody);
424 Statement *syntaxCopy(); 424 Statement *syntaxCopy();
425 Statement *semantic(Scope *sc); 425 Statement *semantic(Scope *sc);
426 Expression *interpret(InterState *istate); 426 Expression *interpret(InterState *istate);
427 void toCBuffer(OutBuffer *buf, HdrGenState *hgs); 427 void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
428 int usesEH(); 428 int usesEH();