Fix typespec to AST conversion for functions with variable arity (...)

Author: yrashk

lib/elixir/lib/kernel/typespec.ex

@@ -449,8 +449,12 @@ defmodule Kernel.Typespec do
     { :"->", line, [{args, typespec_to_ast(result)}] }
   end
 
+  defp typespec_to_ast({ :type, line, :fun, [args, result] }) do
+    { :"->", line, [{[typespec_to_ast(args)], typespec_to_ast(result)}] }
+  end
+
   defp typespec_to_ast({ :type, line, :fun, [] }) do
-    typespec_to_ast({ :type, line, :fun, [{:type, line, :product, [:'...']}, :any] })
+    typespec_to_ast({ :type, line, :fun, [{:type, line, :any}, {:type,line,:any, []} ] })
   end
 
   defp typespec_to_ast({ :type, line, name, args }) do
@@ -483,6 +487,10 @@ defmodule Kernel.Typespec do
     typespec_to_ast({ :ann_type, line, [{ :var, line1, name }, type] })
   end
 
+  defp typespec_to_ast({:type, _, :any}) do
+    quote do: ...
+  end
+
   defp typespec_to_ast({ t, _line, atom }) when is_atom(t) do
     atom
   end

lib/elixir/test/elixir/typespec_test.exs

@@ -297,6 +297,7 @@ defmodule Typespec.Test.Type do
       (quote do: @type tuple_type() :: {integer()}),
       (quote do: @type ftype() :: (() -> any()) | (() -> integer()) | ((integer() -> integer()))),
       (quote do: @type cl() :: char_list()),
+      (quote do: @type vaf() :: (... -> any())),
     ]
 
     types = test_module do