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

Clean up if block parsing and eval

Browse Source
This commit is contained in:
Jason Turner
2016-04-16 15:39:32 -06:00
parent 83c6df11f0
commit 7d5a97aa2f
2 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -653,33 +653,22 @@ namespace chaiscript
struct If_AST_Node final : AST_Node {
If_AST_Node(std::string t_ast_node_text, Parse_Location t_loc, std::vector<AST_NodePtr> t_children) :
AST_Node(std::move(t_ast_node_text), AST_Node_Type::If, std::move(t_loc), std::move(t_children)) { }
AST_Node(std::move(t_ast_node_text), AST_Node_Type::If, std::move(t_loc), std::move(t_children))
{
assert(children.size() == 2 || children.size() == 3);
}
Boxed_Value eval_internal(const chaiscript::detail::Dispatch_State &t_ss) const override {
if (get_bool_condition(children[0]->eval(t_ss))) {
return children[1]->eval(t_ss);
} else {
if (children.size() > 2) {
size_t i = 2;
/// \todo these string comparisons are clunky
while (i < children.size()) {
if (children[i]->text == "else") {
return children[i+1]->eval(t_ss);
}
else if (children[i]->text == "else if") {
if (get_bool_condition(children[i+1]->eval(t_ss))) {
return children[i+2]->eval(t_ss);
}
}
i += 3;
}
if (children.size() == 3) {
return children[2]->eval(t_ss);
} else {
return void_var();
}
}
return void_var();
}
};
struct For_AST_Node final : AST_Node {