* object.c (rb_cstr_to_dbl): return 0.0 if hexadecimal and

  baccheck is FALSE: Float("0x1p+0") works, but "0x1p+0".to_f
  doesn't. [ruby-dev:40650]

* util.c (ruby_strtod): allow hexdecimal integers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 16 deletions

diff --git a/util.c b/util.c
index 9cdb563040..11d0272e52 100644
--- a/util.c
+++ b/util.c
@@ -2124,24 +2124,21 @@ break2:
 		}
 	    }
 
-	    if (*s != 'P' && *s != 'p') {
-		s = s0;
-		goto ret;
+	    if (*s == 'P' || *s == 'p') {
+		dsign = 0x2C - *++s; /* +: 2B, -: 2D */
+		if (abs(dsign) == 1) s++;
+		else dsign = 1;
+
+		for (nd = 0; (c = *s) >= '0' && c <= '9'; s++) {
+		    nd *= 10;
+		    nd += c;
+		    nd -= '0';
+		}
+		dval(rv) = ldexp(adj, nd * dsign);
 	    }
-
-	    dsign = 0x2C - *++s; /* +: 2B, -: 2D */
-	    if (abs(dsign) != 1) {
-		s = s0;
-		goto ret;
+	    else {
+		dval(rv) = adj;
 	    }
-
-	    for (nd = 0, s++; (c = *s) >= '0' && c <= '9'; s++) {
-		nd *= 10;
-		nd += c;
-		nd -= '0';
-	    }
-
-	    dval(rv) = ldexp(adj, nd * dsign);
 	    goto ret;
 	}
         nz0 = 1;