Ensure private functions are not exported, closes #2587

Author: José Valim

lib/elixir/src/elixir_def.erl

@@ -234,7 +234,7 @@ unwrap_definitions(File, Module) ->
 
   {All, Private} = unwrap_definition(ets:tab2list(Table), File, Module, CTable, [], []),
   Unreachable = elixir_locals:warn_unused_local(File, Module, Private),
-  split_definition(All, Unreachable, [], [], [], [], {[], []}).
+  split_definition(All, Unreachable, [], [], [], [], [], {[], []}).
 
 unwrap_definition([Fun|T], File, Module, CTable, All, Private) ->
   {Tuple, Kind, Line, _, Check, Location, {Defaults, _, _}} = Fun,
@@ -263,31 +263,35 @@ unwrap_definition([], _File, _Module, _CTable, All, Private) ->
   {All, Private}.
 
 split_definition([{Tuple, def, Line, Location, Body}|T], Unreachable,
-                 Def, Defp, Defmacro, Defmacrop, Functions) ->
+                 Def, Defp, Defmacro, Defmacrop, Exports, Functions) ->
   split_definition(T, Unreachable, [Tuple|Def], Defp, Defmacro, Defmacrop,
+                   [export(def, Tuple)|Exports],
                    add_definition(Line, Location, Body, Functions));
 
 split_definition([{Tuple, defp, Line, Location, Body}|T], Unreachable,
-                 Def, Defp, Defmacro, Defmacrop, Functions) ->
+                 Def, Defp, Defmacro, Defmacrop, Exports, Functions) ->
   case lists:member(Tuple, Unreachable) of
     false ->
       split_definition(T, Unreachable, Def, [Tuple|Defp], Defmacro, Defmacrop,
-                       add_definition(Line, Location, Body, Functions));
+                       Exports, add_definition(Line, Location, Body, Functions));
     true ->
-      split_definition(T, Unreachable, Def, [Tuple|Defp], Defmacro, Defmacrop, Functions)
+      split_definition(T, Unreachable, Def, [Tuple|Defp], Defmacro, Defmacrop,
+                       Exports, Functions)
   end;
 
 split_definition([{Tuple, defmacro, Line, Location, Body}|T], Unreachable,
-                 Def, Defp, Defmacro, Defmacrop, Functions) ->
+                 Def, Defp, Defmacro, Defmacrop, Exports, Functions) ->
   split_definition(T, Unreachable, Def, Defp, [Tuple|Defmacro], Defmacrop,
+                   [export(defmacro, Tuple)|Exports],
                    add_definition(Line, Location, Body, Functions));
 
 split_definition([{Tuple, defmacrop, _Line, _Location, _Body}|T], Unreachable,
-                 Def, Defp, Defmacro, Defmacrop, Functions) ->
-  split_definition(T, Unreachable, Def, Defp, Defmacro, [Tuple|Defmacrop], Functions);
+                 Def, Defp, Defmacro, Defmacrop, Exports, Functions) ->
+  split_definition(T, Unreachable, Def, Defp, Defmacro, [Tuple|Defmacrop],
+                   Exports, Functions);
 
-split_definition([], _Unreachable, Def, Defp, Defmacro, Defmacrop, {Head, Tail}) ->
-  {Def, Defp, Defmacro, Defmacrop, Head ++ Tail}.
+split_definition([], _Unreachable, Def, Defp, Defmacro, Defmacrop, Exports, {Head, Tail}) ->
+  {Def, Defp, Defmacro, Defmacrop, Exports, Head ++ Tail}.
 
 %% Helpers
 

lib/elixir/src/elixir_module.erl

@@ -60,10 +60,11 @@ do_compile(Line, Module, Block, Vars, E) ->
         [elixir_locals:record_local(Tuple, Module) || Tuple <- OnLoad]
     end,
 
-    {Def, Defp, Defmacro, Defmacrop, Functions} =
+    {Def, Defp, Defmacro, Defmacrop, Exports, Functions} =
       elixir_def:unwrap_definitions(File, Module),
 
-    {All, Forms0} = functions_form(Line, File, Module, Def, Defp, Defmacro, Defmacrop, Functions),
+    {All, Forms0} = functions_form(Line, File, Module, Def, Defp,
+                                   Defmacro, Defmacrop, Exports, Functions),
     Forms1        = specs_form(Module, Defmacro, Defmacrop, Forms0),
     Forms2        = types_form(Line, File, Module, Forms1),
     Forms3        = attributes_form(Line, File, Module, Forms2),
@@ -149,15 +150,13 @@ eval_callbacks(Line, Module, Name, Args, E) ->
 
 %% Return the form with exports and function declarations.
 
-functions_form(Line, File, Module, Def, Defp, Defmacro, Defmacrop, Body) ->
-  All = Def ++ Defp ++ Defmacro ++ Defmacrop,
+functions_form(Line, File, Module, Def, Defp, Defmacro, Defmacrop, Exports, Body) ->
+  All = Def ++ Defmacro ++ Defp ++ Defmacrop,
   {Spec, Info} = add_info_function(Line, File, Module, All, Def, Defmacro),
 
-  NewBody = [Spec, Info|Body],
-  Export  = [{Name, Arity} || {function, _, Name, Arity, _} <- NewBody],
-
   {[{'__info__',1}|All],
-   [{attribute, Line, export, lists:sort(Export)} | NewBody]}.
+   [{attribute, Line, export, lists:sort([{'__info__',1}|Exports])},
+    Spec, Info | Body]}.
 
 %% Add attributes handling to the form
 

lib/elixir/test/elixir/kernel_test.exs

@@ -113,6 +113,14 @@ defmodule KernelTest do
     assert not ({:__info__, 1} in Kernel.__info__(:functions))
   end
 
+  def exported?,      do: not_exported?
+  defp not_exported?, do: true
+
+  test "function_exported?/3" do
+    assert function_exported?(__MODULE__, :exported?, 0)
+    refute function_exported?(__MODULE__, :not_exported?, 0)
+  end
+
   test "macro_exported?/3" do
     assert macro_exported?(Kernel, :in, 2) == true
     assert macro_exported?(Kernel, :def, 1) == true