Fixed bug with indexing in CEL

Fixed a bug with the index operator for arrays in CEL
Added a unit test for the virtual machine to prevent regressions.
Removed unnecessary includes
Kicked version for release

Author: sean-parent

CMakeLists.txt

@@ -103,7 +103,7 @@ if(BUILD_DOCS)
         # Set variables for Doxyfile template
         set(PROJECT_NAME "Adobe Source Libraries")
         set(PROJECT_BRIEF "A collection of C++ libraries.")
-        set(PROJECT_VERSION "2.0.0")
+        set(PROJECT_VERSION "2.0.2")
         set(INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
         set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
         set(AWESOME_CSS_PATH "${AWESOME_CSS_DIR}")

CMakePresets.json

@@ -6,7 +6,7 @@
             "displayName": "debug-windows",
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
-            "binaryDir": "${sourceParentDir}/build/asl-${presetName}",
+            "binaryDir": "${sourceDir}/build/asl-${presetName}",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "DEBUG",
                 "CMAKE_CXX_STANDARD": "20",
@@ -29,7 +29,7 @@
             "displayName": "windows-debug-C++17",
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
-            "binaryDir": "${sourceParentDir}/build/asl-${presetName}",
+            "binaryDir": "${sourceDir}/build/asl-${presetName}",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "DEBUG",
                 "CMAKE_CXX_STANDARD": "17",
@@ -71,7 +71,7 @@
             "displayName": "macos-debug-C++17",
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
-            "binaryDir": "${sourceParentDir}/build/asl-${presetName}",
+            "binaryDir": "${sourceDir}/build/asl-${presetName}",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "DEBUG",
                 "CMAKE_CXX_STANDARD": "17"

adobe/virtual_machine.hpp

@@ -10,13 +10,9 @@
 
 #include <adobe/config.hpp>
 
-#include <bitset>
 #include <functional>
-#include <optional>
 #include <stdexcept>
 #include <string>
-#include <vector>
-
 
 #define BOOST_FUNCTION_NO_DEPRECATED
 #include <boost/operators.hpp>

source/virtual_machine.cpp

@@ -643,7 +643,7 @@ void virtual_machine_t::implementation_t::index_operator() {
             result = get_value(cast<dictionary_t>(operand1), index);
         }
     } else {
-        auto index{cast<size_t>(operand2)};
+        auto index{static_cast<size_t>(cast<double>(operand2))};
 
         if (numeric_index_lookup_m) {
             result = numeric_index_lookup_m(operand1, index);

test/CMakeLists.txt

@@ -89,5 +89,6 @@ add_subdirectory(sha)
 add_subdirectory(stable_partition_selection)
 add_subdirectory(to_string)
 add_subdirectory(unicode)
+add_subdirectory(virtual_machine)
 add_subdirectory(xml_parser)
 add_subdirectory(zuidgen)

test/virtual_machine/CMakeLists.txt

@@ -0,0 +1 @@
+asl_test(BOOST NAME virtual_machine SOURCES virtual_machine_test.cpp)

test/virtual_machine/virtual_machine_test.cpp

@@ -0,0 +1,35 @@
+/*
+    Copyright 2013 Adobe
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+*/
+/**************************************************************************************************/
+
+#include <adobe/virtual_machine.hpp>
+
+#include <adobe/array.hpp>
+#include <adobe/expression_parser.hpp>
+
+#include <sstream>
+#include <string>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+
+using namespace std;
+using namespace adobe;
+
+BOOST_AUTO_TEST_CASE(index_operator) {
+    const line_position_t expression_position{__FILE__, __LINE__ + 1};
+    constexpr const char* expression = R"(
+        ["a", "correct", "c"][1]
+    )";
+    istringstream stream{expression};
+    expression_parser exp(stream, expression_position);
+    array_t instructions;
+    exp.require_expression(instructions);
+
+    virtual_machine_t vm;
+    vm.evaluate(instructions);
+    BOOST_TEST(cast<string>(vm.back()) == "correct");
+}