Skip to content

bpo-34616: add flags to allow top-level-await #13148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1st1 merged 19 commits into from
May 21, 2019
Merged

bpo-34616: add flags to allow top-level-await #13148

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
cfd631b
WIP async repl implementation
May 4, 2019
1dafcdc
Add option to `compile()` to accept top-level await features.
May 5, 2019
1e480cb
remove some unnecessary already existing coroutine flags
May 7, 2019
f48d70c
add actual necessary ste_couroutines
May 7, 2019
ecde540
stry new line
May 7, 2019
25dda35
Reformat some code
May 7, 2019
d208fdf
Apply grammar corrections from code review
Carreau May 11, 2019
8107bea
Cleanup test suite code formatting.
Carreau May 11, 2019
371fa8f
document an extra test
Carreau May 11, 2019
0efd6fb
better formatting
Carreau May 21, 2019
7c1b7ee
use debug-f-string
Carreau May 21, 2019
fd44a14
Update Doc/library/functions.rst
Carreau May 21, 2019
74bea86
code cleanup
May 21, 2019
48c7a7f
Redo-some functional testing.
May 21, 2019
267d0ad
Fix line lenght
May 21, 2019
09c453c
skip await-eval
May 21, 2019
d8c3b96
fix docs
May 21, 2019
41345f4
better documentation formatting
May 21, 2019
f8c8b4c
restaure ev policy in finally
May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add actual necessary ste_couroutines
  • Loading branch information
Matthias Bussonnier @Carreau
Matthias Bussonnier authored and Carreau committed May 21, 2019
commit f48d70ca4a16bbf330b7b9ac4839556ef14f4941
7 changes: 4 additions & 3 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4567,8 +4567,9 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
withitem_ty item = asdl_seq_GET(s->v.AsyncWith.items, pos);

assert(s->kind == AsyncWith_kind);
if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION &&
!(c->c_flags->cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT)){
if (c->c_flags->cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT){
c->u->u_ste->ste_coroutine = 1;

@1st1 1st1 May 21, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you checked if this c->u->u_ste->ste_coroutine = 1; line is needed? Does it work without it?

@Carreau Carreau May 21, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it is necessary, otherwise:

>>> async with acm() as delta:
>>>     count += delta

Traceback (most recent call last):
  File "minirepl.py", line 97, in f
    co = compile(inp, '', 'single', flags=PyCF_ALLOW_TOP_LEVEL_AWAIT)
  File "<string>", line 2
SyntaxError: 'async with' outside async function

@1st1 1st1 May 21, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, cool, let's keep it then :)

@Carreau Carreau May 21, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And there is be a test in Lib/test/test_builtin.py for that in case you ask.

} else if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION){
return compiler_error(c, "'async with' outside async function");
}

Expand Down Expand Up @@ -4777,7 +4778,7 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
ADDOP(c, YIELD_FROM);
break;
case Await_kind:
if (! (c->c_flags->cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT)){
if (!(c->c_flags->cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT)){
if (c->u->u_ste->ste_type != FunctionBlock){
return compiler_error(c, "'await' outside function");
}
Expand Down