Merge branch 'bjorn/remove-tuple-funs/OTP-10170'

* bjorn/remove-tuple-funs/OTP-10170:
  Remove support for tuple funs

12 files changed, 43 insertions, 133 deletions

diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index 6cea783090..82a95b95c1 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -454,9 +454,6 @@ expr({call,Line,{remote,Lr,M,F},As0}, St0) ->
     M1 = expand_package(M, St0),
     {[M2,F1|As1],St1} = expr_list([M1,F|As0], St0),
     {{call,Line,{remote,Lr,M2,F1},As1},St1};
-expr({call,Line,{tuple,_,[{atom,_,_}=M,{atom,_,_}=F]},As}, St) ->
-    %% Rewrite {Mod,Function}(Args...) to Mod:Function(Args...).
-    expr({call,Line,{remote,Line,M,F},As}, St);
 expr({call,Line,F,As0}, St0) ->
     {[Fun1|As1],St1} = expr_list([F|As0], St0),
     {{call,Line,Fun1,As1},St1};
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl
index a92251e1af..c675f704b4 100644
--- a/lib/debugger/test/erl_eval_SUITE.erl
+++ b/lib/debugger/test/erl_eval_SUITE.erl
@@ -216,13 +216,13 @@ guard_4(doc) ->
 guard_4(suite) ->
     [];
 guard_4(Config) when is_list(Config) ->
-    ?line check(fun() -> if {erlang,'+'}(3,a) -> true ; true -> false end end,
-                "if {erlang,'+'}(3,a) -> true ; true -> false end.",
-                false),
-    ?line check(fun() -> if {erlang,is_integer}(3) -> true ; true -> false end
-                end,
-                "if {erlang,is_integer}(3) -> true ; true -> false end.",
-                true),
+    check(fun() -> if erlang:'+'(3,a) -> true ; true -> false end end,
+	  "if erlang:'+'(3,a) -> true ; true -> false end.",
+	  false),
+    check(fun() -> if erlang:is_integer(3) -> true ; true -> false end
+	  end,
+	  "if erlang:is_integer(3) -> true ; true -> false end.",
+	  true),
     ?line check(fun() -> [X || X <- [1,2,3], erlang:is_integer(X)] end,
                 "[X || X <- [1,2,3], erlang:is_integer(X)].",
                 [1,2,3]),
@@ -230,11 +230,11 @@ guard_4(Config) when is_list(Config) ->
                 end,
                 "if is_atom(is_integer(a)) -> true ; true -> false end.",
                 true),
-    ?line check(fun() -> if {erlang,is_atom}({erlang,is_integer}(a)) -> true;
-                            true -> false end end,
-                "if {erlang,is_atom}({erlang,is_integer}(a)) -> true; "
-                "true -> false end.",
-                true),
+    check(fun() -> if erlang:is_atom(erlang:is_integer(a)) -> true;
+		      true -> false end end,
+	  "if erlang:is_atom(erlang:is_integer(a)) -> true; "
+	  "true -> false end.",
+	  true),
     ?line check(fun() -> if is_atom(3+a) -> true ; true -> false end end,
                 "if is_atom(3+a) -> true ; true -> false end.",
                 false),
@@ -1060,11 +1060,6 @@ do_funs(LFH, EFH) ->
                 concat(["begin F1 = fun(F,N) -> apply(", M,
                         ",count_down,[F, N]) end, F1(F1,1000) end."]),
 		0, ['F1'], LFH, EFH),
