refactor: start of abstacting away ast nodes into an enum.

rzvxa · rzvxa · commit 7dd03cb70064 · 2024-03-16T18:54:55.000+03:30
diff --git a/crates/fuse-ast/src/ast.rs b/crates/fuse-ast/src/ast.rs
@@ -353,7 +353,6 @@ pub enum BinaryOperatorKind {
     Modulo(Span),
     ShiftLeft(Span),
     ShiftRight(Span),
-    Member(Span),
 }
 
 impl GetSpan for BinaryOperatorKind {
@@ -380,7 +379,6 @@ impl GetSpan for BinaryOperatorKind {
             Self::Modulo(span) => span,
             Self::ShiftLeft(span) => span,
             Self::ShiftRight(span) => span,
-            Self::Member(span) => span,
         };
         *span
     }
diff --git a/crates/fuse-ast/src/ast_node.rs b/crates/fuse-ast/src/ast_node.rs
@@ -0,0 +1,47 @@
+use crate::ast::*;
+
+#[derive(Debug, Clone, Copy)]
+pub enum AstNode<'a> {
+    // Primary nodes
+    Chunk(&'a Chunk),
+    Block(&'a Block),
+
+    // Statement related
+    EmptyStatement(&'a EmptyStatement),
+    ImplStatement(&'a ImplStatement),
+    EnumDeclaration(&'a EnumDeclaration),
+    StructDeclaration(&'a StructDeclaration),
+    FunctionDeclaration(&'a Function),
+    VariableDeclaration(&'a VariableDeclaration),
+
+    // expression related
+    FunctionExpression(&'a Function),
+    ArrayExpression(&'a ArrayExpression),
+    ParenthesizedExpression(&'a ParenthesizedExpression),
+    ConstructionExpression(&'a ConstructionExpression),
+    StructConstructionExpression(&'a StructConstructionExpression),
+    If(&'a If),
+    Else(&'a Else),
+
+    // function inner nodes
+    FunctionSignature(&'a FunctionSignature),
+    FunctionParameters(&'a FunctionParameters),
+    FunctionParameter(&'a FunctionParameter),
+    FunctionBody(&'a FunctionBody),
+
+    EnumVariant(&'a EnumVariant),
+
+    StructField(&'a StructField),
+
+    VisibilityModifier(&'a VisibilityModifier),
+
+    // literals
+    NumberLiteral(&'a NumberLiteral),
+    StringLiteral(&'a StringLiteral),
+    BooleanLiteral(&'a BooleanLiteral),
+
+    Identifier(&'a Identifier),
+
+    UnaryOperator(&'a UnaryOperator),
+    BinaryOperator(&'a BinaryOperator),
+}
diff --git a/crates/fuse-ast/src/lib.rs b/crates/fuse-ast/src/lib.rs
@@ -1,10 +1,12 @@
 mod ast_factory;
+mod ast_node;
 mod get_span;
 mod precedence;
 
 pub mod ast;
 
 pub use ast::*;
 pub use ast_factory::*;
+pub use ast_node::*;
 pub use get_span::*;
 pub use precedence::*;
diff --git a/crates/fuse-parser/src/parsers/operators.rs b/crates/fuse-parser/src/parsers/operators.rs
@@ -81,7 +81,6 @@ impl<'a> Parser<'a> {
             Percent => Modulo
             LShift => ShiftLeft
             RShift => ShiftRight
-            Dot => Member
         }
     }
 
diff --git a/crates/fuse-semantic/src/lib.rs b/crates/fuse-semantic/src/lib.rs
@@ -1,13 +1,13 @@
 use std::collections::HashMap;
 
 use fuse_ast::{
-    Atom, BinaryOperator, BinaryOperatorKind, BindingPatternKind, CallExpression, Chunk,
-    Expression, Function, Identifier, VariableDeclaration,
+    Atom, BindingPatternKind, Chunk, Function, Identifier, MemberExpression, MemberExpressionLHS,
+    MemberExpressionRHS, VariableDeclaration,
 };
 use fuse_common::ReferenceType;
 use fuse_visitor::{
-    walk_binary_operator_mut, walk_call_expression_mut, walk_function_mut,
-    walk_variable_declaration_mut, ScopeVisitor, VisitorMut,
+    walk_function_mut, walk_member_expression_mut, walk_variable_declaration_mut, ScopeVisitor,
+    VisitorMut,
 };
 
 #[derive(Debug, PartialEq, Clone, Copy)]
@@ -31,9 +31,9 @@ impl PartialEq<ReferenceType> for ScopeId {
     }
 }
 
-struct IdentifierMap(HashMap<Atom, ReferenceType>);
+struct IdentDeclMap(HashMap<Atom, ReferenceType>);
 
-impl IdentifierMap {
+impl IdentDeclMap {
     fn new() -> Self {
         Self(HashMap::new())
     }
@@ -54,30 +54,31 @@ enum ReferenceKind {
 
 struct ScopeTree {
     current: ScopeId,
-    identifier_maps: Vec<IdentifierMap>,
+    ident_decl_maps: Vec<IdentDeclMap>,
     /// Maps between `ReferenceId` and `ReferenceKind`
     reference_kinds: Vec<ReferenceKind>,
     parent_ids: Vec<ScopeId>,
 }
 
+/// Tree operations for `ScopeTree`
 impl ScopeTree {
     fn root_scope() -> Self {
         Self {
             current: ScopeId(0),
             parent_ids: vec![ScopeId(0)],
-            identifier_maps: vec![IdentifierMap::new()],
+            ident_decl_maps: vec![IdentDeclMap::new()],
             reference_kinds: Vec::new(),
         }
     }
 
     fn push_stack(&mut self) -> ScopeId {
-        self.identifier_maps.push(IdentifierMap::new());
+        self.ident_decl_maps.push(IdentDeclMap::new());
         self.parent_ids.push(self.current);
 
         // length of all arrays should be same.
-        debug_assert!(self.identifier_maps.len() == self.parent_ids.len());
+        debug_assert!(self.ident_decl_maps.len() == self.parent_ids.len());
 
-        self.current = ScopeId(self.identifier_maps.len() - 1);
+        self.current = ScopeId(self.ident_decl_maps.len() - 1);
         self.current
     }
 
@@ -90,13 +91,32 @@ impl ScopeTree {
         self.current = self.parent();
     }
 
+    fn parent(&self) -> ScopeId {
+        assert_ne!(
+            self.current, 0,
+            "Attempt to access the root scope's parent."
+        );
+        self.parent_ids[self.current.as_index()]
+    }
+
+    fn parent_of(&self, children_id: ScopeId) -> ScopeId {
+        assert_ne!(
+            self.current, 0,
+            "Attempt to access the root scope's parent."
+        );
+        self.parent_ids[children_id.as_index()]
+    }
+}
+
+/// Identifier operations for `ScopeTree`
+impl ScopeTree {
     /// Get an identifier reference from current scope or its parents.
     /// This function is implemented using loops instead of recursion.
-    fn identifier_reference(&mut self, atom: &Atom) -> Option<ReferenceType> {
+    fn scope_identifier_reference(&mut self, atom: &Atom) -> Option<ReferenceType> {
         let mut scope_id = self.current;
         let mut reference;
         loop {
-            reference = self.identifier_maps[scope_id.as_index()].get(atom);
+            reference = self.ident_decl_maps[scope_id.as_index()].get(atom);
 
             if reference.is_some() || scope_id.is_root() {
                 break;
@@ -109,29 +129,20 @@ impl ScopeTree {
 
     /// Set a `ReferenceType` for the given identifier's `Atom` in the current scope.
     /// Would return the last `ReferenceType` if we are shadowing it.
-    fn set_identifier_reference(
+    fn set_scope_identifier_reference(
         &mut self,
         atom: Atom,
         ref_id: ReferenceType,
-        ref_kind: ReferenceKind,
     ) -> Option<ReferenceType> {
-        self.identifier_maps[self.current.as_index()].insert(atom, ref_id)
-    }
-
-    fn parent(&self) -> ScopeId {
-        assert_ne!(
-            self.current, 0,
-            "Attempt to access the root scope's parent."
-        );
-        self.parent_ids[self.current.as_index()]
+        self.ident_decl_maps[self.current.as_index()].insert(atom, ref_id)
     }
 
-    fn parent_of(&self, children_id: ScopeId) -> ScopeId {
-        assert_ne!(
-            self.current, 0,
-            "Attempt to access the root scope's parent."
-        );
-        self.parent_ids[children_id.as_index()]
+    fn member_identifier_reference(
+        &mut self,
+        atom: Atom,
+        ref_id: ReferenceType,
+    ) -> Option<ReferenceType> {
+        self.ident_decl_maps[self.current.as_index()].insert(atom, ref_id)
     }
 }
 
@@ -159,23 +170,29 @@ impl<'ast> Semantic<'ast> {
 
     fn declare_identifier(&mut self, ident: &Identifier) {
         self.last_reference += 1;
-        self.scope.set_identifier_reference(
-            ident.name.clone(),
-            self.last_reference,
-            ReferenceKind::Scope,
-        );
+        self.scope
+            .set_scope_identifier_reference(ident.name.clone(), self.last_reference);
         ident.reference.set(Some(self.last_reference))
     }
 
     fn reference_scope_identifier(&mut self, ident: &Identifier) {
-        let reference = self.scope.identifier_reference(&ident.name);
+        let reference = self.scope.scope_identifier_reference(&ident.name);
         ident.reference.set(reference)
     }
 
-    fn reference_member_identifier(&mut self, ident: &Identifier, sup: Option<&Identifier>) {
-        let reference = self.scope.identifier_reference(&ident.name);
+    fn resolve_member_identifier(&mut self, ident: &Identifier, sup: Option<&Identifier>) {
+        let Some(sup) = sup else {
+            return self.declare_member_identifier(ident, None);
+        };
+        let reference = self.scope.scope_identifier_reference(&ident.name);
+        ident.reference.set(reference);
+        // todo!()
+    }
+
+    fn declare_member_identifier(&mut self, ident: &Identifier, sup: Option<&Identifier>) {
+        let reference = self.scope.scope_identifier_reference(&ident.name);
         ident.reference.set(reference);
-        todo!()
+        // todo!()
     }
 }
 
@@ -205,33 +222,20 @@ impl<'ast> VisitorMut<'ast> for Semantic<'ast> {
         walk_function_mut(self, decl)
     }
 
-    fn visit_binary_operator_mut(&mut self, op: &'ast mut BinaryOperator) {
-        match &op.kind {
-            BinaryOperatorKind::Member(_) => {
-                println!("{:?}", op);
-                let rhs = match &op.rhs {
-                    Expression::Identifier(rhs) => rhs,
-                    Expression::BinaryOperator(op) => match &**op {
-                        BinaryOperator {
-                            kind: BinaryOperatorKind::Member(..),
-                            lhs: Expression::Identifier(lhs),
-                            ..
-                        } => lhs,
-                        BinaryOperator {
-                            kind: BinaryOperatorKind::Member(..),
-                            lhs: Expression::ParenthesizedExpression(expr),
-                            ..
-                        } => todo!(),
-                        _ => {
-                            todo!()
-                        }
-                    },
-                    _ => panic!("Right hand side of a member(.) operator should be an identifier"),
-                };
+    fn visit_member_expression_mut(&mut self, member: &'ast mut MemberExpression) {
+        let lhs = member.lhs.as_ref();
+        let rhs = member.rhs.as_ref();
+        let sup = match lhs {
+            MemberExpressionLHS::Identifier(ident) => {
+                self.reference_scope_identifier(ident);
+                Some(ident)
             }
-            _ => {}
+            _ => None,
+        };
+        if let MemberExpressionRHS::Identifier(ident) = rhs {
+            self.resolve_member_identifier(ident, sup)
         }
-        walk_binary_operator_mut(self, op)
+        walk_member_expression_mut(self, member)
     }
 }
 
diff --git a/crates/fuse-visitor/src/lib.rs b/crates/fuse-visitor/src/lib.rs
@@ -1,7 +1,9 @@
+mod node_visitor;
 mod scope_visitor;
 mod visitor;
 mod visitor_mut;
 
+pub use node_visitor::*;
 pub use scope_visitor::*;
 pub use visitor::*;
 pub use visitor_mut::*;
@@ -26,9 +28,9 @@ macro_rules! visit_list {
 
 #[macro_export]
 macro_rules! visit_scope {
-    ($visitor:ident => $block:block) => {
+    ($visitor:ident => $block:expr) => {
         $visitor.enter_scope();
-        $block
+        $block;
         $visitor.leave_scope();
     };
 }
diff --git a/crates/fuse-visitor/src/node_visitor.rs b/crates/fuse-visitor/src/node_visitor.rs
@@ -0,0 +1,6 @@
+use fuse_ast::AstNode;
+
+pub trait NodeVisitor {
+    fn enter_node(&mut self, node: AstNode) {}
+    fn leave_node(&mut self, node: AstNode) {}
+}
diff --git a/crates/fuse-visitor/src/visitor.rs b/crates/fuse-visitor/src/visitor.rs

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,6 @@ pub enum BinaryOperatorKind {`
`353`	`353`	`Modulo(Span),`
`354`	`354`	`ShiftLeft(Span),`
`355`	`355`	`ShiftRight(Span),`
`356`		`- Member(Span),`
`357`	`356`	`}`
`358`	`357`
`359`	`358`	`impl GetSpan for BinaryOperatorKind {`
`@@ -380,7 +379,6 @@ impl GetSpan for BinaryOperatorKind {`
`380`	`379`	`Self::Modulo(span) => span,`
`381`	`380`	`Self::ShiftLeft(span) => span,`
`382`	`381`	`Self::ShiftRight(span) => span,`
`383`		`- Self::Member(span) => span,`
`384`	`382`	`};`
`385`	`383`	`*span`
`386`	`384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ impl<'a> Parser<'a> {`
`81`	`81`	`Percent => Modulo`
`82`	`82`	`LShift => ShiftLeft`
`83`	`83`	`RShift => ShiftRight`
`84`		`- Dot => Member`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`