From 37348d31616fa55130eead33f08a50141b355151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 2 Mar 2016 06:33:45 +0100 Subject: Replace "%" with "%%" at the beginning of a line We want to re-ident the source files after having taken out all ?line macros. When re-indenting using Emacs, it's important that comments that should be at the beginning of a line (or follow the indentation of statements around it) must start with "%%". --- lib/debugger/test/bs_match_int_SUITE.erl | 4 ++-- lib/debugger/test/bs_match_misc_SUITE.erl | 6 +++--- lib/debugger/test/dbg_ui_SUITE.erl | 16 ++++++++-------- lib/debugger/test/guard_SUITE.erl | 18 +++++++++--------- lib/debugger/test/map_SUITE.erl | 30 +++++++++++++++--------------- 5 files changed, 37 insertions(+), 37 deletions(-) (limited to 'lib/debugger/test') diff --git a/lib/debugger/test/bs_match_int_SUITE.erl b/lib/debugger/test/bs_match_int_SUITE.erl index c2d50a29e6..537a65ee35 100644 --- a/lib/debugger/test/bs_match_int_SUITE.erl +++ b/lib/debugger/test/bs_match_int_SUITE.erl @@ -134,7 +134,7 @@ dynamic(Bin, S1) when S1 >= 0 -> dynamic(_, _) -> ok. dynamic(Bin, S1, S2, A, B) -> -% io:format("~p ~p ~p ~p\n", [S1,S2,A,B]), +%% io:format("~p ~p ~p ~p\n", [S1,S2,A,B]), case Bin of <> -> io:format("~p ~p ~p ~p\n", [S1,S2,A,B]), @@ -145,7 +145,7 @@ dynamic(Bin, S1, S2, A, B) -> %% Extract integers at different alignments and of different sizes. more_dynamic(Config) when is_list(Config) -> - % Unsigned big-endian numbers. + %% Unsigned big-endian numbers. Unsigned = fun(Bin, List, SkipBef, N) -> SkipAft = 8*size(Bin) - N - SkipBef, <<_:SkipBef,Int:N,_:SkipAft>> = Bin, diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl index f184e8fc41..317bf66f9f 100644 --- a/lib/debugger/test/bs_match_misc_SUITE.erl +++ b/lib/debugger/test/bs_match_misc_SUITE.erl @@ -296,9 +296,9 @@ getBase64Char(62) -> "+"; getBase64Char(63) -> "/"; getBase64Char(_Else) -> %% This is an illegal input. -% cgLogEM:log(error, ?MODULE, getBase64Char, [Else], -% "illegal input", -% ?LINE, version()), +%% cgLogEM:log(error, ?MODULE, getBase64Char, [Else], +%% "illegal input", +%% ?LINE, version()), "**". -define(M(F), <> = <>). diff --git a/lib/debugger/test/dbg_ui_SUITE.erl b/lib/debugger/test/dbg_ui_SUITE.erl index 626e49f3ef..e50382fb33 100644 --- a/lib/debugger/test/dbg_ui_SUITE.erl +++ b/lib/debugger/test/dbg_ui_SUITE.erl @@ -25,14 +25,14 @@ -include_lib("common_test/include/ct.hrl"). -% Test server specific exports +%% Test server specific exports -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]). -% Test cases must be exported. +%% Test cases must be exported. -export ([dbg_ui/1]). -% Manual test suites/cases exports +%% Manual test suites/cases exports -export([start1/1, interpret1/1, quit1/1, start2/1, interpret2/1, break2/1, options2/1, quit2/1, interpret3/1, all_step3/1,all_next3/1,save3/1,restore3/1,finish3/1, @@ -83,11 +83,11 @@ dbg_ui (_Config) -> false -> {skipped,"No display"}; Other when is_list(Other) -> -% ?line {ok, Pid} = debugger:start (), -% ?line ok = is_pid (Pid), -% ?line true = erlang:is_process_alive(Pid), -% ?line ok = debugger:stop(), -% ?line false = erlang:is_process_alive(Pid) +%% ?line {ok, Pid} = debugger:start (), +%% ?line ok = is_pid (Pid), +%% ?line true = erlang:is_process_alive(Pid), +%% ?line ok = debugger:stop(), +%% ?line false = erlang:is_process_alive(Pid) {skipped,"Gunilla: Workaround"} end. diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl index c6cb4a82d2..ce1a84d518 100644 --- a/lib/debugger/test/guard_SUITE.erl +++ b/lib/debugger/test/guard_SUITE.erl @@ -1532,51 +1532,51 @@ binary_part(Config) when is_list(Config) -> ?line error = bptest(<<>>), ?line error = bptest(apa), ?line 3 = bptest(<<2,3,3>>), - % With one variable (pos) + %% With one variable (pos) ?line 1 = bptest(<<1,2,3>>,1), ?line 2 = bptest(<<2,1,3>>,1), ?line error = bptest(<<1>>,1), ?line error = bptest(<<>>,1), ?line error = bptest(apa,1), ?line 3 = bptest(<<2,3,3>>,1), - % With one variable (length) + %% With one variable (length) ?line 1 = bptesty(<<1,2,3>>,1), ?line 2 = bptesty(<<2,1,3>>,1), ?line error = bptesty(<<1>>,1), ?line error = bptesty(<<>>,1), ?line error = bptesty(apa,1), ?line 3 = bptesty(<<2,3,3>>,2), - % With one variable (whole tuple) + %% With one variable (whole tuple) ?line 1 = bptestx(<<1,2,3>>,{1,1}), ?line 2 = bptestx(<<2,1,3>>,{1,1}), ?line error = bptestx(<<1>>,{1,1}), ?line error = bptestx(<<>>,{1,1}), ?line error = bptestx(apa,{1,1}), ?line 3 = bptestx(<<2,3,3>>,{1,2}), - % With two variables + %% With two variables ?line 1 = bptest(<<1,2,3>>,1,1), ?line 2 = bptest(<<2,1,3>>,1,1), ?line error = bptest(<<1>>,1,1), ?line error = bptest(<<>>,1,1), ?line error = bptest(apa,1,1), ?line 3 = bptest(<<2,3,3>>,1,2), - % Direct (autoimported) call, these will be evaluated by the compiler... + %% Direct (autoimported) call, these will be evaluated by the compiler... ?line <<2>> = binary_part(<<1,2,3>>,1,1), ?line <<1>> = binary_part(<<2,1,3>>,1,1), - % Compiler warnings due to constant evaluation expected (3) + %% Compiler warnings due to constant evaluation expected (3) ?line badarg = ?MASK_ERROR(binary_part(<<1>>,1,1)), ?line badarg = ?MASK_ERROR(binary_part(<<>>,1,1)), ?line badarg = ?MASK_ERROR(binary_part(apa,1,1)), ?line <<3,3>> = binary_part(<<2,3,3>>,1,2), - % Direct call through apply + %% Direct call through apply ?line <<2>> = apply(erlang,binary_part,[<<1,2,3>>,1,1]), ?line <<1>> = apply(erlang,binary_part,[<<2,1,3>>,1,1]), - % Compiler warnings due to constant evaluation expected (3) + %% Compiler warnings due to constant evaluation expected (3) ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<1>>,1,1])), ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<>>,1,1])), ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[apa,1,1])), ?line <<3,3>> = apply(erlang,binary_part,[<<2,3,3>>,1,2]), - % Constant propagation + %% Constant propagation ?line Bin = <<1,2,3>>, ?line ok = if binary_part(Bin,1,1) =:= <<2>> -> diff --git a/lib/debugger/test/map_SUITE.erl b/lib/debugger/test/map_SUITE.erl index 6209071f1a..42484ff723 100644 --- a/lib/debugger/test/map_SUITE.erl +++ b/lib/debugger/test/map_SUITE.erl @@ -191,8 +191,8 @@ t_build_and_match_literals(Config) when is_list(Config) -> id(#{ map_1=>#{ map_2=>#{value_3 => third}, value_2=> second}, value_1=>first}), %% error case - %V = 32, - %{'EXIT',{{badmatch,_},_}} = (catch (#{<<"hi all">> => 1} = id(#{<<"hi",V,"all">> => 1}))), + %% V = 32, + %%{'EXIT',{{badmatch,_},_}} = (catch (#{<<"hi all">> => 1} = id(#{<<"hi",V,"all">> => 1}))), {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3,x:=2} = id(#{x=>3}))), {'EXIT',{{badmatch,_},_}} = (catch (#{x:=2} = id(#{x=>3}))), {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = id({a,b,c}))), @@ -201,7 +201,7 @@ t_build_and_match_literals(Config) when is_list(Config) -> ok. t_build_and_match_literals_large(Config) when is_list(Config) -> - % normal non-repeating + %% normal non-repeating M0 = id(#{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10", 11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11", 12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12", @@ -229,7 +229,7 @@ t_build_and_match_literals_large(Config) when is_list(Config) -> 60 = map_size(M0), 60 = maps:size(M0), - % with repeating + %% with repeating M1 = id(#{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10", 11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11", 12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12", @@ -265,7 +265,7 @@ t_build_and_match_literals_large(Config) when is_list(Config) -> 60 = map_size(M1), 60 = maps:size(M1), - % with floats + %% with floats M2 = id(#{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10", 11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11", @@ -318,7 +318,7 @@ t_build_and_match_literals_large(Config) when is_list(Config) -> 90 = map_size(M2), 90 = maps:size(M2), - % with bignums + %% with bignums M3 = id(#{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10", 11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11", 12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12", @@ -501,7 +501,7 @@ t_build_and_match_literals_large(Config) when is_list(Config) -> 95 = map_size(M4), 95 = maps:size(M4), - % call for value + %% call for value M5 = id(#{ 10=>id(a0),20=>b0,30=>id("c0"),"40"=>"d0",<<"50">>=>id("e0"),{["00"]}=>"10", 11=>id(a1),21=>b1,31=>id("c1"),"41"=>"d1",<<"51">>=>id("e1"),{["01"]}=>"11", @@ -681,7 +681,7 @@ t_map_size(Config) when is_list(Config) -> map_is_size(M,N) when map_size(M) =:= N -> true; map_is_size(_,_) -> false. -% test map updates without matching +%% test map updates without matching t_update_literals(Config) when is_list(Config) -> Map = #{x=>1,y=>2,z=>3,q=>4}, #{x:="d",q:="4"} = loop_update_literals_x_q(Map, [ @@ -751,7 +751,7 @@ loop_update_literals_x_q(Map, []) -> Map; loop_update_literals_x_q(Map, [{X,Q}|Vs]) -> loop_update_literals_x_q(Map#{q=>Q,x=>X},Vs). -% test map updates with matching +%% test map updates with matching t_match_and_update_literals(Config) when is_list(Config) -> Map = #{ x=>0,y=>"untouched",z=>"also untouched",q=>1, #{ "one" => small, map => key } => "small map key 1" }, @@ -1413,7 +1413,7 @@ t_guard_fun(Config) when is_list(Config) -> t_map_sort_literals(Config) when is_list(Config) -> - % test relation + %% test relation %% size order true = #{ a => 1, b => 2} < id(#{ a => 1, b => 1, c => 1}), @@ -1983,10 +1983,10 @@ t_ets(_Config) -> [] = ets:select(Tid,[{{'$1','_'},[{'==','$1',#{ b => c }}],['$_']}]), %% Test match with map of different size - %[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => c },'_'},[],['$_']}]), + %%[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => c },'_'},[],['$_']}]), %%% Test match with don't care value - %[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => '_' },'_'},[],['$_']}]), + %%[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => '_' },'_'},[],['$_']}]), %% Test is_map bif 101 = length(ets:select(Tid,[{'$1',[{is_map,{element,1,'$1'}}],['$1']}])), @@ -2138,13 +2138,13 @@ t_update_exact_variables(Config) when is_list(Config) -> t_nested_pattern_expressions(Config) when is_list(Config) -> K1 = id("hello"), - %K2 = id({ok}), + %% K2 = id({ok}), [_,_,#{ <<"hi">> := wat, K1 := 42 }|_] = id([k,k,#{<<"hi">> => wat, K1 => 42}]), [_,_,#{ -1 := wat, K1 := 42 }|_] = id([k,k,#{-1 => wat, K1 => 42}]), [_,_,{#{ -1 := #{ {-3,<<0:300>>} := V1 }, K1 := 42 },3}|_] = id([k,k,{#{-1 => #{{-3,<<0:300>>}=>"hi"}, K1 => 42},3}]), "hi" = V1, - %[k,#{ {-1,K1,[]} := {wat,K1}, K2 := 42 }|_] = id([k,#{{-1,K1,[]} => {wat,K1}, K2 => 42}]), - %[k,#{ [-1,K2,[]] := {wat,K1}, K1 := 42 }|_] = id([k,#{[-1,K2,[]] => {wat,K1}, K1 => 42}]), + %%[k,#{ {-1,K1,[]} := {wat,K1}, K2 := 42 }|_] = id([k,#{{-1,K1,[]} => {wat,K1}, K2 => 42}]), + %%[k,#{ [-1,K2,[]] := {wat,K1}, K1 := 42 }|_] = id([k,#{[-1,K2,[]] => {wat,K1}, K1 => 42}]), ok. t_guard_update_variables(Config) when is_list(Config) -> -- cgit v1.2.3