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

Make def more efficient, fix to_string(string)

Browse Source
This commit is contained in:
Jason Turner
2014-11-13 12:28:52 -07:00
parent 63a083b47b
commit cf49b1b30c
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@@ -443,7 +443,7 @@ namespace chaiscript
operators::assign<bool>(m); operators::assign<bool>(m);
operators::equal<bool>(m); operators::equal<bool>(m);
m->add(fun(&to_string<const std::string &>), "to_string"); m->add(fun<std::string (const std::string &t_ss)>([](const std::string &s) -> std::string { return s; }), "to_string");
m->add(fun(&Bootstrap::bool_to_string), "to_string"); m->add(fun(&Bootstrap::bool_to_string), "to_string");
m->add(fun(&unknown_assign), "="); m->add(fun(&unknown_assign), "=");
m->add(fun(&throw_exception), "throw"); m->add(fun(&throw_exception), "throw");

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

@@ -443,17 +443,13 @@ namespace chaiscript
/// Adds a named object to the current scope /// Adds a named object to the current scope
/// \warning This version does not check the validity of the name
/// it is meant for internal use only
void add_object(const std::string &name, const Boxed_Value &obj) const void add_object(const std::string &name, const Boxed_Value &obj) const
{ {
auto &stack = get_stack_data(); if (!get_stack_data().back().insert(std::make_pair(name, obj)).second)
validate_object_name(name);
auto &scope = stack.back();
if (scope.find(name) != scope.end())
{ {
throw chaiscript::exception::name_conflict_error(name); throw chaiscript::exception::name_conflict_error(name);
} else {
scope.insert(std::make_pair(name, obj));
} }
} }