crystal-lang · Jul 5, 2016 · Jul 5, 2016 · Jul 5, 2016
Showing with 49 additions and 5 deletions.

+33 −0 spec/compiler/type_inference/instance_var_spec.cr

+10 −0 spec/std/slice_spec.cr

+1 −1 src/compiler/crystal/semantic/base_type_visitor.cr

+2 −1 src/compiler/crystal/types.cr

+3 −3 src/slice.cr
diff --git a/spec/compiler/type_inference/instance_var_spec.cr b/spec/compiler/type_inference/instance_var_spec.cr
@@ -3072,6 +3072,39 @@ describe "Type inference: instance var" do
       "can't use Int as the type of an instance variable yet, use a more specific type"
   end
 
+  it "shouldn't error when accessing instance var in initialized that's always initialized (#2953)" do
+    assert_type(%(
+      class Foo
+        @baz = Baz.new
+
+        def baz
+          @baz
+        end
+      end
+
+      class Bar < Foo
+        def initialize
+          @baz.x = 2
+        end
+      end
+
+      class Baz
+        def initialize
+          @x = 1
+        end
+
+        def x=(@x)
+        end
+
+        def x
+          @x
+        end
+      end
+
+      Bar.new.baz.x
+      )) { int32 }
+  end
+
   # -----------------
   # ||| OLD SPECS |||
   # vvv           vvv

diff --git a/spec/std/slice_spec.cr b/spec/std/slice_spec.cr
@@ -185,4 +185,14 @@ describe "Slice" do
     slice[1].should eq('a')
     slice[2].should eq("foo")
   end
+
+  it "uses percent vars in [] macro (#2954)" do
+    slices = itself(Slice[1, 2], Slice[3])
+    slices[0].to_a.should eq([1, 2])
+    slices[1].to_a.should eq([3])
+  end
+end
+
+private def itself(*args)
+  args
 end
diff --git a/src/compiler/crystal/semantic/base_type_visitor.cr b/src/compiler/crystal/semantic/base_type_visitor.cr
@@ -857,7 +857,7 @@ module Crystal
       end
 
       location = node.location
-      filenames = @mod.find_in_path(node.string, location.try &.filename)
+      filenames = @mod.find_in_path(node.string, location.try &.original_filename)
       if filenames
         nodes = Array(ASTNode).new(filenames.size)
         filenames.each do |filename|

diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
@@ -894,7 +894,8 @@ module Crystal
     end
 
     def has_instance_var_initializer?(name)
-      @instance_vars_initializers.try(&.any? { |init| init.name == name })
+      @instance_vars_initializers.try(&.any? { |init| init.name == name }) ||
+        ancestors.any?(&.has_instance_var_initializer?(name))
     end
   end
 

diff --git a/src/slice.cr b/src/slice.cr
@@ -23,11 +23,11 @@ struct Slice(T)
   #
   # See also: `Number.slice`.
   macro [](*args)
-    slice = Slice(typeof({{*args}})).new({{args.size}})
+    %slice = Slice(typeof({{*args}})).new({{args.size}})
     {% for arg, i in args %}
-      slice.to_unsafe[{{i}}] = {{arg}}
+      %slice.to_unsafe[{{i}}] = {{arg}}
     {% end %}
-    slice
+    %slice
   end
 
   # Returns the size of this slice.