Remove ?line macros

1 files changed, 157 insertions, 157 deletions

diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index 3ec420a3ac..9736f75fe8 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -54,28 +54,28 @@ end_per_group(_GroupName, Config) ->
 t_case(Config) when is_list(Config) ->
     %% We test boolean cases almost but not quite like cases
     %% generated by andalso/orelse.
-    ?line less = t_case_a(1, 2),
-    ?line not_less = t_case_a(2, 2),
-    ?line {'EXIT',{{case_clause,false},_}} = (catch t_case_b({x,y,z}, 2)),
-    ?line {'EXIT',{{case_clause,true},_}} = (catch t_case_b(a, a)),
-    ?line eq = t_case_c(a, a),
-    ?line ne = t_case_c(42, []),
-    ?line t = t_case_d(x, x, true),
-    ?line f = t_case_d(x, x, false),
-    ?line f = t_case_d(x, y, true),
-    ?line {'EXIT',{badarg,_}} = (catch t_case_d(x, y, blurf)),
-    ?line true = (catch t_case_e({a,b}, {a,b})),
-    ?line false = (catch t_case_e({a,b}, 42)),
-
-    ?line true = t_case_xy(42, 100, 700),
-    ?line true = t_case_xy(42, 100, whatever),
-    ?line false = t_case_xy(42, wrong, 700),
-    ?line false = t_case_xy(42, wrong, whatever),
-
-    ?line true = t_case_xy(0, whatever, 700),
-    ?line true = t_case_xy(0, 100, 700),
-    ?line false = t_case_xy(0, whatever, wrong),
-    ?line false = t_case_xy(0, 100, wrong),
+    less = t_case_a(1, 2),
+    not_less = t_case_a(2, 2),
+    {'EXIT',{{case_clause,false},_}} = (catch t_case_b({x,y,z}, 2)),
+    {'EXIT',{{case_clause,true},_}} = (catch t_case_b(a, a)),
+    eq = t_case_c(a, a),
+    ne = t_case_c(42, []),
+    t = t_case_d(x, x, true),
+    f = t_case_d(x, x, false),
+    f = t_case_d(x, y, true),
+    {'EXIT',{badarg,_}} = (catch t_case_d(x, y, blurf)),
+    true = (catch t_case_e({a,b}, {a,b})),
+    false = (catch t_case_e({a,b}, 42)),
+
+    true = t_case_xy(42, 100, 700),
+    true = t_case_xy(42, 100, whatever),
+    false = t_case_xy(42, wrong, 700),
+    false = t_case_xy(42, wrong, whatever),
+
+    true = t_case_xy(0, whatever, 700),
+    true = t_case_xy(0, 100, 700),
+    false = t_case_xy(0, whatever, wrong),
+    false = t_case_xy(0, 100, wrong),
 
     ok.
 
@@ -135,35 +135,35 @@ t_case_y(X, Y, Z) ->
           end).
 
 t_and_or(Config) when is_list(Config) ->
-    ?line true = true and true,
-    ?line false = true and false,
-    ?line false = false and true,
-    ?line false = false and false,
-
-    ?line true = id(true) and true,
-    ?line false = id(true) and false,
-    ?line false = id(false) and true,
-    ?line false = id(false) and false,
-
-    ?line true = true and id(true),
-    ?line false = true and id(false),
-    ?line false = false and id(true),
-    ?line false = false and id(false),
-
-    ?line true = true or true,
-    ?line true = true or false,
-    ?line true = false or true,
-    ?line false = false or false,
-
-    ?line true = id(true) or true,
-    ?line true = id(true) or false,
-    ?line true = id(false) or true,
-    ?line false = id(false) or false,
-
-    ?line true = true or id(true),
-    ?line true = true or id(false),
-    ?line true = false or id(true),
-    ?line false = false or id(false),
+    true = true and true,
+    false = true and false,
+    false = false and true,
+    false = false and false,
+
+    true = id(true) and true,
+    false = id(true) and false,
+    false = id(false) and true,
+    false = id(false) and false,
+
+    true = true and id(true),
+    false = true and id(false),
+    false = false and id(true),
+    false = false and id(false),
+
+    true = true or true,
+    true = true or false,
+    true = false or true,
+    false = false or false,
+
+    true = id(true) or true,
+    true = id(true) or false,
+    true = id(false) or true,
+    false = id(false) or false,
+
+    true = true or id(true),
+    true = true or id(false),
+    true = false or id(true),
+    false = false or id(false),
 
     True = id(true),
 
