Eliminate ?line macros

1 files changed, 168 insertions, 169 deletions

diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index d94f3adf42..d5520b84fa 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -74,22 +74,22 @@ end_per_group(_GroupName, Config) ->
 
 test_ei_encode_long(suite) -> [];
 test_ei_encode_long(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_long),
+    P = runner:start(?test_ei_encode_long),
 
-    ?line {<<97,0>>                        ,0}   = get_buf_and_term(P),
-    ?line {<<97,255>>                      ,255} = get_buf_and_term(P),
-    ?line {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
-    ?line {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
+    {<<97,0>>                        ,0}   = get_buf_and_term(P),
+    {<<97,255>>                      ,255} = get_buf_and_term(P),
+    {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
+    {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
 
-    ?line {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
-    ?line {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
-    ?line {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
+    {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
+    {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
+    {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
 
-    ?line {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
-    ?line {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
+    {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -97,20 +97,20 @@ test_ei_encode_long(Config) when is_list(Config) ->
 
 test_ei_encode_ulong(suite) -> [];
 test_ei_encode_ulong(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_ulong),
+    P = runner:start(?test_ei_encode_ulong),
 
-    ?line {<<97,0>>                          ,0}   = get_buf_and_term(P),
-    ?line {<<97,255>>                        ,255} = get_buf_and_term(P),
-    ?line {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
+    {<<97,0>>                          ,0}   = get_buf_and_term(P),
+    {<<97,255>>                        ,255} = get_buf_and_term(P),
+    {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
 
-    ?line {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,8>>                     ,16#08000000} = get_buf_and_term(P),
+    {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,8>>                     ,16#08000000} = get_buf_and_term(P),
 
-    ?line {<<110,4,0, 255,255,255,127>>             ,16#7fffffff} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,128>>                   ,16#80000000} = get_buf_and_term(P),
-    ?line {<<110,4,0, 255,255,255,255>>             ,16#ffffffff} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,127>>             ,16#7fffffff} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,128>>                   ,16#80000000} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,255>>             ,16#ffffffff} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -119,30 +119,30 @@ test_ei_encode_ulong(Config) when is_list(Config) ->
 test_ei_encode_longlong(suite) -> [];
 test_ei_encode_longlong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_encode_longlong),
-
-	    ?line {<<97,0>>                        ,0}   = get_buf_and_term(P),
-	    ?line {<<97,255>>                      ,255} = get_buf_and_term(P),
-	    ?line {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
-	    ?line {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
-	    
-	    ?line {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
-	    ?line {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
-	    ?line {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
-
-	    ?line {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
-	    ?line {<<110,6,0, 255,255,255,255,255,127>>     , 16#7fffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,6,1, 0,0,0,0,0,128>>               ,-16#800000000000} = get_buf_and_term(P),
-	    ?line {<<110,8,0, 255,255,255,255,255,255,255,127>>,16#7fffffffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,8,1, 0,0,0,0,0,0,0,128>>           ,-16#8000000000000000} = get_buf_and_term(P),
-
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_encode_longlong),
+
+            {<<97,0>>                        ,0}   = get_buf_and_term(P),
+            {<<97,255>>                      ,255} = get_buf_and_term(P),
+            {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
+            {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
+
+            {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
+            {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
+            {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
+
+            {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
+            {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
+            {<<110,6,0, 255,255,255,255,255,127>>     , 16#7fffffffffff} = get_buf_and_term(P),
+            {<<110,6,1, 0,0,0,0,0,128>>               ,-16#800000000000} = get_buf_and_term(P),
+            {<<110,8,0, 255,255,255,255,255,255,255,127>>,16#7fffffffffffffff} = get_buf_and_term(P),
+            {<<110,8,1, 0,0,0,0,0,0,0,128>>           ,-16#8000000000000000} = get_buf_and_term(P),
+
+            runner:recv_eot(P),
+            ok
     end.
 
 
@@ -151,26 +151,26 @@ test_ei_encode_longlong(Config) when is_list(Config) ->
 test_ei_encode_ulonglong(suite) -> [];
 test_ei_encode_ulonglong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_encode_ulonglong),
-
-	    ?line {<<97,0>>                          ,0} = get_buf_and_term(P),
-	    ?line {<<97,255>>                        ,255} = get_buf_and_term(P),
-	    ?line {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
-
-	    ?line {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,8>>              ,16#08000000} = get_buf_and_term(P),
-
-	    ?line {<<110,4,0, 255,255,255,127>>      ,16#7fffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,128>>            ,16#80000000} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 255,255,255,255>>      ,16#ffffffff} = get_buf_and_term(P),
-	    ?line {<<110,6,0, 255,255,255,255,255,255>>,16#ffffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,8,0, 255,255,255,255,255,255,255,255>>,16#ffffffffffffffff} = get_buf_and_term(P),
-
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_encode_ulonglong),
+
+            {<<97,0>>                          ,0} = get_buf_and_term(P),
+            {<<97,255>>                        ,255} = get_buf_and_term(P),
+            {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
+
+            {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,8>>              ,16#08000000} = get_buf_and_term(P),
+
+            {<<110,4,0, 255,255,255,127>>      ,16#7fffffff} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,128>>            ,16#80000000} = get_buf_and_term(P),
+            {<<110,4,0, 255,255,255,255>>      ,16#ffffffff} = get_buf_and_term(P),
+            {<<110,6,0, 255,255,255,255,255,255>>,16#ffffffffffff} = get_buf_and_term(P),
+            {<<110,8,0, 255,255,255,255,255,255,255,255>>,16#ffffffffffffffff} = get_buf_and_term(P),
+
+            runner:recv_eot(P),
+            ok
     end.
 
 
@@ -181,13 +181,13 @@ test_ei_encode_ulonglong(Config) when is_list(Config) ->
 
 test_ei_encode_char(suite) -> [];
 test_ei_encode_char(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_char),
+    P = runner:start(?test_ei_encode_char),
 
-    ?line {<<97,  0>>,0} = get_buf_and_term(P),
-    ?line {<<97,127>>,16#7f} = get_buf_and_term(P),
-    ?line {<<97,255>>,16#ff} = get_buf_and_term(P),
+    {<<97,  0>>,0} = get_buf_and_term(P),
+    {<<97,127>>,16#7f} = get_buf_and_term(P),
+    {<<97,255>>,16#ff} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -195,46 +195,46 @@ test_ei_encode_char(Config) when is_list(Config) ->
 
 test_ei_encode_misc(suite) -> [];
 test_ei_encode_misc(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_misc),
+    P = runner:start(?test_ei_encode_misc),
 
-    ?line <<131>>  = get_binaries(P),
+    <<131>>  = get_binaries(P),
 
-    ?line {<<70,_:8/binary>>,F0} = get_buf_and_term(P),
-    ?line true = match_float(F0, 0.0),
+    {<<70,_:8/binary>>,F0} = get_buf_and_term(P),
+    true = match_float(F0, 0.0),
 
-    ?line {<<70,_:8/binary>>,Fn1} = get_buf_and_term(P),
-    ?line true = match_float(Fn1, -1.0),
+    {<<70,_:8/binary>>,Fn1} = get_buf_and_term(P),
+    true = match_float(Fn1, -1.0),
 
-    ?line {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
-    ?line true = match_float(Fp1, 1.0),
+    {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
+    true = match_float(Fp1, 1.0),
 
-    ?line {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
 
-    ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
-    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
+    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
+    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
 
-    ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
-    ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
-    ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
-    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
+    {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
+    {<<106>>,""}                    = get_buf_and_term(P),
+    {<<106>>,""}                    = get_buf_and_term(P),
+    {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
 
-    ?line {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
-    ?line {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
-    ?line {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
+    {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
+    {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
+    {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
 
-    ?line {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
-    ?line {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
+    {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
+    {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -242,52 +242,52 @@ test_ei_encode_misc(Config) when is_list(Config) ->
 
 test_ei_encode_fails(suite) -> [];
 test_ei_encode_fails(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_fails),
+    P = runner:start(?test_ei_encode_fails),
 
-    ?line XAtom = list_to_atom(lists:duplicate(255, $x)),
-    ?line YAtom = list_to_atom(lists:duplicate(255, $y)),
+    XAtom = list_to_atom(lists:duplicate(255, $x)),
+    YAtom = list_to_atom(lists:duplicate(255, $y)),
 
-    ?line XAtom = get_term(P),
-    ?line XAtom = get_term(P),
-    ?line YAtom = get_term(P),
-    ?line YAtom = get_term(P),
+    XAtom = get_term(P),
+    XAtom = get_term(P),
+    YAtom = get_term(P),
+    YAtom = get_term(P),
 
-    ?line {{{{}}}} = get_term(P),
+    {{{{}}}} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
 test_ei_encode_utf8_atom(Config) ->
-    ?line P = runner:start(?test_ei_encode_utf8_atom),
-    
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    P = runner:start(?test_ei_encode_utf8_atom),
 
-    ?line {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    ?line {<<100,0,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    {<<119,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<100,0,1,$A>>,'A'} = get_buf_and_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
 test_ei_encode_utf8_atom_len(Config) ->
-    ?line P = runner:start(?test_ei_encode_utf8_atom_len),
-    
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,2,197,196>>,'ÅÄ'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
-
-    ?line {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    ?line {<<100,0,2,$A,$B>>,'AB'} = get_buf_and_term(P),
-    ?line {<<100,0,255,_:(255*8)>>,_} = get_buf_and_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?test_ei_encode_utf8_atom_len),
+
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,2,197,196>>,'ÅÄ'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
+
+    {<<119,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<100,0,2,$A,$B>>,'AB'} = get_buf_and_term(P),
+    {<<100,0,255,_:(255*8)>>,_} = get_buf_and_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
@@ -297,20 +297,20 @@ test_ei_encode_utf8_atom_len(Config) ->
 get_buf_and_term(P) ->
     B = get_binaries(P),
     case B of
-	<<131>> ->
-	    io:format("(got single magic, no content)\n",[]),
-	    {B,'$$magic$$'};
-	<<131,_>> ->
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[B,T]),
-	    {B,T};
-	_ ->
-	    B1 = list_to_binary([131,B]),	% No magic, add
-	    T = binary_to_term(B1),
-	    io:format("~w\n~w\n(got no magic)\n",[B,T]),
-	    {B,T}
+        <<131>> ->
+            io:format("(got single magic, no content)\n",[]),
+            {B,'$$magic$$'};
+        <<131,_>> ->
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[B,T]),
+            {B,T};
+        _ ->
+            B1 = list_to_binary([131,B]),	% No magic, add
+            T = binary_to_term(B1),
+            io:format("~w\n~w\n(got no magic)\n",[B,T]),
+            {B,T}
     end.
-    
+
 
 get_binaries(P) ->
     B1 = get_binary(P),
@@ -319,14 +319,14 @@ get_binaries(P) ->
 
 get_binary(P) ->
     case runner:get_term(P) of
-	{bytes,L} ->
-	    B = list_to_binary(L),
-	    io:format("~w\n",[L]),
-% For strange reasons <<131>> show up as <>....
-%	    io:format("~w\n",[B]),
-	    B;
-	Other ->
-	    Other
+        {bytes,L} ->
+            B = list_to_binary(L),
+            io:format("~w\n",[L]),
+            % For strange reasons <<131>> show up as <>....
+            %	    io:format("~w\n",[B]),
+            B;
+        Other ->
+            Other
     end.
 
 %%
@@ -335,27 +335,26 @@ get_binary(P) ->
 
 get_term(P) ->
     case runner:get_term(P) of
-	{bytes,[131]} ->
-	    io:format("(got single magic, no content)\n",[]),
-	    '$$magic$$';
-	{bytes,[131,L]} ->
-	    B = list_to_binary(L),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[L,T]),
-	    T;
-	{bytes,L} ->
-	    B = list_to_binary([131,L]),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got no magic)\n",[L,T]),
-	    T;
-	Other ->
-	    Other
+        {bytes,[131]} ->
+            io:format("(got single magic, no content)\n",[]),
+            '$$magic$$';
+        {bytes,[131,L]} ->
+            B = list_to_binary(L),
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[L,T]),
+            T;
+        {bytes,L} ->
+            B = list_to_binary([131,L]),
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got no magic)\n",[L,T]),
+            T;
+        Other ->
+            Other
     end.
- 
+
 %%
 
 match_float(F, Match) when is_float(F), is_float(Match), F == Match ->
     true;
 match_float(F, Match) when is_float(F), F > Match*0.99, F < Match*1.01 ->
     true.
-