crystal-lang · Jul 22, 2016 · Jul 22, 2016
diff --git a/spec/compiler/codegen/alias_spec.cr b/spec/compiler/codegen/alias_spec.cr
@@ -75,7 +75,7 @@ describe "Code gen: alias" do
   end
 
   it "doesn't break with alias for link attributes" do
-    result = infer_type(%(
+    result = semantic(%(
       alias Foo = Int32
 
       module B

diff --git a/spec/compiler/codegen/const_spec.cr b/spec/compiler/codegen/const_spec.cr
@@ -204,10 +204,7 @@ describe "Codegen: const" do
       ").to_i.should eq(3)
   end
 
-  # Constants are actually initialized before main code, so this should
-  # probably give an error. Since this code is very unlikely to happen,
-  # we'll fix it later.
-  pending "works with const initialized after global variable" do
+  it "works with const initialized after global variable" do
     run(%(
       $a = 1
       COCO = $a

diff --git a/spec/compiler/codegen/yield_with_scope_spec.cr b/spec/compiler/codegen/yield_with_scope_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: yield with scope" do
+describe "Semantic: yield with scope" do
   it "uses scope in global method" do
     run("
       require \"prelude\"

diff --git a/spec/compiler/crystal/types_spec.cr b/spec/compiler/crystal/types_spec.cr
@@ -8,7 +8,7 @@ end
 
 describe "types to_s of" do
   it "does for type contained in generic class" do
-    result = infer_type(%(
+    result = semantic(%(
       class Bar(T)
         class Foo
         end
@@ -18,7 +18,7 @@ describe "types to_s of" do
   end
 
   it "does for type contained in generic module" do
-    result = infer_type(%(
+    result = semantic(%(
       module Bar(T)
         class Foo
         end

diff --git a/...piler/type_inference/abstract_def_spec.cr → spec/compiler/semantic/abstract_def_spec.cr b/...piler/type_inference/abstract_def_spec.cr → spec/compiler/semantic/abstract_def_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: abstract def" do
+describe "Semantic: abstract def" do
   it "errors if using abstract def on subclass" do
     assert_error %(
       abstract class Foo
@@ -183,7 +183,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method is implemented by subclass" do
-    infer_type %(
+    semantic %(
       abstract class Foo
         abstract def foo
       end
@@ -196,7 +196,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method with args is implemented by subclass" do
-    infer_type %(
+    semantic %(
       abstract class Foo
         abstract def foo(x, y)
       end
@@ -209,7 +209,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method with args is implemented by subclass (restriction -> no restriction)" do
-    infer_type %(
+    semantic %(
       abstract class Foo
         abstract def foo(x, y : Int32)
       end
@@ -222,7 +222,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method with args is implemented by subclass (don't check subclasses)" do
-    infer_type %(
+    semantic %(
       abstract class Foo
         abstract def foo
       end
@@ -253,7 +253,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method is implemented by subclass via module inclusion" do
-    infer_type %(
+    semantic %(
       abstract class Foo
         abstract def foo
       end
@@ -283,7 +283,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method is implemented by including class" do
-    infer_type %(
+    semantic %(
       module Foo
         abstract def foo
       end
@@ -298,7 +298,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method is not implemented by including module" do
-    infer_type %(
+    semantic %(
       module Foo
         abstract def foo
       end
@@ -324,7 +324,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if abstract method with args is implemented by subclass (with one default arg)" do
-    infer_type %(
+    semantic %(
       abstract class Foo
         abstract def foo(x)
       end
@@ -337,7 +337,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if implements with parent class" do
-    infer_type %(
+    semantic %(
       class Parent; end
       class Child < Parent; end
 
@@ -353,7 +353,7 @@ describe "Type inference: abstract def" do
   end
 
   it "doesn't error if implements with parent module" do
-    infer_type %(
+    semantic %(
       module Moo
       end
 

diff --git a/spec/compiler/type_inference/alias_spec.cr → spec/compiler/semantic/alias_spec.cr b/spec/compiler/type_inference/alias_spec.cr → spec/compiler/semantic/alias_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "type inference: alias" do
+describe "Semantic: alias" do
   it "resolves alias type" do
     assert_type("
       alias Alias = Int32

diff --git a/spec/compiler/type_inference/array_spec.cr → spec/compiler/semantic/array_spec.cr b/spec/compiler/type_inference/array_spec.cr → spec/compiler/semantic/array_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: array" do
+describe "Semantic: array" do
   it "types array literal of int" do
     assert_type("require \"prelude\"; [1, 2, 3]") { array_of(int32) }
   end

diff --git a/spec/compiler/type_inference/block_spec.cr → spec/compiler/semantic/block_spec.cr b/spec/compiler/type_inference/block_spec.cr → spec/compiler/semantic/block_spec.cr
@@ -18,7 +18,7 @@ describe "Block inference" do
         x = 1
       end
     ").as(Expressions)
-    result = infer_type input
+    result = semantic input
     input.last.as(Call).block.not_nil!.body.type.should eq(result.program.int32)
   end
 
@@ -32,7 +32,7 @@ describe "Block inference" do
         1
       end
     ").as(Expressions)
-    result = infer_type input
+    result = semantic input
     mod = result.program
     input.last.as(Call).block.not_nil!.args[0].type.should eq(mod.int32)
   end

diff --git a/spec/compiler/type_inference/c_enum_spec.cr → spec/compiler/semantic/c_enum_spec.cr b/spec/compiler/type_inference/c_enum_spec.cr → spec/compiler/semantic/c_enum_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: c enum" do
+describe "Semantic: c enum" do
   it "types enum value" do
     assert_type("lib LibFoo; enum Bar; X, Y, Z = 10, W; end; end; LibFoo::Bar::X") { types["LibFoo"].types["Bar"] }
   end

diff --git a/.../compiler/type_inference/c_struct_spec.cr → spec/compiler/semantic/c_struct_spec.cr b/.../compiler/type_inference/c_struct_spec.cr → spec/compiler/semantic/c_struct_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: struct" do
+describe "Semantic: struct" do
   it "types struct" do
     result = assert_type("lib LibFoo; struct Bar; x : Int32; y : Float64; end; end; LibFoo::Bar") { types["LibFoo"].types["Bar"].metaclass }
     mod = result.program
@@ -247,7 +247,7 @@ describe "Type inference: struct" do
   end
 
   it "marks as packed" do
-    result = infer_type(%(
+    result = semantic(%(
       lib LibFoo
         @[Packed]
         struct Struct

diff --git a/spec/compiler/type_inference/c_type_spec.cr → spec/compiler/semantic/c_type_spec.cr b/spec/compiler/type_inference/c_type_spec.cr → spec/compiler/semantic/c_type_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: type" do
+describe "Semantic: type" do
   it "can call methods of original type" do
     assert_type("
       lib Lib

diff --git a/spec/compiler/type_inference/c_union_spec.cr → spec/compiler/semantic/c_union_spec.cr b/spec/compiler/type_inference/c_union_spec.cr → spec/compiler/semantic/c_union_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: c union" do
+describe "Semantic: c union" do
   it "types c union" do
     result = assert_type("lib LibFoo; union Bar; x : Int32; y : Float64; end; end; LibFoo::Bar") { types["LibFoo"].types["Bar"].metaclass }
     mod = result.program

diff --git a/spec/compiler/type_inference/cast_spec.cr → spec/compiler/semantic/cast_spec.cr b/spec/compiler/type_inference/cast_spec.cr → spec/compiler/semantic/cast_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: cast" do
+describe "Semantic: cast" do
   it "casts to same type is ok" do
     assert_type("1 as Int32 ") { int32 }
   end

diff --git a/spec/compiler/type_inference/class_spec.cr → spec/compiler/semantic/class_spec.cr b/spec/compiler/type_inference/class_spec.cr → spec/compiler/semantic/class_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: class" do
+describe "Semantic: class" do
   it "types Const#allocate" do
     assert_type("class Foo; end; Foo.allocate") { types["Foo"].as(NonGenericClassType) }
   end
@@ -67,7 +67,7 @@ describe "Type inference: class" do
       g.set 2.5
       g
     "
-    result = infer_type input
+    result = semantic input
     mod, node = result.program, result.node.as(Expressions)
     foo = mod.types["Foo"].as(GenericClassType)
 
@@ -98,7 +98,7 @@ describe "Type inference: class" do
       g.set 2.5
       g.get
     ").as(Expressions)
-    result = infer_type input
+    result = semantic input
     mod, node = result.program, result.node.as(Expressions)
 
     node[3].type.should eq(mod.nilable(mod.int32))
@@ -121,7 +121,7 @@ describe "Type inference: class" do
       n.add
       n
     ").as(Expressions)
-    result = infer_type input
+    result = semantic input
     mod, input = result.program, result.node.as(Expressions)
     node = mod.types["Node"].as(NonGenericClassType)
 
@@ -241,7 +241,7 @@ describe "Type inference: class" do
 
       Foo::Bar.new(1)
       ").as(Expressions)
-    result = infer_type nodes
+    result = semantic nodes
     mod = result.program
     type = nodes.last.type.as(GenericClassInstanceType)
     type.type_vars["T"].type.should eq(mod.int32)
@@ -348,7 +348,7 @@ describe "Type inference: class" do
       class Foo::Bar
       end
       ")
-    result = infer_type input
+    result = semantic input
     mod = result.program
     mod.types["Foo"].types["Bar"].as(NonGenericClassType)
   end

diff --git a/...compiler/type_inference/class_var_spec.cr → spec/compiler/semantic/class_var_spec.cr b/...compiler/type_inference/class_var_spec.cr → spec/compiler/semantic/class_var_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: class var" do
+describe "Semantic: class var" do
   it "declares class variable" do
     assert_error %(
       class Foo

diff --git a/spec/compiler/type_inference/cleanup_spec.cr → spec/compiler/semantic/cleanup_spec.cr b/spec/compiler/type_inference/cleanup_spec.cr → spec/compiler/semantic/cleanup_spec.cr
diff --git a/spec/compiler/type_inference/closure_spec.cr → spec/compiler/semantic/closure_spec.cr b/spec/compiler/type_inference/closure_spec.cr → spec/compiler/semantic/closure_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: closure" do
+describe "Semantic: closure" do
   it "gives error when doing yield inside proc literal" do
     assert_error "-> { yield }", "can't use `yield` outside a method"
   end

diff --git a/spec/compiler/type_inference/const_spec.cr → spec/compiler/semantic/const_spec.cr b/spec/compiler/type_inference/const_spec.cr → spec/compiler/semantic/const_spec.cr
@@ -1,9 +1,9 @@
 require "../../spec_helper"
 
-describe "Type inference: const" do
+describe "Semantic: const" do
   it "types a constant" do
     input = parse("A = 1").as(Assign)
-    result = infer_type input
+    result = semantic input
     mod = result.program
     input.target.type?.should be_nil # Don't type value until needed
   end
@@ -164,7 +164,7 @@ describe "Type inference: const" do
 
   ["nil", "true", "1", "'a'", %("foo"), "+ 1", "- 2", "~ 2", "1 + 2", "1 + Z"].each do |node|
     it "doesn't errors if constant depends on another one defined later through method, but constant is simple (#{node})" do
-      infer_type(%(
+      semantic(%(
         Z = 10
 
         struct Int32

diff --git a/...piler/type_inference/def_overload_spec.cr → spec/compiler/semantic/def_overload_spec.cr b/...piler/type_inference/def_overload_spec.cr → spec/compiler/semantic/def_overload_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: def overload" do
+describe "Semantic: def overload" do
   it "types a call with overload" do
     assert_type("def foo; 1; end; def foo(x); 2.5; end; foo") { int32 }
   end

diff --git a/spec/compiler/type_inference/def_spec.cr → spec/compiler/semantic/def_spec.cr b/spec/compiler/type_inference/def_spec.cr → spec/compiler/semantic/def_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: def" do
+describe "Semantic: def" do
   it "types a call with an int" do
     assert_type("def foo; 1; end; foo") { int32 }
   end
@@ -19,7 +19,7 @@ describe "Type inference: def" do
 
   it "types a call with an argument" do
     input = parse "def foo(x); x; end; foo 1; foo 2.3"
-    result = infer_type input
+    result = semantic input
     mod, input = result.program, result.node.as(Expressions)
 
     input[1].type.should eq(mod.int32)
@@ -32,7 +32,7 @@ describe "Type inference: def" do
 
   it "assigns def owner" do
     input = parse "struct Int; def foo; 2.5; end; end; 1.foo"
-    result = infer_type input
+    result = semantic input
     mod, input = result.program, result.node.as(Expressions)
     input.last.as(Call).target_def.owner.should eq(mod.int32)
   end
@@ -101,7 +101,7 @@ describe "Type inference: def" do
 
       foo
       )
-    result = infer_type input
+    result = semantic input
     mod, input = result.program, result.node.as(Expressions)
 
     call = input.last.as(Call)

diff --git a/...piler/type_inference/did_you_mean_spec.cr → spec/compiler/semantic/did_you_mean_spec.cr b/...piler/type_inference/did_you_mean_spec.cr → spec/compiler/semantic/did_you_mean_spec.cr
@@ -1,6 +1,6 @@
 require "../../spec_helper"
 
-describe "Type inference: did you mean" do
+describe "Semantic: did you mean" do
   it "says did you mean for one mistake in short word in instance method" do
     assert_error "
       class Foo
@@ -111,7 +111,7 @@ describe "Type inference: did you mean" do
       Foo.new.a
       )
     begin
-      infer_type nodes
+      semantic nodes
       fail "TypeException wasn't raised"
     rescue ex : Crystal::TypeException
       ex.to_s.includes?("did you mean").should be_false