fix: Restored mistakenly commented placeholder multi-parent check

buzz-language · Sep 19, 2024 · b1bd476 · b1bd476
1 parent 4306bab
commit b1bd476
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/Parser.zig b/src/Parser.zig
@@ -1790,7 +1790,7 @@ fn resolvePlaceholderWithRelation(
                 self.reporter.reportErrorFmt(
                     .map_key_type,
                     self.ast.tokens.get(child_placeholder.where),
-                    "`{s}` can't be subscripted",
+                    "Bad key type for `{s}`",
                     .{
                         (try resolved_type.toStringAlloc(self.gc.allocator)).items,
                     },

diff --git a/src/obj.zig b/src/obj.zig
@@ -5025,21 +5025,21 @@ pub const PlaceholderDef = struct {
             return;
         }
 
-        // if (child.resolved_type.?.Placeholder.parent != null) {
-        //     if (BuildOptions.debug_placeholders) {
-        //         io.print(
-        //             ">>> Placeholder @{} ({s}) has already a {} relation with @{} ({s})\n",
-        //             .{
-        //                 @intFromPtr(child),
-        //                 if (child.resolved_type.?.Placeholder.name) |name| name.string else "unknown",
-        //                 child.resolved_type.?.Placeholder.parent_relation.?,
-        //                 @intFromPtr(child.resolved_type.?.Placeholder.parent.?),
-        //                 if (child.resolved_type.?.Placeholder.parent.?.resolved_type.?.Placeholder.name) |name| name.string else "unknown",
-        //             },
-        //         );
-        //     }
-        //     return;
-        // }
+        if (child.resolved_type.?.Placeholder.parent != null) {
+            if (BuildOptions.debug_placeholders) {
+                io.print(
+                    ">>> Placeholder @{} ({s}) has already a {} relation with @{} ({s})\n",
+                    .{
+                        @intFromPtr(child),
+                        if (child.resolved_type.?.Placeholder.name) |name| name.string else "unknown",
+                        child.resolved_type.?.Placeholder.parent_relation.?,
+                        @intFromPtr(child.resolved_type.?.Placeholder.parent.?),
+                        if (child.resolved_type.?.Placeholder.parent.?.resolved_type.?.Placeholder.name) |name| name.string else "unknown",
+                    },
+                );
+            }
+            return;
+        }
 
         child.resolved_type.?.Placeholder.parent = parent;
         try parent.resolved_type.?.Placeholder.children.append(child);