-    ?line check(fun() -> F1 = fun(F,N) -> {?MODULE,count_down}(F,N)
-                              end, F1(F1, 1000) end,
-                concat(["begin F1 = fun(F,N) -> {", M,
-                        ",count_down}(F, N) end, F1(F1,1000) end."]),
-		0, ['F1'], LFH, EFH),
     ?line check(fun() -> F = fun(F,N) when N > 0 -> apply(F,[F,N-1]);
                                 (_F,0) -> ok end,
                          F(F, 1000)
@@ -1096,11 +1091,6 @@ do_funs(LFH, EFH) ->
                          true = {2,3} == F(2) end,
                 "begin F = fun(X) -> A = 1+X, {X,A} end,
                        true = {2,3} == F(2) end.", true, ['F'], LFH, EFH),
-    ?line check(fun() -> F = fun(X) -> {erlang,'+'}(X,2) end,
-                         true = 3 == F(1) end,
-                "begin F = fun(X) -> {erlang,'+'}(X,2) end,"
-                "      true = 3 == F(1) end.", true, ['F'],
-               LFH, EFH),
     ?line check(fun() -> F = fun(X) -> byte_size(X) end,
                          ?MODULE:do_apply(F,<<"hej">>) end,
                 concat(["begin F = fun(X) -> size(X) end,",
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
index c9ac6931e2..0d7883f067 100644
--- a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -76,12 +76,6 @@ apply_test(Fun) ->
     [a,b,d] = ?MODULE:Func(same([a,b,c,d]), same([c])),
     [d,e] = apply(Mod, Func, [same([d,e,f]), same([f])]),
     [3] = apply(?MODULE, Func, [same([3,4]),same([4])]),
-
-    %% This is obsolete, but it should work anyway.
-    HomeMadeFun = {?MODULE,my_subtract},
-    [a] = HomeMadeFun(same([a,x,c]), same([x,c])),
-    [x] = apply(HomeMadeFun, [[x,y],[y,z]]),
-
     ok.
 
 number(X) -> {number,X}.
diff --git a/lib/stdlib/examples/erl_id_trans.erl b/lib/stdlib/examples/erl_id_trans.erl
index 72e41d6473..34c6ecc394 100644
--- a/lib/stdlib/examples/erl_id_trans.erl
+++ b/lib/stdlib/examples/erl_id_trans.erl
@@ -283,15 +283,6 @@ gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As0}) ->
 	true -> As1 = gexpr_list(As0),
 		{call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As1}
     end;
-% Unfortunately, writing calls as {M,F}(...) is also allowed.
-gexpr({call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As0}) ->
-    case erl_internal:guard_bif(F, length(As0)) or
-	 erl_internal:arith_op(F, length(As0)) or 
-	 erl_internal:comp_op(F, length(As0)) or
-	 erl_internal:bool_op(F, length(As0)) of
-	true -> As1 = gexpr_list(As0),
-		{call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As1}
-    end;
 gexpr({bin,Line,Fs}) ->
     Fs2 = pattern_grp(Fs),
     {bin,Line,Fs2};
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 648ff349a4..97dacac0a4 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -1916,9 +1916,6 @@ gexpr({call,Line,{remote,_Lr,{atom,_Lm,erlang},{atom,_Lf,F}},As}, Vt, St0) ->
         true -> {Asvt,St1};
         false -> {Asvt,add_error(Line, illegal_guard_expr, St1)}
     end;
-gexpr({call,L,{tuple,Lt,[{atom,Lm,erlang},{atom,Lf,F}]},As}, Vt, St0) ->
-    St = add_warning(L, deprecated_tuple_fun, St0),
-    gexpr({call,L,{remote,Lt,{atom,Lm,erlang},{atom,Lf,F}},As}, Vt, St);
 gexpr({op,Line,Op,A}, Vt, St0) ->
     {Avt,St1} = gexpr(A, Vt, St0),
     case is_gexpr_op(Op, 1) of
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index eb527471d5..961c060019 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -1178,8 +1178,7 @@ rumerge(T1, [H2 | T2]) ->
 %% takewhile(Predicate, List)
 %% dropwhile(Predicate, List)
 %% splitwith(Predicate, List)
-%%  for list programming. Function here is a 'fun'. For backward compatibility,
-%%  {Module,Function} is still accepted.
+%%  for list programming. Function here is a 'fun'.
 %% 
 %%  The name zf is a joke!
 %%
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index b0c7d562d5..47792d1052 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -216,13 +216,13 @@ guard_4(doc) ->
 guard_4(suite) ->
     [];
 guard_4(Config) when is_list(Config) ->
-    ?line check(fun() -> if {erlang,'+'}(3,a) -> true ; true -> false end end,
-                "if {erlang,'+'}(3,a) -> true ; true -> false end.",
-                false),
-    ?line check(fun() -> if {erlang,is_integer}(3) -> true ; true -> false end
-                end,
-                "if {erlang,is_integer}(3) -> true ; true -> false end.",
-                true),
+    check(fun() -> if erlang:'+'(3,a) -> true ; true -> false end end,
+	  "if erlang:'+'(3,a) -> true ; true -> false end.",
+	  false),
+    check(fun() -> if erlang:is_integer(3) -> true ; true -> false end
+	  end,
+	  "if erlang:is_integer(3) -> true ; true -> false end.",
+	  true),
     ?line check(fun() -> [X || X <- [1,2,3], erlang:is_integer(X)] end,
                 "[X || X <- [1,2,3], erlang:is_integer(X)].",
                 [1,2,3]),
@@ -230,11 +230,11 @@ guard_4(Config) when is_list(Config) ->
                 end,
                 "if is_atom(is_integer(a)) -> true ; true -> false end.",
                 true),
-    ?line check(fun() -> if {erlang,is_atom}({erlang,is_integer}(a)) -> true;
-                            true -> false end end,
-                "if {erlang,is_atom}({erlang,is_integer}(a)) -> true; "
-                "true -> false end.",
-                true),
+    check(fun() -> if erlang:is_atom(erlang:is_integer(a)) -> true;
+		      true -> false end end,
+	  "if erlang:is_atom(erlang:is_integer(a)) -> true; "
+	  "true -> false end.",
+	  true),
     ?line check(fun() -> if is_atom(3+a) -> true ; true -> false end end,
                 "if is_atom(3+a) -> true ; true -> false end.",
                 false),
@@ -1077,11 +1077,6 @@ do_funs(LFH, EFH) ->
                 concat(["begin F1 = fun(F,N) -> apply(", M, 
                         ",count_down,[F, N]) end, F1(F1,1000) end."]),
 		0, ['F1'], LFH, EFH),
