Update parser.py

Author: BaseMax

parser.py

@@ -6,15 +6,15 @@ def __init__(self, tokens):
 		self.tokens = iter(tokens)
 		self.advance()
 
+	def raise_error(self):
+		raise Exception("Invalid syntax")
+	
 	def advance(self):
 		try:
 			self.current_token = next(self.tokens)
 		except StopIteration:
 			self.current_token = None
 
-	def raise_error(self):
-		raise Exception("Invalid syntax")
-
 	def parse(self):
 		if self.current_token == None:
 			return None
@@ -28,6 +28,7 @@ def parse(self):
 
 	def expr(self):
 		result = self.term()
+
 		while self.current_token != None and self.current_token.type in (TokenType.PLUS, TokenType.MINUS):
 			if self.current_token.type == TokenType.PLUS:
 				self.advance()
@@ -36,29 +37,31 @@ def expr(self):
 				self.advance()
 				result = SubtractNode(result, self.term())
 
-			return result
-	
+		return result
+
 	def term(self):
-		result = self.term()
-		while self.current_token != None and self.current_token.type in (TokenType.MULTIPLY, TokenType.DOIVIDE):
+		result = self.factor()
+
+		while self.current_token != None and self.current_token.type in (TokenType.MULTIPLY, TokenType.DIVIDE):
 			if self.current_token.type == TokenType.MULTIPLY:
 				self.advance()
-				result = MultiplyNode(result, self.term())
-			elif self.current_token.type == TokenType.DOIVIDE:
+				result = MultiplyNode(result, self.factor())
+			elif self.current_token.type == TokenType.DIVIDE:
 				self.advance()
-				result = DivideNode(result, self.term())
+				result = DivideNode(result, self.factor())
+				
+		return result
 
-			return result
-	
 	def factor(self):
 		token = self.current_token
 
-		if token.type == TokenType.LPARENT:
+		if token.type == TokenType.LPAREN:
 			self.advance()
 			result = self.expr()
+
 			if self.current_token.type != TokenType.RPAREN:
 				self.raise_error()
-
+			
 			self.advance()
 			return result
 
@@ -69,9 +72,9 @@ def factor(self):
 		elif token.type == TokenType.PLUS:
 			self.advance()
 			return PlusNode(self.factor())
-
+		
 		elif token.type == TokenType.MINUS:
 			self.advance()
 			return MinusNode(self.factor())
-
+		
 		self.raise_error()