Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
7b4b78bc
Commit
7b4b78bc
authored
11 years ago
by
Damien George
Browse files
Options
Downloads
Patches
Plain Diff
py: Put back proper ValueError for badly parsed integers.
parent
b035db35
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
py/parsenum.c
+10
-1
10 additions, 1 deletion
py/parsenum.c
with
10 additions
and
1 deletion
py/parsenum.c
+
10
−
1
View file @
7b4b78bc
...
...
@@ -41,6 +41,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str, uint len, int base) {
// string should be an integer number
machine_int_t
int_val
=
0
;
const
char
*
restrict
str_val_start
=
str
;
for
(;
str
<
top
;
str
++
)
{
machine_int_t
old_val
=
int_val
;
int
dig
=
*
str
;
...
...
@@ -69,6 +70,11 @@ mp_obj_t mp_parse_num_integer(const char *restrict str, uint len, int base) {
}
}
// check we parsed something
if
(
str
==
str_val_start
)
{
goto
value_error
;
}
// negate value if needed
if
(
neg
)
{
int_val
=
-
int_val
;
...
...
@@ -80,12 +86,15 @@ mp_obj_t mp_parse_num_integer(const char *restrict str, uint len, int base) {
// check we reached the end of the string
if
(
str
!=
top
)
{
nlr_jump
(
mp_obj_new_exception_msg
(
&
mp_type_SyntaxError
,
"invalid syntax for number"
))
;
goto
value_error
;
}
// return the object
return
MP_OBJ_NEW_SMALL_INT
(
int_val
);
value_error:
nlr_jump
(
mp_obj_new_exception_msg_varg
(
&
mp_type_ValueError
,
"invalid literal for int() with base %d: '%s'"
,
base
,
str
));
overflow:
// TODO reparse using bignum
nlr_jump
(
mp_obj_new_exception_msg
(
&
mp_type_ValueError
,
"overflow parsing integer"
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment