From 224612c0a70aa8398e6dea5e446efd8dd65c3f27 Mon Sep 17 00:00:00 2001
From: apalala <apalala@gmail.com>
Date: Sun, 10 Dec 2023 11:46:49 -0400
Subject: [PATCH] [bootstrap] make the generated parser be the bootstrap parser

---
 tatsu/bootstrap.py        | 545 +++++++++++---------------------------
 tatsu/ngcodegen/python.py |   2 +-
 2 files changed, 160 insertions(+), 387 deletions(-)

diff --git a/tatsu/bootstrap.py b/tatsu/bootstrap.py
index 6c3be580..ce462d20 100644
--- a/tatsu/bootstrap.py
+++ b/tatsu/bootstrap.py
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-# CAVEAT UTILITOR
+# WARNING: CAVEAT UTILITOR
 #
-# This file was automatically generated by TatSu.
+#  This file was automatically generated by TatSu.
 #
-#    https://pypi.python.org/pypi/tatsu/
+#     https://pypi.python.org/pypi/tatsu/
 #
-# Any changes you make to it will be overwritten the next time
-# the file is generated.
+#  Any changes you make to it will be overwritten the next time
+#  the file is generated.
 
-# ruff: noqa: C405, I001, F401, SIM117
+# ruff: noqa: C405, COM812, I001, F401, SIM117
 
 import sys
 from pathlib import Path
@@ -30,7 +30,7 @@ def __init__(self, text, /, config: ParserConfig | None = None, **settings):
         config = ParserConfig.new(
             config,
             owner=self,
-            whitespace=re.compile(r"\s+"),
+            whitespace='\\s+',
             nameguard=None,
             ignorecase=False,
             namechars='',
@@ -41,38 +41,39 @@ def __init__(self, text, /, config: ParserConfig | None = None, **settings):
             start='start',
         )
         config = config.replace(**settings)
-        super().__init__(text, config=config)
 
+        super().__init__(text, config=config)
 
 class EBNFBootstrapParser(Parser):
     def __init__(self, /, config: ParserConfig | None = None, **settings):
         config = ParserConfig.new(
             config,
             owner=self,
-            whitespace=re.compile(r"\s+"),
+            whitespace='\\s+',
             nameguard=None,
             ignorecase=False,
             namechars='',
             parseinfo=True,
             comments_re='(?sm)[(][*](?:.|\\n)*?[*][)]',
             eol_comments_re='#[^\\n]*$',
-            left_recursion=False,
             keywords=KEYWORDS,
             start='start',
         )
         config = config.replace(**settings)
+
         super().__init__(config=config)
 
     @tatsumasu()
     def _start_(self):
         self._grammar_()
 
+
     @tatsumasu('Grammar')
     def _grammar_(self):
         self._constant('TATSU')
         self.name_last_node('title')
 
-        def block1():
+        def block0():
             with self._choice():
                 with self._option():
                     self._directive_()
@@ -82,13 +83,13 @@ def block1():
                     self.add_last_node_to_name('keywords')
                 self._error(
                     'expecting one of: '
-                    '<directive> <keyword>'  # noqa: COM812
+                    '<directive> <keyword>'
                 )
-        self._closure(block1)
+        self._closure(block0)
         self._rule_()
         self.add_last_node_to_name('rules')
 
-        def block6():
+        def block1():
             with self._choice():
                 with self._option():
                     self._rule_()
@@ -98,10 +99,14 @@ def block6():
                     self.add_last_node_to_name('keywords')
                 self._error(
                     'expecting one of: '
-                    '<keyword> <rule>'  # noqa: COM812
+                    '<keyword> <rule>'
                 )
-        self._closure(block6)
+        self._closure(block1)
         self._check_eof()
