diff --git a/contrib/geshi/chaiscript.php b/contrib/geshi/chaiscript.php index 33711fb..99847ec 100644 --- a/contrib/geshi/chaiscript.php +++ b/contrib/geshi/chaiscript.php @@ -3,7 +3,7 @@ * chaiscript.php * -------------- * Author: Jason Turner & Jonathan Turner (based on JavaScript by Ben Keen (ben.keen@gmail.com)) - * Copyright: (c) 2010 Jason Turner (lefticus@gmail.com) (c) 2009 Jonathan Turner + * Copyright: (c) 2010 Jason Turner (jason@emptycrate.com) (c) 2009 Jonathan Turner * (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter) * Release Version: 1.0 * Date Started: 2009/07/03 diff --git a/contrib/test/callbacktest.cpp b/contrib/test/callbacktest.cpp index a0b9977..bbb68cd 100644 --- a/contrib/test/callbacktest.cpp +++ b/contrib/test/callbacktest.cpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/contrib/test/dispatchkit_test.cpp b/contrib/test/dispatchkit_test.cpp index 7e0c64d..0eab951 100644 --- a/contrib/test/dispatchkit_test.cpp +++ b/contrib/test/dispatchkit_test.cpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/contrib/test/dispatchkit_unittest.cpp b/contrib/test/dispatchkit_unittest.cpp index 9d6342a..188235e 100644 --- a/contrib/test/dispatchkit_unittest.cpp +++ b/contrib/test/dispatchkit_unittest.cpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include "dispatchkit.hpp" diff --git a/contrib/test/sensors.cpp b/contrib/test/sensors.cpp index f67418f..84b0464 100644 --- a/contrib/test/sensors.cpp +++ b/contrib/test/sensors.cpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/include/chaiscript/chaiscript.hpp b/include/chaiscript/chaiscript.hpp index 346c0a9..4cf4088 100644 --- a/include/chaiscript/chaiscript.hpp +++ b/include/chaiscript/chaiscript.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_HPP_ diff --git a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp index 9b3e734..79450e5 100644 --- a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp +++ b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __bad_boxed_cast_hpp__ diff --git a/include/chaiscript/dispatchkit/bind_first.hpp b/include/chaiscript/dispatchkit/bind_first.hpp index 7a7cf52..830639e 100644 --- a/include/chaiscript/dispatchkit/bind_first.hpp +++ b/include/chaiscript/dispatchkit/bind_first.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp index 3e04156..3e2bc73 100644 --- a/include/chaiscript/dispatchkit/bootstrap.hpp +++ b/include/chaiscript/dispatchkit/bootstrap.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __bootstrap_hpp diff --git a/include/chaiscript/dispatchkit/bootstrap_stl.hpp b/include/chaiscript/dispatchkit/bootstrap_stl.hpp index 7302fce..472c033 100644 --- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp +++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com /** diff --git a/include/chaiscript/dispatchkit/boxed_cast.hpp b/include/chaiscript/dispatchkit/boxed_cast.hpp index bed5a51..b410a31 100644 --- a/include/chaiscript/dispatchkit/boxed_cast.hpp +++ b/include/chaiscript/dispatchkit/boxed_cast.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __boxed_cast_hpp__ diff --git a/include/chaiscript/dispatchkit/boxed_cast_helper.hpp b/include/chaiscript/dispatchkit/boxed_cast_helper.hpp index 1fd6ef2..2f056c7 100644 --- a/include/chaiscript/dispatchkit/boxed_cast_helper.hpp +++ b/include/chaiscript/dispatchkit/boxed_cast_helper.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __boxed_cast_helper_hpp__ diff --git a/include/chaiscript/dispatchkit/boxed_pod_value.hpp b/include/chaiscript/dispatchkit/boxed_pod_value.hpp index 0fb3cbd..e13133e 100644 --- a/include/chaiscript/dispatchkit/boxed_pod_value.hpp +++ b/include/chaiscript/dispatchkit/boxed_pod_value.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __boxed_pod_value_hpp__ diff --git a/include/chaiscript/dispatchkit/boxed_value.hpp b/include/chaiscript/dispatchkit/boxed_value.hpp index 01d8ef4..5ee324c 100644 --- a/include/chaiscript/dispatchkit/boxed_value.hpp +++ b/include/chaiscript/dispatchkit/boxed_value.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __boxed_value_hpp__ diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp index e617430..63e21c8 100644 --- a/include/chaiscript/dispatchkit/dispatchkit.hpp +++ b/include/chaiscript/dispatchkit/dispatchkit.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __dispatchkit_hpp__ diff --git a/include/chaiscript/dispatchkit/function_call.hpp b/include/chaiscript/dispatchkit/function_call.hpp index aa0ac3b..2e3f14e 100644 --- a/include/chaiscript/dispatchkit/function_call.hpp +++ b/include/chaiscript/dispatchkit/function_call.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __function_call_hpp__ diff --git a/include/chaiscript/dispatchkit/function_call_detail.hpp b/include/chaiscript/dispatchkit/function_call_detail.hpp index f52185e..61de95e 100644 --- a/include/chaiscript/dispatchkit/function_call_detail.hpp +++ b/include/chaiscript/dispatchkit/function_call_detail.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/include/chaiscript/dispatchkit/handle_return.hpp b/include/chaiscript/dispatchkit/handle_return.hpp index 86946d1..1805646 100644 --- a/include/chaiscript/dispatchkit/handle_return.hpp +++ b/include/chaiscript/dispatchkit/handle_return.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __handle_return_hpp__ diff --git a/include/chaiscript/dispatchkit/proxy_constructors.hpp b/include/chaiscript/dispatchkit/proxy_constructors.hpp index 51b5960..6ba0be2 100644 --- a/include/chaiscript/dispatchkit/proxy_constructors.hpp +++ b/include/chaiscript/dispatchkit/proxy_constructors.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp index 6151a25..007cbbd 100644 --- a/include/chaiscript/dispatchkit/proxy_functions.hpp +++ b/include/chaiscript/dispatchkit/proxy_functions.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com diff --git a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp index 1c67f3c..c3d3cd0 100644 --- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp +++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/include/chaiscript/dispatchkit/register_function.hpp b/include/chaiscript/dispatchkit/register_function.hpp index 5e410f1..c85b035 100644 --- a/include/chaiscript/dispatchkit/register_function.hpp +++ b/include/chaiscript/dispatchkit/register_function.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __register_function_hpp__ diff --git a/include/chaiscript/dispatchkit/type_info.hpp b/include/chaiscript/dispatchkit/type_info.hpp index 547945e..eb16d91 100644 --- a/include/chaiscript/dispatchkit/type_info.hpp +++ b/include/chaiscript/dispatchkit/type_info.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef __type_info_hpp__ diff --git a/include/chaiscript/language/chaiscript_common.hpp b/include/chaiscript/language/chaiscript_common.hpp index aefa064..2dff02e 100644 --- a/include/chaiscript/language/chaiscript_common.hpp +++ b/include/chaiscript/language/chaiscript_common.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef _CHAISCRIPT_COMMON_HPP diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp index c9ec792..6c40fe6 100644 --- a/include/chaiscript/language/chaiscript_engine.hpp +++ b/include/chaiscript/language/chaiscript_engine.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_ENGINE_HPP_ diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp index 17d499a..c70969c 100644 --- a/include/chaiscript/language/chaiscript_eval.hpp +++ b/include/chaiscript/language/chaiscript_eval.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_EVAL_HPP_ diff --git a/include/chaiscript/language/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp index 423de13..3ba8cd2 100644 --- a/include/chaiscript/language/chaiscript_parser.hpp +++ b/include/chaiscript/language/chaiscript_parser.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_PARSER_HPP_ diff --git a/include/chaiscript/language/chaiscript_prelude.hpp b/include/chaiscript/language/chaiscript_prelude.hpp index 5979361..7dcc0c9 100644 --- a/include/chaiscript/language/chaiscript_prelude.hpp +++ b/include/chaiscript/language/chaiscript_prelude.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_PRELUDE_HPP_ diff --git a/src/example.cpp b/src/example.cpp index 1202ad2..6aff54b 100644 --- a/src/example.cpp +++ b/src/example.cpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/src/main.cpp b/src/main.cpp index 89120dd..f9a008b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include @@ -142,7 +142,11 @@ int main(int argc, char *argv[]) { catch (chaiscript::Eval_Error &ee) { std::cout << ee.what(); if (ee.call_stack.size() > 0) { - std::cout << "during evaluation at (" << ee.call_stack[0]->start.line << ", " << ee.call_stack[0]->start.column << ")"; + std::cout << "during evaluation at (" << ee.call_stack[0]->filename << " " << ee.call_stack[0]->start.line << ", " << ee.call_stack[0]->start.column << ")"; + for (int j = 1; j < ee.call_stack.size(); ++j) { + std::cout << std::endl; + std::cout << " > " << ee.call_stack[j]->filename << " (" << ee.call_stack[j]->start.line << ", " << ee.call_stack[j]->start.column << ")"; + } } std::cout << std::endl; } diff --git a/src/multithreaded.cpp b/src/multithreaded.cpp index ed6f268..52c9fbe 100644 --- a/src/multithreaded.cpp +++ b/src/multithreaded.cpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jturner@minnow-lang.org) -// and Jason Turner (lefticus@gmail.com) +// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) +// and Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include