Commit c393a399fb4b463f095a8510595263759fd82cd6 | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-07-18 10:51:18-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-07-18 10:51:42-04:00
log	c393a399fb4b463f095a8510595263759fd82cd6
tree	ae8b4d467362ceb049728d8faa39ee5d68b6889e
parent	cd488c9da56a03d2244a67629612445c451441da

1 files changed, 13 insertions(+), 8 deletions(-)

src/tokenizer.cpp+13-8

 @@ -460,16 +460,21 @@ static const char* get_escape_shorthand(uint8_t c) {
 static void invalid_char_error(Tokenize *t, uint8_t c) {
     if (c == '\r') {
         tokenize_error(t, "invalid carriage return, only '\\n' line endings are supported");
-    } else if (isprint(c)) {
+        return;
+    }
+    const char *sh = get_escape_shorthand(c);
+    if (sh) {
+        tokenize_error(t, "invalid character: '%s'", sh);
+        return;
+    }
+    if (isprint(c)) {
         tokenize_error(t, "invalid character: '%c'", c);
-    } else {
+        return;
-        const char *sh = get_escape_shorthand(c);
-        if (sh) {
-            tokenize_error(t, "invalid character: '%s'", sh);
-        } else {
-            tokenize_error(t, "invalid character: '\\x%x'", c);
-        }
     }
+    tokenize_error(t, "invalid character: '\\x%02x'", c);
 }
 void tokenize(Buf *buf, Tokenization *out) {