fix int := enum as a type mismatch error

Author: CHiPs44

examples/450-enum.pas

@@ -18,10 +18,12 @@
 
 Procedure TestLowHighPredSucc();
 Begin
-  // should not work! (and does not with FPC) because enumeration values are not implicitly convertible to integer/unsigned
-  I := Female;
-  WriteLn('I = ', I, ' (SHOULD NOT WORK!');
+  // does not work! (and does not with FPC) because enumeration values are not implicitly convertible to integer/unsigned
+  // I := Female;
+  // WriteLn('I = ', I, ' (SHOULD NOT WORK!');
   // should work! and does with FPC because Ord() is used to explicitly convert the enumeration value to an integer/unsigned
+  I := Ord(Female);
+  WriteLn('I = ', I, ' (=', 1, ')');
   I := Ord('A');
   WriteLn('I = ', I, ' (=', 65, ')');
   I := Ord(Succ('A'));

src/ps_array.c

@@ -110,8 +110,7 @@ ps_error ps_array_get_value(const ps_symbol *array_var, const ps_value *index, p
         ps_symbol_debug(stderr, "ps_array_get_value, array: ", array_var);
         ps_value_debug(stderr, "ps_array_get_value, index: ", index);
     }
-    const ps_type_definition *type_def = // ps_array_get_type_def(array->value->type);
-        array_var->value->type->value->data.t;
+    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);

src/ps_value.c

@@ -35,22 +35,22 @@ ps_value *ps_value_free(ps_value *value)
     if (value == NULL || !value->allocated)
         return NULL;
     ps_value_type type = ps_value_get_type(value);
-    switch(type)
+    switch (type)
     {
-        // case PS_TYPE_STRING:
-        //     ps_string_free(value->data.s);
-        //     break;
-        case PS_TYPE_ARRAY:
-            ps_array_free(value->data.a);
-            break;
-        case PS_TYPE_EXECUTABLE:
-            ps_executable_free(value->data.x);
-            break;
-        case PS_TYPE_DEFINITION:
-            ps_type_definition_free(value->data.t);
-            break;
-        default:
-            break;
+    // case PS_TYPE_STRING:
+    //     ps_string_free(value->data.s);
+    //     break;
+    case PS_TYPE_ARRAY:
+        ps_array_free(value->data.a);
+        break;
+    case PS_TYPE_EXECUTABLE:
+        ps_executable_free(value->data.x);
+        break;
+    case PS_TYPE_DEFINITION:
+        ps_type_definition_free(value->data.t);
+        break;
+    default:
+        break;
     }
     ps_memory_free(PS_MEMORY_VALUE, value);
     return NULL;
@@ -155,12 +155,18 @@ ps_error ps_value_copy(const ps_value *from, ps_value *to, bool range_check)
     // If destination type is NONE, set it to source type
     if (to->type == &ps_system_none || to_base == PS_TYPE_NONE)
         to->type = from->type;
-    // Same type, just copy value
+    // Same value type, just copy value
     if (from->type == to->type)
     {
+        // TODO copy array?
         to->data = from->data;
         return PS_ERROR_NONE;
     }
+    // Enum can only be copied to same enum type
+    if (ps_value_get_type(from) == PS_TYPE_ENUM)
+    {
+        return PS_ERROR_TYPE_MISMATCH;
+    }
     // Char => Char? (subrange)
     if (from_base == PS_TYPE_CHAR && to_base == PS_TYPE_CHAR)
     {