gh-159672: Remove obsolete keyword typo support

Author: pablogsal

Grammar/python.gram

@@ -97,14 +97,11 @@ func_type[mod_ty]: '(' a=[type_expressions] ')' '->' b=expression NEWLINE* ENDMA
 statements[asdl_stmt_seq*]: a=statement+ { (asdl_stmt_seq*)_PyPegen_seq_flatten(p, a) }
 
 statement[asdl_stmt_seq*]:
-    | a=compound_stmt { _PyPegen_register_stmts(p ,
-                           (asdl_stmt_seq*)_PyPegen_singleton_seq(p, a)
-                        ) }
+    | a=compound_stmt { (asdl_stmt_seq*)_PyPegen_singleton_seq(p, a) }
     | a[asdl_stmt_seq*]=simple_stmts { a }
 
 single_compound_stmt[asdl_stmt_seq*]:
-    | a=compound_stmt {
-        _PyPegen_register_stmts(p, (asdl_stmt_seq*)_PyPegen_singleton_seq(p, a)) }
+    | a=compound_stmt { (asdl_stmt_seq*)_PyPegen_singleton_seq(p, a) }
 
 statement_newline[asdl_stmt_seq*]:
     | a=single_compound_stmt NEWLINE { a }

Lib/codeop.py

@@ -47,7 +47,7 @@
 PyCF_ONLY_AST = 0x400
 PyCF_ALLOW_INCOMPLETE_INPUT = 0x4000
 
-def _maybe_compile(compiler, source, filename, symbol, flags):
+def _maybe_compile(compiler, source, filename, symbol):
     # Check for source consisting of only blank lines and comments.
     for line in source.split("\n"):
         line = line.strip()
@@ -61,21 +61,22 @@ def _maybe_compile(compiler, source, filename, symbol, flags):
     with warnings.catch_warnings():
         warnings.simplefilter("ignore", (SyntaxWarning, DeprecationWarning))
         try:
-            compiler(source, filename, symbol, flags=flags)
+            compiler(source, filename, symbol)
         except _IncompleteInputError:
             return None
         except SyntaxError:  # Let other compile() errors propagate.
             pass
 
     return compiler(source, filename, symbol, incomplete_input=False)
 
-def _compile(source, filename, symbol, incomplete_input=True, *, flags=0):
+def _compile(source, filename, symbol, incomplete_input=True):
+    flags = 0
     if incomplete_input:
         flags |= PyCF_ALLOW_INCOMPLETE_INPUT
         flags |= PyCF_DONT_IMPLY_DEDENT
     return compile(source, filename, symbol, flags)
 
-def compile_command(source, filename="<input>", symbol="single", flags=0):
+def compile_command(source, filename="<input>", symbol="single"):
     r"""Compile a command and determine whether it is incomplete.
 
     Arguments:
@@ -94,7 +95,7 @@ def compile_command(source, filename="<input>", symbol="single", flags=0):
       syntax error (OverflowError and ValueError can be produced by
       malformed literals).
     """
-    return _maybe_compile(_compile, source, filename, symbol, flags)
+    return _maybe_compile(_compile, source, filename, symbol)
 
 class Compile:
     """Instances of this class behave much like the built-in compile
@@ -146,4 +147,4 @@ def __call__(self, source, filename="<input>", symbol="single"):
           syntax error (OverflowError and ValueError can be produced by
           malformed literals).
         """
-        return _maybe_compile(self.compiler, source, filename, symbol, flags=self.compiler.flags)
+        return _maybe_compile(self.compiler, source, filename, symbol)

Parser/action_helpers.c

@@ -2152,23 +2152,3 @@ _PyPegen_checked_from_import(Parser *p, asdl_seq *dots, expr_ty module_name,
     return _PyAST_ImportFrom(module, names, level, lazy_token ? 1 : 0, lineno,
                              col_offset, end_lineno, end_col_offset, arena);
 }
