From 9eb68d7c44a5c19396b3bc7123d3828bb7ae1b39 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 17 Mar 2010 16:21:45 +0000 Subject: * util.c (ruby_strtod): Add support for Hexadecimal floating-point expression [ruby-dev:40650] #2969 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- util.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'util.c') diff --git a/util.c b/util.c index 5ebc5f3e87..9cdb563040 100644 --- a/util.c +++ b/util.c @@ -2106,6 +2106,44 @@ ruby_strtod(const char *s00, char **se) } break2: if (*s == '0') { + if (s[1] == 'x' || s[1] == 'X') { + static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF"; + s0 = ++s; + adj = 0; + + while (*++s && (s1 = strchr(hexdigit, *s))) { + adj *= 16; + adj += (s1 - hexdigit) & 15; + } + + if (*s == '.') { + aadj = 1.; + while (*++s && (s1 = strchr(hexdigit, *s))) { + aadj /= 16; + adj += aadj * ((s1 - hexdigit) & 15); + } + } + + if (*s != 'P' && *s != 'p') { + s = s0; + goto ret; + } + + dsign = 0x2C - *++s; /* +: 2B, -: 2D */ + if (abs(dsign) != 1) { + s = s0; + goto ret; + } + + 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; while (*++s == '0') ; if (!*s) -- cgit v1.2.1