nobu	2008-02-16 00:21:51 +0900 (Sat, 16 Feb 2008)

  New Revision: 15490

  Modified files:
    trunk/ChangeLog
    trunk/range.c
    trunk/version.h

  Log:
    * range.c (rb_range_beg_len): check if responds to "begin" and "end"
      methods for non-Range object.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15490&r2=15489&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15490&r2=15489&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/range.c?r1=15490&r2=15489&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15489)
+++ ChangeLog	(revision 15490)
@@ -1,3 +1,8 @@
+Sat Feb 16 00:21:49 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* range.c (rb_range_beg_len): check if responds to "begin" and "end"
+	  methods for non-Range object.
+
 Fri Feb 15 20:29:42 2008  Masaki Suketa  <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage
Index: range.c
===================================================================
--- range.c	(revision 15489)
+++ range.c	(revision 15490)
@@ -597,12 +597,10 @@
 	excl = EXCL(range);
     }
     else {
-	b = rb_check_to_integer(range, "begin");
-	if (NIL_P(b))
-	    return Qfalse;
-	e = rb_check_to_integer(range, "end");
-	if (NIL_P(e))
-	    return Qfalse;
+	if (!rb_respond_to(range, id_beg)) return Qfalse;
+	if (!rb_respond_to(range, id_end)) return Qfalse;
+	b = rb_funcall(range, id_beg, 0);
+	e = rb_funcall(range, id_end, 0);
 	excl = RTEST(rb_funcall(range, rb_intern("exclude_end?"), 0));
     }
     beg = NUM2LONG(b);
@@ -751,8 +749,6 @@
     }
     else if (TYPE(beg) == T_STRING && TYPE(end) == T_STRING &&
 	     RSTRING_LEN(beg) == 1 && RSTRING_LEN(end) == 1) {
-	rb_encoding *enc = rb_enc_check(beg, end);
-
 	if (NIL_P(val)) return Qfalse;
 	if (TYPE(val) == T_STRING) {
 	    if (RSTRING_LEN(val) == 0 || RSTRING_LEN(val) > 1)
Index: version.h
===================================================================
--- version.h	(revision 15489)
+++ version.h	(revision 15490)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-02-15"
+#define RUBY_RELEASE_DATE "2008-02-16"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080215
+#define RUBY_RELEASE_CODE 20080216
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 16
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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