summaryrefslogtreecommitdiff
path: root/py/parsenum.c
diff options
context:
space:
mode:
Diffstat (limited to 'py/parsenum.c')
-rw-r--r--py/parsenum.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/py/parsenum.c b/py/parsenum.c
index a72829b20..96f05ff82 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -42,7 +42,7 @@ STATIC NORETURN void raise_exc(mp_obj_t exc, mp_lexer_t *lex) {
// if lex!=NULL then the parser called us and we need to convert the
// exception's type from ValueError to SyntaxError and add traceback info
if (lex != NULL) {
- ((mp_obj_base_t*)MP_OBJ_TO_PTR(exc))->type = &mp_type_SyntaxError;
+ ((mp_obj_base_t *)MP_OBJ_TO_PTR(exc))->type = &mp_type_SyntaxError;
mp_obj_exception_add_traceback(exc, lex->source_name, lex->tok_line, MP_QSTR_NULL);
}
nlr_raise(exc);
@@ -75,7 +75,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
}
// parse optional base prefix
- str += mp_parse_num_base((const char*)str, top - str, &base);
+ str += mp_parse_num_base((const char *)str, top - str, &base);
// string should be an integer number
mp_int_t int_val = 0;
@@ -139,30 +139,30 @@ have_ret_val:
overflow:
// reparse using long int
{
- const char *s2 = (const char*)str_val_start;
+ const char *s2 = (const char *)str_val_start;
ret_val = mp_obj_new_int_from_str_len(&s2, top - str_val_start, neg, base);
- str = (const byte*)s2;
+ str = (const byte *)s2;
goto have_ret_val;
}
-value_error: ;
+value_error:;
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
- mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_ValueError,
- translate("invalid syntax for integer"));
- raise_exc(exc, lex);
+ mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_ValueError,
+ translate("invalid syntax for integer"));
+ raise_exc(exc, lex);
#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
- mp_obj_t exc = mp_obj_new_exception_msg_varg(&mp_type_ValueError,
- translate("invalid syntax for integer with base %d"), base);
- raise_exc(exc, lex);
+ mp_obj_t exc = mp_obj_new_exception_msg_varg(&mp_type_ValueError,
+ translate("invalid syntax for integer with base %d"), base);
+ raise_exc(exc, lex);
#else
- vstr_t vstr;
- mp_print_t print;
- vstr_init_print(&vstr, 50, &print);
- mp_printf(&print, "invalid syntax for integer with base %d: ", base);
- mp_str_print_quoted(&print, str_val_start, top - str_val_start, true);
- mp_obj_t exc = mp_obj_new_exception_arg1(&mp_type_ValueError,
- mp_obj_new_str_from_vstr(&mp_type_str, &vstr));
- raise_exc(exc, lex);
+ vstr_t vstr;
+ mp_print_t print;
+ vstr_init_print(&vstr, 50, &print);
+ mp_printf(&print, "invalid syntax for integer with base %d: ", base);
+ mp_str_print_quoted(&print, str_val_start, top - str_val_start, true);
+ mp_obj_t exc = mp_obj_new_exception_arg1(&mp_type_ValueError,
+ mp_obj_new_str_from_vstr(&mp_type_str, &vstr));
+ raise_exc(exc, lex);
#endif
}
@@ -173,19 +173,19 @@ typedef enum {
} parse_dec_in_t;
mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool force_complex, mp_lexer_t *lex) {
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
// DEC_VAL_MAX only needs to be rough and is used to retain precision while not overflowing
// SMALL_NORMAL_VAL is the smallest power of 10 that is still a normal float
-#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
+ #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
#define DEC_VAL_MAX 1e20F
#define SMALL_NORMAL_VAL (1e-37F)
#define SMALL_NORMAL_EXP (-37)
-#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+ #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
#define DEC_VAL_MAX 1e200
#define SMALL_NORMAL_VAL (1e-307)
#define SMALL_NORMAL_EXP (-307)
-#endif
+ #endif
const char *top = str + len;
mp_float_t dec_val = 0;
@@ -214,7 +214,7 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
if (str + 2 < top && (str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'f') {
// inf
str += 3;
- dec_val = (mp_float_t) INFINITY;
+ dec_val = (mp_float_t)INFINITY;
if (str + 4 < top && (str[0] | 0x20) == 'i' && (str[1] | 0x20) == 'n' && (str[2] | 0x20) == 'i' && (str[3] | 0x20) == 't' && (str[4] | 0x20) == 'y') {
// infinity
str += 5;
@@ -320,17 +320,17 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
}
// return the object
-#if MICROPY_PY_BUILTINS_COMPLEX
+ #if MICROPY_PY_BUILTINS_COMPLEX
if (imag) {
return mp_obj_new_complex(0, dec_val);
} else if (force_complex) {
return mp_obj_new_complex(dec_val, 0);
}
-#else
+ #else
if (imag || force_complex) {
raise_exc(mp_obj_new_exception_msg(&mp_type_ValueError, translate("complex values not supported")), lex);
}
-#endif
+ #endif
else {
return mp_obj_new_float(dec_val);
}
@@ -338,7 +338,7 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
value_error:
raise_exc(mp_obj_new_exception_msg(&mp_type_ValueError, translate("invalid syntax for number")), lex);
-#else
+ #else
raise_exc(mp_obj_new_exception_msg(&mp_type_ValueError, translate("decimal numbers not supported")), lex);
-#endif
+ #endif
}