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

Merge branch 'develop' of github.com:ChaiScript/ChaiScript into multithreaded_performance

Browse Source 
Conflicts:
	include/chaiscript/language/chaiscript_eval.hpp
This commit is contained in:
Jason Turner
2015-07-16 13:16:04 -06:00
parent 748c18f465 2fbc377119
commit 6a7a934e3e
14 changed files with 131 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1050,7 +1050,12 @@ namespace chaiscript
std::vector<Boxed_Value> vec;
if (!children.empty()) {
for (const auto &child : children[0]->children) {
vec.push_back(t_ss->call_function("clone", child->eval(t_ss)));
auto obj = child->eval(t_ss);
if (!obj.is_return_value()) {
vec.push_back(t_ss->call_function("clone", obj));
} else {
vec.push_back(std::move(obj));
}
}
}
return const_var(std::move(vec));
@@ -1076,8 +1081,12 @@ namespace chaiscript
std::map<std::string, Boxed_Value> retval;
for (const auto &child : children[0]->children) {
Boxed_Value bv = t_ss->call_function("clone", child->children[1]->eval(t_ss));
retval[t_ss->boxed_cast<std::string>(child->children[0]->eval(t_ss))] = std::move(bv);
auto obj = child->children[1]->eval(t_ss);
if (!obj.is_return_value()) {
obj = t_ss->call_function("clone", obj);
}
retval[t_ss->boxed_cast<std::string>(child->children[0]->eval(t_ss))] = std::move(obj);
}
return const_var(std::move(retval));