@@ -187,28 +187,28 @@ t_andalso(Config) when is_list(Config) ->
     Ps = [{X,Y} || X <- Bs, Y <- Bs],
     lists:foreach(fun (P) -> t_andalso_1(P) end, Ps),
 
-    ?line true = true andalso true,
-    ?line false = true andalso false,
-    ?line false = false andalso true,
-    ?line false = false andalso false,
+    true = true andalso true,
+    false = true andalso false,
+    false = false andalso true,
+    false = false andalso false,
 
-    ?line true = ?GUARD(true andalso true),
-    ?line false = ?GUARD(true andalso false),
-    ?line false = ?GUARD(false andalso true),
-    ?line false = ?GUARD(false andalso false),
+    true = ?GUARD(true andalso true),
+    false = ?GUARD(true andalso false),
+    false = ?GUARD(false andalso true),
+    false = ?GUARD(false andalso false),
 
-    ?line false = false andalso glurf,
-    ?line false = false andalso exit(exit_now),
+    false = false andalso glurf,
+    false = false andalso exit(exit_now),
 
-    ?line true = not id(false) andalso not id(false),
-    ?line false = not id(false) andalso not id(true),
-    ?line false = not id(true) andalso not id(false),
-    ?line false = not id(true) andalso not id(true),
+    true = not id(false) andalso not id(false),
+    false = not id(false) andalso not id(true),
+    false = not id(true) andalso not id(false),
+    false = not id(true) andalso not id(true),
 
-    ?line {'EXIT',{badarg,_}} = (catch not id(glurf) andalso id(true)),
-    ?line {'EXIT',{badarg,_}} = (catch not id(false) andalso not id(glurf)),
-    ?line false = id(false) andalso not id(glurf),
-    ?line false = false andalso not id(glurf),
+    {'EXIT',{badarg,_}} = (catch not id(glurf) andalso id(true)),
+    {'EXIT',{badarg,_}} = (catch not id(false) andalso not id(glurf)),
+    false = id(false) andalso not id(glurf),
+    false = false andalso not id(glurf),
 
     true = begin (X1 = true) andalso X1, X1 end,
     false = false = begin (X2 = false) andalso X2, X2 end,
@@ -220,28 +220,28 @@ t_orelse(Config) when is_list(Config) ->
     Ps = [{X,Y} || X <- Bs, Y <- Bs],
     lists:foreach(fun (P) -> t_orelse_1(P) end, Ps),
     
-    ?line true = true orelse true,
-    ?line true = true orelse false,
-    ?line true = false orelse true,
-    ?line false = false orelse false,
+    true = true orelse true,
+    true = true orelse false,
+    true = false orelse true,
+    false = false orelse false,
 
-    ?line true = ?GUARD(true orelse true),
-    ?line true = ?GUARD(true orelse false),
-    ?line true = ?GUARD(false orelse true),
-    ?line false = ?GUARD(false orelse false),
+    true = ?GUARD(true orelse true),
+    true = ?GUARD(true orelse false),
+    true = ?GUARD(false orelse true),
+    false = ?GUARD(false orelse false),
 
-    ?line true = true orelse glurf,
-    ?line true = true orelse exit(exit_now),
+    true = true orelse glurf,
+    true = true orelse exit(exit_now),
 
-    ?line true = not id(false) orelse not id(false),
-    ?line true = not id(false) orelse not id(true),
-    ?line true = not id(true) orelse not id(false),
-    ?line false = not id(true) orelse not id(true),
+    true = not id(false) orelse not id(false),
+    true = not id(false) orelse not id(true),
+    true = not id(true) orelse not id(false),
+    false = not id(true) orelse not id(true),
 
-    ?line {'EXIT',{badarg,_}} = (catch not id(glurf) orelse id(true)),
-    ?line {'EXIT',{badarg,_}} = (catch not id(true) orelse not id(glurf)),
-    ?line true = id(true) orelse not id(glurf),
-    ?line true = true orelse not id(glurf),
+    {'EXIT',{badarg,_}} = (catch not id(glurf) orelse id(true)),
+    {'EXIT',{badarg,_}} = (catch not id(true) orelse not id(glurf)),
+    true = id(true) orelse not id(glurf),
+    true = true orelse not id(glurf),
 
     true = begin (X1 = true) orelse X1, X1 end,
     false = begin (X2 = false) orelse X2, X2 end,
