Code cleanup and bug fix

NicoNex · Feb 9, 2024 · 7d34193 · 7d34193
1 parent 7685a0a
commit 7d34193
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 20 deletions.
diff --git a/internal/obj/builtins.c b/internal/obj/builtins.c
@@ -72,7 +72,6 @@ static struct object input_b(struct object *args, size_t len) {
 		tmp = getchar();
 		char *reinput = realloc(input, ilen + 1);
 		if (reinput == NULL) {
-			free(input);
 			return errorf("input: error allocating memory");
 		}
 		input = reinput;
@@ -528,7 +527,6 @@ static struct object bytes_b(struct object *args, size_t len) {
 
 		for (uint32_t i = 0; i < len; i++) {
 			if (list[i].type != obj_integer) {
-				free(b);
 				return errorf("bytes: list cannot be converted to bytes");
 			}
 			b[i] = list[i].data.i;

diff --git a/internal/obj/map.c b/internal/obj/map.c
@@ -130,14 +130,6 @@ static inline void _map_delete(struct map_node **root, struct map_node **n, stru
 	}
 }
 
-static inline void _map_dispose(struct map_node * restrict n) {
-	if (n != NULL) {
-		if (n->l != NULL) _map_dispose(n->l);
-		if (n->r != NULL) _map_dispose(n->r);
-		free(n);
-	}
-}
-
 static inline void _map_keys(struct map_node * restrict n, struct list *list) {
 	if (n != NULL) {
 		list->list[list->len++] = n->val.key;

diff --git a/internal/obj/object.go b/internal/obj/object.go
@@ -1,7 +1,7 @@
 package obj
 
 // #cgo CFLAGS: -Ofast -Ilibffi/include
-// #cgo LDFLAGS: -Llibffi/lib ${SRCDIR}/libffi/lib/libffi.a -lm
+// #cgo LDFLAGS: -Llibffi/lib ${SRCDIR}/libffi/lib/libffi.a -lm -L${SRCDIR}/../vm/bdwgc/lib ${SRCDIR}/../vm/bdwgc/lib/libgc.a
 // #include <stdio.h>
 // #include <stdlib.h>
 // #include <stdint.h>
@@ -130,9 +130,7 @@ func (o Object) TypeString() string {
 }
 
 func (o Object) String() string {
-	cstr := C.object_str(o)
-	defer C.free(unsafe.Pointer(cstr))
-	return C.GoString(cstr)
+	return C.GoString(C.object_str(o))
 }
 
 func (o Object) Int() int64 {

diff --git a/internal/obj/pipe.c b/internal/obj/pipe.c
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <stdio.h>
 #include "object.h"
 #include "../vm/gc.h"

diff --git a/internal/obj/utils.c b/internal/obj/utils.c
@@ -65,5 +65,4 @@ char *object_str(struct object o) {
 void print_obj(struct object o) {
 	char *str = object_str(o);
 	puts(str);
-	free(str);
 }
diff --git a/internal/tau_test.go b/internal/tau_test.go
@@ -73,7 +73,6 @@ func (tt TauTest) run(t *testing.T) {
 		if err := fn(tvm.LastPoppedStackObj()); err != nil {
 			t.Fatal(err)
 		}
-		tvm.Free()
 	}
 }
 

diff --git a/internal/vm/gc.h b/internal/vm/gc.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define GC_THREADS
-#include "bdwgc/include/gc.h"
+#include "bdwgc/include/gc/gc.h"
 
 #define malloc(n) GC_MALLOC(n)
 #define calloc(m, n) GC_MALLOC((m)*(n))

diff --git a/internal/vm/vm.c b/internal/vm/vm.c
@@ -1,9 +1,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include <setjmp.h>
-#include <threads.h>
 
 #include "vm.h"
 #include "opcode.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,6 @@ func (tt TauTest) run(t *testing.T) { @@
     		if err := fn(tvm.LastPoppedStackObj()); err != nil {
     			t.Fatal(err)
     		}
-    		tvm.Free()
     	}
     }
@@ Expand Down @@