Mercurial > projects > dil

changeset 682:7541c64fc423

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed FunctionBody, CatchBody and FinallyBody. FunctionBody -> FuncBodyStatement, CatchBody -> CatchStatement, FinallyBody -> FinallyStatement.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Sat, 19 Jan 2008 20:35:45 +0100
parents 95a3c28c0f64
children 1ae72234db26
files trunk/src/cmd/Generate.d trunk/src/dil/ast/Declarations.d trunk/src/dil/ast/DefaultVisitor.d trunk/src/dil/ast/Expressions.d trunk/src/dil/ast/NodesEnum.d trunk/src/dil/ast/Statements.d trunk/src/dil/parser/ImportParser.d trunk/src/dil/parser/Parser.d
diffstat 8 files changed, 44 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/trunk/src/cmd/Generate.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/cmd/Generate.d	Sat Jan 19 20:35:45 2008 +0100
@@ -100,15 +100,7 @@
     suffixLength = "Declaration".length;
     break;
   case NC.Statement:
-    switch (node.kind)
-    {
-    case NodeKind.CatchBody,
-         NodeKind.FinallyBody,
-         NodeKind.FunctionBody:
-      break;
-    default:
-     suffixLength = "Statement".length;
-    }
+    suffixLength = "Statement".length;
     break;
   case NC.Expression:
     switch (node.kind)
