Add get_array_key

src/sfall_arrays.cc

@@ -19,6 +19,11 @@ public:
         opcode = VALUE_TYPE_INT;
         integerValue = 0;
     }
+    SFallArrayElement(int value)
+    {
+        opcode = VALUE_TYPE_INT;
+        integerValue = value;
+    }
 };
 
 #define ARRAYFLAG_ASSOC (1) // is map
@@ -41,6 +46,10 @@ public:
         data.resize(len);
     }
     std::vector<SFallArrayElement> data;
+    int size()
+    {
+        return data.size();
+    }
 };
 
 using ArraysMap = std::unordered_map<ArrayId, SFallArray>;
@@ -77,4 +86,25 @@ ArrayId CreateTempArray(int len, uint32_t flags)
     return array_id;
 }
 
+static SFallArray* get_array_by_id(ArrayId array_id)
+{
+    auto iter = arrays.find(array_id);
+    if (iter == arrays.end()) {
+        return nullptr;
+    };
+    return &iter->second;
+}
+
+ProgramValue GetArrayKey(ArrayId array_id, int index)
+{
+    auto arr = get_array_by_id(array_id);
+    if (arr == nullptr || index < -1 || index > arr->size()) {
+        return SFallArrayElement(0);
+    };
+    if (index == -1) { // special index to indicate if array is associative
+        throw(std::invalid_argument("Not implemented yet"));
+    };
+    return SFallArrayElement(index);
+}
+
 }

src/sfall_opcodes.cc

@@ -294,8 +294,8 @@ static void opGetArrayKey(Program* program)
 {
     auto index = programStackPopInteger(program);
     auto arrayId = programStackPopInteger(program);
-
+    auto value = GetArrayKey(arrayId, index);
-    programStackPushInteger(program, 33);
+    programStackPushValue(program, value);
 }
 
 // create_array