nobu	2008-06-27 00:44:42 +0900 (Fri, 27 Jun 2008)

  New Revision: 17591

  Modified files:
    branches/mvm/ChangeLog
    branches/mvm/io.c
    branches/mvm/string.c

  Log:
    * io.c (argf_binmode_p): fix for backport.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/ChangeLog?r1=17591&r2=17590&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/string.c?r1=17591&r2=17590&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/io.c?r1=17591&r2=17590&diff_format=u

Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 17590)
+++ mvm/ChangeLog	(revision 17591)
@@ -1,3 +1,7 @@
+Fri Jun 27 00:44:39 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (argf_binmode_p): fix for backport.
+
 Fri Jun 27 00:00:14 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
@@ -3,4 +7,9 @@
 	  Yamaguchi <keita.yamaguchi at gmail.com>.
 
+Thu Jun 26 23:58:29 2008  Yusuke Endoh  <mame@t...>
+
+	* string.c (rb_str_index_m, rb_str_rindex_m, rb_str_include): fix
+	  rdoc.
+
 Thu Jun 26 17:43:41 2008  Yukihiro Matsumoto  <matz@r...>
 
Index: mvm/string.c
===================================================================
--- mvm/string.c	(revision 17590)
+++ mvm/string.c	(revision 17591)
@@ -2093,19 +2093,17 @@
 /*
  *  call-seq:
  *     str.index(substring [, offset])   => fixnum or nil
- *     str.index(fixnum [, offset])      => fixnum or nil
  *     str.index(regexp [, offset])      => fixnum or nil
  *  
- *  Returns the index of the first occurrence of the given <i>substring</i>,
- *  character (<i>fixnum</i>), or pattern (<i>regexp</i>) in <i>str</i>. Returns
- *  <code>nil</code> if not found. If the second parameter is present, it
- *  specifies the position in the string to begin the search.
+ *  Returns the index of the first occurrence of the given <i>substring</i> or
+ *  pattern (<i>regexp</i>) in <i>str</i>. Returns <code>nil</code> if not
+ *  found. If the second parameter is present, it specifies the position in the
+ *  string to begin the search.
  *     
  *     "hello".index('e')             #=> 1
  *     "hello".index('lo')            #=> 3
  *     "hello".index('a')             #=> nil
  *     "hello".index(?e)              #=> 1
- *     "hello".index(101)             #=> 1
  *     "hello".index(/[aeiou]/, -3)   #=> 4
  */
 
@@ -2202,20 +2200,18 @@
 /*
  *  call-seq:
  *     str.rindex(substring [, fixnum])   => fixnum or nil
- *     str.rindex(fixnum [, fixnum])   => fixnum or nil
  *     str.rindex(regexp [, fixnum])   => fixnum or nil
  *  
- *  Returns the index of the last occurrence of the given <i>substring</i>,
- *  character (<i>fixnum</i>), or pattern (<i>regexp</i>) in <i>str</i>. Returns
- *  <code>nil</code> if not found. If the second parameter is present, it
- *  specifies the position in the string to end the search---characters beyond
- *  this point will not be considered.
+ *  Returns the index of the last occurrence of the given <i>substring</i> or
+ *  pattern (<i>regexp</i>) in <i>str</i>. Returns <code>nil</code> if not
+ *  found. If the second parameter is present, it specifies the position in the
+ *  string to end the search---characters beyond this point will not be
+ *  considered.
  *     
  *     "hello".rindex('e')             #=> 1
  *     "hello".rindex('l')             #=> 3
  *     "hello".rindex('a')             #=> nil
  *     "hello".rindex(?e)              #=> 1
- *     "hello".rindex(101)             #=> 1
  *     "hello".rindex(/[aeiou]/, -2)   #=> 1
  */
 
@@ -3596,7 +3592,6 @@
 /*
  *  call-seq:
  *     str.include? other_str   => true or false
- *     str.include? fixnum      => true or false
  *  
  *  Returns <code>true</code> if <i>str</i> contains the given string or
  *  character.
Index: mvm/io.c
===================================================================
--- mvm/io.c	(revision 17590)
+++ mvm/io.c	(revision 17591)
@@ -7381,7 +7381,7 @@
 static VALUE
 argf_binmode_p(VALUE argf)
 {
-    return argf_binmode ? Qtrue : Qfalse;
+    return argf_of(argf).binmode ? Qtrue : Qfalse;
 }
 
 static VALUE

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/