Move ply into src

Author: boriel

libzxbasm/asmlex.py

@@ -8,11 +8,12 @@
 # This program is Free Software and is released under the terms of
 #                    the GNU General License
 #
-# This is the Lexer for the ZXBpp (ZXBasic Preprocessor)
+# This is the Lexer for the zxbasm (ZXBasic Assembler)
 # ----------------------------------------------------------------------
 
-import ply.lex as lex
 import sys
+
+from src.ply import lex
 from src.api.config import OPTIONS
 from src.api.errmsg import error
 

libzxbasm/asmparse.py

@@ -14,7 +14,7 @@
 import os
 import re
 from . import asmlex, basic
-import ply.yacc as yacc
+import src.ply.yacc as yacc
 
 from .asmlex import tokens  # noqa
 from .asm import AsmInstruction, Error

libzxbpp/zxbasmpplex.py

@@ -12,7 +12,7 @@
 
 import os
 import sys
-from ply import lex
+from src.ply import lex
 import src.api.utils
 from libzxbpp.prepro.output import warning, error
 

libzxbpp/zxbpp.py

@@ -18,15 +18,17 @@
 from typing import NamedTuple, List
 
 from .zxbpplex import tokens  # noqa
-from . import zxbpplex, zxbasmpplex
-from ply import yacc
+from . import zxbpplex
+from . import zxbasmpplex
+from src.ply import yacc
 
 from src.api.config import OPTIONS
 from src.api import global_
 import src.api.utils
+
+from .prepro import output
 from .prepro.output import warning
 from .prepro.output import error
-from .prepro.output import CURRENT_FILE
 from .prepro import DefinesTable, ID, MacroCall, Arg, ArgList
 from .prepro.exceptions import PreprocError
 
@@ -75,7 +77,6 @@ def init():
     global ENABLED
     global IFDEFS
     global ID_TABLE
-    global CURRENT_FILE
 
     OPTIONS.add_option_if_not_defined('debug_zxbpp', bool, False)
     global_.FILENAME = '(stdin)'
@@ -88,7 +89,7 @@ def init():
     global_.error_msg_cache.clear()
     parser.defaulted_states = {}
     ID_TABLE = DefinesTable()
-    del CURRENT_FILE[:]
+    del output.CURRENT_FILE[:]
 
 
 def get_include_path():
@@ -152,16 +153,15 @@ def include_file(filename, lineno, local_first):
     This is used when doing a #include "filename".
     """
     global CURRENT_DIR
-    global CURRENT_FILE
 
     filename = search_filename(filename, lineno, local_first)
     if filename not in INCLUDED.keys():
         INCLUDED[filename] = []
 
-    if len(CURRENT_FILE) > 0:  # Added from which file, line
-        INCLUDED[filename].append((CURRENT_FILE[-1], lineno))
+    if len(output.CURRENT_FILE) > 0:  # Added from which file, line
+        INCLUDED[filename].append((output.CURRENT_FILE[-1], lineno))
 
-    CURRENT_FILE.append(filename)
+    output.CURRENT_FILE.append(filename)
     CURRENT_DIR = os.path.dirname(filename)
     return LEXER.include(filename)
 
@@ -284,8 +284,8 @@ def p_include_file(p):
     """
     global CURRENT_DIR
     p[0] = [p[1] + p[2]] + p[3] + [p[4]]
-    CURRENT_FILE.pop()  # Remove top of the stack
-    CURRENT_DIR = os.path.dirname(CURRENT_FILE[-1])
+    output.CURRENT_FILE.pop()  # Remove top of the stack
+    CURRENT_DIR = os.path.dirname(output.CURRENT_FILE[-1])
 
 
 def p_include_file_empty(p):
@@ -305,8 +305,8 @@ def p_include_once_ok(p):
     """
     global CURRENT_DIR
     p[0] = [p[1] + p[2]] + p[3] + [p[4]]
-    CURRENT_FILE.pop()  # Remove top of the stack
-    CURRENT_DIR = os.path.dirname(CURRENT_FILE[-1])
+    output.CURRENT_FILE.pop()  # Remove top of the stack
+    CURRENT_DIR = os.path.dirname(output.CURRENT_FILE[-1])
 
 
 def p_include(p):
@@ -422,7 +422,7 @@ def p_define(p):
                 warning(p.lineno(1), "missing whitespace after the macro name")
 
         ID_TABLE.define(p[2], args=p[3], value=p[4], lineno=p.lineno(2),
-                        fname=CURRENT_FILE[-1])
+                        fname=output.CURRENT_FILE[-1])
     p[0] = []
 
 
@@ -437,7 +437,7 @@ def p_define_params_empty(p):
     """
     # Defines the 'epsilon' parameter
     p[0] = [ID('', value='', args=None, lineno=p.lineno(1),
-               fname=CURRENT_FILE[-1])]
+               fname=output.CURRENT_FILE[-1])]
 
 
 def p_define_params_paramlist(p):
@@ -464,14 +464,14 @@ def p_paramlist_single(p):
     """ paramlist : ID
     """
     p[0] = [ID(p[1], value='', args=None, lineno=p.lineno(1),
-               fname=CURRENT_FILE[-1])]
+               fname=output.CURRENT_FILE[-1])]
 
 
 def p_paramlist_paramlist(p):
     """ paramlist : paramlist COMMA ID
     """
     p[0] = p[1] + [ID(p[3], value='', args=None, lineno=p.lineno(1),
-                      fname=CURRENT_FILE[-1])]
+                      fname=output.CURRENT_FILE[-1])]
 
 
 def p_pragma_id(p):
