diff options
| author | Hans Bolinder <[email protected]> | 2017-06-19 15:54:54 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-09-05 11:02:25 +0200 |
| commit | 1f13f9db23b2015b45dd501a8ebb939c3c9994f1 (patch) | |
| tree | 30bfa4015558b83f15da26a964810bf9da16d76e | |
| parent | 7eaaf5dd6140eda8b3892ef23e1fcf70be90d7c4 (diff) | |
| download | otp-1f13f9db23b2015b45dd501a8ebb939c3c9994f1.tar.gz otp-1f13f9db23b2015b45dd501a8ebb939c3c9994f1.tar.bz2 otp-1f13f9db23b2015b45dd501a8ebb939c3c9994f1.zip | |
edoc: Improve handling of Unicode
| -rw-r--r-- | lib/edoc/src/edoc_types.erl | 2 | ||||
| -rw-r--r-- | lib/erl_docgen/src/docgen_otp_specs.erl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl index ccc3169767..510f9513b2 100644 --- a/lib/edoc/src/edoc_types.erl +++ b/lib/edoc/src/edoc_types.erl @@ -107,7 +107,7 @@ to_xml(#t_paren{type = T}, Env) -> to_xml(#t_nonempty_list{type = T}, Env) -> {nonempty_list, [wrap_utype(T, Env)]}; to_xml(#t_atom{val = V}, _Env) -> - {atom, [{value, io_lib:write(V)}], []}; + {atom, [{value, atom_to_list(V)}], []}; to_xml(#t_integer{val = V}, _Env) -> {integer, [{value, integer_to_list(V)}], []}; to_xml(#t_integer_range{from = From, to = To}, _Env) -> diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl index 6c41147e27..126229ecc9 100644 --- a/lib/erl_docgen/src/docgen_otp_specs.erl +++ b/lib/erl_docgen/src/docgen_otp_specs.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-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. @@ -406,7 +406,7 @@ t_var(E) -> [get_attrval(name, E)]. t_atom(E) -> - [get_attrval(value, E)]. + [io_lib:write(list_to_atom(get_attrval(value, E)))]. t_integer(E) -> [get_attrval(value, E)]. @@ -578,7 +578,7 @@ ot_var(E) -> {var,0,list_to_atom(get_attrval(name, E))}. ot_atom(E) -> - {ok, [{atom,A,Name}], _} = erl_scan:string(get_attrval(value, E), 0), + {ok, [{atom,A,Name}], _} = erl_scan:string(lists:flatten(t_atom(E)), 0), {atom,erl_anno:line(A),Name}. ot_integer(E) -> |