From 4c44da8b6f91f8e1123d6de801947b64082b99cd Mon Sep 17 00:00:00 2001
From: Garrit Franke <garrit@slashdev.space>
Date: Wed, 17 Feb 2021 17:36:48 +0100
Subject: [PATCH] chore: refactor field access parsing

---
 src/parser/rules.rs | 38 ++++++++++++++++++++------------------
 tests/structs.sb    |  2 +-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/parser/rules.rs b/src/parser/rules.rs
index 024cb76..1086c11 100644
--- a/src/parser/rules.rs
+++ b/src/parser/rules.rs
@@ -252,11 +252,11 @@ impl Parser {
 
     fn parse_expression(&mut self) -> Result<Expression, String> {
         let token = self.next()?;
-        match token.kind {
+        let expr = match token.kind {
             TokenKind::BraceOpen => {
                 let expr = self.parse_expression()?;
                 self.match_token(TokenKind::BraceClose)?;
-                Ok(expr)
+                expr
             }
             TokenKind::Keyword(Keyword::Boolean) => {
                 let state = match BinOp::try_from(self.peek()?.kind) {
@@ -265,21 +265,21 @@ impl Parser {
                         Expression::Bool(token.raw.parse::<bool>().map_err(|e| e.to_string())?)
                     }
                 };
-                Ok(state)
+                state
             }
             TokenKind::Literal(Value::Int) => {
                 let state = match BinOp::try_from(self.peek()?.kind) {
                     Ok(_) => self.parse_bin_op(None)?,
                     Err(_) => Expression::Int(token.raw.parse::<u32>().map_err(|e| e.to_string())?),
                 };
-                Ok(state)
+                state
             }
             TokenKind::Literal(Value::Str) => {
                 let state = match BinOp::try_from(self.peek()?.kind) {
                     Ok(_) => self.parse_bin_op(None)?,
                     Err(_) => Expression::Str(token.raw),
                 };
-                Ok(state)
+                state
             }
             TokenKind::Identifier(val) => {
                 let next = self.peek()?;
@@ -298,25 +298,27 @@ impl Parser {
                             Err(_) => arr,
                         }
                     }
-                    TokenKind::Dot => {
-                        let subject = Expression::Variable(token.raw);
-                        self.match_token(TokenKind::Dot)?;
-                        let field = self.match_identifier()?;
-                        match BinOp::try_from(self.peek()?.kind) {
-                            Ok(_) => self.parse_bin_op(Some(Expression::Variable(field)))?,
-                            Err(_) => return Ok(Expression::FieldAccess(Box::new(subject), field)),
-                        }
-                    }
                     _ => match BinOp::try_from(self.peek()?.kind) {
                         Ok(_) => self.parse_bin_op(Some(Expression::Variable(token.raw)))?,
                         Err(_) => Expression::Variable(val),
                     },
                 };
-                Ok(state)
+                state
             }
-            TokenKind::SquareBraceOpen => self.parse_array(),
-            TokenKind::Keyword(Keyword::New) => self.parse_struct_initialization(),
-            other => Err(format!("Expected Expression, found {:?}", other)),
+            TokenKind::SquareBraceOpen => self.parse_array()?,
+            TokenKind::Keyword(Keyword::New) => self.parse_struct_initialization()?,
+            other => Err(format!("Expected Expression, found {:?}", other))?,
+        };
+
+        if self.peek_token(TokenKind::Dot).is_ok() {
+                self.match_token(TokenKind::Dot)?;
+                let field = self.match_identifier()?;
+                match BinOp::try_from(self.peek()?.kind) {
+                    Ok(_) => self.parse_bin_op(Some(expr)),
+                    Err(_) => return Ok(Expression::FieldAccess(Box::new(expr), field)),
+                }
+        } else {
+            Ok(expr)
         }
     }
 
diff --git a/tests/structs.sb b/tests/structs.sb
index 389f873..963472f 100644
--- a/tests/structs.sb
+++ b/tests/structs.sb
@@ -30,7 +30,7 @@ fn test_initialization() {
 fn test_simple_field_access() {
     let user: User = user_stub()
     // user.username = "Foo Bar"
-    // assert(user.username == "Foo Bar")
+    //assert(user.username == "Foo Bar")
 }
 
 fn main() {