Removed manual string formation and made it so the lexer returns string representations of the tokens (for debugging purposes only)

Author: ElBe-Plaq

Main/types.py Main/_types.pyMain/types.py renamed to Main/_types.py

@@ -1,6 +1,6 @@
 """
 I Language types.
-Version: 0.1.0
+Version: 0.1.1
 
 Copyright (c) 2023-present ElBe Development.
 

Main/lexer.py

@@ -29,7 +29,6 @@
 # IMPORTS #
 ###########
 
-import ast
 from typing import (
     Any,
     List,
@@ -71,9 +70,7 @@ def __repr__(self) -> str:
         :return: String representation of the token.
         """
 
-        return (
-            "{" + self.type + ":'" + self.value + "'}"
-        )  # TODO (ElBe): Remove manual string formatting
+        return f"{self.type}: {self.value!r}"
 
 
 class LexerError(BaseException):
@@ -111,7 +108,12 @@ class Lexer:
     def __init__(self, text: str):
         self.text = text
         self.separators = [" ", "\t", "\n"]
-        self.double_marks = {"==": "EQUAL", "++": "COUNT_UP", "--": "COUNT_DOWN"}
+        self.double_marks = {
+            "==": "EQUAL",
+            "===": "TYPE_EQUAL",
+            "++": "COUNT_UP",
+            "--": "COUNT_DOWN",
+        }
         self.marks = {
             ";": "END_CMD",
             "=": "SET",
@@ -131,7 +133,7 @@ def __init__(self, text: str):
             "*": "MULTIPLY",
             "/": "DIVIDE",
             "%": "MODULO",
-            "//.": "CHILD", # Duplicate, needs escaping
+            " .".replace(" ", ""): "CHILD",  # Duplicate, needs escaping
             ",": "SEPERATOR",
         }
         self.keywords = {
@@ -161,7 +163,6 @@ def __init__(self, text: str):
             "list",
             "str",
             "string",
-
             "None",
             "Null",
         ]
@@ -214,13 +215,6 @@ def gettoken(string: str, line: int, column: int) -> LexerToken | None:
             else:
                 raise LexerError("Unrecognized Pattern: '" + string + "'", line, column)
 
-        def replace_none(ar):  # What's that?
-            n = []
-            for el in ar:
-                if el is not None:
-                    n.append(el)
-            return n
-
         line = 1
         comment = 0
         column = 1
@@ -276,13 +270,13 @@ def replace_none(ar):  # What's that?
                     buffer += self.text[index]
 
             index += 1
-        self.tokens = replace_none(self.tokens)
-        return self.tokens
+
+        return [str(token) for token in self.tokens if token is not None]
 
 
 if __name__ == "__main__":
     with open("../test.ilang") as test:
         data = test.read()
 
     lexer = Lexer(data)
-    print(lexer.lex())
+    print("\n".join(lexer.lex()))