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

Avoid placeholder lookup cost

Browse Source
This commit is contained in:
Jason Turner
2015-06-20 07:13:54 -06:00
parent 2870874d91
commit c4633436ba
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@@ -408,8 +408,7 @@ namespace chaiscript
}; };
Dispatch_Engine() Dispatch_Engine()
: m_stack_holder(this), : m_stack_holder(this)
m_place_holder(std::make_shared<dispatch::Placeholder_Object>())
{ {
} }
@@ -572,12 +571,6 @@ namespace chaiscript
/// ensure that it is always in scope. /// ensure that it is always in scope.
Boxed_Value get_object(const std::string &name) const Boxed_Value get_object(const std::string &name) const
{ {
// Is it a placeholder object?
if (name == "_")
{
return m_place_holder;
}
auto &stack = get_stack_data(); auto &stack = get_stack_data();
// Is it in the stack? // Is it in the stack?
@@ -1345,8 +1338,6 @@ namespace chaiscript
State m_state; State m_state;
Boxed_Value m_place_holder;
}; };
} }
} }

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

@@ -170,15 +170,14 @@ namespace chaiscript
{ {
if (t_text == "true") { if (t_text == "true") {
return const_var(true); return const_var(true);
} } else if (t_text == "false") {
else if (t_text == "false") {
return const_var(false); return const_var(false);
} } else if (t_text == "Infinity") {
else if (t_text == "Infinity") {
return const_var(std::numeric_limits<double>::infinity()); return const_var(std::numeric_limits<double>::infinity());
} } else if (t_text == "NaN") {
else if (t_text == "NaN") {
return const_var(std::numeric_limits<double>::quiet_NaN()); return const_var(std::numeric_limits<double>::quiet_NaN());
} else if (t_text == "_") {
return Boxed_Value(std::make_shared<dispatch::Placeholder_Object>());
} else { } else {
return Boxed_Value(); return Boxed_Value();
} }