diff options
-rw-r--r-- | ply/lex.py | 4 | ||||
-rw-r--r-- | ply/yacc.py | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -859,6 +859,10 @@ class LexerReflect(object): # ----------------------------------------------------------------------------- def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab', reflags=0, nowarn=False, outputdir=None, debuglog=None, errorlog=None): + + if lextab is None: + lextab = 'lextab' + global lexer ldict = None diff --git a/ply/yacc.py b/ply/yacc.py index e0b4faf..eb02cc2 100644 --- a/ply/yacc.py +++ b/ply/yacc.py @@ -2709,7 +2709,7 @@ _tabversion = %r _lr_method = %r _lr_signature = %r - ''' % (filename, __tabversion__, self.lr_method, signature)) + ''' % (os.path.basename(filename), __tabversion__, self.lr_method, signature)) # Change smaller to 0 to go back to original tables smaller = 1 @@ -3183,6 +3183,9 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star check_recursion=True, optimize=False, write_tables=True, debugfile=debug_file, outputdir=None, debuglog=None, errorlog=None, picklefile=None): + if tabmodule is None: + tabmodule = tab_module + # Reference to the parsing method of the last built parser global parse |