gabry/hscript-improved
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed : isBlock tells if expr ends with }

Browse Source
This commit is contained in:
Nicolas Cannasse
2008-07-09 11:09:28 +00:00
parent ebe78a431a
commit 521c8b3d5b
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hscript/Parser.hx
+21 -10
View File
@@ -106,19 +106,30 @@ class Parser {
return null;
}
function isBlock(e) {
return switch( e ) {
case EBlock(_): true;
case EFunction(_,e,_): isBlock(e);
case EVar(_,e): e != null && isBlock(e);
case EIf(_,e1,e2): if( e2 != null ) isBlock(e2) else isBlock(e1);
case EBinop(_,_,e): isBlock(e);
case EUnop(_,prefix,e): !prefix && isBlock(e);
case EWhile(_,e): isBlock(e);
case EFor(_,_,e): isBlock(e);
case EReturn(e): e != null && isBlock(e);
default: false;
}
}
function parseFullExpr(s) {
var e = parseExpr(s);
var tk = token(s);
if( tk != TSemicolon && tk != TEof )
switch( e ) {
case EBlock(_): tokens.add(tk);
case EFunction(_,e,_):
switch(e) {
case EBlock(_): tokens.add(tk);
default: unexpected(tk);
}
default: unexpected(tk);
}
if( tk != TSemicolon && tk != TEof ) {
if( isBlock(e) )
tokens.add(tk);
else
unexpected(tk);
}
return e;
}