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
GitLab 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
69b3ba0d
Commit
69b3ba0d
authored
11 years ago
by
Damien George
Browse files
Options
Downloads
Patches
Plain Diff
py: Swap around the double return value of mp_obj_gen_resume.
Just to keep things consistent :)
parent
66eaf84b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
py/objgenerator.c
+32
-28
32 additions, 28 deletions
py/objgenerator.c
py/objgenerator.h
+1
-1
1 addition, 1 deletion
py/objgenerator.h
with
33 additions
and
29 deletions
py/objgenerator.c
+
32
−
28
View file @
69b3ba0d
...
...
@@ -74,11 +74,11 @@ mp_obj_t gen_instance_getiter(mp_obj_t self_in) {
return
self_in
;
}
mp_
obj
_t
mp_obj_gen_resume
(
mp_obj_t
self_in
,
mp_obj_t
send_value
,
mp_obj_t
throw_value
,
mp_
vm_return_kind
_t
*
ret_
kind
)
{
mp_
vm_return_kind
_t
mp_obj_gen_resume
(
mp_obj_t
self_in
,
mp_obj_t
send_value
,
mp_obj_t
throw_value
,
mp_
obj
_t
*
ret_
val
)
{
mp_obj_gen_instance_t
*
self
=
self_in
;
if
(
self
->
ip
==
0
)
{
*
ret_
kind
=
MP_
VM_RETURN_NORMA
L
;
return
MP_
OBJ_NUL
L
;
*
ret_
val
=
MP_
OBJ_NUL
L
;
return
MP_
VM_RETURN_NORMA
L
;
}
if
(
self
->
sp
==
self
->
state
-
1
)
{
if
(
send_value
!=
mp_const_none
)
{
...
...
@@ -87,11 +87,11 @@ mp_obj_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw
}
else
{
*
self
->
sp
=
send_value
;
}
*
ret_kind
=
mp_execute_byte_code_2
(
self
->
code_info
,
&
self
->
ip
,
mp_vm_return_kind_t
ret_kind
=
mp_execute_byte_code_2
(
self
->
code_info
,
&
self
->
ip
,
&
self
->
state
[
self
->
n_state
-
1
],
&
self
->
sp
,
(
mp_exc_stack
*
)(
self
->
state
+
self
->
n_state
),
&
self
->
exc_sp
,
throw_value
);
switch
(
*
ret_kind
)
{
switch
(
ret_kind
)
{
case
MP_VM_RETURN_NORMAL
:
// Explicitly mark generator as completed. If we don't do this,
// subsequent next() may re-execute statements after last yield
...
...
@@ -99,26 +99,30 @@ mp_obj_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw
// TODO: check how return with value behaves under such conditions
// in CPython.
self
->
ip
=
0
;
return
*
self
->
sp
;
*
ret_val
=
*
self
->
sp
;
break
;
case
MP_VM_RETURN_YIELD
:
return
*
self
->
sp
;
*
ret_val
=
*
self
->
sp
;
break
;
case
MP_VM_RETURN_EXCEPTION
:
self
->
ip
=
0
;
return
self
->
state
[
self
->
n_state
-
1
];
*
ret_val
=
self
->
state
[
self
->
n_state
-
1
];
break
;
default:
assert
(
0
);
return
mp_const_none
;
*
ret_val
=
mp_const_none
;
break
;
}
return
ret_kind
;
}
STATIC
mp_obj_t
gen_resume_and_raise
(
mp_obj_t
self_in
,
mp_obj_t
send_value
,
mp_obj_t
throw_value
)
{
mp_vm_return_kind_t
ret_kind
;
mp_obj_t
ret
=
mp_obj_gen_resume
(
self_in
,
send_value
,
throw_value
,
&
ret_kind
);
switch
(
ret_kind
)
{
mp_obj_t
ret
;
switch
(
mp_obj_gen_resume
(
self_in
,
send_value
,
throw_value
,
&
ret
))
{
case
MP_VM_RETURN_NORMAL
:
// Optimize return w/o value in case generator is used in for loop
if
(
ret
==
mp_const_none
)
{
...
...
@@ -166,25 +170,25 @@ STATIC mp_obj_t gen_instance_throw(uint n_args, const mp_obj_t *args) {
STATIC
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
gen_instance_throw_obj
,
2
,
4
,
gen_instance_throw
);
STATIC
mp_obj_t
gen_instance_close
(
mp_obj_t
self_in
)
{
mp_vm_return_kind_t
ret_kind
;
mp_obj_t
ret
=
mp_obj_gen_resume
(
self_in
,
mp_const_none
,
(
mp_obj_t
)
&
mp_type_GeneratorExit
,
&
ret_kind
);
if
(
ret_kind
==
MP_VM_RETURN_YIELD
)
{
mp_obj_t
ret
;
switch
(
mp_obj_gen_resume
(
self_in
,
mp_const_none
,
(
mp_obj_t
)
&
mp_type_GeneratorExit
,
&
ret
))
{
case
MP_VM_RETURN_YIELD
:
nlr_jump
(
mp_obj_new_exception_msg
(
&
mp_type_RuntimeError
,
"generator ignored GeneratorExit"
));
}
// Swallow StopIteration & GeneratorExit (== successful close), and re-raise any other
if
(
ret_kind
==
MP_VM_RETURN_EXCEPTION
)
{
case
MP_VM_RETURN_EXCEPTION
:
// ret should always be an instance of an exception class
if
(
mp_obj_is_subclass_fast
(
mp_obj_get_type
(
ret
),
&
mp_type_GeneratorExit
)
||
mp_obj_is_subclass_fast
(
mp_obj_get_type
(
ret
),
&
mp_type_StopIteration
))
{
return
mp_const_none
;
}
nlr_jump
(
ret
);
}
default:
// The only choice left is MP_VM_RETURN_NORMAL which is successful close
return
mp_const_none
;
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
gen_instance_close_obj
,
gen_instance_close
);
...
...
This diff is collapsed.
Click to expand it.
py/objgenerator.h
+
1
−
1
View file @
69b3ba0d
mp_
obj
_t
mp_obj_gen_resume
(
mp_obj_t
self_in
,
mp_obj_t
send_val
,
mp_obj_t
throw_val
,
mp_
vm_return_kind
_t
*
ret_
kind
);
mp_
vm_return_kind
_t
mp_obj_gen_resume
(
mp_obj_t
self_in
,
mp_obj_t
send_val
,
mp_obj_t
throw_val
,
mp_
obj
_t
*
ret_
val
);
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