No commit message

PRQL · Aug 7, 2023 · fd7f3ce · fd7f3ce
1 parent 20071d4
commit fd7f3ce
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/crates/prql-parser/src/lexer.rs b/crates/prql-parser/src/lexer.rs
@@ -294,38 +294,14 @@ fn literal() -> impl Parser<char, Literal, Error = Cheap<char>> {
 
 fn quoted_string(escaped: bool) -> impl Parser<char, String, Error = Cheap<char>> {
     choice((
-        quoted_string_quote(&'"', escaped),
-        quoted_string_quote(&'\'', escaped),
+        quoted_string_of_quote(&'"', escaped),
+        quoted_string_of_quote(&'\'', escaped),
     ))
     .collect::<String>()
     .labelled("string")
 }
 
-fn escaped_character() -> impl Parser<char, char, Error = Cheap<char>> {
-    just('\\').ignore_then(choice((
-        just('\\'),
-        just('/'),
-        just('b').to('\x08'),
-        just('f').to('\x0C'),
-        just('n').to('\n'),
-        just('r').to('\r'),
-        just('t').to('\t'),
-        (just('u').ignore_then(
-            filter(|c: &char| c.is_ascii_hexdigit())
-                .repeated()
-                .exactly(4)
-                .collect::<String>()
-                .validate(|digits, span, emit| {
-                    char::from_u32(u32::from_str_radix(&digits, 16).unwrap()).unwrap_or_else(|| {
-                        emit(Cheap::expected_input_found(span, None, None));
-                        '\u{FFFD}' // unicode replacement character
-                    })
-                }),
-        )),
-    )))
-}
-
-fn quoted_string_quote(
+fn quoted_string_of_quote(
     quote: &char,
     escaping: bool,
 ) -> impl Parser<char, Vec<char>, Error = Cheap<char>> + '_ {
@@ -354,6 +330,30 @@ fn quoted_string_quote(
     })
 }
 
+fn escaped_character() -> impl Parser<char, char, Error = Cheap<char>> {
+    just('\\').ignore_then(choice((
+        just('\\'),
+        just('/'),
+        just('b').to('\x08'),
+        just('f').to('\x0C'),
+        just('n').to('\n'),
+        just('r').to('\r'),
+        just('t').to('\t'),
+        (just('u').ignore_then(
+            filter(|c: &char| c.is_ascii_hexdigit())
+                .repeated()
+                .exactly(4)
+                .collect::<String>()
+                .validate(|digits, span, emit| {
+                    char::from_u32(u32::from_str_radix(&digits, 16).unwrap()).unwrap_or_else(|| {
+                        emit(Cheap::expected_input_found(span, None, None));
+                        '\u{FFFD}' // unicode replacement character
+                    })
+                }),
+        )),
+    )))
+}
+
 fn digits(count: usize) -> impl Parser<char, Vec<char>, Error = Cheap<char>> {
     filter(|c: &char| c.is_ascii_digit())
         .repeated()