+        self._define(
+            ['title'],
+            ['directives', 'keywords', 'rules'],
+        )
 
         self._define(
             ['title'],
@@ -125,7 +130,7 @@ def _directive_(self):
                                 self._token('eol_comments')
                             self._error(
                                 'expecting one of: '
-                                "'comments' 'eol_comments'"  # noqa: COM812
+                                "'comments' 'eol_comments'"
                             )
                     self.name_last_node('name')
                     self._cut()
@@ -134,11 +139,7 @@ def _directive_(self):
                     self._cut()
                     self._regex_()
                     self.name_last_node('value')
-
-                    self._define(
-                        ['name', 'value'],
-                        [],
-                    )
+                    self._define(['name', 'value'], [])
                 with self._option():
                     with self._group():
                         self._token('whitespace')
@@ -159,14 +160,10 @@ def _directive_(self):
                                 self._constant('None')
                             self._error(
                                 'expecting one of: '
-                                "'False' 'None' <regex>"  # noqa: COM812
+                                "'False' 'None' <regex>"
                             )
                     self.name_last_node('value')
-
-                    self._define(
-                        ['name', 'value'],
-                        [],
-                    )
+                    self._define(['name', 'value'], [])
                 with self._option():
                     with self._group():
                         with self._choice():
@@ -181,7 +178,7 @@ def _directive_(self):
                             self._error(
                                 'expecting one of: '
                                 "'ignorecase' 'left_recursion'"
-                                "'nameguard' 'parseinfo'"  # noqa: COM812
+                                "'nameguard' 'parseinfo'"
                             )
                     self.name_last_node('name')
                     self._cut()
@@ -192,23 +189,15 @@ def _directive_(self):
                                 self._cut()
                                 self._boolean_()
                                 self.name_last_node('value')
-
-                                self._define(
-                                    ['value'],
-                                    [],
-                                )
+                                self._define(['value'], [])
                             with self._option():
                                 self._constant(True)
                                 self.name_last_node('value')
                             self._error(
                                 'expecting one of: '
-                                "'::'"  # noqa: COM812
+                                "'::'"
                             )
-
-                    self._define(
-                        ['name', 'value'],
-                        [],
-                    )
+                    self._define(['name', 'value'], [])
                 with self._option():
                     with self._group():
                         self._token('grammar')
@@ -218,11 +207,7 @@ def _directive_(self):
                     self._cut()
                     self._word_()
                     self.name_last_node('value')
-
-                    self._define(
-                        ['name', 'value'],
-                        [],
-                    )
+                    self._define(['name', 'value'], [])
                 with self._option():
                     with self._group():
                         self._token('namechars')
@@ -232,24 +217,18 @@ def _directive_(self):
                     self._cut()
                     self._string_()
                     self.name_last_node('value')
-
-                    self._define(
-                        ['name', 'value'],
-                        [],
-                    )
+                    self._define(['name', 'value'], [])
                 self._error(
                     'expecting one of: '
                     "'comments' 'eol_comments' 'grammar'"
                     "'ignorecase' 'left_recursion'"
                     "'namechars' 'nameguard' 'parseinfo'"
-                    "'whitespace'"  # noqa: COM812
+                    "'whitespace'"
                 )
         self._cut()
+        self._define(['name', 'value'], [])
 
-        self._define(
-            ['name', 'value'],
-            [],
-        )
+        self._define(['name', 'value'], [])
 
     @tatsumasu()
     def _keywords_(self):
@@ -258,6 +237,7 @@ def block0():
             self._keywords_()
         self._positive_closure(block0)
 
+
     @tatsumasu()
     def _keyword_(self):
         self._token('@@keyword')
@@ -277,10 +257,11 @@ def block0():
                             self._token('=')
                         self._error(
                             'expecting one of: '
-                            "':' '='"  # noqa: COM812
+                            "':' '='"
                         )
         self._closure(block0)
 
+
     @tatsumasu()
     def _paramdef_(self):
         with self._choice():
@@ -289,11 +270,7 @@ def _paramdef_(self):
                 self._cut()
                 self._params_()
                 self.name_last_node('params')
-
-                self._define(
-                    ['params'],
-                    [],
-                )
+                self._define(['params'], [])
             with self._option():
                 self._token('(')
                 self._cut()
@@ -309,35 +286,28 @@ def _paramdef_(self):
                             self._cut()
                             self._kwparams_()
                             self.name_last_node('kwparams')
-
-                            self._define(
-                                ['kwparams', 'params'],
-                                [],
-                            )
+                            self._define(['kwparams', 'params'], [])
                         with self._option():
                             self._params_()
                             self.name_last_node('params')
                         self._error(
                             'expecting one of: '
-                            '<kwparams> <params>'  # noqa: COM812
+                            '<kwparams> <params>'
                         )
                 self._token(')')
-
-                self._define(
-                    ['kwparams', 'params'],
-                    [],
-                )
+                self._define(['kwparams', 'params'], [])
             self._error(
                 'expecting one of: '
-                "'(' '::'"  # noqa: COM812
+                "'(' '::'"
             )
 
+
     @tatsumasu('Rule')
     def _rule_(self):
 
-        def block1():
+        def block0():
             self._decorator_()
-        self._closure(block1)
+        self._closure(block0)
         self.name_last_node('decorators')
         self._name_()
         self.name_last_node('name')
@@ -349,11 +319,7 @@ def block1():
                     self._cut()
                     self._params_()
                     self.name_last_node('params')
-
-                    self._define(
-                        ['params'],
-                        [],
-                    )
+                    self._define(['params'], [])
                 with self._option():
                     self._token('(')
                     self._cut()
@@ -369,49 +335,35 @@ def block1():
                                 self._cut()
                                 self._kwparams_()
                                 self.name_last_node('kwparams')
-
-                                self._define(
-                                    ['kwparams', 'params'],
-                                    [],
-                                )
+                                self._define(['kwparams', 'params'], [])
                             with self._option():
                                 self._params_()
                                 self.name_last_node('params')
                             self._error(
                                 'expecting one of: '
-                                '<kwparams> <params>'  # noqa: COM812
+                                '<kwparams> <params>'
                             )
                     self._token(')')
-
-                    self._define(
-                        ['kwparams', 'params'],
-                        [],
-                    )
+                    self._define(['kwparams', 'params'], [])
                 self._error(
                     'expecting one of: '
-                    "'(' '::'"  # noqa: COM812
+                    "'(' '::'"
                 )
         with self._optional():
             self._token('<')
             self._cut()
             self._known_name_()
             self.name_last_node('base')
-
-            self._define(
-                ['base'],
-                [],
-            )
+            self._define(['base'], [])
         self._token('=')
         self._cut()
         self._expre_()
         self.name_last_node('exp')
         self._token(';')
         self._cut()
+        self._define(['base', 'decorators', 'exp', 'kwparams', 'name', 'params'], [])
 
-        self._define(
-            ['base', 'decorators', 'exp', 'kwparams', 'name', 'params'],
-            [],
-        )
+        self._define(['base', 'decorators', 'exp', 'kwparams', 'name', 'params'], [])
 
     @tatsumasu()
     def _decorator_(self):
@@ -429,23 +381,25 @@ def _decorator_(self):
                     self._token('nomemo')
                 self._error(
                     'expecting one of: '
-                    "'name' 'nomemo' 'override'"  # noqa: COM812
+                    "'name' 'nomemo' 'override'"
                 )
         self.name_last_node('@')
 
+
     @tatsumasu()
     def _params_(self):
         self._first_param_()
         self.add_last_node_to_name('@')
 
-        def block1():
+        def block0():
             self._token(',')
             self._literal_()
             self.add_last_node_to_name('@')
             with self._ifnot():
                 self._token('=')
             self._cut()
-        self._closure(block1)
+        self._closure(block0)
+
 
     @tatsumasu()
     def _first_param_(self):
@@ -458,18 +412,20 @@ def _first_param_(self):
                 'expecting one of: '
                 '(?!\\d)\\w+(?:::(?!\\d)\\w+)+ <boolean>'
                 '<float> <hex> <int> <literal> <null>'
-                '<path> <raw_string> <string> <word>'  # noqa: COM812
+                '<path> <raw_string> <string> <word>'
             )
 
