AST - Refactored variable reference expressions

src/ast.rs

@@ -105,6 +105,15 @@ pub struct BinaryExpr {
     pub right: Box<ExprNode>,
 }
 
+/// A variable reference expression.
+#[derive(Debug, Clone)]
+pub struct VariableExpr {
+    /// The name of the variable, or the "this" keyword.
+    pub token: Token,
+    /// Identifier used for variable resolution.
+    pub id: usize,
+}
+
 /// An AST node that represents an expression.
 #[derive(Debug, Clone)]
 pub enum ExprNode {
@@ -135,11 +144,7 @@ pub enum ExprNode {
     Litteral { value: Token },
 
     /// A reference to a variable.
-    Variable {
+    Variable(VariableExpr),
-        name: Token,
-        /// Identifier used for variable resolution.
-        id: usize,
-    },
 
     /// A lambda function.
     Lambda {

src/dumper.rs

@@ -217,8 +217,8 @@ fn dump_expr_node(dumper: &mut Dumper, expr: &ExprNode) {
             dumper.current_line().push_str(&value.lexeme);
         }
 
-        ExprNode::Variable { name, id: _ } => {
+        ExprNode::Variable(var) => {
-            dumper.current_line().push_str(&name.lexeme);
+            dumper.current_line().push_str(&var.token.lexeme);
         }
 
         ExprNode::Lambda { params, body } => {