DynamicJava: Fix for broken for loops.

dlsmith · dlsmith · commit f5f77f225116 · 2008-07-09T22:34:21.000Z
git-svn-id: file:///tmp/test-svn/trunk@4559 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/lib/plt.jar b/dynamicjava/lib/plt.jar
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/StatementChecker.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/StatementChecker.java
@@ -125,11 +125,7 @@ public StatementChecker(TypeContext ctx, Options options) {
   
   private TypeContext checkList(Iterable<? extends Node> l) {
     TypeContext c = context;
-    for (Node n : l) {
-      // TODO: fix the parser so there aren't any Expressions here
-      if (n instanceof Expression) { n.acceptVisitor(new ExpressionChecker(c, opt)); }
-      else { c = n.acceptVisitor(new StatementChecker(c, opt)); }
-    }
+    for (Node n : l) { c = n.acceptVisitor(new StatementChecker(c, opt)); }
     return c;
   }
 
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/StatementEvaluator.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/StatementEvaluator.java
@@ -194,7 +194,7 @@ public Object next() {
         catch (ContinueException e) {
           if (e.hasLabel() && !node.hasLabel(e.label())) { throw e; }
         }
-        if (update != null) { evaluateSequence(update); }
+        if (update != null) { seval.evaluateSequence(update); }
       }
     }
     catch (BreakException e) {
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/LocalVariable.java b/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/LocalVariable.java
@@ -22,4 +22,5 @@ public LocalVariable(String name, Type type, boolean isFinal) {
   
   public boolean isFinal() { return _isFinal; }
   
+  public String toString() { return "LocalVariable(" + _name + ")@" + Integer.toHexString(hashCode()); }
 }
diff --git a/dynamicjava/src/koala/dynamicjava/parser/grammar.jj b/dynamicjava/src/koala/dynamicjava/parser/grammar.jj
@@ -2677,7 +2677,7 @@ PARSER_END(Parser)
            |
            ( init=forInit() | ";" )
            [ exp=expression() ] ";"
-           [ update=statementExpressionList() ]
+           [ update=expressionStatementList() ]
            )
         ")" stmt=statement(true)
       {
@@ -2701,7 +2701,8 @@ PARSER_END(Parser)
   }
   
   /**
-   * Used internally to parse a 'for' statement
+   * Used internally to parse a 'for' statement; produces a list of
+   * ExpressionStatements or a variable declaration
    */
   List<Node> forInit() :
   {
@@ -2710,34 +2711,32 @@ PARSER_END(Parser)
   {
     (   LOOKAHEAD( variableDeclarationLookahead() )
          list=localVariableDeclaration(true)
-      | list=statementExpressionList() ";"
+      | list=expressionStatementList() ";"
     )
     {
       return list;
     }
   }
   
   /**
-   * Parses a comma separated list of expression
+   * Parses a comma separated list of strict ExpressionStatements
    */
-  List<Node> statementExpressionList() :
+  List<Node> expressionStatementList() :
+  { List<Node> list = new LinkedList<Node>(); Expression exp; }
   {
-    List<Node> list = new LinkedList<Node>();
-    Node node;
-  }
-  {
-    node=statementExpression()
+    exp=statementExpression()
     {
-      list.add(node);
-    }
-    ( "," node=statementExpression()
-       {
-      list.add(node);
+      list.add(new ExpressionStatement(exp, true, filename,
+                                       exp.getBeginLine(), exp.getBeginColumn(),
+                                       exp.getEndLine(), exp.getEndColumn()));
     }
+    ( "," exp=statementExpression()
+      {  list.add(new ExpressionStatement(exp, true, filename,
+                                          exp.getBeginLine(), exp.getBeginColumn(),
+                                          exp.getEndLine(), exp.getEndColumn()));
+      }
     )*
-    {
-      return list;
-    }
+    { return list; }
   }
   
   /**
@@ -2918,7 +2917,7 @@ PARSER_END(Parser)
    * a trailing semicolon is required and only StatementExpressions
    * will be allowed.
    */
-  Node expressionStatement(boolean strictExpression) :
+  ExpressionStatement expressionStatement(boolean strictExpression) :
   { Expression exp; Token t = null; }
   {
     { lookaheadFlag = strictExpression; } // makes strictExpression visible to lookahead
diff --git a/dynamicjava/src/koala/dynamicjava/tree/ForStatement.java b/dynamicjava/src/koala/dynamicjava/tree/ForStatement.java
@@ -99,9 +99,9 @@ public ForStatement(List<Node> init, Expression cond, List<Node> updt, Node body
   
   /**
    * Creates a new for statement
-   * @param init  the initialization statements
+   * @param init  the initialization statements (either Statements or declarations)
    * @param cond  the condition to evaluate at each loop
-   * @param updt  the update statements
+   * @param updt  the update statements (either Statements or declarations)
    * @param body  the body
    * @param fn    the filename
    * @param bl    the begin line

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public Object next() {`
`194`	`194`	`catch (ContinueException e) {`
`195`	`195`	`if (e.hasLabel() && !node.hasLabel(e.label())) { throw e; }`
`196`	`196`	`}`
`197`		`- if (update != null) { evaluateSequence(update); }`
	`197`	`+ if (update != null) { seval.evaluateSequence(update); }`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`	`catch (BreakException e) {`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,5 @@ public LocalVariable(String name, Type type, boolean isFinal) {`
`22`	`22`
`23`	`23`	`public boolean isFinal() { return _isFinal; }`
`24`	`24`
	`25`	`+ public String toString() { return "LocalVariable(" + _name + ")@" + Integer.toHexString(hashCode()); }`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2677,7 +2677,7 @@ PARSER_END(Parser)`
`2677`	`2677`	`\|`
`2678`	`2678`	`( init=forInit() \| ";" )`
`2679`	`2679`	`[ exp=expression() ] ";"`
`2680`		`- [ update=statementExpressionList() ]`
	`2680`	`+ [ update=expressionStatementList() ]`
`2681`	`2681`	`)`
`2682`	`2682`	`")" stmt=statement(true)`
`2683`	`2683`	`{`
`@@ -2701,7 +2701,8 @@ PARSER_END(Parser)`
`2701`	`2701`	`}`
`2702`	`2702`
`2703`	`2703`	`/**`
`2704`		`- * Used internally to parse a 'for' statement`
	`2704`	`+ * Used internally to parse a 'for' statement; produces a list of`
	`2705`	`+ * ExpressionStatements or a variable declaration`
`2705`	`2706`	`*/`
`2706`	`2707`	`List<Node> forInit() :`
`2707`	`2708`	`{`
`@@ -2710,34 +2711,32 @@ PARSER_END(Parser)`
`2710`	`2711`	`{`
`2711`	`2712`	`( LOOKAHEAD( variableDeclarationLookahead() )`
`2712`	`2713`	`list=localVariableDeclaration(true)`
`2713`		`- \| list=statementExpressionList() ";"`
	`2714`	`+ \| list=expressionStatementList() ";"`
`2714`	`2715`	`)`
`2715`	`2716`	`{`
`2716`	`2717`	`return list;`
`2717`	`2718`	`}`
`2718`	`2719`	`}`
`2719`	`2720`
`2720`	`2721`	`/**`
`2721`		`- * Parses a comma separated list of expression`
	`2722`	`+ * Parses a comma separated list of strict ExpressionStatements`
`2722`	`2723`	`*/`
`2723`		`- List<Node> statementExpressionList() :`
	`2724`	`+ List<Node> expressionStatementList() :`
	`2725`	`+ { List<Node> list = new LinkedList<Node>(); Expression exp; }`
`2724`	`2726`	`{`
`2725`		`- List<Node> list = new LinkedList<Node>();`
`2726`		`- Node node;`
`2727`		`- }`
`2728`		`- {`
`2729`		`- node=statementExpression()`
	`2727`	`+ exp=statementExpression()`
`2730`	`2728`	`{`
`2731`		`- list.add(node);`
`2732`		`- }`
`2733`		`- ( "," node=statementExpression()`
`2734`		`- {`
`2735`		`- list.add(node);`
	`2729`	`+ list.add(new ExpressionStatement(exp, true, filename,`
	`2730`	`+ exp.getBeginLine(), exp.getBeginColumn(),`
	`2731`	`+ exp.getEndLine(), exp.getEndColumn()));`
`2736`	`2732`	`}`
	`2733`	`+ ( "," exp=statementExpression()`
	`2734`	`+ { list.add(new ExpressionStatement(exp, true, filename,`
	`2735`	`+ exp.getBeginLine(), exp.getBeginColumn(),`
	`2736`	`+ exp.getEndLine(), exp.getEndColumn()));`
	`2737`	`+ }`
`2737`	`2738`	`)*`
`2738`		`- {`
`2739`		`- return list;`
`2740`		`- }`
	`2739`	`+ { return list; }`
`2741`	`2740`	`}`
`2742`	`2741`
`2743`	`2742`	`/**`
`@@ -2918,7 +2917,7 @@ PARSER_END(Parser)`
`2918`	`2917`	`* a trailing semicolon is required and only StatementExpressions`
`2919`	`2918`	`* will be allowed.`
`2920`	`2919`	`*/`
`2921`		`- Node expressionStatement(boolean strictExpression) :`
	`2920`	`+ ExpressionStatement expressionStatement(boolean strictExpression) :`
`2922`	`2921`	`{ Expression exp; Token t = null; }`
`2923`	`2922`	`{`
`2924`	`2923`	`{ lookaheadFlag = strictExpression; } // makes strictExpression visible to lookahead`