CSY/reowolf Changeset - 533b69e54b4b · Centrum Wiskunde & Informatica (CWI)

Changeset - 533b69e54b4b

Parent rev.

Child rev.

[Not reviewed]

0 1 0

MH - 4 years ago 2021-05-31 14:37:03
contact@maxhenger.nl

Fix to escaped character parsing

1 file changed with 4 insertions and 2 deletions:

src/protocol/parser/token_parsing.rs

0 comments (0 inline, 0 general)

src/protocol/parser/token_parsing.rs

➞

Show inline comments

@@ @@ -394,34 +394,36 @@ pub(crate) fn consume_string_literal( @@
     if !text.is_ascii() {
         return Err(ParseError::new_error_str_at_span(source, span, "expected an ASCII string literal"));
+    }
     debug_assert_eq!(text[0], b'"'); // here as kind of a reminder: the span includes the bounding quotation marks
     debug_assert_eq!(text[text.len() - 1], b'"');
     buffer.reserve(text.len() - 2);
     let mut was_escape = false;
     for idx in 1..text.len() - 1 {
         let cur = text[idx];
-        if cur != b'\\' {
+        let is_escape = cur == b'\\';
         if was_escape {
             let to_push = parse_escaped_character(source, span, cur)?;
             buffer.push(to_push);
         } else {
             buffer.push(cur as char);
+        }
         if was_escape && is_escape {
             was_escape = false;
         } else {
-            was_escape = true;
+            was_escape = is_escape;
+        }
+    }
     debug_assert!(!was_escape); // because otherwise we couldn't have ended the string literal
     Ok(span)
+}
 fn parse_escaped_character(source: &InputSource, literal_span: InputSpan, v: u8) -> Result<char, ParseError> {
     let result = match v {
         b'r' => '\r',
         b'n' => '\n',

0 comments (0 inline, 0 general)