Actually fixed skipped instructions after use (previous commit didn't include it for some reason)

.gitignore

@@ -3,4 +3,3 @@ build
 ground
 groundc
 .idea
-Makefile

libs/datetime/date_functions.c

@@ -1,422 +0,0 @@
-#include "date_functions.h"
-#include <stdio.h>
-
-GroundValue tmToGroundValue(struct tm t) {
-    GroundStruct timeStruct = groundCreateStruct();
-    groundAddFieldToStruct(&timeStruct, "year", groundCreateValue(INT, t.tm_year + 1900));
-    groundAddFieldToStruct(&timeStruct, "month", groundCreateValue(INT, t.tm_mon + 1));
-    groundAddFieldToStruct(&timeStruct, "day", groundCreateValue(INT, t.tm_mday));
-    groundAddFieldToStruct(&timeStruct, "hour", groundCreateValue(INT, t.tm_hour));
-    groundAddFieldToStruct(&timeStruct, "minute", groundCreateValue(INT, t.tm_min));
-    groundAddFieldToStruct(&timeStruct, "second", groundCreateValue(INT, t.tm_sec));
-    groundAddFieldToStruct(&timeStruct, "weekDay", groundCreateValue(INT, t.tm_wday));
-    groundAddFieldToStruct(&timeStruct, "yearDay", groundCreateValue(INT, t.tm_yday + 1));
-    groundAddFieldToStruct(&timeStruct, "isDaylightSavingsTime", groundCreateValue(BOOL, t.tm_isdst));
-    
-    GroundValue value = groundCreateValue(CUSTOM, &timeStruct);
-    value.type = CUSTOM;
-
-    return value;
-}
-
-GroundValue datetime_Now(GroundScope* scope, List args) {
-    time_t now = time(NULL);
-    struct tm t = {0};
-
-    localtime_r(&now, &t);
-
-    // return a -datetime struct
-    return tmToGroundValue(t);
-}
-
-GroundValue datetime_FromEpochLocal(GroundScope* scope, List args) {
-    struct tm t = {0};
-    time_t ts = args.values[0].data.doubleVal;
-
-    localtime_r(&ts, &t);
-
-    return tmToGroundValue(t);
-}
-
-GroundValue datetime_FromEpochUTC(GroundScope* scope, List args) {
-    struct tm t = {0};
-    time_t ts = args.values[0].data.doubleVal;
-
-    gmtime_r(&ts, &t);
-
-    return tmToGroundValue(t);
-}
-
-GroundValue datetime_ToEpochLocal(GroundScope* scope, List args) {
-    GroundObject obj = *args.values[0].data.customVal;
-
-    // check args
-    GroundObjectField* year = groundFindField(obj, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object does not have year field as int", "ValueError");
-    GroundObjectField* month = groundFindField(obj, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object does not have month field as int", "ValueError");
-    GroundObjectField* day = groundFindField(obj, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object does not have day field as int", "ValueError");
-    GroundObjectField* hour = groundFindField(obj, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object does not have hour field as int", "ValueError");
-    GroundObjectField* minute = groundFindField(obj, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object does not have minute field as int", "ValueError");
-    GroundObjectField* second = groundFindField(obj, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object does not have second field as int", "ValueError");
-    GroundObjectField* weekDay = groundFindField(obj, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object does not have weekDay field as int", "ValueError");
-    GroundObjectField* yearDay = groundFindField(obj, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object does not have yearDay field as int", "ValueError");
-    GroundObjectField* isDaylightSavingsTime = groundFindField(obj, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-
-    time_t ts = mktime(&t);
-    return groundCreateValue(INT, (long long)ts);
-}
-
-GroundValue datetime_ToEpochUTC(GroundScope* scope, List args) {
-    GroundObject obj = *args.values[0].data.customVal;
-
-    // check args
-    GroundObjectField* year = groundFindField(obj, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object does not have year field as int", "ValueError");
-    GroundObjectField* month = groundFindField(obj, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object does not have month field as int", "ValueError");
-    GroundObjectField* day = groundFindField(obj, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object does not have day field as int", "ValueError");
-    GroundObjectField* hour = groundFindField(obj, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object does not have hour field as int", "ValueError");
-    GroundObjectField* minute = groundFindField(obj, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object does not have minute field as int", "ValueError");
-    GroundObjectField* second = groundFindField(obj, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object does not have second field as int", "ValueError");
-    GroundObjectField* weekDay = groundFindField(obj, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object does not have weekDay field as int", "ValueError");
-    GroundObjectField* yearDay = groundFindField(obj, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object does not have yearDay field as int", "ValueError");
-    GroundObjectField* isDaylightSavingsTime = groundFindField(obj, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-
-    time_t ts = timegm(&t);
-    return groundCreateValue(INT, (long long)ts);
-}
-
-GroundValue formatDatetimeObj(GroundObject obj, char* formatString) {
-    // check args
-    GroundObjectField* year = groundFindField(obj, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object does not have year field as int", "ValueError");
-    GroundObjectField* month = groundFindField(obj, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object does not have month field as int", "ValueError");
-    GroundObjectField* day = groundFindField(obj, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object does not have day field as int", "ValueError");
-    GroundObjectField* hour = groundFindField(obj, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object does not have hour field as int", "ValueError");
-    GroundObjectField* minute = groundFindField(obj, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object does not have minute field as int", "ValueError");
-    GroundObjectField* second = groundFindField(obj, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object does not have second field as int", "ValueError");
-    GroundObjectField* weekDay = groundFindField(obj, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object does not have weekDay field as int", "ValueError");
-    GroundObjectField* yearDay = groundFindField(obj, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object does not have yearDay field as int", "ValueError");
-    GroundObjectField* isDaylightSavingsTime = groundFindField(obj, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-
-    mktime(&t); // normalise time
-
-    // create a buffer for the string
-    char* buffer = (char*)malloc(128);
-    strftime(buffer, 128, formatString, &t);
-
-    // return ground version of string
-    return groundCreateValue(STRING, buffer);
-}
-
-GroundValue datetime_Format(GroundScope* scope, List args) {
-    return formatDatetimeObj(
-        *args.values[0].data.customVal,
-        args.values[1].data.stringVal
-    );
-}
-
-GroundValue datetime_FromFormatted(GroundScope* scope, List args) {
-    char* timeString = args.values[0].data.stringVal;
-    char* formatString = args.values[1].data.stringVal;
-
-    struct tm t = {0};
-    t.tm_isdst = -1;
-    char* result = strptime(timeString, formatString, &t);
-
-    if (result == NULL) {
-        ERROR("Time string does not match format!", "ValueError");
-    }
-
-    mktime(&t);
-
-    return tmToGroundValue(t);
-}
-
-GroundValue datetime_ToISO8601UTC(GroundScope* scope, List args) {
-    GroundObject obj = *args.values[0].data.customVal;
-
-    // check args
-    GroundObjectField* year = groundFindField(obj, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object does not have year field as int", "ValueError");
-    GroundObjectField* month = groundFindField(obj, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object does not have month field as int", "ValueError");
-    GroundObjectField* day = groundFindField(obj, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object does not have day field as int", "ValueError");
-    GroundObjectField* hour = groundFindField(obj, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object does not have hour field as int", "ValueError");
-    GroundObjectField* minute = groundFindField(obj, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object does not have minute field as int", "ValueError");
-    GroundObjectField* second = groundFindField(obj, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object does not have second field as int", "ValueError");
-    GroundObjectField* weekDay = groundFindField(obj, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object does not have weekDay field as int", "ValueError");
-    GroundObjectField* yearDay = groundFindField(obj, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object does not have yearDay field as int", "ValueError");
-    GroundObjectField* isDaylightSavingsTime = groundFindField(obj, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-
-    time_t ts = mktime(&t);
-    gmtime_r(&ts, &t);
-
-    char* buffer = (char*)malloc(128);
-    strftime(buffer, 128, "%Y-%m-%dT%H:%M:%SZ", &t);
-
-    return groundCreateValue(STRING, buffer);
-}
-
-GroundValue datetime_ToISO8601Local(GroundScope* scope, List args) {
-    GroundObject obj = *args.values[0].data.customVal;
-
-    // check args
-    GroundObjectField* year = groundFindField(obj, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object does not have year field as int", "ValueError");
-    GroundObjectField* month = groundFindField(obj, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object does not have month field as int", "ValueError");
-    GroundObjectField* day = groundFindField(obj, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object does not have day field as int", "ValueError");
-    GroundObjectField* hour = groundFindField(obj, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object does not have hour field as int", "ValueError");
-    GroundObjectField* minute = groundFindField(obj, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object does not have minute field as int", "ValueError");
-    GroundObjectField* second = groundFindField(obj, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object does not have second field as int", "ValueError");
-    GroundObjectField* weekDay = groundFindField(obj, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object does not have weekDay field as int", "ValueError");
-    GroundObjectField* yearDay = groundFindField(obj, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object does not have yearDay field as int", "ValueError");
-    GroundObjectField* isDaylightSavingsTime = groundFindField(obj, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-
-    time_t ts = mktime(&t);
-    localtime_r(&ts, &t);
-
-    char* buffer = (char*)malloc(128);
-    strftime(buffer, 128, "%Y-%m-%dT%H:%M:%S%z", &t);
-
-    return groundCreateValue(STRING, buffer);
-}
-
-GroundValue datetime_Diff(GroundScope* scope, List args) {
-    GroundObject obj1 = *args.values[0].data.customVal;
-    GroundObject obj2 = *args.values[1].data.customVal;
-
-    // check first timedate object
-    GroundObjectField* year = groundFindField(obj1, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object 1 does not have year field as int", "ValueError");
-    GroundObjectField* month = groundFindField(obj1, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object 1 does not have month field as int", "ValueError");
-    GroundObjectField* day = groundFindField(obj1, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object 1 does not have day field as int", "ValueError");
-    GroundObjectField* hour = groundFindField(obj1, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object 1 does not have hour field as int", "ValueError");
-    GroundObjectField* minute = groundFindField(obj1, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object 1 does not have minute field as int", "ValueError");
-    GroundObjectField* second = groundFindField(obj1, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object 1 does not have second field as int", "ValueError");
-    GroundObjectField* weekDay = groundFindField(obj1, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object 1 does not have weekDay field as int", "ValueError");
-    GroundObjectField* yearDay = groundFindField(obj1, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object 1 does not have yearDay field as int", "ValueError");
-    GroundObjectField* isDaylightSavingsTime = groundFindField(obj1, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object 1 does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t1 = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-    
-    
-    // check second timedate object
-    year = groundFindField(obj2, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object does not have year field as int", "ValueError");
-    month = groundFindField(obj2, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object does not have month field as int", "ValueError");
-    day = groundFindField(obj2, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object does not have day field as int", "ValueError");
-    hour = groundFindField(obj2, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object does not have hour field as int", "ValueError");
-    minute = groundFindField(obj2, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object does not have minute field as int", "ValueError");
-    second = groundFindField(obj2, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object does not have second field as int", "ValueError");
-    weekDay = groundFindField(obj2, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object does not have weekDay field as int", "ValueError");
-    yearDay = groundFindField(obj2, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object does not have yearDay field as int", "ValueError");
-    isDaylightSavingsTime = groundFindField(obj2, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t2 = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-
-
-    time_t ts1 = mktime(&t1);
-    time_t ts2 = mktime(&t2);
-
-    return groundCreateValue(INT, ts2 - ts1);
-}
-
-GroundValue datetime_Add(GroundScope* scope, List args) {
-     GroundObject obj = *args.values[0].data.customVal;
-
-     long long secs = args.values[1].data.intVal;
-     long long mins = args.values[2].data.intVal;
-     long long hours = args.values[3].data.intVal;
-     long long days = args.values[4].data.intVal;
-
-    // check args
-    GroundObjectField* year = groundFindField(obj, "year");
-    if (year == NULL || year->value.type != INT) ERROR("Object does not have year field as int", "ValueError");
-    GroundObjectField* month = groundFindField(obj, "month");
-    if (month == NULL || month->value.type != INT) ERROR("Object does not have month field as int", "ValueError");
-    GroundObjectField* day = groundFindField(obj, "day");
-    if (day == NULL || day->value.type != INT) ERROR("Object does not have day field as int", "ValueError");
-    GroundObjectField* hour = groundFindField(obj, "hour");
-    if (hour == NULL || hour->value.type != INT) ERROR("Object does not have hour field as int", "ValueError");
-    GroundObjectField* minute = groundFindField(obj, "minute");
-    if (minute == NULL || minute->value.type != INT) ERROR("Object does not have minute field as int", "ValueError");
-    GroundObjectField* second = groundFindField(obj, "second");
-    if (second == NULL || second->value.type != INT) ERROR("Object does not have second field as int", "ValueError");
-    GroundObjectField* weekDay = groundFindField(obj, "weekDay");
-    if (weekDay == NULL || weekDay->value.type != INT) ERROR("Object does not have weekDay field as int", "ValueError");
-    GroundObjectField* yearDay = groundFindField(obj, "yearDay");
-    if (yearDay == NULL || yearDay->value.type != INT) ERROR("Object does not have yearDay field as int", "ValueError");
-    GroundObjectField* isDaylightSavingsTime = groundFindField(obj, "isDaylightSavingsTime");
-    if (isDaylightSavingsTime == NULL || isDaylightSavingsTime->value.type != BOOL) ERROR("Object does not have isDaylightSavingsTime field as bool", "ValueError");
-
-    // construct tm struct from our ground struct
-    struct tm t = {
-        .tm_sec = second->value.data.intVal,
-        .tm_min = minute->value.data.intVal,
-        .tm_hour = hour->value.data.intVal,
-        .tm_mday = day->value.data.intVal,
-        .tm_mon = month->value.data.intVal - 1,
-        .tm_year = year->value.data.intVal - 1900,
-        .tm_wday = 0,
-        .tm_yday = 0,
-        .tm_isdst = -1
-    };
-
-    time_t base = mktime(&t);
-
-    long long totalSeconds = 
-        secs +
-        mins * 60 +
-        hours * 3600 +
-        days * 86400;
-
-    base += totalSeconds;
-
-    struct tm newT;
-    localtime_r(&base, &newT);
-
-    return tmToGroundValue(newT);
-
-}

libs/datetime/date_functions.h

@@ -1,18 +0,0 @@
-#pragma once
-#define _XOPEN_SOURCE // to make gcc happy lol
-
-#include <groundext.h>
-#include <groundvm.h>
-#include <time.h>
-
-GroundValue datetime_Now(GroundScope* scope, List args);
-GroundValue datetime_Format(GroundScope* scope, List args);
-GroundValue datetime_FromFormatted(GroundScope* scope, List args);
-GroundValue datetime_ToISO8601UTC(GroundScope* scope, List args);
-GroundValue datetime_ToISO8601Local(GroundScope* scope, List args);
-GroundValue datetime_FromEpochLocal(GroundScope* scope, List args);
-GroundValue datetime_FromEpochUTC(GroundScope* scope, List args);
-GroundValue datetime_ToEpochLocal(GroundScope* scope, List args);
-GroundValue datetime_ToEpochUTC(GroundScope* scope, List args);
-GroundValue datetime_Diff(GroundScope* scope, List args);
-GroundValue datetime_Add(GroundScope* scope, List args);

libs/datetime/datetime.c

@@ -1,18 +0,0 @@
-#include "time_functions.h"
-#include "date_functions.h"
-
-
-void ground_init(GroundScope* scope) {
-    groundAddNativeFunction(scope, "datetime_NowEpoch", datetime_NowEpoch, DOUBLE, 0);
-    groundAddNativeFunction(scope, "datetime_Now", datetime_Now, CUSTOM, 0);
-    groundAddNativeFunction(scope, "datetime_Format", datetime_Format, STRING, 2, CUSTOM, "datetime", STRING, "format");
-    groundAddNativeFunction(scope, "datetime_FromFormatted", datetime_FromFormatted, CUSTOM, 2, STRING, "datetimeString", STRING, "format");
-    groundAddNativeFunction(scope, "datetime_ToISO8601UTC", datetime_ToISO8601UTC, STRING, 1, CUSTOM, "datetime");
-    groundAddNativeFunction(scope, "datetime_ToISO8601Local", datetime_ToISO8601Local, STRING, 1, CUSTOM, "datetime");
-    groundAddNativeFunction(scope, "datetime_FromEpochUTC", datetime_FromEpochUTC, CUSTOM, 1, DOUBLE, "epoch");
-    groundAddNativeFunction(scope, "datetime_FromEpochLocal", datetime_FromEpochLocal, CUSTOM, 1, DOUBLE, "epoch");
-    groundAddNativeFunction(scope, "datetime_ToEpochUTC", datetime_ToEpochUTC, INT, 1, CUSTOM, "datetime");
-    groundAddNativeFunction(scope, "datetime_ToEpochLocal", datetime_ToEpochLocal, INT, 1, CUSTOM, "datetime");
-    groundAddNativeFunction(scope, "datetime_Diff", datetime_Diff, INT, 2, CUSTOM, "datetime1", CUSTOM, "datetime2");
-    groundAddNativeFunction(scope, "datetime_Add", datetime_Add, CUSTOM, 5, CUSTOM, "datetime", INT, "seconds", INT, "minutes", INT, "hours", INT, "days");
-}

libs/datetime/time_functions.c

@@ -1,12 +0,0 @@
-#include "time_functions.h"
-
-GroundValue datetime_NowEpoch(GroundScope* scope, List args) {
-    // grab time from system clock
-    struct timespec ts;
-    clock_gettime(CLOCK_REALTIME, &ts);
-
-    // convert it to secs and return it
-    double secsSinceEpoch = (double)ts.tv_sec + (double)ts.tv_nsec / 1e9;
-
-    return groundCreateValue(DOUBLE, secsSinceEpoch);
-}

libs/datetime/time_functions.h

@@ -1,5 +0,0 @@
-#pragma once
-#include <groundext.h>
-#include <time.h>
-
-GroundValue datetime_NowEpoch(GroundScope* scope, List args);

libs/request/request.c

@@ -1,23 +1,35 @@
 #include <groundext.h>
-#include <groundvm.h>
 #include <curl/curl.h>
+#include <groundvm.h>
 #include <stdio.h>
-#include <stdbool.h>
+#include <string.h>
+#include <stdlib.h>
 
-CURL* curlHandle = NULL;
+bool curl_init = false;
-
-GroundStruct template;
-
-const char* VALID_REQUEST_TYPES[] = {
-    "GET",
-    "POST"
-};
 
 typedef struct {
     char* data;
     size_t size;
 } ResponseBuffer;
 
+typedef struct {
+    CURL* handle;
+    bool connected;
+    char* url;
+} WebSocketConnection;
+
+// Global storage for WebSocket connections (simple implementation)
+#define MAX_WS_CONNECTIONS 10
+WebSocketConnection ws_connections[MAX_WS_CONNECTIONS] = {0};
+
+void curl_setup() {
+    if (!curl_init) {
+        curl_global_init(CURL_GLOBAL_ALL);
+        curl_init = true;
+    }
+}
+
+// Proper write callback that accumulates data
 size_t write_callback(void* ptr, size_t size, size_t nmemb, void* userdata) {
     size_t total_size = size * nmemb;
     ResponseBuffer* buffer = (ResponseBuffer*)userdata;
@@ -36,117 +48,295 @@ size_t write_callback(void* ptr, size_t size, size_t nmemb, void* userdata) {
     return total_size;
 }
 
-GroundValue ground_request(GroundScope* scope, List args) {
+// GET request
+GroundValue get_request(GroundScope* scope, List args) {
+    curl_setup();
+    CURL* handle = curl_easy_init();
+    
+    if (!handle) {
+        ERROR("CURL failed to init", "GenericRequestError");
+    }
+    
+    ResponseBuffer buffer = {0};
+    buffer.data = malloc(1);
+    buffer.data[0] = '\0';
+    buffer.size = 0;
+    
+    curl_easy_setopt(handle, CURLOPT_URL, args.values[0].data.stringVal);
+    curl_easy_setopt(handle, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_callback);
+    curl_easy_setopt(handle, CURLOPT_WRITEDATA, &buffer);
+    curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1L);
+    
+    CURLcode result = curl_easy_perform(handle);
+    
+    if (result != CURLE_OK) {
+        char buf[256];
+        snprintf(buf, sizeof(buf) - 1, "Curl request failed: %s\n", curl_easy_strerror(result));
+        ERROR(buf, "ActionRequestError");
+    }
+    
+    curl_easy_cleanup(handle);
+    
+    GroundValue ret = groundCreateValue(STRING, buffer.data);
+    return ret;
+}
 
-    GroundObject obj = *args.values[0].data.customVal;
+// POST request
+GroundValue post_request(GroundScope* scope, List args) {
+    curl_setup();
+    CURL* handle = curl_easy_init();
+    
+    if (!handle) {
+        ERROR("CURL failed to init", "GenericRequestError");
+    }
+    
+    ResponseBuffer buffer = {0};
+    buffer.data = malloc(1);
+    buffer.data[0] = '\0';
+    buffer.size = 0;
+    
+    curl_easy_setopt(handle, CURLOPT_URL, args.values[0].data.stringVal);
+    curl_easy_setopt(handle, CURLOPT_POST, 1L);
+    curl_easy_setopt(handle, CURLOPT_POSTFIELDS, args.values[1].data.stringVal);
+    curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_callback);
+    curl_easy_setopt(handle, CURLOPT_WRITEDATA, &buffer);
+    curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1L);
+    
+    CURLcode result = curl_easy_perform(handle);
+    
+    if (result != CURLE_OK) {
+        free(buffer.data);
+        char buf[256];
+        snprintf(buf, sizeof(buf) - 1, "Curl request failed: %s\n", curl_easy_strerror(result));
+        curl_easy_cleanup(handle);
+        ERROR(buf, "ActionRequestError");
+    }
+    
+    curl_easy_cleanup(handle);
+    
+    GroundValue ret = groundCreateValue(STRING, buffer.data);
+    return ret;
+}
 
-    // check arg types
+// ============== WebSocket Functions ==============
-    GroundObjectField* address = groundFindField(obj, "address");
-    if (address == NULL || address->value.type != STRING) {
-        ERROR("Object does not have address field as string", "ValueError");
-    }
-    GroundObjectField* type = groundFindField(obj, "type");
-    if (type == NULL || type->value.type != STRING) {
-        ERROR("Object does not have type field as string", "ValueError");
-    }
-    GroundObjectField* userAgent = groundFindField(obj, "userAgent");
-    if (userAgent == NULL || userAgent->value.type != STRING) {
-        ERROR("Object does not have userAgent field as string", "ValueError");
-    }
-    GroundObjectField* httpHeaders = groundFindField(obj, "httpHeaders");
-    if (httpHeaders == NULL || httpHeaders->value.type != LIST) {
-        ERROR("Object does not have httpHeaders field as list<string>", "ValueError");
-    }
-    GroundObjectField* verbose = groundFindField(obj, "verbose");
-    if (verbose == NULL || verbose->value.type != BOOL) {
-        ERROR("Object does not have verbose field as bool", "ValueError");
-    }
 
-    // check request type string
+// Find an empty slot for a new WebSocket connection
-    bool requestTypeOk = false;
+int find_ws_slot() {
-    for (int i = 0; i < sizeof(VALID_REQUEST_TYPES)/sizeof(VALID_REQUEST_TYPES[0]); i++) {
+    for (int i = 0; i < MAX_WS_CONNECTIONS; i++) {
-        if (strcmp(type->value.data.stringVal, VALID_REQUEST_TYPES[i]) == 0) {
+        if (!ws_connections[i].connected) {
-            requestTypeOk = true;
+            return i;
-            break;
         }
     }
-    if (!requestTypeOk) 
+    return -1;
-        ERROR("Invalid request type! Choices: GET, POST", "ValueError");
+}
+
+// WebSocket Connect - returns connection ID as INT
+GroundValue ws_connect(GroundScope* scope, List args) {
+    curl_setup();
     
-
+    int slot = find_ws_slot();
-    ResponseBuffer buffer = {0};
+    if (slot == -1) {
-
+        ERROR("Maximum WebSocket connections reached", "OverflowError");
-    // set curl params
-    curl_easy_setopt(curlHandle, CURLOPT_URL, address->value.data.stringVal);
-    curl_easy_setopt(curlHandle, CURLOPT_WRITEFUNCTION, write_callback);
-    curl_easy_setopt(curlHandle, CURLOPT_WRITEDATA, (void*)&buffer);
-    curl_easy_setopt(curlHandle, CURLOPT_USERAGENT, userAgent->value.data.stringVal);
-    curl_easy_setopt(curlHandle, CURLOPT_VERBOSE, verbose->value.data.boolVal);
-
-    // append headers to http request
-    struct curl_slist* httpHeaderList = NULL;
-    GroundValue* httpHeaderStrings = httpHeaders->value.data.listVal.values;
-    for (int i = 0; i < httpHeaders->value.data.listVal.size; i++) {
-        httpHeaderList = curl_slist_append(httpHeaderList, httpHeaderStrings[i].data.stringVal);
     }
-    curl_easy_setopt(curlHandle, CURLOPT_HTTPHEADER, httpHeaderList);
+    
-
+    CURL* handle = curl_easy_init();
-
+    if (!handle) {
-    CURLcode curlStatus = curl_easy_perform(curlHandle);
+        ERROR("CURL failed to init", "GenericWSError");
-    curl_slist_free_all(httpHeaderList); // dont want em' memory leaks :P - spooopy
-
-    // check for any curl errors
-    if (curlStatus != CURLE_OK) {
-        char curlErrorMsg[255] = {0};
-
-        snprintf(curlErrorMsg, 255, "%s\n", curl_easy_strerror(curlStatus));
-        ERROR(curlErrorMsg, "CurlError");
     }
+    
+    curl_easy_setopt(handle, CURLOPT_URL, args.values[0].data.stringVal);
+    curl_easy_setopt(handle, CURLOPT_CONNECT_ONLY, 2L); // WebSocket mode
+    curl_easy_setopt(handle, CURLOPT_TIMEOUT, 10L);
+    
+    CURLcode result = curl_easy_perform(handle);
+    
+    if (result != CURLE_OK) {
+        char buf[256];
+        snprintf(buf, sizeof(buf) - 1, "Curl WebSocket failed: %s\n", curl_easy_strerror(result));
+        curl_easy_cleanup(handle);
+        ERROR(buf, "ActionWSError");
+    }
+    
+    ws_connections[slot].handle = handle;
+    ws_connections[slot].connected = true;
+    ws_connections[slot].url = strdup(args.values[0].data.stringVal);
+    
+    return groundCreateValue(INT, (int64_t)slot);
+}
 
-    // get the http response code
+// WebSocket Send - sends a text message, returns bytes sent as INT
-    long httpCode = 0;
+GroundValue ws_send(GroundScope* scope, List args) {
-    curl_easy_getinfo(curlHandle, CURLINFO_RESPONSE_CODE, &httpCode);
+    int conn_id = (int)args.values[0].data.intVal;
+    if (conn_id < 0 || conn_id >= MAX_WS_CONNECTIONS || !ws_connections[conn_id].connected) {
+        ERROR("Invalid WebSocket connection ID", "GenericWSError");
+    }
+    
+    CURL* handle = ws_connections[conn_id].handle;
+    const char* message = args.values[1].data.stringVal;
+    size_t sent;
+    
+    CURLcode result = curl_ws_send(handle, message, strlen(message), &sent, 0, CURLWS_TEXT);
+    
+    if (result != CURLE_OK) {
+        char buf[256];
+        snprintf(buf, sizeof(buf) - 1, "WebSocket send failed: %s\n", curl_easy_strerror(result));
+        ERROR(buf, "ActionWSError");
+    }
+    
+    return groundCreateValue(INT, (int64_t)sent);
+}
 
-    // create return value and return it
+// WebSocket Receive - receives a message (blocking)
-    GroundValue value = groundCreateValue(CUSTOM, &template);
+GroundValue ws_receive(GroundScope* scope, List args) {
+    int conn_id = (int)args.values[0].data.intVal;
+    if (conn_id < 0 || conn_id >= MAX_WS_CONNECTIONS || !ws_connections[conn_id].connected) {
+        ERROR("Invalid WebSocket connection ID", "GenericWSError");
+    }
+    
+    CURL* handle = ws_connections[conn_id].handle;
+    char buffer[4096];
+    size_t received;
+    const struct curl_ws_frame* meta;
+    
+    CURLcode result = curl_ws_recv(handle, buffer, sizeof(buffer) - 1, &received, &meta);
+    
+    if (result != CURLE_OK) {
+        if (result == CURLE_AGAIN) {
+            // No data available right now
+            return groundCreateValue(STRING, "");
+        }
+        char buf[256];
+        snprintf(buf, sizeof(buf) - 1, "WebSocket receive failed: %s\n", curl_easy_strerror(result));
+        ERROR(buf, "ActionWSError");
+    }
+    
+    buffer[received] = '\0';
+    
+    // Handle different frame types
+    if (meta->flags & CURLWS_CLOSE) {
+        printf("WebSocket close frame received\n");
+        ws_connections[conn_id].connected = false;
+        return groundCreateValue(STRING, "[CLOSED]");
+    }
+    
+    if (meta->flags & CURLWS_PING) {
+        // Automatically respond to ping with pong
+        curl_ws_send(handle, "", 0, &received, 0, CURLWS_PONG);
+        return groundCreateValue(STRING, "[PING]");
+    }
+    
+    char* data = malloc(received + 1);
+    memcpy(data, buffer, received);
+    data[received] = '\0';
+    
+    return groundCreateValue(STRING, data);
+}
 
-    GroundObjectField* status = groundFindField(*value.data.customVal, "statusCode");
+// WebSocket Receive with timeout (non-blocking version)
-    status->value.data.intVal = httpCode;
+GroundValue ws_receive_timeout(GroundScope* scope, List args) {
+    int conn_id = (int)args.values[0].data.intVal;
+    long timeout_ms = (long)args.values[1].data.intVal;
+    
+    if (conn_id < 0 || conn_id >= MAX_WS_CONNECTIONS || !ws_connections[conn_id].connected) {
+        ERROR("Invalid WebSocket connection ID", "GenericWSError");
+    }
+    
+    CURL* handle = ws_connections[conn_id].handle;
+    
+    // Set socket to non-blocking mode
+    curl_easy_setopt(handle, CURLOPT_TIMEOUT_MS, timeout_ms);
+    
+    char buffer[4096];
+    size_t received;
+    const struct curl_ws_frame* meta;
+    
+    CURLcode result = curl_ws_recv(handle, buffer, sizeof(buffer) - 1, &received, &meta);
+    
+    if (result == CURLE_AGAIN || result == CURLE_OPERATION_TIMEDOUT) {
+        return groundCreateValue(STRING, "");
+    }
+    
+    if (result != CURLE_OK) {
+        char buf[256];
+        snprintf(buf, sizeof(buf) - 1, "WebSocket receive failed: %s\n", curl_easy_strerror(result));
+        ERROR(buf, "ActionWSError");
+    }
+    
+    buffer[received] = '\0';
+    
+    if (meta->flags & CURLWS_CLOSE) {
+        ws_connections[conn_id].connected = false;
+        return groundCreateValue(STRING, "[CLOSED]");
+    }
+    
+    if (meta->flags & CURLWS_PING) {
+        curl_ws_send(handle, "", 0, &received, 0, CURLWS_PONG);
+        return groundCreateValue(STRING, "[PING]");
+    }
+    
+    char* data = malloc(received + 1);
+    memcpy(data, buffer, received);
+    data[received] = '\0';
+    
+    return groundCreateValue(STRING, data);
+}
 
-    GroundObjectField* data = groundFindField(*value.data.customVal, "data");
+// WebSocket Close - properly close a connection, returns BOOL success
-    data->value.data.stringVal = buffer.data;
+GroundValue ws_close(GroundScope* scope, List args) {
+    int conn_id = (int)args.values[0].data.intVal;
+    if (conn_id < 0 || conn_id >= MAX_WS_CONNECTIONS || !ws_connections[conn_id].connected) {
+        ERROR("Invalid or already connected websocket", "GenericWSError");
+    }
+    
+    CURL* handle = ws_connections[conn_id].handle;
+    size_t sent;
+    
+    // Send close frame
+    curl_ws_send(handle, "", 0, &sent, 0, CURLWS_CLOSE);
+    
+    // Cleanup
+    curl_easy_cleanup(handle);
+    free(ws_connections[conn_id].url);
+    ws_connections[conn_id].handle = NULL;
+    ws_connections[conn_id].connected = false;
+    ws_connections[conn_id].url = NULL;
+    
+    return groundCreateValue(BOOL, true);
+}
 
-    value.type = CUSTOM;
+// WebSocket Send Binary data, returns bytes sent as INT
-
+GroundValue ws_send_binary(GroundScope* scope, List args) {
-    return value;
+    int conn_id = (int)args.values[0].data.intVal;
+    if (conn_id < 0 || conn_id >= MAX_WS_CONNECTIONS || !ws_connections[conn_id].connected) {
+        ERROR("Invalid WebSocket connection ID", "GenericWSError");
+    }
+    
+    CURL* handle = ws_connections[conn_id].handle;
+    const char* data = args.values[1].data.stringVal;
+    size_t sent;
+    
+    CURLcode result = curl_ws_send(handle, data, strlen(data), &sent, 0, CURLWS_BINARY);
+    
+    if (result != CURLE_OK) {
+        char buf[256];
+        snprintf(buf, sizeof(buf) - 1, "WebSocket binary send failed: %s\n", curl_easy_strerror(result));
+        ERROR(buf, "ActionWSError");
+    }
+    
+    return groundCreateValue(INT, (int64_t)sent);
 }
 
 void ground_init(GroundScope* scope) {
-    // init libcurl
+    // HTTP Functions
-    curl_global_init(CURL_GLOBAL_ALL);
+    groundAddNativeFunction(scope, "request_Get", get_request, STRING, 1, STRING, "url");
-    curlHandle = curl_easy_init();
+    groundAddNativeFunction(scope, "request_Post", post_request, STRING, 2, STRING, "url", STRING, "data");
-
+    
-    groundAddValueToScope(scope, "requestInitSuccess", groundCreateValue(BOOL, curlHandle != NULL));
+    // WebSocket Functions
-    if (curlHandle == NULL) {
+    groundAddNativeFunction(scope, "ws_Connect", ws_connect, INT, 1, STRING, "url");
-        return;
+    groundAddNativeFunction(scope, "ws_Send", ws_send, INT, 2, INT, "conn_id", STRING, "message");
-    } 
+    groundAddNativeFunction(scope, "ws_Receive", ws_receive, STRING, 1, INT, "conn_id");
-
+    groundAddNativeFunction(scope, "ws_ReceiveTimeout", ws_receive_timeout, STRING, 2, INT, "conn_id", INT, "timeout_ms");
-    // create struct
+    groundAddNativeFunction(scope, "ws_Close", ws_close, BOOL, 1, INT, "conn_id");
-    template = groundCreateStruct();
+    groundAddNativeFunction(scope, "ws_SendBinary", ws_send_binary, INT, 2, INT, "conn_id", STRING, "data");
-    groundAddFieldToStruct(&template, "statusCode", groundCreateValue(INT, 200));
+}
-    groundAddFieldToStruct(&template, "data", groundCreateValue(STRING, ""));
-    groundAddFieldToStruct(&template, "ok", groundCreateValue(BOOL, 1));
-
-    // create struct that users can pass to this library
-    GroundStruct requestStruct = groundCreateStruct();
-    groundAddFieldToStruct(&requestStruct, "address", groundCreateValue(STRING, ""));
-    groundAddFieldToStruct(&requestStruct, "type", groundCreateValue(STRING, "GET"));
-    groundAddFieldToStruct(&requestStruct, "userAgent", groundCreateValue(STRING, "Ground/1.0"));
-    groundAddFieldToStruct(&requestStruct, "httpHeaders", groundCreateValue(LIST, 0));
-    groundAddFieldToStruct(&requestStruct, "verbose", groundCreateValue(BOOL, 0));
-
-    groundAddValueToScope(scope, "request", groundCreateValue(STRUCTVAL, requestStruct));
-
-    // create functions
-    groundAddNativeFunction(scope, "request_Request", ground_request, CUSTOM, 1, CUSTOM, "requestInfo");
-}

src/main.c

@@ -3,7 +3,6 @@
 #include "compiler.h"
 #include "types.h"
 #include "serialize.h"
-#include "repl.h"
 #include <stdio.h>
 #include <string.h>
 
@@ -44,8 +43,9 @@ char* getFileContents(const char* filename) {
 }
 
 int main(int argc, char** argv) {
-    if (argc == 1) {
+    if (argc < 2) {
-        exit(repl());
+        printf("Usage: %s <file> [-c] [--compile] [-h] [--help]\n", argv[0]);
+        exit(1);
     }
 
     bool compile = false;
@@ -71,7 +71,7 @@ int main(int argc, char** argv) {
             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) {
+        } else if (strcmp("--writebytecode", argv[i]) == 0 || strcmp("-w", argv[i]) == 0) {
             if (compile) {
                 printf("Cannot choose both bytecode and compilation");
                 exit(1);

src/parser.c

@@ -176,11 +176,6 @@ 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;
@@ -199,7 +194,6 @@ static GroundInstType getInstructionType(const char* inst) {
     if (strcmp(inst, "use") == 0) return USE;
     if (strcmp(inst, "extern") == 0) return EXTERN;
     if (strcmp(inst, "drop") == 0) return DROP;
-    if (strcmp(inst, "license") == 0) return LICENSE;
     if (strcmp(inst, "PAUSE") == 0) return PAUSE;
     
     fprintf(stderr, "Error: Unknown instruction: %s\n", inst);

src/repl.c

@@ -1,60 +0,0 @@
-/*
- * Ground REPL (shows when ground is ran without any arguments)
- * Copyright (C) 2026 DiamondNether90
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "interpreter.h"
-#include "include/estr.h"
-#include "parser.h"
-#define BUFFER_SIZE 1024
-
-int repl() {
-    printf("Ground REPL\n");
-    printf("Copyright (C) DiamondNether90 2026\n");
-    printf("Distributed under the GNU GPL-3.0 license; type \"license\" for more info\n");
-    char input[BUFFER_SIZE];
-    
-    GroundVariable* variables = NULL;
-    GroundLabel* labels = NULL;
-
-    GroundScope scope;
-    scope.variables = &variables;
-    scope.labels = &labels;
-    scope.isMainScope = true;
-    while (true) {
-        Estr programString = CREATE_ESTR("");
-        *scope.labels = NULL;
-        
-        // Get program
-        printf(">>> ");
-        while (true) {
-            fgets(input, BUFFER_SIZE, stdin);
-            if (strcmp(input, "\n") == 0) {
-                break;
-            }
-            APPEND_ESTR(programString, input);
-            printf("...");
-        }
-        
-        // Interpret program
-        GroundProgram program = createGroundProgram();
-        program = parseFile(programString.str);
-        interpretGroundProgram(&program, &scope);
-        freeGroundProgram(&program);
-        
-        DESTROY_ESTR(programString);
-    }
-}

src/repl.h

@@ -1 +0,0 @@
-int repl();

src/types.c

@@ -87,14 +87,11 @@ GroundValue copyGroundValue(const GroundValue* gv) {
         case CHAR: newGv.data.charVal = gv->data.charVal; break;
         case BOOL: newGv.data.boolVal = gv->data.boolVal; break;
         case STRING:
-            /*
             if (gv->data.stringVal != NULL) {
                 newGv.data.stringVal = strdup(gv->data.stringVal);
             } else {
                 newGv.data.stringVal = NULL;
             }
-            */
-            newGv.data.stringVal = gv->data.stringVal;
             break;
         case LIST: {
             List newList = createList();
@@ -261,8 +258,7 @@ void printGroundValue(GroundValue* gv) {
 
 void freeGroundValue(GroundValue* gv) {
     if (gv->type == STRING && gv->data.stringVal != NULL) {
-        // leak some memory for now
+        free(gv->data.stringVal);
-        // free(gv->data.stringVal);
         gv->data.stringVal = NULL;
     }
     if (gv->type == LIST && gv->data.listVal.values != NULL) {
@@ -486,21 +482,6 @@ 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;
@@ -560,7 +541,6 @@ void printGroundInstruction(GroundInstruction* gi) {
     }
     if (gi->type != CREATELABEL) printf(" ");
     for (size_t i = 0; i < gi->args.length; i++) {
-        if (i != 0) printf(" ");
         if (gi->args.args[i].type == VALUE && gi->args.args[i].value.value.type == STRING) {
             printf("\"");
             printGroundArg(&gi->args.args[i]);
@@ -568,6 +548,7 @@ void printGroundInstruction(GroundInstruction* gi) {
         } else {
             printGroundArg(&gi->args.args[i]);
         }
+        printf(" ");
     }
 }
 
@@ -580,12 +561,12 @@ List createList() {
 
 void appendToList(List* list, GroundValue value) {
     if (list == NULL) {
-        printf("Expecting a List ptr, got a null pointer instead.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/ground\n");
+        printf("Expecting a List ptr, got a null pointer instead.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/cground\n");
         exit(EXIT_FAILURE);
     }
     GroundValue* ptr = realloc(list->values, (list->size + 1) * sizeof(GroundValue));
     if (ptr == NULL) {
-        printf("There was an error allocating memory for a list.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/ground\n");
+        printf("There was an error allocating memory for a list.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/cground\n");
         exit(EXIT_FAILURE);
     }
     list->size++;
@@ -595,7 +576,7 @@ void appendToList(List* list, GroundValue value) {
 
 ListAccess getListAt(List* list, size_t idx) {
     if (list == NULL) {
-        printf("Expecting a List ptr, got a null pointer instead.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/ground\n");
+        printf("Expecting a List ptr, got a null pointer instead.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/cground\n");
         exit(EXIT_FAILURE);
     }    
     if (idx < list->size) {
@@ -613,7 +594,7 @@ ListAccess getListAt(List* list, size_t idx) {
 
 ListAccessStatus setListAt(List* list, size_t idx, GroundValue value) {
     if (list == NULL) {
-        printf("Expecting a List ptr, got a null pointer instead.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/ground\n");
+        printf("Expecting a List ptr, got a null pointer instead.\nThis is likely not an error with your Ground program.\nPlease report this issue to https://chsp.au/ground/cground\n");
         exit(EXIT_FAILURE);
     }    
     if (idx < list->size) {

src/types.h

@@ -29,7 +29,7 @@ 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, AND, OR, XOR, NEG, SHIFT, 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, 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 {
@@ -83,7 +83,7 @@ typedef struct GroundError {
 typedef struct GroundValue {
     GroundValueType type;
     struct GroundStruct* customType;
-    union {
+    struct {
         int64_t intVal;
         double doubleVal;
         char* stringVal;

tests/closure.grnd

@@ -1,15 +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
 
-set &x 10
 call !dingle 3 &result
+
+PAUSE
+
 call !result 5 &y
-println $y $x
+println $y

tests/drop.grnd

@@ -1,4 +1,4 @@
 set &x "dingus"
-println $x
+PAUSE
 drop &x
-println $x
+PAUSE

tests/end.grnd

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

tests/lib.grnd

@@ -1,4 +1,7 @@
 fun !lib_PrintHello -int
-    println "Hello"
+    println "Hello, world!"
     return 0
-endfun
+endfun
+
+println "Hello!"
+println "Hello!"

tests/list.grnd

@@ -1,6 +1,5 @@
 # A cool list
-setlist &favWords "hello" "there" "general"
+setlist &favWords "hello" "there" "general" "kenobi"
-listappend &favWords "kenobi"
 println $favWords
 
 set &count 0

tests/pause.grnd

@@ -1,2 +1,11 @@
+fun !dingle -int
+
+endfun
+
 set &x 5
-PAUSE
+set &y "dingle"
+PAUSE
+println "continuing"
+println "step through here"
+println "step again"
+println "and again"

tests/recursivefib.grnd

@@ -18,7 +18,7 @@ fun !fib -int -int &n -function &fib
 endfun
 
 # Main program
-println "Computing fib(20) recursively..."
+println "Computing fib(30) recursively..."
-call !fib 20 $fib &answer
+call !fib 30 $fib &answer
 println "Result:" $answer
 end

tests/string.grnd

@@ -2,10 +2,10 @@ input &str
 getstrsize $str &size
 set &idx 0
 @loop
-    getstrcharat $str $idx &char
+getstrcharat $str $idx &char
-    println $char
+println $char
-    add 1 $idx &idx
+add 1 $idx &idx
-    equal $idx $size &cond
+equal $idx $size &cond
-    if $cond %loopend
+if $cond %loopend
-    jump %loop
+jump %loop
 @loopend

tests/unit.sh

@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-
-echo "" > log.txt
-for f in *.grnd; do
-    [ -e "$f" ] || continue   # skip if no files match
-    # Files to skip over
-    if [[ "$f" == "lib.grnd" ]] ||
-    [[ "$f" == "string.grnd" ]] ||
-    [[ "$f" == "test.grnd" ]] ||
-    [[ "$f" == "to1000.grnd" ]] ||
-    [[ "$f" == "uhoh.grnd" ]] ||
-    [[ "$f" == "pause.grnd" ]];
-        then continue
-    fi
-    echo "Running $f"
-    ground "$f" > log.txt
-    
-    FILE="log.txt"
-    FAILED="\033[31mFailed\n\033[0m"
-    if [[ "$f" == "closure.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "13 10\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "convs.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "32\n12\n3.140000\na\n97\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "drop.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "dingus\nGround runtime error:\n  ErrorType: UnknownVariable\n  ErrorInstruction: println \$x\n  ErrorLine: 4\n"));
-            then printf "\033[31mFailed\n\033[0m"
-            exit 1
-        fi
-    elif [[ "$f" == "error.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "Ground runtime error:\n  ErrorType: Hello\n  ErrorContext: [1, 2, 3, Hi!]\n  ErrorInstruction: error \"Hello\" [1, 2, 3, Hi!] 1\n  ErrorLine: 2\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "fib.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "Fibonacci result: 7540113804746346429\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "function.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "dingle\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "list.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "[hello, there, general, kenobi]\nhello\nthere\ngeneral\nkenobi\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "recursivefib.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "Computing fib(20) recursively...\nResult: 6765\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "simple.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "dingus\ndinglefart\n5.840000\n464773025\n5164.120000\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "struct.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "53\n32\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    elif [[ "$f" == "use.grnd" ]]; then
-        if !(cmp -s "$FILE" <(printf "Hello\n"));
-            then printf $FAILED
-            exit 1
-        fi
-    else
-        printf "\033[31mCould not find test case\n\033[0m"
-        exit 1
-    fi
-done
-rm log.txt
-printf "\033[32mAll tests passed!\n\033[0m"
-exit 0