--- a/trunk/src/dil/ast/Declarations.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/dil/ast/Declarations.d	Sat Jan 19 20:35:45 2008 +0100
@@ -274,8 +274,8 @@
 class ConstructorDeclaration : Declaration
 {
   Parameters params;
-  FunctionBody funcBody;
-  this(Parameters params, FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(Parameters params, FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
@@ -289,8 +289,8 @@
 
 class StaticConstructorDeclaration : Declaration
 {
-  FunctionBody funcBody;
-  this(FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
@@ -302,8 +302,8 @@
 
 class DestructorDeclaration : Declaration
 {
-  FunctionBody funcBody;
-  this(FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
@@ -315,8 +315,8 @@
 
 class StaticDestructorDeclaration : Declaration
 {
-  FunctionBody funcBody;
-  this(FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
@@ -332,10 +332,10 @@
   Identifier* name;
   TemplateParameters tparams;
   Parameters params;
-  FunctionBody funcBody;
+  FuncBodyStatement funcBody;
   LinkageType linkageType;
   this(TypeNode returnType, Identifier* name, TemplateParameters tparams,
-       Parameters params, FunctionBody funcBody)
+       Parameters params, FuncBodyStatement funcBody)
   {
     super.hasBody = funcBody.funcBody !is null;
     mixin(set_kind);
@@ -390,8 +390,8 @@
 
 class InvariantDeclaration : Declaration
 {
-  FunctionBody funcBody;
-  this(FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
@@ -403,8 +403,8 @@
 
 class UnittestDeclaration : Declaration
 {
-  FunctionBody funcBody;
-  this(FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
@@ -505,8 +505,8 @@
 class NewDeclaration : Declaration
 {
   Parameters params;
-  FunctionBody funcBody;
-  this(Parameters params, FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(Parameters params, FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
@@ -521,8 +521,8 @@
 class DeleteDeclaration : Declaration
 {
   Parameters params;
-  FunctionBody funcBody;
-  this(Parameters params, FunctionBody funcBody)
+  FuncBodyStatement funcBody;
+  this(Parameters params, FuncBodyStatement funcBody)
   {
     super.hasBody = true;
     mixin(set_kind);
--- a/trunk/src/dil/ast/DefaultVisitor.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/dil/ast/DefaultVisitor.d	Sat Jan 19 20:35:45 2008 +0100
@@ -198,7 +198,7 @@
       foreach (node; s.children)
         visitS(cast(Statement)cast(void*)node);
     //IllegalStatement has no subnodes.
-    static if (is(S == FunctionBody))
+    static if (is(S == FuncBodyStatement))
       s.funcBody && visitS(s.funcBody),
       s.inBody && visitS(s.inBody),
       s.outBody && visitS(s.outBody);
@@ -249,13 +249,13 @@
     static if (is(S == TryStatement))
     {
       visitS(s.tryBody);
-      foreach (body_; s.catchBodies)
-        visitS(body_);
+      foreach (catchBody; s.catchBodies)
+        visitS(catchBody);
       s.finallyBody && visitS(s.finallyBody);
     }
-    static if (is(S == CatchBody))
+    static if (is(S == CatchStatement))
       s.param && visitN(s.param), visitS(s.catchBody);
-    static if (is(S == FinallyBody))
+    static if (is(S == FinallyStatement))
       visitS(s.finallyBody);
     static if (is(S == ScopeGuardStatement))
       visitS(s.scopeBody);
--- a/trunk/src/dil/ast/Expressions.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/dil/ast/Expressions.d	Sat Jan 19 20:35:45 2008 +0100
@@ -905,7 +905,7 @@
 {
   TypeNode returnType;
   Parameters params;
-  FunctionBody funcBody;
+  FuncBodyStatement funcBody;
 
   this()
   {
@@ -915,7 +915,7 @@
     addChild(funcBody);
   }
 
-  this(TypeNode returnType, Parameters params, FunctionBody funcBody)
+  this(TypeNode returnType, Parameters params, FuncBodyStatement funcBody)
   {
     this.returnType = returnType;
     this.params = params;
@@ -923,7 +923,7 @@
     this();
   }
 
-  this(FunctionBody funcBody)
+  this(FuncBodyStatement funcBody)
   {
     this.funcBody = funcBody;
     this();
--- a/trunk/src/dil/ast/NodesEnum.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/dil/ast/NodesEnum.d	Sat Jan 19 20:35:45 2008 +0100
@@ -56,7 +56,7 @@
   "CompoundStatement",
   "IllegalStatement",
   "EmptyStatement",
-  "FunctionBody",
+  "FuncBodyStatement",
   "ScopeStatement",
   "LabeledStatement",
   "ExpressionStatement",
@@ -77,8 +77,8 @@
   "WithStatement",
   "SynchronizedStatement",
   "TryStatement",
-  "CatchBody",
-  "FinallyBody",
+  "CatchStatement",
+  "FinallyStatement",
   "ScopeGuardStatement",
   "ThrowStatement",
   "VolatileStatement",
--- a/trunk/src/dil/ast/Statements.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/dil/ast/Statements.d	Sat Jan 19 20:35:45 2008 +0100
@@ -41,7 +41,7 @@
   }
 }
 
-class FunctionBody : Statement
+class FuncBodyStatement : Statement
 {
   Statement funcBody, inBody, outBody;
   Identifier* outIdent;
@@ -341,9 +341,9 @@
 class TryStatement : Statement
 {
   Statement tryBody;
-  CatchBody[] catchBodies;
-  FinallyBody finallyBody;
-  this(Statement tryBody, CatchBody[] catchBodies, FinallyBody finallyBody)
+  CatchStatement[] catchBodies;
+  FinallyStatement finallyBody;
+  this(Statement tryBody, CatchStatement[] catchBodies, FinallyStatement finallyBody)
   {
     mixin(set_kind);
     addChild(tryBody);
@@ -356,7 +356,7 @@
   }
 }
 
-class CatchBody : Statement
+class CatchStatement : Statement
 {
   Parameter param;
   Statement catchBody;
@@ -370,7 +370,7 @@
   }
 }
 
-class FinallyBody : Statement
+class FinallyStatement : Statement
 {
   Statement finallyBody;
   this(Statement finallyBody)
--- a/trunk/src/dil/parser/ImportParser.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/dil/parser/ImportParser.d	Sat Jan 19 20:35:45 2008 +0100
@@ -335,7 +335,7 @@
     }
   }
 
-  FunctionBody parseFunctionBody()
+  FuncBodyStatement parseFunctionBody()
   {
     while (1)
     {
--- a/trunk/src/dil/parser/Parser.d	Sat Jan 19 00:10:57 2008 +0100
+++ b/trunk/src/dil/parser/Parser.d	Sat Jan 19 20:35:45 2008 +0100
@@ -644,10 +644,10 @@
     return init;
   }
 
-  FunctionBody parseFunctionBody()
+  FuncBodyStatement parseFunctionBody()
   {
     auto begin = token;
-    auto func = new FunctionBody;
+    auto func = new FuncBodyStatement;
     while (1)
     {
       switch (token.kind)
@@ -1984,6 +1984,7 @@
            token.kind != T.RBrace &&
            token.kind != T.EOF)
       s ~= parseStatement();
+    set(s, begin);
     return set(new ScopeStatement(s), begin);
   }
 
@@ -2089,8 +2090,8 @@
     nT();
 
     auto tryBody = parseScopeStatement();
-    CatchBody[] catchBodies;
-    FinallyBody finBody;
+    CatchStatement[] catchBodies;
+    FinallyStatement finBody;
 
     while (skipped(T.Catch))
     {
@@ -2104,14 +2105,14 @@
         set(param, begin2);
         require(T.RParen);
       }
-      catchBodies ~= set(new CatchBody(param, parseNoScopeStatement()), begin);
+      catchBodies ~= set(new CatchStatement(param, parseNoScopeStatement()), begin);
       if (param is null)
         break; // This is a LastCatch
       begin = token;
     }
 
     if (skipped(T.Finally))
-      finBody = set(new FinallyBody(parseNoScopeStatement()), prevToken);
+      finBody = set(new FinallyStatement(parseNoScopeStatement()), prevToken);
 
     if (catchBodies.length == 0 && finBody is null)
       assert(begin.kind == T.Try), error(begin, MSG.MissingCatchOrFinally);