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

Add simple efficencies for static ids

Browse Source
This commit is contained in:
Jason Turner
2011-03-28 19:50:41 -06:00
parent 79e8af4f6e
commit 8ecd3a084b
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,22 +99,16 @@ namespace chaiscript
struct Id_AST_Node : public AST_Node { struct Id_AST_Node : public AST_Node {
public: public:
Id_AST_Node(const std::string &t_ast_node_text = "", int t_id = AST_Node_Type::Id, const boost::shared_ptr<std::string> &t_fname=boost::shared_ptr<std::string>(), int t_start_line = 0, int t_start_col = 0, int t_end_line = 0, int t_end_col = 0) : Id_AST_Node(const std::string &t_ast_node_text = "", int t_id = AST_Node_Type::Id, const boost::shared_ptr<std::string> &t_fname=boost::shared_ptr<std::string>(), int t_start_line = 0, int t_start_col = 0, int t_end_line = 0, int t_end_col = 0) :
AST_Node(t_ast_node_text, t_id, t_fname, t_start_line, t_start_col, t_end_line, t_end_col) { } AST_Node(t_ast_node_text, t_id, t_fname, t_start_line, t_start_col, t_end_line, t_end_col),
m_value(get_value(t_ast_node_text))
{ }
virtual ~Id_AST_Node() {} virtual ~Id_AST_Node() {}
virtual Boxed_Value eval_internal(chaiscript::detail::Dispatch_Engine &t_ss){ virtual Boxed_Value eval_internal(chaiscript::detail::Dispatch_Engine &t_ss) {
if (this->text == "true") { if (!m_value.is_undef())
return const_var(true); {
} return m_value;
else if (this->text == "false") { } else {
return const_var(false);
}
else if (this->text == "Infinity") {
return const_var(std::numeric_limits<double>::infinity());
}
else if (this->text == "NaN") {
return const_var(std::numeric_limits<double>::quiet_NaN());
}
else {
try { try {
return t_ss.get_object(this->text); return t_ss.get_object(this->text);
} }
@@ -123,6 +117,27 @@ namespace chaiscript
} }
} }
} }
private:
static Boxed_Value get_value(const std::string &t_text)
{
if (t_text == "true") {
return const_var(true);
}
else if (t_text == "false") {
return const_var(false);
}
else if (t_text == "Infinity") {
return const_var(std::numeric_limits<double>::infinity());
}
else if (t_text == "NaN") {
return const_var(std::numeric_limits<double>::quiet_NaN());
} else {
return Boxed_Value();
}
}
Boxed_Value m_value;
}; };
struct Char_AST_Node : public AST_Node { struct Char_AST_Node : public AST_Node {
@@ -168,7 +183,7 @@ namespace chaiscript
try { try {
t_ss.set_stack(new_stack); t_ss.set_stack(new_stack);
const Boxed_Value &retval = (*boxed_cast<Const_Proxy_Function>(fn))(plb); const Boxed_Value &retval = (*boxed_cast<const Const_Proxy_Function &>(fn))(plb);
t_ss.set_stack(prev_stack); t_ss.set_stack(prev_stack);
return retval; return retval;
} }
@@ -208,10 +223,8 @@ namespace chaiscript
} }
} }
Boxed_Value fn = this->children[0]->eval(t_ss);
try { try {
return (*boxed_cast<Const_Proxy_Function >(fn))(plb); return (*boxed_cast<const Const_Proxy_Function &>(this->children[0]->eval(t_ss)))(plb);
} }
catch(const exception::dispatch_error &e){ catch(const exception::dispatch_error &e){
throw exception::eval_error(std::string(e.what()) + " with function '" + this->children[0]->text + "'"); throw exception::eval_error(std::string(e.what()) + " with function '" + this->children[0]->text + "'");