diff options
author | Björn Gustavsson <[email protected]> | 2012-08-02 11:26:48 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2012-08-17 11:12:15 +0200 |
commit | de7e01c958ff7c9e6da4034a53567a30a4ae5792 (patch) | |
tree | 67aa1004deb3d276f9a18b84aa4223101f81cd7a /lib/debugger | |
parent | c54a1c434fa263018bb3c9bb8416d4039ed807ab (diff) | |
download | otp-de7e01c958ff7c9e6da4034a53567a30a4ae5792.tar.gz otp-de7e01c958ff7c9e6da4034a53567a30a4ae5792.tar.bz2 otp-de7e01c958ff7c9e6da4034a53567a30a4ae5792.zip |
Remove support for tuple funs
Tuple funs were deprecated in R15B (in commit a4029940e309518f5500).
Diffstat (limited to 'lib/debugger')
-rw-r--r-- | lib/debugger/test/erl_eval_SUITE.erl | 34 | ||||
-rw-r--r-- | lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl | 6 |
2 files changed, 12 insertions, 28 deletions
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}. |