summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-28 14:28:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-28 14:28:11 +0000
commit47eb32f56424b63ecb6d7fa9c5e1b7355fa1e5f1 (patch)
tree18f7afa31393a2d81d5a48ebad49ac61afc8e665
parent91ea1529c69e6c38be71ebe15f8204144c8b7991 (diff)
* object.c (rb_cstr_to_dbl): underscores should appear only
between digits. [ruby-dev:28891] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--object.c11
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d402504d4..ad3d0dc610 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 28 23:23:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * object.c (rb_cstr_to_dbl): underscores should appear only
+ between digits. [ruby-dev:28891]
+
Wed Jun 28 19:04:34 2006 Tanaka Akira <akr@m17n.org>
* test/socket/test_unix.rb: test_seqpacket_pair removed.
diff --git a/object.c b/object.c
index afbcd61e28..733f4f88f9 100644
--- a/object.c
+++ b/object.c
@@ -2073,8 +2073,8 @@ rb_cstr_to_dbl(const char *p, int badcheck)
errno = 0;
}
if (p == end) {
+ bad:
if (badcheck) {
- bad:
rb_invalid_str(q, "Float()");
}
return d;
@@ -2087,15 +2087,12 @@ rb_cstr_to_dbl(const char *p, int badcheck)
while (*p) {
if (*p == '_') {
/* remove underscores between digits */
+ if (n == buf || !ISDIGIT(n[-1])) goto bad;
+ while (*++p == '_');
if (badcheck) {
- if (n == buf || !ISDIGIT(n[-1])) goto bad;
- ++p;
if (!ISDIGIT(*p)) goto bad;
}
- else {
- while (*++p == '_');
- continue;
- }
+ continue;
}
*n++ = *p++;
}