diff options
author | Henrik Nord <[email protected]> | 2011-03-25 12:22:23 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-03-25 12:22:29 +0100 |
commit | ad99d0e01d9c61dfad5e8a32dc587b61e2409edb (patch) | |
tree | c83eeb4c8daa397cb1ba3d86c7d26f318a3a4df7 /lib/tv | |
parent | d090e8e1c02f55853f202e30e0f664b4d15f77ea (diff) | |
parent | 5eff630532b9421a0481b3f727cc3bd58b4ad642 (diff) | |
download | otp-ad99d0e01d9c61dfad5e8a32dc587b61e2409edb.tar.gz otp-ad99d0e01d9c61dfad5e8a32dc587b61e2409edb.tar.bz2 otp-ad99d0e01d9c61dfad5e8a32dc587b61e2409edb.zip |
Merge branch 'bw/tv-render-fix' into dev
* bw/tv-render-fix:
tv: Allow table viewer to display refs, ports and small binaries
OTP-9153
Diffstat (limited to 'lib/tv')
-rw-r--r-- | lib/tv/src/tv_io_lib.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/tv/src/tv_io_lib.erl b/lib/tv/src/tv_io_lib.erl index f693ff796d..5457575b7d 100644 --- a/lib/tv/src/tv_io_lib.erl +++ b/lib/tv/src/tv_io_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2009. All Rights Reserved. +%% Copyright Ericsson AB 1998-2010. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -52,10 +52,11 @@ write(_Term, 0) -> "..."; write(Term, _D) when is_integer(Term) -> integer_to_list(Term); write(Term, _D) when is_float(Term) -> tv_io_lib_format:fwrite_g(Term); write(Atom, _D) when is_atom(Atom) -> write_atom(Atom); -write(Term, _D) when is_port(Term) -> "#Port"; +write(Term, _D) when is_port(Term) -> lists:flatten(io_lib:write(Term)); write(Term, _D) when is_pid(Term) -> pid_to_list(Term); -write(Term, _D) when is_reference(Term) -> "#Ref"; -write(Term, _D) when is_binary(Term) -> "#Bin"; +write(Term, _D) when is_reference(Term) -> io_lib:write(Term); +write(Term, _D) when is_binary(Term), byte_size(Term) > 100 -> "#Bin"; +write(Term, _D) when is_binary(Term) -> "<<\"" ++ binary_to_list(Term) ++ "\">>"; write(Term, _D) when is_bitstring(Term) -> "#Bitstr"; write([], _D) -> "[]"; write({}, _D) -> "{}"; |