+
     @tatsumasu()
     def _kwparams_(self):
 
         def sep0():
             self._token(',')
 
-        def block0():
+        def block1():
             self._pair_()
-        self._positive_gather(block0, sep0)
+        self._positive_gather(block1, sep0)
+
 
     @tatsumasu()
     def _pair_(self):
@@ -480,6 +436,7 @@ def _pair_(self):
         self._literal_()
         self.add_last_node_to_name('@')
 
+
     @tatsumasu()
     def _expre_(self):
         with self._choice():
@@ -490,9 +447,10 @@ def _expre_(self):
             self._error(
                 'expecting one of: '
                 "'|' <choice> <element> <option>"
-                '<sequence>'  # noqa: COM812
+                '<sequence>'
             )
 
+
     @tatsumasu('Choice')
     def _choice_(self):
         with self._optional():
@@ -501,26 +459,30 @@ def _choice_(self):
         self._option_()
         self.add_last_node_to_name('@')
 
-        def block1():
+        def block0():
             self._token('|')
             self._cut()
             self._option_()
             self.add_last_node_to_name('@')
-        self._positive_closure(block1)
+        self._positive_closure(block0)
+
 
     @tatsumasu('Option')
     def _option_(self):
         self._sequence_()
         self.name_last_node('@')
 
