Add segfault handling to Ground-dependent programs

Reviewed-on: ground/ground#31

Makefile

@@ -1,6 +1,7 @@
 CC = gcc
-CFLAGS = -Wall -Wextra -Isrc/include -Iinclude
+AR = ar
-LDFLAGS = -ldl -rdynamic 
+CFLAGS += -Wall -Wextra -Isrc/include -Iinclude -ggdb
+LDFLAGS += -ldl -rdynamic
 
 # Install paths
 PREFIX ?= /usr/local
@@ -17,6 +18,7 @@ OBJ_DIR = $(BUILD_DIR)/obj
 # Output names
 EXECUTABLE = $(BIN_DIR)/ground
 SHARED_LIB = $(LIB_DIR)/libgroundvm.so
+STATIC_LIB = $(LIB_DIR)/libgroundvm.a
 HEADERS = $(INC_DIR)/groundvm.h $(INC_DIR)/groundext.h
 
 # Source files
@@ -27,9 +29,13 @@ EXE_SOURCES = $(wildcard $(SRC_DIR)/*.c)
 LIB_OBJECTS = $(LIB_SOURCES:$(SRC_DIR)/%.c=$(OBJ_DIR)/lib_%.o)
 EXE_OBJECTS = $(EXE_SOURCES:$(SRC_DIR)/%.c=$(OBJ_DIR)/exe_%.o)
 
-# Default target: build standalone executable
+# Default target: build library
 .PHONY: all
-all: executable
+all: both
+
+DEFINE_TRAM:
+	$(eval CFLAGS += -DGROUND_COMPILE_WITH_TRAM)
+	$(eval LDFLAGS += -ltram)
 
 # Build standalone executable
 .PHONY: executable
@@ -37,12 +43,16 @@ executable: $(EXECUTABLE)
 
 # Build shared library
 .PHONY: library
-library: $(SHARED_LIB) $(HEADERS)
+library: $(SHARED_LIB) $(STATIC_LIB) $(HEADERS)
 
 # Build both
 .PHONY: both
 both: executable library
 
+# both, with tram
+.PHONY: tram_both
+tram_both: DEFINE_TRAM both
+
 # Link executable
 $(EXECUTABLE): $(EXE_OBJECTS) | $(BIN_DIR)
 	$(CC) $(EXE_OBJECTS) -o $@ $(LDFLAGS)
@@ -51,6 +61,10 @@ $(EXECUTABLE): $(EXE_OBJECTS) | $(BIN_DIR)
 $(SHARED_LIB): $(LIB_OBJECTS) | $(LIB_DIR)
 	$(CC) -shared $(LIB_OBJECTS) -o $@ $(LDFLAGS)
 
+# Build static library
+$(STATIC_LIB): $(LIB_OBJECTS) | $(LIB_DIR)
+	$(AR) rcs $(STATIC_LIB) $(LIB_OBJECTS)
+
 # Copy header for library distribution
 $(INC_DIR)/%.h: include/%.h | $(INC_DIR)
 	cp $< $@
@@ -80,6 +94,7 @@ install: both
 	mkdir -p $(DESTDIR)$(PREFIX)/include
 	cp $(EXECUTABLE) $(DESTDIR)$(PREFIX)/bin/
 	cp $(SHARED_LIB) $(DESTDIR)$(PREFIX)/lib/
+	cp $(STATIC_LIB) $(DESTDIR)$(PREFIX)/lib/
 	cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/
 	echo "$(DESTDIR)$(PREFIX)/lib" | tee $(DESTDIR)/etc/ld.so.conf.d/cground.conf 
 	ldconfig

docs/syntax.md

@@ -348,6 +348,14 @@ Calls a function. After the function reference, a variable amount of value refer
 
 The last argument must be a direct reference which symbolises where to store the function's return value.
 
+#### callmethod &object !methodName $arg1 $arg2 $arg3... &variable
+
+Calls a method stored inside an object. The object can use the "self" variable to refer to itself, and manipulate its fields.
+
+The first argument must be a direct reference to the object, and the second argument must be a function reference to the method name.
+
+The last argument must be a direct reference which symbolises where to store the method's return value.
+
 
 ### Libraries
 

include/groundext.h

@@ -38,6 +38,7 @@ typedef GroundValue (*NativeGroundFunction)(GroundScope* scope, List args);
  * ...: A sequence of (GroundValueType type, char* name) for each argument.
  */
 void groundAddNativeFunction(GroundScope* scope, char* name, NativeGroundFunction fn, GroundValueType returnType, int argCount, ...);
+void groundAddFunctionToStruct(GroundStruct* gstruct, char* name, NativeGroundFunction fn, GroundValueType returnType, int argCount, ...);
 
 #ifdef __cplusplus
 }

include/groundvm.h

