mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 08:58:27 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From dbf122652d38ba03ff9f9fe4aa9bee3693e6775f Mon Sep 17 00:00:00 2001
|
|
From: David Beazley <dave@dabeaz.com>
|
|
Date: Fri, 8 May 2015 10:10:55 -0500
|
|
Subject: [PATCH] Minor fix to account for bad None arguments for
|
|
tabmodule/lextab
|
|
|
|
---
|
|
ply/lex.py | 4 ++++
|
|
ply/yacc.py | 5 ++++-
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ply/lex.py b/ply/lex.py
|
|
index ed1e2ed..772325c 100644
|
|
--- a/ply/lex.py
|
|
+++ b/ply/lex.py
|
|
@@ -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
|
|
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 @@ 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
|
|
@@ -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
|
|
|