From ed38358ad859e616fe043458fb032a682390f38f Mon Sep 17 00:00:00 2001
From: David Gonzalez Martin <davidgm94.work@protonmail.com>
Date: Sat, 25 May 2024 07:53:12 -0600
Subject: [PATCH] Implement 'and'

---
 bootstrap/compiler.zig         | 29 ++++++++++++++++++++++++-----
 retest/standalone/and/main.nat |  7 +++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 retest/standalone/and/main.nat

diff --git a/bootstrap/compiler.zig b/bootstrap/compiler.zig
index 09f2c02..d222d07 100644
--- a/bootstrap/compiler.zig
+++ b/bootstrap/compiler.zig
@@ -480,6 +480,8 @@ const Parser = struct{
         add_assign,
         sub,
         sub_assign,
+        @"and",
+        and_assign,
     };
 
     fn parse_expression(parser: *Parser, analyzer: *Analyzer, thread: *Thread, file: *File, ty: ?*Type, side: Side) *Value {
@@ -495,7 +497,7 @@ const Parser = struct{
                 .none => {
                     previous_value = current_value;
                 },
-                .add, .sub => {
+                .add, .sub, .@"and" => {
                     const add = thread.integer_binary_operations.append(.{
                         .instruction = .{
                             .value = .{
@@ -510,7 +512,7 @@ const Parser = struct{
                         .left = previous_value,
                         .right = current_value,
                         .id = switch (current_operation) {
-                            .none, .add_assign, .sub_assign => unreachable,
+                            .none, .add_assign, .sub_assign, .and_assign => unreachable,
                             inline else => |co| @field(IntegerBinaryOperation.Id, @tagName(co)),
                         },
                         .type = if (ty) |t| t else current_value.get_type(),
@@ -518,7 +520,7 @@ const Parser = struct{
                     _ = analyzer.current_basic_block.instructions.append(&add.instruction);
                     previous_value = &add.instruction.value;
                 },
-                .add_assign, .sub_assign => unreachable,
+                .add_assign, .sub_assign, .and_assign => unreachable,
             }
 
             switch (src[parser.i]) {
@@ -551,6 +553,20 @@ const Parser = struct{
 
                     parser.skip_space(src);
                 },
+                '&' => {
+                    current_operation = .@"and";
+                    parser.i += 1;
+
+                    switch (src[parser.i]) {
+                        '=' => {
+                            current_operation = .and_assign;
+                            parser.i += 1;
+                        },
+                        else => {},
+                    }
+
+                    parser.skip_space(src);
+                },
                 else => @panic((src.ptr + parser.i)[0..1]),
             }
         }
@@ -920,6 +936,7 @@ const IntegerBinaryOperation = struct {
     const Id = enum{
         add,
         sub,
+        @"and",
     };
 };
 
@@ -2162,9 +2179,11 @@ fn worker_thread(thread_index: u32, cpu_count: *u32) void {
                                         const integer_type = integer_binary_operation.type.get_payload(.integer);
                                         const no_unsigned_wrapping = integer_type.signedness == .unsigned;
                                         const no_signed_wrapping = integer_type.signedness == .signed;
+                                        const name = "";
                                         break :block switch (integer_binary_operation.id) {
-                                            .add => builder.createAdd(left, right, "", "".len, no_unsigned_wrapping, no_signed_wrapping),
-                                            .sub => builder.createSub(left, right, "", "".len, no_unsigned_wrapping, no_signed_wrapping),
+                                            .add => builder.createAdd(left, right, name, name.len, no_unsigned_wrapping, no_signed_wrapping),
+                                            .sub => builder.createSub(left, right, name, name.len, no_unsigned_wrapping, no_signed_wrapping),
+                                            .@"and" => builder.createAnd(left, right, name, name.len),
                                         };
                                     },
                                     .call => block: {
diff --git a/retest/standalone/and/main.nat b/retest/standalone/and/main.nat
new file mode 100644
index 0000000..805253d
--- /dev/null
+++ b/retest/standalone/and/main.nat
@@ -0,0 +1,7 @@
+fn [cc(.c)] main [export]() s32
+{
+    >a: s32 = 5;
+    >b: s32 = 4;
+    >result = a & b;
+    return result - b;
+}