summaryrefslogtreecommitdiff
path: root/src/parser.y
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2012-02-06 12:22:27 -0700
committerMike Buland <eichlan@xagasoft.com>2012-02-06 12:22:27 -0700
commit9de9d4e733ce872806c569334af4c9ace01db203 (patch)
treecd401af5f0e158807238d6f9215f16a2c202b3dc /src/parser.y
parent315dd7104f02a278b9ade41345060ed5f6825fbb (diff)
downloadstage-9de9d4e733ce872806c569334af4c9ace01db203.tar.gz
stage-9de9d4e733ce872806c569334af4c9ace01db203.tar.bz2
stage-9de9d4e733ce872806c569334af4c9ace01db203.tar.xz
stage-9de9d4e733ce872806c569334af4c9ace01db203.zip
Important bugfix in stack code. Thanks david!0.04
Diffstat (limited to 'src/parser.y')
-rw-r--r--src/parser.y12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/parser.y b/src/parser.y
index b50b897..bbe4840 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -160,10 +160,10 @@ cmpltExprList:
160 | cmpltExprList cmpltExpr 160 | cmpltExprList cmpltExpr
161 ; 161 ;
162 162
163cmpltExpr: expr ';' 163cmpltExpr: expr ';' { bld.endCmpltExpr(); }
164 | tokReturn '(' expr ')' ';' { bld.addNode( AstNode::tReturn ); } 164 | tokReturn '(' expr ')' ';' { bld.addNode( AstNode::tReturn ); bld.endCmpltExpr();}
165 | tokReturn '(' ')' ';' { bld.addNode( AstNode::tReturn ); } 165 | tokReturn '(' ')' ';' { bld.addNode( AstNode::tReturn ); bld.endCmpltExpr();}
166 | tokGoto '(' expr ')' ';' { bld.addNode( AstNode::tGoto ); } 166 | tokGoto '(' expr ')' ';' { bld.addNode( AstNode::tGoto ); bld.endCmpltExpr();}
167 | ifbase 167 | ifbase
168 | tokFor tokEach { 168 | tokFor tokEach {
169 bld.addNode( AstNode::tForEach ); 169 bld.addNode( AstNode::tForEach );
@@ -269,11 +269,11 @@ expr: literal
269 ; 269 ;
270 270
271funcCallParams: 271funcCallParams:
272 | expr funcCallParamsEx 272 | expr funcCallParamsEx { bld.stackMod( AstNode::tPop ); }
273 ; 273 ;
274 274
275funcCallParamsEx: 275funcCallParamsEx:
276 | funcCallParamsEx ',' expr 276 | funcCallParamsEx ',' expr { bld.stackMod( AstNode::tPop ); }
277 ; 277 ;
278 278
279listValues: expr { bld.addNode( AstNode::tAppend ); } 279listValues: expr { bld.addNode( AstNode::tAppend ); }