Fixed bugs in interpreter and validator. Made emit-ast now also emit ids of identifiers

Author: JBrosDevelopment

Makefile

@@ -3,7 +3,7 @@
 # -----------------------------
 CC       := gcc
 CFLAGS   := -Wall -Wextra -Wno-unused-parameter -O2
-DBGFLAGS := -Wall -Wextra -g -O0
+DBGFLAGS := -Wall -Wextra -Wno-unused-parameter -g -O0
 LDFLAGS  :=
 
 SRC_DIR  := src

project/lib.galo

@@ -6,35 +6,8 @@ fun increment(v int) int
     return (v + 1)
 end
 
-#int convert(string val) int
-#float convert(string val) float
-#bool convert(string val) bool
-#byte convert(string val) byte
-#
-#fun string length(self string) int
-#fun string index(self string, int index) byte
-#fun string contains(value string, sub string) bool
-#fun string starts_with(value string, check string) bool
-#fun string ends_with(value string, check string) bool
-#fun string replace(value string, bef string, aft string) string
-#fun string sub(value string, start int, end int) string
-#fun string concat(left string, right string) string
-#
-#struct list
-#    type Type
-#end
-#
-#fun init(type Type) list
-#fun add(self list, value list type) void
-#fun get(self list, index int) list type
-#fun length(self list) int
-#fun remove(self list, index int) void
-#fun clear(self list) void
-#fun contains(self list, value list type) bool
-#fun set(self list, index int, value list type) void
-
 # for build.galo
-#struct __BuildArguments
+#struct BuildArguments
 #    input_file string
 #    output_file string
 #    input_files list
@@ -60,7 +33,7 @@ end
 #    interpret_debug bool
 #end
 #
-#fun compile(args __BuildArguments)
-#fun transpile(args __BuildArguments)
-#fun interpret(args __BuildArguments)
+#fun compile(args BuildArguments)
+#fun transpile(args BuildArguments)
+#fun interpret(args BuildArguments)
 #fun run(program string, args list)

project/main.galo

@@ -1,40 +1,17 @@
-let l1 list = list init(int, 10)
-println(l1)
-l1 = list append(l1, 99)
-println(l1)
-l1 = list append(l1, 98)
-println(l1)
-l1 = list append(l1, 97)
-println(l1)
-l1 = list remove(l1, 1)
-println(l1)
-l1 = list set(l1, 0, 55)
-println(l1)
-l1 = list insert(l1, 1, 125)
-println(l1)
-l1 = list clear(l1)
-println(l1)
-l1 = list(10, "abc", 789.0, true)
-println(l1)
+#!galo interpret project/main.galo --emit-validator --emit-ast -- 1 5 9 3 -5 4 -99 123 
+#!include project/lib.galo
 
-##!galo interpret project/main.galo -- 1 5 9 3 -5 4 -99 123 
-##!include project/lib.galo
-#
-#fun main(args list) int
-#    let x int = 0
-#    let i int = 0
-#    while (list length(args) > i)
-#        let arg string = list get(args, i)
-#        let val int = cast(int, arg)
-#        if (val == -6)
-#            print("INVALID ARGUMENT:", arg, "\n")
-#            return 1
-#        end
-#        x = add(x, val)
-#        i = increment(i)
-#    end
-#    print("args total up to: ", x, "\n")
-#end
+fun main(args list) void
+    let i int = 0
+    let x int = 0
+    while (list length(args) > i)
+        let s string = list get(args, i)
+        let v int = cast(int, s)
+        x = add(x, v)
+        i = increment(i)
+    end
+    println(x)
+end
 
 
 #TODO

src/galo_headers.h

@@ -343,18 +343,12 @@ typedef struct GaloObject_t {
     void* data;
 } GaloObject;
 
-typedef struct {
+typedef struct ScopeFrame_t {
     int* variable_ids;
     int  count;
     int  capacity;
 } ScopeFrame;
 
-typedef struct CallFrame_t {
-    int function_id;
-    Node* return_node;
-    int scope_depth_at_entry;
-} CallFrame;
-
 typedef struct Interpreter_Object_t {
     // Program data
     Validator_Object* validator_object;
@@ -374,11 +368,6 @@ typedef struct Interpreter_Object_t {
     int scope_depth;
     int scope_capacity;
 
-    // Call stack
-    CallFrame* call_stack;
-    int call_depth;
-    int call_capacity;
-
     // Execution state
     Node* current_node;
     GaloObject return_value;
@@ -404,6 +393,8 @@ GaloObject list_object_value(ObjectList* list);
 GaloObject void_object_value();
 void print_out_variable_values(Interpreter_Object* interp);
 void print_galo_object(Interpreter_Object* interp, GaloObject* object);
+GaloObject function_call(Interpreter_Object* interp, FunctionDeclaration* function, int argument_count, GaloObject* arguments);
+GaloObject predefined_function_call(Interpreter_Object* interp, PredefinedFunction* predefined_function, int argument_count, GaloObject* arguments);
 
 /////////////////////////////////////////////////////////////////////
 // FUNCTIONS AND THEIR DEBUGGER FUNCTIONS
@@ -434,7 +425,7 @@ void build_option_new(char* project_name);
 void build_option_version();
 void build_option_help();
 
-void interpret(Interpreter_Object* interpreter_object, int input_argc, char** input_argv);
+int interpret(Interpreter_Object* interpreter_object, int input_argc, char** input_argv);
 GaloObject interpret_node(Interpreter_Object* interpreter_object, Node* node);
 
 void transpile();