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

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

Browse Source 
Conflicts:
	include/chaiscript/language/chaiscript_eval.hpp
	unittests/object_lifetime_test.cpp
	unittests/utility_test.cpp
This commit is contained in:
Jason Turner
2012-05-16 11:50:44 -06:00
parent 4674594ee7 4bcaa75fa4
commit a04dbf2c2d
9 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittests/utility_test.cpp
View File

@@ -37,8 +37,8 @@ int main()
chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());;
chai.add(m);
if (chai.eval<std::string>("auto t = Test(); t.function2(); ") == "Function2"
&& chai.eval<std::string>("auto t = Test(); t.functionOverload(1); ") == "int"
&& chai.eval<std::string>("auto t = Test(); t.functionOverload(1.1); ") == "double")
&& chai.eval<std::string>("auto t2 = Test(); t2.functionOverload(1); ") == "int"
&& chai.eval<std::string>("auto t3 = Test(); t3.functionOverload(1.1); ") == "double")
{
chai.eval("t = Test();");
return EXIT_SUCCESS;