+
     @tatsumasu('Sequence')
     def _sequence_(self):
 
-        def block1():
+        def block0():
             self._element_()
-        self._positive_closure(block1)
+        self._positive_closure(block0)
         self.name_last_node('sequence')
 
+        self._define(['sequence'], [])
+
     @tatsumasu()
     def _element_(self):
         with self._choice():
@@ -543,9 +505,10 @@ def _element_(self):
                 '<override_single_deprecated>'
                 '<positive_closure> <right_join>'
                 '<rule_include> <skip_to> <special>'
-                '<term> <void>'  # noqa: COM812
+                '<term> <void>'
             )
 
+
     @tatsumasu('RuleInclude')
     def _rule_include_(self):
         self._token('>')
@@ -553,6 +516,7 @@ def _rule_include_(self):
         self._known_name_()
         self.name_last_node('@')
 
+
     @tatsumasu()
     def _named_(self):
         with self._choice():
@@ -562,9 +526,10 @@ def _named_(self):
                 self._named_single_()
             self._error(
                 'expecting one of: '
-                '<name> <named_list> <named_single>'  # noqa: COM812
+                '<name> <named_list> <named_single>'
             )
 
+
     @tatsumasu('NamedList')
     def _named_list_(self):
         self._name_()
@@ -573,11 +538,9 @@ def _named_list_(self):
         self._cut()
         self._term_()
         self.name_last_node('exp')
+        self._define(['exp', 'name'], [])
 
-        self._define(
-            ['exp', 'name'],
-            [],
-        )
+        self._define(['exp', 'name'], [])
 
     @tatsumasu('Named')
     def _named_single_(self):
@@ -587,11 +550,9 @@ def _named_single_(self):
         self._cut()
         self._term_()
         self.name_last_node('exp')
+        self._define(['exp', 'name'], [])
 
-        self._define(
-            ['exp', 'name'],
-            [],
-        )
+        self._define(['exp', 'name'], [])
 
     @tatsumasu()
     def _override_(self):
@@ -606,9 +567,10 @@ def _override_(self):
                 'expecting one of: '
                 "'@' '@+:' '@:' <override_list>"
                 '<override_single>'
-                '<override_single_deprecated>'  # noqa: COM812
+                '<override_single_deprecated>'
             )
 
+
     @tatsumasu('OverrideList')
     def _override_list_(self):
         self._token('@+:')
@@ -616,6 +578,7 @@ def _override_list_(self):
         self._term_()
         self.name_last_node('@')
 
+
     @tatsumasu('Override')
     def _override_single_(self):
         self._token('@:')
@@ -623,6 +586,7 @@ def _override_single_(self):
         self._term_()
         self.name_last_node('@')
 
+
     @tatsumasu('Override')
     def _override_single_deprecated_(self):
         self._token('@')
