[前][次][番号順一覧][スレッド一覧]

ruby-changes:4414

From: ko1@a...
Date: Sat, 5 Apr 2008 10:05:23 +0900 (JST)
Subject: [ruby-changes:4414] nobu - Ruby:r15905 (ruby_1_8): * object.c (rb_check_to_integer): backported for range_step.

nobu	2008-04-05 10:05:03 +0900 (Sat, 05 Apr 2008)

  New Revision: 15905

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/intern.h
    branches/ruby_1_8/object.c
    branches/ruby_1_8/version.h

  Log:
    * object.c (rb_check_to_integer): backported for range_step.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/intern.h?r1=15905&r2=15904&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15905&r2=15904&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15905&r2=15904&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/object.c?r1=15905&r2=15904&diff_format=u

Index: ruby_1_8/intern.h
===================================================================
--- ruby_1_8/intern.h	(revision 15904)
+++ ruby_1_8/intern.h	(revision 15905)
@@ -319,6 +319,7 @@
 VALUE rb_class_inherited_p _((VALUE, VALUE));
 VALUE rb_convert_type _((VALUE,int,const char*,const char*));
 VALUE rb_check_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_check_to_integer _((VALUE, const char *));
 VALUE rb_to_int _((VALUE));
 VALUE rb_Integer _((VALUE));
 VALUE rb_Float _((VALUE));
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15904)
+++ ruby_1_8/ChangeLog	(revision 15905)
@@ -1,3 +1,7 @@
+Sat Apr  5 10:05:00 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* object.c (rb_check_to_integer): backported for range_step.
+
 Fri Apr  4 05:57:11 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 15904)
+++ ruby_1_8/version.h	(revision 15905)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-04-03"
+#define RUBY_RELEASE_DATE "2008-04-05"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080403
+#define RUBY_RELEASE_CODE 20080405
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/object.c
===================================================================
--- ruby_1_8/object.c	(revision 15904)
+++ ruby_1_8/object.c	(revision 15905)
@@ -2200,6 +2200,19 @@
 }
 
 VALUE
+rb_check_to_integer(VALUE val, const char *method)
+{
+    VALUE v;
+
+    if (FIXNUM_P(val)) return val;
+    v = convert_type(val, "Integer", method, Qfalse);
+    if (!rb_obj_is_kind_of(v, rb_cInteger)) {
+	return Qnil;
+    }
+    return v;
+}
+
+VALUE
 rb_to_int(val)
     VALUE val;
 {

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

[前][次][番号順一覧][スレッド一覧]