Teach the parsermodule about floor division. Fixes

[ 676521 ] parser module validation failure

bugfix candidate.

diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index c0b1bfcedec11b241dad1e51ddeefa5ccece30ac..81708b5309539915a5fb7d7c2c26bd3f377a0c36 100644 (file)
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -51,6 +51,10 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
         self.check_expr("foo(a, b, c, *args, **kw)")
         self.check_expr("foo(a, b, c, **kw)")
         self.check_expr("foo + bar")
+        self.check_expr("foo - bar")
+        self.check_expr("foo * bar")
+        self.check_expr("foo / bar")
+        self.check_expr("foo // bar")
         self.check_expr("lambda: 0")
         self.check_expr("lambda x: 0")
         self.check_expr("lambda *y: 0")
@@ -85,6 +89,7 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
         self.check_suite("a -= b")
         self.check_suite("a *= b")
         self.check_suite("a /= b")
+        self.check_suite("a //= b")
         self.check_suite("a %= b")
         self.check_suite("a &= b")
         self.check_suite("a |= b")

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index e0c74313c8208d7be3a44fd68f8ec0b9ec908bc8..fd030678e6f5fea3ae1722bcf8453800e64ac0b5 100644 (file)
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -1440,6 +1440,7 @@ validate_expr_stmt(node *tree)
                    || strcmp(s, "-=") == 0
                    || strcmp(s, "*=") == 0
                    || strcmp(s, "/=") == 0
+                   || strcmp(s, "//=") == 0
                    || strcmp(s, "%=") == 0
                    || strcmp(s, "&=") == 0
                    || strcmp(s, "|=") == 0
@@ -2095,6 +2096,7 @@ validate_term(node *tree)
     for ( ; res && (pos < nch); pos += 2)
         res = (((TYPE(CHILD(tree, pos)) == STAR)
                || (TYPE(CHILD(tree, pos)) == SLASH)
+               || (TYPE(CHILD(tree, pos)) == DOUBLESLASH)
                || (TYPE(CHILD(tree, pos)) == PERCENT))
                && validate_factor(CHILD(tree, pos + 1)));