diff options
| author | Hans Bolinder <[email protected]> | 2017-04-10 08:58:25 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-04-10 08:58:25 +0200 |
| commit | 710abdb5d79554cde4e0ca051bfa16bdcfdccc57 (patch) | |
| tree | 8e99daa1f998f49b0bd78a1937d70c9ca07f59eb /lib/debugger | |
| parent | 3a29920a05cedee8c1f7501ee7b1aa22e068efed (diff) | |
| parent | 73657a28e74f8ad12ddb4fea49272a74f5b823c3 (diff) | |
| download | otp-710abdb5d79554cde4e0ca051bfa16bdcfdccc57.tar.gz otp-710abdb5d79554cde4e0ca051bfa16bdcfdccc57.tar.bz2 otp-710abdb5d79554cde4e0ca051bfa16bdcfdccc57.zip | |
Merge branch 'hasse/unicode_atoms/OTP-14285'
* hasse/unicode_atoms/OTP-14285:
syntax_tools: Fix Syntax Tools regarding Unicode atoms
debugger: Show Latin-1 code correctly
edoc: Fix EDoc regarding Unicode atoms
parsetools: Fix Yecc regarding Unicode atoms
parsetools: Fix Leex regarding Unicode atoms
stdlib: Fix Erlang shell regarding Unicode atoms
stdlib: Fix Erlang pretty printer regarding Unicode atoms
stdlib: Add function to io_lib to handle Unicode atoms
Diffstat (limited to 'lib/debugger')
| -rw-r--r-- | lib/debugger/src/dbg_wx_code.erl | 4 | ||||
| -rw-r--r-- | lib/debugger/src/dbg_wx_src_view.erl | 4 | ||||
| -rw-r--r-- | lib/debugger/src/int.erl | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/debugger/src/dbg_wx_code.erl b/lib/debugger/src/dbg_wx_code.erl index 473963500a..bca8a0d241 100644 --- a/lib/debugger/src/dbg_wx_code.erl +++ b/lib/debugger/src/dbg_wx_code.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. @@ -190,6 +190,6 @@ find(Ed, Str, Case, Next) -> keyWords() -> L = ["after","begin","case","try","cond","catch","andalso","orelse", - "end","fun","if","let","of","query","receive","when","bnot","not", + "end","fun","if","let","of","receive","when","bnot","not", "div","rem","band","and","bor","bxor","bsl","bsr","or","xor"], lists:flatten([K ++ " " || K <- L] ++ [0]). diff --git a/lib/debugger/src/dbg_wx_src_view.erl b/lib/debugger/src/dbg_wx_src_view.erl index 207c407fbc..ee8eb72407 100644 --- a/lib/debugger/src/dbg_wx_src_view.erl +++ b/lib/debugger/src/dbg_wx_src_view.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. @@ -62,6 +62,6 @@ code_area(Parent, Sizer) -> keyWords() -> L = ["after","begin","case","try","cond","catch","andalso","orelse", - "end","fun","if","let","of","query","receive","when","bnot","not", + "end","fun","if","let","of","receive","when","bnot","not", "div","rem","band","and","bor","bxor","bsl","bsr","or","xor"], lists:flatten([K ++ " " || K <- L] ++ [0]). diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl index e5bade9abe..fdf5957182 100644 --- a/lib/debugger/src/int.erl +++ b/lib/debugger/src/int.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. @@ -533,7 +533,9 @@ load({Mod, Src, Beam, BeamBin, Exp, Abst}, Dist) -> case erl_prim_loader:get_file(filename:absname(Src)) of {ok, SrcBin, _} -> MD5 = code:module_md5(BeamBin), - Bin = term_to_binary({interpreter_module,Exp,Abst,SrcBin,MD5}), + SrcBin1 = unicode:characters_to_binary(SrcBin, enc(SrcBin)), + true = is_binary(SrcBin1), + Bin = term_to_binary({interpreter_module,Exp,Abst,SrcBin1,MD5}), {module, Mod} = dbg_iserver:safe_call({load, Mod, Src, Bin}), _ = everywhere(Dist, fun() -> |