@@ -267,16 +267,16 @@ t_orelse_1({X,Y}) ->
     V1 = id(X or Y).
 
 inside(Config) when is_list(Config) ->
-    ?line true = inside(-8, 1),
-    ?line false = inside(-53.5, -879798),
-    ?line false = inside(1.0, -879),
-    ?line false = inside(59, -879),
-    ?line false = inside(-11, 1.0),
-    ?line false = inside(100, 0.2),
-    ?line false = inside(100, 1.2),
-    ?line false = inside(-53.5, 4),
-    ?line false = inside(1.0, 5.3),
-    ?line false = inside(59, 879),
+    true = inside(-8, 1),
+    false = inside(-53.5, -879798),
+    false = inside(1.0, -879),
+    false = inside(59, -879),
+    false = inside(-11, 1.0),
+    false = inside(100, 0.2),
+    false = inside(100, 1.2),
+    false = inside(-53.5, 4),
+    false = inside(1.0, 5.3),
+    false = inside(59, 879),
     ok.
 
 inside(Xm, Ym) ->
@@ -311,15 +311,15 @@ inside_guard(Xm, Ym, X, Y, W, H) ->
     {false,Xm,Ym,X,Y,W,H}.
 
 overlap(Config) when is_list(Config) ->
-    ?line true = overlap(7.0, 2.0, 8.0, 0.5),
-    ?line true = overlap(7.0, 2.0, 8.0, 2.5),
-    ?line true = overlap(7.0, 2.0, 5.3, 2),
-    ?line true = overlap(7.0, 2.0, 0.0, 100.0),
-
-    ?line false = overlap(-1, 2, -35, 0.5),
-    ?line false = overlap(-1, 2, 777, 0.5),
-    ?line false = overlap(-1, 2, 2, 10),
-    ?line false = overlap(2, 10, 12, 55.3),
+    true = overlap(7.0, 2.0, 8.0, 0.5),
+    true = overlap(7.0, 2.0, 8.0, 2.5),
+    true = overlap(7.0, 2.0, 5.3, 2),
+    true = overlap(7.0, 2.0, 0.0, 100.0),
+
+    false = overlap(-1, 2, -35, 0.5),
+    false = overlap(-1, 2, 777, 0.5),
+    false = overlap(-1, 2, 2, 10),
+    false = overlap(2, 10, 12, 55.3),
     ok.
 
 overlap(Pos1, Len1, Pos2, Len2) ->
@@ -343,33 +343,33 @@ overlap(Pos1, Len1, Pos2, Len2) ->
 -define(COMB(A,B,C), (A andalso B orelse C)).
 
 combined(Config) when is_list(Config) ->
-    ?line false = comb(false, false, false),
-    ?line true = comb(false, false, true),
-    ?line false = comb(false, true, false),
-    ?line true = comb(false, true, true),
-
-    ?line false = comb(true, false, false),
-    ?line true = comb(true, true, false),
-    ?line true = comb(true, false, true),
-    ?line true = comb(true, true, true),
-
-    ?line false = comb(false, blurf, false),
-    ?line true = comb(false, blurf, true),
-    ?line true = comb(true, true, blurf),
-
-    ?line false = ?COMB(false, false, false),
-    ?line true = ?COMB(false, false, true),
-    ?line false = ?COMB(false, true, false),
-    ?line true = ?COMB(false, true, true),
-
-    ?line false = ?COMB(true, false, false),
-    ?line true = ?COMB(true, true, false),
-    ?line true = ?COMB(true, false, true),
-    ?line true = ?COMB(true, true, true),
-
-    ?line false = ?COMB(false, blurf, false),
-    ?line true = ?COMB(false, blurf, true),
-    ?line true = ?COMB(true, true, blurf),
+    false = comb(false, false, false),
+    true = comb(false, false, true),
+    false = comb(false, true, false),
+    true = comb(false, true, true),
+
+    false = comb(true, false, false),
+    true = comb(true, true, false),
+    true = comb(true, false, true),
+    true = comb(true, true, true),
+
+    false = comb(false, blurf, false),
+    true = comb(false, blurf, true),
+    true = comb(true, true, blurf),
+
+    false = ?COMB(false, false, false),
+    true = ?COMB(false, false, true),
+    false = ?COMB(false, true, false),
+    true = ?COMB(false, true, true),
+
+    false = ?COMB(true, false, false),
+    true = ?COMB(true, true, false),
+    true = ?COMB(true, false, true),
+    true = ?COMB(true, true, true),
+
+    false = ?COMB(false, blurf, false),
+    true = ?COMB(false, blurf, true),
+    true = ?COMB(true, true, blurf),
 
     false = simple_comb(false, false),
     false = simple_comb(false, true),
