Merge pull request RustPython#2350 from isidentical/issue-2349

coolreader18 · web-flow · commit 5bbe2da1efb6 · 2020-12-06T11:12:04.000-06:00
Handle raw yield expressions as RHS for augmented/annotated assignments
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
@@ -461,8 +461,7 @@ def test_var_annot_simple_exec(self):
     #     exec('X: str', {}, CNS2())
     #     self.assertEqual(nonloc_ns['__annotations__']['x'], str)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
+
     def test_var_annot_rhs(self):
         ns = {}
         exec('x: tuple = 1, 2', ns)
diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop
@@ -107,7 +107,7 @@ ExpressionStatement: ast::Statement = {
             }
         }
     },
-    <location:@L> <target:TestOrStarExprList> <op:AugAssign> <rhs:TestList> => {
+    <location:@L> <target:TestOrStarExprList> <op:AugAssign> <rhs:TestListOrYieldExpr> => {
         ast::Statement {
             location,
             node: ast::StatementType::AugAssign {
@@ -117,23 +117,27 @@ ExpressionStatement: ast::Statement = {
             },
         }
     },
-    <location:@L> <target:Test> ":" <annotation:Test> <rhs:("=" Test)?> => {
+    <location:@L> <target:Test> ":" <annotation:Test> <rhs:AssignSuffix?> => {
         ast::Statement {
             location,
             node: ast::StatementType::AnnAssign {
                 target: Box::new(target),
                 annotation: Box::new(annotation),
-                value: rhs.map(|e| e.1)
+                value: rhs
             },
         }
     },
 };
 
 AssignSuffix: ast::Expression = {
-    "=" <e:TestList> => e,
-    "=" <e:YieldExpr> => e,
+    "=" <e:TestListOrYieldExpr> => e
 };
 
+TestListOrYieldExpr: ast::Expression = {
+    TestList,
+    YieldExpr
+}
+
 TestOrStarExprList: ast::Expression = {
     <location:@L> <elements:OneOrMore<TestOrStarExpr>> <comma:","?> => {
         if elements.len() == 1 && comma.is_none() {
