multi dimensional arrays WIP

Author: CHiPs44

src/ps_array.c

@@ -21,7 +21,7 @@ ps_array_data *ps_array_alloc(const ps_symbol *array_type)
     ps_array_data *array_data = ps_memory_malloc(PS_MEMORY_VALUE, sizeof(ps_array_data));
     if (array_data == NULL)
         return NULL;
-    array_data->count = ps_type_definition_get_subrange_count(type_def->def.a.subrange->value->data.t);
+    array_data->count = ps_type_definition_get_subrange_count(type_def->def.a.subranges[0]->value->data.t);
     if (ps_array_debug)
         fprintf(stderr, " DEBUG\tps_array_alloc, size: %u * %zu = %zu\n", array_data->count, sizeof(ps_value_data),
                 array_data->count * sizeof(ps_value_data));
@@ -87,7 +87,7 @@ ps_symbol *ps_array_get_subrange(const ps_symbol *array_type)
         ps_type_definition_debug(stderr, "GET_SUBRANGE\tTYPE_DEF\t", type_def);
     if (type_def == NULL)
         return NULL;
-    ps_symbol *subrange = type_def->def.a.subrange;
+    ps_symbol *subrange = type_def->def.a.subranges[0];
     if (ps_array_debug)
         ps_symbol_debug(stderr, "GET_SUBRANGE\tSUBRANGE\t", subrange);
     return subrange;
@@ -113,7 +113,7 @@ ps_error ps_array_get_value(const ps_symbol *array_var, const ps_value *index, p
     const ps_type_definition *type_def = array_var->value->type->value->data.t;
     if (ps_array_debug)
         ps_type_definition_debug(stderr, "*** ps_array_get_value, type_def: ", type_def);
-    ps_unsigned offset = ps_type_definition_get_subrange_offset(type_def->def.a.subrange->value->data.t, index);
+    ps_unsigned offset = ps_type_definition_get_subrange_offset(type_def->def.a.subranges[0]->value->data.t, index);
     if (offset >= array_var->value->data.a->count)
         return PS_ERROR_OUT_OF_RANGE;
     ps_value array_value = {.allocated = false,

src/ps_functions.c

@@ -294,7 +294,7 @@ ps_error ps_function_low_or_high_type(ps_interpreter *interpreter, ps_symbol *ty
             low ? ps_system_constant_boolean_true.value->data.b : ps_system_constant_boolean_false.value->data.b;
         break;
     case PS_TYPE_ARRAY:
-        ps_symbol *subrange = type_def->def.a.subrange;
+        ps_symbol *subrange = type_def->def.a.subranges[0];
         if (debug)
             ps_symbol_debug(stderr, "ps_function_low/high, array subrange: ", subrange);
         return ps_function_low_or_high_type(interpreter, subrange, result, low);

src/ps_type_definition.c

@@ -121,7 +121,7 @@ ps_type_definition *ps_type_definition_create_array(ps_symbol *dimension)
     ps_type_definition *type_def = ps_type_definition_alloc(PS_TYPE_ARRAY, PS_TYPE_ARRAY);
     if (type_def == NULL)
         return NULL;
-    type_def->def.a.subrange = dimension;
+    type_def->def.a.subranges[0] = dimension;
     return type_def;
 }
 
@@ -297,7 +297,7 @@ char *ps_type_definition_get_name(const ps_type_definition *type_def)
         break;
     case PS_TYPE_ARRAY:
         // ARRAY[1..10] OF INTEGER => "ARRAY(SUBRANGE, INTEGER)"
-        snprintf(buffer, sizeof(buffer) - 1, "ARRAY(%s, %s)", type_def->def.a.subrange->name,
+        snprintf(buffer, sizeof(buffer) - 1, "ARRAY(%s, %s)", type_def->def.a.subranges[0]->name,
                  type_def->def.a.item_type->name);
         break;
     default:

src/ps_value.c

@@ -448,7 +448,7 @@ char *ps_value_to_string(const ps_value *value, bool debug, int16_t width, int16
         EXECUTABLE_VALUE
         break;
     case PS_TYPE_ARRAY:
-        snprintf(buffer, sizeof(buffer) - 1, "ARRAY[%s] OF %s", value->type->value->data.t->def.a.subrange->name,
+        snprintf(buffer, sizeof(buffer) - 1, "ARRAY[%s] OF %s", value->type->value->data.t->def.a.subranges[0]->name,
                  value->type->value->data.t->def.a.item_type->name);
         break;
     case PS_TYPE_POINTER:

src/ps_visit_statement.c

@@ -95,7 +95,7 @@ bool ps_visit_assignment_array(ps_interpreter *interpreter, ps_interpreter_mode
 
     EXPECT_TOKEN(PS_TOKEN_LEFT_BRACKET)
     READ_NEXT_TOKEN
-    index.type = variable->value->type->value->data.t->def.a.subrange;
+    index.type = variable->value->type->value->data.t->def.a.subranges[0];
     if (!ps_visit_expression(interpreter, mode, &index))
         TRACE_ERROR("INDEX")
     EXPECT_TOKEN(PS_TOKEN_RIGHT_BRACKET)

src/ps_visit_type.c

@@ -661,7 +661,9 @@ bool ps_visit_type_reference_array(ps_interpreter *interpreter, ps_interpreter_m
         ps_type_definition_free(type_def);
         RETURN_ERROR(PS_ERROR_OUT_OF_MEMORY);
     }
-    memccpy(type_def->def.a.subranges, subranges, dimensions * sizeof(ps_symbol *));
+    for (int i = 0; i <= dimensions; i++) {
+        type_def->def.a.subranges[i] = subranges[i];
+    }
     type_def->def.a.item_type = item_type;
     type_def->def.a.dimensions = dimensions;
     // Register new type definition in symbol table