Replace generic list AST with typed expression tree

Each form (fn, let, for, set, do, call) now has its own variant with named fields instead of being a
plain list.

1 files changed, 41 insertions, 7 deletions

diff --git a/compiler/src/ast/models.rs b/compiler/src/ast/models.rs
index 2a8c5ae..64fec19 100644
--- a/compiler/src/ast/models.rs
+++ b/compiler/src/ast/models.rs
@@ -2,22 +2,56 @@ use std::rc::Rc;
 
 use crate::span::Spanned;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct LetVar {
+    pub name: Spanned<Rc<str>>,
+    pub expr: Spanned<Expr>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Atom {
-    Integer(i64),
-    String(Rc<str>),
-    Symbol(Rc<str>),
+    Int(i64),
+    Str(Rc<str>),
+    Sym(Rc<str>),
     Bool(bool),
     Nil,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Expr {
+    Fn {
+        name: Spanned<Rc<str>>,
+        args: Vec<Spanned<Rc<str>>>,
+        body: Vec<Spanned<Expr>>,
+    },
+    Const {
+        vars: Vec<Spanned<LetVar>>,
+    },
+    Let {
+        vars: Vec<Spanned<LetVar>>,
+        body: Vec<Spanned<Expr>>,
+    },
+    For {
+        loop_var: Spanned<Rc<str>>,
+        from: Spanned<Box<Expr>>,
+        to: Spanned<Box<Expr>>,
+        body: Vec<Spanned<Expr>>,
+    },
+    Set {
+        target_var: Spanned<Rc<str>>,
+        expr: Spanned<Box<Expr>>,
+    },
+    Do {
+        body: Vec<Spanned<Expr>>,
+    },
+    Call {
+        fn_name: Spanned<Rc<str>>,
+        args: Vec<Spanned<Expr>>,
+    },
     Atom(Atom),
-    List(Vec<Spanned<Expr>>),
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Ast(Vec<Spanned<Expr>>);
 
 impl Ast {