Parse comments in whitespace
This commit is contained in:
parent
a559966c1d
commit
41723eb4ca
2 changed files with 41 additions and 8 deletions
|
|
@ -1,20 +1,43 @@
|
|||
//! Corresponds to `ast::basic`.
|
||||
|
||||
use chumsky::prelude::*;
|
||||
use chumsky::text::Character;
|
||||
|
||||
use crate::ast::{Ident, Space};
|
||||
use crate::ast::{Ident, Line, Space};
|
||||
use crate::span::Span;
|
||||
|
||||
pub type Error = Simple<char, Span>;
|
||||
|
||||
// TODO https://github.com/rust-lang/rust/issues/63063
|
||||
|
||||
pub fn inline() -> impl Parser<char, (), Error = Error> {
|
||||
filter(|c: &char| c.is_whitespace() && *c != '\n')
|
||||
.repeated()
|
||||
.to(())
|
||||
}
|
||||
|
||||
pub fn newline() -> impl Parser<char, (), Error = Error> {
|
||||
just('\n').to(())
|
||||
}
|
||||
|
||||
pub fn line() -> impl Parser<char, Line, Error = Error> {
|
||||
let empty = newline().to(Line::Empty);
|
||||
|
||||
let comment = just('#')
|
||||
.ignore_then(take_until(newline()))
|
||||
.map(|(s, _)| s)
|
||||
.collect::<String>()
|
||||
.map(Line::Comment);
|
||||
|
||||
empty.or(comment)
|
||||
}
|
||||
|
||||
pub fn space() -> impl Parser<char, Space, Error = Error> {
|
||||
// TODO Parse comments
|
||||
text::whitespace().map_with_span(|(), span| Space {
|
||||
comment: vec![],
|
||||
span,
|
||||
})
|
||||
inline()
|
||||
.ignore_then(line())
|
||||
.repeated()
|
||||
.then_ignore(inline())
|
||||
.map_with_span(|lines, span| Space { lines, span })
|
||||
}
|
||||
|
||||
pub fn ident() -> impl Parser<char, Ident, Error = Error> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue