From 71348b79672609de62ded5e83fde593274767d16 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Mon, 17 Feb 2014 16:24:29 -0700 Subject: [PATCH] Update copyrights to 2014 and some comment formatting --- include/chaiscript/chaiscript.hpp | 2 +- include/chaiscript/chaiscript_threading.hpp | 2 +- .../chaiscript/dispatchkit/bad_boxed_cast.hpp | 2 +- include/chaiscript/dispatchkit/bind_first.hpp | 2 +- include/chaiscript/dispatchkit/bootstrap.hpp | 2 +- .../chaiscript/dispatchkit/bootstrap_stl.hpp | 136 ++++++++---------- include/chaiscript/dispatchkit/boxed_cast.hpp | 2 +- .../dispatchkit/boxed_cast_helper.hpp | 2 +- .../chaiscript/dispatchkit/boxed_number.hpp | 2 +- .../chaiscript/dispatchkit/boxed_value.hpp | 2 +- .../chaiscript/dispatchkit/dispatchkit.hpp | 2 +- .../dispatchkit/dynamic_cast_conversion.hpp | 2 +- .../chaiscript/dispatchkit/dynamic_object.hpp | 2 +- .../dispatchkit/exception_specification.hpp | 2 +- .../chaiscript/dispatchkit/function_call.hpp | 4 +- .../dispatchkit/function_call_detail.hpp | 2 +- .../chaiscript/dispatchkit/handle_return.hpp | 2 +- include/chaiscript/dispatchkit/operators.hpp | 2 +- .../dispatchkit/proxy_constructors.hpp | 2 +- .../dispatchkit/proxy_functions.hpp | 2 +- .../dispatchkit/proxy_functions_detail.hpp | 2 +- .../dispatchkit/register_function.hpp | 2 +- include/chaiscript/dispatchkit/type_info.hpp | 2 +- .../language/chaiscript_algebraic.hpp | 2 +- .../chaiscript/language/chaiscript_common.hpp | 37 ++--- .../chaiscript/language/chaiscript_engine.hpp | 27 ++-- .../chaiscript/language/chaiscript_eval.hpp | 2 +- .../chaiscript/language/chaiscript_parser.hpp | 2 +- .../language/chaiscript_prelude.hpp | 2 +- include/chaiscript/utility/utility.hpp | 2 +- license.txt | 5 +- readme.md | 3 +- src/main.cpp | 4 +- src/reflection.cpp | 6 + src/stl_extra.cpp | 5 + unittests/integer_literal_test.cpp | 2 - unittests/multithreaded_test.cpp | 6 - 37 files changed, 131 insertions(+), 156 deletions(-) diff --git a/include/chaiscript/chaiscript.hpp b/include/chaiscript/chaiscript.hpp index 47ba903..afdba24 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_HPP_ diff --git a/include/chaiscript/chaiscript_threading.hpp b/include/chaiscript/chaiscript_threading.hpp index bec5db1..36d2279 100644 --- a/include/chaiscript/chaiscript_threading.hpp +++ b/include/chaiscript/chaiscript_threading.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_THREADING_HPP_ diff --git a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp index c920257..5d51981 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_BAD_BOXED_CAST_HPP_ diff --git a/include/chaiscript/dispatchkit/bind_first.hpp b/include/chaiscript/dispatchkit/bind_first.hpp index 953344d..512a120 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, 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 25852c6..787b05c 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_BOOTSTRAP_HPP_ diff --git a/include/chaiscript/dispatchkit/bootstrap_stl.hpp b/include/chaiscript/dispatchkit/bootstrap_stl.hpp index f7534ac..db6520d 100644 --- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp +++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp @@ -1,16 +1,13 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com -/** - * \file - * This file contains utility functions for registration of STL container - * classes. The methodology used is based on the SGI STL concepts. - * http://www.sgi.com/tech/stl/table_of_contents.html - */ - +/// \file +/// This file contains utility functions for registration of STL container +/// classes. The methodology used is based on the SGI STL concepts. +/// http://www.sgi.com/tech/stl/table_of_contents.html #ifndef CHAISCRIPT_BOOTSTRAP_STL_HPP_ @@ -25,11 +22,10 @@ namespace chaiscript { namespace standard_library { - /** - * Bidir_Range, based on the D concept of ranges. - * \todo Update the Range code to base its capabilities on - * the user_typetraits of the iterator passed in - */ + + /// Bidir_Range, based on the D concept of ranges. + /// \todo Update the Range code to base its capabilities on + /// the user_typetraits of the iterator passed in template struct Bidir_Range { @@ -245,9 +241,8 @@ namespace chaiscript - /** - * Add Bidir_Range support for the given ContainerType - */ + + /// Add Bidir_Range support for the given ContainerType template ModulePtr input_range_type_impl(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -266,9 +261,8 @@ namespace chaiscript return m; } - /** - * Algorithm for inserting at a specific position into a container - */ + + /// Algorithm for inserting at a specific position into a container template void insert_at(Type &container, int pos, const typename Type::value_type &v) { @@ -284,9 +278,8 @@ namespace chaiscript container.insert(itr, v); } - /** - * Algorithm for erasing a specific position from a container - */ + + /// Algorithm for erasing a specific position from a container template void erase_at(Type &container, int pos) { @@ -312,10 +305,9 @@ namespace chaiscript return m; } - /** - * Add random_access_container concept to the given ContainerType - * http://www.sgi.com/tech/stl/RandomAccessContainer.html - */ + + /// Add random_access_container concept to the given ContainerType + /// http://www.sgi.com/tech/stl/RandomAccessContainer.html template ModulePtr random_access_container_type(const std::string &/*type*/, ModulePtr m = ModulePtr(new Module())) { @@ -334,10 +326,9 @@ namespace chaiscript return m; } - /** - * Add assignable concept to the given ContainerType - * http://www.sgi.com/tech/stl/Assignable.html - */ + + /// Add assignable concept to the given ContainerType + /// http://www.sgi.com/tech/stl/Assignable.html template ModulePtr assignable_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -346,10 +337,9 @@ namespace chaiscript return m; } - /** - * Add container concept to the given ContainerType - * http://www.sgi.com/tech/stl/Container.html - */ + + /// Add container concept to the given ContainerType + /// http://www.sgi.com/tech/stl/Container.html template ModulePtr container_type(const std::string &/*type*/, ModulePtr m = ModulePtr(new Module())) { @@ -360,10 +350,9 @@ namespace chaiscript return m; } - /** - * Add default constructable concept to the given Type - * http://www.sgi.com/tech/stl/DefaultConstructible.html - */ + + /// Add default constructable concept to the given Type + /// http://www.sgi.com/tech/stl/DefaultConstructible.html template ModulePtr default_constructible_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -373,10 +362,9 @@ namespace chaiscript - /** - * Add sequence concept to the given ContainerType - * http://www.sgi.com/tech/stl/Sequence.html - */ + + /// Add sequence concept to the given ContainerType + /// http://www.sgi.com/tech/stl/Sequence.html template ModulePtr sequence_type(const std::string &/*type*/, ModulePtr m = ModulePtr(new Module())) { @@ -394,10 +382,9 @@ namespace chaiscript return m; } - /** - * Add back insertion sequence concept to the given ContainerType - * http://www.sgi.com/tech/stl/BackInsertionSequence.html - */ + + /// Add back insertion sequence concept to the given ContainerType + /// http://www.sgi.com/tech/stl/BackInsertionSequence.html template ModulePtr back_insertion_sequence_type(const std::string &/*type*/, ModulePtr m = ModulePtr(new Module())) { @@ -420,10 +407,9 @@ namespace chaiscript } - /** - *Front insertion sequence - *http://www.sgi.com/tech/stl/FrontInsertionSequence.html - */ + + /// Front insertion sequence + /// http://www.sgi.com/tech/stl/FrontInsertionSequence.html template ModulePtr front_insertion_sequence_type(const std::string &, ModulePtr m = ModulePtr(new Module())) { @@ -446,10 +432,9 @@ namespace chaiscript return m; } - /** - * bootstrap a given PairType - * http://www.sgi.com/tech/stl/pair.html - */ + + /// bootstrap a given PairType + /// http://www.sgi.com/tech/stl/pair.html template ModulePtr pair_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -469,10 +454,10 @@ namespace chaiscript } - /** - * Add pair associative container concept to the given ContainerType - * http://www.sgi.com/tech/stl/PairAssociativeContainer.html - */ + + /// Add pair associative container concept to the given ContainerType + /// http://www.sgi.com/tech/stl/PairAssociativeContainer.html + template ModulePtr pair_associative_container_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -481,10 +466,9 @@ namespace chaiscript return m; } - /** - * Add unique associative container concept to the given ContainerType - * http://www.sgi.com/tech/stl/UniqueAssociativeContainer.html - */ + + /// Add unique associative container concept to the given ContainerType + /// http://www.sgi.com/tech/stl/UniqueAssociativeContainer.html template ModulePtr unique_associative_container_type(const std::string &/*type*/, ModulePtr m = ModulePtr(new Module())) { @@ -510,10 +494,9 @@ namespace chaiscript return m; } - /** - * Add a MapType container - * http://www.sgi.com/tech/stl/Map.html - */ + + /// Add a MapType container + /// http://www.sgi.com/tech/stl/Map.html template ModulePtr map_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -532,10 +515,9 @@ namespace chaiscript return m; } - /** - * hopefully working List type - * http://www.sgi.com/tech/stl/List.html - */ + + /// hopefully working List type + /// http://www.sgi.com/tech/stl/List.html template ModulePtr list_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -552,10 +534,9 @@ namespace chaiscript return m; } - /** - * Create a vector type with associated concepts - * http://www.sgi.com/tech/stl/Vector.html - */ + + /// Create a vector type with associated concepts + /// http://www.sgi.com/tech/stl/Vector.html template ModulePtr vector_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { @@ -623,10 +604,9 @@ namespace chaiscript }; } - /** - * Add a String container - * http://www.sgi.com/tech/stl/basic_string.html - */ + + /// Add a String container + /// http://www.sgi.com/tech/stl/basic_string.html template ModulePtr string_type(const std::string &type, ModulePtr m = ModulePtr(new Module())) { diff --git a/include/chaiscript/dispatchkit/boxed_cast.hpp b/include/chaiscript/dispatchkit/boxed_cast.hpp index b2fd0d7..345e89a 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_BOXED_CAST_HPP_ diff --git a/include/chaiscript/dispatchkit/boxed_cast_helper.hpp b/include/chaiscript/dispatchkit/boxed_cast_helper.hpp index 54bb90d..afb9b01 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_BOXED_CAST_HELPER_HPP_ diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp index 7e071cd..29c6c8d 100644 --- a/include/chaiscript/dispatchkit/boxed_number.hpp +++ b/include/chaiscript/dispatchkit/boxed_number.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_BOXED_NUMERIC_HPP_ diff --git a/include/chaiscript/dispatchkit/boxed_value.hpp b/include/chaiscript/dispatchkit/boxed_value.hpp index 14e0530..ab04ff5 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_BOXED_VALUE_HPP_ diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp index 7c964f8..f8e31fc 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_DISPATCHKIT_HPP_ diff --git a/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp b/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp index 841136c..91e0a88 100644 --- a/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp +++ b/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_ diff --git a/include/chaiscript/dispatchkit/dynamic_object.hpp b/include/chaiscript/dispatchkit/dynamic_object.hpp index f8d55a6..8952a4a 100644 --- a/include/chaiscript/dispatchkit/dynamic_object.hpp +++ b/include/chaiscript/dispatchkit/dynamic_object.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_DYNAMIC_OBJECT_HPP_ diff --git a/include/chaiscript/dispatchkit/exception_specification.hpp b/include/chaiscript/dispatchkit/exception_specification.hpp index b1fa687..909e7fb 100644 --- a/include/chaiscript/dispatchkit/exception_specification.hpp +++ b/include/chaiscript/dispatchkit/exception_specification.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_EXCEPTION_SPECIFICATION_HPP_ diff --git a/include/chaiscript/dispatchkit/function_call.hpp b/include/chaiscript/dispatchkit/function_call.hpp index 69282cb..27749f9 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 (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_FUNCTION_CALL_HPP_ diff --git a/include/chaiscript/dispatchkit/function_call_detail.hpp b/include/chaiscript/dispatchkit/function_call_detail.hpp index 7d68915..b739281 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, 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 9c649fb..ff1902d 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_HANDLE_RETURN_HPP_ diff --git a/include/chaiscript/dispatchkit/operators.hpp b/include/chaiscript/dispatchkit/operators.hpp index ee0196f..8677c51 100644 --- a/include/chaiscript/dispatchkit/operators.hpp +++ b/include/chaiscript/dispatchkit/operators.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_OPERATORS_HPP_ diff --git a/include/chaiscript/dispatchkit/proxy_constructors.hpp b/include/chaiscript/dispatchkit/proxy_constructors.hpp index 265d767..5d436ce 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, 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 c66ed15..2b4aff7 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, 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 fb7980a..eda5173 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, 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 e3f6e48..afa5658 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_REGISTER_FUNCTION_HPP_ diff --git a/include/chaiscript/dispatchkit/type_info.hpp b/include/chaiscript/dispatchkit/type_info.hpp index d9c7901..b03194b 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_TYPE_INFO_HPP_ diff --git a/include/chaiscript/language/chaiscript_algebraic.hpp b/include/chaiscript/language/chaiscript_algebraic.hpp index 13ae897..d16a367 100644 --- a/include/chaiscript/language/chaiscript_algebraic.hpp +++ b/include/chaiscript/language/chaiscript_algebraic.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_ALGEBRAIC_HPP_ diff --git a/include/chaiscript/language/chaiscript_common.hpp b/include/chaiscript/language/chaiscript_common.hpp index ffed54e..2f7e0c1 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_COMMON_HPP_ @@ -29,9 +29,8 @@ namespace chaiscript namespace { - /** - * Helper lookup to get the name of each node type - */ + + /// Helper lookup to get the name of each node type const char *ast_node_type_to_string(int ast_node_type) { const char *ast_node_types[] = { "Internal Parser Error", "Int", "Float", "Id", "Char", "Str", "Eol", "Fun_Call", "Inplace_Fun_Call", "Arg_List", "Variable", "Equation", "Var_Decl", "Comparison", "Addition", "Subtraction", "Multiplication", "Division", "Modulus", "Array_Call", "Dot_Access", "Quoted_String", "Single_Quoted_String", @@ -61,9 +60,8 @@ namespace chaiscript /// \brief Classes which may be thrown during error cases when ChaiScript is executing. namespace exception { - /** - * Errors generated during parsing or evaluation - */ + + /// Errors generated during parsing or evaluation struct eval_error : public std::runtime_error { std::string reason; File_Position start_position; @@ -377,9 +375,8 @@ namespace chaiscript } }; - /** - * Errors generated when loading a file - */ + + /// Errors generated when loading a file struct file_not_found_error : public std::runtime_error { file_not_found_error(const std::string &t_filename) throw() : std::runtime_error("File Not Found: " + t_filename) @@ -414,9 +411,8 @@ namespace chaiscript return oss.str(); } - /** - * Prints the contents of an AST node, including its children, recursively - */ + + /// Prints the contents of an AST node, including its children, recursively std::string to_string(std::string t_prepend = "") { std::ostringstream oss; @@ -478,25 +474,22 @@ namespace chaiscript { namespace detail { - /** - * Special type for returned values - */ + + /// Special type for returned values struct Return_Value { Boxed_Value retval; Return_Value(const Boxed_Value &t_return_value) : retval(t_return_value) { } }; - /** - * Special type indicating a call to 'break' - */ + + /// Special type indicating a call to 'break' struct Break_Loop { Break_Loop() { } }; - /** - * Special type indicating a call to 'continue' - */ + + /// Special type indicating a call to 'continue' struct Continue_Loop { Continue_Loop() { } }; diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp index 4cf268c..0b74d7b 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_ENGINE_HPP_ @@ -251,9 +251,8 @@ namespace chaiscript chaiscript::detail::Dispatch_Engine m_engine; - /** - * Evaluates the given string in by parsing it and running the results through the evaluator - */ + + /// Evaluates the given string in by parsing it and running the results through the evaluator Boxed_Value do_eval(const std::string &t_input, const std::string &t_filename = "__EVAL__", bool /* t_internal*/ = false) { try { @@ -282,9 +281,8 @@ namespace chaiscript } - /** - * Evaluates the given string, used during eval() inside of a script - */ + + /// Evaluates the given string, used during eval() inside of a script const Boxed_Value internal_eval(const std::string &t_e) { try { return do_eval(t_e, "__EVAL__", true); @@ -294,16 +292,14 @@ namespace chaiscript } - /** - * Returns the current evaluation m_engine - */ + + /// Returns the current evaluation m_engine chaiscript::detail::Dispatch_Engine &get_eval_engine() { return m_engine; } - /** - * Builds all the requirements for ChaiScript, including its evaluator and a run of its prelude. - */ + + /// Builds all the requirements for ChaiScript, including its evaluator and a run of its prelude. void build_eval_system() { using namespace bootstrap; m_engine.add_reserved_word("auto"); @@ -362,9 +358,8 @@ namespace chaiscript do_eval(chaiscript_prelude, "standard prelude"); } - /** - * Helper function for loading a file - */ + + /// Helper function for loading a file std::string load_file(const std::string &t_filename) { std::ifstream infile(t_filename.c_str(), std::ios::in | std::ios::ate | std::ios::binary ); diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp index b014e12..8fb9809 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, 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 1ff2c20..888c982 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, 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 3188102..3636ae8 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-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_PRELUDE_HPP_ diff --git a/include/chaiscript/utility/utility.hpp b/include/chaiscript/utility/utility.hpp index c719cd7..2d66cc6 100644 --- a/include/chaiscript/utility/utility.hpp +++ b/include/chaiscript/utility/utility.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_UTILITY_UTILITY_HPP_ diff --git a/license.txt b/license.txt index 0601f2f..3416309 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,7 @@ -Copyright 2009-2012 Jason Turner and Jonathan Turner. All Rights Reserved. +Copyright 2009-2014 Jason Turner +Copyright 2009-2012 Jonathan Turner. + +All Rights Reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/readme.md b/readme.md index 536ffc6..34069ff 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,8 @@ ChaiScript http://www.chaiscript.com -(c) 2009-2012 Jason Turner and Jonathan Turner +(c) 2009-2012 Jonathan Turner +(c) 2009-2014 Jason Turner Release under the BSD license, see "license.txt" for details. diff --git a/src/main.cpp b/src/main.cpp index 4d3eb23..5a99dae 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 (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #include diff --git a/src/reflection.cpp b/src/reflection.cpp index 71408e2..289d253 100644 --- a/src/reflection.cpp +++ b/src/reflection.cpp @@ -1,3 +1,9 @@ +// This file is distributed under the BSD License. +// See "license.txt" for details. +// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) +// http://www.chaiscript.com + #include #include diff --git a/src/stl_extra.cpp b/src/stl_extra.cpp index 2045fe9..029e4a5 100644 --- a/src/stl_extra.cpp +++ b/src/stl_extra.cpp @@ -1,3 +1,8 @@ +// This file is distributed under the BSD License. +// See "license.txt" for details. +// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) +// Copyright 2009-2014, Jason Turner (jason@emptycrate.com) +// http://www.chaiscript.com #include #include diff --git a/unittests/integer_literal_test.cpp b/unittests/integer_literal_test.cpp index 85efe06..b446d3d 100644 --- a/unittests/integer_literal_test.cpp +++ b/unittests/integer_literal_test.cpp @@ -1,5 +1,3 @@ -// Tests to make sure that the order in which function dispatches occur is correct - #include #define TEST_LITERAL(v) test_literal(v, #v) diff --git a/unittests/multithreaded_test.cpp b/unittests/multithreaded_test.cpp index 731a4ff..4129e40 100644 --- a/unittests/multithreaded_test.cpp +++ b/unittests/multithreaded_test.cpp @@ -1,9 +1,3 @@ -// This file is distributed under the BSD License. -// See "license.txt" for details. -// Copyright 2009-2010, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) -// http://www.chaiscript.com - #include #include