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

Match compiler: Split _replaceTokenMatch() into two small functions

This commit is contained in:
Thomas Jarosch 2013-01-07 21:39:49 +01:00
parent 498d03458f
commit 9b51d81e99
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tools/matchcompiler.py
View File

@ -246,6 +246,21 @@ class MatchCompiler:
return None return None
def _replaceSpecificTokenMatch(self, line, start_pos, end_pos, pattern, tok, varId):
more_args = ''
if varId:
more_args = ',' + varId
# Compile function or use previously compiled one
patternNumber = self._lookupMatchFunctionId(pattern, None, varId, False)
if patternNumber == None:
patternNumber = len(self._rawMatchFunctions) + 1
self._insertMatchFunctionId(patternNumber, pattern, None, varId, False)
self._rawMatchFunctions.append(self._compilePattern(pattern, patternNumber, varId))
return line[:start_pos]+'match'+str(patternNumber)+'('+tok+more_args+')'+line[start_pos+end_pos:]
def _replaceTokenMatch(self, line): def _replaceTokenMatch(self, line):
while True: while True:
pos1 = line.find('Token::Match(') pos1 = line.find('Token::Match(')
@ -257,34 +272,22 @@ class MatchCompiler:
res = self.parseMatch(line, pos1) res = self.parseMatch(line, pos1)
if res == None: if res == None:
break break
else:
assert(len(res)==3 or len(res)==4) # assert that Token::Match has either 2 or 3 arguments
g0 = res[0] assert(len(res)==3 or len(res)==4) # assert that Token::Match has either 2 or 3 arguments
arg1 = res[1]
arg2 = res[2]
arg3 = None
if len(res) == 4:
arg3 = res[3]
res = re.match(r'\s*"([^"]*)"\s*$', arg2) end_pos = len(res[0])
if res == None: tok = res[1]
break # Non-const pattern - bailout raw_pattern = res[2]
else: varId = None
pattern = res.group(1) if len(res) == 4:
a3 = '' varId = res[3]
if arg3:
a3 = ',' + arg3
# Compile function or use previously compiled one res = re.match(r'\s*"([^"]*)"\s*$', raw_pattern)
patternNumber = self._lookupMatchFunctionId(pattern, None, arg3, False) if res == None:
break # Non-const pattern - bailout
if patternNumber == None: pattern = res.group(1)
patternNumber = len(self._rawMatchFunctions) + 1 line = self._replaceSpecificTokenMatch(line, pos1, end_pos, pattern, tok, varId)
self._insertMatchFunctionId(patternNumber, pattern, None, arg3, False)
self._rawMatchFunctions.append(self._compilePattern(pattern, patternNumber, arg3))
line = line[:pos1]+'match'+str(patternNumber)+'('+arg1+a3+')'+line[pos1+len(g0):]
return line return line