Fix doctest + better lex error message

metaborg · Nov 24, 2023 · 012d1e3 · 012d1e3
1 parent ac8348f
commit 012d1e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/scopegraphs-regular-expressions/src/parse.rs b/scopegraphs-regular-expressions/src/parse.rs
@@ -185,10 +185,8 @@ impl<'a> Lexer<'a> {
             return Ok(Token::End);
         }
 
-        let lookahead = input.lookahead1();
-
         // Rust performs parenthesis matching: leverage that here.
-        if lookahead.peek(syn::token::Paren) {
+        if input.peek(syn::token::Paren) {
             let inner;
             parenthesized!(inner in input);
             return Regex::parse(&inner).map(|re| Token::Regex(Rc::new(re)));
@@ -241,7 +239,10 @@ impl<'a> Lexer<'a> {
             return Ok(Token::And);
         }
 
-        Err(lookahead.error())
+        Err(syn::Error::new(
+            input.span(),
+            "expected '0', 'e', '~', '*', '+', '?', '|', '&', '(' or label here.",
+        ))
     }
 
     /// Peeks the first token in the stream.

diff --git a/scopegraphs-regular-expressions/src/regex.rs b/scopegraphs-regular-expressions/src/regex.rs
@@ -173,6 +173,7 @@ impl Regex {
     /// Examples of this include the `e` itself, any 0-ary repeat `A*`, `e | A`, etc.
     ///
     /// ```
+    /// # use scopegraphs_regular_expressions::Regex;
     /// assert!(Regex::EmptyString.is_nullable())
     /// ```
     pub fn is_nullable(&self) -> bool {