🚚 (parser): Move AST structs to own file

semver: chore

src/parser/ast.rs

@@ -0,0 +1,32 @@
+use crate::scanner::lexeme::Lexeme;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Symbol {
+    Expression(Expression),
+    Statement(Statement),
+    Unknown(Lexeme),
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Expression {
+    Number(f64),
+    String(String),
+    Identifier(String),
+    Binary(Box<Expression>, BinaryOperation, Box<Expression>),
+    Grouping(Box<Expression>),
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Statement {
+    Block(Vec<Statement>),
+    Declaration(String, Expression),
+    Expression(Expression),
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum BinaryOperation {
+    Plus,
+    Minus,
+    Times,
+    Divide,
+}

src/parser/expression.rs

@@ -1,4 +1,4 @@
-use super::{lookup::BindingPower, Diagnostic, Expression, Parser};
+use super::{ast::Expression, lookup::BindingPower, Diagnostic, Parser};
 use crate::scanner::lexeme::{Lexeme, Range};
 
 pub fn parse(

src/parser/lookup.rs

@@ -1,10 +1,13 @@
+use crate::scanner::lexeme::{Lexeme, TokenType, TokenValue};
 use core::panic;
 use std::collections::HashMap;
 
 use super::{
-    expression, macros::expect_token, BinaryOperation, Diagnostic, Expression, Parser, Statement,
+    ast::{BinaryOperation, Expression, Statement},
+    macros::{expect_expression, expect_token},
+    statement::parse_variable_declaration,
+    Diagnostic, Parser,
 };
-use crate::scanner::lexeme::{Lexeme, TokenType, TokenValue};
 
 #[derive(Debug, PartialEq, PartialOrd)]
 pub enum BindingPower {

src/parser/mod.rs

@@ -1,44 +1,16 @@
 use std::collections::HashSet;
 
+use ast::{Statement, Symbol};
 use lookup::Lookup;
 
 use crate::scanner::lexeme::{Lexeme, Range};
 
+pub mod ast;
 pub mod expression;
 pub mod lookup;
 pub mod macros;
 pub mod statement;
 
-#[derive(Debug, Clone, PartialEq)]
-pub enum Symbol {
-    Expression(Expression),
-    Statement(Statement),
-    Unknown(Lexeme),
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum Expression {
-    Number(f64),
-    String(String),
-    Identifier(String),
-    Binary(Box<Expression>, BinaryOperation, Box<Expression>),
-    Grouping(Box<Expression>),
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum Statement {
-    Block(Vec<Statement>),
-    Expression(Expression),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum BinaryOperation {
-    Plus,
-    Minus,
-    Times,
-    Divide,
-}
-
 pub struct Parser {
     lookup: Lookup,
     lexemes: Vec<Lexeme>,
@@ -142,6 +114,8 @@ impl Diagnostic {
 
 #[cfg(test)]
 mod tests {
+    use ast::{BinaryOperation, Expression};
+
     use crate::scanner::Scanner;
 
     use super::*;

src/transpiler/bend.rs

@@ -1,4 +1,4 @@
-use crate::parser::{BinaryOperation, Expression, Statement, Symbol};
+use crate::parser::ast::{BinaryOperation, Expression, Statement, Symbol};
 
 use super::Transpiler;
 

src/transpiler/mod.rs

@@ -1,4 +1,4 @@
-use crate::parser::Symbol;
+use crate::parser::ast::Symbol;
 
 pub mod bend;