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

Re-enable C++11 registration utility

Browse Source 
The latest VisualStudio 2013 CTP2 sworks with this now. Be sure to install it to build chaiscript
This commit is contained in:
Jason Turner 2014-03-22 16:24:16 -06:00
parent dbd9534bd9
commit 593ce462f7
2 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/utility/utility.hpp
View File

@ -17,7 +17,7 @@ namespace chaiscript
{ {
/// \todo Use of this utility, and uniform initializer lists, is causing memory errors in MSVC /// \todo Use of this utility, and uniform initializer lists, is causing memory errors in MSVC
/*
template<typename Class, typename ModuleType> template<typename Class, typename ModuleType>
void add_class(ModuleType &t_module, void add_class(ModuleType &t_module,
const std::string &t_classname, const std::string &t_classname,
@ -37,7 +37,7 @@ namespace chaiscript
} }
} }
*/
} }
} }

44
src/reflection.cpp
View File

@ -73,26 +73,15 @@ CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_reflect
chaiscript::bootstrap::standard_library::vector_type<std::vector<std::shared_ptr<chaiscript::AST_Node> > >("AST_NodeVector", m); chaiscript::bootstrap::standard_library::vector_type<std::vector<std::shared_ptr<chaiscript::AST_Node> > >("AST_NodeVector", m);
using namespace chaiscript; using namespace chaiscript;
m->add(chaiscript::user_type<chaiscript::exception::eval_error>(), "eval_error");
m->add(chaiscript::fun(&chaiscript::exception::eval_error::reason), "reason");
m->add(chaiscript::fun(&chaiscript::exception::eval_error::call_stack), "call_stack");
/*
chaiscript::utility::add_class<chaiscript::exception::eval_error>(*m, chaiscript::utility::add_class<chaiscript::exception::eval_error>(*m,
"eval_error", "eval_error",
{ }, { },
{ {fun(&chaiscript::exception::eval_error::reason), "reason"}, { {fun(&chaiscript::exception::eval_error::reason), "reason"},
{fun(&chaiscript::exception::eval_error::call_stack), "call_stack"} } {fun(&chaiscript::exception::eval_error::call_stack), "call_stack"} }
); );
*/
m->add(chaiscript::user_type<chaiscript::File_Position>(), "File_Position");
m->add(chaiscript::constructor<File_Position()>(), "File_Position");
m->add(chaiscript::constructor<File_Position(int, int)>(), "File_Position");
m->add(chaiscript::fun(&File_Position::line), "line");
m->add(chaiscript::fun(&File_Position::column), "column");
/*
chaiscript::utility::add_class<chaiscript::File_Position>(*m, chaiscript::utility::add_class<chaiscript::File_Position>(*m,
"File_Position", "File_Position",
{ constructor<File_Position()>(), { constructor<File_Position()>(),
@ -100,19 +89,8 @@ CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_reflect
{ {fun(&File_Position::line), "line"}, { {fun(&File_Position::line), "line"},
{fun(&File_Position::column), "column"} } {fun(&File_Position::column), "column"} }
); );
*/
m->add(chaiscript::user_type<AST_Node>(), "AST_Node");
m->add(chaiscript::fun(&AST_Node::text), "text");
m->add(chaiscript::fun(&AST_Node::identifier), "identifier");
m->add(chaiscript::fun(&AST_Node::filename), "filename");
m->add(chaiscript::fun(&AST_Node::start), "start");
m->add(chaiscript::fun(&AST_Node::end), "end");
m->add(chaiscript::fun(&AST_Node::internal_to_string), "internal_to_string");
m->add(chaiscript::fun(&AST_Node::children), "children");
m->add(chaiscript::fun(&AST_Node::replace_child), "replace_child");
/*
chaiscript::utility::add_class<AST_Node>(*m, chaiscript::utility::add_class<AST_Node>(*m,
"AST_Node", "AST_Node",
{ }, { },
@ -126,21 +104,15 @@ CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_reflect
{fun(&AST_Node::replace_child), "replace_child"} {fun(&AST_Node::replace_child), "replace_child"}
} }
); );
*/
m->add(chaiscript::user_type<parser::ChaiScript_Parser>(), "ChaiScript_Parser");
m->add(chaiscript::constructor<parser::ChaiScript_Parser()>(), "ChaiScript_Parser");
m->add(chaiscript::fun(&parser::ChaiScript_Parser::parse), "parse");
m->add(chaiscript::fun(&parser::ChaiScript_Parser::ast), "ast");
/*
chaiscript::utility::add_class<parser::ChaiScript_Parser>(*m, chaiscript::utility::add_class<parser::ChaiScript_Parser>(*m,
"ChaiScript_Parser", "ChaiScript_Parser",
{ constructor<parser::ChaiScript_Parser ()>() }, { constructor<parser::ChaiScript_Parser ()>() },
{ {fun(&parser::ChaiScript_Parser::parse), "parse"}, { {fun(&parser::ChaiScript_Parser::parse), "parse"},
{fun(&parser::ChaiScript_Parser::ast), "ast"} } {fun(&parser::ChaiScript_Parser::ast), "ast"} }
); );
*/
return m; return m;