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

Add && and || operator short-circuiting

Browse Source
This commit is contained in:
Jonathan Turner 2009-07-01 17:57:14 +00:00
parent feb4cc0d14
commit 57c75dae31
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
chaiscript/chaiscript_eval.hpp
View File

@ -139,8 +139,38 @@ namespace chaiscript
retval = ss.get_object(node->children[0]->text); retval = ss.get_object(node->children[0]->text);
} }
break; break;
case (Token_Type::Expression) : {
retval = eval_token(ss, node->children[0]);
if (node->children.size() > 1) {
for (i = 1; i < node->children.size(); i += 2) {
bool lhs;
try {
lhs = dispatchkit::boxed_cast<bool &>(retval);
}
catch (std::exception &e) {
throw EvalError("Condition not boolean", node);
}
if (node->children[i]->text == "&&") {
if (lhs) {
retval = eval_token(ss, node->children[i+1]);
}
else {
retval = dispatchkit::Boxed_Value(false);
}
}
else if (node->children[i]->text == "||") {
if (lhs) {
retval = dispatchkit::Boxed_Value(true);
}
else {
retval = eval_token(ss, node->children[i+1]);
}
}
}
}
}
break;
case (Token_Type::Comparison) : case (Token_Type::Comparison) :
case (Token_Type::Expression) :
case (Token_Type::Additive) : case (Token_Type::Additive) :
case (Token_Type::Multiplicative) : { case (Token_Type::Multiplicative) : {
retval = eval_token(ss, node->children[0]); retval = eval_token(ss, node->children[0]);