aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-06-07 09:48:41 +0200
committerDan Gudmundsson <[email protected]>2017-06-07 09:48:41 +0200
commit106c7b1bd5d845b982796e4ab5d537b2e68c3f1d (patch)
tree2f04af4c3b048a9a4e54e4be7af53ab641037701 /lib
parent807c34117da12e0056cf4b4898830830da114e80 (diff)
parent0a6d15b8da355f8e14671b4019f44e46f0b594db (diff)
downloadotp-106c7b1bd5d845b982796e4ab5d537b2e68c3f1d.tar.gz
otp-106c7b1bd5d845b982796e4ab5d537b2e68c3f1d.tar.bz2
otp-106c7b1bd5d845b982796e4ab5d537b2e68c3f1d.zip
Merge branch 'dgud/observer/edit-pid-port-ref'
* dgud/observer/edit-pid-port-ref: observer: Allow edit of pid, port and refs
Diffstat (limited to 'lib')
-rw-r--r--lib/observer/src/observer_lib.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 7352af936c..c7ee294719 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -636,12 +636,12 @@ user_term_multiline(Parent, Title, Default) ->
parse_string(Str) ->
try
- Tokens = case erl_scan:string(Str) of
+ Tokens = case erl_scan:string(Str, 1, [text]) of
{ok, Ts, _} -> Ts;
{error, {_SLine, SMod, SError}, _} ->
throw(io_lib:format("~s", [SMod:format_error(SError)]))
end,
- case erl_parse:parse_term(Tokens) of
+ case lib:extended_parse_term(Tokens) of
{error, {_PLine, PMod, PError}} ->
throw(io_lib:format("~s", [PMod:format_error(PError)]));
Res -> Res