aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2011-07-06 09:51:18 +0200
committerHans Bolinder <[email protected]>2011-07-06 09:51:18 +0200
commite1ad871bf09949b106d4621f2e2bf11e07098213 (patch)
tree39e9a6c15ccbab524ca8b59ddd6e5f95c7982684
parent2ed4f2bb674cccb9791a1a9420ee84aec1851e40 (diff)
parentb681c4c073381c57ac9982a4fa96dbc780190a92 (diff)
downloadotp-e1ad871bf09949b106d4621f2e2bf11e07098213.tar.gz
otp-e1ad871bf09949b106d4621f2e2bf11e07098213.tar.bz2
otp-e1ad871bf09949b106d4621f2e2bf11e07098213.zip
Merge branch 'hb/spec_bug/OTP-9413' into dev
* hb/spec_bug/OTP-9413: Correct the contract of io_lib:fread/2,3
-rw-r--r--lib/stdlib/src/io_lib.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 54c7283abf..165e03e506 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -100,7 +100,7 @@ fwrite(Format, Args) ->
-spec fread(Format, String) -> Result when
Format :: string(),
String :: string(),
- Result :: {'ok', InputList :: chars(), LeftOverChars :: string()}
+ Result :: {'ok', InputList :: [term()], LeftOverChars :: string()}
| {'more', RestFormat :: string(),
Nchars :: non_neg_integer(),
InputStack :: chars()}
@@ -115,7 +115,7 @@ fread(Chars, Format) ->
Format :: string(),
Return :: {'more', Continuation1 :: continuation()}
| {'done', Result, LeftOverChars :: string()},
- Result :: {'ok', InputList :: chars()}
+ Result :: {'ok', InputList :: [term()]}
| 'eof'
| {'error', What :: term()}.