@@ -630,6 +594,7 @@ def _override_single_deprecated_(self):
         self._term_()
         self.name_last_node('@')
 
+
     @tatsumasu()
     def _term_(self):
         with self._choice():
@@ -673,9 +638,10 @@ def _term_(self):
                 '<negative_lookahead> <optional>'
                 '<pattern> <positive_closure>'
                 '<right_join> <separator> <skip_to>'
-                '<special> <token> <void>'  # noqa: COM812
+                '<special> <token> <void>'
             )
 
+
     @tatsumasu('Group')
     def _group_(self):
         self._token('(')
@@ -684,11 +650,9 @@ def _group_(self):
         self.name_last_node('exp')
         self._token(')')
         self._cut()
+        self._define(['exp'], [])
 
-        self._define(
-            ['exp'],
-            [],
-        )
+        self._define(['exp'], [])
 
     @tatsumasu()
     def _gather_(self):
@@ -705,9 +669,10 @@ def _gather_(self):
                     self._normal_gather_()
                 self._error(
                     'expecting one of: '
-                    '<normal_gather> <positive_gather>'  # noqa: COM812
+                    '<normal_gather> <positive_gather>'
                 )
 
+
     @tatsumasu('PositiveGather')
     def _positive_gather_(self):
         self._separator_()
@@ -724,14 +689,12 @@ def _positive_gather_(self):
                     self._token('-')
                 self._error(
                     'expecting one of: '
-                    "'+' '-'"  # noqa: COM812
+                    "'+' '-'"
                 )
         self._cut()
+        self._define(['exp', 'sep'], [])
 
-        self._define(
-            ['exp', 'sep'],
-            [],
-        )
+        self._define(['exp', 'sep'], [])
 
     @tatsumasu('Gather')
     def _normal_gather_(self):
@@ -746,11 +709,9 @@ def _normal_gather_(self):
             self._token('*')
             self._cut()
         self._cut()
+        self._define(['exp', 'sep'], [])
 
-        self._define(
-            ['exp', 'sep'],
-            [],
-        )
+        self._define(['exp', 'sep'], [])
 
     @tatsumasu()
     def _join_(self):
@@ -767,9 +728,10 @@ def _join_(self):
                     self._normal_join_()
                 self._error(
                     'expecting one of: '
-                    '<normal_join> <positive_join>'  # noqa: COM812
+                    '<normal_join> <positive_join>'
                 )
 
+
     @tatsumasu('PositiveJoin')
     def _positive_join_(self):
         self._separator_()
@@ -786,14 +748,12 @@ def _positive_join_(self):
                     self._token('-')
                 self._error(
                     'expecting one of: '
-                    "'+' '-'"  # noqa: COM812
+                    "'+' '-'"
                 )
         self._cut()
+        self._define(['exp', 'sep'], [])
 
-        self._define(
-            ['exp', 'sep'],
-            [],
-        )
+        self._define(['exp', 'sep'], [])
 
     @tatsumasu('Join')
     def _normal_join_(self):
@@ -808,11 +768,9 @@ def _normal_join_(self):
             self._token('*')
             self._cut()
         self._cut()
+        self._define(['exp', 'sep'], [])
 
-        self._define(
-            ['exp', 'sep'],
-            [],
-        )
+        self._define(['exp', 'sep'], [])
 
     @tatsumasu('LeftJoin')
     def _left_join_(self):
@@ -831,14 +789,12 @@ def _left_join_(self):
                     self._token('-')
                 self._error(
                     'expecting one of: '
-                    "'+' '-'"  # noqa: COM812
+                    "'+' '-'"
                 )
         self._cut()
+        self._define(['exp', 'sep'], [])
 
-        self._define(
-            ['exp', 'sep'],
-            [],
-        )
+        self._define(['exp', 'sep'], [])
 
     @tatsumasu('RightJoin')
     def _right_join_(self):
@@ -857,14 +813,12 @@ def _right_join_(self):
                     self._token('-')
                 self._error(
                     'expecting one of: '
-                    "'+' '-'"  # noqa: COM812
+                    "'+' '-'"
                 )
         self._cut()
