crystal-lang · May 21, 2017 · May 21, 2017 · May 21, 2017
Showing with 34 additions and 5 deletions.

+24 −0 spec/compiler/semantic/macro_spec.cr

+1 −1 spec/std/callstack_spec.cr

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

+7 −3 src/compiler/crystal/types.cr
diff --git a/spec/compiler/semantic/macro_spec.cr b/spec/compiler/semantic/macro_spec.cr
@@ -1060,4 +1060,28 @@ describe "Semantic: macro" do
       {global(1), global(1, 2)}
       )) { tuple_of [int32, char] }
   end
+
+  it "finds macro and method at the same scope inside included module" do
+    assert_type(%(
+      module Moo
+        macro global(x)
+          1
+        end
+
+        def global(x, y)
+          'a'
+        end
+      end
+
+      class Foo
+        include Moo
+
+        def main
+          {global(1), global(1, 2)}
+        end
+      end
+
+      Foo.new.main
+      )) { tuple_of [int32, char] }
+  end
 end
diff --git a/spec/std/callstack_spec.cr b/spec/std/callstack_spec.cr
@@ -1,4 +1,4 @@
-require "../spec_helper"
+require "spec"
 require "tempfile"
 
 describe "Backtrace" do

diff --git a/src/compiler/crystal/codegen/codegen.cr b/src/compiler/crystal/codegen/codegen.cr
@@ -1248,7 +1248,8 @@ module Crystal
 
     def cant_pass_closure_to_c_exception_call
       @cant_pass_closure_to_c_exception_call ||= begin
-        call = Call.global("raise", StringLiteral.new("passing a closure to C is not allowed"))
+        location = Location.new(@program.filename, 1, 1)
+        call = Call.global("raise", StringLiteral.new("passing a closure to C is not allowed")).at(location)
         @program.visit_main call
         call
       end

diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
@@ -373,7 +373,11 @@ module Crystal
     end
 
     def has_def?(name)
-      defs.try(&.has_key?(name)) || parents.try(&.any?(&.has_def?(name)))
+      has_def_without_parents?(name) || parents.try(&.any?(&.has_def?(name)))
+    end
+
+    def has_def_without_parents?(name)
+      defs.try(&.has_key?(name))
     end
 
     record DefInMacroLookup
@@ -399,7 +403,7 @@ module Crystal
       # First check if there are defs at this scope with that name.
       # If so, make that a priority in the lookup and don't consider
       # macro matches.
-      if has_def?(name)
+      if has_def_without_parents?(name)
         return DefInMacroLookup.new
       end
 
@@ -423,7 +427,7 @@ module Crystal
         return macros
       end
 
-      if has_def?(name)
+      if has_def_without_parents?(name)
         return DefInMacroLookup.new
       end