-    ?line check(fun() -> F1 = fun(F,N) -> {?MODULE,count_down}(F,N)
-                              end, F1(F1, 1000) end,
-                concat(["begin F1 = fun(F,N) -> {", M, 
-                        ",count_down}(F, N) end, F1(F1,1000) end."]),
-		0, ['F1'], LFH, EFH),
     ?line check(fun() -> F = fun(F,N) when N > 0 -> apply(F,[F,N-1]); 
                                 (_F,0) -> ok end, 
                          F(F, 1000)
@@ -1113,11 +1108,11 @@ do_funs(LFH, EFH) ->
                          true = {2,3} == F(2) end,
                 "begin F = fun(X) -> A = 1+X, {X,A} end, 
                        true = {2,3} == F(2) end.", true, ['F'], LFH, EFH),
-    ?line check(fun() -> F = fun(X) -> {erlang,'+'}(X,2) end, 
-                         true = 3 == F(1) end,
-                "begin F = fun(X) -> {erlang,'+'}(X,2) end," 
-                "      true = 3 == F(1) end.", true, ['F'],
-               LFH, EFH),
+    check(fun() -> F = fun(X) -> erlang:'+'(X,2) end,
+		   true = 3 == F(1) end,
+	  "begin F = fun(X) -> erlang:'+'(X,2) end,"
+	  "      true = 3 == F(1) end.", true, ['F'],
+	  LFH, EFH),
     ?line check(fun() -> F = fun(X) -> byte_size(X) end,
                          ?MODULE:do_apply(F,<<"hej">>) end, 
                 concat(["begin F = fun(X) -> size(X) end,",
diff --git a/lib/stdlib/test/erl_expand_records_SUITE.erl b/lib/stdlib/test/erl_expand_records_SUITE.erl
index 01cdb92d7b..e248934e10 100644
--- a/lib/stdlib/test/erl_expand_records_SUITE.erl
+++ b/lib/stdlib/test/erl_expand_records_SUITE.erl
@@ -157,7 +157,7 @@ expr(Config) when is_list(Config) ->
              One = 1 = fun f/1(1),
              2 = fun(X) -> X end(One + One),
              3 = fun exprec_test:f/1(3),
-             4 = {exprec_test,f}(4),
+             4 = exprec_test:f(4),
              5 = ''.f(5),
              L = receive 
                      {a,message,L0} ->
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 9f9d97b619..944d8ebd6a 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1307,44 +1307,30 @@ guard(Config) when is_list(Config) ->
                    foo;
                t3(A) when erlang:is_record(A, {apa}) ->
                    foo;
-               t3(A) when {erlang,is_record}(A, {apa}) ->
-                   foo;
                t3(A) when is_record(A, {apa}, 1) ->
                    foo;
                t3(A) when erlang:is_record(A, {apa}, 1) ->
                    foo;
-               t3(A) when {erlang,is_record}(A, {apa}, 1) ->
-                   foo;
                t3(A) when is_record(A, apa, []) ->
                    foo;
                t3(A) when erlang:is_record(A, apa, []) ->
                    foo;
-               t3(A) when {erlang,is_record}(A, apa, []) ->
-                   foo;
                t3(A) when record(A, apa) ->
                    foo;
                t3(A) when is_record(A, apa) ->
                    foo;
                t3(A) when erlang:is_record(A, apa) ->
-                   foo;
-               t3(A) when {erlang,is_record}(A, apa) ->
                    foo.
             ">>,
             [warn_unused_vars, nowarn_obsolete_guard],
-            {error,[{2,erl_lint,illegal_guard_expr},
-		    {4,erl_lint,illegal_guard_expr},
-		    {6,erl_lint,illegal_guard_expr},
-		    {8,erl_lint,illegal_guard_expr},
-		    {10,erl_lint,illegal_guard_expr},
-		    {12,erl_lint,illegal_guard_expr},
-		    {14,erl_lint,illegal_guard_expr},
-		    {16,erl_lint,illegal_guard_expr},
-		    {18,erl_lint,illegal_guard_expr},
-		    {20,erl_lint,illegal_guard_expr}],
-	     [{8,erl_lint,deprecated_tuple_fun},
-	      {14,erl_lint,deprecated_tuple_fun},
-	      {20,erl_lint,deprecated_tuple_fun},
-	      {28,erl_lint,deprecated_tuple_fun}]}},
+            {errors,[{2,erl_lint,illegal_guard_expr},
+		     {4,erl_lint,illegal_guard_expr},
+		     {6,erl_lint,illegal_guard_expr},
+		     {8,erl_lint,illegal_guard_expr},
+		     {10,erl_lint,illegal_guard_expr},
+		     {12,erl_lint,illegal_guard_expr},
+		     {14,erl_lint,illegal_guard_expr}],
+	     []}},
            {guard6,
             <<"-record(apa,{a=a,b=foo:bar()}).
               apa() ->
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index e1972a100e..233b0d0a78 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -26,7 +26,7 @@
 	 id_transform/1]).
 
 -export([check/2,check2/1,g/0,f/1,t/1,t1/1,t2/1,t3/1,t4/1,
-	 t5/1,t6/1,apa/1,new_fun/0]).
+	 t5/1,apa/1,new_fun/0]).
 
 						% Serves as test...
 -hej(hopp).
