diff --git a/CMakeLists.txt b/CMakeLists.txt index ccab0041..944a8caf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description.txt" set(CPACK_PACKAGE_VERSION_MAJOR 5) set(CPACK_PACKAGE_VERSION_MINOR 8) -set(CPACK_PACKAGE_VERSION_PATCH 4) +set(CPACK_PACKAGE_VERSION_PATCH 5) set(CPACK_PACKAGE_EXECUTABLES "chai;ChaiScript Eval") set(CPACK_PACKAGE_VENDOR "ChaiScript.com") diff --git a/include/chaiscript/chaiscript_defines.hpp b/include/chaiscript/chaiscript_defines.hpp index ea8b1db9..f5588476 100644 --- a/include/chaiscript/chaiscript_defines.hpp +++ b/include/chaiscript/chaiscript_defines.hpp @@ -99,7 +99,7 @@ namespace chaiscript { static const int version_major = 5; static const int version_minor = 8; - static const int version_patch = 4; + static const int version_patch = 5; static const char *compiler_version = CHAISCRIPT_COMPILER_VERSION; static const char *compiler_name = CHAISCRIPT_COMPILER_NAME; diff --git a/include/chaiscript/language/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp index 7653c7f0..fa161282 100644 --- a/include/chaiscript/language/chaiscript_parser.hpp +++ b/include/chaiscript/language/chaiscript_parser.hpp @@ -2164,7 +2164,7 @@ namespace chaiscript /// Reads a unary prefixed expression from input bool Prefix() { const auto prev_stack_top = m_match_stack.size(); - const std::vector prefix_opers{"++", "--", "-", "+", "!", "~", "&"}; + const std::vector prefix_opers{"++", "--", "-", "+", "!", "~"}; for (const auto &oper : prefix_opers) { diff --git a/releasenotes.md b/releasenotes.md index d2698ae8..b415a8e8 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,6 +1,10 @@ Notes: ======= -Current Version: 5.8.4 +Current Version: 5.8.5 + +### Changes since 5.8.4 +* Fix order of operations for prefix operators +* Make sure atomics are initialized properly ### Changes since 5.8.3 * Fix case with some numeric conversions mixed with numerics that do not need conversion diff --git a/unittests/fuzzy_tests-2015-07-16.tar.bz2 b/unittests/fuzzy_tests-2015-07-16.tar.bz2 index 9768b8e4..7aadb765 100644 Binary files a/unittests/fuzzy_tests-2015-07-16.tar.bz2 and b/unittests/fuzzy_tests-2015-07-16.tar.bz2 differ