Make project structure more consistentdev

9 files changed, 77 insertions, 68 deletions

diff --git a/compiler/src/ast/mod.rs b/compiler/src/ast/mod.rs
index 8e35baf..2a0be03 100644
--- a/compiler/src/ast/mod.rs
+++ b/compiler/src/ast/mod.rs
@@ -1,40 +1,10 @@
 mod error;
+mod models;
 mod parser;
 
-use std::rc::Rc;
-
-use crate::span::Spanned;
 pub use error::Error;
+pub use models::{Ast, Atom, Expr};
 pub use parser::Parser;
 
 #[cfg(test)]
 mod tests;
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum Atom {
-    Float(f64),
-    Integer(i64),
-    String(Rc<str>),
-    Symbol(Rc<str>),
-    Bool(bool),
-    Nil,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum Expr {
-    Atom(Atom),
-    List(Vec<Spanned<Expr>>),
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Program(Vec<Spanned<Expr>>);
-
-impl Program {
-    pub fn inner(&self) -> &[Spanned<Expr>] {
-        &self.0
-    }
-
-    pub fn into_inner(self) -> Vec<Spanned<Expr>> {
-        self.0
-    }
-}
diff --git a/compiler/src/ast/models.rs b/compiler/src/ast/models.rs
new file mode 100644
index 0000000..db9728d
--- /dev/null
+++ b/compiler/src/ast/models.rs
@@ -0,0 +1,36 @@
+use std::rc::Rc;
+
+use crate::span::Spanned;
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum Atom {
+    Float(f64),
+    Integer(i64),
+    String(Rc<str>),
+    Symbol(Rc<str>),
+    Bool(bool),
+    Nil,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum Expr {
+    Atom(Atom),
+    List(Vec<Spanned<Expr>>),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Ast(Vec<Spanned<Expr>>);
+
+impl Ast {
+    pub fn new(ast: Vec<Spanned<Expr>>) -> Self {
+        Self(ast)
+    }
+
+    pub fn inner(&self) -> &[Spanned<Expr>] {
+        &self.0
+    }
+
+    pub fn into_inner(self) -> Vec<Spanned<Expr>> {
+        self.0
+    }
+}
diff --git a/compiler/src/ast/parser.rs b/compiler/src/ast/parser.rs
index 263e5b7..33b36be 100644
--- a/compiler/src/ast/parser.rs
+++ b/compiler/src/ast/parser.rs
@@ -1,8 +1,8 @@
 use std::iter::Peekable;
 
 use crate::{
-    ast::{Atom, Error, Expr, Program},
-    lexer::Token,
+    ast::{Ast, Atom, Error, Expr},
+    lex::Token,
     span::{Pos, Span, Spanned},
 };
 
@@ -174,13 +174,13 @@ where
         Err(Spanned::new(Error::UnclosedLeftPar, left_par_span))
     }
 
-    pub fn parse(mut self) -> Result<Program, Spanned<Error>> {
-        let mut program = Vec::new();
+    pub fn parse(mut self) -> Result<Ast, Spanned<Error>> {
+        let mut ast = Vec::new();
 
         while self.peek().is_some() {
-            program.push(self.parse_expr()?)
+            ast.push(self.parse_expr()?)
         }
 
-        Ok(Program(program))
+        Ok(Ast::new(ast))
     }
 }
diff --git a/compiler/src/ast/tests.rs b/compiler/src/ast/tests.rs
index c6d8c38..8905427 100644
--- a/compiler/src/ast/tests.rs
+++ b/compiler/src/ast/tests.rs
@@ -1,14 +1,10 @@
-use std::f64;
-use std::fmt::Debug;
-use std::iter::repeat_n;
-use std::rc::Rc;
+use std::{fmt::Debug, iter::repeat_n, rc::Rc};
 
-use self::E::*;
-use super::{Error, Parser, parser::MAX_DEPTH};
-use crate::ast::{Atom, Expr};
-use crate::lexer::Token;
-use crate::lexer::Token::*;
-use crate::span::{Pos, Span, Spanned};
+use crate::{
+    ast::{Atom, Error, Expr, Parser, parser::MAX_DEPTH, tests::E::*},
+    lex::Token::{self, *},
+    span::{Pos, Span, Spanned},
+};
 
 #[derive(Debug, PartialEq)]
 enum E {
diff --git a/compiler/src/lexer/mod.rs b/compiler/src/lex/lexer.rs
index f3c8b76..801d382 100644
--- a/compiler/src/lexer/mod.rs
+++ b/compiler/src/lex/lexer.rs
@@ -1,23 +1,12 @@
-use crate::span::{Pos, Span, Spanned};
-
-#[cfg(test)]
-mod tests;
+use crate::{
+    lex::Token,
+    span::{Pos, Span, Spanned},
+};
 
 fn is_terminator(ch: char) -> bool {
     ch.is_whitespace() || matches!(ch, '(' | ')' | '\'' | '"' | ';')
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Token<'a> {
-    LeftPar,
-    RightPar,
-    Quote,
-    Number(&'a str),
-    String(&'a str),
-    UnclosedString(&'a str),
-    Symbol(&'a str),
-}
-
 pub struct Lexer<'a> {
     input: &'a str,
     cursor: usize,
diff --git a/compiler/src/lex/mod.rs b/compiler/src/lex/mod.rs
new file mode 100644
index 0000000..7bc4440
--- /dev/null
+++ b/compiler/src/lex/mod.rs
@@ -0,0 +1,8 @@
+mod lexer;
+mod token;
+
+pub use lexer::Lexer;
+pub use token::Token;
+
+#[cfg(test)]
+mod tests;
diff --git a/compiler/src/lexer/tests.rs b/compiler/src/lex/tests.rs
index 6f96c65..2d872a2 100644
--- a/compiler/src/lexer/tests.rs
+++ b/compiler/src/lex/tests.rs
@@ -1,7 +1,7 @@
-use crate::span::Pos;
-
-use super::Token::*;
-use super::{Lexer, Token};
+use crate::{
+    lex::{Lexer, Token, Token::*},
+    span::Pos,
+};
 
 fn tokenize<'a>(input: &'a str) -> Vec<Token<'a>> {
     Lexer::new(input).map(|s| s.inner).collect()
diff --git a/compiler/src/lex/token.rs b/compiler/src/lex/token.rs
new file mode 100644
index 0000000..2d07885
--- /dev/null
+++ b/compiler/src/lex/token.rs
@@ -0,0 +1,10 @@
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Token<'a> {
+    LeftPar,
+    RightPar,
+    Quote,
+    Number(&'a str),
+    String(&'a str),
+    UnclosedString(&'a str),
+    Symbol(&'a str),
+}
diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
index b9b7a46..80311b4 100644
--- a/compiler/src/lib.rs
+++ b/compiler/src/lib.rs
@@ -1,3 +1,3 @@
 pub mod ast;
-pub mod lexer;
+pub mod lex;
 pub mod span;