Split up and expand ast

src/ast/basic.rs

@@ -0,0 +1,39 @@
+use std::fmt;
+
+use crate::span::{HasSpan, Span};
+
+#[derive(Clone)]
+pub struct Space {
+    pub comment: Vec<(String, Span)>,
+    pub span: Span,
+}
+
+impl fmt::Debug for Space {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Space").finish()
+    }
+}
+
+impl HasSpan for Space {
+    fn span(&self) -> Span {
+        self.span
+    }
+}
+
+#[derive(Clone)]
+pub struct Ident {
+    pub name: String,
+    pub span: Span,
+}
+
+impl fmt::Debug for Ident {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "i#{}", self.name)
+    }
+}
+
+impl HasSpan for Ident {
+    fn span(&self) -> Span {
+        self.span
+    }
+}

src/ast/call.rs

@@ -0,0 +1,50 @@
+use crate::span::{HasSpan, Span};
+
+use super::basic::Space;
+use super::expr::Expr;
+use super::table_constr::TableConstr;
+
+#[derive(Debug, Clone)]
+pub enum Call {
+    /// `a(b)`
+    ///
+    /// Structure: `expr s0 ( s1 arg s2)
+    Arg {
+        expr: Box<Expr>,
+        s0: Space,
+        s1: Space,
+        arg: Box<Expr>,
+        s2: Space,
+        span: Span,
+    },
+
+    /// `a()`
+    ///
+    /// Structure: `expr s0 ( s1 )`
+    NoArg {
+        expr: Box<Expr>,
+        s0: Space,
+        s1: Space,
+        span: Span,
+    },
+
+    /// `a{..}`
+    ///
+    /// Structure: `expr s0 constr`
+    Constr {
+        expr: Box<Expr>,
+        s0: Space,
+        constr: TableConstr,
+        span: Span,
+    },
+}
+
+impl HasSpan for Call {
+    fn span(&self) -> Span {
+        match self {
+            Call::Arg { span, .. } => *span,
+            Call::NoArg { span, .. } => *span,
+            Call::Constr { span, .. } => *span,
+        }
+    }
+}

src/ast/expr.rs

@@ -0,0 +1,102 @@
+use crate::span::{HasSpan, Span};
+
+use super::basic::Space;
+use super::call::Call;
+use super::field::Field;
+use super::lit::Lit;
+use super::table_constr::TableConstr;
+use super::table_destr::TableDestr;
+use super::var::Var;
+
+#[derive(Debug, Clone, Copy)]
+pub enum BinOp {
+    /// `+`
+    Add,
+    /// `-`
+    Sub,
+    /// `*`
+    Mul,
+    /// `/`
+    Div,
+    /// `%`
+    Mod,
+    /// `==`
+    Eq,
+    /// `!=`
+    Neq,
+    /// `and`
+    And,
+    /// `or`
+    Or,
+}
+
+#[derive(Debug, Clone)]
+pub enum Expr {
+    Lit(Lit),
+    Call(Call),
+    Field(Field),
+    Var(Var),
+    TableConstr(TableConstr),
+    TableDestr(TableDestr),
+
+    /// `(a)`
+    ///
+    /// Structure: `( s0 inner s1 )`
+    Paren {
+        s0: Space,
+        inner: Box<Expr>,
+        s1: Space,
+        span: Span,
+    },
+
+    /// `-a`
+    ///
+    /// Structure: `- s0 expr`
+    Neg {
+        minus: Span,
+        s0: Space,
+        expr: Box<Expr>,
+        span: Span,
+    },
+
+    /// `not a`
+    ///
+    /// Structure: `'not' s0 expr`
+    Not {
+        not: Span,
+        s0: Space,
+        expr: Box<Expr>,
+        span: Span,
+    },
+
+    /// - `a + b`
+    /// - `a == b`
+    /// - `a and b`
+    ///
+    /// Structure: `left s0 op s1 right`
+    BinOp {
+        left: Box<Expr>,
+        s0: Space,
+        op: BinOp,
+        s1: Space,
+        right: Box<Expr>,
+        span: Span,
+    },
+}
+
+impl HasSpan for Expr {
+    fn span(&self) -> Span {
+        match self {
+            Expr::Lit(lit) => lit.span(),
+            Expr::Call(call) => call.span(),
+            Expr::Field(field) => field.span(),
+            Expr::Var(var) => var.span(),
+            Expr::TableConstr(constr) => constr.span(),
+            Expr::TableDestr(destr) => destr.span(),
+            Expr::Paren { span, .. } => *span,
+            Expr::Neg { span, .. } => *span,
+            Expr::Not { span, .. } => *span,
+            Expr::BinOp { span, .. } => *span,
+        }
+    }
+}

src/ast/field.rs

