Bug no Parser reparado

Author: manoelmms

abstract_syntax_tree.py

@@ -44,7 +44,6 @@ def __init__(self, name, expression):
         self.name = name
         self.expression = expression
         self.type = "Assignment"
-        variable[name] = expression
 
 class Token:
     def __init__(self, value, type, line, column):
@@ -83,6 +82,7 @@ def parseVS(self):
                 self.consume("EQUAL")
                 exp = self.parseE()
                 e = EAssignment(var.value, exp)
+                variable[var.value] = exp
 
                 if not self.peek("NEWLINE"):
                     if self.peek("EOF"):
@@ -133,10 +133,18 @@ def parseE(self):
 
             elif self.peek("SUM"):
                 self.consume("SUM")
+                
+                if not self.peek("NUM") and not self.peek("VARIABLE") and not self.peek("PARENTESES_L") and not self.peek("FUNCTION"):
+                    raise SyntaxError("Expected token of type NUMBER, VARIABLE, PARENTESES_L or FUNCTION at line " + str(self.next_token.line) + " column " + str(self.next_token.column))
+                
                 e = EBinary(e, "+", self.parseT())
 
             elif self.peek("SUB"):
                 self.consume("SUB")
+                
+                if not self.peek("NUM") and not self.peek("VARIABLE") and not self.peek("PARENTESES_L") and not self.peek("FUNCTION"):
+                    raise SyntaxError("Expected token of type NUMBER, VARIABLE, PARENTESES_L or FUNCTION at line " + str(self.next_token.line) + " column " + str(self.next_token.column))
+                
                 e = EBinary(e, "-", self.parseT())
 
             else:
@@ -152,10 +160,18 @@ def parseT(self):
 
             elif self.peek("MULT"):
                 self.consume("MULT")
+                
+                if not self.peek("NUM") and not self.peek("VARIABLE") and not self.peek("PARENTESES_L") and not self.peek("FUNCTION"):
+                    raise SyntaxError("Expected token of type NUMBER, VARIABLE, PARENTESES_L or FUNCTION at line " + str(self.next_token.line) + " column " + str(self.next_token.column))
+                
                 e = EBinary(e, "*", self.parseF())
 
             elif self.peek("DIV"):
                 self.consume("DIV")
+                
+                if not self.peek("NUM") and not self.peek("VARIABLE") and not self.peek("PARENTESES_L") and not self.peek("FUNCTION"):
+                    raise SyntaxError("Expected token of type NUMBER, VARIABLE, PARENTESES_L or FUNCTION at line " + str(self.next_token.line) + " column " + str(self.next_token.column))
+                
                 e = EBinary(e, "/", self.parseF())
 
             else:
@@ -189,12 +205,11 @@ def parseF(self):
         elif self.peek("FUNCTION"):
             function = self.consume("FUNCTION").value
 
-            if self.peek("PARENTESES_L"):
-                self.consume("PARENTESES_L")
-                e = self.parseE()
-                self.consume("PARENTESES_R")
+            self.consume("PARENTESES_L")
+            e = self.parseE()
+            self.consume("PARENTESES_R")
 
-                return EFunction(function, [e])
+            return EFunction(function, [e])         
 
 def evaluate_expression(expression, variables = variable):
     match expression.type:

main.py

@@ -43,6 +43,7 @@ def read_file_tokens(code_file):
 
         test.control_test()
         test.lexer_test()
+        test.parser_test()
         test.evaluation_test()
 
         print("Testes concluídos com sucesso!")

test.py

@@ -56,6 +56,28 @@ def lexer_test(self):
         assert(lexer.lexical_analysis("1 + 2 * 3") == [('NUM', '1'), ('SUM', '+'), ('NUM', '2'), ('MULT', '*'), ('NUM', '3'), ('EOF', 'EOF')])
         print("Lexer testado com sucesso!\n")
 
+    def parser_test(self):
+        try:
+            error_test_1 = main.read_file_tokens("@1 +* 2")
+            main.Parser(error_test_1[0]).parseS()
+        except Exception as e:
+            print(e)
+
+        try:
+            error_test_2 = main.read_file_tokens("@1 + 2 *")
+            main.Parser(error_test_2[0]).parseS()
+        except Exception as e:
+            print(e)
+        
+        try:
+            error_test_3 = main.read_file_tokens("@1 2 * 3")
+            main.Parser(error_test_3[0]).parseS()
+        except Exception as e:
+            print(e)
+
+        print("Parser testado com sucesso!\n")
+        return
+
     def evaluation_test(self):
         # Carrega os arquivos de teste na pasta tests
         for file in os.listdir(os.path.dirname(__file__) + "/tests"):