From db4c4363f1d8ad37985e2a7275e734efc0946a7e Mon Sep 17 00:00:00 2001
From: "[ Taha. Dostifam ]" <mr.tahadostifam@gmail.com>
Date: Mon, 10 Feb 2025 17:01:33 +0330
Subject: [PATCH] refactor parser

---
 examples/main.cy          | 22 ++--------------------
 parser/src/expressions.rs | 21 +++++----------------
 parser/src/statements.rs  |  1 -
 3 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/examples/main.cy b/examples/main.cy
index 414c31e..d5ff002 100644
--- a/examples/main.cy
+++ b/examples/main.cy
@@ -1,23 +1,5 @@
-#a = (1 + 2);
-#b = "kir" as string;
-
-struct Person {
-    name: string;
-    age: i32;
-
-    pub fn new(name: string, age: i32): Person {
-        return Person {
-            name: "Taha",
-            age: 17
-        };
-    }
-
-    fn info(self: *Person) {
-        cprintf("Name: %s\n", (*self).name);
-        cprintf("Age: %d\n", (*self).age);
-    }
-}
 
 pub fn main() {
-    Person.new("Taha", 17).info();
+    // Person.new("Taha", 17).info();
+    Person.name.aassad;
 }
\ No newline at end of file
diff --git a/parser/src/expressions.rs b/parser/src/expressions.rs
index be07332..7f5cb81 100644
--- a/parser/src/expressions.rs
+++ b/parser/src/expressions.rs
@@ -105,7 +105,6 @@ impl<'a> Parser<'a> {
                     loc: self.current_location(),
                 };
 
-
                 if self.peek_token_is(TokenKind::Increment) {
                     self.next_token();
                     Expression::UnaryOperator(UnaryOperator {
@@ -151,9 +150,7 @@ impl<'a> Parser<'a> {
 
                 Expression::Literal(Literal::Bool(BoolLiteral { raw, span }))
             }
-            TokenKind::Literal(value) => {
-                Expression::Literal(value.clone())
-            }
+            TokenKind::Literal(value) => Expression::Literal(value.clone()),
             TokenKind::Minus | TokenKind::Bang => {
                 let start = self.current_token.span.start;
                 let prefix_operator = self.current_token.clone();
@@ -444,16 +441,7 @@ impl<'a> Parser<'a> {
                 self.next_token(); // consume method name
 
                 let arguments = self.parse_expression_series(TokenKind::RightParen)?.0;
-                if !self.current_token_is(TokenKind::RightParen) {
-                    return Err(CompileTimeError {
-                        location: self.current_location(),
-                        etype: ParserErrorType::MissingClosingParen,
-                        file_name: Some(self.lexer.file_name.clone()),
-                        code_raw: Some(self.lexer.select(start..self.current_token.span.end)),
-                        verbose: None,
-                        caret: true,
-                    });
-                }
+                self.expect_current(TokenKind::RightParen)?;
 
                 let method_call = FuncCall {
                     func_name: method_name,
@@ -515,6 +503,7 @@ impl<'a> Parser<'a> {
                         })
                     }
                 };
+                self.next_token();
 
                 chains.push(FieldAccessOrMethodCall {
                     method_call: None,
@@ -524,8 +513,8 @@ impl<'a> Parser<'a> {
                         loc: self.current_location(),
                     }),
                 });
-
-                match self.peek_token.kind {
+                
+                match self.current_token.kind {
                     TokenKind::Dot => {
                         self.next_token(); // consume field_name
                         continue;
diff --git a/parser/src/statements.rs b/parser/src/statements.rs
index 95b2865..6c3f995 100644
--- a/parser/src/statements.rs
+++ b/parser/src/statements.rs
@@ -639,7 +639,6 @@ impl<'a> Parser<'a> {
             self.next_token();   
         }
         // 
-        // 
         
         if !self.current_token_is(TokenKind::Semicolon) {
             return Err(CompileTimeError {