13b13d1fdd
This includes making int("01") parse in base 10 like standard Python.
When a base of 0 is specified it means auto-detect based on the prefix, and
literals begining with 0 (except when the literal is all 0's) like "01" are
then invalid and now throw an exception.
The new error message is different from CPython. It says e.g.,
`SyntaxError: invalid syntax for integer with base 0: '09'`
Additional test cases were added to cover the changed & added code.
Co-authored-by: Damien George <damien@micropython.org>
Signed-off-by: Jeff Epler <jepler@gmail.com>
65 lines
2.2 KiB
C
65 lines
2.2 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "py/mpconfig.h"
|
|
#include "py/misc.h"
|
|
#include "py/parsenumbase.h"
|
|
|
|
// find real radix base, and strip preceding '0x', '0o' and '0b'
|
|
// puts base in *base, and returns number of bytes to skip the prefix
|
|
// in base-0, puts 1 in *base to indicate a number that starts with 0, to provoke a
|
|
// ValueError if it's not all-digits-zero.
|
|
size_t mp_parse_num_base(const char *str, size_t len, int *base) {
|
|
const byte *p = (const byte *)str;
|
|
if (len <= 1) {
|
|
goto no_prefix;
|
|
}
|
|
unichar c = *(p++);
|
|
if (c == '0') {
|
|
c = *(p++) | 32;
|
|
int b = *base;
|
|
if (c == 'x' && !(b & ~16)) {
|
|
*base = 16;
|
|
} else if (c == 'o' && !(b & ~8)) {
|
|
*base = 8;
|
|
} else if (c == 'b' && !(b & ~2)) {
|
|
*base = 2;
|
|
} else {
|
|
p -= 2;
|
|
if (b == 0) {
|
|
*base = 1;
|
|
}
|
|
}
|
|
} else {
|
|
p--;
|
|
no_prefix:
|
|
if (*base == 0) {
|
|
*base = 10;
|
|
}
|
|
}
|
|
return p - (const byte *)str;
|
|
}
|