Auto-append .grnd file extension in use command

Reviewed-on: ground/cground#19

README.md

@@ -121,3 +121,10 @@ Supported instructions so far:
 * print
 * println
 * end
+
+## Closures
+
+So I decided to add closures to Ground. Here's how they work:
+
+* When you define a function, it makes a copy of the scope it's currently in. Variables are statically captured
+* Use those variables in functions. Closure achieved!

include/groundvm.h

@@ -1,5 +1,6 @@
 #ifndef LIBGROUND_H
 #define LIBGROUND_H
+#define MAX_ID_LEN 64
 
 /*
  * groundvm.h 
@@ -13,8 +14,9 @@
 #include <stdarg.h>
 #include <uthash.h>
 
+
 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, 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, STOI, STOD, ITOC, CTOI, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, STRUCT, ENDSTRUCT, INIT, GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, ERRORCMD
 } GroundInstType;
 
 typedef enum GroundValueType {
@@ -164,6 +166,24 @@ typedef struct GroundObject {
     GroundObjectField* fields;
 } GroundObject;
 
+typedef struct GroundLabel {
+    char id[MAX_ID_LEN];
+    int lineNum;
+    UT_hash_handle hh;
+} GroundLabel;
+
+typedef struct GroundVariable {
+    char id[MAX_ID_LEN];
+    GroundValue value;
+    UT_hash_handle hh;
+} GroundVariable;
+
+typedef struct GroundScope {
+    GroundLabel** labels;
+    GroundVariable** variables;
+    bool isMainScope;
+} GroundScope;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -179,6 +199,8 @@ void groundAddValueToInstruction(GroundInstruction* inst, GroundValue value);
 void groundAddReferenceToInstruction(GroundInstruction* inst, GroundArg value);
 GroundArg groundCreateReference(GroundArgType type, char* ref);
 
+void groundAddValueToScope(GroundScope* gs, const char* name, GroundValue value);
+
 GroundValue groundCreateValue(GroundValueType type, ...);
 
 GroundProgram groundParseFile(const char* code);
@@ -186,6 +208,16 @@ GroundProgram groundParseFile(const char* code);
 GroundStruct groundCreateStruct();
 void groundAddFieldToStruct(GroundStruct* gstruct, char* name, GroundValue field);
 
+GroundObjectField* groundFindField(GroundObject head, const char *id);
+
+// Run function returned by Ground code
+// Use argc to set count of args, accepts that amount of GroundValue's after
+GroundValue groundRunFunction(GroundFunction* function, size_t argc, ...);
+
+
+bool serializeProgramToFile(const char* path, const GroundProgram* prog);
+bool deserializeProgramFromFile(const char* path, GroundProgram* out);
+
 #ifdef __cplusplus
 }
 #endif

libs/unistd/unistd.c

@@ -0,0 +1,316 @@
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <groundvm.h>
+#include <groundext.h>
+
+// Allows Ground to access the POSIX standard library.
+// Read more here: https://en.wikipedia.org/wiki/Unistd.h
+
+// Misc functions
+
+GroundValue groundCrypt(GroundScope* scope, List args) {
+    char* hash = crypt(args.values[0].data.stringVal, args.values[1].data.stringVal);
+    if (hash == NULL) {
+        ERROR(strerror(errno), "CryptError");
+    }
+    return groundCreateValue(STRING, hash);
+}
+
+GroundValue groundGetHostId(GroundScope* scope, List args) {
+    return groundCreateValue(INT, (int64_t) gethostid());
+}
+
+GroundValue groundSetHostId(GroundScope* scope, List args) {
+    int result = sethostid((long) args.values[0].data.intVal);
+    if (result < 0) {
+        ERROR(strerror(errno), "SetHostIdError");
+    } 
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundGetHostname(GroundScope* scope, List args) {
+    char* buf = malloc(256);
+    if (buf == NULL) {
+        ERROR("Couldn't allocate memory to store hostname", "GetHostnameError");
+    }
+    int result = gethostname(buf, 255);
+    if (result < 0) {
+        ERROR(strerror(errno), "GetHostnameError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSetHostname(GroundScope* scope, List args) {
+    int result = sethostname(args.values[0].data.stringVal, strlen(args.values[0].data.stringVal));
+    if (result < 0) {
+        ERROR(strerror(errno), "SetHostnameError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+// Signals
+
+GroundValue groundAlarm(GroundScope* scope, List args) {
+    unsigned result = alarm((unsigned) args.values[0].data.intVal);
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundPause(GroundScope* scope, List args) {
+    int result = pause();
+    ERROR(strerror(errno), "PauseError");
+}
+
+// Filesystem
+
+GroundValue groundAccess(GroundScope* scope, List args) {
+    int result = access(args.values[0].data.stringVal, (int) args.values[1].data.intVal);
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundChdir(GroundScope* scope, List args) {
+    int result = chdir(args.values[0].data.stringVal);
+    if (result < 0) {
+        ERROR(strerror(errno), "ChdirError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundChown(GroundScope* scope, List args) {
+    int result = chown(args.values[0].data.stringVal, (uid_t) args.values[1].data.intVal, (gid_t) args.values[2].data.intVal);
+    if (result < 0) {
+        ERROR(strerror(errno), "ChownError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundLink(GroundScope* scope, List args) {
+    int result = link(args.values[0].data.stringVal, args.values[1].data.stringVal);
+    if (result < 1) {
+        ERROR(strerror(errno), "LinkError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundRmdir(GroundScope* scope, List args) {
+    int result = rmdir(args.values[0].data.stringVal);
+    if (result < 1) {
+        ERROR(strerror(errno), "RmdirError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSymlink(GroundScope* scope, List args) {
+    int result = symlink(args.values[0].data.stringVal, args.values[1].data.stringVal);
+    if (result < 1) {
+        ERROR(strerror(errno), "SymlinkError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+// Process
+
+GroundValue groundExit(GroundScope* scope, List args) {
+    _exit(args.values[0].data.intVal);
+    ERROR("Couldn't exit (huh?)", "ExitError");
+}
+
+GroundValue groundExecv(GroundScope* scope, List args) {
+    char** argv = malloc(sizeof(char*) * args.values[1].data.listVal.size + 1);
+    if (argv == NULL) {
+        ERROR("Couldn't allocate memory for execv list", "ExecvError");
+    }
+
+    for (size_t i = 0; i < args.values[1].data.listVal.size; i++) {
+        if (args.values[1].data.listVal.values[i].type != STRING) {
+            ERROR("Expecting all arguments in list to be of String type", "ExecvError");
+        }
+        argv[i] = args.values[1].data.listVal.values[i].data.stringVal;
+    }
+    argv[args.values[1].data.listVal.size] = NULL;
+
+    int result = execv(args.values[0].data.stringVal, argv);
+
+    ERROR(strerror(errno), "ExecvError");
+}
+
+GroundValue groundExecvp(GroundScope* scope, List args) {
+    char** argv = malloc(sizeof(char*) * args.values[1].data.listVal.size + 1);
+    if (argv == NULL) {
+        ERROR("Couldn't allocate memory for execv list", "ExecvpError");
+    }
+
+    for (size_t i = 0; i < args.values[1].data.listVal.size; i++) {
+        if (args.values[1].data.listVal.values[i].type != STRING) {
+            ERROR("Expecting all arguments in list to be of String type", "ExecvpError");
+        }
+        argv[i] = args.values[1].data.listVal.values[i].data.stringVal;
+    }
+    argv[args.values[1].data.listVal.size] = NULL;
+
+    int result = execvp(args.values[0].data.stringVal, argv);
+
+    ERROR(strerror(errno), "ExecvpError");
+}
+
+GroundValue groundFork(GroundScope* scope, List args) {
+    pid_t id = fork();
+    if (id < 0) {
+        ERROR(strerror(errno), "ForkError");
+    }
+    return groundCreateValue(INT, id);
+}
+
+GroundValue groundGetPid(GroundScope* scope, List args) {
+    return groundCreateValue(INT, (int64_t) getpid());
+}
+
+GroundValue groundGetPPid(GroundScope* scope, List args) {
+    return groundCreateValue(INT, (int64_t) getppid());
+}
+
+GroundValue groundGetSid(GroundScope* scope, List args) {
+    pid_t result = getsid((pid_t) args.values[0].data.intVal);
+    if (result < 0) {
+        ERROR(strerror(errno), "GetSidError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundNice(GroundScope* scope, List args) {
+    int result = nice((int) args.values[0].data.intVal);
+    if (result < 0) {
+        ERROR(strerror(errno), "NiceError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSetSid(GroundScope* scope, List args) {
+    pid_t result = setsid();
+    if (result < 0) {
+        ERROR(strerror(errno), "SetSidError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSleep(GroundScope* scope, List args) {
+    unsigned int result = sleep((unsigned int) args.values[0].data.intVal);
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+// User/Group
+
+GroundValue groundGetGid(GroundScope* scope, List args) {
+    return groundCreateValue(INT, (int64_t) getgid());
+}
+
+GroundValue groundGetEGid(GroundScope* scope, List args) {
+    return groundCreateValue(INT, (int64_t) getegid());
+}
+
+GroundValue groundGetUid(GroundScope* scope, List args) {
+    return groundCreateValue(INT, (int64_t) getuid());
+}
+
+GroundValue groundGetEUid(GroundScope* scope, List args) {
+    return groundCreateValue(INT, (int64_t) geteuid());
+}
+
+GroundValue groundGetLogin(GroundScope* scope, List args) {
+    char* login = getlogin();
+    if (login == NULL) {
+        ERROR(strerror(errno), "GetLoginError");
+    }
+    return groundCreateValue(STRING, login);
+}
+
+GroundValue groundSetEUid(GroundScope* scope, List args) {
+    int result = seteuid((uid_t) args.values[0].data.intVal);
+    if (result < -1) {
+        ERROR(strerror(errno), "SetEUidError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSetEGid(GroundScope* scope, List args) {
+    int result = setegid((uid_t) args.values[0].data.intVal);
+    if (result < -1) {
+        ERROR(strerror(errno), "SetEGidError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSetREUid(GroundScope* scope, List args) {
+    int result = setreuid((uid_t) args.values[0].data.intVal, (uid_t) args.values[1].data.intVal);
+    if (result < -1) {
+        ERROR(strerror(errno), "SetREUidError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSetREGid(GroundScope* scope, List args) {
+    int result = setregid((gid_t) args.values[0].data.intVal, (gid_t) args.values[1].data.intVal);
+    if (result < -1) {
+        ERROR(strerror(errno), "SetREGidError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+GroundValue groundSetUid(GroundScope* scope, List args) {
+    int result = setuid((uid_t) args.values[0].data.intVal);
+    if (result < -1) {
+        ERROR(strerror(errno), "SetUidError");
+    }
+    return groundCreateValue(INT, (int64_t) result);
+}
+
+void ground_init(GroundScope* scope) {
+
+    // Misc
+    groundAddNativeFunction(scope, "unistd_Crypt", groundCrypt, STRING, 2, STRING, "key", STRING, "value");
+    groundAddNativeFunction(scope, "unistd_GetHostId", groundGetHostId, INT, 0);
+    groundAddNativeFunction(scope, "unistd_SetHostId", groundSetHostId, INT, 1, INT, "hostid");
+    groundAddNativeFunction(scope, "unistd_GetHostname", groundGetHostname, STRING, 0);
+    groundAddNativeFunction(scope, "unistd_SetHostname", groundSetHostname, INT, 1, STRING, "name");
+
+    // Signals
+    groundAddNativeFunction(scope, "unistd_Alarm", groundAlarm, INT, 1, INT, "seconds");
+    groundAddNativeFunction(scope, "unistd_Pause", groundPause, INT, 0);
+
+    // Filesystem
+    groundAddValueToScope(scope, "unistd_F_OK", groundCreateValue(INT, F_OK));
+    groundAddValueToScope(scope, "unistd_R_OK", groundCreateValue(INT, R_OK));
+    groundAddValueToScope(scope, "unistd_W_OK", groundCreateValue(INT, W_OK));
+    groundAddValueToScope(scope, "unistd_X_OK", groundCreateValue(INT, X_OK));
+
+    groundAddNativeFunction(scope, "unistd_Access", groundAccess, INT, 2, STRING, "path", INT, "mode");
+    groundAddNativeFunction(scope, "unistd_Chdir", groundAccess, INT, 1, STRING, "path");
+    groundAddNativeFunction(scope, "unistd_Chown", groundChown, INT, 3, STRING, "path", INT, "owner", INT, "group");
+    groundAddNativeFunction(scope, "unistd_Link", groundLink, INT, 2, STRING, "oldpath", STRING, "newpath");
+    groundAddNativeFunction(scope, "unistd_Rmdir", groundRmdir, INT, 1, STRING, "path");
+    groundAddNativeFunction(scope, "unistd_Symlink", groundSymlink, INT, 2, STRING, "target", STRING, "linkpath");
+
+    // Process
+    groundAddNativeFunction(scope, "unistd_Exit", groundExit, INT, 1, INT, "status");
+    groundAddNativeFunction(scope, "unistd_Execv", groundExecv, INT, 2, STRING, "path", LIST, "argv");
+    groundAddNativeFunction(scope, "unistd_Execvp", groundExecvp, INT, 2, STRING, "path", LIST, "argv");
+    groundAddNativeFunction(scope, "unistd_Fork", groundFork, INT, 0);
+    groundAddNativeFunction(scope, "unistd_GetPid", groundGetPid, INT, 0);
+    groundAddNativeFunction(scope, "unistd_GetPPid", groundGetPPid, INT, 0);
+    groundAddNativeFunction(scope, "unistd_GetSid", groundGetSid, INT, 1, INT, "pid");
+    groundAddNativeFunction(scope, "unistd_Nice", groundNice, INT, 1, INT, "inc");
+    groundAddNativeFunction(scope, "unistd_SetSid", groundSetSid, INT, 0);
+    groundAddNativeFunction(scope, "unistd_Sleep", groundSleep, INT, 1, INT, "seconds");
+
+    // User/Group
+    groundAddNativeFunction(scope, "unistd_GetGid", groundGetGid, INT, 0);
+    groundAddNativeFunction(scope, "unistd_GetEGid", groundGetEGid, INT, 0);
+    groundAddNativeFunction(scope, "unistd_GetUid", groundGetUid, INT, 0);
+    groundAddNativeFunction(scope, "unistd_GetEUid", groundGetEUid, INT, 0);
+    groundAddNativeFunction(scope, "unistd_GetLogin", groundGetLogin, STRING, 0);    
+    groundAddNativeFunction(scope, "unistd_SetEUid", groundSetEUid, INT, 1, INT, "euid");
+    groundAddNativeFunction(scope, "unistd_SetEGid", groundSetEGid, INT, 1, INT, "egid");
+    groundAddNativeFunction(scope, "unistd_SetREUid", groundSetEGid, INT, 1, INT, "ruid", INT, "euid");
+    groundAddNativeFunction(scope, "unistd_SetREGid", groundSetEGid, INT, 1, INT, "rgid", INT, "egid");
+}

src/interface.c

@@ -43,60 +43,87 @@ GroundValue groundCreateValue(GroundValueType type, ...) {
     va_list args;
     va_start(args, type);
 
+    GroundValue gv;
     switch (type) {
         case INT: {
-            return createIntGroundValue(va_arg(args, int64_t));
+            gv = createIntGroundValue(va_arg(args, int64_t));
             break;
         }
         case DOUBLE: {
-            return createDoubleGroundValue(va_arg(args, double));
+            gv = createDoubleGroundValue(va_arg(args, double));
             break;
         }
         case STRING: {
-            return createStringGroundValue(va_arg(args, char*));
+            gv = createStringGroundValue(va_arg(args, char*));
             break;
         }
         case CHAR: {
-            return createCharGroundValue((char)va_arg(args, int));
+            gv = createCharGroundValue((char)va_arg(args, int));
             break;
         }
         case BOOL: {
-            return createBoolGroundValue((bool)va_arg(args, int));
+            gv = createBoolGroundValue((bool)va_arg(args, int));
             break;
         }
         case LIST: {
-            return createListGroundValue(va_arg(args, List));
+            gv = createListGroundValue(va_arg(args, List));
             break;
         }
         case FUNCTION: {
-            return createFunctionGroundValue(va_arg(args, GroundFunction*));
+            gv = createFunctionGroundValue(va_arg(args, GroundFunction*));
             break;
         }
         case STRUCTVAL: {
-            GroundValue gv;
             gv.type = STRUCTVAL;
             gv.data.structVal = malloc(sizeof(GroundStruct));
             *gv.data.structVal = va_arg(args, GroundStruct);
-            return gv;
+            break;
         }
         case NONE: {
-            return createNoneGroundValue();
+            gv = createNoneGroundValue();
             break;
         }
-        case ERROR:
         case CUSTOM: {
+            // CUSTOM values are created from structs
+            GroundStruct* gstruct = va_arg(args, GroundStruct*);
+            gv.type = CUSTOM;
+            gv.data.customVal = malloc(sizeof(GroundObject));
+            *gv.data.customVal = createObject(*gstruct);
+            
+            // Deep copy the struct definition so it stays valid
+            gv.customType = malloc(sizeof(GroundStruct));
+            gv.customType->size = gstruct->size;
+            gv.customType->fields = malloc(gstruct->size * sizeof(GroundStructField));
+            for (size_t i = 0; i < gstruct->size; i++) {
+                strncpy(gv.customType->fields[i].id, gstruct->fields[i].id, 64);
+                gv.customType->fields[i].value = copyGroundValue(&gstruct->fields[i].value);
+            }
+            break;
+        }
+        case ERROR: {
             // FIXME
+            gv = createNoneGroundValue();
+            break;
+        }
+        default: {
+            gv = createNoneGroundValue();
             break;
         }
     }
 
-    return createNoneGroundValue();
-
     va_end(args);
+    return gv;
 }
 
 GroundValue groundRunProgram(GroundProgram* program) {
-    return interpretGroundProgram(program, NULL);
+    GroundVariable* variables = NULL;
+    GroundLabel* labels = NULL;
+    GroundScope scope = {
+        .variables = &variables,
+        .labels = &labels,
+        .isMainScope = true
+    };
+    return interpretGroundProgram(program, &scope);
 }
 
 void groundPrintProgram(GroundProgram* program) {
@@ -128,3 +155,44 @@ void groundAddFieldToStruct(GroundStruct* gstruct, char* name, GroundValue field
 char* groundCompileProgram(GroundProgram* program) {
     return compileGroundProgram(program);
 }
+
+GroundValue groundRunFunction(GroundFunction* function, size_t argc, ...) {
+    va_list args;
+    va_start(args, argc);
+
+    if (function == NULL) {
+        return createErrorGroundValue(createGroundError("Null function passed to groundRunFunction", "valueError", NULL, NULL));
+    }
+
+    // Seems to crash some functions
+    // GroundScope callScope = copyGroundScope(&function->closure);
+
+    GroundScope callScope = {
+        .labels = malloc(sizeof(GroundLabel*)),
+        .variables = malloc(sizeof(GroundVariable*)),
+        .isMainScope = false
+    };
+    *callScope.variables = NULL;
+    *callScope.labels = NULL;
+
+    if (argc != function->argSize) {
+        return createErrorGroundValue(createGroundError("Too few or too many arguments for function", "callError", NULL, NULL));
+    }
+
+    for (size_t i = 0; i < argc; i++) {
+        GroundValue gv = va_arg(args, GroundValue);
+        if (checkFnTypes(&gv, &function->args[i]) == false) {
+            return createErrorGroundValue(createGroundError("Mismatched argument type", "callError", NULL, NULL));
+        }
+        addVariable(callScope.variables, function->args[i].name, gv);
+    }
+    va_end(args);
+
+    return interpretGroundProgram(&function->program, &callScope);
+}
+
+GroundObjectField* groundFindField(GroundObject head, const char *id) {
+    GroundObjectField* s;
+    HASH_FIND_STR(head.fields, id, s);
+    return s;
+}

src/interpreter.c

@@ -5,7 +5,9 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _WIN32
 #include <dlfcn.h>
+#endif
 #include <stdarg.h>
 #include <unistd.h>
 
@@ -447,6 +449,7 @@ GroundStruct parseStruct(GroundProgram* in, GroundScope* scope, size_t errorOffs
 
                 GroundFunction* function = parseFunction(&gp, errorOffset);
                 function->startLine = i;
+                function->closure = copyGroundScope(scope);
                 GroundValue gv = createFunctionGroundValue(function);
                 addFieldToStruct(&gstruct, name, gv);
                 break;
@@ -482,42 +485,6 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
         if (in->instructions[i].type == CREATELABEL) {
             addLabel(scope.labels, in->instructions[i].args.args[0].value.refName, i);
         }
-        if (in->instructions[i].type == FUN) {
-            if (in->instructions[i].args.length < 1) {
-                runtimeError(TOO_FEW_ARGS, "Expecting 1 or more args", &in->instructions[i], i);
-            }
-            if (in->instructions[i].args.args[0].type != FNREF) {
-                runtimeError(ARG_TYPE_MISMATCH, "Expecting a FunctionRef for arg 1", &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);
-
-            size_t counter = 1;
-            GroundProgram gp = createGroundProgram();
-            addInstructionToProgram(&gp, in->instructions[i]);
-            size_t errorOffset = i;
-            i++;
-            while (counter > 0) {
-                if (i >= in->size) {
-                    runtimeError(PREMATURE_EOF, "Reached end of scope before function definition ended", &in->instructions[i - 1], i - 1);
-                }
-                if (in->instructions[i].type == FUN) {
-                    counter++;
-                }
-                if (in->instructions[i].type == ENDFUN) {
-                    counter--;
-                }
-                addInstructionToProgram(&gp, in->instructions[i]);
-                i++;
-            }
-            i--;
-
-            GroundFunction* function = parseFunction(&gp, errorOffset);
-            function->startLine = i;
-            GroundValue gv = createFunctionGroundValue(function);
-
-            addVariable(scope.variables, name, gv);
-        }
         if (in->instructions[i].type == STRUCT) {
             if (in->instructions[i].args.length < 1) {
                 runtimeError(TOO_FEW_ARGS, "Expecting 1 arg", &in->instructions[i], i);
@@ -560,6 +527,44 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
         }
     }
     for (size_t i = 0; i < in->size; i++) {
+        if (in->instructions[i].type == FUN) {
+            if (in->instructions[i].args.length < 1) {
+                runtimeError(TOO_FEW_ARGS, "Expecting 1 or more args", &in->instructions[i], i);
+            }
+            if (in->instructions[i].args.args[0].type != FNREF) {
+                runtimeError(ARG_TYPE_MISMATCH, "Expecting a FunctionRef for arg 1", &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);
+
+            size_t counter = 1;
+            GroundProgram gp = createGroundProgram();
+            addInstructionToProgram(&gp, in->instructions[i]);
+            size_t errorOffset = i;
+            i++;
+            while (counter > 0) {
+                if (i >= in->size) {
+                    runtimeError(PREMATURE_EOF, "Reached end of scope before function definition ended", &in->instructions[i - 1], i - 1);
+                }
+                if (in->instructions[i].type == FUN) {
+                    counter++;
+                }
+                if (in->instructions[i].type == ENDFUN) {
+                    counter--;
+                }
+                addInstructionToProgram(&gp, in->instructions[i]);
+                i++;
+            }
+            i--;
+
+            GroundFunction* function = parseFunction(&gp, errorOffset);
+            function->startLine = i;
+            function->closure = copyGroundScope(inScope);
+            GroundValue gv = createFunctionGroundValue(function);
+
+            addVariable(scope.variables, name, gv);
+        }
+        /*
         if (in->instructions[i].type == FUN) {
             int count = 1;
             while (count > 0) {
@@ -575,6 +580,7 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
                 }
             }
         }
+        */
         if (in->instructions[i].type == STRUCT) {
             int count = 1;
             while (count > 0) {
@@ -1175,11 +1181,11 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             char buf[256];
             switch (value->type) {
                 case INT: {
-                    snprintf(buf, sizeof(buf) * 256, "%" PRId64, value->data.intVal);
+                    snprintf(buf, sizeof(buf), "%" PRId64, value->data.intVal);
                     break;
                 }
                 case DOUBLE: {
-                    snprintf(buf, sizeof(buf) * 256, "%f", value->data.doubleVal);
+                    snprintf(buf, sizeof(buf), "%f", value->data.doubleVal);
                     break;
                 }
                 case STRING: {
@@ -1787,11 +1793,6 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             if (in->args.args[in->args.length - 1].type != DIRREF) {
                 runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef as the last arg", in, currentInstruction);
             }
-            GroundVariable* variables = NULL;
-            GroundLabel* labels = NULL;
-            GroundScope newScope;
-            newScope.variables = &variables;
-            newScope.labels = &labels;
             GroundVariable* var = findVariable(*scope->variables, in->args.args[0].value.refName);
             if (var == NULL) {
                 runtimeError(UNKNOWN_VARIABLE, "Function not found", in, currentInstruction);
@@ -1814,10 +1815,15 @@ 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->nativeFn) {
+                        if (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])) {
                             runtimeError(ARG_TYPE_MISMATCH, "Mismatched function argument types", in, currentInstruction);
                         }
+                    }
                     appendToList(&argsList, in->args.args[i + 1].value.value);
                 }
                 
@@ -1839,6 +1845,7 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                 }
                 free(argsList.values); 
             } else {
+                GroundScope newScope = copyGroundScope(&function->closure);
                 for (size_t i = 0; i < function->argSize; i++) {
                     if (in->args.args[i + 1].type != VALUE) {
                         runtimeError(ARG_TYPE_MISMATCH, "Expecting a Value", in, currentInstruction);
@@ -1879,23 +1886,23 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             char* envPath = getenv("GROUND_LIBS");
             
             if (envPath) {
-                snprintf(path, sizeof(path), "%s/%s", envPath, libName);
+                snprintf(path, sizeof(path), "%s/%s.grnd", envPath, libName);
                 if (access(path, F_OK) == 0) found = 1;
             }
             
             if (!found) {
-                snprintf(path, sizeof(path), "/usr/lib/ground/%s", libName);
+                snprintf(path, sizeof(path), "/usr/lib/ground/%s.grnd", libName);
                 if (access(path, F_OK) == 0) found = 1;
             }
             
             if (!found) {
-                snprintf(path, sizeof(path), "%s", libName);
+                snprintf(path, sizeof(path), "./%s.grnd", libName);
                  if (access(path, F_OK) == 0) found = 1;
             }
 
             if (!found) {
                 char errorMsg[1100];
-                snprintf(errorMsg, sizeof(errorMsg), "Could not find library: %s", libName);
+                snprintf(errorMsg, sizeof(errorMsg), "Could not find library: %s.grnd", libName);
                 runtimeError(FIXME, errorMsg, in, currentInstruction);
             }
             
@@ -1925,6 +1932,10 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
         }
 
         case EXTERN: {
+	    #ifdef _WIN32
+	    runtimeError(FIXME, "No Windows support for extern, sucker", in, currentInstruction);
+	    #endif
+	    #ifndef _WIN32
             if (in->args.length < 1) {
                 runtimeError(TOO_FEW_ARGS, "Expecting 1 arg", in, currentInstruction);
             }
@@ -1974,6 +1985,7 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             }
             
             initFn(scope);
+	    #endif
             break;
         }
 

src/interpreter.h

@@ -1,6 +1,5 @@
 #ifndef INTERPRETER_H
 #define INTERPRETER_H
-#define MAX_ID_LEN 64
 
 #include "types.h"
 #include "parser.h"
@@ -14,24 +13,6 @@ typedef enum GroundDebugInstructionType {
     DUMP, INSPECT, EVAL, CONTINUE, EXIT, STEP, VIEW, HELP, UNKNOWN
 } GroundDebugInstructionType;
 
-typedef struct GroundLabel {
-    char id[MAX_ID_LEN];
-    int lineNum;
-    UT_hash_handle hh;
-} GroundLabel;
-
-typedef struct GroundVariable {
-    char id[MAX_ID_LEN];
-    GroundValue value;
-    UT_hash_handle hh;
-} GroundVariable;
-
-typedef struct GroundScope {
-    GroundLabel** labels;
-    GroundVariable** variables;
-    bool isMainScope;
-} GroundScope;
-
 typedef struct GroundDebugInstruction {
     GroundDebugInstructionType type;
     char* arg;
@@ -42,7 +23,6 @@ GroundFunction* parseFunction(GroundProgram* in, size_t errorOffset);
 GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope);
 GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scope);
 
