From b7e1cf41e5b598ec6bdd21446aa833d847a0b772 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Mon, 4 Jun 2012 07:31:20 -0600 Subject: [PATCH] Move to using the new constructor that searched for the stdlib to improve compile time. --- samples/example.cpp | 4 ++-- unittests/cpp_lambda_test.cpp | 3 +-- unittests/dynamic_object_test.cpp | 3 +-- unittests/eval_catch_exception_test.cpp | 11 +++++------ unittests/function_ordering_test.cpp | 3 +-- unittests/functor_cast_test.cpp | 3 +-- unittests/functor_creation_test.cpp | 3 +-- unittests/object_lifetime_test.cpp | 3 +-- unittests/short_comparison_test.cpp | 3 +-- 9 files changed, 14 insertions(+), 22 deletions(-) diff --git a/samples/example.cpp b/samples/example.cpp index e5838b0..e753451 100644 --- a/samples/example.cpp +++ b/samples/example.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include void log(const std::string &msg) @@ -67,7 +67,7 @@ void take_shared_ptr(const std::shared_ptr &p) int main(int /*argc*/, char * /*argv*/[]) { using namespace chaiscript; - ChaiScript chai(Std_Lib::library()); + ChaiScript chai; //Create a new system object and share it with the chaiscript engine System system; diff --git a/unittests/cpp_lambda_test.cpp b/unittests/cpp_lambda_test.cpp index ec5a0ff..d38983d 100644 --- a/unittests/cpp_lambda_test.cpp +++ b/unittests/cpp_lambda_test.cpp @@ -1,6 +1,5 @@ #include -#include int main() { @@ -9,7 +8,7 @@ int main() // in an std::function or provide the signature - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; // provide the signature chai.add(chaiscript::fun([] { return "hello"; } ), "f1"); diff --git a/unittests/dynamic_object_test.cpp b/unittests/dynamic_object_test.cpp index 60c1e5e..3e09ef6 100644 --- a/unittests/dynamic_object_test.cpp +++ b/unittests/dynamic_object_test.cpp @@ -1,5 +1,4 @@ -#include #include template @@ -16,7 +15,7 @@ void assert_equal(const LHS &lhs, const RHS &rhs) int main() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; chai("attr bob::z; def bob::bob() { this.z = 10 }; auto x = bob()"); diff --git a/unittests/eval_catch_exception_test.cpp b/unittests/eval_catch_exception_test.cpp index 0a7aced..21510d7 100644 --- a/unittests/eval_catch_exception_test.cpp +++ b/unittests/eval_catch_exception_test.cpp @@ -1,11 +1,10 @@ // Tests to make sure that the order in which function dispatches occur is correct #include -#include int test_generic() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; try { chai.eval("throw(runtime_error(\"error\"));"); @@ -23,7 +22,7 @@ int test_generic() int test_1() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; try { chai.eval("throw(1)", chaiscript::exception_specification()); @@ -40,7 +39,7 @@ int test_1() int test_2() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; try { chai.eval("throw(1.0)", chaiscript::exception_specification()); @@ -57,7 +56,7 @@ int test_2() int test_5() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; try { chai.eval("throw(runtime_error(\"error\"))", chaiscript::exception_specification()); @@ -83,7 +82,7 @@ int test_5() int test_unhandled() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; try { chai.eval("throw(\"error\")", chaiscript::exception_specification()); diff --git a/unittests/function_ordering_test.cpp b/unittests/function_ordering_test.cpp index 125c2a1..0055220 100644 --- a/unittests/function_ordering_test.cpp +++ b/unittests/function_ordering_test.cpp @@ -1,7 +1,6 @@ // Tests to make sure that the order in which function dispatches occur is correct #include -#include int test_one(const int &) { @@ -15,7 +14,7 @@ int test_two(int &) int main() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; chai.eval("def test_fun(x) { return 3; }"); chai.eval("def test_fun(x) : x == \"hi\" { return 4; }"); // chai.eval("def test_fun(x) { return 5; }"); diff --git a/unittests/functor_cast_test.cpp b/unittests/functor_cast_test.cpp index 33250c9..7c76ca2 100644 --- a/unittests/functor_cast_test.cpp +++ b/unittests/functor_cast_test.cpp @@ -1,5 +1,4 @@ #include -#include double test_call(const std::function &f, int val) { @@ -9,7 +8,7 @@ double test_call(const std::function &f, int val) int main() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; chai.add(chaiscript::fun(&test_call), "test_call"); diff --git a/unittests/functor_creation_test.cpp b/unittests/functor_creation_test.cpp index d5289cb..bea1244 100644 --- a/unittests/functor_creation_test.cpp +++ b/unittests/functor_creation_test.cpp @@ -1,11 +1,10 @@ #include -#include int main() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; chai.eval("def func() { print(\"Hello World\"); } "); diff --git a/unittests/object_lifetime_test.cpp b/unittests/object_lifetime_test.cpp index 6d24f9c..ab66ad7 100644 --- a/unittests/object_lifetime_test.cpp +++ b/unittests/object_lifetime_test.cpp @@ -1,5 +1,4 @@ #include -#include class Test { @@ -37,7 +36,7 @@ int main() { {chaiscript::fun(&Test::count), "count"} } ); - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; chai.add(m); // chai.add(chaiscript::fun(&Test::count), "count"); diff --git a/unittests/short_comparison_test.cpp b/unittests/short_comparison_test.cpp index 8295f32..5aacfdc 100644 --- a/unittests/short_comparison_test.cpp +++ b/unittests/short_comparison_test.cpp @@ -1,5 +1,4 @@ #include -#include class Test { public: @@ -13,7 +12,7 @@ class Test { int main() { - chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); + chaiscript::ChaiScript chai; chai.add(chaiscript::user_type(), "Test"); chai.add(chaiscript::constructor(), "Test");