fix: Foreach value placeholder can't be .Subscript when map

buzz-language · Sep 19, 2024 · 2a17e7e · 2a17e7e
1 parent b1bd476
commit 2a17e7e
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 4 deletions.
diff --git a/src/Parser.zig b/src/Parser.zig
@@ -1756,11 +1756,54 @@ fn resolvePlaceholderWithRelation(
         },
         .Subscript => {
             if (resolved_type.def_type == .List) {
-                try self.resolvePlaceholder(child, resolved_type.resolved_type.?.List.item_type, false);
+                try self.resolvePlaceholder(
+                    child,
+                    resolved_type.resolved_type.?.List.item_type,
+                    false,
+                );
             } else if (resolved_type.def_type == .Map) {
-                try self.resolvePlaceholder(child, try resolved_type.resolved_type.?.Map.value_type.cloneOptional(&self.gc.type_registry), false);
+                try self.resolvePlaceholder(
+                    child,
+                    try resolved_type.resolved_type.?.Map.value_type.cloneOptional(&self.gc.type_registry),
+                    false,
+                );
             } else if (resolved_type.def_type == .String) {
-                try self.resolvePlaceholder(child, self.gc.type_registry.str_type, false);
+                try self.resolvePlaceholder(
+                    child,
+                    self.gc.type_registry.str_type,
+                    false,
+                );
+            } else {
+                self.reporter.reportErrorFmt(
+                    .map_key_type,
+                    self.ast.tokens.get(child_placeholder.where),
+                    "`{s}` can't be subscripted",
+                    .{
+                        (try resolved_type.toStringAlloc(self.gc.allocator)).items,
+                    },
+                );
+                return;
+            }
+        },
+        .UnwrappedSubscript => {
+            if (resolved_type.def_type == .List) {
+                try self.resolvePlaceholder(
+                    child,
+                    resolved_type.resolved_type.?.List.item_type,
+                    false,
+                );
+            } else if (resolved_type.def_type == .Map) {
+                try self.resolvePlaceholder(
+                    child,
+                    resolved_type.resolved_type.?.Map.value_type,
+                    false,
+                );
+            } else if (resolved_type.def_type == .String) {
+                try self.resolvePlaceholder(
+                    child,
+                    self.gc.type_registry.str_type,
+                    false,
+                );
             } else {
                 self.reporter.reportErrorFmt(
                     .map_key_type,
@@ -8354,7 +8397,7 @@ fn forEachStatement(self: *Self) Error!Ast.Node.Index {
             try obj.PlaceholderDef.link(
                 iterable_type_def,
                 placeholder,
-                .Subscript,
+                .UnwrappedSubscript,
             );
 
             break :placeholder placeholder;

diff --git a/src/obj.zig b/src/obj.zig
@@ -4984,6 +4984,7 @@ pub const PlaceholderDef = struct {
         Call,
         Yield,
         Subscript,
+        UnwrappedSubscript,
         Key,
         FieldAccess,
         Assignment,