+        self._define(['exp', 'sep'], [])
 
-        self._define(
-            ['exp', 'sep'],
-            [],
-        )
+        self._define(['exp', 'sep'], [])
 
     @tatsumasu()
     def _separator_(self):
@@ -883,9 +837,10 @@ def _separator_(self):
                 'expecting one of: '
                 "'(' '/./' '`' <any> <constant> <group>"
                 '<pattern> <raw_string> <regexes>'
-                '<string> <token>'  # noqa: COM812
+                '<string> <token>'
             )
 
+
     @tatsumasu('PositiveClosure')
     def _positive_closure_(self):
         self._token('{')
@@ -900,10 +855,11 @@ def _positive_closure_(self):
                     self._token('+')
                 self._error(
                     'expecting one of: '
-                    "'+' '-'"  # noqa: COM812
+                    "'+' '-'"
                 )
         self._cut()
 
+
     @tatsumasu('Closure')
     def _closure_(self):
         self._token('{')
@@ -914,6 +870,7 @@ def _closure_(self):
             self._token('*')
         self._cut()
 
+
     @tatsumasu('EmptyClosure')
     def _empty_closure_(self):
         self._token('{')
@@ -921,6 +878,7 @@ def _empty_closure_(self):
         self.name_last_node('@')
         self._token('}')
 
+
     @tatsumasu('Optional')
     def _optional_(self):
         self._token('[')
@@ -930,6 +888,7 @@ def _optional_(self):
         self._token(']')
         self._cut()
 
+
     @tatsumasu('Special')
     def _special_(self):
         self._token('?(')
@@ -939,6 +898,7 @@ def _special_(self):
         self._token(')?')
         self._cut()
 
+
     @tatsumasu('Lookahead')
     def _lookahead_(self):
         self._token('&')
@@ -946,6 +906,7 @@ def _lookahead_(self):
         self._term_()
         self.name_last_node('@')
 
+
     @tatsumasu('NegativeLookahead')
     def _negative_lookahead_(self):
         self._token('!')
@@ -953,6 +914,7 @@ def _negative_lookahead_(self):
         self._term_()
         self.name_last_node('@')
 
+
     @tatsumasu('SkipTo')
     def _skip_to_(self):
         self._token('->')
@@ -960,6 +922,7 @@ def _skip_to_(self):
         self._term_()
         self.name_last_node('@')
 
+
     @tatsumasu()
     def _atom_(self):
         with self._choice():
@@ -984,37 +947,44 @@ def _atom_(self):
                 "'$' '>>' '`' '~' <alert> <call>"
                 '<constant> <cut> <cut_deprecated> <eof>'
                 '<pattern> <raw_string> <regexes>'
-                '<string> <token> <word> \\^+'  # noqa: COM812
+                '<string> <token> <word> \\^+'
             )
 
+
     @tatsumasu('RuleRef')
     def _call_(self):
         self._word_()
 
+
     @tatsumasu('Void')
     def _void_(self):
         self._token('()')
         self._cut()
 
+
     @tatsumasu('Cut')
     def _cut_(self):
         self._token('~')
         self._cut()
 
+
     @tatsumasu('Cut')
     def _cut_deprecated_(self):
         self._token('>>')
         self._cut()
 
+
     @tatsumasu()
     def _known_name_(self):
         self._name_()
         self._cut()
 
+
     @tatsumasu()
     def _name_(self):
         self._word_()
 
+
     @tatsumasu('Constant')
     def _constant_(self):
         with self._if():
@@ -1032,20 +1002,19 @@ def _constant_(self):
                     self._pattern('`(.*?)`')
                 self._error(
                     'expecting one of: '
-                    "'`' (?ms)```((?:.|\\n)*?)``` `(.*?)`"  # noqa: COM812
+                    "'`' (?ms)```((?:.|\\n)*?)``` `(.*?)`"
                 )
 
