Fix error message for named expression syntax errors

chrismoradi · chrismoradi · commit 8bb1aabf2ec1 · 2021-10-02T13:43:50.000-07:00
diff --git a/Lib/test/test_named_expressions.py b/Lib/test/test_named_expressions.py
@@ -4,32 +4,24 @@
 
 class NamedExpressionInvalidTest(unittest.TestCase):
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_01(self):
         code = """x := 0"""
 
         with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_02(self):
         code = """x = y := 0"""
 
         with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_03(self):
         code = """y := f(x)"""
 
         with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_04(self):
         code = """y0 = y1 := f(x)"""
 
@@ -44,32 +36,24 @@ def test_named_expression_invalid_06(self):
         with self.assertRaisesRegex(SyntaxError, "cannot use assignment expressions with tuple"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_07(self):
         code = """def spam(a = b := 42): pass"""
 
         with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_08(self):
         code = """def spam(a: b := 42 = 5): pass"""
 
         with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_09(self):
         code = """spam(a=b := 'c')"""
 
         with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_10(self):
         code = """spam(x = y := f(x))"""
 
@@ -97,8 +81,6 @@ def test_named_expression_invalid_13(self):
             "positional argument follows keyword argument"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_14(self):
         code = """(x := lambda: y := 1)"""
 
@@ -114,16 +96,12 @@ def test_named_expression_invalid_15(self):
             "cannot use assignment expressions with lambda"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_16(self):
         code = "[i + 1 for i in i := [1,2]]"
 
         with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
             exec(code, {}, {})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure # wrong error message
     def test_named_expression_invalid_17(self):
         code = "[i := 0, j := 1 for i, j in [(1, 2), (3, 4)]]"
 
diff --git a/parser/src/error.rs b/parser/src/error.rs
@@ -196,7 +196,7 @@ impl fmt::Display for ParseErrorType {
                 } else if expected.as_deref() == Some("Indent") {
                     write!(f, "expected an indented block")
                 } else {
-                    write!(f, "Got unexpected token {}", tok)
+                    write!(f, "invalid syntax. Got unexpected token {}", tok)
                 }
             }
             ParseErrorType::Lexical(ref error) => write!(f, "{}", error),

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ impl fmt::Display for ParseErrorType {`
`196`	`196`	`} else if expected.as_deref() == Some("Indent") {`
`197`	`197`	`write!(f, "expected an indented block")`
`198`	`198`	`} else {`
`199`		`- write!(f, "Got unexpected token {}", tok)`
	`199`	`+ write!(f, "invalid syntax. Got unexpected token {}", tok)`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`ParseErrorType::Lexical(ref error) => write!(f, "{}", error),`