summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-19 11:43:23 +0000
committertadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-19 11:43:23 +0000
commit59c2a7c222855e5a3cfbfa2740a09442760b116c (patch)
treefe97def7a4898e1288f1187f8ed52de71d1de229
parent01806711bd0bd3f43c6bcc804de62213235e27fd (diff)
downloadruby-59c2a7c222855e5a3cfbfa2740a09442760b116c.tar.gz
ruby-59c2a7c222855e5a3cfbfa2740a09442760b116c.tar.xz
ruby-59c2a7c222855e5a3cfbfa2740a09442760b116c.zip
* complex.c (make_patterns): do not use \d.
* rational.c (make_patterns): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--complex.c2
-rw-r--r--rational.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dffca496c..62056bfe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
Sun Jul 19 17:32:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_read): should taint the result. [ruby-dev:38826]
diff --git a/complex.c b/complex.c
index 91f53e643..fcaf2d821 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 a9e60ebc0..c14bc9468 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