@@ -0,0 +1,70 @@
+use crate::span::{HasSpan, Span};
+
+use super::basic::{Ident, Space};
+use super::expr::Expr;
+
+#[derive(Debug, Clone)]
+pub enum Field {
+    /// `a[b]`
+    ///
+    /// Structure: `expr s0 [ s1 index s2 ]`
+    Access {
+        expr: Box<Expr>,
+        s0: Space,
+        s1: Space,
+        index: Box<Expr>,
+        s2: Space,
+        span: Span,
+    },
+
+    /// `a[b] = c`
+    ///
+    /// Structure: `expr s0 [ s1 index s2 ] s3 = s4 value`
+    Assign {
+        expr: Box<Expr>,
+        s0: Space,
+        s1: Space,
+        index: Box<Expr>,
+        s2: Space,
+        s3: Space,
+        s4: Space,
+        value: Box<Expr>,
+        span: Span,
+    },
+
+    /// `a.foo`
+    ///
+    /// Structure: `expr s0 . s1 ident`
+    AccessIdent {
+        expr: Box<Expr>,
+        s0: Space,
+        s1: Space,
+        ident: Ident,
+        span: Span,
+    },
+
+    /// `a.foo = b`
+    ///
+    /// Structure: `expr s0 . s1 ident s2 = s3 value`
+    AssignIdent {
+        expr: Box<Expr>,
+        s0: Space,
+        s1: Space,
+        ident: Ident,
+        s2: Space,
+        s3: Space,
+        value: Box<Expr>,
+        span: Span,
+    },
+}
+
+impl HasSpan for Field {
+    fn span(&self) -> Span {
+        match self {
+            Field::Access { span, .. } => *span,
+            Field::Assign { span, .. } => *span,
+            Field::AccessIdent { span, .. } => *span,
+            Field::AssignIdent { span, .. } => *span,
+        }
+    }
+}

src/ast/lit.rs

