crystal-lang · Sep 3, 2016 · Sep 3, 2016 · Sep 3, 2016
Showing with 60 additions and 3 deletions.

+6 −0 spec/compiler/semantic/cast_spec.cr

+33 −0 spec/compiler/semantic/new_spec.cr

+2 −2 src/compiler/crystal/semantic/bindings.cr

+19 −1 src/compiler/crystal/semantic/new.cr
diff --git a/spec/compiler/semantic/cast_spec.cr b/spec/compiler/semantic/cast_spec.cr
@@ -302,4 +302,10 @@ describe "Semantic: cast" do
       Bar(Int32).new.as(Foo(Int32))
       )) { generic_class("Foo", int32).virtual_type! }
   end
+
+  it "doesn't cast to virtual primitive (bug)" do
+    assert_type(%(
+      1.as(Int)
+      )) { int32 }
+  end
 end
diff --git a/spec/compiler/semantic/new_spec.cr b/spec/compiler/semantic/new_spec.cr
@@ -191,4 +191,37 @@ describe "Semantic: new" do
       ),
       "instance variable '@caps' of My was not initialized in all of the 'initialize' methods, rendering it nilable"
   end
+
+  it "inherits initialize and new methods if doesn't define new (#3238)" do
+    assert_type(%(
+      class Foo(T)
+        def initialize(x : Int32)
+        end
+
+        def self.new(x : Char)
+          new(1)
+        end
+      end
+
+      class Bar < Foo(Int32)
+      end
+
+      Bar.new('a')
+      )) { types["Bar"] }
+  end
+
+  it "doesn't have default new for inherited class from generic type" do
+    assert_error %(
+      class Foo(T)
+        def initialize(x : Int32)
+        end
+      end
+
+      class Bar < Foo(Int32)
+      end
+
+      Bar.new
+      ),
+      "wrong number of arguments for 'Bar.new' (given 0, expected 1)"
+  end
 end
diff --git a/src/compiler/crystal/semantic/bindings.cr b/src/compiler/crystal/semantic/bindings.cr
@@ -297,7 +297,7 @@ module Crystal
         #   1 as Int32 | Float64
         #   Bar.new as Foo # where Bar < Foo
         if obj_type == filtered_type && obj_type != to_type &&
-           !to_type.is_a?(GenericClassType)
+           !to_type.is_a?(GenericClassType) && to_type.allowed_in_generics?
           filtered_type = to_type
           @upcast = true
         end
@@ -328,7 +328,7 @@ module Crystal
         #   1 as Int32 | Float64
         #   Bar.new as Foo # where Bar < Foo
         if obj_type == filtered_type && obj_type != to_type &&
-           !to_type.is_a?(GenericClassType)
+           !to_type.is_a?(GenericClassType) && to_type.allowed_in_generics?
           filtered_type = to_type.virtual_type
           @upcast = true
         end

diff --git a/src/compiler/crystal/semantic/new.cr b/src/compiler/crystal/semantic/new.cr
@@ -77,15 +77,31 @@ module Crystal
                 type.add_def(Def.argless_initialize)
               end
             else
+              initialize_owner = nil
+
               initialize_methods.each do |initialize|
                 # If the type has `self.new()`, don't override it
                 if initialize.args.empty? && !initialize.yields && has_default_self_new
                   next
                 end
 
+                # Only copy initialize methods from the first ancestor that has them
+                if initialize_owner && initialize.owner != initialize_owner
+                  break
+                end
+
+                initialize_owner = initialize.owner
+
                 new_method = initialize.expand_new_from_initialize(type)
                 type.metaclass.as(ModuleType).add_def(new_method)
               end
+
+              # Copy non-generated `new` methods from parent to child
+              new_methods.each do |new_method|
+                next if new_method.new?
+
+                type.metaclass.as(ModuleType).add_def(new_method.clone)
+              end
             end
           else
             type.as(ClassType).lookup_new_in_ancestors = true
@@ -214,7 +230,9 @@ module Crystal
         Call.new(Path.global("GC"), "add_finalizer", var.clone))
       exps << var.clone
 
-      Def.new("new", body: exps)
+      a_def = Def.new("new", body: exps)
+      a_def.new = true
+      a_def
     end
 
     def self.argless_initialize