Codechange: Vendor in latest ply version

.flake8

@@ -14,6 +14,6 @@ per-file-ignores =
 
 exclude =
     build
-    generated
+    ply
     nml/actions/action2var_variables.py
     nml/actions/action3_callbacks.py

.github/workflows/testing.yml

@@ -79,4 +79,4 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install black
-        black -l 120 --exclude "(generated|nml/actions/action2var_variables.py|nml/actions/action3_callbacks.py)" --check --diff nml
+        black -l 120 --exclude "(ply|nml/actions/action2var_variables.py|nml/actions/action3_callbacks.py)" --check --diff nml

.gitignore

@@ -2,8 +2,6 @@ build/*
 dist/*
 **/__pycache__/*
 nml/__version__.py
-nml/generated/parsetab.py
-nml/generated/lextab.py
 **/.nmlcache
 nml.egg-info/*
 nml_lz77*

Makefile

@@ -1,6 +1,6 @@
 MAKE?=make
 PYTHON?=/usr/bin/env python3
-BLACK_OPTIONS=-l 120 --exclude 'action2var_variables.py|action3_callbacks.py|generated'
+BLACK_OPTIONS=-l 120 --exclude 'action2var_variables.py|action3_callbacks.py|ply'
 
 .PHONY: regression test install extensions clean flake black
 

nml/main.py

@@ -85,7 +85,6 @@ def parse_cli(argv):
         md5_filename=None,
         keep_orphaned=True,
         verbosity=generic.verbosity_level,
-        rebuild_parser=False,
         debug_parser=False,
         allow_extra_zoom=True,
         allow_32bpp=True,
@@ -197,13 +196,6 @@ def parse_cli(argv):
             generic.VERBOSITY_MAX
         ),
     )
-    opt_parser.add_option(
-        "-R",
-        "--rebuild-parser",
-        action="store_true",
-        dest="rebuild_parser",
-        help="Force regeneration of parser tables.",
-    )
     opt_parser.add_option(
         "-D", "--debug-parser", action="store_true", dest="debug_parser", help="Enable debug mode for parser."
     )
@@ -353,7 +345,6 @@ def main(argv):
         opts.crop,
         opts.forced_palette,
         opts.md5_filename,
-        opts.rebuild_parser,
         opts.debug_parser,
         opts.disable_palette_validation,
     )
@@ -376,7 +367,6 @@ def nml(
     crop_sprites,
     forced_palette,
     md5_filename,
-    rebuild_parser,
     debug_parser,
     disable_palette_validation,
 ):
@@ -425,7 +415,7 @@ def nml(
 
     generic.print_progress("Init parser ...")
 
-    nml_parser = parser.NMLParser(rebuild_parser, debug_parser)
+    nml_parser = parser.NMLParser(debug_parser)
     if input_filename is None:
         input_filename = "input"
 

nml/parser.py

@@ -13,7 +13,7 @@
 with NML; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."""
 
-import ply.yacc as yacc
+from .ply import yacc
 
 from nml import expression, generic, nmlop, tokens, unit
 from nml.actions import actionD, real_sprite
@@ -59,24 +59,14 @@ class NMLParser:
     @type parser: L{ply.yacc}
     """
 
-    def __init__(self, rebuild=False, debug=False):
-        if debug:
-            try:
-                import os
-
-                os.remove(os.path.normpath(os.path.join(os.path.dirname(__file__), "generated", "parsetab.py")))
-            except FileNotFoundError:
-                # Tried to remove a non existing file
-                pass
+    def __init__(self, debug=False):
         self.lexer = tokens.NMLLexer()
-        self.lexer.build(rebuild or debug)
+        self.lexer.build()
         self.tokens = self.lexer.tokens
         self.parser = yacc.yacc(
             module=self,
             debug=debug,
-            optimize=not (rebuild or debug),
-            write_tables=not debug,
-            tabmodule="nml.generated.parsetab",
+            optimize=not debug,
         )
 
     def parse(self, text, input_filename):

nml/ply/__init__.py

@@ -0,0 +1,5 @@
+# PLY package
+# Author: David Beazley ([email protected])
+# https://github.com/dabeaz/ply
+
+__version__ = '2022.10.27'