Changeset: 46659a7de18f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=46659a7de18f
Modified Files:
testing/melcheck.py
Branch: Oct2020
Log Message:
Deal with restrict, plus some fixes.
diffs (28 lines):
diff --git a/testing/melcheck.py b/testing/melcheck.py
--- a/testing/melcheck.py
+++ b/testing/melcheck.py
@@ -18,7 +18,7 @@ patreg = r'^\s*(?P<cmdpat>pattern|comman
argre = re.compile(argreg)
patre = re.compile(patreg, re.MULTILINE)
-fcnargreg =
r'\s*,\s*(?:const\s+)?(?:(?P<type>\w+)\s*\*(?:\s*(?:const\s*)?\*)*|ptr\s)\s*(?P<argname>\w+)'
+fcnargreg =
r'\s*,\s*(?:const\s+)?(?:(?P<type>\w+)\s*\*(?:\s*(?:const\s*)?\*)*(?:\s*restrict\s)?|ptr\s)\s*(?P<argname>\w+)'
fcnreg =
r'(?:static\s+)?(?:str|char\s*\*)\s+(?P<name>\w+)\s*\(\s*(?:(?P<pattern>Client\s+\w+\s*,\s*MalBlkPtr\s+\w+\s*,\s*MalStkPtr\s+\w+\s*,\s*InstrPtr\s+\w+)|(?P<command>(?:\w+\s*\*+|ptr\s)\s*\w+(?:'+
fcnargreg + r')*))\s*\)\s*{'
fcnre = re.compile(fcnreg)
@@ -115,13 +115,13 @@ def process2():
if cmdpat == 'pattern':
if imp not in gpats:
if imp in gcmds:
- print('command implementation {} for pattern
{}.{}'.format(imp, res.group('mod'), res.group('fcn')))
+ print('command implementation {} for pattern
{}.{}'.format(imp, mod, fcn))
else:
print('pattern implementation {} for {}.{} is
missing'.format(imp, mod, fcn))
else:
if imp not in gcmds:
if imp in gpats:
- print('pattern implementation {} for command
{}.{}'.format(imp, res.group('mod'), res.group('fcn')))
+ print('pattern implementation {} for command
{}.{}'.format(imp, mod, fcn))
else:
print('command implementation {} for {}.{} is
missing'.format(imp, mod, fcn))
else:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