@@ -505,7 +505,7 @@ def p_ifdef(p):
     else:
         p[0] = []
 
-    p[0] += ['#line %i "%s"' % (p.lineno(4) + 1, CURRENT_FILE[-1])]
+    p[0] += ['#line %i "%s"' % (p.lineno(4) + 1, output.CURRENT_FILE[-1])]
     ENABLED = IFDEFS.pop().enabled
 
 
@@ -520,7 +520,7 @@ def p_ifdef_else(p):
     else:
         p[0] = []
 
-    p[0] += ['#line %i "%s"' % (p.lineno(3) + 1, CURRENT_FILE[-1])]
+    p[0] += ['#line %i "%s"' % (p.lineno(3) + 1, output.CURRENT_FILE[-1])]
 
 
 def p_ifdef_else_a(p):
@@ -541,7 +541,7 @@ def p_ifdef_else_b(p):
     global ENABLED
 
     if ENABLED:
-        p[0] = ['#line %i "%s"%s' % (p.lineno(1) + 1, CURRENT_FILE[-1], p[2])]
+        p[0] = ['#line %i "%s"%s' % (p.lineno(1) + 1, output.CURRENT_FILE[-1], p[2])]
         p[0] += p[3]
     else:
         p[0] = []
@@ -757,12 +757,12 @@ def filter_(input_, filename='<internal>', state='INITIAL'):
     global CURRENT_DIR
 
     prev_dir = CURRENT_DIR
-    CURRENT_FILE.append(filename)
-    CURRENT_DIR = os.path.dirname(CURRENT_FILE[-1])
+    output.CURRENT_FILE.append(filename)
+    CURRENT_DIR = os.path.dirname(output.CURRENT_FILE[-1])
     LEXER.input(input_, filename)
     LEXER.lex.begin(state)
     parser.parse(lexer=LEXER, debug=OPTIONS.debug_zxbpp)
-    CURRENT_FILE.pop()
+    output.CURRENT_FILE.pop()
     CURRENT_DIR = prev_dir
 
 
@@ -774,10 +774,10 @@ def main(argv):
     set_include_path()
 
     if argv:
-        CURRENT_FILE.append(argv[0])
+        output.CURRENT_FILE.append(argv[0])
     else:
-        CURRENT_FILE.append(global_.FILENAME)
-    CURRENT_DIR = os.path.dirname(CURRENT_FILE[-1])
+        output.CURRENT_FILE.append(global_.FILENAME)
+    CURRENT_DIR = os.path.dirname(output.CURRENT_FILE[-1])
 
     if OPTIONS.Sinclair:
         included_file = search_filename('sinclair.bas', 0, local_first=False)
@@ -789,17 +789,17 @@ def main(argv):
             OUTPUT += '\n'
 
         parser.parse(lexer=LEXER, debug=OPTIONS.debug_zxbpp)
-        CURRENT_FILE.pop()
-        CURRENT_DIR = os.path.dirname(CURRENT_FILE[-1])
+        output.CURRENT_FILE.pop()
+        CURRENT_DIR = os.path.dirname(output.CURRENT_FILE[-1])
 
     prev_file = global_.FILENAME
-    global_.FILENAME = CURRENT_FILE[-1]
-    OUTPUT += LEXER.include(CURRENT_FILE[-1])
+    global_.FILENAME = output.CURRENT_FILE[-1]
+    OUTPUT += LEXER.include(output.CURRENT_FILE[-1])
     if len(OUTPUT) and OUTPUT[-1] != '\n':
         OUTPUT += '\n'
 
     parser.parse(lexer=LEXER, debug=OPTIONS.debug_zxbpp)
-    CURRENT_FILE.pop()
+    output.CURRENT_FILE.pop()
     global_.FILENAME = prev_file
     return global_.has_errors
 

libzxbpp/zxbpplex.py

@@ -11,7 +11,7 @@
 # ----------------------------------------------------------------------
 
 import sys
-from ply import lex
+from src.ply import lex
 from libzxbpp.prepro.output import warning, error
 import src.api.utils
 

pyproject.toml

@@ -36,7 +36,6 @@ packages = [
     { include = "arch/**/*"},
     { include = "ast_" },
     { include = "outfmt" },
-    { include = "ply" },
     { include = "libzxbasm" },
     { include = "libzxbpp" },
 ]

setup.py

@@ -13,8 +13,7 @@
     'libzxbasm',
     'libzxbpp',
     'libzxbpp.prepro',
-    'outfmt',
-    'ply'
+    'outfmt'
 ]
 
 # The directory containing this file

src/libzxbc/zxblex.py

@@ -10,7 +10,7 @@
 # ----------------------------------------------------------------------
 
 import sys
-from ply import lex
+from src.ply import lex
 from .keywords import KEYWORDS as reserved
 from src import api
 from src.api.errmsg import error

src/libzxbc/zxbparser.py

@@ -55,7 +55,7 @@
 from src.api import global_ as gl
 
 # Lexers and parsers, etc
-import ply.yacc as yacc
+import src.ply.yacc as yacc
 from src.libzxbc import zxblex
 from src.libzxbc.zxblex import tokens  # noqa
 from libzxbpp import zxbpp