aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--bignum.c14
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cd1f9adac2..189c84f379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 30 12:06:43 2008 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * bignum.c (rb_cstr_to_inum): '0_2' is a valid representatin.
+
Wed Jan 30 11:57:50 2008 NARUSE, Yui <naruse@ruby-lang.org>
* bootstraptest/runner.rb: fix -I../../hoge case.
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);