diff options
| author | Hans Bolinder <[email protected]> | 2017-04-04 09:33:23 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-04-04 09:33:23 +0200 |
| commit | d26bd8c3ecafe9a3cc0a892445fe1e3157c273a8 (patch) | |
| tree | eecf8947f58065e7a013d55d753fa192467d1fa3 | |
| parent | 0b3416203c37eba5354e284b9040799158567133 (diff) | |
| parent | 20ba9ab511e645098ea278d2c96638e225a5013e (diff) | |
| download | otp-d26bd8c3ecafe9a3cc0a892445fe1e3157c273a8.tar.gz otp-d26bd8c3ecafe9a3cc0a892445fe1e3157c273a8.tar.bz2 otp-d26bd8c3ecafe9a3cc0a892445fe1e3157c273a8.zip | |
Merge branch 'hasse/debugger/fix_edit_variable/OTP-14318'
* hasse/debugger/fix_edit_variable/OTP-14318:
debugger: Enable editing of bit strings in the bindings area
debugger: Remove a debug printout
| -rw-r--r-- | lib/debugger/src/dbg_ieval.erl | 3 | ||||
| -rw-r--r-- | lib/debugger/src/dbg_wx_trace.erl | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl index f5e079ef7e..88c7caacb0 100644 --- a/lib/debugger/src/dbg_ieval.erl +++ b/lib/debugger/src/dbg_ieval.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2016. All Rights Reserved. +%% Copyright Ericsson AB 1998-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1486,7 +1486,6 @@ guard_expr({map,_,E0,Fs0}, Bs) -> Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi); ({map_exact,K,V}, Mi) -> maps:update(K,V,Mi) end, E, Fs), - io:format("~p~n", [{E,Value}]), {value,Value}; guard_expr({bin,_,Flds}, Bs) -> {value,V,_Bs} = diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl index 29c8e8cefb..f4ee30618c 100644 --- a/lib/debugger/src/dbg_wx_trace.erl +++ b/lib/debugger/src/dbg_wx_trace.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2016. All Rights Reserved. +%% Copyright Ericsson AB 2008-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -524,7 +524,8 @@ gui_cmd({edit, {Var, Value}}, State) -> cancel -> State; {Var, Term} -> - Cmd = atom_to_list(Var)++"="++io_lib:format("~w", [Term]), + %% The space after "=" is needed for handling "B= <<1>>". + Cmd = atom_to_list(Var)++"= "++io_lib:format("~w", [Term]), gui_cmd({user_command, lists:flatten(Cmd)}, State) end. |