@@ -0,0 +1,165 @@
+use std::fmt;
+
+use crate::span::{HasSpan, Span};
+
+use super::basic::{Ident, Space};
+use super::expr::Expr;
+
+#[derive(Clone)]
+pub enum NumLitStr {
+    /// - `0b_0001_1011`
+    /// - `0b10`
+    Bin(String),
+
+    /// - `12_345`
+    /// - `7`
+    Dec(String),
+
+    /// - `0x_c0_f3`
+    /// - `0xB`
+    Hex(String),
+}
+
+impl fmt::Debug for NumLitStr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Bin(str) => write!(f, "0b{str}"),
+            Self::Dec(str) => write!(f, "{str}"),
+            Self::Hex(str) => write!(f, "0x{str}"),
+        }
+    }
+}
+
+/// Positive number literal.
+///
+/// Possible bases are binary, decimal, hexadecimal. Underscores can be inserted
+/// before and after any digit.
+#[derive(Clone)]
+pub struct NumLit {
+    pub value: i64,
+    pub str: NumLitStr,
+    pub span: Span,
+}
+
+impl fmt::Debug for NumLit {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.str.fmt(f)
+    }
+}
+
+impl HasSpan for NumLit {
+    fn span(&self) -> Span {
+        self.span
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum StringLit {
+    /// - `"Hello world\n"`
+    /// - `""`
+    Inline(String, Span),
+
+    /// ```text
+    /// """
+    ///     Hello,
+    ///     world!
+    /// """
+    /// ```
+    Multiline(String, Span),
+}
+
+impl HasSpan for StringLit {
+    fn span(&self) -> Span {
+        match self {
+            StringLit::Inline(_, span) => *span,
+            StringLit::Multiline(_, span) => *span,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum TableLitElem {
+    /// `a`
+    Positional(Box<Expr>),
+
+    /// `foo: a`
+    ///
+    /// Structure: `name s0 : s1 value`
+    Named {
+        name: Ident,
+        s0: Space,
+        s1: Space,
+        value: Box<Expr>,
+        span: Span,
+    },
+}
+
+impl HasSpan for TableLitElem {
+    fn span(&self) -> Span {
+        match self {
+            TableLitElem::Positional(value) => value.span(),
+            TableLitElem::Named { span, .. } => *span,
+        }
+    }
+}
+
+/// `'{ a, foo: b }`
+#[derive(Debug, Clone)]
+pub struct TableLit {
+    pub elems: Vec<(Space, TableLitElem, Space)>,
+    /// `Some` if there is a trailing comma, `None` otherwise.
+    pub trailing_comma: Option<Space>,
+    pub span: Span,
+}
+
+impl HasSpan for TableLit {
+    fn span(&self) -> Span {
+        self.span
+    }
+}
+
+#[derive(Clone)]
+pub enum Lit {
+    /// `nil`
+    Nil(Span),
+
+    /// - `true`
+    /// - `false`
+    Bool(bool, Span),
+
+    /// See [`NumLit`].
+    Num(NumLit),
+
+    /// See [`StringLit`]
+    String(StringLit),
+
+    /// See [`TableLit`].
+    Table(TableLit),
+}
+
+impl fmt::Debug for Lit {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Nil(_) => write!(f, "l#nil"),
+            Self::Bool(b, _) => write!(f, "l#{b:?}"),
+            Self::Num(n) => write!(f, "l#{n:?}"),
+            Self::String(s) => write!(f, "l#{s:?}"),
+            Self::Table(t) => {
+                write!(f, "l#")?;
+                t.fmt(f)
+            }
+        }
+    }
+}
+
+impl HasSpan for Lit {
+    fn span(&self) -> Span {
+        match self {
+            Lit::Nil(span) => *span,
+            Lit::Bool(_, span) => *span,
+            Lit::Num(n) => n.span(),
+            Lit::String(s) => s.span(),
+            Lit::Table(t) => t.span(),
+        }
+    }
+}

src/ast/table_constr.rs

@@ -0,0 +1,48 @@
+use crate::span::{HasSpan, Span};
+
+use super::basic::Space;
+use super::expr::Expr;
+use super::lit::TableLitElem;
+
+#[derive(Debug, Clone)]
+pub enum TableConstrElem {
+    /// See [`TableLitElem`].
+    Lit(TableLitElem),
+
+    /// `[a]: b`
+    ///
+    /// Structure: `[ s0 index s1 ] s2 : s3 value`
+    Indexed {
+        s0: Space,
+        index: Box<Expr>,
+        s1: Space,
+        s2: Space,
+        s3: Space,
+        value: Box<Expr>,
+        span: Span,
+    },
+}
+
+impl HasSpan for TableConstrElem {
+    fn span(&self) -> Span {
+        match self {
+            TableConstrElem::Lit(lit) => lit.span(),
+            TableConstrElem::Indexed { span, .. } => *span,
+        }
+    }
+}
+
+/// `{ a, b, foo: c, [d]: e }`
+#[derive(Debug, Clone)]
+pub struct TableConstr {
+    pub elems: Vec<(Space, TableConstrElem, Space)>,
+    /// `Some` if there is a trailing comma, `None` otherwise.
+    pub trailing_comma: Option<Space>,
+    pub span: Span,
+}
+
+impl HasSpan for TableConstr {
+    fn span(&self) -> Span {
+        self.span
+    }
+}

src/ast/table_destr.rs

@@ -0,0 +1,65 @@
+use crate::span::{HasSpan, Span};
+
+use super::basic::{Ident, Space};
+use super::expr::Expr;
+
+#[derive(Debug, Clone)]
+pub enum TablePatternElem {
+    /// `foo`
+    Positional(Ident),
+
+    /// `foo: bar`
+    ///
+    /// Structure: `name s0 : s1 ident`
+    Named {
+        name: Ident,
+        s0: Space,
+        s1: Space,
+        ident: Ident,
+        span: Span,
+    },
+}
+
+impl HasSpan for TablePatternElem {
+    fn span(&self) -> Span {
+        match self {
+            TablePatternElem::Positional(ident) => ident.span(),
+            TablePatternElem::Named { span, .. } => *span,
+        }
+    }
+}
+
+/// `'{ foo, bar: baz }`
+#[derive(Debug, Clone)]
+pub struct TablePattern {
+    pub elems: Vec<(Space, TablePatternElem, Space)>,
+    /// `Some` if there is a trailing comma, `None` otherwise.
+    pub trailing_comma: Option<Space>,
+    pub span: Span,
+}
+
+impl HasSpan for TablePattern {
+    fn span(&self) -> Span {
+        self.span
+    }
+}
+
+/// - `{ foo, bar: baz } = a`
+/// - `local { foo, bar: baz } = a`
+///
+/// Structure: `local pattern s0 = s1 value`
+#[derive(Debug, Clone)]
+pub struct TableDestr {
+    pub local: Option<Space>,
+    pub pattern: TablePattern,
+    pub s0: Space,
+    pub s1: Space,
+    pub value: Box<Expr>,
+    pub span: Span,
+}
+
+impl HasSpan for TableDestr {
+    fn span(&self) -> Span {
+        self.span
+    }
+}

src/ast/var.rs

@@ -0,0 +1,59 @@
+use crate::span::{HasSpan, Span};
+
+use super::basic::{Ident, Space};
+use super::expr::Expr;
+
+#[derive(Debug, Clone)]
+pub enum Var {
+    /// `[a]`
+    ///
+    /// Structure: `[ s0 index s1 ]`
+    Access {
+        s0: Space,
+        index: Box<Expr>,
+        s1: Space,
+        span: Span,
+    },
+
+    /// - `[a] = b`
+    /// - `local [a] = b`
+    ///
+    /// Structure: `local [ s0 index s1 ] s2 = s3 value`
+    Assign {
+        local: Option<Space>,
+        s0: Space,
+        index: Box<Expr>,
+        s1: Space,
+        s2: Space,
+        s3: Space,
+        value: Box<Expr>,
+        span: Span,
+    },
+
+    /// `foo`
+    AccessIdent(Ident),
+
+    /// - `foo = a`
+    /// - `local foo = a`
+    ///
+    /// Structure: `local name s0 = s1 value`
+    AssignIdent {
+        local: Option<Space>,
+        name: Ident,
+        s0: Space,
+        s1: Space,
+        value: Box<Expr>,
+        span: Span,
+    },
+}
+
+impl HasSpan for Var {
+    fn span(&self) -> Span {
+        match self {
+            Var::Access { span, .. } => *span,
+            Var::Assign { span, .. } => *span,
+            Var::AccessIdent(ident) => ident.span(),
+            Var::AssignIdent { span, .. } => *span,
+        }
+    }
+}