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

Reduce overhead necessary for internal_eval. Desirable due to the use of "eval" during cloning operations

Browse Source
This commit is contained in:
Jason Turner 2009-09-22 01:58:16 +00:00
parent d3cdd6959d
commit 443902f787
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/chaiscript/language/chaiscript_engine.hpp
View File

@ -201,10 +201,13 @@ namespace chaiscript
/** /**
* Evaluates the given string in by parsing it and running the results through the evaluator * Evaluates the given string in by parsing it and running the results through the evaluator
*/ */
Boxed_Value do_eval(const std::string &input, const std::string &filename = "__EVAL__") { Boxed_Value do_eval(const std::string &input, const std::string &filename = "__EVAL__", bool internal = false) {
ChaiScript_Parser parser; ChaiScript_Parser parser;
engine.sync_cache(); if (!internal)
{
engine.sync_cache();
}
//debug_print(tokens); //debug_print(tokens);
Boxed_Value value; Boxed_Value value;
@ -213,25 +216,40 @@ namespace chaiscript
// to the parser. This is so that the parser does not have the overhead of passing // to the parser. This is so that the parser does not have the overhead of passing
// around and copying strings // around and copying strings
// //
if (filename != "__EVAL__")
{
#ifndef CHAISCRIPT_NO_THREADS #ifndef CHAISCRIPT_NO_THREADS
boost::unique_lock<boost::shared_mutex> l(mutex); boost::unique_lock<boost::shared_mutex> l(mutex);
#endif #endif
loaded_files.insert(filename); loaded_files.insert(filename);
try {
try { if (parser.parse(input, loaded_files.find(filename)->c_str())) {
if (parser.parse(input, loaded_files.find(filename)->c_str())) {
#ifndef CHAISCRIPT_NO_THREADS #ifndef CHAISCRIPT_NO_THREADS
l.unlock(); l.unlock();
#endif #endif
//parser.show_match_stack(); //parser.show_match_stack();
value = eval_token<Eval_Engine>(engine, parser.ast()); value = eval_token<Eval_Engine>(engine, parser.ast());
}
}
catch (const Return_Value &rv) {
value = rv.retval;
}
} else {
try {
if (parser.parse(input, loaded_files.find(filename)->c_str())) {
//parser.show_match_stack();
value = eval_token<Eval_Engine>(engine, parser.ast());
}
}
catch (const Return_Value &rv) {
value = rv.retval;
} }
} }
catch (const Return_Value &rv) {
value = rv.retval;
}
engine.sync_cache(); if (!internal)
{
engine.sync_cache();
}
return value; return value;
} }
@ -240,7 +258,7 @@ namespace chaiscript
* Evaluates the given boxed string, used during eval() inside of a script * Evaluates the given boxed string, used during eval() inside of a script
*/ */
const Boxed_Value internal_eval(const std::vector<Boxed_Value> &vals) { const Boxed_Value internal_eval(const std::vector<Boxed_Value> &vals) {
return do_eval(boxed_cast<std::string>(vals.at(0))); return do_eval(boxed_cast<std::string>(vals.at(0)), "__EVAL__", true);
} }
void use(const std::string &filename) void use(const std::string &filename)