From 01752120268a8f5328c4255579c66ba80a918d42 Mon Sep 17 00:00:00 2001
From: LordBaryhobal <lordbaryhobal@gmail.com>
Date: Fri, 6 Feb 2026 15:05:02 +0100
Subject: [PATCH] refactor: pass source and tokens in constructors instead of
 method

---
 main.py              |  8 ++++----
 src/lexer.py         | 20 +++++---------------
 src/parser/parser.py | 12 ++++--------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/main.py b/main.py
index 3320c0b..ec5d8ed 100644
--- a/main.py
+++ b/main.py
@@ -11,12 +11,12 @@ def main():
     source: str = ""
     with open(path, "r") as f:
         source = f.read()
-    lexer: Lexer = Lexer()
-    tokens: list[Token] = lexer.process(source, path)
+    lexer: Lexer = Lexer(source, path)
+    tokens: list[Token] = lexer.process()
     print(list(filter(lambda t: t.type not in Parser.IGNORE, tokens)))
 
-    parser: Parser = Parser()
-    program: list[Stmt] = parser.parse(tokens)
+    parser: Parser = Parser(tokens)
+    program: list[Stmt] = parser.parse()
 
     interpreter: Interpreter = Interpreter()
     interpreter.interpret(program)
diff --git a/src/lexer.py b/src/lexer.py
index 5077f89..5fe9491 100644
--- a/src/lexer.py
+++ b/src/lexer.py
@@ -6,13 +6,13 @@ from src.token import Token, TokenType
 
 
 class Lexer:
-    def __init__(self):
-        self.path: str = "<main>"
-        self.source: str = ""
+    def __init__(self, source: str, path: Optional[str] = None):
+        self.path: str = path or "<main>"
+        self.source: str = source
         self.tokens: list[Token] = []
         self.start: int = 0
         self.idx: int = 0
-        self.length: int = 0
+        self.length: int = len(self.source)
         self.line: int = 1
         self.column: int = 1
         self.start_pos: Position = self.get_position()
@@ -20,23 +20,13 @@ class Lexer:
     def error(self, msg: str):
         raise SyntaxError(f"[ERROR] Error at {self.start_pos}: {msg}")
 
-    def process(self, source: str, path: Optional[str] = None) -> list[Token]:
-        self.path = path or "<main>"
-        self.source = source
-        self.tokens = []
-        self.start = 0
-        self.idx = 0
-        self.length = len(self.source)
-        self.line = 1
-        self.column = 1
-
+    def process(self) -> list[Token]:
         while not self.is_at_end():
             self.start_pos = self.get_position()
             self.start = self.idx
             self.scan_token()
 
         self.tokens.append(Token(TokenType.EOF, "", None, self.get_position()))
-
         return self.tokens
 
     def is_at_end(self) -> bool:
diff --git a/src/parser/parser.py b/src/parser/parser.py
index e2f6595..850a698 100644
--- a/src/parser/parser.py
+++ b/src/parser/parser.py
@@ -19,21 +19,17 @@ class Parser:
         TokenType.FOR, TokenType.WHILE, TokenType.IF, TokenType.PRINT
     }
 
-    def __init__(self):
-        self.tokens: list[Token] = []
+    def __init__(self, tokens: list[Token]):
+        self.tokens: list[Token] = list(filter(lambda t: t.type not in self.IGNORE, tokens))
         self.current: int = 0
-        self.length: int = 0
+        self.length: int = len(self.tokens)
 
     @staticmethod
     def error(token: Token, msg: str):
         Pebble.token_error(token, msg)
         return ParsingError()
 
-    def parse(self, tokens: list[Token]) -> list[Stmt]:
-        self.tokens = list(filter(lambda t: t.type not in self.IGNORE, tokens))
-        self.current = 0
-        self.length = len(self.tokens)
-
+    def parse(self) -> list[Stmt]:
         statements: list[Stmt] = []
         self.skip_newlines()
         while not self.is_at_end():