From 5199cda5ea2756573092bab8537d8d393b8f5147 Mon Sep 17 00:00:00 2001
From: Brendan Hansknecht <brendan.hansknecht@gmail.com>
Date: Tue, 11 Mar 2025 09:04:24 -0700
Subject: [PATCH] Remove `||` and `&&` from tokenizer

As discussed here: https://roc.zulipchat.com/#narrow/channel/395097-compiler-development/topic/zig.20compiler.20-.20spike/near/504579627

I assume in the long term, support will be added to the parser
to notice when double opBar or opAmpersand should be consider an `and` or `or`.
Then the formatter will fix things up.

For now, double bar is always a lambda and double ampersand is invalid.
---
 src/check/parse/tokenize.zig | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/check/parse/tokenize.zig b/src/check/parse/tokenize.zig
index a0e1696cca..10dc9a0d6a 100644
--- a/src/check/parse/tokenize.zig
+++ b/src/check/parse/tokenize.zig
@@ -954,13 +954,8 @@ pub const Tokenizer = struct {
 
                 // Ampersand (&)
                 '&' => {
-                    if (self.cursor.peekAt(1) == '&') {
-                        self.cursor.pos += 2;
-                        self.output.pushTokenNormal(.OpAnd, start, 2);
-                    } else {
-                        self.cursor.pos += 1;
-                        self.output.pushTokenNormal(.OpAmpersand, start, 1);
-                    }
+                    self.cursor.pos += 1;
+                    self.output.pushTokenNormal(.OpAmpersand, start, 1);
                 },
 
                 // Comma (,)
@@ -982,10 +977,7 @@ pub const Tokenizer = struct {
 
                 // Pipe (|)
                 '|' => {
-                    if (self.cursor.peekAt(1) == '|') {
-                        self.cursor.pos += 2;
-                        self.output.pushTokenNormal(.OpOr, start, 2);
-                    } else if (self.cursor.peekAt(1) == '>') {
+                    if (self.cursor.peekAt(1) == '>') {
                         self.cursor.pos += 2;
                         self.output.pushTokenNormal(.OpPizza, start, 2);
                     } else {
@@ -1620,15 +1612,10 @@ fn rebuildBufferForTesting(buf: []const u8, tokens: *TokenizedBuffer, alloc: std
                 try buf2.append(alloc, '!');
             },
             .OpAnd => {
-                std.debug.assert(length == 2 or length == 3);
-                if (length == 2) {
-                    try buf2.append(alloc, '&');
-                    try buf2.append(alloc, '&');
-                } else {
-                    try buf2.append(alloc, 'a');
-                    try buf2.append(alloc, 'n');
-                    try buf2.append(alloc, 'd');
-                }
+                std.debug.assert(length == 3);
+                try buf2.append(alloc, 'a');
+                try buf2.append(alloc, 'n');
+                try buf2.append(alloc, 'd');
             },
             .OpAmpersand => {
                 std.debug.assert(length == 1);
@@ -1645,13 +1632,8 @@ fn rebuildBufferForTesting(buf: []const u8, tokens: *TokenizedBuffer, alloc: std
             },
             .OpOr => {
                 std.debug.assert(length == 2);
-                if (buf[token.offset] == 'o') {
-                    try buf2.append(alloc, 'o');
-                    try buf2.append(alloc, 'r');
-                } else {
-                    try buf2.append(alloc, '|');
-                    try buf2.append(alloc, '|');
-                }
+                try buf2.append(alloc, 'o');
+                try buf2.append(alloc, 'r');
             },
             .OpBar => {
                 std.debug.assert(length == 1);