walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

matchcompiler: reverted changes so the 'make test' works again

This commit is contained in:
Daniel Marjamäki 2012-12-08 07:41:18 +01:00
parent 068c695bd1
commit bef0cf149b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/matchcompiler.py
View File

@ -90,9 +90,11 @@ def compilePattern(pattern, nr):
ret = ret + ' return true;\n}\n' ret = ret + ' return true;\n}\n'
return ret return ret
def findMatchPattern(line): def findMatchPattern(line):
res = re.search(r'Token::s?i?m?p?l?e?Match[(](([^(,]+([(][^()]*[)])?){1,4})\s*,\s*"([^"]+)"[)]', line) res = re.search(r'Token::Match[(]([^(,]+),\s*"([^"]+)"[)]', line)
if res == None:
res = re.search(r'Token::simpleMatch[(]([^(,]+),\s*"([^"]+)"[)]', line)
return res return res
def convertFile(srcname, destname): def convertFile(srcname, destname):
@ -109,14 +111,14 @@ def convertFile(srcname, destname):
patternNumber = 1 patternNumber = 1
for line in srclines: for line in srclines:
res = findMatchPattern(line) res = findMatchPattern(line)
while res != None: if res == None: # or patternNumber > 68:
code = code + line
else:
g0 = res.group(0) g0 = res.group(0)
pos1 = line.find(g0) pos1 = line.find(g0)
line = line[:pos1]+'match'+str(patternNumber)+'('+res.group(1)+')'+line[pos1+len(g0):] code = code + line[:pos1]+'match'+str(patternNumber)+'('+res.group(1)+')'+line[pos1+len(g0):]
matchfunctions = matchfunctions + compilePattern(res.group(2), patternNumber) matchfunctions = matchfunctions + compilePattern(res.group(2), patternNumber)
patternNumber = patternNumber + 1 patternNumber = patternNumber + 1
res = findMatchPattern(line)
code = code + line
fout = open(destname, 'wt') fout = open(destname, 'wt')
fout.write(matchfunctions+code) fout.write(matchfunctions+code)
@ -124,10 +126,7 @@ def convertFile(srcname, destname):
# selftests.. # selftests..
assert(None != findMatchPattern(' Token::Match(tok, ";") ')) assert(None != findMatchPattern(' Token::Match(tok, ";") '))
assert(None != findMatchPattern(' Token::Match(tok->next(), ";") ')) assert(None == findMatchPattern(' Token::Match(tok->next(), ";") ')) # function calls are not handled
assert(None != findMatchPattern(' Token::Match(tok->next()->next(), ";") '))
assert(None != findMatchPattern(' Token::Match(tok->next()->next()->next(), ";") '))
assert(None != findMatchPattern(' Token::Match(tok->next()->next()->next()->next(), ";") '))
# convert all lib/*.cpp files # convert all lib/*.cpp files
for f in glob.glob('lib/*.cpp'): for f in glob.glob('lib/*.cpp'):