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

Trying to debug compound equation operators

Browse Source
This commit is contained in:
Jonathan Turner
2009-06-06 15:56:47 +00:00
parent df41d7abe6
commit b8eb887ac9
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wesley/main.cpp
View File

@@ -148,9 +148,23 @@ Boxed_Value eval_token(BoxedCPP_System &ss, TokenPtr node) {
case (TokenType::Equation) : case (TokenType::Equation) :
retval = eval_token(ss, node->children.back()); retval = eval_token(ss, node->children.back());
if (node->children.size() > 1) { if (node->children.size() > 1) {
for (i = node->children.size()-2; ((int)i) >= 0; --i) { for (i = node->children.size()-3; ((int)i) >= 0; i -= 2) {
if (node->children[i+1]->text == "=") {
ss.add_object(node->children[i]->text, retval); ss.add_object(node->children[i]->text, retval);
} }
else {
Param_List_Builder plb;
plb << retval;
plb << eval_token(ss, node->children[i]);
try {
retval = dispatch(ss.get_function(node->children[i+1]->text), plb);
}
catch(std::exception &e){
throw EvalError("Can not find appropriate '" + node->children[i+1]->text + "'", node->children[i+1]);
}
ss.add_object(node->children[i]->text, retval);
}
}
} }
break; break;
case (TokenType::Factor) : case (TokenType::Factor) :
@@ -353,7 +367,8 @@ 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::Semicolon))) >> Ign(Id(TokenType::Curly_Open)) >> *(Ign(Id(TokenType::Semicolon))) >> ~statements >> Ign(Id(TokenType::Curly_Close)); block = *(Ign(Id(TokenType::Semicolon))) >> Ign(Id(TokenType::Curly_Open)) >> *(Ign(Id(TokenType::Semicolon))) >> ~statements >> Ign(Id(TokenType::Curly_Close));
equation = *(Id(TokenType::Identifier) >> Ign(Str("="))) >> boolean; equation = *((Id(TokenType::Identifier) >> Str("=")) | (Id(TokenType::Identifier) >> Str("+=")) | (Id(TokenType::Identifier) >> Str("-=")) |
(Id(TokenType::Identifier) >> Str("*=")) | (Id(TokenType::Identifier) >> 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));
@@ -426,7 +441,7 @@ TokenPtr parse(Rule &rule, std::vector<TokenPtr> &tokens, const char *filename)
std::pair<Token_Iterator, bool> results = rule(iter, end, parent); std::pair<Token_Iterator, bool> results = rule(iter, end, parent);
if (results.second) { if (results.second) {
//debug_print(parent, ""); debug_print(parent, "");
return parent; return parent;
} }
else { else {