Merge pull request #3 from IagoMendes/v2.1

v2.1.2

Author: IagoMendes

Diff for: Classes/parser.py

@@ -23,7 +23,12 @@ def parseBlock():
     def parseCommand():
         result = None
 
-        if (Parser.tokens.actual.type == 'IDENTIFIER'):
+        if (Parser.tokens.actual.type == "LINE_END"):
+            Parser.tokens.selectNext()
+            if (not result):
+                result = NoOp()
+
+        elif (Parser.tokens.actual.type == 'IDENTIFIER'):
             iden = Parser.tokens.actual.value
             Parser.tokens.selectNext()
 
@@ -47,10 +52,8 @@ def parseCommand():
             else:
                 raise NameError("Expected Parenthesis")
 
-        if (Parser.tokens.actual.type == "LINE_END"):
-            Parser.tokens.selectNext()
-            if (not result):
-                result = NoOp()
+        else:
+            raise NameError(f"Unexpected token {Parser.tokens.actual.type}")
 
         return result
 

Diff for: Classes/tokenizer.py

@@ -36,6 +36,8 @@ def selectNext(self):
             while (self.position < len(self.origin) and (self.origin[self.position].isnumeric())):
                 resToken += self.origin[self.position]
                 self.position += 1
+                if (self.origin[self.position].isalpha() or self.origin[self.position] == "_"):
+                    raise NameError("Error creating number, found character")
             self.actual = Token(resToken, "INT")
 
         elif (self.origin[self.position].isalpha()):
@@ -51,5 +53,8 @@ def selectNext(self):
                 self.actual = Token(resToken, "PRINT")
             else:
                 self.actual = Token(resToken, "IDENTIFIER")
-
+        
+        else:
+            raise NameError("Unknown token")
+        
         return