diff options
| author | Hans Bolinder <[email protected]> | 2011-07-06 09:53:11 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-07-06 09:53:11 +0200 |
| commit | db8cbaf6ee77aca55823f080fbcb1eea5cf2c208 (patch) | |
| tree | e5889d79764935339571cb06fe15851708d6cd35 /lib | |
| parent | 6b96ae3505ebf15f9d12f3bb353ec6b80afa80b8 (diff) | |
| parent | e1ad871bf09949b106d4621f2e2bf11e07098213 (diff) | |
| download | otp-db8cbaf6ee77aca55823f080fbcb1eea5cf2c208.tar.gz otp-db8cbaf6ee77aca55823f080fbcb1eea5cf2c208.tar.bz2 otp-db8cbaf6ee77aca55823f080fbcb1eea5cf2c208.zip | |
Merge branch 'dev' into major
* dev:
Correct the contract of io_lib:fread/2,3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/io_lib.erl | 4 |
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()}. |