changeset 1810956fa5dc in /z/repo/gem5 details: http://repo.gem5.org/gem5?cmd=changeset;node=1810956fa5dc description: ISA parser: Loosen the regular expressions matching filenames.
The regular expressions matching filenames in the ##include directives and the internally generated ##newfile directives where only looking for filenames composed of alpha numeric characters, periods, and dashes. In Unix/Linux, the rules for what characters can be in a filename are much looser than that. This change replaces those expressions with ones that look for anything other than a quote character. Technically quote characters are allowed as well so we should allow escaping them somehow, but the additional complexity probably isn't worth it. diffstat: src/arch/isa_parser.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 4d1005f78496 -r 1810956fa5dc src/arch/isa_parser.py --- a/src/arch/isa_parser.py Tue Jun 07 00:24:49 2011 -0700 +++ b/src/arch/isa_parser.py Tue Jun 07 00:46:54 2011 -0700 @@ -1215,7 +1215,7 @@ return t def t_NEWFILE(self, t): - r'^\#\#newfile\s+"[\w/.-]*"' + r'^\#\#newfile\s+"[^"]*"' self.fileNameStack.push((t.value[11:-1], t.lexer.lineno)) t.lexer.lineno = 0 @@ -1998,7 +1998,7 @@ f.close() # This regular expression matches '##include' directives - includeRE = re.compile(r'^\s*##include\s+"(?P<filename>[\w/.-]*)".*$', + includeRE = re.compile(r'^\s*##include\s+"(?P<filename>[^"]*)".*$', re.MULTILINE) def replace_include(self, matchobj, dirname): _______________________________________________ gem5-dev mailing list gem5-dev@m5sim.org http://m5sim.org/mailman/listinfo/gem5-dev