refactor(ast): add reference cell to identifiers.

fuse-lang · Mar 11, 2024 · a3f05a1 · a3f05a1
1 parent 31f569d
commit a3f05a1
Show file tree

Hide file tree

Showing 40 changed files with 104 additions and 1 deletion.
diff --git a/crates/fuse-ast/src/ast.rs b/crates/fuse-ast/src/ast.rs
@@ -1,6 +1,6 @@
 use fuse_common::Span;
 use fuse_common_proc::serializable;
-use std::rc::Rc;
+use std::{cell::Cell, rc::Rc};
 
 #[serializable]
 #[derive(Debug)]
@@ -185,8 +185,13 @@ pub enum InterpolationFormat {
 pub struct Identifier {
     pub span: Span,
     pub name: Atom,
+    pub reference: Cell<Option<ReferenceId>>,
 }
 
+#[serializable]
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub struct ReferenceId(u32);
+
 #[serializable]
 #[derive(Debug, PartialEq)]
 pub struct Function {

diff --git a/crates/fuse-parser/src/parsers/expressions.rs b/crates/fuse-parser/src/parsers/expressions.rs
@@ -1,3 +1,5 @@
+use std::cell::Cell;
+
 use crate::{lexer::TokenKind, Parser, ParserResult};
 use fuse_ast::{
     ArrayExpressionElement, BinaryOperator, BooleanLiteral, ConstructionExpression,
@@ -71,6 +73,7 @@ impl<'a> Parser<'a> {
         Ok(Identifier {
             span: token.span(),
             name: self.ast.atom(view),
+            reference: Cell::default(),
         })
     }
 

diff --git a/crates/fuse-parser/tests/cases/fail/variable-declaration-01/ast.snap b/crates/fuse-parser/tests/cases/fail/variable-declaration-01/ast.snap
@@ -29,6 +29,7 @@ Some(Chunk(
                 end: 10,
               ),
               name: Atom("name"),
+              reference: None,
             ),
             mutable: false,
           )),

diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-01/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-01/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 1,
           ),
           name: Atom("x"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: LogicalAnd(Span(
@@ -34,13 +35,15 @@ Some(Chunk(
               end: 5,
             ),
             name: Atom("a"),
+            reference: None,
           )),
           rhs: Identifier(Identifier(
             span: Span(
               start: 10,
               end: 11,
             ),
             name: Atom("b"),
+            reference: None,
           )),
         )),
       ))),

diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-02/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-02/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 1,
           ),
           name: Atom("x"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: LogicalAnd(Span(
@@ -39,13 +40,15 @@ Some(Chunk(
                 end: 5,
               ),
               name: Atom("a"),
+              reference: None,
             )),
             rhs: Identifier(Identifier(
               span: Span(
                 start: 10,
                 end: 11,
               ),
               name: Atom("b"),
+              reference: None,
             )),
           )),
           rhs: Identifier(Identifier(
@@ -54,6 +57,7 @@ Some(Chunk(
               end: 17,
             ),
             name: Atom("c"),
+            reference: None,
           )),
         )),
       ))),

diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-03/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-03/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 1,
           ),
           name: Atom("x"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: LogicalOr(Span(
@@ -39,13 +40,15 @@ Some(Chunk(
                 end: 5,
               ),
               name: Atom("a"),
+              reference: None,
             )),
             rhs: Identifier(Identifier(
               span: Span(
                 start: 10,
                 end: 11,
               ),
               name: Atom("b"),
+              reference: None,
             )),
           )),
           rhs: Identifier(Identifier(
@@ -54,6 +57,7 @@ Some(Chunk(
               end: 16,
             ),
             name: Atom("c"),
+            reference: None,
           )),
         )),
       ))),

diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-04/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-04/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 1,
           ),
           name: Atom("x"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: Minus(Span(

diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-05/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-05/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 1,
           ),
           name: Atom("x"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: LessThan(Span(

diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-06/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-06/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 1,
           ),
           name: Atom("x"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: LogicalAnd(Span(
@@ -39,13 +40,15 @@ Some(Chunk(
                 end: 5,
               ),
               name: Atom("x"),
+              reference: None,
             )),
             rhs: Identifier(Identifier(
               span: Span(
                 start: 8,
                 end: 11,
               ),
               name: Atom("max"),
+              reference: None,
             )),
           )),
           rhs: BinaryOperator(BinaryOperator(
@@ -59,13 +62,15 @@ Some(Chunk(
                 end: 17,
               ),
               name: Atom("x"),
+              reference: None,
             )),
             rhs: Identifier(Identifier(
               span: Span(
                 start: 21,
                 end: 24,
               ),
               name: Atom("min"),
+              reference: None,
             )),
           )),
         )),

diff --git a/crates/fuse-parser/tests/cases/pass/binary-operator-07/ast.snap b/crates/fuse-parser/tests/cases/pass/binary-operator-07/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 1,
           ),
           name: Atom("x"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: Multiply(Span(
@@ -39,6 +40,7 @@ Some(Chunk(
                 end: 6,
               ),
               name: Atom("x"),
+              reference: None,
             )),
           )),
           rhs: NumberLiteral(NumberLiteral(

diff --git a/crates/fuse-parser/tests/cases/pass/call-expression-01/ast.snap b/crates/fuse-parser/tests/cases/pass/call-expression-01/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 4,
           ),
           name: Atom("test"),
+          reference: None,
         )),
         arguments: [],
       ))),

