FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 09:57:15 +01:00
Code Issues Projects Releases Wiki Activity

Issue 1255

Browse Source
This commit is contained in:
Thomas Nagy 2013-02-15 10:35:20 +01:00
parent a308c89c35
commit 582a1a59f1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
waflib/Tools/c_preproc.py
View File

@ -853,7 +853,7 @@ class c_parser(object):
break
found = self.cached_find_resource(n, filename)
if found:
if found and not found in self.ban_includes:
# TODO the duplicates do not increase the no-op build times too much, but they may be worth removing
self.nodes.append(found)
if filename[-4:] != '.moc':
@ -921,6 +921,7 @@ class c_parser(object):
bld.parse_cache = {}
self.parse_cache = bld.parse_cache
self.current_file = node
self.addlines(node)
# macros may be defined on the command-line, so they must be parsed as if they were part of the file
@ -970,12 +971,11 @@ class c_parser(object):
else: state[-1] = accepted
elif token == 'include' or token == 'import':
(kind, inc) = extract_include(line, self.defs)
if inc in self.ban_includes:
continue
if token == 'import': self.ban_includes.add(inc)
if ve: debug('preproc: include found %s (%s) ', inc, kind)
if kind == '"' or not strict_quotes:
self.tryfind(inc)
self.current_file = self.tryfind(inc)
if token == 'import':
self.ban_includes.add(self.current_file)
elif token == 'elif':
if state[-1] == accepted:
state[-1] = skipped
@ -997,7 +997,7 @@ class c_parser(object):
#print "undef %s" % name
elif token == 'pragma':
if re_pragma_once.match(line.lower()):
self.ban_includes.add(self.curfile)
self.ban_includes.add(self.current_file)
except Exception as e:
if Logs.verbose:
debug('preproc: line parsing failed (%s): %s %s', e, line, Utils.ex_stack())