crystal-lang · Nov 18, 2016 · Nov 18, 2016 · Nov 18, 2016 · Nov 18, 2016
Showing with 30 additions and 6 deletions.

+11 −0 spec/compiler/codegen/is_a_spec.cr

+11 −1 src/compiler/crystal/semantic/restrictions.cr

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

+3 −3 src/compiler/crystal/util.cr

+2 −1 src/spec/context.cr

+2 −1 src/spec/source.cr
diff --git a/spec/compiler/codegen/is_a_spec.cr b/spec/compiler/codegen/is_a_spec.cr
@@ -686,4 +686,15 @@ describe "Codegen: is_a?" do
       Bar(Int32).new.as(Foo(Int32)).is_a?(Bar) ? 2 : 3
       )).to_i.should eq(2)
   end
+
+  it "doesn't consider generic type to be a generic type of a recursive alias (#3524)" do
+    run(%(
+      class Gen(T)
+      end
+
+      alias Type = Int32 | Gen(Type)
+      a = Gen(Int32).new
+      a.is_a?(Type)
+      )).to_b.should be_false
+  end
 end
diff --git a/src/compiler/crystal/semantic/restrictions.cr b/src/compiler/crystal/semantic/restrictions.cr
@@ -328,7 +328,7 @@ module Crystal
     end
 
     def restrict(other : UnionType, context)
-      restricted = other.union_types.any? { |union_type| restriction_of?(union_type, context.instantiated_type) }
+      restricted = other.union_types.any? { |union_type| restrict(union_type, context) }
       restricted ? self : nil
     end
 
@@ -863,6 +863,16 @@ module Crystal
       remove_alias.restrict(other, context)
     end
 
+    def restrict(other : AliasType, context)
+      return self if self == other
+
+      if !self.simple? && !other.simple?
+        return nil
+      end
+
+      remove_alias.restrict(other, context)
+    end
+
     def restrict(other, context)
       return self if self == other
 

diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
@@ -2225,6 +2225,7 @@ module Crystal
   class AliasType < NamedType
     getter? value_processed = false
     property! aliased_type : Type
+    getter? simple
 
     def initialize(program, namespace, name, @value : ASTNode)
       super(program, namespace, name)

diff --git a/src/compiler/crystal/util.cr b/src/compiler/crystal/util.cr
@@ -3,10 +3,10 @@ module Crystal
     dir = Dir.current
     if filename.starts_with?(dir)
       filename = filename[dir.size..-1]
-      if filename.starts_with? "/"
-        ".#{filename}"
+      if filename.starts_with? '/'
+        filename[1..-1]
       else
-        "./#{filename}"
+        filename
       end
     else
       filename

diff --git a/src/spec/context.cr b/src/spec/context.cr
@@ -72,7 +72,8 @@ module Spec
         failures_and_errors.each_with_index do |fail, i|
           if ex = fail.exception
             puts
-            puts "  #{i + 1}) #{fail.description}"
+            puts "#{(i + 1).to_s.rjust(3, ' ')}) #{fail.description}"
+
             if ex.is_a?(AssertionFailed)
               source_line = Spec.read_line(ex.file, ex.line)
               if source_line

diff --git a/src/spec/source.cr b/src/spec/source.cr
@@ -16,7 +16,8 @@ module Spec
   def self.relative_file(file)
     cwd = Dir.current
     if file.starts_with?(cwd)
-      file = ".#{file[cwd.size..-1]}"
+      file = file[cwd.size..-1]
+      file = file[1..-1] if file.starts_with?('/')
     end
     file
   end