diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 13:37:59 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 13:37:59 +0000 |
commit | ba595fe918f57f851b117926db9be1087c881de1 (patch) | |
tree | e913b2001f896dba289c093d3434e5267726c0e3 | |
parent | 3ae8d8aa4dbd4406a3033e8a4d9f9fd55ec99707 (diff) |
merges r24205 from trunk into ruby_1_9_1.
--
* complex.c (make_patterns): do not use \d.
* rational.c (make_patterns): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | complex.c | 2 | ||||
-rw-r--r-- | rational.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Jul 19 20:41:24 2009 Tadayoshi Funaba <tadf@dotrb.org> + + * complex.c (make_patterns): do not use \d. + + * rational.c (make_patterns): ditto. + Fri Apr 30 03:38:14 2010 NAKAMURA Usaku <usa@ruby-lang.org> * numeric.c (fix_mul): the width of fixnum is same as long's on all @@ -1054,7 +1054,7 @@ static VALUE comp_pat0, comp_pat1, comp_pat2, a_slash, a_dot_and_an_e, null_string, underscores_pat, an_underscore; #define WS "\\s*" -#define DIGITS "(?:\\d(?:_\\d|\\d)*)" +#define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)" #define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?" #define DENOMINATOR DIGITS #define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?" diff --git a/rational.c b/rational.c index 70f7f16283..92d884d8d5 100644 --- a/rational.c +++ b/rational.c @@ -1313,7 +1313,7 @@ float_to_r(VALUE self) static VALUE rat_pat, an_e_pat, a_dot_pat, underscores_pat, an_underscore; #define WS "\\s*" -#define DIGITS "(?:\\d(?:_\\d|\\d)*)" +#define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)" #define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?" #define DENOMINATOR DIGITS #define PATTERN "\\A" WS "([-+])?(" NUMERATOR ")(?:\\/(" DENOMINATOR "))?" WS @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 425 +#define RUBY_PATCHLEVEL 426 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |