aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-04 04:14:37 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-04 04:14:37 +0000
commit39802186b2135cce68882770aa36dc09ad6cb311 (patch)
treeec6dff1eef7ef8abf23cd7ae11252432b4d2eccb
parentd5e1b514f9113ac0f706bb46b8a20a1dd5ec7390 (diff)
downloadruby-39802186b2135cce68882770aa36dc09ad6cb311.tar.gz
* ext/stringio/stringio.c (ungetc): RDoc updated. trunk allows
pushing back behind the beginning of the pseudo stream. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/stringio/stringio.c7
-rw-r--r--test/stringio/test_stringio.rb2
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ee90df1ad5..d72dbd0dd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 4 13:10:23 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * ext/stringio/stringio.c (ungetc): RDoc updated. trunk allows
+ pushing back behind the beginning of the pseudo stream.
+
Fri Dec 4 03:10:38 2009 Shugo Maeda <shugo@ruby-lang.org>
* compile.c (compile_cpath, iseq_compile_each): reverted
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 802c462b56..f193c6ef6a 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -696,10 +696,9 @@ strio_extend(struct StringIO *ptr, long pos, long len)
* strio.ungetc(string) -> nil
*
* Pushes back one character (passed as a parameter) onto *strio*
- * such that a subsequent buffered read will return it. Pushing back
- * behind the beginning of the buffer string is not possible. Nothing
- * will be done if such an attempt is made.
- * In other case, there is no limitation for multiple pushbacks.
+ * such that a subsequent buffered read will return it. There is no
+ * limitation for multiple pushbacks including pushing back behind the
+ * beginning of the buffer string.
*/
static VALUE
strio_ungetc(VALUE self, VALUE c)
diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb
index 63647683ca..30284faee2 100644
--- a/test/stringio/test_stringio.rb
+++ b/test/stringio/test_stringio.rb
@@ -327,7 +327,7 @@ class TestStringIO < Test::Unit::TestCase
s = "1234"
f = StringIO.new(s, "r")
assert_nothing_raised { f.ungetc("x") }
- assert_equal("x", f.getc) # bug?
+ assert_equal("x", f.getc) # bug? -> it's a feature from 1.9.
assert_equal("1", f.getc)
s = "1234"