mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 08:47:28 +01:00
Add PARSE_NUMBER_XXX__ALLOW_UNDERSCORES
This commit is contained in:
1 parent
e82bc8ec7b
commit
c5c9885db4
5 files changed
+190
-83
No files matched your search
@@ -10028,11 +10028,13 @@ wuffs_base__private_implementation__high_prec_dec__parse(
|
||||
uint8_t* p = s.ptr;
|
||||
uint8_t* q = s.ptr + s.len;
|
||||
|
||||
for (;; p++) {
|
||||
if (p >= q) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
} else if (*p != '_') {
|
||||
break;
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
for (;; p++) {
|
||||
if (p >= q) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
} else if (*p != '_') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10046,11 +10048,13 @@ wuffs_base__private_implementation__high_prec_dec__parse(
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
for (;; p++) {
|
||||
if (p >= q) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
} else if (*p != '_') {
|
||||
break;
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
for (;; p++) {
|
||||
if (p >= q) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
} else if (*p != '_') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} while (0);
|
||||
@@ -10081,7 +10085,8 @@ wuffs_base__private_implementation__high_prec_dec__parse(
|
||||
} else if ((*p == 'E') || (*p == 'e')) {
|
||||
p++;
|
||||
goto after_exp;
|
||||
} else if (*p != '_') {
|
||||
} else if ((*p != '_') ||
|
||||
!(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
}
|
||||
}
|
||||
@@ -10117,7 +10122,8 @@ wuffs_base__private_implementation__high_prec_dec__parse(
|
||||
} else if ((*p == 'E') || (*p == 'e')) {
|
||||
p++;
|
||||
goto after_exp;
|
||||
} else if (*p != '_') {
|
||||
} else if ((*p != '_') ||
|
||||
!(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
}
|
||||
}
|
||||
@@ -10155,18 +10161,21 @@ after_sep:
|
||||
} else if ((*p == 'E') || (*p == 'e')) {
|
||||
p++;
|
||||
goto after_exp;
|
||||
} else if (*p != '_') {
|
||||
} else if ((*p != '_') ||
|
||||
!(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
}
|
||||
}
|
||||
|
||||
after_exp:
|
||||
do {
|
||||
for (;; p++) {
|
||||
if (p >= q) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
} else if (*p != '_') {
|
||||
break;
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
for (;; p++) {
|
||||
if (p >= q) {
|
||||
return wuffs_base__make_status(wuffs_base__error__bad_argument);
|
||||
} else if (*p != '_') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10184,7 +10193,8 @@ after_exp:
|
||||
WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION;
|
||||
bool saw_exp_digits = false;
|
||||
for (; p < q; p++) {
|
||||
if (*p == '_') {
|
||||
if ((*p == '_') &&
|
||||
(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
|
||||
// No-op.
|
||||
} else if (('0' <= *p) && (*p <= '9')) {
|
||||
saw_exp_digits = true;
|
||||
@@ -11767,7 +11777,9 @@ wuffs_base__parse_number_i64(wuffs_base__slice_u8 s, uint32_t options) {
|
||||
uint8_t* p = s.ptr;
|
||||
uint8_t* q = s.ptr + s.len;
|
||||
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
}
|
||||
}
|
||||
|
||||
bool negative = false;
|
||||
@@ -11828,7 +11840,9 @@ wuffs_base__parse_number_u64(wuffs_base__slice_u8 s, uint32_t options) {
|
||||
uint8_t* p = s.ptr;
|
||||
uint8_t* q = s.ptr + s.len;
|
||||
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
}
|
||||
}
|
||||
|
||||
if (p >= q) {
|
||||
@@ -11839,23 +11853,27 @@ wuffs_base__parse_number_u64(wuffs_base__slice_u8 s, uint32_t options) {
|
||||
if (p >= q) {
|
||||
goto ok_zero;
|
||||
}
|
||||
if (*p == '_') {
|
||||
p++;
|
||||
for (; p < q; p++) {
|
||||
if (*p != '_') {
|
||||
if (options &
|
||||
WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES) {
|
||||
goto decimal;
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
if (*p == '_') {
|
||||
p++;
|
||||
for (; p < q; p++) {
|
||||
if (*p != '_') {
|
||||
if (options &
|
||||
WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES) {
|
||||
goto decimal;
|
||||
}
|
||||
goto fail_bad_argument;
|
||||
}
|
||||
goto fail_bad_argument;
|
||||
}
|
||||
goto ok_zero;
|
||||
}
|
||||
goto ok_zero;
|
||||
}
|
||||
|
||||
if ((*p == 'x') || (*p == 'X')) {
|
||||
p++;
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
}
|
||||
}
|
||||
if (p < q) {
|
||||
goto hexadecimal;
|
||||
@@ -11863,7 +11881,9 @@ wuffs_base__parse_number_u64(wuffs_base__slice_u8 s, uint32_t options) {
|
||||
|
||||
} else if ((*p == 'd') || (*p == 'D')) {
|
||||
p++;
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
|
||||
for (; (p < q) && (*p == '_'); p++) {
|
||||
}
|
||||
}
|
||||
if (p < q) {
|
||||
goto decimal;
|
||||
@@ -11889,7 +11909,8 @@ decimal:
|
||||
const uint8_t max1 = 5;
|
||||
|
||||
for (; p < q; p++) {
|
||||
if (*p == '_') {
|
||||
if ((*p == '_') &&
|
||||
(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
|
||||
continue;
|
||||
}
|
||||
uint8_t digit = wuffs_base__parse_number__decimal_digits[*p];
|
||||
@@ -11918,7 +11939,8 @@ hexadecimal:
|
||||
v &= 0x0F;
|
||||
|
||||
for (; p < q; p++) {
|
||||
if (*p == '_') {
|
||||
if ((*p == '_') &&
|
||||
(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
|
||||
continue;
|
||||
}
|
||||
uint8_t digit = wuffs_base__parse_number__hexadecimal_digits[*p];
|
||||
|
||||
Reference in new issue
Block a user