greg/rust-parser-combinator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename seq -> tuple2

Browse Source
This commit is contained in:
Greg Shuflin 2022-10-16 17:34:21 -07:00
parent c5b351e8ee
commit 95a6d935e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib.rs
View File

@ -46,7 +46,7 @@ trait Parser<I, O, E> {
E: 'a, E: 'a,
P: Parser<I, O2, E> + 'a, P: Parser<I, O2, E> + 'a,
{ {
BoxedParser::new(sequence::seq(self, next_parser)) BoxedParser::new(sequence::tuple2(self, next_parser))
} }
} }

6
src/sequence.rs
View File

@ -1,6 +1,6 @@
use crate::Parser; use crate::Parser;
pub(crate) fn seq<P1, P2, I, O1, O2, E>(parser1: P1, parser2: P2) -> impl Parser<I, (O1, O2), E> pub(crate) fn tuple2<P1, P2, I, O1, O2, E>(parser1: P1, parser2: P2) -> impl Parser<I, (O1, O2), E>
where where
P1: Parser<I, O1, E>, P1: Parser<I, O1, E>,
P2: Parser<I, O2, E>, P2: Parser<I, O2, E>,
@ -21,8 +21,8 @@ mod test {
use std::assert_matches::assert_matches; use std::assert_matches::assert_matches;
#[test] #[test]
fn test_seq() { fn test_tuple2() {
let p = seq(identifier, seq(literal(" "), literal("ruts"))); let p = tuple2(identifier, tuple2(literal(" "), literal("ruts")));
assert_matches!(p.parse("fort1 ruts"), Ok((r, "")) if r.0 == "fort1" && r.1 == (" ", "ruts") ); assert_matches!(p.parse("fort1 ruts"), Ok((r, "")) if r.0 == "fort1" && r.1 == (" ", "ruts") );
let p = identifier.then(literal(" ")).then(literal("ruts")); let p = identifier.then(literal(" ")).then(literal("ruts"));