shyouhei	2009-08-04 11:04:58 +0900 (Tue, 04 Aug 2009)

  New Revision: 24385

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24385

  Log:
    merge revision(s) 24190,24192:
    * re.h (RMATCH_REGS): added for compatibility.
    * ruby.h (RFLOAT_VALUE, RSTRING_END, RREGEXP_SRC_*, RBIGNUM_*):
      backported macros for compatiblity from trunk.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/re.h
    branches/ruby_1_8_7/ruby.h
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24384)
+++ ruby_1_8_7/ChangeLog	(revision 24385)
@@ -1,3 +1,7 @@
+Tue Aug  4 11:00:30 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* re.h (RMATCH_REGS): added for compatibility.
+
 Mon Aug  3 14:46:53 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/complex.rb (Numeric#arg): should return NaN for NaN.
Index: ruby_1_8_7/re.h
===================================================================
--- ruby_1_8_7/re.h	(revision 24384)
+++ ruby_1_8_7/re.h	(revision 24385)
@@ -27,6 +27,7 @@
 };
 
 #define RMATCH(obj)  (R_CAST(RMatch)(obj))
+#define RMATCH_REGS(obj)  (R_CAST(RMatch)(obj)->regs)
 
 VALUE rb_reg_regcomp _((VALUE));
 long rb_reg_search _((VALUE, VALUE, long, long));
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24384)
+++ ruby_1_8_7/version.h	(revision 24385)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-08-03"
+#define RUBY_RELEASE_DATE "2009-08-04"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090803
-#define RUBY_PATCHLEVEL 193
+#define RUBY_RELEASE_CODE 20090804
+#define RUBY_PATCHLEVEL 194
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/ruby.h
===================================================================
--- ruby_1_8_7/ruby.h	(revision 24384)
+++ ruby_1_8_7/ruby.h	(revision 24385)
@@ -342,6 +342,7 @@
     struct RBasic basic;
     double value;
 };
+#define RFLOAT_VALUE(v) (RFLOAT(v)->value)
 
 #define ELTS_SHARED FL_USER2
 
@@ -356,6 +357,7 @@
 };
 #define RSTRING_PTR(s) (RSTRING(s)->ptr)
 #define RSTRING_LEN(s) (RSTRING(s)->len)
+#define RSTRING_END(s) (RSTRING_PTR(s)+RSTRING_LEN(s))
 
 struct RArray {
     struct RBasic basic;
@@ -375,6 +377,8 @@
     long len;
     char *str;
 };
+#define RREGEXP_SRC_PTR(r) (RREGEXP(r)->src)
+#define RREGEXP_SRC_LEN(r) (RREGEXP(r)->len)
 
 struct RHash {
     struct RBasic basic;
@@ -437,6 +441,12 @@
     long len;
     void *digits;
 };
+#define RBIGNUM_SIGN(b)       (RBIGNUM(b)->sign)
+#define RBIGNUM_SET_SIGN(b,s) (RBIGNUM(b)->sign = (s))
+#define RBIGNUM_POSITIVE_P(b) RBIGNUM_SIGN(b)
+#define RBIGNUM_NEGATIVE_P(b) (!RBIGNUM_SIGN(b))
+#define RBIGNUM_LEN(b)        (RBIGNUM(b)->len)
+#define RBIGNUM_DIGITS(b)     (RBIGNUM(b)->digits)
 
 #define R_CAST(st)   (struct st*)
 #define RBASIC(obj)  (R_CAST(RBasic)(obj))

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