diff options
author | Mike Buland <eichlan@xagasoft.com> | 2012-01-03 00:08:48 -0700 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2012-01-03 00:08:48 -0700 |
commit | 8b9a15a755ebc6681ff6be808615e375cb567080 (patch) | |
tree | c836f3a7a338e6bcc1fe88fe1207819005b92a83 /src/parser.y | |
parent | 340de5ebabbc60727b2aeb85b9faa72a75f1628b (diff) | |
download | stage-8b9a15a755ebc6681ff6be808615e375cb567080.tar.gz stage-8b9a15a755ebc6681ff6be808615e375cb567080.tar.bz2 stage-8b9a15a755ebc6681ff6be808615e375cb567080.tar.xz stage-8b9a15a755ebc6681ff6be808615e375cb567080.zip |
New functions, fixes, and a working bloodfields.
Diffstat (limited to 'src/parser.y')
-rw-r--r-- | src/parser.y | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/parser.y b/src/parser.y index 3dfd737..2e9eead 100644 --- a/src/parser.y +++ b/src/parser.y | |||
@@ -54,7 +54,7 @@ void yyerror( YYLTYPE *llocp, yyscan_t yyscanner, GameBuilder &, const char *err | |||
54 | %token tokDo | 54 | %token tokDo |
55 | %token tokIn | 55 | %token tokIn |
56 | %token tokIf | 56 | %token tokIf |
57 | %token tokThen | 57 | %token tokThen "then" |
58 | %token tokElse | 58 | %token tokElse |
59 | %token tokNot | 59 | %token tokNot |
60 | %token tokCommand | 60 | %token tokCommand |
@@ -204,7 +204,9 @@ ifnext: | |||
204 | | tokElse { bld.addNode( AstNode::tScope ); } '{' cmpltExprList '}' { | 204 | | tokElse { bld.addNode( AstNode::tScope ); } '{' cmpltExprList '}' { |
205 | bld.closeNode(); | 205 | bld.closeNode(); |
206 | } | 206 | } |
207 | | tokElse { bld.addNode( AstNode::tScope ); } ifbase | 207 | | tokElse { bld.addNode( AstNode::tScope ); } ifbase { |
208 | bld.closeNode(); | ||
209 | } | ||
208 | ; | 210 | ; |
209 | 211 | ||
210 | varRef: tokIdent { bld.addVarRef( *($1), sidLocal ); } | 212 | varRef: tokIdent { bld.addVarRef( *($1), sidLocal ); } |