Mercurial > codeOptimizer
changeset 10:09b39021c4af
Make filename an attribute of file.
| author | Tom Fredrik Blenning Klaussen <bfg@blenning.no> |
|---|---|
| date | Wed, 14 Nov 2012 21:44:53 +0100 |
| parents | 2263a283203c |
| children | 5b542d05e2b1 |
| files | Compilable.py Config.py DepGraph.py test/loop/loop.xml |
| diffstat | 4 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Compilable.py Mon Sep 24 10:48:28 2012 +0200 +++ b/Compilable.py Wed Nov 14 21:44:53 2012 +0100 @@ -76,7 +76,7 @@ del replace[n] return retVal - + @staticmethod def getPathname(str): pattern = '^\s*#include ["<]([^">]+)[">]' @@ -84,7 +84,7 @@ m = prog.search(str) include = m.group(1) return include - + @staticmethod def getClassname(str):
--- a/Config.py Mon Sep 24 10:48:28 2012 +0200 +++ b/Config.py Wed Nov 14 21:44:53 2012 +0100 @@ -22,7 +22,7 @@ res = Config.getOption(potentialMatch, option, match) if not res: res = potentialMatch.getAttribute('cxxflags') - return res + return res return None def getCxxflags(self, name): @@ -34,6 +34,9 @@ def getFiles(self): retVal = [] for elem in self.document.getElementsByTagName('file'): - for t in elem.childNodes: - retVal.append(t.wholeText) + if elem.hasAttribute('name'): + retVal.append(elem.getAttribute('name')) + else: + raise xml.dom.SyntaxErr("<file> must have a name attribute") + return retVal
--- a/DepGraph.py Mon Sep 24 10:48:28 2012 +0200 +++ b/DepGraph.py Wed Nov 14 21:44:53 2012 +0100 @@ -33,7 +33,7 @@ if not type(dst) is ListType: dst = [ dst ] - self.rightSize() + self.rightSize() si = self.values.index(src) for d in dst:
--- a/test/loop/loop.xml Mon Sep 24 10:48:28 2012 +0200 +++ b/test/loop/loop.xml Wed Nov 14 21:44:53 2012 +0100 @@ -1,7 +1,7 @@ <xml> - <file>Header1.hpp</file> - <file>Header2.hpp</file> - <file>Header3.hpp</file> - <file>Header4.hpp</file> + <file name="Header1.hpp"/> + <file name="Header2.hpp"/> + <file name="Header3.hpp"/> + <file name="Header4.hpp"/> <option match=".*" cxxflags=""/> </xml>