From 37a9a37c7222847257b62eb6eac23dcc12051c2f Mon Sep 17 00:00:00 2001
From: Jeff <dev@jeffa.io>
Date: Fri, 29 Dec 2023 14:35:52 -0500
Subject: [PATCH] Fix type check bug

---
 src/abstract_tree/assignment.rs | 18 ++++++++++--------
 src/interpret.rs                | 20 ++++++++++++--------
 src/main.rs                     |  6 ++++--
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/abstract_tree/assignment.rs b/src/abstract_tree/assignment.rs
index 6f168a0..028e984 100644
--- a/src/abstract_tree/assignment.rs
+++ b/src/abstract_tree/assignment.rs
@@ -28,17 +28,17 @@ impl AbstractTree for Assignment {
         let identifier = Identifier::from_syntax_node(source, identifier_node, context)?;
         let identifier_type = identifier.expected_type(context)?;
 
-        let type_node = node.child(1);
-        let type_definition = if let Some(type_node) = type_node {
-            if type_node.kind() == "type_definition" {
-                Some(TypeDefinition::from_syntax_node(
-                    source, type_node, context,
-                )?)
+        let type_node = node.child(1).unwrap();
+        let type_definition = if type_node.kind() == "type_definition" {
+            Some(TypeDefinition::from_syntax_node(
+                source, type_node, context,
+            )?)
+        } else {
+            if let Some((_, r#type)) = context.variables()?.get(identifier.inner()) {
+                Some(TypeDefinition::new(r#type.clone()))
             } else {
                 None
             }
-        } else {
-            None
         };
 
         let operator_node = node.child(child_count - 2).unwrap().child(0).unwrap();
@@ -87,6 +87,8 @@ impl AbstractTree for Assignment {
                 AssignmentOperator::Equal => {}
                 AssignmentOperator::PlusEqual => {
                     if let Type::List(item_type) = identifier_type {
+                        println!("{item_type} {statement_type}");
+
                         item_type
                             .check(&statement_type)
                             .map_err(|error| error.at_node(statement_node, source))?;
diff --git a/src/interpret.rs b/src/interpret.rs
index d4f66ea..c214738 100644
--- a/src/interpret.rs
+++ b/src/interpret.rs
@@ -4,7 +4,7 @@
 //! functions or by constructing your own Evaluator.
 use tree_sitter::{Parser, Tree as TSTree};
 
-use crate::{language, AbstractTree, Map, Result, Root, Value};
+use crate::{language, AbstractTree, Error, Map, Result, Root, Value};
 
 /// Interpret the given source code.
 ///
@@ -54,7 +54,7 @@ pub fn interpret_with_context(source: &str, context: &mut Map) -> Result<Value>
 
 /// A source code interpreter for the Dust language.
 pub struct Interpreter<'c, 's> {
-    _parser: Parser,
+    parser: Parser,
     context: &'c mut Map,
     source: &'s str,
     syntax_tree: Option<TSTree>,
@@ -68,7 +68,7 @@ impl<'c, 's> Interpreter<'c, 's> {
         parser.set_language(language())?;
 
         Ok(Interpreter {
-            _parser: parser,
+            parser,
             context,
             source,
             syntax_tree: None,
@@ -80,8 +80,12 @@ impl<'c, 's> Interpreter<'c, 's> {
         self.source = source;
     }
 
+    pub fn parse_only(&mut self) {
+        self.syntax_tree = self.parser.parse(self.source, self.syntax_tree.as_ref());
+    }
+
     pub fn run(&mut self) -> Result<Value> {
-        self.syntax_tree = self._parser.parse(self.source, self.syntax_tree.as_ref());
+        self.syntax_tree = self.parser.parse(self.source, self.syntax_tree.as_ref());
         self.abstract_tree = if let Some(syntax_tree) = &self.syntax_tree {
             Some(Root::from_syntax_node(
                 self.source,
@@ -89,7 +93,7 @@ impl<'c, 's> Interpreter<'c, 's> {
                 &self.context,
             )?)
         } else {
-            return Err(crate::Error::ParserCancelled);
+            return Err(Error::ParserCancelled);
         };
 
         if let Some(abstract_tree) = &self.abstract_tree {
@@ -99,11 +103,11 @@ impl<'c, 's> Interpreter<'c, 's> {
         }
     }
 
-    pub fn syntax_tree(&self) -> Option<String> {
+    pub fn syntax_tree(&self) -> Result<String> {
         if let Some(syntax_tree) = &self.syntax_tree {
-            Some(syntax_tree.root_node().to_sexp())
+            Ok(syntax_tree.root_node().to_sexp())
         } else {
-            None
+            Err(Error::ParserCancelled)
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 9d0b622..6725fb5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -76,7 +76,7 @@ fn main() {
     let mut parser = TSParser::new();
     parser.set_language(language()).unwrap();
 
-    let mut interpreter = Interpreter::parse(parser, &mut context, &source).unwrap();
+    let mut interpreter = Interpreter::new(&mut context, &source).unwrap();
 
     if args.interactive {
         loop {
@@ -87,7 +87,9 @@ fn main() {
     }
 
     if args.show_syntax_tree {
-        println!("{}", interpreter.syntax_tree());
+        interpreter.parse_only();
+
+        println!("{}", interpreter.syntax_tree().unwrap());
     }
 
     let eval_result = interpreter.run();