.clang-format

@@ -1,33 +0,0 @@
-# clang-format: 11
-AccessModifierOffset:                 -2
-AlignAfterOpenBracket:                Align
-AlignConsecutiveBitFields:            false
-AllowShortBlocksOnASingleLine:        false
-AllowShortFunctionsOnASingleLine:     Inline
-AllowShortLambdasOnASingleLine:       All
-AlwaysBreakTemplateDeclarations:      true
-BasedOnStyle:                         WebKit
-BinPackArguments:                     true
-BinPackParameters:                    true
-BreakBeforeBraces:                    Attach
-ColumnLimit:                          0
-Cpp11BracedListStyle:                 true
-FixNamespaceComments:                 true
-IncludeBlocks:                        Preserve
-IndentCaseLabels:                     true
-IndentPPDirectives:                   None
-IndentWidth:                          2
-KeepEmptyLinesAtTheStartOfBlocks:     false
-NamespaceIndentation:                 All
-PenaltyBreakBeforeFirstCallParameter: 200
-PenaltyBreakComment:                  5
-PenaltyBreakFirstLessLess:            50
-PenaltyExcessCharacter:               4
-PointerAlignment:                     Right
-SortIncludes:                         true
-SpaceAfterTemplateKeyword:            false
-SpaceBeforeCpp11BracedList:           false
-SpaceInEmptyBlock:                    false
-Standard:                             Latest
-TabWidth:                             2
-UseTab:                               Never

.decent_ci-Linux.yaml

@@ -1,12 +1,12 @@
 compilers:
   - name: "clang"
-    version: "3.6"
+    version: "3.5"
     skip_packaging: true
     cmake_extra_flags: -DUSE_LIBCXX:BOOL=OFF -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DRUN_PERFORMANCE_TESTS:BOOL=ON
     collect_performance_results: true
   - name: "clang"
     build_tag: "LibC++"
-    version: "3.6"
+    version: "3.5"
     skip_packaging: true
     cmake_extra_flags: -DUSE_LIBCXX:BOOL=ON -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON
   - name: "clang"
@@ -19,28 +19,17 @@ compilers:
     version: "3.6"
     skip_packaging: true
     cmake_extra_flags: -DUSE_LIBCXX:BOOL=OFF -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_THREAD_SANITIZER:BOOL=ON
-  - name: "clang"
-    version: "3.7"
-    skip_packaging: true
-    cmake_extra_flags: -DUSE_LIBCXX:BOOL=OFF -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DRUN_PERFORMANCE_TESTS:BOOL=ON
-    collect_performance_results: true
-  - name: "clang"
-    build_tag: "LibC++"
-    version: "3.7"
-    skip_packaging: true
-    cmake_extra_flags: -DUSE_LIBCXX:BOOL=ON -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON
   - name: "gcc"
-    version: "4.9"
-    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_TESTING:BOOL=ON -DRUN_PERFORMANCE_TESTS:BOOL=ON
-    collect_performance_results: true
-  - name: "gcc"
-    version: "4.9"
-    skip_packaging: true
+    version: "4.8"
     build_tag: "NoThreads"
     cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_TESTING:BOOL=ON -DRUN_PERFORMANCE_TESTS:BOOL=ON -DMULTITHREAD_SUPPORT_ENABLED:BOOL=OFF
     collect_performance_results: true
   - name: "gcc"
-    version: "5"
+    version: "4.8"
+    cmake_extra_flags: -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DBUILD_TESTING:BOOL=ON -DRUN_PERFORMANCE_TESTS:BOOL=ON
+    collect_performance_results: true
+  - name: "gcc"
+    version: "4.6"
     skip_packaging: true
     cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DRUN_PERFORMANCE_TESTS:BOOL=ON
     collect_performance_results: true

.decent_ci-Windows.yaml

@@ -10,6 +10,13 @@ compilers:
     cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
     compiler_extra_flags: /analyze
     skip_packaging: true
+  - name: Visual Studio
+    version: 12
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
+  - name: Visual Studio
+    version: 12
+    architecture: Win64
+    cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA%
   - name: Visual Studio
     version: 14
     build_type: Debug
@@ -18,4 +25,3 @@ compilers:
     compiler_extra_flags: /analyze
     skip_packaging: true
 
-

.gitignore

@@ -1,6 +0,0 @@
-/buck-out/
-/.buckd/
-/buckaroo/
-.buckconfig.local
-BUCKAROO_DEPS
-/build

.travis.yml

@@ -1,71 +1,33 @@
 language: cpp
-
-
-addons:
-  apt:
-    sources: 
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-5.0
-      - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main'
-        key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-    packages:
-      - g++-7
-      - g++-8
-  coverity_scan:
-    project:
-      name: "ChaiScript/ChaiScript"
-      description: "Build submitted via Travis CI"
-    notification_email: jason@emptycrate.com
-    build_command_prepend: "cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . "
-    build_command:   "cmake --build . -- -j2"
-    branch_pattern: coverity_scan
-      
-matrix:
-  include:
-    - os: linux
-      sudo: false
-      env: GCC_VER="7"
-      compiler: gcc
-      #    - os: linux
-      #sudo: false
-      #env: GCC_VER="6" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1
-      #compiler: gcc
-    - os: linux
-      sudo: false
-      env: GCC_VER="7" CPPCHECK=1 CMAKE_OPTIONS="-D RUN_FUZZY_TESTS:BOOL=TRUE"
-      compiler: gcc
-    - os: linux
-      sudo: false
-      env: GCC_VER="8" CPPCHECK=1 COVERAGE=1 CMAKE_OPTIONS="-D RUN_FUZZY_TESTS:BOOL=TRUE"
-      compiler: gcc
-    #- os: osx
-    #  compiler: clang
-    #  osx_image: xcode10
-    #  env: CLANG_VER="5.0"
-    #- os: osx
-    #  compiler: clang
-    #  osx_image: xcode10
-    #  env: CLANG_VER="5.0" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1
-  
+compiler:
+  - gcc
 env:
+  matrix:
+    - GCC_VER="4.6"
+    - GCC_VER="4.8"
+
   global:
     - secure: eiaR6pXiiEpyB8+LLQ1NvZdl0Yylru1BLy9lMoHl+IpUNGGQGywmW/2WAn77rFfmR1OPA2qWQLfgPwgK0HxUA9HHlot9tre5QhiN2Lw8NOT8tCZ6tTm2+QntDBjBGJyal/knRvQkn/6qs6GxlXRerz4ArnnuPL1vESt3zwB0YtU=
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
     - secure: "LfolGjP8tWm3yAwthfu3yp8Zn40aueFae580UUR34gusG87cyglq2tQDtxdy+63gWEeNfArbv9n5rZv+bDW3ggHyPjuCKKc1PlZAy07lfXUXf1uz+SFhNvNoYTn3mQG3VZ08o116p4Le2p8yqu4bylJ8wckEq7PrTwvSGVQWTWM="
 
 before_install:
-  - if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi
-  #- if [ "${CLANG_VER}" != "" ]; then export CXX="clang++-$CLANG_VER"; fi
-  - pip install --user cpp-coveralls
+  - export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER"
+  - if [ "$GCC_VER" = "4.8" ]; then export COVERAGE=1 CPPCHECK=1; fi
+  - if [ ${COVERAGE} = 1 ]; then export FUZZY_CMD="-D RUN_FUZZY_TESTS:BOOL=TRUE"; fi
+  - sudo pip install cpp-coveralls
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+  - sudo apt-get update
+  - sudo apt-get install -qq g++-$GCC_VER
 
 script: 
-  - cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug $CMAKE_OPTIONS . 
-  - cmake --build . -- -j2
-  - if [ "${BUILD_ONLY}" != "1" ]; then ctest; fi
-  - if [ "${COVERAGE}" = "1" ]; then bash <(curl -s https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov) -x $GCOV -a "-s `pwd`" ; fi
+  - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug $FUZZY_CMD . ; fi
+  - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make -j2 ; fi
+  - make test
+  - if [ ${COVERAGE} = 1 ]; then bash <(curl -s https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov) -x $GCOV -a "-s `pwd`" ; fi
 
-#after_script:
-#  - if [ ${CPPCHECK} = 1 ]; then contrib/codeanalysis/runcppcheck.sh ; fi
+after_script:
+  - if [ ${CPPCHECK} = 1 ]; then contrib/codeanalysis/runcppcheck.sh ; fi
 
 
 notifications:
@@ -80,3 +42,15 @@ notifications:
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
+
+addons:
+  coverity_scan:
+    project:
+      name: "ChaiScript/ChaiScript"
+      description: "Build submitted via Travis CI"
+    notification_email: jason@emptycrate.com
+    build_command_prepend: "cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . "
+    build_command:   "cmake --build . -- -j2"
+    branch_pattern: coverity_scan
+
+

BUCK

@@ -1,11 +0,0 @@
-prebuilt_cxx_library(
-  name = 'chaiscript',
-  header_only = True,
-  header_namespace = 'chaiscript',
-  exported_headers = subdir_glob([
-    ('include/chaiscript', '**/*.hpp'),
-  ]),
-  visibility = [
-    'PUBLIC',
-  ],
-)

CMakeLists.txt

@@ -1,16 +1,19 @@
-cmake_minimum_required(VERSION 3.12)
-cmake_policy(SET CMP0054 NEW)
+cmake_minimum_required(VERSION 2.8)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
+  cmake_policy(SET CMP0054 NEW)
+endif()
+
+IF(BIICODE)
+  INIT_BIICODE_BLOCK()
+  ADD_BIICODE_TARGETS()
+ELSE()
+  # Your regular CMakeLists configuration here
 
-# required since cmake 3.4 at least for libc++
-set(CMAKE_ENABLE_EXPORTS ON)
 
 project(chaiscript)
 
 option(MULTITHREAD_SUPPORT_ENABLED "Multithreaded Support Enabled" TRUE)
-option(DYNLOAD_ENABLED "Dynamic Loading Support Enabled" TRUE)
 
 
 option(BUILD_MODULES "Build Extra Modules (stl)" TRUE)
@@ -45,14 +48,12 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   if(ENABLE_ADDRESS_SANITIZER)
     add_definitions(-fsanitize=address -g)
     set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=address")
-
-    option(BUILD_LIBFUZZ_TESTER "Build libfuzzer tool" FALSE)
   endif()
 
   option(ENABLE_MEMORY_SANITIZER "Enable memory sanitizer testing in gcc/clang" FALSE)
   if(ENABLE_MEMORY_SANITIZER)
-    add_definitions(-fsanitize=memory -fsanitize-memory-track-origins -g)
-    set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=memory -fsanitize-memory-track-origins ")
+    add_definitions(-fsanitize=memory -g)
+    set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=memory")
   endif()
 
   option(ENABLE_UNDEFINED_SANITIZER "Enable undefined behavior sanitizer testing in gcc/clang" FALSE)
@@ -62,26 +63,27 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   endif()
 
   option(ENABLE_LTO "Enable Link Time Optimization" FALSE)
-  if(ENABLE_LTO)
-    check_ipo_supported()
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+
+  if (ENABLE_LTO)
+    add_definitions(-flto)
+    set(LINKER_FLAGS "${LINKER_FLAGS} -flto")
   endif()
 
   option(GPROF_OUTPUT "Generate profile data" FALSE)
-  if(GPROF_OUTPUT)
+  if (GPROF_OUTPUT)
     add_definitions(-pg)
     set(LINKER_FLAGS "${LINKER_FLAGS} -pg")
   endif()
 
 
   option(PROFILE_GENERATE "Generate profile data" FALSE)
-  if(PROFILE_GENERATE)
+  if (PROFILE_GENERATE)
     add_definitions(-fprofile-generate)
     set(LINKER_FLAGS "${LINKER_FLAGS} -fprofile-generate")
   endif()
 
   option(PROFILE_USE "Use profile data" FALSE)
-  if(PROFILE_USE)
+  if (PROFILE_USE)
     add_definitions(-fprofile-use)
     set(LINKER_FLAGS "${LINKER_FLAGS} -fprofile-use")
   endif()
@@ -99,9 +101,9 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/license.txt")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/readme.md")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description.txt")
 
-set(CPACK_PACKAGE_VERSION_MAJOR 7)
-set(CPACK_PACKAGE_VERSION_MINOR 0)
-set(CPACK_PACKAGE_VERSION_PATCH 0)
+set(CPACK_PACKAGE_VERSION_MAJOR 5)
+set(CPACK_PACKAGE_VERSION_MINOR 8)
+set(CPACK_PACKAGE_VERSION_PATCH 5)
 
 set(CPACK_PACKAGE_EXECUTABLES "chai;ChaiScript Eval")
 set(CPACK_PACKAGE_VENDOR "ChaiScript.com")
@@ -120,13 +122,12 @@ configure_file(Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile)
 
 include(CTest)
 include(CPack)
-include(cmake/Catch.cmake)
 
 if(NOT MINGW)
   find_library(READLINE_LIBRARY NAMES readline PATH /usr/lib /usr/local/lib /opt/local/lib)
 endif()
 
-if(UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE)
   find_program(VALGRIND NAMES valgrind PATH /usr/bin /usr/local/bin)
 endif()
 
@@ -144,10 +145,22 @@ else()
   set(READLINE_FLAG)
 endif()
 
+if(CMAKE_COMPILER_IS_GNUCC)
+  execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+
+  if(GCC_VERSION VERSION_LESS 4.8)
+    set(CPP11_FLAG "-std=c++0x")
+  else()
+    set(CPP11_FLAG "-std=c++11")
+  endif()
+else()
+  set(CPP11_FLAG "-std=c++11")
+endif()
+
 if(MSVC)
   add_definitions(/W4 /w14545 /w34242 /w34254 /w34287 /w44263 /w44265 /w44296 /w44311 /w44826 /we4289 /w14546 /w14547 /w14549 /w14555 /w14619 /w14905 /w14906 /w14928)
 
-  if(MSVC_VERSION STREQUAL "1800")
+  if (MSVC_VERSION STREQUAL "1800")
     # VS2013 doesn't have magic statics
     add_definitions(/w44640)
   else()
@@ -155,7 +168,7 @@ if(MSVC)
     add_definitions(/w34062)
   endif()
 
-  add_definitions(/bigobj /permissive- /utf-8)
+  add_definitions(/bigobj)
   # Note on MSVC compiler flags.
   # The code base selective disables warnings as necessary when the compiler is complaining too much
   # about something that is perfectly valid, or there is simply no technical way around it
@@ -165,10 +178,10 @@ if(MSVC)
   # how to workaround or fix the error. So I'm disabling it globally.
   add_definitions(/wd4503)
 else()
-  add_definitions(-Wall -Wextra -Wconversion -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wcast-qual -Wunused -Woverloaded-virtual -Wno-noexcept-type -Wpedantic -Werror=return-type)
+  add_definitions(-Wall -Wextra -Wconversion -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wcast-qual -Wunused -Woverloaded-virtual  -pedantic ${CPP11_FLAG})
 
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-    add_definitions(-Weverything -Wno-c++98-compat-pedantic  -Wno-c++98-compat -Wno-documentation -Wno-switch-enum -Wno-weak-vtables -Wno-missing-prototypes -Wno-padded -Wno-missing-noreturn -Wno-exit-time-destructors -Wno-documentation-unknown-command -Wno-unused-template -Wno-undef -Wno-double-promotion)
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    add_definitions(-Weverything -Wno-c++98-compat-pedantic  -Wno-c++98-compat -Wno-documentation -Wno-switch-enum -Wno-weak-vtables -Wno-missing-prototypes -Wno-padded -Wno-missing-noreturn -Wno-exit-time-destructors -Wno-documentation-unknown-command)
   else()
     add_definitions(-Wnoexcept)
   endif()
@@ -179,12 +192,16 @@ else()
 endif()
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  option(USE_LIBCXX "Use clang's libcxx" FALSE)
+  option(USE_LIBCXX "Use clang's libcxx" TRUE)
 
   if(USE_LIBCXX)
     add_definitions(-stdlib=libc++)
-    set(LINKER_FLAGS "${LINKER_FLAGS} -stdlib=libc++")
+    set(LINKER_FLAGS "${LINKER_FLAGS} ${CPP11_FLAG} -stdlib=libc++")
+  else()
+    set(LINKER_FLAGS "${LINKER_FLAGS} ${CPP11_FLAG}")
   endif()
+elseif(CMAKE_COMPILER_IS_GNUCC)
+  set(LINKER_FLAGS "${LINKER_FLAGS} ${CPP11_FLAG}")
 endif()
 
 # limitations in MinGW require us to make an optimized build
@@ -196,7 +213,7 @@ endif()
 include_directories(include)
 
 
-set(Chai_INCLUDES include/chaiscript/chaiscript.hpp include/chaiscript/chaiscript_threading.hpp include/chaiscript/dispatchkit/bad_boxed_cast.hpp include/chaiscript/dispatchkit/bind_first.hpp include/chaiscript/dispatchkit/bootstrap.hpp include/chaiscript/dispatchkit/bootstrap_stl.hpp include/chaiscript/dispatchkit/boxed_cast.hpp include/chaiscript/dispatchkit/boxed_cast_helper.hpp include/chaiscript/dispatchkit/boxed_number.hpp include/chaiscript/dispatchkit/boxed_value.hpp include/chaiscript/dispatchkit/dispatchkit.hpp include/chaiscript/dispatchkit/type_conversions.hpp include/chaiscript/dispatchkit/dynamic_object.hpp include/chaiscript/dispatchkit/exception_specification.hpp include/chaiscript/dispatchkit/function_call.hpp include/chaiscript/dispatchkit/function_call_detail.hpp include/chaiscript/dispatchkit/handle_return.hpp include/chaiscript/dispatchkit/operators.hpp include/chaiscript/dispatchkit/proxy_constructors.hpp include/chaiscript/dispatchkit/proxy_functions.hpp include/chaiscript/dispatchkit/proxy_functions_detail.hpp include/chaiscript/dispatchkit/register_function.hpp include/chaiscript/dispatchkit/type_info.hpp include/chaiscript/language/chaiscript_algebraic.hpp include/chaiscript/language/chaiscript_common.hpp include/chaiscript/language/chaiscript_engine.hpp include/chaiscript/language/chaiscript_eval.hpp include/chaiscript/language/chaiscript_parser.hpp include/chaiscript/language/chaiscript_prelude.hpp include/chaiscript/language/chaiscript_prelude_docs.hpp include/chaiscript/utility/utility.hpp include/chaiscript/utility/json.hpp include/chaiscript/utility/json_wrap.hpp)
+set(Chai_INCLUDES include/chaiscript/chaiscript.hpp include/chaiscript/chaiscript_threading.hpp include/chaiscript/dispatchkit/bad_boxed_cast.hpp include/chaiscript/dispatchkit/bind_first.hpp include/chaiscript/dispatchkit/bootstrap.hpp include/chaiscript/dispatchkit/bootstrap_stl.hpp include/chaiscript/dispatchkit/boxed_cast.hpp include/chaiscript/dispatchkit/boxed_cast_helper.hpp include/chaiscript/dispatchkit/boxed_number.hpp include/chaiscript/dispatchkit/boxed_value.hpp include/chaiscript/dispatchkit/dispatchkit.hpp include/chaiscript/dispatchkit/type_conversions.hpp include/chaiscript/dispatchkit/dynamic_object.hpp include/chaiscript/dispatchkit/exception_specification.hpp include/chaiscript/dispatchkit/function_call.hpp include/chaiscript/dispatchkit/function_call_detail.hpp include/chaiscript/dispatchkit/handle_return.hpp include/chaiscript/dispatchkit/operators.hpp include/chaiscript/dispatchkit/proxy_constructors.hpp include/chaiscript/dispatchkit/proxy_functions.hpp include/chaiscript/dispatchkit/proxy_functions_detail.hpp include/chaiscript/dispatchkit/register_function.hpp include/chaiscript/dispatchkit/type_info.hpp include/chaiscript/language/chaiscript_algebraic.hpp include/chaiscript/language/chaiscript_common.hpp include/chaiscript/language/chaiscript_engine.hpp include/chaiscript/language/chaiscript_eval.hpp include/chaiscript/language/chaiscript_parser.hpp include/chaiscript/language/chaiscript_prelude.chai include/chaiscript/language/chaiscript_prelude_docs.hpp include/chaiscript/utility/utility.hpp include/chaiscript/utility/json.hpp include/chaiscript/utility/json_wrap.hpp)
 
 set_source_files_properties(${Chai_INCLUDES} PROPERTIES HEADER_FILE_ONLY TRUE)
 
@@ -204,16 +221,10 @@ if(NOT MULTITHREAD_SUPPORT_ENABLED)
   add_definitions(-DCHAISCRIPT_NO_THREADS)
 endif()
 
-if(NOT DYNLOAD_ENABLED)
-  add_definitions(-DCHAISCRIPT_NO_DYNLOAD)
-endif()
-
 if(CMAKE_HOST_UNIX)
-  if(DYNLOAD_ENABLED)
   if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
     list(APPEND LIBS "dl")
   endif()
-  endif()
 
   if(MULTITHREAD_SUPPORT_ENABLED)
     if(CMAKE_COMPILER_IS_GNUCC)
@@ -238,47 +249,37 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
 
-add_library(stdlib STATIC static_libs/chaiscript_stdlib.cpp)
-add_library(parser STATIC static_libs/chaiscript_parser.cpp)
 
-add_library(chaiscript_stdlib-${CHAI_VERSION} MODULE src/chaiscript_stdlib_module.cpp)
+add_library(chaiscript_stdlib-${CHAI_VERSION} MODULE src/chaiscript_stdlib.cpp)
 target_link_libraries(chaiscript_stdlib-${CHAI_VERSION} ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
-set(CHAISCRIPT_LIBS stdlib parser)
-
 add_executable(chai src/main.cpp ${Chai_INCLUDES})
-target_link_libraries(chai ${LIBS} ${CHAISCRIPT_LIBS})
-
-add_library(chaiscript INTERFACE)
-target_include_directories(chaiscript INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_link_libraries(chai ${LIBS})
+add_dependencies(chai chaiscript_stdlib-${CHAI_VERSION})
 
 if(BUILD_SAMPLES)
-  add_executable(sanity_checks src/sanity_checks.cpp)
-  target_link_libraries(sanity_checks ${LIBS})
+  add_executable(example samples/example.cpp)
+  target_link_libraries(example ${LIBS})
   add_executable(test_num_exceptions samples/test_num_exceptions.cpp)
-  target_link_libraries(test_num_exceptions ${LIBS} ${CHAISCRIPT_LIBS})
+  target_link_libraries(test_num_exceptions ${LIBS})
   add_executable(memory_leak_test samples/memory_leak_test.cpp)
-  target_link_libraries(memory_leak_test ${LIBS} ${CHAISCRIPT_LIBS})
+  target_link_libraries(memory_leak_test ${LIBS})
   add_executable(inheritance samples/inheritance.cpp)
-  target_link_libraries(inheritance ${LIBS} ${CHAISCRIPT_LIBS})
+  target_link_libraries(inheritance ${LIBS})
   add_executable(factory samples/factory.cpp)
-  target_link_libraries(factory ${LIBS} ${CHAISCRIPT_LIBS})
+  target_link_libraries(factory ${LIBS})
   add_executable(fun_call_performance samples/fun_call_performance.cpp)
-  target_link_libraries(fun_call_performance ${LIBS} ${CHAISCRIPT_LIBS})
+  target_link_libraries(fun_call_performance ${LIBS})
 endif()
 
 
 if(BUILD_MODULES)
-  add_library(test_module MODULE src/test_module.cpp)
-  target_link_libraries(test_module ${LIBS})
-
   add_library(stl_extra MODULE src/stl_extra.cpp)
   target_link_libraries(stl_extra ${LIBS})
 
   set(MODULES stl_extra)
 endif()
 
-
 file(GLOB UNIT_TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/unittests/ ${CMAKE_CURRENT_SOURCE_DIR}/unittests/*.chai ${CMAKE_CURRENT_SOURCE_DIR}/unittests/3.x/*.chai)
 list(SORT UNIT_TESTS)
 
@@ -286,22 +287,37 @@ file(GLOB PERFORMANCE_TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/performance_tes
 list(SORT PERFORMANCE_TESTS)
 
 
-if(RUN_FUZZY_TESTS)
+if (RUN_FUZZY_TESTS)
 
   file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/unittests")
 
   execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar xjf ${CMAKE_CURRENT_SOURCE_DIR}/unittests/fuzzy_tests-2017-07-20.tar.bz2
+    COMMAND ${CMAKE_COMMAND} -E tar xjf ${CMAKE_CURRENT_SOURCE_DIR}/unittests/fuzzy_tests-2015-07-16.tar.bz2
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittests
     )
 
 
-  file(GLOB FUZZY_TESTS RELATIVE ${CMAKE_BINARY_DIR}/unittests/ ${CMAKE_BINARY_DIR}/unittests/MINIMIZED/*)
-  list(SORT FUZZY_TESTS)
+  file(GLOB FUZZY_CRASH_TESTS RELATIVE ${CMAKE_BINARY_DIR}/unittests/ ${CMAKE_BINARY_DIR}/unittests/fuzzy_tests/crashes/id*)
+  list(SORT FUZZY_CRASH_TESTS)
 
-  foreach(filename ${FUZZY_TESTS})
+  file(GLOB FUZZY_EXCEPTION_TESTS RELATIVE ${CMAKE_BINARY_DIR}/unittests/ ${CMAKE_BINARY_DIR}/unittests/fuzzy_tests/exceptions/id*)
+  list(SORT FUZZY_EXCEPTION_TESTS)
+
+
+  foreach(filename ${FUZZY_CRASH_TESTS})
     message(STATUS "Adding test ${filename}")
-    add_test(fuzz.${filename} chai "-e" "--exception" "--any-exception" ${CMAKE_CURRENT_SOURCE_DIR}/unittests/fuzz_unit_test.inc ${CMAKE_BINARY_DIR}/unittests/${filename})
+    add_test(${filename} chai "-e" ${CMAKE_BINARY_DIR}/unittests/fuzzy_tests/crashes/unit_test.inc ${CMAKE_BINARY_DIR}/unittests/${filename})
+  endforeach()
+
+  set_property(TEST ${FUZZY_CRASH_TESTS}
+    PROPERTY ENVIRONMENT
+    "CHAI_USE_PATH=${CMAKE_BINARY_DIR}/unittests/"
+    "CHAI_MODULE_PATH=${CMAKE_CURRENT_BINARY_DIR}/"
+    )
+
+  foreach(filename ${FUZZY_EXCEPTION_TESTS})
+    message(STATUS "Adding test ${filename}")
+    add_test(${filename} chai "--exception" ${CMAKE_BINARY_DIR}/unittests/fuzzy_tests/exceptions/unit_test.inc ${CMAKE_BINARY_DIR}/unittests/${filename})
   endforeach()
 
   set_property(TEST ${FUZZY_EXCEPTION_TESTS}
@@ -315,6 +331,37 @@ endif()
 
 if(BUILD_TESTING)
 
+  # Add catch tests macro
+  macro(ADD_CATCH_TESTS executable)
+    if (MSVC)
+      file(TO_NATIVE_PATH "${QT_LIBRARY_DIR}" QT_LIB_PATH)
+      set(NEWPATH "${QT_LIB_PATH};$ENV{PATH}")
+    else()
+      set(NEWPATH $ENV{PATH})
+    endif()
+
+    get_target_property(target_files ${executable} SOURCES)
+
+    foreach(source ${target_files})
+      if(NOT "${source}" MATCHES "/moc_.*cxx")
+        string(REGEX MATCH .*cpp source "${source}")
+        if(source)
+          file(READ "${source}" contents)
+          string(REGEX MATCHALL "TEST_CASE\\([ ]*\"[^\"]+\"" found_tests ${contents})
+          foreach(hit ${found_tests})
+            string(REGEX REPLACE "TEST_CASE\\([ ]*(\"[^\"]+\").*" "\\1" test_name ${hit})
+            add_test(compiled.${test_name} "${executable}" ${test_name})
+            set_tests_properties(compiled.${test_name} PROPERTIES TIMEOUT 660 ENVIRONMENT "PATH=${NEWPATH}")
+          endforeach()
+        endif()
+      endif()
+    endforeach()
+  endmacro()
+
+
+
+
+
   option(UNIT_TEST_LIGHT "Unit tests light (expect module loading failures)" FALSE)
 
   add_test(version_check chai -c  "if(\"\\\${ version() };\\\${version_major()};\\\${version_minor()};\\\${version_patch()}\" != \"${CHAI_VERSION};${CPACK_PACKAGE_VERSION_MAJOR};${CPACK_PACKAGE_VERSION_MINOR};${CPACK_PACKAGE_VERSION_PATCH}\") { exit(-1) }")
@@ -346,7 +393,7 @@ if(BUILD_TESTING)
     list(APPEND TESTS unit.${filename})
   endforeach()
 
-  if(RUN_PERFORMANCE_TESTS)
+  if (RUN_PERFORMANCE_TESTS)
     foreach(filename ${PERFORMANCE_TESTS})
       message(STATUS "Adding performance test ${filename}")
 
@@ -371,12 +418,9 @@ if(BUILD_TESTING)
 
   if(NOT UNIT_TEST_LIGHT)
     add_executable(compiled_tests unittests/compiled_tests.cpp)
-    target_link_libraries(compiled_tests ${LIBS} ${CHAISCRIPT_LIBS})
-    catch_discover_tests(compiled_tests TEST_PREFIX "compiled.")
+    target_link_libraries(compiled_tests ${LIBS})
+    ADD_CATCH_TESTS(compiled_tests)
 
-    add_executable(static_chaiscript_test unittests/static_chaiscript.cpp)
-    target_link_libraries(static_chaiscript_test ${LIBS})
-    add_test(NAME Static_ChaiScript_Test COMMAND static_chaiscript_test)
 
     add_executable(boxed_cast_test unittests/boxed_cast_test.cpp)
     target_link_libraries(boxed_cast_test ${LIBS})
@@ -387,11 +431,11 @@ if(BUILD_TESTING)
     add_test(NAME Type_Info_Test COMMAND type_info_test)
 
     add_executable(c_linkage_test unittests/c_linkage_test.cpp)
-    target_link_libraries(c_linkage_test ${LIBS} ${CHAISCRIPT_LIBS})
+    target_link_libraries(c_linkage_test ${LIBS})
     add_test(NAME C_Linkage_Test COMMAND c_linkage_test)
 
     add_executable(integer_literal_test unittests/integer_literal_test.cpp)
-    target_link_libraries(integer_literal_test ${LIBS} ${CHAISCRIPT_LIBS})
+    target_link_libraries(integer_literal_test ${LIBS})
     add_test(NAME Integer_Literal_Test COMMAND integer_literal_test)
 
     if(MULTITHREAD_SUPPORT_ENABLED)
@@ -403,8 +447,10 @@ if(BUILD_TESTING)
         "CHAI_USE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/unittests/"
         "CHAI_MODULE_PATH=${CMAKE_CURRENT_BINARY_DIR}/"
       )
+
     endif()
 
+
     add_executable(multifile_test
       unittests/multifile_test_main.cpp
       unittests/multifile_test_chai.cpp
@@ -413,19 +459,14 @@ if(BUILD_TESTING)
     target_link_libraries(multifile_test ${LIBS})
     add_test(NAME MultiFile_Test COMMAND multifile_test)
 
-    install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/chaiscript")
+    add_library(test_module MODULE src/test_module.cpp)
+    target_link_libraries(test_module ${LIBS})
+
+    install(TARGETS test_module RUNTIME DESTINATION bin LIBRARY DESTINATION lib/chaiscript)
   endif()
 endif()
 
-
-if(BUILD_LIBFUZZ_TESTER)
-  add_executable(fuzzer src/libfuzzer_client.cpp src/sha3.cpp)
-  target_compile_options(fuzzer PRIVATE "-fsanitize=fuzzer,address")
-  target_link_libraries(fuzzer PRIVATE ${LIBS} "-fsanitize=fuzzer,address")
-endif()
-
-
-install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/chaiscript")
+install(TARGETS chai chaiscript_stdlib-${CHAI_VERSION} ${MODULES} RUNTIME DESTINATION bin LIBRARY DESTINATION lib/chaiscript)
 
 install(DIRECTORY include/chaiscript DESTINATION include
   PATTERN "*.hpp"
@@ -446,6 +487,8 @@ install(DIRECTORY samples DESTINATION share/chaiscript
 
 configure_file(contrib/pkgconfig/chaiscript.pc.in lib/pkgconfig/chaiscript.pc @ONLY)
 install(FILES "${chaiscript_BINARY_DIR}/lib/pkgconfig/chaiscript.pc"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+        DESTINATION lib/pkgconfig)
 
     
+ENDIF()
+

DesignGoals.md

@@ -1,28 +0,0 @@
-# Introduction
-
-This document outlines the principles that drive the development of ChaiScript. ChaiScript does not intent to be the perfect tool for *every* situation, but it does intend to be a good general purpose tool for *most* situations.
-
-# Goals
-
-1. Trivially easy to integrate with C++ projects
-2. 0 external depenencies
-3. "Perfect" integration with C++
-   * Direct mapping between ChaiScript objects and C++ objects
-   * Direct mapping between ChaiScript functions and C++ functions
-   * Direct mapping between ChaiScript exceptions and C++ exceptions
-3. Never surprise the C++ developer
-   * Object lifetimes managed by the stack
-   * Familiar syntax to C++ developers
-4. Perform "well enough" to not get in the way
-
-
-# Alternatives
-
-## Sol2
-
-If you are looking for the fastest performing scripting language and don't mind Lua, you might want to consider [sol2](https://github.com/ThePhD/sol2).
-
-## SWIG
-
-If you are looking for the most flexible solution to be able to support multiple target languages, consider [SWIG](http://swig.org)
-

LICENSE

@@ -1,6 +1,4 @@
-BSD-3-Clause License
-
-Copyright 2009-2018 Jason Turner
+Copyright 2009-2016 Jason Turner
 Copyright 2009-2012 Jonathan Turner. 
 
 All Rights Reserved.

appveyor.yml

@@ -1,23 +1,16 @@
-version: 6.1.x.{build}
-image:
-  - Visual Studio 2019
+version: 5.7.2.{build}
+os: Visual Studio 2015
 environment:
   matrix:
-  - VS_VERSION: "Visual Studio 16"
+  - {}
 build_script:
 - cmd: >-
     mkdir build
 
     cd build
 
-    cmake c:\Projects\chaiscript -G "%VS_VERSION%" -DBUILD_TESTING:BOOL=ON -DBUILD_MODULES:BOOL=ON
+    cmake c:\Projects\chaiscript -G "Visual Studio 14"
 
     cmake --build . --config Debug
 test_script:
 - cmd: ctest -C Debug
-notifications:
-- provider: Webhook
-  url: https://webhooks.gitter.im/e/9ff725a985b5679d1d5d
-  on_build_success: true
-  on_build_failure: true
-  on_build_status_changed: false

buckaroo.json

@@ -1,3 +0,0 @@
-{
-  "name": "ChaiScript"
-}

cheatsheet.md

@@ -11,46 +11,38 @@ ChaiScript tries to follow the [Semantic Versioning](http://semver.org/) scheme.
 # Initializing ChaiScript
 
 ```
-chaiscript::ChaiScript chai; // initializes ChaiScript, adding the standard ChaiScript types (map, string, ...)
+chaiscript::ChaiScript chai; // loads stdlib from loadable module on file system
+chaiscript::ChaiScript chai(chaiscript::Std_Lib::library()); // compiles in stdlib
 ```
 
-Note that ChaiScript cannot be used as a global / static object unless it is being compiled with `CHAISCRIPT_NO_THREADS`.
-
 # Adding Things To The Engine
 
 ## Adding a Function / Method / Member
 
 ### General
 
-```cpp
+```
 chai.add(chaiscript::fun(&function_name), "function_name");
 chai.add(chaiscript::fun(&Class::method_name), "method_name");
 chai.add(chaiscript::fun(&Class::member_name), "member_name");
 ```
 
-### Bound Member Functions
-
-```cpp
-chai.add(chaiscript::fun(&Class::method_name, Class_instance_ptr), "method_name");
-chai.add(chaiscript::fun(&Class::member_name, Class_instance_ptr), "member_name");
-```
-
 ### With Overloads 
 
 #### Preferred
 
-```cpp
+```
 chai.add(chaiscript::fun<ReturnType (ParamType1, ParamType2)>(&function_with_overloads), "function_name");
 ```
 
 #### Alternative
 
-```cpp
-chai.add(chaiscript::fun(static_cast<ReturnType (*)(ParamType1, ParamType2)>(&function_with_overloads)), "function_name");
 ```
-This overload technique is also used when exposing base members using derived type
+chai.add(chaiscript::fun(std::static_cast<ReturnType (*)(ParamType1, ParamType2)>(&function_with_overloads)), "function_name");
+```
+This overload technique is also used when exposing base member using derived type
 
-```cpp
+```
 struct Base
 {
   int data;
@@ -64,9 +56,9 @@ chai.add(chaiscript::fun(static_cast<int(Derived::*)>(&Derived::data)), "data");
 
 ### Lambda
 
-```cpp
+```
 chai.add(
-  chaiscript::fun<std::function<std::string (bool)>>(
+  chaiscript::fun<std::string (bool)>(
     [](bool type) { 
       if (type) { return "x"; } 
       else { return "y"; } 
@@ -75,7 +67,7 @@ chai.add(
 
 ### Constructors
 
-```cpp
+```
 chai.add(chaiscript::constructor<MyType ()>(), "MyType");
 chai.add(chaiscript::constructor<MyType (const MyType &)>(), "MyType");
 ```
@@ -84,56 +76,13 @@ chai.add(chaiscript::constructor<MyType (const MyType &)>(), "MyType");
 
 It's not strictly necessary to add types, but it helps with many things. Cloning, better errors, etc.
 
-```cpp
+```
 chai.add(chaiscript::user_type<MyClass>(), "MyClass");
 ```
 
 ## Adding Type Conversions
 
-User-defined type conversions are possible, defined in either script or in C++.
-
-
-
-### ChaiScript Defined Conversions
-
-Function objects (including lambdas) can be used to add type conversions
-from inside of ChaiScript:
-
-```
-add_type_conversion(type("string"), type("Type_Info"), fun(s) { return type(s); });
-```
-
-### C++ Defined Conversions
-
-Invoking a C++ type conversion possible with `static_cast`
-
-```cpp
-chai.add(chaiscript::type_conversion<T, bool>());
-```
-
-Calling a user-defined type conversion that takes a lambda
-
-```cpp
-chai.add(chaiscript::type_conversion<TestBaseType, Type2>([](const TestBaseType &t_bt) { /* return converted thing */ }));
-```
-
-### Class Hierarchies
-
-If you want objects to be convertable between base and derived classes, you must tell ChaiScript about the relationship.
-
-```cpp
-chai.add(chaiscript::base_class<Base, Derived>());
-```
-
-If you have multiple classes in your inheritance graph, you will probably want to tell ChaiScript about all relationships.
-
-```cpp
-chai.add(chaiscript::base_class<Base, Derived>());
-chai.add(chaiscript::base_class<Derived, MoreDerived>());
-chai.add(chaiscript::base_class<Base, MoreDerived>());
-```
-
-### Helpers
+User defined type conversions are possible, defined in either script or in C++.
 
 A helper function exists for strongly typed and ChaiScript `Vector` function conversion definition:
 
@@ -148,14 +97,13 @@ chai.add(chaiscript::map_conversion<std::map<std::string, int>>());
 ```
 
 
-
 This allows you to pass a ChaiScript function to a function requiring `std::vector<int>`
 
 ## Adding Objects
 
 ```
 chai.add(chaiscript::var(somevar), "somevar"); // copied in
-chai.add(chaiscript::var(std::ref(somevar)), "somevar"); // by reference, shared between C++ and chai
+chai.add(chaiscript::var(std::ref(somevar), "somevar"); // by reference, shared between C++ and chai
 auto shareddouble = std::make_shared<double>(4.3);
 chai.add(chaiscript::var(shareddouble), "shareddouble"); // by shared_ptr, shared between c++ and chai
 chai.add(chaiscript::const_var(somevar), "somevar"); // copied in and made const
@@ -163,29 +111,10 @@ chai.add_global_const(chaiscript::const_var(somevar), "somevar"); // global cons
 chai.add_global(chaiscript::var(somevar), "somevar"); // global non-const, throws if object exists
 chai.set_global(chaiscript::var(somevar), "somevar"); // global non-const, overwrites existing object
 ```
-
-## Adding Namespaces
-
-Namespaces will not be populated until `import` is called.
-This saves memory and computing costs if a namespace is not imported into every ChaiScript instance.
-
-```cpp
-chai.register_namespace([](chaiscript::Namespace& math) {
-    math["pi"] = chaiscript::const_var(3.14159);
-    math["sin"] = chaiscript::var(chaiscript::fun([](const double x) { return sin(x); })); },
-    "math");
-```
-
-Import namespace in ChaiScript
-```
-import("math")
-print(math.pi) // prints 3.14159
-```
-
 # Using STL
-ChaiScript recognizes many types from STL, but you have to add specific instantiation yourself.
+ChaiScript recognize many types from STL, but you have to add specific instantiation yourself.
 
-```cpp
+```
 typedef std::vector<std::pair<int, std::string>> data_list;
 data_list my_list{ make_pair(0, "Hello"), make_pair(1, "World") };
 chai.add(chaiscript::bootstrap::standard_library::vector_type<data_list>("DataList"));
@@ -203,7 +132,7 @@ chai.eval(R"_(
 
 ## General
 
-```cpp
+```
 chai.eval("print(\"Hello World\")");
 chai.eval(R"(print("Hello World"))");
 ```
@@ -214,13 +143,13 @@ Returns values are of the type `Boxed_Value` which is meant to be opaque to the
 
 ### Prefered
 
-```cpp
+```
 chai.eval<double>("5.3 + 2.1"); // returns 7.4 as a C++ double
 ```
 
 ### Alternative
 
-```cpp
+```
 auto v = chai.eval("5.3 + 2.1");
 chai.boxed_cast<double>(v); // extracts double value from boxed_value and applies known conversions
 chaiscript::boxed_cast<double>(v); // free function version, does not know about conversions
@@ -228,7 +157,7 @@ chaiscript::boxed_cast<double>(v); // free function version, does not know about
 
 ### Converting Between Algebraic Types
 
-```cpp
+```
 chaiscript::Boxed_Number(chai.eval("5.3 + 2.1")).get_as<int>(); // works with any number type
 // which is equivalent to, but much more automatic than:
 static_cast<int>(chai.eval<double>("5.3+2.1")); // this version only works if we know that it's a double
@@ -241,7 +170,7 @@ Conversion to `std::shared_ptr<T> &` is supported for function calls, but if you
 ```cpp
 // ok this is supported, you can register it with chaiscript engine
 void nullify_shared_ptr(std::shared_ptr<int> &t) {
-  t = nullptr
+  t == nullptr
 }
 ```
 
@@ -258,7 +187,7 @@ int main()
 
 ## Sharing Values
 
-```cpp
+```
 double &d = chai.eval("var i = 5.2; i"); // d is now a reference to i in the script
 std::shared_ptr<double> d = chai.eval("var i = 5.2; i"); // same result but reference counted
 
@@ -268,7 +197,7 @@ chai.eval("print(i)"); // prints 3
 
 ## Catching Eval Errors
 
-```cpp
+```
 try {
   chai.eval("2.3 + \"String\"");
 } catch (const chaiscript::exception::eval_error &e) {
@@ -278,7 +207,7 @@ try {
 
 ## Catching Errors Thrown From Script
 
-```cpp
+```
 try {
   chai.eval("throw(runtime_error(\"error\"))", chaiscript::exception_specification<int, double, float, const std::string &, const std::exception &>());
 } catch (const double e) {
@@ -286,26 +215,26 @@ try {
 } catch (float) {
 } catch (const std::string &) {
 } catch (const std::exception &e) {
-  // This is the one that will be called in the specific throw() above
+  // This is the one what will be called in the specific throw() above
 }
 ```
 
 ## Sharing Functions
 
 
-```cpp
+```
 auto p = chai.eval<std::function<std::string (double)>>("to_string"); 
 p(5); // calls chaiscript's 'to_string' function, returning std::string("5")
 ```
 
 Note: backtick treats operators as normal functions
 
-```cpp
-auto p = chai.eval<std::function<int (int, int)>>("`+`"); 
+```
+auto p = chai.eval<std::function<int (int, int)>>(`+`); 
 p(5, 6); // calls chaiscript's '+' function, returning 11
 ```
 
-```cpp
+```
 auto p = chai.eval<std::function<std::string (int, double)>>("fun(x,y) { to_string(x) + to_string(y); }");
 p(3,4.2); // evaluates the lambda function, returning the string "34.2" to C++
 ```
@@ -331,82 +260,13 @@ if (g2.is_var_undef()) { g2 = 4; } // only initialize g2 once, if global decl hi
 GLOBAL g3; // all upper case version also accepted
 ```
 
-## Looping
-
-```
-// c-style for loops
-for (var i = 0; i < 100; ++i) { print(i); }
-```
-
-```
-// while
-while (some_condition()) { /* do something */ }
-```
-
-```
-// ranged for
-for (i : [1, 2, 3]) { print(i); }
-```
-
-Each of the loop styles can be broken using the `break` statement. For example:
-
-```
-while (some_condition()) {
-  /* do something */
-  if (another_condition()) { break; }
-}
-```
-
-## Conditionals
-
-```
-if (expression) { }
-```
-
-```
-// C++17-style init-if blocks
-// Value of 'statement' is scoped for entire `if` block
-if (statement; expression) { }
-```
-
-## Switch Statements
-
-``` chaiscript
-var myvalue = 2
-switch (myvalue) {
-    case (1) {
-        print("My Value is 1");
-        break;
-    }
-    case (2) {
-        print("My Value is 2");
-        break;
-    }
-    default {
-        print("My Value is something else.";
-    }
-}
-```
-
-## Built-in Types
-
-There are a number of built-in types that are part of ChaiScript.
-
-### Vectors and Maps
+## Built in Types
 
 ```
 var v = [1,2,3u,4ll,"16", `+`]; // creates vector of heterogenous values
 var m = ["a":1, "b":2]; // map of string:value pairs
-
-// Add a value to the vector by value.
-v.push_back(123);
-
-// Add an object to the vector by reference.
-v.push_back_ref(m);
 ```
 
-### Numbers
-
 Floating point values default to `double` type and integers default to `int` type. All C++ suffixes
 such as `f`, `ll`, `u` as well as scientific notation are supported
 
@@ -427,7 +287,7 @@ on your platform.
 ## Functions
 
 Note that any type of ChaiScript function can be passed freely to C++ and automatically
-converted into a `std::function` object.
+converted into an `std::function` object.
 
 ### General 
 
@@ -526,20 +386,6 @@ o.f = fun(y) { print(this.x + y); }
 o.f(10); // prints 13
 ```
 
-## Namespaces
-
-Namespaces in ChaiScript are Dynamic Objects with global scope
-
-```
-namespace("math") // create a new namespace
-
-math.square = fun(x) { x * x } // add a function to the "math" namespace
-math.sum_squares = fun(x, y) { math.square(x) + math.square(y) }
-
-print(math.square(4)) // prints 16
-print(math.sum_squares(2, 5)) // prints 29
-```
-
 ### Option Explicit
 
 If you want to disable dynamic parameter definitions, you can `set_explicit`.
@@ -572,15 +418,8 @@ the contained function.
 
 If both a 2 parameter and a 3 parameter signature match, the 3 parameter function always wins.
 
-## Context
 
- * `__LINE__` Current file line number
- * `__FILE__` Full path of current file
- * `__CLASS__` Name of current class
- * `__FUNC__` Name of current function
-
-
-# Built-in Functions
+# Built In Functions
 
 ## Evaluation
 
@@ -593,10 +432,4 @@ use("filename") // evals file exactly once and returns value of last statement
 
 Both `use` and `eval_file` search the 'usepaths' passed to the ChaiScript constructor
 
-## JSON
 
- * `from_json` converts a JSON string into its strongly typed (map, vector, int, double, string) representations
- * `to_json` converts a ChaiScript object (either a `Object` or one of map, vector, int, double, string) tree into its JSON string representation
- 
-## Extras
-ChaiScript itself does not provide a link to the math functions defined in `<cmath>`. You can either add them yourself, or use the [ChaiScript_Extras](https://github.com/ChaiScript/ChaiScript_Extras) helper library. (Which also provides some additional string functions.)

cmake/Catch.cmake

@@ -1,175 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-Catch
------
-
-This module defines a function to help use the Catch test framework.
-
-The :command:`catch_discover_tests` discovers tests by asking the compiled test
-executable to enumerate its tests.  This does not require CMake to be re-run
-when tests change.  However, it may not work in a cross-compiling environment,
-and setting test properties is less convenient.
-
-This command is intended to replace use of :command:`add_test` to register
-tests, and will create a separate CTest test for each Catch test case.  Note
-that this is in some cases less efficient, as common set-up and tear-down logic
-cannot be shared by multiple test cases executing in the same instance.
-However, it provides more fine-grained pass/fail information to CTest, which is
-usually considered as more beneficial.  By default, the CTest test name is the
-same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
-
-.. command:: catch_discover_tests
-
-  Automatically add tests with CTest by querying the compiled test executable
-  for available tests::
-
-    catch_discover_tests(target
-                         [TEST_SPEC arg1...]
-                         [EXTRA_ARGS arg1...]
-                         [WORKING_DIRECTORY dir]
-                         [TEST_PREFIX prefix]
-                         [TEST_SUFFIX suffix]
-                         [PROPERTIES name1 value1...]
-                         [TEST_LIST var]
-    )
-
-  ``catch_discover_tests`` sets up a post-build command on the test executable
-  that generates the list of tests by parsing the output from running the test
-  with the ``--list-test-names-only`` argument.  This ensures that the full
-  list of tests is obtained.  Since test discovery occurs at build time, it is
-  not necessary to re-run CMake when the list of tests changes.
-  However, it requires that :prop_tgt:`CROSSCOMPILING_EMULATOR` is properly set
-  in order to function in a cross-compiling environment.
-
-  Additionally, setting properties on tests is somewhat less convenient, since
-  the tests are not available at CMake time.  Additional test properties may be
-  assigned to the set of tests as a whole using the ``PROPERTIES`` option.  If
-  more fine-grained test control is needed, custom content may be provided
-  through an external CTest script using the :prop_dir:`TEST_INCLUDE_FILES`
-  directory property.  The set of discovered tests is made accessible to such a
-  script via the ``<target>_TESTS`` variable.
-
-  The options are:
-
-  ``target``
-    Specifies the Catch executable, which must be a known CMake executable
-    target.  CMake will substitute the location of the built executable when
-    running the test.
-
-  ``TEST_SPEC arg1...``
-    Specifies test cases, wildcarded test cases, tags and tag expressions to
-    pass to the Catch executable with the ``--list-test-names-only`` argument.
-
-  ``EXTRA_ARGS arg1...``
-    Any extra arguments to pass on the command line to each test case.
-
-  ``WORKING_DIRECTORY dir``
-    Specifies the directory in which to run the discovered test cases.  If this
-    option is not provided, the current binary directory is used.
-
-  ``TEST_PREFIX prefix``
-    Specifies a ``prefix`` to be prepended to the name of each discovered test
-    case.  This can be useful when the same test executable is being used in
-    multiple calls to ``catch_discover_tests()`` but with different
-    ``TEST_SPEC`` or ``EXTRA_ARGS``.
-
-  ``TEST_SUFFIX suffix``
-    Similar to ``TEST_PREFIX`` except the ``suffix`` is appended to the name of
-    every discovered test case.  Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may
-    be specified.
-
-  ``PROPERTIES name1 value1...``
-    Specifies additional properties to be set on all tests discovered by this
-    invocation of ``catch_discover_tests``.
-
-  ``TEST_LIST var``
-    Make the list of tests available in the variable ``var``, rather than the
-    default ``<target>_TESTS``.  This can be useful when the same test
-    executable is being used in multiple calls to ``catch_discover_tests()``.
-    Note that this variable is only available in CTest.
-
-#]=======================================================================]
-
-#------------------------------------------------------------------------------
-function(catch_discover_tests TARGET)
-  cmake_parse_arguments(
-    ""
-    ""
-    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST"
-    "TEST_SPEC;EXTRA_ARGS;PROPERTIES"
-    ${ARGN}
-  )
-
-  if(NOT _WORKING_DIRECTORY)
-    set(_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endif()
-  if(NOT _TEST_LIST)
-    set(_TEST_LIST ${TARGET}_TESTS)
-  endif()
-
-  ## Generate a unique name based on the extra arguments
-  string(SHA1 args_hash "${_TEST_SPEC} ${_EXTRA_ARGS}")
-  string(SUBSTRING ${args_hash} 0 7 args_hash)
-
-  # Define rule to generate test list for aforementioned test executable
-  set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake")
-  set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake")
-  get_property(crosscompiling_emulator
-    TARGET ${TARGET}
-    PROPERTY CROSSCOMPILING_EMULATOR
-  )
-  add_custom_command(
-    TARGET ${TARGET} POST_BUILD
-    BYPRODUCTS "${ctest_tests_file}"
-    COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_TARGET=${TARGET}"
-            -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
-            -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-            -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
-            -D "TEST_SPEC=${_TEST_SPEC}"
-            -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-            -D "TEST_PROPERTIES=${_PROPERTIES}"
-            -D "TEST_PREFIX=${_TEST_PREFIX}"
-            -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-            -D "TEST_LIST=${_TEST_LIST}"
-            -D "CTEST_FILE=${ctest_tests_file}"
-            -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
-    VERBATIM
-  )
-
-  file(WRITE "${ctest_include_file}"
-    "if(EXISTS \"${ctest_tests_file}\")\n"
-    "  include(\"${ctest_tests_file}\")\n"
-    "else()\n"
-    "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
-    "endif()\n"
-  )
-
-  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0") 
-    # Add discovered tests to directory TEST_INCLUDE_FILES
-    set_property(DIRECTORY
-      APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
-    )
-  else()
-    # Add discovered tests as directory TEST_INCLUDE_FILE if possible
-    get_property(test_include_file_set DIRECTORY PROPERTY TEST_INCLUDE_FILE SET)
-    if (NOT ${test_include_file_set})
-      set_property(DIRECTORY
-        PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
-      )
-    else()
-      message(FATAL_ERROR
-        "Cannot set more than one TEST_INCLUDE_FILE"
-      )
-    endif()
-  endif()
-
-endfunction()
-
-###############################################################################
-
-set(_CATCH_DISCOVER_TESTS_SCRIPT
-  ${CMAKE_CURRENT_LIST_DIR}/CatchAddTests.cmake
-)

cmake/CatchAddTests.cmake

@@ -1,76 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-set(prefix "${TEST_PREFIX}")
-set(suffix "${TEST_SUFFIX}")
-set(spec ${TEST_SPEC})
-set(extra_args ${TEST_EXTRA_ARGS})
-set(properties ${TEST_PROPERTIES})
-set(script)
-set(suite)
-set(tests)
-
-function(add_command NAME)
-  set(_args "")
-  foreach(_arg ${ARGN})
-    if(_arg MATCHES "[^-./:a-zA-Z0-9_]")
-      set(_args "${_args} [==[${_arg}]==]") # form a bracket_argument
-    else()
-      set(_args "${_args} ${_arg}")
-    endif()
-  endforeach()
-  set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
-endfunction()
-
-# Run test executable to get list of available tests
-if(NOT EXISTS "${TEST_EXECUTABLE}")
-  message(FATAL_ERROR
-    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
-  )
-endif()
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-test-names-only
-  OUTPUT_VARIABLE output
-  RESULT_VARIABLE result
-)
-# Catch --list-test-names-only reports the number of tests, so 0 is... surprising
-if(${result} EQUAL 0)
-  message(WARNING
-    "Test executable '${TEST_EXECUTABLE}' contains no tests!\n"
-  )
-elseif(${result} LESS 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${result}\n"
-    "  Output: ${output}\n"
-  )
-endif()
-
-string(REPLACE "\n" ";" output "${output}")
-
-# Parse output
-foreach(line ${output})
-  set(test ${line})
-  # ...and add to script
-  add_command(add_test
-    "${prefix}${test}${suffix}"
-    ${TEST_EXECUTOR}
-    "${TEST_EXECUTABLE}"
-    ${test}
-    ${extra_args}
-  )
-  add_command(set_tests_properties
-    "${prefix}${test}${suffix}"
-    PROPERTIES
-    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-    ${properties}
-  )
-  list(APPEND tests "${prefix}${test}${suffix}")
-endforeach()
-
-# Create a list of all discovered tests, which users may use to e.g. set
-# properties on the tests
-add_command(set ${TEST_LIST} ${tests})
-
-# Write CTest script
-file(WRITE "${CTEST_FILE}" "${script}")

cmake/ParseAndAddCatchTests.cmake

@@ -1,185 +0,0 @@
-#==================================================================================================#
-#  supported macros                                                                                #
-#    - TEST_CASE,                                                                                  #
-#    - SCENARIO,                                                                                   #
-#    - TEST_CASE_METHOD,                                                                           #
-#    - CATCH_TEST_CASE,                                                                            #
-#    - CATCH_SCENARIO,                                                                             #
-#    - CATCH_TEST_CASE_METHOD.                                                                     #
-#                                                                                                  #
-#  Usage                                                                                           #
-# 1. make sure this module is in the path or add this otherwise:                                   #
-#    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake.modules/")              #
-# 2. make sure that you've enabled testing option for the project by the call:                     #
-#    enable_testing()                                                                              #
-# 3. add the lines to the script for testing target (sample CMakeLists.txt):                       #
-#        project(testing_target)                                                                   #
-#        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake.modules/")          #
-#        enable_testing()                                                                          #
-#                                                                                                  #
-#        find_path(CATCH_INCLUDE_DIR "catch.hpp")                                                  #
-#        include_directories(${INCLUDE_DIRECTORIES} ${CATCH_INCLUDE_DIR})                          #
-#                                                                                                  #
-#        file(GLOB SOURCE_FILES "*.cpp")                                                           #
-#        add_executable(${PROJECT_NAME} ${SOURCE_FILES})                                           #
-#                                                                                                  #
-#        include(ParseAndAddCatchTests)                                                            #
-#        ParseAndAddCatchTests(${PROJECT_NAME})                                                    #
-#                                                                                                  #
-# The following variables affect the behavior of the script:                                       #
-#                                                                                                  #
-#    PARSE_CATCH_TESTS_VERBOSE (Default OFF)                                                       #
-#    -- enables debug messages                                                                     #
-#    PARSE_CATCH_TESTS_NO_HIDDEN_TESTS (Default OFF)                                               #
-#    -- excludes tests marked with [!hide], [.] or [.foo] tags                                     #
-#    PARSE_CATCH_TESTS_ADD_FIXTURE_IN_TEST_NAME (Default ON)                                       #
-#    -- adds fixture class name to the test name                                                   #
-#    PARSE_CATCH_TESTS_ADD_TARGET_IN_TEST_NAME (Default ON)                                        #
-#    -- adds cmake target name to the test name                                                    #
-#    PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS (Default OFF)                                      #
-#    -- causes CMake to rerun when file with tests changes so that new tests will be discovered    #
-#                                                                                                  #
-#==================================================================================================#
-
-cmake_minimum_required(VERSION 2.8.8)
-
-option(PARSE_CATCH_TESTS_VERBOSE "Print Catch to CTest parser debug messages" OFF)
-option(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS "Exclude tests with [!hide], [.] or [.foo] tags" OFF)
-option(PARSE_CATCH_TESTS_ADD_FIXTURE_IN_TEST_NAME "Add fixture class name to the test name" ON)
-option(PARSE_CATCH_TESTS_ADD_TARGET_IN_TEST_NAME "Add target name to the test name" ON)
-option(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS "Add test file to CMAKE_CONFIGURE_DEPENDS property" OFF)
-
-function(PrintDebugMessage)
-    if(PARSE_CATCH_TESTS_VERBOSE)
-            message(STATUS "ParseAndAddCatchTests: ${ARGV}")
-    endif()
-endfunction()
-
-# This removes the contents between
-#  - block comments (i.e. /* ... */)
-#  - full line comments (i.e. // ... )
-# contents have been read into '${CppCode}'.
-# !keep partial line comments
-function(RemoveComments CppCode)
-  string(ASCII 2 CMakeBeginBlockComment)
-  string(ASCII 3 CMakeEndBlockComment)
-  string(REGEX REPLACE "/\\*" "${CMakeBeginBlockComment}" ${CppCode} "${${CppCode}}")
-  string(REGEX REPLACE "\\*/" "${CMakeEndBlockComment}" ${CppCode} "${${CppCode}}")
-  string(REGEX REPLACE "${CMakeBeginBlockComment}[^${CMakeEndBlockComment}]*${CMakeEndBlockComment}" "" ${CppCode} "${${CppCode}}")
-  string(REGEX REPLACE "\n[ \t]*//+[^\n]+" "\n" ${CppCode} "${${CppCode}}")
-
-  set(${CppCode} "${${CppCode}}" PARENT_SCOPE)
-endfunction()
-
-# Worker function
-function(ParseFile SourceFile TestTarget)
-    # According to CMake docs EXISTS behavior is well-defined only for full paths.
-    get_filename_component(SourceFile ${SourceFile} ABSOLUTE)
-    if(NOT EXISTS ${SourceFile})
-        message(WARNING "Cannot find source file: ${SourceFile}")
-        return()
-    endif()
-    PrintDebugMessage("parsing ${SourceFile}")
-    file(STRINGS ${SourceFile} Contents NEWLINE_CONSUME)
-
-    # Remove block and fullline comments
-    RemoveComments(Contents)
-
-    # Find definition of test names
-    string(REGEX MATCHALL "[ \t]*(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([^\)]+\\)+[ \t\n]*{+[ \t]*(//[^\n]*[Tt][Ii][Mm][Ee][Oo][Uu][Tt][ \t]*[0-9]+)*" Tests "${Contents}")
-
-    if(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS AND Tests)
-      PrintDebugMessage("Adding ${SourceFile} to CMAKE_CONFIGURE_DEPENDS property")
-      set_property(
-        DIRECTORY
-        APPEND
-        PROPERTY CMAKE_CONFIGURE_DEPENDS ${SourceFile}
-      )
-    endif()
-
-    foreach(TestName ${Tests})
-        # Strip newlines
-        string(REGEX REPLACE "\\\\\n|\n" "" TestName "${TestName}")
-
-        # Get test type and fixture if applicable
-        string(REGEX MATCH "(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([^,^\"]*" TestTypeAndFixture "${TestName}")
-        string(REGEX MATCH "(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)" TestType "${TestTypeAndFixture}")
-        string(REPLACE "${TestType}(" "" TestFixture "${TestTypeAndFixture}")
-
-        # Get string parts of test definition
-        string(REGEX MATCHALL "\"+([^\\^\"]|\\\\\")+\"+" TestStrings "${TestName}")
-
-        # Strip wrapping quotation marks
-        string(REGEX REPLACE "^\"(.*)\"$" "\\1" TestStrings "${TestStrings}")
-        string(REPLACE "\";\"" ";" TestStrings "${TestStrings}")
-
-        # Validate that a test name and tags have been provided
-        list(LENGTH TestStrings TestStringsLength)
-        if(TestStringsLength GREATER 2 OR TestStringsLength LESS 1)
-            message(FATAL_ERROR "You must provide a valid test name and tags for all tests in ${SourceFile}")
-        endif()
-
-        # Assign name and tags
-        list(GET TestStrings 0 Name)
-        if("${TestType}" STREQUAL "SCENARIO")
-            set(Name "Scenario: ${Name}")
-        endif()
-        if(PARSE_CATCH_TESTS_ADD_FIXTURE_IN_TEST_NAME AND TestFixture)
-            set(CTestName "${TestFixture}:${Name}")
-        else()
-            set(CTestName "${Name}")
-        endif()
-        if(PARSE_CATCH_TESTS_ADD_TARGET_IN_TEST_NAME)
-            set(CTestName "${TestTarget}:${CTestName}")
-        endif()
-        # add target to labels to enable running all tests added from this target
-        set(Labels ${TestTarget})
-        if(TestStringsLength EQUAL 2)
-            list(GET TestStrings 1 Tags)
-            string(TOLOWER "${Tags}" Tags)
-            # remove target from labels if the test is hidden
-            if("${Tags}" MATCHES ".*\\[!?(hide|\\.)\\].*")
-                list(REMOVE_ITEM Labels ${TestTarget})
-            endif()
-            string(REPLACE "]" ";" Tags "${Tags}")
-            string(REPLACE "[" "" Tags "${Tags}")
-        endif()
-
-        list(APPEND Labels ${Tags})
-
-        list(FIND Labels "!hide" IndexOfHideLabel)
-        set(HiddenTagFound OFF)
-        foreach(label ${Labels})
-            string(REGEX MATCH "^!hide|^\\." result ${label})
-            if(result)
-                set(HiddenTagFound ON)
-                break()
-            endif(result)
-        endforeach(label)
-        if(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS AND ${HiddenTagFound})
-            PrintDebugMessage("Skipping test \"${CTestName}\" as it has [!hide], [.] or [.foo] label")
-        else()
-            PrintDebugMessage("Adding test \"${CTestName}\"")
-            if(Labels)
-                PrintDebugMessage("Setting labels to ${Labels}")
-            endif()
-
-            # Add the test and set its properties
-            add_test(NAME "\"${CTestName}\"" COMMAND ${TestTarget} ${Name} ${AdditionalCatchParameters})
-            set_tests_properties("\"${CTestName}\"" PROPERTIES FAIL_REGULAR_EXPRESSION "No tests ran"
-                                                    LABELS "${Labels}")
-        endif()
-
-    endforeach()
-endfunction()
-
-# entry point
-function(ParseAndAddCatchTests TestTarget)
-    PrintDebugMessage("Started parsing ${TestTarget}")
-    get_target_property(SourceFiles ${TestTarget} SOURCES)
-    PrintDebugMessage("Found the following sources: ${SourceFiles}")
-    foreach(SourceFile ${SourceFiles})
-        ParseFile(${SourceFile} ${TestTarget})
-    endforeach()
-    PrintDebugMessage("Finished parsing ${TestTarget}")
-endfunction()

contrib/codeanalysis/fuzzy_tests/chaiscript.dict

@@ -1,61 +0,0 @@
-# My dict
-
-
-for="for"
-while="while"
-def="def"
-fun="fun"
-if="if"
-else="else"
-and="&&"
-or="||"
-auto="auto"
-var="var"
-begin_block="{"
-end_block="}"
-empty_vec="[]"
-string="string"
-vector="Vector"
-map="Map"
-return="return"
-break="break"
-true="true"
-false="false"
-class="class"
-attr="attr"
-var="var"
-global="global"
-empty_lambda=" fun(){} "
-empty_fun=" def empty_fun() {} "
-continue="continue"
-float=" 1.1f "
-double=" 2.2 "
-long_double=" 2.2ll "
-unsigned=" 3u "
-unsigned_long=" 4ul "
-unsigned_long_long=" 4ull "
-long_long=" 5ll "
-attr="attr"
-reference_del="auto &"
-int8=" int8_t(1) "
-int16=" int16_t(2) "
-int32=" int32_t(3) "
-int64=" int64_t(4) "
-uint8=" uint8_t(1) "
-uint16=" uint16_t(2) "
-uint32=" uint32_t(3) "
-uint64=" uint64_t(4) "
-int8t="int8_t"
-int16t="int16_t"
-int32t="int32_t"
-int64t="int64_t"
-uint8t="uint8_t"
-uint16t="uint16_t"
-uint32t="uint32_t"
-uint64t="uint64_t"
-
-
-
-
-
-

contrib/codeanalysis/fuzzy_tests/notes.txt

@@ -1,17 +0,0 @@
-Command line used to find this crash:
-
-../../Downloads/afl-1.80b/afl-fuzz -i- -o findings -x chaiscript.dict -- ../a.out unit_test.inc @@
-
-If you can't reproduce a bug outside of afl-fuzz, be sure to set the same
-memory limit. The limit used for this fuzzing session was 50.0 MB.
-
-Need a tool to minimize test cases before investigating the crashes or sending
-them to a vendor? Check out the afl-tmin that comes with the fuzzer!
-
-Found any cool bugs in open-source tools using afl-fuzz? If yes, please drop
-me a mail at <lcamtuf@coredump.cx> once the issues are fixed - I'd love to
-add your finds to the gallery at:
-
-  http://lcamtuf.coredump.cx/afl/
-
-Thanks :-)

contrib/codeanalysis/runcppcheck.sh

@@ -4,7 +4,7 @@ pushd ..
 wget http://sourceforge.net/projects/cppcheck/files/cppcheck/1.66/cppcheck-1.66.tar.bz2
 tar -xvf cppcheck-1.66.tar.bz2
 cd cppcheck-1.66
-make -j2
+CXX=g++-4.8 make -j2
 popd
 ../cppcheck-1.66/cppcheck --enable=all -I include --inline-suppr --suppress=missingIncludeSystem --std=c++11 --platform=unix64 src/main.cpp src/chai*.cpp --template ' - __{severity}__: [{file}:{line}](../blob/TRAVIS_COMMIT/{file}#L{line}) {message} ({id})'  2>output
 sed -i "s/TRAVIS_COMMIT/${TRAVIS_COMMIT}/g" output

contrib/sublimetext/ChaiScript.YAML-tmLanguage

@@ -0,0 +1,93 @@
+# [PackageDev] target_format: plist, ext: tmLanguage
+---
+comment: 'ChaiScript Syntax: version 2.0'
+fileTypes: [chai]
+firstLineMatch: ^#!/usr/bin/env node
+foldingStartMarker: ^.*\bdef\s*(\w+\s*)?\([^\)]*\)(\s*\{[^\}]*)?\s*$
+foldingStopMarker: ^\s*\}
+keyEquivalent: ^~J
+name: ChaiScript
+patterns:
+- {comment: chaiscript shebang, match: ^#, name: comment.line.chai}
+- {match: '\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b', name: constant.numeric.chai}
+- begin: ''''
+  beginCaptures:
+    '0': {name: punctuation.definition.string.begin.chai}
+  end: ''''
+  endCaptures:
+    '0': {name: punctuation.definition.string.end.chai}
+  name: string.quoted.single.chai
+  patterns:
+  - {match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)', name: constant.character.escape.chai}
+- begin: '"'
+  beginCaptures:
+    '0': {name: punctuation.definition.string.begin.chai}
+  end: '"'
+  endCaptures:
+    '0': {name: punctuation.definition.string.end.chai}
+  name: string.quoted.double.chai
+  patterns:
+  - {match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)', name: constant.character.escape.chai}
+- begin: /\*\*(?!/)
+  captures:
+    '0': {name: punctuation.definition.comment.chai}
+  end: \*/
+  name: comment.block.documentation.chai
+- begin: /\*
+  captures:
+    '0': {name: punctuation.definition.comment.chai}
+  end: \*/
+  name: comment.block.chai
+- captures:
+    '1': {name: punctuation.definition.comment.chai}
+  match: (//).*$\n?
+  name: comment.line.double-slash.chai
+- captures:
+    '0': {name: punctuation.definition.comment.html.chai}
+    '2': {name: punctuation.definition.comment.html.chai}
+  match: (<!--|-->)
+  name: comment.block.html.chai
+- {match: \b(boolean|byte|char|class|double|enum|float|fun|def|int|interface|long|short|var|auto|attr)\b,
+  name: storage.type.chai}
+- {match: \b(break|case|catch|continue|default|do|else|finally|else if|for|goto|if|return|switch|throw|try|while)\b,
+  name: keyword.control.chai}
+- {match: \b(delete|in|instanceof|new|typeof|with)\b, name: keyword.operator.chai}
+- {match: \btrue\b, name: constant.language.boolean.true.chai}
+- {match: \bfalse\b, name: constant.language.boolean.false.chai}
+- {match: \bnull\b, name: constant.language.null.chai}
+- {match: \b(Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Math|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|Radio|RegExp|Reset|Select|String|Style|Submit|screen|sun|Text|Textarea|window|XMLHttpRequest)\b,
+  name: support.class.chai}
+- {match: '\b(s(h(ift|ow(Mod(elessDialog|alDialog)|Help))|croll(X|By(Pages|Lines)?|Y|To)?|t(op|rike)|i(n|zeToContent|debar|gnText)|ort|u(p|b(str(ing)?)?)|pli(ce|t)|e(nd|t(Re(sizable|questHeader)|M(i(nutes|lliseconds)|onth)|Seconds|Ho(tKeys|urs)|Year|Cursor|Time(out)?|Interval|ZOptions|Date|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(ome|andleEvent)|navigate|c(har(CodeAt|At)|o(s|n(cat|textual|firm)|mpile)|eil|lear(Timeout|Interval)?|a(ptureEvents|ll)|reate(StyleSheet|Popup|EventObject))|t(o(GMTString|S(tring|ource)|U(TCString|pperCase)|Lo(caleString|werCase))|est|a(n|int(Enabled)?))|i(s(NaN|Finite)|ndexOf|talics)|d(isableExternalCapture|ump|etachEvent)|u(n(shift|taint|escape|watch)|pdateCommands)|j(oin|avaEnabled)|p(o(p|w)|ush|lugins.refresh|a(ddings|rse(Int|Float)?)|r(int|ompt|eference))|e(scape|nableExternalCapture|val|lementFromPoint|x(p|ec(Script|Command)?))|valueOf|UTC|queryCommand(State|Indeterm|Enabled|Value)|f(i(nd|le(ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(nt(size|color)|rward)|loor|romCharCode)|watch|l(ink|o(ad|g)|astIndexOf)|a(sin|nchor|cos|t(tachEvent|ob|an(2)?)|pply|lert|b(s|ort))|r(ou(nd|teEvents)|e(size(By|To)|calc|turnValue|place|verse|l(oad|ease(Capture|Events)))|andom)|g(o|et(ResponseHeader|M(i(nutes|lliseconds)|onth)|Se(conds|lection)|Hours|Year|Time(zoneOffset)?|Da(y|te)|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Da(y|te)|FullYear)|FullYear|A(ttention|llResponseHeaders)))|m(in|ove(B(y|elow)|To(Absolute)?|Above)|ergeAttributes|a(tch|rgins|x))|b(toa|ig|o(ld|rderWidths)|link|ack))\b(?=\()',
+  name: support.function.chai}
+- {match: '\b(s(ub(stringData|mit)|plitText|e(t(NamedItem|Attribute(Node)?)|lect))|has(ChildNodes|Feature)|namedItem|c(l(ick|o(se|neNode))|reate(C(omment|DATASection|aption)|T(Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(ntityReference|lement)|Attribute))|tabIndex|i(nsert(Row|Before|Cell|Data)|tem)|open|delete(Row|C(ell|aption)|T(Head|Foot)|Data)|focus|write(ln)?|a(dd|ppend(Child|Data))|re(set|place(Child|Data)|move(NamedItem|Child|Attribute(Node)?)?)|get(NamedItem|Element(sBy(Name|TagName)|ById)|Attribute(Node)?)|blur)\b(?=\()',
+  name: support.function.dom.chai}
+- {match: '(?<=\.)(s(ystemLanguage|cr(ipts|ollbars|een(X|Y|Top|Left))|t(yle(Sheets)?|atus(Text|bar)?)|ibling(Below|Above)|ource|uffixes|e(curity(Policy)?|l(ection|f)))|h(istory|ost(name)?|as(h|Focus))|y|X(MLDocument|SLDocument)|n(ext|ame(space(s|URI)|Prop))|M(IN_VALUE|AX_VALUE)|c(haracterSet|o(n(structor|trollers)|okieEnabled|lorDepth|mp(onents|lete))|urrent|puClass|l(i(p(boardData)?|entInformation)|osed|asses)|alle(e|r)|rypto)|t(o(olbar|p)|ext(Transform|Indent|Decoration|Align)|ags)|SQRT(1_2|2)|i(n(ner(Height|Width)|put)|ds|gnoreCase)|zIndex|o(scpu|n(readystatechange|Line)|uter(Height|Width)|p(sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(i(splay|alog(Height|Top|Width|Left|Arguments)|rectories)|e(scription|fault(Status|Ch(ecked|arset)|View)))|u(ser(Profile|Language|Agent)|n(iqueID|defined)|pdateInterval)|_content|p(ixelDepth|ort|ersonalbar|kcs11|l(ugins|atform)|a(thname|dding(Right|Bottom|Top|Left)|rent(Window|Layer)?|ge(X(Offset)?|Y(Offset)?))|r(o(to(col|type)|duct(Sub)?|mpter)|e(vious|fix)))|e(n(coding|abledPlugin)|x(ternal|pando)|mbeds)|v(isibility|endor(Sub)?|Linkcolor)|URLUnencoded|P(I|OSITIVE_INFINITY)|f(ilename|o(nt(Size|Family|Weight)|rmName)|rame(s|Element)|gColor)|E|whiteSpace|l(i(stStyleType|n(eHeight|kColor))|o(ca(tion(bar)?|lName)|wsrc)|e(ngth|ft(Context)?)|a(st(M(odified|atch)|Index|Paren)|yer(s|X)|nguage))|a(pp(MinorVersion|Name|Co(deName|re)|Version)|vail(Height|Top|Width|Left)|ll|r(ity|guments)|Linkcolor|bove)|r(ight(Context)?|e(sponse(XML|Text)|adyState))|global|x|m(imeTypes|ultiline|enubar|argin(Right|Bottom|Top|Left))|L(N(10|2)|OG(10E|2E))|b(o(ttom|rder(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(Color|Image)))\b',
+  name: support.constant.chai}
+- {match: '(?<=\.)(s(hape|ystemId|c(heme|ope|rolling)|ta(ndby|rt)|ize|ummary|pecified|e(ctionRowIndex|lected(Index)?)|rc)|h(space|t(tpEquiv|mlFor)|e(ight|aders)|ref(lang)?)|n(o(Resize|tation(s|Name)|Shade|Href|de(Name|Type|Value)|Wrap)|extSibling|ame)|c(h(ildNodes|Off|ecked|arset)?|ite|o(ntent|o(kie|rds)|de(Base|Type)?|l(s|Span|or)|mpact)|ell(s|Spacing|Padding)|l(ear|assName)|aption)|t(ype|Bodies|itle|Head|ext|a(rget|gName)|Foot)|i(sMap|ndex|d|m(plementation|ages))|o(ptions|wnerDocument|bject)|d(i(sabled|r)|o(c(type|umentElement)|main)|e(clare|f(er|ault(Selected|Checked|Value)))|at(eTime|a))|useMap|p(ublicId|arentNode|r(o(file|mpt)|eviousSibling))|e(n(ctype|tities)|vent|lements)|v(space|ersion|alue(Type)?|Link|Align)|URL|f(irstChild|orm(s)?|ace|rame(Border)?)|width|l(ink(s)?|o(ngDesc|wSrc)|a(stChild|ng|bel))|a(nchors|c(ce(ssKey|pt(Charset)?)|tion)|ttributes|pplets|l(t|ign)|r(chive|eas)|xis|Link|bbr)|r(ow(s|Span|Index)|ules|e(v|ferrer|l|adOnly))|m(ultiple|e(thod|dia)|a(rgin(Height|Width)|xLength))|b(o(dy|rder)|ackground|gColor))\b',
+  name: support.constant.dom.chai}
+- {match: \b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\b,
+  name: support.constant.dom.chai}
+- {match: '\bon(R(ow(s(inserted|delete)|e(nter|xit))|e(s(ize(start|end)?|et)|adystatechange))|Mouse(o(ut|ver)|down|up|move)|B(efore(cut|deactivate|u(nload|pdate)|p(aste|rint)|editfocus|activate)|lur)|S(croll|top|ubmit|elect(start|ionchange)?)|H(over|elp)|C(hange|ont(extmenu|rolselect)|ut|ellchange|l(ick|ose))|D(eactivate|ata(setc(hanged|omplete)|available)|r(op|ag(start|over|drop|en(ter|d)|leave)?)|blclick)|Unload|P(aste|ropertychange)|Error(update)?|Key(down|up|press)|Focus|Load|A(ctivate|fter(update|print)|bort))\b',
+  name: support.function.event-handler.chai}
+- {match: '!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=|\b(in|instanceof|new|delete|typeof|void)\b',
+  name: keyword.operator.chai}
+- {match: \b(Infinity|NaN|undefined)\b, name: constant.language.chai}
+- begin: (?<=[=(:]|^|return|&&|\|\||!)\s*(/)(?![/*+{}?])
+  beginCaptures:
+    '1': {name: punctuation.definition.string.begin.chai}
+  end: (/)[igm]*
+  endCaptures:
+    '1': {name: punctuation.definition.string.end.chai}
+  name: string.regexp.chai
+  patterns:
+  - {match: \\., name: constant.character.escape.chai}
+- {match: \;, name: punctuation.terminator.statement.chai}
+- {match: ',[ |\t]*', name: meta.delimiter.object.comma.chai}
+- {match: \., name: meta.delimiter.method.period.chai}
+- {match: '\{|\}', name: meta.brace.curly.chai}
+- {match: \(|\), name: meta.brace.round.chai}
+- {match: '\[|\]', name: meta.brace.square.chai}
+scopeName: source.chai
+uuid: 93E017CC-6F27-11D9-90EB-000D93589AF6
+ 
+...

contrib/sublimetext/ChaiScript.tmLanguage

@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>comment</key>
+	<string>ChaiScript Syntax: version 2.0</string>
+	<key>fileTypes</key>
+	<array>
+		<string>chai</string>
+	</array>
+	<key>firstLineMatch</key>
+	<string>^#!/usr/bin/env node</string>
+	<key>foldingStartMarker</key>
+	<string>^.*\bdef\s*(\w+\s*)?\([^\)]*\)(\s*\{[^\}]*)?\s*$</string>
+	<key>foldingStopMarker</key>
+	<string>^\s*\}</string>
+	<key>keyEquivalent</key>
+	<string>^~J</string>
+	<key>name</key>
+	<string>ChaiScript</string>
+	<key>patterns</key>
+	<array>
+		<dict>
+			<key>comment</key>
+			<string>chaiscript shebang</string>
+			<key>match</key>
+			<string>^#</string>
+			<key>name</key>
+			<string>comment.line.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b</string>
+			<key>name</key>
+			<string>constant.numeric.chai</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>'</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>'</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.end.chai</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>string.quoted.single.chai</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)</string>
+					<key>name</key>
+					<string>constant.character.escape.chai</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>"</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>"</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.end.chai</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>string.quoted.double.chai</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)</string>
+					<key>name</key>
+					<string>constant.character.escape.chai</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>/\*\*(?!/)</string>
+			<key>captures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>\*/</string>
+			<key>name</key>
+			<string>comment.block.documentation.chai</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>/\*</string>
+			<key>captures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>\*/</string>
+			<key>name</key>
+			<string>comment.block.chai</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.chai</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(//).*$\n?</string>
+			<key>name</key>
+			<string>comment.line.double-slash.chai</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.html.chai</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.html.chai</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(&lt;!--|--&gt;)</string>
+			<key>name</key>
+			<string>comment.block.html.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(boolean|byte|char|class|double|enum|float|fun|def|int|interface|long|short|var|auto|attr)\b</string>
+			<key>name</key>
+			<string>storage.type.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(break|case|catch|continue|default|do|else|finally|else if|for|goto|if|return|switch|throw|try|while)\b</string>
+			<key>name</key>
+			<string>keyword.control.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(delete|in|instanceof|new|typeof|with)\b</string>
+			<key>name</key>
+			<string>keyword.operator.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\btrue\b</string>
+			<key>name</key>
+			<string>constant.language.boolean.true.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bfalse\b</string>
+			<key>name</key>
+			<string>constant.language.boolean.false.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bnull\b</string>
+			<key>name</key>
+			<string>constant.language.null.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Math|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|Radio|RegExp|Reset|Select|String|Style|Submit|screen|sun|Text|Textarea|window|XMLHttpRequest)\b</string>
+			<key>name</key>
+			<string>support.class.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(s(h(ift|ow(Mod(elessDialog|alDialog)|Help))|croll(X|By(Pages|Lines)?|Y|To)?|t(op|rike)|i(n|zeToContent|debar|gnText)|ort|u(p|b(str(ing)?)?)|pli(ce|t)|e(nd|t(Re(sizable|questHeader)|M(i(nutes|lliseconds)|onth)|Seconds|Ho(tKeys|urs)|Year|Cursor|Time(out)?|Interval|ZOptions|Date|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(ome|andleEvent)|navigate|c(har(CodeAt|At)|o(s|n(cat|textual|firm)|mpile)|eil|lear(Timeout|Interval)?|a(ptureEvents|ll)|reate(StyleSheet|Popup|EventObject))|t(o(GMTString|S(tring|ource)|U(TCString|pperCase)|Lo(caleString|werCase))|est|a(n|int(Enabled)?))|i(s(NaN|Finite)|ndexOf|talics)|d(isableExternalCapture|ump|etachEvent)|u(n(shift|taint|escape|watch)|pdateCommands)|j(oin|avaEnabled)|p(o(p|w)|ush|lugins.refresh|a(ddings|rse(Int|Float)?)|r(int|ompt|eference))|e(scape|nableExternalCapture|val|lementFromPoint|x(p|ec(Script|Command)?))|valueOf|UTC|queryCommand(State|Indeterm|Enabled|Value)|f(i(nd|le(ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(nt(size|color)|rward)|loor|romCharCode)|watch|l(ink|o(ad|g)|astIndexOf)|a(sin|nchor|cos|t(tachEvent|ob|an(2)?)|pply|lert|b(s|ort))|r(ou(nd|teEvents)|e(size(By|To)|calc|turnValue|place|verse|l(oad|ease(Capture|Events)))|andom)|g(o|et(ResponseHeader|M(i(nutes|lliseconds)|onth)|Se(conds|lection)|Hours|Year|Time(zoneOffset)?|Da(y|te)|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Da(y|te)|FullYear)|FullYear|A(ttention|llResponseHeaders)))|m(in|ove(B(y|elow)|To(Absolute)?|Above)|ergeAttributes|a(tch|rgins|x))|b(toa|ig|o(ld|rderWidths)|link|ack))\b(?=\()</string>
+			<key>name</key>
+			<string>support.function.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(s(ub(stringData|mit)|plitText|e(t(NamedItem|Attribute(Node)?)|lect))|has(ChildNodes|Feature)|namedItem|c(l(ick|o(se|neNode))|reate(C(omment|DATASection|aption)|T(Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(ntityReference|lement)|Attribute))|tabIndex|i(nsert(Row|Before|Cell|Data)|tem)|open|delete(Row|C(ell|aption)|T(Head|Foot)|Data)|focus|write(ln)?|a(dd|ppend(Child|Data))|re(set|place(Child|Data)|move(NamedItem|Child|Attribute(Node)?)?)|get(NamedItem|Element(sBy(Name|TagName)|ById)|Attribute(Node)?)|blur)\b(?=\()</string>
+			<key>name</key>
+			<string>support.function.dom.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>(?&lt;=\.)(s(ystemLanguage|cr(ipts|ollbars|een(X|Y|Top|Left))|t(yle(Sheets)?|atus(Text|bar)?)|ibling(Below|Above)|ource|uffixes|e(curity(Policy)?|l(ection|f)))|h(istory|ost(name)?|as(h|Focus))|y|X(MLDocument|SLDocument)|n(ext|ame(space(s|URI)|Prop))|M(IN_VALUE|AX_VALUE)|c(haracterSet|o(n(structor|trollers)|okieEnabled|lorDepth|mp(onents|lete))|urrent|puClass|l(i(p(boardData)?|entInformation)|osed|asses)|alle(e|r)|rypto)|t(o(olbar|p)|ext(Transform|Indent|Decoration|Align)|ags)|SQRT(1_2|2)|i(n(ner(Height|Width)|put)|ds|gnoreCase)|zIndex|o(scpu|n(readystatechange|Line)|uter(Height|Width)|p(sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(i(splay|alog(Height|Top|Width|Left|Arguments)|rectories)|e(scription|fault(Status|Ch(ecked|arset)|View)))|u(ser(Profile|Language|Agent)|n(iqueID|defined)|pdateInterval)|_content|p(ixelDepth|ort|ersonalbar|kcs11|l(ugins|atform)|a(thname|dding(Right|Bottom|Top|Left)|rent(Window|Layer)?|ge(X(Offset)?|Y(Offset)?))|r(o(to(col|type)|duct(Sub)?|mpter)|e(vious|fix)))|e(n(coding|abledPlugin)|x(ternal|pando)|mbeds)|v(isibility|endor(Sub)?|Linkcolor)|URLUnencoded|P(I|OSITIVE_INFINITY)|f(ilename|o(nt(Size|Family|Weight)|rmName)|rame(s|Element)|gColor)|E|whiteSpace|l(i(stStyleType|n(eHeight|kColor))|o(ca(tion(bar)?|lName)|wsrc)|e(ngth|ft(Context)?)|a(st(M(odified|atch)|Index|Paren)|yer(s|X)|nguage))|a(pp(MinorVersion|Name|Co(deName|re)|Version)|vail(Height|Top|Width|Left)|ll|r(ity|guments)|Linkcolor|bove)|r(ight(Context)?|e(sponse(XML|Text)|adyState))|global|x|m(imeTypes|ultiline|enubar|argin(Right|Bottom|Top|Left))|L(N(10|2)|OG(10E|2E))|b(o(ttom|rder(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(Color|Image)))\b</string>
+			<key>name</key>
+			<string>support.constant.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>(?&lt;=\.)(s(hape|ystemId|c(heme|ope|rolling)|ta(ndby|rt)|ize|ummary|pecified|e(ctionRowIndex|lected(Index)?)|rc)|h(space|t(tpEquiv|mlFor)|e(ight|aders)|ref(lang)?)|n(o(Resize|tation(s|Name)|Shade|Href|de(Name|Type|Value)|Wrap)|extSibling|ame)|c(h(ildNodes|Off|ecked|arset)?|ite|o(ntent|o(kie|rds)|de(Base|Type)?|l(s|Span|or)|mpact)|ell(s|Spacing|Padding)|l(ear|assName)|aption)|t(ype|Bodies|itle|Head|ext|a(rget|gName)|Foot)|i(sMap|ndex|d|m(plementation|ages))|o(ptions|wnerDocument|bject)|d(i(sabled|r)|o(c(type|umentElement)|main)|e(clare|f(er|ault(Selected|Checked|Value)))|at(eTime|a))|useMap|p(ublicId|arentNode|r(o(file|mpt)|eviousSibling))|e(n(ctype|tities)|vent|lements)|v(space|ersion|alue(Type)?|Link|Align)|URL|f(irstChild|orm(s)?|ace|rame(Border)?)|width|l(ink(s)?|o(ngDesc|wSrc)|a(stChild|ng|bel))|a(nchors|c(ce(ssKey|pt(Charset)?)|tion)|ttributes|pplets|l(t|ign)|r(chive|eas)|xis|Link|bbr)|r(ow(s|Span|Index)|ules|e(v|ferrer|l|adOnly))|m(ultiple|e(thod|dia)|a(rgin(Height|Width)|xLength))|b(o(dy|rder)|ackground|gColor))\b</string>
+			<key>name</key>
+			<string>support.constant.dom.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\b</string>
+			<key>name</key>
+			<string>support.constant.dom.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bon(R(ow(s(inserted|delete)|e(nter|xit))|e(s(ize(start|end)?|et)|adystatechange))|Mouse(o(ut|ver)|down|up|move)|B(efore(cut|deactivate|u(nload|pdate)|p(aste|rint)|editfocus|activate)|lur)|S(croll|top|ubmit|elect(start|ionchange)?)|H(over|elp)|C(hange|ont(extmenu|rolselect)|ut|ellchange|l(ick|ose))|D(eactivate|ata(setc(hanged|omplete)|available)|r(op|ag(start|over|drop|en(ter|d)|leave)?)|blclick)|Unload|P(aste|ropertychange)|Error(update)?|Key(down|up|press)|Focus|Load|A(ctivate|fter(update|print)|bort))\b</string>
+			<key>name</key>
+			<string>support.function.event-handler.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>!|\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\|\||\?\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|void)\b</string>
+			<key>name</key>
+			<string>keyword.operator.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(Infinity|NaN|undefined)\b</string>
+			<key>name</key>
+			<string>constant.language.chai</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>(?&lt;=[=(:]|^|return|&amp;&amp;|\|\||!)\s*(/)(?![/*+{}?])</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(/)[igm]*</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.end.chai</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>string.regexp.chai</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\.</string>
+					<key>name</key>
+					<string>constant.character.escape.chai</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\;</string>
+			<key>name</key>
+			<string>punctuation.terminator.statement.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>,[ |\t]*</string>
+			<key>name</key>
+			<string>meta.delimiter.object.comma.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\.</string>
+			<key>name</key>
+			<string>meta.delimiter.method.period.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\{|\}</string>
+			<key>name</key>
+			<string>meta.brace.curly.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\(|\)</string>
+			<key>name</key>
+			<string>meta.brace.round.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\[|\]</string>
+			<key>name</key>
+			<string>meta.brace.square.chai</string>
+		</dict>
+	</array>
+	<key>scopeName</key>
+	<string>source.chai</string>
+	<key>uuid</key>
+	<string>93E017CC-6F27-11D9-90EB-000D93589AF6</string>
+</dict>
+</plist>

contrib/vim

@@ -1 +0,0 @@
-vim support can be found at https://github.com/ChaiScript/vim-chaiscript

contrib/vim/README.txt

@@ -0,0 +1,7 @@
+Install ftdetect, indent and syntax subdirectories to:
+
+~/.vim/
+
+See the vim documentation on this:
+
+http://vimdoc.sourceforge.net/htmldoc/syntax.html#mysyntaxfile

contrib/vim/ftdetect/chaiscript.vim

@@ -0,0 +1,2 @@
+au BufRead,BufNewFile *.chai            set filetype=chaiscript
+

contrib/vim/indent/chaiscript.vim

@@ -0,0 +1,50 @@
+" Vim indent file
+" Language:     ChaiScript
+" Maintainer:	Jason Turner <lefticus 'at' gmail com>
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetChaiScriptIndent()
+setlocal autoindent
+
+" Only define the function once.
+if exists("*GetChaiScriptIndent")
+  finish
+endif
+
+function! GetChaiScriptIndent()
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " Hit the start of the file, use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  " Add a 'shiftwidth' after lines that start a block:
+  " lines containing a {
+  let ind = indent(lnum)
+  let flag = 0
+  let prevline = getline(lnum)
+  if prevline =~ '^.*{.*'
+    let ind = ind + &shiftwidth
+    let flag = 1
+  endif
+
+  " Subtract a 'shiftwidth' after lines containing a { followed by a }
+  " to keep it balanced
+  if flag == 1 && prevline =~ '.*{.*}.*'
+    let ind = ind - &shiftwidth
+  endif
+
+  " Subtract a 'shiftwidth' on lines ending with }
+  if getline(v:lnum) =~ '^\s*\%(}\)'
+    let ind = ind - &shiftwidth
+  endif
+
+  return ind
+endfunction

contrib/vim/syntax/chaiscript.vim

@@ -0,0 +1,99 @@
+" Vim syntax file
+" Language:	ChaiScript
+" Maintainer:	Jason Turner <lefticus 'at' gmail com>
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+end
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case match
+
+" syncing method
+syn sync fromstart
+
+" Strings
+syn region chaiscriptString        start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=chaiscriptSpecial,chaiscriptEval,@Spell
+
+" Escape characters
+syn match  chaiscriptSpecial       contained "\\[\\abfnrtv\'\"]\|\\\d\{,3}"
+
+" String evals
+syn region chaiscriptEval          contained start="${" end="}"
+
+" integer number
+syn match  chaiscriptNumber        "\<\d\+\>"
+
+" floating point number, with dot, optional exponent
+syn match  chaiscriptFloat         "\<\d\+\.\d*\%(e[-+]\=\d\+\)\=\>"
+
+" floating point number, starting with a dot, optional exponent
+syn match  chaiscriptFloat         "\.\d\+\%(e[-+]\=\d\+\)\=\>"
+
+" floating point number, without dot, with exponent
+syn match  chaiscriptFloat         "\<\d\+e[-+]\=\d\+\>"
+
+" Hex strings
+syn match  chaiscriptNumber        "\<0x\x\+\>"
+
+" Binary strings
+syn match  chaiscriptNumber        "\<0b[01]\+\>"
+
+" Various language features
+syn keyword chaiscriptCond         if else
+syn keyword chaiscriptRepeat       while for do
+syn keyword chaiscriptStatement    break continue return switch case default
+syn keyword chaiscriptExceptions   try catch throw
+
+"Keyword
+syn keyword chaiscriptKeyword      def true false attr
+
+"Built in types
+syn keyword chaiscriptType         fun var auto
+
+"Built in funcs, keep it simple
+syn keyword chaiscriptFunc         eval throw
+
+"Let's treat all backtick operator function lookups as built in too
+syn region  chaiscriptFunc         matchgroup=chaiscriptFunc start="`" end="`"
+
+" Account for the "[1..10]" syntax, treating it as an operator
+" Intentionally leaving out all of the normal, well known operators
+syn match   chaiscriptOperator     "\.\."
+
+" Guard seperator as an operator
+syn match   chaiscriptOperator     ":"
+
+" Comments
+syn match   chaiscriptComment      "//.*$" contains=@Spell
+syn region  chaiscriptComment      matchgroup=chaiscriptComment start="/\*" end="\*/" contains=@Spell
+
+
+
+hi def link chaiscriptExceptions	Exception
+hi def link chaiscriptKeyword		Keyword
+hi def link chaiscriptStatement		Statement
+hi def link chaiscriptRepeat		Repeat
+hi def link chaiscriptString		String
+hi def link chaiscriptNumber		Number
+hi def link chaiscriptFloat		Float
+hi def link chaiscriptOperator		Operator
+hi def link chaiscriptConstant		Constant
+hi def link chaiscriptCond		Conditional
+hi def link chaiscriptFunction		Function
+hi def link chaiscriptComment		Comment
+hi def link chaiscriptTodo		Todo
+hi def link chaiscriptError		Error
+hi def link chaiscriptSpecial		SpecialChar
+hi def link chaiscriptFunc		Identifier
+hi def link chaiscriptType		Type
+hi def link chaiscriptEval	        Special
+
+let b:current_syntax = "chaiscript"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: nowrap sw=2 sts=2 ts=8 noet

include/chaiscript/chaiscript.hpp

@@ -1,15 +1,14 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_HPP_
 #define CHAISCRIPT_HPP_
 
+
+
 /// @mainpage
 /// [ChaiScript](http://www.chaiscript.com") is a scripting language designed specifically for integration with C++. It provides
 /// seamless integration with C++ on all levels, including shared_ptr objects, functors and exceptions.
@@ -19,8 +18,7 @@
 ///
 /// The end user parts of the API are extremely simple both in size and ease of use.
 ///
-/// Currently, all source control and project management aspects of ChaiScript occur on
-/// [github](http://www.github.com/ChaiScript/ChaiScript").
+/// Currently, all source control and project management aspects of ChaiScript occur on [github](http://www.github.com/ChaiScript/ChaiScript").
 ///
 /// ------------------------------------------------------------
 /// 
@@ -67,7 +65,7 @@
 /// int main()
 /// {
 ///   chaiscript::ChaiScript chai;
-///   chai.add(chaiscript::fun(&function), "function");
+///   chai.add(&function, "function");
 ///
 ///   double d = chai.eval<double>("function(3, 4.75);");
 /// } 
@@ -313,8 +311,8 @@
 /// As much as possible, ChaiScript attempts to convert between &, *, const &, const *, std::shared_ptr<T>,
 /// std::shared_ptr<const T>, std::reference_wrapper<T>, std::reference_wrapper<const T> and value types automatically.
 ///
-/// If a chaiscript::var object was created in C++ from a pointer, it cannot be converted to a shared_ptr (this would add invalid reference
-/// counting). Const may be added, but never removed.
+/// If a chaiscript::var object was created in C++ from a pointer, it cannot be converted to a shared_ptr (this would add invalid reference counting).
+/// Const may be added, but never removed. 
 ///
 /// The take away is that you can pretty much expect function calls to Just Work when you need them to.
 ///
@@ -468,8 +466,7 @@
 /// chaiscript::ChaiScript chai;
 ///
 /// try {
-///   chai.eval("throw(runtime_error(@"error@"))", chaiscript::exception_specification<int, double, float, const std::string &, const
-///   std::exception &>());
+///   chai.eval("throw(runtime_error(@"error@"))", chaiscript::exception_specification<int, double, float, const std::string &, const std::exception &>());
 /// } catch (const double e) {
 /// } catch (int) {
 /// } catch (float) {
@@ -482,6 +479,8 @@
 /// @sa chaiscript::Exception_Handler for details on automatic exception unboxing 
 /// @sa chaiscript::exception_specification
 
+
+
 /// @page LangObjectSystemRef ChaiScript Language Object Model Reference
 ///
 ///
@@ -649,6 +648,7 @@
 /// @sa @ref LangKeywordRef
 /// @sa ChaiScript_Language for Built in Functions
 
+
 /// @page LangKeywordRef ChaiScript Language Keyword Reference
 ///
 ///
@@ -695,10 +695,11 @@
 /// Begins a function or method definition
 ///
 /// ~~~~~~~~
-/// Function Definition ::= "def" identifier "(" [[type] arg ("," [type] arg)*] ")" [":" guard] block
-/// Method Definition ::= "def" class_name "::" method_name "(" [[type] arg ("," [type] arg)*] ")" [":" guard] block
+/// Function Definition ::= [annotation + CR/LF] "def" identifier "(" [[type] arg ("," [type] arg)*] ")" [":" guard] block
+/// Method Definition ::= [annotation + CR/LF] "def" class_name "::" method_name "(" [[type] arg ("," [type] arg)*] ")" [":" guard] block
 /// ~~~~~~~~
 /// 
+/// annotation: meta-annotation on function, currently used as documentation. Optional.
 /// identifier: name of function. Required.
 /// args: comma-delimited list of parameter names with optional type specifiers. Optional.
 /// guards: guarding statement that act as a prerequisite for the function. Optional.
@@ -809,29 +810,23 @@
 ///
 /// Synonym for @ref keywordauto
 
+
 /// @namespace chaiscript
 /// @brief Namespace chaiscript contains every API call that the average user will be concerned with.
 
 /// @namespace chaiscript::detail
 /// @brief Classes and functions reserved for internal use. Items in this namespace are not supported.
 
-#include "chaiscript_basic.hpp"
-#include "chaiscript_stdlib.hpp"
-#include "language/chaiscript_parser.hpp"
+#include "chaiscript_defines.hpp"
+
+#include "dispatchkit/dispatchkit.hpp"
+#include "dispatchkit/function_call.hpp"
+#include "dispatchkit/dynamic_object.hpp"
+#include "dispatchkit/boxed_number.hpp"
+
+#include "language/chaiscript_eval.hpp"
+#include "language/chaiscript_engine.hpp"
+
 
-namespace chaiscript {
-  class ChaiScript : public ChaiScript_Basic {
-  public:
-    ChaiScript(std::vector<std::string> t_modulepaths = {},
-               std::vector<std::string> t_usepaths = {},
-               std::vector<Options> t_opts = chaiscript::default_options())
-        : ChaiScript_Basic(chaiscript::Std_Lib::library(),
-                           std::make_unique<parser::ChaiScript_Parser<eval::Noop_Tracer, optimizer::Optimizer_Default>>(),
-                           std::move(t_modulepaths),
-                           std::move(t_usepaths),
-                           std::move(t_opts)) {
-    }
-  };
-} // namespace chaiscript
 
 #endif /* CHAISCRIPT_HPP_ */

include/chaiscript/chaiscript_basic.hpp

@@ -1,37 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_BASIC_HPP_
-#define CHAISCRIPT_BASIC_HPP_
-
-#include "chaiscript_defines.hpp"
-
-#include "dispatchkit/boxed_number.hpp"
-#include "dispatchkit/dispatchkit.hpp"
-#include "dispatchkit/dynamic_object.hpp"
-#include "dispatchkit/function_call.hpp"
-
-#include "language/chaiscript_engine.hpp"
-#include "language/chaiscript_eval.hpp"
-
-// This file includes all of the basic requirements for ChaiScript,
-// to use, you might do something like:
-//
-
-/*
-
-#include "chaiscript_stdlib.hpp"
-#include "language/chaiscript_parser.hpp"
-
-ChaiScript_Basic chai(
-          chaiscript::Std_Lib::library(),
-          std::make_unique<parser::ChaiScript_Parser<eval::Noop_Tracer, optimizer::Optimizer_Default>>());
-
-*/
-
-// If you want a fully packaged ready to go ChaiScript, use chaiscript.hpp
-
-#endif /* CHAISCRIPT_BASIC_HPP_ */

include/chaiscript/chaiscript_defines.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)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
 #ifndef CHAISCRIPT_DEFINES_HPP_
@@ -9,21 +9,23 @@
 
 #ifdef _MSC_VER
 #define CHAISCRIPT_STRINGIZE(x) "" #x
-#define CHAISCRIPT_STRINGIZE_EXPANDED(x) CHAISCRIPT_STRINGIZE(x)
-#define CHAISCRIPT_COMPILER_VERSION CHAISCRIPT_STRINGIZE_EXPANDED(_MSC_FULL_VER)
+#define CHAISCRIPT_COMPILER_VERSION CHAISCRIPT_STRINGIZE(_MSC_FULL_VER)
 #define CHAISCRIPT_MSVC _MSC_VER
 #define CHAISCRIPT_HAS_DECLSPEC
-
-static_assert(_MSC_FULL_VER >= 190024210, "Visual C++ 2015 Update 3 or later required");
-
+#if _MSC_VER <= 1800
+#define CHAISCRIPT_MSVC_12
+#endif
 #else
 #define CHAISCRIPT_COMPILER_VERSION __VERSION__
 #endif
 
-#include <string_view>
+#ifndef CHAISCRIPT_MSVC_12
+#define CHAISCRIPT_HAS_MAGIC_STATICS
+#endif
+
 #include <vector>
 
-#if defined(_LIBCPP_VERSION)
+#if defined( _LIBCPP_VERSION )
 #define CHAISCRIPT_LIBCPP
 #endif
 
@@ -49,18 +51,39 @@ static_assert(_MSC_FULL_VER >= 190024210, "Visual C++ 2015 Update 3 or later req
 #endif
 #endif
 
+#if (defined(CHAISCRIPT_MSVC) && !defined(CHAISCRIPT_MSVC_12)) ||  (defined(__GNUC__) && __GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || (defined(__llvm__) && !defined(CHAISCRIPT_LIBCPP))
+/// Currently only g++>=4.8 supports this natively
+/// \todo Make this support other compilers when possible
+#define CHAISCRIPT_HAS_THREAD_LOCAL
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 6)
+#define CHAISCRIPT_GCC_4_6
+#endif
+
 #if defined(__llvm__)
 #define CHAISCRIPT_CLANG
 #endif
 
+#if (defined(__GNUC__) && __GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(CHAISCRIPT_MSVC) || defined(CHAISCRIPT_CLANG)
+#define CHAISCRIPT_OVERRIDE override
+#else
+#define CHAISCRIPT_OVERRIDE
+#endif
+
+
 #ifdef  CHAISCRIPT_HAS_DECLSPEC
 #define CHAISCRIPT_MODULE_EXPORT extern "C" __declspec(dllexport)
 #else
 #define CHAISCRIPT_MODULE_EXPORT extern "C" 
 #endif
 
-#if defined(CHAISCRIPT_MSVC) || (defined(__GNUC__) && __GNUC__ >= 5) || defined(CHAISCRIPT_CLANG)
-#define CHAISCRIPT_UTF16_UTF32
+#ifdef CHAISCRIPT_MSVC_12
+#define CHAISCRIPT_NOEXCEPT throw()
+#define CHAISCRIPT_CONSTEXPR 
+#else
+#define CHAISCRIPT_NOEXCEPT noexcept
+#define CHAISCRIPT_CONSTEXPR constexpr
 #endif
 
 #ifdef _DEBUG
@@ -69,63 +92,41 @@ static_assert(_MSC_FULL_VER >= 190024210, "Visual C++ 2015 Update 3 or later req
 #define CHAISCRIPT_DEBUG false
 #endif
 
-#include <cmath>
 #include <memory>
 #include <string>
+#include <cmath>
 
 namespace chaiscript {
-  constexpr static const int version_major = 7;
-  constexpr static const int version_minor = 0;
-  constexpr static const int version_patch = 0;
+  static const int version_major = 5;
+  static const int version_minor = 8;
+  static const int version_patch = 5;
 
-  constexpr static const char *compiler_version = CHAISCRIPT_COMPILER_VERSION;
-  constexpr static const char *compiler_name = CHAISCRIPT_COMPILER_NAME;
-  constexpr static const bool debug_build = CHAISCRIPT_DEBUG;
+  static const char *compiler_version = CHAISCRIPT_COMPILER_VERSION;
+  static const char *compiler_name = CHAISCRIPT_COMPILER_NAME;
+  static const bool debug_build = CHAISCRIPT_DEBUG;
 
-  template<typename B, typename D, typename... Arg>
-  inline std::shared_ptr<B> make_shared(Arg &&...arg) {
+  template<typename B, typename D, typename ...Arg>
+  inline std::shared_ptr<B> make_shared(Arg && ... arg)
+  {
 #ifdef CHAISCRIPT_USE_STD_MAKE_SHARED
     return std::make_shared<D>(std::forward<Arg>(arg)...);
 #else
-    return std::shared_ptr<B>(static_cast<B *>(new D(std::forward<Arg>(arg)...)));
+    return std::shared_ptr<B>(static_cast<B*>(new D(std::forward<Arg>(arg)...)));
 #endif
   }
 
-  template<typename B, typename D, typename... Arg>
-  inline std::unique_ptr<B> make_unique(Arg &&...arg) {
-#ifdef CHAISCRIPT_USE_STD_MAKE_SHARED
-    return std::make_unique<D>(std::forward<Arg>(arg)...);
-#else
-    return std::unique_ptr<B>(static_cast<B *>(new D(std::forward<Arg>(arg)...)));
-#endif
+  template<typename Iter, typename Distance>
+    Iter advance_copy(Iter iter, Distance distance) {
+      std::advance(iter, static_cast<typename std::iterator_traits<Iter>::difference_type>(distance));
+      return iter;
     }
 
-  struct Build_Info {
-    [[nodiscard]] constexpr static int version_major() noexcept { return chaiscript::version_major; }
-
-    [[nodiscard]] constexpr static int version_minor() noexcept { return chaiscript::version_minor; }
-
-    [[nodiscard]] constexpr static int version_patch() noexcept { return chaiscript::version_patch; }
-
-    [[nodiscard]] static std::string version() {
-      return std::to_string(version_major()) + '.' + std::to_string(version_minor()) + '.' + std::to_string(version_patch());
-    }
-
-    [[nodiscard]] static std::string compiler_id() { return compiler_name() + '-' + compiler_version(); }
-
-    [[nodiscard]] static std::string build_id() { return compiler_id() + (debug_build() ? "-Debug" : "-Release"); }
-
-    [[nodiscard]] static std::string compiler_version() { return chaiscript::compiler_version; }
-
-    [[nodiscard]] static std::string compiler_name() { return chaiscript::compiler_name; }
-
-    [[nodiscard]] constexpr static bool debug_build() noexcept { return chaiscript::debug_build; }
-  };
 
   template<typename T>
-  [[nodiscard]] constexpr auto parse_num(const std::string_view t_str) noexcept -> typename std::enable_if<std::is_integral<T>::value, T>::type {
+    auto parse_num(const char *t_str) -> typename std::enable_if<std::is_integral<T>::value, T>::type
+    {
       T t = 0;
-    for (const auto c : t_str) {
+      for (char c = *t_str; (c = *t_str); ++t_str) {
         if (c < '0' || c > '9') {
           return t;
         }
@@ -135,110 +136,57 @@ namespace chaiscript {
       return t;
     }
 
-  template<typename T>
-  [[nodiscard]] auto parse_num(const std::string_view t_str) -> typename std::enable_if<!std::is_integral<T>::value, T>::type {
-    T t = 0;
-    T base{};
-    T decimal_place = 0;
-    int exponent = 0;
 
-    for (const auto c : t_str) {
-      switch (c) {
-        case '.':
+  template<typename T>
+    auto parse_num(const char *t_str) -> typename std::enable_if<!std::is_integral<T>::value, T>::type
+    {
+      T t = 0;
+      T base = 0;
+      T decimal_place = 0;
+      bool exponent = false;
+      bool neg_exponent = false;
+
+      const auto final_value = [](const T val, const T baseval, const bool hasexp, const bool negexp) -> T {
+        if (!hasexp) {
+          return val;
+        } else {
+          return baseval * std::pow(T(10), val*T(negexp?-1:1));
+        }
+      };
+
+      for(; *t_str != '\0'; ++t_str) {
+        char c = *t_str;
+        if (c == '.') {
           decimal_place = 10;
-          break;
-        case 'e':
-        case 'E':
-          exponent = 1;
+        } else if (c == 'e' || c == 'E') {
+          exponent = true;
           decimal_place = 0;
           base = t;
           t = 0;
-          break;
-        case '-':
-          exponent = -1;
-          break;
-        case '+':
-          break;
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-          if (decimal_place < 10) {
-            t *= 10;
-            t += static_cast<T>(c - '0');
+        } else if (c == '-' && exponent) {
+          neg_exponent = true;
+        } else if (c == '+' && exponent) {
+          neg_exponent = false;
+        } else if (c < '0' || c > '9') {
+          return final_value(t, base, exponent, neg_exponent);
+        } else if (decimal_place < T(10)) {
+          t *= T(10);
+          t += T(c - '0');
         } else {
-            t += static_cast<T>(c - '0') / decimal_place;
+          t += (T(c - '0') / (T(decimal_place)));
           decimal_place *= 10;
         }
-          break;
-        default:
-          break;
-      }
-    }
-    return exponent ? base * std::pow(T(10), t * static_cast<T>(exponent)) : t;
       }
 
-  struct str_equal {
-    [[nodiscard]] bool operator()(const std::string &t_lhs, const std::string &t_rhs) const noexcept { return t_lhs == t_rhs; }
-    template<typename LHS, typename RHS>
-    [[nodiscard]] constexpr bool operator()(const LHS &t_lhs, const RHS &t_rhs) const noexcept {
-      return std::equal(t_lhs.begin(), t_lhs.end(), t_rhs.begin(), t_rhs.end());
-    }
-    struct is_transparent {
-    };
-  };
-
-  struct str_less {
-    [[nodiscard]] bool operator()(const std::string &t_lhs, const std::string &t_rhs) const noexcept { return t_lhs < t_rhs; }
-    template<typename LHS, typename RHS>
-    [[nodiscard]] constexpr bool operator()(const LHS &t_lhs, const RHS &t_rhs) const noexcept {
-      return std::lexicographical_compare(t_lhs.begin(), t_lhs.end(), t_rhs.begin(), t_rhs.end());
-    }
-    struct is_transparent {
-    };
-  };
-
-  enum class Options {
-    No_Load_Modules,
-    Load_Modules,
-    No_External_Scripts,
-    External_Scripts
-  };
-
-  template<typename From, typename To>
-  struct is_nothrow_forward_constructible : std::bool_constant<noexcept(To{std::declval<From>()})> {
-  };
-
-  template<class From, class To>
-  static inline constexpr bool is_nothrow_forward_constructible_v = is_nothrow_forward_constructible<From, To>::value;
-
-  template<typename Container, typename... T>
-  [[nodiscard]] constexpr auto make_container(T &&...t) {
-    Container c;
-    c.reserve(sizeof...(t));
-    (c.push_back(std::forward<T>(t)), ...);
-    return c;
+      return final_value(t, base, exponent, neg_exponent);
     }
 
-  template<typename... T>
-  [[nodiscard]] auto make_vector(T &&...t) -> std::vector<std::common_type_t<std::decay_t<T>...>> {
-    using container_type = std::vector<std::common_type_t<std::decay_t<T>...>>;
-
-    return make_container<container_type>(std::forward<T>(t)...);
+  template<typename T>
+    T parse_num(const std::string &t_str)
+    {
+      return parse_num<T>(t_str.c_str());
     }
 
-  [[nodiscard]] inline std::vector<Options> default_options() {
-#ifdef CHAISCRIPT_NO_DYNLOAD
-    return {Options::No_Load_Modules, Options::External_Scripts};
-#else
-    return {Options::Load_Modules, Options::External_Scripts};
-#endif
-  }
-} // namespace chaiscript
+}
 #endif
+

include/chaiscript/chaiscript_stdlib.hpp

@@ -14,53 +14,53 @@
 #include <vector>
 
 #include "chaiscript_defines.hpp"
-#include "language/chaiscript_common.hpp"
-
-#include "dispatchkit/function_call.hpp"
-
-//#include "dispatchkit/dispatchkit.hpp"
+#include "dispatchkit/dispatchkit.hpp"
 #include "dispatchkit/bootstrap.hpp"
 #include "dispatchkit/bootstrap_stl.hpp"
-#include "dispatchkit/operators.hpp"
-//#include "dispatchkit/boxed_value.hpp"
-#include "dispatchkit/register_function.hpp"
-#include "language/chaiscript_prelude.hpp"
+#include "dispatchkit/boxed_value.hpp"
+#include "language/chaiscript_prelude.chai"
 #include "utility/json_wrap.hpp"
 
 #ifndef CHAISCRIPT_NO_THREADS
 #include <future>
 #endif
 
+
 /// @file
 ///
 /// This file generates the standard library that normal ChaiScript usage requires.
 
-namespace chaiscript {
-  class Std_Lib {
+namespace chaiscript
+{
+  class Std_Lib
+  {
     public:
-    [[nodiscard]] static ModulePtr library() {
-      auto lib = std::make_shared<Module>();
-      bootstrap::Bootstrap::bootstrap(*lib);
 
-      bootstrap::standard_library::vector_type<std::vector<Boxed_Value>>("Vector", *lib);
-      bootstrap::standard_library::string_type<std::string>("string", *lib);
-      bootstrap::standard_library::map_type<std::map<std::string, Boxed_Value>>("Map", *lib);
-      bootstrap::standard_library::pair_type<std::pair<Boxed_Value, Boxed_Value>>("Pair", *lib);
+      static ModulePtr library()
+      {
+        using namespace bootstrap;
+
+        ModulePtr lib = Bootstrap::bootstrap();
+
+        lib->add(standard_library::vector_type<std::vector<Boxed_Value> >("Vector"));
+        lib->add(standard_library::string_type<std::string>("string"));
+        lib->add(standard_library::map_type<std::map<std::string, Boxed_Value> >("Map"));
+        lib->add(standard_library::pair_type<std::pair<Boxed_Value, Boxed_Value > >("Pair"));
 
 #ifndef CHAISCRIPT_NO_THREADS
-      bootstrap::standard_library::future_type<std::future<chaiscript::Boxed_Value>>("future", *lib);
-      lib->add(chaiscript::fun(
-                   [](const std::function<chaiscript::Boxed_Value()> &t_func) { return std::async(std::launch::async, t_func); }),
-               "async");
+        lib->add(standard_library::future_type<std::future<chaiscript::Boxed_Value>>("future"));
+        lib->add(chaiscript::fun([](const std::function<chaiscript::Boxed_Value ()> &t_func){ return std::async(std::launch::async, t_func);}), "async");
 #endif
 
-      json_wrap::library(*lib);
+        lib->add(json_wrap::library());
 
-      lib->eval(ChaiScript_Prelude::chaiscript_prelude() /*, "standard prelude"*/);
+        lib->eval(ChaiScript_Prelude::chaiscript_prelude() /*, "standard prelude"*/ );
 
         return lib;
       }
+
   };
-} // namespace chaiscript
+}
 
 #endif
+

include/chaiscript/chaiscript_threading.hpp

@@ -1,24 +1,21 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_THREADING_HPP_
 #define CHAISCRIPT_THREADING_HPP_
 
+
 #include <unordered_map>
 
 #ifndef CHAISCRIPT_NO_THREADS
-#include <mutex>
-#include <shared_mutex>
 #include <thread>
+#include <mutex>
 #else
 #ifndef CHAISCRIPT_NO_THREADS_WARNING
-#pragma message("ChaiScript is compiling without thread safety.")
+#pragma message ("ChaiScript is compiling without thread safety.")
 #endif
 #endif
 
@@ -32,102 +29,214 @@
 /// It also has the side effect that the chaiscript::ChaiScript object may not be accessed from more than
 /// one thread simultaneously.
 
-/// If threading is enabled, then this namespace contains std thread classes.
-/// If threading is not enabled, then stubbed in wrappers that do nothing are provided.
-/// This allows us to avoid \#ifdef code in the sections that need thread safety.
-namespace chaiscript::detail::threading {
+namespace chaiscript
+{
+  namespace detail
+  {
+    /// If threading is enabled, then this namespace contains std thread classes.
+    /// If threading is not enabled, then stubbed in wrappers that do nothing are provided.
+    /// This allows us to avoid \#ifdef code in the sections that need thread safety.
+    namespace threading
+    {
+
 #ifndef CHAISCRIPT_NO_THREADS
 
       template<typename T>
-  using unique_lock = std::unique_lock<T>;
+      class unique_lock : public std::unique_lock<T>
+      {
+        public:
+          explicit unique_lock(T &t) : std::unique_lock<T>(t) {}
+      };
 
       template<typename T>
-  using shared_lock = std::shared_lock<T>;
+      class shared_lock : public std::unique_lock<T>
+      {
+        public:
+          explicit shared_lock(T &t) : std::unique_lock<T>(t) {}
+          void unlock() {}
+      };
 
       template<typename T>
-  using lock_guard = std::lock_guard<T>;
+      class lock_guard : public std::lock_guard<T>
+      {
+        public:
+          explicit lock_guard(T &t) : std::lock_guard<T>(t) {}
+      };
 
-  using std::shared_mutex;
+      class shared_mutex : public std::mutex { };
 
       using std::mutex;
 
       using std::recursive_mutex;
 
+#ifdef CHAISCRIPT_HAS_THREAD_LOCAL
       /// Typesafe thread specific storage. If threading is enabled, this class uses a mutex protected map. If
       /// threading is not enabled, the class always returns the same data, regardless of which thread it is called from.
       template<typename T>
-  class Thread_Storage {
+        class Thread_Storage
+        {
           public:
-    Thread_Storage() = default;
-    Thread_Storage(const Thread_Storage &) = delete;
-    Thread_Storage(Thread_Storage &&) = delete;
-    Thread_Storage &operator=(const Thread_Storage &) = delete;
-    Thread_Storage &operator=(Thread_Storage &&) = delete;
 
-    ~Thread_Storage() { t().erase(this); }
+            explicit Thread_Storage(void *t_key)
+              : m_key(t_key)
+            {
+            }
 
-    inline const T *operator->() const noexcept { return &(t()[this]); }
+            ~Thread_Storage()
+            {
+              t().erase(m_key);
+            }
 
-    inline const T &operator*() const noexcept { return t()[this]; }
+            inline const T *operator->() const
+            {
+              return &(t()[m_key]);
+            }
 
-    inline T *operator->() noexcept { return &(t()[this]); }
+            inline const T &operator*() const
+            {
+              return t()[m_key];
+            }
+
+            inline T *operator->()
+            {
+              return &(t()[m_key]);
+            }
+
+            inline T &operator*()
+            {
+              return t()[m_key];
+            }
 
-    inline T &operator*() noexcept { return t()[this]; }
 
             void *m_key;
 
           private:
-    /// todo: is it valid to make this noexcept? The allocation could fail, but if it
-    /// does there is no possible way to recover
-    static std::unordered_map<const void *, T> &t() noexcept {
-      static thread_local std::unordered_map<const void *, T> my_t;
+            static std::unordered_map<void*, T> &t()
+            {
+              thread_local static std::unordered_map<void *, T> my_t;
               return my_t;
             }
         };
 
+#else
+
+      /// Typesafe thread specific storage. If threading is enabled, this class uses a mutex protected map. If
+      /// threading is not enabled, the class always returns the same data, regardless of which thread it is called from.
+      /// 
+      /// This version is used if the compiler does not support thread_local
+      template<typename T>
+        class Thread_Storage
+        {
+          public:
+
+            explicit Thread_Storage(void *)
+            {
+            }
+
+            inline const T *operator->() const
+            {
+              return get_tls().get();
+            }
+
+            inline const T &operator*() const
+            {
+              return *get_tls();
+            }
+
+            inline T *operator->()
+            {
+              return get_tls().get();
+            }
+
+            inline T &operator*()
+            {
+              return *get_tls();
+            }
+
+
+          private:
+            /// \todo this leaks thread instances. It needs to be culled from time to time
+            std::shared_ptr<T> get_tls() const
+            {
+              unique_lock<mutex> lock(m_mutex);
+
+              const auto id = std::this_thread::get_id();
+              auto itr = m_instances.find(id);
+
+              if (itr != m_instances.end()) { return itr->second; }
+
+              std::shared_ptr<T> new_instance(std::make_shared<T>());
+
+              m_instances.insert(std::make_pair(id, new_instance));
+
+              return new_instance;
+            }
+
+
+            mutable mutex m_mutex;
+            mutable std::unordered_map<std::thread::id, std::shared_ptr<T> > m_instances;
+        };
+#endif // threading enabled but no tls
+
 #else // threading disabled
       template<typename T>
-  class unique_lock {
+      class unique_lock 
+      {
         public:
-    constexpr explicit unique_lock(T &) noexcept {}
-    constexpr void lock() noexcept {}
-    constexpr void unlock() noexcept {}
+          explicit unique_lock(T &) {}
+          void lock() {}
+          void unlock() {}
       };
 
       template<typename T>
-  class shared_lock {
+      class shared_lock 
+      {
         public:
-    constexpr explicit shared_lock(T &) noexcept {}
-    constexpr void lock() noexcept {}
-    constexpr void unlock() noexcept {}
+          explicit shared_lock(T &) {}
+          void lock() {}
+          void unlock() {}
       };
 
       template<typename T>
-  class lock_guard {
+      class lock_guard 
+      {
         public:
-    constexpr explicit lock_guard(T &) noexcept {}
+          explicit lock_guard(T &) {}
       };
 
-  class shared_mutex {
-  };
+      class shared_mutex { };
+
+      class recursive_mutex {};
 
-  class recursive_mutex {
-  };
 
       template<typename T>
-  class Thread_Storage {
+        class Thread_Storage
+        {
           public:
-    constexpr explicit Thread_Storage() noexcept {}
+            explicit Thread_Storage(void *)
+            {
+            }
 
-    constexpr inline T *operator->() const noexcept { return &obj; }
+            inline T *operator->() const
+            {
+              return &obj;
+            }
 
-    constexpr inline T &operator*() const noexcept { return obj; }
+            inline T &operator*() const
+            {
+              return obj;
+            }
 
           private:
             mutable T obj;
         };
 
 #endif
-} // namespace chaiscript::detail::threading
+    }
+  }
+}
+
+
 
 #endif
+

include/chaiscript/dispatchkit/any.hpp

@@ -11,50 +11,82 @@
 
 namespace chaiscript {
   namespace detail {
-    namespace exception {
+    namespace exception
+    {
       /// \brief Thrown in the event that an Any cannot be cast to the desired type
       ///
       /// It is used internally during function dispatch.
       ///
       /// \sa chaiscript::detail::Any
-      class bad_any_cast : public std::bad_cast {
+      class bad_any_cast : public std::bad_cast
+      {
         public:
+          bad_any_cast() CHAISCRIPT_NOEXCEPT
+            : m_what("bad any cast")
+          {
+          }
+
+          bad_any_cast(const bad_any_cast &) = default;
+
+          virtual ~bad_any_cast() CHAISCRIPT_NOEXCEPT {}
+
           /// \brief Description of what error occurred
-        const char *what() const noexcept override { return "bad any cast"; }
+          virtual const char * what() const CHAISCRIPT_NOEXCEPT CHAISCRIPT_OVERRIDE
+          {
+            return m_what.c_str();
+          }
+
+        private:
+          std::string m_what;
       };
-    } // namespace exception
+    }
+  
 
     class Any {
       private:
-      struct Data {
-        constexpr explicit Data(const std::type_info &t_type) noexcept
-            : m_type(t_type) {
+        struct Data
+        {
+          explicit Data(const std::type_info &t_type) 
+            : m_type(t_type)
+          {
           }
 
           Data &operator=(const Data &) = delete;
 
-        virtual ~Data() noexcept = default;
+          virtual ~Data() {}
 
-        virtual void *data() noexcept = 0;
-
-        const std::type_info &type() const noexcept { return m_type; }
+          virtual void *data() = 0;
+          const std::type_info &type() const
+          {
+            return m_type;
+          }
 
           virtual std::unique_ptr<Data> clone() const = 0;
           const std::type_info &m_type;
         };
 
         template<typename T>
-      struct Data_Impl : Data {
+          struct Data_Impl : Data
+          {
             explicit Data_Impl(T t_type)
-            : Data(typeid(T))
-            , m_data(std::move(t_type)) {
+              : Data(typeid(T)),
+                m_data(std::move(t_type))
+            {
             }
 
-        void *data() noexcept override { return &m_data; }
+            virtual ~Data_Impl() {}
 
-        std::unique_ptr<Data> clone() const override { return std::make_unique<Data_Impl<T>>(m_data); }
+            virtual void *data() CHAISCRIPT_OVERRIDE
+            {
+              return &m_data;
+            }
 
-        Data_Impl &operator=(const Data_Impl &) = delete;
+            std::unique_ptr<Data> clone() const CHAISCRIPT_OVERRIDE
+            {
+              return std::unique_ptr<Data>(new Data_Impl<T>(m_data));
+            }
+
+            Data_Impl &operator=(const Data_Impl&) = delete;
 
             T m_data;
           };
@@ -63,45 +95,71 @@ namespace chaiscript {
 
       public:
         // construct/copy/destruct
-      constexpr Any() noexcept = default;
-      Any(Any &&) noexcept = default;
-      Any &operator=(Any &&t_any) = default;
+        Any() = default;
 
         Any(const Any &t_any) 
-          : m_data(t_any.empty() ? nullptr : t_any.m_data->clone()) {
+        { 
+          if (!t_any.empty())
+          {
+            m_data = t_any.m_data->clone(); 
+          } else {
+            m_data.reset();
+          }
         }
 
-      template<typename ValueType, typename = std::enable_if_t<!std::is_same_v<Any, std::decay_t<ValueType>>>>
+#if !defined(_MSC_VER) || _MSC_VER  != 1800
+        Any(Any &&) = default;
+        Any &operator=(Any &&t_any) = default;
+#endif
+
+        template<typename ValueType,
+          typename = typename std::enable_if<!std::is_same<Any, typename std::decay<ValueType>::type>::value>::type>
         explicit Any(ValueType &&t_value)
-          : m_data(std::make_unique<Data_Impl<std::decay_t<ValueType>>>(std::forward<ValueType>(t_value))) {
+          : m_data(std::unique_ptr<Data>(new Data_Impl<typename std::decay<ValueType>::type>(std::forward<ValueType>(t_value))))
+        {
         }
 
-      Any &operator=(const Any &t_any) {
+
+        Any & operator=(const Any &t_any)
+        {
           Any copy(t_any);
           swap(copy);
           return *this; 
         }
 
         template<typename ToType>
-      ToType &cast() const {
-        if (m_data && typeid(ToType) == m_data->type()) {
+          ToType &cast() const
+          {
+            if (m_data && typeid(ToType) == m_data->type())
+            {
               return *static_cast<ToType *>(m_data->data());
             } else {
               throw chaiscript::detail::exception::bad_any_cast();
             }
           }
 
+
+        ~Any()
+        {
+        }
+
         // modifiers
-      Any &swap(Any &t_other) {
+        Any & swap(Any &t_other)
+        {
           std::swap(t_other.m_data, m_data);
           return *this;
         }
 
         // queries
-      bool empty() const noexcept { return !static_cast<bool>(m_data); }
+        bool empty() const
+        {
+          return !bool(m_data);
+        }
 
-      const std::type_info &type() const noexcept {
-        if (m_data) {
+        const std::type_info & type() const
+        {
+          if (m_data)
+          {
             return m_data->type();
           } else {
             return typeid(void);
@@ -109,7 +167,9 @@ namespace chaiscript {
         }
     };
 
-  } // namespace detail
-} // namespace chaiscript
+  }
+}
 
 #endif
+
+

include/chaiscript/dispatchkit/bad_boxed_cast.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_BAD_BOXED_CAST_HPP_
 #define CHAISCRIPT_BAD_BOXED_CAST_HPP_
 
@@ -14,51 +11,59 @@
 #include <typeinfo>
 
 #include "../chaiscript_defines.hpp"
-#include "../utility/static_string.hpp"
 #include "type_info.hpp"
 
 namespace chaiscript {
-  class Type_Info;
+class Type_Info;
 }  // namespace chaiscript
 
-namespace chaiscript {
-  namespace exception {
+namespace chaiscript 
+{
+  namespace exception
+  {
     /// \brief Thrown in the event that a Boxed_Value cannot be cast to the desired type
     ///
     /// It is used internally during function dispatch and may be used by the end user.
     ///
     /// \sa chaiscript::boxed_cast
-    class bad_boxed_cast : public std::bad_cast {
+    class bad_boxed_cast : public std::bad_cast
+    {
       public:
-      bad_boxed_cast(Type_Info t_from, const std::type_info &t_to, utility::Static_String t_what) noexcept
-          : from(t_from)
-          , to(&t_to)
-          , m_what(std::move(t_what)) {
+        bad_boxed_cast(Type_Info t_from, const std::type_info &t_to,
+            std::string t_what) CHAISCRIPT_NOEXCEPT
+          : from(std::move(t_from)), to(&t_to), m_what(std::move(t_what))
+        {
         }
 
-      bad_boxed_cast(Type_Info t_from, const std::type_info &t_to) noexcept
-          : from(t_from)
-          , to(&t_to)
-          , m_what("Cannot perform boxed_cast") {
+        bad_boxed_cast(Type_Info t_from, const std::type_info &t_to)
+          : from(std::move(t_from)), to(&t_to), m_what("Cannot perform boxed_cast: " + t_from.name() + " to: " + t_to.name())
+        {
         }
 
-      explicit bad_boxed_cast(utility::Static_String t_what) noexcept
-          : m_what(std::move(t_what)) {
+        explicit bad_boxed_cast(std::string t_what) CHAISCRIPT_NOEXCEPT
+          : to(nullptr), m_what(std::move(t_what))
+        {
         }
 
-      bad_boxed_cast(const bad_boxed_cast &) noexcept = default;
-      ~bad_boxed_cast() noexcept override = default;
+        bad_boxed_cast(const bad_boxed_cast &) = default;
+        virtual ~bad_boxed_cast() CHAISCRIPT_NOEXCEPT {}
 
         /// \brief Description of what error occurred
-      const char *what() const noexcept override { return m_what.c_str(); }
+        virtual const char * what() const CHAISCRIPT_NOEXCEPT CHAISCRIPT_OVERRIDE
+        {
+          return m_what.c_str();
+        }
 
         Type_Info from; ///< Type_Info contained in the Boxed_Value
-      const std::type_info *to = nullptr; ///< std::type_info of the desired (but failed) result type
+        const std::type_info *to; ///< std::type_info of the desired (but failed) result type
 
       private:
-      utility::Static_String m_what;
+        std::string m_what;
     };
-  } // namespace exception
-} // namespace chaiscript
+  }
+}
+
+
 
 #endif
+

include/chaiscript/dispatchkit/bind_first.hpp

@@ -1,60 +1,74 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_BIND_FIRST_HPP_
 #define CHAISCRIPT_BIND_FIRST_HPP_
 
 #include <functional>
 
-namespace chaiscript {
-  namespace detail {
+namespace chaiscript
+{
+  namespace detail
+  {
+
     template<typename T>
-    constexpr T *get_pointer(T *t) noexcept {
+      T* get_pointer(T *t)
+      {
         return t;
       }
 
     template<typename T>
-    T *get_pointer(const std::reference_wrapper<T> &t) noexcept {
+      T* get_pointer(const std::reference_wrapper<T> &t)
+      {
         return &t.get();
       }
 
-    template<typename O, typename Ret, typename P1, typename... Param>
-    constexpr auto bind_first(Ret (*f)(P1, Param...), O &&o) {
-      return [f, o = std::forward<O>(o)](Param... param) -> Ret { return f(o, std::forward<Param>(param)...); };
+    template<typename O, typename Ret, typename P1, typename ... Param>
+      std::function<Ret (Param...)> bind_first(Ret (*f)(P1, Param...), O&& o)
+      {
+        return std::function<Ret (Param...)>(
+            [f, o](Param...param) -> Ret {
+              return f(std::forward<O>(o), std::forward<Param>(param)...);
+            }
+          );
       }
 
-    template<typename O, typename Ret, typename Class, typename... Param>
-    constexpr auto bind_first(Ret (Class::*f)(Param...), O &&o) {
-      return [f, o = std::forward<O>(o)](Param... param) -> Ret { return (get_pointer(o)->*f)(std::forward<Param>(param)...); };
+    template<typename O, typename Ret, typename Class, typename ... Param>
+      std::function<Ret (Param...)> bind_first(Ret (Class::*f)(Param...), O&& o)
+      {
+        return std::function<Ret (Param...)>(
+            [f, o](Param...param) -> Ret {
+              return (get_pointer(o)->*f)(std::forward<Param>(param)...);
+            }
+          );
       }
 
-    template<typename O, typename Ret, typename Class, typename... Param>
-    constexpr auto bind_first(Ret (Class::*f)(Param...) const, O &&o) {
-      return [f, o = std::forward<O>(o)](Param... param) -> Ret { return (get_pointer(o)->*f)(std::forward<Param>(param)...); };
+    template<typename O, typename Ret, typename Class, typename ... Param>
+      std::function<Ret (Param...)> bind_first(Ret (Class::*f)(Param...) const, O&& o)
+      {
+        return std::function<Ret (Param...)>(
+            [f, o](Param...param) -> Ret {
+              return (get_pointer(o)->*f)(std::forward<Param>(param)...);
+            }
+          );
+
       }
 
-    template<typename O, typename Ret, typename P1, typename... Param>
-    auto bind_first(const std::function<Ret(P1, Param...)> &f, O &&o) {
-      return [f, o = std::forward<O>(o)](Param... param) -> Ret { return f(o, std::forward<Param>(param)...); };
+    template<typename O, typename Ret, typename P1, typename ... Param>
+      std::function<Ret (Param...)> bind_first(const std::function<Ret (P1, Param...)> &f, O&& o)
+      {
+        return std::function<Ret (Param...)>(
+            [f, o](Param...param) -> Ret {
+              return f(o, std::forward<Param>(param)...);
+            });
       }
 
-    template<typename F, typename O, typename Ret, typename Class, typename P1, typename... Param>
-    constexpr auto bind_first(const F &fo, O &&o, Ret (Class::*f)(P1, Param...) const) {
-      return [fo, o = std::forward<O>(o), f](Param... param) -> Ret { return (fo.*f)(o, std::forward<Param>(param)...); };
-    }
 
-    template<typename F, typename O>
-    constexpr auto bind_first(const F &f, O &&o) {
-      return bind_first(f, std::forward<O>(o), &F::operator());
   }
+}
 
-  } // namespace detail
-} // namespace chaiscript
 
 #endif

include/chaiscript/dispatchkit/bootstrap.hpp

@@ -1,85 +1,136 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_BOOTSTRAP_HPP_
 #define CHAISCRIPT_BOOTSTRAP_HPP_
 
-#include "../utility/utility.hpp"
+#include <cstdint>
+#include <exception>
+#include <functional>
+#include <memory>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <vector>
+#include <iterator>
+
+#include "bad_boxed_cast.hpp"
+#include "boxed_cast.hpp"
+#include "boxed_number.hpp"
+#include "boxed_value.hpp"
+#include "dispatchkit.hpp"
+#include "type_conversions.hpp"
+#include "dynamic_object.hpp"
+#include "operators.hpp"
+#include "proxy_constructors.hpp"
+#include "proxy_functions.hpp"
+#include "proxy_functions_detail.hpp"
 #include "register_function.hpp"
+#include "type_info.hpp"
+#include "../utility/utility.hpp"
+#include "../language/chaiscript_common.hpp"
 
-/// \brief Classes and functions useful for bootstrapping of ChaiScript and adding of new types
-namespace chaiscript::bootstrap {
-  template<typename T, typename = typename std::enable_if<std::is_array<T>::value>::type>
-  void array(const std::string &type, Module &m) {
-    using ReturnType = typename std::remove_extent<T>::type;
+namespace chaiscript 
+{
+  /// \brief Classes and functions useful for bootstrapping of ChaiScript and adding of new types
+  namespace bootstrap
+  {
+    namespace detail
+    {
+      /// \brief Constructs a new POD value object from a Boxed_Number
+      /// \param[in] v Boxed_Number to copy into the new object
+      /// \returns The newly created object.
+      template<typename P1>
+      std::shared_ptr<P1> construct_pod(const Boxed_Number &v)
+      {
+        return std::make_shared<P1>(v.get_as<P1>());
+      }
+    }
 
-    m.add(user_type<T>(), type);
-    m.add(fun([](T &t, size_t index) -> ReturnType & {
-            constexpr const auto extent = std::extent<T>::value;
+    template<typename T, typename = typename std::enable_if<std::is_array<T>::value>::type >
+      ModulePtr array(const std::string &type, ModulePtr m = std::make_shared<Module>())
+      {
+        typedef typename std::remove_extent<T>::type ReturnType;
+        const auto extent = std::extent<T>::value;
+        m->add(user_type<T>(), type);
+        m->add(fun(
+              [extent](T& t, size_t index)->ReturnType &{
                 if (extent > 0 && index >= extent) {
-              throw std::range_error("Array index out of range. Received: " + std::to_string(index) + " expected < "
-                                     + std::to_string(extent));
+                  throw std::range_error("Array index out of range. Received: " + std::to_string(index)  + " expected < " + std::to_string(extent));
                 } else {
                   return t[index];
                 }
-          }),
-          "[]");
+              }
+              ), "[]"
+            );
 
-    m.add(fun([](const T &t, size_t index) -> const ReturnType & {
-            constexpr const auto extent = std::extent<T>::value;
+        m->add(fun(
+              [extent](const T &t, size_t index)->const ReturnType &{
                 if (extent > 0 && index >= extent) {
-              throw std::range_error("Array index out of range. Received: " + std::to_string(index) + " expected < "
-                                     + std::to_string(extent));
+                  throw std::range_error("Array index out of range. Received: " + std::to_string(index)  + " expected < " + std::to_string(extent));
                 } else {
                   return t[index];
                 }
-          }),
-          "[]");
+              }
+              ), "[]"
+            );
 
-    m.add(fun([](const T &) { return std::extent<T>::value; }), "size");
+        m->add(fun(
+              [extent](const T &) {
+                return extent;
+              }), "size");
+
+
+        return m;
       }
 
     /// \brief Adds a copy constructor for the given type to the given Model
     /// \param[in] type The name of the type. The copy constructor will be named "type".
     /// \param[in,out] m The Module to add the copy constructor to
     /// \tparam T The type to add a copy constructor for
-  /// \returns The passed in Module
+    /// \returns The passed in ModulePtr, or the newly constructed one if the default param is used
     template<typename T>
-  void copy_constructor(const std::string &type, Module &m) {
-    m.add(constructor<T(const T &)>(), type);
+    ModulePtr copy_constructor(const std::string &type, ModulePtr m = std::make_shared<Module>())
+    {
+      m->add(constructor<T (const T &)>(), type);
+      return m;
     }
 
     /// \brief Add all comparison operators for the templated type. Used during bootstrap, also available to users.
     /// \tparam T Type to create comparison operators for
     /// \param[in,out] m module to add comparison operators to
-  /// \returns the passed in Module.
+    /// \returns the passed in ModulePtr or the newly constructed one if the default params are used.
     template<typename T>
-  void opers_comparison(Module &m) {
+    ModulePtr opers_comparison(ModulePtr m = std::make_shared<Module>())
+    {
       operators::equal<T>(m);
       operators::greater_than<T>(m);
       operators::greater_than_equal<T>(m);
       operators::less_than<T>(m);
       operators::less_than_equal<T>(m);
       operators::not_equal<T>(m);
+      return m;
     }
 
+
+
     /// \brief Adds default and copy constructors for the given type
     /// \param[in] type The name of the type to add the constructors for.
     /// \param[in,out] m The Module to add the basic constructors to
     /// \tparam T Type to generate basic constructors for
-  /// \returns The passed in Module
+    /// \returns The passed in ModulePtr, or the newly constructed one if the default param is used
     /// \sa copy_constructor
     /// \sa constructor
     template<typename T>
-  void basic_constructors(const std::string &type, Module &m) {
-    m.add(constructor<T()>(), type);
+    ModulePtr basic_constructors(const std::string &type, ModulePtr m = std::make_shared<Module>())
+    {
+      m->add(constructor<T ()>(), type);
       copy_constructor<T>(type, m);
+      return m;
     }
 
     /// \brief Adds a constructor for a POD type 
@@ -87,58 +138,94 @@ namespace chaiscript::bootstrap {
     /// \param[in] type The name of the type
     /// \param[in,out] m The Module to add the constructor to
     template<typename T>
-  void construct_pod(const std::string &type, Module &m) {
-    m.add(fun([](const Boxed_Number &bn) { return bn.get_as<T>(); }), type);
+    ModulePtr construct_pod(const std::string &type, ModulePtr m = std::make_shared<Module>())
+    {
+      m->add(fun(&detail::construct_pod<T>), type);
+      return m;
+    }
+
+
+    /// to_string function for internal use. Uses ostream operator<<
+    template<typename Input>
+    std::string to_string(Input i)
+    {
+      std::stringstream ss;
+      ss << i;
+      return ss.str();
     }
 
     /// Internal function for converting from a string to a value
     /// uses ostream operator >> to perform the conversion
     template<typename Input>
-  Input parse_string(const std::string &i) {
-    if constexpr (!std::is_same<Input, wchar_t>::value && !std::is_same<Input, char16_t>::value && !std::is_same<Input, char32_t>::value) {
+    auto parse_string(const std::string &i)
+      -> typename std::enable_if<
+             !std::is_same<Input, wchar_t>::value
+             && !std::is_same<Input, char16_t>::value
+             && !std::is_same<Input, char32_t>::value,
+      Input>::type
+    {
       std::stringstream ss(i);
       Input t;
       ss >> t;
       return t;
-    } else {
+    }
+
+    template<typename Input>
+    auto parse_string(const std::string &) 
+      -> typename std::enable_if<
+             std::is_same<Input, wchar_t>::value
+             || std::is_same<Input, char16_t>::value
+             || std::is_same<Input, char32_t>::value,
+      Input>::type
+    {
       throw std::runtime_error("Parsing of wide characters is not yet supported");
     }
-  }
+
 
     /// Add all common functions for a POD type. All operators, and
     /// common conversions
     template<typename T>
-  void bootstrap_pod_type(const std::string &name, Module &m) {
-    m.add(user_type<T>(), name);
-    m.add(constructor<T()>(), name);
+    ModulePtr bootstrap_pod_type(const std::string &name, ModulePtr m = std::make_shared<Module>())
+    {
+      m->add(user_type<T>(), name);
+      m->add(constructor<T()>(), name);
       construct_pod<T>(name, m);
 
-    m.add(fun(&parse_string<T>), "to_" + name);
-    m.add(fun([](const T t) { return t; }), "to_" + name);
+      m->add(fun(&parse_string<T>), "to_" + name);
+      return m;
     }
 
+
     /// "clone" function for a shared_ptr type. This is used in the case
     /// where you do not want to make a deep copy of an object during cloning
     /// but want to instead maintain the shared_ptr. It is needed internally
     /// for handling of Proxy_Function object (that is,
     /// function variables.
     template<typename Type>
-  auto shared_ptr_clone(const std::shared_ptr<Type> &p) {
+    std::shared_ptr<Type> shared_ptr_clone(const std::shared_ptr<Type> &p)
+    {
       return p;
     }
 
     /// Specific version of shared_ptr_clone just for Proxy_Functions
     template<typename Type>
-  std::shared_ptr<std::remove_const_t<Type>> shared_ptr_unconst_clone(const std::shared_ptr<std::add_const_t<Type>> &p) {
+    std::shared_ptr<typename std::remove_const<Type>::type> 
+        shared_ptr_unconst_clone(const std::shared_ptr<typename std::add_const<Type>::type> &p)
+    {
       return std::const_pointer_cast<typename std::remove_const<Type>::type>(p);
     }
 
+
+
     /// Assignment function for shared_ptr objects, does not perform a copy of the
     /// object pointed to, instead maintains the shared_ptr concept.
     /// Similar to shared_ptr_clone. Used for Proxy_Function.
     template<typename Type>
-  Boxed_Value ptr_assign(Boxed_Value lhs, const std::shared_ptr<Type> &rhs) {
-    if (lhs.is_undef() || (!lhs.get_type_info().is_const() && lhs.get_type_info().bare_equal(chaiscript::detail::Get_Type_Info<Type>::get()))) {
+    Boxed_Value ptr_assign(Boxed_Value lhs, const std::shared_ptr<Type> &rhs)
+    {
+      if (lhs.is_undef() 
+          || (!lhs.get_type_info().is_const() && lhs.get_type_info().bare_equal(chaiscript::detail::Get_Type_Info<Type>::get())))
+      {
         lhs.assign(Boxed_Value(rhs));
         return lhs;
       } else {
@@ -148,110 +235,156 @@ namespace chaiscript::bootstrap {
 
     /// Class consisting of only static functions. All default bootstrapping occurs
     /// from this class.
-  class Bootstrap {
+    class Bootstrap
+    {
     private:
       /// Function allowing for assignment of an unknown type to any other value
-    static Boxed_Value unknown_assign(Boxed_Value lhs, Boxed_Value rhs) {
-      if (lhs.is_undef()) {
+      static Boxed_Value unknown_assign(Boxed_Value lhs, Boxed_Value rhs)
+      {
+        if (lhs.is_undef())
+        {
           return (lhs.assign(rhs));
         } else {
           throw exception::bad_boxed_cast("boxed_value has a set type already");
         }
       }
 
-    static void print(const std::string &s) noexcept { fwrite(s.c_str(), 1, s.size(), stdout); }
+      static void print(const std::string &s)
+      {
+        fwrite(s.c_str(), 1, s.size(), stdout);
+      }
+
+      static void println(const std::string &s)
+      {
+        puts(s.c_str());
+      }
 
-    static void println(const std::string &s) noexcept { puts(s.c_str()); }
 
       /// Add all arithmetic operators for PODs
-    static void opers_arithmetic_pod(Module &m) {
-      m.add(fun(&Boxed_Number::equals), "==");
-      m.add(fun(&Boxed_Number::less_than), "<");
-      m.add(fun(&Boxed_Number::greater_than), ">");
-      m.add(fun(&Boxed_Number::greater_than_equal), ">=");
-      m.add(fun(&Boxed_Number::less_than_equal), "<=");
-      m.add(fun(&Boxed_Number::not_equal), "!=");
+      static void opers_arithmetic_pod(ModulePtr m = std::make_shared<Module>())
+      {
+        m->add(fun(&Boxed_Number::equals), "==");
+        m->add(fun(&Boxed_Number::less_than), "<");
+        m->add(fun(&Boxed_Number::greater_than), ">");
+        m->add(fun(&Boxed_Number::greater_than_equal), ">=");
+        m->add(fun(&Boxed_Number::less_than_equal), "<=");
+        m->add(fun(&Boxed_Number::not_equal), "!=");
+
+        m->add(fun(&Boxed_Number::pre_decrement), "--");
+        m->add(fun(&Boxed_Number::pre_increment), "++");
+        m->add(fun(&Boxed_Number::sum), "+");
+        m->add(fun(&Boxed_Number::unary_plus), "+");
+        m->add(fun(&Boxed_Number::unary_minus), "-");
+        m->add(fun(&Boxed_Number::difference), "-");
+        m->add(fun(&Boxed_Number::assign_bitwise_and), "&=");
+        m->add(fun(&Boxed_Number::assign), "=");
+        m->add(fun(&Boxed_Number::assign_bitwise_or), "|=");
+        m->add(fun(&Boxed_Number::assign_bitwise_xor), "^=");
+        m->add(fun(&Boxed_Number::assign_remainder), "%=");
+        m->add(fun(&Boxed_Number::assign_shift_left), "<<=");
+        m->add(fun(&Boxed_Number::assign_shift_right), ">>=");
+        m->add(fun(&Boxed_Number::bitwise_and), "&");
+        m->add(fun(&Boxed_Number::bitwise_complement), "~");
+        m->add(fun(&Boxed_Number::bitwise_xor), "^");
+        m->add(fun(&Boxed_Number::bitwise_or), "|");
+        m->add(fun(&Boxed_Number::assign_product), "*=");
+        m->add(fun(&Boxed_Number::assign_quotient), "/=");
+        m->add(fun(&Boxed_Number::assign_sum), "+=");
+        m->add(fun(&Boxed_Number::assign_difference), "-=");
+        m->add(fun(&Boxed_Number::quotient), "/");
+        m->add(fun(&Boxed_Number::shift_left), "<<");
+        m->add(fun(&Boxed_Number::product), "*");
+        m->add(fun(&Boxed_Number::remainder), "%");
+        m->add(fun(&Boxed_Number::shift_right), ">>");
+
 
-      m.add(fun(&Boxed_Number::pre_decrement), "--");
-      m.add(fun(&Boxed_Number::pre_increment), "++");
-      m.add(fun(&Boxed_Number::sum), "+");
-      m.add(fun(&Boxed_Number::unary_plus), "+");
-      m.add(fun(&Boxed_Number::unary_minus), "-");
-      m.add(fun(&Boxed_Number::difference), "-");
-      m.add(fun(&Boxed_Number::assign_bitwise_and), "&=");
-      m.add(fun(&Boxed_Number::assign), "=");
-      m.add(fun(&Boxed_Number::assign_bitwise_or), "|=");
-      m.add(fun(&Boxed_Number::assign_bitwise_xor), "^=");
-      m.add(fun(&Boxed_Number::assign_remainder), "%=");
-      m.add(fun(&Boxed_Number::assign_shift_left), "<<=");
-      m.add(fun(&Boxed_Number::assign_shift_right), ">>=");
-      m.add(fun(&Boxed_Number::bitwise_and), "&");
-      m.add(fun(&Boxed_Number::bitwise_complement), "~");
-      m.add(fun(&Boxed_Number::bitwise_xor), "^");
-      m.add(fun(&Boxed_Number::bitwise_or), "|");
-      m.add(fun(&Boxed_Number::assign_product), "*=");
-      m.add(fun(&Boxed_Number::assign_quotient), "/=");
-      m.add(fun(&Boxed_Number::assign_sum), "+=");
-      m.add(fun(&Boxed_Number::assign_difference), "-=");
-      m.add(fun(&Boxed_Number::quotient), "/");
-      m.add(fun(&Boxed_Number::shift_left), "<<");
-      m.add(fun(&Boxed_Number::product), "*");
-      m.add(fun(&Boxed_Number::remainder), "%");
-      m.add(fun(&Boxed_Number::shift_right), ">>");
      }
 
       /// Create a bound function object. The first param is the function to bind
       /// the remaining parameters are the args to bind into the result
-    static Boxed_Value bind_function(const Function_Params &params) {
+      static Boxed_Value bind_function(const std::vector<Boxed_Value> &params)
+      {
         if (params.empty()) {
           throw exception::arity_error(0, 1);
         }
 
         Const_Proxy_Function f = boxed_cast<Const_Proxy_Function>(params[0]);
 
-      if (f->get_arity() != -1 && size_t(f->get_arity()) != params.size() - 1) {
+        if (f->get_arity() != -1 && size_t(f->get_arity()) != params.size() - 1)
+        {
           throw exception::arity_error(static_cast<int>(params.size()), f->get_arity());
         }
 
-      return Boxed_Value(Const_Proxy_Function(
-          std::make_shared<dispatch::Bound_Function>(std::move(f), std::vector<Boxed_Value>(params.begin() + 1, params.end()))));
+        return Boxed_Value(Const_Proxy_Function(std::make_shared<dispatch::Bound_Function>(std::move(f),
+          std::vector<Boxed_Value>(params.begin() + 1, params.end()))));
       }
 
-    static bool has_guard(const Const_Proxy_Function &t_pf) noexcept {
+
+      static bool has_guard(const Const_Proxy_Function &t_pf)
+      {
         auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
-      return pf && pf->has_guard();
+        return pf && pf->get_guard();
       }
 
-    static Const_Proxy_Function get_guard(const Const_Proxy_Function &t_pf) {
+      static Const_Proxy_Function get_guard(const Const_Proxy_Function &t_pf)
+      {
         const auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
-      if (pf && pf->get_guard()) {
+        if (pf && pf->get_guard())
+        {
           return pf->get_guard();
         } else {
           throw std::runtime_error("Function does not have a guard");
         }
       }
 
+      static void throw_exception(const Boxed_Value &bv) {
+        throw bv;
+      }
+
+      static std::string what(const std::exception &e)
+      {
+        return e.what();
+      }
+
+      /// Boolean specialization of internal to_string function
+      static std::string bool_to_string(bool b)
+      {
+        if (b)
+        {
+          return "true";
+        } else {
+          return "false";
+        }
+      }
+
       template<typename FunctionType>
-    static std::vector<Boxed_Value> do_return_boxed_value_vector(FunctionType f, const dispatch::Proxy_Function_Base *b) {
+        static std::vector<Boxed_Value> do_return_boxed_value_vector(FunctionType f,
+            const dispatch::Proxy_Function_Base *b)
+        {
           auto v = (b->*f)();
  
           std::vector<Boxed_Value> vbv;
 
-      for (const auto &o : v) {
+          for (const auto &o: v)
+          {
             vbv.push_back(const_var(o));
           }
 
           return vbv;
         }
 
-    static bool has_parse_tree(const chaiscript::Const_Proxy_Function &t_pf) noexcept {
+
+      static bool has_parse_tree(const chaiscript::Const_Proxy_Function &t_pf)
+      {
         const auto pf = std::dynamic_pointer_cast<const chaiscript::dispatch::Dynamic_Proxy_Function>(t_pf);
-      return bool(pf);
+        return pf && pf->get_parse_tree();
       }
 
-    static const chaiscript::AST_Node &get_parse_tree(const chaiscript::Const_Proxy_Function &t_pf) {
+      static chaiscript::AST_NodePtr get_parse_tree(const chaiscript::Const_Proxy_Function &t_pf)
+      {
         const auto pf = std::dynamic_pointer_cast<const chaiscript::dispatch::Dynamic_Proxy_Function>(t_pf);
-      if (pf) {
+        if (pf && pf->get_parse_tree())
+        {
           return pf->get_parse_tree();
         } else {
           throw std::runtime_error("Function does not have a parse tree");
@@ -259,145 +392,120 @@ namespace chaiscript::bootstrap {
       }
 
       template<typename Function>
-    static auto return_boxed_value_vector(const Function &f) {
-      return [f](const dispatch::Proxy_Function_Base *b) { return do_return_boxed_value_vector(f, b); };
+      static std::function<std::vector<Boxed_Value> (const dispatch::Proxy_Function_Base*)> return_boxed_value_vector(const Function &f)
+      {
+        return [f](const dispatch::Proxy_Function_Base *b) {
+          return do_return_boxed_value_vector(f, b);
+        };
       }
 
+
     public:
       /// \brief perform all common bootstrap functions for std::string, void and POD types
       /// \param[in,out] m Module to add bootstrapped functions to
-    /// \returns passed in Module
-    static void bootstrap(Module &m) {
-      m.add(user_type<void>(), "void");
-      m.add(user_type<bool>(), "bool");
-      m.add(user_type<Boxed_Value>(), "Object");
-      m.add(user_type<Boxed_Number>(), "Number");
-      m.add(user_type<Proxy_Function>(), "Function");
-      m.add(user_type<dispatch::Assignable_Proxy_Function>(), "Assignable_Function");
-      m.add(user_type<std::exception>(), "exception");
+      /// \returns passed in ModulePtr, or newly created one if default argument is used
+      static ModulePtr bootstrap(ModulePtr m = std::make_shared<Module>())
+      {
+        m->add(user_type<void>(), "void");
+        m->add(user_type<bool>(), "bool");
+        m->add(user_type<Boxed_Value>(), "Object");
+        m->add(user_type<Boxed_Number>(), "Number");
+        m->add(user_type<Proxy_Function>(), "Function");
+        m->add(user_type<dispatch::Assignable_Proxy_Function>(), "Assignable_Function");
+        m->add(user_type<std::exception>(), "exception");
 
-      m.add(fun(&dispatch::Proxy_Function_Base::get_arity), "get_arity");
-      m.add(fun(&dispatch::Proxy_Function_Base::operator==), "==");
+        m->add(fun(&dispatch::Proxy_Function_Base::get_arity), "get_arity");
+        m->add(fun(&dispatch::Proxy_Function_Base::annotation), "get_annotation");
+        m->add(fun(&dispatch::Proxy_Function_Base::operator==), "==");
 
-      m.add(fun(return_boxed_value_vector(&dispatch::Proxy_Function_Base::get_param_types)), "get_param_types");
-      m.add(fun(return_boxed_value_vector(&dispatch::Proxy_Function_Base::get_contained_functions)), "get_contained_functions");
 
-      m.add(fun([](const std::exception &e) { return std::string(e.what()); }), "what");
+        m->add(fun(return_boxed_value_vector(&dispatch::Proxy_Function_Base::get_param_types)), "get_param_types");
+        m->add(fun(return_boxed_value_vector(&dispatch::Proxy_Function_Base::get_contained_functions)), "get_contained_functions");
 
-      m.add(user_type<std::out_of_range>(), "out_of_range");
-      m.add(user_type<std::logic_error>(), "logic_error");
-      m.add(chaiscript::base_class<std::exception, std::logic_error>());
-      m.add(chaiscript::base_class<std::logic_error, std::out_of_range>());
-      m.add(chaiscript::base_class<std::exception, std::out_of_range>());
 
-      m.add(user_type<std::runtime_error>(), "runtime_error");
-      m.add(chaiscript::base_class<std::exception, std::runtime_error>());
+        m->add(user_type<std::out_of_range>(), "out_of_range");
+        m->add(user_type<std::logic_error>(), "logic_error");
+        m->add(chaiscript::base_class<std::exception, std::logic_error>());
+        m->add(chaiscript::base_class<std::logic_error, std::out_of_range>());
+        m->add(chaiscript::base_class<std::exception, std::out_of_range>());
 
-      m.add(constructor<std::runtime_error(const std::string &)>(), "runtime_error");
+        m->add(user_type<std::runtime_error>(), "runtime_error");
+        m->add(chaiscript::base_class<std::exception, std::runtime_error>());
 
-      m.add(user_type<dispatch::Dynamic_Object>(), "Dynamic_Object");
-      m.add(constructor<dispatch::Dynamic_Object(const std::string &)>(), "Dynamic_Object");
-      m.add(constructor<dispatch::Dynamic_Object()>(), "Dynamic_Object");
-      m.add(fun(&dispatch::Dynamic_Object::get_type_name), "get_type_name");
-      m.add(fun(&dispatch::Dynamic_Object::get_attrs), "get_attrs");
-      m.add(fun(&dispatch::Dynamic_Object::set_explicit), "set_explicit");
-      m.add(fun(&dispatch::Dynamic_Object::is_explicit), "is_explicit");
-      m.add(fun(&dispatch::Dynamic_Object::has_attr), "has_attr");
+        m->add(constructor<std::runtime_error (const std::string &)>(), "runtime_error");
+        m->add(fun(std::function<std::string (const std::runtime_error &)>(&what)), "what");
 
-      m.add(fun(static_cast<Boxed_Value &(dispatch::Dynamic_Object::*)(const std::string &)>(&dispatch::Dynamic_Object::get_attr)), "get_attr");
-      m.add(fun(static_cast<const Boxed_Value &(dispatch::Dynamic_Object::*)(const std::string &) const>(&dispatch::Dynamic_Object::get_attr)),
-            "get_attr");
+        m->add(user_type<dispatch::Dynamic_Object>(), "Dynamic_Object");
+        m->add(constructor<dispatch::Dynamic_Object (const std::string &)>(), "Dynamic_Object");
+        m->add(constructor<dispatch::Dynamic_Object ()>(), "Dynamic_Object");
+        m->add(fun(&dispatch::Dynamic_Object::get_type_name), "get_type_name");
+        m->add(fun(&dispatch::Dynamic_Object::get_attrs), "get_attrs");
+        m->add(fun(&dispatch::Dynamic_Object::set_explicit), "set_explicit");
+        m->add(fun(&dispatch::Dynamic_Object::is_explicit), "is_explicit");
 
-      m.add(fun(static_cast<Boxed_Value &(dispatch::Dynamic_Object::*)(const std::string &)>(&dispatch::Dynamic_Object::method_missing)),
-            "method_missing");
-      m.add(fun(static_cast<const Boxed_Value &(dispatch::Dynamic_Object::*)(const std::string &) const>(
-                &dispatch::Dynamic_Object::method_missing)),
-            "method_missing");
+        m->add(fun(static_cast<Boxed_Value & (dispatch::Dynamic_Object::*)(const std::string &)>(&dispatch::Dynamic_Object::get_attr)), "get_attr");
+        m->add(fun(static_cast<const Boxed_Value & (dispatch::Dynamic_Object::*)(const std::string &) const>(&dispatch::Dynamic_Object::get_attr)), "get_attr");
 
-      m.add(fun(static_cast<Boxed_Value &(dispatch::Dynamic_Object::*)(const std::string &)>(&dispatch::Dynamic_Object::get_attr)), "[]");
-      m.add(fun(static_cast<const Boxed_Value &(dispatch::Dynamic_Object::*)(const std::string &) const>(&dispatch::Dynamic_Object::get_attr)),
-            "[]");
+        m->add(fun(static_cast<Boxed_Value & (dispatch::Dynamic_Object::*)(const std::string &)>(&dispatch::Dynamic_Object::method_missing)), "method_missing");
+        m->add(fun(static_cast<const Boxed_Value & (dispatch::Dynamic_Object::*)(const std::string &) const>(&dispatch::Dynamic_Object::method_missing)), "method_missing");
 
-      m.eval(R"chaiscript(
+        m->add(fun(static_cast<Boxed_Value & (dispatch::Dynamic_Object::*)(const std::string &)>(&dispatch::Dynamic_Object::get_attr)), "[]");
+        m->add(fun(static_cast<const Boxed_Value & (dispatch::Dynamic_Object::*)(const std::string &) const>(&dispatch::Dynamic_Object::get_attr)), "[]");
+
+        m->eval(R""(
           def Dynamic_Object::clone() { 
             auto &new_o = Dynamic_Object(this.get_type_name()); 
             for_each(this.get_attrs(), fun[new_o](x) { new_o.get_attr(x.first) = x.second; } ); 
             new_o; 
           }
+          )"");
 
-          def `=`(Dynamic_Object lhs, Dynamic_Object rhs) : lhs.get_type_name() == rhs.get_type_name()
-          {
-            for_each(rhs.get_attrs(), fun[lhs](x) { lhs.get_attr(x.first) = clone(x.second); } );
-          }
+        m->add(fun(&has_guard), "has_guard");
+        m->add(fun(&get_guard), "get_guard");
 
-          def `!=`(Dynamic_Object lhs, Dynamic_Object rhs) : lhs.get_type_name() == rhs.get_type_name()
-          {
-            var rhs_attrs := rhs.get_attrs();
-            var lhs_attrs := lhs.get_attrs();
+        m->add(fun(&Boxed_Value::is_undef), "is_var_undef");
+        m->add(fun(&Boxed_Value::is_null), "is_var_null");
+        m->add(fun(&Boxed_Value::is_const), "is_var_const");
+        m->add(fun(&Boxed_Value::is_ref), "is_var_reference");
+        m->add(fun(&Boxed_Value::is_pointer), "is_var_pointer");
+        m->add(fun(&Boxed_Value::is_return_value), "is_var_return_value");
+        m->add(fun(&Boxed_Value::reset_return_value), "reset_var_return_value");
+        m->add(fun(&Boxed_Value::is_type), "is_type");
+        m->add(fun(&Boxed_Value::get_attr), "get_var_attr");
+        m->add(fun(&Boxed_Value::copy_attrs), "copy_var_attrs");
+        m->add(fun(&Boxed_Value::clone_attrs), "clone_var_attrs");
 
-            if (rhs_attrs.size() != lhs_attrs.size()) {
-              true;
-            } else {
-              return any_of(rhs_attrs, fun[lhs](x) { !lhs.has_attr(x.first) || lhs.get_attr(x.first) != x.second; } );
-            }
-          }
+        m->add(fun(&Boxed_Value::get_type_info), "get_type_info");
+        m->add(user_type<Type_Info>(), "Type_Info");
+        m->add(constructor<Type_Info (const Type_Info &)>(), "Type_Info");
 
-          def `==`(Dynamic_Object lhs, Dynamic_Object rhs) : lhs.get_type_name() == rhs.get_type_name()
-          {
-            var rhs_attrs := rhs.get_attrs();
-            var lhs_attrs := lhs.get_attrs();
-
-            if (rhs_attrs.size() != lhs_attrs.size()) {
-              false;
-            } else {
-              return all_of(rhs_attrs, fun[lhs](x) { lhs.has_attr(x.first) && lhs.get_attr(x.first) == x.second; } );
-            }
-          }
-        )chaiscript");
-
-      m.add(fun(&has_guard), "has_guard");
-      m.add(fun(&get_guard), "get_guard");
-
-      m.add(fun(&Boxed_Value::is_undef), "is_var_undef");
-      m.add(fun(&Boxed_Value::is_null), "is_var_null");
-      m.add(fun(&Boxed_Value::is_const), "is_var_const");
-      m.add(fun(&Boxed_Value::is_ref), "is_var_reference");
-      m.add(fun(&Boxed_Value::is_pointer), "is_var_pointer");
-      m.add(fun(&Boxed_Value::is_return_value), "is_var_return_value");
-      m.add(fun(&Boxed_Value::reset_return_value), "reset_var_return_value");
-      m.add(fun(&Boxed_Value::is_type), "is_type");
-      m.add(fun(&Boxed_Value::get_attr), "get_var_attr");
-      m.add(fun(&Boxed_Value::copy_attrs), "copy_var_attrs");
-      m.add(fun(&Boxed_Value::clone_attrs), "clone_var_attrs");
-
-      m.add(fun(&Boxed_Value::get_type_info), "get_type_info");
-      m.add(user_type<Type_Info>(), "Type_Info");
-      m.add(constructor<Type_Info(const Type_Info &)>(), "Type_Info");
 
         operators::equal<Type_Info>(m);
 
-      m.add(fun(&Type_Info::is_const), "is_type_const");
-      m.add(fun(&Type_Info::is_reference), "is_type_reference");
-      m.add(fun(&Type_Info::is_void), "is_type_void");
-      m.add(fun(&Type_Info::is_undef), "is_type_undef");
-      m.add(fun(&Type_Info::is_pointer), "is_type_pointer");
-      m.add(fun(&Type_Info::is_arithmetic), "is_type_arithmetic");
-      m.add(fun(&Type_Info::name), "cpp_name");
-      m.add(fun(&Type_Info::bare_name), "cpp_bare_name");
-      m.add(fun(&Type_Info::bare_equal), "bare_equal");
+        m->add(fun(&Type_Info::is_const), "is_type_const");
+        m->add(fun(&Type_Info::is_reference), "is_type_reference");
+        m->add(fun(&Type_Info::is_void), "is_type_void");
+        m->add(fun(&Type_Info::is_undef), "is_type_undef");
+        m->add(fun(&Type_Info::is_pointer), "is_type_pointer");
+        m->add(fun(&Type_Info::is_arithmetic), "is_type_arithmetic");
+        m->add(fun(&Type_Info::name), "cpp_name");
+        m->add(fun(&Type_Info::bare_name), "cpp_bare_name");
+        m->add(fun(&Type_Info::bare_equal), "bare_equal");
+
 
         basic_constructors<bool>("bool", m);
         operators::assign<bool>(m);
         operators::equal<bool>(m);
         operators::not_equal<bool>(m);
 
-      m.add(fun([](const std::string &s) { return s; }), "to_string");
-      m.add(fun([](const bool b) { return std::string(b ? "true" : "false"); }), "to_string");
-      m.add(fun(&unknown_assign), "=");
-      m.add(fun([](const Boxed_Value &bv) { throw bv; }), "throw");
+        m->add(fun([](const std::string &s) -> std::string { return s; }), "to_string");
+        m->add(fun(&Bootstrap::bool_to_string), "to_string");
+        m->add(fun(&unknown_assign), "=");
+        m->add(fun(&throw_exception), "throw");
+        m->add(fun(&what), "what");
 
-      m.add(fun([](const char c) { return std::string(1, c); }), "to_string");
-      m.add(fun(&Boxed_Number::to_string), "to_string");
+        m->add(fun(&to_string<char>), "to_string");
+        m->add(fun(&Boxed_Number::to_string), "to_string");
 
         bootstrap_pod_type<double>("double", m);
         bootstrap_pod_type<long double>("long_double", m);
@@ -426,86 +534,97 @@ namespace chaiscript::bootstrap {
 
         opers_arithmetic_pod(m);
 
-      m.add(fun(&Build_Info::version_major), "version_major");
-      m.add(fun(&Build_Info::version_minor), "version_minor");
-      m.add(fun(&Build_Info::version_patch), "version_patch");
-      m.add(fun(&Build_Info::version), "version");
-      m.add(fun(&Build_Info::compiler_version), "compiler_version");
-      m.add(fun(&Build_Info::compiler_name), "compiler_name");
-      m.add(fun(&Build_Info::compiler_id), "compiler_id");
-      m.add(fun(&Build_Info::debug_build), "debug_build");
 
-      m.add(fun(&print), "print_string");
-      m.add(fun(&println), "println_string");
+        m->add(fun(&print), "print_string");
+        m->add(fun(&println), "println_string");
 
-      m.add(dispatch::make_dynamic_proxy_function(&bind_function), "bind");
+        m->add(dispatch::make_dynamic_proxy_function(&bind_function), "bind");
 
-      m.add(fun(&shared_ptr_unconst_clone<dispatch::Proxy_Function_Base>), "clone");
-      m.add(fun(&ptr_assign<std::remove_const<dispatch::Proxy_Function_Base>::type>), "=");
-      m.add(fun(&ptr_assign<std::add_const<dispatch::Proxy_Function_Base>::type>), "=");
-      m.add(chaiscript::base_class<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function>());
-      m.add(fun([](dispatch::Assignable_Proxy_Function &t_lhs, const std::shared_ptr<const dispatch::Proxy_Function_Base> &t_rhs) {
+        m->add(fun(&shared_ptr_unconst_clone<dispatch::Proxy_Function_Base>), "clone");
+        m->add(fun(&ptr_assign<std::remove_const<dispatch::Proxy_Function_Base>::type>), "=");
+        m->add(fun(&ptr_assign<std::add_const<dispatch::Proxy_Function_Base>::type>), "=");
+        m->add(chaiscript::base_class<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function>());
+        m->add(fun(
+                  [](dispatch::Assignable_Proxy_Function &t_lhs, const std::shared_ptr<const dispatch::Proxy_Function_Base> &t_rhs) {
                     t_lhs.assign(t_rhs);
-            }),
-            "=");
+                  }
+                ), "="
+              );
 
-      m.add(fun(&Boxed_Value::type_match), "type_match");
+        m->add(fun(&Boxed_Value::type_match), "type_match");
 
-      m.add(chaiscript::fun(&has_parse_tree), "has_parse_tree");
-      m.add(chaiscript::fun(&get_parse_tree), "get_parse_tree");
 
-      m.add(chaiscript::base_class<std::runtime_error, chaiscript::exception::eval_error>());
-      m.add(chaiscript::base_class<std::exception, chaiscript::exception::eval_error>());
+        m->add(chaiscript::fun(&has_parse_tree), "has_parse_tree");
+        m->add(chaiscript::fun(&get_parse_tree), "get_parse_tree");
 
-      m.add(chaiscript::user_type<chaiscript::exception::arithmetic_error>(), "arithmetic_error");
-      m.add(chaiscript::base_class<std::runtime_error, chaiscript::exception::arithmetic_error>());
-      m.add(chaiscript::base_class<std::exception, chaiscript::exception::arithmetic_error>());
+        m->add(chaiscript::base_class<std::runtime_error, chaiscript::exception::eval_error>());
 
-      //        chaiscript::bootstrap::standard_library::vector_type<std::vector<std::shared_ptr<chaiscript::AST_Node> >
-      //        >("AST_NodeVector", m);
+        m->add(chaiscript::user_type<chaiscript::exception::arithmetic_error>(), "arithmetic_error");
+        m->add(chaiscript::base_class<std::runtime_error, chaiscript::exception::arithmetic_error>());
 
-      chaiscript::utility::add_class<chaiscript::exception::eval_error>(m,
+
+//        chaiscript::bootstrap::standard_library::vector_type<std::vector<std::shared_ptr<chaiscript::AST_Node> > >("AST_NodeVector", m);
+
+
+        chaiscript::utility::add_class<chaiscript::exception::eval_error>(*m,
             "eval_error",
-                                                                        {},
-                                                                        {{fun(&chaiscript::exception::eval_error::reason), "reason"},
+            { },
+            { {fun(&chaiscript::exception::eval_error::reason), "reason"},
               {fun(&chaiscript::exception::eval_error::pretty_print), "pretty_print"},
-                                                                         {fun([](const chaiscript::exception::eval_error &t_eval_error) {
+              {fun(std::function<std::vector<Boxed_Value> (const chaiscript::exception::eval_error &t_eval_error)>([](const chaiscript::exception::eval_error &t_eval_error) -> std::vector<Boxed_Value> { 
                   std::vector<Boxed_Value> retval;
-                                                                            std::transform(t_eval_error.call_stack.begin(),
-                                                                                           t_eval_error.call_stack.end(),
+                  std::transform(t_eval_error.call_stack.begin(), t_eval_error.call_stack.end(),
                                  std::back_inserter(retval),
-                                                                                           &chaiscript::var<const chaiscript::AST_Node_Trace &>);
+                                 &chaiscript::var<const std::shared_ptr<const chaiscript::AST_Node> &>);
                   return retval;
-                                                                          }),
-                                                                          "call_stack"}});
+                })), "call_stack"} }
+            );
 
-      chaiscript::utility::add_class<chaiscript::File_Position>(m,
+
+        chaiscript::utility::add_class<chaiscript::File_Position>(*m,
             "File_Position",
-                                                                {constructor<File_Position()>(), constructor<File_Position(int, int)>()},
-                                                                {{fun(&File_Position::line), "line"},
-                                                                 {fun(&File_Position::column), "column"}});
+            { constructor<File_Position()>(),
+              constructor<File_Position(int, int)>() },
+            { {fun(&File_Position::line), "line"},
+              {fun(&File_Position::column), "column"} }
+            );
 
-      chaiscript::utility::add_class<AST_Node>(m,
+
+        chaiscript::utility::add_class<AST_Node>(*m, 
             "AST_Node",
-                                               {},
-                                               {{fun(&AST_Node::text), "text"},
+            {  },
+            { {fun(&AST_Node::text), "text"},
               {fun(&AST_Node::identifier), "identifier"},
               {fun(&AST_Node::filename), "filename"},
               {fun(&AST_Node::start), "start"},
               {fun(&AST_Node::end), "end"},
               {fun(&AST_Node::to_string), "to_string"},
-                                                {fun([](const chaiscript::AST_Node &t_node) -> std::vector<Boxed_Value> {
+              {fun(std::function<std::vector<Boxed_Value> (const chaiscript::AST_Node &t_node)>([](const chaiscript::AST_Node &t_node) -> std::vector<Boxed_Value> { 
                 std::vector<Boxed_Value> retval;
-                                                   const auto children = t_node.get_children();
-                                                   std::transform(children.begin(),
-                                                                  children.end(),
+                std::transform(t_node.children.begin(), t_node.children.end(),
                                std::back_inserter(retval),
-                                                                  &chaiscript::var<const std::reference_wrapper<chaiscript::AST_Node> &>);
+                               &chaiscript::var<const std::shared_ptr<chaiscript::AST_Node> &>);
                 return retval;
-                                                 }),
-                                                 "children"}});
+              })), "children"},
+              {fun(&AST_Node::replace_child), "replace_child"}
+            }
+            );
+
+
+        chaiscript::utility::add_class<parser::ChaiScript_Parser>(*m,
+            "ChaiScript_Parser",
+            { constructor<parser::ChaiScript_Parser ()>() },
+            { {fun(&parser::ChaiScript_Parser::parse), "parse"},
+              {fun(&parser::ChaiScript_Parser::ast), "ast"} }
+            );
+
+
+
+        return m;
       }
     };
-} // namespace chaiscript::bootstrap
+  }
+}
 
 #endif
+

include/chaiscript/dispatchkit/bootstrap_stl.hpp

@@ -1,17 +1,15 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.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
 
+
 #ifndef CHAISCRIPT_BOOTSTRAP_STL_HPP_
 #define CHAISCRIPT_BOOTSTRAP_STL_HPP_
 
@@ -29,94 +27,183 @@
 #include "register_function.hpp"
 #include "type_info.hpp"
 
-namespace chaiscript::bootstrap::standard_library {
+namespace chaiscript 
+{
+  namespace bootstrap
+  {
+    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
-  template<typename Container, typename IterType>
-  struct Bidir_Range {
-    using container_type = Container;
+      template<typename Container>
+        struct Bidir_Range
+        {
+          typedef Container container_type;
+          typedef typename std::iterator_traits<typename Container::iterator>::reference reference_type;
 
-    constexpr Bidir_Range(Container &c)
-        : m_begin(c.begin())
-        , m_end(c.end()) {
+          Bidir_Range(Container &c)
+            : m_begin(c.begin()), m_end(c.end())
+          {
           }
 
-    constexpr bool empty() const noexcept { return m_begin == m_end; }
+          bool empty() const
+          {
+            return m_begin == m_end;
+          }
 
-    constexpr void pop_front() {
-      if (empty()) {
+          void pop_front()
+          {
+            if (empty())
+            {
               throw std::range_error("Range empty");
             }
             ++m_begin;
           }
 
-    constexpr void pop_back() {
-      if (empty()) {
+          void pop_back()
+          {
+            if (empty())
+            {
               throw std::range_error("Range empty");
             }
             --m_end;
           }
 
-    constexpr decltype(auto) front() const {
-      if (empty()) {
+          reference_type front() const
+          {
+            if (empty())
+            {
               throw std::range_error("Range empty");
             }
-      return (*m_begin);
+            return *m_begin;
           }
 
-    constexpr decltype(auto) back() const {
-      if (empty()) {
+          reference_type back() const
+          {
+            if (empty())
+            {
               throw std::range_error("Range empty");
             }
-      auto pos = m_end;
+            typename Container::iterator pos = m_end;
             --pos;
-      return (*(pos));
+            return *(pos);
           }
 
-    IterType m_begin;
-    IterType m_end;
+          typename Container::iterator m_begin;
+          typename Container::iterator m_end;
+        };
+
+      template<typename Container>
+        struct Const_Bidir_Range
+        {
+          typedef const Container container_type;
+          typedef typename std::iterator_traits<typename Container::const_iterator>::reference const_reference_type;
+
+          Const_Bidir_Range(const Container &c)
+            : m_begin(c.begin()), m_end(c.end())
+          {
+          }
+
+          bool empty() const
+          {
+            return m_begin == m_end;
+          }
+
+          void pop_front()
+          {
+            if (empty())
+            {
+              throw std::range_error("Range empty");
+            }
+            ++m_begin;
+          }
+
+          void pop_back()
+          {
+            if (empty())
+            {
+              throw std::range_error("Range empty");
+            }
+            --m_end;
+          }
+
+          const_reference_type front() const
+          {
+            if (empty())
+            {
+              throw std::range_error("Range empty");
+            }
+            return *m_begin;
+          }
+
+          const_reference_type back() const
+          {
+            if (empty())
+            {
+              throw std::range_error("Range empty");
+            }
+            typename Container::const_iterator pos = m_end;
+            --pos;
+            return *(pos);
+          }
+
+          typename Container::const_iterator m_begin;
+          typename Container::const_iterator m_end;
         };
 
       namespace detail {
+
         template<typename T>
-    size_t count(const T &t_target, const typename T::key_type &t_key) {
+        size_t count(const T &t_target, const typename T::key_type &t_key)
+        {
           return t_target.count(t_key);
         }
 
         template<typename T>
-    void insert(T &t_target, const T &t_other) {
+          void insert(T &t_target, const T &t_other)
+          {
             t_target.insert(t_other.begin(), t_other.end());
           }
 
         template<typename T>
-    void insert_ref(T &t_target, const typename T::value_type &t_val) {
+          void insert_ref(T &t_target, const typename T::value_type &t_val)
+          {
             t_target.insert(t_val);
           }
 
+
+
         /// Add Bidir_Range support for the given ContainerType
         template<typename Bidir_Type>
-    void input_range_type_impl(const std::string &type, Module &m) {
-      m.add(user_type<Bidir_Type>(), type + "_Range");
+          ModulePtr input_range_type_impl(const std::string &type, ModulePtr m = std::make_shared<Module>())
+          {
+            m->add(user_type<Bidir_Type>(), type + "_Range");
 
             copy_constructor<Bidir_Type>(type + "_Range", m);
 
-      m.add(constructor<Bidir_Type(typename Bidir_Type::container_type &)>(), "range_internal");
+            m->add(constructor<Bidir_Type (typename Bidir_Type::container_type &)>(), "range_internal");
 
-      m.add(fun(&Bidir_Type::empty), "empty");
-      m.add(fun(&Bidir_Type::pop_front), "pop_front");
-      m.add(fun(&Bidir_Type::front), "front");
-      m.add(fun(&Bidir_Type::pop_back), "pop_back");
-      m.add(fun(&Bidir_Type::back), "back");
+            m->add(fun(&Bidir_Type::empty), "empty");
+            m->add(fun(&Bidir_Type::pop_front), "pop_front");
+            m->add(fun(&Bidir_Type::front), "front");
+            m->add(fun(&Bidir_Type::pop_back), "pop_back");
+            m->add(fun(&Bidir_Type::back), "back");
+
+            return m;
           } 
 
+
         /// Algorithm for inserting at a specific position into a container
         template<typename Type>
-    void insert_at(Type &container, int pos, const typename Type::value_type &v) {
+          void insert_at(Type &container, int pos, const typename Type::value_type &v)
+          {
             auto itr = container.begin();
             auto end = container.end();
 
-      if (pos < 0 || std::distance(itr, end) < pos) {
+            if (pos < 0 || std::distance(itr, end) < pos)
+            {
               throw std::range_error("Cannot insert past end of range");
             }
 
@@ -124,96 +211,102 @@ namespace chaiscript::bootstrap::standard_library {
             container.insert(itr, v);
           }
 
+
         /// Algorithm for erasing a specific position from a container
         template<typename Type>
-    void erase_at(Type &container, int pos) {
+          void erase_at(Type &container, int pos)
+          {
             auto itr = container.begin();
             auto end = container.end();
 
-      if (pos < 0 || std::distance(itr, end) <= pos) {
+            if (pos < 0 || std::distance(itr, end) < (pos-1))
+            {
               throw std::range_error("Cannot erase past end of range");
             }
 
             std::advance(itr, pos);
             container.erase(itr);
           }
-  } // namespace detail
+      }
 
       template<typename ContainerType>
-  void input_range_type(const std::string &type, Module &m) {
-    detail::input_range_type_impl<Bidir_Range<ContainerType, typename ContainerType::iterator>>(type, m);
-    detail::input_range_type_impl<Bidir_Range<const ContainerType, typename ContainerType::const_iterator>>("Const_" + type, m);
+        ModulePtr input_range_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          detail::input_range_type_impl<Bidir_Range<ContainerType> >(type,m);
+          detail::input_range_type_impl<Const_Bidir_Range<ContainerType> >("Const_" + type, m);
+          return m;
         }
 
+
       /// Add random_access_container concept to the given ContainerType
       /// http://www.sgi.com/tech/stl/RandomAccessContainer.html
       template<typename ContainerType>
-  void random_access_container_type(const std::string & /*type*/, Module &m) {
-    // In the interest of runtime safety for the m, we prefer the at() method for [] access,
-    // to throw an exception in an out of bounds condition.
-    m.add(fun([](ContainerType &c, int index) -> typename ContainerType::reference {
-            /// \todo we are preferring to keep the key as 'int' to avoid runtime conversions
+        ModulePtr random_access_container_type(const std::string &/*type*/, ModulePtr m = std::make_shared<Module>())
+        {
+          //In the interest of runtime safety for the m, we prefer the at() method for [] access,
+          //to throw an exception in an out of bounds condition.
+          m->add(
+              fun(
+                [](ContainerType &c, int index) -> typename ContainerType::reference {
+                  /// \todo we are prefering to keep the key as 'int' to avoid runtime conversions
                   /// during dispatch. reevaluate
                   return c.at(static_cast<typename ContainerType::size_type>(index));
-          }),
-          "[]");
+                }), "[]");
 
-    m.add(fun([](const ContainerType &c, int index) -> typename ContainerType::const_reference {
-            /// \todo we are preferring to keep the key as 'int' to avoid runtime conversions
+          m->add(
+              fun(
+                [](const ContainerType &c, int index) -> typename ContainerType::const_reference {
+                  /// \todo we are prefering to keep the key as 'int' to avoid runtime conversions
                   /// during dispatch. reevaluate
                   return c.at(static_cast<typename ContainerType::size_type>(index));
-          }),
-          "[]");
+                }), "[]");
+
+          return m;
         }
 
+
       /// Add assignable concept to the given ContainerType
       /// http://www.sgi.com/tech/stl/Assignable.html
       template<typename ContainerType>
-  void assignable_type(const std::string &type, Module &m) {
+        ModulePtr assignable_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
           copy_constructor<ContainerType>(type, m);
           operators::assign<ContainerType>(m);
+          return m;
         }
 
-  /// Add container resize concept to the given ContainerType
-  /// http://www.cplusplus.com/reference/stl/
-  template<typename ContainerType>
-  void resizable_type(const std::string & /*type*/, Module &m) {
-    m.add(fun([](ContainerType *a, typename ContainerType::size_type n, const typename ContainerType::value_type &val) {
-            return a->resize(n, val);
-          }),
-          "resize");
-    m.add(fun([](ContainerType *a, typename ContainerType::size_type n) { return a->resize(n); }), "resize");
-  }
-
-  /// Add container reserve concept to the given ContainerType
-  /// http://www.cplusplus.com/reference/stl/
-  template<typename ContainerType>
-  void reservable_type(const std::string & /*type*/, Module &m) {
-    m.add(fun([](ContainerType *a, typename ContainerType::size_type n) { return a->reserve(n); }), "reserve");
-    m.add(fun([](const ContainerType *a) { return a->capacity(); }), "capacity");
-  }
 
       /// Add container concept to the given ContainerType
       /// http://www.sgi.com/tech/stl/Container.html
       template<typename ContainerType>
-  void container_type(const std::string & /*type*/, Module &m) {
-    m.add(fun([](const ContainerType *a) { return a->size(); }), "size");
-    m.add(fun([](const ContainerType *a) { return a->empty(); }), "empty");
-    m.add(fun([](ContainerType *a) { a->clear(); }), "clear");
+        ModulePtr container_type(const std::string &/*type*/, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(fun([](const ContainerType *a) { return a->size(); } ), "size");
+          m->add(fun([](const ContainerType *a) { return a->empty(); } ), "empty");
+          m->add(fun([](ContainerType *a) { a->clear(); } ), "clear");
+          return m;
         }
 
+
       /// Add default constructable concept to the given Type
       /// http://www.sgi.com/tech/stl/DefaultConstructible.html
       template<typename Type>
-  void default_constructible_type(const std::string &type, Module &m) {
-    m.add(constructor<Type()>(), type);
+        ModulePtr default_constructible_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(constructor<Type ()>(), type);
+          return m;
         }
 
+
+
+
       /// Add sequence concept to the given ContainerType
       /// http://www.sgi.com/tech/stl/Sequence.html
       template<typename ContainerType>
-  void sequence_type(const std::string & /*type*/, Module &m) {
-    m.add(fun(&detail::insert_at<ContainerType>), []() -> std::string {
+        ModulePtr sequence_type(const std::string &/*type*/, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(fun(&detail::insert_at<ContainerType>), 
+              []()->std::string{
                 if (typeid(typename ContainerType::value_type) == typeid(Boxed_Value)) {
                   return "insert_ref_at";
                 } else {
@@ -221,37 +314,29 @@ namespace chaiscript::bootstrap::standard_library {
                 }
               }());
 
-    m.add(fun(&detail::erase_at<ContainerType>), "erase_at");
+          m->add(fun(&detail::erase_at<ContainerType>), "erase_at");
+
+          return m;
         }
 
+
       /// Add back insertion sequence concept to the given ContainerType
       /// http://www.sgi.com/tech/stl/BackInsertionSequence.html
       template<typename ContainerType>
-  void back_insertion_sequence_type(const std::string &type, Module &m) {
-    m.add(fun([](ContainerType &container) -> decltype(auto) {
-            if (container.empty()) {
-              throw std::range_error("Container empty");
-            } else {
-              return (container.back());
-            }
-          }),
-          "back");
-    m.add(fun([](const ContainerType &container) -> decltype(auto) {
-            if (container.empty()) {
-              throw std::range_error("Container empty");
-            } else {
-              return (container.back());
-            }
-          }),
-          "back");
+        ModulePtr back_insertion_sequence_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          typedef typename ContainerType::reference (ContainerType::*backptr)();
 
-    using push_back = void (ContainerType::*)(const typename ContainerType::value_type &);
-    m.add(fun(static_cast<push_back>(&ContainerType::push_back)), [&]() -> std::string {
+          m->add(fun(static_cast<backptr>(&ContainerType::back)), "back");
+
+
+          typedef void (ContainerType::*push_back)(const typename ContainerType::value_type &);
+          m->add(fun(static_cast<push_back>(&ContainerType::push_back)),
+              [&]()->std::string{
               if (typeid(typename ContainerType::value_type) == typeid(Boxed_Value)) {
-        m.eval("# Pushes the second value onto the container while making a clone of the value\n"
-               "def push_back("
-               + type
-               + " container, x)\n"
+                m->eval(
+                    "# Pushes the second value onto the container while making a clone of the value\n"
+                    "def push_back(" + type + " container, x)\n"
                     "{ \n"
                     "  if (x.is_var_return_value()) {\n"
                     "    x.reset_var_return_value() \n"
@@ -259,7 +344,8 @@ namespace chaiscript::bootstrap::standard_library {
                     "  } else { \n"
                     "    container.push_back_ref(clone(x)); \n"
                     "  }\n"
-                 "} \n");
+                    "} \n"
+                    );
 
                   return "push_back_ref";
                 } else {
@@ -267,40 +353,31 @@ namespace chaiscript::bootstrap::standard_library {
                 }
               }());
 
-    m.add(fun(&ContainerType::pop_back), "pop_back");
+          m->add(fun(&ContainerType::pop_back), "pop_back");
+          return m;
         }
 
+
+
       /// Front insertion sequence
       /// http://www.sgi.com/tech/stl/FrontInsertionSequence.html
       template<typename ContainerType>
-  void front_insertion_sequence_type(const std::string &type, Module &m) {
-    using push_ptr = void (ContainerType::*)(typename ContainerType::const_reference);
-    using pop_ptr = void (ContainerType::*)();
+        ModulePtr front_insertion_sequence_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          typedef typename ContainerType::reference (ContainerType::*front_ptr)();
+          typedef typename ContainerType::const_reference (ContainerType::*const_front_ptr)() const;
+          typedef void (ContainerType::*push_ptr)(typename ContainerType::const_reference);
+          typedef void (ContainerType::*pop_ptr)();
 
-    m.add(fun([](ContainerType &container) -> decltype(auto) {
-            if (container.empty()) {
-              throw std::range_error("Container empty");
-            } else {
-              return (container.front());
-            }
-          }),
-          "front");
+          m->add(fun(static_cast<front_ptr>(&ContainerType::front)), "front");
+          m->add(fun(static_cast<const_front_ptr>(&ContainerType::front)), "front");
 
-    m.add(fun([](const ContainerType &container) -> decltype(auto) {
-            if (container.empty()) {
-              throw std::range_error("Container empty");
-            } else {
-              return (container.front());
-            }
-          }),
-          "front");
-
-    m.add(fun(static_cast<push_ptr>(&ContainerType::push_front)), [&]() -> std::string {
+          m->add(fun(static_cast<push_ptr>(&ContainerType::push_front)),
+              [&]()->std::string{
                 if (typeid(typename ContainerType::value_type) == typeid(Boxed_Value)) {
-        m.eval("# Pushes the second value onto the front of container while making a clone of the value\n"
-               "def push_front("
-               + type
-               + " container, x)\n"
+                  m->eval(
+                      "# Pushes the second value onto the front of container while making a clone of the value\n"
+                      "def push_front(" + type + " container, x)\n"
                       "{ \n"
                       "  if (x.is_var_return_value()) {\n"
                       "    x.reset_var_return_value() \n"
@@ -308,74 +385,98 @@ namespace chaiscript::bootstrap::standard_library {
                       "  } else { \n"
                       "    container.push_front_ref(clone(x)); \n"
                       "  }\n"
-                 "} \n");
+                      "} \n"
+                      );
                   return "push_front_ref";
                 } else {
                   return "push_front";
                 }
               }());
 
-    m.add(fun(static_cast<pop_ptr>(&ContainerType::pop_front)), "pop_front");
+          m->add(fun(static_cast<pop_ptr>(&ContainerType::pop_front)), "pop_front");
+          return m;
         }
 
+
       /// bootstrap a given PairType
       /// http://www.sgi.com/tech/stl/pair.html
       template<typename PairType>
-  void pair_type(const std::string &type, Module &m) {
-    m.add(user_type<PairType>(), type);
+        ModulePtr pair_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(user_type<PairType>(), type);
 
-    m.add(fun(&PairType::first), "first");
-    m.add(fun(&PairType::second), "second");
+
+          typename PairType::first_type PairType::* f = &PairType::first;
+          typename PairType::second_type PairType::* s = &PairType::second;
+
+          m->add(fun(f), "first");
+          m->add(fun(s), "second");
 
           basic_constructors<PairType>(type, m);
-    m.add(constructor<PairType(const typename PairType::first_type &, const typename PairType::second_type &)>(), type);
+          m->add(constructor<PairType (const typename PairType::first_type &, const typename PairType::second_type &)>(), type);
+
+          return m;
         }
 
+
+
       /// Add pair associative container concept to the given ContainerType
       /// http://www.sgi.com/tech/stl/PairAssociativeContainer.html
 
       template<typename ContainerType>
-  void pair_associative_container_type(const std::string &type, Module &m) {
+        ModulePtr pair_associative_container_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
           pair_type<typename ContainerType::value_type>(type + "_Pair", m);
+
+          return m;
         }
 
+
       /// Add unique associative container concept to the given ContainerType
       /// http://www.sgi.com/tech/stl/UniqueAssociativeContainer.html
       template<typename ContainerType>
-  void unique_associative_container_type(const std::string & /*type*/, Module &m) {
-    m.add(fun(detail::count<ContainerType>), "count");
+        ModulePtr unique_associative_container_type(const std::string &/*type*/, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(fun(detail::count<ContainerType>), "count");
 
-    using erase_ptr = size_t (ContainerType::*)(const typename ContainerType::key_type &);
+          typedef size_t (ContainerType::*erase_ptr)(const typename ContainerType::key_type &);
 
-    m.add(fun(static_cast<erase_ptr>(&ContainerType::erase)), "erase");
+          m->add(fun(static_cast<erase_ptr>(&ContainerType::erase)), "erase");
 
-    m.add(fun(&detail::insert<ContainerType>), "insert");
+          m->add(fun(&detail::insert<ContainerType>), "insert");
 
-    m.add(fun(&detail::insert_ref<ContainerType>), []() -> std::string {
+          m->add(fun(&detail::insert_ref<ContainerType>), 
+              []()->std::string{
                 if (typeid(typename ContainerType::mapped_type) == typeid(Boxed_Value)) {
                   return "insert_ref";
                 } else {
                   return "insert";
                 }
               }());
+
+
+          return m;
         }
 
+
       /// Add a MapType container
       /// http://www.sgi.com/tech/stl/Map.html
       template<typename MapType>
-  void map_type(const std::string &type, Module &m) {
-    m.add(user_type<MapType>(), type);
+        ModulePtr map_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(user_type<MapType>(), type);
 
-    using elem_access = typename MapType::mapped_type &(MapType::*)(const typename MapType::key_type &);
-    using const_elem_access = const typename MapType::mapped_type &(MapType::*)(const typename MapType::key_type &) const;
+          typedef typename MapType::mapped_type &(MapType::*elem_access)(const typename MapType::key_type &);
+          typedef const typename MapType::mapped_type &(MapType::*const_elem_access)(const typename MapType::key_type &) const;
 
-    m.add(fun(static_cast<elem_access>(&MapType::operator[])), "[]");
+          m->add(fun(static_cast<elem_access>(&MapType::operator[])), "[]");
 
-    m.add(fun(static_cast<elem_access>(&MapType::at)), "at");
-    m.add(fun(static_cast<const_elem_access>(&MapType::at)), "at");
+          m->add(fun(static_cast<elem_access>(&MapType::at)), "at");
+          m->add(fun(static_cast<const_elem_access>(&MapType::at)), "at");
 
-    if (typeid(MapType) == typeid(std::map<std::string, Boxed_Value>)) {
-      m.eval(R"(
+          if (typeid(MapType) == typeid(std::map<std::string, Boxed_Value>))
+          {
+            m->eval(R"(
                     def Map::`==`(Map rhs) {
                        if ( rhs.size() != this.size() ) {
                          return false;
@@ -393,7 +494,8 @@ namespace chaiscript::bootstrap::standard_library {
                          }
                          true;
                        }
-                   } )");
+                   } )"
+                 );
           } 
 
           container_type<MapType>(type, m);
@@ -402,59 +504,55 @@ namespace chaiscript::bootstrap::standard_library {
           unique_associative_container_type<MapType>(type, m);
           pair_associative_container_type<MapType>(type, m);
           input_range_type<MapType>(type, m);
+
+          return m;
         }
 
+
+      /// hopefully working List type
       /// http://www.sgi.com/tech/stl/List.html
       template<typename ListType>
-  void list_type(const std::string &type, Module &m) {
-    m.add(user_type<ListType>(), type);
+        ModulePtr list_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(user_type<ListType>(), type);
 
           front_insertion_sequence_type<ListType>(type, m);
           back_insertion_sequence_type<ListType>(type, m);
           sequence_type<ListType>(type, m);
-    resizable_type<ListType>(type, m);
           container_type<ListType>(type, m);
           default_constructible_type<ListType>(type, m);
           assignable_type<ListType>(type, m);
           input_range_type<ListType>(type, m);
+
+          return m;
         }
 
+
       /// Create a vector type with associated concepts
       /// http://www.sgi.com/tech/stl/Vector.html
       template<typename VectorType>
-  void vector_type(const std::string &type, Module &m) {
-    m.add(user_type<VectorType>(), type);
+        ModulePtr vector_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(user_type<VectorType>(), type);
 
-    m.add(fun([](VectorType &container) -> decltype(auto) {
-            if (container.empty()) {
-              throw std::range_error("Container empty");
-            } else {
-              return (container.front());
-            }
-          }),
-          "front");
+          typedef typename VectorType::reference (VectorType::*frontptr)();
+          typedef typename VectorType::const_reference (VectorType::*constfrontptr)() const;
+
+          m->add(fun(static_cast<frontptr>(&VectorType::front)), "front");
+          m->add(fun(static_cast<constfrontptr>(&VectorType::front)), "front");
 
-    m.add(fun([](const VectorType &container) -> decltype(auto) {
-            if (container.empty()) {
-              throw std::range_error("Container empty");
-            } else {
-              return (container.front());
-            }
-          }),
-          "front");
 
           back_insertion_sequence_type<VectorType>(type, m);
           sequence_type<VectorType>(type, m);
           random_access_container_type<VectorType>(type, m);
-    resizable_type<VectorType>(type, m);
-    reservable_type<VectorType>(type, m);
           container_type<VectorType>(type, m);
           default_constructible_type<VectorType>(type, m);
           assignable_type<VectorType>(type, m);
           input_range_type<VectorType>(type, m);
 
-    if (typeid(VectorType) == typeid(std::vector<Boxed_Value>)) {
-      m.eval(R"(
+          if (typeid(VectorType) == typeid(std::vector<Boxed_Value>))
+          {
+            m->eval(R"(
                     def Vector::`==`(Vector rhs) {
                        if ( rhs.size() != this.size() ) {
                          return false;
@@ -472,15 +570,19 @@ namespace chaiscript::bootstrap::standard_library {
                          }
                          true;
                        }
-                   } )");
+                   } )"
+                 );
           } 
+
+          return m;
         }
 
       /// Add a String container
       /// http://www.sgi.com/tech/stl/basic_string.html
       template<typename String>
-  void string_type(const std::string &type, Module &m) {
-    m.add(user_type<String>(), type);
+        ModulePtr string_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(user_type<String>(), type);
           operators::addition<String>(m);
           operators::assign_sum<String>(m);
           opers_comparison<String>(m);
@@ -491,8 +593,9 @@ namespace chaiscript::bootstrap::standard_library {
           assignable_type<String>(type, m);
           input_range_type<String>(type, m);
 
-    // Special case: add push_back to string (which doesn't support other back_insertion operations
-    m.add(fun(&String::push_back), []() -> std::string {
+          //Special case: add push_back to string (which doesn't support other back_insertion operations
+          m->add(fun(&String::push_back), 
+              []()->std::string{
                 if (typeid(typename String::value_type) == typeid(Boxed_Value)) {
                   return "push_back_ref";
                 } else {
@@ -500,34 +603,45 @@ namespace chaiscript::bootstrap::standard_library {
                 }
               }());
 
-    m.add(fun([](const String *s, const String &f, size_t pos) { return s->find(f, pos); }), "find");
-    m.add(fun([](const String *s, const String &f, size_t pos) { return s->rfind(f, pos); }), "rfind");
-    m.add(fun([](const String *s, const String &f, size_t pos) { return s->find_first_of(f, pos); }), "find_first_of");
-    m.add(fun([](const String *s, const String &f, size_t pos) { return s->find_last_of(f, pos); }), "find_last_of");
-    m.add(fun([](const String *s, const String &f, size_t pos) { return s->find_last_not_of(f, pos); }), "find_last_not_of");
-    m.add(fun([](const String *s, const String &f, size_t pos) { return s->find_first_not_of(f, pos); }), "find_first_not_of");
 
-    m.add(fun([](String *s, typename String::value_type c) -> decltype(auto) { return (*s += c); }), "+=");
+          m->add(fun([](const String *s, const String &f, size_t pos) { return s->find(f, pos); } ), "find");
+          m->add(fun([](const String *s, const String &f, size_t pos) { return s->rfind(f, pos); } ), "rfind");
+          m->add(fun([](const String *s, const String &f, size_t pos) { return s->find_first_of(f, pos); } ), "find_first_of");
+          m->add(fun([](const String *s, const String &f, size_t pos) { return s->find_last_of(f, pos); } ), "find_last_of");
+          m->add(fun([](const String *s, const String &f, size_t pos) { return s->find_last_not_of(f, pos); } ), "find_last_not_of");
+          m->add(fun([](const String *s, const String &f, size_t pos) { return s->find_first_not_of(f, pos); } ), "find_first_not_of");
 
-    m.add(fun([](String *s) { s->clear(); }), "clear");
-    m.add(fun([](const String *s) { return s->empty(); }), "empty");
-    m.add(fun([](const String *s) { return s->size(); }), "size");
+          m->add(fun([](String *s) { s->clear(); } ), "clear");
+          m->add(fun([](const String *s) { return s->empty(); } ), "empty");
+          m->add(fun([](const String *s) { return s->size(); } ), "size");
 
-    m.add(fun([](const String *s) { return s->c_str(); }), "c_str");
-    m.add(fun([](const String *s) { return s->data(); }), "data");
-    m.add(fun([](const String *s, size_t pos, size_t len) { return s->substr(pos, len); }), "substr");
+          m->add(fun([](const String *s) { return s->c_str(); } ), "c_str");
+          m->add(fun([](const String *s) { return s->data(); } ), "data");
+          m->add(fun([](const String *s, size_t pos, size_t len) { return s->substr(pos, len); } ), "substr");
+
+          return m;
         }
 
+
+
       /// Add a MapType container
       /// http://www.sgi.com/tech/stl/Map.html
       template<typename FutureType>
-  void future_type(const std::string &type, Module &m) {
-    m.add(user_type<FutureType>(), type);
+        ModulePtr future_type(const std::string &type, ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(user_type<FutureType>(), type);
 
-    m.add(fun([](const FutureType &t) { return t.valid(); }), "valid");
-    m.add(fun([](FutureType &t) { return t.get(); }), "get");
-    m.add(fun(&FutureType::wait), "wait");
+          m->add(fun([](const FutureType &t) { return t.valid(); }), "valid");
+          m->add(fun(&FutureType::get), "get");
+          m->add(fun(&FutureType::wait), "wait");
+
+          return m;
         }
-} // namespace chaiscript::bootstrap::standard_library
+    }
+  }
+}
+
 
 #endif
+
+

include/chaiscript/dispatchkit/boxed_cast.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_BOXED_CAST_HPP_
 #define CHAISCRIPT_BOXED_CAST_HPP_
 
@@ -18,13 +15,17 @@
 #include "type_info.hpp"
 
 namespace chaiscript {
-  class Type_Conversions;
-}
-namespace chaiscript::detail::exception {
-  class bad_any_cast;
-} // namespace chaiscript::detail::exception
+class Type_Conversions;
+namespace detail {
+namespace exception {
+class bad_any_cast;
+}  // namespace exception
+}  // namespace detail
+}  // namespace chaiscript
+
+namespace chaiscript 
+{
  
-namespace chaiscript {
   /// \brief Function for extracting a value stored in a Boxed_Value object
   /// \tparam Type The type to extract from the Boxed_Value
   /// \param[in] bv The Boxed_Value to extract a typed value from
@@ -68,7 +69,8 @@ namespace chaiscript {
   /// assert(i == 5);
   /// \endcode
   template<typename Type>
-  decltype(auto) boxed_cast(const Boxed_Value &bv, const Type_Conversions_State *t_conversions = nullptr) {
+  typename detail::Cast_Helper<Type>::Result_Type boxed_cast(const Boxed_Value &bv, const Type_Conversions_State *t_conversions = nullptr)
+  {
     if (!t_conversions || bv.get_type_info().bare_equal(user_type<Type>()) || (t_conversions && !(*t_conversions)->convertable_type<Type>())) {
       try {
         return detail::Cast_Helper<Type>::cast(bv, t_conversions);
@@ -76,27 +78,34 @@ namespace chaiscript {
       }
     }
 
-    if (t_conversions && (*t_conversions)->convertable_type<Type>()) {
+
+    if (t_conversions && (*t_conversions)->convertable_type<Type>())
+    {
       try {
+        // std::cout << "trying an up conversion " << typeid(Type).name() << '\n';
         // We will not catch any bad_boxed_dynamic_cast that is thrown, let the user get it
         // either way, we are not responsible if it doesn't work
-        return (detail::Cast_Helper<Type>::cast((*t_conversions)->boxed_type_conversion<Type>(t_conversions->saves(), bv), t_conversions));
+        return detail::Cast_Helper<Type>::cast((*t_conversions)->boxed_type_conversion<Type>(t_conversions->saves(), bv), t_conversions);
       } catch (...) {
         try {
-          // try going the other way
-          return (detail::Cast_Helper<Type>::cast((*t_conversions)->boxed_type_down_conversion<Type>(t_conversions->saves(), bv),
-                                                  t_conversions));
+        //  std::cout << "trying a down conversion " << typeid(Type).name() << '\n';
+          // try going the other way - down the inheritance graph
+          return detail::Cast_Helper<Type>::cast((*t_conversions)->boxed_type_down_conversion<Type>(t_conversions->saves(), bv), t_conversions);
         } catch (const chaiscript::detail::exception::bad_any_cast &) {
           throw exception::bad_boxed_cast(bv.get_type_info(), typeid(Type));
         }
       }
     } else {
-      // If it's not convertable, just throw the error, don't waste the time on the
+      // If it's not polymorphic, just throw the error, don't waste the time on the 
       // attempted dynamic_cast
       throw exception::bad_boxed_cast(bv.get_type_info(), typeid(Type));
     }
+
   }
 
-} // namespace chaiscript
+}
+
+
 
 #endif
+

include/chaiscript/dispatchkit/boxed_cast_helper.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_BOXED_CAST_HELPER_HPP_
 #define CHAISCRIPT_BOXED_CAST_HELPER_HPP_
 
@@ -16,245 +13,274 @@
 #include "boxed_value.hpp"
 #include "type_info.hpp"
 
-namespace chaiscript {
+
+namespace chaiscript 
+{
   class Type_Conversions_State;
 
-  namespace detail {
+  namespace detail
+  {
     // Cast_Helper_Inner helper classes
 
     template<typename T>
-    constexpr T *throw_if_null(T *t) {
-      if (t) {
-        return t;
-      }
+      T* throw_if_null(T *t)
+      {
+        if (t) return t;
         throw std::runtime_error("Attempted to dereference null Boxed_Value");
       }
 
-    template<typename T>
-    static const T *verify_type_no_throw(const Boxed_Value &ob, const std::type_info &ti, const T *ptr) {
-      if (ob.get_type_info() == ti) {
-        return ptr;
-      } else {
-        throw chaiscript::detail::exception::bad_any_cast();
-      }
-    }
-
-    template<typename T>
-    static T *verify_type_no_throw(const Boxed_Value &ob, const std::type_info &ti, T *ptr) {
-      if (!ob.is_const() && ob.get_type_info() == ti) {
-        return ptr;
-      } else {
-        throw chaiscript::detail::exception::bad_any_cast();
-      }
-    }
-
-    template<typename T>
-    static const T *verify_type(const Boxed_Value &ob, const std::type_info &ti, const T *ptr) {
-      if (ob.get_type_info().bare_equal_type_info(ti)) {
-        return throw_if_null(ptr);
-      } else {
-        throw chaiscript::detail::exception::bad_any_cast();
-      }
-    }
-
-    template<typename T>
-    static T *verify_type(const Boxed_Value &ob, const std::type_info &ti, T *ptr) {
-      if (!ob.is_const() && ob.get_type_info().bare_equal_type_info(ti)) {
-        return throw_if_null(ptr);
-      } else {
-        throw chaiscript::detail::exception::bad_any_cast();
-      }
-    }
-
     /// Generic Cast_Helper_Inner, for casting to any type
     template<typename Result>
-    struct Cast_Helper_Inner {
-      static Result cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return *static_cast<const Result *>(verify_type(ob, typeid(Result), ob.get_const_ptr()));
+      struct Cast_Helper_Inner
+      {
+        typedef typename std::add_const<Result>::type Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          if (ob.get_type_info().bare_equal_type_info(typeid(Result)))
+          {
+            auto p = throw_if_null(ob.get_const_ptr());
+            return *static_cast<const Result *>(p);
+          } else {
+            throw chaiscript::detail::exception::bad_any_cast();
+          }
         }
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const Result> : Cast_Helper_Inner<Result> {
+      struct Cast_Helper_Inner<const Result> : Cast_Helper_Inner<Result>
+      {
       };
 
+
     /// Cast_Helper_Inner for casting to a const * type
     template<typename Result>
-    struct Cast_Helper_Inner<const Result *> {
-      static const Result *cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return static_cast<const Result *>(verify_type_no_throw(ob, typeid(Result), ob.get_const_ptr()));
+      struct Cast_Helper_Inner<const Result *>
+      {
+        typedef const Result * Result_Type;
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          if (ob.get_type_info().bare_equal_type_info(typeid(Result)))
+          {
+            return static_cast<const Result *>(ob.get_const_ptr());
+          } else {
+            throw chaiscript::detail::exception::bad_any_cast();
+          }
         }
       };
 
     /// Cast_Helper_Inner for casting to a * type
     template<typename Result>
-    struct Cast_Helper_Inner<Result *> {
-      static Result *cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return static_cast<Result *>(verify_type_no_throw(ob, typeid(Result), ob.get_ptr()));
+      struct Cast_Helper_Inner<Result *>
+      {
+        typedef Result * Result_Type;
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          if (!ob.get_type_info().is_const() && ob.get_type_info() == typeid(Result))
+          {
+            return static_cast<Result *>(ob.get_ptr());
+          } else {
+            throw chaiscript::detail::exception::bad_any_cast();
+          }
         }
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<Result *const &> : public Cast_Helper_Inner<Result *> {
+    struct Cast_Helper_Inner<Result * const &> : public Cast_Helper_Inner<Result *>
+    {
     };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const Result *const &> : public Cast_Helper_Inner<const Result *> {
+    struct Cast_Helper_Inner<const Result * const &> : public Cast_Helper_Inner<const Result *>
+    {
     };
 
+
     /// Cast_Helper_Inner for casting to a & type
     template<typename Result>
-    struct Cast_Helper_Inner<const Result &> {
-      static const Result &cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return *static_cast<const Result *>(verify_type(ob, typeid(Result), ob.get_const_ptr()));
+      struct Cast_Helper_Inner<const Result &>
+      {
+        typedef const Result& Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          if (ob.get_type_info().bare_equal_type_info(typeid(Result)))
+          {
+            auto p = throw_if_null(ob.get_const_ptr());
+            return *static_cast<const Result *>(p);
+          } else {
+            throw chaiscript::detail::exception::bad_any_cast();
+          }
         }
       };
 
+
+
     /// Cast_Helper_Inner for casting to a & type
     template<typename Result>
-    struct Cast_Helper_Inner<Result &> {
-      static Result &cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return *static_cast<Result *>(verify_type(ob, typeid(Result), ob.get_ptr()));
-      }
-    };
+      struct Cast_Helper_Inner<Result &>
+      {
+        typedef Result& Result_Type;
 
-    /// Cast_Helper_Inner for casting to a && type
-    template<typename Result>
-    struct Cast_Helper_Inner<Result &&> {
-      static Result &&cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return std::move(*static_cast<Result *>(verify_type(ob, typeid(Result), ob.get_ptr())));
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          if (!ob.get_type_info().is_const() && ob.get_type_info().bare_equal_type_info(typeid(Result)))
+          {
+            return *(static_cast<Result *>(throw_if_null(ob.get_ptr())));
+          } else {
+            throw chaiscript::detail::exception::bad_any_cast();
           }
-    };
-
-    /// Cast_Helper_Inner for casting to a std::unique_ptr<> && type
-    /// \todo Fix the fact that this has to be in a shared_ptr for now
-    template<typename Result>
-    struct Cast_Helper_Inner<std::unique_ptr<Result> &&> {
-      static std::unique_ptr<Result> &&cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return std::move(*(ob.get().cast<std::shared_ptr<std::unique_ptr<Result>>>()));
-      }
-    };
-
-    /// Cast_Helper_Inner for casting to a std::unique_ptr<> & type
-    /// \todo Fix the fact that this has to be in a shared_ptr for now
-    template<typename Result>
-    struct Cast_Helper_Inner<std::unique_ptr<Result> &> {
-      static std::unique_ptr<Result> &cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return *(ob.get().cast<std::shared_ptr<std::unique_ptr<Result>>>());
-      }
-    };
-
-    /// Cast_Helper_Inner for casting to a std::unique_ptr<> & type
-    /// \todo Fix the fact that this has to be in a shared_ptr for now
-    template<typename Result>
-    struct Cast_Helper_Inner<const std::unique_ptr<Result> &> {
-      static std::unique_ptr<Result> &cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        return *(ob.get().cast<std::shared_ptr<std::unique_ptr<Result>>>());
         }
       };
 
     /// Cast_Helper_Inner for casting to a std::shared_ptr<> type
     template<typename Result>
-    struct Cast_Helper_Inner<std::shared_ptr<Result>> {
-      static auto cast(const Boxed_Value &ob, const Type_Conversions_State *) { return ob.get().cast<std::shared_ptr<Result>>(); }
+      struct Cast_Helper_Inner<std::shared_ptr<Result> >
+      {
+        typedef std::shared_ptr<Result> Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          return ob.get().cast<std::shared_ptr<Result> >();
+        }
       };
 
     /// Cast_Helper_Inner for casting to a std::shared_ptr<const> type
     template<typename Result>
-    struct Cast_Helper_Inner<std::shared_ptr<const Result>> {
-      static auto cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        if (!ob.get_type_info().is_const()) {
-          return std::const_pointer_cast<const Result>(ob.get().cast<std::shared_ptr<Result>>());
+      struct Cast_Helper_Inner<std::shared_ptr<const Result> >
+      {
+        typedef std::shared_ptr<const Result> Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          if (!ob.get_type_info().is_const())
+          {
+            return std::const_pointer_cast<const Result>(ob.get().cast<std::shared_ptr<Result> >());
           } else {
-          return ob.get().cast<std::shared_ptr<const Result>>();
+            return ob.get().cast<std::shared_ptr<const Result> >();
           }
         }
       };
 
     /// Cast_Helper_Inner for casting to a const std::shared_ptr<> & type
     template<typename Result>
-    struct Cast_Helper_Inner<const std::shared_ptr<Result>> : Cast_Helper_Inner<std::shared_ptr<Result>> {
+      struct Cast_Helper_Inner<const std::shared_ptr<Result> > : Cast_Helper_Inner<std::shared_ptr<Result> >
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const std::shared_ptr<Result> &> : Cast_Helper_Inner<std::shared_ptr<Result>> {
+      struct Cast_Helper_Inner<const std::shared_ptr<Result> &> : Cast_Helper_Inner<std::shared_ptr<Result> >
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<std::shared_ptr<Result> &> {
+      struct Cast_Helper_Inner<std::shared_ptr<Result> &>
+      {
         static_assert(!std::is_const<Result>::value, "Non-const reference to std::shared_ptr<const T> is not supported");
-      static auto cast(const Boxed_Value &ob, const Type_Conversions_State *) {
-        std::shared_ptr<Result> &res = ob.get().cast<std::shared_ptr<Result>>();
+
+        typedef Boxed_Value::Sentinel<Result> Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          std::shared_ptr<Result> &res = ob.get().cast<std::shared_ptr<Result> >();
           return ob.pointer_sentinel(res);
         }
       };
 
+
     /// Cast_Helper_Inner for casting to a const std::shared_ptr<const> & type
     template<typename Result>
-    struct Cast_Helper_Inner<const std::shared_ptr<const Result>> : Cast_Helper_Inner<std::shared_ptr<const Result>> {
+      struct Cast_Helper_Inner<const std::shared_ptr<const Result> > : Cast_Helper_Inner<std::shared_ptr<const Result> >
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const std::shared_ptr<const Result> &> : Cast_Helper_Inner<std::shared_ptr<const Result>> {
+      struct Cast_Helper_Inner<const std::shared_ptr<const Result> &> : Cast_Helper_Inner<std::shared_ptr<const Result> >
+      {
       };
 
+
     /// Cast_Helper_Inner for casting to a Boxed_Value type
     template<>
-    struct Cast_Helper_Inner<Boxed_Value> {
-      static Boxed_Value cast(const Boxed_Value &ob, const Type_Conversions_State *) { return ob; }
+      struct Cast_Helper_Inner<Boxed_Value>
+      {
+        typedef Boxed_Value Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
+          return ob;
+        }
       };
 
     /// Cast_Helper_Inner for casting to a Boxed_Value & type
     template<>
-    struct Cast_Helper_Inner<Boxed_Value &> {
-      static std::reference_wrapper<Boxed_Value> cast(const Boxed_Value &ob, const Type_Conversions_State *) {
+      struct Cast_Helper_Inner<Boxed_Value &>
+      {
+        typedef std::reference_wrapper<Boxed_Value> Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *)
+        {
           return std::ref(const_cast<Boxed_Value &>(ob));
         }
       };
 
+
     /// Cast_Helper_Inner for casting to a const Boxed_Value & type
     template<>
-    struct Cast_Helper_Inner<const Boxed_Value> : Cast_Helper_Inner<Boxed_Value> {
+      struct Cast_Helper_Inner<const Boxed_Value> : Cast_Helper_Inner<Boxed_Value>
+      {
       };
 
     template<>
-    struct Cast_Helper_Inner<const Boxed_Value &> : Cast_Helper_Inner<Boxed_Value> {
+      struct Cast_Helper_Inner<const Boxed_Value &> : Cast_Helper_Inner<Boxed_Value>
+      {
       };
 
+
     /// Cast_Helper_Inner for casting to a std::reference_wrapper type
     template<typename Result>
-    struct Cast_Helper_Inner<std::reference_wrapper<Result>> : Cast_Helper_Inner<Result &> {
+      struct Cast_Helper_Inner<std::reference_wrapper<Result> > : Cast_Helper_Inner<Result &>
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const std::reference_wrapper<Result>> : Cast_Helper_Inner<Result &> {
+      struct Cast_Helper_Inner<const std::reference_wrapper<Result> > : Cast_Helper_Inner<Result &>
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const std::reference_wrapper<Result> &> : Cast_Helper_Inner<Result &> {
+      struct Cast_Helper_Inner<const std::reference_wrapper<Result> &> : Cast_Helper_Inner<Result &>
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<std::reference_wrapper<const Result>> : Cast_Helper_Inner<const Result &> {
+      struct Cast_Helper_Inner<std::reference_wrapper<const Result> > : Cast_Helper_Inner<const Result &>
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const std::reference_wrapper<const Result>> : Cast_Helper_Inner<const Result &> {
+      struct Cast_Helper_Inner<const std::reference_wrapper<const Result> > : Cast_Helper_Inner<const Result &>
+      {
       };
 
     template<typename Result>
-    struct Cast_Helper_Inner<const std::reference_wrapper<const Result> &> : Cast_Helper_Inner<const Result &> {
+      struct Cast_Helper_Inner<const std::reference_wrapper<const Result> & > : Cast_Helper_Inner<const Result &>
+      {
       };
 
     /// The exposed Cast_Helper object that by default just calls the Cast_Helper_Inner
     template<typename T>
-    struct Cast_Helper {
-      static decltype(auto) cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions) {
-        return (Cast_Helper_Inner<T>::cast(ob, t_conversions));
+      struct Cast_Helper
+      {
+        typedef typename Cast_Helper_Inner<T>::Result_Type Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions)
+        {
+          return Cast_Helper_Inner<T>::cast(ob, t_conversions);
         }
       };
-  } // namespace detail
+  }
   
-} // namespace chaiscript
+}
 
 #endif

include/chaiscript/dispatchkit/boxed_value.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_BOXED_VALUE_HPP_
 #define CHAISCRIPT_BOXED_VALUE_HPP_
 
@@ -18,29 +15,36 @@
 #include "any.hpp"
 #include "type_info.hpp"
 
-namespace chaiscript {
+namespace chaiscript 
+{
+
   /// \brief A wrapper for holding any valid C++ type. All types in ChaiScript are Boxed_Value objects
   /// \sa chaiscript::boxed_cast
-  class Boxed_Value {
+  class Boxed_Value
+  {
     public:
       /// used for explicitly creating a "void" object
-    struct Void_Type {
+      struct Void_Type
+      {
       };
 
     private:
       /// structure which holds the internal state of a Boxed_Value
       /// \todo Get rid of Any and merge it with this, reducing an allocation in the process
-    struct Data {
-      Data(const Type_Info &ti, chaiscript::detail::Any to, bool is_ref, const void *t_void_ptr, bool t_return_value) noexcept
-          : m_type_info(ti)
-          , m_obj(std::move(to))
-          , m_data_ptr(ti.is_const() ? nullptr : const_cast<void *>(t_void_ptr))
-          , m_const_data_ptr(t_void_ptr)
-          , m_is_ref(is_ref)
-          , m_return_value(t_return_value) {
+      struct Data
+      {
+        Data(const Type_Info &ti,
+            chaiscript::detail::Any to,
+            bool tr,
+            const void *t_void_ptr,
+            bool t_return_value)
+          : m_type_info(ti), m_obj(std::move(to)), m_data_ptr(ti.is_const()?nullptr:const_cast<void *>(t_void_ptr)), m_const_data_ptr(t_void_ptr),
+            m_is_ref(tr), m_return_value(t_return_value)
+        {
         }
 
-      Data &operator=(const Data &rhs) {
+        Data &operator=(const Data &rhs)
+        {
           m_type_info = rhs.m_type_info;
           m_obj = rhs.m_obj;
           m_is_ref = rhs.m_is_ref;
@@ -48,8 +52,9 @@ namespace chaiscript {
           m_const_data_ptr = rhs.m_const_data_ptr;
           m_return_value = rhs.m_return_value;
 
-        if (rhs.m_attrs) {
-          m_attrs = std::make_unique<std::map<std::string, std::shared_ptr<Data>>>(*rhs.m_attrs);
+          if (rhs.m_attrs)
+          {
+            m_attrs = std::unique_ptr<std::map<std::string, std::shared_ptr<Data>>>(new std::map<std::string, std::shared_ptr<Data>>(*rhs.m_attrs));
           }
 
           return *this;
@@ -57,8 +62,11 @@ namespace chaiscript {
 
         Data(const Data &) = delete;
 
+#if !defined(__APPLE__) && (!defined(_MSC_VER) || _MSC_VER != 1800)
         Data(Data &&) = default;
         Data &operator=(Data &&rhs) = default;
+#endif
+
 
         Type_Info m_type_info;
         chaiscript::detail::Any m_obj;
@@ -69,187 +77,296 @@ namespace chaiscript {
         bool m_return_value;
       };
 
-    struct Object_Data {
-      static auto get(Boxed_Value::Void_Type, bool t_return_value) {
-        return std::make_shared<Data>(detail::Get_Type_Info<void>::get(), chaiscript::detail::Any(), false, nullptr, t_return_value);
+      struct Object_Data
+      {
+        static std::shared_ptr<Data> get(Boxed_Value::Void_Type, bool t_return_value)
+        {
+          return std::make_shared<Data>(
+                detail::Get_Type_Info<void>::get(),
+                chaiscript::detail::Any(), 
+                false,
+                nullptr,
+                t_return_value)
+              ;
         }
 
         template<typename T>
-      static auto get(const std::shared_ptr<T> *obj, bool t_return_value) {
+          static std::shared_ptr<Data> get(const std::shared_ptr<T> *obj, bool t_return_value)
+          {
             return get(*obj, t_return_value);
           }
 
         template<typename T>
-      static auto get(const std::shared_ptr<T> &obj, bool t_return_value) {
-        return std::make_shared<Data>(detail::Get_Type_Info<T>::get(), chaiscript::detail::Any(obj), false, obj.get(), t_return_value);
+          static std::shared_ptr<Data> get(const std::shared_ptr<T> &obj, bool t_return_value)
+          {
+            return std::make_shared<Data>(
+                  detail::Get_Type_Info<T>::get(), 
+                  chaiscript::detail::Any(obj), 
+                  false,
+                  obj.get(),
+                  t_return_value
+                );
           }
 
         template<typename T>
-      static auto get(std::shared_ptr<T> &&obj, bool t_return_value) {
+          static std::shared_ptr<Data> get(std::shared_ptr<T> &&obj, bool t_return_value)
+          {
             auto ptr = obj.get();
-        return std::make_shared<Data>(detail::Get_Type_Info<T>::get(), chaiscript::detail::Any(std::move(obj)), false, ptr, t_return_value);
+            return std::make_shared<Data>(
+                  detail::Get_Type_Info<T>::get(), 
+                  chaiscript::detail::Any(std::move(obj)), 
+                  false,
+                  ptr,
+                  t_return_value
+                );
           }
 
         template<typename T>
-      static auto get(T *t, bool t_return_value) {
+          static std::shared_ptr<Data> get(T *t, bool t_return_value)
+          {
             return get(std::ref(*t), t_return_value);
           }
 
         template<typename T>
-      static auto get(const T *t, bool t_return_value) {
+          static std::shared_ptr<Data> get(const T *t, bool t_return_value)
+          {
             return get(std::cref(*t), t_return_value);
           }
 
+
         template<typename T>
-      static auto get(std::reference_wrapper<T> obj, bool t_return_value) {
+          static std::shared_ptr<Data> get(std::reference_wrapper<T> obj, bool t_return_value)
+          {
             auto p = &obj.get();
-        return std::make_shared<Data>(detail::Get_Type_Info<T>::get(), chaiscript::detail::Any(std::move(obj)), true, p, t_return_value);
-      }
-
-      template<typename T>
-      static auto get(std::unique_ptr<T> &&obj, bool t_return_value) {
-        auto ptr = obj.get();
-        return std::make_shared<Data>(detail::Get_Type_Info<T>::get(),
-                                      chaiscript::detail::Any(std::make_shared<std::unique_ptr<T>>(std::move(obj))),
+            return std::make_shared<Data>(
+                  detail::Get_Type_Info<T>::get(),
+                  chaiscript::detail::Any(std::move(obj)),
                   true,
-                                      ptr,
-                                      t_return_value);
+                  p,
+                  t_return_value
+                );
           }
 
         template<typename T>
-      static auto get(T t, bool t_return_value) {
+          static std::shared_ptr<Data> get(T t, bool t_return_value)
+          {
             auto p = std::make_shared<T>(std::move(t));
             auto ptr = p.get();
-        return std::make_shared<Data>(detail::Get_Type_Info<T>::get(), chaiscript::detail::Any(std::move(p)), false, ptr, t_return_value);
+            return std::make_shared<Data>(
+                  detail::Get_Type_Info<T>::get(), 
+                  chaiscript::detail::Any(std::move(p)),
+                  false,
+                  ptr,
+                  t_return_value
+                );
+          }
+
+        static std::shared_ptr<Data> get()
+        {
+          return std::make_shared<Data>(
+                Type_Info(),
+                chaiscript::detail::Any(),
+                false,
+                nullptr,
+                false
+              );
         }
 
-      static std::shared_ptr<Data> get() { return std::make_shared<Data>(Type_Info(), chaiscript::detail::Any(), false, nullptr, false); }
       };
 
     public:
       /// Basic Boxed_Value constructor
-    template<typename T, typename = std::enable_if_t<!std::is_same_v<Boxed_Value, std::decay_t<T>>>>
+        template<typename T,
+          typename = typename std::enable_if<!std::is_same<Boxed_Value, typename std::decay<T>::type>::value>::type>
         explicit Boxed_Value(T &&t, bool t_return_value = false)
-        : m_data(Object_Data::get(std::forward<T>(t), t_return_value)) {
+          : m_data(Object_Data::get(std::forward<T>(t), t_return_value))
+        {
         }
 
       /// Unknown-type constructor
-    Boxed_Value() = default;
+      Boxed_Value()
+        : m_data(Object_Data::get())
+      {
+      }
 
-    Boxed_Value(Boxed_Value &&) = default;
-    Boxed_Value &operator=(Boxed_Value &&) = default;
-    Boxed_Value(const Boxed_Value &) = default;
-    Boxed_Value &operator=(const Boxed_Value &) = default;
+#if !defined(_MSC_VER) || _MSC_VER != 1800
+      Boxed_Value(Boxed_Value&&) = default;
+      Boxed_Value& operator=(Boxed_Value&&) = default;
+#endif
 
-    void swap(Boxed_Value &rhs) noexcept { std::swap(m_data, rhs.m_data); }
+      Boxed_Value(const Boxed_Value&) = default;
+      Boxed_Value& operator=(const Boxed_Value&) = default;
+
+      void swap(Boxed_Value &rhs)
+      {
+        std::swap(m_data, rhs.m_data);
+      }
 
       /// Copy the values stored in rhs.m_data to m_data.
       /// m_data pointers are not shared in this case
-    Boxed_Value assign(const Boxed_Value &rhs) noexcept {
+      Boxed_Value assign(const Boxed_Value &rhs)
+      {
         (*m_data) = (*rhs.m_data);
         return *this;
       }
 
-    const Type_Info &get_type_info() const noexcept { return m_data->m_type_info; }
+      const Type_Info &get_type_info() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_type_info;
+      }
 
       /// return true if the object is uninitialized
-    bool is_undef() const noexcept { return m_data->m_type_info.is_undef(); }
+      bool is_undef() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_type_info.is_undef();
+      }
 
-    bool is_const() const noexcept { return m_data->m_type_info.is_const(); }
+      bool is_const() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_type_info.is_const();
+      }
 
-    bool is_type(const Type_Info &ti) const noexcept { return m_data->m_type_info.bare_equal(ti); }
+      bool is_type(const Type_Info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_type_info.bare_equal(ti);
+      }
 
       template<typename T>
-    auto pointer_sentinel(std::shared_ptr<T> &ptr) const noexcept {
       struct Sentinel {
-        Sentinel(std::shared_ptr<T> &t_ptr, Data &data)
-            : m_ptr(t_ptr)
-            , m_data(data) {
+        Sentinel(std::shared_ptr<T> &ptr, Data &data)
+          : m_ptr(ptr), m_data(data)
+        {
         }
 
-        ~Sentinel() {
+        ~Sentinel()
+        {
           // save new pointer data
-          const auto ptr_ = m_ptr.get().get();
-          m_data.get().m_data_ptr = ptr_;
-          m_data.get().m_const_data_ptr = ptr_;
+          m_data.get().m_data_ptr = m_ptr.get().get();
+          m_data.get().m_const_data_ptr = m_ptr.get().get();
         }
 
-        Sentinel &operator=(Sentinel &&s) = default;
-        Sentinel(Sentinel &&s) = default;
+        Sentinel& operator=(Sentinel&&s) {
+          m_ptr = std::move(s.m_ptr);
+          m_data = std::move(s.m_data);
+        }
 
-        operator std::shared_ptr<T> &() const noexcept { return m_ptr.get(); }
+        Sentinel(Sentinel &&s)
+          : m_ptr(std::move(s.m_ptr)),
+            m_data(std::move(s.m_data))
+        {
+        }
+
+        operator std::shared_ptr<T>&() const
+        {
+          return m_ptr.get();
+        }
 
         Sentinel &operator=(const Sentinel &) = delete;
-        Sentinel(Sentinel &) = delete;
+        Sentinel(Sentinel&) = delete;
 
         std::reference_wrapper<std::shared_ptr<T>> m_ptr;
         std::reference_wrapper<Data> m_data;
       };
 
-      return Sentinel(ptr, *(m_data.get()));
+
+      template<typename T>
+      Sentinel<T> pointer_sentinel(std::shared_ptr<T> &ptr) const
+      {
+        return Sentinel<T>(ptr, *(m_data.get()));
       }
 
-    bool is_null() const noexcept { return (m_data->m_data_ptr == nullptr && m_data->m_const_data_ptr == nullptr); }
+      bool is_null() const CHAISCRIPT_NOEXCEPT
+      {
+        return (m_data->m_data_ptr == nullptr && m_data->m_const_data_ptr == nullptr);
+      }
 
-    const chaiscript::detail::Any &get() const noexcept { return m_data->m_obj; }
+      const chaiscript::detail::Any & get() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_obj;
+      }
 
-    bool is_ref() const noexcept { return m_data->m_is_ref; }
+      bool is_ref() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_is_ref;
+      }
 
-    bool is_return_value() const noexcept { return m_data->m_return_value; }
+      bool is_return_value() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_return_value;
+      }
 
-    void reset_return_value() const noexcept { m_data->m_return_value = false; }
+      void reset_return_value() const CHAISCRIPT_NOEXCEPT
+      {
+        m_data->m_return_value = false;
+      }
 
-    bool is_pointer() const noexcept { return !is_ref(); }
+      bool is_pointer() const CHAISCRIPT_NOEXCEPT
+      {
+        return !is_ref();
+      }
 
-    void *get_ptr() const noexcept { return m_data->m_data_ptr; }
+      void *get_ptr() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_data_ptr;
+      }
 
-    const void *get_const_ptr() const noexcept { return m_data->m_const_data_ptr; }
+      const void *get_const_ptr() const CHAISCRIPT_NOEXCEPT
+      {
+        return m_data->m_const_data_ptr;
+      }
 
-    Boxed_Value get_attr(const std::string &t_name) {
-      if (!m_data->m_attrs) {
-        m_data->m_attrs = std::make_unique<std::map<std::string, std::shared_ptr<Data>>>();
+      Boxed_Value get_attr(const std::string &t_name)
+      {
+        if (!m_data->m_attrs)
+        {
+          m_data->m_attrs = std::unique_ptr<std::map<std::string, std::shared_ptr<Data>>>(new std::map<std::string, std::shared_ptr<Data>>());
         }
 
         auto &attr = (*m_data->m_attrs)[t_name];
         if (attr) {
           return Boxed_Value(attr, Internal_Construction());
         } else {
-        Boxed_Value bv; // default construct a new one
+          Boxed_Value bv; //default construct a new one
           attr = bv.m_data;
           return bv;
         }
       }
 
-    Boxed_Value &copy_attrs(const Boxed_Value &t_obj) {
-      if (t_obj.m_data->m_attrs) {
-        m_data->m_attrs = std::make_unique<std::map<std::string, std::shared_ptr<Data>>>(*t_obj.m_data->m_attrs);
+      Boxed_Value &copy_attrs(const Boxed_Value &t_obj)
+      {
+        if (t_obj.m_data->m_attrs)
+        {
+          m_data->m_attrs = std::unique_ptr<std::map<std::string, std::shared_ptr<Data>>>(new std::map<std::string, std::shared_ptr<Data>>(*t_obj.m_data->m_attrs));
         }
         return *this;
       }
 
-    Boxed_Value &clone_attrs(const Boxed_Value &t_obj) {
+      Boxed_Value &clone_attrs(const Boxed_Value &t_obj)
+      {
         copy_attrs(t_obj);
         reset_return_value();
         return *this;
       }
 
+
       /// \returns true if the two Boxed_Values share the same internal type
-    static bool type_match(const Boxed_Value &l, const Boxed_Value &r) noexcept { return l.get_type_info() == r.get_type_info(); }
+      static bool type_match(const Boxed_Value &l, const Boxed_Value &r) CHAISCRIPT_NOEXCEPT
+      {
+        return l.get_type_info() == r.get_type_info();
+      }
 
     private:
       // necessary to avoid hitting the templated && constructor of Boxed_Value
-    struct Internal_Construction {
-    };
+      struct Internal_Construction{};
 
-    Boxed_Value(std::shared_ptr<Data> t_data, Internal_Construction)
-        : m_data(std::move(t_data)) {
+      Boxed_Value(const std::shared_ptr<Data> &t_data, Internal_Construction)
+        : m_data(t_data) {
       }
 
-    std::shared_ptr<Data> m_data = Object_Data::get();
+      std::shared_ptr<Data> m_data;
   };
 
-  /// @brief Creates a Boxed_Value. If the object passed in is a value type, it is copied. If it is a pointer, std::shared_ptr, or
-  /// std::reference_type
+  /// @brief Creates a Boxed_Value. If the object passed in is a value type, it is copied. If it is a pointer, std::shared_ptr, or std::reference_type
   ///        a copy is not made.
   /// @param t The value to box
   ///
@@ -264,7 +381,8 @@ namespace chaiscript {
   ///
   /// @sa @ref adding_objects
   template<typename T>
-  Boxed_Value var(T &&t) {
+    Boxed_Value var(T &&t)
+    {
       return Boxed_Value(std::forward<T>(t));
     }
 
@@ -274,8 +392,9 @@ namespace chaiscript {
     /// \returns Immutable Boxed_Value 
     /// \sa Boxed_Value::is_const
     template<typename T>
-    Boxed_Value const_var_impl(const T &t) {
-      return Boxed_Value(std::make_shared<typename std::add_const<T>::type>(t));
+      Boxed_Value const_var_impl(const T &t)
+      {
+        return Boxed_Value(std::make_shared<typename std::add_const<T>::type >(t));
       }
 
     /// \brief Takes a pointer to a value, adds const to the pointed to type and returns an immutable Boxed_Value.
@@ -284,8 +403,9 @@ namespace chaiscript {
     /// \returns Immutable Boxed_Value
     /// \sa Boxed_Value::is_const
     template<typename T>
-    Boxed_Value const_var_impl(T *t) {
-      return Boxed_Value(const_cast<typename std::add_const<T>::type *>(t));
+      Boxed_Value const_var_impl(T *t)
+      {
+        return Boxed_Value( const_cast<typename std::add_const<T>::type *>(t) );
       }
 
     /// \brief Takes a std::shared_ptr to a value, adds const to the pointed to type and returns an immutable Boxed_Value.
@@ -294,8 +414,9 @@ namespace chaiscript {
     /// \returns Immutable Boxed_Value
     /// \sa Boxed_Value::is_const
     template<typename T>
-    Boxed_Value const_var_impl(const std::shared_ptr<T> &t) {
-      return Boxed_Value(std::const_pointer_cast<typename std::add_const<T>::type>(t));
+      Boxed_Value const_var_impl(const std::shared_ptr<T> &t)
+      {
+        return Boxed_Value( std::const_pointer_cast<typename std::add_const<T>::type>(t) );
       }
 
     /// \brief Takes a std::reference_wrapper value, adds const to the referenced type and returns an immutable Boxed_Value.
@@ -304,10 +425,11 @@ namespace chaiscript {
     /// \returns Immutable Boxed_Value
     /// \sa Boxed_Value::is_const
     template<typename T>
-    Boxed_Value const_var_impl(const std::reference_wrapper<T> &t) {
-      return Boxed_Value(std::cref(t.get()));
+      Boxed_Value const_var_impl(const std::reference_wrapper<T> &t)
+      {
+        return Boxed_Value( std::cref(t.get()) );
+      }
   }
-  } // namespace detail
 
   /// \brief Takes an object and returns an immutable Boxed_Value. If the object is a std::reference or pointer type
   ///        the value is not copied. If it is an object type, it is copied.
@@ -333,18 +455,15 @@ namespace chaiscript {
   /// \todo support C++11 strongly typed enums
   /// \sa \ref adding_objects
   template<typename T>
-  Boxed_Value const_var(const T &t) {
+    Boxed_Value const_var(const T &t)
+    {
       return detail::const_var_impl(t);
     }
 
-  inline Boxed_Value void_var() {
-    static const auto v = Boxed_Value(Boxed_Value::Void_Type());
-    return v;
-  }
-
+#ifdef CHAISCRIPT_HAS_MAGIC_STATICS
   inline Boxed_Value const_var(bool b) {
-    static const auto t = detail::const_var_impl(true);
-    static const auto f = detail::const_var_impl(false);
+    static auto t = detail::const_var_impl(true);
+    static auto f = detail::const_var_impl(false);
 
     if (b) {
       return t;
@@ -352,7 +471,9 @@ namespace chaiscript {
       return f;
     }
   }
+#endif
 
-} // namespace chaiscript
+}
 
 #endif
+

include/chaiscript/dispatchkit/callable_traits.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)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
 #ifndef CHAISCRIPT_CALLABLE_TRAITS_HPP_
@@ -12,50 +12,49 @@
 namespace chaiscript {
   namespace dispatch {
     namespace detail {
-      template<typename Class, typename... Param>
-      struct Constructor {
-        template<typename... Inner>
-        std::shared_ptr<Class> operator()(Inner &&...inner) const {
+
+      template<typename Class, typename ... Param>
+      struct Constructor
+      {
+        template<typename ... Inner>
+        std::shared_ptr<Class> operator()(Inner&& ... inner) const {
           return std::make_shared<Class>(std::forward<Inner>(inner)...);
         }
       };
 
-      template<typename Ret, typename Class, typename... Param>
-      struct Const_Caller {
-        explicit Const_Caller(Ret (Class::*t_func)(Param...) const)
-            : m_func(t_func) {
-        }
+      template<typename Ret, typename Class, typename ... Param>
+      struct Const_Caller
+      {
+        Const_Caller(Ret (Class::*t_func)(Param...) const) : m_func(t_func) {}
 
-        template<typename... Inner>
-        Ret operator()(const Class &o, Inner &&...inner) const {
+        template<typename ... Inner>
+        Ret operator()(const Class &o, Inner&& ... inner) const {
           return (o.*m_func)(std::forward<Inner>(inner)...);
         }
 
         Ret (Class::*m_func)(Param...) const;
       };
 
-      template<typename Ret, typename... Param>
-      struct Fun_Caller {
-        explicit Fun_Caller(Ret (*t_func)(Param...))
-            : m_func(t_func) {
-        }
+      template<typename Ret, typename ... Param>
+      struct Fun_Caller
+      {
+        Fun_Caller(Ret( * t_func)(Param...) ) : m_func(t_func) {}
 
-        template<typename... Inner>
-        Ret operator()(Inner &&...inner) const {
+        template<typename ... Inner>
+        Ret operator()(Inner&& ... inner) const {
           return (m_func)(std::forward<Inner>(inner)...);
         }
 
-        Ret (*m_func)(Param...);
+        Ret(*m_func)(Param...);
       };
 
-      template<typename Ret, typename Class, typename... Param>
-      struct Caller {
-        explicit Caller(Ret (Class::*t_func)(Param...))
-            : m_func(t_func) {
-        }
+      template<typename Ret, typename Class, typename ... Param>
+      struct Caller
+      {
+        Caller(Ret (Class::*t_func)(Param...)) : m_func(t_func) {}
 
-        template<typename... Inner>
-        Ret operator()(Class &o, Inner &&...inner) const {
+        template<typename ... Inner>
+        Ret operator()(Class &o, Inner&& ... inner) const {
           return (o.*m_func)(std::forward<Inner>(inner)...);
         }
 
@@ -63,37 +62,46 @@ namespace chaiscript {
       };
 
       template<typename T>
-      struct Arity {
+        struct Arity
+        {
         };
 
-      template<typename Ret, typename... Params>
-      struct Arity<Ret(Params...)> {
+      template<typename Ret, typename ... Params>
+      struct Arity<Ret (Params...)>
+        {
           static const size_t arity = sizeof...(Params);
         };
 
-      template<typename T>
-      struct Function_Signature {
-      };
-
-      template<typename Ret, typename... Params>
-      struct Function_Signature<Ret(Params...)> {
-        using Return_Type = Ret;
-        using Signature = Ret()(Params...);
-      };
-
-      template<typename Ret, typename T, typename... Params>
-      struct Function_Signature<Ret (T::*)(Params...) const> {
-        using Return_Type = Ret;
-        using Signature = Ret()(Params...);
-      };
 
       template<typename T>
-      struct Callable_Traits {
-        using Signature = typename Function_Signature<decltype(&T::operator())>::Signature;
-        using Return_Type = typename Function_Signature<decltype(&T::operator())>::Return_Type;
+        struct Function_Signature
+        {
         };
-    } // namespace detail
-  } // namespace dispatch
-} // namespace chaiscript
+
+      template<typename Ret, typename ... Params>
+      struct Function_Signature<Ret (Params...)>
+        {
+          typedef Ret Return_Type;
+          typedef Ret (Signature)(Params...);
+        };
+
+      template<typename Ret, typename T, typename ... Params>
+      struct Function_Signature<Ret (T::*)(Params...) const>
+        {
+          typedef Ret Return_Type;
+          typedef Ret (Signature)(Params...);
+        };
+
+
+      template<typename T>
+        struct Callable_Traits
+        {
+          typedef typename Function_Signature<decltype(&T::operator())>::Signature Signature;
+          typedef typename Function_Signature<decltype(&T::operator())>::Return_Type Return_Type;
+        };
+    }
+  }
+}
 
 #endif
+

include/chaiscript/dispatchkit/dynamic_object.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_DYNAMIC_OBJECT_HPP_
 #define CHAISCRIPT_DYNAMIC_OBJECT_HPP_
 
@@ -17,44 +14,67 @@
 #include "boxed_value.hpp"
 
 namespace chaiscript {
-  class Type_Conversions;
-  namespace dispatch {
-    class Proxy_Function_Base;
-  } // namespace dispatch
+class Type_Conversions;
+namespace dispatch {
+class Proxy_Function_Base;
+}  // namespace dispatch
 }  // namespace chaiscript
 
-namespace chaiscript {
-  namespace dispatch {
+namespace chaiscript
+{
+  namespace dispatch
+  {
     struct option_explicit_set : std::runtime_error {
-      explicit option_explicit_set(const std::string &t_param_name)
-          : std::runtime_error("option explicit set and parameter '" + t_param_name + "' does not exist") {
+      option_explicit_set(const std::string &t_param_name)
+        : std::runtime_error("option explicit set and parameter '" + t_param_name + "' does not exist")
+      {
+
       }
 
       option_explicit_set(const option_explicit_set &) = default;
 
-      ~option_explicit_set() noexcept override = default;
+      virtual ~option_explicit_set() CHAISCRIPT_NOEXCEPT {}
     };
 
-    class Dynamic_Object {
+    class Dynamic_Object
+    {
       public:
-      explicit Dynamic_Object(std::string t_type_name)
-          : m_type_name(std::move(t_type_name))
-          , m_option_explicit(false) {
+        Dynamic_Object(std::string t_type_name)
+          : m_type_name(std::move(t_type_name)), m_option_explicit(false)
+        {
         }
 
-      Dynamic_Object() = default;
+        Dynamic_Object() : m_type_name(""), m_option_explicit(false)
+        {
+        }
 
-      bool is_explicit() const noexcept { return m_option_explicit; }
+        bool is_explicit() const
+        {
+          return m_option_explicit;
+        }
 
-      void set_explicit(const bool t_explicit) noexcept { m_option_explicit = t_explicit; }
+        void set_explicit(const bool t_explicit)
+        {
+          m_option_explicit = t_explicit;
+        }
 
-      const std::string &get_type_name() const noexcept { return m_type_name; }
+        std::string get_type_name() const
+        {
+          return m_type_name;
+        }
 
-      const Boxed_Value &operator[](const std::string &t_attr_name) const { return get_attr(t_attr_name); }
+        const Boxed_Value &operator[](const std::string &t_attr_name) const
+        {
+          return get_attr(t_attr_name);
+        }
 
-      Boxed_Value &operator[](const std::string &t_attr_name) { return get_attr(t_attr_name); }
+        Boxed_Value &operator[](const std::string &t_attr_name)
+        {
+          return get_attr(t_attr_name);
+        }
 
-      const Boxed_Value &get_attr(const std::string &t_attr_name) const {
+        const Boxed_Value &get_attr(const std::string &t_attr_name) const
+        {
           auto a = m_attrs.find(t_attr_name);
 
           if (a != m_attrs.end()) {
@@ -64,11 +84,13 @@ namespace chaiscript {
           }
         }
 
-      bool has_attr(const std::string &t_attr_name) const { return m_attrs.find(t_attr_name) != m_attrs.end(); }
+        Boxed_Value &get_attr(const std::string &t_attr_name)
+        {
+          return m_attrs[t_attr_name];
+        }
 
-      Boxed_Value &get_attr(const std::string &t_attr_name) { return m_attrs[t_attr_name]; }
-
-      Boxed_Value &method_missing(const std::string &t_method_name) {
+        Boxed_Value &method_missing(const std::string &t_method_name)
+        {
           if (m_option_explicit && m_attrs.find(t_method_name) == m_attrs.end()) {
             throw option_explicit_set(t_method_name);
           }
@@ -76,7 +98,8 @@ namespace chaiscript {
           return get_attr(t_method_name);
         }
 
-      const Boxed_Value &method_missing(const std::string &t_method_name) const {
+        const Boxed_Value &method_missing(const std::string &t_method_name) const
+        {
           if (m_option_explicit && m_attrs.find(t_method_name) == m_attrs.end()) {
             throw option_explicit_set(t_method_name);
           }
@@ -84,15 +107,20 @@ namespace chaiscript {
           return get_attr(t_method_name);
         }
 
-      std::map<std::string, Boxed_Value> get_attrs() const { return m_attrs; }
+
+        std::map<std::string, Boxed_Value> get_attrs() const
+        {
+          return m_attrs;
+        }
 
       private:
-      const std::string m_type_name = "";
-      bool m_option_explicit = false;
+        std::string m_type_name;
+        bool m_option_explicit;
 
         std::map<std::string, Boxed_Value> m_attrs;
     };
 
-  } // namespace dispatch
-} // namespace chaiscript
+  }
+}
 #endif
+

include/chaiscript/dispatchkit/dynamic_object_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)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
 #ifndef CHAISCRIPT_DYNAMIC_OBJECT_DETAIL_HPP_
@@ -19,97 +19,125 @@
 #include "boxed_cast.hpp"
 #include "boxed_cast_helper.hpp"
 #include "boxed_value.hpp"
-#include "dynamic_object.hpp"
 #include "proxy_functions.hpp"
 #include "type_info.hpp"
+#include "dynamic_object.hpp"
 
 namespace chaiscript {
-  class Type_Conversions;
-  namespace dispatch {
-    class Proxy_Function_Base;
-  } // namespace dispatch
+class Type_Conversions;
+namespace dispatch {
+class Proxy_Function_Base;
+}  // namespace dispatch
 }  // namespace chaiscript
 
-namespace chaiscript {
-  namespace dispatch {
-    namespace detail {
+namespace chaiscript
+{
+  namespace dispatch
+  {
+    namespace detail
+    {
       /// A Proxy_Function implementation designed for calling a function
       /// that is automatically guarded based on the first param based on the
       /// param's type name
-      class Dynamic_Object_Function final : public Proxy_Function_Base {
+      class Dynamic_Object_Function : public Proxy_Function_Base
+      {
         public:
-        Dynamic_Object_Function(std::string t_type_name, const Proxy_Function &t_func, bool t_is_attribute = false)
-            : Proxy_Function_Base(t_func->get_param_types(), t_func->get_arity())
-            , m_type_name(std::move(t_type_name))
-            , m_func(t_func)
-            , m_doti(user_type<Dynamic_Object>())
-            , m_is_attribute(t_is_attribute) {
-          assert((t_func->get_arity() > 0 || t_func->get_arity() < 0)
+          Dynamic_Object_Function(
+              std::string t_type_name,
+              const Proxy_Function &t_func,
+              bool t_is_attribute = false)
+            : Proxy_Function_Base(t_func->get_param_types(), t_func->get_arity()),
+              m_type_name(std::move(t_type_name)), m_func(t_func), m_doti(user_type<Dynamic_Object>()),
+              m_is_attribute(t_is_attribute)
+          {
+            assert( (t_func->get_arity() > 0 || t_func->get_arity() < 0)
                 && "Programming error, Dynamic_Object_Function must have at least one parameter (this)");
           }
 
-        Dynamic_Object_Function(std::string t_type_name, const Proxy_Function &t_func, const Type_Info &t_ti, bool t_is_attribute = false)
-            : Proxy_Function_Base(build_param_types(t_func->get_param_types(), t_ti), t_func->get_arity())
-            , m_type_name(std::move(t_type_name))
-            , m_func(t_func)
-            , m_ti(t_ti.is_undef() ? nullptr : new Type_Info(t_ti))
-            , m_doti(user_type<Dynamic_Object>())
-            , m_is_attribute(t_is_attribute) {
-          assert((t_func->get_arity() > 0 || t_func->get_arity() < 0)
+          Dynamic_Object_Function(
+              std::string t_type_name,
+              const Proxy_Function &t_func,
+              const Type_Info &t_ti,
+              bool t_is_attribute = false)
+            : Proxy_Function_Base(build_param_types(t_func->get_param_types(), t_ti), t_func->get_arity()),
+              m_type_name(std::move(t_type_name)), m_func(t_func), m_ti(t_ti.is_undef()?nullptr:new Type_Info(t_ti)), m_doti(user_type<Dynamic_Object>()),
+              m_is_attribute(t_is_attribute)
+          {
+            assert( (t_func->get_arity() > 0 || t_func->get_arity() < 0)
                 && "Programming error, Dynamic_Object_Function must have at least one parameter (this)");
           }
 
+          virtual ~Dynamic_Object_Function() {}
+
           Dynamic_Object_Function &operator=(const Dynamic_Object_Function) = delete;
           Dynamic_Object_Function(Dynamic_Object_Function &) = delete;
 
-        bool operator==(const Proxy_Function_Base &f) const noexcept override {
-          if (const auto *df = dynamic_cast<const Dynamic_Object_Function *>(&f)) {
+          virtual bool operator==(const Proxy_Function_Base &f) const CHAISCRIPT_OVERRIDE
+          {
+            if (const auto *df = dynamic_cast<const Dynamic_Object_Function *>(&f))
+            {
               return df->m_type_name == m_type_name && (*df->m_func) == (*m_func);
             } else {
               return false;
             }
           }
 
-        bool is_attribute_function() const noexcept override { return m_is_attribute; }
+          virtual bool is_attribute_function() const CHAISCRIPT_OVERRIDE { return m_is_attribute; } 
 
-        bool call_match(const chaiscript::Function_Params &vals, const Type_Conversions_State &t_conversions) const noexcept override {
-          if (dynamic_object_typename_match(vals, m_type_name, m_ti, t_conversions)) {
+          virtual bool call_match(const std::vector<Boxed_Value> &vals, const Type_Conversions_State &t_conversions) const CHAISCRIPT_OVERRIDE
+          {
+            if (dynamic_object_typename_match(vals, m_type_name, m_ti, t_conversions))
+            {
               return m_func->call_match(vals, t_conversions);
             } else {
               return false;
             }
           }
 
-        std::vector<Const_Proxy_Function> get_contained_functions() const override { return {m_func}; }
+          virtual std::vector<Const_Proxy_Function> get_contained_functions() const CHAISCRIPT_OVERRIDE
+          {
+            return {m_func};
+          }
+
+          virtual std::string annotation() const CHAISCRIPT_OVERRIDE
+          {
+            return m_func->annotation();
+          }
+
 
         protected:
-        Boxed_Value do_call(const chaiscript::Function_Params &params, const Type_Conversions_State &t_conversions) const override {
-          if (dynamic_object_typename_match(params, m_type_name, m_ti, t_conversions)) {
+          virtual Boxed_Value do_call(const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions) const CHAISCRIPT_OVERRIDE
+          {
+            if (dynamic_object_typename_match(params, m_type_name, m_ti, t_conversions))
+            {
               return (*m_func)(params, t_conversions);
             } else {
               throw exception::guard_error();
             } 
           }
 
-        bool compare_first_type(const Boxed_Value &bv, const Type_Conversions_State &t_conversions) const noexcept override {
+          virtual bool compare_first_type(const Boxed_Value &bv, const Type_Conversions_State &t_conversions) const CHAISCRIPT_OVERRIDE
+          {
             return dynamic_object_typename_match(bv, m_type_name, m_ti, t_conversions);
           }
 
         private:
-        static std::vector<Type_Info> build_param_types(const std::vector<Type_Info> &t_inner_types, const Type_Info &t_objectti) {
+          static std::vector<Type_Info> build_param_types(
+              const std::vector<Type_Info> &t_inner_types, const Type_Info& t_objectti)
+          {
             std::vector<Type_Info> types(t_inner_types);
 
             assert(types.size() > 1);
-          // assert(types[1].bare_equal(user_type<Boxed_Value>()));
+            //assert(types[1].bare_equal(user_type<Boxed_Value>()));
             types[1] = t_objectti;
             return types;
           }
 
-        bool dynamic_object_typename_match(const Boxed_Value &bv,
-                                           const std::string &name,
-                                           const std::unique_ptr<Type_Info> &ti,
-                                           const Type_Conversions_State &t_conversions) const noexcept {
-          if (bv.get_type_info().bare_equal(m_doti)) {
+          bool dynamic_object_typename_match(const Boxed_Value &bv, const std::string &name,
+              const std::unique_ptr<Type_Info> &ti, const Type_Conversions_State &t_conversions) const
+          {
+            if (bv.get_type_info().bare_equal(m_doti))
+            {
               try {
                 const Dynamic_Object &d = boxed_cast<const Dynamic_Object &>(bv, &t_conversions);
                 return name == "Dynamic_Object" || d.get_type_name() == name;
@@ -117,19 +145,21 @@ namespace chaiscript {
                 return false;
               } 
             } else {
-            if (ti) {
+              if (ti)
+              {
                 return bv.get_type_info().bare_equal(*ti);
               } else {
                 return false;
               }
             }
+
           }
 
-        bool dynamic_object_typename_match(const chaiscript::Function_Params &bvs,
-                                           const std::string &name,
-                                           const std::unique_ptr<Type_Info> &ti,
-                                           const Type_Conversions_State &t_conversions) const noexcept {
-          if (!bvs.empty()) {
+          bool dynamic_object_typename_match(const std::vector<Boxed_Value> &bvs, const std::string &name,
+              const std::unique_ptr<Type_Info> &ti, const Type_Conversions_State &t_conversions) const
+          {
+            if (bvs.size() > 0)
+            {
               return dynamic_object_typename_match(bvs[0], name, ti, t_conversions);
             } else {
               return false;
@@ -140,64 +170,84 @@ namespace chaiscript {
           Proxy_Function m_func;
           std::unique_ptr<Type_Info> m_ti;
           const Type_Info m_doti;
-        const bool m_is_attribute;
+          bool m_is_attribute;
+
+
       };
 
+
       /**
        * A Proxy_Function implementation designed for creating a new
        * Dynamic_Object
        * that is automatically guarded based on the first param based on the
        * param's type name
        */
-      class Dynamic_Object_Constructor final : public Proxy_Function_Base {
+      class Dynamic_Object_Constructor : public Proxy_Function_Base
+      {
         public:
-        Dynamic_Object_Constructor(std::string t_type_name, const Proxy_Function &t_func)
-            : Proxy_Function_Base(build_type_list(t_func->get_param_types()), t_func->get_arity() - 1)
-            , m_type_name(std::move(t_type_name))
-            , m_func(t_func) {
-          assert((t_func->get_arity() > 0 || t_func->get_arity() < 0)
+          Dynamic_Object_Constructor(
+              std::string t_type_name,
+              const Proxy_Function &t_func)
+            : Proxy_Function_Base(build_type_list(t_func->get_param_types()), t_func->get_arity() - 1),
+              m_type_name(std::move(t_type_name)), m_func(t_func)
+          {
+            assert( (t_func->get_arity() > 0 || t_func->get_arity() < 0)
                 && "Programming error, Dynamic_Object_Function must have at least one parameter (this)");
           }
 
-        static std::vector<Type_Info> build_type_list(const std::vector<Type_Info> &tl) {
+          static std::vector<Type_Info> build_type_list(const std::vector<Type_Info> &tl)
+          {
             auto begin = tl.begin();
             auto end = tl.end();
 
-          if (begin != end) {
+            if (begin != end)
+            {
               ++begin;
             }
 
             return std::vector<Type_Info>(begin, end);
           }
 
-        bool operator==(const Proxy_Function_Base &f) const noexcept override {
-          const Dynamic_Object_Constructor *dc = dynamic_cast<const Dynamic_Object_Constructor *>(&f);
-          return (dc != nullptr) && dc->m_type_name == m_type_name && (*dc->m_func) == (*m_func);
+          virtual ~Dynamic_Object_Constructor() {}
+
+          virtual bool operator==(const Proxy_Function_Base &f) const CHAISCRIPT_OVERRIDE
+          {
+            const Dynamic_Object_Constructor *dc = dynamic_cast<const Dynamic_Object_Constructor*>(&f);
+            return dc && dc->m_type_name == m_type_name && (*dc->m_func) == (*m_func);
           }
 
-        bool call_match(const chaiscript::Function_Params &vals, const Type_Conversions_State &t_conversions) const override {
+          virtual bool call_match(const std::vector<Boxed_Value> &vals, const Type_Conversions_State &t_conversions) const CHAISCRIPT_OVERRIDE
+          {
             std::vector<Boxed_Value> new_vals{Boxed_Value(Dynamic_Object(m_type_name))};
             new_vals.insert(new_vals.end(), vals.begin(), vals.end());
 
-          return m_func->call_match(chaiscript::Function_Params{new_vals}, t_conversions);
+            return m_func->call_match(new_vals, t_conversions);
+          }    
+
+          virtual std::string annotation() const CHAISCRIPT_OVERRIDE
+          {
+            return m_func->annotation();
           }
 
         protected:
-        Boxed_Value do_call(const chaiscript::Function_Params &params, const Type_Conversions_State &t_conversions) const override {
+          virtual Boxed_Value do_call(const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions) const CHAISCRIPT_OVERRIDE
+          {
             auto bv = Boxed_Value(Dynamic_Object(m_type_name), true);
             std::vector<Boxed_Value> new_params{bv};
             new_params.insert(new_params.end(), params.begin(), params.end());
 
-          (*m_func)(chaiscript::Function_Params{new_params}, t_conversions);
+            (*m_func)(new_params, t_conversions);
 
             return bv;
           }
 
         private:
-        const std::string m_type_name;
-        const Proxy_Function m_func;
+          std::string m_type_name;
+          Proxy_Function m_func;
+
       };
-    } // namespace detail
-  } // namespace dispatch
-} // namespace chaiscript
+    }
+  }
+}
 #endif
+

include/chaiscript/dispatchkit/exception_specification.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_EXCEPTION_SPECIFICATION_HPP_
 #define CHAISCRIPT_EXCEPTION_SPECIFICATION_HPP_
 
@@ -16,28 +13,93 @@
 #include "boxed_cast.hpp"
 
 namespace chaiscript {
-  namespace detail {
-    struct Exception_Handler_Base {
+class Boxed_Value;
+namespace exception {
+class bad_boxed_cast;
+}  // namespace exception
+}  // namespace chaiscript
+
+namespace chaiscript
+{
+  namespace detail
+  {
+    /// \todo make this a variadic template
+    struct Exception_Handler_Base
+    {
       virtual void handle(const Boxed_Value &bv, const Dispatch_Engine &t_engine) = 0;
 
-      virtual ~Exception_Handler_Base() = default;
+      virtual ~Exception_Handler_Base() {}
 
       protected:
         template<typename T>
-      static void throw_type(const Boxed_Value &bv, const Dispatch_Engine &t_engine) {
-        try {
-          T t = t_engine.boxed_cast<T>(bv);
-          throw t;
-        } catch (const chaiscript::exception::bad_boxed_cast &) {
-        }
+        static void throw_type(const Boxed_Value &bv, const Dispatch_Engine &t_engine)
+        {
+          try { T t = t_engine.boxed_cast<T>(bv); throw t; } catch (const chaiscript::exception::bad_boxed_cast &) {}
         }
     };
 
-    template<typename... T>
-    struct Exception_Handler_Impl : Exception_Handler_Base {
-      void handle(const Boxed_Value &bv, const Dispatch_Engine &t_engine) override { (throw_type<T>(bv, t_engine), ...); }
+    template<typename T1>
+      struct Exception_Handler_Impl1 : Exception_Handler_Base
+      {
+        virtual ~Exception_Handler_Impl1() {}
+
+        virtual void handle(const Boxed_Value &bv, const Dispatch_Engine &t_engine) CHAISCRIPT_OVERRIDE
+        {
+          throw_type<T1>(bv, t_engine);
+        }
       };
-  } // namespace detail
+    template<typename T1, typename T2>
+      struct Exception_Handler_Impl2 : Exception_Handler_Base
+      {
+        virtual ~Exception_Handler_Impl2() {}
+
+        virtual void handle(const Boxed_Value &bv, const Dispatch_Engine &t_engine) CHAISCRIPT_OVERRIDE
+        {
+          throw_type<T1>(bv, t_engine);
+          throw_type<T2>(bv, t_engine);
+        }
+      };
+
+    template<typename T1, typename T2, typename T3>
+      struct Exception_Handler_Impl3 : Exception_Handler_Base
+      {
+        virtual ~Exception_Handler_Impl3() {}
+
+        virtual void handle(const Boxed_Value &bv, const Dispatch_Engine &t_engine) CHAISCRIPT_OVERRIDE
+        {
+          throw_type<T1>(bv, t_engine);
+          throw_type<T2>(bv, t_engine);
+          throw_type<T3>(bv, t_engine);
+        }
+      };
+    template<typename T1, typename T2, typename T3, typename T4>
+      struct Exception_Handler_Impl4 : Exception_Handler_Base
+      {
+        virtual ~Exception_Handler_Impl4() {}
+
+        virtual void handle(const Boxed_Value &bv, const Dispatch_Engine &t_engine) CHAISCRIPT_OVERRIDE
+        {
+          throw_type<T1>(bv, t_engine);
+          throw_type<T2>(bv, t_engine);
+          throw_type<T3>(bv, t_engine);
+          throw_type<T4>(bv, t_engine);
+        }
+      };
+    template<typename T1, typename T2, typename T3, typename T4, typename T5>
+      struct Exception_Handler_Impl5 : Exception_Handler_Base
+      {
+        virtual ~Exception_Handler_Impl5() {}
+
+        virtual void handle(const Boxed_Value &bv, const Dispatch_Engine &t_engine) CHAISCRIPT_OVERRIDE
+        {
+          throw_type<T1>(bv, t_engine);
+          throw_type<T2>(bv, t_engine);
+          throw_type<T3>(bv, t_engine);
+          throw_type<T4>(bv, t_engine);
+          throw_type<T5>(bv, t_engine);
+        }
+      };
+  }
 
   /// \brief Used in the automatic unboxing of exceptions thrown during script evaluation
   ///
@@ -49,8 +111,7 @@ namespace chaiscript {
   /// chaiscript::ChaiScript chai;
   ///
   /// try {
-  ///   chai.eval("throw(runtime_error(\"error\"))", chaiscript::exception_specification<int, double, float, const std::string &, const
-  ///   std::exception &>());
+  ///   chai.eval("throw(runtime_error(\"error\"))", chaiscript::exception_specification<int, double, float, const std::string &, const std::exception &>());
   /// } catch (const double e) {
   /// } catch (int) {
   /// } catch (float) {
@@ -90,14 +151,49 @@ namespace chaiscript {
   ///
   /// \sa chaiscript::exception_specification for creation of chaiscript::Exception_Handler objects
   /// \sa \ref exceptions
-  using Exception_Handler = std::shared_ptr<detail::Exception_Handler_Base>;
+  typedef std::shared_ptr<detail::Exception_Handler_Base> Exception_Handler;
 
   /// \brief creates a chaiscript::Exception_Handler which handles one type of exception unboxing
   /// \sa \ref exceptions
-  template<typename... T>
-  Exception_Handler exception_specification() {
-    return std::make_shared<detail::Exception_Handler_Impl<T...>>();
+  template<typename T1>
+  Exception_Handler exception_specification()
+  {
+    return Exception_Handler(new detail::Exception_Handler_Impl1<T1>());
   }
-} // namespace chaiscript
+
+  /// \brief creates a chaiscript::Exception_Handler which handles two types of exception unboxing
+  /// \sa \ref exceptions
+  template<typename T1, typename T2>
+  Exception_Handler exception_specification()
+  {
+    return Exception_Handler(new detail::Exception_Handler_Impl2<T1, T2>());
+  }
+
+  /// \brief creates a chaiscript::Exception_Handler which handles three types of exception unboxing
+  /// \sa \ref exceptions
+  template<typename T1, typename T2, typename T3>
+  Exception_Handler exception_specification()
+  {
+    return Exception_Handler(new detail::Exception_Handler_Impl3<T1, T2, T3>());
+  }
+
+  /// \brief creates a chaiscript::Exception_Handler which handles four types of exception unboxing
+  /// \sa \ref exceptions
+  template<typename T1, typename T2, typename T3, typename T4>
+  Exception_Handler exception_specification()
+  {
+    return Exception_Handler(new detail::Exception_Handler_Impl4<T1, T2, T3, T4>());
+  }
+
+  /// \brief creates a chaiscript::Exception_Handler which handles five types of exception unboxing
+  /// \sa \ref exceptions
+  template<typename T1, typename T2, typename T3, typename T4, typename T5>
+  Exception_Handler exception_specification()
+  {
+    return Exception_Handler(new detail::Exception_Handler_Impl5<T1, T2, T3, T4, T5>());
+  }
+}
+
 
 #endif
+

include/chaiscript/dispatchkit/function_call.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_FUNCTION_CALL_HPP_
 #define CHAISCRIPT_FUNCTION_CALL_HPP_
 
@@ -17,25 +14,20 @@
 #include "boxed_cast.hpp"
 #include "function_call_detail.hpp"
 #include "proxy_functions.hpp"
+#include "callable_traits.hpp"
 
 namespace chaiscript {
-  class Boxed_Value;
-  class Type_Conversions_State;
-  namespace detail {
-    template<typename T>
-    struct Cast_Helper;
-  } // namespace detail
+class Boxed_Value;
+class Type_Conversions_State;
+namespace detail {
+template <typename T> struct Cast_Helper;
+}  // namespace detail
 }  // namespace chaiscript
 
-namespace chaiscript {
-  namespace dispatch {
-    namespace detail {
-      template<typename Ret, typename... Param>
-      constexpr auto arity(Ret (*)(Param...)) noexcept {
-        return sizeof...(Param);
-      }
-    } // namespace detail
-
+namespace chaiscript
+{
+  namespace dispatch
+  {
     /// Build a function caller that knows how to dispatch on a set of functions
     /// example:
     /// std::function<void (int)> f =
@@ -43,16 +35,19 @@ namespace chaiscript {
     /// \returns A std::function object for dispatching
     /// \param[in] funcs the set of functions to dispatch on.
     template<typename FunctionType>
-    std::function<FunctionType> functor(const std::vector<Const_Proxy_Function> &funcs, const Type_Conversions_State *t_conversions) {
-      const bool has_arity_match = std::any_of(funcs.begin(), funcs.end(), [](const Const_Proxy_Function &f) {
-        return f->get_arity() == -1 || size_t(f->get_arity()) == detail::arity(static_cast<FunctionType *>(nullptr));
+      std::function<FunctionType>
+      functor(const std::vector<Const_Proxy_Function> &funcs, const Type_Conversions_State *t_conversions)
+      {
+        const bool has_arity_match = std::any_of(funcs.begin(), funcs.end(),
+            [](const Const_Proxy_Function &f) {
+              return f->get_arity() == -1 || size_t(f->get_arity()) == chaiscript::dispatch::detail::Arity<FunctionType>::arity;
             });
 
         if (!has_arity_match) {
           throw exception::bad_boxed_cast(user_type<Const_Proxy_Function>(), typeid(std::function<FunctionType>));
         }
 
-      FunctionType *p = nullptr;
+        FunctionType *p=nullptr;
         return detail::build_function_caller_helper(p, funcs, t_conversions);
       }
 
@@ -68,24 +63,33 @@ namespace chaiscript {
     /// \returns A std::function object for dispatching
     /// \param[in] func A function to execute.
     template<typename FunctionType>
-    std::function<FunctionType> functor(Const_Proxy_Function func, const Type_Conversions_State *t_conversions) {
+      std::function<FunctionType>
+      functor(Const_Proxy_Function func, const Type_Conversions_State *t_conversions)
+      {
         return functor<FunctionType>(std::vector<Const_Proxy_Function>({std::move(func)}), t_conversions);
       }
 
     /// Helper for automatically unboxing a Boxed_Value that contains a function object
     /// and creating a typesafe C++ function caller from it.
     template<typename FunctionType>
-    std::function<FunctionType> functor(const Boxed_Value &bv, const Type_Conversions_State *t_conversions) {
-      return functor<FunctionType>(boxed_cast<Const_Proxy_Function>(bv, t_conversions), t_conversions);
+      std::function<FunctionType>
+      functor(const Boxed_Value &bv, const Type_Conversions_State *t_conversions)
+      {
+        return functor<FunctionType>(boxed_cast<Const_Proxy_Function >(bv, t_conversions), t_conversions);
+      }
   }
-  } // namespace dispatch
 
-  namespace detail {
+  namespace detail{
     /// Cast helper to handle automatic casting to const std::function &
     template<typename Signature>
-    struct Cast_Helper<const std::function<Signature> &> {
-      static std::function<Signature> cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions) {
-        if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>())) {
+      struct Cast_Helper<const std::function<Signature> &>
+      {
+        typedef std::function<Signature> Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions)
+        {
+          if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
+          {
             return dispatch::functor<Signature>(ob, t_conversions);
           } else {
             return Cast_Helper_Inner<const std::function<Signature> &>::cast(ob, t_conversions);
@@ -95,28 +99,39 @@ namespace chaiscript {
 
     /// Cast helper to handle automatic casting to std::function
     template<typename Signature>
-    struct Cast_Helper<std::function<Signature>> {
-      static std::function<Signature> cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions) {
-        if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>())) {
+      struct Cast_Helper<std::function<Signature> >
+      {
+        typedef std::function<Signature> Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions)
+        {
+          if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
+          {
             return dispatch::functor<Signature>(ob, t_conversions);
           } else {
-          return Cast_Helper_Inner<std::function<Signature>>::cast(ob, t_conversions);
+            return Cast_Helper_Inner<std::function<Signature> >::cast(ob, t_conversions);
           }
         }
       };
 
     /// Cast helper to handle automatic casting to const std::function
     template<typename Signature>
-    struct Cast_Helper<const std::function<Signature>> {
-      static std::function<Signature> cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions) {
-        if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>())) {
+      struct Cast_Helper<const std::function<Signature> >
+      {
+        typedef std::function<Signature> Result_Type;
+
+        static Result_Type cast(const Boxed_Value &ob, const Type_Conversions_State *t_conversions)
+        {
+          if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
+          {
             return dispatch::functor<Signature>(ob, t_conversions);
           } else {
-          return Cast_Helper_Inner<const std::function<Signature>>::cast(ob, t_conversions);
+            return Cast_Helper_Inner<const std::function<Signature> >::cast(ob, t_conversions);
           }
         }
       };
-  } // namespace detail
-} // namespace chaiscript
+  }
+}
 
 #endif
+

include/chaiscript/dispatchkit/function_call_detail.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_FUNCTION_CALL_DETAIL_HPP_
 #define CHAISCRIPT_FUNCTION_CALL_DETAIL_HPP_
 
@@ -19,61 +16,131 @@
 #include "boxed_cast.hpp"
 #include "boxed_number.hpp"
 #include "boxed_value.hpp"
-#include "proxy_functions.hpp"
 #include "type_conversions.hpp"
+#include "proxy_functions.hpp"
 
-namespace chaiscript::dispatch::detail {
-  /// used internally for unwrapping a function call's types
-  template<typename Ret, typename... Param>
-  struct Build_Function_Caller_Helper {
-    Build_Function_Caller_Helper(std::vector<Const_Proxy_Function> t_funcs, const Type_Conversions *t_conversions)
-        : m_funcs(std::move(t_funcs))
-        , m_conversions(t_conversions) {
-    }
-
-    Ret call(const chaiscript::Function_Params &params, const Type_Conversions_State &t_state) {
-      if constexpr (std::is_arithmetic_v<Ret> && !std::is_same_v<std::remove_cv_t<std::remove_reference_t<Ret>>, bool>) {
-        return Boxed_Number(dispatch::dispatch(m_funcs, params, t_state)).get_as<Ret>();
-      } else if constexpr (std::is_same_v<void, Ret>) {
-        dispatch::dispatch(m_funcs, params, t_state);
-      } else {
-        return boxed_cast<Ret>(dispatch::dispatch(m_funcs, params, t_state), &t_state);
-      }
-    }
-
-    template<typename... P>
-    Ret operator()(P &&...param) {
-      std::array<Boxed_Value, sizeof...(P)> params{box<P>(std::forward<P>(param))...};
-
-      if (m_conversions) {
-        Type_Conversions_State state(*m_conversions, m_conversions->conversion_saves());
-        return call(chaiscript::Function_Params{params}, state);
+namespace chaiscript
+{
+  namespace dispatch
+  {
+    namespace detail
+    {
+      /// Internal helper class for handling the return
+      /// value of a build_function_caller
+      template<typename Ret, bool is_arithmetic>
+        struct Function_Caller_Ret
+        {
+          static Ret call(const std::vector<Const_Proxy_Function> &t_funcs, 
+              const std::vector<Boxed_Value> &params, const Type_Conversions_State *t_conversions)
+          {
+            if (t_conversions) {
+              return boxed_cast<Ret>(dispatch::dispatch(t_funcs, params, *t_conversions), t_conversions);
             } else {
               Type_Conversions conv;
               Type_Conversions_State state(conv, conv.conversion_saves());
-        return call(chaiscript::Function_Params{params}, state);
+              return boxed_cast<Ret>(dispatch::dispatch(t_funcs, params, state), t_conversions);
             }
           }
+        };
+
+      /**
+       * Specialization for arithmetic return types
+       */
+      template<typename Ret>
+        struct Function_Caller_Ret<Ret, true>
+        {
+          static Ret call(const std::vector<Const_Proxy_Function> &t_funcs, 
+              const std::vector<Boxed_Value> &params, const Type_Conversions_State *t_conversions)
+          {
+            if (t_conversions) {
+              return Boxed_Number(dispatch::dispatch(t_funcs, params, *t_conversions)).get_as<Ret>();
+            } else {
+              Type_Conversions conv;
+              Type_Conversions_State state(conv, conv.conversion_saves());
+              return Boxed_Number(dispatch::dispatch(t_funcs, params, state)).get_as<Ret>();
+            }
+          }
+        };
+
+
+      /**
+       * Specialization for void return types
+       */
+      template<>
+        struct Function_Caller_Ret<void, false>
+        {
+          static void call(const std::vector<Const_Proxy_Function> &t_funcs, 
+              const std::vector<Boxed_Value> &params, const Type_Conversions_State *t_conversions)
+          {
+            if (t_conversions) {
+              dispatch::dispatch(t_funcs, params, *t_conversions);
+            } else {
+              Type_Conversions conv;
+              Type_Conversions_State state(conv, conv.conversion_saves());
+              dispatch::dispatch(t_funcs, params, state);
+            }
+          }
+        };
+
+      /**
+       * used internally for unwrapping a function call's types
+       */
+      template<typename Ret, typename ... Param>
+        struct Build_Function_Caller_Helper
+        {
+          Build_Function_Caller_Helper(std::vector<Const_Proxy_Function> t_funcs, const Type_Conversions *t_conversions)
+            : m_funcs(std::move(t_funcs)),
+              m_conversions(t_conversions)
+          {
+          }
+
+          template<typename ... P>
+          Ret operator()(P&&  ...  param)
+          {
+            if (m_conversions) {
+              Type_Conversions_State state(*m_conversions, m_conversions->conversion_saves());
+              return Function_Caller_Ret<Ret, std::is_arithmetic<Ret>::value && !std::is_same<Ret, bool>::value>::call(m_funcs, { 
+                  box<P>(std::forward<P>(param))...
+                  }, &state
+                  );
+            } else {
+              return Function_Caller_Ret<Ret, std::is_arithmetic<Ret>::value && !std::is_same<Ret, bool>::value>::call(m_funcs, { 
+                  box<P>(std::forward<P>(param))...
+                  }, nullptr
+                  );
+            }
+
+          }
 
           template<typename P, typename Q>
-    static Boxed_Value box(Q &&q) {
-      if constexpr (std::is_same_v<chaiscript::Boxed_Value, std::decay_t<Q>>) {
-        return std::forward<Q>(q);
-      } else if constexpr (std::is_reference_v<P>) {
+          static auto box(Q&& q) -> typename std::enable_if<std::is_reference<P>::value&&!std::is_same<chaiscript::Boxed_Value, typename std::remove_const<typename std::remove_reference<P>::type>::type>::value, Boxed_Value>::type
+          {
             return Boxed_Value(std::ref(std::forward<Q>(q)));
-      } else {
+          }
+
+          template<typename P, typename Q>
+          static auto box(Q&& q) -> typename std::enable_if<!std::is_reference<P>::value&&!std::is_same<chaiscript::Boxed_Value, typename std::remove_const<typename std::remove_reference<P>::type>::type>::value, Boxed_Value>::type
+          {
             return Boxed_Value(std::forward<Q>(q));
           }
+
+          template<typename P>
+          static Boxed_Value box(Boxed_Value bv)
+          {
+            return bv;
           }
 
+
           std::vector<Const_Proxy_Function> m_funcs;
           const Type_Conversions *m_conversions;
         };
 
+
+
       /// \todo what happens if t_conversions is deleted out from under us?!
-  template<typename Ret, typename... Params>
-  std::function<Ret(Params...)>
-  build_function_caller_helper(Ret(Params...), const std::vector<Const_Proxy_Function> &funcs, const Type_Conversions_State *t_conversions) {
+      template<typename Ret, typename ... Params>
+        std::function<Ret (Params...)> build_function_caller_helper(Ret (Params...), const std::vector<Const_Proxy_Function> &funcs, const Type_Conversions_State *t_conversions)
+        {
           /*
           if (funcs.size() == 1)
           {
@@ -88,10 +155,13 @@ namespace chaiscript::dispatch::detail {
             // looks like this either wasn't a Proxy_Function_Impl or the types didn't match
             // we cannot make any other guesses or assumptions really, so continuing
           }
-  */
+*/
 
-    return std::function<Ret(Params...)>(Build_Function_Caller_Helper<Ret, Params...>(funcs, t_conversions ? t_conversions->get() : nullptr));
+          return std::function<Ret (Params...)>(Build_Function_Caller_Helper<Ret, Params...>(funcs, t_conversions?t_conversions->get():nullptr));
         }
-} // namespace chaiscript::dispatch::detail
+    }
+  }
+}
 
 #endif
+

include/chaiscript/dispatchkit/function_params.hpp

@@ -1,67 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-#ifndef CHAISCRIPT_FUNCTION_PARAMS_HPP
-#define CHAISCRIPT_FUNCTION_PARAMS_HPP
-
-#include "boxed_value.hpp"
-
-namespace chaiscript {
-  class Function_Params {
-  public:
-    constexpr Function_Params(const Boxed_Value *const t_begin, const Boxed_Value *const t_end)
-        : m_begin(t_begin)
-        , m_end(t_end) {
-    }
-
-    explicit Function_Params(const Boxed_Value &bv)
-        : m_begin(&bv)
-        , m_end(m_begin + 1) {
-    }
-
-    explicit Function_Params(const std::vector<Boxed_Value> &vec)
-        : m_begin(vec.empty() ? nullptr : &vec.front())
-        , m_end(vec.empty() ? nullptr : &vec.front() + vec.size()) {
-    }
-
-    template<size_t Size>
-    constexpr explicit Function_Params(const std::array<Boxed_Value, Size> &a)
-        : m_begin(&a.front())
-        , m_end(&a.front() + Size) {
-    }
-
-    [[nodiscard]] constexpr const Boxed_Value &operator[](const std::size_t t_i) const noexcept { return m_begin[t_i]; }
-
-    [[nodiscard]] constexpr const Boxed_Value *begin() const noexcept { return m_begin; }
-
-    [[nodiscard]] constexpr const Boxed_Value &front() const noexcept { return *m_begin; }
-
-    [[nodiscard]] constexpr const Boxed_Value *end() const noexcept { return m_end; }
-
-    [[nodiscard]] constexpr std::size_t size() const noexcept { return std::size_t(m_end - m_begin); }
-
-    [[nodiscard]] std::vector<Boxed_Value> to_vector() const { return std::vector<Boxed_Value>{m_begin, m_end}; }
-
-    [[nodiscard]] constexpr bool empty() const noexcept { return m_begin == m_end; }
-
-  private:
-    const Boxed_Value *m_begin = nullptr;
-    const Boxed_Value *m_end = nullptr;
-  };
-
-  // Constructor specialization for array of size 0
-  template<>
-  constexpr Function_Params::Function_Params(const std::array<Boxed_Value, size_t{0}> & /* a */)
-      : m_begin(nullptr)
-      , m_end(nullptr) {
-  }
-
-} // namespace chaiscript
-
-#endif

include/chaiscript/dispatchkit/function_signature.hpp

@@ -1,149 +0,0 @@
-#ifndef CHAISCRIPT_FUNCTION_SIGNATURE_HPP
-#define CHAISCRIPT_FUNCTION_SIGNATURE_HPP
-
-#include <type_traits>
-
-namespace chaiscript::dispatch::detail {
-  template<typename... Param>
-  struct Function_Params {
-  };
-
-  template<typename Ret, typename Params, bool IsNoExcept = false, bool IsMember = false, bool IsMemberObject = false, bool IsObject = false>
-  struct Function_Signature {
-    using Param_Types = Params;
-    using Return_Type = Ret;
-    constexpr static const bool is_object = IsObject;
-    constexpr static const bool is_member_object = IsMemberObject;
-    constexpr static const bool is_noexcept = IsNoExcept;
-    template<typename T>
-    constexpr Function_Signature(T &&) noexcept {
-    }
-    constexpr Function_Signature() noexcept = default;
-  };
-
-  // Free functions
-
-  template<typename Ret, typename... Param>
-  Function_Signature(Ret (*f)(Param...)) -> Function_Signature<Ret, Function_Params<Param...>>;
-
-  template<typename Ret, typename... Param>
-  Function_Signature(Ret (*f)(Param...) noexcept) -> Function_Signature<Ret, Function_Params<Param...>, true>;
-
-  // no reference specifier
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile) -> Function_Signature<Ret, Function_Params<volatile Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile noexcept)
-      -> Function_Signature<Ret, Function_Params<volatile Class &, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile const)
-      -> Function_Signature<Ret, Function_Params<volatile const Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile const noexcept)
-      -> Function_Signature<Ret, Function_Params<volatile const Class &, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...)) -> Function_Signature<Ret, Function_Params<Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) noexcept) -> Function_Signature<Ret, Function_Params<Class &, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) const) -> Function_Signature<Ret, Function_Params<const Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) const noexcept) -> Function_Signature<Ret, Function_Params<const Class &, Param...>, true, true>;
-
-  // & reference specifier
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile &) -> Function_Signature<Ret, Function_Params<volatile Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile &noexcept)
-      -> Function_Signature<Ret, Function_Params<volatile Class &, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile const &)
-      -> Function_Signature<Ret, Function_Params<volatile const Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile const &noexcept)
-      -> Function_Signature<Ret, Function_Params<volatile const Class &, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) &) -> Function_Signature<Ret, Function_Params<Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) &noexcept) -> Function_Signature<Ret, Function_Params<Class &, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) const &) -> Function_Signature<Ret, Function_Params<const Class &, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) const &noexcept) -> Function_Signature<Ret, Function_Params<const Class &, Param...>, true, true>;
-
-  // && reference specifier
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile &&) -> Function_Signature<Ret, Function_Params<volatile Class &&, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile &&noexcept)
-      -> Function_Signature<Ret, Function_Params<volatile Class &&, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile const &&)
-      -> Function_Signature<Ret, Function_Params<volatile const Class &&, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) volatile const &&noexcept)
-      -> Function_Signature<Ret, Function_Params<volatile const Class &&, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) &&) -> Function_Signature<Ret, Function_Params<Class &&, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) &&noexcept) -> Function_Signature<Ret, Function_Params<Class &&, Param...>, true, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) const &&) -> Function_Signature<Ret, Function_Params<const Class &&, Param...>, false, true>;
-
-  template<typename Ret, typename Class, typename... Param>
-  Function_Signature(Ret (Class::*f)(Param...) const &&noexcept)
-      -> Function_Signature<Ret, Function_Params<const Class &&, Param...>, true, true>;
-
-  template<typename Ret, typename Class>
-  Function_Signature(Ret Class::*f) -> Function_Signature<Ret, Function_Params<Class &>, true, true, true>;
-
-  // primary template handles types that have no nested ::type member:
-  template<class, class = std::void_t<>>
-  struct has_call_operator : std::false_type {
-  };
-
-  // specialization recognizes types that do have a nested ::type member:
-  template<class T>
-  struct has_call_operator<T, std::void_t<decltype(&T::operator())>> : std::true_type {
-  };
-
-  template<typename Func>
-  auto function_signature(const Func &f) {
-    if constexpr (has_call_operator<Func>::value) {
-      return Function_Signature<typename decltype(Function_Signature{&std::decay_t<Func>::operator()})::Return_Type,
-                                typename decltype(Function_Signature{&std::decay_t<Func>::operator()})::Param_Types,
-                                decltype(Function_Signature{&std::decay_t<Func>::operator()})::is_noexcept,
-                                false,
-                                false,
-                                true>{};
-    } else {
-      return Function_Signature{f};
-    }
-  }
-
-} // namespace chaiscript::dispatch::detail
-
-#endif

include/chaiscript/dispatchkit/handle_return.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_HANDLE_RETURN_HPP_
 #define CHAISCRIPT_HANDLE_RETURN_HPP_
 
@@ -18,178 +15,282 @@
 #include "boxed_value.hpp"
 
 namespace chaiscript {
-  class Boxed_Number;
+class Boxed_Number;
 }  // namespace chaiscript
 
-namespace chaiscript {
-  namespace dispatch {
-    template<class T, class U>
-    class Proxy_Function_Callable_Impl;
-    template<class T>
-    class Assignable_Proxy_Function_Impl;
+namespace chaiscript
+{
+  namespace dispatch
+  {
+    template<class T, class U> class Proxy_Function_Callable_Impl;
+    template<class T> class Assignable_Proxy_Function_Impl;
 
-    namespace detail {
-      /// Used internally for handling a return value from a Proxy_Function call
+    namespace detail
+    {
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
       template<typename Ret>
-      struct Handle_Return {
-        template<typename T, typename = typename std::enable_if_t<std::is_trivial_v<typename std::decay_t<T>>>>
-        static Boxed_Value handle(T r) {
+        struct Handle_Return
+        {
+          template<typename T,
+                   typename = typename std::enable_if<std::is_pod<typename std::decay<T>::type>::value>::type>
+          static Boxed_Value handle(T r)
+          {
             return Boxed_Value(std::move(r), true);
           }
 
-        template<typename T, typename = typename std::enable_if_t<!(std::is_trivial_v<typename std::decay_t<T>>)>>
-        static Boxed_Value handle(T &&r) {
+          template<typename T,
+                   typename = typename std::enable_if<!std::is_pod<typename std::decay<T>::type>::value>::type>
+          static Boxed_Value handle(T &&r)
+          {
             return Boxed_Value(std::make_shared<T>(std::forward<T>(r)), true);
           }
         };
 
       template<typename Ret>
-      struct Handle_Return<const std::function<Ret> &> {
+        struct Handle_Return<const std::function<Ret> &>
+        {
           static Boxed_Value handle(const std::function<Ret> &f) {
             return Boxed_Value(
-              chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret, std::function<Ret>>>(f));
+                chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret, std::function<Ret>>>(f)
+              );
           }
         };
 
       template<typename Ret>
-      struct Handle_Return<std::function<Ret>> : Handle_Return<const std::function<Ret> &> {
+        struct Handle_Return<std::function<Ret>>
+        {
+          static Boxed_Value handle(const std::function<Ret> &f) {
+            return Boxed_Value(
+                chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret, std::function<Ret>>>(f)
+              );
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<const std::shared_ptr<std::function<Ret>>> {
+        struct Handle_Return<const std::shared_ptr<std::function<Ret>>>
+        {
           static Boxed_Value handle(const std::shared_ptr<std::function<Ret>> &f) {
             return Boxed_Value(
-              chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function_Impl<Ret>>(std::ref(*f), f));
+                chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function_Impl<Ret>>(std::ref(*f),f)
+                );
           }
         };
 
       template<typename Ret>
-      struct Handle_Return<const std::shared_ptr<std::function<Ret>> &> : Handle_Return<const std::shared_ptr<std::function<Ret>>> {
+        struct Handle_Return<const std::shared_ptr<std::function<Ret>> &>
+        {
+          static Boxed_Value handle(const std::shared_ptr<std::function<Ret>> &f) {
+            return Boxed_Value(
+                chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function_Impl<Ret>>(std::ref(*f),f)
+              );
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<std::shared_ptr<std::function<Ret>>> : Handle_Return<const std::shared_ptr<std::function<Ret>>> {
+        struct Handle_Return<std::shared_ptr<std::function<Ret>>>
+        {
+          static Boxed_Value handle(const std::shared_ptr<std::function<Ret>> &f) {
+            return Boxed_Value(
+                chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function_Impl<Ret>>(std::ref(*f),f)
+              );
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<std::function<Ret> &> {
+        struct Handle_Return<std::function<Ret> &>
+        {
           static Boxed_Value handle(std::function<Ret> &f) {
-          return Boxed_Value(chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function_Impl<Ret>>(
-              std::ref(f), std::shared_ptr<std::function<Ret>>()));
+            return Boxed_Value(
+                chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Assignable_Proxy_Function_Impl<Ret>>(std::ref(f),
+                  std::shared_ptr<std::function<Ret>>())
+              );
           }
 
           static Boxed_Value handle(const std::function<Ret> &f) {
             return Boxed_Value(
-              chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret, std::function<Ret>>>(f));
+                chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret, std::function<Ret>>>(f)
+              );
           }
         };
 
       template<typename Ret>
-      struct Handle_Return<Ret *&> {
-        static Boxed_Value handle(Ret *p) { return Boxed_Value(p, true); }
+        struct Handle_Return<Ret *&>
+        {
+          static Boxed_Value handle(Ret *p)
+          {
+            return Boxed_Value(p, true);
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<const Ret *&> {
-        static Boxed_Value handle(const Ret *p) { return Boxed_Value(p, true); }
+        struct Handle_Return<const Ret *&>
+        {
+          static Boxed_Value handle(const Ret *p)
+          {
+            return Boxed_Value(p, true);
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<Ret *> {
-        static Boxed_Value handle(Ret *p) { return Boxed_Value(p, true); }
+        struct Handle_Return<Ret *>
+        {
+          static Boxed_Value handle(Ret *p)
+          {
+            return Boxed_Value(p, true);
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<const Ret *> {
-        static Boxed_Value handle(const Ret *p) { return Boxed_Value(p, true); }
+        struct Handle_Return<const Ret *>
+        {
+          static Boxed_Value handle(const Ret *p)
+          {
+            return Boxed_Value(p, true);
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<std::shared_ptr<Ret> &> {
-        static Boxed_Value handle(const std::shared_ptr<Ret> &r) { return Boxed_Value(r, true); }
+        struct Handle_Return<std::shared_ptr<Ret> &>
+        {
+          static Boxed_Value handle(const std::shared_ptr<Ret> &r)
+          {
+            return Boxed_Value(r, true);
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<std::shared_ptr<Ret>> : Handle_Return<std::shared_ptr<Ret> &> {
+        struct Handle_Return<std::shared_ptr<Ret> >
+        {
+          static Boxed_Value handle(const std::shared_ptr<Ret> &r)
+          {
+            return Boxed_Value(r, true);
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<const std::shared_ptr<Ret> &> : Handle_Return<std::shared_ptr<Ret> &> {
+        struct Handle_Return<const std::shared_ptr<Ret> &>
+        {
+          static Boxed_Value handle(const std::shared_ptr<Ret> &r)
+          {
+            return Boxed_Value(r, true);
+          }
         };
 
       template<typename Ret>
-      struct Handle_Return<std::unique_ptr<Ret>> : Handle_Return<std::unique_ptr<Ret> &> {
-        static Boxed_Value handle(std::unique_ptr<Ret> &&r) { return Boxed_Value(std::move(r), true); }
-      };
-
-      template<typename Ret, bool Ptr>
-      struct Handle_Return_Ref {
-        template<typename T>
-        static Boxed_Value handle(T &&r) {
+        struct Handle_Return<const Ret &>
+        {
+          static Boxed_Value handle(const Ret &r)
+          {
             return Boxed_Value(std::cref(r), true);
           }
         };
 
+
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
       template<typename Ret>
-      struct Handle_Return_Ref<Ret, true> {
-        template<typename T>
-        static Boxed_Value handle(T &&r) {
-          return Boxed_Value(typename std::remove_reference<decltype(r)>::type{r}, true);
+        struct Handle_Return<Ret &>
+        {
+          static Boxed_Value handle(Ret &r)
+          {
+            return Boxed_Value(std::ref(r));
+          }
+
+          static Boxed_Value handle(const Ret &r)
+          {
+            return Boxed_Value(std::cref(r));
           }
         };
 
-      template<typename Ret>
-      struct Handle_Return<const Ret &> : Handle_Return_Ref<const Ret &, std::is_pointer<typename std::remove_reference<const Ret &>::type>::value> {
-      };
-
-      template<typename Ret>
-      struct Handle_Return<const Ret> {
-        static Boxed_Value handle(Ret r) { return Boxed_Value(std::move(r)); }
-      };
-
-      template<typename Ret>
-      struct Handle_Return<Ret &> {
-        static Boxed_Value handle(Ret &r) { return Boxed_Value(std::ref(r)); }
-      };
-
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
       template<>
-      struct Handle_Return<Boxed_Value> {
-        static Boxed_Value handle(const Boxed_Value &r) noexcept { return r; }
-      };
-
-      template<>
-      struct Handle_Return<const Boxed_Value> : Handle_Return<Boxed_Value> {
-      };
-
-      template<>
-      struct Handle_Return<Boxed_Value &> : Handle_Return<Boxed_Value> {
-      };
-
-      template<>
-      struct Handle_Return<const Boxed_Value &> : Handle_Return<Boxed_Value> {
+        struct Handle_Return<Boxed_Value>
+        {
+          static Boxed_Value handle(const Boxed_Value &r)
+          {
+            return r;
+          }
         };
 
       /**
        * Used internally for handling a return value from a Proxy_Function call
        */
       template<>
-      struct Handle_Return<Boxed_Number> {
-        static Boxed_Value handle(const Boxed_Number &r) noexcept { return r.bv; }
-      };
-
-      template<>
-      struct Handle_Return<const Boxed_Number> : Handle_Return<Boxed_Number> {
+        struct Handle_Return<const Boxed_Value>
+        {
+          static Boxed_Value handle(const Boxed_Value &r)
+          {
+            return r;
+          }
         };
 
       /**
        * Used internally for handling a return value from a Proxy_Function call
        */
       template<>
-      struct Handle_Return<void> {
-        static Boxed_Value handle() { return void_var(); }
+        struct Handle_Return<Boxed_Value &>
+        {
+          static Boxed_Value handle(const Boxed_Value &r)
+          {
+            return r;
+          }
         };
-    } // namespace detail
-  } // namespace dispatch
-} // namespace chaiscript
+
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
+      template<>
+        struct Handle_Return<const Boxed_Value &>
+        {
+          static Boxed_Value handle(const Boxed_Value &r)
+          {
+            return r;
+          }
+        };
+
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
+      template<>
+        struct Handle_Return<Boxed_Number>
+        {
+          static Boxed_Value handle(const Boxed_Number &r)
+          {
+            return r.bv;
+          }
+        };
+
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
+      template<>
+        struct Handle_Return<const Boxed_Number>
+        {
+          static Boxed_Value handle(const Boxed_Number &r)
+          {
+            return r.bv;
+          }
+        };
+
+
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
+      template<>
+        struct Handle_Return<void>
+        {
+          static Boxed_Value handle()
+          {
+            return Boxed_Value(Boxed_Value::Void_Type());
+          }
+        };
+    }
+  }
+}
 
 #endif

include/chaiscript/dispatchkit/operators.hpp

@@ -1,184 +1,465 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_OPERATORS_HPP_
 #define CHAISCRIPT_OPERATORS_HPP_
 
 #include "../chaiscript_defines.hpp"
-#include "../dispatchkit/dispatchkit.hpp"
 #include "register_function.hpp"
 
-namespace chaiscript::bootstrap::operators {
+namespace chaiscript 
+{
+  namespace bootstrap
+  {
+    namespace operators
+    {
+      namespace detail
+      {
+        /// \todo make this return a decltype once we drop gcc 4.6
+        template<typename L, typename R>
+          auto assign(L l, R r) -> L&
+          {
+            return (l = r);
+          }
+
+        template<typename L, typename R>
+          auto assign_bitwise_and(L l, R r) -> decltype((l &= r))
+          {
+            return (l &= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_xor(L l, R r) -> decltype((l^=r))
+          {
+            return (l ^= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_bitwise_or(L l, R r) -> decltype((l |= r))
+          {
+            return (l |= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_difference(L l, R r) -> decltype(( l -= r))
+          {
+            return (l -= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_left_shift(L l, R r) -> decltype(( l <<= r))
+          {
+            return (l <<= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_product(L l, R r) -> decltype(( l *= r ))
+          {
+            return (l *= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_quotient(L l, R r) -> decltype(( l /= r ))
+          {
+            return (l /= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_remainder(L l, R r) -> decltype(( l %= r ))
+          {
+            return (l %= r);
+          }
+
+        template<typename L, typename R>
+          auto assign_right_shift(L l, R r) -> decltype(( l >>= r))
+          {
+            return (l >>= r);
+          }
+
+        /// \todo make this return a decltype once we drop gcc 4.6
+        template<typename L, typename R>
+          auto assign_sum(L l, R r) -> L&
+          {
+            return (l += r);
+          }
+
+        template<typename L>
+          auto prefix_decrement(L l) -> decltype(( --l ))
+          {
+            return (--l);
+          }
+
+        template<typename L>
+          auto prefix_increment(L l) -> decltype(( ++l ))
+          {
+            return (++l);
+          }
+
+        template<typename L, typename R>
+          auto equal(L l, R r) -> decltype(( l == r ))
+          {
+            return (l == r);
+          }
+
+        template<typename L, typename R>
+          auto greater_than(L l, R r) -> decltype(( l > r ))
+          {
+            return (l > r);
+          }
+
+        template<typename L, typename R>
+          auto greater_than_equal(L l, R r) -> decltype(( l >= r ))
+          {
+            return (l >= r);
+          }
+
+        template<typename L, typename R>
+          auto less_than(L l, R r) -> decltype(( l < r ))
+          {
+            return (l < r);
+          }
+
+        template<typename L, typename R>
+          auto less_than_equal(L l, R r) -> decltype(( l <= r ))
+          {
+            return (l <= r);
+          }
+
+        template<typename L>
+          auto logical_compliment(L l) -> decltype(( !l ))
+          {
+            return (!l);
+          }
+
+        template<typename L, typename R>
+          auto not_equal(L l, R r) -> decltype(( l != r ))
+          {
+            return (l != r);
+          }
+
+        template<typename L, typename R>
+          auto addition(L l, R r) -> decltype(( l + r ))
+          {
+            return (l + r);
+          }
+
+        template<typename L>
+          auto unary_plus(L l) -> decltype(( +l ))
+          {
+            return (+l);
+          }
+
+        template<typename L, typename R>
+          auto subtraction(L l, R r) -> decltype(( l - r ))
+          {
+            return (l - r);
+          }
+
+        template<typename L>
+          auto unary_minus(L l) -> decltype(( -l ))
+          {
+#ifdef CHAISCRIPT_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4146)
+            return (-l);
+#pragma warning(pop)
+#else
+            return (-l);
+#endif
+          }
+
+        template<typename L, typename R>
+          auto bitwise_and(L l, R r) -> decltype(( l & r ))
+          {
+            return (l & r);
+          }
+
+        template<typename L>
+          auto bitwise_compliment(L l) -> decltype(( ~l ))
+          {
+            return (~l);
+          }
+
+        template<typename L, typename R>
+          auto bitwise_xor(L l, R r) -> decltype(( l ^ r ))
+          {
+            return (l ^ r);
+          }
+
+        template<typename L, typename R>
+          auto bitwise_or(L l, R r) -> decltype(( l | r ))
+          {
+            return (l | r);
+          }
+
+        template<typename L, typename R>
+          auto division(L l, R r) -> decltype(( l / r ))
+          {
+            return (l / r);
+          }
+
+        template<typename L, typename R>
+          auto left_shift(L l, R r) -> decltype(( l << r ))
+          {
+            return l << r;
+          }
+
+        template<typename L, typename R>
+          auto multiplication(L l, R r) -> decltype(( l * r ))
+          {
+            return l * r;
+          }
+
+        template<typename L, typename R>
+          auto remainder(L l, R r) -> decltype(( l % r ))
+          {
+            return (l % r);
+          }
+
+        template<typename L, typename R>
+          auto right_shift(L l, R r) -> decltype(( l >> r ))
+          {
+            return (l >> r);
+          }
+      }
+
+
+
       template<typename T>
-  void assign(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs = rhs; }), "=");
+        ModulePtr assign(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign<T &, const T&>), "=");
+          return m;
         }
 
       template<typename T>
-  void assign_bitwise_and(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs &= rhs; }), "&=");
+        ModulePtr assign_bitwise_and(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_bitwise_and<T &, const T&>), "&=");
+          return m;
         }
 
       template<typename T>
-  void assign_xor(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs ^= rhs; }), "^=");
+        ModulePtr assign_xor(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_xor<T &, const T&>), "^=");
+          return m;
         }
 
       template<typename T>
-  void assign_bitwise_or(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs |= rhs; }), "|=");
+        ModulePtr assign_bitwise_or(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_bitwise_or<T &, const T&>), "|=");
+          return m;
         }
 
       template<typename T>
-  void assign_difference(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs -= rhs; }), "-=");
+        ModulePtr assign_difference(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_difference<T &, const T&>), "-=");
+          return m;
         }
 
       template<typename T>
-  void assign_left_shift(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs <<= rhs; }), "<<=");
+        ModulePtr assign_left_shift(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_left_shift<T &, const T&>), "<<=");
+          return m;
         }
 
       template<typename T>
-  void assign_product(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs <<= rhs; }), "*=");
+        ModulePtr assign_product(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_product<T &, const T&>), "*=");
+          return m;
         }
 
       template<typename T>
-  void assign_quotient(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs /= rhs; }), "/=");
+        ModulePtr assign_quotient(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_quotient<T &, const T&>), "/=");
+          return m;
         }
 
       template<typename T>
-  void assign_remainder(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs %= rhs; }), "%=");
+        ModulePtr assign_remainder(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_remainder<T &, const T&>), "%=");
+          return m;
         }
 
       template<typename T>
-  void assign_right_shift(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs >>= rhs; }), ">>=");
+        ModulePtr assign_right_shift(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_right_shift<T &, const T&>), ">>=");
+          return m;
         }
 
       template<typename T>
-  void assign_sum(Module &m) {
-    m.add(chaiscript::fun([](T &lhs, const T &rhs) -> T & { return lhs += rhs; }), "+=");
+        ModulePtr assign_sum(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::assign_sum<T &, const T&>), "+=");
+          return m;
         }
 
       template<typename T>
-  void prefix_decrement(Module &m) {
-    m.add(chaiscript::fun([](T &lhs) -> T & { return --lhs; }), "--");
+        ModulePtr prefix_decrement(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::prefix_decrement<T &>), "--");
+          return m;
         }
 
       template<typename T>
-  void prefix_increment(Module &m) {
-    m.add(chaiscript::fun([](T &lhs) -> T & { return ++lhs; }), "++");
+        ModulePtr prefix_increment(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::prefix_increment<T &>), "++");
+          return m;
         }
 
       template<typename T>
-  void equal(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs == rhs; }), "==");
+        ModulePtr equal(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::equal<const T&, const T&>), "==");
+          return m;
         }
 
       template<typename T>
-  void greater_than(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs > rhs; }), ">");
+        ModulePtr greater_than(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::greater_than<const T&, const T&>), ">");
+          return m;
         }
 
       template<typename T>
-  void greater_than_equal(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs >= rhs; }), ">=");
+        ModulePtr greater_than_equal(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::greater_than_equal<const T&, const T&>), ">=");
+          return m;
         }
 
       template<typename T>
-  void less_than(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs < rhs; }), "<");
+        ModulePtr less_than(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::less_than<const T&, const T&>), "<");
+          return m;
         }
 
       template<typename T>
-  void less_than_equal(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs <= rhs; }), "<=");
+        ModulePtr less_than_equal(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::less_than_equal<const T&, const T&>), "<=");
+          return m;
         }
 
       template<typename T>
-  void logical_compliment(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs) { return !lhs; }), "!");
+        ModulePtr logical_compliment(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::logical_compliment<const T &>), "!");
+          return m;
         }
 
       template<typename T>
-  void not_equal(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs != rhs; }), "!=");
+        ModulePtr not_equal(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::not_equal<const T &, const T &>), "!=");
+          return m;
         }
 
       template<typename T>
-  void addition(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs + rhs; }), "+");
+        ModulePtr addition(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::addition<const T &, const T &>), "+");
+          return m;
         }
 
       template<typename T>
-  void unary_plus(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs) { return +lhs; }), "+");
+        ModulePtr unary_plus(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::unary_plus<const T &>), "+");
+          return m;
         }
 
       template<typename T>
-  void subtraction(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs - rhs; }), "-");
+        ModulePtr subtraction(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::subtraction<const T &, const T &>), "-");
+          return m;
         }
 
       template<typename T>
-  void unary_minus(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs) { return -lhs; }), "-");
+        ModulePtr unary_minus(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::unary_minus<const T &>), "-");
+          return m;
         }
 
       template<typename T>
-  void bitwise_and(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs & rhs; }), "&");
+        ModulePtr bitwise_and(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::bitwise_and<const T &, const T &>), "&");
+          return m;
         }
 
       template<typename T>
-  void bitwise_compliment(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs) { return ~lhs; }), "~");
+        ModulePtr bitwise_compliment(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::bitwise_compliment<const T &>), "~");
+          return m;
         }
 
       template<typename T>
-  void bitwise_xor(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs ^ rhs; }), "^");
+        ModulePtr bitwise_xor(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::bitwise_xor<const T &, const T &>), "^");
+          return m;
         }
 
       template<typename T>
-  void bitwise_or(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs | rhs; }), "|");
+        ModulePtr bitwise_or(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::bitwise_or<const T &, const T &>), "|");
+          return m;
         }
 
       template<typename T>
-  void division(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs / rhs; }), "/");
+        ModulePtr division(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::division<const T &, const T &>), "/");
+          return m;
         }
 
       template<typename T>
-  void left_shift(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs << rhs; }), "<<");
+        ModulePtr left_shift(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::left_shift<const T &, const T &>), "<<");
+          return m;
         }
 
       template<typename T>
-  void multiplication(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs * rhs; }), "*");
+        ModulePtr multiplication(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::multiplication<const T &, const T &>), "*");
+          return m;
         }
 
       template<typename T>
-  void remainder(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs % rhs; }), "%");
+        ModulePtr remainder(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::remainder<const T &, const T &>), "%");
+          return m;
         }
 
       template<typename T>
-  void right_shift(Module &m) {
-    m.add(chaiscript::fun([](const T &lhs, const T &rhs) { return lhs >> rhs; }), ">>");
+        ModulePtr right_shift(ModulePtr m = std::make_shared<Module>())
+        {
+          m->add(chaiscript::fun(&detail::right_shift<const T &, const T &>), ">>");
+          return m;
         }
-} // namespace chaiscript::bootstrap::operators
+    }
+  }
+}
 
 #endif

include/chaiscript/dispatchkit/proxy_constructors.hpp

@@ -1,37 +1,34 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 
 #ifndef CHAISCRIPT_PROXY_CONSTRUCTORS_HPP_
 #define CHAISCRIPT_PROXY_CONSTRUCTORS_HPP_
 
 #include "proxy_functions.hpp"
 
-namespace chaiscript::dispatch::detail {
-  template<typename Class, typename... Params>
-  Proxy_Function build_constructor_(Class (*)(Params...)) {
-    if constexpr (!std::is_copy_constructible_v<Class>) {
-      auto call = [](auto &&...param) { return std::make_shared<Class>(std::forward<decltype(param)>(param)...); };
+namespace chaiscript
+{
+  namespace dispatch
+  {
+    namespace detail
+    {
+
+      template<typename Class, typename ... Params  >
+        Proxy_Function build_constructor_(Class (*)(Params...))
+        {
+          auto call = dispatch::detail::Constructor<Class, Params...>();
 
           return Proxy_Function(
-          chaiscript::make_shared<dispatch::Proxy_Function_Base,
-                                  dispatch::Proxy_Function_Callable_Impl<std::shared_ptr<Class>(Params...), decltype(call)>>(call));
-    } else if constexpr (true) {
-      auto call = [](auto &&...param) { return Class(std::forward<decltype(param)>(param)...); };
-
-      return Proxy_Function(
-          chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Class(Params...), decltype(call)>>(
-              call));
+            chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<std::shared_ptr<Class> (Params...), decltype(call)>>(call));
+        }
     }
   }
-} // namespace chaiscript::dispatch::detail
 
-namespace chaiscript {
+
   /// \brief Generates a constructor function for use with ChaiScript
   /// 
   /// \tparam T The signature of the constructor to generate. In the form of: ClassType (ParamType1, ParamType2, ...)
@@ -44,10 +41,13 @@ namespace chaiscript {
   ///    chai.add(constructor<MyClass (int, float)>(), "MyClass");
   /// \endcode
   template<typename T>
-  Proxy_Function constructor() {
+    Proxy_Function constructor()
+    {
       T *f = nullptr;
       return (dispatch::detail::build_constructor_(f));
     }
-} // namespace chaiscript
+
+}
 
 #endif
+

include/chaiscript/dispatchkit/proxy_functions_detail.hpp

@@ -1,16 +1,12 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_
 #define CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_
 
-#include <array>
 #include <functional>
 #include <stdexcept>
 #include <vector>
@@ -18,94 +14,262 @@
 #include "../chaiscript_defines.hpp"
 #include "boxed_cast.hpp"
 #include "boxed_value.hpp"
-#include "function_params.hpp"
 #include "handle_return.hpp"
 #include "type_info.hpp"
+#include "callable_traits.hpp"
 
 namespace chaiscript {
-  class Type_Conversions_State;
-  namespace exception {
-    class bad_boxed_cast;
-  } // namespace exception
+class Type_Conversions_State;
+namespace exception {
+class bad_boxed_cast;
+}  // namespace exception
 }  // namespace chaiscript
 
-namespace chaiscript {
-  namespace exception {
+namespace chaiscript
+{
+  namespace exception
+  {
     /**
      * Exception thrown when there is a mismatch in number of
      * parameters during Proxy_Function execution
      */
-    struct arity_error : std::range_error {
+    struct arity_error : std::range_error
+    {
       arity_error(int t_got, int t_expected)
-          : std::range_error("Function dispatch arity mismatch")
-          , got(t_got)
-          , expected(t_expected) {
+        : std::range_error("Function dispatch arity mismatch"),
+        got(t_got), expected(t_expected)
+      {
       }
 
       arity_error(const arity_error &) = default;
 
-      ~arity_error() noexcept override = default;
+      virtual ~arity_error() CHAISCRIPT_NOEXCEPT {}
 
       int got;
       int expected;
     };
-  } // namespace exception
+  }
 
-  namespace dispatch {
-    namespace detail {
+  namespace dispatch
+  {
+    namespace detail
+    {
       /**
        * Used by Proxy_Function_Impl to return a list of all param types
        * it contains.
        */
-      template<typename Ret, typename... Params>
-      std::vector<Type_Info> build_param_type_list(Ret (*)(Params...)) {
+      template<typename Ret, typename ... Params>
+        std::vector<Type_Info> build_param_type_list(Ret (*)(Params...))
+        {
           /// \note somehow this is responsible for a large part of the code generation
-        return {user_type<Ret>(), user_type<Params>()...};
+          return { user_type<Ret>(), user_type<Params>()... };
         }
 
+
+#ifdef CHAISCRIPT_GCC_4_6 
+      /// \todo REMOVE THIS WHEN WE DROP G++4.6
+
+
+      // Forward declaration
+      template<typename ... Rest> 
+        struct Try_Cast; 
+
+      template<typename Param, typename ... Rest>
+        struct Try_Cast<Param, Rest...>
+        {
+          static void do_try(const std::vector<Boxed_Value> &params, size_t generation, const Type_Conversions_State &t_conversions)
+          {
+            boxed_cast<Param>(params[generation], &t_conversions);
+            Try_Cast<Rest...>::do_try(params, generation+1, t_conversions);
+          }
+        };
+
+      // 0th case
+      template<>
+        struct Try_Cast<>
+        {
+          static void do_try(const std::vector<Boxed_Value> &, size_t, const Type_Conversions_State &)
+          {
+          }
+        };
+
+
       /**
        * Used by Proxy_Function_Impl to determine if it is equivalent to another
        * Proxy_Function_Impl object. This function is primarily used to prevent
        * registration of two functions with the exact same signatures
        */
-      template<typename Ret, typename... Params>
-      bool compare_types_cast(Ret (*)(Params...), const chaiscript::Function_Params &params, const Type_Conversions_State &t_conversions) noexcept {
+      template<typename Ret, typename ... Params>
+        bool compare_types_cast(Ret (*)(Params...),
+             const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+        {
           try {
-          std::vector<Boxed_Value>::size_type i = 0;
-          (boxed_cast<Params>(params[i++], &t_conversions), ...);
+            Try_Cast<Params...>::do_try(params, 0, t_conversions);
+          } catch (const exception::bad_boxed_cast &) {
+            return false;
+          }
+
+          return true;
+        }
+
+      template<typename Ret, int count, typename ... Params>
+        struct Call_Func
+        {
+
+          template<typename Callable, typename ... InnerParams>
+          static Ret do_call(const Callable &f,
+              const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions, InnerParams &&... innerparams)
+          {
+            return Call_Func<Ret, count - 1, Params...>::do_call(f, params, t_conversions, std::forward<InnerParams>(innerparams)..., params[sizeof...(Params) - count]);
+          } 
+        };
+
+      template<typename Ret, typename ... Params>
+        struct Call_Func<Ret, 0, Params...>
+        {
+#ifdef CHAISCRIPT_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4100) /// Disable unreferenced formal parameter warning, which only shows up in MSVC I don't think there's any way around it \todo evaluate this
+#endif
+          template<typename Callable, typename ... InnerParams>
+            static Ret do_call(const Callable &f,
+                const std::vector<Boxed_Value> &, const Type_Conversions_State &t_conversions, InnerParams &&... innerparams)
+            {
+              return f(boxed_cast<Params>(std::forward<InnerParams>(innerparams), &t_conversions)...);
+            }
+#ifdef CHAISCRIPT_MSVC
+#pragma warning(pop)
+#endif
+        };
+
+      /**
+       * Used by Proxy_Function_Impl to perform typesafe execution of a function.
+       * The function attempts to unbox each parameter to the expected type.
+       * if any unboxing fails the execution of the function fails and
+       * the bad_boxed_cast is passed up to the caller.
+       */
+      template<typename Callable, typename Ret, typename ... Params>
+        Ret call_func(const chaiscript::dispatch::detail::Function_Signature<Ret (Params...)> &, const Callable &f,
+            const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+        {
+          if (params.size() == sizeof...(Params))
+          {
+            return Call_Func<Ret, sizeof...(Params), Params...>::do_call(f, params, t_conversions);
+          }
+
+          throw exception::arity_error(static_cast<int>(params.size()), sizeof...(Params));
+        }
+
+
+
+#else
+
+      template<size_t ... I>
+      struct Indexes
+      {
+      };
+
+      template<size_t S, size_t ... I> 
+      struct Make_Indexes
+      {
+        typedef typename Make_Indexes<S-1, I..., sizeof...(I)>::indexes indexes;
+      };
+
+      template<size_t ... I>
+      struct Make_Indexes<0, I...>
+      {
+        typedef Indexes<I...> indexes;
+      };
+
+
+
+      /**
+       * Used by Proxy_Function_Impl to determine if it is equivalent to another
+       * Proxy_Function_Impl object. This function is primarily used to prevent
+       * registration of two functions with the exact same signatures
+       */
+      template<typename Ret, typename ... Params, size_t ... I>
+        bool compare_types_cast(Indexes<I...>, Ret (*)(Params...),
+             const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+        {
+          try {
+            (void)params; (void)t_conversions;
+            (void)std::initializer_list<int>{(boxed_cast<Params>(params[I], &t_conversions), 0)...};
             return true;
           } catch (const exception::bad_boxed_cast &) {
             return false;
           }
+
         }
 
-      template<typename Callable, typename Ret, typename... Params, size_t... I>
-      Ret call_func(Ret (*)(Params...),
-                    std::index_sequence<I...>,
-                    const Callable &f,
-                    [[maybe_unused]] const chaiscript::Function_Params &params,
-                    [[maybe_unused]] const Type_Conversions_State &t_conversions) {
+      template<typename Ret, typename ... Params>
+        bool compare_types_cast(Ret (*f)(Params...),
+             const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+        {
+          typedef typename Make_Indexes<sizeof...(Params)>::indexes indexes;
+          return compare_types_cast(indexes(), f, params, t_conversions);
+        }
+
+
+      template<typename Callable, typename Ret, typename ... Params, size_t ... I>
+        Ret call_func(const chaiscript::dispatch::detail::Function_Signature<Ret (Params...)> &, Indexes<I...>, const Callable &f,
+            const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+        {
+          (void)params; (void)t_conversions;
           return f(boxed_cast<Params>(params[I], &t_conversions)...);
         }
 
-      /// Used by Proxy_Function_Impl to perform typesafe execution of a function.
-      /// The function attempts to unbox each parameter to the expected type.
-      /// if any unboxing fails the execution of the function fails and
-      /// the bad_boxed_cast is passed up to the caller.
-      template<typename Callable, typename Ret, typename... Params>
-      Boxed_Value
-      call_func(Ret (*sig)(Params...), const Callable &f, const chaiscript::Function_Params &params, const Type_Conversions_State &t_conversions) {
-        if constexpr (std::is_same_v<Ret, void>) {
-          call_func(sig, std::index_sequence_for<Params...>{}, f, params, t_conversions);
-          return Handle_Return<void>::handle();
-        } else {
-          return Handle_Return<Ret>::handle(call_func(sig, std::index_sequence_for<Params...>{}, f, params, t_conversions));
-        }
-      }
 
-    } // namespace detail
-  } // namespace dispatch
-
-} // namespace chaiscript
+      /**
+       * Used by Proxy_Function_Impl to perform typesafe execution of a function.
+       * The function attempts to unbox each parameter to the expected type.
+       * if any unboxing fails the execution of the function fails and
+       * the bad_boxed_cast is passed up to the caller.
+       */
+      template<typename Callable, typename Ret, typename ... Params>
+        Ret call_func(const chaiscript::dispatch::detail::Function_Signature<Ret (Params...)> &sig, const Callable &f,
+            const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+        {
+          typedef typename Make_Indexes<sizeof...(Params)>::indexes indexes;
+          return call_func(sig, indexes(), f, params, t_conversions);
+        }
+
+#endif
+
+    }
+  }
+
+}
+
+
+namespace chaiscript
+{
+  namespace dispatch
+  {
+    namespace detail
+    {
+    template<typename Ret>
+      struct Do_Call
+      {
+        template<typename Signature, typename Callable>
+          static Boxed_Value go(const Callable &fun, const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+          {
+            return Handle_Return<Ret>::handle(call_func(Function_Signature<Signature>(), fun, params, t_conversions));
+          }
+      };
+
+    template<>
+      struct Do_Call<void>
+      {
+        template<typename Signature, typename Callable>
+          static Boxed_Value go(const Callable &fun, const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions)
+          {
+            call_func(Function_Signature<Signature>(), fun, params, t_conversions);
+            return Handle_Return<void>::handle();
+          }
+      };
+    }
+  }
+}
 
 #endif

include/chaiscript/dispatchkit/register_function.hpp

@@ -1,61 +1,19 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_REGISTER_FUNCTION_HPP_
 #define CHAISCRIPT_REGISTER_FUNCTION_HPP_
 
 #include <type_traits>
 
 #include "bind_first.hpp"
-#include "function_signature.hpp"
 #include "proxy_functions.hpp"
 
-namespace chaiscript {
-  namespace dispatch::detail {
-    template<typename Obj, typename Param1, typename... Rest>
-    Param1 get_first_param(Function_Params<Param1, Rest...>, Obj &&obj) {
-      return static_cast<Param1>(std::forward<Obj>(obj));
-    }
-
-    template<typename Func, bool Is_Noexcept, bool Is_Member, bool Is_MemberObject, bool Is_Object, typename Ret, typename... Param>
-    auto make_callable_impl(Func &&func, Function_Signature<Ret, Function_Params<Param...>, Is_Noexcept, Is_Member, Is_MemberObject, Is_Object>) {
-      if constexpr (Is_MemberObject) {
-        // we now that the Param pack will have only one element, so we are safe expanding it here
-        return Proxy_Function(chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Attribute_Access<Ret, std::decay_t<Param>...>>(
-            std::forward<Func>(func)));
-      } else if constexpr (Is_Member) {
-        // TODO some kind of bug is preventing forwarding of this noexcept for the lambda
-        auto call = [func = std::forward<Func>(func)](auto &&obj, auto &&...param) /* noexcept(Is_Noexcept) */ -> decltype(auto) {
-          return ((get_first_param(Function_Params<Param...>{}, obj).*func)(std::forward<decltype(param)>(param)...));
-        };
-        return Proxy_Function(
-            chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret(Param...), decltype(call)>>(
-                std::move(call)));
-      } else {
-        return Proxy_Function(
-            chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret(Param...), std::decay_t<Func>>>(
-                std::forward<Func>(func)));
-      }
-    }
-
-    // this version peels off the function object itself from the function signature, when used
-    // on a callable object
-    template<typename Func, typename Ret, typename Object, typename... Param, bool Is_Noexcept>
-    auto make_callable(Func &&func, Function_Signature<Ret, Function_Params<Object, Param...>, Is_Noexcept, false, false, true>) {
-      return make_callable_impl(std::forward<Func>(func), Function_Signature<Ret, Function_Params<Param...>, Is_Noexcept, false, false, true>{});
-    }
-
-    template<typename Func, typename Ret, typename... Param, bool Is_Noexcept, bool Is_Member, bool Is_MemberObject>
-    auto make_callable(Func &&func, Function_Signature<Ret, Function_Params<Param...>, Is_Noexcept, Is_Member, Is_MemberObject, false> fs) {
-      return make_callable_impl(std::forward<Func>(func), fs);
-    }
-  } // namespace dispatch::detail
+namespace chaiscript
+{
 
   /// \brief Creates a new Proxy_Function object from a free function, member function or data member
   /// \param[in] t Function / member to expose
@@ -78,10 +36,53 @@ namespace chaiscript {
   /// 
   /// \sa \ref adding_functions
   template<typename T>
-  Proxy_Function fun(T &&t) {
-    return dispatch::detail::make_callable(std::forward<T>(t), dispatch::detail::function_signature(t));
+    Proxy_Function fun(const T &t)
+    {
+      typedef typename dispatch::detail::Callable_Traits<T>::Signature Signature;
+
+      return Proxy_Function(
+          chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Signature, T>>(t));
     }
 
+  template<typename Ret, typename ... Param>
+    Proxy_Function fun(Ret (*func)(Param...))
+    {
+      auto fun_call = dispatch::detail::Fun_Caller<Ret, Param...>(func);
+
+      return Proxy_Function(
+          chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret (Param...), decltype(fun_call)>>(fun_call));
+
+    }
+
+  template<typename Ret, typename Class, typename ... Param>
+    Proxy_Function fun(Ret (Class::*t_func)(Param...) const)
+    {
+      auto call = dispatch::detail::Const_Caller<Ret, Class, Param...>(t_func);
+
+      return Proxy_Function(
+          chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret (const Class &, Param...), decltype(call)>>(call));
+    }
+
+  template<typename Ret, typename Class, typename ... Param>
+    Proxy_Function fun(Ret (Class::*t_func)(Param...))
+    {
+      auto call = dispatch::detail::Caller<Ret, Class, Param...>(t_func);
+
+      return Proxy_Function(
+          chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Proxy_Function_Callable_Impl<Ret (Class &, Param...), decltype(call)>>(call));
+
+    }
+
+
+  template<typename T, typename Class /*, typename = typename std::enable_if<std::is_member_object_pointer<T>::value>::type*/>
+    Proxy_Function fun(T Class::* m /*, typename std::enable_if<std::is_member_object_pointer<T>::value>::type* = 0*/ )
+    {
+      return Proxy_Function(chaiscript::make_shared<dispatch::Proxy_Function_Base, dispatch::Attribute_Access<T, Class>>(m));
+    }
+
+
+
+  
   /// \brief Creates a new Proxy_Function object from a free function, member function or data member and binds the first parameter of it
   /// \param[in] t Function / member to expose
   /// \param[in] q Value to bind to first parameter
@@ -101,10 +102,39 @@ namespace chaiscript {
   /// 
   /// \sa \ref adding_functions
   template<typename T, typename Q>
-  Proxy_Function fun(T &&t, const Q &q) {
+    Proxy_Function fun(T &&t, const Q &q)
+    {
       return fun(detail::bind_first(std::forward<T>(t), q));
     }
 
-} // namespace chaiscript
+  /// \brief Creates a new Proxy_Function object from a free function or member function and binds the first and second parameters of it
+  /// \param[in] t Function / member to expose
+  /// \param[in] q Value to bind to first parameter
+  /// \param[in] r Value to bind to second parameter
+  ///
+  /// \b Example:
+  /// \code
+  /// struct MyClass
+  /// {
+  ///   void memberfunction(int);
+  /// };
+  /// 
+  /// MyClass obj;
+  /// chaiscript::ChaiScript chai;
+  /// // Add function taking only no arguments, and permanently bound to "obj" and "1"
+  /// // memberfunction() will be equivalent to obj.memberfunction(1)
+  /// chai.add(fun(&MyClass::memberfunction, std::ref(obj), 1), "memberfunction"); 
+  /// \endcode
+  /// 
+  /// \sa \ref adding_functions
+  template<typename T, typename Q, typename R>
+    Proxy_Function fun(T &&t, Q &&q, R &&r)
+    {
+      return fun(detail::bind_first(detail::bind_first(std::forward<T>(t), std::forward<Q>(q)), std::forward<R>(r)));
+    }
+
+}
+
 
 #endif
+

include/chaiscript/dispatchkit/short_alloc.hpp

@@ -1,137 +0,0 @@
-#ifndef SHORT_ALLOC_H
-#define SHORT_ALLOC_H
-
-// The MIT License (MIT)
-//
-// Copyright (c) 2015 Howard Hinnant
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include <cassert>
-#include <cstddef>
-
-template<std::size_t N, std::size_t alignment = alignof(std::max_align_t)>
-class arena {
-  alignas(alignment) char buf_[N];
-  char *ptr_;
-
-public:
-  ~arena() { ptr_ = nullptr; }
-  arena() noexcept
-      : ptr_(buf_) {
-  }
-  arena(const arena &) = delete;
-  arena &operator=(const arena &) = delete;
-
-  template<std::size_t ReqAlign>
-  char *allocate(std::size_t n);
-  void deallocate(char *p, std::size_t n) noexcept;
-
-  static constexpr std::size_t size() noexcept { return N; }
-  std::size_t used() const noexcept { return static_cast<std::size_t>(ptr_ - buf_); }
-  void reset() noexcept { ptr_ = buf_; }
-
-private:
-  static std::size_t align_up(std::size_t n) noexcept { return (n + (alignment - 1)) & ~(alignment - 1); }
-
-  bool pointer_in_buffer(char *p) noexcept { return buf_ <= p && p <= buf_ + N; }
-};
-
-template<std::size_t N, std::size_t alignment>
-template<std::size_t ReqAlign>
-char *arena<N, alignment>::allocate(std::size_t n) {
-  static_assert(ReqAlign <= alignment, "alignment is too small for this arena");
-  assert(pointer_in_buffer(ptr_) && "short_alloc has outlived arena");
-  auto const aligned_n = align_up(n);
-  if (static_cast<decltype(aligned_n)>(buf_ + N - ptr_) >= aligned_n) {
-    char *r = ptr_;
-    ptr_ += aligned_n;
-    return r;
-  }
-
-  static_assert(alignment <= alignof(std::max_align_t),
-                "you've chosen an "
-                "alignment that is larger than alignof(std::max_align_t), and "
-                "cannot be guaranteed by normal operator new");
-  return static_cast<char *>(::operator new(n));
-}
-
-template<std::size_t N, std::size_t alignment>
-void arena<N, alignment>::deallocate(char *p, std::size_t n) noexcept {
-  assert(pointer_in_buffer(ptr_) && "short_alloc has outlived arena");
-  if (pointer_in_buffer(p)) {
-    n = align_up(n);
-    if (p + n == ptr_) {
-      ptr_ = p;
-    }
-  } else {
-    ::operator delete(p);
-  }
-}
-
-template<class T, std::size_t N, std::size_t Align = alignof(std::max_align_t)>
-class short_alloc {
-public:
-  using value_type = T;
-  static auto constexpr alignment = Align;
-  static auto constexpr size = N;
-  using arena_type = arena<size, alignment>;
-
-private:
-  arena_type &a_;
-
-public:
-  short_alloc(const short_alloc &) = default;
-  short_alloc &operator=(const short_alloc &) = delete;
-
-  explicit short_alloc(arena_type &a) noexcept
-      : a_(a) {
-    static_assert(size % alignment == 0, "size N needs to be a multiple of alignment Align");
-  }
-  template<class U>
-  explicit short_alloc(const short_alloc<U, N, alignment> &a) noexcept
-      : a_(a.a_) {
-  }
-
-  template<class _Up>
-  struct rebind {
-    using other = short_alloc<_Up, N, alignment>;
-  };
-
-  T *allocate(std::size_t n) { return reinterpret_cast<T *>(a_.template allocate<alignof(T)>(n * sizeof(T))); }
-  void deallocate(T *p, std::size_t n) noexcept { a_.deallocate(reinterpret_cast<char *>(p), n * sizeof(T)); }
-
-  template<class T1, std::size_t N1, std::size_t A1, class U, std::size_t M, std::size_t A2>
-  friend bool operator==(const short_alloc<T1, N1, A1> &x, const short_alloc<U, M, A2> &y) noexcept;
-
-  template<class U, std::size_t M, std::size_t A>
-  friend class short_alloc;
-};
-
-template<class T, std::size_t N, std::size_t A1, class U, std::size_t M, std::size_t A2>
-inline bool operator==(const short_alloc<T, N, A1> &x, const short_alloc<U, M, A2> &y) noexcept {
-  return N == M && A1 == A2 && &x.a_ == &y.a_;
-}
-
-template<class T, std::size_t N, std::size_t A1, class U, std::size_t M, std::size_t A2>
-inline bool operator!=(const short_alloc<T, N, A1> &x, const short_alloc<U, M, A2> &y) noexcept {
-  return !(x == y);
-}
-
-#endif // SHORT_ALLOC_HPP

include/chaiscript/dispatchkit/type_conversions.hpp

@@ -1,16 +1,12 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_
 #define CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_
 
-#include <algorithm>
 #include <atomic>
 #include <memory>
 #include <set>
@@ -20,116 +16,141 @@
 #include <typeinfo>
 
 #include "../chaiscript_threading.hpp"
-#include "../utility/static_string.hpp"
 #include "bad_boxed_cast.hpp"
 #include "boxed_cast_helper.hpp"
 #include "boxed_value.hpp"
 #include "type_info.hpp"
 
-namespace chaiscript {
-  namespace exception {
-    /// \brief Error thrown when there's a problem with type conversion
-    class conversion_error : public bad_boxed_cast {
+namespace chaiscript
+{
+  namespace exception
+  {
+    class bad_boxed_dynamic_cast : public bad_boxed_cast
+    {
       public:
-      conversion_error(const Type_Info t_to, const Type_Info t_from, const utility::Static_String what) noexcept
-          : bad_boxed_cast(t_from, (*t_to.bare_type_info()), what)
-          , type_to(t_to) {
+        bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to,
+            const std::string &t_what) CHAISCRIPT_NOEXCEPT
+          : bad_boxed_cast(t_from, t_to, t_what)
+        {
         }
 
-      Type_Info type_to;
-    };
-
-    class bad_boxed_dynamic_cast : public bad_boxed_cast {
-    public:
-      bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to, const utility::Static_String &t_what) noexcept
-          : bad_boxed_cast(t_from, t_to, t_what) {
+        bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to) CHAISCRIPT_NOEXCEPT
+          : bad_boxed_cast(t_from, t_to)
+        {
         }
 
-      bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to) noexcept
-          : bad_boxed_cast(t_from, t_to) {
-      }
-
-      explicit bad_boxed_dynamic_cast(const utility::Static_String &w) noexcept
-          : bad_boxed_cast(w) {
+        bad_boxed_dynamic_cast(const std::string &w) CHAISCRIPT_NOEXCEPT
+          : bad_boxed_cast(w)
+        {
         }
 
         bad_boxed_dynamic_cast(const bad_boxed_dynamic_cast &) = default;
 
-      ~bad_boxed_dynamic_cast() noexcept override = default;
+        virtual ~bad_boxed_dynamic_cast() CHAISCRIPT_NOEXCEPT {}
     };
 
-    class bad_boxed_type_cast : public bad_boxed_cast {
+    class bad_boxed_type_cast : public bad_boxed_cast
+    {
       public:
-      bad_boxed_type_cast(const Type_Info &t_from, const std::type_info &t_to, const utility::Static_String &t_what) noexcept
-          : bad_boxed_cast(t_from, t_to, t_what) {
+        bad_boxed_type_cast(const Type_Info &t_from, const std::type_info &t_to,
+            const std::string &t_what) CHAISCRIPT_NOEXCEPT
+          : bad_boxed_cast(t_from, t_to, t_what)
+        {
         }
 
-      bad_boxed_type_cast(const Type_Info &t_from, const std::type_info &t_to) noexcept
-          : bad_boxed_cast(t_from, t_to) {
+        bad_boxed_type_cast(const Type_Info &t_from, const std::type_info &t_to) CHAISCRIPT_NOEXCEPT
+          : bad_boxed_cast(t_from, t_to)
+        {
         }
 
-      explicit bad_boxed_type_cast(const utility::Static_String &w) noexcept
-          : bad_boxed_cast(w) {
+        bad_boxed_type_cast(const std::string &w) CHAISCRIPT_NOEXCEPT
+          : bad_boxed_cast(w)
+        {
         }
 
         bad_boxed_type_cast(const bad_boxed_type_cast &) = default;
 
-      ~bad_boxed_type_cast() noexcept override = default;
+        virtual ~bad_boxed_type_cast() CHAISCRIPT_NOEXCEPT {}
     };
-  } // namespace exception
+  }
 
-  namespace detail {
-    class Type_Conversion_Base {
+
+  namespace detail
+  {
+    class Type_Conversion_Base
+    {
       public:
         virtual Boxed_Value convert(const Boxed_Value &from) const = 0;
         virtual Boxed_Value convert_down(const Boxed_Value &to) const = 0;
 
-      const Type_Info &to() const noexcept { return m_to; }
-      const Type_Info &from() const noexcept { return m_from; }
-
-      virtual bool bidir() const noexcept { return true; }
-
-      virtual ~Type_Conversion_Base() = default;
-
-    protected:
-      Type_Conversion_Base(Type_Info t_to, Type_Info t_from)
-          : m_to(std::move(t_to))
-          , m_from(std::move(t_from)) {
+        const Type_Info &to() const
+        {
+          return m_to;
+        }
+        const Type_Info &from() const
+        {
+          return m_from;
         }
 
+        virtual bool bidir() const
+        {
+          return true;
+        }
+
+        virtual ~Type_Conversion_Base() {}
+
+      protected:
+        Type_Conversion_Base(const Type_Info &t_to, const Type_Info &t_from)
+          : m_to(t_to), m_from(t_from)
+        {
+        }
+
+
       private:
-      const Type_Info m_to;
-      const Type_Info m_from;
+        Type_Info m_to;
+        Type_Info m_from;
+
     };
 
     template<typename From, typename To> 
-    class Static_Caster {
+      class Static_Caster
+      {
         public: 
-      static Boxed_Value cast(const Boxed_Value &t_from) {
-        if (t_from.get_type_info().bare_equal(chaiscript::user_type<From>())) {
-          if (t_from.is_pointer()) {
+          static Boxed_Value cast(const Boxed_Value &t_from)
+          {
+            if (t_from.get_type_info().bare_equal(chaiscript::user_type<From>()))
+            {
+              if (t_from.is_pointer())
+              {
                 // Dynamic cast out the contained boxed value, which we know is the type we want
-            if (t_from.is_const()) {
-              return Boxed_Value([&]() {
-                if (auto data
-                    = std::static_pointer_cast<const To>(detail::Cast_Helper<std::shared_ptr<const From>>::cast(t_from, nullptr))) {
+                if (t_from.is_const())
+                {
+                  return Boxed_Value(
+                      [&]()->std::shared_ptr<const To>{
+                        if (auto data = std::static_pointer_cast<const To>(detail::Cast_Helper<std::shared_ptr<const From> >::cast(t_from, nullptr)))
+                        {
                           return data;
                         } else {
                           throw std::bad_cast();
                         }
-              }());
+                      }()
+                      );
                 } else {
-              return Boxed_Value([&]() {
-                if (auto data = std::static_pointer_cast<To>(detail::Cast_Helper<std::shared_ptr<From>>::cast(t_from, nullptr))) {
+                  return Boxed_Value(
+                      [&]()->std::shared_ptr<To>{
+                        if (auto data = std::static_pointer_cast<To>(detail::Cast_Helper<std::shared_ptr<From> >::cast(t_from, nullptr)))
+                        {
                           return data;
                         } else {
                           throw std::bad_cast();
                         }
-              }());
+                      }()
+                      );
                 }
               } else {
                 // Pull the reference out of the contained boxed value, which we know is the type we want
-            if (t_from.is_const()) {
+                if (t_from.is_const())
+                {
                   const From &d = detail::Cast_Helper<const From &>::cast(t_from, nullptr);
                   const To &data = static_cast<const To &>(d);
                   return Boxed_Value(std::cref(data));
@@ -143,33 +164,44 @@ namespace chaiscript {
               throw chaiscript::exception::bad_boxed_dynamic_cast(t_from.get_type_info(), typeid(To), "Unknown dynamic_cast_conversion");
             }
           }
+ 
       };
 
+
     template<typename From, typename To> 
-    class Dynamic_Caster {
+      class Dynamic_Caster
+      {
         public: 
-      static Boxed_Value cast(const Boxed_Value &t_from) {
-        if (t_from.get_type_info().bare_equal(chaiscript::user_type<From>())) {
-          if (t_from.is_pointer()) {
+          static Boxed_Value cast(const Boxed_Value &t_from)
+          {
+            if (t_from.get_type_info().bare_equal(chaiscript::user_type<From>()))
+            {
+              if (t_from.is_pointer())
+              {
                 // Dynamic cast out the contained boxed value, which we know is the type we want
-            if (t_from.is_const()) {
-              return Boxed_Value([&]() {
-                if (auto data
-                    = std::dynamic_pointer_cast<const To>(detail::Cast_Helper<std::shared_ptr<const From>>::cast(t_from, nullptr))) {
+                if (t_from.is_const())
+                {
+                  return Boxed_Value(
+                      [&]()->std::shared_ptr<const To>{
+                        if (auto data = std::dynamic_pointer_cast<const To>(detail::Cast_Helper<std::shared_ptr<const From> >::cast(t_from, nullptr)))
+                        {
                           return data;
                         } else {
                           throw std::bad_cast();
                         }
-              }());
+                      }()
+                      );
                 } else {
-              return Boxed_Value([&]() {
-                if (auto data = std::dynamic_pointer_cast<To>(detail::Cast_Helper<std::shared_ptr<From>>::cast(t_from, nullptr))) {
+                  return Boxed_Value(
+                      [&]()->std::shared_ptr<To>{
+                        if (auto data = std::dynamic_pointer_cast<To>(detail::Cast_Helper<std::shared_ptr<From> >::cast(t_from, nullptr)))
+                        {
                           return data;
                         } else {
 #ifdef CHAISCRIPT_LIBCPP
                           /// \todo fix this someday after libc++ is fixed.
                           if (std::string(typeid(To).name()).find("Assignable_Proxy_Function") != std::string::npos) {
-                    auto from = detail::Cast_Helper<std::shared_ptr<From>>::cast(t_from, nullptr);
+                            auto from = detail::Cast_Helper<std::shared_ptr<From> >::cast(t_from, nullptr);
                             if (std::string(typeid(*from).name()).find("Assignable_Proxy_Function_Impl") != std::string::npos) {
                               return std::static_pointer_cast<To>(from);
                             }
@@ -177,11 +209,13 @@ namespace chaiscript {
 #endif
                           throw std::bad_cast();
                         }
-              }());
+                      }()
+                      );
                 }
               } else {
                 // Pull the reference out of the contained boxed value, which we know is the type we want
-            if (t_from.is_const()) {
+                if (t_from.is_const())
+                {
                   const From &d = detail::Cast_Helper<const From &>::cast(t_from, nullptr);
                   const To &data = dynamic_cast<const To &>(d);
                   return Boxed_Value(std::cref(data));
@@ -195,91 +229,136 @@ namespace chaiscript {
               throw chaiscript::exception::bad_boxed_dynamic_cast(t_from.get_type_info(), typeid(To), "Unknown dynamic_cast_conversion");
             }
           }
+ 
       };
 
+
     template<typename Base, typename Derived>
-    class Dynamic_Conversion_Impl : public Type_Conversion_Base {
+      class Dynamic_Conversion_Impl : public Type_Conversion_Base
+    {
       public:
         Dynamic_Conversion_Impl()
-          : Type_Conversion_Base(chaiscript::user_type<Base>(), chaiscript::user_type<Derived>()) {
+          : Type_Conversion_Base(chaiscript::user_type<Base>(), chaiscript::user_type<Derived>())
+        {
         }
 
-      Boxed_Value convert_down(const Boxed_Value &t_base) const override { return Dynamic_Caster<Base, Derived>::cast(t_base); }
+        virtual Boxed_Value convert_down(const Boxed_Value &t_base) const CHAISCRIPT_OVERRIDE
+        {
+          return Dynamic_Caster<Base, Derived>::cast(t_base);
+        }
 
-      Boxed_Value convert(const Boxed_Value &t_derived) const override { return Static_Caster<Derived, Base>::cast(t_derived); }
+        virtual Boxed_Value convert(const Boxed_Value &t_derived) const CHAISCRIPT_OVERRIDE
+        {
+          return Static_Caster<Derived, Base>::cast(t_derived);
+        }
     };
 
     template<typename Base, typename Derived>
-    class Static_Conversion_Impl : public Type_Conversion_Base {
+      class Static_Conversion_Impl : public Type_Conversion_Base
+    {
       public:
         Static_Conversion_Impl()
-          : Type_Conversion_Base(chaiscript::user_type<Base>(), chaiscript::user_type<Derived>()) {
+          : Type_Conversion_Base(chaiscript::user_type<Base>(), chaiscript::user_type<Derived>())
+        {
         }
 
-      Boxed_Value convert_down(const Boxed_Value &t_base) const override {
-        throw chaiscript::exception::bad_boxed_dynamic_cast(t_base.get_type_info(),
-                                                            typeid(Derived),
-                                                            "Unable to cast down inheritance hierarchy with non-polymorphic types");
+        virtual Boxed_Value convert_down(const Boxed_Value &t_base) const CHAISCRIPT_OVERRIDE
+        {
+          throw chaiscript::exception::bad_boxed_dynamic_cast(t_base.get_type_info(), typeid(Derived), "Unable to cast down inheritance hierarchy with non-polymorphic types");
         }
 
-      bool bidir() const noexcept override { return false; }
+        virtual bool bidir() const CHAISCRIPT_OVERRIDE
+        {
+          return false;
+        }
 
-      Boxed_Value convert(const Boxed_Value &t_derived) const override { return Static_Caster<Derived, Base>::cast(t_derived); }
+        virtual Boxed_Value convert(const Boxed_Value &t_derived) const CHAISCRIPT_OVERRIDE
+        {
+          return Static_Caster<Derived, Base>::cast(t_derived);
+        }
     };
 
+
+
     template<typename Callable>
-    class Type_Conversion_Impl : public Type_Conversion_Base {
+    class Type_Conversion_Impl : public Type_Conversion_Base
+    {
       public:
         Type_Conversion_Impl(Type_Info t_from, Type_Info t_to, Callable t_func)
-          : Type_Conversion_Base(t_to, t_from)
-          , m_func(std::move(t_func)) {
+          : Type_Conversion_Base(std::move(t_to), std::move(t_from)),
+            m_func(std::move(t_func))
+        {
         }
 
-      Boxed_Value convert_down(const Boxed_Value &) const override {
+        virtual Boxed_Value convert_down(const Boxed_Value &) const CHAISCRIPT_OVERRIDE
+        {
           throw chaiscript::exception::bad_boxed_type_cast("No conversion exists");
         }
 
-      Boxed_Value convert(const Boxed_Value &t_from) const override {
+        virtual Boxed_Value convert(const Boxed_Value &t_from) const CHAISCRIPT_OVERRIDE
+        {
           /// \todo better handling of errors from the conversion function
           return m_func(t_from);
         }
 
-      bool bidir() const noexcept override { return false; }
+        virtual bool bidir() const CHAISCRIPT_OVERRIDE
+        {
+          return false;
+        }
+
 
       private:
         Callable m_func;
     };
-  } // namespace detail
+  }
 
-  class Type_Conversions {
+  class Type_Conversions
+  {
     public:
-    struct Conversion_Saves {
-      bool enabled = false;
+      struct Conversion_Saves
+      {
+        Conversion_Saves()
+          : enabled(false)
+        {}
+
+        bool enabled;
         std::vector<Boxed_Value> saves;
       };
 
-    struct Less_Than {
-      bool operator()(const std::type_info *t_lhs, const std::type_info *t_rhs) const noexcept {
+      struct Less_Than
+      {
+        bool operator()(const std::type_info *t_lhs, const std::type_info *t_rhs) const
+        {
           return *t_lhs != *t_rhs && t_lhs->before(*t_rhs);
         }
       };
 
       Type_Conversions()
-        : m_mutex()
-        , m_conversions()
-        , m_convertableTypes()
-        , m_num_types(0) {
+        : m_mutex(),
+          m_conversions(),
+          m_convertableTypes(),
+          m_num_types(0),
+          m_thread_cache(this),
+          m_conversion_saves(this)
+      {
       }
 
-    Type_Conversions(const Type_Conversions &t_other) = delete;
-    Type_Conversions(Type_Conversions &&) = delete;
+      Type_Conversions(const Type_Conversions &t_other)
+        : m_mutex(),
+          m_conversions(t_other.get_conversions()),
+          m_convertableTypes(t_other.m_convertableTypes),
+          m_num_types(m_conversions.size()),
+          m_thread_cache(this),
+          m_conversion_saves(this)
 
-    Type_Conversions &operator=(const Type_Conversions &) = delete;
-    Type_Conversions &operator=(Type_Conversions &&) = delete;
+      {
+      }
 
-    const std::set<const std::type_info *, Less_Than> &thread_cache() const {
+      const std::set<const std::type_info *, Less_Than> &thread_cache() const
+      {
         auto &cache = *m_thread_cache;
-      if (cache.size() != m_num_types) {
+        if (cache.size() != m_num_types)
+        {
           chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
           cache = m_convertableTypes;
         }
@@ -287,30 +366,32 @@ namespace chaiscript {
         return cache;
       }
 
-    void add_conversion(const std::shared_ptr<detail::Type_Conversion_Base> &conversion) {
+      void add_conversion(const std::shared_ptr<detail::Type_Conversion_Base> &conversion)
+      {
         chaiscript::detail::threading::unique_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
-      if (find_bidir(conversion->to(), conversion->from()) != m_conversions.end()) {
-        throw exception::conversion_error(conversion->to(), conversion->from(), "Trying to re-insert an existing conversion!");
-      }
+        /// \todo error if a conversion already exists
         m_conversions.insert(conversion);
         m_convertableTypes.insert({conversion->to().bare_type_info(), conversion->from().bare_type_info()});
         m_num_types = m_convertableTypes.size();
       }
 
       template<typename T>
-    bool convertable_type() const noexcept {
-      const auto type = user_type<T>().bare_type_info();
-      return thread_cache().count(type) != 0;
+        bool convertable_type() const
+        {
+          return thread_cache().count(user_type<T>().bare_type_info()) != 0;
         }
 
       template<typename To, typename From>
-    bool converts() const noexcept {
+        bool converts() const
+        {
           return converts(user_type<To>(), user_type<From>());
         }
 
-    bool converts(const Type_Info &to, const Type_Info &from) const noexcept {
+      bool converts(const Type_Info &to, const Type_Info &from) const
+      {
         const auto &types = thread_cache();
-      if (types.count(to.bare_type_info()) != 0 && types.count(from.bare_type_info()) != 0) {
+        if (types.count(to.bare_type_info()) != 0 && types.count(from.bare_type_info()) != 0)
+        {
           return has_conversion(to, from);
         } else {
           return false;
@@ -318,94 +399,102 @@ namespace chaiscript {
       }
 
       template<typename To>
-    Boxed_Value boxed_type_conversion(Conversion_Saves &t_saves, const Boxed_Value &from) const {
-      return boxed_type_conversion(user_type<To>(), t_saves, from);
+        Boxed_Value boxed_type_conversion(Conversion_Saves &t_saves, const Boxed_Value &from) const
+        {
+          try {
+            Boxed_Value ret = get_conversion(user_type<To>(), from.get_type_info())->convert(from);
+            if (t_saves.enabled) t_saves.saves.push_back(ret);
+            return ret;
+          } catch (const std::out_of_range &) {
+            throw exception::bad_boxed_dynamic_cast(from.get_type_info(), typeid(To), "No known conversion");
+          } catch (const std::bad_cast &) {
+            throw exception::bad_boxed_dynamic_cast(from.get_type_info(), typeid(To), "Unable to perform dynamic_cast operation");
+          }
         }
 
       template<typename From>
-    Boxed_Value boxed_type_down_conversion(Conversion_Saves &t_saves, const Boxed_Value &to) const {
-      return boxed_type_down_conversion(user_type<From>(), t_saves, to);
-    }
-
-    Boxed_Value boxed_type_conversion(const Type_Info &to, Conversion_Saves &t_saves, const Boxed_Value &from) const {
+        Boxed_Value boxed_type_down_conversion(Conversion_Saves &t_saves, const Boxed_Value &to) const
+        {
           try {
-        Boxed_Value ret = get_conversion(to, from.get_type_info())->convert(from);
-        if (t_saves.enabled) {
-          t_saves.saves.push_back(ret);
-        }
+            Boxed_Value ret = get_conversion(to.get_type_info(), user_type<From>())->convert_down(to);
+            if (t_saves.enabled) t_saves.saves.push_back(ret);
             return ret;
           } catch (const std::out_of_range &) {
-        throw exception::bad_boxed_dynamic_cast(from.get_type_info(), *to.bare_type_info(), "No known conversion");
+            throw exception::bad_boxed_dynamic_cast(to.get_type_info(), typeid(From), "No known conversion");
           } catch (const std::bad_cast &) {
-        throw exception::bad_boxed_dynamic_cast(from.get_type_info(), *to.bare_type_info(), "Unable to perform dynamic_cast operation");
+            throw exception::bad_boxed_dynamic_cast(to.get_type_info(), typeid(From), "Unable to perform dynamic_cast operation");
           }
         }
 
-    Boxed_Value boxed_type_down_conversion(const Type_Info &from, Conversion_Saves &t_saves, const Boxed_Value &to) const {
-      try {
-        Boxed_Value ret = get_conversion(to.get_type_info(), from)->convert_down(to);
-        if (t_saves.enabled) {
-          t_saves.saves.push_back(ret);
-        }
-        return ret;
-      } catch (const std::out_of_range &) {
-        throw exception::bad_boxed_dynamic_cast(to.get_type_info(), *from.bare_type_info(), "No known conversion");
-      } catch (const std::bad_cast &) {
-        throw exception::bad_boxed_dynamic_cast(to.get_type_info(), *from.bare_type_info(), "Unable to perform dynamic_cast operation");
-      }
+      static void enable_conversion_saves(Conversion_Saves &t_saves, bool t_val) 
+      {
+        t_saves.enabled = t_val;
       }
 
-    static void enable_conversion_saves(Conversion_Saves &t_saves, bool t_val) { t_saves.enabled = t_val; }
-
-    std::vector<Boxed_Value> take_saves(Conversion_Saves &t_saves) {
+      std::vector<Boxed_Value> take_saves(Conversion_Saves &t_saves)
+      {
         std::vector<Boxed_Value> ret;
         std::swap(ret, t_saves.saves);
         return ret;
       }
 
-    bool has_conversion(const Type_Info &to, const Type_Info &from) const {
+      bool has_conversion(const Type_Info &to, const Type_Info &from) const
+      {
         chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
         return find_bidir(to, from) != m_conversions.end();
       }
 
-    std::shared_ptr<detail::Type_Conversion_Base> get_conversion(const Type_Info &to, const Type_Info &from) const {
+      std::shared_ptr<detail::Type_Conversion_Base> get_conversion(const Type_Info &to, const Type_Info &from) const
+      {
         chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
 
-      const auto itr = find(to, from);
+        auto itr = find(to, from);
 
-      if (itr != m_conversions.end()) {
+        if (itr != m_conversions.end())
+        {
           return *itr;
         } else {
-        throw std::out_of_range(std::string("No such conversion exists from ") + from.bare_name() + " to " + to.bare_name());
+          throw std::out_of_range("No such conversion exists from " + from.bare_name() + " to " + to.bare_name());
         }
       }
 
-    Conversion_Saves &conversion_saves() const noexcept { return *m_conversion_saves; }
+      Conversion_Saves &conversion_saves() const {
+        return *m_conversion_saves;
+      }
 
     private:
-    std::set<std::shared_ptr<detail::Type_Conversion_Base>>::const_iterator find_bidir(const Type_Info &to, const Type_Info &from) const {
-      return std::find_if(m_conversions.begin(),
-                          m_conversions.end(),
-                          [&to, &from](const std::shared_ptr<detail::Type_Conversion_Base> &conversion) -> bool {
+      std::set<std::shared_ptr<detail::Type_Conversion_Base> >::const_iterator find_bidir(
+          const Type_Info &to, const Type_Info &from) const
+      {
+        return std::find_if(m_conversions.begin(), m_conversions.end(),
+              [&to, &from](const std::shared_ptr<detail::Type_Conversion_Base> &conversion) -> bool
+              {
                 return  (conversion->to().bare_equal(to) && conversion->from().bare_equal(from))
                      || (conversion->bidir() && conversion->from().bare_equal(to) && conversion->to().bare_equal(from));
-                          });
+              }
+        );
       }
 
-    std::set<std::shared_ptr<detail::Type_Conversion_Base>>::const_iterator find(const Type_Info &to, const Type_Info &from) const {
-      return std::find_if(m_conversions.begin(),
-                          m_conversions.end(),
-                          [&to, &from](const std::shared_ptr<detail::Type_Conversion_Base> &conversion) {
+      std::set<std::shared_ptr<detail::Type_Conversion_Base> >::const_iterator find(
+          const Type_Info &to, const Type_Info &from) const
+      {
+        return std::find_if(m_conversions.begin(), m_conversions.end(),
+              [&to, &from](const std::shared_ptr<detail::Type_Conversion_Base> &conversion)
+              {
                 return conversion->to().bare_equal(to) && conversion->from().bare_equal(from);
-                          });
+              }
+        );
       }
 
-    std::set<std::shared_ptr<detail::Type_Conversion_Base>> get_conversions() const {
+      std::set<std::shared_ptr<detail::Type_Conversion_Base>> get_conversions() const
+      {
         chaiscript::detail::threading::shared_lock<chaiscript::detail::threading::shared_mutex> l(m_mutex);
 
         return m_conversions;
       }
 
+
+
       mutable chaiscript::detail::threading::shared_mutex m_mutex;
       std::set<std::shared_ptr<detail::Type_Conversion_Base>> m_conversions;
       std::set<const std::type_info *, Less_Than> m_convertableTypes;
@@ -414,25 +503,34 @@ namespace chaiscript {
       mutable chaiscript::detail::threading::Thread_Storage<Conversion_Saves> m_conversion_saves;
   };
 
-  class Type_Conversions_State {
+  class Type_Conversions_State
+  {
     public:
-    Type_Conversions_State(const Type_Conversions &t_conversions, Type_Conversions::Conversion_Saves &t_saves)
-        : m_conversions(t_conversions)
-        , m_saves(t_saves) {
+      Type_Conversions_State(const Type_Conversions &t_conversions,
+          Type_Conversions::Conversion_Saves &t_saves)
+        : m_conversions(t_conversions),
+          m_saves(t_saves)
+      {
       }
 
-    const Type_Conversions *operator->() const noexcept { return &m_conversions.get(); }
+      const Type_Conversions *operator->() const {
+        return &m_conversions.get();
+      }
 
-    const Type_Conversions *get() const noexcept { return &m_conversions.get(); }
+      const Type_Conversions *get() const {
+        return &m_conversions.get();
+      }
 
-    Type_Conversions::Conversion_Saves &saves() const noexcept { return m_saves; }
+      Type_Conversions::Conversion_Saves &saves() const {
+        return m_saves;
+      }
 
     private:
       std::reference_wrapper<const Type_Conversions> m_conversions;
       std::reference_wrapper<Type_Conversions::Conversion_Saves> m_saves;
   };
 
-  using Type_Conversion = std::shared_ptr<chaiscript::detail::Type_Conversion_Base>;
+  typedef std::shared_ptr<chaiscript::detail::Type_Conversion_Base> Type_Conversion;
 
   /// \brief Used to register a to / parent class relationship with ChaiScript. Necessary if you
   ///        want automatic conversions up your inheritance hierarchy.
@@ -456,50 +554,59 @@ namespace chaiscript {
   /// \endcode
   /// 
   template<typename Base, typename Derived>
-  Type_Conversion base_class() {
-    // Can only be used with related polymorphic types
-    // may be expanded some day to support conversions other than child -> parent
-    static_assert(std::is_base_of<Base, Derived>::value, "Classes are not related by inheritance");
+  Type_Conversion base_class(typename std::enable_if<std::is_polymorphic<Base>::value && std::is_polymorphic<Derived>::value>::type* = nullptr)
+  {
+    //Can only be used with related polymorphic types
+    //may be expanded some day to support conversions other than child -> parent
+    static_assert(std::is_base_of<Base,Derived>::value, "Classes are not related by inheritance");
 
-    if constexpr (std::is_polymorphic<Base>::value && std::is_polymorphic<Derived>::value) {
     return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Dynamic_Conversion_Impl<Base, Derived>>();
-    } else {
+  }
+
+  template<typename Base, typename Derived>
+  Type_Conversion base_class(typename std::enable_if<!std::is_polymorphic<Base>::value || !std::is_polymorphic<Derived>::value>::type* = nullptr)
+  {
+    //Can only be used with related polymorphic types
+    //may be expanded some day to support conversions other than child -> parent
+    static_assert(std::is_base_of<Base,Derived>::value, "Classes are not related by inheritance");
+
     return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Static_Conversion_Impl<Base, Derived>>();
   }
-  }
+
 
   template<typename Callable>
-  Type_Conversion type_conversion(const Type_Info &t_from, const Type_Info &t_to, const Callable &t_func) {
+    Type_Conversion type_conversion(const Type_Info &t_from, const Type_Info &t_to, 
+        const Callable &t_func)
+    {
       return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<Callable>>(t_from, t_to, t_func);
     }
 
   template<typename From, typename To, typename Callable>
-  Type_Conversion type_conversion(const Callable &t_function) {
+    Type_Conversion type_conversion(const Callable &t_function)
+    {
       auto func = [t_function](const Boxed_Value &t_bv) -> Boxed_Value {
             // not even attempting to call boxed_cast so that we don't get caught in some call recursion
             return chaiscript::Boxed_Value(t_function(detail::Cast_Helper<const From &>::cast(t_bv, nullptr)));
           };
 
-    return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<From>(),
-                                                                                                               user_type<To>(),
-                                                                                                               func);
+      return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<From>(), user_type<To>(), func);
     }
 
   template<typename From, typename To>
-  Type_Conversion type_conversion() {
+    Type_Conversion type_conversion()
+    {
       static_assert(std::is_convertible<From, To>::value, "Types are not automatically convertible");
       auto func = [](const Boxed_Value &t_bv) -> Boxed_Value {
             // not even attempting to call boxed_cast so that we don't get caught in some call recursion
             return chaiscript::Boxed_Value(To(detail::Cast_Helper<From>::cast(t_bv, nullptr)));
           };
 
-    return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<From>(),
-                                                                                                               user_type<To>(),
-                                                                                                               func);
+      return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<From>(), user_type<To>(), func);
     }
 
   template<typename To>
-  Type_Conversion vector_conversion() {
+    Type_Conversion vector_conversion()
+    {
       auto func = [](const Boxed_Value &t_bv) -> Boxed_Value {
         const std::vector<Boxed_Value> &from_vec = detail::Cast_Helper<const std::vector<Boxed_Value> &>::cast(t_bv, nullptr);
 
@@ -512,28 +619,26 @@ namespace chaiscript {
         return Boxed_Value(std::move(vec));
       };
 
-    return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<std::vector<Boxed_Value>>(),
-                                                                                                               user_type<To>(),
-                                                                                                               func);
+      return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<std::vector<Boxed_Value>>(), user_type<To>(), func);
     }
 
   template<typename To>
-  Type_Conversion map_conversion() {
+    Type_Conversion map_conversion()
+    {
       auto func = [](const Boxed_Value &t_bv) -> Boxed_Value {
-      const std::map<std::string, Boxed_Value> &from_map
-          = detail::Cast_Helper<const std::map<std::string, Boxed_Value> &>::cast(t_bv, nullptr);
+        const std::map<std::string, Boxed_Value> &from_map = detail::Cast_Helper<const std::map<std::string, Boxed_Value> &>::cast(t_bv, nullptr);
 
         To map;
-      for (const std::pair<const std::string, Boxed_Value> &p : from_map) {
+        for (const std::pair<std::string, Boxed_Value> &p : from_map) {
           map.insert(std::make_pair(p.first, detail::Cast_Helper<typename To::mapped_type>::cast(p.second, nullptr)));
         }
 
         return Boxed_Value(std::move(map));
       };
 
-    return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(
-        user_type<std::map<std::string, Boxed_Value>>(), user_type<To>(), func);
+      return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(user_type<std::map<std::string, Boxed_Value>>(), user_type<To>(), func);
     }
-} // namespace chaiscript
+}
+
 
 #endif

include/chaiscript/dispatchkit/type_info.hpp

@@ -1,113 +1,154 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_TYPE_INFO_HPP_
 #define CHAISCRIPT_TYPE_INFO_HPP_
 
 #include <memory>
-#include <string>
 #include <type_traits>
 #include <typeinfo>
+#include <string>
 
-namespace chaiscript {
-  namespace detail {
+namespace chaiscript
+{
+
+  namespace detail
+  {
     template<typename T>
-    struct Bare_Type {
-      using type = typename std::remove_cv<typename std::remove_pointer<typename std::remove_reference<T>::type>::type>::type;
+      struct Bare_Type
+      {
+        typedef typename std::remove_cv<typename std::remove_pointer<typename std::remove_reference<T>::type>::type>::type type;
       };
-  } // namespace detail
+  }
+
 
   /// \brief Compile time deduced information about a type
-  class Type_Info {
+  class Type_Info
+  {
     public:
-    constexpr Type_Info(const bool t_is_const,
-                        const bool t_is_reference,
-                        const bool t_is_pointer,
-                        const bool t_is_void,
-                        const bool t_is_arithmetic,
-                        const std::type_info *t_ti,
-                        const std::type_info *t_bare_ti) noexcept
-        : m_type_info(t_ti)
-        , m_bare_type_info(t_bare_ti)
-        , m_flags((static_cast<unsigned int>(t_is_const) << is_const_flag) + (static_cast<unsigned int>(t_is_reference) << is_reference_flag)
-                  + (static_cast<unsigned int>(t_is_pointer) << is_pointer_flag) + (static_cast<unsigned int>(t_is_void) << is_void_flag)
-                  + (static_cast<unsigned int>(t_is_arithmetic) << is_arithmetic_flag)) {
+      CHAISCRIPT_CONSTEXPR Type_Info(bool t_is_const, bool t_is_reference, bool t_is_pointer, bool t_is_void, 
+          bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bare_ti)
+        : m_type_info(t_ti), m_bare_type_info(t_bare_ti),
+          m_flags((static_cast<unsigned int>(t_is_const) << is_const_flag)
+                + (static_cast<unsigned int>(t_is_reference) << is_reference_flag)
+                + (static_cast<unsigned int>(t_is_pointer) << is_pointer_flag)
+                + (static_cast<unsigned int>(t_is_void) << is_void_flag)
+                + (static_cast<unsigned int>(t_is_arithmetic) << is_arithmetic_flag))
+      {
       }
 
-    constexpr Type_Info() noexcept = default;
-
-    bool operator<(const Type_Info &ti) const noexcept { return m_type_info->before(*ti.m_type_info); }
-
-    constexpr bool operator!=(const Type_Info &ti) const noexcept { return !(operator==(ti)); }
-
-    constexpr bool operator!=(const std::type_info &ti) const noexcept { return !(operator==(ti)); }
-
-    constexpr bool operator==(const Type_Info &ti) const noexcept {
-      return ti.m_type_info == m_type_info || *ti.m_type_info == *m_type_info;
+      CHAISCRIPT_CONSTEXPR Type_Info()
+        : m_type_info(nullptr), m_bare_type_info(nullptr),
+          m_flags(1 << is_undef_flag)
+      {
       }
 
-    constexpr bool operator==(const std::type_info &ti) const noexcept { return !is_undef() && (*m_type_info) == ti; }
+#if !defined(_MSC_VER) || _MSC_VER != 1800
+      Type_Info(Type_Info&&) = default;
+      Type_Info& operator=(Type_Info&&) = default;
+#endif
 
-    constexpr bool bare_equal(const Type_Info &ti) const noexcept {
-      return ti.m_bare_type_info == m_bare_type_info || *ti.m_bare_type_info == *m_bare_type_info;
+      Type_Info(const Type_Info&) = default;
+      Type_Info& operator=(const Type_Info&) = default;
+
+
+      CHAISCRIPT_CONSTEXPR bool operator<(const Type_Info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return m_type_info < ti.m_type_info;
       }
 
-    constexpr bool bare_equal_type_info(const std::type_info &ti) const noexcept { return !is_undef() && (*m_bare_type_info) == ti; }
+      CHAISCRIPT_CONSTEXPR bool operator!=(const Type_Info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return !(operator==(ti));
+      }
 
-    constexpr bool is_const() const noexcept { return (m_flags & (1 << is_const_flag)) != 0; }
-    constexpr bool is_reference() const noexcept { return (m_flags & (1 << is_reference_flag)) != 0; }
-    constexpr bool is_void() const noexcept { return (m_flags & (1 << is_void_flag)) != 0; }
-    constexpr bool is_arithmetic() const noexcept { return (m_flags & (1 << is_arithmetic_flag)) != 0; }
-    constexpr bool is_undef() const noexcept { return (m_flags & (1 << is_undef_flag)) != 0; }
-    constexpr bool is_pointer() const noexcept { return (m_flags & (1 << is_pointer_flag)) != 0; }
+      CHAISCRIPT_CONSTEXPR bool operator!=(const std::type_info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return !(operator==(ti));
+      }
 
-    const char *name() const noexcept {
-      if (!is_undef()) {
+      CHAISCRIPT_CONSTEXPR bool operator==(const Type_Info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return ti.m_type_info == m_type_info
+          || (ti.m_type_info && m_type_info && *ti.m_type_info == *m_type_info);
+      }
+
+      CHAISCRIPT_CONSTEXPR bool operator==(const std::type_info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return m_type_info != nullptr && (*m_type_info) == ti;
+      }
+
+      CHAISCRIPT_CONSTEXPR bool bare_equal(const Type_Info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return ti.m_bare_type_info == m_bare_type_info 
+          || (ti.m_bare_type_info && m_bare_type_info && *ti.m_bare_type_info == *m_bare_type_info);
+      }
+
+      CHAISCRIPT_CONSTEXPR bool bare_equal_type_info(const std::type_info &ti) const CHAISCRIPT_NOEXCEPT
+      {
+        return m_bare_type_info != nullptr 
+          && (*m_bare_type_info) == ti;
+      }
+
+      CHAISCRIPT_CONSTEXPR bool is_const() const CHAISCRIPT_NOEXCEPT { return (m_flags & (1 << is_const_flag)) != 0; }
+      CHAISCRIPT_CONSTEXPR bool is_reference() const CHAISCRIPT_NOEXCEPT { return (m_flags & (1 << is_reference_flag)) != 0; }
+      CHAISCRIPT_CONSTEXPR bool is_void() const CHAISCRIPT_NOEXCEPT { return (m_flags & (1 << is_void_flag)) != 0; }
+      CHAISCRIPT_CONSTEXPR bool is_arithmetic() const CHAISCRIPT_NOEXCEPT { return (m_flags & (1 << is_arithmetic_flag)) != 0; }
+      CHAISCRIPT_CONSTEXPR bool is_undef() const CHAISCRIPT_NOEXCEPT { return (m_flags & (1 << is_undef_flag)) != 0; }
+      CHAISCRIPT_CONSTEXPR bool is_pointer() const CHAISCRIPT_NOEXCEPT { return (m_flags & (1 << is_pointer_flag)) != 0; }
+
+      std::string name() const
+      {
+        if (m_type_info)
+        {
           return m_type_info->name();
         } else {
           return "";
         }
       }
 
-    const char *bare_name() const noexcept {
-      if (!is_undef()) {
+      std::string bare_name() const
+      {
+        if (m_bare_type_info)
+        {
           return m_bare_type_info->name();
         } else {
           return "";
         }
       }
 
-    constexpr const std::type_info *bare_type_info() const noexcept { return m_bare_type_info; }
+      CHAISCRIPT_CONSTEXPR const std::type_info *bare_type_info() const
+      {
+        return m_bare_type_info;
+      }
 
     private:
-    struct Unknown_Type {
-    };
-
-    const std::type_info *m_type_info = &typeid(Unknown_Type);
-    const std::type_info *m_bare_type_info = &typeid(Unknown_Type);
+      const std::type_info *m_type_info;
+      const std::type_info *m_bare_type_info;
+      unsigned int m_flags;
       static const int is_const_flag = 0;
       static const int is_reference_flag = 1;
       static const int is_pointer_flag = 2;
       static const int is_void_flag = 3;
       static const int is_arithmetic_flag = 4;
       static const int is_undef_flag = 5;
-    unsigned int m_flags = (1 << is_undef_flag);
   };
 
-  namespace detail {
+  namespace detail
+  {
     /// Helper used to create a Type_Info object
     template<typename T>
-    struct Get_Type_Info {
-      constexpr static Type_Info get() noexcept {
+      struct Get_Type_Info
+      {
+        typedef T type;
+
+        static Type_Info get()
+        {
           return Type_Info(std::is_const<typename std::remove_pointer<typename std::remove_reference<T>::type>::type>::value, 
-                         std::is_reference<T>::value,
-                         std::is_pointer<T>::value,
+              std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
               (std::is_arithmetic<T>::value || std::is_arithmetic<typename std::remove_reference<T>::type>::value)
                 && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
@@ -117,66 +158,71 @@ namespace chaiscript {
       };
 
     template<typename T>
-    struct Get_Type_Info<std::shared_ptr<T>> {
-      constexpr static Type_Info get() noexcept {
-        return Type_Info(std::is_const<T>::value,
-                         std::is_reference<T>::value,
-                         std::is_pointer<T>::value,
+      struct Get_Type_Info<std::shared_ptr<T> >
+      {
+        typedef T type;
+
+        static Type_Info get()
+        {
+          return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
-                         std::is_arithmetic<T>::value
-                             && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
-                         &typeid(std::shared_ptr<T>),
+              std::is_arithmetic<T>::value && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
+              &typeid(std::shared_ptr<T> ), 
               &typeid(typename Bare_Type<T>::type));
         }
       };
 
     template<typename T>
-    struct Get_Type_Info<std::shared_ptr<T> &> : Get_Type_Info<std::shared_ptr<T>> {
+      struct Get_Type_Info<std::shared_ptr<T> &> : Get_Type_Info<std::shared_ptr<T>>
+      {
       };
 
     template<typename T>
-    struct Get_Type_Info<const std::shared_ptr<T> &> {
-      constexpr static Type_Info get() noexcept {
-        return Type_Info(std::is_const<T>::value,
-                         std::is_reference<T>::value,
-                         std::is_pointer<T>::value,
+      struct Get_Type_Info<const std::shared_ptr<T> &>
+      {
+        typedef T type;
+
+        static Type_Info get()
+        {
+          return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
-                         std::is_arithmetic<T>::value
-                             && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
+              std::is_arithmetic<T>::value && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
               &typeid(const std::shared_ptr<T> &), 
               &typeid(typename Bare_Type<T>::type));
         }
       };
 
     template<typename T>
-    struct Get_Type_Info<std::reference_wrapper<T>> {
-      constexpr static Type_Info get() noexcept {
-        return Type_Info(std::is_const<T>::value,
-                         std::is_reference<T>::value,
-                         std::is_pointer<T>::value,
+      struct Get_Type_Info<std::reference_wrapper<T> >
+      {
+        typedef T type;
+
+        static Type_Info get()
+        {
+          return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
-                         std::is_arithmetic<T>::value
-                             && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
-                         &typeid(std::reference_wrapper<T>),
+              std::is_arithmetic<T>::value && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
+              &typeid(std::reference_wrapper<T> ), 
               &typeid(typename Bare_Type<T>::type));
         }
       };
 
     template<typename T>
-    struct Get_Type_Info<const std::reference_wrapper<T> &> {
-      constexpr static Type_Info get() noexcept {
-        return Type_Info(std::is_const<T>::value,
-                         std::is_reference<T>::value,
-                         std::is_pointer<T>::value,
+      struct Get_Type_Info<const std::reference_wrapper<T> &>
+      {
+        typedef T type;
+
+        static Type_Info get()
+        {
+          return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
               std::is_void<T>::value,
-                         std::is_arithmetic<T>::value
-                             && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
+              std::is_arithmetic<T>::value && !std::is_same<typename std::remove_const<typename std::remove_reference<T>::type>::type, bool>::value,
               &typeid(const std::reference_wrapper<T> &), 
               &typeid(typename Bare_Type<T>::type));
         }
       };
 
-  } // namespace detail
+  }
 
   /// \brief Creates a Type_Info object representing the type passed in
   /// \tparam T Type of object to get a Type_Info for, derived from the passed in parameter
@@ -188,10 +234,12 @@ namespace chaiscript {
   /// chaiscript::Type_Info ti = chaiscript::user_type(i);
   /// \endcode
   template<typename T>
-  constexpr Type_Info user_type(const T & /*t*/) noexcept {
+   Type_Info user_type(const T &/*t*/)
+  {
     return detail::Get_Type_Info<T>::get();
   }
 
+
   /// \brief Creates a Type_Info object representing the templated type
   /// \tparam T Type of object to get a Type_Info for
   /// \return Type_Info for T
@@ -201,10 +249,12 @@ namespace chaiscript {
   /// chaiscript::Type_Info ti = chaiscript::user_type<int>();
   /// \endcode
   template<typename T>
-  constexpr Type_Info user_type() noexcept {
+   Type_Info user_type()
+  {
     return detail::Get_Type_Info<T>::get();
   }
 
-} // namespace chaiscript
+}
 
 #endif
+

include/chaiscript/language/chaiscript_algebraic.hpp

@@ -1,167 +1,130 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_ALGEBRAIC_HPP_
 #define CHAISCRIPT_ALGEBRAIC_HPP_
 
-#include "../utility/hash.hpp"
-
 #include <string>
 
-namespace chaiscript {
+namespace chaiscript
+{
+
   struct Operators {
-    enum class Opers {
-      equals,
-      less_than,
-      greater_than,
-      less_than_equal,
-      greater_than_equal,
-      not_equal,
-      assign,
-      pre_increment,
-      pre_decrement,
-      assign_product,
-      assign_sum,
-      assign_quotient,
-      assign_difference,
-      assign_bitwise_and,
-      assign_bitwise_or,
-      assign_shift_left,
-      assign_shift_right,
-      assign_remainder,
-      assign_bitwise_xor,
-      shift_left,
-      shift_right,
-      remainder,
-      bitwise_and,
-      bitwise_or,
-      bitwise_xor,
-      bitwise_complement,
-      sum,
-      quotient,
-      product,
-      difference,
-      unary_plus,
-      unary_minus,
+    enum Opers
+    {
+      boolean_flag,
+      equals, less_than, greater_than, less_than_equal, greater_than_equal, not_equal, 
+      non_const_flag, 
+      assign, pre_increment, pre_decrement, assign_product, assign_sum,
+      assign_quotient, assign_difference,
+      non_const_int_flag,
+      assign_bitwise_and, assign_bitwise_or, assign_shift_left, assign_shift_right,
+      assign_remainder, assign_bitwise_xor,
+      const_int_flag,
+      shift_left, shift_right, remainder, bitwise_and, bitwise_or, bitwise_xor, bitwise_complement,
+      const_flag,
+      sum, quotient, product, difference, unary_plus, unary_minus, 
       invalid
     };
 
-    constexpr static const char *to_string(Opers t_oper) noexcept {
-      constexpr const char *opers[]
-          = {"", "==", "<", ">", "<=", ">=", "!=", "", "=", "++", "--", "*=", "+=", "/=", "-=", "", "&=", "|=", "<<=", ">>=", "%=", "^=", "", "<<", ">>", "%", "&", "|", "^", "~", "", "+", "/", "*", "-", "+", "-", ""};
-      return opers[static_cast<int>(t_oper)];
-    }
-
-    constexpr static Opers to_operator(std::string_view t_str, bool t_is_unary = false) noexcept {
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4307)
-#endif
-
-      const auto op_hash = utility::hash(t_str);
-      switch (op_hash) {
-        case utility::hash("=="): {
-          return Opers::equals;
-        }
-        case utility::hash("<"): {
-          return Opers::less_than;
-        }
-        case utility::hash(">"): {
-          return Opers::greater_than;
-        }
-        case utility::hash("<="): {
-          return Opers::less_than_equal;
-        }
-        case utility::hash(">="): {
-          return Opers::greater_than_equal;
-        }
-        case utility::hash("!="): {
-          return Opers::not_equal;
-        }
-        case utility::hash("="): {
-          return Opers::assign;
-        }
-        case utility::hash("++"): {
-          return Opers::pre_increment;
-        }
-        case utility::hash("--"): {
-          return Opers::pre_decrement;
-        }
-        case utility::hash("*="): {
-          return Opers::assign_product;
-        }
-        case utility::hash("+="): {
-          return Opers::assign_sum;
-        }
-        case utility::hash("-="): {
-          return Opers::assign_difference;
-        }
-        case utility::hash("&="): {
-          return Opers::assign_bitwise_and;
-        }
-        case utility::hash("|="): {
-          return Opers::assign_bitwise_or;
-        }
-        case utility::hash("<<="): {
-          return Opers::assign_shift_left;
-        }
-        case utility::hash(">>="): {
-          return Opers::assign_shift_right;
-        }
-        case utility::hash("%="): {
-          return Opers::assign_remainder;
-        }
-        case utility::hash("^="): {
-          return Opers::assign_bitwise_xor;
-        }
-        case utility::hash("<<"): {
-          return Opers::shift_left;
-        }
-        case utility::hash(">>"): {
-          return Opers::shift_right;
-        }
-        case utility::hash("%"): {
-          return Opers::remainder;
-        }
-        case utility::hash("&"): {
-          return Opers::bitwise_and;
-        }
-        case utility::hash("|"): {
-          return Opers::bitwise_or;
-        }
-        case utility::hash("^"): {
-          return Opers::bitwise_xor;
-        }
-        case utility::hash("~"): {
-          return Opers::bitwise_complement;
-        }
-        case utility::hash("+"): {
-          return t_is_unary ? Opers::unary_plus : Opers::sum;
-        }
-        case utility::hash("-"): {
-          return t_is_unary ? Opers::unary_minus : Opers::difference;
-        }
-        case utility::hash("/"): {
-          return Opers::quotient;
-        }
-        case utility::hash("*"): {
-          return Opers::product;
-        }
-        default: {
-          return Opers::invalid;
-        }
-      }
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
-    }
+    static const char *to_string(Opers t_oper) {
+      const char *opers[] = { 
+        "",
+        "==", "<", ">", "<=", ">=", "!=",
+        "",
+        "=", "++", "--", "*=", "+=",
+        "/=", "-=",
+        "",
+        "&=", "|=", "<<=", ">>=",
+        "%=", "^=",
+        "", 
+        "<<", ">>", "%", "&", "|", "^", "~",
+        "",
+        "+", "/", "*", "-", "+", "-",
+        ""
       };
-} // namespace chaiscript
+      return opers[t_oper];
+    }
+
+    static Opers to_operator(const std::string &t_str, bool t_is_unary = false)
+    {
+      if (t_str == "==")
+      {
+        return equals;
+      } else if (t_str == "<") {
+        return less_than;
+      } else if (t_str == ">") {
+        return greater_than;
+      } else if (t_str == "<=") {
+        return less_than_equal; 
+      } else if (t_str == ">=") {
+        return greater_than_equal;
+      } else if (t_str == "!=") {
+        return not_equal;
+      } else if (t_str == "=") {
+        return assign;
+      } else if (t_str == "++") {
+        return pre_increment;
+      } else if (t_str == "--") {
+        return pre_decrement;
+      } else if (t_str == "*=") {
+        return assign_product;
+      } else if (t_str == "+=") {
+        return assign_sum;
+      } else if (t_str == "-=") {
+        return assign_difference;
+      } else if (t_str == "&=") {
+        return assign_bitwise_and;
+      } else if (t_str == "|=") {
+        return assign_bitwise_or;
+      } else if (t_str == "<<=") {
+        return assign_shift_left;
+      } else if (t_str == ">>=") {
+        return assign_shift_right;
+      } else if (t_str == "%=") {
+        return assign_remainder;
+      } else if (t_str == "^=") {
+        return assign_bitwise_xor;
+      } else if (t_str == "<<") {
+        return shift_left;
+      } else if (t_str == ">>") {
+        return shift_right;
+      } else if (t_str == "%") {
+        return remainder;
+      } else if (t_str == "&") { 
+        return bitwise_and;
+      } else if (t_str == "|") {
+        return bitwise_or;
+      } else if (t_str == "^") {
+        return bitwise_xor;
+      } else if (t_str == "~") {
+        return bitwise_complement;
+      } else if (t_str == "+") {
+        if (t_is_unary) {
+          return unary_plus;
+        } else {
+          return sum;
+        }
+      } else if (t_str == "-") {
+        if (t_is_unary) {
+          return unary_minus;
+        } else {
+          return difference;
+        }
+      } else if (t_str == "/") {
+        return quotient;
+      } else if (t_str == "*") {
+        return product;
+      } else {
+        return invalid;
+      } 
+    }
+
+  };
+}
 
 #endif /* _CHAISCRIPT_ALGEBRAIC_HPP */
+

include/chaiscript/language/chaiscript_common.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_COMMON_HPP_
 #define CHAISCRIPT_COMMON_HPP_
 
@@ -22,280 +19,88 @@
 #include "../dispatchkit/dispatchkit.hpp"
 #include "../dispatchkit/proxy_functions.hpp"
 #include "../dispatchkit/type_info.hpp"
-#include <unordered_set>
 
 namespace chaiscript {
-  struct AST_Node;
-  struct AST_Node_Trace;
-  namespace exception {
-    struct eval_error;
-  }
+struct AST_Node;
 }  // namespace chaiscript
 
-namespace chaiscript {
-  struct Name_Validator {
-    template<typename T>
-    static bool is_reserved_word(const T &s) noexcept {
-      const static std::unordered_set<std::uint32_t>
-          words{utility::hash("def"), utility::hash("fun"), utility::hash("while"), utility::hash("for"), utility::hash("if"), utility::hash("else"), utility::hash("&&"), utility::hash("||"), utility::hash(","), utility::hash("auto"), utility::hash("return"), utility::hash("break"), utility::hash("true"), utility::hash("false"), utility::hash("class"), utility::hash("attr"), utility::hash("var"), utility::hash("global"), utility::hash("GLOBAL"), utility::hash("_"), utility::hash("__LINE__"), utility::hash("__FILE__"), utility::hash("__FUNC__"), utility::hash("__CLASS__")};
-
-      return words.count(utility::hash(s)) == 1;
-    }
-
-    template<typename T>
-    static bool valid_object_name(const T &name) noexcept {
-      return name.find("::") == std::string::npos && !is_reserved_word(name);
-    }
-
-    template<typename T>
-    static void validate_object_name(const T &name) {
-      if (is_reserved_word(name)) {
-        throw exception::reserved_word_error(std::string(name));
-      }
-
-      if (name.find("::") != std::string::npos) {
-        throw exception::illegal_name_error(std::string(name));
-      }
-    }
-  };
+namespace chaiscript
+{
 
   /// Signature of module entry point that all binary loadable modules must implement.
-  using Create_Module_Func = ModulePtr (*)();
+  typedef ModulePtr (*Create_Module_Func)();
+
 
   /// Types of AST nodes available to the parser and eval
-  enum class AST_Node_Type {
-    Id,
-    Fun_Call,
-    Unused_Return_Fun_Call,
-    Arg_List,
-    Equation,
-    Var_Decl,
-    Assign_Decl,
-    Array_Call,
-    Dot_Access,
-    Lambda,
-    Block,
-    Scopeless_Block,
-    Def,
-    While,
-    If,
-    For,
-    Ranged_For,
-    Inline_Array,
-    Inline_Map,
-    Return,
-    File,
-    Prefix,
-    Break,
-    Continue,
-    Map_Pair,
-    Value_Range,
-    Inline_Range,
-    Try,
-    Catch,
-    Finally,
-    Method,
-    Attr_Decl,
-    Logical_And,
-    Logical_Or,
-    Reference,
-    Switch,
-    Case,
-    Default,
-    Noop,
-    Class,
-    Binary,
-    Arg,
-    Global_Decl,
-    Constant,
-    Compiled
+  class AST_Node_Type {
+  public:
+    enum Type { Error, Int, Float, Id, Char, Str, Eol, Fun_Call, Arg_List, Variable, Equation, Var_Decl,
+                Comparison, Addition, Subtraction, Multiplication, Division, Modulus, Array_Call, Dot_Access, Quoted_String, Single_Quoted_String,
+                Lambda, Block, Def, While, If, For, Inline_Array, Inline_Map, Return, File, Prefix, Break, Continue, Map_Pair, Value_Range,
+                Inline_Range, Annotation, Try, Catch, Finally, Method, Attr_Decl, Shift, Equality, Bitwise_And, Bitwise_Xor, Bitwise_Or, 
+                Logical_And, Logical_Or, Reference, Switch, Case, Default, Ternary_Cond, Noop, Class, Binary, Arg, Global_Decl
+    };
   };
 
-  enum class Operator_Precedence {
-    Ternary_Cond,
-    Logical_Or,
-    Logical_And,
-    Bitwise_Or,
-    Bitwise_Xor,
-    Bitwise_And,
-    Equality,
-    Comparison,
-    Shift,
-    Addition,
-    Multiplication,
-    Prefix
-  };
+  namespace
+  {
 
-  namespace {
     /// Helper lookup to get the name of each node type
-    constexpr const char *ast_node_type_to_string(AST_Node_Type ast_node_type) noexcept {
-      constexpr const char *const ast_node_types[] = {"Id", "Fun_Call", "Unused_Return_Fun_Call", "Arg_List", "Equation", "Var_Decl", "Assign_Decl", "Array_Call", "Dot_Access", "Lambda", "Block", "Scopeless_Block", "Def", "While", "If", "For", "Ranged_For", "Inline_Array", "Inline_Map", "Return", "File", "Prefix", "Break", "Continue", "Map_Pair", "Value_Range", "Inline_Range", "Try", "Catch", "Finally", "Method", "Attr_Decl", "Logical_And", "Logical_Or", "Reference", "Switch", "Case", "Default", "Noop", "Class", "Binary", "Arg", "Global_Decl", "Constant", "Compiled"};
+    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", "Arg_List", "Variable", "Equation", "Var_Decl",
+                                    "Comparison", "Addition", "Subtraction", "Multiplication", "Division", "Modulus", "Array_Call", "Dot_Access", "Quoted_String", "Single_Quoted_String",
+                                    "Lambda", "Block", "Def", "While", "If", "For", "Inline_Array", "Inline_Map", "Return", "File", "Prefix", "Break", "Continue", "Map_Pair", "Value_Range",
+                                    "Inline_Range", "Annotation", "Try", "Catch", "Finally", "Method", "Attr_Decl", "Shift", "Equality", "Bitwise_And", "Bitwise_Xor", "Bitwise_Or", 
+                                    "Logical_And", "Logical_Or", "Reference", "Switch", "Case", "Default", "Ternary Condition", "Noop", "Class", "Binary", "Arg"};
 
-      return ast_node_types[static_cast<int>(ast_node_type)];
+      return ast_node_types[ast_node_type];
+    }
   }
-  } // namespace
 
   /// \brief Convenience type for file positions
   struct File_Position {
-    int line = 0;
-    int column = 0;
+    int line;
+    int column;
 
-    constexpr File_Position(int t_file_line, int t_file_column) noexcept
-        : line(t_file_line)
-        , column(t_file_column) {
-    }
+    File_Position(int t_file_line, int t_file_column)
+      : line(t_file_line), column(t_file_column) { }
 
-    constexpr File_Position() noexcept = default;
+    File_Position() : line(0), column(0) { }
   };
 
   struct Parse_Location {
-    Parse_Location(std::string t_fname = "", const int t_start_line = 0, const int t_start_col = 0, const int t_end_line = 0, const int t_end_col = 0)
-        : start(t_start_line, t_start_col)
-        , end(t_end_line, t_end_col)
-        , filename(std::make_shared<std::string>(std::move(t_fname))) {
+    Parse_Location(std::string t_fname="", const int t_start_line=0, const int t_start_col=0,
+        const int t_end_line=0, const int t_end_col=0)
+      : start(t_start_line, t_start_col), 
+        end(t_end_line, t_end_col),
+        filename(std::make_shared<std::string>(std::move(t_fname)))
+    {
     }
 
-    Parse_Location(std::shared_ptr<std::string> t_fname,
-                   const int t_start_line = 0,
-                   const int t_start_col = 0,
-                   const int t_end_line = 0,
-                   const int t_end_col = 0)
-        : start(t_start_line, t_start_col)
-        , end(t_end_line, t_end_col)
-        , filename(std::move(t_fname)) {
+    Parse_Location(std::shared_ptr<std::string> t_fname, const int t_start_line=0, const int t_start_col=0,
+        const int t_end_line=0, const int t_end_col=0)
+      : start(t_start_line, t_start_col), 
+        end(t_end_line, t_end_col),
+        filename(std::move(t_fname))
+    {
     }
 
+
+
     File_Position start;
     File_Position end;
     std::shared_ptr<std::string> filename;
   };
 
-  /// \brief Struct that doubles as both a parser ast_node and an AST node.
-  struct AST_Node {
-  public:
-    const AST_Node_Type identifier;
-    const std::string text;
-    Parse_Location location;
-
-    const std::string &filename() const noexcept { return *location.filename; }
-
-    const File_Position &start() const noexcept { return location.start; }
-
-    const File_Position &end() const noexcept { return location.end; }
-
-    std::string pretty_print() const {
-      std::ostringstream oss;
-
-      oss << text;
-
-      for (auto &elem : get_children()) {
-        oss << elem.get().pretty_print() << ' ';
-      }
-
-      return oss.str();
-    }
-
-    virtual std::vector<std::reference_wrapper<AST_Node>> get_children() const = 0;
-    virtual Boxed_Value eval(const chaiscript::detail::Dispatch_State &t_e) const = 0;
-
-    /// Prints the contents of an AST node, including its children, recursively
-    std::string to_string(const std::string &t_prepend = "") const {
-      std::ostringstream oss;
-
-      oss << t_prepend << "(" << ast_node_type_to_string(this->identifier) << ") " << this->text << " : " << this->location.start.line
-          << ", " << this->location.start.column << '\n';
-
-      for (auto &elem : get_children()) {
-        oss << elem.get().to_string(t_prepend + "  ");
-      }
-      return oss.str();
-    }
-
-    static inline bool get_bool_condition(const Boxed_Value &t_bv, const chaiscript::detail::Dispatch_State &t_ss);
-
-    virtual ~AST_Node() noexcept = default;
-    AST_Node(AST_Node &&) = default;
-    AST_Node &operator=(AST_Node &&) = delete;
-    AST_Node(const AST_Node &) = delete;
-    AST_Node &operator=(const AST_Node &) = delete;
-
-  protected:
-    AST_Node(std::string t_ast_node_text, AST_Node_Type t_id, Parse_Location t_loc)
-        : identifier(t_id)
-        , text(std::move(t_ast_node_text))
-        , location(std::move(t_loc)) {
-    }
-  };
 
   /// \brief Typedef for pointers to AST_Node objects. Used in building of the AST_Node tree
-  using AST_NodePtr = std::unique_ptr<AST_Node>;
-  using AST_NodePtr_Const = std::unique_ptr<const AST_Node>;
+  typedef std::shared_ptr<AST_Node> AST_NodePtr;
+  typedef std::shared_ptr<const AST_Node> AST_NodePtr_Const;
 
-  struct AST_Node_Trace {
-    const AST_Node_Type identifier;
-    const std::string text;
-    Parse_Location location;
-
-    const std::string &filename() const noexcept { return *location.filename; }
-
-    const File_Position &start() const noexcept { return location.start; }
-
-    const File_Position &end() const noexcept { return location.end; }
-
-    std::string pretty_print() const {
-      std::ostringstream oss;
-
-      oss << text;
-
-      for (const auto &elem : children) {
-        oss << elem.pretty_print() << ' ';
-      }
-
-      return oss.str();
-    }
-
-    std::vector<AST_Node_Trace> get_children(const AST_Node &node) {
-      const auto node_children = node.get_children();
-      return std::vector<AST_Node_Trace>(node_children.begin(), node_children.end());
-    }
-
-    AST_Node_Trace(const AST_Node &node)
-        : identifier(node.identifier)
-        , text(node.text)
-        , location(node.location)
-        , children(get_children(node)) {
-    }
-
-    std::vector<AST_Node_Trace> children;
-  };
 
   /// \brief Classes which may be thrown during error cases when ChaiScript is executing.
-  namespace exception {
-    /// \brief Thrown if an error occurs while attempting to load a binary module
-    struct load_module_error : std::runtime_error {
-      explicit load_module_error(const std::string &t_reason)
-          : std::runtime_error(t_reason) {
-      }
-
-      load_module_error(const std::string &t_name, const std::vector<load_module_error> &t_errors)
-          : std::runtime_error(format_error(t_name, t_errors)) {
-      }
-
-      load_module_error(const load_module_error &) = default;
-      ~load_module_error() noexcept override = default;
-
-      static std::string format_error(const std::string &t_name, const std::vector<load_module_error> &t_errors) {
-        std::stringstream ss;
-        ss << "Error loading module '" << t_name << "'\n"
-           << "  The following locations were searched:\n";
-
-        for (const auto &err : t_errors) {
-          ss << "    " << err.what() << "\n";
-        }
-
-        return ss.str();
-      }
-    };
+  namespace exception
+  {
 
     /// Errors generated during parsing or evaluation
     struct eval_error : std::runtime_error {
@@ -303,57 +108,50 @@ namespace chaiscript {
       File_Position start_position;
       std::string filename;
       std::string detail;
-      std::vector<AST_Node_Trace> call_stack;
+      std::vector<AST_NodePtr_Const> call_stack;
+
+      eval_error(const std::string &t_why, const File_Position &t_where, const std::string &t_fname,
+          const std::vector<Boxed_Value> &t_parameters, const std::vector<chaiscript::Const_Proxy_Function> &t_functions,
+          bool t_dot_notation,
+          const chaiscript::detail::Dispatch_Engine &t_ss) CHAISCRIPT_NOEXCEPT :
+        std::runtime_error(format(t_why, t_where, t_fname, t_parameters, t_dot_notation, t_ss)),
+        reason(t_why), start_position(t_where), filename(t_fname), detail(format_detail(t_functions, t_dot_notation, t_ss)) 
+      {}
 
       eval_error(const std::string &t_why, 
-                 const File_Position &t_where,
-                 const std::string &t_fname,
-                 const std::vector<Boxed_Value> &t_parameters,
-                 const std::vector<chaiscript::Const_Proxy_Function> &t_functions,
+           const std::vector<Boxed_Value> &t_parameters, const std::vector<chaiscript::Const_Proxy_Function> &t_functions,
            bool t_dot_notation,
-                 const chaiscript::detail::Dispatch_Engine &t_ss) noexcept
-          : std::runtime_error(format(t_why, t_where, t_fname, t_parameters, t_dot_notation, t_ss))
-          , reason(t_why)
-          , start_position(t_where)
-          , filename(t_fname)
-          , detail(format_detail(t_functions, t_dot_notation, t_ss)) {
-      }
+           const chaiscript::detail::Dispatch_Engine &t_ss) CHAISCRIPT_NOEXCEPT :
+        std::runtime_error(format(t_why, t_parameters, t_dot_notation, t_ss)),
+        reason(t_why), detail(format_detail(t_functions, t_dot_notation, t_ss))
+      {}
 
-      eval_error(const std::string &t_why,
-                 const std::vector<Boxed_Value> &t_parameters,
-                 const std::vector<chaiscript::Const_Proxy_Function> &t_functions,
-                 bool t_dot_notation,
-                 const chaiscript::detail::Dispatch_Engine &t_ss) noexcept
-          : std::runtime_error(format(t_why, t_parameters, t_dot_notation, t_ss))
-          , reason(t_why)
-          , detail(format_detail(t_functions, t_dot_notation, t_ss)) {
-      }
 
-      eval_error(const std::string &t_why, const File_Position &t_where, const std::string &t_fname) noexcept
-          : std::runtime_error(format(t_why, t_where, t_fname))
-          , reason(t_why)
-          , start_position(t_where)
-          , filename(t_fname) {
-      }
+      eval_error(const std::string &t_why, const File_Position &t_where, const std::string &t_fname) CHAISCRIPT_NOEXCEPT :
+        std::runtime_error(format(t_why, t_where, t_fname)),
+        reason(t_why), start_position(t_where), filename(t_fname)
+      {}
 
-      explicit eval_error(const std::string &t_why) noexcept
-          : std::runtime_error("Error: \"" + t_why + "\" ")
-          , reason(t_why) {
-      }
+      eval_error(const std::string &t_why) CHAISCRIPT_NOEXCEPT
+        : std::runtime_error("Error: \"" + t_why + "\" "),
+        reason(t_why) 
+      {}
 
       eval_error(const eval_error &) = default;
 
-      std::string pretty_print() const {
+      std::string pretty_print() const
+      {
         std::ostringstream ss;
 
         ss << what();
-        if (!call_stack.empty()) {
+        if (call_stack.size() > 0) {
           ss << "during evaluation at (" << fname(call_stack[0]) << " " << startpos(call_stack[0]) << ")\n";
-          ss << '\n'
-             << detail << '\n';
+          ss << '\n' << detail << '\n';
           ss << "  " << fname(call_stack[0]) << " (" << startpos(call_stack[0]) << ") '" << pretty(call_stack[0]) << "'";
           for (size_t j = 1; j < call_stack.size(); ++j) {
-            if (id(call_stack[j]) != chaiscript::AST_Node_Type::Block && id(call_stack[j]) != chaiscript::AST_Node_Type::File) {
+            if (id(call_stack[j]) != chaiscript::AST_Node_Type::Block
+                && id(call_stack[j]) != chaiscript::AST_Node_Type::File)
+            {
               ss << '\n';
               ss << "  from " << fname(call_stack[j]) << " (" << startpos(call_stack[j]) << ") '" << pretty(call_stack[j]) << "'";
             }
@@ -363,42 +161,54 @@ namespace chaiscript {
         return ss.str();
       }
 
-      ~eval_error() noexcept override = default;
+      virtual ~eval_error() CHAISCRIPT_NOEXCEPT {}
 
     private:
+
       template<typename T>
-      static AST_Node_Type id(const T &t) noexcept {
-        return t.identifier;
+        static int id(const T& t)
+        {
+          return t->identifier;
         }
 
       template<typename T>
-      static std::string pretty(const T &t) {
-        return t.pretty_print();
+        static std::string pretty(const T& t)
+        {
+          return t->pretty_print();
         }
 
       template<typename T>
-      static const std::string &fname(const T &t) noexcept {
-        return t.filename();
+        static const std::string &fname(const T& t)
+        {
+          return t->filename();
         }
 
       template<typename T>
-      static std::string startpos(const T &t) {
+        static std::string startpos(const T& t)
+        {
           std::ostringstream oss;
-        oss << t.start().line << ", " << t.start().column;
+          oss << t->start().line << ", " << t->start().column;
           return oss.str();
         }
 
-      static std::string format_why(const std::string &t_why) { return "Error: \"" + t_why + "\""; }
+      static std::string format_why(const std::string &t_why)
+      {
+        return "Error: \"" + t_why + "\"";
+      }
 
-      static std::string format_types(const Const_Proxy_Function &t_func, bool t_dot_notation, const chaiscript::detail::Dispatch_Engine &t_ss) {
-        assert(t_func);
+      static std::string format_types(const Const_Proxy_Function &t_func,
+          bool t_dot_notation,
+          const chaiscript::detail::Dispatch_Engine &t_ss)
+      {
         int arity = t_func->get_arity();
         std::vector<Type_Info> types = t_func->get_param_types();
 
         std::string retval;
-        if (arity == -1) {
+        if (arity == -1)
+        {
           retval = "(...)";
-          if (t_dot_notation) {
+          if (t_dot_notation)
+          {
             retval = "(Object)." + retval;
           }
         } else if (types.size() <= 1) {
@@ -409,13 +219,18 @@ namespace chaiscript {
 
           std::string paramstr;
 
-          for (size_t index = 1; index != types.size(); ++index) {
-            paramstr += (types[index].is_const() ? "const " : "");
+          for (size_t index = 1;
+               index != types.size();
+               ++index)
+          {
+            paramstr += (types[index].is_const()?"const ":"");
             paramstr += t_ss.get_type_name(types[index]);
 
-            if (index == 1 && t_dot_notation) {
+            if (index == 1 && t_dot_notation)
+            {
               paramstr += ").(";
-              if (types.size() == 2) {
+              if (types.size() == 2)
+              {
                 paramstr += ", ";
               }
             } else {
@@ -429,15 +244,19 @@ namespace chaiscript {
           retval = ss.str();
         }
 
+
         std::shared_ptr<const dispatch::Dynamic_Proxy_Function> dynfun 
           = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_func);
 
-        if (dynfun && dynfun->has_parse_tree()) {
+        if (dynfun)
+        {
           Proxy_Function f = dynfun->get_guard();
 
-          if (f) {
+          if (f)
+          {
             auto dynfunguard = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(f);
-            if (dynfunguard && dynfunguard->has_parse_tree()) {
+            if (dynfunguard)
+            {
               retval += " : " + format_guard(dynfunguard->get_parse_tree());
             }
           }
@@ -449,50 +268,69 @@ namespace chaiscript {
       }
 
       template<typename T>
-      static std::string format_guard(const T &t) {
-        return t.pretty_print();
+        static std::string format_guard(const T &t)
+        {
+          return t->pretty_print();
         }
 
       template<typename T>
-      static std::string format_location(const T &t) {
+        static std::string format_location(const T &t)
+        {
+          if (t) {
             std::ostringstream oss;
-        oss << "(" << t.filename() << " " << t.start().line << ", " << t.start().column << ")";
+            oss << "(" << t->filename() << " " << t->start().line << ", " << t->start().column << ")"; 
             return oss.str();
+          } else {
+            return "(internal)";
+          }
+
         }
 
       static std::string format_detail(const std::vector<chaiscript::Const_Proxy_Function> &t_functions,
           bool t_dot_notation,
-                                       const chaiscript::detail::Dispatch_Engine &t_ss) {
+          const chaiscript::detail::Dispatch_Engine &t_ss)
+      {
         std::stringstream ss;
-        if (t_functions.size() == 1) {
-          assert(t_functions[0]);
+        if (t_functions.size() == 1)
+        {
           ss << "  Expected: " << format_types(t_functions[0], t_dot_notation, t_ss) << '\n';
         } else {
           ss << "  " << t_functions.size() << " overloads available:\n";
 
-          for (const auto &t_function : t_functions) {
+          for (const auto & t_function : t_functions)
+          {
             ss << "      " << format_types((t_function), t_dot_notation, t_ss) << '\n';
           }
+
         }
 
         return ss.str();
+
       }
 
-      static std::string
-      format_parameters(const std::vector<Boxed_Value> &t_parameters, bool t_dot_notation, const chaiscript::detail::Dispatch_Engine &t_ss) {
+      static std::string format_parameters(const std::vector<Boxed_Value> &t_parameters,
+          bool t_dot_notation,
+          const chaiscript::detail::Dispatch_Engine &t_ss)
+      {
         std::stringstream ss;
         ss << "(";
 
-        if (!t_parameters.empty()) {
+        if (!t_parameters.empty())
+        {
           std::string paramstr;
 
-          for (auto itr = t_parameters.begin(); itr != t_parameters.end(); ++itr) {
-            paramstr += (itr->is_const() ? "const " : "");
+          for (auto itr = t_parameters.begin();
+               itr != t_parameters.end();
+               ++itr)
+          {
+            paramstr += (itr->is_const()?"const ":"");
             paramstr += t_ss.type_name(*itr);
 
-            if (itr == t_parameters.begin() && t_dot_notation) {
+            if (itr == t_parameters.begin() && t_dot_notation)
+            {
               paramstr += ").(";
-              if (t_parameters.size() == 1) {
+              if (t_parameters.size() == 1)
+              {
                 paramstr += ", ";
               }
             } else {
@@ -507,10 +345,12 @@ namespace chaiscript {
         return ss.str();
       }
 
-      static std::string format_filename(const std::string &t_fname) {
+      static std::string format_filename(const std::string &t_fname)
+      {
         std::stringstream ss;
 
-        if (t_fname != "__EVAL__") {
+        if (t_fname != "__EVAL__")
+        {
           ss << "in '" << t_fname << "' ";
         } else {
           ss << "during evaluation ";
@@ -519,18 +359,16 @@ namespace chaiscript {
         return ss.str();
       }
 
-      static std::string format_location(const File_Position &t_where) {
+      static std::string format_location(const File_Position &t_where)
+      {
         std::stringstream ss;
         ss << "at (" << t_where.line << ", " << t_where.column << ")";
         return ss.str();
       }
 
-      static std::string format(const std::string &t_why,
-                                const File_Position &t_where,
-                                const std::string &t_fname,
-                                const std::vector<Boxed_Value> &t_parameters,
-                                bool t_dot_notation,
-                                const chaiscript::detail::Dispatch_Engine &t_ss) {
+      static std::string format(const std::string &t_why, const File_Position &t_where, const std::string &t_fname,
+          const std::vector<Boxed_Value> &t_parameters, bool t_dot_notation, const chaiscript::detail::Dispatch_Engine &t_ss)
+      {
         std::stringstream ss;
 
         ss << format_why(t_why);
@@ -550,7 +388,8 @@ namespace chaiscript {
       static std::string format(const std::string &t_why, 
           const std::vector<Boxed_Value> &t_parameters, 
           bool t_dot_notation,
-                                const chaiscript::detail::Dispatch_Engine &t_ss) {
+          const chaiscript::detail::Dispatch_Engine &t_ss)
+      {
         std::stringstream ss;
 
         ss << format_why(t_why);
@@ -562,7 +401,8 @@ namespace chaiscript {
         return ss.str();
       }
 
-      static std::string format(const std::string &t_why, const File_Position &t_where, const std::string &t_fname) {
+      static std::string format(const std::string &t_why, const File_Position &t_where, const std::string &t_fname)
+      {
         std::stringstream ss;
 
         ss << format_why(t_why);
@@ -577,125 +417,218 @@ namespace chaiscript {
       }
     };
 
+
     /// Errors generated when loading a file
     struct file_not_found_error : std::runtime_error {
-      explicit file_not_found_error(const std::string &t_filename)
+      file_not_found_error(const std::string &t_filename) CHAISCRIPT_NOEXCEPT
         : std::runtime_error("File Not Found: " + t_filename)
-          , filename(t_filename) {
-      }
+      { }
 
       file_not_found_error(const file_not_found_error &) = default;
-      ~file_not_found_error() noexcept override = default;
-
-      std::string filename;
+      virtual ~file_not_found_error() CHAISCRIPT_NOEXCEPT {}
     };
 
-  } // namespace exception
+  }
 
-  //static
-  bool AST_Node::get_bool_condition(const Boxed_Value &t_bv, const chaiscript::detail::Dispatch_State &t_ss) {
+ 
+  /// \brief Struct that doubles as both a parser ast_node and an AST node.
+  struct AST_Node : std::enable_shared_from_this<AST_Node> {
+    public:
+      const int identifier; //< \todo shouldn't this be a strongly typed enum value?
+      const std::string text;
+      Parse_Location location;
+      std::vector<AST_NodePtr> children;
+      AST_NodePtr annotation;
+
+      const std::string &filename() const {
+        return *location.filename;
+      }
+
+      const File_Position &start() const {
+        return location.start;
+      }
+
+      const File_Position &end() const {
+        return location.end;
+      }
+
+      virtual std::string pretty_print() const
+      {
+        std::ostringstream oss;
+
+        oss << text;
+
+        for (auto & elem : this->children) {
+          oss << elem->pretty_print();
+        }
+
+        return oss.str();
+      }
+
+
+      /// Prints the contents of an AST node, including its children, recursively
+      std::string to_string(const std::string &t_prepend = "") const {
+        std::ostringstream oss;
+
+        oss << t_prepend << "(" << ast_node_type_to_string(this->identifier) << ") "
+            << this->text << " : " << this->location.start.line << ", " << this->location.start.column << '\n';
+
+        for (auto & elem : this->children) {
+          oss << elem->to_string(t_prepend + "  ");
+        }
+        return oss.str();
+      }
+
+      Boxed_Value eval(const chaiscript::detail::Dispatch_State &t_e) const
+      {
         try {
-        return t_ss->boxed_cast<bool>(t_bv);
-      } catch (const exception::bad_boxed_cast &) {
+          return eval_internal(t_e);
+        } catch (exception::eval_error &ee) {
+          ee.call_stack.push_back(shared_from_this());
+          throw;
+        }
+      }
+
+      static bool get_bool_condition(const Boxed_Value &t_bv) {
+        try {
+          return boxed_cast<bool>(t_bv);
+        }
+        catch (const exception::bad_boxed_cast &) {
           throw exception::eval_error("Condition not boolean");
         }
       }
 
-  namespace parser {
-    class ChaiScript_Parser_Base {
-    public:
-      virtual AST_NodePtr parse(const std::string &t_input, const std::string &t_fname) = 0;
-      virtual void debug_print(const AST_Node &t, std::string prepend = "") const = 0;
-      virtual void *get_tracer_ptr() = 0;
-      virtual ~ChaiScript_Parser_Base() = default;
-      ChaiScript_Parser_Base() = default;
-      ChaiScript_Parser_Base(ChaiScript_Parser_Base &&) = default;
-      ChaiScript_Parser_Base &operator=(ChaiScript_Parser_Base &&) = delete;
-      ChaiScript_Parser_Base &operator=(const ChaiScript_Parser_Base &&) = delete;
 
-      template<typename T>
-      T &get_tracer() noexcept {
-        // to do type check this somehow?
-        return *static_cast<T *>(get_tracer_ptr());
+      void replace_child(const AST_NodePtr &t_child, const AST_NodePtr &t_new_child)
+      {
+        std::replace(children.begin(), children.end(), t_child, t_new_child);
       }
 
-    protected:
-      ChaiScript_Parser_Base(const ChaiScript_Parser_Base &) = default;
-    };
-  } // namespace parser
+      virtual ~AST_Node() {}
 
-  namespace eval {
-    namespace detail {
+    protected:
+      AST_Node(std::string t_ast_node_text, int t_id, Parse_Location t_loc, 
+               std::vector<AST_NodePtr> t_children = std::vector<AST_NodePtr>()) :
+        identifier(t_id), text(std::move(t_ast_node_text)),
+        location(std::move(t_loc)),
+        children(std::move(t_children))
+      {
+      }
+
+      virtual Boxed_Value eval_internal(const chaiscript::detail::Dispatch_State &) const
+      {
+        throw std::runtime_error("Undispatched ast_node (internal error)");
+      }
+
+    private:
+      // Copy and assignment explicitly unimplemented
+      AST_Node(const AST_Node &) = delete;
+      AST_Node& operator=(const AST_Node &) = delete;
+  };
+
+
+  namespace eval
+  {
+    namespace detail
+    {
       /// Special type for returned values
       struct Return_Value {
         Boxed_Value retval;
+
+        Return_Value(Boxed_Value t_return_value) : retval(std::move(t_return_value)) { }
       };
 
+
       /// Special type indicating a call to 'break'
       struct Break_Loop {
+        Break_Loop() { }
       };
 
+
       /// Special type indicating a call to 'continue'
       struct Continue_Loop {
+        Continue_Loop() { }
       };
 
-      /// Creates a new scope then pops it on destruction
-      struct Scope_Push_Pop {
-        Scope_Push_Pop(Scope_Push_Pop &&) = default;
-        Scope_Push_Pop &operator=(Scope_Push_Pop &&) = delete;
-        Scope_Push_Pop(const Scope_Push_Pop &) = delete;
-        Scope_Push_Pop &operator=(const Scope_Push_Pop &) = delete;
 
-        explicit Scope_Push_Pop(const chaiscript::detail::Dispatch_State &t_ds)
-            : m_ds(t_ds) {
-          m_ds->new_scope(m_ds.stack_holder());
+      /// Creates a new scope then pops it on destruction
+      struct Scope_Push_Pop
+      {
+        Scope_Push_Pop(const Scope_Push_Pop &) = delete;
+        Scope_Push_Pop& operator=(const Scope_Push_Pop &) = delete;
+
+        Scope_Push_Pop(const chaiscript::detail::Dispatch_State &t_ds)
+          : m_ds(t_ds)
+        {
+          m_ds.get()->new_scope(m_ds.get().stack_holder());
+        }
+
+        ~Scope_Push_Pop()
+        {
+          m_ds.get()->pop_scope(m_ds.get().stack_holder());
         }
 
-        ~Scope_Push_Pop() { m_ds->pop_scope(m_ds.stack_holder()); }
 
         private:
-        const chaiscript::detail::Dispatch_State &m_ds;
+        std::reference_wrapper<const chaiscript::detail::Dispatch_State> m_ds;
       };
 
       /// Creates a new function call and pops it on destruction
-      struct Function_Push_Pop {
-        Function_Push_Pop(Function_Push_Pop &&) = default;
-        Function_Push_Pop &operator=(Function_Push_Pop &&) = delete;
+      struct Function_Push_Pop
+      {
         Function_Push_Pop(const Function_Push_Pop &) = delete;
-        Function_Push_Pop &operator=(const Function_Push_Pop &) = delete;
+        Function_Push_Pop& operator=(const Function_Push_Pop &) = delete;
 
-        explicit Function_Push_Pop(const chaiscript::detail::Dispatch_State &t_ds)
-            : m_ds(t_ds) {
-          m_ds->new_function_call(m_ds.stack_holder(), m_ds.conversion_saves());
+        Function_Push_Pop(const chaiscript::detail::Dispatch_State &t_ds)
+          : m_ds(t_ds)
+        {
+          m_ds.get()->new_function_call(m_ds.get().stack_holder(), m_ds.get().conversion_saves());
         }
 
-        ~Function_Push_Pop() { m_ds->pop_function_call(m_ds.stack_holder(), m_ds.conversion_saves()); }
+        ~Function_Push_Pop()
+        {
+          m_ds.get()->pop_function_call(m_ds.get().stack_holder(), m_ds.get().conversion_saves());
+        }
+
+        void save_params(const std::vector<Boxed_Value> &t_params)
+        {
+          m_ds.get()->save_function_params(t_params);
+        }
+
+        void save_params(std::initializer_list<Boxed_Value> t_params)
+        {
+          m_ds.get()->save_function_params(std::move(t_params));
+        }
 
-        void save_params(const Function_Params &t_params) { m_ds->save_function_params(t_params); }
 
         private:
-        const chaiscript::detail::Dispatch_State &m_ds;
+          std::reference_wrapper<const chaiscript::detail::Dispatch_State> m_ds;
       };
 
       /// Creates a new scope then pops it on destruction
-      struct Stack_Push_Pop {
-        Stack_Push_Pop(Stack_Push_Pop &&) = default;
-        Stack_Push_Pop &operator=(Stack_Push_Pop &&) = delete;
+      struct Stack_Push_Pop
+      {
         Stack_Push_Pop(const Stack_Push_Pop &) = delete;
-        Stack_Push_Pop &operator=(const Stack_Push_Pop &) = delete;
+        Stack_Push_Pop& operator=(const Stack_Push_Pop &) = delete;
 
-        explicit Stack_Push_Pop(const chaiscript::detail::Dispatch_State &t_ds)
-            : m_ds(t_ds) {
-          m_ds->new_stack(m_ds.stack_holder());
+        Stack_Push_Pop(const chaiscript::detail::Dispatch_State &t_ds)
+          : m_ds(t_ds)
+        {
+          m_ds.get()->new_stack(m_ds.get().stack_holder());
+        }
+
+        ~Stack_Push_Pop()
+        {
+          m_ds.get()->pop_stack(m_ds.get().stack_holder());
         }
 
-        ~Stack_Push_Pop() { m_ds->pop_stack(m_ds.stack_holder()); }
 
         private:
-        const chaiscript::detail::Dispatch_State &m_ds;
+          std::reference_wrapper<const chaiscript::detail::Dispatch_State> m_ds;
       };
-    } // namespace detail
-  } // namespace eval
-} // namespace chaiscript
+    }
+  }
+}
 
 #endif /* _CHAISCRIPT_COMMON_HPP */
+

include/chaiscript/language/chaiscript_optimizer.hpp

@@ -1,433 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_OPTIMIZER_HPP_
-#define CHAISCRIPT_OPTIMIZER_HPP_
-
-#include "chaiscript_eval.hpp"
-
-namespace chaiscript {
-  namespace optimizer {
-    template<typename... T>
-    struct Optimizer : T... {
-      Optimizer() = default;
-      explicit Optimizer(T... t)
-          : T(std::move(t))... {
-      }
-
-      template<typename Tracer>
-      auto optimize(eval::AST_Node_Impl_Ptr<Tracer> p) {
-        ((p = static_cast<T &>(*this).optimize(std::move(p))), ...);
-        return p;
-      }
-    };
-
-    template<typename T>
-    eval::AST_Node_Impl<T> &child_at(eval::AST_Node_Impl<T> &node, const size_t offset) noexcept {
-      if (node.children[offset]->identifier == AST_Node_Type::Compiled) {
-        return *(dynamic_cast<eval::Compiled_AST_Node<T> &>(*node.children[offset]).m_original_node);
-      } else {
-        return *node.children[offset];
-      }
-    }
-
-    template<typename T>
-    const eval::AST_Node_Impl<T> &child_at(const eval::AST_Node_Impl<T> &node, const size_t offset) noexcept {
-      if (node.children[offset]->identifier == AST_Node_Type::Compiled) {
-        return *(dynamic_cast<const eval::Compiled_AST_Node<T> &>(*node.children[offset]).m_original_node);
-      } else {
-        return *node.children[offset];
-      }
-
-      /*
-    if (node->identifier == AST_Node_Type::Compiled) {
-      return dynamic_cast<const eval::Compiled_AST_Node<T>&>(*node).m_original_node->children[offset];
-    } else {
-      return node->children[offset];
-    }
-    */
-    }
-
-    template<typename T>
-    auto child_count(const eval::AST_Node_Impl<T> &node) noexcept {
-      if (node.identifier == AST_Node_Type::Compiled) {
-        return dynamic_cast<const eval::Compiled_AST_Node<T> &>(node).m_original_node->children.size();
-      } else {
-        return node.children.size();
-      }
-    }
-
-    template<typename T, typename Callable>
-    auto make_compiled_node(eval::AST_Node_Impl_Ptr<T> original_node, std::vector<eval::AST_Node_Impl_Ptr<T>> children, Callable callable) {
-      return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Compiled_AST_Node<T>>(std::move(original_node),
-                                                                                         std::move(children),
-                                                                                         std::move(callable));
-    }
-
-    struct Return {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> p) {
-        if ((p->identifier == AST_Node_Type::Def || p->identifier == AST_Node_Type::Lambda) && !p->children.empty()) {
-          auto &last_child = p->children.back();
-          if (last_child->identifier == AST_Node_Type::Block) {
-            auto &block_last_child = last_child->children.back();
-            if (block_last_child->identifier == AST_Node_Type::Return) {
-              if (block_last_child->children.size() == 1) {
-                last_child->children.back() = std::move(block_last_child->children[0]);
-              }
-            }
-          }
-        }
-
-        return p;
-      }
-    };
-
-    template<typename T>
-    bool contains_var_decl_in_scope(const eval::AST_Node_Impl<T> &node) noexcept {
-      if (node.identifier == AST_Node_Type::Var_Decl || node.identifier == AST_Node_Type::Assign_Decl
-          || node.identifier == AST_Node_Type::Reference) {
-        return true;
-      }
-
-      const auto num = child_count(node);
-
-      for (size_t i = 0; i < num; ++i) {
-        const auto &child = child_at(node, i);
-        if (child.identifier != AST_Node_Type::Block && child.identifier != AST_Node_Type::For
-            && child.identifier != AST_Node_Type::Ranged_For && contains_var_decl_in_scope(child)) {
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    struct Block {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> node) {
-        if (node->identifier == AST_Node_Type::Block) {
-          if (!contains_var_decl_in_scope(*node)) {
-            if (node->children.size() == 1) {
-              return std::move(node->children[0]);
-            } else {
-              return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Scopeless_Block_AST_Node<T>>(node->text,
-                                                                                                        node->location,
-                                                                                                        std::move(node->children));
-            }
-          }
-        }
-
-        return node;
-      }
-    };
-
-    struct Dead_Code {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> node) {
-        if (node->identifier == AST_Node_Type::Block) {
-          std::vector<size_t> keepers;
-          const auto num_children = node->children.size();
-          keepers.reserve(num_children);
-
-          for (size_t i = 0; i < num_children; ++i) {
-            const auto &child = *node->children[i];
-            if ((child.identifier != AST_Node_Type::Id && child.identifier != AST_Node_Type::Constant
-                 && child.identifier != AST_Node_Type::Noop)
-                || i == num_children - 1) {
-              keepers.push_back(i);
-            }
-          }
-
-          if (keepers.size() == num_children) {
-            return node;
-          } else {
-            const auto new_children = [&]() {
-              std::vector<eval::AST_Node_Impl_Ptr<T>> retval;
-              for (const auto x : keepers) {
-                retval.push_back(std::move(node->children[x]));
-              }
-              return retval;
-            };
-
-            return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Block_AST_Node<T>>(node->text, node->location, new_children());
-          }
-        } else {
-          return node;
-        }
-      }
-    };
-
-    struct Unused_Return {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> node) {
-        if ((node->identifier == AST_Node_Type::Block || node->identifier == AST_Node_Type::Scopeless_Block) && !node->children.empty()) {
-          for (size_t i = 0; i < node->children.size() - 1; ++i) {
-            auto child = node->children[i].get();
-            if (child->identifier == AST_Node_Type::Fun_Call) {
-              node->children[i]
-                  = chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Unused_Return_Fun_Call_AST_Node<T>>(child->text,
-                                                                                                              child->location,
-                                                                                                              std::move(child->children));
-            }
-          }
-        } else if ((node->identifier == AST_Node_Type::For || node->identifier == AST_Node_Type::While) && child_count(*node) > 0) {
-          auto &child = child_at(*node, child_count(*node) - 1);
-          if (child.identifier == AST_Node_Type::Block || child.identifier == AST_Node_Type::Scopeless_Block) {
-            auto num_sub_children = child_count(child);
-            for (size_t i = 0; i < num_sub_children; ++i) {
-              auto &sub_child = child_at(child, i);
-              if (sub_child.identifier == AST_Node_Type::Fun_Call) {
-                child.children[i] = chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Unused_Return_Fun_Call_AST_Node<T>>(
-                    sub_child.text, sub_child.location, std::move(sub_child.children));
-              }
-            }
-          }
-        }
-        return node;
-      }
-    };
-
-    struct Assign_Decl {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> node) {
-        if ((node->identifier == AST_Node_Type::Equation) && node->text == "=" && node->children.size() == 2
-            && node->children[0]->identifier == AST_Node_Type::Var_Decl) {
-          std::vector<eval::AST_Node_Impl_Ptr<T>> new_children;
-          new_children.push_back(std::move(node->children[0]->children[0]));
-          new_children.push_back(std::move(node->children[1]));
-          return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Assign_Decl_AST_Node<T>>(node->text,
-                                                                                                node->location,
-                                                                                                std::move(new_children));
-        }
-
-        return node;
-      }
-    };
-
-    struct If {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> node) {
-        if ((node->identifier == AST_Node_Type::If) && node->children.size() >= 2 && node->children[0]->identifier == AST_Node_Type::Constant) {
-          const auto condition = dynamic_cast<eval::Constant_AST_Node<T> *>(node->children[0].get())->m_value;
-          if (condition.get_type_info().bare_equal_type_info(typeid(bool))) {
-            if (boxed_cast<bool>(condition)) {
-              return std::move(node->children[1]);
-            } else if (node->children.size() == 3) {
-              return std::move(node->children[2]);
-            }
-          }
-        }
-
-        return node;
-      }
-    };
-
-    struct Partial_Fold {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> node) {
-        // Fold right side
-        if (node->identifier == AST_Node_Type::Binary && node->children.size() == 2
-            && node->children[0]->identifier != AST_Node_Type::Constant && node->children[1]->identifier == AST_Node_Type::Constant) {
-          try {
-            const auto &oper = node->text;
-            const auto parsed = Operators::to_operator(oper);
-            if (parsed != Operators::Opers::invalid) {
-              const auto rhs = dynamic_cast<eval::Constant_AST_Node<T> *>(node->children[1].get())->m_value;
-              if (rhs.get_type_info().is_arithmetic()) {
-                return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Fold_Right_Binary_Operator_AST_Node<T>>(
-                    node->text, node->location, std::move(node->children), rhs);
-              }
-            }
-          } catch (const std::exception &) {
-            // failure to fold, that's OK
-          }
-        }
-
-        return node;
-      }
-    };
-
-    struct Constant_Fold {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> node) {
-        if (node->identifier == AST_Node_Type::Prefix && node->children.size() == 1 && node->children[0]->identifier == AST_Node_Type::Constant) {
-          try {
-            const auto &oper = node->text;
-            const auto parsed = Operators::to_operator(oper, true);
-            const auto lhs = dynamic_cast<const eval::Constant_AST_Node<T> *>(node->children[0].get())->m_value;
-            const auto match = oper + node->children[0]->text;
-
-            if (parsed != Operators::Opers::invalid && parsed != Operators::Opers::bitwise_and && lhs.get_type_info().is_arithmetic()) {
-              const auto val = Boxed_Number::do_oper(parsed, lhs);
-              return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Constant_AST_Node<T>>(std::move(match),
-                                                                                                 node->location,
-                                                                                                 std::move(val));
-            } else if (lhs.get_type_info().bare_equal_type_info(typeid(bool)) && oper == "!") {
-              return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Constant_AST_Node<T>>(std::move(match),
-                                                                                                 node->location,
-                                                                                                 Boxed_Value(!boxed_cast<bool>(lhs)));
-            }
-          } catch (const std::exception &) {
-            // failure to fold, that's OK
-          }
-        } else if ((node->identifier == AST_Node_Type::Logical_And || node->identifier == AST_Node_Type::Logical_Or)
-                   && node->children.size() == 2 && node->children[0]->identifier == AST_Node_Type::Constant
-                   && node->children[1]->identifier == AST_Node_Type::Constant) {
-          try {
-            const auto lhs = dynamic_cast<const eval::Constant_AST_Node<T> &>(*node->children[0]).m_value;
-            const auto rhs = dynamic_cast<const eval::Constant_AST_Node<T> &>(*node->children[1]).m_value;
-            if (lhs.get_type_info().bare_equal_type_info(typeid(bool)) && rhs.get_type_info().bare_equal_type_info(typeid(bool))) {
-              const auto match = node->children[0]->text + " " + node->text + " " + node->children[1]->text;
-              const auto val = [lhs_val = boxed_cast<bool>(lhs), rhs_val = boxed_cast<bool>(rhs), id = node->identifier] {
-                if (id == AST_Node_Type::Logical_And) {
-                  return Boxed_Value(lhs_val && rhs_val);
-                } else {
-                  return Boxed_Value(lhs_val || rhs_val);
-                }
-              }();
-
-              return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Constant_AST_Node<T>>(std::move(match),
-                                                                                                 node->location,
-                                                                                                 std::move(val));
-            }
-          } catch (const std::exception &) {
-            // failure to fold, that's OK
-          }
-        } else if (node->identifier == AST_Node_Type::Binary && node->children.size() == 2
-                   && node->children[0]->identifier == AST_Node_Type::Constant && node->children[1]->identifier == AST_Node_Type::Constant) {
-          try {
-            const auto &oper = node->text;
-            const auto parsed = Operators::to_operator(oper);
-            if (parsed != Operators::Opers::invalid) {
-              const auto lhs = dynamic_cast<const eval::Constant_AST_Node<T> &>(*node->children[0]).m_value;
-              const auto rhs = dynamic_cast<const eval::Constant_AST_Node<T> &>(*node->children[1]).m_value;
-              if (lhs.get_type_info().is_arithmetic() && rhs.get_type_info().is_arithmetic()) {
-                const auto val = Boxed_Number::do_oper(parsed, lhs, rhs);
-                const auto match = node->children[0]->text + " " + oper + " " + node->children[1]->text;
-                return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Constant_AST_Node<T>>(std::move(match),
-                                                                                                   node->location,
-                                                                                                   std::move(val));
-              }
-            }
-          } catch (const std::exception &) {
-            // failure to fold, that's OK
-          }
-        } else if (node->identifier == AST_Node_Type::Fun_Call && node->children.size() == 2
-                   && node->children[0]->identifier == AST_Node_Type::Id && node->children[1]->identifier == AST_Node_Type::Arg_List
-                   && node->children[1]->children.size() == 1 && node->children[1]->children[0]->identifier == AST_Node_Type::Constant) {
-          const auto arg = dynamic_cast<const eval::Constant_AST_Node<T> &>(*node->children[1]->children[0]).m_value;
-          if (arg.get_type_info().is_arithmetic()) {
-            const auto &fun_name = node->children[0]->text;
-
-            const auto make_constant = [&node, &fun_name](auto val) {
-              const auto match = fun_name + "(" + node->children[1]->children[0]->text + ")";
-              return chaiscript::make_unique<eval::AST_Node_Impl<T>, eval::Constant_AST_Node<T>>(std::move(match),
-                                                                                                 node->location,
-                                                                                                 const_var(val));
-            };
-
-            if (fun_name == "double") {
-              return make_constant(Boxed_Number(arg).get_as<double>());
-            } else if (fun_name == "int") {
-              return make_constant(Boxed_Number(arg).get_as<int>());
-            } else if (fun_name == "float") {
-              return make_constant(Boxed_Number(arg).get_as<float>());
-            } else if (fun_name == "long") {
-              return make_constant(Boxed_Number(arg).get_as<long>());
-            } else if (fun_name == "size_t") {
-              return make_constant(Boxed_Number(arg).get_as<size_t>());
-            }
-          }
-        }
-
-        return node;
-      }
-    };
-
-    struct For_Loop {
-      template<typename T>
-      auto optimize(eval::AST_Node_Impl_Ptr<T> for_node) {
-        if (for_node->identifier != AST_Node_Type::For) {
-          return for_node;
-        }
-
-        const auto &eq_node = child_at(*for_node, 0);
-        const auto &binary_node = child_at(*for_node, 1);
-        const auto &prefix_node = child_at(*for_node, 2);
-
-        if (child_count(*for_node) == 4 && eq_node.identifier == AST_Node_Type::Assign_Decl && child_count(eq_node) == 2
-            && child_at(eq_node, 0).identifier == AST_Node_Type::Id && child_at(eq_node, 1).identifier == AST_Node_Type::Constant
-            && binary_node.identifier == AST_Node_Type::Binary && binary_node.text == "<" && child_count(binary_node) == 2
-            && child_at(binary_node, 0).identifier == AST_Node_Type::Id && child_at(binary_node, 0).text == child_at(eq_node, 0).text
-            && child_at(binary_node, 1).identifier == AST_Node_Type::Constant && prefix_node.identifier == AST_Node_Type::Prefix
-            && prefix_node.text == "++" && child_count(prefix_node) == 1 && child_at(prefix_node, 0).identifier == AST_Node_Type::Id
-            && child_at(prefix_node, 0).text == child_at(eq_node, 0).text) {
-          const Boxed_Value &begin = dynamic_cast<const eval::Constant_AST_Node<T> &>(child_at(eq_node, 1)).m_value;
-          const Boxed_Value &end = dynamic_cast<const eval::Constant_AST_Node<T> &>(child_at(binary_node, 1)).m_value;
-          const std::string &id = child_at(prefix_node, 0).text;
-
-          if (begin.get_type_info().bare_equal(user_type<int>()) && end.get_type_info().bare_equal(user_type<int>())) {
-            const auto start_int = boxed_cast<int>(begin);
-            const auto end_int = boxed_cast<int>(end);
-
-            // note that we are moving the last element out, then popping the empty shared_ptr
-            // from the vector
-            std::vector<eval::AST_Node_Impl_Ptr<T>> body_vector;
-            auto body_child = std::move(for_node->children[3]);
-            for_node->children.pop_back();
-            body_vector.emplace_back(std::move(body_child));
-
-            return make_compiled_node(std::move(for_node),
-                                      std::move(body_vector),
-                                      [id, start_int, end_int](const std::vector<eval::AST_Node_Impl_Ptr<T>> &children,
-                                                               const chaiscript::detail::Dispatch_State &t_ss) {
-                                        assert(children.size() == 1);
-                                        chaiscript::eval::detail::Scope_Push_Pop spp(t_ss);
-
-                                        int i = start_int;
-                                        t_ss.add_object(id, var(&i));
-
-                                        try {
-                                          for (; i < end_int; ++i) {
-                                            try {
-                                              // Body of Loop
-                                              children[0]->eval(t_ss);
-                                            } catch (eval::detail::Continue_Loop &) {
-                                              // we got a continue exception, which means all of the remaining
-                                              // loop implementation is skipped and we just need to continue to
-                                              // the next iteration step
-                                            }
-                                          }
-                                        } catch (eval::detail::Break_Loop &) {
-                                          // loop broken
-                                        }
-
-                                        return void_var();
-                                      });
-          } else {
-            return for_node;
-          }
-        } else {
-          return for_node;
-        }
-      }
-    };
-
-    using Optimizer_Default = Optimizer<optimizer::Partial_Fold,
-                                        optimizer::Unused_Return,
-                                        optimizer::Constant_Fold,
-                                        optimizer::If,
-                                        optimizer::Return,
-                                        optimizer::Dead_Code,
-                                        optimizer::Block,
-                                        optimizer::For_Loop,
-                                        optimizer::Assign_Decl>;
-
-  } // namespace optimizer
-} // namespace chaiscript
-
-#endif

include/chaiscript/language/chaiscript_posix.hpp

@@ -1,53 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_POSIX_HPP_
-#define CHAISCRIPT_POSIX_HPP_
-
-namespace chaiscript::detail {
-  struct Loadable_Module {
-    struct DLModule {
-      explicit DLModule(const std::string &t_filename)
-          : m_data(dlopen(t_filename.c_str(), RTLD_NOW)) {
-        if (m_data == nullptr) {
-          throw chaiscript::exception::load_module_error(dlerror());
-        }
-      }
-
-      DLModule(DLModule &&) = default;
-      DLModule &operator=(DLModule &&) = default;
-      DLModule(const DLModule &) = delete;
-      DLModule &operator=(const DLModule &) = delete;
-
-      ~DLModule() { dlclose(m_data); }
-
-      void *m_data;
-    };
-
-    template<typename T>
-    struct DLSym {
-      DLSym(DLModule &t_mod, const std::string &t_symbol)
-          : m_symbol(reinterpret_cast<T>(dlsym(t_mod.m_data, t_symbol.c_str()))) {
-        if (!m_symbol) {
-          throw chaiscript::exception::load_module_error(dlerror());
-        }
-      }
-
-      T m_symbol;
-    };
-
-    Loadable_Module(const std::string &t_module_name, const std::string &t_filename)
-        : m_dlmodule(t_filename)
-        , m_func(m_dlmodule, "create_chaiscript_module_" + t_module_name)
-        , m_moduleptr(m_func.m_symbol()) {
-    }
-
-    DLModule m_dlmodule;
-    DLSym<Create_Module_Func> m_func;
-    ModulePtr m_moduleptr;
-  };
-} // namespace chaiscript::detail
-#endif

include/chaiscript/language/chaiscript_prelude.chai

@@ -0,0 +1,539 @@
+// 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)
+// http://www.chaiscript.com
+
+#ifndef CHAISCRIPT_PRELUDE_HPP_
+#define CHAISCRIPT_PRELUDE_HPP_
+
+namespace chaiscript {
+struct ChaiScript_Prelude { 
+  static std::string chaiscript_prelude() {  return R""(
+
+def lt(l, r) { 
+  if (call_exists(`<`, l, r)) { 
+    l < r 
+  } else { 
+    type_name(l) < type_name(r) 
+  } 
+}
+
+
+def gt(l, r) { 
+  if (call_exists(`>`, l, r)) { 
+    l > r 
+  } else { 
+    type_name(l) > type_name(r) 
+  } 
+}
+
+def eq(l, r) { 
+  if (call_exists(`==`, l, r)) { 
+    l == r 
+  } else { 
+    false 
+  } 
+}
+
+def new(x) { 
+  eval(type_name(x))(); 
+}
+
+def clone(double x) {
+  double(x).clone_var_attrs(x)
+}
+
+def clone(string x) {
+  string(x).clone_var_attrs(x)
+}
+
+def clone(vector x) {
+  vector(x).clone_var_attrs(x)
+}
+
+
+def clone(int x) {
+  int(x).clone_var_attrs(x)
+}
+
+def clone(x) : function_exists(type_name(x)) && call_exists(eval(type_name(x)), x)
+{
+  eval(type_name(x))(x).clone_var_attrs(x);
+}
+
+
+# to_string for Pair()
+def to_string(x) : call_exists(first, x) && call_exists(second, x) { 
+  "<" + x.first.to_string() + ", " + x.second.to_string() + ">"; 
+}
+
+# to_string for containers
+def to_string(x) : call_exists(range, x) && !x.is_type("string"){ 
+  "[" + x.join(", ") + "]"; 
+}
+
+# Prints to console with no carriage return
+def puts(x) { 
+  print_string(x.to_string()); 
+}
+
+# Prints to console with carriage return
+def print(x) { 
+  println_string(x.to_string()); 
+}
+
+# Returns the maximum value of two numbers
+def max(a, b) {
+  if (a>b) { 
+    a 
+  } else { 
+    b 
+  } 
+} 
+
+# Returns the minimum value of two numbers
+def min(a, b) 
+{ 
+  if (a<b) 
+  { 
+    a 
+  } else { 
+    b 
+  } 
+}
+
+
+# Returns true if the value is odd
+def odd(x)  { 
+  if (x % 2 == 1) 
+  { 
+    true 
+  } else { 
+    false 
+  } 
+}
+
+
+# Returns true if the value is even
+def even(x) 
+{ 
+  if (x % 2 == 0) 
+  { 
+    true 
+  } else { 
+    false 
+  } 
+} 
+
+
+# Inserts the third value at the position of the second value into the container of the first
+# while making a clone. 
+def insert_at(container, pos, x) 
+{ 
+  container.insert_ref_at(pos, clone(x)); 
+} 
+
+# Returns the reverse of the given container
+def reverse(container) {
+  auto retval := new(container); 
+  auto r := range(container); 
+  while (!r.empty()) { 
+    retval.push_back(r.back()); 
+    r.pop_back(); 
+  } 
+  retval; 
+}
+
+
+def range(r) : call_exists(range_internal, r)
+{
+  var ri := range_internal(r);
+  ri.get_var_attr("internal_obj") := r;
+  ri;
+}
+
+# Return a range from a range 
+def range(r) : call_exists(empty, r) && call_exists(pop_front, r) && call_exists(pop_back, r) && call_exists(back, r) && call_exists(front, r) 
+{
+  clone(r);
+}
+
+
+# The retro attribute that contains the underlying range 
+attr retro::m_range; 
+
+# Creates a retro from a retro by returning the original range
+def retro(r) : call_exists(get_type_name, r) && get_type_name(r) == "retro" 
+{ 
+  clone(r.m_range) 
+}
+
+
+# Creates a retro range from a range
+def retro::retro(r) : call_exists(empty, r) && call_exists(pop_front, r) && call_exists(pop_back, r) && call_exists(back, r) && call_exists(front, r) 
+{ 
+  this.m_range = r; 
+}
+
+# Returns the first value of a retro
+def retro::front()  
+{ 
+  back(this.m_range) 
+}
+
+# Returns the last value of a retro
+def retro::back()  
+{ 
+  front(this.m_range) 
+}
+
+# Moves the back iterator of a retro towards the front by one 
+def retro::pop_back()  
+{
+  pop_front(this.m_range) 
+}
+
+# Moves the front iterator of a retro towards the back by one 
+def retro::pop_front()  
+{ 
+  pop_back(this.m_range) 
+} 
+
+# returns true if the retro is out of elements 
+def retro::empty() 
+{ 
+  empty(this.m_range); 
+} 
+
+# Performs the second value function over the container first value
+def for_each(container, func) : call_exists(range, container) { 
+  var t_range := range(container); 
+  while (!t_range.empty()) { 
+    func(t_range.front()); 
+    t_range.pop_front(); 
+  } 
+} 
+
+def back_inserter(container) {
+  bind(push_back, container, _);
+}
+
+def contains(container, item, compare_func) : call_exists(range, container) { 
+  auto t_range := range(container); 
+  while (!t_range.empty()) { 
+    if ( compare_func(t_range.front(), item) ) { 
+      return true; 
+    } 
+
+    t_range.pop_front(); 
+  } 
+  false; 
+} 
+
+def contains(container, item) { 
+  contains(container, item, eq) 
+} 
+
+def map(container, func, inserter) : call_exists(range, container) { 
+  auto range := range(container); 
+  while (!range.empty()) { 
+    inserter(func(range.front())); 
+    range.pop_front(); 
+  } 
+} 
+
+# Performs the second value function over the container first value. Creates a new container with the results
+def map(container, func) { 
+  auto retval := new(container); 
+  map(container, func, back_inserter(retval));
+  retval;
+}
+
+# Performs the second value function over the container first value. Starts with initial and continues with each element.
+def foldl(container, func, initial) : call_exists(range, container){ 
+  auto retval = initial; 
+  auto range := range(container); 
+  while (!range.empty()) { 
+    retval = (func(range.front(), retval)); 
+    range.pop_front(); 
+  } 
+  retval; 
+}
+
+# Returns the sum of the elements of the given value
+def sum(container) { 
+  foldl(container, `+`, 0.0) 
+} 
+
+# Returns the product of the elements of the given value
+def product(container) { 
+  foldl(container, `*`, 1.0) 
+} 
+
+# Returns a new container with the elements of the first value concatenated with the elements of the second value
+def concat(x, y) : call_exists(clone, x) { 
+  auto retval = x; 
+  auto inserter := back_inserter(retval); 
+  auto range := range(y); 
+  while (!range.empty()) { 
+    inserter(range.front()); 
+    range.pop_front(); 
+  } 
+  retval; 
+}
+
+
+def take(container, num, inserter) : call_exists(range, container) { 
+  auto r := range(container); 
+  auto i = num; 
+  while ((i > 0) && (!r.empty())) { 
+    inserter(r.front()); 
+    r.pop_front(); 
+    --i; 
+  } 
+}
+
+
+# Returns a new container with the given number of elements taken from the container
+def take(container, num) {
+  auto retval := new(container); 
+  take(container, num, back_inserter(retval)); 
+  retval; 
+}
+
+
+def take_while(container, f, inserter) : call_exists(range, container) { 
+  auto r := range(container); 
+  while ((!r.empty()) && f(r.front())) { 
+    inserter(r.front()); 
+    r.pop_front(); 
+  } 
+} 
+
+
+# Returns a new container with the given elements match the second value function
+def take_while(container, f) {
+  auto retval := new(container); 
+  take_while(container, f, back_inserter(retval)); 
+  retval;
+}
+
+
+def drop(container, num, inserter) : call_exists(range, container) { 
+  auto r := range(container); 
+  auto i = num; 
+  while ((i > 0) && (!r.empty())) { 
+    r.pop_front(); 
+    --i; 
+  } 
+  while (!r.empty()) { 
+    inserter(r.front()); 
+    r.pop_front(); 
+  } 
+}
+
+
+# Returns a new container with the given number of elements dropped from the given container 
+def drop(container, num) {
+  auto retval := new(container); 
+  drop(container, num, back_inserter(retval)); 
+  retval; 
+}
+
+
+def drop_while(container, f, inserter) : call_exists(range, container) { 
+  auto r := range(container); 
+  while ((!r.empty())&& f(r.front())) { 
+    r.pop_front(); 
+  } 
+  while (!r.empty()) { 
+    inserter(r.front()); 
+    r.pop_front(); 
+  } 
+}
+
+
+# Returns a new container with the given elements dropped that match the second value function
+def drop_while(container, f) {
+  auto retval := new(container); 
+  drop_while(container, f, back_inserter(retval)); 
+  retval; 
+}
+
+
+# Applies the second value function to the container. Starts with the first two elements. Expects at least 2 elements.
+def reduce(container, func) : container.size() >= 2 && call_exists(range, container) { 
+  auto r := range(container); 
+  auto retval = r.front(); 
+  r.pop_front(); 
+  retval = func(retval, r.front()); 
+  r.pop_front(); 
+  while (!r.empty()) { 
+    retval = func(retval, r.front()); 
+    r.pop_front(); 
+  } 
+  retval; 
+}
+
+
+# Returns a string of the elements in container delimited by the second value string
+def join(container, delim) { 
+  auto retval = ""; 
+  auto range := range(container); 
+  if (!range.empty()) { 
+    retval += to_string(range.front()); 
+    range.pop_front(); 
+    while (!range.empty()) { 
+      retval += delim; 
+      retval += to_string(range.front()); 
+      range.pop_front(); 
+    } 
+  } 
+  retval; 
+}
+
+
+def filter(container, f, inserter) : call_exists(range, container) { 
+  auto r := range(container); 
+  while (!r.empty()) { 
+    if (f(r.front())) { 
+      inserter(r.front()); 
+    } 
+    r.pop_front(); 
+  } 
+} 
+
+
+# Returns a new Vector which match the second value function
+def filter(container, f) { 
+  auto retval := new(container); 
+  filter(container, f, back_inserter(retval));
+  retval;
+}
+
+
+def generate_range(x, y, inserter) { 
+  auto i = x; 
+  while (i <= y) { 
+    inserter(i); 
+    ++i; 
+  } 
+}
+
+
+# Returns a new Vector which represents the range from the first value to the second value
+def generate_range(x, y) { 
+  auto retval := Vector(); 
+  generate_range(x,y,back_inserter(retval)); 
+  retval; 
+}
+
+
+# Returns a new Vector with the first value to the second value as its elements
+def collate(x, y) { 
+  return [x, y]; 
+}
+
+
+def zip_with(f, x, y, inserter) : call_exists(range, x) && call_exists(range, y) { 
+  auto r_x := range(x); 
+  auto r_y := range(y); 
+  while (!r_x.empty() && !r_y.empty()) { 
+    inserter(f(r_x.front(), r_y.front())); 
+    r_x.pop_front(); 
+    r_y.pop_front(); 
+  } 
+}
+
+
+# Returns a new Vector which joins matching elements of the second and third value with the first value function
+def zip_with(f, x, y) { 
+  auto retval := Vector(); 
+  zip_with(f,x,y,back_inserter(retval)); 
+  retval;
+}
+
+
+# Returns a new Vector which joins matching elements of the first and second
+def zip(x, y) { 
+  zip_with(collate, x, y); 
+}
+
+
+# Returns the position of the second value string in the first value string
+def string::find(string substr) { 
+  find(this, substr, size_t(0)); 
+}
+
+
+# Returns the position of last match of the second value string in the first value string
+def string::rfind(string substr) { 
+  rfind(this, substr, size_t(-1)); 
+}
+
+
+# Returns the position of the first match of elements in the second value string in the first value string
+def string::find_first_of(string list) { 
+  find_first_of(this, list, size_t(0)); 
+} 
+
+
+# Returns the position of the last match of elements in the second value string in the first value string
+def string::find_last_of(string list) {
+  find_last_of(this, list, size_t(-1)); 
+} 
+
+
+# Returns the position of the first non-matching element in the second value string in the first value string
+def string::find_first_not_of(string list) { 
+  find_first_not_of(this, list, size_t(0)); 
+} 
+
+
+# Returns the position of the last non-matching element in the second value string in the first value string
+def string::find_last_not_of(string list) { 
+  find_last_not_of(this, list, size_t(-1)); 
+} 
+
+
+def string::ltrim() { 
+  drop_while(this, fun(x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'}); 
+} 
+
+
+def string::rtrim() { 
+  reverse(drop_while(reverse(this), fun(x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'})); 
+} 
+
+
+def string::trim() { 
+  ltrim(rtrim(this)); 
+}
+
+
+def find(container, value, Function compare_func) : call_exists(range, container) { 
+  auto range := range(container); 
+  while (!range.empty()) { 
+    if (compare_func(range.front(), value)) { 
+      return range; 
+    } else { 
+      range.pop_front(); 
+    } 
+  } 
+  range; 
+} 
+
+
+def find(container, value) { 
+  find(container, value, eq) 
+} 
+
+
+)"";
+}
+
+};
+}
+
+#endif /* CHAISCRIPT_PRELUDE_HPP_ */

include/chaiscript/language/chaiscript_prelude.hpp

@@ -1,562 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// and 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_PRELUDE_HPP_
-#define CHAISCRIPT_PRELUDE_HPP_
-
-namespace chaiscript {
-  struct ChaiScript_Prelude {
-    static std::string chaiscript_prelude() {
-      return R"chaiscript(
-
-def lt(l, r) {
-  if (call_exists(`<`, l, r)) {
-    l < r
-  } else {
-    type_name(l) < type_name(r)
-  }
-}
-
-
-def gt(l, r) {
-  if (call_exists(`>`, l, r)) {
-    l > r
-  } else {
-    type_name(l) > type_name(r)
-  }
-}
-
-def eq(l, r) {
-  if (call_exists(`==`, l, r)) {
-    l == r
-  } else {
-    false
-  }
-}
-
-def new(x) {
-  eval(type_name(x))();
-}
-
-def clone(double x) {
-  double(x).clone_var_attrs(x)
-}
-
-def clone(string x) {
-  string(x).clone_var_attrs(x)
-}
-
-def clone(vector x) {
-  vector(x).clone_var_attrs(x)
-}
-
-
-def clone(int x) {
-  int(x).clone_var_attrs(x)
-}
-
-def clone(x) : function_exists(type_name(x)) && call_exists(eval(type_name(x)), x)
-{
-  eval(type_name(x))(x).clone_var_attrs(x);
-}
-
-
-# to_string for Pair()
-def to_string(x) : call_exists(first, x) && call_exists(second, x) {
-  "<" + x.first.to_string() + ", " + x.second.to_string() + ">";
-}
-
-# to_string for containers
-def to_string(x) : call_exists(range, x) && !x.is_type("string"){
-  "[" + x.join(", ") + "]";
-}
-
-# Prints to console with no carriage return
-def puts(x) {
-  print_string(x.to_string());
-}
-
-# Prints to console with carriage return
-def print(x) {
-  println_string(x.to_string());
-}
-
-# Returns the maximum value of two numbers
-def max(a, b) {
-  if (a>b) {
-    a
-  } else {
-    b
-  }
-}
-
-# Returns the minimum value of two numbers
-def min(a, b)
-{
-  if (a<b)
-  {
-    a
-  } else {
-    b
-  }
-}
-
-
-# Returns true if the value is odd
-def odd(x)  {
-  if (x % 2 == 1)
-  {
-    true
-  } else {
-    false
-  }
-}
-
-
-# Returns true if the value is even
-def even(x)
-{
-  if (x % 2 == 0)
-  {
-    true
-  } else {
-    false
-  }
-}
-
-
-# Inserts the third value at the position of the second value into the container of the first
-# while making a clone.
-def insert_at(container, pos, x)
-{
-  container.insert_ref_at(pos, clone(x));
-}
-
-# Returns the reverse of the given container
-def reverse(container) {
-  auto retval := new(container);
-  auto r := range(container);
-  while (!r.empty()) {
-    retval.push_back(r.back());
-    r.pop_back();
-  }
-  retval;
-}
-
-
-def range(r) : call_exists(range_internal, r)
-{
-  var ri := range_internal(r);
-  ri.get_var_attr("internal_obj") := r;
-  ri;
-}
-
-# Return a range from a range
-def range(r) : call_exists(empty, r) && call_exists(pop_front, r) && call_exists(pop_back, r) && call_exists(back, r) && call_exists(front, r)
-{
-  clone(r);
-}
-
-
-# The retro attribute that contains the underlying range
-attr retro::m_range;
-
-# Creates a retro from a retro by returning the original range
-def retro(r) : call_exists(get_type_name, r) && get_type_name(r) == "retro"
-{
-  clone(r.m_range)
-}
-
-
-# Creates a retro range from a range
-def retro::retro(r) : call_exists(empty, r) && call_exists(pop_front, r) && call_exists(pop_back, r) && call_exists(back, r) && call_exists(front, r)
-{
-  this.m_range = r;
-}
-
-# Returns the first value of a retro
-def retro::front()
-{
-  back(this.m_range)
-}
-
-# Returns the last value of a retro
-def retro::back()
-{
-  front(this.m_range)
-}
-
-# Moves the back iterator of a retro towards the front by one
-def retro::pop_back()
-{
-  pop_front(this.m_range)
-}
-
-# Moves the front iterator of a retro towards the back by one
-def retro::pop_front()
-{
-  pop_back(this.m_range)
-}
-
-# returns true if the retro is out of elements
-def retro::empty()
-{
-  empty(this.m_range);
-}
-
-# Performs the second value function over the container first value
-def for_each(container, func) : call_exists(range, container) {
-  var t_range := range(container);
-  while (!t_range.empty()) {
-    func(t_range.front());
-    t_range.pop_front();
-  }
-}
-
-def any_of(container, func) : call_exists(range, container) {
-  var t_range := range(container);
-  while (!t_range.empty()) {
-    if (func(t_range.front())) {
-      return true;
-    }
-    t_range.pop_front();
-  }
-  false;
-}
-
-def all_of(container, func) : call_exists(range, container) {
-  var t_range := range(container);
-  while (!t_range.empty()) {
-    if (!func(t_range.front())) {
-      return false;
-    }
-    t_range.pop_front();
-  }
-
-  true;
-}
-
-def back_inserter(container) {
-  bind(push_back, container, _);
-}
-
-def contains(container, item, compare_func) : call_exists(range, container) {
-  auto t_range := range(container);
-  while (!t_range.empty()) {
-    if ( compare_func(t_range.front(), item) ) {
-      return true;
-    }
-
-    t_range.pop_front();
-  }
-  false;
-}
-
-def contains(container, item) {
-  contains(container, item, eq)
-}
-
-def map(container, func, inserter) : call_exists(range, container) {
-  auto range := range(container);
-  while (!range.empty()) {
-    inserter(func(range.front()));
-    range.pop_front();
-  }
-}
-
-# Performs the second value function over the container first value. Creates a new container with the results
-def map(container, func) {
-  auto retval := new(container);
-  map(container, func, back_inserter(retval));
-  retval;
-}
-
-# Performs the second value function over the container first value. Starts with initial and continues with each element.
-def foldl(container, func, initial) : call_exists(range, container){
-  auto retval = initial;
-  auto range := range(container);
-  while (!range.empty()) {
-    retval = (func(range.front(), retval));
-    range.pop_front();
-  }
-  retval;
-}
-
-# Returns the sum of the elements of the given value
-def sum(container) {
-  foldl(container, `+`, 0.0)
-}
-
-# Returns the product of the elements of the given value
-def product(container) {
-  foldl(container, `*`, 1.0)
-}
-
-# Returns a new container with the elements of the first value concatenated with the elements of the second value
-def concat(x, y) : call_exists(clone, x) {
-  auto retval = x;
-  auto inserter := back_inserter(retval);
-  auto range := range(y);
-  while (!range.empty()) {
-    inserter(range.front());
-    range.pop_front();
-  }
-  retval;
-}
-
-
-def take(container, num, inserter) : call_exists(range, container) {
-  auto r := range(container);
-  auto i = num;
-  while ((i > 0) && (!r.empty())) {
-    inserter(r.front());
-    r.pop_front();
-    --i;
-  }
-}
-
-
-# Returns a new container with the given number of elements taken from the container
-def take(container, num) {
-  auto retval := new(container);
-  take(container, num, back_inserter(retval));
-  retval;
-}
-
-
-def take_while(container, f, inserter) : call_exists(range, container) {
-  auto r := range(container);
-  while ((!r.empty()) && f(r.front())) {
-    inserter(r.front());
-    r.pop_front();
-  }
-}
-
-
-# Returns a new container with the given elements match the second value function
-def take_while(container, f) {
-  auto retval := new(container);
-  take_while(container, f, back_inserter(retval));
-  retval;
-}
-
-
-def drop(container, num, inserter) : call_exists(range, container) {
-  auto r := range(container);
-  auto i = num;
-  while ((i > 0) && (!r.empty())) {
-    r.pop_front();
-    --i;
-  }
-  while (!r.empty()) {
-    inserter(r.front());
-    r.pop_front();
-  }
-}
-
-
-# Returns a new container with the given number of elements dropped from the given container
-def drop(container, num) {
-  auto retval := new(container);
-  drop(container, num, back_inserter(retval));
-  retval;
-}
-
-
-def drop_while(container, f, inserter) : call_exists(range, container) {
-  auto r := range(container);
-  while ((!r.empty())&& f(r.front())) {
-    r.pop_front();
-  }
-  while (!r.empty()) {
-    inserter(r.front());
-    r.pop_front();
-  }
-}
-
-
-# Returns a new container with the given elements dropped that match the second value function
-def drop_while(container, f) {
-  auto retval := new(container);
-  drop_while(container, f, back_inserter(retval));
-  retval;
-}
-
-
-# Applies the second value function to the container. Starts with the first two elements. Expects at least 2 elements.
-def reduce(container, func) : container.size() >= 2 && call_exists(range, container) {
-  auto r := range(container);
-  auto retval = r.front();
-  r.pop_front();
-  retval = func(retval, r.front());
-  r.pop_front();
-  while (!r.empty()) {
-    retval = func(retval, r.front());
-    r.pop_front();
-  }
-  retval;
-}
-
-
-# Returns a string of the elements in container delimited by the second value string
-def join(container, delim) {
-  auto retval = "";
-  auto range := range(container);
-  if (!range.empty()) {
-    retval += to_string(range.front());
-    range.pop_front();
-    while (!range.empty()) {
-      retval += delim;
-      retval += to_string(range.front());
-      range.pop_front();
-    }
-  }
-  retval;
-}
-
-
-def filter(container, f, inserter) : call_exists(range, container) {
-  auto r := range(container);
-  while (!r.empty()) {
-    if (f(r.front())) {
-      inserter(r.front());
-    }
-    r.pop_front();
-  }
-}
-
-
-# Returns a new Vector which match the second value function
-def filter(container, f) {
-  auto retval := new(container);
-  filter(container, f, back_inserter(retval));
-  retval;
-}
-
-
-def generate_range(x, y, inserter) {
-  auto i = x;
-  while (i <= y) {
-    inserter(i);
-    ++i;
-  }
-}
-
-
-# Returns a new Vector which represents the range from the first value to the second value
-def generate_range(x, y) {
-  auto retval := Vector();
-  generate_range(x,y,back_inserter(retval));
-  retval;
-}
-
-
-# Returns a new Vector with the first value to the second value as its elements
-def collate(x, y) {
-  return [x, y];
-}
-
-
-def zip_with(f, x, y, inserter) : call_exists(range, x) && call_exists(range, y) {
-  auto r_x := range(x);
-  auto r_y := range(y);
-  while (!r_x.empty() && !r_y.empty()) {
-    inserter(f(r_x.front(), r_y.front()));
-    r_x.pop_front();
-    r_y.pop_front();
-  }
-}
-
-
-# Returns a new Vector which joins matching elements of the second and third value with the first value function
-def zip_with(f, x, y) {
-  auto retval := Vector();
-  zip_with(f,x,y,back_inserter(retval));
-  retval;
-}
-
-
-# Returns a new Vector which joins matching elements of the first and second
-def zip(x, y) {
-  zip_with(collate, x, y);
-}
-
-
-# Returns the position of the second value string in the first value string
-def string::find(string substr) {
-  find(this, substr, size_t(0));
-}
-
-
-# Returns the position of last match of the second value string in the first value string
-def string::rfind(string substr) {
-  rfind(this, substr, size_t(-1));
-}
-
-
-# Returns the position of the first match of elements in the second value string in the first value string
-def string::find_first_of(string list) {
-  find_first_of(this, list, size_t(0));
-}
-
-
-# Returns the position of the last match of elements in the second value string in the first value string
-def string::find_last_of(string list) {
-  find_last_of(this, list, size_t(-1));
-}
-
-
-# Returns the position of the first non-matching element in the second value string in the first value string
-def string::find_first_not_of(string list) {
-  find_first_not_of(this, list, size_t(0));
-}
-
-
-# Returns the position of the last non-matching element in the second value string in the first value string
-def string::find_last_not_of(string list) {
-  find_last_not_of(this, list, size_t(-1));
-}
-
-
-def string::ltrim() {
-  drop_while(this, fun(x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'});
-}
-
-
-def string::rtrim() {
-  reverse(drop_while(reverse(this), fun(x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'}));
-}
-
-
-def string::trim() {
-  ltrim(rtrim(this));
-}
-
-
-def find(container, value, Function compare_func) : call_exists(range, container) {
-  auto range := range(container);
-  while (!range.empty()) {
-    if (compare_func(range.front(), value)) {
-      return range;
-    } else {
-      range.pop_front();
-    }
-  }
-  range;
-}
-
-
-def find(container, value) {
-  find(container, value, eq)
-}
-
-
-)chaiscript";
-    }
-  };
-} // namespace chaiscript
-
-#endif /* CHAISCRIPT_PRELUDE_HPP_ */

include/chaiscript/language/chaiscript_prelude_docs.hpp

@@ -2,22 +2,26 @@
 /// regarding the ChaiScript standard runtime library.
 
 /// \brief Items in this namespace exist in the ChaiScript language runtime. They are not part of the C++ API
-namespace ChaiScript_Language {
-  /// \page LangStandardLibraryRef ChaiScript Language Standard Library Reference
-  ///
-  /// ChaiScript, at its core, has some very functional programming-inspired habits. Few places show this off as clearly
-  /// as the prelude, itself a name taken as a nod to the popular functional language Haskell. This prelude is available
-  /// to all standard ChaiScript applications, and provides a simple foundation for using numbers, strings, and ranges
-  /// (the general category of Range cs and their iteration).
-  ///
+namespace ChaiScript_Language
+{
 
-  /// \brief Generic concept of a value in ChaiScript.
-  ///
-  /// The Object type exists merely as a concept. All objects in ChaiScript support this concept
-  /// and have the following methods available to them. All objects are stored internally as chaiscript::Boxed_Value types.
-  ///
-  /// \sa chaiscript::Boxed_Value
-  class Object {
+/// \page LangStandardLibraryRef ChaiScript Language Standard Library Reference
+///
+/// ChaiScript, at its core, has some very functional programming-inspired habits. Few places show this off as clearly 
+/// as the prelude, itself a name taken as a nod to the popular functional language Haskell. This prelude is available 
+/// to all standard ChaiScript applications, and provides a simple foundation for using numbers, strings, and ranges 
+/// (the general category of Range cs and their iteration).
+///
+
+
+/// \brief Generic concept of a value in ChaiScript. 
+///
+/// The Object type exists merely as a concept. All objects in ChaiScript support this concept 
+/// and have the following methods available to them. All objects are stored internally as chaiscript::Boxed_Value types.
+///
+/// \sa chaiscript::Boxed_Value
+class Object
+{
   public:
     /// \brief Returns the Type_Info value for this Object
     Type_Info get_type_info() const;
@@ -47,39 +51,42 @@ namespace ChaiScript_Language {
     ///
     /// \sa Type_Info::name();
     string type_name() const;
-  };
+};
 
-  /// \brief Item returned from a Range object from a Map
-  class Map_Pair {
+/// \brief Item returned from a Range object from a Map
+class Map_Pair
+{
   public:
     /// \brief Returns the key of the Map entry
     const string first();
 
     /// \brief Returns the value Object of the Map entry 
     Object second();
-  };
+};
 
-  /// \brief Maps strings to Objects
-  ///
-  /// ChaiScript has a built in shortcut for generating Map objects:
-  ///
-  /// Example:
-  /// \code
-  /// eval> var m = ["a":1, "b":2];
-  /// [<a,1>, <b,2>]
-  /// eval> m.count("a");
-  /// 1
-  /// eval> m.count("c");
-  /// 0
-  /// eval> m.size();
-  /// 2
-  /// \endcode
-  ///
-  /// Implemented as std::map<Boxed_Value>
-  ///
-  /// \sa Map_Pair
-  /// \sa chaiscript::bootstrap::standard_library::map_type
-  class Map {
+
+/// \brief Maps strings to Objects
+///
+/// ChaiScript has a built in shortcut for generating Map objects:
+/// 
+/// Example:
+/// \code
+/// eval> var m = ["a":1, "b":2];
+/// [<a,1>, <b,2>]
+/// eval> m.count("a");
+/// 1
+/// eval> m.count("c");
+/// 0
+/// eval> m.size();
+/// 2
+/// \endcode
+///
+/// Implemented as std::map<Boxed_Value>
+///
+/// \sa Map_Pair
+/// \sa chaiscript::bootstrap::standard_library::map_type
+class Map
+{
   public:
     /// \brief Returns an object that implements the Range concept for the Map_Pair's in this Map
     Range range();
@@ -101,57 +108,64 @@ namespace ChaiScript_Language {
 
     /// \brief Returns true if the map contains no items
     bool empty() const;
-  };
 
-  /// \brief A concept implemented by string, Vector and Map. It is convertible to Range, default constructable and back_insertable
-  class Container {
+};
+
+
+/// \brief A concept implemented by string, Vector and Map. It is convertible to Range, default constructable and back_insertable
+class Container
+{
   public:
     void push_back(Object);
     Range range();
     Const_Range range() const;
-  };
+};
 
-  /// \brief Converts o into a string.
-  ///
-  /// \code
-  /// eval> to_string(3).is_type("string") <br>
-  /// true<br>
-  /// \endcode
-  string to_string(Object o);
 
-  /// \brief Prints o to the terminal, without a trailing carriage return. Applies conversions to string automatically.
-  /// \code
-  /// eval> puts("hi, "); puts("there")
-  /// hi, thereeval>
-  /// \endcode
-  /// \sa to_string
-  /// \sa print
-  void puts(Object o);
+/// \brief Converts o into a string.
+///
+/// \code
+/// eval> to_string(3).is_type("string") <br>
+/// true<br>
+/// \endcode
+string to_string(Object o);
 
-  /// \brief Prints o to the terminal, with a trailing carriage return. Applies conversions to string automatically
-  /// \code
-  /// eval> print("hello")
-  /// hello
-  /// eval>
-  /// \endcode
-  /// \sa to_string
-  /// \sa puts
-  void print(Object o);
 
-  /// \brief ChaiScript representation of std::string. It is an std::string but only some member are exposed to ChaiScript.
-  ///
-  /// Because the ChaiScript string object is an std::string, it is directly convertible to and from std::string
-  /// using the chaiscript::boxed_cast and chaiscript::var functions.
-  ///
-  /// With the exception of string::trim, string::rtrim, string::ltrim, all members are direct pass-throughs to the
-  /// std::string of the same name.
-  ///
-  /// \note Object and function notations are equivalent in ChaiScript. This means that
-  ///       \c "bob".find("b") and \c find("bob", "b") are exactly the same. Most examples below follow the
-  ///       second formation of the function calls.
-  /// \sa \ref keyworddef for extending existing C++ classes in ChaiScript
-  /// \sa chaiscript::bootstrap::standard_library::string_type
-  class string {
+/// \brief Prints o to the terminal, without a trailing carriage return. Applies conversions to string automatically.
+/// \code
+/// eval> puts("hi, "); puts("there")
+/// hi, thereeval>
+/// \endcode
+/// \sa to_string
+/// \sa print
+void puts(Object o);
+
+
+/// \brief Prints o to the terminal, with a trailing carriage return. Applies conversions to string automatically
+/// \code
+/// eval> print("hello")
+/// hello
+/// eval>
+/// \endcode
+/// \sa to_string
+/// \sa puts
+void print(Object o);
+
+/// \brief ChaiScript representation of std::string. It is an std::string but only some member are exposed to ChaiScript.
+/// 
+/// Because the ChaiScript string object is an std::string, it is directly convertible to and from std::string
+/// using the chaiscript::boxed_cast and chaiscript::var functions.
+///
+/// With the exception of string::trim, string::rtrim, string::ltrim, all members are direct pass-throughs to the
+/// std::string of the same name. 
+///
+/// \note Object and function notations are equivalent in ChaiScript. This means that
+///       \c "bob".find("b") and \c find("bob", "b") are exactly the same. Most examples below follow the
+///       second formation of the function calls.
+/// \sa \ref keyworddef for extending existing C++ classes in ChaiScript
+/// \sa chaiscript::bootstrap::standard_library::string_type
+class string
+{
   public:
     /// \brief Finds the first instance of substr.
     /// \code
@@ -160,6 +174,7 @@ namespace ChaiScript_Language {
     /// \endcode
     int find(string s) const;
 
+
     /// \brief Finds the last instance of substr.
     /// \code
     /// eval> rfind("abab", "ab")
@@ -266,15 +281,16 @@ namespace ChaiScript_Language {
 
     /// \brief Returns an object that implements the Const_Range concept for the characters of this string
     Const_Range range() const;
-  };
+};
 
-  /// \brief A concept in ChaiScript that is implemented by \ref string, Vector and Map. It provides
-  ///        easy iteration over the elements in a container.
-  ///
-  /// Implemented by the template chaiscript::bootstrap::standard_library::Bidir_Range
-  ///
-  /// \sa Const_Range
-  class Range {
+/// \brief A concept in ChaiScript that is implemented by \ref string, Vector and Map. It provides
+///        easy iteration over the elements in a container.
+///
+/// Implemented by the template chaiscript::bootstrap::standard_library::Bidir_Range
+///
+/// \sa Const_Range
+class Range
+{
   public:
     /// \brief Returns the last item of the range
     Object back();
@@ -295,15 +311,17 @@ namespace ChaiScript_Language {
     /// 
     /// \post front() returns the element at front() + 1;
     void pop_front();
-  };
 
-  /// \brief A concept in ChaiScript that is implemented by \ref string, Vector and Map. It provides
-  ///        easy iteration over the elements in a container. Contained values are const.
-  ///
-  /// Implemented by the template chaiscript::bootstrap::standard_library::Const_Bidir_Range
-  ///
-  /// \sa Range
-  class Const_Range {
+};
+
+/// \brief A concept in ChaiScript that is implemented by \ref string, Vector and Map. It provides
+///        easy iteration over the elements in a container. Contained values are const.
+///
+/// Implemented by the template chaiscript::bootstrap::standard_library::Const_Bidir_Range
+///
+/// \sa Range
+class Const_Range
+{
   public:
     /// \brief Returns the last item of the range
     const Object back();
@@ -324,26 +342,28 @@ namespace ChaiScript_Language {
     /// 
     /// \post front() returns the element at front() + 1;
     void pop_front();
-  };
 
-  /// \brief A vector of Objects
-  ///
-  /// ChaiScript includes a shortcut for creating a Vector of Objects
-  ///
-  /// Example:
-  /// \code
-  /// eval> var v = [1,2,3,4]
-  /// [1, 2, 3, 4]
-  /// eval> v[0];
-  /// 1
-  /// eval> v.size();
-  /// 4
-  /// \endcode
-  ///
-  /// Implemented with std::vector<chaiscript::Boxed_Value>
-  ///
-  /// \sa chaiscript::bootstrap::standard_library::vector_type
-  class Vector {
+};
+
+/// \brief A vector of Objects
+///
+/// ChaiScript includes a shortcut for creating a Vector of Objects
+/// 
+/// Example:
+/// \code
+/// eval> var v = [1,2,3,4]
+/// [1, 2, 3, 4]
+/// eval> v[0];
+/// 1
+/// eval> v.size();
+/// 4
+/// \endcode 
+///
+/// Implemented with std::vector<chaiscript::Boxed_Value>
+/// 
+/// \sa chaiscript::bootstrap::standard_library::vector_type
+class Vector
+{
   public:
     /// \brief returns the Object at the given index. Throws an exception if the index does not exist
     Object operator[](int t_index);
@@ -397,9 +417,11 @@ namespace ChaiScript_Language {
 
     /// \brief Returns the number of elements in the Vector
     int size() const;
-  };
 
-  class Type_Info {
+};
+
+class Type_Info
+{
   public:
     /// \brief Compares this Type_Info object with another one and returns true if the two types are the same
     ///        after const, pointer, reference are removed.
@@ -428,29 +450,32 @@ namespace ChaiScript_Language {
 
     /// \brief Returns the ChaiScript registered name for the type if one exists.
     string name() const;
-  };
 
-  /// \brief Represents a function object in ChaiScript
-  ///
-  /// A function object may be one function, such as:
-  /// \code
-  /// var f = fun(x) { return x; }
-  /// \endcode
-  ///
-  /// Or it may represent multiple functions
-  /// \code
-  /// var f2 = `-`; // represents the unary - as well as the set of binary - operators
-  /// \endcode
-  ///
-  /// Guarded function example
-  /// \code
-  /// def f3(x) : x > 2 {
-  ///  return x;
-  /// }
-  /// \endcode
-  ///
-  /// Examples in the function definitions below will reference these examples
-  class Function {
+};
+
+
+/// \brief Represents a function object in ChaiScript
+///
+/// A function object may be one function, such as:
+/// \code
+/// var f = fun(x) { return x; }
+/// \endcode
+/// 
+/// Or it may represent multiple functions
+/// \code
+/// var f2 = `-`; // represents the unary - as well as the set of binary - operators
+/// \endcode
+///
+/// Guarded function example
+/// \code
+/// def f3(x) : x > 2 {
+///  return x;
+/// }
+/// \endcode
+///
+/// Examples in the function definitions below will reference these examples
+class Function
+{
   public:
     /// \brief Returns the annotation description of the function
     string get_annotation() const;
@@ -480,7 +505,7 @@ namespace ChaiScript_Language {
     /// \endcode
     Vector get_contained_functions() const;
 
-    /// \brief Returns a function guard as function
+    /// \brief Returns a vector of the contained functions
     /// 
     /// Example:
     /// \code
@@ -520,264 +545,286 @@ namespace ChaiScript_Language {
     /// 1
     /// \endcode
     Object call(Vector t_params) const;
-  }
+}
 
-  /// \brief Returns the max of a or b. Requires that operator>(a, b) exists
-  /// Equivalent to
-  /// \code
-  /// return a>b?a:b;
-  /// \endcode
-  ///
-  /// Example:
-  /// \code
-  /// eval> max(4, 10)
-  /// 10
-  /// \endcode
-  Object
-  max(Object a, Object b);
 
-  /// \brief Returns the min of a or b. Requires that operator<(a, b) exists
-  ///
-  /// Equivalent to
-  /// \code
-  /// return a<b?a:b;
-  /// \endcode
-  ///
-  /// Example:
-  /// \code
-  /// eval> min(4, 10)
-  /// 4
-  /// \endcode
-  Object min(Object a, Object b);
 
-  /// \brief Returns true if x is an even integer.
-  ///
-  /// Will also work on any non-integer type for which an operator%(x, int) exists
-  ///
-  /// Example:
-  /// \code
-  /// eval> even(4)
-  /// true
-  /// \endcode
-  bool even(Object x);
+/// \brief Returns the max of a or b. Requires that operator>(a, b) exists
+/// Equivalent to 
+/// \code
+/// return a>b?a:b;
+/// \endcode
+///
+/// Example:
+/// \code
+/// eval> max(4, 10)
+/// 10
+/// \endcode
+Object max(Object a, Object b);
 
-  /// \brief Returns true if x is an odd integer.
-  ///
-  /// Will also work on any non-integer type for which an operator%(x, int) exists
-  ///
-  /// Example:
-  /// \code
-  /// eval> odd(4)
-  /// false
-  /// \endcode
-  bool even(Object x);
+/// \brief Returns the min of a or b. Requires that operator<(a, b) exists
+///
+/// Equivalent to 
+/// \code
+/// return a<b?a:b;
+/// \endcode
+///
+/// Example:
+/// \code
+/// eval> min(4, 10)
+/// 4
+/// \endcode
+Object min(Object a, Object b);
 
-  /// \brief Applies the function f over each element in the Range c.
-  ///
-  /// Example:
-  /// \code
-  /// eval> for_each([1, 2, 3], print)
-  /// 1
-  /// 2
-  /// 3
-  /// \endcode
-  void for_each(Range c, Function f);
+/// \brief Returns true if x is an even integer. 
+/// 
+/// Will also work on any non-integer type for which an operator%(x, int) exists
+///
+/// Example:
+/// \code
+/// eval> even(4)
+/// true
+/// \endcode
+bool even(Object x);
 
-  /// \brief Applies f over each element in the Range c, joining all the results.
-  ///
-  /// Example:
-  /// \code
-  /// eval> map([1, 2, 3], odd)
-  /// [true, false, true]
-  /// \endcode
-  Object map(Range c, Function f);
+/// \brief Returns true if x is an odd integer. 
+/// 
+/// Will also work on any non-integer type for which an operator%(x, int) exists
+///
+/// Example:
+/// \code
+/// eval> odd(4)
+/// false 
+/// \endcode
+bool even(Object x);
 
-  /// \brief Starts with the initial value and applies the function f to it and the first element of the Range c.
-  ///        The result is then applied to the second element, and so on until the elements are exhausted.
-  ///
-  /// Example:
-  /// \code
-  /// eval> foldl([1, 2, 3, 4], `+`, 0)
-  /// 10
-  /// \endcode
-  Object foldl(Range c, Function f, Object initial);
 
-  /// \brief Returns the sum total of the values in the Range c.
-  ///
-  /// Example:
-  /// \code
-  /// eval> sum([1, 2, 3, 4])
-  /// 10
-  /// \endcode
-  ///
-  /// Equivalent to:
-  /// \code
-  /// foldl(c, `+`, 0.0);
-  /// \endcode
-  Numeric sum(Range c);
+/// \brief Applies the function f over each element in the Range c.
+///
+/// Example:
+/// \code
+/// eval> for_each([1, 2, 3], print)
+/// 1
+/// 2
+/// 3
+/// \endcode
+void for_each(Range c, Function f);
 
-  /// \brief Returns the product of the value in the Range c.
-  ///
-  /// Example:
-  /// \code
-  /// eval> product([1, 2, 3, 4])
-  /// 24
-  /// \endcode
-  ///
-  /// Equivalent to:
-  /// \code
-  /// foldl(c, `*`, 1.0);
-  /// \endcode
-  Numeric product(Range c);
 
-  /// \brief Takes num elements from the Range c, returning them.
-  ///
-  /// Example:
-  /// \code
-  /// eval> take([1, 2, 3, 4], 2)
-  /// [1, 2]
-  /// \endcode
-  ///
-  /// \returns A container of the same type that was passed in
-  Object take(Range c, int num);
+/// \brief Applies f over each element in the Range c, joining all the results.
+///
+/// Example:
+/// \code
+/// eval> map([1, 2, 3], odd)
+/// [true, false, true]
+/// \endcode
+Object map(Range c, Function f);
 
-  /// \brief Takes elements from the Range c that match function f, stopping at the first non-match, returning them as a new Vector.
-  ///
-  /// Example:
-  /// \code
-  /// eval> take_while([1, 2, 3], odd)
-  /// [1]
-  /// \endcode
-  ///
-  /// \returns A container of the same type that was passed in
-  Object take_while(Range c, Function f);
 
-  /// \brief Drops num elements from the Range c, returning the remainder.
-  ///
-  /// Example:
-  /// \code
-  /// eval> drop([1, 2, 3, 4], 2)
-  /// [3, 4]
-  /// \endcode
-  ///
-  /// \returns A container of the same type that was passed in
-  Object drop(Range c, int num);
+/// \brief Starts with the initial value and applies the function f to it and the first element of the Range c. 
+///        The result is then applied to the second element, and so on until the elements are exhausted.
+///
+/// Example:
+/// \code
+/// eval> foldl([1, 2, 3, 4], `+`, 0)
+/// 10
+/// \endcode
+Object foldl(Range c, Function f, Object initial);
 
-  /// \brief Drops elements from the Range c that match f, stopping at the first non-match, returning the remainder.
-  ///
-  /// Example:
-  /// \code
-  /// eval> drop_while([1, 2, 3], odd)
-  /// [2, 3]
-  /// \endcode
-  Object drop_while(Range c, Function f);
 
-  /// \brief Similar to foldl, this takes the first two elements as its starting values for f. This assumes Range c has at least 2 elements.
-  ///
-  /// Example:
-  /// \code
-  /// eval> reduce([1, 2, 3, 4], `+`)
-  /// 10
-  /// \endcode
-  Object reduce(Range c, Function f);
+/// \brief Returns the sum total of the values in the Range c.
+///
+/// Example:
+/// \code
+/// eval> sum([1, 2, 3, 4])
+/// 10
+/// \endcode
+///
+/// Equivalent to:
+/// \code
+/// foldl(c, `+`, 0.0);
+/// \endcode
+Numeric sum(Range c);
 
-  /// \brief Takes elements from Container c that match function f, return them.
-  ///
-  /// Example:
-  /// \code
-  /// eval> filter([1, 2, 3, 4], odd)
-  /// [1, 3]
-  /// \endcode
-  Object filter(Container c, Function f);
 
-  /// \brief Joins the elements of the Range c into a string, delimiting each with the delim string.
-  ///
-  /// Example:
-  /// \code
-  /// eval> join([1, 2, 3], "*")
-  /// 1*2*3
-  /// \endcode
-  string join(Range c, string delim);
+/// \brief Returns the product of the value in the Range c.
+///
+/// Example:
+/// \code
+/// eval> product([1, 2, 3, 4])
+/// 24
+/// \endcode
+///
+/// Equivalent to:
+/// \code
+/// foldl(c, `*`, 1.0);
+/// \endcode
+Numeric product(Range c);
 
-  /// \brief Returns the contents of the Container c in reversed order.
-  ///
-  /// Example:
-  /// \code
-  /// eval> reverse([1, 2, 3, 4, 5, 6, 7])
-  /// [7, 6, 5, 4, 3, 2, 1]
-  /// \endcode
-  Container reverse(Container c);
 
-  /// \brief Generates a new Vector filled with values starting at x and ending with y.
-  ///
-  /// Works on types supporting operator<=(x, y) and operator++(x)
-  ///
-  /// Example:
-  /// \code
-  /// eval> generate_range(1, 10)
-  /// [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-  /// \endcode
-  Vector generate_range(Object x, Object y);
+/// \brief Takes num elements from the Range c, returning them.
+///
+/// Example:
+/// \code
+/// eval> take([1, 2, 3, 4], 2)
+/// [1, 2]
+/// \endcode
+///
+/// \returns A container of the same type that was passed in
+Object take(Range c, int num);
 
-  /// \brief Returns a new Range with x and y concatenated.
-  ///
-  /// Example:
-  /// \code
-  /// eval> concat([1, 2, 3], [4, 5, 6])
-  /// [1, 2, 3, 4, 5, 6]
-  /// \endcode
-  Object concat(Range x, Range y);
 
-  /// \brief Returns a new Vector with x and y as its values.
-  ///
-  /// Example:
-  /// \code
-  /// eval> collate(1, 2)
-  /// [1, 2]
-  /// \endcode
-  Vector collate(Object x, Object y);
+/// \brief Takes elements from the Range c that match function f, stopping at the first non-match, returning them as a new Vector.
+///
+/// Example:
+/// \code
+/// eval> take_while([1, 2, 3], odd)
+/// [1]
+/// \endcode
+///
+/// \returns A container of the same type that was passed in
+Object take_while(Range c, Function f);
 
-  /// \brief Applies f to elements of x and y, returning a new Vector with the result of each application.
-  ///
-  /// Example:
-  /// \code
-  /// eval> zip_with(`+`, [1, 2, 3], [4, 5, 6])
-  /// [5, 7, 9]
-  /// \endcode
-  Vector zip_with(Function f, Range x, Range y);
 
-  /// \brief Collates elements of x and y, returning a new Vector with the result.
-  ///
-  /// Example:
-  /// \code
-  /// eval> zip([1, 2, 3], [4, 5, 6])
-  /// [[1, 4], [2, 5], [3, 6]]
-  /// \endcode
-  Vector zip(Range x, Range y);
+/// \brief Drops num elements from the Range c, returning the remainder.
+///
+/// Example:
+/// \code
+/// eval> drop([1, 2, 3, 4], 2)
+/// [3, 4]
+/// \endcode
+///
+/// \returns A container of the same type that was passed in
+Object drop(Range c, int num);
 
-  /// \brief returns true if there exists a call to the Function f that takes the given parameters
-  ///
-  /// Example:
-  /// \code
-  /// eval> call_exists(`+`, 1, 2)
-  /// true
-  /// \endcode
-  bool call_exists(Function f, ...);
 
-  /// \brief Reverses a Range object so that the elements are accessed in reverse
-  Range retro(Range);
+/// \brief Drops elements from the Range c that match f, stopping at the first non-match, returning the remainder.
+///
+/// Example:
+/// \code
+/// eval> drop_while([1, 2, 3], odd)         
+/// [2, 3]
+/// \endcode
+Object drop_while(Range c, Function f);
 
-  /// \brief Reverses a Const_Range object so that the elements are accessed in reverse
-  Const_Range retro(Const_Range);
 
-  /// \brief Raises the given object as an exception. Any type of object can be thrown.
-  ///
-  /// Example:
-  /// \code
-  /// eval> try { throw(1); } catch (e) { print("Exception caught: " + to_string(e)); }
-  /// Exception caught: 1
-  /// \endcode
-  ///
-  /// \sa \ref keywordtry
-  void throw(Object);
-} // namespace ChaiScript_Language
+/// \brief Similar to foldl, this takes the first two elements as its starting values for f. This assumes Range c has at least 2 elements.
+///
+/// Example:
+/// \code
+/// eval> reduce([1, 2, 3, 4], `+`)
+/// 10
+/// \endcode
+Object reduce(Range c, Function f);
+
+
+/// \brief Takes elements from Container c that match function f, return them.
+///
+/// Example:
+/// \code
+/// eval> filter([1, 2, 3, 4], odd)
+/// [1, 3]
+/// \endcode
+Object filter(Container c, Function f);
+
+
+/// \brief Joins the elements of the Range c into a string, delimiting each with the delim string.
+///
+/// Example:
+/// \code
+/// eval> join([1, 2, 3], "*") 
+/// 1*2*3
+/// \endcode
+string join(Range c, string delim);
+
+
+/// \brief Returns the contents of the Container c in reversed order.
+///
+/// Example:
+/// \code
+/// eval> reverse([1, 2, 3, 4, 5, 6, 7])
+/// [7, 6, 5, 4, 3, 2, 1]
+/// \endcode
+Container reverse(Container c);
+
+
+/// \brief Generates a new Vector filled with values starting at x and ending with y.
+///
+/// Works on types supporting operator<=(x, y) and operator++(x)
+///
+/// Example:
+/// \code
+/// eval> generate_range(1, 10)
+/// [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+/// \endcode
+Vector generate_range(Object x, Object y);
+
+
+/// \brief Returns a new Range with x and y concatenated.
+///
+/// Example:
+/// \code
+/// eval> concat([1, 2, 3], [4, 5, 6])
+/// [1, 2, 3, 4, 5, 6]
+/// \endcode
+Object concat(Range x, Range y);
+
+
+/// \brief Returns a new Vector with x and y as its values.
+///
+/// Example:
+/// \code
+/// eval> collate(1, 2)
+/// [1, 2]
+/// \endcode
+Vector collate(Object x, Object y);
+
+
+/// \brief Applies f to elements of x and y, returning a new Vector with the result of each application.
+///
+/// Example:
+/// \code
+/// eval> zip_with(`+`, [1, 2, 3], [4, 5, 6])
+/// [5, 7, 9]
+/// \endcode
+Vector zip_with(Function f, Range x, Range y);
+
+
+/// \brief Collates elements of x and y, returning a new Vector with the result.
+///
+/// Example:
+/// \code
+/// eval> zip([1, 2, 3], [4, 5, 6])
+/// [[1, 4], [2, 5], [3, 6]]
+/// \endcode
+Vector zip(Range x, Range y);
+
+
+/// \brief returns true if there exists a call to the Function f that takes the given parameters
+///
+/// Example:
+/// \code
+/// eval> call_exists(`+`, 1, 2)
+/// true
+/// \endcode
+bool call_exists(Function f, ...);
+
+/// \brief Reverses a Range object so that the elements are accessed in reverse
+Range retro(Range);
+
+/// \brief Reverses a Const_Range object so that the elements are accessed in reverse
+Const_Range retro(Const_Range);
+
+
+/// \brief Raises the given object as an exception. Any type of object can be thrown.
+///
+/// Example:
+/// \code
+/// eval> try { throw(1); } catch (e) { print("Exception caught: " + to_string(e)); }
+/// Exception caught: 1
+/// \endcode
+/// 
+/// \sa \ref keywordtry
+void throw(Object); 
+}
+

include/chaiscript/language/chaiscript_tracer.hpp

@@ -1,37 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_TRACER_HPP_
-#define CHAISCRIPT_TRACER_HPP_
-
-namespace chaiscript::eval {
-  struct Noop_Tracer_Detail {
-    template<typename T>
-    constexpr void trace(const chaiscript::detail::Dispatch_State &, const AST_Node_Impl<T> *) noexcept {
-    }
-  };
-
-  template<typename... T>
-  struct Tracer : T... {
-    Tracer() = default;
-    constexpr explicit Tracer(T... t)
-        : T(std::move(t))... {
-    }
-
-    void do_trace(const chaiscript::detail::Dispatch_State &ds, const AST_Node_Impl<Tracer<T...>> *node) {
-      (static_cast<T &>(*this).trace(ds, node), ...);
-    }
-
-    static void trace(const chaiscript::detail::Dispatch_State &ds, const AST_Node_Impl<Tracer<T...>> *node) {
-      ds->get_parser().get_tracer<Tracer<T...>>().do_trace(ds, node);
-    }
-  };
-
-  using Noop_Tracer = Tracer<Noop_Tracer_Detail>;
-
-} // namespace chaiscript::eval
-
-#endif

include/chaiscript/language/chaiscript_unknown.hpp

@@ -1,25 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_UNKNOWN_HPP_
-#define CHAISCRIPT_UNKNOWN_HPP_
-
-namespace chaiscript {
-  namespace detail {
-    struct Loadable_Module {
-      Loadable_Module(const std::string &, const std::string &) {
-#ifdef CHAISCRIPT_NO_DYNLOAD
-        throw chaiscript::exception::load_module_error("Loadable module support was disabled (CHAISCRIPT_NO_DYNLOAD)");
-#else
-        throw chaiscript::exception::load_module_error("Loadable module support not available for your platform");
-#endif
-      }
-
-      ModulePtr m_moduleptr;
-    };
-  } // namespace detail
-} // namespace chaiscript
-#endif

include/chaiscript/language/chaiscript_windows.hpp

@@ -1,113 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_WINDOWS_HPP_
-#define CHAISCRIPT_WINDOWS_HPP_
-
-#include <string>
-
-#ifdef CHAISCRIPT_WINDOWS
-#define VC_EXTRA_LEAN
-#if !defined(WIN32_LEAN_AND_MEAN)
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#endif
-
-namespace chaiscript {
-  namespace detail {
-    struct Loadable_Module {
-      template<typename T>
-      static std::wstring to_wstring(const T &t_str) {
-        return std::wstring(t_str.begin(), t_str.end());
-      }
-
-      template<typename T>
-      static std::string to_string(const T &t_str) {
-        return std::string(t_str.begin(), t_str.end());
-      }
-
-#if defined(_UNICODE) || defined(UNICODE)
-      template<typename T>
-      static std::wstring to_proper_string(const T &t_str) {
-        return to_wstring(t_str);
-      }
-#else
-      template<typename T>
-      static std::string to_proper_string(const T &t_str) {
-        return to_string(t_str);
-      }
-#endif
-
-      static std::string get_error_message(DWORD t_err) {
-        using StringType = LPTSTR;
-
-#if defined(_UNICODE) || defined(UNICODE)
-        std::wstring retval = L"Unknown Error";
-#else
-        std::string retval = "Unknown Error";
-#endif
-        StringType lpMsgBuf = nullptr;
-
-        if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                          nullptr,
-                          t_err,
-                          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                          reinterpret_cast<StringType>(&lpMsgBuf),
-                          0,
-                          nullptr)
-                != 0
-            && lpMsgBuf) {
-          retval = lpMsgBuf;
-          LocalFree(lpMsgBuf);
-        }
-
-        return to_string(retval);
-      }
-
-      struct DLModule {
-        explicit DLModule(const std::string &t_filename)
-            : m_data(LoadLibrary(to_proper_string(t_filename).c_str())) {
-          if (!m_data) {
-            throw chaiscript::exception::load_module_error(get_error_message(GetLastError()));
-          }
-        }
-
-        DLModule(DLModule &&) = default;
-        DLModule &operator=(DLModule &&) = default;
-        DLModule(const DLModule &) = delete;
-        DLModule &operator=(const DLModule &) = delete;
-
-        ~DLModule() { FreeLibrary(m_data); }
-
-        HMODULE m_data;
-      };
-
-      template<typename T>
-      struct DLSym {
-        DLSym(DLModule &t_mod, const std::string &t_symbol)
-            : m_symbol(reinterpret_cast<T>(GetProcAddress(t_mod.m_data, t_symbol.c_str()))) {
-          if (!m_symbol) {
-            throw chaiscript::exception::load_module_error(get_error_message(GetLastError()));
-          }
-        }
-
-        T m_symbol;
-      };
-
-      Loadable_Module(const std::string &t_module_name, const std::string &t_filename)
-          : m_dlmodule(t_filename)
-          , m_func(m_dlmodule, "create_chaiscript_module_" + t_module_name)
-          , m_moduleptr(m_func.m_symbol()) {
-      }
-
-      DLModule m_dlmodule;
-      DLSym<Create_Module_Func> m_func;
-      ModulePtr m_moduleptr;
-    };
-  } // namespace detail
-} // namespace chaiscript
-#endif

include/chaiscript/utility/fnv1a.hpp

@@ -1,38 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_UTILITY_FNV1A_HPP_
-#define CHAISCRIPT_UTILITY_FNV1A_HPP_
-
-#include "../chaiscript_defines.hpp"
-#include <cstdint>
-
-namespace chaiscript {
-  namespace utility {
-    static constexpr std::uint32_t fnv1a_32(const char *s, std::uint32_t h = 0x811c9dc5) {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4307)
-#endif
-      return (*s == 0) ? h : fnv1a_32(s + 1, ((h ^ (*s)) * 0x01000193));
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-  } // namespace utility
-} // namespace chaiscript
-
-#endif

include/chaiscript/utility/hash.hpp

@@ -1,94 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_UTILITY_FNV1A_HPP_
-#define CHAISCRIPT_UTILITY_FNV1A_HPP_
-
-#include "../chaiscript_defines.hpp"
-#include <cstdint>
-
-namespace chaiscript {
-  namespace utility {
-    namespace fnv1a {
-      template<typename Itr>
-      static constexpr std::uint32_t hash(Itr begin, Itr end) noexcept {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4307)
-#endif
-        std::uint32_t h = 0x811c9dc5;
-
-        while (begin != end) {
-          h = (h ^ (*begin)) * 0x01000193;
-          ++begin;
-        }
-        return h;
-
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-      }
-
-      template<size_t N>
-      static constexpr std::uint32_t hash(const char (&str)[N]) noexcept {
-        return hash(std::begin(str), std::end(str) - 1);
-      }
-
-      static constexpr std::uint32_t hash(std::string_view sv) noexcept {
-        return hash(sv.begin(), sv.end());
-      }
-
-      static inline std::uint32_t hash(const std::string &s) noexcept {
-        return hash(s.begin(), s.end());
-      }
-    } // namespace fnv1a
-
-    namespace jenkins_one_at_a_time {
-      template<typename Itr>
-      static constexpr std::uint32_t hash(Itr begin, Itr end) noexcept {
-        std::uint32_t hash = 0;
-
-        while (begin != end) {
-          hash += std::uint32_t(*begin);
-          hash += hash << 10;
-          hash ^= hash >> 6;
-          ++begin;
-        }
-
-        hash += hash << 3;
-        hash ^= hash >> 11;
-        hash += hash << 15;
-        return hash;
-      }
-
-      template<size_t N>
-      static constexpr std::uint32_t hash(const char (&str)[N]) noexcept {
-        return hash(std::begin(str), std::end(str) - 1);
-      }
-
-      static constexpr std::uint32_t hash(std::string_view sv) noexcept {
-        return hash(sv.begin(), sv.end());
-      }
-
-      static inline std::uint32_t hash(const std::string &s) noexcept {
-        return hash(s.begin(), s.end());
-      }
-    } // namespace jenkins_one_at_a_time
-
-    using fnv1a::hash;
-  } // namespace utility
-} // namespace chaiscript
-
-#endif

include/chaiscript/utility/json_wrap.hpp

@@ -3,68 +3,82 @@
 
 #include "json.hpp"
 
-namespace chaiscript {
-  class json_wrap {
+namespace chaiscript
+{
+  class json_wrap
+  {
     public:
-    static Module &library(Module &m) {
-      m.add(chaiscript::fun([](const std::string &t_str) { return from_json(t_str); }), "from_json");
-      m.add(chaiscript::fun(&json_wrap::to_json), "to_json");
+
+      static ModulePtr library(ModulePtr m = std::make_shared<Module>())
+      {
+
+        m->add(chaiscript::fun([](const std::string &t_str) { return from_json(t_str); }), "from_json");
+        m->add(chaiscript::fun(&json_wrap::to_json), "to_json");
 
         return m;
+
       }
 
     private:
-    static Boxed_Value from_json(const json::JSON &t_json) {
-      switch (t_json.JSONType()) {
+
+      static Boxed_Value from_json(const json::JSON &t_json)
+      {
+        switch( t_json.JSONType() ) {
           case json::JSON::Class::Null:
             return Boxed_Value();
-        case json::JSON::Class::Object: {
+          case json::JSON::Class::Object:
+            {
               std::map<std::string, Boxed_Value> m;
 
-          for (const auto &p : t_json.object_range()) {
+              for (const auto &p : t_json.ObjectRange())
+              {
                 m.insert(std::make_pair(p.first, from_json(p.second)));
               }
 
               return Boxed_Value(m);
             }
-        case json::JSON::Class::Array: {
+          case json::JSON::Class::Array:
+            {
               std::vector<Boxed_Value> vec;
 
-          for (const auto &p : t_json.array_range()) {
+              for (const auto &p : t_json.ArrayRange()) 
+              {
                 vec.emplace_back(from_json(p));
               }
 
               return Boxed_Value(vec);
             }
           case json::JSON::Class::String:
-          return Boxed_Value(t_json.to_string());
+            return Boxed_Value(t_json.ToString());
           case json::JSON::Class::Floating:
-          return Boxed_Value(t_json.to_float());
+            return Boxed_Value(t_json.ToFloat());
           case json::JSON::Class::Integral:
-          return Boxed_Value(t_json.to_int());
+            return Boxed_Value(t_json.ToInt());
           case json::JSON::Class::Boolean:
-          return Boxed_Value(t_json.to_bool());
+            return Boxed_Value(t_json.ToBool());
         }
 
         throw std::runtime_error("Unknown JSON type");
       }
 
-    static Boxed_Value from_json(const std::string &t_json) {
-      try {
-        return from_json(json::JSON::Load(t_json));
-      } catch (const std::out_of_range &) {
-        throw std::runtime_error("Unparsed JSON input");
-      }
+      static Boxed_Value from_json(const std::string &t_json)
+      {
+        return from_json( json::JSON::Load(t_json) );
       }
 
-    static std::string to_json(const Boxed_Value &t_bv) { return to_json_object(t_bv).dump(); }
+      static std::string to_json(const Boxed_Value &t_bv)
+      {
+        return to_json_object(t_bv).dump();
+      }
 
-    static json::JSON to_json_object(const Boxed_Value &t_bv) {
+      static json::JSON to_json_object(const Boxed_Value &t_bv)
+      {
         try {
           const std::map<std::string, Boxed_Value> m = chaiscript::boxed_cast<const std::map<std::string, Boxed_Value> &>(t_bv);
 
-        json::JSON obj(json::JSON::Class::Object);
-        for (const auto &o : m) {
+          json::JSON obj;
+          for (const auto &o : m)
+          {
             obj[o.first] = to_json_object(o.second);
           }
           return obj;
@@ -75,8 +89,9 @@ namespace chaiscript {
         try {
           const std::vector<Boxed_Value> v = chaiscript::boxed_cast<const std::vector<Boxed_Value> &>(t_bv);
 
-        json::JSON obj(json::JSON::Class::Array);
-        for (size_t i = 0; i < v.size(); ++i) {
+          json::JSON obj;
+          for (size_t i = 0; i < v.size(); ++i)
+          {
             obj[i] = to_json_object(v[i]);
           }
           return obj;
@@ -84,34 +99,46 @@ namespace chaiscript {
           // not a vector
         }
 
+
         try {
           Boxed_Number bn(t_bv);
-        if (Boxed_Number::is_floating_point(t_bv)) {
-          return json::JSON(bn.get_as<double>());
+          json::JSON obj;
+          if (Boxed_Number::is_floating_point(t_bv))
+          {
+            obj = bn.get_as<double>();
           } else {
-          return json::JSON(bn.get_as<std::int64_t>());
+            obj = bn.get_as<long>();
           }
+          return obj;
         } catch (const chaiscript::detail::exception::bad_any_cast &) {
           // not a number
         }
 
         try {
-        return json::JSON(boxed_cast<bool>(t_bv));
+          bool b = boxed_cast<bool>(t_bv);
+          json::JSON obj;
+          obj = b;
+          return obj;
         } catch (const chaiscript::exception::bad_boxed_cast &) {
           // not a bool
         }
 
         try {
-        return json::JSON(boxed_cast<std::string>(t_bv));
+          std::string s = boxed_cast<std::string>(t_bv);
+          json::JSON obj;
+          obj = s;
+          return obj;
         } catch (const chaiscript::exception::bad_boxed_cast &) {
           // not a string
         }
 
+
         try {
           const chaiscript::dispatch::Dynamic_Object &o = boxed_cast<const dispatch::Dynamic_Object &>(t_bv);
 
-        json::JSON obj(json::JSON::Class::Object);
-        for (const auto &attr : o.get_attrs()) {
+          json::JSON obj;
+          for (const auto &attr : o.get_attrs())
+          {
             obj[attr.first] = to_json_object(attr.second);
           }
           return obj;
@@ -119,13 +146,13 @@ namespace chaiscript {
           // not a dynamic object
         }
 
-      if (t_bv.is_null())
-        return json::JSON(); // a null value
-
         throw std::runtime_error("Unknown object type to convert to JSON");
       }
+
+
   };
 
-} // namespace chaiscript
+
+}
 
 #endif

include/chaiscript/utility/quick_flat_map.hpp

@@ -1,133 +0,0 @@
-#ifndef CHAISCRIPT_UTILITY_QUICK_FLAT_MAP_HPP
-#define CHAISCRIPT_UTILITY_QUICK_FLAT_MAP_HPP
-
-namespace chaiscript::utility {
-  template<typename Key, typename Value, typename Comparator = std::equal_to<>>
-  struct QuickFlatMap {
-    Comparator comparator;
-
-    template<typename Lookup>
-    auto find(const Lookup &s) noexcept {
-      return std::find_if(std::begin(data), std::end(data), [&s, this](const auto &d) { return comparator(d.first, s); });
-    }
-
-    template<typename Lookup>
-    auto find(const Lookup &s) const noexcept {
-      return std::find_if(std::cbegin(data), std::cend(data), [&s, this](const auto &d) { return comparator(d.first, s); });
-    }
-
-    template<typename Lookup>
-    auto find(const Lookup &s, const std::size_t t_hint) const noexcept {
-      if (data.size() > t_hint && comparator(data[t_hint].first, s)) {
-        const auto begin = std::cbegin(data);
-        return std::next(begin, static_cast<typename std::iterator_traits<std::decay_t<decltype(begin)>>::difference_type>(t_hint));
-      } else {
-        return find(s);
-      }
-    }
-
-    auto size() const noexcept { return data.size(); }
-
-    auto begin() const noexcept { return data.begin(); }
-
-    auto end() const noexcept { return data.end(); }
-
-    auto begin() noexcept { return data.begin(); }
-
-    auto end() noexcept { return data.end(); }
-
-    auto &back() noexcept { return data.back(); }
-
-    const auto &back() const noexcept { return data.back(); }
-
-    Value &operator[](const Key &s) {
-      const auto itr = find(s);
-      if (itr != data.end()) {
-        return itr->second;
-      } else {
-        grow();
-        return data.emplace_back(s, Value()).second;
-      }
-    }
-
-    Value &at_index(const std::size_t idx) noexcept { return data[idx].second; }
-
-    const Value &at_index(const std::size_t idx) const noexcept { return data[idx].second; }
-
-    bool empty() const noexcept { return data.empty(); }
-
-    template<typename Itr>
-    void assign(Itr begin, Itr end) {
-      data.assign(begin, end);
-    }
-
-    Value &at(const Key &s) {
-      const auto itr = find(s);
-      if (itr != data.end()) {
-        return itr->second;
-      } else {
-        throw std::out_of_range("Unknown key: " + s);
-      }
-    }
-
-    template<typename M>
-    auto insert_or_assign(Key &&key, M &&m) {
-      if (auto itr = find(key); itr != data.end()) {
-        *itr = std::forward<M>(m);
-        return std::pair{itr, false};
-      } else {
-        grow();
-        return std::pair{data.emplace(data.end(), std::move(key), std::forward<M>(m)), true};
-      }
-    }
-
-    template<typename M>
-    auto insert_or_assign(const Key &key, M &&m) {
-      if (auto itr = find(key); itr != data.end()) {
-        itr->second = std::forward<M>(m);
-        return std::pair{itr, false};
-      } else {
-        grow();
-        return std::pair{data.emplace(data.end(), key, std::forward<M>(m)), true};
-      }
-    }
-
-    const Value &at(const Key &s) const {
-      const auto itr = find(s);
-      if (itr != data.end()) {
-        return itr->second;
-      } else {
-        throw std::out_of_range("Unknown key: " + s);
-      }
-    }
-
-    template<typename Lookup>
-    size_t count(const Lookup &s) const noexcept {
-      return (find(s) != data.end()) ? 1 : 0;
-    }
-
-    std::vector<std::pair<Key, Value>> data;
-
-    using value_type = std::pair<Key, Value>;
-    using iterator = typename decltype(data)::iterator;
-    using const_iterator = typename decltype(data)::const_iterator;
-
-    std::pair<iterator, bool> insert(value_type &&value) {
-      if (const auto itr = find(value.first); itr != data.end()) {
-        return std::pair{itr, false};
-      } else {
-        grow();
-        return std::pair{data.insert(data.end(), std::move(value)), true};
-      }
-    }
-
-    void grow() {
-      if ((data.capacity() - data.size()) == 0) {
-        data.reserve(data.size() + 2);
-      }
-    }
-  };
-
-} // namespace chaiscript::utility
-
-#endif

include/chaiscript/utility/stack_vector.hpp

@@ -1,49 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-#ifndef CHAISCRIPT_STACK_VECTOR_HPP_
-#define CHAISCRIPT_STACK_VECTOR_HPP_
-
-#include <cstdint>
-#include <string>
-#include <type_traits>
-
-template<typename T, std::size_t MaxSize>
-struct Stack_Vector {
-  constexpr static auto aligned_size = sizeof(T) + (sizeof(T) & std::alignment_of_v<T>) > 0 ? std::alignment_of_v<T> : 0;
-
-  alignas(std::alignment_of_v<T>) char data[aligned_size * MaxSize];
-
-  [[nodiscard]] T &operator[](const std::size_t idx) noexcept { return *reinterpret_cast<T *>(&data + aligned_size * idx); }
-
-  [[nodiscard]] const T &operator[](const std::size_t idx) const noexcept {
-    return *reinterpret_cast<const T *>(&data + aligned_size * idx);
-  }
-
-  template<typename... Param>
-  T &emplace_back(Param &&...param) {
-    auto *p = new (&(*this)[m_size++]) T(std::forward<Param>(param)...);
-    return *p;
-  };
-
-  auto size() const noexcept { return m_size; };
-
-  void pop_back() noexcept(std::is_nothrow_destructible_v<T>) { (*this)[--m_size].~T(); }
-
-  ~Stack_Vector() noexcept(std::is_nothrow_destructible_v<T>) {
-    auto loc = m_size - 1;
-    for (std::size_t pos = 0; pos < m_size; ++pos) {
-      (*this)[loc--].~T();
-    }
-  }
-
-  std::size_t m_size{0};
-};
-
-#endif CHAISCRIPT_STACK_VECTOR_HPP_

include/chaiscript/utility/static_string.hpp

@@ -1,54 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-#ifndef CHAISCRIPT_UTILITY_STATIC_STRING_HPP_
-#define CHAISCRIPT_UTILITY_STATIC_STRING_HPP_
-
-namespace chaiscript::utility {
-  struct Static_String {
-    template<size_t N>
-    constexpr Static_String(const char (&str)[N]) noexcept
-        : m_size(N - 1)
-        , data(&str[0]) {
-    }
-
-    constexpr size_t size() const noexcept { return m_size; }
-
-    constexpr const char *c_str() const noexcept { return data; }
-
-    constexpr auto begin() const noexcept { return data; }
-
-    constexpr auto end() const noexcept { return data + m_size; }
-
-    constexpr bool operator==(std::string_view other) const noexcept {
-      // return std::string_view(data, m_size) == other;
-      auto b1 = begin();
-      const auto e1 = end();
-      auto b2 = other.begin();
-      const auto e2 = other.end();
-
-      if (e1 - b1 != e2 - b2) {
-        return false;
-      }
-
-      while (b1 != e1) {
-        if (*b1 != *b2) {
-          return false;
-        }
-        ++b1;
-        ++b2;
-      }
-      return true;
-    }
-
-    bool operator==(const std::string &t_str) const noexcept { return std::equal(begin(), end(), std::cbegin(t_str), std::cend(t_str)); }
-
-    const size_t m_size;
-    const char *data = nullptr;
-  };
-} // namespace chaiscript::utility
-
-#endif

include/chaiscript/utility/utility.hpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_UTILITY_UTILITY_HPP_
 #define CHAISCRIPT_UTILITY_UTILITY_HPP_
 
@@ -15,11 +12,17 @@
 #include <utility>
 #include <vector>
 
+#include "../chaiscript.hpp"
+#include "../dispatchkit/proxy_functions.hpp"
+#include "../dispatchkit/type_info.hpp"
 #include "../dispatchkit/operators.hpp"
-#include "../dispatchkit/register_function.hpp"
-#include "../language/chaiscript_common.hpp"
 
-namespace chaiscript::utility {
+
+namespace chaiscript 
+{
+  namespace utility
+  {
+
     /// Single step command for registering a class with ChaiScript
     /// 
     /// \param[in,out] t_module Model to add class to
@@ -47,14 +50,17 @@ namespace chaiscript::utility {
       void add_class(ModuleType &t_module,
           const std::string &t_class_name,
           const std::vector<chaiscript::Proxy_Function> &t_constructors,
-                 const std::vector<std::pair<chaiscript::Proxy_Function, std::string>> &t_funcs) {
+          const std::vector<std::pair<chaiscript::Proxy_Function, std::string>> &t_funcs)
+      {
         t_module.add(chaiscript::user_type<Class>(), t_class_name); 
 
-    for (const chaiscript::Proxy_Function &ctor : t_constructors) {
+        for(const chaiscript::Proxy_Function &ctor: t_constructors)
+        {
           t_module.add(ctor, t_class_name);
         }
 
-    for (const auto &fun : t_funcs) {
+        for(const auto &fun: t_funcs)
+        {
           t_module.add(fun.first, fun.second);
         }
       }
@@ -63,42 +69,39 @@ namespace chaiscript::utility {
       typename std::enable_if<std::is_enum<Enum>::value, void>::type
       add_class(ModuleType &t_module,
         const std::string &t_class_name,
-            const std::vector<std::pair<typename std::underlying_type<Enum>::type, std::string>> &t_constants) {
+#ifdef CHAISCRIPT_GCC_4_6
+        const std::vector<std::pair<int, std::string>> &t_constants
+#else
+        const std::vector<std::pair<typename std::underlying_type<Enum>::type, std::string>> &t_constants
+#endif
+        )
+      {
         t_module.add(chaiscript::user_type<Enum>(), t_class_name);
 
-    t_module.add(chaiscript::constructor<Enum()>(), t_class_name);
-    t_module.add(chaiscript::constructor<Enum(const Enum &)>(), t_class_name);
+        t_module.add(chaiscript::constructor<Enum ()>(), t_class_name);
+        t_module.add(chaiscript::constructor<Enum (const Enum &)>(), t_class_name);
 
         using namespace chaiscript::bootstrap::operators;
-    equal<Enum>(t_module);
-    not_equal<Enum>(t_module);
-    assign<Enum>(t_module);
+        t_module.add([](){
+              // add some comparison and assignment operators
+              return assign<Enum>(not_equal<Enum>(equal<Enum>()));
+            }());
 
+#ifdef CHAISCRIPT_GCC_4_6
         t_module.add(chaiscript::fun([](const Enum &e, const int &i) { return e == i; }), "==");
         t_module.add(chaiscript::fun([](const int &i, const Enum &e) { return i == e; }), "==");
+#else
+        t_module.add(chaiscript::fun([](const Enum &e, const typename std::underlying_type<Enum>::type &i) { return e == i; }), "==");
+        t_module.add(chaiscript::fun([](const typename std::underlying_type<Enum>::type &i, const Enum &e) { return i == e; }), "==");
+#endif
 
-    for (const auto &constant : t_constants) {
+        for (const auto &constant : t_constants)
+        {
           t_module.add_global_const(chaiscript::const_var(Enum(constant.first)), constant.second);
         }
       }
-
-  template<typename EnumClass, typename ModuleType>
-  typename std::enable_if<std::is_enum<EnumClass>::value, void>::type
-  add_class(ModuleType &t_module, const std::string &t_class_name, const std::vector<std::pair<EnumClass, std::string>> &t_constants) {
-    t_module.add(chaiscript::user_type<EnumClass>(), t_class_name);
-
-    t_module.add(chaiscript::constructor<EnumClass()>(), t_class_name);
-    t_module.add(chaiscript::constructor<EnumClass(const EnumClass &)>(), t_class_name);
-
-    using namespace chaiscript::bootstrap::operators;
-    equal<EnumClass>(t_module);
-    not_equal<EnumClass>(t_module);
-    assign<EnumClass>(t_module);
-
-    for (const auto &constant : t_constants) {
-      t_module.add_global_const(chaiscript::const_var(EnumClass(constant.first)), constant.second);
   }
-  }
-} // namespace chaiscript::utility
+}
 
 #endif
+

license.txt

@@ -1,6 +1,4 @@
-BSD-3-Clause License
-
-Copyright 2009-2018 Jason Turner
+Copyright 2009-2016 Jason Turner
 Copyright 2009-2012 Jonathan Turner. 
 
 All Rights Reserved.

performance_tests/create_variables.chai

@@ -1,11 +0,0 @@
-def var_test(int n)
-{
-    for (var i = 0; i < n; ++i)   {
-        var j = 0
-    }
-}
-
-var n = 500000
-var_test(n) // takes 2.6 s
-
-

performance_tests/profile_cpp_calls_2.cpp

@@ -5,8 +5,9 @@ double f(const std::string &, double, bool) noexcept {
   return .0;
 }
 
-int main() {
-  chaiscript::ChaiScript chai;
+int main()
+{
+  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
 
   chai.add(chaiscript::fun(&f), "f");
 
@@ -15,4 +16,5 @@ int main() {
         f("str", 1.2, false);
       }
     )");
+
 }

performance_tests/profile_fun_wrappers.cpp

@@ -5,14 +5,16 @@ double f(const std::string &, double, bool) noexcept {
   return .0;
 }
 
-int main() {
-  chaiscript::ChaiScript chai;
+int main()
+{
+  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
 
   chai.add(chaiscript::fun(&f), "f");
 
-  const auto f = chai.eval<std::function<void()>>(R"(fun(){ f("str", 1.2, false); })");
+  const auto f = chai.eval<std::function<void ()>>(R"(fun(){ f("str", 1.2, false); })");
 
   for (int i = 0; i < 100000; ++i) {
     f();
   }
+
 }

readme.md

@@ -1,18 +1,18 @@
-<a href="https://www.patreon.com/bePatron?u=2977989&redirect_uri=https%3A%2F%2Fwww.patreon.com%2Flefticus">
-    <img height="40" width="204" src="https://s3-us-west-1.amazonaws.com/widget-images/become-patron-widget-medium%402x.png">
-</a>
-
-
 Master Status: [![Linux Build Status](https://travis-ci.org/ChaiScript/ChaiScript.png?branch=master)](https://travis-ci.org/ChaiScript/ChaiScript) [![Windows Build status](https://ci.appveyor.com/api/projects/status/6u3r4s81kkjqmsqw?svg=true)](https://ci.appveyor.com/project/lefticus/chaiscript) [![codecov.io](http://codecov.io/github/ChaiScript/ChaiScript/coverage.svg?branch=master)](http://codecov.io/github/ChaiScript/ChaiScript?branch=master)
 
 Develop Status: [![Linux Build Status](https://travis-ci.org/ChaiScript/ChaiScript.png?branch=develop)](https://travis-ci.org/ChaiScript/ChaiScript) [![Windows Build status](https://ci.appveyor.com/api/projects/status/6u3r4s81kkjqmsqw/branch/develop?svg=true)](https://ci.appveyor.com/project/lefticus/chaiscript/branch/develop) [![codecov.io](http://codecov.io/github/ChaiScript/ChaiScript/coverage.svg?branch=develop)](http://codecov.io/github/ChaiScript/ChaiScript?branch=develop)
 
+<a href="https://scan.coverity.com/projects/5297">
+  <img alt="Coverity Scan Build Status"
+       src="https://img.shields.io/coverity/scan/5297.svg"/>
+</a>
+
 ChaiScript
 
 http://www.chaiscript.com
 
 (c) 2009-2012 Jonathan Turner
-(c) 2009-2017 Jason Turner
+(c) 2009-2016 Jason Turner
 
 Release under the BSD license, see "license.txt" for details.
 
@@ -20,11 +20,11 @@ Release under the BSD license, see "license.txt" for details.
 Introduction
 ============
 
-[![Gitter](https://badges.gitter.im/JoinChat.svg)](https://gitter.im/ChaiScript/ChaiScript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ChaiScript/ChaiScript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ChaiScript is one of the only embedded scripting language designed from the 
 ground up to directly target C++ and take advantage of modern C++ development 
-techniques, working with the developer how they would expect it to work.  Being a
+techniques, working with the developer like he expects it to work.  Being a 
 native C++ application, it has some advantages over existing embedded scripting 
 languages:
 
@@ -38,21 +38,11 @@ languages:
 Requirements
 ============
 
-ChaiScript requires a C++17 compiler to build with support for variadic
-templates.  It has been tested with gcc 7 and clang 6 (with libcxx).
-
-Installation using vcpkg
-========================
-
-You can download and install ChaiScript using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
-
-    git clone https://github.com/Microsoft/vcpkg.git
-    cd vcpkg
-    ./bootstrap-vcpkg.sh
-    ./vcpkg integrate install
-    vcpkg install chaiscript
-
-The ChaiScript port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
+ChaiScript requires a C++11 compiler to build with support for variadic 
+templates.  It has been tested with gcc 4.6 and clang 3.1 (with libcxx). MacOS 
+10.8 (Mountain Lion) is also known to support the C++11 build with Apple's 
+clang 4.0. MSVC 2013 or newer is supports also. For more information see the build 
+[dashboard](http://chaiscript.com/ChaiScript-BuildResults/index.html).
 
 Usage
 =====
@@ -85,7 +75,7 @@ directory, and for more in-depth look at the language, the unit tests in the
 "unittests" directory cover the most ground.
 
 For examples of how to register parts of your C++ application, see 
-"example.cpp" in the "samples" directory. Example.cpp is verbose and shows every
+"example.cpp" in the "src" directory. Example.cpp is verbose and shows every 
 possible way of working with the library. For further documentation generate 
 the doxygen documentation in the build folder or see the website 
 http://www.chaiscript.com.
@@ -93,21 +83,44 @@ http://www.chaiscript.com.
 
 The shortest complete example possible follows:
 
-```C++
-/// main.cpp
+    /// main.cpp
 
-#include <chaiscript/chaiscript.hpp>
+    #include <chaiscript/chaiscript.hpp>
 
-double function(int i, double j)
-{
+    double function(int i, double j)
+    {
       return i * j;
-}
+    }
 
-int main()
-{
+    int main()
+    {
       chaiscript::ChaiScript chai;
       chai.add(chaiscript::fun(&function), "function");
 
       double d = chai.eval<double>("function(3, 4.75);");
-}
-```
+    }
+
+
+
+Or, if you want to compile the std lib into your code, which reduces
+runtime requirements.
+
+    /// main.cpp
+
+    #include <chaiscript/chaiscript.hpp>
+    #include <chaiscript/chaiscript_stdlib.hpp>
+
+    double function(int i, double j)
+    {
+      return i * j;
+    }
+
+    int main()
+    {
+      chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+      chai.add(chaiscript::fun(&function), "function");
+
+      double d = chai.eval<double>("function(3, 4.75);");
+    }
+
+

releasenotes.md

@@ -1,75 +1,6 @@
 Notes:
 =======
-Current Version: 6.1.1
-
-### Changes since 6.1.0
-
- * Handle the returning of `&` to `*` types. This specifically comes up with `std::vector<int *>` and similar containers
- * Update CMake to use `LIBDIR` instead of `lib` #502 by @guoyunhe
- * Add documentation for installing ChaiScript with vcpkg #500 by @grdowns
- * Fix warning for implicit 'this' lambda capture in C++20 #495 by @Josh-Thompson
-
-### Changes since 6.0.0
-
- * Add namespacing support #290 @stephenberry
- * Add utf parsing support
- * cheatsheet.md updates
- * `add_class` utility support for scoped enums #306 @StanEpp
- * Parser optimizations #300 @niXman
- * Various JSON fixes #377 #400 #409 #371 @totalgee @dinghram @arcoRocks
- * Various cleanups, bugfixes and warning fixes and minor performance improvements
- * Support for C++17 compilers!
- * Support for UTF8 BOM #439 @AlekMosingiewicz @MarioLiebisch
-
-### Changes since 5.8.6
-
-*6.0.0 is a massive rework compared to 5.x. It now requires a C++14 enabled compiler*
-
-#### Compiler Requirements
-
-* MSVC 2015 or greater
-* g++ 4.9 or greater
-* clang 3.6 or greater
-
-#### Breaking Changes
-
-* Instantiating a ChaiScript object now, by default, builds the stdlib in
-  * This was done to address the most common support issues of loading stdlib dynamically at runtime
-  * If you want the old behavior, use include/chaiscript/chaiscript_basic.hpp
-* Headers have been reorganized to fully separate stdlib/parser/engine from each other (some faster builds)
-* Bootstrap functions no longer return a reference to the module added to (compile time savings)
-* It's now no longer possible modify AST_Nodes (compile time, runtime efficiency)
-* Function annotations no longer exist (simplifies code, reduces compile time, compile size)
-
-#### New Features Added
-
-* Modular optimization system; this can be accessed via the ChaiScript_Basic interface
-* Execution tracing capability; also accessed via ChaiScript_Basic interface
-* range-based for loops `for( id : container ) { }` (much better performance than other loop types)
-* If-init expressions (ala C++17)
-* Support for passing r-value references to functions
-* Support for containing unique_ptr
-* Add helpers for exposing enum classes to ChaiScript
-* Allow typed ChaiScript defined functions to perform conversions on call #303
-
-#### Improvements
-
-* Compile time improvements
-* Compile size improvements
-* Significant runtime improvements (see "Modular optimization system")
-* Significant parser improvements, both with parse-time and parser initialization time (Thanks @niXman)
-* Fix type conversion to bool in conditionals
-
-#### Improvements Still Need To Be Made
-
-* File location tracking has been rewritten; this currently means error location reporting is not as good as it was
-* Tracing capability needs to be tested and vetted
-
-### Changes since 5.8.5
-* Optimize away `return` statements in lambdas also
-* Allow conversions to bool in conditionals
-* Don't allow `class` statements inside of scopes
-* Properly error when a dynamic object non-function member is called
+Current Version: 5.8.5
 
 ### Changes since 5.8.4
 * Fix order of operations for prefix operators

samples/BUCK

@@ -1,12 +0,0 @@
-cxx_binary(
-  name = 'example', 
-  srcs = [
-    'example.cpp',
-  ],
-  compiler_flags = [
-    '-std=c++14',
-  ],
-  deps = [
-    '//:chaiscript',
-  ],
-)

samples/example.cpp

@@ -4,52 +4,64 @@
 // and Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// NOT TO BE USED AS A SOURCE OF BEST PRACTICES
-// FOR CHAISCRIPT
-
-#include <ctime>
 #include <iostream>
+#include <ctime>
 
 #include <chaiscript/chaiscript.hpp>
 #include <chaiscript/dispatchkit/bootstrap_stl.hpp>
 #include <chaiscript/dispatchkit/function_call.hpp>
 
-void log(const std::string &msg) {
+void log(const std::string &msg)
+{
   std::cout << "[" << time(nullptr) << "] " << msg << '\n';
 }
 
-void log(const std::string &module, const std::string &msg) {
+void log(const std::string &module, const std::string &msg)
+{
   std::cout << "[" << time(nullptr) << "] <" << module << "> " << msg << '\n';
 }
 
-void bound_log(const std::string &msg) {
+void bound_log(const std::string &msg)
+{
   log(msg);
 }
 
-void hello_world(const chaiscript::Boxed_Value & /*o*/) {
+void hello_world(const chaiscript::Boxed_Value & /*o*/)
+{
   std::cout << "Hello World\n";
 }
 
-void hello_constructor(const chaiscript::Boxed_Value & /*o*/) {
+void hello_constructor(const chaiscript::Boxed_Value & /*o*/)
+{
   std::cout << "Hello Constructor\n";
 }
 
-struct System {
-  std::map<std::string, std::function<std::string(const std::string &)>> m_callbacks;
 
-  void add_callback(const std::string &t_name, const std::function<std::string(const std::string &)> &t_func) {
+struct System
+{
+  std::map<std::string, std::function<std::string (const std::string &) > > m_callbacks;
+
+  void add_callback(const std::string &t_name, 
+      const std::function<std::string (const std::string &)> &t_func)
+  {
     m_callbacks[t_name] = t_func;
   }
 
-  void do_callbacks(const std::string &inp) {
+
+  void do_callbacks(const std::string &inp)
+  {
     log("Running Callbacks: " + inp);
-    for (auto &m_callback : m_callbacks) {
-      log("Callback: " + m_callback.first, m_callback.second(inp));
+    for (std::map<std::string, std::function<std::string (const std::string &)> >::iterator itr = m_callbacks.begin();
+         itr != m_callbacks.end();
+         ++itr)
+    {
+      log("Callback: " + itr->first, itr->second(inp));
     }
   }
 };
 
-void take_shared_ptr(const std::shared_ptr<const std::string> &p) {
+void take_shared_ptr(const std::shared_ptr<const std::string> &p)
+{
   std::cout << *p << '\n';
 }
 
@@ -58,14 +70,15 @@ int main(int /*argc*/, char * /*argv*/[]) {
 
   ChaiScript chai;
   
-  // Create a new system object and share it with the chaiscript engine
-  System system;
-  chai.add_global(var(&system), "system");
 
-  // Add a bound callback method
+  //Create a new system object and share it with the chaiscript engine
+  System system;
+  chai.add(var(&system), "system");
+
+  //Add a bound callback method
   chai.add(fun(&System::add_callback, std::ref(system)), "add_callback_bound");
 
-  // Register the two methods of the System structure.
+  //Register the two methods of the System structure.
   chai.add(fun(&System::add_callback), "add_callback");
   chai.add(fun(&System::do_callbacks), "do_callbacks");
 
@@ -75,87 +88,90 @@ int main(int /*argc*/, char * /*argv*/[]) {
   // The function "{ 'Callback1' + x }" is created in chaiscript and passed into our C++ application
   // in the "add_callback" function of struct System the chaiscript function is converted into a 
   // std::function, so it can be handled and called easily and type-safely
-  chai.eval(R"(system.add_callback("#1", fun(x) { "Callback1 " + x });)");
+  chai.eval("system.add_callback(\"#1\", fun(x) { \"Callback1 \" + x });");
   
   // Because we are sharing the "system" object with the chaiscript engine we have equal
   // access to it both from within chaiscript and from C++ code
   system.do_callbacks("TestString");
-  chai.eval(R"(system.do_callbacks("TestString");)");
+  chai.eval("system.do_callbacks(\"TestString\");");
 
   // The log function is overloaded, therefore we have to give the C++ compiler a hint as to which
   // version we want to register. One way to do this is to create a typedef of the function pointer
   // then cast your function to that typedef.
-  using PlainLog = void (*)(const std::string &);
-  using ModuleLog = void (*)(const std::string &, const std::string &);
+  typedef void (*PlainLog)(const std::string &);
+  typedef void (*ModuleLog)(const std::string &, const std::string &);
   chai.add(fun(PlainLog(&log)), "log");
   chai.add(fun(ModuleLog(&log)), "log");
 
-  chai.eval(R"(log("Test Message"))");
+  chai.eval("log(\"Test Message\")");
 
   // A shortcut to using eval is just to use the chai operator()
-  chai(R"(log("Test Module", "Test Message");)");
+  chai("log(\"Test Module\", \"Test Message\");");
 
-  // Finally, it is possible to register a lambda as a system function, in this
-  // way, we can, for instance add a bound member function to the system
-  chai.add(fun([&system]() { return system.do_callbacks("Bound Test"); }), "do_callbacks");
+  //Finally, it is possible to register any std::function as a system function, in this 
+  //way, we can, for instance add a bound member function to the system
+  chai.add(fun(&System::do_callbacks, std::ref(system), std::string("Bound Test")), "do_callbacks");
 
-  // Call bound version of do_callbacks
+  //Call bound version of do_callbacks
   chai("do_callbacks()");
 
-  std::function<void()> caller = chai.eval<std::function<void()>>(R"(fun() { system.do_callbacks("From Functor"); })");
+  std::function<void ()> caller = chai.eval<std::function<void ()> >("fun() { system.do_callbacks(\"From Functor\"); }");
   caller();
 
-  // If we would like a type-safe return value from all call, we can use
-  // the templated version of eval:
+
+  //If we would like a type-safe return value from all call, we can use
+  //the templated version of eval:
   int i = chai.eval<int>("5+5");
 
   std::cout << "5+5: " << i << '\n';
 
-  // Add a new variable
+  //Add a new variable
   chai("var scripti = 15");
 
-  // We can even get a handle to the variables in the system
+  //We can even get a handle to the variables in the system
   int &scripti = chai.eval<int &>("scripti");
 
   std::cout << "scripti: " << scripti << '\n';
   scripti *= 2;
   std::cout << "scripti (updated): " << scripti << '\n';
-  chai(R"(print("Scripti from chai: " + to_string(scripti)))");
+  chai("print(\"Scripti from chai: \" + to_string(scripti))");
 
-  // To do: Add examples of handling Boxed_Values directly when needed
+  //To do: Add examples of handling Boxed_Values directly when needed
 
-  // Creating a functor on the stack and using it immediately
-  int x = chai.eval<std::function<int(int, int)>>("fun (x, y) { return x + y; }")(5, 6);
+  //Creating a functor on the stack and using it immediately 
+  int x = chai.eval<std::function<int (int, int)> >("fun (x, y) { return x + y; }")(5, 6);
 
   std::stringstream ss;
   ss << x;
   log("Functor test output", ss.str());
 
   chai.add(var(std::shared_ptr<int>()), "nullvar");
-  chai(R"(print("This should be true."); print(nullvar.is_var_null()))");
+  chai("print(\"This should be true.\"); print(nullvar.is_var_null())");
 
   // test the global const action
   chai.add_global_const(const_var(1), "constvar");
   chai("def getvar() { return constvar; }");
   chai("print( getvar() )");
 
-  // Ability to create our own container types when needed. std::vector and std::map are
-  // mostly supported currently
-  // chai.add(bootstrap::standard_library::vector_type<std::vector<int> >("IntVector"));
+
+  //Ability to create our own container types when needed. std::vector and std::map are
+  //mostly supported currently
+  chai.add(bootstrap::standard_library::vector_type<std::vector<int> >("IntVector"));
+
 
   // Test ability to register a function that excepts a shared_ptr version of a type
-  chai(R"(take_shared_ptr("Hello World as a shared_ptr");)");
+  chai("take_shared_ptr(\"Hello World as a shared_ptr\");");
 
   chai.add(fun(&bound_log, std::string("Msg")), "BoundFun");
 
-  // Dynamic objects test
+  //Dynamic objects test
   chai.add(chaiscript::Proxy_Function(new dispatch::detail::Dynamic_Object_Function("TestType", fun(&hello_world))), "hello_world");
   chai.add(chaiscript::Proxy_Function(new dispatch::detail::Dynamic_Object_Constructor("TestType", fun(&hello_constructor))), "TestType");
-  //  chai.add(fun(std::function<Boxed_Value (dispatch::Dynamic_Object &)>(std::bind(&dispatch::detail::Dynamic_Object_Attribute::func,
-  //  "TestType", "attr", std::placeholders::_1))), "attr");
+//  chai.add(fun(std::function<Boxed_Value (dispatch::Dynamic_Object &)>(std::bind(&dispatch::detail::Dynamic_Object_Attribute::func, "TestType", "attr", std::placeholders::_1))), "attr");
 
   chai.eval("var x = TestType()");
-  //  chai.eval("x.attr = \"hi\"");
-  //  chai.eval("print(x.attr)");
+//  chai.eval("x.attr = \"hi\"");
+//  chai.eval("print(x.attr)");
   chai.eval("x.hello_world()");
 }
+

samples/factory.cpp

@@ -1,45 +1,53 @@
 #include <chaiscript/chaiscript.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
 
-class Entity {
-public:
+class Entity
+{
+  public:
     int width;
     int height;
     int x;
     int y;
     std::string name;
 
-  std::function<void(Entity &)> updater;
+    std::function<void (Entity &)> updater;
 
     Entity(const int t_width, const int t_height, const int t_x, const int t_y, std::string t_name)
-      : width(t_width)
-      , height(t_height)
-      , x(t_x)
-      , y(t_y)
-      , name(std::move(t_name)) {
+      : width(t_width), height(t_height), x(t_x), y(t_y), name(std::move(t_name))
+    {
     }
 };
 
-class Factory {
-public:
+class Factory
+{
+  public:
     // we may as well pass the parameters for the entity to the factory method, this does the initialization
     // in one step.
-  Entity *make_entity(const int width, const int height, const int x, const int y, const std::string &name) {
+    Entity *make_entity(const int width, const int height, const int x, const int y, const std::string &name)
+    {
       auto entity = entities.insert({name, Entity{width, height, x, y, name}});
       return &(entity.first->second);
     }
 
-  Entity *get_entity(const std::string &name) { return &entities.at(name); }
+    Entity *get_entity(const std::string &name)
+    {
+      return &entities.at(name);
+    }
+
 
     // loop over all entities and all their updater function (if it exists)
-  void update_entities() {
-    for (auto &entity : entities) {
+    void update_entities()
+    {
+      for (auto &entity : entities)
+      {
         if (entity.second.updater) {
           entity.second.updater(entity.second);
         }
       }
     }
 
-private:
+
+  private:
     // we cannot store the entities in a std::vector if we want to return a pointer to them,
     // because a vector automatically resizing itself can invalidate the pointer that was returned.
     // using a map guarantees that the memory assigned to the entity will never change, plus
@@ -47,8 +55,9 @@ private:
     std::map<std::string, Entity> entities;
 };
 
-int main() {
-  chaiscript::ChaiScript chai;
+int main()
+{
+  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
 
   chai.add(chaiscript::fun(&Entity::width), "width");
   chai.add(chaiscript::fun(&Entity::height), "height");
@@ -63,6 +72,7 @@ int main() {
   chai.add(chaiscript::fun(&Factory::update_entities), "update_entities");
   chai.add(chaiscript::user_type<Factory>(), "Factory"); // this isn't strictly necessary but makes error messages nicer
 
+
   Factory f;
   chai.add(chaiscript::var(&f), "f");
 
@@ -83,5 +93,11 @@ int main() {
     print(f.get_entity("entity3").x == 20) // this one has no updater, so it stays the same
     )"";
 
+
   chai.eval(script);
+
+
+
 }
+
+

samples/fun_call_performance.cpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #include <iostream>
 #include <list>
 #include <regex>
@@ -16,17 +13,17 @@
 #endif
 
 #include <chaiscript/chaiscript.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
 
 #ifdef READLINE_AVAILABLE
-#include <readline/history.h>
 #include <readline/readline.h>
+#include <readline/history.h>
 #else
 
 char *mystrdup(const char *s) {
   size_t len = strlen(s); // Space for length plus nul
-  char *d = static_cast<char *>(malloc(len + 1));
-  if (d == nullptr)
-    return nullptr; // No memory
+  char *d = static_cast<char*>(malloc(len + 1));
+  if (d == nullptr) return nullptr;          // No memory
 #ifdef CHAISCRIPT_MSVC
   strcpy_s(d, len + 1, s);                        // Copy the characters
 #else
@@ -36,20 +33,26 @@ char *mystrdup(const char *s) {
   return d;                            // Return the new string
 }
 
-char *readline(const char *p) {
+char* readline(const char* p)
+{
   std::string retval;
   std::cout << p;
   std::getline(std::cin, retval);
   return std::cin.eof() ? nullptr : mystrdup(retval.c_str());
 }
 
-void add_history(const char *) {}
-void using_history() {}
+
+void add_history(const char*){}
+void using_history(){}
 #endif
 
-void *cast_module_symbol(std::vector<std::string> (*t_path)()) {
-  union cast_union {
-    std::vector<std::string> (*in_ptr)();
+
+
+void *cast_module_symbol(std::vector<std::string>(*t_path)())
+{
+  union cast_union
+  {
+    std::vector<std::string>(*in_ptr)();
     void *out_ptr;
   };
 
@@ -58,10 +61,10 @@ void *cast_module_symbol(std::vector<std::string> (*t_path)()) {
   return c.out_ptr;
 }
 
-std::vector<std::string> default_search_paths() {
+std::vector<std::string> default_search_paths()
+{
   std::vector<std::string> paths;
 
-#ifndef CHAISCRIPT_NO_DYNLOAD
 #ifdef CHAISCRIPT_WINDOWS  // force no unicode
   CHAR path[4096];
   int size = GetModuleFileNameA(0, path, sizeof(path) - 1);
@@ -70,12 +73,14 @@ std::vector<std::string> default_search_paths() {
 
   size_t lastslash = exepath.rfind('\\');
   size_t secondtolastslash = exepath.rfind('\\', lastslash - 1);
-  if (lastslash != std::string::npos) {
+  if (lastslash != std::string::npos)
+  {
     paths.push_back(exepath.substr(0, lastslash));
   }
 
-  if (secondtolastslash != std::string::npos) {
-    return {exepath.substr(0, secondtolastslash) + "\\lib\\chaiscript\\"};
+  if (secondtolastslash != std::string::npos)
+  {
+    return{ exepath.substr(0, secondtolastslash) + "\\lib\\chaiscript\\" };
   }
 #else
 
@@ -84,23 +89,29 @@ std::vector<std::string> default_search_paths() {
   std::vector<char> buf(2048);
   ssize_t size = -1;
 
-  if ((size = readlink("/proc/self/exe", &buf.front(), buf.size())) > 0) {
+  if ((size = readlink("/proc/self/exe", &buf.front(), buf.size())) > 0)
+  {
     exepath = std::string(&buf.front(), static_cast<size_t>(size));
   }
 
-  if (exepath.empty()) {
-    if ((size = readlink("/proc/curproc/file", &buf.front(), buf.size())) > 0) {
+  if (exepath.empty())
+  {
+    if ((size = readlink("/proc/curproc/file", &buf.front(), buf.size())) > 0)
+    {
       exepath = std::string(&buf.front(), static_cast<size_t>(size));
     }
   }
 
-  if (exepath.empty()) {
-    if ((size = readlink("/proc/self/path/a.out", &buf.front(), buf.size())) > 0) {
+  if (exepath.empty())
+  {
+    if ((size = readlink("/proc/self/path/a.out", &buf.front(), buf.size())) > 0)
+    {
       exepath = std::string(&buf.front(), static_cast<size_t>(size));
     }
   }
 
-  if (exepath.empty()) {
+  if (exepath.empty())
+  {
     Dl_info rInfo;
     memset(&rInfo, 0, sizeof(rInfo));
     if (!dladdr(cast_module_symbol(&default_search_paths), &rInfo) || !rInfo.dli_fname) {
@@ -113,55 +124,62 @@ std::vector<std::string> default_search_paths() {
   size_t lastslash = exepath.rfind('/');
 
   size_t secondtolastslash = exepath.rfind('/', lastslash - 1);
-  if (lastslash != std::string::npos) {
+  if (lastslash != std::string::npos)
+  {
     paths.push_back(exepath.substr(0, lastslash));
   }
 
-  if (secondtolastslash != std::string::npos) {
+  if (secondtolastslash != std::string::npos)
+  {
     paths.push_back(exepath.substr(0, secondtolastslash) + "/lib/chaiscript/");
   }
 #endif
-#endif // ifndef CHAISCRIPT_NO_DYNLOAD
 
   return paths;
 }
 
 void help(int n) {
   if (n >= 0) {
-    std::cout << "ChaiScript evaluator.  To evaluate an expression, type it and press <enter>.\n";
-    std::cout << "Additionally, you can inspect the runtime system using:\n";
-    std::cout << "  dump_system() - outputs all functions registered to the system\n";
-    std::cout << "  dump_object(x) - dumps information about the given symbol\n";
-  } else {
-    std::cout << "usage : chai [option]+\n";
-    std::cout << "option:\n";
-    std::cout << "   -h | --help\n";
-    std::cout << "   -i | --interactive\n";
-    std::cout << "   -c | --command cmd\n";
-    std::cout << "   -v | --version\n";
-    std::cout << "   -    --stdin\n";
-    std::cout << "   filepath\n";
+    std::cout << "ChaiScript evaluator.  To evaluate an expression, type it and press <enter>." << std::endl;
+    std::cout << "Additionally, you can inspect the runtime system using:" << std::endl;
+    std::cout << "  dump_system() - outputs all functions registered to the system" << std::endl;
+    std::cout << "  dump_object(x) - dumps information about the given symbol" << std::endl;
+  }
+  else {
+    std::cout << "usage : chai [option]+" << std::endl;
+    std::cout << "option:" << std::endl;
+    std::cout << "   -h | --help" << std::endl;
+    std::cout << "   -i | --interactive" << std::endl;
+    std::cout << "   -c | --command cmd" << std::endl;
+    std::cout << "   -v | --version" << std::endl;
+    std::cout << "   -    --stdin" << std::endl;
+    std::cout << "   filepath" << std::endl;
   }
 }
 
-std::string helloWorld(const std::string &t_name) {
+std::string helloWorld(const std::string &t_name)
+{
   return "Hello " + t_name + "!";
 }
 
-bool throws_exception(const std::function<void()> &f) {
+bool throws_exception(const std::function<void()> &f)
+{
   try {
     f();
-  } catch (...) {
+  }
+  catch (...) {
     return true;
   }
 
   return false;
 }
 
-chaiscript::exception::eval_error get_eval_error(const std::function<void()> &f) {
+chaiscript::exception::eval_error get_eval_error(const std::function<void()> &f)
+{
   try {
     f();
-  } catch (const chaiscript::exception::eval_error &e) {
+  }
+  catch (const chaiscript::exception::eval_error &e) {
     return e;
   }
 
@@ -177,11 +195,13 @@ std::string get_next_command() {
 
       std::string val(input_raw);
       size_t pos = val.find_first_not_of("\t \n");
-      if (pos != std::string::npos) {
+      if (pos != std::string::npos)
+      {
         val.erase(0, pos);
       }
       pos = val.find_last_not_of("\t \n");
-      if (pos != std::string::npos) {
+      if (pos != std::string::npos)
+      {
         val.erase(pos + 1, std::string::npos);
       }
 
@@ -190,7 +210,11 @@ std::string get_next_command() {
       ::free(input_raw);
     }
   }
-  if (retval == "quit" || retval == "exit" || retval == "help" || retval == "version") {
+  if (retval == "quit"
+      || retval == "exit"
+      || retval == "help"
+      || retval == "version")
+  {
     retval += "(0)";
   }
   return retval;
@@ -202,7 +226,8 @@ void myexit(int return_val) {
   exit(return_val);
 }
 
-void interactive(chaiscript::ChaiScript &chai) {
+void interactive(chaiscript::ChaiScript& chai)
+{
   using_history();
 
   for (;;) {
@@ -211,28 +236,32 @@ void interactive(chaiscript::ChaiScript &chai) {
       // evaluate input
       chaiscript::Boxed_Value val = chai.eval(input);
 
-      // Then, we try to print the result of the evaluation to the user
+      //Then, we try to print the result of the evaluation to the user
       if (!val.get_type_info().bare_equal(chaiscript::user_type<void>())) {
         try {
-          std::cout << chai.eval<std::function<std::string(const chaiscript::Boxed_Value &bv)>>("to_string")(val) << '\n';
-        } catch (...) {
-        } // If we can't, do nothing
+          std::cout << chai.eval<std::function<std::string(const chaiscript::Boxed_Value &bv)> >("to_string")(val) << std::endl;
         }
-    } catch (const chaiscript::exception::eval_error &ee) {
+        catch (...) {} //If we can't, do nothing
+      }
+    }
+    catch (const chaiscript::exception::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]->start().line << ", " << ee.call_stack[0]->start().column << ")";
       }
-      std::cout << '\n';
-    } catch (const std::exception &e) {
+      std::cout << std::endl;
+    }
+    catch (const std::exception &e) {
       std::cout << e.what();
       std::cout << std::endl;
     }
   }
 }
 
-int main(int argc, char *argv[]) {
-// Disable deprecation warning for getenv call.
+int main(int argc, char *argv[])
+{
+
+  // Disable deprecation warning for getenv call.
 #ifdef CHAISCRIPT_MSVC
 #pragma warning(push)
 #pragma warning(disable : 4996)
@@ -247,7 +276,8 @@ int main(int argc, char *argv[]) {
 
   std::vector<std::string> usepaths;
   usepaths.push_back("");
-  if (usepath) {
+  if (usepath)
+  {
     usepaths.push_back(usepath);
   }
 
@@ -255,12 +285,13 @@ int main(int argc, char *argv[]) {
   std::vector<std::string> searchpaths = default_search_paths();
   modulepaths.insert(modulepaths.end(), searchpaths.begin(), searchpaths.end());
   modulepaths.push_back("");
-  if (modulepath) {
+  if (modulepath)
+  {
     modulepaths.push_back(modulepath);
   }
 
-  // chaiscript::ChaiScript chai(modulepaths, usepaths);
-  chaiscript::ChaiScript chai(usepaths);
+  //chaiscript::ChaiScript chai(modulepaths, usepaths);
+  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library(), usepaths);
 
   chai.add(chaiscript::fun(&myexit), "exit");
   chai.add(chaiscript::fun(&myexit), "quit");
@@ -272,7 +303,8 @@ int main(int argc, char *argv[]) {
 
   clock_t begin = clock();
 
-  for (int i = 0; i < 1000; i++) {
+  for (int i = 0; i < 1000; i++)
+  {
     std::string str = helloWorld("Bob12345");
     fwrite(str.c_str(), 1, str.size(), stdout);
   }
@@ -280,17 +312,17 @@ int main(int argc, char *argv[]) {
   clock_t end = clock();
   double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
 
-  // begin = clock();
+  //begin = clock();
 
   ////for (int i = 0; i < 1000; i++)
   ////{
   //// chai.eval("puts(helloWorld(\"Bob12345\"));");
   ////}
-  // chai.eval_file("E:\\C++\\ChaiScript - 5.4.0\\samples\forx.chai");
+  //chai.eval_file("E:\\C++\\ChaiScript - 5.4.0\\samples\forx.chai");
 
-  // end = clock();
-  // elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
-  // printf("**MyProgram::time= %lf\n", elapsed_secs);
+  //end = clock();
+  //elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
+  //printf("**MyProgram::time= %lf\n", elapsed_secs);
 
   for (int i = 0; i < argc; ++i) {
     if (i == 0 && argc > 1) {
@@ -300,47 +332,49 @@ int main(int argc, char *argv[]) {
     std::string arg(i ? argv[i] : "--interactive");
 
     enum {
-      eInteractive,
-      eCommand,
-      eFile
-    } mode
-        = eCommand;
+      eInteractive
+        , eCommand
+        , eFile
+    } mode = eCommand;
 
     if (arg == "-c" || arg == "--command") {
       if ((i + 1) >= argc) {
         std::cout << "insufficient input following " << arg << std::endl;
         return EXIT_FAILURE;
-      } else {
+      }
+      else {
         arg = argv[++i];
       }
-    } else if (arg == "-" || arg == "--stdin") {
+    }
+    else if (arg == "-" || arg == "--stdin") {
       arg = "";
       std::string line;
       while (std::getline(std::cin, line)) {
         arg += line + '\n';
       }
-    } else if (arg == "-v" || arg == "--version") {
+    }
+    else if (arg == "-v" || arg == "--version") {
       arg = "version()";
-    } else if (arg == "-h" || arg == "--help") {
+    }
+    else if (arg == "-h" || arg == "--help") {
       arg = "help(-1)";
-    } else if (arg == "-i" || arg == "--interactive") {
+    }
+    else if (arg == "-i" || arg == "--interactive") {
       mode = eInteractive;
-    } else if (arg.find('-') == 0) {
+    }
+    else if (arg.find('-') == 0) {
       std::cout << "unrecognised argument " << arg << std::endl;
       return EXIT_FAILURE;
-    } else {
+    }
+    else {
       mode = eFile;
     }
 
     chaiscript::Boxed_Value val;
     try {
       switch (mode) {
-        case eInteractive:
-          interactive(chai);
-          break;
-        case eCommand:
-          val = chai.eval(arg);
-          break;
+        case eInteractive: interactive(chai); break;
+        case eCommand: val = chai.eval(arg); break;
         case eFile: {
                       begin = clock();
 
@@ -352,12 +386,15 @@ int main(int argc, char *argv[]) {
                       printf("**ChaiScript::time= %.10f\n", elapsed_secs1);
                       break;
                     }
+
       }
-    } catch (const chaiscript::exception::eval_error &ee) {
+    }
+    catch (const chaiscript::exception::eval_error &ee) {
       std::cout << ee.pretty_print();
       std::cout << std::endl;
       return EXIT_FAILURE;
-    } catch (std::exception &e) {
+    }
+    catch (std::exception &e) {
       std::cout << e.what() << std::endl;
       return EXIT_FAILURE;
     }
@@ -365,3 +402,4 @@ int main(int argc, char *argv[]) {
 
   return EXIT_SUCCESS;
 }
+

samples/inheritance.cpp

@@ -1,66 +1,80 @@
 #include <chaiscript/chaiscript.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
 
-class BaseClass {
-public:
-  BaseClass() = default;
+class BaseClass
+{
+  public:
+    BaseClass()
+    {
+    }
 
     BaseClass(const BaseClass &) = default;
 
-  virtual ~BaseClass() = default;
+    virtual ~BaseClass() {}
 
     virtual std::string doSomething(float, double) const = 0;
 
+
     void setValue(const std::string &t_val) {
-    if (validateValue(t_val)) {
+      if (validateValue(t_val))
+      {
         m_value = t_val;
       }
     }
 
-  std::string getValue() const { return m_value; }
+    std::string getValue() const {
+      return m_value;
+    }
 
-protected:
+  protected:
     virtual bool validateValue(const std::string &t_val) = 0;
 
-private:
+  private:
     std::string m_value;
 };
 
-class ChaiScriptDerived : public BaseClass {
-public:
-  ChaiScriptDerived(const std::vector<chaiscript::Boxed_Value> &t_funcs) {
+class ChaiScriptDerived : public BaseClass
+{
+  public:
+    ChaiScriptDerived(const std::vector<chaiscript::Boxed_Value> &t_funcs)
+    {
       // using the range-checked .at() methods to give us an exception
       // instead of a crash if the user passed in too-few params
       tie(t_funcs.at(0), m_doSomethingImpl);
       tie(t_funcs.at(1), m_validateValueImpl);
     }
 
-  std::string doSomething(float f, double d) const override {
+    std::string doSomething(float f, double d) const CHAISCRIPT_OVERRIDE
+    {
       assert(m_doSomethingImpl);
       return m_doSomethingImpl(*this, f, d);
     }
 
-protected:
-  bool validateValue(const std::string &t_val) override {
+  protected:
+    bool validateValue(const std::string &t_val) CHAISCRIPT_OVERRIDE
+    {
       assert(m_validateValueImpl);
       return m_validateValueImpl(*this, t_val);
     }
 
-private:
+  private:
     template<typename Param>
-  void tie(const chaiscript::Boxed_Value &t_func, Param &t_param) {
+    void tie(const chaiscript::Boxed_Value &t_func, Param &t_param)
+    {
       t_param = chaiscript::boxed_cast<Param>(t_func);
     }
 
-  std::function<std::string(const ChaiScriptDerived &, float, double)> m_doSomethingImpl;
-  std::function<bool(ChaiScriptDerived &, const std::string &t_val)> m_validateValueImpl;
+    std::function<std::string (const ChaiScriptDerived&, float, double)> m_doSomethingImpl;
+    std::function<bool (ChaiScriptDerived&, const std::string &t_val)> m_validateValueImpl;
 };
 
-int main() {
-  chaiscript::ChaiScript chai;
+int main()
+{
+  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
   chai.add(chaiscript::fun(&BaseClass::doSomething), "doSomething");
   chai.add(chaiscript::fun(&BaseClass::setValue), "setValue");
   chai.add(chaiscript::fun(&BaseClass::getValue), "getValue");
-  chai.add(chaiscript::constructor<ChaiScriptDerived(const std::vector<chaiscript::Boxed_Value> &)>(), "ChaiScriptDerived");
+  chai.add(chaiscript::constructor<ChaiScriptDerived (const std::vector<chaiscript::Boxed_Value> &)>(), "ChaiScriptDerived");
   chai.add(chaiscript::base_class<BaseClass, ChaiScriptDerived>());
   chai.add(chaiscript::user_type<BaseClass>(), "BaseClass");
   chai.add(chaiscript::user_type<ChaiScriptDerived>(), "ChaiScriptDerived");
@@ -93,7 +107,7 @@ int main() {
 
   chai.eval(script);
   
-  BaseClass &myderived = chai.eval<ChaiScriptDerived &>("myderived");
+  BaseClass &myderived = chai.eval<ChaiScriptDerived&>("myderived");
 
   // at this point in the code myderived is both a ChaiScript variable and a C++ variable. In both cases
   // it is a derivation of BaseClass, and the implementation is provided via ChaiScript functors
@@ -108,7 +122,8 @@ int main() {
   myderived.setValue("12345");
   assert(myderived.getValue() == "1234");
 
-  chai.eval(R"(myderived.setValue("new"))"); // set the value via chaiscript
+
+  chai.eval("myderived.setValue(\"new\")"); // set the value via chaiscript
   assert(myderived.getValue() == "new");
 
   // call the other derived method via chaiscript and return the value to c++ land:
@@ -117,3 +132,5 @@ int main() {
 
   // The whole process is fully orthogonal
 }
+
+

samples/memory_leak_test.cpp

@@ -1,12 +1,15 @@
 #include <iostream>
 
 #include <chaiscript/chaiscript.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
 
 #ifdef READLINE_AVAILABLE
-#include <readline/history.h>
 #include <readline/readline.h>
+#include <readline/history.h>
 #endif
 
+
+
 std::string get_next_command() {
 #ifdef READLINE_AVAILABLE
   char *input_raw;
@@ -21,32 +24,49 @@ std::string get_next_command() {
 #endif
 }
 
-void function(void) {
+void function(void)
+{
   // do nothing
 }
 
-class test {
+class test
+{
   chaiscript::ChaiScript chai;
-  chaiscript::ChaiScript::State backupState = chai.get_state();
+  chaiscript::ChaiScript::State backupState;
 
-public:
-  void ResetState() {
+  public:
+  test()
+    : chai(chaiscript::Std_Lib::library())
+  {
+    backupState = chai.get_state();
+  }
+  ~test(){}
+
+  void ResetState()
+  {
     chai.set_state(backupState);
-    chai.add(chaiscript::fun(&function), "Whatever()");
+    chai.add(chaiscript::fun(&function),"Whatever()");
   }
 
-  void RunFile(std::string sFile) {
+  void RunFile(std::string sFile)
+  {
     try {
       chaiscript::Boxed_Value val = chai.eval_file(sFile);
-    } catch (std::exception &e) {
+    }
+    catch (std::exception &e) {
       std::cout << e.what() << '\n';
     }
   }
+
 };
 
+
+
 int main(int /*argc*/, char * /*argv*/[]) {
+
   test myChai;
 
+
   std::string command = "";
 
   //
@@ -58,11 +78,12 @@ int main(int /*argc*/, char * /*argv*/[]) {
   // scenario3 - RunFile gets in changing intervals: memory usage goes up and down, but never as
   //            low as in case 1 scenario3 :
 
-  while (command != "quit") {
-    for (int i = 1; i < 200; i++)
+  while(command != "quit")
+  {
+    for(int i = 1; i < 200; i++)
       myChai.ResetState();
 
-    if (command == "runfile")
+    if(command == "runfile")
       myChai.RunFile("Test.chai");
 
     command = get_next_command();

samples/test_num_exceptions.cpp

@@ -1,12 +1,16 @@
 #include <chaiscript/chaiscript.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
 #include <chaiscript/dispatchkit/bootstrap_stl.hpp>
 #include <chaiscript/dispatchkit/function_call.hpp>
 
-int main(int /*argc*/, char * /*argv*/[]) {
-  chaiscript::ChaiScript ch;
+int main( int /*argc*/ , char * /*argv*/[] )
+{
+  chaiscript::ChaiScript ch( chaiscript::Std_Lib::library( ) );
 
-  try {
-    static const char script[] =
+
+  try
+  {
+    static const char script[ ] =
       R""(
 
       class Rectangle
@@ -18,9 +22,12 @@ int main(int /*argc*/, char * /*argv*/[]) {
 
     )"";
 
-    ch.eval(script);
-  } catch (const std::exception &e) {
-    printf(" >>> Exception thrown: %s \n", e.what());
+
+    ch.eval( script );
+  }
+  catch ( const std::exception &e )
+  {
+    printf( " >>> Exception thrown: %s \n" , e.what( ) );
   }
 
   return 1;

src/chaiscript_stdlib.cpp

@@ -1,6 +1,7 @@
 
 #include <chaiscript/chaiscript_stdlib.hpp>
 
+
 // MSVC doesn't like that we are using C++ return types from our C declared module
 // but this is the best way to do it for cross platform compatibility
 #ifdef CHAISCRIPT_MSVC
@@ -13,10 +14,13 @@
 #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
 #endif
 
-CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_chaiscript_stdlib() {
+
+CHAISCRIPT_MODULE_EXPORT  chaiscript::ModulePtr create_chaiscript_module_chaiscript_stdlib()
+{
   return chaiscript::Std_Lib::library();
 }
 
+
 #ifdef __llvm__
 #pragma clang diagnostic pop
 #endif

src/libfuzzer_client.cpp

@@ -1,325 +0,0 @@
-// This file is distributed under the BSD License.
-// See "license.txt" for details.
-// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
-// http://www.chaiscript.com
-
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-#include <iostream>
-#include <list>
-#include <regex>
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "../static_libs/chaiscript_parser.hpp"
-#include "../static_libs/chaiscript_stdlib.hpp"
-#include <chaiscript/chaiscript.hpp>
-
-#include "sha3.h"
-
-#ifdef READLINE_AVAILABLE
-#include <readline/history.h>
-#include <readline/readline.h>
-#else
-
-char *mystrdup(const char *s) {
-  size_t len = strlen(s); // Space for length plus nul
-  char *d = static_cast<char *>(malloc(len + 1));
-  if (d == nullptr) {
-    return nullptr;
-  } // No memory
-#ifdef CHAISCRIPT_MSVC
-  strcpy_s(d, len + 1, s); // Copy the characters
-#else
-  strncpy(d, s, len); // Copy the characters
-#endif
-  d[len] = '\0';
-  return d; // Return the new string
-}
-
-char *readline(const char *p) {
-  std::string retval;
-  std::cout << p;
-  std::getline(std::cin, retval);
-  return std::cin.eof() ? nullptr : mystrdup(retval.c_str());
-}
-
-void add_history(const char * /*unused*/) {}
-void using_history() {}
-#endif
-
-void *cast_module_symbol(std::vector<std::string> (*t_path)()) {
-  union cast_union {
-    std::vector<std::string> (*in_ptr)();
-    void *out_ptr;
-  };
-
-  cast_union c;
-  c.in_ptr = t_path;
-  return c.out_ptr;
-}
-
-std::vector<std::string> default_search_paths() {
-  std::vector<std::string> paths;
-
-#ifndef CHAISCRIPT_NO_DYNLOAD
-#ifdef CHAISCRIPT_WINDOWS // force no unicode
-  CHAR path[4096];
-  int size = GetModuleFileNameA(nullptr, path, sizeof(path) - 1);
-
-  std::string exepath(path, size);
-
-  size_t lastslash = exepath.rfind('\\');
-  size_t secondtolastslash = exepath.rfind('\\', lastslash - 1);
-  if (lastslash != std::string::npos) {
-    paths.push_back(exepath.substr(0, lastslash));
-  }
-
-  if (secondtolastslash != std::string::npos) {
-    return {exepath.substr(0, secondtolastslash) + "\\lib\\chaiscript\\"};
-  }
-#else
-
-  std::string exepath;
-
-  std::vector<char> buf(2048);
-  ssize_t size = -1;
-
-  if ((size = readlink("/proc/self/exe", &buf.front(), buf.size())) >= 0) {
-    exepath = std::string(&buf.front(), static_cast<size_t>(size));
-  }
-
-  if (exepath.empty()) {
-    if ((size = readlink("/proc/curproc/file", &buf.front(), buf.size())) >= 0) {
-      exepath = std::string(&buf.front(), static_cast<size_t>(size));
-    }
-  }
-
-  if (exepath.empty()) {
-    if ((size = readlink("/proc/self/path/a.out", &buf.front(), buf.size())) >= 0) {
-      exepath = std::string(&buf.front(), static_cast<size_t>(size));
-    }
-  }
-
-  if (exepath.empty()) {
-    Dl_info rInfo;
-    memset(&rInfo, 0, sizeof(rInfo));
-    if (dladdr(cast_module_symbol(&default_search_paths), &rInfo) == 0 || rInfo.dli_fname == nullptr) {
-      return paths;
-    }
-
-    exepath = std::string(rInfo.dli_fname);
-  }
-
-  size_t lastslash = exepath.rfind('/');
-
-  size_t secondtolastslash = exepath.rfind('/', lastslash - 1);
-  if (lastslash != std::string::npos) {
-    paths.push_back(exepath.substr(0, lastslash + 1));
-  }
-
-  if (secondtolastslash != std::string::npos) {
-    paths.push_back(exepath.substr(0, secondtolastslash) + "/lib/chaiscript/");
-  }
-#endif
-#endif // ifndef CHAISCRIPT_NO_DYNLOAD
-
-  return paths;
-}
-
-void help(int n) {
-  if (n >= 0) {
-    std::cout << "ChaiScript evaluator.  To evaluate an expression, type it and press <enter>.\n";
-    std::cout << "Additionally, you can inspect the runtime system using:\n";
-    std::cout << "  dump_system() - outputs all functions registered to the system\n";
-    std::cout << "  dump_object(x) - dumps information about the given symbol\n";
-  } else {
-    std::cout << "usage : chai [option]+\n";
-    std::cout << "option:" << '\n';
-    std::cout << "   -h | --help" << '\n';
-    std::cout << "   -i | --interactive" << '\n';
-    std::cout << "   -c | --command cmd" << '\n';
-    std::cout << "   -v | --version" << '\n';
-    std::cout << "   -    --stdin" << '\n';
-    std::cout << "   filepath" << '\n';
-  }
-}
-
-bool throws_exception(const std::function<void()> &f) {
-  try {
-    f();
-  } catch (...) {
-    return true;
-  }
-
-  return false;
-}
-
-chaiscript::exception::eval_error get_eval_error(const std::function<void()> &f) {
-  try {
-    f();
-  } catch (const chaiscript::exception::eval_error &e) {
-    return e;
-  }
-
-  throw std::runtime_error("no exception throw");
-}
-
-std::string get_next_command() {
-  std::string retval("quit");
-  if (!std::cin.eof()) {
-    char *input_raw = readline("eval> ");
-    if (input_raw != nullptr) {
-      add_history(input_raw);
-
-      std::string val(input_raw);
-      size_t pos = val.find_first_not_of("\t \n");
-      if (pos != std::string::npos) {
-        val.erase(0, pos);
-      }
-      pos = val.find_last_not_of("\t \n");
-      if (pos != std::string::npos) {
-        val.erase(pos + 1, std::string::npos);
-      }
-
-      retval = val;
-
-      ::free(input_raw);
-    }
-  }
-  if (retval == "quit" || retval == "exit" || retval == "help" || retval == "version") {
-    retval += "(0)";
-  }
-  return retval;
-}
-
-// We have to wrap exit with our own because Clang has a hard time with
-// function pointers to functions with special attributes (system exit being marked NORETURN)
-void myexit(int return_val) {
-  exit(return_val);
-}
-
-void interactive(chaiscript::ChaiScript_Basic &chai) {
-  using_history();
-
-  for (;;) {
-    std::string input = get_next_command();
-    try {
-      // evaluate input
-      chaiscript::Boxed_Value val = chai.eval(input);
-
-      // Then, we try to print the result of the evaluation to the user
-      if (!val.get_type_info().bare_equal(chaiscript::user_type<void>())) {
-        try {
-          std::cout << chai.eval<std::function<std::string(const chaiscript::Boxed_Value &bv)>>("to_string")(val) << '\n';
-        } catch (...) {
-        } // If we can't, do nothing
-      }
-    } catch (const chaiscript::exception::eval_error &ee) {
-      std::cout << ee.what();
-      if (!ee.call_stack.empty()) {
-        std::cout << "during evaluation at (" << ee.call_stack[0].start().line << ", " << ee.call_stack[0].start().column << ")";
-      }
-      std::cout << '\n';
-    } catch (const std::exception &e) {
-      std::cout << e.what();
-      std::cout << '\n';
-    }
-  }
-}
-
-double now() {
-  using namespace std::chrono;
-  auto now = high_resolution_clock::now();
-  return duration_cast<duration<double>>(now.time_since_epoch()).count();
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-  chaiscript::ChaiScript chai;
-
-  chai.eval(R"chaiscript(
-def assert_equal(x, y)
-{
-  if (x == y)
-  {
-    // Passes
-  } else {
-    // Fails
-    print("assert_equal failure: got '" + to_string(y) + "' expected '" + to_string(x) + "'");
-//    exit(-1);
-  }
-}
-
-def assert_false(f)
-{
-  if (f)
-  {
-    print("assert_false failure");
-//    exit(-1);
-  }
-}
-
-def assert_true(f)
-{
-  if (!f)
-  {
-    print("assert_true failure");
-//    exit(-1);
-  }
-}
-
-def assert_not_equal(x, y)
-{
-  if (!(x == y))
-  {
-    // Passes
-  } else {
-    // Fails
-    print("assert_not_equal failure: got " + to_string(y) + " which was not expected.");
-//    exit(-1);
-  }
-}
-
-def assert_throws(desc, x)
-{
-  if (throws_exception(x))
-  {
-    // Passes
-  } else {
-    // Fails
-    print("assert_throws failure, function did not throw exception: " + to_string(desc));
-//    exit(-1);
-  }
-})chaiscript");
-
-  SHA3 sha3;
-  std::string sha = sha3(data, size);
-
-  std::string input(reinterpret_cast<const char *>(data), size);
-  try {
-    chai.eval(std::string(reinterpret_cast<const char *>(data), size));
-    std::ofstream ofs("VALID/" + sha);
-    ofs << input;
-  } catch (const chaiscript::exception::eval_error &) {
-    std::ofstream ofs("EVAL_ERROR/" + sha);
-    ofs << input;
-  } catch (const chaiscript::Boxed_Value &) {
-    std::ofstream ofs("BOXED_VALUE/" + sha);
-    ofs << input;
-  } catch (const chaiscript::exception::load_module_error &e) {
-    std::cout << "Unhandled module load error\n"
-              << e.what() << '\n';
-  } catch (const std::exception &) {
-    std::ofstream ofs("STD_EXCEPTION/" + sha);
-    ofs << input;
-  } catch (...) {
-    std::ofstream ofs("UNKOWN_EXCEPTION/" + sha);
-    ofs << input;
-  }
-
-  return 0;
-}

src/main.cpp

@@ -1,12 +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-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #include <iostream>
 #include <list>
 #include <regex>
@@ -15,43 +12,45 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "../static_libs/chaiscript_parser.hpp"
-#include "../static_libs/chaiscript_stdlib.hpp"
-#include <chaiscript/chaiscript_basic.hpp>
+#include <chaiscript/chaiscript.hpp>
 
 #ifdef READLINE_AVAILABLE
-#include <readline/history.h>
 #include <readline/readline.h>
+#include <readline/history.h>
 #else
 
-char *mystrdup(const char *s) {
+char *mystrdup (const char *s) {
   size_t len = strlen(s); // Space for length plus nul
-  char *d = static_cast<char *>(malloc(len + 1));
-  if (d == nullptr) {
-    return nullptr;
-  } // No memory
+  char *d = static_cast<char*>(malloc (len+1));
+  if (d == nullptr) return nullptr;          // No memory
 #ifdef CHAISCRIPT_MSVC
-  strcpy_s(d, len + 1, s); // Copy the characters
+  strcpy_s(d, len+1, s);                        // Copy the characters
 #else
-  strncpy(d, s, len); // Copy the characters
+  strncpy(d,s,len);                        // Copy the characters
 #endif
   d[len] = '\0';
   return d;                            // Return the new string
 }
 
-char *readline(const char *p) {
+char* readline(const char* p)
+{
   std::string retval;
-  std::cout << p;
+  std::cout << p ;
   std::getline(std::cin, retval);
   return std::cin.eof() ? nullptr : mystrdup(retval.c_str());
 }
 
-void add_history(const char * /*unused*/) {}
-void using_history() {}
+
+void add_history(const char*){}
+void using_history(){}
 #endif
 
-void *cast_module_symbol(std::vector<std::string> (*t_path)()) {
-  union cast_union {
+
+
+void *cast_module_symbol(std::vector<std::string> (*t_path)())
+{
+  union cast_union
+  {
     std::vector<std::string> (*in_ptr)();
     void *out_ptr;
   };
@@ -61,23 +60,25 @@ void *cast_module_symbol(std::vector<std::string> (*t_path)()) {
   return c.out_ptr;
 }
 
-std::vector<std::string> default_search_paths() {
+std::vector<std::string> default_search_paths()
+{
   std::vector<std::string> paths;
 
-#ifndef CHAISCRIPT_NO_DYNLOAD
 #ifdef CHAISCRIPT_WINDOWS  // force no unicode
   CHAR path[4096];
-  int size = GetModuleFileNameA(nullptr, path, sizeof(path) - 1);
+  int size = GetModuleFileNameA(nullptr, path, sizeof(path)-1);
 
   std::string exepath(path, size);
 
   size_t lastslash = exepath.rfind('\\');
   size_t secondtolastslash = exepath.rfind('\\', lastslash - 1);
-  if (lastslash != std::string::npos) {
+  if (lastslash != std::string::npos)
+  {
     paths.push_back(exepath.substr(0, lastslash));
   }
 
-  if (secondtolastslash != std::string::npos) {
+  if (secondtolastslash != std::string::npos)
+  {
     return {exepath.substr(0, secondtolastslash) + "\\lib\\chaiscript\\"};
   }
 #else
@@ -87,26 +88,32 @@ std::vector<std::string> default_search_paths() {
   std::vector<char> buf(2048);
   ssize_t size = -1;
 
-  if ((size = readlink("/proc/self/exe", &buf.front(), buf.size())) >= 0) {
+  if ((size = readlink("/proc/self/exe", &buf.front(), buf.size())) >= 0)
+  {
     exepath = std::string(&buf.front(), static_cast<size_t>(size));
   }
 
-  if (exepath.empty()) {
-    if ((size = readlink("/proc/curproc/file", &buf.front(), buf.size())) >= 0) {
+  if (exepath.empty())
+  {
+    if ((size = readlink("/proc/curproc/file", &buf.front(), buf.size())) >= 0)
+    {
       exepath = std::string(&buf.front(), static_cast<size_t>(size));
     }
   }
 
-  if (exepath.empty()) {
-    if ((size = readlink("/proc/self/path/a.out", &buf.front(), buf.size())) >= 0) {
+  if (exepath.empty())
+  {
+    if ((size = readlink("/proc/self/path/a.out", &buf.front(), buf.size())) >= 0)
+    {
       exepath = std::string(&buf.front(), static_cast<size_t>(size));
     }
   }
 
-  if (exepath.empty()) {
+  if (exepath.empty())
+  {
     Dl_info rInfo;
-    memset(&rInfo, 0, sizeof(rInfo));
-    if (dladdr(cast_module_symbol(&default_search_paths), &rInfo) == 0 || rInfo.dli_fname == nullptr) {
+    memset( &rInfo, 0, sizeof(rInfo) ); 
+    if ( !dladdr(cast_module_symbol(&default_search_paths), &rInfo)  || !rInfo.dli_fname ) { 
       return paths;
     }
 
@@ -116,21 +123,22 @@ std::vector<std::string> default_search_paths() {
   size_t lastslash = exepath.rfind('/');
 
   size_t secondtolastslash = exepath.rfind('/', lastslash - 1);
-  if (lastslash != std::string::npos) {
-    paths.push_back(exepath.substr(0, lastslash + 1));
+  if (lastslash != std::string::npos)
+  {
+    paths.push_back(exepath.substr(0, lastslash));
   }
 
-  if (secondtolastslash != std::string::npos) {
+  if (secondtolastslash != std::string::npos)
+  {
     paths.push_back(exepath.substr(0, secondtolastslash) + "/lib/chaiscript/");
   }
 #endif
-#endif // ifndef CHAISCRIPT_NO_DYNLOAD
 
   return paths;
 }
 
 void help(int n) {
-  if (n >= 0) {
+  if ( n >= 0 ) {
     std::cout << "ChaiScript evaluator.  To evaluate an expression, type it and press <enter>.\n";
     std::cout << "Additionally, you can inspect the runtime system using:\n";
     std::cout << "  dump_system() - outputs all functions registered to the system\n";
@@ -147,17 +155,19 @@ void help(int n) {
   }
 }
 
-std::string throws_exception(const std::function<void()> &f) {
+bool throws_exception(const std::function<void ()> &f)
+{
   try {
     f();
-  } catch (const std::exception &e) {
-    return e.what();
+  } catch (...) {
+    return true;
   }
 
-  return "";
+  return false;
 }
 
-chaiscript::exception::eval_error get_eval_error(const std::function<void()> &f) {
+chaiscript::exception::eval_error get_eval_error(const std::function<void ()> &f)
+{
   try {
     f();
   } catch (const chaiscript::exception::eval_error &e) {
@@ -169,19 +179,21 @@ chaiscript::exception::eval_error get_eval_error(const std::function<void()> &f)
 
 std::string get_next_command() {
   std::string retval("quit");
-  if (!std::cin.eof()) {
+  if ( ! std::cin.eof() ) {
     char *input_raw = readline("eval> ");
-    if (input_raw != nullptr) {
+    if ( input_raw ) {
       add_history(input_raw);
 
       std::string val(input_raw);
       size_t pos = val.find_first_not_of("\t \n");
-      if (pos != std::string::npos) {
+      if (pos != std::string::npos)
+      {
         val.erase(0, pos);
       }
       pos = val.find_last_not_of("\t \n");
-      if (pos != std::string::npos) {
-        val.erase(pos + 1, std::string::npos);
+      if (pos != std::string::npos)
+      {
+        val.erase(pos+1, std::string::npos);
       }
 
       retval = val;
@@ -189,7 +201,11 @@ std::string get_next_command() {
       ::free(input_raw);
     }
   }
-  if (retval == "quit" || retval == "exit" || retval == "help" || retval == "version") {
+  if(   retval == "quit"
+     || retval == "exit"
+     || retval == "help"
+     || retval == "version") 
+  {
     retval += "(0)";
   }
   return retval;
@@ -201,7 +217,8 @@ void myexit(int return_val) {
   exit(return_val);
 }
 
-void interactive(chaiscript::ChaiScript_Basic &chai) {
+void interactive(chaiscript::ChaiScript& chai)
+{
   using_history();
 
   for (;;) {
@@ -210,34 +227,39 @@ void interactive(chaiscript::ChaiScript_Basic &chai) {
       // evaluate input
       chaiscript::Boxed_Value val = chai.eval(input);
 
-      // Then, we try to print the result of the evaluation to the user
+      //Then, we try to print the result of the evaluation to the user
       if (!val.get_type_info().bare_equal(chaiscript::user_type<void>())) {
         try {
-          std::cout << chai.eval<std::function<std::string(const chaiscript::Boxed_Value &bv)>>("to_string")(val) << '\n';
-        } catch (...) {
-        } // If we can't, do nothing
+          std::cout << chai.eval<std::function<std::string (const chaiscript::Boxed_Value &bv)> >("to_string")(val) << '\n';
         }
-    } catch (const chaiscript::exception::eval_error &ee) {
+        catch (...) {} //If we can't, do nothing
+      }
+    }
+    catch (const chaiscript::exception::eval_error &ee) {
       std::cout << ee.what();
-      if (!ee.call_stack.empty()) {
-        std::cout << "during evaluation at (" << ee.call_stack[0].start().line << ", " << ee.call_stack[0].start().column << ")";
+      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 << '\n';
-    } catch (const std::exception &e) {
+    }
+    catch (const std::exception &e) {
       std::cout << e.what();
       std::cout << '\n';
     }
   }
 }
 
-double now() {
+double now()
+{
   using namespace std::chrono;
   auto now = high_resolution_clock::now();
   return duration_cast<duration<double>>(now.time_since_epoch()).count();
 }
 
-int main(int argc, char *argv[]) {
-// Disable deprecation warning for getenv call.
+int main(int argc, char *argv[])
+{
+
+  // Disable deprecation warning for getenv call.
 #ifdef CHAISCRIPT_MSVC
 #pragma warning(push)
 #pragma warning(disable : 4996)
@@ -251,20 +273,22 @@ int main(int argc, char *argv[]) {
 #endif
 
   std::vector<std::string> usepaths;
-  usepaths.emplace_back("");
-  if (usepath != nullptr) {
-    usepaths.emplace_back(usepath);
+  usepaths.push_back("");
+  if (usepath)
+  {
+    usepaths.push_back(usepath);
   }
 
   std::vector<std::string> modulepaths;
   std::vector<std::string> searchpaths = default_search_paths();
   modulepaths.insert(modulepaths.end(), searchpaths.begin(), searchpaths.end());
-  modulepaths.emplace_back("");
-  if (modulepath != nullptr) {
-    modulepaths.emplace_back(modulepath);
+  modulepaths.push_back("");
+  if (modulepath)
+  {
+    modulepaths.push_back(modulepath);
   }
 
-  chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(), create_chaiscript_parser(), modulepaths, usepaths);
+  chaiscript::ChaiScript chai(modulepaths,usepaths);
 
   chai.add(chaiscript::fun(&myexit), "exit");
   chai.add(chaiscript::fun(&myexit), "quit");
@@ -275,51 +299,45 @@ int main(int argc, char *argv[]) {
 
   bool eval_error_ok = false;
   bool boxed_exception_ok = false;
-  bool any_exception_ok = false;
 
   for (int i = 0; i < argc; ++i) {
-    if (i == 0 && argc > 1) {
+    if ( i == 0 && argc > 1 ) {
       ++i;
     }
 
-    std::string arg(i != 0 ? argv[i] : "--interactive");
+    std::string arg( i ? argv[i] : "--interactive" );
 
-    enum {
-      eInteractive,
-      eCommand,
-      eFile
-    } mode
-        = eCommand;
+    enum { eInteractive
+         , eCommand
+         , eFile
+    } mode = eCommand ;
 
-    if (arg == "-c" || arg == "--command") {
-      if ((i + 1) >= argc) {
+    if  ( arg == "-c" || arg == "--command" ) {
+      if ( (i+1) >= argc ) {
         std::cout << "insufficient input following " << arg << '\n';
         return EXIT_FAILURE;
-      }
+      } else {
         arg = argv[++i];
-
-    } else if (arg == "-" || arg == "--stdin") {
-      arg = "";
-      std::string line;
-      while (std::getline(std::cin, line)) {
-        arg += line + '\n';
       }
-    } else if (arg == "-v" || arg == "--version") {
-      arg = "print(version())";
-    } else if (arg == "-h" || arg == "--help") {
+    } else if ( arg == "-" || arg == "--stdin" ) {
+      arg = "" ;
+      std::string line;
+      while ( std::getline(std::cin, line) ) {
+        arg += line + '\n' ;
+      }
+    } else if ( arg == "-v" || arg == "--version" ) {
+      arg = "print(version())" ;
+    } else if ( arg == "-h" || arg == "--help" ) {
       arg = "help(-1)";
-    } else if (arg == "-e" || arg == "--evalerrorok") {
+    } else if ( arg == "-e" || arg == "--evalerrorok" ) {
       eval_error_ok = true;
       continue;
-    } else if (arg == "--exception") {
+    } else if ( arg == "--exception" ) {
       boxed_exception_ok = true;
       continue;
-    } else if (arg == "--any-exception") {
-      any_exception_ok = true;
-      continue;
-    } else if (arg == "-i" || arg == "--interactive") {
-      mode = eInteractive;
-    } else if (arg.find('-') == 0) {
+    } else if ( arg == "-i" || arg == "--interactive" ) {
+      mode = eInteractive ;
+    } else if ( arg.find('-') == 0 ) {
       std::cout << "unrecognised argument " << arg << '\n';
       return EXIT_FAILURE;
     } else {
@@ -327,7 +345,7 @@ int main(int argc, char *argv[]) {
     }
 
     try {
-      switch (mode) {
+      switch ( mode ) {
         case eInteractive:
           interactive(chai);
           break;
@@ -337,33 +355,27 @@ int main(int argc, char *argv[]) {
         case eFile:
           chai.eval_file(arg);
       }
-    } catch (const chaiscript::exception::eval_error &ee) {
+    }
+    catch (const chaiscript::exception::eval_error &ee) {
       std::cout << ee.pretty_print();
       std::cout << '\n';
 
       if (!eval_error_ok) {
         return EXIT_FAILURE;
       }
-    } catch (const chaiscript::Boxed_Value &e) {
+    }
+    catch (const chaiscript::Boxed_Value &e) {
       std::cout << "Unhandled exception thrown of type " << e.get_type_info().name() << '\n';
 
       if (!boxed_exception_ok) {
         return EXIT_FAILURE;
       }
-    } catch (const chaiscript::exception::load_module_error &e) {
-      std::cout << "Unhandled module load error\n"
-                << e.what() << '\n';
-    } catch (std::exception &e) {
-      std::cout << "Unhandled standard exception: " << e.what() << '\n';
-      if (!any_exception_ok) {
-        throw;
-      }
-    } catch (...) {
-      std::cout << "Unhandled unknown exception" << '\n';
-      if (!any_exception_ok) {
-        throw;
-      }
     }
+
+//    catch (std::exception &e) {
+//      std::cout << e.what() << '\n';
+//      return EXIT_FAILURE;
+//    }
   }
 
   return EXIT_SUCCESS;

src/sha3.cpp

@@ -1,289 +0,0 @@
-// //////////////////////////////////////////////////////////
-// sha3.cpp
-// Copyright (c) 2014,2015 Stephan Brumme. All rights reserved.
-// see http://create.stephan-brumme.com/disclaimer.html
-//
-
-#include "sha3.h"
-
-// big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN
-#ifndef _MSC_VER
-#include <endian.h>
-#endif
-
-/// same as reset()
-SHA3::SHA3(Bits bits)
-    : m_blockSize(200 - 2 * (bits / 8))
-    , m_bits(bits) {
-  reset();
-}
-
-/// restart
-void SHA3::reset() {
-  for (size_t i = 0; i < StateSize; i++)
-    m_hash[i] = 0;
-
-  m_numBytes = 0;
-  m_bufferSize = 0;
-}
-
-/// constants and local helper functions
-namespace {
-  const unsigned int Rounds = 24;
-  const uint64_t XorMasks[Rounds]
-      = {0x0000000000000001ULL, 0x0000000000008082ULL, 0x800000000000808aULL, 0x8000000080008000ULL, 0x000000000000808bULL, 0x0000000080000001ULL, 0x8000000080008081ULL, 0x8000000000008009ULL, 0x000000000000008aULL, 0x0000000000000088ULL, 0x0000000080008009ULL, 0x000000008000000aULL, 0x000000008000808bULL, 0x800000000000008bULL, 0x8000000000008089ULL, 0x8000000000008003ULL, 0x8000000000008002ULL, 0x8000000000000080ULL, 0x000000000000800aULL, 0x800000008000000aULL, 0x8000000080008081ULL, 0x8000000000008080ULL, 0x0000000080000001ULL, 0x8000000080008008ULL};
-
-  /// rotate left and wrap around to the right
-  inline uint64_t rotateLeft(uint64_t x, uint8_t numBits) {
-    return (x << numBits) | (x >> (64 - numBits));
-  }
-
-  /// convert litte vs big endian
-  inline uint64_t swap(uint64_t x) {
-#if defined(__GNUC__) || defined(__clang__)
-    return __builtin_bswap64(x);
-#endif
-#ifdef _MSC_VER
-    return _byteswap_uint64(x);
-#endif
-
-    return (x >> 56) | ((x >> 40) & 0x000000000000FF00ULL) | ((x >> 24) & 0x0000000000FF0000ULL) | ((x >> 8) & 0x00000000FF000000ULL)
-        | ((x << 8) & 0x000000FF00000000ULL) | ((x << 24) & 0x0000FF0000000000ULL) | ((x << 40) & 0x00FF000000000000ULL) | (x << 56);
-  }
-
-  /// return x % 5 for 0 <= x <= 9
-  unsigned int mod5(unsigned int x) {
-    if (x < 5)
-      return x;
-
-    return x - 5;
-  }
-} // namespace
-
-/// process a full block
-void SHA3::processBlock(const void *data) {
-#if defined(__BYTE_ORDER) && (__BYTE_ORDER != 0) && (__BYTE_ORDER == __BIG_ENDIAN)
-#define LITTLEENDIAN(x) swap(x)
-#else
-#define LITTLEENDIAN(x) (x)
-#endif
-
-  const uint64_t *data64 = (const uint64_t *)data;
-  // mix data into state
-  for (unsigned int i = 0; i < m_blockSize / 8; i++)
-    m_hash[i] ^= LITTLEENDIAN(data64[i]);
-
-  // re-compute state
-  for (unsigned int round = 0; round < Rounds; round++) {
-    // Theta
-    uint64_t coefficients[5];
-    for (unsigned int i = 0; i < 5; i++)
-      coefficients[i] = m_hash[i] ^ m_hash[i + 5] ^ m_hash[i + 10] ^ m_hash[i + 15] ^ m_hash[i + 20];
-
-    for (unsigned int i = 0; i < 5; i++) {
-      uint64_t one = coefficients[mod5(i + 4)] ^ rotateLeft(coefficients[mod5(i + 1)], 1);
-      m_hash[i] ^= one;
-      m_hash[i + 5] ^= one;
-      m_hash[i + 10] ^= one;
-      m_hash[i + 15] ^= one;
-      m_hash[i + 20] ^= one;
-    }
-
-    // temporary
-    uint64_t one;
-
-    // Rho Pi
-    uint64_t last = m_hash[1];
-    one = m_hash[10];
-    m_hash[10] = rotateLeft(last, 1);
-    last = one;
-    one = m_hash[7];
-    m_hash[7] = rotateLeft(last, 3);
-    last = one;
-    one = m_hash[11];
-    m_hash[11] = rotateLeft(last, 6);
-    last = one;
-    one = m_hash[17];
-    m_hash[17] = rotateLeft(last, 10);
-    last = one;
-    one = m_hash[18];
-    m_hash[18] = rotateLeft(last, 15);
-    last = one;
-    one = m_hash[3];
-    m_hash[3] = rotateLeft(last, 21);
-    last = one;
-    one = m_hash[5];
-    m_hash[5] = rotateLeft(last, 28);
-    last = one;
-    one = m_hash[16];
-    m_hash[16] = rotateLeft(last, 36);
-    last = one;
-    one = m_hash[8];
-    m_hash[8] = rotateLeft(last, 45);
-    last = one;
-    one = m_hash[21];
-    m_hash[21] = rotateLeft(last, 55);
-    last = one;
-    one = m_hash[24];
-    m_hash[24] = rotateLeft(last, 2);
-    last = one;
-    one = m_hash[4];
-    m_hash[4] = rotateLeft(last, 14);
-    last = one;
-    one = m_hash[15];
-    m_hash[15] = rotateLeft(last, 27);
-    last = one;
-    one = m_hash[23];
-    m_hash[23] = rotateLeft(last, 41);
-    last = one;
-    one = m_hash[19];
-    m_hash[19] = rotateLeft(last, 56);
-    last = one;
-    one = m_hash[13];
-    m_hash[13] = rotateLeft(last, 8);
-    last = one;
-    one = m_hash[12];
-    m_hash[12] = rotateLeft(last, 25);
-    last = one;
-    one = m_hash[2];
-    m_hash[2] = rotateLeft(last, 43);
-    last = one;
-    one = m_hash[20];
-    m_hash[20] = rotateLeft(last, 62);
-    last = one;
-    one = m_hash[14];
-    m_hash[14] = rotateLeft(last, 18);
-    last = one;
-    one = m_hash[22];
-    m_hash[22] = rotateLeft(last, 39);
-    last = one;
-    one = m_hash[9];
-    m_hash[9] = rotateLeft(last, 61);
-    last = one;
-    one = m_hash[6];
-    m_hash[6] = rotateLeft(last, 20);
-    last = one;
-    m_hash[1] = rotateLeft(last, 44);
-
-    // Chi
-    for (unsigned int j = 0; j < 25; j += 5) {
-      // temporaries
-      uint64_t one = m_hash[j];
-      uint64_t two = m_hash[j + 1];
-
-      m_hash[j] ^= m_hash[j + 2] & ~two;
-      m_hash[j + 1] ^= m_hash[j + 3] & ~m_hash[j + 2];
-      m_hash[j + 2] ^= m_hash[j + 4] & ~m_hash[j + 3];
-      m_hash[j + 3] ^= one & ~m_hash[j + 4];
-      m_hash[j + 4] ^= two & ~one;
-    }
-
-    // Iota
-    m_hash[0] ^= XorMasks[round];
-  }
-}
-
-/// add arbitrary number of bytes
-void SHA3::add(const void *data, size_t numBytes) {
-  const uint8_t *current = (const uint8_t *)data;
-
-  // copy data to buffer
-  if (m_bufferSize > 0) {
-    while (numBytes > 0 && m_bufferSize < m_blockSize) {
-      m_buffer[m_bufferSize++] = *current++;
-      numBytes--;
-    }
-  }
-
-  // full buffer
-  if (m_bufferSize == m_blockSize) {
-    processBlock((void *)m_buffer);
-    m_numBytes += m_blockSize;
-    m_bufferSize = 0;
-  }
-
-  // no more data ?
-  if (numBytes == 0)
-    return;
-
-  // process full blocks
-  while (numBytes >= m_blockSize) {
-    processBlock(current);
-    current += m_blockSize;
-    m_numBytes += m_blockSize;
-    numBytes -= m_blockSize;
-  }
-
-  // keep remaining bytes in buffer
-  while (numBytes > 0) {
-    m_buffer[m_bufferSize++] = *current++;
-    numBytes--;
-  }
-}
-
-/// process everything left in the internal buffer
-void SHA3::processBuffer() {
-  // add padding
-  size_t offset = m_bufferSize;
-  // add a "1" byte
-  m_buffer[offset++] = 0x06;
-  // fill with zeros
-  while (offset < m_blockSize)
-    m_buffer[offset++] = 0;
-
-  // and add a single set bit
-  m_buffer[offset - 1] |= 0x80;
-
-  processBlock(m_buffer);
-}
-
-/// return latest hash as 16 hex characters
-std::string SHA3::getHash() {
-  // process remaining bytes
-  processBuffer();
-
-  // convert hash to string
-  static const char dec2hex[16 + 1] = "0123456789abcdef";
-
-  // number of significant elements in hash (uint64_t)
-  unsigned int hashLength = m_bits / 64;
-
-  std::string result;
-  result.reserve(m_bits / 4);
-  for (unsigned int i = 0; i < hashLength; i++)
-    for (unsigned int j = 0; j < 8; j++) // 64 bits => 8 bytes
-    {
-      // convert a byte to hex
-      unsigned char oneByte = (unsigned char)(m_hash[i] >> (8 * j));
-      result += dec2hex[oneByte >> 4];
-      result += dec2hex[oneByte & 15];
-    }
-
-  // SHA3-224's last entry in m_hash provides only 32 bits instead of 64 bits
-  unsigned int remainder = m_bits - hashLength * 64;
-  unsigned int processed = 0;
-  while (processed < remainder) {
-    // convert a byte to hex
-    unsigned char oneByte = (unsigned char)(m_hash[hashLength] >> processed);
-    result += dec2hex[oneByte >> 4];
-    result += dec2hex[oneByte & 15];
-
-    processed += 8;
-  }
-
-  return result;
-}
-
-/// compute SHA3 of a memory block
-std::string SHA3::operator()(const void *data, size_t numBytes) {
-  reset();
-  add(data, numBytes);
-  return getHash();
-}
-
-/// compute SHA3 of a string, excluding final zero
-std::string SHA3::operator()(const std::string &text) {
-  reset();
-  add(text.c_str(), text.size());
-  return getHash();
-}

src/sha3.h

@@ -1,81 +0,0 @@
-// //////////////////////////////////////////////////////////
-// sha3.h
-// Copyright (c) 2014,2015 Stephan Brumme. All rights reserved.
-// see http://create.stephan-brumme.com/disclaimer.html
-//
-
-#pragma once
-
-//#include "hash.h"
-#include <string>
-
-// define fixed size integer types
-#ifdef _MSC_VER
-// Windows
-typedef unsigned __int8  uint8_t;
-typedef unsigned __int64 uint64_t;
-#else
-// GCC
-#include <stdint.h>
-#endif
-
-
-/// compute SHA3 hash
-/** Usage:
-    SHA3 sha3;
-    std::string myHash  = sha3("Hello World");     // std::string
-    std::string myHash2 = sha3("How are you", 11); // arbitrary data, 11 bytes
-
-    // or in a streaming fashion:
-
-    SHA3 sha3;
-    while (more data available)
-      sha3.add(pointer to fresh data, number of new bytes);
-    std::string myHash3 = sha3.getHash();
-  */
-class SHA3 //: public Hash
-{
-public:
-  /// algorithm variants
-  enum Bits { Bits224 = 224, Bits256 = 256, Bits384 = 384, Bits512 = 512 };
-
-  /// same as reset()
-  explicit SHA3(Bits bits = Bits256);
-
-  /// compute hash of a memory block
-  std::string operator()(const void* data, size_t numBytes);
-  /// compute hash of a string, excluding final zero
-  std::string operator()(const std::string& text);
-
-  /// add arbitrary number of bytes
-  void add(const void* data, size_t numBytes);
-
-  /// return latest hash as hex characters
-  std::string getHash();
-
-  /// restart
-  void reset();
-
-private:
-  /// process a full block
-  void processBlock(const void* data);
-  /// process everything left in the internal buffer
-  void processBuffer();
-
-  /// 1600 bits, stored as 25x64 bit, BlockSize is no more than 1152 bits (Keccak224)
-  enum { StateSize    = 1600 / (8 * 8),
-         MaxBlockSize =  200 - 2 * (224 / 8) };
-
-  /// hash
-  uint64_t m_hash[StateSize];
-  /// size of processed data in bytes
-  uint64_t m_numBytes;
-  /// block size (less or equal to MaxBlockSize)
-  size_t   m_blockSize;
-  /// valid bytes in m_buffer
-  size_t   m_bufferSize;
-  /// bytes not processed yet
-  uint8_t  m_buffer[MaxBlockSize];
-  /// variant
-  Bits     m_bits;
-};

src/stl_extra.cpp

@@ -1,13 +1,10 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2018, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com
 
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-#include <chaiscript/chaiscript_basic.hpp>
+#include <chaiscript/chaiscript.hpp>
 #include <chaiscript/dispatchkit/bootstrap_stl.hpp>
 #include <list>
 #include <string>
@@ -24,10 +21,11 @@
 #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
 #endif
 
-CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_stl_extra() {
-  auto module = std::make_shared<chaiscript::Module>();
-  chaiscript::bootstrap::standard_library::list_type<std::list<chaiscript::Boxed_Value>>("List", *module);
-  chaiscript::bootstrap::standard_library::vector_type<std::vector<uint16_t>>("u16vector", *module);
+CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_stl_extra()
+{
+
+  auto module = chaiscript::bootstrap::standard_library::list_type<std::list<chaiscript::Boxed_Value> >("List");
+  module->add(chaiscript::bootstrap::standard_library::vector_type<std::vector<uint16_t> >("u16vector"));
   module->add(chaiscript::vector_conversion<std::vector<uint16_t>>());
   return module;
 }

src/test_module.cpp

@@ -1,44 +1,27 @@
 
-#include <chaiscript/chaiscript_basic.hpp>
+#include <chaiscript/chaiscript.hpp>
 #include <chaiscript/dispatchkit/bootstrap.hpp>
 #include <string>
 
-class TestBaseType {
-public:
-  TestBaseType() noexcept
-      : val(10)
-      , const_val(15)
-      , mdarray{} {
-  }
-  TestBaseType(int) noexcept
-      : val(10)
-      , const_val(15)
-      , mdarray{} {
-  }
-  TestBaseType(int *) noexcept
-      : val(10)
-      , const_val(15)
-      , mdarray{} {
-  }
 
-  TestBaseType(const TestBaseType &other) noexcept
-      : val(other.val)
-      , const_val(other.const_val)
-      , const_val_ptr(&const_val)
-      , func_member(other.func_member) {
-  }
 
-  TestBaseType(TestBaseType &&other) noexcept
-      : val(other.val)
-      , const_val(other.const_val)
-      , const_val_ptr(&const_val)
-      , func_member(std::move(other.func_member)) {
-  }
+class TestBaseType
+{
+  public:
+#ifdef CHAISCRIPT_MSVC_12
+#pragma warning(push)
+#pragma warning(disable : 4351)
+#endif
+    // MSVC 12 warns that we are using new (correct) behavior 
+    TestBaseType() : val(10), const_val(15), mdarray{} { }
+    TestBaseType(int) : val(10), const_val(15), mdarray{} { }
+    TestBaseType(int *) : val(10), const_val(15), mdarray{} { }
+#ifdef CHAISCRIPT_MSVC_12
+#pragma warning(pop)
+#endif    
     
-  TestBaseType &operator=(TestBaseType &&) = delete;
-  TestBaseType &operator=(const TestBaseType &) = delete;
-
-  virtual ~TestBaseType() = default;
+    TestBaseType(const TestBaseType &) = default;
+    virtual ~TestBaseType() {}
     virtual int func() { return 0; }
 
     int base_only_func() { return -9; }
@@ -47,77 +30,109 @@ public:
 
     int val;
     const int const_val;
-  const int *const_val_ptr = &const_val;
-
-  const int *get_const_val_ptr() { return const_val_ptr; }
 
     int mdarray[2][3][5];
-  std::function<int(int)> func_member;
+    std::function<int (int)> func_member;
 
-  void set_string_val(std::string &t_str) { t_str = "42"; }
-};
-
-class Type2 {
-public:
-  Type2(TestBaseType t_bt) noexcept
-      : m_bt(std::move(t_bt))
-      , m_str("Hello World") {
+    void set_string_val(std::string &t_str)
+    {
+      t_str = "42";
     }
 
-  int get_val() const { return m_bt.val; }
+  private:
+    TestBaseType &operator=(const TestBaseType &) = delete;
+};
 
-  const char *get_str() const { return m_str.c_str(); }
+class Type2
+{
+  public:
+    Type2(TestBaseType t_bt)
+      : m_bt(std::move(t_bt)),
+        m_str("Hello World")
+    {
+    }
 
-private:
+    int get_val() const
+    {
+      return m_bt.val;
+    }
+
+
+    const char *get_str() const
+    {
+      return m_str.c_str();
+    }
+
+  private:
     TestBaseType m_bt;
     std::string m_str;
 };
 
-enum TestEnum {
+enum TestEnum
+{
   TestValue1 = 1
 };
 
-int to_int(TestEnum t) {
+int to_int(TestEnum t)
+{
   return t;
 }
 
-class TestDerivedType : public TestBaseType {
-public:
-  int func() override { return 1; }
+class TestDerivedType : public TestBaseType
+{
+  public:
+    virtual ~TestDerivedType() {}
+    TestDerivedType(const TestDerivedType &) = default;
+    TestDerivedType() = default;
+    virtual int func() CHAISCRIPT_OVERRIDE { return 1; }
     int derived_only_func() { return 19; }
+
+  private:
+    TestDerivedType &operator=(const TestDerivedType &) = delete;
 };
 
-class TestMoreDerivedType : public TestDerivedType {
-public:
+class TestMoreDerivedType : public TestDerivedType
+{
+  public:
+    TestMoreDerivedType(const TestMoreDerivedType &) = default;
+    TestMoreDerivedType() = default;
+    virtual ~TestMoreDerivedType() {}
 };
 
-std::shared_ptr<TestBaseType> derived_type_factory() {
+std::shared_ptr<TestBaseType> derived_type_factory()
+{
   return std::make_shared<TestDerivedType>();
 }
 
-std::shared_ptr<TestBaseType> more_derived_type_factory() {
+std::shared_ptr<TestBaseType> more_derived_type_factory()
+{
   return std::make_shared<TestMoreDerivedType>();
 }
 
-std::shared_ptr<TestBaseType> null_factory() {
+std::shared_ptr<TestBaseType> null_factory()
+{
   return std::shared_ptr<TestBaseType>();
 }
 
-void update_shared_ptr(std::shared_ptr<TestBaseType> &ptr) {
+void update_shared_ptr(std::shared_ptr<TestBaseType> &ptr)
+{
   ptr = std::make_shared<TestDerivedType>();
 }
 
-void nullify_shared_ptr(std::shared_ptr<TestBaseType> &ptr) {
+void nullify_shared_ptr(std::shared_ptr<TestBaseType> &ptr)
+{
   ptr = nullptr;
 }
 
-std::string hello_world() {
+std::string hello_world()
+{
   return "Hello World";
 }
 
 static int global_i = 1;
 
-int *get_new_int() {
+int *get_new_int()
+{
   return &global_i;
 }
 
@@ -133,7 +148,8 @@ int *get_new_int() {
 #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
 #endif
 
-CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_test_module() {
+CHAISCRIPT_MODULE_EXPORT  chaiscript::ModulePtr create_chaiscript_module_test_module()
+{
   chaiscript::ModulePtr m(new chaiscript::Module());
 
   m->add(chaiscript::fun(hello_world), "hello_world");
@@ -143,16 +159,16 @@ CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_test_mod
   m->add(chaiscript::user_type<TestMoreDerivedType>(), "TestMoreDerivedType");
   m->add(chaiscript::user_type<Type2>(), "Type2");
 
-  m->add(chaiscript::constructor<TestBaseType()>(), "TestBaseType");
-  //  m->add(chaiscript::constructor<TestBaseType (int)>(), "TestBaseType");
-  m->add(chaiscript::constructor<TestBaseType(const TestBaseType &)>(), "TestBaseType");
-  m->add(chaiscript::constructor<TestBaseType(int *)>(), "TestBaseType");
+  m->add(chaiscript::constructor<TestBaseType ()>(), "TestBaseType");
+//  m->add(chaiscript::constructor<TestBaseType (int)>(), "TestBaseType");
+  m->add(chaiscript::constructor<TestBaseType (const TestBaseType &)>(), "TestBaseType");
+  m->add(chaiscript::constructor<TestBaseType (int *)>(), "TestBaseType");
 
-  m->add(chaiscript::constructor<TestDerivedType()>(), "TestDerivedType");
-  m->add(chaiscript::constructor<TestDerivedType(const TestDerivedType &)>(), "TestDerivedType");
+  m->add(chaiscript::constructor<TestDerivedType ()>(), "TestDerivedType");
+  m->add(chaiscript::constructor<TestDerivedType (const TestDerivedType &)>(), "TestDerivedType");
 
-  m->add(chaiscript::constructor<TestMoreDerivedType()>(), "TestMoreDerivedType");
-  m->add(chaiscript::constructor<TestMoreDerivedType(const TestMoreDerivedType &)>(), "TestMoreDerivedType");
+  m->add(chaiscript::constructor<TestMoreDerivedType ()>(), "TestMoreDerivedType");
+  m->add(chaiscript::constructor<TestMoreDerivedType (const TestMoreDerivedType &)>(), "TestMoreDerivedType");
 
   /// \todo automatic chaining of base classes?
   m->add(chaiscript::base_class<TestBaseType, TestDerivedType>());
@@ -170,20 +186,25 @@ CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_test_mod
   m->add(chaiscript::fun(&TestBaseType::func), "func");
   m->add(chaiscript::fun(&TestBaseType::val), "val");
   m->add(chaiscript::fun(&TestBaseType::const_val), "const_val");
-  m->add(chaiscript::fun(&TestBaseType::const_val_ptr), "const_val_ptr");
-  m->add(chaiscript::fun(&TestBaseType::get_const_val_ptr), "get_const_val_ptr");
   m->add(chaiscript::fun(&TestBaseType::base_only_func), "base_only_func");
   m->add(chaiscript::fun(&TestBaseType::set_string_val), "set_string_val");
 
+#ifndef CHAISCRIPT_MSVC_12
+  // we cannot support these in MSVC_12 because of a bug in the implementation of
+  // std::reference_wrapper
+  // Array types
   m->add(chaiscript::fun(&TestBaseType::mdarray), "mdarray");
-  chaiscript::bootstrap::array<int[2][3][5]>("IntArray_2_3_5", *m);
-  chaiscript::bootstrap::array<int[3][5]>("IntArray_3_5", *m);
-  chaiscript::bootstrap::array<int[5]>("IntArray_5", *m);
+  m->add(chaiscript::bootstrap::array<int[2][3][5]>("IntArray_2_3_5"));
+  m->add(chaiscript::bootstrap::array<int[3][5]>("IntArray_3_5"));
+  m->add(chaiscript::bootstrap::array<int[5]>("IntArray_5"));
+  // end array types
+#endif
 
   // member that is a function
   m->add(chaiscript::fun(&TestBaseType::func_member), "func_member");
   m->add(chaiscript::fun(&get_new_int), "get_new_int");
 
+
   m->add_global_const(chaiscript::const_var(TestValue1), "TestValue1");
 
   m->add(chaiscript::user_type<TestEnum>(), "TestEnum");
@@ -196,14 +217,16 @@ CHAISCRIPT_MODULE_EXPORT chaiscript::ModulePtr create_chaiscript_module_test_mod
   m->add(chaiscript::fun(&Type2::get_val), "get_val");
   m->add(chaiscript::fun(&Type2::get_str), "get_str");
   m->add(chaiscript::type_conversion<const char *, std::string>());
-  m->add(chaiscript::constructor<Type2(const TestBaseType &)>(), "Type2");
+  m->add(chaiscript::constructor<Type2 (const TestBaseType &)>(), "Type2");
 
   m->add(chaiscript::fun(&update_shared_ptr), "update_shared_ptr");
   m->add(chaiscript::fun(&nullify_shared_ptr), "nullify_shared_ptr");
 
+
   return m;
 }
 
+
 #ifdef __llvm__
 #pragma clang diagnostic pop
 #endif

static_libs/chaiscript_parser.cpp

@@ -1,6 +0,0 @@
-#include "../include/chaiscript/language/chaiscript_parser.hpp"
-#include "chaiscript_parser.hpp"
-
-std::unique_ptr<chaiscript::parser::ChaiScript_Parser_Base> create_chaiscript_parser() {
-  return std::make_unique<chaiscript::parser::ChaiScript_Parser<chaiscript::eval::Noop_Tracer, chaiscript::optimizer::Optimizer_Default>>();
-}

static_libs/chaiscript_parser.hpp

@@ -1,15 +0,0 @@
-
-#ifndef CHAISCRIPT_PARSER_LIB
-#define CHAISCRIPT_PARSER_LIB
-
-#include <memory>
-
-namespace chaiscript {
-  namespace parser {
-    class ChaiScript_Parser_Base;
-  }
-} // namespace chaiscript
-
-std::unique_ptr<chaiscript::parser::ChaiScript_Parser_Base> create_chaiscript_parser();
-
-#endif