-
-asdl_stmt_seq*
-_PyPegen_register_stmts(Parser *p, asdl_stmt_seq* stmts) {
-    if (!p->call_invalid_rules) {
-        return stmts;
-    }
-    Py_ssize_t len = asdl_seq_LEN(stmts);
-    if (len == 0) {
-        return stmts;
-    }
-    stmt_ty last_stmt = asdl_seq_GET(stmts, len - 1);
-    if (p->last_stmt_location.lineno > last_stmt->lineno) {
-        return stmts;
-    }
-    p->last_stmt_location.lineno = last_stmt->lineno;
-    p->last_stmt_location.col_offset = last_stmt->col_offset;
-    p->last_stmt_location.end_lineno = last_stmt->end_lineno;
-    p->last_stmt_location.end_col_offset = last_stmt->end_col_offset;
-    return stmts;
-}

Parser/parser.c

@@ -968,7 +968,7 @@ compute_parser_flags(PyCompilerFlags *flags)
 
 Parser *
 _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,
-                    int feature_version, int *errcode, const char* source, PyArena *arena)
+                    int feature_version, int *errcode, PyArena *arena)
 {
     Parser *p = PyMem_Malloc(sizeof(Parser));
     if (p == NULL) {
@@ -1023,10 +1023,6 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,
     p->level = 0;
     p->call_invalid_rules = 0;
     p->input_exhausted = 0;
-    p->last_stmt_location.lineno = 0;
-    p->last_stmt_location.col_offset = 0;
-    p->last_stmt_location.end_lineno = 0;
-    p->last_stmt_location.end_col_offset = 0;
     p->keyword_trial = NULL;
 #ifdef Py_DEBUG
     p->debug = _Py_GetConfig()->parser_debug;
@@ -1052,10 +1048,6 @@ _PyPegen_Parser_Free(Parser *p)
 static void
 reset_parser_state_for_error_pass(Parser *p)
 {
-    p->last_stmt_location.lineno = 0;
-    p->last_stmt_location.col_offset = 0;
-    p->last_stmt_location.end_lineno = 0;
-    p->last_stmt_location.end_col_offset = 0;
     for (int i = 0; i < p->fill; i++) {
         p->tokens[i]->memo = NULL;
         p->tokens[i]->memo_mask = 0;
@@ -1432,7 +1424,7 @@ _PyPegen_run_parser_from_file_pointer(FILE *fp, int start_rule, PyObject *filena
     Py_DECREF(module);
 
     Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, PY_MINOR_VERSION,
-                                    errcode, NULL, arena);
+                                    errcode, arena);
     if (p == NULL) {
         goto error;
     }
@@ -1493,7 +1485,7 @@ _PyPegen_run_parser_from_string(const char *str, int start_rule, PyObject *filen
     int feature_version = flags && (flags->cf_flags & PyCF_ONLY_AST) ?
         flags->cf_feature_version : PY_MINOR_VERSION;
     Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, feature_version,
-                                    NULL, str, arena);
+                                    NULL, arena);
     if (p == NULL) {
         goto error;
     }

Parser/pegen.c

@@ -71,13 +71,6 @@ typedef struct {
     size_t num_items;
 } growable_comment_array;
 
-typedef struct {
-    int lineno;
-    int col_offset;
-    int end_lineno;
-    int end_col_offset;
-} location;
-
 typedef struct {
     int budget;
     int furthest;
@@ -111,7 +104,6 @@ typedef struct {
     int call_invalid_rules;
     KeywordTrial *keyword_trial;
     int debug;
-    location last_stmt_location;
     IdentifierCacheEntry *identifier_cache;
     PyThreadState *tstate;
     // Cached copy of tstate->c_stack_soft_limit offset by one margin toward
@@ -433,12 +425,10 @@ stmt_ty _PyPegen_checked_from_import(Parser *p, asdl_seq *dots, expr_ty module_n
                                      asdl_alias_seq *names, expr_ty lazy_token, int lineno,
                                      int col_offset, int end_lineno, int end_col_offset,
                                      PyArena *arena);
-asdl_stmt_seq* _PyPegen_register_stmts(Parser *p, asdl_stmt_seq* stmts);
-stmt_ty _PyPegen_register_stmt(Parser *p, stmt_ty s);
 
 // Parser API
 
-Parser *_PyPegen_Parser_New(struct tok_state *, int, int, int, int *, const char*, PyArena *);
+Parser *_PyPegen_Parser_New(struct tok_state *, int, int, int, int *, PyArena *);
 void _PyPegen_Parser_Free(Parser *);
 mod_ty _PyPegen_run_parser_from_file_pointer(FILE *, int, PyObject *, const char *,
                                     const char *, const char *, PyCompilerFlags *, int *, PyObject **,