adapt ziglang#21371 to this PR

RetroDev256 · Sep 10, 2024 · c883116 · c883116
1 parent 21a0a4b
commit c883116
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/lib/std/zig/tokenizer.zig b/lib/std/zig/tokenizer.zig
@@ -768,13 +768,9 @@ pub const Tokenizer = struct {
                     0 => if (self.index != self.buffer.len) {
                         continue :state .invalid;
                     },
-                    '\n' => self.index += 1,
-                    '\r' => {
-                        if (self.buffer[self.index + 1] == '\n') {
-                            self.index += 2;
-                        } else {
-                            continue :state .invalid;
-                        }
+                    '\n' => {},
+                    '\r' => if (self.buffer[self.index + 1] != '\n') {
+                        continue :state .invalid;
                     },
                     0x01...0x09, 0x0b...0x0c, 0x0e...0x1f, 0x7f => continue :state .invalid,
                     else => continue :state .multiline_string_literal_line,
@@ -994,7 +990,6 @@ pub const Tokenizer = struct {
                     0, '\n' => result.tag = .doc_comment,
                     '\r' => {
                         if (self.buffer[self.index + 1] == '\n') {
-                            self.index += 1;
                             result.tag = .doc_comment;
                         } else {
                             continue :state .invalid;
@@ -1040,12 +1035,8 @@ pub const Tokenizer = struct {
                 self.index += 1;
                 switch (self.buffer[self.index]) {
                     0, '\n' => {},
-                    '\r' => {
-                        if (self.buffer[self.index + 1] == '\n') {
-                            self.index += 1;
-                        } else {
-                            continue :state .invalid;
-                        }
+                    '\r' => if (self.buffer[self.index + 1] != '\n') {
+                        continue :state .invalid;
                     },
                     0x01...0x09, 0x0b...0x0c, 0x0e...0x1f, 0x7f => {
                         continue :state .invalid;