Merge branch 'hb/unicode/OTP-10302'

OTP-10742
OTP-10745
OTP-10749

* hb/unicode/OTP-10302:
  [stdlib] Remove documentation of ~tp
  Remove one use of iolist_size/1 in io_lib_pretty.erl
  Add a new function proc_lib:format/2 which takes encoding
  Export the type erl_scan:token()
  Make adjustments for Unicode
  [stdlib] Change default of erl_scan's unicode option
  Update preloaded
  Correct recently introduced Unicode related type errors
  [stdlib] Introduce new functions epp:read_encoding_from_binary/1,2
  Extend char() to Unicode characters
  [kernel] Correct bugs in the old shell (user.erl)
  [parsetools] Change the encoding of test suites to UTF-8
  [stdlib] Fix a contract bug
  [stdlib] Update the Unicode examples in STDLIB User's Guide
  [stdlib] Remove documentation of Unicode functions in io_lib

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/stdlib/src/io.erl b/lib/stdlib/src/io.erl
index ecf2aeb375..3dddb0d6e7 100644
--- a/lib/stdlib/src/io.erl
+++ b/lib/stdlib/src/io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. 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
@@ -127,7 +127,7 @@ rows(Io) ->
 -spec get_chars(Prompt, Count) -> Data | server_no_data() when
       Prompt :: prompt(),
       Count :: non_neg_integer(),
-      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
+      Data :: string() | unicode:unicode_binary().
 
 get_chars(Prompt, N) ->
     get_chars(default_input(), Prompt, N).
@@ -136,14 +136,14 @@ get_chars(Prompt, N) ->
       IoDevice :: device(),
       Prompt :: prompt(),
       Count :: non_neg_integer(),
-      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
+      Data :: string() | unicode:unicode_binary().
 
 get_chars(Io, Prompt, N) when is_integer(N), N >= 0 ->
     request(Io, {get_chars,unicode,Prompt,N}).
 
 -spec get_line(Prompt) -> Data | server_no_data() when
       Prompt :: prompt(),
-      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
+      Data :: string() | unicode:unicode_binary().
 
 get_line(Prompt) ->
     get_line(default_input(), Prompt).
@@ -151,7 +151,7 @@ get_line(Prompt) ->
 -spec get_line(IoDevice, Prompt) -> Data | server_no_data() when
       IoDevice :: device(),
       Prompt :: prompt(),
-      Data :: [unicode:unicode_char()] | unicode:unicode_binary().
+      Data :: string() | unicode:unicode_binary().
 
 get_line(Io, Prompt) ->
     request(Io, {get_line,unicode,Prompt}).
@@ -221,8 +221,6 @@ write(Io, Term) ->
               | {'error', ErrorInfo},
       ErrorInfo :: erl_scan:error_info() | erl_parse:error_info().
 
-% Read does not use get_until as erl_scan does not work with unicode
-% XXX:PaN fixme?
 read(Prompt) ->
     read(default_input(), Prompt).
 
@@ -331,7 +329,7 @@ fread(Prompt, Format) ->
       Prompt :: prompt(),
       Format :: format(),
       Result :: {'ok', Terms :: [term()]}
-              | {'error', FreadError :: io_lib:fread_error()}
+              | {'error', {'fread', FreadError :: io_lib:fread_error()}}
               | server_no_data().
 
 fread(Io, Prompt, Format) ->