fixed nonstop return

Author: IagoMendes

Diff for: Classes/node.py

@@ -176,7 +176,10 @@ def __init__(self):
 
     def Evaluate(self, table):
         for i in range(len(self.children)):
-            self.children[i].Evaluate(table)
+            if (table.returnGetter()[1] == None):
+                self.children[i].Evaluate(table)
+            else:
+                break
 
 
 class Print(Node):  # Single children  
@@ -261,7 +264,7 @@ def Evaluate(self, table):
             localTable = SymbolTable()
             for i in range(len(res[1].children)-1):
                 arg = self.children[i].Evaluate(table)
-
+                
                 if (res[1].children[i][1] == arg[0]):
                     localTable.setter(res[1].children[i][0], res[1].children[i][1], None)
                     localTable.setter(res[1].children[i][0], res[1].children[i][1], arg[1])

Diff for: Classes/parser.py

@@ -55,12 +55,12 @@ def parseBlockF():
                                     while (Parser.tokens.actual.type == "COMMA"):
                                         Parser.tokens.selectNext()
                                         if (Parser.tokens.actual.type == "IDENTIFIER"):
-                                            arguments = [Parser.tokens.actual.value]
+                                            arguments = [Parser.tokens.actual.value] 
                                             Parser.tokens.selectNext()
                                             if (Parser.tokens.actual.type == "COLON_I"):
                                                 Parser.tokens.selectNext()
                                                 if (Parser.tokens.actual.type == 'INT' or Parser.tokens.actual.type == 'BOOL' or Parser.tokens.actual.type == 'STRING'):
-                                                    arguments.append(Parser.tokens.actual.value)
+                                                    arguments.append(Parser.tokens.actual.type) 
                                                     func.children.append(arguments)
                                                     Parser.tokens.selectNext()
                                                 else:

Diff for: Classes/symbolTable.py

@@ -36,6 +36,6 @@ def funcSetter(self, key, funcType, function):
     def returnGetter(self):
         return self.table["RETURN"]
 
-    def returnSetter(self, value, retType):
-        self.table["RETURN"] = [value, retType]   
+    def returnSetter(self, retType, value):
+        self.table["RETURN"] = [retType, value]