+
     @tatsumasu('Alert')
     def _alert_(self):
         self._pattern('\\^+')
         self.name_last_node('level')
         self._constant_()
         self.name_last_node('message')
+        self._define(['level', 'message'], [])
 
-        self._define(
-            ['level', 'message'],
-            [],
-        )
+        self._define(['level', 'message'], [])
 
     @tatsumasu('Token')
     def _token_(self):
@@ -1056,9 +1025,10 @@ def _token_(self):
                 self._raw_string_()
             self._error(
                 'expecting one of: '
-                '<STRING> <raw_string> <string> r'  # noqa: COM812
+                '<STRING> <raw_string> <string> r'
             )
 
+
     @tatsumasu()
     def _literal_(self):
         with self._choice():
@@ -1085,19 +1055,22 @@ def _literal_(self):
                 '<float> <hex> <int> <null> <raw_string>'
                 '<string> <word> [-'
                 '+]?(?:\\d+\\.\\d*|\\d*\\.\\d+)(?:[Ee][-'
-                '+]?\\d+)? [-+]?\\d+ r'  # noqa: COM812
+                '+]?\\d+)? [-+]?\\d+ r'
             )
 
+
     @tatsumasu()
     def _string_(self):
         self._STRING_()
 
+
     @tatsumasu()
     def _raw_string_(self):
         self._pattern('r')
         self._STRING_()
         self.name_last_node('@')
 
+
     @tatsumasu()
     def _STRING_(self):
         with self._choice():
@@ -1112,46 +1085,55 @@ def _STRING_(self):
             self._error(
                 'expecting one of: '
                 '"((?:[^"\\n]|\\"|\\\\)*?)"'
-                "'((?:[^'\\n]|\\'|\\\\)*?)'"  # noqa: COM812
+                "'((?:[^'\\n]|\\'|\\\\)*?)'"
             )
 
+
     @tatsumasu()
     def _hex_(self):
         self._pattern('0[xX](?:\\d|[a-fA-F])+')
 
+
     @tatsumasu()
     def _float_(self):
         self._pattern('[-+]?(?:\\d+\\.\\d*|\\d*\\.\\d+)(?:[Ee][-+]?\\d+)?')
 
+
     @tatsumasu()
     def _int_(self):
         self._pattern('[-+]?\\d+')
 
+
     @tatsumasu()
     def _path_(self):
         self._pattern('(?!\\d)\\w+(?:::(?!\\d)\\w+)+')
 
+
     @tatsumasu()
     def _word_(self):
         self._pattern('(?!\\d)\\w+')
 
+
     @tatsumasu('Any')
     def _any_(self):
         self._token('/./')
 
+
     @tatsumasu('Pattern')
     def _pattern_(self):
         self._regexes_()
 
+
     @tatsumasu()
     def _regexes_(self):
 
         def sep0():
             self._token('+')
 
-        def block0():
+        def block1():
             self._regex_()
-        self._positive_gather(block0, sep0)
+        self._positive_gather(block1, sep0)
+
 
     @tatsumasu()
     def _regex_(self):
@@ -1176,9 +1158,10 @@ def _regex_(self):
                 self.name_last_node('@')
             self._error(
                 'expecting one of: '
-                "'/' '?' '?/'"  # noqa: COM812
+                "'/' '?' '?/'"
             )
 
+
     @tatsumasu()
     def _boolean_(self):
         with self._choice():
@@ -1188,231 +1171,21 @@ def _boolean_(self):
                 self._token('False')
             self._error(
                 'expecting one of: '
-                "'False' 'True'"  # noqa: COM812
+                "'False' 'True'"
             )
 
+
     @tatsumasu()
     def _null_(self):
         self._token('None')
 
+
     @tatsumasu('EOF')
     def _eof_(self):
         self._token('$')
         self._cut()
 
 
