Merge pull request 'Update unstable with master' (#18) from master into unstable

Reviewed-on: #18

README.md

@@ -75,7 +75,7 @@ build
         - [x] String operations
     - [x] Maths
     - [x] Comparisions
-    - [x] Type conversions
+    - [ ] Type conversions
     - [x] Functions
         - [x] Define functions
         - [x] Call functions
@@ -83,7 +83,7 @@ build
         - [x] Arguments for functions
         - [x] Jumping within functions
     - [x] Custom data structures
-    - [x] Working with external libraries
+    - [ ] Working with external libraries
 
 ## Debugger
 
@@ -102,7 +102,7 @@ Commands:
 
 CGround now includes an experimental Ground -> x86_64 Linux ASM compiler. You can try it by adding the `-c` flag when running Ground. This will print the generated ASM to the console.
 
-At present only the `int` data type is supported.
+At present only the `int`, `char`, and `bool` data types are supported.
 
 Supported instructions so far:
 

docs/syntax.md

@@ -362,23 +362,3 @@ Looks in the path $GROUND_LIBS/`$libraryName`.grnd for the library. ($GROUND_LIB
 Attempts to import a shared library written in a compiled language like C or C++ for usage within the current program.
 
 Looks in the path $GROUND_LIBS/`$libraryName`.so for the library. ($GROUND_LIBS is a system environment variable.)
-
-### Data Structures
-
-#### struct -structName
-
-Creates a new struct which can be initialised. Until the endstruct keyword, the only valid instructions are init, set, fun, endfun, struct, and endstruct.
-
-Any value created inside the struct will be added to the struct.
-
-#### endstruct
-
-Ends the creation of a struct.
-
-#### getfield $object &fieldName &outputVar
-
-Gets a field from an initialised object. fieldName must be a valid name of a field in the object. Errors if the field does not exist. 
-
-#### setfield &object &fieldName $value
-
-Sets a field to a new value in the object. The value must be of the same type as the field's old value.

include/groundvm.h

@@ -1,6 +1,5 @@
 #ifndef LIBGROUND_H
 #define LIBGROUND_H
-#define MAX_ID_LEN 64
 
 /*
  * groundvm.h 
@@ -14,9 +13,8 @@
 #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, ITOC, CTOI, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, STRUCT, ENDSTRUCT, INIT, GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, ERRORCMD
+    IF, JUMP, END, INPUT, PRINT, PRINTLN, SET, GETTYPE, EXISTS, SETLIST, SETLISTAT, GETLISTAT, GETLISTSIZE, LISTAPPEND, GETSTRSIZE, GETSTRCHARAT, ADD, SUBTRACT, MULTIPLY, DIVIDE, EQUAL, INEQUAL, NOT, GREATER, LESSER, STOI, STOD, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, STRUCT, ENDSTRUCT, INIT, GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, ERRORCMD
 } GroundInstType;
 
 typedef enum GroundValueType {
@@ -166,24 +164,6 @@ 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
@@ -199,8 +179,6 @@ 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);

src/compiler.c

@@ -4,6 +4,7 @@
 #include "include/estr.h"
 #include <stdint.h>
 #include <inttypes.h>
+#include <stdio.h>
 
 VariableTable createVariableTable() {
     VariableTable vt;
@@ -13,7 +14,7 @@ VariableTable createVariableTable() {
     return vt;
 } 
 
-void addVtVariable(VariableTable* vt, const char* name) {
+void addVtVariable(VariableTable* vt, const char* name, GroundValueType type) {
     // check if it already exists
     for (size_t i = 0; i < vt->count; i++) {
         if (strcmp(vt->vars[i].name, name) == 0) {
@@ -29,10 +30,20 @@ void addVtVariable(VariableTable* vt, const char* name) {
 
     // add the variable
     strcpy(vt->vars[vt->count].name, name);
+    vt->vars[vt->count].type = type;
     vt->vars[vt->count].offset = vt->count * 8;
     vt->count++;
 }
 
+VariableInfo* getVariable(VariableTable* vt, const char* name) {
+    for (size_t i = 0; i < vt->count; i++) {
+        if (strcmp(vt->vars[i].name, name) == 0) {
+            return &vt->vars[i];
+        }
+    }
+    return NULL;
+}
+
 int getVariablePos(VariableTable* vt, const char* name) {
     for (size_t i = 0; i < vt->count; i++) {
         if (strcmp(vt->vars[i].name, name) == 0) {
@@ -42,6 +53,318 @@ int getVariablePos(VariableTable* vt, const char* name) {
     return -1;
 }
 
+DoubleTable createDoubleTable() {
+    DoubleTable dt;
+    dt.count = 0;
+    dt.capacity = 16;
+    dt.constants = malloc(sizeof(DoubleConstant) * 16);
+    return dt;
+}
+
+char* addDoubleConstant(DoubleTable* dt, Estr* rodata, double value, int* counter) {
+    for (size_t i = 0; i < dt->count; i++) {
+        if (dt->constants[i].value == value) {
+            return dt->constants[i].label;
+        }
+    }
+
+    if (dt->count >= dt->capacity) {
+        dt->capacity = dt->capacity == 0 ? 16 : dt->capacity * 2; 
+        dt->constants = realloc(dt->constants, sizeof(DoubleConstant) * dt->capacity);
+    }
+
+    char label[64];
+    snprintf(label, sizeof(label), "float_const_%d", (*counter)++);
+    strcpy(dt->constants[dt->count].label, label);
+    dt->constants[dt->count].value = value;
+    dt->count++;
+
+    char line[128];
+    snprintf(line, 128, "%s: dq %.17g ; double constant\n", label, value);
+    APPEND_ESTR((*rodata), line);
+
+    return dt->constants[dt->count - 1].label;
+}
+
+GroundValueType getInstructionReturnType(GroundInstruction* gi, VariableTable* table) {
+    switch (gi->type) {
+        case JUMP:
+        case PRINT:
+        case PRINTLN:
+        case END:
+        case IF:
+        case RETURN:
+        case ENDFUN:
+        case PUSHARG:
+        case CALL: // FIXME do this when functions are added
+        case USE:
+        case EXTERN:
+        case CREATELABEL:
+        case PAUSE:
+        case DROP:
+        case ERRORCMD:
+        case ENDSTRUCT:
+        case INIT: // FIXME do this when objects are added
+        case GETFIELD: // FIXME do this when objects are added
+        case SETFIELD: // FIXME do this when objects are added
+        case DIVIDE: // FIXME do this when division is added
+        case SETLISTAT:
+        case GETLISTAT: // FIXME do this when lists are getting implemented
+        case LISTAPPEND: {
+            return NONE;
+        }
+        case TOSTRING:
+        case GETTYPE:
+        case INPUT: {
+            return STRING;
+        }
+        case STOI:
+        case GETLISTSIZE:
+        case GETSTRSIZE: {
+            return INT;
+        }
+        case STOD: {
+            return DOUBLE;
+        }
+        case EQUAL:
+        case INEQUAL:
+        case GREATER:
+        case LESSER:
+        case NOT:
+        case EXISTS: {
+            return BOOL;
+        }
+        case GETSTRCHARAT: {
+            return CHAR;
+        }
+        case SETLIST: {
+            return LIST;
+        }
+        case FUN: {
+            return FUNCTION;
+        }
+        case STRUCT: {
+            return STRUCTVAL;
+        }
+        case SET: {
+            if (gi->args.length == 2) {
+                if (gi->args.args[1].type == VALUE) {
+                    return gi->args.args[1].value.value.type;
+                } else if (gi->args.args[1].type == VALREF) {
+                    VariableInfo* var = getVariable(table, gi->args.args[1].value.refName);
+                    if (var == NULL) {
+                        return NONE;
+                    }
+                    return var->type;
+                } else {
+                    return NONE;
+                }
+            } else {
+                return NONE;
+            }
+        }
+        case ADD: {
+            if (gi->args.length == 3) {
+                GroundValueType leftType;
+                GroundValueType rightType;
+                if (gi->args.args[0].type == VALUE) {
+                    leftType = gi->args.args[0].value.value.type;
+                } else if (gi->args.args[0].type == VALREF) {
+                    VariableInfo* var = getVariable(table, gi->args.args[0].value.refName);
+                    if (var == NULL) {
+                        return NONE;
+                    }
+                    leftType = var->type;
+                } else {
+                    return NONE;
+                }
+                if (gi->args.args[1].type == VALUE) {
+                    rightType = gi->args.args[1].value.value.type;
+                } else if (gi->args.args[1].type == VALREF) {
+                    VariableInfo* var = getVariable(table, gi->args.args[1].value.refName);
+                    if (var == NULL) {
+                        return NONE;
+                    }
+                    rightType = var->type;
+                } else {
+                    return NONE;
+                }
+
+                if (leftType == STRING) {
+                    if (rightType == STRING) {
+                        return STRING;
+                    } else {
+                        return NONE;
+                    }
+                }
+                if (leftType == DOUBLE) {
+                    if (rightType == DOUBLE || rightType == INT) {
+                        return DOUBLE;
+                    } else {
+                        return NONE;
+                    }
+                }
+                if (rightType == DOUBLE) {
+                    if (leftType == DOUBLE || leftType == INT) {
+                        return DOUBLE;
+                    } else {
+                        return NONE;
+                    }
+                }
+                if (rightType == INT && leftType == INT) {
+                    return INT;
+                }
+                return NONE;
+            } else {
+                return NONE;
+            }
+        }
+        case SUBTRACT: {
+            if (gi->args.length == 3) {
+                GroundValueType leftType;
+                GroundValueType rightType;
+                if (gi->args.args[0].type == VALUE) {
+                    leftType = gi->args.args[0].value.value.type;
+                } else if (gi->args.args[0].type == VALREF) {
+                    VariableInfo* var = getVariable(table, gi->args.args[0].value.refName);
+                    if (var == NULL) {
+                        return NONE;
+                    }
+                    leftType = var->type;
+                } else {
+                    return NONE;
+                }
+                if (gi->args.args[1].type == VALUE) {
+                    rightType = gi->args.args[1].value.value.type;
+                } else if (gi->args.args[1].type == VALREF) {
+                    VariableInfo* var = getVariable(table, gi->args.args[1].value.refName);
+                    if (var == NULL) {
+                        return NONE;
+                    }
+                    rightType = var->type;
+                } else {
+                    return NONE;
+                }
+
+                if (leftType == DOUBLE) {
+                    if (rightType == DOUBLE || rightType == INT) {
+                        return DOUBLE;
+                    } else {
+                        return NONE;
+                    }
+                }
+                if (rightType == DOUBLE) {
+                    if (leftType == DOUBLE || leftType == INT) {
+                        return DOUBLE;
+                    } else {
+                        return NONE;
+                    }
+                }
+                if (rightType == INT && leftType == INT) {
+                    return INT;
+                }
+                return NONE;
+            } else {
+                return NONE;
+            }
+        }
+        case MULTIPLY: {
+            if (gi->args.length == 3) {
+                GroundValueType leftType;
+                GroundValueType rightType;
+                if (gi->args.args[0].type == VALUE) {
+                    leftType = gi->args.args[0].value.value.type;
+                } else if (gi->args.args[0].type == VALREF) {
+                    VariableInfo* var = getVariable(table, gi->args.args[0].value.refName);
+                    if (var == NULL) {
+                        return NONE;
+                    }
+                    leftType = var->type;
+                } else {
+                    return NONE;
+                }
+                if (gi->args.args[1].type == VALUE) {
+                    rightType = gi->args.args[1].value.value.type;
+                } else if (gi->args.args[1].type == VALREF) {
+                    VariableInfo* var = getVariable(table, gi->args.args[1].value.refName);
+                    if (var == NULL) {
+                        return NONE;
+                    }
+                    rightType = var->type;
+                } else {
+                    return NONE;
+                }
+
+                if (leftType == DOUBLE) {
+                    if (rightType == DOUBLE || rightType == INT) {
+                        return DOUBLE;
+                    } else {
+                        return NONE;
+                    }
+                }
+                if (rightType == DOUBLE) {
+                    if (leftType == DOUBLE || leftType == INT) {
+                        return DOUBLE;
+                    } else {
+                        return NONE;
+                    }
+                }
+                if (rightType == INT && leftType == INT) {
+                    return INT;
+                }
+                return NONE;
+            } else {
+                return NONE;
+            }
+        }
+    }
+    return INT;
+}
+
+char* processValueString(GroundArg arg, VariableTable* vt, GroundValueType* outType, DoubleTable* dt, Estr* rodata, int* doubleCounter) {
+    if (arg.type == VALREF) {
+        VariableInfo* var = getVariable(vt, arg.value.refName);
+        if (var && outType) *outType = var->type;
+        char* buf = malloc(260);
+        snprintf(buf, 260, "[%s]", arg.value.refName);
+        return buf;
+    }
+    if (arg.type == VALUE) {
+        if (outType) *outType = arg.value.value.type;
+        switch(arg.value.value.type) {
+            case INT: {
+                char* buf = malloc(64);
+                snprintf(buf, 64, "%" PRId64, arg.value.value.data.intVal);
+                return buf;
+                break;
+            }
+            case DOUBLE: {
+                char* label = addDoubleConstant(dt, rodata, arg.value.value.data.doubleVal, doubleCounter);
+                char* buf = malloc(128);
+                snprintf(buf, 128, "[rel %s]", label);
+                return buf;
+                break;
+            }
+            case BOOL:
+                return arg.value.value.data.boolVal ? "1" : "0";
+                break;
+            case CHAR: {
+                char* buf = malloc(8);
+                snprintf(buf, 8, "%d", (int)arg.value.value.data.charVal);
+                return buf;
+                break;
+            }
+            default: {
+                printf("For now, only int, bool, and char are supported data types in the compiler.");
+                exit(1);
+                break;
+            }
+        }
+    }
+    return NULL;
+}
+
+/*
 char* processValueString(GroundArg arg) {
     if (arg.type == VALREF) {
         char* buf = malloc(sizeof(char) * 260);
@@ -49,21 +372,43 @@ char* processValueString(GroundArg arg) {
         return buf;
     }
     if (arg.type == VALUE) {
-        if (arg.value.value.type != INT) {
+        switch (arg.value.value.type) {
-            printf("Only int is supported right now\n");
+            case INT: {
-            exit(1);
-        }
                 char* buf = malloc(sizeof(char) * 64);
                 snprintf(buf, sizeof(char) * 260, "%" PRId64, arg.value.value.data.intVal);
                 return buf;
+                break;
+            }
+            case BOOL: {
+                return arg.value.value.data.boolVal ? "1" : "0";
+                break;
+            }
+            case CHAR: {
+                char* buf = malloc(8);
+                snprintf(buf, 8, "%d", (int) arg.value.value.data.charVal);
+                return buf;
+                break;
+            }
+            default: {
+                printf("For now, only int, bool, and char are supported data types in the compiler.");
+                exit(1);
+                break;
+            }
+        }
     }
     return NULL;
 }
+*/
 
 char* compileGroundProgram(GroundProgram* program) {
     Estr start = CREATE_ESTR("global _start\nsection .text\n_start:\n");
     Estr data = CREATE_ESTR("section .bss\n");
     Estr helpers = CREATE_ESTR("");
+    Estr rodata = CREATE_ESTR("section .rodata\n");
+    APPEND_ESTR(rodata, "  newline_char: db 10\n");
+    APPEND_ESTR(rodata, "  space_char: db 32\n");
+    DoubleTable doubleTable = createDoubleTable();
+    int doubleConstCounter = 0;
 
     APPEND_ESTR(helpers, "\n; Helper: Print integer in rax\n");
     APPEND_ESTR(helpers, "print_int:\n");
@@ -124,7 +469,7 @@ char* compileGroundProgram(GroundProgram* program) {
         GroundInstruction gi = program->instructions[i];
         for (size_t j = 0; j < gi.args.length; j++) {
             if (gi.args.args[j].type == DIRREF) {
-                addVtVariable(&varTable, gi.args.args[j].value.refName);
+                addVtVariable(&varTable, gi.args.args[j].value.refName, getInstructionReturnType(&gi, &varTable));
             }
         }
     }
@@ -166,7 +511,7 @@ char* compileGroundProgram(GroundProgram* program) {
 
                 APPEND_ESTR(start, "  ; set\n")
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  mov [");
                 APPEND_ESTR(start, varName);
@@ -212,7 +557,7 @@ char* compileGroundProgram(GroundProgram* program) {
 
                 APPEND_ESTR(start, "  ; if\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  test rax, rax\n");
                 APPEND_ESTR(start, "  jnz ");
@@ -239,7 +584,7 @@ char* compileGroundProgram(GroundProgram* program) {
 
                 APPEND_ESTR(start, "  ; not\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  xor rax, 1\n");
                 APPEND_ESTR(start, "  mov [");
@@ -265,17 +610,55 @@ char* compileGroundProgram(GroundProgram* program) {
                     runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for arg 3", &gi, i);
                 }
 
+                GroundValueType leftType, rightType;
+
+                char* left = processValueString(gi.args.args[0], &varTable, &leftType, &doubleTable, &rodata, &doubleConstCounter);
+                char* right = processValueString(gi.args.args[1], &varTable, &rightType, &doubleTable, &rodata, &doubleConstCounter);
                 char* varName = gi.args.args[2].value.refName;
+
+                bool isDouble = (leftType == DOUBLE || rightType == DOUBLE);
+                
+                if (isDouble) {
+                    APPEND_ESTR(start, "  ; add (double)\n");
+                    
+                    if (leftType == INT) {
+                        APPEND_ESTR(start, "  mov rax, ");
+                        APPEND_ESTR(start, left);
+                        APPEND_ESTR(start, "\n");
+                        APPEND_ESTR(start, "  cvtsi2sd xmm0, rax  ; Convert int to double\n");
+                    } else {
+                        APPEND_ESTR(start, "  movsd xmm0, ");
+                        APPEND_ESTR(start, left);
+                        APPEND_ESTR(start, "\n");
+                    }
+                    
+                    if (rightType == INT) {
+                        APPEND_ESTR(start, "  mov rax, ");
+                        APPEND_ESTR(start, right);
+                        APPEND_ESTR(start, "\n");
+                        APPEND_ESTR(start, "  cvtsi2sd xmm1, rax  ; Convert int to double\n");
+                        APPEND_ESTR(start, "  addsd xmm0, xmm1\n");
+                    } else {
+                        APPEND_ESTR(start, "  addsd xmm0, ");
+                        APPEND_ESTR(start, right);
+                        APPEND_ESTR(start, "\n");
+                    }
+                    
+                    APPEND_ESTR(start, "  movsd [");
+                    APPEND_ESTR(start, varName);
+                    APPEND_ESTR(start, "], xmm0\n");
+                } else {
                     APPEND_ESTR(start, "  ; add\n");
                     APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                    APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                     APPEND_ESTR(start, "\n");
                     APPEND_ESTR(start, "  add rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                    APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                     APPEND_ESTR(start, "\n");
                     APPEND_ESTR(start, "  mov [");
                     APPEND_ESTR(start, varName);
                     APPEND_ESTR(start, "], rax\n");
+                }
                 break;
             }
             case SUBTRACT: {
@@ -298,10 +681,10 @@ char* compileGroundProgram(GroundProgram* program) {
                 char* varName= gi.args.args[2].value.refName;
                 APPEND_ESTR(start, "  ; subtract\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  sub rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  mov [");
                 APPEND_ESTR(start, varName);
@@ -328,10 +711,10 @@ char* compileGroundProgram(GroundProgram* program) {
                 char* varName= gi.args.args[2].value.refName;
                 APPEND_ESTR(start, "  ; multiply\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  imul rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  mov [");
                 APPEND_ESTR(start, varName);
@@ -358,10 +741,10 @@ char* compileGroundProgram(GroundProgram* program) {
                 char* varName= gi.args.args[2].value.refName;
                 APPEND_ESTR(start, "  ; equal\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  cmp rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  sete al\n");
                 APPEND_ESTR(start, "  movzx rax, al\n");
@@ -390,10 +773,10 @@ char* compileGroundProgram(GroundProgram* program) {
                 char* varName= gi.args.args[2].value.refName;
                 APPEND_ESTR(start, "  ; inequal\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  cmp rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  setne al\n");
                 APPEND_ESTR(start, "  movzx rax, al\n");
@@ -422,10 +805,10 @@ char* compileGroundProgram(GroundProgram* program) {
                 char* varName= gi.args.args[2].value.refName;
                 APPEND_ESTR(start, "  ; greater\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  cmp rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  setg al\n");
                 APPEND_ESTR(start, "  movzx rax, al\n");
@@ -454,10 +837,10 @@ char* compileGroundProgram(GroundProgram* program) {
                 char* varName= gi.args.args[2].value.refName;
                 APPEND_ESTR(start, "  ; lesser\n");
                 APPEND_ESTR(start, "  mov rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  cmp rax, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[1]));
+                APPEND_ESTR(start, processValueString(gi.args.args[1], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  setl al\n");
                 APPEND_ESTR(start, "  movzx rax, al\n");
@@ -487,7 +870,7 @@ char* compileGroundProgram(GroundProgram* program) {
                     }
                     APPEND_ESTR(start, "  ; print int\n");
                     APPEND_ESTR(start, "  mov rax, ");
-                    APPEND_ESTR(start, processValueString(gi.args.args[j]));
+                    APPEND_ESTR(start, processValueString(gi.args.args[j], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                     APPEND_ESTR(start, "\n");
                     APPEND_ESTR(start, "  call print_int\n");
                 }
@@ -512,7 +895,7 @@ char* compileGroundProgram(GroundProgram* program) {
                 APPEND_ESTR(start, "  ; end\n");
                 APPEND_ESTR(start, "  mov rax, 60\n");
                 APPEND_ESTR(start, "  mov rdi, ");
-                APPEND_ESTR(start, processValueString(gi.args.args[0]));
+                APPEND_ESTR(start, processValueString(gi.args.args[0], &varTable, NULL, &doubleTable, &rodata, &doubleConstCounter));
                 APPEND_ESTR(start, "\n");
                 APPEND_ESTR(start, "  syscall\n");
                 break;
@@ -532,10 +915,8 @@ char* compileGroundProgram(GroundProgram* program) {
     APPEND_ESTR(complete, start.str);
     APPEND_ESTR(complete, "  ; End of program\n  mov rax, 60\n  mov rdi, 0\n  syscall\n");
     APPEND_ESTR(complete, helpers.str);
-    APPEND_ESTR(complete, "\nsection .rodata\n");
+    APPEND_ESTR(complete, data.str);
-    APPEND_ESTR(complete, "newline_char: db 10\n");
+    APPEND_ESTR(complete, rodata.str);
-    APPEND_ESTR(complete, "space_char: db 32\n");
-    APPEND_ESTR(complete, data.str)
 
     return complete.str;
 }

src/compiler.h

@@ -7,6 +7,7 @@ char* compileGroundProgram(GroundProgram* program);
 typedef struct VariableInfo {
     char name[256];
     int offset;
+    GroundValueType type;
 } VariableInfo;
 
 typedef struct VariableTable {
@@ -15,4 +16,13 @@ typedef struct VariableTable {
     size_t capacity;
 } VariableTable;
 
+typedef struct DoubleConstant {
+    double value;
+    char label[64];
+} DoubleConstant;
 
+typedef struct DoubleTable {
+    DoubleConstant* constants;
+    size_t count;
+    size_t capacity;
+} DoubleTable;

src/interpreter.c

@@ -5,9 +5,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef _WIN32
 #include <dlfcn.h>
-#endif
 #include <stdarg.h>
 #include <unistd.h>
 
@@ -445,7 +443,6 @@ GroundStruct parseStruct(GroundProgram* in, GroundScope* scope, size_t errorOffs
                     addInstructionToProgram(&gp, in->instructions[i]);
                     i++;
                 }
-                i--;
 
                 GroundFunction* function = parseFunction(&gp, errorOffset);
                 function->startLine = i;
@@ -512,7 +509,6 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
                 addInstructionToProgram(&gp, in->instructions[i]);
                 i++;
             }
-            i--;
 
             GroundFunction* function = parseFunction(&gp, errorOffset);
             function->startLine = i;
@@ -550,7 +546,6 @@ GroundValue interpretGroundProgram(GroundProgram* in, GroundScope* inScope) {
                 addInstructionToProgram(&gp, in->instructions[i]);
                 i++;
             }
-            i--;
 
             GroundValue gv = {
                 .type = STRUCTVAL,
@@ -1109,7 +1104,7 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             if (in->args.args[1].type != DIRREF) {
                 runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for arg 2", in, currentInstruction);
             }
-            addVariable(scope->variables, in->args.args[1].value.refName, createIntGroundValue(atoll(in->args.args[0].value.value.data.stringVal)));
+            addVariable(scope->variables, in->args.args[2].value.refName, createIntGroundValue(atoll(in->args.args[0].value.value.data.stringVal)));
             break;
         }
         case STOD: {
@@ -1125,39 +1120,7 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             if (in->args.args[1].type != DIRREF) {
                 runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for arg 2", in, currentInstruction);
             }
-            addVariable(scope->variables, in->args.args[1].value.refName, createDoubleGroundValue(atof(in->args.args[0].value.value.data.stringVal)));
+            addVariable(scope->variables, in->args.args[1].value.refName, createIntGroundValue(atof(in->args.args[0].value.value.data.stringVal)));
-            break;
-        }
-        case ITOC: {
-            if (in->args.length < 2) {
-                runtimeError(TOO_FEW_ARGS, "Expecting 2 args", in, currentInstruction);
-            }
-            if (in->args.length > 2) {
-                runtimeError(TOO_MANY_ARGS, "Expecting 2 args", in, currentInstruction);
-            }
-            if (in->args.args[0].type != VALUE || in->args.args[0].value.value.type != INT) {
-                runtimeError(ARG_TYPE_MISMATCH, "Expecting an Int for arg 1", in, currentInstruction);
-            }
-            if (in->args.args[1].type != DIRREF) {
-                runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for arg 2", in, currentInstruction);
-            }
-            addVariable(scope->variables, in->args.args[1].value.refName, createCharGroundValue((char)in->args.args[0].value.value.data.intVal));
-            break;
-        }
-        case CTOI: {
-            if (in->args.length < 2) {
-                runtimeError(TOO_FEW_ARGS, "Expecting 2 args", in, currentInstruction);
-            }
-            if (in->args.length > 2) {
-                runtimeError(TOO_MANY_ARGS, "Expecting 2 args", in, currentInstruction);
-            }
-            if (in->args.args[0].type != VALUE || in->args.args[0].value.value.type != CHAR) {
-                runtimeError(ARG_TYPE_MISMATCH, "Expecting a Char for arg 1", in, currentInstruction);
-            }
-            if (in->args.args[1].type != DIRREF) {
-                runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for arg 2", in, currentInstruction);
-            }
-            addVariable(scope->variables, in->args.args[1].value.refName, createIntGroundValue((int)in->args.args[0].value.value.data.charVal));
             break;
         }
         case TOSTRING: {
@@ -1174,53 +1137,57 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
                 runtimeError(ARG_TYPE_MISMATCH, "Expecting a DirectRef for arg 2", in, currentInstruction);
             }
             GroundValue* value = &in->args.args[0].value.value;
-            char buf[256];
             switch (value->type) {
                 case INT: {
-                    snprintf(buf, sizeof(buf) * 256, "%" PRId64, value->data.intVal);
+                    char* buf = malloc(sizeof(char) * 256);
+                    snprintf(buf, sizeof(char) * 256, "%" PRId64, value->data.intVal);
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue(buf));
                     break;
                 }
                 case DOUBLE: {
-                    snprintf(buf, sizeof(buf) * 256, "%f", value->data.doubleVal);
+                    char* buf = malloc(sizeof(char) * 256);
+                    snprintf(buf, sizeof(char) * 256, "%f", value->data.doubleVal);
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue(buf));
                     break;
                 }
                 case STRING: {
-                    snprintf(buf, sizeof(buf), "%s", value->data.stringVal);
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue(value->data.stringVal));
                     break;
                 }
                 case CHAR: {
+                    char* buf = malloc(sizeof(char) * 2);
                     buf[0] = value->data.charVal;
                     buf[1] = '\0';
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue(buf));
                     break;
                 }
                 case BOOL: {
                     if (value->data.boolVal) {
-                        snprintf(buf, sizeof(buf), "true");
+                        addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("true"));
                     } else {
-                        snprintf(buf, sizeof(buf), "false");
+                        addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("false"));
                     }
                     break;
                 }
                 case LIST: {
-                    snprintf(buf, sizeof(buf), "<list>");
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("<list>"));
                     break;
                 }
                 case FUNCTION: {
-                    snprintf(buf, sizeof(buf), "<function>");
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("<function>"));
                     break;
                 }
                 case CUSTOM: {
-                    snprintf(buf, sizeof(buf), "<custom>");
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("<custom>"));
                     break;
                 }
                 case NONE:
                 default: {
-                    snprintf(buf, sizeof(buf), "<default>");
+                    addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue("<default>"));
                     break;
 
                 }
             }
-            addVariable(scope->variables, in->args.args[1].value.refName, createStringGroundValue(buf));
 
             break;
         }
@@ -1927,10 +1894,6 @@ 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);
             }
@@ -1980,7 +1943,6 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
             }
             
             initFn(scope);
-	    #endif
             break;
         }
 

src/main.c

@@ -1,7 +1,6 @@
 #include "parser.h"
 #include "interpreter.h"
 #include "compiler.h"
-#include "types.h"
 #include <stdio.h>
 
 char* getFileContents(const char* filename) {
@@ -41,6 +40,19 @@ 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);
@@ -48,7 +60,7 @@ int main(int argc, char** argv) {
 
     bool compile = false;
     char* fileName = NULL;
-    List groundArgs = createList();
+
     for (int i = 1; i < argc; i++) {
         if (strcmp("--compile", argv[i]) == 0 || strcmp("-c", argv[i]) == 0) {
             compile = true;
@@ -61,11 +73,7 @@ int main(int argc, char** argv) {
             printf("  -h or --help: Shows this help message\n");
             exit(0);
         } else {
-            if (fileName == NULL) {
             fileName = argv[i];
-            } else {
-                appendToList(&groundArgs, createStringGroundValue(argv[i]));
-            }
         }
     }
 
@@ -83,14 +91,6 @@ int main(int argc, char** argv) {
         char* compiled = compileGroundProgram(&program);
         printf("%s\n", compiled);
     } else {
-        GroundVariable* variables = NULL;
+        interpretGroundProgram(&program, 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,25 +5,6 @@
 #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;
@@ -178,8 +159,6 @@ static GroundInstType getInstructionType(const char* inst) {
     if (strcmp(inst, "lesser") == 0) return LESSER;
     if (strcmp(inst, "stoi") == 0) return STOI;
     if (strcmp(inst, "stod") == 0) return STOD;
-    if (strcmp(inst, "ctoi") == 0) return CTOI;
-    if (strcmp(inst, "itoc") == 0) return ITOC;
     if (strcmp(inst, "tostring") == 0) return TOSTRING;
     if (strcmp(inst, "fun") == 0) return FUN;
     if (strcmp(inst, "return") == 0) return RETURN;

src/types.c

@@ -90,55 +90,16 @@ GroundValue copyGroundValue(const GroundValue* gv) {
         }
         case FUNCTION: newGv.data.fnVal = gv->data.fnVal; break;
         case STRUCTVAL: {
-            newGv.data.structVal = malloc(sizeof(GroundStruct));
+            // do this later lmao
-            if (newGv.data.structVal == NULL) {
+            // FIXME
-                printf("Couldn't allocate memory for GroundStruct copy\n");
+            newGv.data.structVal = gv->data.structVal;
-                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: {
+        case CUSTOM:
-            newGv.customType = gv->customType;
+            // also do this later
-            newGv.data.customVal = malloc(sizeof(GroundObject));
+            // FIXME
-            if (newGv.data.customVal == NULL) {
+            newGv.data.customVal = gv->data.customVal;
-                printf("Couldn't allocate memory for GroundObject copy\n");
-                exit(1);
-            }
-            
-            newGv.data.customVal->fields = NULL;
-            
-            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: {
 
@@ -188,47 +149,8 @@ void printGroundValue(GroundValue* gv) {
             printf("<function>");
             break;
         }
-        case STRUCTVAL: {
+        default: {
-            printf("<struct fields: { ");
+            printf("FIXME");
-            for (size_t i = 0; i < gv->data.structVal->size; i++) {
-                if (i != 0) {
-                    printf(", ");
-                }
-                printf("%s: ", gv->data.structVal->fields[i].id);
-                if (gv->data.structVal->fields[i].value.type == STRING) {
-                    printf("\"");
-                    printGroundValue(&gv->data.structVal->fields[i].value);
-                    printf("\"");
-                } else {
-                    printGroundValue(&gv->data.structVal->fields[i].value);
-                }
-            }
-            printf(" }>");
-            break;
-        }
-        case CUSTOM: {
-            printf("<object fields: { ");
-            for (size_t i = 0; i < gv->customType->size; i++) {
-                if (i != 0) {
-                    printf(", ");
-                }
-                printf("%s: ", gv->customType->fields[i].id);
-                GroundObjectField* field = findField(*gv->data.customVal, gv->customType->fields[i].id);
-                if (field == NULL) {
-                    printf("<missing>");
-                } else {
-                    printGroundValue(&field->value);
-                }
-            }
-            printf(" }>");
-            break;
-        }
-        case ERROR: {
-            printf("<error type: %s, what: %s>", gv->data.errorVal.type, gv->data.errorVal.what);
-            break;
-        }
-        case NONE: {
-            printf("<none>");
             break;
         }
     }
@@ -452,12 +374,6 @@ void printGroundInstruction(GroundInstruction* gi) {
         case STOD:
             printf("stod");
             break;
-        case CTOI:
-            printf("ctoi");
-            break;
-        case ITOC:
-            printf("itoc");
-            break;
         case TOSTRING:
             printf("tostring");
             break;

src/types.h

@@ -9,7 +9,7 @@
 #include "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, ITOC, CTOI, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, STRUCT, ENDSTRUCT, INIT, GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, ERRORCMD
+    IF, JUMP, END, INPUT, PRINT, PRINTLN, SET, GETTYPE, EXISTS, SETLIST, SETLISTAT, GETLISTAT, GETLISTSIZE, LISTAPPEND, GETSTRSIZE, GETSTRCHARAT, ADD, SUBTRACT, MULTIPLY, DIVIDE, EQUAL, INEQUAL, NOT, GREATER, LESSER, STOI, STOD, TOSTRING, FUN, RETURN, ENDFUN, PUSHARG, CALL, STRUCT, ENDSTRUCT, INIT, GETFIELD, SETFIELD, USE, EXTERN, CREATELABEL, PAUSE, DROP, ERRORCMD
 } GroundInstType;
 
 typedef enum GroundValueType {

tests/convs.grnd

@@ -1,11 +1,3 @@
-tostring 32 &str
+tostring 32 &int
-stoi "12" &int
-stod "3.14" &dou
-itoc 353 &chr
-ctoi 'a' &it2
 
-println $str
 println $int
-println $dou
-println $chr
-println $it2