@@ -388,8 +388,6 @@ t3(A) when is_tuple(A) or is_tuple(A) ->
    is_tuple; 
 t3(A) when record(A, apa) ->
    foo;
-t3(A) when {erlang,is_record}(A, apa) ->
-   foo;
 t3(A) when erlang:is_record(A, apa) ->
    foo;
 t3(A) when is_record(A, apa) ->
@@ -397,13 +395,10 @@ t3(A) when is_record(A, apa) ->
 t3(A) when record({apa}, apa) ->
    {A,foo}.
 
-t4(_) when {erlang,is_record}({apa}, apa) ->
-   foo.
-
-t5(A) when erlang:is_record({apa}, apa) ->
+t4(A) when erlang:is_record({apa}, apa) ->
    {A,foo}.
 
-t6(A) when is_record({apa}, apa) ->
+t5(A) when is_record({apa}, apa) ->
    {A,foo}.
 
 -record(apa2,{a=a,b=foo:bar()}).
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 192268f90e..e3090e4a47 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -2969,15 +2969,6 @@ lookup1(Config) when is_list(Config) ->
                 [3] = lookup_keys(Q)
         end, [{1,a},{3,3}])">>,
 
-      {cres,
-       <<"A = 3,
-          etsc(fun(E) ->
-                Q = qlc:q([X || X <- ets:table(E), A =:= {erlang,element}(1, X)]),
-                [{3,3}] = qlc:e(Q),
-                [3] = lookup_keys(Q)
-        end, [{1,a},{3,3}])">>,
-       {warnings,[{3,erl_lint,deprecated_tuple_fun}]}},
-
        <<"etsc(fun(E) ->
                 A = 3,
                 Q = qlc:q([X || X <- ets:table(E), 
@@ -3442,14 +3433,6 @@ lookup2(Config) when is_list(Config) ->
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
        {cres,
-       <<"etsc(fun(E) ->
-                Q = qlc:q([element(1, X) || X <- ets:table(E), 
-                                            {erlang,is_record}(X, r, 2)]),
-                 [r] = qlc:e(Q),
-                 [r] = lookup_keys(Q)
-         end, [{keypos,1}], [#r{}])">>,
-        {warnings,[{4,erl_lint,deprecated_tuple_fun}]}},
-       {cres,
         <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
                                             record(X, r)]),
@@ -3468,15 +3451,7 @@ lookup2(Config) when is_list(Config) ->
                                             is_record(X, r)]),
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
-         end, [{keypos,1}], [#r{}])">>,
-       {cres,
-       <<"etsc(fun(E) ->
-                Q = qlc:q([element(1, X) || X <- ets:table(E), 
-                                            {erlang,is_record}(X, r)]),
-                 [r] = qlc:e(Q),
-                 [r] = lookup_keys(Q)
-         end, [{keypos,1}], [#r{}])">>,
-        {warnings,[{4,erl_lint,deprecated_tuple_fun}]}}
+         end, [{keypos,1}], [#r{}])">>
 
        ],
     ?line run(Config, <<"-record(r, {a}).\n">>, TsR),
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 4b83e42ee0..d49416c150 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -817,9 +817,6 @@ otp_5916(Config) when is_list(Config) ->
         true = if is_record(#r1{},r1,3) -> true; true ->  false end,
         false = if is_record(#r2{},r1,3) -> true; true ->  false end,
 
-        true = if {erlang,is_record}(#r1{},r1,3) -> true; true ->  false end,
-        false = if {erlang,is_record}(#r2{},r1,3) -> true; true ->  false end,
-
         ok.">>,
     [ok] = scan(C),
     ok.
@@ -2282,12 +2279,6 @@ otp_5990(doc) ->
 otp_5990(suite) -> [];
 otp_5990(Config) when is_list(Config) ->
     ?line [true] = 
-        scan(<<"rd(foo,{bar}), {erlang,is_record}(#foo{}, foo).">>),
-    ?line [3] =
-        scan(<<"rd(foo,{bar}), A = #foo{}, "
-               "{if {erlang,is_record}(A, foo) -> erlang; "
-               "true -> not_a_module end, length}([1,2,3]).">>),
-    ?line [true] = 
         scan(<<"rd('OrdSet', {orddata = {},ordtype = type}), "
                "S = #'OrdSet'{ordtype = {}}, "
                "if tuple(S#'OrdSet'.ordtype) -> true; true -> false end.">>),