Changeset c101fe1 for waflib/Tools/c_preproc.py

Timestamp:

Nov 13, 2013, 1:00:56 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

d3066e2

Parents:

54e74f0

Message:

waf, waflib: update to 1.7.13

File:

• waflib/Tools/c_preproc.py (modified) (6 diffs)

waflib/Tools/c_preproc.py

@@ -22 +22 @@
 re_pragma_once=re.compile('^\s*once\s*',re.IGNORECASE)
 re_nl=re.compile('\\\\\r*\n',re.MULTILINE)
-re_cpp=re.compile(r"""(/\*[^*]*\*+([^/*][^*]*\*+)*/)|//[^\n]*|("(\\.|[^"\\])*"|'(\\.|[^'\\])*'|.[^/"'\\]*)""",re.MULTILINE)
+re_cpp=re.compile(r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"',re.DOTALL|re.MULTILINE)
 trig_def=[('??'+a,b)for a,b in zip("=-/!'()<>",r'#~\|^[]{}')]
 chr_esc={'0':0,'a':7,'b':8,'t':9,'n':10,'f':11,'v':12,'r':13,'\\':92,"'":39}
@@ -38 +38 @@
 skipped='s'
 def repl(m):
-        s=m.group(1)
-        if s:
+        s=m.group(0)
+        if s.startswith('/'):
                 return' '
-        return m.group(3)or''
+        return s
 def filter_comments(filename):
         code=Utils.readf(filename)
@@ -476 +476 @@
                                 break
                         found=self.cached_find_resource(n,filename)
-                if found:
+                if found and not found in self.ban_includes:
                         self.nodes.append(found)
                         if filename[-4:]!='.moc':
@@ -519 +519 @@
                         bld.parse_cache={}
                         self.parse_cache=bld.parse_cache
+                self.current_file=node
                 self.addlines(node)
                 if env['DEFINES']:
@@ -558 +559 @@
                                 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:
@@ -584 +584 @@
                                 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 ,e:
                                 if Logs.verbose: