Variables in main scope is now stored in GF #74

thejoeejoee · Nov 24, 2017 · 46ca0c4 · 46ca0c4
1 parent 42c1db8
commit 46ca0c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/src/code_constructor.c b/src/code_constructor.c
@@ -61,13 +61,6 @@ void code_constructor_free(CodeConstructor** constructor) {
 void code_constructor_scope_start(CodeConstructor* constructor) {
     NULL_POINTER_CHECK(constructor,);
 
-    if(constructor->scope_depth == 0) {
-        // main program scope, generate label for jump from start of this file
-
-        GENERATE_CODE(I_CREATE_FRAME);
-        GENERATE_CODE(I_PUSH_FRAME);
-    }
-
     constructor->scope_depth++;
 }
 
@@ -505,9 +498,6 @@ void code_constructor_scope_end(CodeConstructor* constructor) {
     NULL_POINTER_CHECK(constructor,);
 
     constructor->scope_depth--;
-    if(constructor->scope_depth == 0) {
-        GENERATE_CODE(I_POP_FRAME);
-    }
 }
 
 void code_constructor_stack_type_conversion(CodeConstructor* constructor, DataType current_type, DataType target_type) {

diff --git a/src/parser.c b/src/parser.c
@@ -625,8 +625,9 @@ bool parser_parse_variable_declaration(Parser* parser) {
             );
             CODE_GENERATION(
                     {
-
-                            parser->parser_semantic->actual_variable->frame = VARIABLE_FRAME_LOCAL;
+                            parser->parser_semantic->actual_variable->frame =
+                                    parser->parser_semantic->actual_function == NULL ? VARIABLE_FRAME_GLOBAL
+                                                                                     : VARIABLE_FRAME_LOCAL;
                             code_constructor_variable_declaration(
                             parser->code_constructor,
                             parser->parser_semantic->actual_variable

diff --git a/src/symbol_register.c b/src/symbol_register.c
@@ -40,7 +40,7 @@ void symbol_register_push_variables_table(SymbolRegister* register_) {
     SymbolTableSymbolVariableStackItem* item = memory_alloc(sizeof(SymbolTableSymbolVariableStackItem));
     item->symbol_table = symbol_table_variable_init(16);
     item->parent = register_->variables;
-    item->scope_identifier = register_->variables_table_counter++;
+    item->scope_identifier = ++register_->variables_table_counter;
     item->scope_alias = NULL;
     register_->variables = item;
 }