Parser traits in submodule
This commit is contained in:
parent
afae0d0840
commit
918e3d042b
46
src/lib.rs
46
src/lib.rs
@ -2,59 +2,17 @@
|
||||
mod choice;
|
||||
mod combinators;
|
||||
mod map;
|
||||
mod parser;
|
||||
mod primitives;
|
||||
mod sequence;
|
||||
|
||||
pub use choice::*;
|
||||
pub use combinators::*;
|
||||
pub use map::*;
|
||||
pub use parser::{ParseResult, Parser, ParserExtension};
|
||||
pub use primitives::*;
|
||||
pub use sequence::*;
|
||||
|
||||
type ParseResult<I, O, E> = Result<(O, I), (E, I)>;
|
||||
|
||||
pub trait Parser<I, O, E> {
|
||||
fn parse(&self, input: I) -> ParseResult<I, O, E>;
|
||||
}
|
||||
|
||||
impl<I, O, E, F> Parser<I, O, E> for F
|
||||
where
|
||||
F: Fn(I) -> ParseResult<I, O, E>,
|
||||
{
|
||||
fn parse(&self, input: I) -> ParseResult<I, O, E> {
|
||||
self(input)
|
||||
}
|
||||
}
|
||||
|
||||
pub trait ParserExtension<I, O, E>: Parser<I, O, E> {
|
||||
fn map<F, O2>(self, map_fn: F) -> impl Parser<I, O2, E>
|
||||
where
|
||||
F: Fn(O) -> O2;
|
||||
|
||||
fn to<O2: Clone>(self, item: O2) -> impl Parser<I, O2, E>;
|
||||
fn then<O2, P: Parser<I, O2, E>>(self, next: P) -> impl Parser<I, (O, O2), E>;
|
||||
}
|
||||
|
||||
impl<T, I, O, E> ParserExtension<I, O, E> for T
|
||||
where
|
||||
T: Parser<I, O, E>,
|
||||
{
|
||||
fn map<F, O2>(self, map_fn: F) -> impl Parser<I, O2, E>
|
||||
where
|
||||
F: Fn(O) -> O2,
|
||||
{
|
||||
map(self, map_fn)
|
||||
}
|
||||
|
||||
fn to<O2: Clone>(self, item: O2) -> impl Parser<I, O2, E> {
|
||||
self.map(move |_| item.clone())
|
||||
}
|
||||
|
||||
fn then<O2, P: Parser<I, O2, E>>(self, next: P) -> impl Parser<I, (O, O2), E> {
|
||||
seq2(self, next)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
45
src/parser.rs
Normal file
45
src/parser.rs
Normal file
@ -0,0 +1,45 @@
|
||||
use crate::{map, seq2};
|
||||
|
||||
pub type ParseResult<I, O, E> = Result<(O, I), (E, I)>;
|
||||
|
||||
pub trait Parser<I, O, E> {
|
||||
fn parse(&self, input: I) -> ParseResult<I, O, E>;
|
||||
}
|
||||
|
||||
impl<I, O, E, F> Parser<I, O, E> for F
|
||||
where
|
||||
F: Fn(I) -> ParseResult<I, O, E>,
|
||||
{
|
||||
fn parse(&self, input: I) -> ParseResult<I, O, E> {
|
||||
self(input)
|
||||
}
|
||||
}
|
||||
|
||||
pub trait ParserExtension<I, O, E>: Parser<I, O, E> {
|
||||
fn map<F, O2>(self, map_fn: F) -> impl Parser<I, O2, E>
|
||||
where
|
||||
F: Fn(O) -> O2;
|
||||
|
||||
fn to<O2: Clone>(self, item: O2) -> impl Parser<I, O2, E>;
|
||||
fn then<O2, P: Parser<I, O2, E>>(self, next: P) -> impl Parser<I, (O, O2), E>;
|
||||
}
|
||||
|
||||
impl<T, I, O, E> ParserExtension<I, O, E> for T
|
||||
where
|
||||
T: Parser<I, O, E>,
|
||||
{
|
||||
fn map<F, O2>(self, map_fn: F) -> impl Parser<I, O2, E>
|
||||
where
|
||||
F: Fn(O) -> O2,
|
||||
{
|
||||
map(self, map_fn)
|
||||
}
|
||||
|
||||
fn to<O2: Clone>(self, item: O2) -> impl Parser<I, O2, E> {
|
||||
self.map(move |_| item.clone())
|
||||
}
|
||||
|
||||
fn then<O2, P: Parser<I, O2, E>>(self, next: P) -> impl Parser<I, (O, O2), E> {
|
||||
seq2(self, next)
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user