From ec63411905ca66dc4dd874b4cde257b0043442e6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 7 Jul 2021 18:00:04 -0700 Subject: [PATCH] Revert "Skip over CRs at the end of multiline literals" This reverts commit 9de452f9a69d5590743a194bc2d0817d26d66a0b. No CRs allowed in multiline string literals - this is intentional. --- lib/std/zig/tokenizer.zig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/std/zig/tokenizer.zig b/lib/std/zig/tokenizer.zig index 947c8b87fa..3008aecdc3 100644 --- a/lib/std/zig/tokenizer.zig +++ b/lib/std/zig/tokenizer.zig @@ -845,7 +845,7 @@ pub const Tokenizer = struct { self.index += 1; break; }, - '\t', '\r' => {}, + '\t' => {}, else => self.checkLiteralCharacter(), }, @@ -1936,10 +1936,6 @@ test "tokenizer - invalid builtin identifiers" { try testTokenize("@0()", &.{ .invalid, .integer_literal, .l_paren, .r_paren }); } -test "tokenizer - multiline string literal with a DOS-encoded CRLF line endings (issue #9257)" { - try testTokenize("\\\\foobar\r\n", &.{.multiline_string_literal_line}); -} - fn testTokenize(source: [:0]const u8, expected_tokens: []const Token.Tag) !void { var tokenizer = Tokenizer.init(source); for (expected_tokens) |expected_token_id| {