* object.c (rb_cstr_to_dbl): underscores should appear only

  between digits.  [ruby-dev:28891]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 7 deletions

diff --git a/object.c b/object.c
index afbcd61e2..733f4f88f 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++;
 	}