diff options
| author | Rachel Dowdall <rjdowdall@gmail.com> | 2014-03-22 12:17:36 +0000 |
|---|---|---|
| committer | Rachel Dowdall <rjdowdall@gmail.com> | 2014-03-22 12:17:36 +0000 |
| commit | 17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5 (patch) | |
| tree | 36077e73d30aa91f94ed74b707facc86b7ed7937 /py/parsenum.h | |
| parent | 300c8bd4c2c0c6d626a6aaeb873c22a8f8b9fc3f (diff) | |
| parent | da8d21e0dd236ae5e31bfac4ff8d5b73ddd49282 (diff) | |
| download | micropython-17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5.tar.gz micropython-17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'py/parsenum.h')
| -rw-r--r-- | py/parsenum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/parsenum.h b/py/parsenum.h index 5a2e42da50..97578423c7 100644 --- a/py/parsenum.h +++ b/py/parsenum.h @@ -1,2 +1,2 @@ mp_obj_t mp_parse_num_integer(const char *restrict str, uint len, int base); -mp_obj_t mp_parse_num_decimal(const char *str, uint len); +mp_obj_t mp_parse_num_decimal(const char *str, uint len, bool allow_imag, bool force_complex); |