rustell parser wip

Author: functora

rust/rustell/src/lib.rs

@@ -50,10 +50,11 @@ fn expr_use_rec<'src>() -> impl Parser<
     extra::Err<Rich<'src, char>>,
 > {
     recursive(|expr_use_rec| {
-        let ident = || token(text::ascii::ident());
-        let item = ident()
+        let item = expr_use_tok()
             .then(
-                lexeme("as").ignore_then(ident()).or_not(),
+                lexeme("as")
+                    .ignore_then(expr_use_tok())
+                    .or_not(),
             )
             .then(
                 lexeme("::")
@@ -81,6 +82,17 @@ fn expr_use_rec<'src>() -> impl Parser<
     })
 }
 
+fn expr_use_tok<'src>() -> impl Parser<
+    'src,
+    &'src str,
+    &'src str,
+    extra::Err<Rich<'src, char>>,
+> + Clone {
+    keyword_except(&["crate", "super", "self", "Self"])
+        .not()
+        .ignore_then(token(text::ascii::ident()))
+}
+
 fn expr_other<'src>() -> impl Parser<
     'src,
     &'src str,
@@ -123,7 +135,9 @@ fn lexeme<'src>(
     token(just(seq))
 }
 
-fn keyword<'src>() -> impl Parser<
+fn keyword_except<'src>(
+    except: &[&str],
+) -> impl Parser<
     'src,
     &'src str,
     &'src str,
@@ -142,6 +156,12 @@ fn keyword<'src>() -> impl Parser<
             "macro", "override", "priv", "typeof",
             "unsized", "virtual", "yield", "try", "gen",
         ]
-        .map(lexeme),
+        .iter()
+        .filter(|x| !except.contains(x))
+        .map(|&x| {
+            lexeme(x)
+                .then_ignore(text::ascii::ident().not())
+        })
+        .collect::<Vec<_>>(),
     )
 }

rust/rustell/tests/integration.rs

@@ -138,14 +138,14 @@ fn test_parser_crate() {
 fn test_parser_other_then_use() {
     let lhs = r#"
     fn test() {
-        println!("Hello");
+        println!("Hello")
     }
     use crate::module::Type;"#;
     let rhs = vec![
         Expr::Other(
             r#"
     fn test() {
-        println!("Hello");
+        println!("Hello")
     }
     "#,
         ),
@@ -164,7 +164,7 @@ fn test_parser_other_then_use() {
         }),
     ];
     assert_eq!(parse(lhs), rhs);
-    // assert_eq!(parse(&sloppy(lhs)), rhs)
+    assert_eq!(parse(&sloppy(lhs)), rhs)
 }
 
 #[test]