Merge pull request adafruit#3202 from WarriorOfWire/require_await_in_async

tannewt · web-flow · commit 7f804fdc5ddb · 2020-07-27T16:02:25.000-07:00
Require await in async
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-21 18:43-0700\n"
+"POT-Creation-Date: 2020-07-24 19:58-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -110,10 +110,6 @@ msgstr ""
 msgid "'%q' argument required"
 msgstr ""
 
-#: py/objarray.c
-msgid "'%q' object is not bytes-like"
-msgstr ""
-
 #: py/emitinlinethumb.c py/emitinlinextensa.c
 #, c-format
 msgid "'%s' expects a label"
@@ -219,11 +215,11 @@ msgid "'align' requires 1 argument"
 msgstr ""
 
 #: py/compile.c
-msgid "'async for' or 'async with' outside async function"
+msgid "'await' outside function"
 msgstr ""
 
 #: py/compile.c
-msgid "'await' outside function"
+msgid "'await', 'async for' or 'async with' outside async function"
 msgstr ""
 
 #: py/compile.c
@@ -1336,10 +1332,6 @@ msgstr ""
 msgid "Pull not used when direction is output."
 msgstr ""
 
-#: ports/stm/ref/pulseout-pre-timeralloc.c
-msgid "PulseOut not supported on this chip"
-msgstr ""
-
 #: ports/stm/common-hal/os/__init__.c
 msgid "RNG DeInit Error"
 msgstr ""
@@ -1773,7 +1765,7 @@ msgstr ""
 msgid "__new__ arg must be a user-type"
 msgstr ""
 
-#: extmod/modubinascii.c extmod/moduhashlib.c
+#: extmod/modubinascii.c extmod/moduhashlib.c py/objarray.c
 msgid "a bytes-like object is required"
 msgstr ""
 
diff --git a/py/compile.c b/py/compile.c
@@ -1713,11 +1713,11 @@ STATIC void compile_yield_from(compiler_t *comp) {
 #if MICROPY_PY_ASYNC_AWAIT
 STATIC bool compile_require_async_context(compiler_t *comp, mp_parse_node_struct_t *pns) {
     int scope_flags = comp->scope_cur->scope_flags;
-    if(scope_flags & MP_SCOPE_FLAG_GENERATOR) {
+    if(scope_flags & MP_SCOPE_FLAG_ASYNC) {
         return true;
     }
     compile_syntax_error(comp, (mp_parse_node_t)pns,
-        translate("'async for' or 'async with' outside async function"));
+        translate("'await', 'async for' or 'async with' outside async function"));
     return false;
 }
 
@@ -2645,6 +2645,7 @@ STATIC void compile_atom_expr_await(compiler_t *comp, mp_parse_node_struct_t *pn
         compile_syntax_error(comp, (mp_parse_node_t)pns, translate("'await' outside function"));
         return;
     }
+    compile_require_async_context(comp, pns);
     compile_atom_expr_normal(comp, pns);
     compile_yield_from(comp);
 }

Original file line number	Diff line number	Diff line change
`@@ -1713,11 +1713,11 @@ STATIC void compile_yield_from(compiler_t *comp) {`
`1713`	`1713`	`#if MICROPY_PY_ASYNC_AWAIT`
`1714`	`1714`	`STATIC bool compile_require_async_context(compiler_t comp, mp_parse_node_struct_t pns) {`
`1715`	`1715`	`int scope_flags = comp->scope_cur->scope_flags;`
`1716`		`- if(scope_flags & MP_SCOPE_FLAG_GENERATOR) {`
	`1716`	`+ if(scope_flags & MP_SCOPE_FLAG_ASYNC) {`
`1717`	`1717`	`return true;`
`1718`	`1718`	`}`
`1719`	`1719`	`compile_syntax_error(comp, (mp_parse_node_t)pns,`
`1720`		`- translate("'async for' or 'async with' outside async function"));`
	`1720`	`+ translate("'await', 'async for' or 'async with' outside async function"));`
`1721`	`1721`	`return false;`
`1722`	`1722`	`}`
`1723`	`1723`
`@@ -2645,6 +2645,7 @@ STATIC void compile_atom_expr_await(compiler_t comp, mp_parse_node_struct_t pn`
`2645`	`2645`	`compile_syntax_error(comp, (mp_parse_node_t)pns, translate("'await' outside function"));`
`2646`	`2646`	`return;`
`2647`	`2647`	`}`
	`2648`	`+ compile_require_async_context(comp, pns);`
`2648`	`2649`	`compile_atom_expr_normal(comp, pns);`
`2649`	`2650`	`compile_yield_from(comp);`
`2650`	`2651`	`}`