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

A little cleanup of logical and/or since those are now separate evals.

Browse Source
This commit is contained in:
Jonathan Turner 2010-08-19 14:42:18 +00:00
parent 58c62f6333
commit c5f20ea158
1 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
include/chaiscript/language/chaiscript_eval.hpp
View File

@ -276,33 +276,17 @@ namespace chaiscript
catch (const bad_boxed_cast &) {
throw Eval_Error("Condition not boolean");
}
if (this->children[i]->text == "&&") {
if (lhs) {
try {
retval = this->children[i+1]->eval(ss);
}
catch (Eval_Error &ee) {
ee.call_stack.push_back(this->children[i+1]);
throw;
}
if (lhs) {
try {
retval = this->children[i+1]->eval(ss);
}
else {
retval = Boxed_Value(false);
catch (Eval_Error &ee) {
ee.call_stack.push_back(this->children[i+1]);
throw;
}
}
else if (this->children[i]->text == "||") {
if (lhs) {
retval = Boxed_Value(true);
}
else {
try {
retval = this->children[i+1]->eval(ss);
}
catch (Eval_Error &ee) {
ee.call_stack.push_back(this->children[i+1]);
throw;
}
}
else {
retval = Boxed_Value(false);
}
}
}
@ -330,32 +314,16 @@ namespace chaiscript
catch (const bad_boxed_cast &) {
throw Eval_Error("Condition not boolean");
}
if (this->children[i]->text == "&&") {
if (lhs) {
try {
retval = this->children[i+1]->eval(ss);
}
catch (Eval_Error &ee) {
ee.call_stack.push_back(this->children[i+1]);
throw;
}
}
else {
retval = Boxed_Value(false);
}
if (lhs) {
retval = Boxed_Value(true);
}
else if (this->children[i]->text == "||") {
if (lhs) {
retval = Boxed_Value(true);
}
else {
try {
retval = this->children[i+1]->eval(ss);
}
catch (Eval_Error &ee) {
ee.call_stack.push_back(this->children[i+1]);
throw;
else {
try {
retval = this->children[i+1]->eval(ss);
}
catch (Eval_Error &ee) {
ee.call_stack.push_back(this->children[i+1]);
throw;
}
}
}