Fixed #2773: Can't override macro with splat argument

crystal-lang · Jun 7, 2016 · efd1598 · efd1598
1 parent 00492a6
commit efd1598
Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/spec/compiler/type_inference/macro_spec.cr b/spec/compiler/type_inference/macro_spec.cr
@@ -884,4 +884,18 @@ describe "Type inference: macro" do
       Foo.bar
       )) { int32 }
   end
+
+  it "overrides macro with splat (#2773)" do
+    assert_type(%(
+      macro foo(*args)
+        1
+      end
+
+      macro foo(*args)
+        'a'
+      end
+
+      foo
+      )) { char }
+  end
 end
diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
@@ -601,8 +601,13 @@ module Crystal
 
     def lookup_macro(name, args : Array, named_args)
       if macros = self.macros.try &.[name]?
-        match = macros.find &.matches?(args, named_args)
-        return match if match
+        # Lookup macros in reverse order so we find ones that
+        # override others first.
+        # TODO: macros don't really overload right now, they are
+        # just a list of macros grouped by name.
+        macros.reverse_each do |a_macro|
+          return a_macro if a_macro.matches?(args, named_args)
+        end
       end
 
       instance_type.parents.try &.each do |parent|