generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Couple grammar bugfixes for booleans. Made if/while return void.

Browse Source
This commit is contained in:
Jonathan Turner
2009-06-05 12:05:37 +00:00
parent 3f4aed0db9
commit e804f16e7b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wesley/main.cpp
View File

@@ -263,6 +263,7 @@ Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) {
} }
} }
} }
retval = Boxed_Value();
} }
break; break;
case(TokenType::While_Block) : { case(TokenType::While_Block) : {
@@ -273,6 +274,7 @@ Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) {
retval = eval_token(ss, node->children[0]); retval = eval_token(ss, node->children[0]);
cond = Cast_Helper<bool &>()(retval); cond = Cast_Helper<bool &>()(retval);
} }
retval = Boxed_Value();
} }
break; break;
case (TokenType::Function_Def) : { case (TokenType::Function_Def) : {
@@ -369,7 +371,7 @@ Rule build_parser_rules() {
block >> ~Ign(Id(TokenType::Semicolon)); block >> ~Ign(Id(TokenType::Semicolon));
params = Id(TokenType::Identifier) >> *(Ign(Str(",")) >> Id(TokenType::Identifier)); params = Id(TokenType::Identifier) >> *(Ign(Str(",")) >> Id(TokenType::Identifier));
block = Ign(Id(TokenType::Curly_Open)) >> ~statements >> Ign(Id(TokenType::Curly_Close)); block = Ign(Id(TokenType::Curly_Open)) >> ~statements >> Ign(Id(TokenType::Curly_Close));
equation = *(Id(TokenType::Identifier) >> Ign(Str("="))) >> comparison; equation = *(Id(TokenType::Identifier) >> Ign(Str("="))) >> boolean;
boolean = comparison >> *((Str("&&") >> comparison) | (Str("||") >> comparison)); boolean = comparison >> *((Str("&&") >> comparison) | (Str("||") >> comparison));
comparison = expression >> *((Str("==") >> expression) | (Str("!=") >> expression) | (Str("<") >> expression) | comparison = expression >> *((Str("==") >> expression) | (Str("!=") >> expression) | (Str("<") >> expression) |
(Str("<=") >> expression) |(Str(">") >> expression) | (Str(">=") >> expression)); (Str("<=") >> expression) |(Str(">") >> expression) | (Str(">=") >> expression));
@@ -378,7 +380,7 @@ Rule build_parser_rules() {
factor = methodcall | value | negate | (Ign(Str("+")) >> value); factor = methodcall | value | negate | (Ign(Str("+")) >> value);
funcall = Id(TokenType::Identifier) >> Ign(Id(TokenType::Parens_Open)) >> ~(boolean >> *(Ign(Str("," )) >> boolean)) >> Ign(Id(TokenType::Parens_Close)); funcall = Id(TokenType::Identifier) >> Ign(Id(TokenType::Parens_Open)) >> ~(boolean >> *(Ign(Str("," )) >> boolean)) >> Ign(Id(TokenType::Parens_Close));
methodcall = value >> +(Ign(Str(".")) >> funcall); methodcall = value >> +(Ign(Str(".")) >> funcall);
negate = Ign(Str("-")) >> factor; negate = Ign(Str("-")) >> boolean;
return_statement = Ign(Str("return")) >> boolean; return_statement = Ign(Str("return")) >> boolean;
value = (Ign(Id(TokenType::Parens_Open)) >> boolean >> Ign(Id(TokenType::Parens_Close))) | return_statement | value = (Ign(Id(TokenType::Parens_Open)) >> boolean >> Ign(Id(TokenType::Parens_Close))) | return_statement |