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

matchcompiler.py: only add additional includes if necessary (#2636)

This commit is contained in:
Oliver Stöneberg 2020-05-12 21:49:39 +02:00 committed by GitHub
parent 0799d74071
commit 4f7d162555
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tools/matchcompiler.py
View File

@ -186,7 +186,7 @@ class MatchCompiler:
elif tok[0:2] == "!!":
ret += ' if (tok && tok->str() == MatchCompiler::makeConstString("' + tok[2:] + '"))\n'
ret += ' ' + returnStatement
gotoNextToken = ' tok = tok ? tok->next() : NULL;\n'
gotoNextToken = ' tok = tok ? tok->next() : nullptr;\n'
else:
negatedTok = "!" + self._compileCmd(tok)
@ -224,7 +224,7 @@ class MatchCompiler:
ret += self._compilePattern(pattern, -1, varId, True, 'T')
ret += ' }\n'
ret += ' return NULL;\n}\n'
ret += ' return nullptr;\n}\n'
return ret
@ -604,16 +604,15 @@ class MatchCompiler:
srclines = fin.readlines()
fin.close()
header = '#include "token.h"\n'
header += '#include "errorlogger.h"\n'
header += '#include "matchcompiler.h"\n'
header += '#include <string>\n'
header += '#include <cstring>\n'
# header += '#include <iostream>\n'
code = ''
code = u''
modified = False
linenr = 0
for line in srclines:
if not modified:
line_orig = line
linenr += 1
# Compile Token::Match and Token::simpleMatch
line = self._replaceTokenMatch(line, linenr, srcname)
@ -624,19 +623,33 @@ class MatchCompiler:
# Cache plain C-strings in C++ strings
line = self._replaceCStrings(line)
if not modified and not line_orig == line:
modified = True
code += line
# Compute matchFunctions
strFunctions = ''
strFunctions = u''
for function in self._rawMatchFunctions:
strFunctions += function
lineno = ''
lineno = u''
if line_directive:
lineno = '#line 1 "' + srcname + '"\n'
lineno = u'#line 1 "' + srcname + '"\n'
header = u'#include "matchcompiler.h"\n'
header += u'#include <string>\n'
header += u'#include <cstring>\n'
if len(self._rawMatchFunctions):
header += u'#include "errorlogger.h"\n'
header += u'#include "token.h"\n'
fout = io.open(destname, 'wt', encoding="utf-8")
fout.write(header + strFunctions + lineno + code)
if modified or len(self._rawMatchFunctions):
fout.write(header)
fout.write(strFunctions)
fout.write(lineno)
fout.write(code)
fout.close()