@@ -412,13 +412,13 @@ simple_comb(A, B) ->
 %% Test that a boolean expression in a case expression is properly
 %% optimized (in particular, that the error behaviour is correct).
 in_case(Config) when is_list(Config) ->
-    ?line edge_rings = in_case_1(1, 1, 1, 1, 1),
-    ?line not_loop = in_case_1(0.5, 1, 1, 1, 1),
-    ?line loop = in_case_1(0.5, 0.9, 1.1, 1, 4),
-    ?line {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, 0)),
-    ?line {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, nan)),
-    ?line {'EXIT',{badarg,_}} = (catch in_case_1(1, 1, 1, blurf, 1)),
-    ?line {'EXIT',{badarith,_}} = (catch in_case_1([nan], 1, 1, 1, 1)),
+    edge_rings = in_case_1(1, 1, 1, 1, 1),
+    not_loop = in_case_1(0.5, 1, 1, 1, 1),
+    loop = in_case_1(0.5, 0.9, 1.1, 1, 4),
+    {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, 0)),
+    {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, nan)),
+    {'EXIT',{badarg,_}} = (catch in_case_1(1, 1, 1, blurf, 1)),
+    {'EXIT',{badarith,_}} = (catch in_case_1([nan], 1, 1, 1, 1)),
     ok.
 
 in_case_1(LenUp, LenDw, LenN, Rotation, Count) ->
@@ -451,23 +451,23 @@ in_case_1_guard(LenUp, LenDw, LenN, Rotation, Count) ->
     end.
 
 before_and_inside_if(Config) when is_list(Config) ->
-    ?line no = before_and_inside_if([a], [b], delete),
-    ?line no = before_and_inside_if([a], [b], x),
-    ?line no = before_and_inside_if([a], [], delete),
-    ?line no = before_and_inside_if([a], [], x),
-    ?line no = before_and_inside_if([], [], delete),
-    ?line yes = before_and_inside_if([], [], x),
-    ?line yes = before_and_inside_if([], [b], delete),
-    ?line yes = before_and_inside_if([], [b], x),
-
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [b], blah),
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [b], xx),
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [], blah),
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [], xx),
-    ?line {no,no} = before_and_inside_if_2([], [b], blah),
-    ?line {no,no} = before_and_inside_if_2([], [b], xx),
-    ?line {ch1,no} = before_and_inside_if_2([], [], blah),
-    ?line {no,ch2} = before_and_inside_if_2([], [], xx),
+    no = before_and_inside_if([a], [b], delete),
+    no = before_and_inside_if([a], [b], x),
+    no = before_and_inside_if([a], [], delete),
+    no = before_and_inside_if([a], [], x),
+    no = before_and_inside_if([], [], delete),
+    yes = before_and_inside_if([], [], x),
+    yes = before_and_inside_if([], [b], delete),
+    yes = before_and_inside_if([], [b], x),
+
+    {ch1,ch2} = before_and_inside_if_2([a], [b], blah),
+    {ch1,ch2} = before_and_inside_if_2([a], [b], xx),
+    {ch1,ch2} = before_and_inside_if_2([a], [], blah),
+    {ch1,ch2} = before_and_inside_if_2([a], [], xx),
+    {no,no} = before_and_inside_if_2([], [b], blah),
+    {no,no} = before_and_inside_if_2([], [b], xx),
+    {ch1,no} = before_and_inside_if_2([], [], blah),
+    {no,ch2} = before_and_inside_if_2([], [], xx),
     ok.
 
 %% Thanks to Simon Cornish and Kostis Sagonas.