@@ -16,11 +16,14 @@
 
 
 typedef enum GroundInstType {
-    IF, JUMP, END, INPUT, PRINT, PRINTLN, SET, GETTYPE, EXISTS, SETLIST, SETLISTAT, GETLISTAT, GETLISTSIZE, LISTAPPEND, GETSTRSIZE, GETSTRCHARAT, ADD, SUBTRACT, MULTIPLY, DIVIDE, EQUAL, INEQUAL, NOT, GREATER, LESSER, STOI, STOD, ITOC, CTOI, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, STRUCT, ENDSTRUCT, INIT, GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, ERRORCMD
+    IF, JUMP, END, INPUT, PRINT, PRINTLN, SET, GETTYPE, EXISTS, SETLIST, SETLISTAT, GETLISTAT, GETLISTSIZE, LISTAPPEND,
+    GETSTRSIZE, GETSTRCHARAT, ADD, SUBTRACT, MULTIPLY, DIVIDE, EQUAL, INEQUAL, NOT, GREATER, LESSER, AND, OR, XOR, NEG,
+    SHIFT, STOI, STOD, ITOC, CTOI, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, CALLMETHOD, STRUCT, ENDSTRUCT, INIT,
+    GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, LICENSE, ERRORCMD, THROW, CATCH
 } GroundInstType;
 
 typedef enum GroundValueType {
-    INT, DOUBLE, STRING, CHAR, BOOL, LIST, FUNCTION, STRUCTVAL, CUSTOM, ERROR, NONE
+    INT, DOUBLE, STRING, CHAR, BOOL, LIST, FUNCTION, STRUCTVAL, CUSTOM, ERROR, NONE, ANY
 } GroundValueType;
 
 typedef enum GroundArgType {
@@ -209,6 +212,7 @@ GroundStruct groundCreateStruct();
 void groundAddFieldToStruct(GroundStruct* gstruct, char* name, GroundValue field);
 
 GroundObjectField* groundFindField(GroundObject head, const char *id);
+GroundVariable* groundFindVariable(GroundScope* gs, const char *id);
 
 // Run function returned by Ground code
 // Use argc to set count of args, accepts that amount of GroundValue's after

libs/collections/collections.c

@@ -0,0 +1,10 @@
+#include <groundext.h>
+#include <groundvm.h>
+
+#include "list.h"
+#include "hashmap.h"
+
+void ground_init(GroundScope* scope) {
+    initLists(scope);
+    initHashmaps(scope);
+}

libs/collections/hashmap.c

@@ -0,0 +1,181 @@
+#include "hashmap.h"
+#include <groundext.h>
+#include <groundvm.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <uthash.h>
+#include <stdio.h>
+
+GroundStruct hashmapStruct = {};
+
+GroundValue hashmapStructSet(GroundScope* scope, List args) {
+    char* key = args.values[0].data.stringVal;
+    GroundValue value = args.values[1];
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    HashmapItem* keys = (HashmapItem*)ptrField->value.data.intVal;
+
+    HashmapItem* newItem = malloc(sizeof(HashmapItem));
+    newItem->key = strdup(key);
+    newItem->value = value;
+
+    HASH_ADD_KEYPTR(hh, keys, newItem->key, strlen(newItem->key), newItem);
+
+    ptrField->value.data.intVal = (long long)keys;
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue hashmapStructGet(GroundScope* scope, List args) {
+    char* query = args.values[0].data.stringVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    HashmapItem* keys = (HashmapItem*)ptrField->value.data.intVal;
+
+    HashmapItem* out;
+
+    HASH_FIND_STR(keys, query, out);
+
+    if (out == NULL) {
+        ERROR("Key was not found in hashmap (tip: use hashmap.getOr if you want to specify a fallback value)", "KeyNotFound");
+    }
+
+    return out->value;
+}
+
+GroundValue hashmapStructGetOr(GroundScope* scope, List args) {
+    char* query = args.values[0].data.stringVal;
+    GroundValue fallback = args.values[1];
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    HashmapItem* keys = (HashmapItem*)ptrField->value.data.intVal;
+
+    HashmapItem* out;
+
+    HASH_FIND_STR(keys, query, out);
+
+    if (out == NULL) 
+        return fallback;
+
+    return out->value;
+}
+
+GroundValue hashmapStructRemove(GroundScope* scope, List args) {
+    char* query = args.values[0].data.stringVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    HashmapItem* keys = (HashmapItem*)ptrField->value.data.intVal;
+
+    HashmapItem* out;
+
+    HASH_FIND_STR(keys, query, out);
+
+    if (out == NULL) {
+        ERROR("Key was not found in hashmap (tip: use hashmap.removeIfPresent if you want to avoid errors)", "KeyNotFound");
+    }
+
+    HASH_DEL(keys, out);
+
+    free(out->key);
+    free(out);
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue hashmapStructRemoveIfPresent(GroundScope* scope, List args) {
+    char* query = args.values[0].data.stringVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    HashmapItem* keys = (HashmapItem*)ptrField->value.data.intVal;
+
+    HashmapItem* out;
+
+    HASH_FIND_STR(keys, query, out);
+
+    if (out == NULL) {
+        return groundCreateValue(BOOL, false);
+    }
+
+    HASH_DEL(keys, out);
+
+    free(out->key);
+    free(out);
+
+    return groundCreateValue(BOOL, true);
+}
+
+GroundValue hashmapStructConstructor(GroundScope* scope, List args) {
+    GroundValue value = groundCreateValue(CUSTOM, &hashmapStruct);
+    value.type = CUSTOM;
+    return value;
+}
+
+GroundValue destroyHashmapStruct(GroundScope* scope, List args) {
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    HashmapItem* keys = (HashmapItem*)ptrField->value.data.intVal;
+    HashmapItem* current, *temp;
+
+    HASH_ITER(hh, keys, current, temp) {
+        HASH_DEL(keys, current);
+        free(current->key);
+        free(current);
+    }
+
+    return groundCreateValue(NONE);
+}
+
+GroundValue duplicateHashmapStruct(GroundScope* scope, List args) {
+    GroundObject* self = args.values[0].data.customVal;
+    GroundValue newSelf = groundCreateValue(CUSTOM, &hashmapStruct);
+
+    HashmapItem* src, *dst = NULL, *item, *tmp;
+    HASH_ITER(hh, src, item, tmp) {
+        HashmapItem *copy = malloc(sizeof(HashmapItem));
+        *copy = *item;
+        HASH_ADD_KEYPTR(hh, dst, copy->key, strlen(copy->key), copy);
+    }
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    ptrField->value.data.intVal = (int64_t)src;
+
+    return newSelf;
+}
+
+void initHashmaps(GroundScope* scope) {
+    hashmapStruct = groundCreateStruct();
+
+    groundAddFieldToStruct(&hashmapStruct, "ptr", groundCreateValue(INT, 0));
+
+    groundAddFunctionToStruct(&hashmapStruct, "set", hashmapStructSet, INT, 2, STRING, "key", ANY, "value");            // set a key in the hashmap
+    groundAddFunctionToStruct(&hashmapStruct, "get", hashmapStructGet, ANY, 1, STRING, "key");                          // get a key in the hashmap, throws KeyNotFound if the key does not exist
+    groundAddFunctionToStruct(&hashmapStruct, "getOr", hashmapStructGetOr, ANY, 2, STRING, "key", ANY, "default");      // get a key in the hashmap, or fallback to a default value
+    groundAddFunctionToStruct(&hashmapStruct, "remove", hashmapStructRemove, INT, 1, STRING, "key");                    // remove a key from the hashmap, throws KeyNotFound if the key does not exist
+    groundAddFunctionToStruct(&hashmapStruct, "removeIfPresent", hashmapStructRemoveIfPresent, BOOL, 1, STRING, "key"); // remove a key from the hashmap, returns true if the key was removed or false if it didn't exist
+    
+    groundAddFunctionToStruct(&hashmapStruct, "destructor", destroyHashmapStruct, ANY, 0); 
+    groundAddFunctionToStruct(&hashmapStruct, "duplicator", duplicateHashmapStruct, ANY, 1, CUSTOM); 
+    groundAddNativeFunction(scope, "newHashmap", hashmapStructConstructor, CUSTOM, 0);
+    groundAddNativeFunction(scope, "Hashmap_SOLS_CONSTRUCTOR", hashmapStructConstructor, CUSTOM, 0);
+}

libs/collections/hashmap.h

@@ -0,0 +1,16 @@
+#ifndef HASHMAP_H
+#define HASHMAP_H
+
+#include <groundext.h>
+#include <groundvm.h>
+#include <uthash.h>
+
+typedef struct {
+    GroundValue value;
+    char* key;
+    UT_hash_handle hh;
+} HashmapItem;
+
+void initHashmaps(GroundScope* scope);
+
+#endif

libs/collections/list.c

@@ -0,0 +1,546 @@
+#include "list.h"
+#include <groundext.h>
+#include <groundvm.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+const uint8_t STARTING_ELEMENTS = 2;
+GroundStruct listStruct = {};
+
+
+GroundValue appendToListStruct(GroundScope* scope, List args) {
+    GroundValue newValue = args.values[0];
+
+    // grab fields we need from struct
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* memSizeField = groundFindVariable(scope, "memSize");
+    if (memSizeField == NULL) {
+        ERROR("A field called \"memSize\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    GroundVariable* capacityField = groundFindVariable(scope, "capacity");
+    if (capacityField == NULL) {
+        ERROR("A field called \"capacity\" was not found", "FieldNotFound");
+    }
+    int64_t capacity = capacityField->value.data.intVal;
+    int64_t size = sizeField->value.data.intVal;
+
+    if (size+1 > capacity) {
+        if (capacity == 0) capacity = 1;
+        else capacity *= 2;
+
+        capacityField->value.data.intVal = capacity;
+
+        int64_t newSize = sizeof(GroundValue) * capacity;
+        memSizeField->value.data.intVal = newSize;
+
+        GroundValue* newItems = realloc(items, newSize);
+        if (newItems == NULL) {
+            ERROR("Failed to allocate memory when increasing list size!", "AllocFail");
+        }
+        items = newItems;
+
+        ptrField->value.data.intVal = (int64_t)items;
+    }
+    items[size] = newValue;
+    sizeField->value.data.intVal = size + 1;
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue listStructAt(GroundScope* scope, List args) {
+
+    int64_t index = args.values[0].data.intVal;
+    if (index < 0) {
+        ERROR("Attempt to access list at negative index", "OutOfBounds");
+    }
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+    if (index >= size) {
+        char buffer[512];
+        sprintf(buffer, "Attempt to access list at index %ld when list is of length %ld", index, size);
+        ERROR(buffer, "OutOfBounds");
+    }
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    return items[index];
+}
+
+GroundValue clearListStruct(GroundScope* scope, List args) {
+    // grab fields we need from struct
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* memSizeField = groundFindVariable(scope, "memSize");
+    if (memSizeField == NULL) {
+        ERROR("A field called \"memSize\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* capacityField = groundFindVariable(scope, "capacity");
+    if (capacityField == NULL) {
+        ERROR("A field called \"capacity\" was not found", "FieldNotFound");
+    }
+
+    GroundValue* newBuffer = calloc(STARTING_ELEMENTS, sizeof(GroundValue));
+    if (newBuffer == NULL) {
+        ERROR("Failed to allocate memory when clearing list!", "AllocFail");
+    }
+
+    sizeField->value.data.intVal = 0;
+    ptrField->value.data.intVal = (int64_t)newBuffer;
+    capacityField->value.data.intVal = STARTING_ELEMENTS;
+    memSizeField->value.data.intVal = sizeof(GroundValue) * STARTING_ELEMENTS;
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue insertIntoListStruct(GroundScope* scope, List args) {
+    GroundValue value = args.values[0];
+    int64_t index = args.values[1].data.intVal;
+    if (index < 0) {
+        ERROR("Attempt to insert element into list at negative index", "OutOfBounds");
+    }
+
+    // grab fields we need from struct
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    
+    GroundVariable* memSizeField = groundFindVariable(scope, "memSize");
+    if (memSizeField == NULL) {
+        ERROR("A field called \"memSize\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    GroundVariable* capacityField = groundFindVariable(scope, "capacity");
+    if (capacityField == NULL) {
+        ERROR("A field called \"capacity\" was not found", "FieldNotFound");
+    }
+    int64_t capacity = capacityField->value.data.intVal;
+
+    
+    if (sizeField->value.data.intVal <= index) {
+        sizeField->value.data.intVal = index+1;
+    } else {
+        sizeField->value.data.intVal++;
+    }
+
+    // check if we have enough space to insert the element
+    if (capacity <= sizeField->value.data.intVal+1) {
+        // not enough space, double size
+        capacity = sizeField->value.data.intVal + 1;
+        capacityField->value.data.intVal = capacity;
+    }
+
+    // allocate new buffer
+    GroundValue* newBuffer = calloc(capacity, sizeof(GroundValue));
+    if (newBuffer == NULL) {
+        ERROR("Failed to allocate memory when increasing list size!", "AllocFail");
+    }
+    ptrField->value.data.intVal = (int64_t)newBuffer;
+    memSizeField->value.data.intVal = sizeof(GroundValue) * capacity;
+
+    // copy elements from 0 to i-1 into new buffer
+    memcpy(newBuffer, items, sizeof(GroundValue) * index);
+    // insert element at i
+    newBuffer[index] = value;
+    // copy elements 0 to i+1 into new buffer
+    memcpy(newBuffer + (index+1), items + index, sizeof(GroundValue) * (sizeField->value.data.intVal - index));
+
+    // free older buffer
+    free(items);
+
+    // retur null
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue listStructDelete(GroundScope* scope, List args) {
+    int64_t index = args.values[0].data.intVal;
+    if (index < 0) {
+        ERROR("Attempt to remove element into list at negative index", "OutOfBounds");
+    }
+
+    // grab fields we need from struct
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    
+
+    GroundVariable* memSizeField = groundFindVariable(scope, "memSize");
+    if (memSizeField == NULL) {
+        ERROR("A field called \"memSizvoid initLists(GroundScope* scope);e\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    GroundVariable* capacityField = groundFindVariable(scope, "capacity");
+    if (capacityField == NULL) {
+        ERROR("A field called \"capacity\" was not found", "FieldNotFound");
+    }
+    int64_t capacity = capacityField->value.data.intVal;
+
+    if (sizeField->value.data.intVal < index) {
+        char buffer[512];
+        sprintf(buffer, "Attempt to delete element at index %ld when list is of size %ld", index, sizeField->value.data.intVal);
+        ERROR(buffer, "OutOfBounds");
+    } else {
+        sizeField->value.data.intVal--;
+    }
+
+    int64_t size = sizeField->value.data.intVal;
+
+    // check if we have enough space to insert the element
+    if (capacity > size+1) {
+        // too much space, make list smaller
+        capacity = size + 1;
+        capacityField->value.data.intVal = capacity;
+    }
+
+    // allocate new buffer
+    GroundValue* newBuffer = calloc(capacity, sizeof(GroundValue));
+    if (newBuffer == NULL) {
+        ERROR("Failed to allocate memory when decreasing list size!", "AllocFail");
+    }
+    ptrField->value.data.intVal = (int64_t)newBuffer;
+    memSizeField->value.data.intVal = sizeof(GroundValue) * capacity;
+
+    // copy elements from 0 to i-1 into new buffer    
+    if (index > 0)
+        memcpy(newBuffer, items, sizeof(GroundValue) * index);
+    // copy elements 0 to i+1 into new buffer
+    if (index < size)
+        memcpy(newBuffer + index, items + index + 1, sizeof(GroundValue) * (size - index));
+    
+
+    // free older buffer
+    free(items);
+
+    // retur null
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue listStructSet(GroundScope* scope, List args) {
+    GroundValue value = args.values[0];
+    int64_t index = args.values[1].data.intVal;
+    if (index < 0) {
+        ERROR("Attempt to set element in list at negative index", "OutOfBounds");
+    }
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    if (index >= size) {
+        insertIntoListStruct(scope, args);
+    } else {
+        items[index] = value;
+    }
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue listStructIsEmpty(GroundScope* scope, List args) {
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    return groundCreateValue(BOOL, size <= 0);
+}
+
+bool areGroundValuesEqual(GroundValue a, GroundValue b) {
+    if (a.type != b.type) {
+
+        if (a.type == INT && b.type == DOUBLE) {
+            return a.data.intVal == b.data.doubleVal;
+        } else if (a.type == DOUBLE && b.type == INT) {
+            return a.data.doubleVal == b.data.intVal;
+        }
+
+    } else {
+        switch (a.type) {
+            case INT:
+                return a.data.intVal == b.data.intVal;
+            case DOUBLE:
+                return a.data.doubleVal == b.data.doubleVal;
+            case BOOL:
+                return a.data.boolVal == b.data.boolVal;
+            case CHAR:
+                return a.data.charVal == b.data.charVal;
+            case STRING:
+                return strcmp(a.data.stringVal, b.data.stringVal) == 0;
+            default:
+                return false;
+        }
+    }
+
+    return false;
+}
+
+GroundValue listStructContains(GroundScope* scope, List args) {
+    GroundValue targetValue = args.values[0];
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    for (int64_t i = 0; i < size; i++) {
+        if (areGroundValuesEqual(items[i], targetValue)) {
+            return groundCreateValue(BOOL, true);
+        }
+    }
+
+    return groundCreateValue(BOOL, false);
+}
+
+GroundValue reverseListStruct(GroundScope* scope, List args) {
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    GroundVariable* capacityField = groundFindVariable(scope, "capacity");
+    if (capacityField == NULL) {
+        ERROR("A field called \"capacity\" was not found", "FieldNotFound");
+    }
+    int64_t capacity = capacityField->value.data.intVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    GroundValue* newBuffer = calloc(capacity, sizeof(GroundValue));
+    if (newBuffer == NULL) {
+        ERROR("Failed to allocate memory when reversing list!", "AllocFail");
+    }
+
+    int z = 0;
+    for (int i = size - 1; i >= 0; i--, z++) {
+        newBuffer[z] = items[i];
+    }
+
+    ptrField->value.data.intVal = (int64_t)newBuffer;
+    free(items);
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue findListStruct(GroundScope* scope, List args) {
+    GroundValue targetValue = args.values[0];
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    for (int64_t i = 0; i < size; i++) {
+        if (areGroundValuesEqual(items[i], targetValue)) {
+            return groundCreateValue(INT, i);
+        }
+    }
+
+    return groundCreateValue(INT, (int64_t)-1);
+}
+
+GroundValue reserveListStruct(GroundScope* scope, List args) {
+    int64_t amount = args.values[0].data.intVal;
+
+    GroundVariable* capacityField = groundFindVariable(scope, "capacity");
+    if (capacityField == NULL) {
+        ERROR("A field called \"capacity\" was not found", "FieldNotFound");
+    }
+    int64_t capacity = capacityField->value.data.intVal;
+
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+    GroundValue* items = (GroundValue*)ptrField->value.data.intVal;
+
+    GroundVariable* memSizeField = groundFindVariable(scope, "memSize");
+    if (memSizeField == NULL) {
+        ERROR("A field called \"memSize\" was not found", "FieldNotFound");
+    }
+
+    if (capacity > amount) {
+        return groundCreateValue(BOOL, false);
+    }
+
+    capacityField->value.data.intVal = amount;
+    items = realloc(items, sizeof(GroundValue) * amount);
+    if (items == NULL) {
+        ERROR("Failed to allocate memory when reserving list space!", "AllocFail");
+    }
+
+    memSizeField->value.data.intVal = sizeof(GroundValue) * amount;
+
+    return groundCreateValue(BOOL, true);
+}
+
+GroundValue listStructConstructor(GroundScope* scope, List args) {
+    int64_t startingCapacity = args.values[0].data.intVal;
+    if (startingCapacity < 1) {
+        ERROR("List can't be less than 1 element in capacity on initialization!", "OutOfBounds");
+    }
+
+    GroundValue value = groundCreateValue(CUSTOM, &listStruct);
+
+    
+
+    GroundObjectField *sizeField = groundFindField(*value.data.customVal, "size");
+    GroundObjectField *capacityField = groundFindField(*value.data.customVal, "capacity");
+    GroundObjectField *memSizeField = groundFindField(*value.data.customVal, "memSize");
+    GroundObjectField *ptrField = groundFindField(*value.data.customVal, "ptr");
+
+    GroundValue* items = calloc(STARTING_ELEMENTS, sizeof(GroundValue));
+    if (items == NULL) {
+        ERROR("Failed to allocate memory while creating list!", "AllocFail");
+    }
+
+    sizeField->value.data.intVal = 0;
+    capacityField->value.data.intVal = startingCapacity;
+    memSizeField->value.data.intVal = sizeof(GroundValue) * startingCapacity;
+    ptrField->value.data.intVal = (int64_t)items;
+
+    value.type = CUSTOM;
+
+    return value;
+}
+
+GroundValue destroyListStruct(GroundScope* scope, List args) {
+    GroundVariable* ptrField = groundFindVariable(scope, "ptr");
+    if (ptrField == NULL) {
+        ERROR("A field called \"ptr\" was not found", "FieldNotFound");
+    }
+
+    //free((GroundValue*)ptrField->value.data.intVal);
+    return groundCreateValue(NONE);
+}
+
+GroundValue duplicateListStruct(GroundScope* scope, List args) {
+    GroundObject* self = args.values[0].data.customVal;
+
+    GroundObjectField *sizeField = groundFindField(*self, "size");
+    GroundObjectField *capacityField = groundFindField(*self, "capacity");
+    GroundObjectField *memSizeField = groundFindField(*self, "memSize");
+    GroundObjectField *ptrField = groundFindField(*self, "ptr");
+
+    GroundValue newSelf = groundCreateValue(CUSTOM, &listStruct);
+    newSelf.type = CUSTOM;
+
+    GroundObjectField *newSizeField = groundFindField(*newSelf.data.customVal, "size");
+    GroundObjectField *newCapacityField = groundFindField(*newSelf.data.customVal, "capacity");
+    GroundObjectField *newMemSizeField = groundFindField(*newSelf.data.customVal, "memSize");
+    GroundObjectField *newPtrField = groundFindField(*newSelf.data.customVal, "ptr");
+
+    newSizeField->value.data.intVal = sizeField->value.data.intVal;
+    newCapacityField->value.data.intVal = capacityField->value.data.intVal;
+    newMemSizeField->value.data.intVal = memSizeField->value.data.intVal;
+    groundAddValueToScope(scope, "size", sizeField->value);
+    groundAddValueToScope(scope, "capacity", capacityField->value);
+    groundAddValueToScope(scope, "memSize", memSizeField->value);
+
+    GroundValue* newPtr = calloc(capacityField->value.data.intVal, sizeof(GroundValue));
+    if (!newPtr) {
+        ERROR("Failed to allocate memory while calling copy constructor of List!", "AllocFail");
+    }
+    
+    memcpy(newPtr, (GroundValue*)ptrField->value.data.intVal, sizeField->value.data.intVal * sizeof(GroundValue));
+    newPtrField->value.data.intVal = (int64_t)newPtr;
+
+    return newSelf;
+}
+
+void initLists(GroundScope* scope) {
+    listStruct = groundCreateStruct();
+    groundAddFieldToStruct(&listStruct, "size", groundCreateValue(INT, 0));                                                  // number of elements
+    groundAddFieldToStruct(&listStruct, "memSize", groundCreateValue(INT, sizeof(GroundValue) * STARTING_ELEMENTS));         // number of bytes allocated
+    groundAddFieldToStruct(&listStruct, "capacity", groundCreateValue(INT, STARTING_ELEMENTS));                              // number of elements that can fit in the currently allocated space
+    groundAddFieldToStruct(&listStruct, "ptr", groundCreateValue(INT, 0));                                                   // pointer to internal list struct
+
+    groundAddFunctionToStruct(&listStruct, "init", listStructConstructor, INT, 1, INT, "startingCapacity");     // init struct (ground constructor)
+    groundAddFunctionToStruct(&listStruct, "append", appendToListStruct, INT, 1, ANY, "value");                 // append item to end of list
+    groundAddFunctionToStruct(&listStruct, "insert", insertIntoListStruct, INT, 2, ANY, "value", INT, "index"); // insert value at index
+    groundAddFunctionToStruct(&listStruct, "remove", listStructDelete, INT, 1, INT, "index");                   // delete value at index
+    groundAddFunctionToStruct(&listStruct, "at", listStructAt, ANY, 1, INT, "index");                           // get value at index
+    groundAddFunctionToStruct(&listStruct, "clear", clearListStruct, INT, 0);                                   // clear list
+    groundAddFunctionToStruct(&listStruct, "set", listStructSet, INT, 2, ANY, "value", INT, "index");           // replace a value at an index
+    groundAddFunctionToStruct(&listStruct, "isEmpty", listStructIsEmpty, BOOL, 0);                              // returns true if list is empty, otherwise false
+    groundAddFunctionToStruct(&listStruct, "contains", listStructContains, BOOL, 1, ANY, "value");              // returns true if value is in list
+    groundAddFunctionToStruct(&listStruct, "reverse", reverseListStruct, INT, 0);                               // return list struct in reverse order
+    groundAddFunctionToStruct(&listStruct, "find", findListStruct, INT, 1, ANY, "value");                       // return index of value in list, if not found, returns -1
+    groundAddFunctionToStruct(&listStruct, "reserve", reserveListStruct, BOOL, 1, INT, "amount");               // ensure list capacity >= amount. returns true if the list's capacity was expanded
+    
+    groundAddFunctionToStruct(&listStruct, "destructor", destroyListStruct, ANY,0);               
+    groundAddFunctionToStruct(&listStruct, "duplicator", duplicateListStruct, CUSTOM, 1, CUSTOM, "self");               
+    groundAddNativeFunction(scope, "newList", listStructConstructor, CUSTOM, 1, INT, "startingCapacity");
+    groundAddNativeFunction(scope, "List_SOLS_CONSTRUCTOR", listStructConstructor, CUSTOM, 1, INT, "startingCapacity");
+}

libs/collections/list.h

@@ -0,0 +1,13 @@
+#ifndef LIST_H
+#define LIST_H
+
+#include <groundext.h>
+#include <groundvm.h>
+#include <stddef.h>
+
+extern const uint8_t STARTING_ELEMENTS;
+
+GroundValue createList(int64_t initialCapacity);
+void initLists(GroundScope* scope);
+
+#endif

libs/fileio/fileio.c

@@ -1,57 +1,258 @@
+#include <groundext.h>
+#include <groundvm.h> 
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "groundext.h"
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-GroundValue native_file_read(GroundScope* scope, List args) {
+GroundStruct fileStruct = {};
-    if (args.size < 1 || args.values[0].type != STRING) {
+
-        return groundCreateValue(NONE);
+
+
+GroundValue fileStructConstructor(GroundScope* scope, List args) {
+    GroundValue value = groundCreateValue(CUSTOM, &fileStruct);
+    char* filePath = args.values[0].data.stringVal;
+
+    // do a check to make sure the file is actually a file first
+    struct stat st;
+    if (0 != lstat(filePath, &st)) {
+        // lstat failed, file probably doesn't exist
+        char buffer[256];
+        sprintf(buffer, "The file \"%s\" does not exist!", filePath);
+        ERROR(buffer, "FileNotFound");
     }
 
-    char* path = args.values[0].data.stringVal;
+    if (S_IFREG != (st.st_mode & S_IFMT)) {
-    FILE* f = fopen(path, "r");
+        switch (st.st_mode & S_IFMT) {
-    if (!f) {
+            case S_IFSOCK:
-        ERROR("Failed to open file for reading", "FileError");
+                ERROR("Attempt to open socket as file!", "NotAFile");
+            case S_IFBLK:
+                ERROR("Attempt to open block device as file!", "NotAFile");
+            case S_IFDIR:
+                ERROR("Attempt to open directory as file!", "NotAFile");
+            case S_IFCHR:
+                ERROR("Attempt to open character device as file!", "NotAFile");
+            case S_IFIFO:
+                ERROR("Attempt to open FIFO (pipe) as file!", "NotAFile");
+            default:
+                break;
+        }
     }
 
-    fseek(f, 0, SEEK_END);
+    // opens the given file in read and write mode, the file must exist or openning the file will fail
-    long fsize = ftell(f);
+    FILE* file = fopen(filePath, "r+");
-    fseek(f, 0, SEEK_SET);
 
-    char* content = malloc(fsize + 1);
+    if (file == NULL) {
-    if (!content) {
+        ERROR("Unkown error while openning file!", "GenericFileError");
-        fclose(f);
-        ERROR("Failed to allocate memory for file reading", "FileError");
     }
 
-    fread(content, 1, fsize, f);
+    // seek to end of file to get size
-    fclose(f);
+    fseek(file, 0, SEEK_END);
-    content[fsize] = 0;
+    int64_t size = ftell(file);
+    rewind(file);
 
-    GroundValue val = groundCreateValue(STRING, content);
+    GroundObjectField *handleField = groundFindField(*value.data.customVal, "fileHandle");
-    free(content); 
+    GroundObjectField *sizeField = groundFindField(*value.data.customVal, "size");
-    return val;
+    GroundObjectField *filePathField = groundFindField(*value.data.customVal, "filePath");
+
+    handleField->value.data.intVal = (int64_t)file;
+    sizeField->value.data.intVal = size;
+    filePathField->value.data.stringVal = filePath;
+
+    value.type = CUSTOM;
+
+    return value;
 }
 
-GroundValue native_file_write(GroundScope* scope, List args) {
+GroundValue fileStructRead(GroundScope* scope, List args) {
-    if (args.size < 2 || args.values[0].type != STRING || args.values[1].type != STRING) {
+    GroundVariable* handleField = groundFindVariable(scope, "fileHandle");
-        return groundCreateValue(BOOL, 0);
+    if (handleField == NULL) {
+        ERROR("A field called \"fileHandle\" was not found", "FieldNotFound");
+    }
+    FILE* file = (FILE*)handleField->value.data.intVal;
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    // allocate buffer to read file into
+    char* buffer = malloc(size + 1);
+    if (buffer == NULL) {
+        ERROR("Failed to allocate memory for buffer while reading file!", "AllocFail");
     }
 
-    char* path = args.values[0].data.stringVal;
+    // read file
-    char* content = args.values[1].data.stringVal;
+    size_t readSize = fread(buffer, 1, size, file);
+    buffer[readSize] = 0; // null terminate buffer
 
-    FILE* f = fopen(path, "w");
+    return groundCreateValue(STRING, buffer);
-    if (!f) {
+}
-        ERROR("Failed to open file for writing", "FileError");
+
+GroundValue fileStructWrite(GroundScope* scope, List args) {
+    char* buffer = args.values[0].data.stringVal;
+
+    GroundVariable* handleField = groundFindVariable(scope, "fileHandle");
+    if (handleField == NULL) {
+        ERROR("A field called \"fileHandle\" was not found", "FieldNotFound");
+    }
+    FILE* file = (FILE*)handleField->value.data.intVal;
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
     }
 
-    fprintf(f, "%s", content);
+    GroundVariable* tellField = groundFindVariable(scope, "tell");
-    fclose(f);
+    if (tellField == NULL) {
+        ERROR("A field called \"tell\" was not found", "FieldNotFound");
+    }
 
-    return groundCreateValue(BOOL, 1);
+    ftruncate(fileno(file), 0);
+    rewind(file);
+    fprintf(file, "%s", buffer);
+
+    sizeField->value.data.intVal = strlen(buffer);
+    tellField->value.data.intVal = strlen(buffer);
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue fileStructAppend(GroundScope* scope, List args) {
+    char* buffer = args.values[0].data.stringVal;
+
+    GroundVariable* handleField = groundFindVariable(scope, "fileHandle");
+    if (handleField == NULL) {
+        ERROR("A field called \"fileHandle\" was not found", "FieldNotFound");
+    }
+    FILE* file = (FILE*)handleField->value.data.intVal;
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    GroundVariable* tellField = groundFindVariable(scope, "tell");
+    if (tellField == NULL) {
+        ERROR("A field called \"tell\" was not found", "FieldNotFound");
+    }
+
+    fprintf(file, "%s", buffer);
+    sizeField->value.data.intVal = size + strlen(buffer);
+    tellField->value.data.intVal = tellField->value.data.intVal + strlen(buffer);
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue fileStructFlush(GroundScope* scope, List args) {
+    GroundVariable* handleField = groundFindVariable(scope, "fileHandle");
+    if (handleField == NULL) {
+        ERROR("A field called \"fileHandle\" was not found", "FieldNotFound");
+    }
+    FILE* file = (FILE*)handleField->value.data.intVal;
+    fflush(file);
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue fileStructSeek(GroundScope* scope, List args) {
+    int64_t offset = args.values[0].data.intVal;
+    if (offset < 0) {
+        ERROR("Can't seek to negative offset!", "OutOfBounds");
+    }
+
+    GroundVariable* handleField = groundFindVariable(scope, "fileHandle");
+    if (handleField == NULL) {
+        ERROR("A field called \"fileHandle\" was not found", "FieldNotFound");
+    }
+    FILE* file = (FILE*)handleField->value.data.intVal;
+
+    GroundVariable* tellField = groundFindVariable(scope, "tell");
+    if (tellField == NULL) {
+        ERROR("A field called \"tell\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    if (offset >= size) {
+        ERROR("Attempt to seek past file size!", "OutOfBounds");
+    }
+
+    int result = fseek(file, offset, SEEK_SET);
+    if (result != 0) {
+        char buffer[100];
+        sprintf(buffer, "fseek failed with error code: \"%d\"", result);
+        ERROR(buffer, "SeekError");
+    }
+    tellField->value.data.intVal = offset;
+
+    return groundCreateValue(INT, 0);
+}
+
+GroundValue fileStructSeekEnd(GroundScope* scope, List args) {
+    int64_t offset = args.values[0].data.intVal;
+    if (offset < 0) {
+        ERROR("Can't seek to negative offset!", "OutOfBounds");
+    }
+
+    GroundVariable* handleField = groundFindVariable(scope, "fileHandle");
+    if (handleField == NULL) {
+        ERROR("A field called \"fileHandle\" was not found", "FieldNotFound");
+    }
+    FILE* file = (FILE*)handleField->value.data.intVal;
+
+    GroundVariable* tellField = groundFindVariable(scope, "tell");
+    if (tellField == NULL) {
+        ERROR("A field called \"tell\" was not found", "FieldNotFound");
+    }
+
+    GroundVariable* sizeField = groundFindVariable(scope, "size");
+    if (sizeField == NULL) {
+        ERROR("A field called \"size\" was not found", "FieldNotFound");
+    }
+    int64_t size = sizeField->value.data.intVal;
+
+    if (offset >= size) {
+        ERROR("Attempt to seek past file size!", "OutOfBounds");
+    }
+
+    int result = fseek(file, offset, SEEK_END);
+    if (result != 0) {
+        char buffer[100];
+        sprintf(buffer, "fseek failed with error code: \"%d\"", result);
+        ERROR(buffer, "SeekError");
+    }
+
+    tellField->value.data.intVal = size - offset;
+
+    return groundCreateValue(INT, 0);
 }
 
 void ground_init(GroundScope* scope) {
-    groundAddNativeFunction(scope, "file_Read", native_file_read, STRING, 1, STRING, "path");
+    fileStruct = groundCreateStruct();
-    groundAddNativeFunction(scope, "file_Write", native_file_write, BOOL, 2, STRING, "path", STRING, "content");
+
+    groundAddFieldToStruct(&fileStruct, "fileHandle", groundCreateValue(INT, 0));
+    groundAddFieldToStruct(&fileStruct, "filePath", groundCreateValue(STRING, ""));
+    groundAddFieldToStruct(&fileStruct, "size", groundCreateValue(INT, 0));
+    groundAddFieldToStruct(&fileStruct, "tell", groundCreateValue(INT, 0));
+
+    groundAddFunctionToStruct(&fileStruct, "read", fileStructRead, STRING, 0);                    // reads the file and returns the contents as a string
+    // readLines function implemented in solstice
+    groundAddFunctionToStruct(&fileStruct, "write", fileStructWrite, INT, 1, STRING, "buffer");   // wipes the file before writing the buffer to the file
+    groundAddFunctionToStruct(&fileStruct, "append", fileStructAppend, INT, 1, STRING, "buffer"); // appends the buffer to end of the contents in the file
+    groundAddFunctionToStruct(&fileStruct, "flush", fileStructFlush, INT, 0);                     // flush file buffer (not THAT useful tbh)
+    groundAddFunctionToStruct(&fileStruct, "seek", fileStructSeek, INT, 1, INT, "offset");        // jump to offset relative to start of file
+    groundAddFunctionToStruct(&fileStruct, "seekEnd", fileStructSeekEnd, INT, 1, INT, "offset");  // jump to offset relative to end of file
+
+    groundAddNativeFunction(scope, "openFile", fileStructConstructor, CUSTOM, 1, STRING, "filePath");
+    groundAddNativeFunction(scope, "File_SOLS_CONSTRUCTOR", fileStructConstructor, CUSTOM, 1, STRING, "filePath");
 }

libs/string/string.c

@@ -0,0 +1,455 @@
+#include <ctype.h>
+#include <groundext.h>
+#include <groundvm.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+GroundValue stringUpper(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    char* uppercase = malloc(sizeof(char) * (strlen(string) + 1));
+    if (!uppercase)
+        ERROR("Failed to allocate memory while getting uppercase of string!", "AllocFail");
+
+    for (size_t i = 0; i < strlen(string); i++) {
+        uppercase[i] = toupper(string[i]);
+    }
+
+    return groundCreateValue(STRING, uppercase);
+}
+
+GroundValue stringLower(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    char* lowercase = malloc(sizeof(char) * (strlen(string) + 1));
+    if (!lowercase)
+        ERROR("Failed to allocate memory while getting uppercase of string!", "AllocFail");
+
+    for (size_t i = 0; i < strlen(string); i++) {
+        lowercase[i] = tolower(string[i]);
+    }
+
+    return groundCreateValue(STRING, lowercase);
+}
+
+GroundValue stringStartsWith(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    char* prefix = args.values[1].data.stringVal;
+
+    return groundCreateValue(BOOL, strncmp(prefix, string, strlen(prefix)) == 0);
+}
+
+GroundValue stringEndsWith(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    char* suffix = args.values[1].data.stringVal;
+
+    size_t strLen = strlen(string);
+    size_t suffixLen = strlen(suffix);
+    if (suffixLen > strLen) return groundCreateValue(BOOL, false); // can't start with suffix if suffix is longer
+
+    return groundCreateValue(
+        BOOL,
+        strcmp(string + strLen - suffixLen, suffix) == 0
+    );
+}
+
+GroundValue stringSubstring(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    int64_t start = args.values[1].data.intVal;
+    int64_t end = args.values[2].data.intVal;
+
+    if (end < start) {
+        ERROR("End can't be less than start when getting substring!", "EndBeforeStart");
+    }
+
+    size_t inputLen = strlen(string);
+
+    if (start >= inputLen) {
+        ERROR("Start is outside string!", "OutOfBounds");
+    } else if (end >= inputLen || end < 0) {
+        ERROR("End is outside string!", "OutOfBounds");
+    }
+
+    char* buffer = malloc(inputLen + 1);
+    if (!buffer) {
+        ERROR("Failed to allocate memory while getting substring of string!", "AllocFail");
+    }
+
+    // string_Substring("Hello!", 1, 3) -> "ell"
+    // amount = 3 - 1 + 1 = 3
+    strncpy(buffer, string + start, end - start + 1);
+    buffer[end - start + 1] = 0;
+
+    return groundCreateValue(STRING, buffer);
+}
+
+GroundValue stringCharAt(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    int64_t index = args.values[1].data.intVal;
+
+    if (index < 0)
+        ERROR("Index can't be less than 0!", "OutOfBounds");
+
+    int64_t stringLen = strlen(string);
+    if (index >= stringLen) {
+        char buffer[256];
+        sprintf(buffer, "Attempt to get char at index %ld when string is of length %ld.", index, stringLen);
+        ERROR(buffer, "OutOfBounds");
+    }
+
+    char buffer[2] = {string[index], 0};
+    return groundCreateValue(STRING, buffer);
+}
+
+GroundValue stringFind(GroundScope* scope, List args) {
+    char* haystack = args.values[0].data.stringVal;
+    char* needle = args.values[1].data.stringVal;
+
+    char* result = strstr(haystack, needle);
+    if (!result) {
+        return groundCreateValue(INT, (int64_t)-1);
+    }
+
+    return groundCreateValue(INT, result - haystack);
+}
+
+GroundValue stringFindLast(GroundScope* scope, List args) {
+    char* haystack = args.values[0].data.stringVal;
+    char* needle = args.values[1].data.stringVal;
+
+    if (!*needle) {
+        return groundCreateValue(INT, (int64_t)strlen(haystack)-1);
+    }
+
+    const char* p = haystack;
+    while (*p) p++;
+
+    const char* q = needle;
+    while (*q) q++;
+
+    bool found = false;
+
+    while (!found && (p - haystack) >= (q - needle)) {
+        const char* s = p;
+        const char* t = q;
+
+        while (t != needle && s != haystack && *(s - 1) == *(t - 1)) {
+            s--;
+            t--;
+        }
+
+        found = (t == needle);
+
+        if (found) p = s;
+        else p--;
+    }
+
+    return groundCreateValue(INT, (int64_t)(found ? p - haystack : -1));
+}
+
+GroundValue stringContains(GroundScope* scope, List args) {
+    char* haystack = args.values[0].data.stringVal;
+    char* needle = args.values[1].data.stringVal;
+
+    char* result = strstr(haystack, needle);
+    return groundCreateValue(BOOL, result != NULL);
+}
+
+GroundValue stringCount(GroundScope* scope, List args) {
+    char* haystack = args.values[0].data.stringVal;
+    char* needle = args.values[1].data.stringVal;
+
+    int64_t count = 0;
+    const char* tmp = haystack;
+    while ((tmp = strstr(tmp, needle))) {
+        count++;
+        tmp++;
+    }
+
+    return groundCreateValue(INT, count);
+}
+
+GroundValue stringTrim(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+
+    // trip whitespace from start
+    char* start = string;
+    while (*start && isspace((unsigned char)*start)) start++;
+
+    // trim whitespace from end
+    char* end = string + strlen(string);
+    while (end > start && isspace((unsigned char)*(end - 1))) end--;
+
+    size_t len = end - start;
+
+    char* buffer = malloc(len + 1);
+    if (!buffer)
+        ERROR("Failed to allocate memory while trimming string!", "AllocFail");
+
+    memcpy(buffer, start, len);
+    buffer[len] = 0;
+
+    return groundCreateValue(STRING, buffer);
+}
+
+GroundValue stringTrimLeft(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+
+    // trip whitespace from start
+    char* start = string;
+    while (*start && isspace((unsigned char)*start)) start++;
+
+    size_t len = strlen(start);
+
+    char* buffer = malloc(len + 1);
+    if (!buffer)
+        ERROR("Failed to allocate memory while trimming string!", "AllocFail");
+
+    memcpy(buffer, start, len);
+    buffer[len] = 0;
+
+    return groundCreateValue(STRING, buffer);
+}
+
+GroundValue stringTrimRight(GroundScope* scope, List args) {
+    char* str = args.values[0].data.stringVal;
+
+    char* end = str + strlen(str);
+    while (end > str && isspace((unsigned char)*(end - 1))) {
+        end--;
+    }
+
+    size_t len = end - str;
+
+    char* buffer = malloc(len + 1);
+    if (!buffer)
+        ERROR("Failed to allocate memory while trimming string!", "AllocFail");
+    memcpy(buffer, str, len);
+    buffer[len] = '\0';
+
+    return groundCreateValue(STRING, buffer);
+}
+
+GroundValue stringReplace(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    char* from = args.values[1].data.stringVal;
+    char* to = args.values[2].data.stringVal;
+
+    // === THANK YOU TO https://creativeandcritical.net FOR THEIR repl_str() FUNCTION === \\
+    /* Adjust each of the below values to suit your needs. */
+
+	/* Increment positions cache size initially by this number. */
+	size_t cache_sz_inc = 16;
+	/* Thereafter, each time capacity needs to be increased,
+	 * multiply the increment by this factor. */
+	const size_t cache_sz_inc_factor = 3;
+	/* But never increment capacity by more than this number. */
+	const size_t cache_sz_inc_max = 1048576;
+
+	char *pret, *ret = NULL;
+	const char *pstr2, *pstr = string;
+	size_t i, count = 0;
+	#if (__STDC_VERSION__ >= 199901L)
+	uintptr_t *pos_cache_tmp, *pos_cache = NULL;
+	#else
+	ptrdiff_t *pos_cache_tmp, *pos_cache = NULL;
+	#endif
+	size_t cache_sz = 0;
+	size_t cpylen, orglen, retlen, tolen, fromlen = strlen(from);
+
+	/* Find all matches and cache their positions. */
+	while ((pstr2 = strstr(pstr, from)) != NULL) {
+		count++;
+
+		/* Increase the cache size when necessary. */
+		if (cache_sz < count) {
+			cache_sz += cache_sz_inc;
+			pos_cache_tmp = realloc(pos_cache, sizeof(*pos_cache) * cache_sz);
+			if (pos_cache_tmp == NULL) {
+				goto end_repl_str;
+			} else pos_cache = pos_cache_tmp;
+			cache_sz_inc *= cache_sz_inc_factor;
+			if (cache_sz_inc > cache_sz_inc_max) {
+				cache_sz_inc = cache_sz_inc_max;
+			}
+		}
+
+		pos_cache[count-1] = pstr2 - string;
+		pstr = pstr2 + fromlen;
+	}
+
+	orglen = pstr - string + strlen(pstr);
+
+	/* Allocate memory for the post-replacement string. */
+	if (count > 0) {
+		tolen = strlen(to);
+		retlen = orglen + (tolen - fromlen) * count;
+	} else	retlen = orglen;
+	ret = malloc(retlen + 1);
+	if (ret == NULL) {
+		goto end_repl_str;
+	}
+
+	if (count == 0) {
+		/* If no matches, then just duplicate the string. */
+		strcpy(ret, string);
+	} else {
+		/* Otherwise, duplicate the string whilst performing
+		 * the replacements using the position cache. */
+		pret = ret;
+		memcpy(pret, string, pos_cache[0]);
+		pret += pos_cache[0];
+		for (i = 0; i < count; i++) {
+			memcpy(pret, to, tolen);
+			pret += tolen;
+			pstr = string + pos_cache[i] + fromlen;
+			cpylen = (i == count-1 ? orglen : pos_cache[i+1]) - pos_cache[i] - fromlen;
+			memcpy(pret, pstr, cpylen);
+			pret += cpylen;
+		}
+		ret[retlen] = '\0';
+	}
+
+end_repl_str:
+	/* Free the cache and return the post-replacement string,
+	 * which will be NULL in the event of an error. */
+	free(pos_cache);
+    return groundCreateValue(STRING, ret);
+}
+
+GroundValue stringRepeat(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    int64_t times = args.values[1].data.intVal;
+
+    if (times < 0)
+        ERROR("Can't repeat string negative number of times!", "ValueError");
+
+    char* out = malloc(strlen(string) * times + 1);
+    if (!out)
+        ERROR("Failed to allocate memory while repeating string!", "AllocFail");
+
+    strcpy(out, string);
+    while (--times > 0) {
+        strcat(out, string);
+    }
+
+    return groundCreateValue(STRING, out);
+}
+
+GroundValue stringReverse(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+
+    size_t stringLen = strlen(string);
+    char* out = malloc(stringLen + 1);
+    if (!out)
+        ERROR("Failed to allocate memory while reversing string!", "AllocFail");
+
+    unsigned int i = 0;
+    while (stringLen > 0) out[i++] = string[stringLen-- - 1];
+    out[i] = 0;
+
+    return groundCreateValue(STRING, out);
+}
+
+GroundValue stringIsAlpha(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    const char* p = string;
+
+    bool isAlpha = true;
+
+    while (*p) {
+        if (!isalpha(*p)) {
+            isAlpha = false;
+            break;
+        }
+        p++;
+    }
+
+    return groundCreateValue(BOOL, isAlpha);
+}  
+
+GroundValue stringIsDigit(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    const char* p = string;
+
+    bool isDigit = true;
+
+    while (*p) {
+        if (!isdigit(*p)) {
+            isDigit = false;
+            break;
+        }
+        p++;
+    }
+
+    return groundCreateValue(BOOL, isDigit);
+}  
+
+GroundValue stringIsAlnum(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    const char* p = string;
+
+    bool isAlnum = true;
+
+    while (*p) {
+        if (!isalnum(*p)) {
+            isAlnum = false;
+            break;
+        }
+        p++;
+    }
+
+    return groundCreateValue(BOOL, isAlnum);
+}  
+
+GroundValue stringIsSpace(GroundScope* scope, List args) {
+    char* string = args.values[0].data.stringVal;
+    const char* p = string;
+
+    bool isSpace = true;
+
+    while (*p) {
+        if (!isspace(*p)) {
+            isSpace = false;
+            break;
+        }
+        p++;
+    }
+
+    return groundCreateValue(BOOL, isSpace);
+}  
+
+void ground_init(GroundScope* scope) {
+    // modify string
+    groundAddNativeFunction(scope, "string_Upper", stringUpper, STRING, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_Lower", stringLower, STRING, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_Trim", stringTrim, STRING, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_TrimLeft", stringTrimLeft, STRING, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_TrimRight", stringTrimRight, STRING, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_Substring", stringSubstring, STRING, 3, STRING, "str", INT, "start", INT, "end");
+    groundAddNativeFunction(scope, "string_Replace", stringReplace, STRING, 3, STRING, "str", STRING, "from", STRING, "to");
+    groundAddNativeFunction(scope, "string_Repeat", stringRepeat, STRING, 2, STRING, "str", INT, "times");
+    groundAddNativeFunction(scope, "string_Reverse", stringReverse, STRING, 1, STRING, "str");
+
+    // check for substring
+    groundAddNativeFunction(scope, "string_StartsWith", stringStartsWith, BOOL, 2, STRING, "str", STRING, "prefix");
+    groundAddNativeFunction(scope, "string_EndsWith", stringEndsWith, BOOL, 2, STRING, "str", STRING, "suffix");
+    groundAddNativeFunction(scope, "string_Contains", stringContains, BOOL, 2, STRING, "haystack", STRING, "needle");
+
+    // character classification
+    groundAddNativeFunction(scope, "string_IsAlpha", stringIsAlpha, BOOL, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_IsDigit", stringIsDigit, BOOL, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_IsAlnum", stringIsAlnum, BOOL, 1, STRING, "str");
+    groundAddNativeFunction(scope, "string_IsSpace", stringIsSpace, BOOL, 1, STRING, "str");
+
+    // get char
+    groundAddNativeFunction(scope, "string_CharAt", stringCharAt, STRING, 2, STRING, "str", INT, "index");
+    
+    // find index substring
+    groundAddNativeFunction(scope, "string_Find", stringFind, INT, 2, STRING, "haystack", STRING, "needle");
+    groundAddNativeFunction(scope, "string_FindLast", stringFindLast, INT, 2, STRING, "haystack", STRING, "needle");
+    groundAddNativeFunction(scope, "string_Count", stringCount, INT, 2, STRING, "haystack", STRING, "needle");
+    
+}

libs/tests/tests.c

@@ -0,0 +1,50 @@
+#include "uthash.h"
+#include <stdio.h>
+#include <groundvm.h>
+#include <groundext.h>
+#include <ansii.h>
+
+GroundValue testsRun(GroundScope* scope, List args) {
+    GroundObject* testsStruct = args.values[0].data.customVal;
+
+    int totalTests = 0, successful = 0, fail = 0;
+
+    GroundObjectField* entry, *temp;
+    HASH_ITER(hh, testsStruct->fields, entry, temp) {
+        if (entry) {
+
+            totalTests++;
+
+            if (entry->value.type != FUNCTION) {
+                ERROR("The given tests struct can't have any struct fields, only methods!", "WrongType");
+            }
+
+            GroundValue success = groundRunFunction(entry->value.data.fnVal, 0);
+            if (success.type != BOOL) {
+                ERROR("Your tests should return a boolean.", "ReturnTypeMismatch");
+            }
+
+            if (success.data.boolVal) {
+                successful++;
+                printf(ESC_GREEN_FG ESC_BOLD ".");
+            } else {
+                fail++;
+                printf(ESC_RED_FG ESC_BOLD ".");
+            }
+
+        }
+    }
+
+    printf(ESC_RESET "\n\n/============================\\\n");
+    printf("- Total     : %d\n", totalTests);
+    printf("- Successful: %d\n", successful);
+    printf("- Fail      : %d\n", fail);
+    printf("\\============================/\n");
+
+
+    return groundCreateValue(INT, 0);
+}
+
+void ground_init(GroundScope* scope) {
+    groundAddNativeFunction(scope, "tests_Run", testsRun, INT, 1, CUSTOM, "testsStruct");
+}

src/compiler.h

@@ -1,18 +1,20 @@
 #include "types.h"
-#include "interpreter.h"
+#ifdef GROUND_COMPILE_WITH_TRAM
+#include <tram.h>
+#endif
 
-char* compileGroundProgram(GroundProgram* program);
+typedef struct GroundCompilerVariable {
-[[noreturn]] void runtimeError(GroundRuntimeError error, char* what, GroundInstruction* where, int whereLine);
+    GroundValueType type;
-
+    char id[MAX_ID_LEN];
-typedef struct VariableInfo {
+    UT_hash_handle hh;
-    char name[256];
+} GroundCompilerVariable;
-    int offset;
-} VariableInfo;
-
-typedef struct VariableTable {
-    VariableInfo* vars;
-    size_t count;
-    size_t capacity;
-} VariableTable;
 
+typedef struct GroundState {
+    GroundCompilerVariable* variables;
+    GroundLabel* labels;
+} GroundState;
 
+void compileGroundProgram(GroundProgram* program, char* name);
+#ifdef GROUND_COMPILE_WITH_TRAM
+void compileGroundInstruction(GroundInstruction* instruction, Tram_Program* program, GroundState* state);
+#endif

src/interface.c

@@ -5,6 +5,43 @@
 
 #include <stdlib.h>
 #include <stdarg.h>
+#include <signal.h>
+
+char* getFileContents(const char* filename) {
+    // https://stackoverflow.com/questions/3747086/reading-the-whole-text-file-into-a-char-array-in-c
+    FILE* fp;
+    long lSize;
+    char* file;
+
+    fp = fopen(filename, "rb");
+    if (!fp) {
+        perror(filename);
+        exit(1);
+    }
+
+    fseek(fp, 0L, SEEK_END);
+    lSize = ftell(fp);
+    rewind(fp);
+
+    file = calloc(1, lSize + 1);
+    if (!file) {
+        fclose(fp);
+        fprintf(stderr, "memory allocation fail when reading file %s\n", filename);
+        exit(1);
+    }
+
+    if (1!=fread(file, lSize, 1, fp)) {
+        fclose(fp);
+        free(file);
+        fputs("couldn't read entire file", stderr);
+        exit(1);
+    }
+
+    // we done
+    fclose(fp);
+
+    return file;
+}
 
 GroundProgram groundCreateProgram() {
     return (GroundProgram) {
@@ -115,7 +152,10 @@ GroundValue groundCreateValue(GroundValueType type, ...) {
     return gv;
 }
 
+void segfaultHandle(int signal);
+
 GroundValue groundRunProgram(GroundProgram* program) {
+    signal(SIGSEGV, segfaultHandle);
     GroundVariable* variables = NULL;
     GroundLabel* labels = NULL;
     GroundScope scope = {
@@ -151,9 +191,35 @@ void groundAddValueToScope(GroundScope* gs, const char* name, GroundValue value)
 void groundAddFieldToStruct(GroundStruct* gstruct, char* name, GroundValue field) {
     addFieldToStruct(gstruct, name, field);
 }
+GroundFunction* createGroundFunction();
+void addArgsToGroundFunction(GroundFunction* function, GroundValueType type, char* name);
 
-char* groundCompileProgram(GroundProgram* program) {
+void groundAddFunctionToStruct(GroundStruct* gstruct, char* name, NativeGroundFunction fn, GroundValueType returnType, int argCount, ...) {
-    return compileGroundProgram(program);
+    GroundFunction* gf = createGroundFunction();
+    gf->isNative = true;
+    gf->nativeFn = fn;
+    gf->returnType = returnType;
+
+    va_list args;
+    va_start(args, argCount);
+    for(int i = 0; i < argCount; i++) {
+        GroundValueType type = va_arg(args, GroundValueType);
+        char* argName = va_arg(args, char*);
+        addArgsToGroundFunction(gf, type, argName);
+    }
+    va_end(args);
+
+    GroundValue gv = createFunctionGroundValue(gf);
+    addFieldToStruct(gstruct, name, gv);
+}
+
+void groundCompileProgram(GroundProgram* program) {
+#ifdef GROUND_COMPILE_WITH_TRAM
+    compileGroundProgram(program, "program.gexe");
+#else
+    (void)program;
+    printf("This version of Ground has been compiled without Tram, so compilation is not supported.\n");
+#endif
 }
 
 GroundValue groundRunFunction(GroundFunction* function, size_t argc, ...) {
@@ -167,6 +233,14 @@ GroundValue groundRunFunction(GroundFunction* function, size_t argc, ...) {
     // Seems to crash some functions
     // GroundScope callScope = copyGroundScope(&function->closure);
 
+    if (function->isNative) {
+        List argsList = createList();
+        for (size_t i = 0; i < argc; i++) {
+            appendToList(&argsList, va_arg(args, GroundValue));
+        }
+        return function->nativeFn(NULL, argsList);
+    }
+
     GroundScope callScope = {
         .labels = malloc(sizeof(GroundLabel*)),
         .variables = malloc(sizeof(GroundVariable*)),
@@ -196,3 +270,9 @@ GroundObjectField* groundFindField(GroundObject head, const char *id) {
     HASH_FIND_STR(head.fields, id, s);
     return s;
 }
+
+GroundVariable* groundFindVariable(GroundScope* gs, const char *id) {
+    GroundVariable* var;
+    HASH_FIND_STR(*gs->variables, id, var);
+    return var;
+}

src/interpreter.c

@@ -15,6 +15,8 @@ int currentInstruction = 0;
 
 bool isMainScopeGlobal = true;
 
+bool listDeprecationWarning = true;
+
 char* getFileContents(const char* filename);
 
 [[noreturn]] void customError(GroundArg type, GroundArg what, GroundInstruction* where, int whereLine, int exitCode) {
@@ -117,12 +119,22 @@ char* getFileContents(const char* filename);
     exit(1);
 }
 
+void segfaultHandle(int signal) {
+    runtimeError(FIXME, "The Ground interpreter has crashed due to a segmentation fault. Please report this issue as soon as possible, with as much detail as possible.", NULL, currentInstruction);
+}
+
 GroundLabel* findLabel(GroundLabel* head, const char *id) {
     GroundLabel *item;
     HASH_FIND_STR(head, id, item);
     return item;
 }
 
+GroundCatch* findCatch(GroundCatch* head, const char *id) {
+    GroundCatch *item;
+    HASH_FIND_STR(head, id, item);
+    return item;
+}
+
 void deleteLabel(GroundLabel** head, GroundLabel *item) {
     HASH_DEL(*head, item);
     free(item);
@@ -146,6 +158,42 @@ GroundVariable* findVariable(GroundVariable* head, const char *id) {
 }
 
 void deleteVariable(GroundVariable** head, GroundVariable *item) {
+    if (item == NULL) {
+        return;
+    }
+    if (strcmp(item->id, "self") == 0) {
+        return;
+    }
+    if (item->freed) {
+        return;
+    }
+    item->freed = true;
+    if (item->value.type == CUSTOM) {
+        GroundObjectField* destructor = findField(*item->value.data.customVal, "destructor");
+        if (destructor != NULL) {
+            if (destructor->value.type == FUNCTION) {
+                GroundScope scope = {
+                    .labels = NULL,
+                    .variables = malloc(sizeof(GroundVariable*)),
+                    .catches = malloc(sizeof(GroundCatch*)),
+                    .isMainScope = false
+                };
+                if (scope.variables == NULL) {
+                    runtimeError(FIXME, "Failed to allocate memory for scope variables", NULL, -1);
+                }
+                *scope.variables = NULL;
+                addVariable(scope.variables, "self", item->value);
+                GroundInstruction instruction = createGroundInstruction(CALLMETHOD);
+                addArgToInstruction(&instruction, createRefGroundArg(DIRREF, "self"));
+                addArgToInstruction(&instruction, createRefGroundArg(FNREF, "destructor"));
+                addArgToInstruction(&instruction, createRefGroundArg(DIRREF, ""));
+                interpretGroundInstruction(instruction, &scope);
+            } else {
+                runtimeError(ARG_TYPE_MISMATCH, "Custom type destructor must be a function", NULL, -1);
+            }
+        }
+    }
+    freeGroundValue(&item->value);
     HASH_DEL(*head, item);
     free(item);
 }
@@ -153,12 +201,12 @@ void deleteVariable(GroundVariable** head, GroundVariable *item) {
 void addVariable(GroundVariable **head, const char *id, GroundValue data) {
     GroundVariable* variable = findVariable(*head, id);
     if (variable) {
-        freeGroundValue(&variable->value);
         deleteVariable(head, variable);
     }
     GroundVariable* item = malloc(sizeof(GroundVariable));
     snprintf(item->id, MAX_ID_LEN, "%s", id);
     item->value = copyGroundValue(&data);
+    item->freed = false;
     HASH_ADD_STR(*head, id, item);
 }
 
@@ -188,6 +236,9 @@ void addArgsToGroundFunction(GroundFunction* function, GroundValueType type, cha
 };
 
 GroundValueType stringToValueType(char* in) {
+    if (in == NULL) {
+        return ANY;
+    }
     if (strcmp(in, "int") == 0) {
         return INT;
     }
@@ -209,6 +260,12 @@ GroundValueType stringToValueType(char* in) {
     if (strcmp(in, "function") == 0) {
         return FUNCTION;
     }
+    if (strcmp(in, "struct") == 0) {
+        return STRUCTVAL;
+    }
+    if (strcmp(in, "any") == 0) {
+        return ANY;
+    }
     return CUSTOM;
 }
 
@@ -320,11 +377,59 @@ GroundFunction* parseFunction(GroundProgram* in, size_t errorOffset) {
     return function;
 }
 
+GroundValue resolveInstructionVariables(GroundInstruction* in, GroundScope* scope) {
+    for (size_t i = 0; i < in->args.length; i++) {
+        if (in->args.args[i].type == VALREF) {
+            GroundVariable* variable = findVariable(*scope->variables, in->args.args[i].value.refName);
+            if (variable) {
+                // If there is a duplicator, call it (except when returning and getting fields)
+                if (variable->value.type == CUSTOM && in->type != RETURN && in->type != GETFIELD) {
+                    GroundObject* obj = variable->value.data.customVal;
+                    GroundObjectField* duplicator = findField(*obj, "duplicator");
+                    if (duplicator != NULL) {
+                        if (duplicator->value.type != FUNCTION) {
+                            runtimeError(ARG_TYPE_MISMATCH, "duplicator is not a function", in, currentInstruction);
+                        }
+                        GroundInstruction gi = createGroundInstruction(CALLMETHOD);
+                        addArgToInstruction(&gi, createRefGroundArg(DIRREF, in->args.args[i].value.refName));
+                        addArgToInstruction(&gi, createRefGroundArg(FNREF, "duplicator"));
+                        addArgToInstruction(&gi, createValueGroundArg(variable->value));
+                        addArgToInstruction(&gi, createRefGroundArg(DIRREF, "__ground_tmp_duplicate"));
+                        GroundValue gv = interpretGroundInstruction(gi, scope);
+                        if (gv.type == ERROR) {
+                            return gv;
+                        }
+                        GroundVariable* tmp = findVariable(*scope->variables, "__ground_tmp_duplicate");
+                        if (tmp == NULL) {
+                            runtimeError(FIXME, "Couldn't find temporary variable (this should never happen)", in, currentInstruction);
+                        }
+                        in->args.args[i].value.value = copyGroundValue(&tmp->value);
+                        in->args.args[i].type = VALUE;
+                        deleteVariable(scope->variables, tmp);
+                        continue;
+                    }
+                }
+                free(in->args.args[i].value.refName);
+                in->args.args[i].value.value = copyGroundValue(&variable->value);
+                in->args.args[i].type = VALUE;
+            } else {
+                runtimeError(UNKNOWN_VARIABLE, NULL, in, currentInstruction);
+            }
+        }
+    }
+
+    return createNoneGroundValue();
+}
+
 GroundStruct parseStruct(GroundProgram* in, GroundScope* scope, size_t errorOffset) {
     GroundStruct gstruct = createStruct();
     for (size_t i = 0; i < in->size; i++) {
         switch (in->instructions[i].type) {
             case SET: {
+                GroundValue resolved = resolveInstructionVariables(&in->instructions[i], scope);
+                if (resolved.type == ERROR) {
+                    throwError(&resolved.data.errorVal);
+                }
                 if (in->instructions[i].args.length < 2) {
                     runtimeError(TOO_FEW_ARGS, "Expecting 2 args", &in->instructions[i], i + errorOffset);
                 }
@@ -467,10 +572,10 @@ GroundStruct parseStruct(GroundProgram* in, GroundScope* scope, size_t errorOffs
     }
     return gstruct;
 }
-
 GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
     GroundLabel* labels = NULL;
     GroundVariable* variables = NULL;
+    GroundCatch* catches = NULL;
     int instructionsToPause = -1;
 
     GroundScope scope;
@@ -479,54 +584,15 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
     } else {
         scope.labels = &labels;
         scope.variables = &variables;
+        scope.catches = &catches;
     }
     scope.isMainScope = isMainScopeGlobal;
     isMainScopeGlobal = false;
-    // Preprocess all labels, structs and functions
+    // Preprocess all labels
     for (size_t i = 0; i < in->size; i++) {
         if (in->instructions[i].type == CREATELABEL) {
             addLabel(scope.labels, in->instructions[i].args.args[0].value.refName, i);
         }
-        if (in->instructions[i].type == STRUCT) {
-            if (in->instructions[i].args.length < 1) {
-                runtimeError(TOO_FEW_ARGS, "Expecting 1 arg", &in->instructions[i], i);
-            }
-            if (in->instructions[i].args.length > 1) {
-                runtimeError(TOO_MANY_ARGS, "Expecting 1 arg", &in->instructions[i], i);
-            }
-            if (in->instructions[i].args.args[0].type != TYPEREF) {
-                runtimeError(ARG_TYPE_MISMATCH, "Expected arg 1 to be a typeref", &in->instructions[i], i);
-            }
-            char* name = malloc(strlen(in->instructions[i].args.args[0].value.refName) + 1);
-            strcpy(name, in->instructions[i].args.args[0].value.refName);
-            i++;
-
-            size_t counter = 1;
-            GroundProgram gp = createGroundProgram();
-            size_t errorOffset = i;
-            while (counter > 0) {
-                if (i >= in->size) {
-                    runtimeError(PREMATURE_EOF, "Reached end of scope before struct definition ended", &in->instructions[i - 1], i - 1);
-                }
-                if (in->instructions[i].type == STRUCT) {
-                    counter++;
-                }
-                if (in->instructions[i].type == ENDSTRUCT) {
-                    counter--;
-                }
-                addInstructionToProgram(&gp, in->instructions[i]);
-                i++;
-            }
-            i--;
-
-            GroundValue gv = {
-                .type = STRUCTVAL,
-                .data.structVal = malloc(sizeof(GroundStruct))
-            };
-            *gv.data.structVal = parseStruct(&gp, &scope, errorOffset);
-
-            addVariable(scope.variables, name, gv);
-        }
     }
     for (size_t i = 0; i < in->size; i++) {
         if (in->instructions[i].type == FUN) {
@@ -566,37 +632,47 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
 
             addVariable(scope.variables, name, gv);
         }
-        /*
-        if (in->instructions[i].type == FUN) {
-            int count = 1;
-            while (count > 0) {
-                i++;
-                if (i >= in->size) {
-                    return createNoneGroundValue();
-                }
-                if (in->instructions[i].type == FUN) {
-                    count++;
-                }
-                if (in->instructions[i].type == ENDFUN) {
-                    count--;
-                }
-            }
-        }
-        */
         if (in->instructions[i].type == STRUCT) {
-            int count = 1;
+            if (in->instructions[i].args.length < 1) {
-            while (count > 0) {
+                runtimeError(TOO_FEW_ARGS, "Expecting 1 arg", &in->instructions[i], i);
+            }
+            if (in->instructions[i].args.length > 1) {
+                runtimeError(TOO_MANY_ARGS, "Expecting 1 arg", &in->instructions[i], i);
+            }
+            if (in->instructions[i].args.args[0].type != TYPEREF) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expected arg 1 to be a typeref", &in->instructions[i], i);
+            }
+            char* name = malloc(strlen(in->instructions[i].args.args[0].value.refName) + 1);
+            strcpy(name, in->instructions[i].args.args[0].value.refName);
             i++;
+
+            size_t counter = 1;
+            GroundProgram gp = createGroundProgram();
+            size_t errorOffset = i;
+            while (counter > 0) {
                 if (i >= in->size) {
-                    return createNoneGroundValue();
+                    runtimeError(PREMATURE_EOF, "Reached end of scope before struct definition ended", &in->instructions[i - 1], i - 1);
                 }
                 if (in->instructions[i].type == STRUCT) {
-                    count++;
+                    counter++;
                 }
                 if (in->instructions[i].type == ENDSTRUCT) {
-                    count--;
+                    counter--;
                 }
+
+                GroundInstruction structInstruction = copyGroundInstruction(&in->instructions[i]);
+                addInstructionToProgram(&gp, structInstruction);
+                i++;
             }
+            i--;
+
+            GroundValue gv = {
+                .type = STRUCTVAL,
+                .data.structVal = malloc(sizeof(GroundStruct))
+            };
+            *gv.data.structVal = parseStruct(&gp, &scope, errorOffset);
+
+            addVariable(scope.variables, name, gv);
         }
         if (in->instructions[i].type == PAUSE || instructionsToPause == 0) {
             printf("Paused execution\n");
@@ -703,7 +779,18 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
         instructionsToPause --;
         int ci = currentInstruction;
         GroundValue gv = interpretGroundInstruction(in->instructions[i], &scope);
-        if (gv.type != NONE) {
+        if (gv.type == ERROR) {
+            GroundCatch* catch = findCatch(*scope.catches, gv.data.errorVal.type);
+            if (catch != NULL) {
+                currentInstruction = catch->label->lineNum;
+            } else {
+                if (scope.isMainScope) {
+                    throwError(&gv.data.errorVal);
+                } else {
+                    return gv;
+                }
+            }
+        } else if (gv.type != NONE) {
             return gv;
         }
         if (ci != currentInstruction) {
@@ -718,19 +805,12 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
     GroundInstruction copied_inst = copyGroundInstruction(&inst);
     GroundInstruction* in = &copied_inst;
 
-    // Insert variables prefixed with $
+    GroundValue resolved = resolveInstructionVariables(in, scope);
-    for (size_t i = 0; i < in->args.length; i++) {
+    if (resolved.type == ERROR) {
-        if (in->args.args[i].type == VALREF) {
+        freeGroundInstruction(in);
-            GroundVariable* variable = findVariable(*scope->variables, in->args.args[i].value.refName);
+        return resolved;
-            if (variable) {
-                free(in->args.args[i].value.refName); // Free the strdup'd refName
-                in->args.args[i].value.value = copyGroundValue(&variable->value);
-                in->args.args[i].type = VALUE;
-            } else {
-                runtimeError(UNKNOWN_VARIABLE, NULL, in, currentInstruction);
-            }
-        }
     }
+
     switch (in->type) {
             // We can safely ignore these instructions, as they have been preprocessed
             case FUN:
@@ -929,6 +1009,10 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                     addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("struct"));
                     break;
                 }
+                case ANY: {
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("any"));
+                    break;
+                }
                 case NONE: {
                     addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("none"));
                     break;
@@ -963,6 +1047,10 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
         case SETLIST: {
+            if (listDeprecationWarning) {
+                printf("Lists are deprecated, please migrate to using the \"collections\" library soon.\n");
+                listDeprecationWarning = false;
+            }
             if (in->args.length < 1) {
                 runtimeError(TOO_FEW_ARGS, "Expecting 1 arg", in, currentInstruction);
             }
@@ -980,6 +1068,10 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
         case SETLISTAT: {
+            if (listDeprecationWarning) {
+                printf("Lists are deprecated, please migrate to using the \"collections\" library soon.\n");
+                listDeprecationWarning = false;
+            }
             if (in->args.length < 3) {
                 runtimeError(TOO_FEW_ARGS, "Expecting 3 args", in, currentInstruction);
             }
@@ -1016,6 +1108,10 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
         case GETLISTAT: {
+            if (listDeprecationWarning) {
+                printf("Lists are deprecated, please migrate to using the \"collections\" library soon.\n");
+                listDeprecationWarning = false;
+            }
             if (in->args.length < 2) {
                 runtimeError(TOO_FEW_ARGS, "Expecting 2 args", in, currentInstruction);
             }
@@ -1054,6 +1150,10 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
         case GETLISTSIZE: {
+            if (listDeprecationWarning) {
+                printf("Lists are deprecated, please migrate to using the \"collections\" library soon.\n");
+                listDeprecationWarning = false;
+            }
             if (in->args.length < 2) {
                 runtimeError(TOO_FEW_ARGS, "Expecting 2 args", in, currentInstruction);
             }
@@ -1078,6 +1178,10 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
         case LISTAPPEND: {
+            if (listDeprecationWarning) {
+                printf("Lists are deprecated, please migrate to using the \"collections\" library soon.\n");
+                listDeprecationWarning = false;
+            }
             if (in->args.length < 2) {
                 runtimeError(TOO_FEW_ARGS, "Expecting 2 args", in, currentInstruction);
             }
@@ -1332,9 +1436,9 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                     }
 
                     if (right->type == INT) {
-                        result += right->data.intVal;
+                        result -= right->data.intVal;
                     } else if (right->type == DOUBLE) {
-                        result += right->data.doubleVal;
+                        result -= right->data.doubleVal;
                     }
 
                     addVariable(scope->variables, in->args.args[2].value.refName, createDoubleGroundValue(result));
@@ -1451,6 +1555,29 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             }
             break;
         }
+        case OR: {
+            if (in->args.length < 2) {
+                runtimeError(TOO_FEW_ARGS, "Expecting at least 2 args", in, currentInstruction);
+            }
+            for (size_t i = 0; i < in->args.length - 1; i++) {
+                if (in->args.args[i].type != VALUE) {
+                    runtimeError(ARG_TYPE_MISMATCH, "Expecting a value for all args except last", in, currentInstruction);
+                }
+                if (in->args.args[i].value.value.type != INT) {
+                    runtimeError(ARG_TYPE_MISMATCH, "Expecting an int for all args except last", in, currentInstruction);
+                }
+            }
+            if (in->args.args[in->args.length-1].type != DIRREF) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a direct reference for last argument", in, currentInstruction);
+            }
+
+            int64_t result = 0;
+            for (size_t i = 0; i < in->args.length - 1; i++) {
+                result |= in->args.args[i].value.value.data.intVal;
+            }
+            addVariable(scope->variables, in->args.args[in->args.length-1].value.refName, createIntGroundValue(result));
+            break;
+        }
 
         /*
          * STRING OPERATIONS
@@ -1818,11 +1945,11 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                         runtimeError(ARG_TYPE_MISMATCH, "Expecting a Value", in, currentInstruction);
                     }
                     if (function->nativeFn) {
-                        if (in->args.args[i + 1].value.value.type != function->args[i].type) {
+                        if (function->args[i].type != ANY && in->args.args[i + 1].value.value.type != function->args[i].type) {
                             runtimeError(ARG_TYPE_MISMATCH, "Mismatched function argument types", in, currentInstruction);
                         }
                     } else {
-                        if (!checkFnTypes(&in->args.args[i + 1].value.value, &function->args[i])) {
+                        if (function->args[i].type != ANY && !checkFnTypes(&in->args.args[i + 1].value.value, &function->args[i])) {
                             runtimeError(ARG_TYPE_MISMATCH, "Mismatched function argument types", in, currentInstruction);
                         }
                     }
@@ -1835,12 +1962,9 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                         returnValue.data.errorVal.line = currentInstruction;
                         returnValue.data.errorVal.hasLine = true;
                         returnValue.data.errorVal.where = in;
-                        if (scope->isMainScope) {
-                            throwError(&returnValue.data.errorVal);
-                        }
                         return returnValue;
                     }
-                    if (returnValue.type != function->returnType) {
+                    if (returnValue.type != ANY && returnValue.type != function->returnType) {
                          runtimeError(RETURN_TYPE_MISMATCH, "Unexpected return value type from native function", in, currentInstruction);
                     }
                     addVariable(scope->variables, in->args.args[in->args.length - 1].value.refName, returnValue);
@@ -1852,8 +1976,7 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                     if (in->args.args[i + 1].type != VALUE) {
                         runtimeError(ARG_TYPE_MISMATCH, "Expecting a Value", in, currentInstruction);
                     }
-                    //if (in->args.args[i + 1].value.value.type != function->args[i].type) {
+                    if (function->args[i].type != ANY && !checkFnTypes(&in->args.args[i + 1].value.value, &function->args[i])) {
-                    if (!checkFnTypes(&in->args.args[i + 1].value.value, &function->args[i])) {
                         runtimeError(ARG_TYPE_MISMATCH, "Mismatched function argument types", in, currentInstruction);
                     }
                     addVariable(newScope.variables, function->args[i].name, in->args.args[i + 1].value.value);
@@ -1864,14 +1987,188 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                 if (returnValue.type == ERROR) {
                     return returnValue;
                 }
-                if (returnValue.type != function->returnType) {
+                if (function->returnType != ANY && returnValue.type != function->returnType) {
                     runtimeError(RETURN_TYPE_MISMATCH, "Unexpected return value type from function", in, currentInstruction);
                 }
+
+                GroundVariable* var, *tmp;
+
+                HASH_ITER(hh, *newScope.variables, var, tmp) {
+                    deleteVariable(newScope.variables, var);
+                }
+
                 addVariable(scope->variables, in->args.args[in->args.length - 1].value.refName, returnValue);
                 currentInstruction = currentCurrentInstruction;
             }
             break;
         }
+        case CALLMETHOD: {
+            if (in->args.length < 3) {
+                runtimeError(TOO_FEW_ARGS, "Expecting 3 or more args", in, currentInstruction);
+            }
+            if (in->args.args[0].type != DIRREF) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef to an object for arg 1", in, currentInstruction);
+            }
+            if (in->args.args[in->args.length - 1].type != DIRREF) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef as the last arg", in, currentInstruction);
+            }
+
+            GroundVariable* objvar = findVariable(*scope->variables, in->args.args[0].value.refName);
+            if (objvar == NULL) {
+                runtimeError(UNKNOWN_VARIABLE, "Object not found", in, currentInstruction);
+            }
+            GroundValue* obj = &objvar->value;
+            if (obj->type != CUSTOM) {
+                runtimeError(UNKNOWN_VARIABLE, "Provided reference does not reference an object", in, currentInstruction);
+            }
+
+            GroundObjectField* fnvar = findField(*obj->data.customVal, in->args.args[1].value.refName);
+            if (fnvar == NULL) {
+                runtimeError(UNKNOWN_VARIABLE, "Method not found inside specified object", in, currentInstruction);
+            }
+
+            size_t fnRefPos = 0;
+            for (size_t i = 2; i < in->args.length; i++) {
+                if (in->args.args[i].type == FNREF) {
+                    if (fnvar == NULL) {
+                        runtimeError(FIXME, "fnvar is null (this should not happen)", in, currentInstruction);
+                    }
+                    if (fnvar->value.type != CUSTOM) {
+                        runtimeError(ARG_TYPE_MISMATCH, "Field is not an object", in, currentInstruction);
+                    }
+                    obj = &fnvar->value;
+                    fnvar = findField(*fnvar->value.data.customVal, in->args.args[i].value.refName);
+                    if (fnvar == NULL) {
+                        runtimeError(UNKNOWN_VARIABLE, "Struct does not contain that field", in, currentInstruction);
+                    }
+                    if (fnvar->value.type != FUNCTION) {
+                        runtimeError(ARG_TYPE_MISMATCH, "Field is not a method", in, currentInstruction);
+                    }
+                    fnRefPos = i;
+                    break;
+                } else if (in->args.args[i].type == DIRREF) {
+                    if (fnvar == NULL) {
+                        runtimeError(FIXME, "fnvar is null (this should not happen)", in, currentInstruction);
+                    }
+                    if (fnvar->value.type != CUSTOM) {
+                        runtimeError(ARG_TYPE_MISMATCH, "Field is not an object", in, currentInstruction);
+                    }
+                    fnvar = findField(*fnvar->value.data.customVal, in->args.args[i].value.refName);
+                    if (fnvar == NULL) {
+                        runtimeError(UNKNOWN_VARIABLE, "Struct does not contain that field", in, currentInstruction);
+                    }
+                } else {
+                    runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef or FnRef for callmethod args", in, currentInstruction);
+                }
+            }
+
+            if (fnRefPos == 0) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a FunctionRef after field list", in, currentInstruction);
+            }
+
+            GroundFunction* function = fnvar->value.data.fnVal;
+            if (function->argSize < in->args.length - fnRefPos - 2) {
+                runtimeError(TOO_FEW_ARGS, "Incorrect amount of arguments provided for function", in, currentInstruction);
+            }
+            if (function->argSize > in->args.length - fnRefPos - 2) {
+                runtimeError(TOO_MANY_ARGS, "Incorrect amount of arguments provided for function", in, currentInstruction);
+            }
+            if (function->isNative) {
+                List argsList = createList();
+                for (size_t i = 0; i < function->argSize; i++) {
+                    if (in->args.args[i + fnRefPos + 1].type != VALUE) {
+                        runtimeError(ARG_TYPE_MISMATCH, "Expecting a Value", in, currentInstruction);
+                    }
+                    if (function->nativeFn) {
+                        if (function->args[i].type != ANY && in->args.args[i + fnRefPos + 1].value.value.type != function->args[i].type) {
+                            runtimeError(ARG_TYPE_MISMATCH, "Mismatched function argument types", in, currentInstruction);
+                        }
+                    } else {
+                        if (function->args[i].type != ANY && !checkFnTypes(&in->args.args[i + fnRefPos + 1].value.value, &function->args[i])) {
+                            runtimeError(ARG_TYPE_MISMATCH, "Mismatched function argument types", in, currentInstruction);
+                        }
+                    }
+                    appendToList(&argsList, in->args.args[i + fnRefPos + 1].value.value);
+                }
+
+                GroundScope newscope = {
+                    .labels = NULL,
+                    .variables = malloc(sizeof(GroundVariable*)),
+                    .isMainScope = false
+                };
+
+                if (newscope.variables == NULL) {
+                    runtimeError(FIXME, "Failed to allocate memory", in, currentInstruction);
+                }
+
+                *newscope.variables = NULL;
+
+                GroundObjectField* tmp;
+                GroundObjectField* el;
+
+                HASH_ITER(hh, obj->data.customVal->fields, el, tmp) {
+                    addVariable(newscope.variables, el->id, el->value);
+                }
+
+                if (function->nativeFn) {
+                    GroundValue returnValue = function->nativeFn(&newscope, argsList);
+                    if (returnValue.type == ERROR) {
+                        returnValue.data.errorVal.line = currentInstruction;
+                        returnValue.data.errorVal.hasLine = true;
+                        returnValue.data.errorVal.where = in;
+                        if (scope->isMainScope) {
+                            throwError(&returnValue.data.errorVal);
+                        }
+                        return returnValue;
+                    }
+                    if (function->returnType != ANY && returnValue.type != function->returnType) {
+                         runtimeError(RETURN_TYPE_MISMATCH, "Unexpected return value type from native function", in, currentInstruction);
+                    }
+                    addVariable(scope->variables, in->args.args[in->args.length - 1].value.refName, returnValue);
+
+                    // Copy back modified variables
+                    HASH_ITER(hh, obj->data.customVal->fields, el, tmp) {
+                        el->value = findVariable(*newscope.variables, el->id)->value;
+                    }
+                }
+                free(argsList.values);
+            } else {
+                GroundScope newScope = copyGroundScope(&function->closure);
+                for (size_t i = 0; i < function->argSize; i++) {
+                    if (in->args.args[i + fnRefPos + 1].type != VALUE) {
+                        runtimeError(ARG_TYPE_MISMATCH, "Expecting a Value", in, currentInstruction);
+                    }
+                    //if (in->args.args[i + 1].value.value.type != function->args[i].type) {
+                    if (function->args[i].type != ANY && !checkFnTypes(&in->args.args[i + fnRefPos + 1].value.value, &function->args[i])) {
+                        runtimeError(ARG_TYPE_MISMATCH, "Mismatched function argument types", in, currentInstruction);
+                    }
+                    addVariable(newScope.variables, function->args[i].name, in->args.args[i + fnRefPos + 1].value.value);
+                }
+                // Add the object to the scope
+                addVariable(newScope.variables, "self", *obj);
+                size_t currentCurrentInstruction = currentInstruction;
+                currentInstruction = function->startLine;
+                GroundValue returnValue = interpretGroundProgram(&function->program, &newScope);
+                if (returnValue.type == ERROR) {
+                    return returnValue;
+                }
+                if (function->returnType != ANY && returnValue.type != function->returnType) {
+                    runtimeError(RETURN_TYPE_MISMATCH, "Unexpected return value type from function", in, currentInstruction);
+                }
+                addVariable(scope->variables, in->args.args[in->args.length - 1].value.refName, returnValue);
+                currentInstruction = currentCurrentInstruction;
+
+                // Copy out the object
+                GroundVariable* objvar = findVariable(*newScope.variables, "self");
+                if (objvar == NULL) {
+                    runtimeError(UNKNOWN_VARIABLE, "self not found in scope, did you drop the object?", in, currentInstruction);
+                }
+                *obj = objvar->value;
+            }
+
+            break;
+
+        }
 
         case USE: {
             if (in->args.length < 1) {
@@ -2104,21 +2401,18 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
         // setfield &obj &field $value
+        // also allows setting nested fields with:
+        //      setfield &obj &field1 &field2 &field3 ... $value
         case SETFIELD: {
             if (in->args.length < 3) {
-                runtimeError(TOO_FEW_ARGS, "Expecting 3 args", in, currentInstruction);
+                runtimeError(TOO_FEW_ARGS, "Expecting 3 or more args", in, currentInstruction);
-            }
-            if (in->args.length > 3) {
-                runtimeError(TOO_MANY_ARGS, "Expecting 3 args", in, currentInstruction);
             }
             if (in->args.args[0].type != DIRREF) {
                 runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef to an Object for arg 1", in, currentInstruction);
             }
-            if (in->args.args[1].type != DIRREF) {
+            // Check everything is a DIRREF wihle looping through the fields
-                runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for arg 2", in, currentInstruction);
+            if (in->args.args[in->args.length - 1].type != VALUE) {
-            }
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a Value for last arg", in, currentInstruction);
-            if (in->args.args[2].type != VALUE) {
-                runtimeError(ARG_TYPE_MISMATCH, "Expecting a Value for arg 3", in, currentInstruction);
             }
 
             GroundVariable* var = findVariable(*scope->variables, in->args.args[0].value.refName);
@@ -2133,11 +2427,28 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             if (field == NULL) {
                 runtimeError(UNKNOWN_VARIABLE, "Struct does not contain that field", in, currentInstruction);
             }
-            if (field->value.type != in->args.args[2].value.value.type) {
+
+            for (size_t i = 2; i < in->args.length - 1; i++) {
+                if (field == NULL) {
+                    runtimeError(FIXME, "Field is null, this should have errored beforehand", in, currentInstruction);
+                }
+                if (in->args.args[i].type != DIRREF) {
+                    runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for field setter args", in, currentInstruction);
+                }
+                if (field->value.type != CUSTOM) {
+                    runtimeError(ARG_TYPE_MISMATCH, "Field is not an object", in, currentInstruction);
+                }
+                field = findField(*field->value.data.customVal, in->args.args[i].value.refName);
+                if (field == NULL) {
+                    runtimeError(UNKNOWN_VARIABLE, "Struct does not contain that field", in, currentInstruction);
+                }
+            }
+
+            if (field->value.type != in->args.args[in->args.length - 1].value.value.type) {
                 runtimeError(ARG_TYPE_MISMATCH, "Field type and provided type do not match", in, currentInstruction);
             }
 
-            field->value = copyGroundValue(&in->args.args[2].value.value);
+            field->value = copyGroundValue(&in->args.args[in->args.length - 1].value.value);
             break;
         }
 
@@ -2159,6 +2470,58 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
 
+
+        case THROW: {
+            if (in->args.length < 2) {
+                runtimeError(TOO_FEW_ARGS, "Expecting 2 args", in, currentInstruction);
+            }
+            if (in->args.length > 2) {
+                runtimeError(TOO_MANY_ARGS, "Expecting 2 args", in, currentInstruction);
+            }
+            if (in->args.args[0].type != VALUE || in->args.args[0].value.value.type != STRING) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a String value for arg 1", in, currentInstruction);
+            }
+            if (in->args.args[1].type != VALUE || in->args.args[1].value.value.type != STRING) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a String value for arg 2", in, currentInstruction);
+            }
+
+            return createErrorGroundValue(
+                createGroundError(
+                    in->args.args[1].value.value.data.stringVal,
+                    in->args.args[0].value.value.data.stringVal,
+                    in,
+                    (size_t*)&currentInstruction
+                )
+            );
+        }
+        case CATCH: {
+            if (in->args.length < 2) {
+                runtimeError(TOO_FEW_ARGS, "Expecting 2 args", in, currentInstruction);
+            }
+            if (in->args.length > 2) {
+                runtimeError(TOO_MANY_ARGS, "Expecting 2 args", in, currentInstruction);
+            }
+            if (in->args.args[0].type != VALUE || in->args.args[0].value.value.type != STRING) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a String value for arg 1", in, currentInstruction);
+            }
+            if (in->args.args[1].type != LINEREF) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a LineRef for arg 2", in, currentInstruction);
+            }
+
+            GroundLabel* label = findLabel(*scope->labels, in->args.args[1].value.refName);
+            if (label == NULL) {
+                runtimeError(UNKNOWN_LABEL, NULL, in, currentInstruction);
+            }
+
+            GroundCatch catch = {
+                .label = label,
+            };
+            snprintf(catch.id, sizeof(catch.id), "%s", in->args.args[0].value.value.data.stringVal);
+
+            HASH_ADD_STR(*scope->catches, id, &catch);
+            break;
+        }
+
         /*
          * License for REPL
          */
@@ -2168,6 +2531,7 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             break;
         }
 
+
         default: {
             runtimeError(FIXME, "Currently unimplemented instruction", in, currentInstruction);
         }

src/main.c

@@ -4,46 +4,18 @@
 #include "types.h"
 #include "serialize.h"
 #include "repl.h"
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 
-char* getFileContents(const char* filename) {
+void segfaultHandle(int signal);
-    // https://stackoverflow.com/questions/3747086/reading-the-whole-text-file-into-a-char-array-in-c
-    FILE* fp;
-    long lSize;
-    char* file;
 
-    fp = fopen(filename, "rb");
+char* getFileContents(const char* filename);
-    if (!fp) {
-        perror(filename);
-        exit(1);
-    }
-
-    fseek(fp, 0L, SEEK_END);
-    lSize = ftell(fp);
-    rewind(fp);
-
-    file = calloc(1, lSize + 1);
-    if (!file) {
-        fclose(fp);
-        fputs("memory allocation fail when reading file", stderr);
-        exit(1);
-    }
-
-    if (1!=fread(file, lSize, 1, fp)) {
-        fclose(fp);
-        free(file);
-        fputs("couldn't read entire file", stderr);
-        exit(1);
-    }
-
-    // we done
-    fclose(fp);
-
-    return file;
-}
 
 int main(int argc, char** argv) {
+
+    signal(SIGSEGV, segfaultHandle);
+
     if (argc == 1) {
         exit(repl());
     }
@@ -111,17 +83,22 @@ int main(int argc, char** argv) {
     }
 
     if (compile) {
-        char* compiled = compileGroundProgram(&program);
+#ifdef GROUND_COMPILE_WITH_TRAM
-        printf("%s\n", compiled);
+        compileGroundProgram(&program, "program.gexe");
+#else
+        printf("This version of Ground has been compiled without Tram, so compilation is not supported.\n");
+#endif
     } else if (writeBytecode) {
         serializeProgramToFile(outFileName, &program);
     } else {
         GroundVariable* variables = NULL;
         GroundLabel* labels = NULL;
+        GroundCatch* catches = NULL;
 
         GroundScope scope;
         scope.variables = &variables;
         scope.labels = &labels;
+        scope.catches = &catches;
         scope.isMainScope = true;
         addVariable(scope.variables, "CMDLINE_ARGS", createListGroundValue(groundArgs));
         interpretGroundProgram(&program, &scope);

src/parser.c

@@ -128,6 +128,9 @@ static GroundArg parseArgument(const char* token) {
     else if (token[0] == '-') {
         // Could be type reference or negative number
         if (strlen(token) > 1 && !isdigit(token[1])) {
+            if (strcmp(token, "-any") == 0) {
+                printf("Note: please avoid using \"any\" type outside of extlibs.\n");
+            }
             // Type reference (e.g., -int, -string)
             return createRefGroundArg(TYPEREF, token + 1);
         }
@@ -176,6 +179,11 @@ static GroundInstType getInstructionType(const char* inst) {
     if (strcmp(inst, "not") == 0) return NOT;
     if (strcmp(inst, "greater") == 0) return GREATER;
     if (strcmp(inst, "lesser") == 0) return LESSER;
+    if (strcmp(inst, "and") == 0) return AND;
+    if (strcmp(inst, "or") == 0) return OR;
+    if (strcmp(inst, "xor") == 0) return XOR;
+    if (strcmp(inst, "neg") == 0) return NEG;
+    if (strcmp(inst, "shift") == 0) return SHIFT;
     if (strcmp(inst, "stoi") == 0) return STOI;
     if (strcmp(inst, "stod") == 0) return STOD;
     if (strcmp(inst, "ctoi") == 0) return CTOI;
@@ -186,6 +194,7 @@ static GroundInstType getInstructionType(const char* inst) {
     if (strcmp(inst, "endfun") == 0) return ENDFUN;
     if (strcmp(inst, "pusharg") == 0) return PUSHARG;
     if (strcmp(inst, "call") == 0) return CALL;
+    if (strcmp(inst, "callmethod") == 0) return CALLMETHOD;
     if (strcmp(inst, "struct") == 0) return STRUCT;
     if (strcmp(inst, "endstruct") == 0) return ENDSTRUCT;
     if (strcmp(inst, "init") == 0) return INIT;
@@ -195,6 +204,8 @@ static GroundInstType getInstructionType(const char* inst) {
     if (strcmp(inst, "extern") == 0) return EXTERN;
     if (strcmp(inst, "drop") == 0) return DROP;
     if (strcmp(inst, "license") == 0) return LICENSE;
+    if (strcmp(inst, "throw") == 0) return THROW;
+    if (strcmp(inst, "catch") == 0) return CATCH;
     if (strcmp(inst, "PAUSE") == 0) return PAUSE;
     
     fprintf(stderr, "Error: Unknown instruction: %s\n", inst);

src/types.c

@@ -16,6 +16,8 @@ void wasm_print(const char* str) {
 }
 #endif
 
+bool groundDisableTypeChecking = false;
+
 GroundValue createIntGroundValue(int64_t in) {
     GroundValue gv;
     gv.data.intVal = in;
@@ -248,6 +250,10 @@ void printGroundValue(GroundValue* gv) {
             printf(" }>");
             break;
         }
+        case ANY: {
+            printf("<any>");
+            break;
+        }
         case ERROR: {
             printf("<error type: %s, what: %s>", gv->data.errorVal.type, gv->data.errorVal.what);
             break;
@@ -356,6 +362,10 @@ void printGroundArg(GroundArg* ga) {
             break;
         }
         case TYPEREF: {
+            if (ga->value.refName == NULL) {
+                printf("-any");
+                break;
+            }
             printf("-%s", ga->value.refName);
             break;
         }
@@ -486,6 +496,21 @@ void printGroundInstruction(GroundInstruction* gi) {
         case LESSER:
             printf("lesser");
             break;
+        case AND:
+            printf("and");
+            break;
+        case OR:
+            printf("or");
+            break;
+        case XOR:
+            printf("xor");
+            break;
+        case NEG:
+            printf("neg");
+            break;
+        case SHIFT:
+            printf("shift");
+            break;
         case STOI:
             printf("stoi");
             break;
@@ -516,6 +541,9 @@ void printGroundInstruction(GroundInstruction* gi) {
         case CALL:
             printf("call");
             break;
+        case CALLMETHOD: 
+            printf("callmethod");
+            break;
         case STRUCT:
             printf("struct");
             break;
@@ -539,8 +567,23 @@ void printGroundInstruction(GroundInstruction* gi) {
         case ERRORCMD:
             printf("error");
             break;
-        default:
+        case GETFIELD:
-            printf("FIXME");
+            printf("getfield");
+            break;
+        case SETFIELD:
+            printf("setfield");
+            break;
+        case PAUSE:
+            printf("pause");
+            break;
+        case LICENSE:
+            printf("license");
+            break;
+        case THROW:
+            printf("throw");
+            break;
+        case CATCH:
+            printf("catch");
             break;
     }
     if (gi->type != CREATELABEL) printf(" ");
@@ -711,6 +754,8 @@ GroundError createGroundError(char* what, char* type, GroundInstruction* where,
 }
 
 bool checkFnTypes(GroundValue* left, GroundFunctionArgs* right) {
+    if (groundDisableTypeChecking) return true;
+    if (left->type == ANY || right->type == ANY) return true;
     if (left->type != right->type) {
         return false;
     }
@@ -731,6 +776,7 @@ bool checkFnTypes(GroundValue* left, GroundFunctionArgs* right) {
 }
 
 bool checkTypes(GroundValue* left, GroundValue* right) {
+    if (groundDisableTypeChecking) return true;
     if (left->type != right->type) {
         return false;
     }
@@ -754,10 +800,12 @@ GroundScope copyGroundScope(GroundScope* scope) {
     GroundScope newScope = {
         .labels = malloc(sizeof(GroundLabel*)),
         .variables = malloc(sizeof(GroundVariable*)),
+        .catches = malloc(sizeof(GroundCatch*)),
         .isMainScope = false
     };
     *newScope.variables = NULL;
     *newScope.labels = NULL;
+    *newScope.catches = NULL;
 
     if (scope == NULL) {
         printf("oh no scope is null\n");

src/types.h

@@ -29,11 +29,14 @@ void wasm_print(const char* str);
 #endif
 
 typedef enum GroundInstType {
-    IF, JUMP, END, INPUT, PRINT, PRINTLN, SET, GETTYPE, EXISTS, SETLIST, SETLISTAT, GETLISTAT, GETLISTSIZE, LISTAPPEND, GETSTRSIZE, GETSTRCHARAT, ADD, SUBTRACT, MULTIPLY, DIVIDE, EQUAL, INEQUAL, NOT, GREATER, LESSER, STOI, STOD, ITOC, CTOI, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, STRUCT, ENDSTRUCT, INIT, GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, LICENSE, ERRORCMD
+    IF, JUMP, END, INPUT, PRINT, PRINTLN, SET, GETTYPE, EXISTS, SETLIST, SETLISTAT, GETLISTAT, GETLISTSIZE, LISTAPPEND,
+    GETSTRSIZE, GETSTRCHARAT, ADD, SUBTRACT, MULTIPLY, DIVIDE, EQUAL, INEQUAL, NOT, GREATER, LESSER, AND, OR, XOR, NEG,
+    SHIFT, STOI, STOD, ITOC, CTOI, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, CALLMETHOD, STRUCT, ENDSTRUCT, INIT,
+    GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, LICENSE, ERRORCMD, THROW, CATCH
 } GroundInstType;
 
 typedef enum GroundValueType {
-    INT, DOUBLE, STRING, CHAR, BOOL, LIST, FUNCTION, STRUCTVAL, CUSTOM, ERROR, NONE
+    INT, DOUBLE, STRING, CHAR, BOOL, LIST, FUNCTION, STRUCTVAL, CUSTOM, ERROR, NONE, ANY
 } GroundValueType;
 
 typedef enum GroundArgType {
@@ -83,7 +86,7 @@ typedef struct GroundError {
 typedef struct GroundValue {
     GroundValueType type;
     struct GroundStruct* customType;
-    union {
+    struct {
         int64_t intVal;
         double doubleVal;
         char* stringVal;
@@ -107,11 +110,19 @@ typedef struct GroundVariable {
     char id[MAX_ID_LEN];
     GroundValue value;
     UT_hash_handle hh;
+    bool freed;
 } GroundVariable;
 
+typedef struct GroundCatch {
+    char id[MAX_ID_LEN];
+    GroundLabel* label;
+    UT_hash_handle hh;
+} GroundCatch;
+
 typedef struct GroundScope {
     GroundLabel** labels;
     GroundVariable** variables;
+    GroundCatch** catches;
     bool isMainScope;
 } GroundScope;
 

tests/catch.grnd

@@ -0,0 +1,13 @@
+fun !throws -int
+    throw "MyError" "longer error message"
+endfun
+
+catch "MyError" %catcher
+
+call !throws &res
+
+end 0
+
+@catcher
+println "ruh roh"
+end 1

tests/end.grnd

@@ -0,0 +1,2 @@
+set &x 10
+end $x

tests/unit.sh

@@ -8,7 +8,8 @@ for f in *.grnd; do
     [[ "$f" == "string.grnd" ]] ||
     [[ "$f" == "test.grnd" ]] ||
     [[ "$f" == "to1000.grnd" ]] ||
-    [[ "$f" == "uhoh.grnd" ]];
+    [[ "$f" == "uhoh.grnd" ]] ||
+    [[ "$f" == "pause.grnd" ]];
         then continue
     fi
     echo "Running $f"