Handle more cases (SyntaxWarning's currently)

Author: skirpichev

Lib/test/test_grammar.py

@@ -193,12 +193,17 @@ def check(test, error=False):
                ("1jz", 3, "imaginary"),
                ("0xI", 3, "hexadecimal"),
                ("0bz", 3, "binary"),
+               # SyntaxWarning's currently:
+               ("1or 0", 2, " decimal"),
+               ("0or 0", 3, "octal"),
                ])
     def test_end_of_numerical_literals_offset(self, source, offset, msg):
         # gh-149277: verify the error caret points at the first invalid
         # character, not the last valid digit.
-        with self.assertRaises(SyntaxError) as cm:
-            compile(source, "<test>", "eval")
+        with warnings.catch_warnings():
+            warnings.simplefilter("error", SyntaxWarning)
+            with self.assertRaises(SyntaxError) as cm:
+                compile(source, "<test>", "eval")
         self.assertEqual(cm.exception.offset, offset)
         self.assertIn(msg, cm.exception.msg)
 

Parser/lexer/number.c

@@ -70,13 +70,11 @@ verify_end_of_number(struct tok_state *tok, int c, const char *kind) {
         r = lookahead(tok, "ot");
     }
     if (r) {
-        tok_backup(tok, c);
         if (_PyTokenizer_parser_warn(tok, PyExc_SyntaxWarning,
                 "invalid %s literal", kind))
         {
             return 0;
         }
-        tok_nextc(tok);
     }
     else /* In future releases, only error will remain. */
     if (c < 128 && is_potential_identifier_char(c)) {