Fixed #2984: Macros not correctly working inside proc literals and ot…

…her places
crystal-lang · Jul 11, 2016 · 177828e · 177828e
1 parent dc9f526
commit 177828e
Showing 3 changed files with 18 additions and 40 deletions.
diff --git a/spec/compiler/type_inference/macro_spec.cr b/spec/compiler/type_inference/macro_spec.cr
@@ -898,4 +898,14 @@ describe "Type inference: macro" do
       foo
       )) { char }
   end
+
+  it "works inside proc literal (#2984)" do
+    assert_type(%(
+      macro foo
+        1
+      end
+
+      ->{ foo }.call
+      )) { int32 }
+  end
 end
diff --git a/src/compiler/crystal/semantic/top_level_visitor.cr b/src/compiler/crystal/semantic/top_level_visitor.cr
@@ -703,6 +703,7 @@ module Crystal
     end
 
     def visit(node : ProcLiteral)
+      node.def.body.accept self
       false
     end
 
@@ -720,14 +721,17 @@ module Crystal
     end
 
     def visit(node : Cast)
+      node.obj.accept self
       false
     end
 
     def visit(node : NilableCast)
+      node.obj.accept self
       false
     end
 
     def visit(node : IsA)
+      node.obj.accept self
       false
     end
 
@@ -739,18 +743,6 @@ module Crystal
       false
     end
 
-    def visit(node : InstanceSizeOf)
-      false
-    end
-
-    def visit(node : SizeOf)
-      false
-    end
-
-    def visit(node : PointerOf)
-      false
-    end
-
     def visit(node : MultiAssign)
       node.targets.each do |target|
         if target.is_a?(Var)

diff --git a/src/compiler/crystal/semantic/type_declaration_visitor.cr b/src/compiler/crystal/semantic/type_declaration_visitor.cr
@@ -223,42 +223,22 @@ module Crystal
     end
 
     def visit(node : ProcLiteral)
+      node.def.body.accept self
       false
     end
 
     def visit(node : IsA)
+      node.obj.accept self
       false
     end
 
     def visit(node : Cast)
+      node.obj.accept self
       false
     end
 
     def visit(node : NilableCast)
-      false
-    end
-
-    def visit(node : InstanceSizeOf)
-      false
-    end
-
-    def visit(node : SizeOf)
-      false
-    end
-
-    def visit(node : TypeOf)
-      false
-    end
-
-    def visit(node : PointerOf)
-      false
-    end
-
-    def visit(node : ArrayLiteral)
-      false
-    end
-
-    def visit(node : HashLiteral)
+      node.obj.accept self
       false
     end
 
@@ -286,10 +266,6 @@ module Crystal
       false
     end
 
-    def visit(node : TypeOf)
-      false
-    end
-
     def inside_block?
       false
     end