Fix handling of standalone match/case with newlines/comments (#2760)

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

diff --git a/src/blib2to3/pygram.py b/src/blib2to3/pygram.py
index b8362b814735afffb1d7a2804dc0361f0fa88a76..aa20b8104aea914d4751c6ed40a93a18cb57f76b 100644 (file)
--- a/src/blib2to3/pygram.py
+++ b/src/blib2to3/pygram.py
@@ -39,12 +39,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 +76,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 +85,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


@@ -92,6 +96,8 @@ class _python_symbols(Symbols):
     or_test: int
     parameters: int
     pass_stmt: int
     or_test: int
     parameters: 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 +107,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


@@ -124,9 +131,7 @@ class _python_symbols(Symbols):
     vfplist: int
     vname: int
     while_stmt: 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 +154,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 +165,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 +178,8 @@ 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)

+    soft_keywords = python_grammar.soft_keywords.copy()
+    python_grammar.soft_keywords.clear()

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


@@ -191,6 +200,12 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
         True
     )
 
         True
     )
 

+    # 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
+

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