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

Merge branch 'master' into 2011-09-09-CxScript

Browse Source
This commit is contained in:
Jason Turner 2012-05-19 09:51:19 -06:00
commit 16bdfe4571
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,7 +375,7 @@ namespace chaiscript
struct State struct State
{ {
std::map<std::string, std::vector<Proxy_Function> > m_functions; std::map<std::string, std::vector<Proxy_Function> > m_functions;
std::map<std::string, Boxed_Value> m_function_objects; std::map<std::string, Proxy_Function> m_function_objects;
std::map<std::string, Boxed_Value> m_global_objects; std::map<std::string, Boxed_Value> m_global_objects;
Type_Name_Map m_types; Type_Name_Map m_types;
std::set<std::string> m_reserved_words; std::set<std::string> m_reserved_words;
@ -645,16 +645,16 @@ namespace chaiscript
{ {
chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex); chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
const std::map<std::string, Boxed_Value > &funs = get_function_objects_int(); const std::map<std::string, Proxy_Function> &funs = get_function_objects_int();
std::map<std::string, Boxed_Value>::const_iterator itr = funs.find(t_name); std::map<std::string, Proxy_Function>::const_iterator itr = funs.find(t_name);
if (itr != funs.end()) if (itr != funs.end())
{ {
return itr->second; return const_var(itr->second);
} else { } else {
throw std::range_error("Object not found: " + t_name); throw std::range_error("Object not found: " + t_name);
} }
} }
/** /**
@ -704,7 +704,18 @@ namespace chaiscript
{ {
chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex); chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
return get_function_objects_int(); const std::map<std::string, Proxy_Function> &funs = get_function_objects_int();
std::map<std::string, Boxed_Value> objs;
for (std::map<std::string, Proxy_Function>::const_iterator itr = funs.begin();
itr != funs.end();
++itr)
{
objs.insert(std::make_pair(itr->first, const_var(itr->second)));
}
return objs;
} }
@ -897,12 +908,12 @@ namespace chaiscript
return *(m_stack_holder->stacks.back()); return *(m_stack_holder->stacks.back());
} }
const std::map<std::string, Boxed_Value> &get_function_objects_int() const const std::map<std::string, Proxy_Function> &get_function_objects_int() const
{ {
return m_state.m_function_objects; return m_state.m_function_objects;
} }
std::map<std::string, Boxed_Value> &get_function_objects_int() std::map<std::string, Proxy_Function> &get_function_objects_int()
{ {
return m_state.m_function_objects; return m_state.m_function_objects;
} }
@ -1038,7 +1049,7 @@ namespace chaiscript
std::map<std::string, std::vector<Proxy_Function> >::iterator itr std::map<std::string, std::vector<Proxy_Function> >::iterator itr
= funcs.find(t_name); = funcs.find(t_name);
std::map<std::string, Boxed_Value> &func_objs = get_function_objects_int(); std::map<std::string, Proxy_Function> &func_objs = get_function_objects_int();
if (itr != funcs.end()) if (itr != funcs.end())
{ {
@ -1055,12 +1066,12 @@ namespace chaiscript
vec.push_back(t_f); vec.push_back(t_f);
std::stable_sort(vec.begin(), vec.end(), &function_less_than); std::stable_sort(vec.begin(), vec.end(), &function_less_than);
func_objs[t_name] = Boxed_Value(Const_Proxy_Function(new Dispatch_Function(vec))); func_objs[t_name] = Proxy_Function(new Dispatch_Function(vec));
} else { } else {
std::vector<Proxy_Function> vec; std::vector<Proxy_Function> vec;
vec.push_back(t_f); vec.push_back(t_f);
funcs.insert(std::make_pair(t_name, vec)); funcs.insert(std::make_pair(t_name, vec));
func_objs[t_name] = const_var(t_f); func_objs[t_name] = t_f;
} }

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

@ -1460,12 +1460,9 @@ namespace chaiscript
* Reads a switch statement from input * Reads a switch statement from input
*/ */
bool Switch() { bool Switch() {
bool retval = false;
size_t prev_stack_top = m_match_stack.size(); size_t prev_stack_top = m_match_stack.size();
if (Keyword("switch")) { if (Keyword("switch")) {
retval = true;
if (!Char('(')) { if (!Char('(')) {
throw exception::eval_error("Incomplete 'switch' expression", File_Position(m_line, m_col), *m_filename); throw exception::eval_error("Incomplete 'switch' expression", File_Position(m_line, m_col), *m_filename);
@ -1478,8 +1475,6 @@ namespace chaiscript
while (Eol()) {} while (Eol()) {}
if (Char('{')) { if (Char('{')) {
retval = true;
while (Eol()) {} while (Eol()) {}
while (Case()) { while (Case()) {
@ -1497,9 +1492,12 @@ namespace chaiscript
} }
build_match(AST_NodePtr(new eval::Switch_AST_Node()), prev_stack_top); build_match(AST_NodePtr(new eval::Switch_AST_Node()), prev_stack_top);
return true;
} else {
return false;
} }
return retval;
} }
/** /**
@ -2000,7 +1998,6 @@ namespace chaiscript
bool saw_eol = true; bool saw_eol = true;
while (has_more) { while (has_more) {
has_more = false;
int prev_line = m_line; int prev_line = m_line;
int prev_col = m_col; int prev_col = m_col;
if (Def()) { if (Def()) {