Merge pull request #1234 from mururu/deprecate-implicit-args

Implicit super arguments is deprecated

Author: José Valim

lib/eex/lib/eex/smart_engine.ex

@@ -76,8 +76,8 @@ defmodule EEx.AssignsEngine do
         quote(do: Keyword.get var!(assigns), unquote(name))
       end
 
-      defp transform(_) do
-        super
+      defp transform(arg) do
+        super(arg)
       end
 
       defoverridable [transform: 1]
@@ -94,4 +94,4 @@ defmodule EEx.SmartEngine do
   `AssignsEngine` and other conveniences. Read
   `EEx.AssignsEngine` for examples.
   """
-end
+end

lib/elixir/src/elixir_translator.erl

@@ -331,9 +331,12 @@ translate_each({ super, Meta, Args } = Original, S) ->
       { _, Arity } = Function,
 
       { TArgs, TS } = if
+        is_atom(Args) andalso Arity == 0 ->
+          elixir_def_overridable:retrieve_args(Meta, Arity, S);
         is_atom(Args) ->
+          elixir_errors:deprecation(Meta, S#elixir_scope.file, "omitting arguments of super is deprecated, please call super with arguments instead"),
           elixir_def_overridable:retrieve_args(Meta, Arity, S);
-        length(Args) == Arity ->
+        not is_atom(Args) andalso length(Args) == Arity ->
           translate_args(Args, S);
         true ->
           syntax_error(Meta, S#elixir_scope.file, "super must be called with the same number of arguments as the current function")

lib/elixir/test/elixir/gen_server/behaviour_test.exs

@@ -16,8 +16,8 @@ defmodule GenServer.BehaviourTest do
       { :stop, :normal, :ok, config }
     end
 
-    def handle_call(_request, _from, _config) do
-      super
+    def handle_call(request, from, config) do
+      super(request, from, config)
     end
 
     def handle_cast({ :push, item }, config) do

lib/elixir/test/elixir/kernel/overridable_test.exs

@@ -47,10 +47,6 @@ defmodule Kernel.Overridable do
     x + y
   end
 
-  def super_with_implicit_args(x, y) do
-    x + y
-  end
-
   def many_clauses(0) do
     11
   end
@@ -59,7 +55,7 @@ defmodule Kernel.Overridable do
     13
   end
 
-  defoverridable [implicit_nested_super: 0, super_with_implicit_args: 2,
+  defoverridable [implicit_nested_super: 0,
     super_with_explicit_args: 2, many_clauses: 1]
 
   def without_super do
@@ -82,14 +78,6 @@ defmodule Kernel.Overridable do
     super x, y * 2
   end
 
-  def super_with_implicit_args(x, y) do
-    if true do
-      x + y + super
-    else
-      raise :NEVER
-    end
-  end
-
   def many_clauses(2) do
     17
   end
@@ -98,8 +86,8 @@ defmodule Kernel.Overridable do
     super(0) + super(1)
   end
 
-  def many_clauses(_) do
-    super
+  def many_clauses(x) do
+    super(x)
   end
 end
 
@@ -131,10 +119,6 @@ defmodule Kernel.OverridableTest do
     assert Overridable.super_with_explicit_args(1, 2) == 5
   end
 
-  test "calling super with implicit args" do
-    assert Overridable.super_with_implicit_args(1, 2) == 6
-  end
-
   test "function without overridable returns false for super?" do
     assert Overridable.no_overridable == { :no_overridable, false }
   end
@@ -160,4 +144,4 @@ defmodule Kernel.OverridableTest do
           "Overridable functions available are: bar/0")
     end
   end
-end
+end

lib/ex_unit/lib/ex_unit/cli_formatter.ex

@@ -49,8 +49,8 @@ defmodule ExUnit.CLIFormatter do
     { :stop, :normal, length(config.test_failures), config }
   end
 
-  def handle_call(_, _, _) do
-    super
+  def handle_call(reqest, from, config) do
+    super(reqest, from, config)
   end
 
   def handle_cast({ :test_finished, test = ExUnit.Test[invalid: true] }, config) do
@@ -78,8 +78,8 @@ defmodule ExUnit.CLIFormatter do
     end
   end
 
-  def handle_cast(_, _) do
-    super
+  def handle_cast(request, config) do
+    super(request, config)
   end
 
   defp print_suite(counter, [], [], run_us, load_us) do