respect magic trailing commas in return types (#3916)

[etc/vim.git] / src / blib2to3 / pygram.py

diff --git a/src/blib2to3/pygram.py b/src/blib2to3/pygram.py
index b8362b814735afffb1d7a2804dc0361f0fa88a76..c30c630e81685f905e104c3f56460dc00eae6f21 100644 (file)
--- a/src/blib2to3/pygram.py
+++ b/src/blib2to3/pygram.py
@@ -5,13 +5,10 @@
 
 # Python imports
 import os
 
 # Python imports
 import os

-

 from typing import Union
 
 # Local imports
 from typing import Union
 
 # Local imports

-from .pgen2 import token

 from .pgen2 import driver
 from .pgen2 import driver

-

 from .pgen2.grammar import Grammar
 
 # Moved into initialize because mypyc can't handle __file__ (XXX bug)
 from .pgen2.grammar import Grammar
 
 # Moved into initialize because mypyc can't handle __file__ (XXX bug)


@@ -21,7 +18,7 @@ from .pgen2.grammar import Grammar
 #                                      "PatternGrammar.txt")
 
 
 #                                      "PatternGrammar.txt")
 
 

-class Symbols(object):
+class Symbols:

     def __init__(self, grammar: Grammar) -> None:
         """Initializer.
 
     def __init__(self, grammar: Grammar) -> None:
         """Initializer.
 


@@ -39,12 +36,14 @@ class _python_symbols(Symbols):
     arglist: int
     argument: int
     arith_expr: int
     arglist: int
     argument: int
     arith_expr: int

+    asexpr_test: int

     assert_stmt: int
     async_funcdef: int
     async_stmt: int
     atom: int
     augassign: int
     break_stmt: int
     assert_stmt: int
     async_funcdef: int
     async_stmt: int
     atom: int
     augassign: int
     break_stmt: int

+    case_block: int

     classdef: int
     comp_for: int
     comp_if: int
     classdef: int
     comp_for: int
     comp_if: int


@@ -74,6 +73,7 @@ class _python_symbols(Symbols):
     for_stmt: int
     funcdef: int
     global_stmt: int
     for_stmt: int
     funcdef: int
     global_stmt: int

+    guard: int

     if_stmt: int
     import_as_name: int
     import_as_names: int
     if_stmt: int
     import_as_name: int
     import_as_names: int


@@ -82,6 +82,7 @@ class _python_symbols(Symbols):
     import_stmt: int
     lambdef: int
     listmaker: int
     import_stmt: int
     lambdef: int
     listmaker: int

+    match_stmt: int

     namedexpr_test: int
     not_test: int
     old_comp_for: int
     namedexpr_test: int
     not_test: int
     old_comp_for: int


@@ -91,7 +92,10 @@ class _python_symbols(Symbols):
     old_test: int
     or_test: int
     parameters: int
     old_test: int
     or_test: int
     parameters: int

+    paramspec: int

     pass_stmt: int
     pass_stmt: int

+    pattern: int
+    patterns: int

     power: int
     print_stmt: int
     raise_stmt: int
     power: int
     print_stmt: int
     raise_stmt: int


@@ -101,6 +105,7 @@ class _python_symbols(Symbols):
     single_input: int
     sliceop: int
     small_stmt: int
     single_input: int
     sliceop: int
     small_stmt: int

+    subject_expr: int

     star_expr: int
     stmt: int
     subscript: int
     star_expr: int
     stmt: int
     subscript: int


@@ -116,17 +121,21 @@ class _python_symbols(Symbols):
     tfpdef: int
     tfplist: int
     tname: int
     tfpdef: int
     tfplist: int
     tname: int

+    tname_star: int

     trailer: int
     try_stmt: int
     trailer: int
     try_stmt: int

+    type_stmt: int

     typedargslist: int
     typedargslist: int

+    typeparam: int
+    typeparams: int
+    typevar: int
+    typevartuple: int

     varargslist: int
     vfpdef: int
     vfplist: int
     vname: int
     while_stmt: int
     varargslist: int
     vfpdef: int
     vfplist: int
     vname: int
     while_stmt: int

-    with_item: int

     with_stmt: int
     with_stmt: int

-    with_var: int

     xor_expr: int
     yield_arg: int
     yield_expr: int
     xor_expr: int
     yield_arg: int
     yield_expr: int


@@ -149,6 +158,7 @@ python_grammar_no_print_statement_no_exec_statement: Grammar
 python_grammar_no_print_statement_no_exec_statement_async_keywords: Grammar
 python_grammar_no_exec_statement: Grammar
 pattern_grammar: Grammar
 python_grammar_no_print_statement_no_exec_statement_async_keywords: Grammar
 python_grammar_no_exec_statement: Grammar
 pattern_grammar: Grammar

+python_grammar_soft_keywords: Grammar

 
 python_symbols: _python_symbols
 pattern_symbols: _pattern_symbols
 
 python_symbols: _python_symbols
 pattern_symbols: _pattern_symbols


@@ -159,6 +169,7 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
     global python_grammar_no_print_statement
     global python_grammar_no_print_statement_no_exec_statement
     global python_grammar_no_print_statement_no_exec_statement_async_keywords
     global python_grammar_no_print_statement
     global python_grammar_no_print_statement_no_exec_statement
     global python_grammar_no_print_statement_no_exec_statement_async_keywords

+    global python_grammar_soft_keywords

     global python_symbols
     global pattern_grammar
     global pattern_symbols
     global python_symbols
     global pattern_grammar
     global pattern_symbols


@@ -171,6 +182,10 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
 
     # Python 2
     python_grammar = driver.load_packaged_grammar("blib2to3", _GRAMMAR_FILE, cache_dir)
 
     # Python 2
     python_grammar = driver.load_packaged_grammar("blib2to3", _GRAMMAR_FILE, cache_dir)

+    python_grammar.version = (2, 0)
+
+    soft_keywords = python_grammar.soft_keywords.copy()
+    python_grammar.soft_keywords.clear()

 
     python_symbols = _python_symbols(python_grammar)
 
 
     python_symbols = _python_symbols(python_grammar)
 


@@ -182,6 +197,7 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
     python_grammar_no_print_statement_no_exec_statement = python_grammar.copy()
     del python_grammar_no_print_statement_no_exec_statement.keywords["print"]
     del python_grammar_no_print_statement_no_exec_statement.keywords["exec"]
     python_grammar_no_print_statement_no_exec_statement = python_grammar.copy()
     del python_grammar_no_print_statement_no_exec_statement.keywords["print"]
     del python_grammar_no_print_statement_no_exec_statement.keywords["exec"]

+    python_grammar_no_print_statement_no_exec_statement.version = (3, 0)

 
     # Python 3.7+
     python_grammar_no_print_statement_no_exec_statement_async_keywords = (
 
     # Python 3.7+
     python_grammar_no_print_statement_no_exec_statement_async_keywords = (


@@ -190,6 +206,14 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
     python_grammar_no_print_statement_no_exec_statement_async_keywords.async_keywords = (
         True
     )
     python_grammar_no_print_statement_no_exec_statement_async_keywords.async_keywords = (
         True
     )

+    python_grammar_no_print_statement_no_exec_statement_async_keywords.version = (3, 7)
+
+    # Python 3.10+
+    python_grammar_soft_keywords = (
+        python_grammar_no_print_statement_no_exec_statement_async_keywords.copy()
+    )
+    python_grammar_soft_keywords.soft_keywords = soft_keywords
+    python_grammar_soft_keywords.version = (3, 10)

 
     pattern_grammar = driver.load_packaged_grammar(
         "blib2to3", _PATTERN_GRAMMAR_FILE, cache_dir
 
     pattern_grammar = driver.load_packaged_grammar(
         "blib2to3", _PATTERN_GRAMMAR_FILE, cache_dir