diff options
| author | Hans Bolinder <[email protected]> | 2013-01-25 13:04:01 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-01-25 13:04:10 +0100 |
| commit | 4adc1523254d5e326e2d5cf942b5eeee84fdb8ea (patch) | |
| tree | 527d936f6295f3d8f86ceecf44ff2310ab5508b2 /erts/preloaded | |
| parent | 9afbb879f0397a650a7c403911a8cc30daa6dbbe (diff) | |
| parent | 5b68f914f08479759d36557282aee29f44683d97 (diff) | |
| download | otp-4adc1523254d5e326e2d5cf942b5eeee84fdb8ea.tar.gz otp-4adc1523254d5e326e2d5cf942b5eeee84fdb8ea.tar.bz2 otp-4adc1523254d5e326e2d5cf942b5eeee84fdb8ea.zip | |
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
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/prim_file.beam | bin | 41176 -> 41256 bytes | |||
| -rw-r--r-- | erts/preloaded/src/prim_file.erl | 7 |
2 files changed, 3 insertions, 4 deletions
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex b8f71b0c1e..01cbb08135 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl index c412b7faf2..50adf9c89d 100644 --- a/erts/preloaded/src/prim_file.erl +++ b/erts/preloaded/src/prim_file.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2012. All Rights Reserved. +%% Copyright Ericsson AB 2000-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 @@ -154,8 +154,7 @@ internal_native2name/1, internal_normalize_utf8/1]). --type unicode_string() :: [unicode:unicode_char()]. --type prim_file_name() :: unicode_string() | unicode:unicode_binary(). +-type prim_file_name() :: string() | unicode:unicode_binary(). -spec internal_name2native(prim_file_name()) -> binary(). @@ -167,7 +166,7 @@ internal_name2native(_) -> internal_native2name(_) -> erlang:nif_error(undefined). --spec internal_normalize_utf8(unicode:unicode_binary()) -> unicode_string(). +-spec internal_normalize_utf8(unicode:unicode_binary()) -> string(). internal_normalize_utf8(_) -> erlang:nif_error(undefined). |