Added Validator functionality and updated parser and header accordingly

Author: JBrosDevelopment

source.galo

@@ -1,3 +1,9 @@
+let x int = 22
+let y int = 8
+x = y
+
+~
+
 fun add(left int, right int) int
     # inside parenthesis because all operations require parenthesis to define order of operations
     return (left + right) 

src/galo_headers.h

@@ -75,6 +75,7 @@ typedef struct VariableDeclaration_t {
     Token* name;
     Token* type;
     Node value;
+    int id;
 } VariableDeclaration;
 
 typedef struct Parameter_t {
@@ -89,17 +90,23 @@ typedef struct FunctionDeclaration_t {
     Token* return_type;
     Token* struct_implementation;
     NodeList* body;
+    int id;
 } FunctionDeclaration;
 
 typedef struct StructDeclaration_t {
     Token* name;
     Parameter* fields;
     int field_count;
+    int id;
 } StructDeclaration;
 
-typedef struct VariableAssignment_t {
+typedef struct ScopedIdentifier_t {
     Token** scope;
-    int scope_size;
+    int size;
+} ScopedIdentifier;
+
+typedef struct VariableAssignment_t {
+    ScopedIdentifier identifier;
     Node value;
 } VariableAssignment;
 
@@ -139,15 +146,6 @@ typedef struct Operation_t {
     Node* right;
 } Operation;
 
-typedef struct ScopedIdentifier_t {
-    Token** scope;
-    int size;
-} ScopedIdentifier;
-
-typedef struct Constant_t {
-    Token* value;
-} Constant;
-
 NodeList* create_node_list();
 void free_node_list(NodeList* node_list);
 void add_node(NodeList* node_list, Node node);
@@ -163,13 +161,22 @@ IntList* create_int_list();
 void free_int_list(IntList* int_list);
 void add_int(IntList* int_list, int value);
 int* get_int(IntList* int_list, int index);
+void remove_int(IntList* int_list, int index);
+char contains_int(IntList* int_list, int value);
 
 typedef struct ObjectList_t {
     void** objects;
     int size;
     int capacity;
 } ObjectList;
 
+typedef struct Validator_Object_t {
+    ObjectList* functions;
+    ObjectList* structs;
+    ObjectList* variables;
+    IntList* active_variables;
+    int last_id;
+} Validator_Object;
 
 ObjectList* create_object_list();
 void free_object_list(ObjectList* object_list);
@@ -188,5 +195,9 @@ const char* get_node_type_name(enum NodeType type);
 void debug_parser(NodeList* ast);
 void debug_parser_node(Node* node);
 
-void validator();
+Validator_Object create_validator_object();
+void free_validator_object(Validator_Object* validator_object);
+void validator(NodeList* ast, Validator_Object* validator_object);
+void debug_validator(Validator_Object* validator_object);
+
 void run();

src/lists.c

@@ -80,6 +80,24 @@ int* get_int(IntList* int_list, int index) {
     }
     return &int_list->int_list[index];
 }
+void remove_int(IntList* int_list, int index) {
+    if (index < 0 || index >= int_list->size) {
+        return;
+    }
+    for (int i = index; i < int_list->size - 1; i++) {
+        int_list->int_list[i] = int_list->int_list[i + 1];
+    }
+    int_list->size--;
+}
+
+char contains_int(IntList* int_list, int value) {
+    for (int i = 0; i < int_list->size; i++) {
+        if (int_list->int_list[i] == value) {
+            return 1;
+        }
+    }
+    return 0;
+}
 
 
 ObjectList* create_object_list() {

src/main.c

@@ -21,14 +21,17 @@ int main() {
 
     printf("parsing...\n");
     parser(token_list, object_list, ast, &index);
-    debug_parser(ast);
+    //debug_parser(ast);
 
+    Validator_Object validator_object = create_validator_object();
     printf("validating...\n");
-    validator();
-
+    validator(ast, &validator_object);
+    debug_validator(&validator_object);
+    
     printf("runnning...\n");
     run();
 
+    free_validator_object(&validator_object);
     free_node_list(ast);
     free_object_list(object_list);
     free_token_list(token_list);

src/parser.c

@@ -63,6 +63,7 @@ void parse_var_decl(TokenList* tokens, ObjectList* object_list, int* index, Vari
         exit(1);
     }
     var_decl->type = var_type;
+    var_decl->id = -1;
 
     (*index)++;
 
@@ -103,8 +104,10 @@ void parse_var_assign(TokenList* tokens, ObjectList* object_list, int* index, Va
 
     Token** var_scope_address = add_object(object_list, var_scope, sizeof(Token*) * size);
 
-    var_assign->scope_size = size;
-    var_assign->scope = var_scope_address;
+    ScopedIdentifier scoped_identifier;
+    scoped_identifier.scope = var_scope_address;
+    scoped_identifier.size = size;
+    var_assign->identifier = scoped_identifier;
 
     if (var_scope != NULL) {
         free(var_scope);
@@ -198,6 +201,7 @@ void parse_function(TokenList* tokens, ObjectList* object_list, int* index, Func
 
     func_decl->name = func_name;
     func_decl->struct_implementation = struct_implementation;
+    func_decl->id = -1;
 
     if (get_token(tokens, *index)->type != TOKEN_PARENTHESIS_OPEN) {
         printf("Error: Invalid function declaration in line %d\n", get_token(tokens, *index)->line);
@@ -274,6 +278,7 @@ void parse_struct(TokenList* tokens, ObjectList* object_list, int* index, Struct
 
     struct_decl->fields = field_address;
     struct_decl->field_count = field_count;
+    struct_decl->id = -1;
 }
 
 void parse_function_call(TokenList* tokens, ObjectList* object_list, int* index, FunctionCall* func_call) {
@@ -355,7 +360,7 @@ void parse_if(TokenList* tokens, ObjectList* object_list, int* index, IfStatemen
     if_stmt->condition = parse_expression(tokens, object_list, index);
 
     if (get_token(tokens, *index)->type != TOKEN_END_OF_LINE) {
-        printf("Error: Invalid if statement, expected end of line but found `%s` in line %d\n", get_token(tokens, *index)->line);
+        printf("Error: Invalid if statement, expected end of line but found `%s` in line %d\n", get_token(tokens, *index)->value, get_token(tokens, *index)->line);
         exit(1);
     }
 
@@ -398,7 +403,7 @@ void parse_if(TokenList* tokens, ObjectList* object_list, int* index, IfStatemen
 
         elif.condition = parse_expression(tokens, object_list, index);
         if (get_token(tokens, *index)->type != TOKEN_END_OF_LINE) {
-            printf("Error: Invalid elif statement, expected end of line but found `%s` in line %d\n", get_token(tokens, *index)->line);
+            printf("Error: Invalid elif statement, expected end of line but found `%s` in line %d\n", get_token(tokens, *index)->value, get_token(tokens, *index)->line);
             exit(1);
         }
         (*index)++;
@@ -438,7 +443,7 @@ void parse_while(TokenList* tokens, ObjectList* object_list, int* index, WhileLo
     while_loop->condition = parse_expression(tokens, object_list, index);
 
     if (get_token(tokens, *index)->type != TOKEN_END_OF_LINE) {
-        printf("Error: Invalid while statement, expected end of line but found `%s` in line %d\n", get_token(tokens, *index)->line);
+        printf("Error: Invalid while statement, expected end of line but found `%s` in line %d\n", get_token(tokens, *index)->value, get_token(tokens, *index)->line);
         exit(1);
     }
 
@@ -670,8 +675,8 @@ void debug_parser_node(Node* node) {
     }
     else if (node->type == NODE_VARIABLE_ASSIGNMENT) {
         VariableAssignment* var_assign = (VariableAssignment*)node->data;
-        for (int i = 0; i < var_assign->scope_size; i++) {
-            printf("%s ", var_assign->scope[i]->value);
+        for (int i = 0; i < var_assign->identifier.size; i++) {
+            printf("%s ", var_assign->identifier.scope[i]->value);
         }
         printf("= ");
         debug_parser_node(&var_assign->value);