1 files changed, 22 insertions, 20 deletions

diff --git a/src/ast/nodes/RootNode.java b/src/ast/nodes/RootNode.java
index e0989e8..5bbce8c 100644
--- a/src/ast/nodes/RootNode.java
+++ b/src/ast/nodes/RootNode.java
@@ -1,36 +1,41 @@
 package ast.nodes;
 
-import java.util.ArrayList;
-
-import semanticanalysis.SemanticError;
-import semanticanalysis.SymbolTable;
 import ast.types.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import semanticanalysis.*;
 
 /**
  * Node for the `root` statement of the grammar.
  */
 public class RootNode implements Node {
+
     // stms and compundStmts are protected because they are reused for a
     // BlockNode
-    protected ArrayList<Node> stmts;
-    protected ArrayList<Node> compoundStmts;
+    protected ArrayList<Node> childs;
 
-    public RootNode(ArrayList<Node> stmts, ArrayList<Node> compoundStmts) {
-        this.stmts = stmts;
-        this.compoundStmts = compoundStmts;
+    public RootNode(ArrayList<Node> childs) {
+        this.childs = childs;
     }
 
     @Override
     public ArrayList<SemanticError> checkSemantics(SymbolTable ST, int _nesting) {
-        ArrayList<SemanticError> errors = new ArrayList<SemanticError>();
+        ArrayList<SemanticError> errors = new ArrayList();
 
-        for (Node stmt : stmts) {
-            errors.addAll(stmt.checkSemantics(ST, _nesting));
-        }
-        for (Node stmt : compoundStmts) {
-            errors.addAll(stmt.checkSemantics(ST, _nesting));
+        // Create a new HashMap for the current scope
+        HashMap<String, STentry> HM = new HashMap();
+
+        // Add the HashMap to the SymbolTable
+        ST.add(HM);
+
+        // Check semantics for each child
+        for (Node child : childs) {
+            errors.addAll(child.checkSemantics(ST, _nesting));
         }
 
+        // Remove the HashMap from the SymbolTable
+        ST.remove();
+
         return errors;
     }
 
@@ -51,11 +56,8 @@ public class RootNode implements Node {
 
         prefix += "  ";
 
-        for (Node stmt : stmts) {
-            str += stmt.toPrint(prefix);
-        }
-        for (Node stmt : compoundStmts) {
-            str += stmt.toPrint(prefix);
+        for (Node child : childs) {
+            str += child.toPrint(prefix);
         }
 
         return str;