diff --git a/crates/fuse-parser/tests/cases/pass/call-expression-02/ast.snap b/crates/fuse-parser/tests/cases/pass/call-expression-02/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 4,
           ),
           name: Atom("test"),
+          reference: None,
         )),
         arguments: [
           Identifier(Identifier(
@@ -30,20 +31,23 @@ Some(Chunk(
               end: 6,
             ),
             name: Atom("a"),
+            reference: None,
           )),
           Identifier(Identifier(
             span: Span(
               start: 8,
               end: 9,
             ),
             name: Atom("b"),
+            reference: None,
           )),
           Identifier(Identifier(
             span: Span(
               start: 11,
               end: 12,
             ),
             name: Atom("c"),
+            reference: None,
           )),
         ],
       ))),

diff --git a/crates/fuse-parser/tests/cases/pass/call-expression-03/ast.snap b/crates/fuse-parser/tests/cases/pass/call-expression-03/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 3,
           ),
           name: Atom("foo"),
+          reference: None,
         )),
         rhs: BinaryOperator(BinaryOperator(
           kind: Member(Span(
@@ -39,6 +40,7 @@ Some(Chunk(
                 end: 7,
               ),
               name: Atom("bar"),
+              reference: None,
             )),
             arguments: [],
           )),
@@ -53,6 +55,7 @@ Some(Chunk(
                 end: 13,
               ),
               name: Atom("baz"),
+              reference: None,
             )),
             arguments: [],
           )),

diff --git a/crates/fuse-parser/tests/cases/pass/enum-declaration-01/ast.snap b/crates/fuse-parser/tests/cases/pass/enum-declaration-01/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 13,
           ),
           name: Atom("EnumName"),
+          reference: None,
         ),
         variants: [
           EnumVariant(
@@ -31,6 +32,7 @@ Some(Chunk(
                 end: 23,
               ),
               name: Atom("VariantA"),
+              reference: None,
             ),
             value: None,
           ),
@@ -41,6 +43,7 @@ Some(Chunk(
                 end: 33,
               ),
               name: Atom("VariantB"),
+              reference: None,
             ),
             value: None,
           ),

diff --git a/crates/fuse-parser/tests/cases/pass/enum-declaration-02/ast.snap b/crates/fuse-parser/tests/cases/pass/enum-declaration-02/ast.snap
@@ -22,6 +22,7 @@ Some(Chunk(
             end: 10,
           ),
           name: Atom("Ident"),
+          reference: None,
         ),
         variants: [
           EnumVariant(
@@ -31,6 +32,7 @@ Some(Chunk(
                 end: 16,
               ),
               name: Atom("Var1"),
+              reference: None,
             ),
             value: Some(StringLiteral(StringLiteral(
               span: Span(
@@ -52,6 +54,7 @@ Some(Chunk(
                 end: 32,
               ),
               name: Atom("Var2"),
+              reference: None,
             ),
             value: Some(StringLiteral(StringLiteral(
               span: Span(

diff --git a/crates/fuse-parser/tests/cases/pass/function-declaration-01/ast.snap b/crates/fuse-parser/tests/cases/pass/function-declaration-01/ast.snap
@@ -27,6 +27,7 @@ Some(Chunk(
               end: 13,
             ),
             name: Atom("test"),
+            reference: None,
           )),
           params: FunctionParameters(
             span: Span(

diff --git a/crates/fuse-parser/tests/cases/pass/function-declaration-02/ast.snap b/crates/fuse-parser/tests/cases/pass/function-declaration-02/ast.snap
@@ -27,6 +27,7 @@ Some(Chunk(
               end: 13,
             ),
             name: Atom("test"),
+            reference: None,
           )),
           params: FunctionParameters(
             span: Span(
@@ -51,6 +52,7 @@ Some(Chunk(
                         end: 15,
                       ),
                       name: Atom("a"),
+                      reference: None,
                     ),
                     mutable: false,
                   )),
@@ -75,6 +77,7 @@ Some(Chunk(
                         end: 18,
                       ),
                       name: Atom("b"),
+                      reference: None,
                     ),
                     mutable: false,
                   )),
@@ -99,6 +102,7 @@ Some(Chunk(
                         end: 21,
                       ),
                       name: Atom("c"),
+                      reference: None,
                     ),
                     mutable: false,
                   )),
@@ -119,6 +123,7 @@ Some(Chunk(
                 end: 26,
               ),
               name: Atom("b"),
+              reference: None,
             ))),
           ],
         )),

diff --git a/crates/fuse-parser/tests/cases/pass/function-declaration-03/ast.snap b/crates/fuse-parser/tests/cases/pass/function-declaration-03/ast.snap
@@ -27,6 +27,7 @@ Some(Chunk(
               end: 7,
             ),
             name: Atom("test"),
+            reference: None,
           )),
           params: FunctionParameters(
             span: Span(
@@ -51,6 +52,7 @@ Some(Chunk(
                         end: 9,
                       ),
                       name: Atom("a"),
+                      reference: None,
                     ),
                     mutable: false,
                   )),
@@ -69,6 +71,7 @@ Some(Chunk(
             end: 15,
           ),
           name: Atom("a"),
+          reference: None,
         ))),
       )),
     ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ Some(Chunk( @@
                 end: 4,
               ),
               name: Atom("test"),
+              reference: None,
             )),
             arguments: [],
           ))),
@@ Expand Down @@