Changeset 1033

Timestamp:

02/10/10 17:14:33 (6 months ago)

Author:

weyrick

Message:

grammar tweaks

Files:

• trunk/rphp/compiler/analysis/grammar_src/rphp_grammar.y (modified) (8 diffs)

trunk/rphp/compiler/analysis/grammar_src/rphp_grammar.y

@@ -252 +252 @@
 statement(A) ::= statementBlock(B). { A = B; }
 statement(A) ::= inlineHTML(B). { A = B; }
-statement(A) ::= staticDecl(B). { A = B; }
 statement(A) ::= functionDecl(B). { A = B; }
 statement(A) ::= classDecl(B). { A = B; }
@@ -262 +261 @@
 statement(A) ::= switchStmt(B). { A = B; }
 statement(A) ::= tryCatch(B). { A = B; }
+statement(A) ::= staticDecl(B) T_SEMI. { A = B; }
 statement(A) ::= echo(B) T_SEMI. { A = B; }
 statement(A) ::= throw(B) T_SEMI. { A = B; }
@@ -310 +310 @@
     A->setLine(CURRENT_LINE);
 }
-return(A) ::= T_RETURN expr(B).
+return(A) ::= T_RETURN baseExpr(B).
 {
     A = new (CTXT) AST::returnStmt(B);
@@ -447 +447 @@
 %type forEach {AST::forEach*}
 // foreach($expr as $val)
-forEach(A) ::= T_FOREACH(F) T_LEFTPAREN expr(RVAL) T_AS T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
+forEach(A) ::= T_FOREACH(F) T_LEFTPAREN baseExpr(RVAL) T_AS T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
 {
     A = new (CTXT) AST::forEach(RVAL, BODY, CTXT, *VAL, false /*by ref*/ );
@@ -453 +453 @@
 }
 // foreach($expr as $key => $val)
-forEach(A) ::= T_FOREACH(F) T_LEFTPAREN expr(RVAL) T_AS T_VARIABLE(KEY) T_ARROWKEY T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
+forEach(A) ::= T_FOREACH(F) T_LEFTPAREN baseExpr(RVAL) T_AS T_VARIABLE(KEY) T_ARROWKEY T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
 {
     A = new (CTXT) AST::forEach(RVAL, BODY, CTXT, *VAL, false /*by ref*/, KEY);
@@ -459 +459 @@
 }
 // foreach($expr as &$val)
-forEach(A) ::= T_FOREACH(F) T_LEFTPAREN expr(RVAL) T_AS T_AND T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
+forEach(A) ::= T_FOREACH(F) T_LEFTPAREN baseExpr(RVAL) T_AS T_AND T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
 {
     A = new (CTXT) AST::forEach(RVAL, BODY, CTXT, *VAL, true /*by ref*/);
@@ -465 +465 @@
 }
 // foreach($expr as $key => &$val)
-forEach(A) ::= T_FOREACH(F) T_LEFTPAREN expr(RVAL) T_AS T_VARIABLE(KEY) T_ARROWKEY T_AND T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
+forEach(A) ::= T_FOREACH(F) T_LEFTPAREN baseExpr(RVAL) T_AS T_VARIABLE(KEY) T_ARROWKEY T_AND T_VARIABLE(VAL) T_RIGHTPAREN statement(BODY).
 {
     A = new (CTXT) AST::forEach(RVAL, BODY, CTXT, *VAL, true /*by ref*/, KEY);
@@ -1926 +1926 @@
 }
 
+
 /** CONSTRUCTOR INVOKE **/
 %type constructorInvoke {AST::functionInvoke*}