diff --git a/include/chaiscript/chaiscript.hpp b/include/chaiscript/chaiscript.hpp index 20aee70..5ae46fc 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 d5cfd00..baf000d 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 0861f2b..0d5fb7e 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 5bd4348..16f95b0 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 #ifndef CHAISCRIPT_BIND_FIRST_HPP_ diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp index ab95ce9..8a5e772 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 975c90f..034bc83 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_ @@ -26,11 +23,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 { @@ -169,9 +165,7 @@ 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())) { @@ -190,9 +184,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) { @@ -208,9 +201,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) { @@ -236,10 +228,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())) { @@ -258,10 +249,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())) { @@ -270,10 +260,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())) { @@ -283,10 +272,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())) { @@ -296,10 +284,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())) { @@ -317,10 +304,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())) { @@ -343,10 +329,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())) { @@ -369,10 +354,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())) { @@ -392,10 +376,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())) { @@ -404,10 +388,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())) { @@ -431,10 +414,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())) { @@ -453,10 +435,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())) { @@ -473,10 +454,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())) { @@ -519,10 +499,8 @@ namespace chaiscript return m; } - /** - * 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 5c51f24..a603da5 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 1852bbf..2008de3 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 ce93228..66a7fa9 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 964c29c..bcb5839 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 865bc68..93ed1fb 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 22a384c..1fd461b 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 934aba5..487505c 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 c0a6e3c..1997ef0 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 a104312..1ef1ca4 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 0309d17..579ae67 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 #ifndef CHAISCRIPT_FUNCTION_CALL_DETAIL_HPP_ diff --git a/include/chaiscript/dispatchkit/handle_return.hpp b/include/chaiscript/dispatchkit/handle_return.hpp index 8f07248..99e4cd5 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 7863130..ed64b2c 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 cff94e1..1fe2f3f 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 diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp index 8e5bf7c..6abc3aa 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 5cfa0c5..d2cdd45 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 #ifndef CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_ diff --git a/include/chaiscript/dispatchkit/register_function.hpp b/include/chaiscript/dispatchkit/register_function.hpp index 50019c0..5dfdeed 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 b634dc6..fe4c742 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 7729bc8..fde79e6 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 07969f1..0572906 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) CHAISCRIPT_NOEXCEPT : 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 b73b78c..ff37d56 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_ @@ -254,9 +254,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 { @@ -285,9 +284,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); @@ -296,16 +294,12 @@ 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(const ModulePtr &t_lib) { m_engine.add_reserved_word("def"); m_engine.add_reserved_word("fun"); @@ -356,9 +350,8 @@ namespace chaiscript do_eval(ChaiScript_Prelude::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 542fa4d..076c7de 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 98db184..3580c9f 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/utility/utility.hpp b/include/chaiscript/utility/utility.hpp index 1943db7..7f5b6c0 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 1829446..a82f916 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 0a84cd0..44ff212 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 841e4a2..e08cb7b 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 e97dfb3..eb6bb8c 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 3386d1d..26e4d55 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