From a7290749a5a6d4e0420d4b18a8153b25f86c34f2 Mon Sep 17 00:00:00 2001 From: tadf Date: Sun, 19 Jul 2009 11:43:23 +0000 Subject: [PATCH] * complex.c (make_patterns): do not use \d. * rational.c (make_patterns): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ complex.c | 2 +- rational.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dffca496cb..62056bfe3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jul 19 20:41:24 2009 Tadayoshi Funaba + + * complex.c (make_patterns): do not use \d. + + * rational.c (make_patterns): ditto. + Sun Jul 19 17:32:37 2009 Nobuyoshi Nakada * io.c (io_read): should taint the result. [ruby-dev:38826] diff --git a/complex.c b/complex.c index 91f53e643e..fcaf2d8216 100644 --- a/complex.c +++ b/complex.c @@ -1406,7 +1406,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 a9e60ebc09..c14bc94681 100644 --- a/rational.c +++ b/rational.c @@ -1723,7 +1723,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