Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Minor fix to account for bad None arguments for tabmodule/lextab
  • Loading branch information
dabeaz committed May 8, 2015
1 parent 192d922 commit dbf1226
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ply/lex.py
Expand Up @@ -859,6 +859,10 @@ def validate_module(self, module):
# -----------------------------------------------------------------------------
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
Expand Down
5 changes: 4 additions & 1 deletion ply/yacc.py
Expand Up @@ -2709,7 +2709,7 @@ def write_table(self, tabmodule, outputdir='', signature=''):
_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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit dbf1226

Please sign in to comment.