From 6a93f33fed828e3589cf9e956049c2596d637de0 Mon Sep 17 00:00:00 2001
From: David Gonzalez Martin <davidgm94.work@protonmail.com>
Date: Sun, 28 Jul 2024 14:31:08 +0200
Subject: [PATCH] Implement shifts

---
 bootstrap/main.c      | 30 ++++++++++++++++++++++++++----
 run_tests.sh          |  2 ++
 tests/shift_left.nat  |  4 ++++
 tests/shift_right.nat |  4 ++++
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 tests/shift_left.nat
 create mode 100644 tests/shift_right.nat

diff --git a/bootstrap/main.c b/bootstrap/main.c
index c43b4b7..22c1a6b 100644
--- a/bootstrap/main.c
+++ b/bootstrap/main.c
@@ -1322,7 +1322,7 @@ fn StringMapValue* string_map_values(StringMap* map)
     return (StringMapValue*)(map->pointer + map->capacity);
 }
 
-fn s32 string_map_find_slot(StringMap* map, u32 original_index, String key, u32 wanted_value)
+fn s32 string_map_find_slot(StringMap* map, u32 original_index, String key)
 {
     s32 result = -1;
 
@@ -1456,7 +1456,7 @@ fn StringMapPut string_map_get(StringMap* map, String key)
     auto hash = (u32)long_hash;
     assert(hash);
     auto index = hash & (map->capacity - 1);
-    auto slot = string_map_find_slot(map, index, key, 0);
+    auto slot = string_map_find_slot(map, index, key);
     u8 existing = slot != -1;
     if (existing)
     {
@@ -1476,7 +1476,7 @@ fn StringMapPut string_map_put(StringMap* map, Arena* arena, String key, u32 val
     auto hash = (u32)long_hash;
     assert(hash);
     auto index = hash & (map->capacity - 1);
-    auto slot = string_map_find_slot(map, index, key, value);
+    auto slot = string_map_find_slot(map, index, key);
     if (slot != -1)
     {
         trap();
@@ -3257,10 +3257,18 @@ fn TypeIndex compute_type_integer_binary(Thread* thread, NodeIndex node_index)
             case NODE_INTEGER_XOR:
                 result = left_value ^ right_value;
                 break;
+            case NODE_INTEGER_SIGNED_SHIFT_LEFT:
+                result = left_value << right_value;
+                break;
+            case NODE_INTEGER_SIGNED_SHIFT_RIGHT:
+                result = left_value >> right_value;
+                break;
             default:
                 trap();
         }
+
         type_integer.constant = result;
+
         auto new_type = thread_get_integer_type(thread, type_integer);
         return new_type;
     }
@@ -3322,6 +3330,12 @@ global const NodeVirtualTable node_functions[NODE_COUNT] = {
     [NODE_INTEGER_XOR] = {
         .compute_type = &compute_type_integer_binary,
     },
+    [NODE_INTEGER_SIGNED_SHIFT_LEFT] = {
+        .compute_type = &compute_type_integer_binary,
+    },
+    [NODE_INTEGER_SIGNED_SHIFT_RIGHT] = {
+        .compute_type = &compute_type_integer_binary,
+    },
 
     // Constant
     [NODE_CONSTANT] = {
@@ -4732,7 +4746,7 @@ fn void analyze_block(Thread* thread, Parser* parser, FunctionBuilder* builder,
 
             skip_space(parser, src);
 
-            NodeIndex right = analyze_expression(thread, parser, builder, src, invalidi(Type));
+            NodeIndex initial_right = analyze_expression(thread, parser, builder, src, invalidi(Type));
 
             expect_character(parser, src, ';');
 
@@ -4742,6 +4756,14 @@ fn void analyze_block(Thread* thread, Parser* parser, FunctionBuilder* builder,
                 fail();
             }
 
+            NodeIndex right;
+            switch (assignment_operator)
+            {
+                case ASSIGNMENT_OPERATOR_NONE:
+                    right = initial_right;
+                    break;
+            }
+
             scope_update(thread, builder, left_name, right);
         }
         else if (is_decimal_digit(statement_start_ch))
diff --git a/run_tests.sh b/run_tests.sh
index 47903d3..a7606ec 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -16,6 +16,8 @@ test_names=(
     "xor"
     "return_var"
     "return_mod_scope"
+    "shift_left"
+    "shift_right"
 )
 
 if [ "$all" == "1" ]
diff --git a/tests/shift_left.nat b/tests/shift_left.nat
new file mode 100644
index 0000000..d89c908
--- /dev/null
+++ b/tests/shift_left.nat
@@ -0,0 +1,4 @@
+fn main() s32
+{
+    return 0 << 1;
+}
diff --git a/tests/shift_right.nat b/tests/shift_right.nat
new file mode 100644
index 0000000..dd38ff1
--- /dev/null
+++ b/tests/shift_right.nat
@@ -0,0 +1,4 @@
+fn main() s32
+{
+    return 1 >> 1;
+}