-class EBNFBootstrapSemantics:
-    def start(self, ast):
-        return ast
-
-    def grammar(self, ast):
-        return ast
-
-    def directive(self, ast):
-        return ast
-
-    def keywords(self, ast):
-        return ast
-
-    def keyword(self, ast):
-        return ast
-
-    def paramdef(self, ast):
-        return ast
-
-    def rule(self, ast):
-        return ast
-
-    def decorator(self, ast):
-        return ast
-
-    def params(self, ast):
-        return ast
-
-    def first_param(self, ast):
-        return ast
-
-    def kwparams(self, ast):
-        return ast
-
-    def pair(self, ast):
-        return ast
-
-    def expre(self, ast):
-        return ast
-
-    def choice(self, ast):
-        return ast
-
-    def option(self, ast):
-        return ast
-
-    def sequence(self, ast):
-        return ast
-
-    def element(self, ast):
-        return ast
-
-    def rule_include(self, ast):
-        return ast
-
-    def named(self, ast):
-        return ast
-
-    def named_list(self, ast):
-        return ast
-
-    def named_single(self, ast):
-        return ast
-
-    def override(self, ast):
-        return ast
-
-    def override_list(self, ast):
-        return ast
-
-    def override_single(self, ast):
-        return ast
-
-    def override_single_deprecated(self, ast):
-        return ast
-
-    def term(self, ast):
-        return ast
-
-    def group(self, ast):
-        return ast
-
-    def gather(self, ast):
-        return ast
-
-    def positive_gather(self, ast):
-        return ast
-
-    def normal_gather(self, ast):
-        return ast
-
-    def join(self, ast):
-        return ast
-
-    def positive_join(self, ast):
-        return ast
-
-    def normal_join(self, ast):
-        return ast
-
-    def left_join(self, ast):
-        return ast
-
-    def right_join(self, ast):
-        return ast
-
-    def separator(self, ast):
-        return ast
-
-    def positive_closure(self, ast):
-        return ast
-
-    def closure(self, ast):
-        return ast
-
-    def empty_closure(self, ast):
-        return ast
-
-    def optional(self, ast):
-        return ast
-
-    def special(self, ast):
-        return ast
-
-    def lookahead(self, ast):
-        return ast
-
-    def negative_lookahead(self, ast):
-        return ast
-
-    def skip_to(self, ast):
-        return ast
-
-    def atom(self, ast):
-        return ast
-
-    def call(self, ast):
-        return ast
-
-    def void(self, ast):
-        return ast
-
-    def cut(self, ast):
-        return ast
-
-    def cut_deprecated(self, ast):
-        return ast
-
-    def known_name(self, ast):
-        return ast
-
-    def name(self, ast):
-        return ast
-
-    def constant(self, ast):
-        return ast
-
-    def alert(self, ast):
-        return ast
-
-    def token(self, ast):
-        return ast
-
-    def literal(self, ast):
-        return ast
-
-    def string(self, ast):
-        return ast
-
-    def raw_string(self, ast):
-        return ast
-
-    def STRING(self, ast):
-        return ast
-
-    def hex(self, ast):
-        return ast
-
-    def float(self, ast):
-        return ast
-
-    def int(self, ast):
-        return ast
-
-    def path(self, ast):
-        return ast
-
-    def word(self, ast):
-        return ast
-
-    def any(self, ast):
-        return ast
-
-    def pattern(self, ast):
-        return ast
-
-    def regexes(self, ast):
-        return ast
-
-    def regex(self, ast):
-        return ast
-
-    def boolean(self, ast):
-        return ast
-
-    def null(self, ast):
-        return ast
-
-    def eof(self, ast):
-        return ast
-
-
 def main(filename, **kwargs):
     if not filename or filename == '-':
         text = sys.stdin.read()
diff --git a/tatsu/ngcodegen/python.py b/tatsu/ngcodegen/python.py
index ac4eca6d..791a7b86 100644
--- a/tatsu/ngcodegen/python.py
+++ b/tatsu/ngcodegen/python.py
@@ -24,7 +24,7 @@
     #  Any changes you make to it will be overwritten the next time
     #  the file is generated.
 
-    # ruff: noqa: C405, I001, F401, SIM117
+    # ruff: noqa: C405, COM812, I001, F401, SIM117
 
     import sys
     from pathlib import Path