From fb997983a29d97dbac13354c8e87cdf2b1742c4d Mon Sep 17 00:00:00 2001 From: tadf Date: Wed, 30 Jan 2008 03:07:37 +0000 Subject: * bignum.c (rb_cstr_to_inum): '0_2' is a valid representatin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- bignum.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'bignum.c') diff --git a/bignum.c b/bignum.c index ec5b8e8cce..eae1f7e735 100644 --- a/bignum.c +++ b/bignum.c @@ -438,7 +438,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) len = 2; break; case 8: - if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O'||str[1] == '_')) { + if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) { str += 2; } case 4: case 5: case 6: case 7: @@ -470,8 +470,16 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) break; } if (*str == '0') { /* squeeze preceding 0s */ - while (*++str == '0'); - if (!(c = *str) || ISSPACE(c)) --str; + int nn = 0; + while ((c = *++str) == '0' || c == '_') { + if (c == '_') { + nn++; + if (nn >= 2) + break; + } else + nn = 0; + } + if (!(c = *str) || ISSPACE(c)) --str; } c = *str; c = conv_digit(c); -- cgit v1.2.3