admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

an int literal may have multiple underscores inside

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-03-27 13:33:14 +09:00
parent 9434506035
commit 70718d5935
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+8 -7
View File
@@ -1954,7 +1954,7 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
{
const char *p;
char sign = 1;
int c, us;
int c, uscore;
unsigned long n = 0;
mrb_int val;
@@ -2042,14 +2042,14 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
break;
} /* end of switch (base) { */
if (*str == '0') { /* squeeze preceeding 0s */
us = 0;
uscore = 0;
while ((c = *++str) == '0' || c == '_') {
if (c == '_') {
if (++us >= 2)
if (++uscore >= 2)
break;
}
else
us = 0;
uscore = 0;
}
if (!(c = *str) || ISSPACE(c)) --str;
}
@@ -2060,16 +2060,17 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
return mrb_fixnum_value(0);
}
us = 0;
uscore = 0;
for (p=str;*p;p++) {
if (*p == '_') {
if (us == 0) {
us++;
if (uscore == 0) {
uscore++;
continue;
}
if (badcheck) goto bad;
break;
}
uscore = 0;
c = conv_digit(*p);
if (c < 0 || c >= base) {
if (badcheck) goto bad;