fix(parser): Minus operand can be placeholders

Author: giann

src/Parser.zig

@@ -1926,7 +1926,7 @@ fn resolvePlaceholderWithRelation(
     child: *obj.ObjTypeDef,
     resolved_type: *obj.ObjTypeDef,
     final: bool,
-    relation: obj.PlaceholderDef.PlaceholderRelation,
+    relation: obj.PlaceholderDef.Relation,
 ) Error!void {
     const child_placeholder = child.resolved_type.?.Placeholder;
     const child_placeholder_name = self.ast.tokens.items(.lexeme)[child_placeholder.where];
@@ -4205,7 +4205,7 @@ fn literal(self: *Self, _: bool) Error!Ast.Node.Index {
             node.components = .{
                 .Double = self.ast.tokens.items(.literal)[node.location].Double,
             };
-            node.type_def = self.gc.type_registry.float_type;
+            node.type_def = self.gc.type_registry.double_type;
         },
         else => unreachable,
     }
@@ -7082,7 +7082,12 @@ fn binary(self: *Self, _: bool, left: Ast.Node.Index) Error!Ast.Node.Index {
                 .EqualEqual,
                 => self.gc.type_registry.bool_type,
 
-                .Plus => left_type_def orelse right_type_def,
+                .Minus,
+                .Star,
+                .Percent,
+                .Slash,
+                .Plus,
+                => left_type_def orelse right_type_def,
 
                 .ShiftLeft,
                 .ShiftRight,
@@ -7091,15 +7096,6 @@ fn binary(self: *Self, _: bool, left: Ast.Node.Index) Error!Ast.Node.Index {
                 .Xor,
                 => self.gc.type_registry.int_type,
 
-                .Minus,
-                .Star,
-                .Percent,
-                .Slash,
-                => if ((left_type_def != null and left_type_def.?.def_type == .Double) or (right_type_def != null and right_type_def.?.def_type == .Double))
-                    self.gc.type_registry.float_type
-                else
-                    self.gc.type_registry.int_type,
-
                 else => unreachable,
             },
             .components = .{

src/TypeRegistry.zig

@@ -23,7 +23,7 @@ registry: std.AutoHashMapUnmanaged(TypeDefHash, *o.ObjTypeDef) = .empty,
 void_type: *o.ObjTypeDef,
 str_type: *o.ObjTypeDef,
 int_type: *o.ObjTypeDef,
-float_type: *o.ObjTypeDef,
+double_type: *o.ObjTypeDef,
 bool_type: *o.ObjTypeDef,
 any_type: *o.ObjTypeDef,
 pat_type: *o.ObjTypeDef,
@@ -37,7 +37,7 @@ pub fn init(gc: *GC) !TypeRegistry {
         .void_type = undefined,
         .str_type = undefined,
         .int_type = undefined,
-        .float_type = undefined,
+        .double_type = undefined,
         .bool_type = undefined,
         .any_type = undefined,
         .pat_type = undefined,
@@ -49,7 +49,7 @@ pub fn init(gc: *GC) !TypeRegistry {
     self.void_type = try self.getTypeDef(.{ .def_type = .Void });
     self.str_type = try self.getTypeDef(.{ .def_type = .String });
     self.int_type = try self.getTypeDef(.{ .def_type = .Integer });
-    self.float_type = try self.getTypeDef(.{ .def_type = .Double });
+    self.double_type = try self.getTypeDef(.{ .def_type = .Double });
     self.bool_type = try self.getTypeDef(.{ .def_type = .Bool });
     self.any_type = try self.getTypeDef(
         .{

src/obj.zig

@@ -5601,7 +5601,7 @@ pub fn cloneObject(obj: *Obj, vm: *VM) !Value {
 pub const PlaceholderDef = struct {
     const Self = @This();
 
-    pub const PlaceholderRelation = enum {
+    pub const Relation = enum {
         Call,
         Yield,
         Subscript,
@@ -5623,7 +5623,7 @@ pub const PlaceholderDef = struct {
     /// can trace back the root of the unknown type.
     parent: ?*ObjTypeDef = null,
     /// What's the relation with the parent?
-    parent_relation: ?PlaceholderRelation = null,
+    parent_relation: ?Relation = null,
     /// Children adds themselves here
     children: std.ArrayList(*ObjTypeDef),
     mutable: ?bool,
@@ -5644,7 +5644,7 @@ pub const PlaceholderDef = struct {
         self.children.deinit(allocator);
     }
 
-    pub fn link(allocator: Allocator, parent: *ObjTypeDef, child: *ObjTypeDef, relation: PlaceholderRelation) !void {
+    pub fn link(allocator: Allocator, parent: *ObjTypeDef, child: *ObjTypeDef, relation: Relation) !void {
         assert(parent.def_type == .Placeholder);
         assert(child.def_type == .Placeholder);
 

src/value.zig

@@ -137,7 +137,7 @@ pub const Value = packed struct {
         }
 
         if (self.isDouble()) {
-            return gc.type_registry.float_type;
+            return gc.type_registry.double_type;
         }
 
         if (self.isInteger()) {
@@ -147,7 +147,7 @@ pub const Value = packed struct {
         return switch (self.getTag()) {
             TagBoolean => gc.type_registry.bool_type,
             TagNull, TagVoid => gc.type_registry.void_type,
-            else => gc.type_registry.float_type,
+            else => gc.type_registry.double_type,
         };
     }