fix(semantic): missing comptime scope flags on comptime { ... } (#179)

Author: DonIsaac

src/semantic/SemanticBuilder.zig

@@ -538,8 +538,8 @@ inline fn visitRecursiveSlice(self: *SemanticBuilder, node_id: NodeIndex) !void
 fn visitBlock(self: *SemanticBuilder, statements: []const NodeIndex) !void {
     const NON_COMPTIME_BLOCKS: Scope.Flags = .{ .s_test = true, .s_block = true, .s_function = true };
     const is_root = self.currentScope() == ROOT_SCOPE;
-    const is_comptime = is_root and !self._curr_scope_flags.intersects(NON_COMPTIME_BLOCKS);
     const was_comptime = self._curr_scope_flags.s_comptime;
+    const is_comptime = was_comptime or (is_root and !self._curr_scope_flags.intersects(NON_COMPTIME_BLOCKS));
 
     self._curr_scope_flags.s_comptime = is_comptime;
     defer self._curr_scope_flags.s_comptime = was_comptime;

src/semantic/test/scope_flags_test.zig

@@ -109,11 +109,33 @@ test "function signatures and body scopes" {
 //     try testXDeclScope(cases);
 // }
 
-test "comptime scopes" {
+test "block scopes" {
     const cases = &[_]TestCase{
+        // .{
+        //     "const y = { const x = 1; };",
+        //     Scope.Flags{ .s_block = true, .s_comptime = true },
+        // },
+        // .{
+        //     \\fn foo() u32 {
+        //     \\  const y = blk: {
+        //     \\    const x: u32 = 1;
+        //     \\    break :blk x;
+        //     \\  };
+        //     \\
+        //     \\  return y;
+        //     \\}
+        //     ,
+        //     .{ .s_block = true },
+        // },
         .{
-            "const y = { const x = 1; };",
-            Scope.Flags{ .s_block = true, .s_comptime = true },
+            \\fn foo() void {
+            \\  comptime {
+            \\    const x: u32 = 1;
+            \\  }
+            \\  return y;
+            \\}
+            ,
+            .{ .s_block = true, .s_comptime = true },
         },
     };
 

test/snapshots/snapshot-coverage/simple/pass/cond_if.zig.snap

@@ -322,7 +322,7 @@
                 "children": [
                   {
                     "id": util.id.NominalId(u32)(15), 
-                    "flags": ["block"], 
+                    "flags": ["block", "comptime"], 
                     "bindings": {
 
                     }, 

test/snapshots/snapshot-coverage/simple/pass/fn_comptime.zig.snap

@@ -259,14 +259,14 @@
         "children": [
           {
             "id": util.id.NominalId(u32)(2), 
-            "flags": ["function", "block"], 
+            "flags": ["function", "block", "comptime"], 
             "bindings": {
 
             }, 
             "children": [
               {
                 "id": util.id.NominalId(u32)(3), 
-                "flags": ["struct", "block"], 
+                "flags": ["struct", "block", "comptime"], 
                 "bindings": {
                   "inner": 3, 
                   "Self": 4, 
@@ -312,22 +312,22 @@
         "children": [
           {
             "id": util.id.NominalId(u32)(7), 
-            "flags": ["function", "block"], 
+            "flags": ["function", "block", "comptime"], 
             "bindings": {
               "l": 9, 
 
             }, 
             "children": [
               {
                 "id": util.id.NominalId(u32)(8), 
-                "flags": [], 
+                "flags": ["comptime"], 
                 "bindings": {
 
                 }, 
                 "children": [
                   {
                     "id": util.id.NominalId(u32)(9), 
-                    "flags": ["block"], 
+                    "flags": ["block", "comptime"], 
                     "bindings": {
 
                     }, 
@@ -338,15 +338,15 @@
 
               }, {
                 "id": util.id.NominalId(u32)(10), 
-                "flags": [], 
+                "flags": ["comptime"], 
                 "bindings": {
 
                 }, 
                 "children": [], 
 
               }, {
                 "id": util.id.NominalId(u32)(11), 
-                "flags": ["struct", "block"], 
+                "flags": ["struct", "block", "comptime"], 
                 "bindings": {
                   "inner": 10, 
 
@@ -378,22 +378,22 @@
             "children": [
               {
                 "id": util.id.NominalId(u32)(14), 
-                "flags": ["block"], 
+                "flags": ["block", "comptime"], 
                 "bindings": {
                   "c": 14, 
 
                 }, 
                 "children": [
                   {
                     "id": util.id.NominalId(u32)(15), 
-                    "flags": [], 
+                    "flags": ["comptime"], 
                     "bindings": {
 
                     }, 
                     "children": [
                       {
                         "id": util.id.NominalId(u32)(16), 
-                        "flags": ["block"], 
+                        "flags": ["block", "comptime"], 
                         "bindings": {
 
                         }, 
@@ -404,7 +404,7 @@
 
                   }, {
                     "id": util.id.NominalId(u32)(17), 
-                    "flags": [], 
+                    "flags": ["comptime"], 
                     "bindings": {
 
                     },