diff options
author | Hans Bolinder <[email protected]> | 2017-02-10 16:00:32 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2017-03-08 14:11:49 +0100 |
commit | bce73eb11441c3593304ccc88d6145ba1fbeffa1 (patch) | |
tree | bcd0b4e8f9365b2d20add49b1fda075d3958e83a | |
parent | acfebc2742721b08d35dccb29c192849c48284a7 (diff) | |
download | otp-bce73eb11441c3593304ccc88d6145ba1fbeffa1.tar.gz otp-bce73eb11441c3593304ccc88d6145ba1fbeffa1.tar.bz2 otp-bce73eb11441c3593304ccc88d6145ba1fbeffa1.zip |
debugger: Fix handling of locations and annotations
-rw-r--r-- | lib/debugger/src/dbg_wx_win.erl | 4 | ||||
-rw-r--r-- | lib/debugger/test/int_SUITE.erl | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl index d302423077..2c9d83ea74 100644 --- a/lib/debugger/src/dbg_wx_win.erl +++ b/lib/debugger/src/dbg_wx_win.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. @@ -276,7 +276,7 @@ verify(Type, Str) -> case erl_scan:string(Str) of {ok, Tokens, _EndLine} when Type==term -> - case erl_parse:parse_term(Tokens++[{dot, 1}]) of + case erl_parse:parse_term(Tokens++[{dot, erl_anno:new(1)}]) of {ok, Value} -> {edit, Value}; _Error -> ignore diff --git a/lib/debugger/test/int_SUITE.erl b/lib/debugger/test/int_SUITE.erl index f697ace4e5..cb1fcb83f3 100644 --- a/lib/debugger/test/int_SUITE.erl +++ b/lib/debugger/test/int_SUITE.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. @@ -241,7 +241,8 @@ interpretable(Config) when is_list(Config) -> true = code:del_path(PrivDir), %% {error, no_src} - {ok, lists2, Binary} = compile:forms([{attribute,1,module,lists2}], []), + A1 = erl_anno:new(1), + {ok, lists2, Binary} = compile:forms([{attribute,A1,module,lists2}], []), code:load_binary(lists2, "unknown", Binary), {error, no_src} = int:interpretable(lists2), |