-void addVariable(GroundVariable **head, const char *id, GroundValue data);
 
 
 

src/main.c

@@ -1,7 +1,10 @@
 #include "parser.h"
 #include "interpreter.h"
 #include "compiler.h"
+#include "types.h"
+#include "serialize.h"
 #include <stdio.h>
+#include <string.h>
 
 char* getFileContents(const char* filename) {
     // https://stackoverflow.com/questions/3747086/reading-the-whole-text-file-into-a-char-array-in-c
@@ -40,57 +43,87 @@ char* getFileContents(const char* filename) {
 }
 
 int main(int argc, char** argv) {
-    /*
-    if (argc < 2) {
-        printf("Usage: ground [file]\n");
-        exit(1);
-    }
-    char* file = getFileContents(argv[1]);
-    GroundProgram program = parseFile(file);
-    free(file);
-    char* compiled = compileGroundProgram(&program);
-    printf("%s\n", compiled);
-    interpretGroundProgram(&program, NULL);
-    */
-
     if (argc < 2) {
         printf("Usage: %s <file> [-c] [--compile] [-h] [--help]\n", argv[0]);
         exit(1);
     }
 
     bool compile = false;
+    bool writeBytecode = false;
+    bool readBytecode = false;
     char* fileName = NULL;
-
+    char* outFileName = NULL;
+    List groundArgs = createList();
     for (int i = 1; i < argc; i++) {
         if (strcmp("--compile", argv[i]) == 0 || strcmp("-c", argv[i]) == 0) {
+            if (writeBytecode) {
+                printf("Cannot choose both bytecode and compilation");
+                exit(1);
+            }
             compile = true;
         }
         else if (strcmp("--help", argv[i]) == 0 || strcmp("-h", argv[i]) == 0) {
             printf("GroundVM help\n");
-            printf("Usage: %s <file> [-c] [--compile] [-h] [--help]\n", argv[0]);
+            printf("Usage: %s <file> [-c] [--compile] [-h] [--help] [-w <output>] [--writeBytecode <output>] [-b] [--bytecode]\n", argv[0]);
             printf("Options:\n");
             printf("  -c or --compile: Outputs Linux x86_64 assembly instead of interpreting (WIP)\n");
             printf("  -h or --help: Shows this help message\n");
+            printf("  -w <output> or --writebytecode <output>: Outputs binary Ground bytecode");
+            printf("  -b <output> or --bytecode <output>: Inputs binary Ground bytecode");
             exit(0);
+        } else if (strcmp("--writebytecode", argv[i]) == 0 || strcmp("-w", argv[i]) == 0) {
+            if (compile) {
+                printf("Cannot choose both bytecode and compilation");
+                exit(1);
+            }
+            writeBytecode = true;
+            if (i + 1 >= argc) {
+                printf("Usage: %s %s <output>", argv[0], argv[i]);
+                exit(1);
+            }
+            i++;
+            outFileName = argv[i];
+        } else if (strcmp("--bytecode", argv[i]) == 0 || strcmp("-b", argv[i]) == 0) {
+            readBytecode = true;
         } else {
+            if (fileName == NULL) {
                 fileName = argv[i];
+            } else {
+                appendToList(&groundArgs, createStringGroundValue(argv[i]));
+            }
         }
     }
 
     if (fileName == NULL) {
-        printf("Usage: %s <file> [-c] [--compile] [-h] [--help]\n", argv[0]);
+        printf("Usage: %s <file> [-c] [--compile] [-h] [--help] [-w <output>] [--writeBytecode <output>] [-b] [--bytecode]\n", argv[0]);
         printf("Error: No file name provided\n");
         exit(1);
     }
 
+    GroundProgram program;
+
+    if (readBytecode) {
+        deserializeProgramFromFile(fileName, &program);
+    } else {
         char* file = getFileContents(fileName);
-    GroundProgram program = parseFile(file);
+        program = parseFile(file);
         free(file);
+    }
 
     if (compile) {
         char* compiled = compileGroundProgram(&program);
         printf("%s\n", compiled);
+    } else if (writeBytecode) {
+        serializeProgramToFile(outFileName, &program);
     } else {
-        interpretGroundProgram(&program, NULL);
+        GroundVariable* variables = NULL;
+        GroundLabel* labels = NULL;
+
+        GroundScope scope;
+        scope.variables = &variables;
+        scope.labels = &labels;
+        scope.isMainScope = true;
+        addVariable(scope.variables, "CMDLINE_ARGS", createListGroundValue(groundArgs));
+        interpretGroundProgram(&program, &scope);
     }
 }

src/parser.c

@@ -5,6 +5,25 @@
 #include <string.h>
 #include <ctype.h>
 
+#ifdef _WIN32
+size_t strnlen(const char *src, size_t n) {
+    size_t len = 0;
+    while (len < n && src[len])
+        len++;
+    return len;
+}
+
+char* strndup(const char *s, size_t n) {
+    size_t len = strnlen(s, n);
+    char *p = malloc(len + 1);
+    if (p) {
+        memcpy(p, s, len);
+        p[len] = '\0';
+    }
+    return p;
+}
+#endif
+
 GroundProgram createGroundProgram() {
     GroundProgram gp;
     gp.size = 0;

src/serialize.c

@@ -0,0 +1,302 @@
+#include "serialize.h"
+#include "types.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <inttypes.h>
+
+static bool writeBytes(FILE* f, const void* data, size_t n) {
+    return fwrite(data, 1, n, f) == n;
+}
+
+static bool readBytes(FILE* f, void* data, size_t n) {
+    return fread(data, 1, n, f) == n;
+}
+
+/* Convenience macros for writing/reading a single typed value. */
+#define WRITE(f, val)  writeBytes((f), &(val), sizeof(val))
+#define READ(f, val)   readBytes((f),  &(val), sizeof(val))
+
+
+bool serializeWriteString(FILE* f, const char* s) {
+    if (s == NULL) {
+        uint32_t sentinel = UINT32_MAX;
+        return WRITE(f, sentinel);
+    }
+    uint32_t len = (uint32_t)strlen(s);
+    if (!WRITE(f, len)) return false;
+    if (len > 0 && !writeBytes(f, s, len)) return false;
+    return true;
+}
+
+char* serializeReadString(FILE* f) {
+    uint32_t len;
+    if (!READ(f, len)) return NULL;
+    if (len == UINT32_MAX) return NULL;
+    char* s = malloc(len + 1);
+    if (!s) return NULL;
+    if (len > 0 && !readBytes(f, s, len)) {
+        free(s);
+        return NULL;
+    }
+    s[len] = '\0';
+    return s;
+}
+
+/* -----------------------------------------------------------------------
+ * GroundValue
+ *
+ * Format:
+ *   uint32_t  type
+ *   <payload depending on type>
+ *
+ * Only INT, DOUBLE, CHAR, BOOL, STRING, NONE are expected here.
+ * Any other type is treated as a serialization error.
+ * ----------------------------------------------------------------------- 
+*/
+
+bool serializeWriteValue(FILE* f, const GroundValue* gv) {
+    uint32_t type = (uint32_t)gv->type;
+    if (!WRITE(f, type)) return false;
+
+    switch (gv->type) {
+        case INT:
+            return WRITE(f, gv->data.intVal);
+        case DOUBLE:
+            return WRITE(f, gv->data.doubleVal);
+        case CHAR:
+            return WRITE(f, gv->data.charVal);
+        case BOOL:
+            return WRITE(f, gv->data.boolVal);
+        case STRING:
+            return serializeWriteString(f, gv->data.stringVal);
+        case NONE:
+            return true;
+        default:
+            /* LIST, FUNCTION, STRUCTVAL, CUSTOM, ERROR:
+             * These don't exist at serialization time. If you're hitting
+             * this, something has gone wrong well before we got here. */
+            fprintf(stderr, "serializeWriteValue: unexpected type %d\n", gv->type);
+            return false;
+    }
+}
+
+bool serializeReadValue(FILE* f, GroundValue* out) {
+    memset(out, 0, sizeof(*out));
+
+    uint32_t type;
+    if (!READ(f, type)) return false;
+    out->type = (GroundValueType)type;
+
+    switch (out->type) {
+        case INT:
+            return READ(f, out->data.intVal);
+        case DOUBLE:
+            return READ(f, out->data.doubleVal);
+        case CHAR:
+            return READ(f, out->data.charVal);
+        case BOOL:
+            return READ(f, out->data.boolVal);
+        case STRING: {
+            char* s = serializeReadString(f);
+            /* NULL is a valid encoded value (the sentinel case), but
+             * we only wrote non-NULL strings, so treat NULL-read as error. */
+            if (!s) return false;
+            out->data.stringVal = s;
+            return true;
+        }
+        case NONE:
+            return true;
+        default:
+            fprintf(stderr, "serializeReadValue: unexpected type %d\n", out->type);
+            return false;
+    }
+}
+
+/* -----------------------------------------------------------------------
+ * GroundArg
+ *
+ * Format:
+ *   uint32_t  argType
+ *   <if VALUE>  serialized GroundValue
+ *   <otherwise> length-prefixed refName string
+ * ----------------------------------------------------------------------- 
+*/
+
+bool serializeWriteArg(FILE* f, const GroundArg* ga) {
+    uint32_t type = (uint32_t)ga->type;
+    if (!WRITE(f, type)) return false;
+
+    if (ga->type == VALUE) {
+        return serializeWriteValue(f, &ga->value.value);
+    } else {
+        /* VALREF, DIRREF, LINEREF, LABEL, FNREF, TYPEREF — all carry a refName */
+        return serializeWriteString(f, ga->value.refName);
+    }
+}
+
+bool serializeReadArg(FILE* f, GroundArg* out) {
+    memset(out, 0, sizeof(*out));
+
+    uint32_t type;
+    if (!READ(f, type)) return false;
+    out->type = (GroundArgType)type;
+
+    if (out->type == VALUE) {
+        return serializeReadValue(f, &out->value.value);
+    } else {
+        char* ref = serializeReadString(f);
+        if (!ref) return false;
+        out->value.refName = ref;
+        return true;
+    }
+}
+
+/* -----------------------------------------------------------------------
+ * GroundInstruction
+ *
+ * Format:
+ *   uint32_t  instType
+ *   uint64_t  argCount
+ *   <argCount x serialized GroundArg>
+ * ----------------------------------------------------------------------- 
+*/
+
+bool serializeWriteInstruction(FILE* f, const GroundInstruction* gi) {
+    uint32_t type = (uint32_t)gi->type;
+    if (!WRITE(f, type)) return false;
+
+    uint64_t argc = (uint64_t)gi->args.length;
+    if (!WRITE(f, argc)) return false;
+
+    for (size_t i = 0; i < gi->args.length; i++) {
+        if (!serializeWriteArg(f, &gi->args.args[i])) return false;
+    }
+    return true;
+}
+
+bool serializeReadInstruction(FILE* f, GroundInstruction* out) {
+    uint32_t type;
+    if (!READ(f, type)) return false;
+
+    *out = createGroundInstruction((GroundInstType)type);
+
+    uint64_t argc;
+    if (!READ(f, argc)) return false;
+
+    for (uint64_t i = 0; i < argc; i++) {
+        GroundArg arg;
+        if (!serializeReadArg(f, &arg)) {
+            /* Free whatever args we've already read before bailing. */
+            freeGroundInstruction(out);
+            return false;
+        }
+        addArgToInstruction(out, arg);
+    }
+    return true;
+}
+
+/* -----------------------------------------------------------------------
+ * GroundProgram  —  top-level
+ *
+ * File layout:
+ *   uint32_t  magic    (GROUND_MAGIC)
+ *   uint32_t  version  (GROUND_VERSION)
+ *   uint64_t  instrCount
+ *   <instrCount x serialized GroundInstruction>
+ * ----------------------------------------------------------------------- 
+*/
+
+bool serializeProgramToFile(const char* path, const GroundProgram* prog) {
+    FILE* f = fopen(path, "wb");
+    if (!f) {
+        perror("serializeProgramToFile: fopen");
+        return false;
+    }
+
+    bool ok = true;
+
+    /* Header */
+    uint32_t magic   = GROUND_MAGIC;
+    uint32_t version = GROUND_VERSION;
+    ok = ok && WRITE(f, magic);
+    ok = ok && WRITE(f, version);
+
+    /* Instruction count, then instructions */
+    uint64_t count = (uint64_t)prog->size;
+    ok = ok && WRITE(f, count);
+
+    for (size_t i = 0; i < prog->size && ok; i++) {
+        ok = serializeWriteInstruction(f, &prog->instructions[i]);
+    }
+
+    if (!ok) {
+        fprintf(stderr, "serializeProgramToFile: write error\n");
+    }
+
+    fclose(f);
+    return ok;
+}
+
+bool deserializeProgramFromFile(const char* path, GroundProgram* out) {
+    memset(out, 0, sizeof(*out));
+
+    FILE* f = fopen(path, "rb");
+    if (!f) {
+        perror("deserializeProgramFromFile: fopen");
+        return false;
+    }
+
+    bool ok = true;
+
+    /* Validate header */
+    uint32_t magic, version;
+    ok = ok && READ(f, magic);
+    ok = ok && READ(f, version);
+
+    if (!ok || magic != GROUND_MAGIC) {
+        fprintf(stderr, "deserializeProgramFromFile: bad magic (got 0x%08X)\n", magic);
+        fclose(f);
+        return false;
+    }
+    if (version != GROUND_VERSION) {
+        fprintf(stderr, "deserializeProgramFromFile: unsupported version %u\n", version);
+        fclose(f);
+        return false;
+    }
+
+    /* Read instruction count */
+    uint64_t count;
+    if (!READ(f, count)) {
+        fclose(f);
+        return false;
+    }
+
+    out->instructions = malloc(sizeof(GroundInstruction) * count);
+    if (!out->instructions && count > 0) {
+        fprintf(stderr, "deserializeProgramFromFile: malloc failed\n");
+        fclose(f);
+        return false;
+    }
+    out->size = 0;  /* incremented as we go so partial frees are safe */
+
+    for (uint64_t i = 0; i < count; i++) {
+        if (!serializeReadInstruction(f, &out->instructions[i])) {
+            fprintf(stderr, "deserializeProgramFromFile: failed at instruction %llu\n",
+                    (unsigned long long)i);
+            /* Free everything successfully read so far. */
+            for (size_t j = 0; j < out->size; j++)
+                freeGroundInstruction(&out->instructions[j]);
+            free(out->instructions);
+            memset(out, 0, sizeof(*out));
+            fclose(f);
+            return false;
+        }
+        out->size++;
+    }
+
+    fclose(f);
+    return true;
+}

src/serialize.h

@@ -0,0 +1,48 @@
+#ifndef SERIALIZE_H
+#define SERIALIZE_H
+
+#include <stdio.h>
+#include <stdbool.h>
+#include "types.h"
+
+/*
+ * Magic number and version for Ground bytecode files.
+ * The magic bytes spell 'GRND'
+ */
+#define GROUND_MAGIC   0x47524E44u
+#define GROUND_VERSION 1u
+
+/*
+ * File header written at the start of every .grbc file.
+ */
+typedef struct GroundBytecodeHeader {
+    uint32_t magic;
+    uint32_t version;
+} GroundBytecodeHeader;
+
+/*
+ * Writes a length-prefixed UTF-8 string to (f).
+ * NULL is encoded as a sentinel length (UINT32_MAX).
+ * Returns true on success.
+ */
+bool serializeWriteString(FILE* f, const char* s);
+
+char* serializeReadString(FILE* f);
+
+
+bool serializeWriteValue(FILE* f, const GroundValue* gv);
+bool serializeReadValue(FILE* f, GroundValue* out);
+
+
+bool serializeWriteArg(FILE* f, const GroundArg* ga);
+bool serializeReadArg(FILE* f, GroundArg* out);
+
+
+bool serializeWriteInstruction(FILE* f, const GroundInstruction* gi);
+bool serializeReadInstruction(FILE* f, GroundInstruction* out);
+
+bool serializeProgramToFile(const char* path, const GroundProgram* prog);
+
+bool deserializeProgramFromFile(const char* path, GroundProgram* out);
+
+#endif

src/types.c

@@ -2,6 +2,20 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
+#ifdef __EMSCRIPTEN__
+static char out_buf[65536];
+static int out_pos = 0;
+
+void wasm_print(const char* str) {
+    int len = strlen(str);
+    if (out_pos + len < (int)sizeof(out_buf) - 1) {
+        memcpy(out_buf + out_pos, str, len);
+        out_pos += len;
+        out_buf[out_pos] = '\0';
+    }
+}
+#endif
+
 GroundValue createIntGroundValue(int64_t in) {
     GroundValue gv;
     gv.data.intVal = in;
@@ -90,16 +104,63 @@ GroundValue copyGroundValue(const GroundValue* gv) {
         }
         case FUNCTION: newGv.data.fnVal = gv->data.fnVal; break;
         case STRUCTVAL: {
-            // do this later lmao
-            // FIXME
-            newGv.data.structVal = gv->data.structVal;
+            newGv.data.structVal = malloc(sizeof(GroundStruct));
+            if (newGv.data.structVal == NULL) {
+                printf("Couldn't allocate memory for GroundStruct copy\n");
+                exit(1);
+            }
+            
+            newGv.data.structVal->size = gv->data.structVal->size;
+            newGv.data.structVal->fields = malloc(gv->data.structVal->size * sizeof(GroundStructField));
+            if (newGv.data.structVal->fields == NULL && gv->data.structVal->size > 0) {
+                printf("Couldn't allocate memory for GroundStruct fields copy\n");
+                exit(1);
+            }
+            
+            for (size_t i = 0; i < gv->data.structVal->size; i++) {
+                strncpy(newGv.data.structVal->fields[i].id, 
+                        gv->data.structVal->fields[i].id, 
+                        sizeof(newGv.data.structVal->fields[i].id) - 1);
+                newGv.data.structVal->fields[i].id[sizeof(newGv.data.structVal->fields[i].id) - 1] = '\0';
+                
+                newGv.data.structVal->fields[i].value = copyGroundValue(&gv->data.structVal->fields[i].value);
+            }
             break;
         }
-        case CUSTOM:
-            // also do this later
-            // FIXME
-            newGv.data.customVal = gv->data.customVal;
+        case CUSTOM: {
+            newGv.data.customVal = malloc(sizeof(GroundObject));
+            if (newGv.data.customVal == NULL) {
+                printf("Couldn't allocate memory for GroundObject copy\n");
+                exit(1);
+            }
+            
+            newGv.data.customVal->fields = NULL;
+            
+            // Deep copy the struct definition as well
+            newGv.customType = malloc(sizeof(GroundStruct));
+            newGv.customType->size = gv->customType->size;
+            newGv.customType->fields = malloc(gv->customType->size * sizeof(GroundStructField));
+            for (size_t i = 0; i < gv->customType->size; i++) {
+                strncpy(newGv.customType->fields[i].id, gv->customType->fields[i].id, 64);
+                newGv.customType->fields[i].value = copyGroundValue(&gv->customType->fields[i].value);
+            }
+
+            GroundObjectField *field, *tmp;
+            HASH_ITER(hh, gv->data.customVal->fields, field, tmp) {
+                GroundObjectField* newField = malloc(sizeof(GroundObjectField));
+                if (newField == NULL) {
+                    printf("Couldn't allocate memory for GroundObjectField copy\n");
+                    exit(1);
+                }
+                
+                strncpy(newField->id, field->id, sizeof(newField->id) - 1);
+                newField->id[sizeof(newField->id) - 1] = '\0';
+                newField->value = copyGroundValue(&field->value);
+                
+                HASH_ADD_STR(newGv.data.customVal->fields, id, newField);
+            }
             break;
+        }
         case NONE:
         default: {
 
@@ -214,6 +275,20 @@ void freeGroundValue(GroundValue* gv) {
         freeGroundStruct(gstruct);
         free(gstruct);
     }
+    if (gv->type == CUSTOM && gv->data.customVal != NULL) {
+        freeGroundObject(gv->data.customVal);
+        free(gv->data.customVal);
+        gv->data.customVal = NULL;
+        
+        if (gv->customType != NULL) {
+            for (size_t i = 0; i < gv->customType->size; i++) {
+                freeGroundValue(&gv->customType->fields[i].value);
+            }
+            free(gv->customType->fields);
+            free(gv->customType);
+            gv->customType = NULL;
+        }
+    }
     if (gv->type == ERROR) {
         GroundError* error = &gv->data.errorVal;
         if (error->type != NULL) {
@@ -670,3 +745,24 @@ bool checkTypes(GroundValue* left, GroundValue* right) {
     }
     return true;
 }
+
+GroundScope copyGroundScope(GroundScope* scope) {
+    GroundScope newScope = {
+        .labels = malloc(sizeof(GroundLabel*)),
+        .variables = malloc(sizeof(GroundVariable*)),
+        .isMainScope = false
+    };
+    *newScope.variables = NULL;
+    *newScope.labels = NULL;
+
+    if (scope == NULL) {
+        printf("oh no scope is null\n");
+    }
+
+    GroundVariable *var, *tmp = NULL;
+    HASH_ITER(hh, *scope->variables, var, tmp) {
+        addVariable(newScope.variables, var->id, var->value);
+    }
+
+    return newScope;
+}

src/types.h

@@ -8,6 +8,26 @@
 #include <string.h>
 #include "include/uthash.h"
 
+#define MAX_ID_LEN 64
+
+// If targeting WASM, define WASM specific stuff
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+
+void wasm_print(const char* str);
+
+#undef printf
+#define printf(fmt, ...) do { \
+    int __needed = snprintf(NULL, 0, fmt, ##__VA_ARGS__) + 1; \
+    char* __buf = malloc(__needed); \
+    if (__buf) { \
+        snprintf(__buf, __needed, fmt, ##__VA_ARGS__); \
+        wasm_print(__buf); \
+        free(__buf); \
+    } \
+} while(0)
+#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, ERRORCMD
 } GroundInstType;
@@ -77,6 +97,24 @@ typedef struct GroundValue {
     } data;
 } GroundValue;
 
+typedef struct GroundLabel {
+    char id[MAX_ID_LEN];
+    int lineNum;
+    UT_hash_handle hh;
+} GroundLabel;
+
+typedef struct GroundVariable {
+    char id[MAX_ID_LEN];
+    GroundValue value;
+    UT_hash_handle hh;
+} GroundVariable;
+
+typedef struct GroundScope {
+    GroundLabel** labels;
+    GroundVariable** variables;
+    bool isMainScope;
+} GroundScope;
+
 /*
  * Indicates status when accessing a list.
  * Associated functions:
@@ -145,6 +183,7 @@ typedef struct GroundFunction {
     GroundProgram program;
     size_t startLine;
     bool isNative;
+    GroundScope closure;
     NativeGroundFunction nativeFn;
 } GroundFunction;
 
@@ -284,5 +323,10 @@ bool checkFnTypes(GroundValue* left, GroundFunctionArgs* arg);
 // Compares types of two values.
 bool checkTypes(GroundValue* left, GroundValue* right);
 
+// Adds variable to GroundScope
+void addVariable(GroundVariable **head, const char *id, GroundValue data);
+
+// Deep copies a GroundScope
+GroundScope copyGroundScope(GroundScope* scope);
 
 #endif

tests/closure.grnd

@@ -0,0 +1,27 @@
+set &x 5
+
+PAUSE
+
+fun !dingle -function -int &a
+
+    PAUSE
+
+    fun !capture -int -int &b
+
+        PAUSE
+
+        add $a $b &tmp
+        add $tmp $x &tmp
+        return $tmp
+    endfun
+
+    return $capture
+
+endfun
+
+call !dingle 3 &result
+
+PAUSE
+
+call !result 5 &y
+println $y