[pypy-svn] r42722 - pypy/dist/pypy/lang/js

[santagada at codespeak.net]

Author: santagada
Date: Sun May  6 01:42:07 2007
New Revision: 42722

Modified:
   pypy/dist/pypy/lang/js/jsgrammar.txt
Log:
some more adjusts to the grammar

Modified: pypy/dist/pypy/lang/js/jsgrammar.txt
==============================================================================
--- pypy/dist/pypy/lang/js/jsgrammar.txt	(original)
+++ pypy/dist/pypy/lang/js/jsgrammar.txt	Sun May  6 01:42:07 2007
@@ -29,7 +29,7 @@
             | <trystatement>
             ;
 
-block   : ["{"] statementlist? ["}"]
+block   : ["{"] >statementlist<? ["}"]
         ;
 
 statementlist   : statement >statementlist<
@@ -43,7 +43,7 @@
                         | variabledeclaration
                         ;
 
-variabledeclaration : identifier initialiser?
+variabledeclaration : identifier >initialiser<?
                     ;
  
 initialiser : ["="] assignmentexpression
@@ -62,10 +62,10 @@
 iterationstatement  
     : "do" statement ["while"] ["("] expression [")"]
     | "while" ["("] expression [")"] statement 
-    | "for" ["("]expressionnoin? [";"] expression? [";"] expression? [")"] statement 
-    | "for" ["("] ["var"] variabledeclarationlistnoin [";"] expression? [";"] expression? [")"] statement 
-    | ["for"] ["("] lefthandsideexpression "in" expression [")"] statement 
-    | ["for"] ["("] ["var"] variabledeclarationnoin "in" expression [")"] statement
+    | "for" ["("] expressionnoin? ";" expression? ";" expression? ")" statement 
+    | "for" ["("] ["var"] variabledeclarationlistnoin ";" expression? ";" expression? ")" statement 
+    | "for" ["("] lefthandsideexpression "in" expression ")" statement 
+    | "for" ["("] ["var"] variabledeclarationnoin "in" expression ")" statement
     ;