BenJilks: Quick fix (#337)

Co-authored-by: BenJilks <[email protected]>

Author: BenJilks

BenJilks/src/interpreter.c

@@ -78,7 +78,7 @@ static Object *eval_list(Interpreter *interpreter, Scope *scope,
     int index = 0;
     Object *list_object = object_list(interpreter->heap, len);
     for (List *it = list; it; it = it->next)
-        memcpy(&list_object->items[index++], eval_expression(interpreter, scope, it->value), sizeof(Object));
+        object_copy(&list_object->items[index++], eval_expression(interpreter, scope, it->value));
 
     return list_object;
 }

BenJilks/src/object.c

@@ -65,6 +65,21 @@ Object *object_list(Heap *heap, int len)
     return obj;
 }
 
+void object_copy(Object *dst, Object *src)
+{
+    memcpy(dst, src, sizeof(Object));
+    switch (src->type)
+    {
+        case OBJECT_TYPE_STRING:
+	    dst->str = malloc(strlen(src->str) + 1);
+	    strcpy(dst->str, src->str);
+            break;
+
+        defualt:
+            break;
+    }
+}
+
 void object_free(Object *object)
 {
     switch (object->type)
@@ -130,9 +145,9 @@ Object *object_add(Heap *heap, Object *lhs, Object *rhs)
                 case OBJECT_TYPE_LIST:
                 {
                     Object *list = object_list(heap, 1 + rhs->list_len);
-                    memcpy(&list->items[0], lhs, sizeof(Object));
+                    object_copy(&list->items[0], lhs);
                     for (int i = 0; i < rhs->list_len; i++)
-                        list->items[i + 1] = rhs->items[i];
+                        object_copy(&list->items[i + 1], &rhs->items[i]);
                     return list;
                 }
 
@@ -155,18 +170,18 @@ Object *object_add(Heap *heap, Object *lhs, Object *rhs)
                 {
                     Object *list = object_list(heap, 1 + lhs->list_len);
                     for (int i = 0; i < lhs->list_len; i++)
-                        list->items[i] = lhs->items[i];
-                    memcpy(&list->items[lhs->list_len], rhs, sizeof(Object));
+                        object_copy(&list->items[i], &lhs->items[i]);
+                    object_copy(&list->items[lhs->list_len], rhs);
                     return list;
                 }
 
                 case OBJECT_TYPE_LIST:
                 {
                     Object *list = object_list(heap, lhs->list_len + rhs->list_len);
                     for (int i = 0; i < lhs->list_len; i++)
-                        list->items[i] = lhs->items[i];
+                        object_copy(&list->items[i], &lhs->items[i]);
                     for (int i = 0; i < rhs->list_len; i++)
-                        list->items[i + lhs->list_len] = rhs->items[i];
+                        object_copy(&list->items[i + lhs->list_len], &rhs->items[i]);
                     return list;
                 }
 

BenJilks/src/object.h

@@ -47,6 +47,7 @@ Object *object_bool(Heap*, int);
 Object *object_function(Heap*, Function*);
 Object *object_native_function(Heap*, NativeFunction);
 Object *object_list(Heap*, int len);
+void object_copy(Object *dst, Object *src);
 void object_free(Object *object);
 
 const char* object_to_string(Object*);