stdlib: Fix Erlang shell regarding Unicode atoms

3 files changed, 35 insertions, 9 deletions

diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml
index f52bc39deb..ab62c2fcdd 100644
--- a/lib/stdlib/doc/src/shell.xml
+++ b/lib/stdlib/doc/src/shell.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -854,7 +854,7 @@ q                 - quit erlang
       <c>{history, N}</c>, where <c>N</c> is the current command number. The
       function is to return a list of characters or an atom. This
       constraint is because of the Erlang I/O protocol. Unicode characters
-      beyond code point 255 are allowed in the list. Notice
+      beyond code point 255 are allowed in the list and the atom. Notice
       that in restricted mode the call <c>Mod:Func(L)</c> must be
       allowed or the default shell prompt function is called.</p>
   </section>
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index 28f37ef8bf..394f4f2fa4 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.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.
@@ -349,10 +349,16 @@ default_prompt(N) ->
     %% Don't bother flattening the list irrespective of what the
     %% I/O-protocol states.
     case is_alive() of
-	true  -> io_lib:format(<<"(~s)~w> ">>, [node(), N]);
+	true  -> io_lib:format(<<"(~ts)~w> ">>, [node_string(), N]);
 	false -> io_lib:format(<<"~w> ">>, [N])
     end.
 
+node_string() ->
+    case encoding() of
+        latin1 -> io_lib:write_atom_as_latin1(node());
+        _ ->      io_lib:write_atom(node())
+    end.
+
 %% expand_hist(Expressions, CommandNumber)
 %%  Preprocess the expression list replacing all history list commands
 %%  with their expansions.
@@ -967,10 +973,11 @@ local_func(f, [{var,_,Name}], Bs, _Shell, _RT, _Lf, _Ef) ->
     {value,ok,erl_eval:del_binding(Name, Bs)};
 local_func(f, [_Other], _Bs, _Shell, _RT, _Lf, _Ef) ->
     erlang:raise(error, function_clause, [{shell,f,1}]);
-local_func(rd, [{atom,_,RecName},RecDef0], Bs, _Shell, RT, _Lf, _Ef) ->
+local_func(rd, [{atom,_,RecName0},RecDef0], Bs, _Shell, RT, _Lf, _Ef) ->
     RecDef = expand_value(RecDef0),
     RDs = lists:flatten(erl_pp:expr(RecDef)),
-    Attr = lists:concat(["-record('", RecName, "',", RDs, ")."]),
+    RecName = io_lib:write_atom_as_latin1(RecName0),
+    Attr = lists:concat(["-record(", RecName, ",", RDs, ")."]),
     {ok, Tokens, _} = erl_scan:string(Attr),
     case erl_parse:parse_form(Tokens) of
         {ok,AttrForm} ->
@@ -1417,9 +1424,11 @@ columns() ->
         {ok,N} -> N;
         _ -> 80
     end.
+
 encoding() ->
     [{encoding, Encoding}] = enc(),
     Encoding.
+
 enc() ->
     case lists:keyfind(encoding, 1, io:getopts()) of
 	false -> [{encoding,latin1}]; % should never happen
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 4864bc3d72..56002dda25 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -30,7 +30,8 @@
 	 progex_bit_syntax/1, progex_records/1, 
 	 progex_lc/1, progex_funs/1,
 	 otp_5990/1, otp_6166/1, otp_6554/1,
-	 otp_7184/1, otp_7232/1, otp_8393/1, otp_10302/1, otp_13719/1]).
+	 otp_7184/1, otp_7232/1, otp_8393/1, otp_10302/1, otp_13719/1,
+         otp_14285/1]).
 
 -export([ start_restricted_from_shell/1, 
 	  start_restricted_on_command_line/1,restricted_local/1]).
@@ -91,7 +92,7 @@ groups() ->
        progex_funs]},
      {tickets, [],
       [otp_5990, otp_6166, otp_6554, otp_7184,
-       otp_7232, otp_8393, otp_10302, otp_13719]}].
+       otp_7232, otp_8393, otp_10302, otp_13719, otp_14285]}].
 
 init_per_suite(Config) ->
     Config.
@@ -2824,6 +2825,22 @@ otp_13719(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
+otp_14285(Config) ->
+    {ok,Node} = start_node(shell_suite_helper_4,
+			   "-pa "++proplists:get_value(priv_dir,Config)++
+			   " +pc unicode"),
+    Test1 =
+        <<"begin
+               io:setopts([{encoding,utf8}]),
+               [1024] = atom_to_list('\\x{400}'),
+               rd('\\x{400}', {'\\x{400}' = '\\x{400}'}),
+               ok = rl('\\x{400}')
+           end.">>,
+    "-record('\x{400}',{'\x{400}' = '\x{400}'}).\nok.\n" =
+        t({Node,Test1}),
+    test_server:stop_node(Node),
+    ok.
+
 scan(B) ->
     F = fun(Ts) -> 
                 case erl_parse:parse_term(Ts) of