Joscha
b009a9c4ec
I noticed that programs like '{} would parse correctly while '{ } would
expect an inner element. This was because the leading space was actually
part of the element parser, which is a violation of the (as of yet
unspoken) rule that parsers should not parse surrounding whitespace.
Because whitespace whas treated differently from everywhere else and
because this implementation was wrong, I decided to reimplement it,
abstracting the concept of things separated by other things with
optional trailing things. I did this in such a way that surrounding
whitespace is not touched.
37 lines
1 KiB
Rust
37 lines
1 KiB
Rust
//! Corresponds to `ast::program`.
|
|
|
|
use chumsky::prelude::*;
|
|
|
|
use crate::ast::{Expr, Program, Space, TableLitElem};
|
|
|
|
use super::basic::{separated_by, EParser};
|
|
|
|
pub fn program(
|
|
space: EParser<Space>,
|
|
table_lit_elem: EParser<TableLitElem>,
|
|
expr: EParser<Expr>,
|
|
) -> EParser<Program> {
|
|
let lit = space
|
|
.clone()
|
|
.then(expr)
|
|
.then(space.clone())
|
|
.map_with_span(|((s0, expr), s1), span| Program::Expr { s0, expr, s1, span });
|
|
|
|
let separator = space.clone().then_ignore(just(',')).then(space.clone());
|
|
let trailing_separator = space.clone().then_ignore(just(','));
|
|
let module = space
|
|
.clone()
|
|
.then_ignore(text::keyword("module"))
|
|
.then(space.clone())
|
|
.then(separated_by(table_lit_elem, separator, trailing_separator))
|
|
.then(space.clone())
|
|
.map_with_span(|(((s0, s1), elems), s2), span| Program::Module {
|
|
s0,
|
|
s1,
|
|
elems,
|
|
s2,
|
|
span,
|
|
});
|
|
|
|
module.or(lit).boxed()
|
|
}
|