better lexeme

Author: functora

rust/rustell/src/lib.rs

@@ -1,9 +1,6 @@
-use chumsky::container::OrderedSeq;
-use chumsky::extra::ParserExtra;
 pub use chumsky::prelude::Parser;
 use chumsky::prelude::*;
-use chumsky::primitive::Just;
-use chumsky::text::{Char, Padded};
+use chumsky::text::whitespace;
 
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub enum Expr<'src> {
@@ -40,7 +37,7 @@ fn expr_use<'src>() -> impl Parser<
     Expr<'src>,
     extra::Err<Rich<'src, char>>,
 > {
-    lexeme("use")
+    just("use")
         .ignore_then(expr_use_rec())
         .then_ignore(lexeme(";").or_not())
         .map(Expr::Use)
@@ -72,10 +69,10 @@ fn expr_use_rec<'src>() -> impl Parser<
             });
 
         let many = expr_use
-            .separated_by(lexeme(','))
+            .separated_by(lexeme(","))
             .allow_trailing()
             .collect::<Vec<_>>()
-            .delimited_by(lexeme('{'), lexeme('}'))
+            .delimited_by(lexeme("{"), lexeme("}"))
             .map(ExprUse::Many);
 
         let glob = lexeme("*").map(|_| ExprUse::Glob);
@@ -99,12 +96,13 @@ fn expr_other<'src>() -> impl Parser<
         .map(Expr::Other)
 }
 
-fn lexeme<'src, T, I, E>(seq: T) -> Padded<Just<T, I, E>>
-where
-    I: Input<'src>,
-    I::Token: Char,
-    E: ParserExtra<'src, I>,
-    T: OrderedSeq<'src, I::Token> + Clone,
-{
-    just(seq).padded()
+fn lexeme<'src>(
+    seq: &'static str,
+) -> impl Parser<
+    'src,
+    &'src str,
+    &'src str,
+    extra::Err<Rich<'src, char>>,
+> + Clone {
+    whitespace().or_not().ignore_then(just(seq))
 }

rust/rustell/tests/integration.rs

@@ -147,7 +147,8 @@ fn test_parser_other_then_use() {
             r#"
     fn test() {
         println!("Hello");
-    }"#,
+    }
+    "#,
         ),
         Expr::Use(ExprUse::Item {
             module: "crate",
@@ -174,6 +175,7 @@ fn test_parser_multiple() {
     "#;
     let lhs = expr().parse(src).into_result().unwrap();
     let rhs = vec![
+        Expr::Other("\n    "),
         Expr::Use(ExprUse::Item {
             module: "std",
             rename: None,
@@ -183,6 +185,7 @@ fn test_parser_multiple() {
                 nested: None,
             })),
         }),
+        Expr::Other("\n    "),
         Expr::Use(ExprUse::Item {
             module: "std",
             rename: None,
@@ -192,6 +195,7 @@ fn test_parser_multiple() {
                 nested: None,
             })),
         }),
+        Expr::Other("\n    "),
     ];
     assert_eq!(lhs, rhs)
 }
@@ -207,6 +211,7 @@ fn test_parser_multiple_with_other() {
     "#;
     let lhs = expr().parse(src).into_result().unwrap();
     let rhs = vec![
+        Expr::Other("\n    "),
         Expr::Use(ExprUse::Item {
             module: "std",
             rename: None,
@@ -217,9 +222,11 @@ fn test_parser_multiple_with_other() {
             })),
         }),
         Expr::Other(
-            r#"fn test() {
+            r#"
+    fn test() {
         println!("Hello");
-    }"#,
+    }
+    "#,
         ),
         Expr::Use(ExprUse::Item {
             module: "std",
@@ -230,6 +237,7 @@ fn test_parser_multiple_with_other() {
                 nested: None,
             })),
         }),
+        Expr::Other("\n    "),
     ];
     assert_eq!(lhs, rhs)
 }
@@ -249,6 +257,7 @@ fn test_parser_mixed_all_cases() {
     "#;
     let lhs = expr().parse(src).into_result().unwrap();
     let rhs = vec![
+        Expr::Other("\n    "),
         Expr::Use(ExprUse::Item {
             module: "std",
             rename: None,
@@ -278,6 +287,7 @@ fn test_parser_mixed_all_cases() {
                 },
             ]))),
         }),
+        Expr::Other("\n    "),
         Expr::Use(ExprUse::Item {
             module: "crate",
             rename: None,
@@ -292,7 +302,9 @@ fn test_parser_mixed_all_cases() {
             })),
         }),
         Expr::Other(
-            r#"fn hello() {
+            r#"
+
+    fn hello() {
         println!("Hello");
     }
     "#,