Changeset: cea24e594d60 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cea24e594d60
Modified Files:
testing/Mfilter.py.in
Branch: Feb2013
Log Message:
Mfilter.py.in: normalize also "sys.L[0-9]*" to "sys."
(in addition to ".L[0-9]*" to "."
diffs (25 lines):
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -113,8 +113,8 @@ norm_out = (
None, '1.1', None,
# 9: 3
)
-# match "table_name" SQL table header line to normalize ".L[0-9]*" to "."
-table_name = re.compile(r'^%.*[\t ]\.L[0-9]*[, ].*# table_name$')
+# match "table_name" SQL table header line to normalize "(sys)?.L[0-9]*" to
"(sys)?."
+table_name = re.compile(r'^%.*[\t ](|sys)\.L[0-9]*[, ].*# table_name$')
attrre = re.compile(r'\b[-:a-zA-Z_0-9]+\s*=\s*(?:\'[^\']*\'|"[^"]*")')
elemre = re.compile(r'<[-:a-zA-Z_0-9]+(?P<attrs>(\s+' + attrre.pattern +
r')+)\s*/?>')
@@ -176,8 +176,8 @@ def mFilter (FILE, IGNORE) :
oline += '\n'
xline = norm_hint + iline
elif table_name.match(iline):
- # normalize ".L[0-9]*" to "." in "table_name" line of SQL table
header
- oline = re.sub(r'([ \t]\.)L[0-9]*([, ])', r'\1\2', iline)
+ # normalize "(sys)?.L[0-9]*" to "(sys)?." in "table_name" line of
SQL table header
+ oline = re.sub(r'([ \t])(|sys)(\.)L[0-9]*([, ])', r'\1\2\3\4',
iline)
# keep original line for reference as comment (i.e., ignore diffs,
if any)
xline = iline.replace('%','#',1)
else:
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
