hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Eliminated two bugs found by spack test and rewrote the parser to be more sane

Browse source
This commit is contained in:
Todd Gamblin 2015-11-10 18:44:01 -08:00
parent 5e75a5c81c
commit 5417a514e9
2 changed files with 23 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/spack/spack/concretize.py
View file

@ -183,14 +183,13 @@ def concretize_compiler_flags(self, spec):
""" """
ret = False ret = False
for flag in Compiler.valid_compiler_flags(): for flag in Compiler.valid_compiler_flags():
print flag
try: try:
nearest = next(p for p in spec.traverse(direction='parents') nearest = next(p for p in spec.traverse(direction='parents')
if p.compiler == spec.compiler and p is not spec if ((p.compiler == spec.compiler and p is not spec)
and flag in p.compiler_flags) and flag in p.compiler_flags))
if ((not flag in spec.compiler_flags) or if ((not flag in spec.compiler_flags) or
spec.compiler_flags[flag] != p.compiler_flags[flag]): spec.compiler_flags[flag] != nearest.compiler_flags[flag]):
spec.compiler_flags[flag] = p.compiler_flags[flag] spec.compiler_flags[flag] = nearest.compiler_flags[flag]
ret = True ret = True
except StopIteration: except StopIteration:

96
lib/spack/spack/spec.py
View file

@ -1812,52 +1812,28 @@ def do_parse(self):
try: try:
while self.next: while self.next:
if self.accept(ID): if self.accept(ID):
specs.append(self.spec()) specs.append(self.spec(self.token.value))
elif self.accept(HASH): elif self.accept(HASH):
specs.append(self.spec_by_hash()) specs.append(self.spec_by_hash())
elif self.accept(DEP): elif self.accept(DEP):
if not specs: if not specs:
specs.append(self.empty_spec()) specs.append(self.spec(''))
if self.accept(HASH): if self.accept(HASH):
specs[-1]._add_dependency(self.spec_by_hash()) specs[-1]._add_dependency(self.spec_by_hash())
else: else:
self.expect(ID) self.expect(ID)
specs[-1]._add_dependency(self.spec()) specs[-1]._add_dependency(self.spec(self.token.value))
elif self.accept(PCT):
specs.append(self.empty_spec())
specs[-1]._set_compiler(self.compiler())
elif self.accept(ON):
specs.append(self.empty_spec())
self.expect(ID)
self.check_identifier()
name = self.token.value
if self.accept(EQ):
if self.accept(QT):
self.token.value = self.token.value[1:-1]
else:
self.expect(ID)
specs[-1]._add_flag(name,self.token.value)
else:
specs[-1]._add_variant(self.variant(name),True)
elif self.accept(OFF):
specs.append(self.empty_spec())
specs[-1]._add_variant(self.variant(),False)
else: else:
self.unexpected_token() # Attempt to construct an anonymous spec, but check that the first token is valid
# TODO: Is this check even necessary, or will it all be Lex errors now?
specs.append(self.spec('',True))
except spack.parse.ParseError, e: except spack.parse.ParseError, e:
raise SpecParseError(e) raise SpecParseError(e)
# for top_spec in specs:
# for spec in top_spec.traverse():
# if 'arch' in spec.variants:
# spec.architecture = spec.variants['arch']
return specs return specs
@ -1888,55 +1864,16 @@ def spec_by_hash(self):
return matches[0] return matches[0]
def empty_spec(self):
"""Create a Null spec from which dependency constraints can be hung"""
spec = Spec.__new__(Spec)
spec.name = ""
spec.versions = VersionList(':')
spec.variants = VariantMap(spec)
spec.architecture = None
spec.compiler = None
spec.compiler_flags = FlagMap(spec)
spec.dependents = DependencyMap()
spec.dependencies = DependencyMap()
spec._normal = False def spec(self, name, check_valid_token = False):
spec._concrete = False
#Should we be able to add cflags eventually?
while self.next:
if self.accept(ON):
self.expect(ID)
self.check_identifier()
name = self.token.value
if self.accept(EQ):
if self.accept(QT):
self.token.value = self.token.value[1:-1]
else:
self.expect(ID)
spec._add_flag(name,self.token.value)
else:
spec._add_variant(self.variant(name),True)
elif self.accept(OFF):
spec._add_variant(self.variant(),False)
elif self.accept(PCT):
spec._set_compiler(self.compiler())
else:
break
return spec
def spec(self):
"""Parse a spec out of the input. If a spec is supplied, then initialize """Parse a spec out of the input. If a spec is supplied, then initialize
and return it instead of creating a new one.""" and return it instead of creating a new one."""
self.check_identifier() if name != '':
self.check_identifier()
# This will init the spec without calling __init__. # This will init the spec without calling __init__.
spec = Spec.__new__(Spec) spec = Spec.__new__(Spec)
spec.name = self.token.value spec.name = name
spec.versions = VersionList() spec.versions = VersionList()
spec.variants = VariantMap(spec) spec.variants = VariantMap(spec)
spec.architecture = None spec.architecture = None
@ -1958,28 +1895,33 @@ def spec(self):
for version in vlist: for version in vlist:
spec._add_version(version) spec._add_version(version)
added_version = True added_version = True
check_valid_token = False
elif self.accept(ON): elif self.accept(ON):
self.expect(ID) self.expect(ID)
self.check_identifier() self.check_identifier()
name = self.token.value input = self.token.value
if self.accept(EQ): if self.accept(EQ):
if self.accept(QT): if self.accept(QT):
self.token.value = self.token.value[1:-1] self.token.value = self.token.value[1:-1]
else: else:
self.expect(ID) self.expect(ID)
spec._add_flag(name,self.token.value) spec._add_flag(input,self.token.value)
else: else:
spec._add_variant(self.variant(name),True) spec._add_variant(self.variant(input),True)
check_valid_token = False
elif self.accept(OFF): elif self.accept(OFF):
spec._add_variant(self.variant(),False) spec._add_variant(self.variant(),False)
check_valid_token = False
elif self.accept(PCT): elif self.accept(PCT):
spec._set_compiler(self.compiler()) spec._set_compiler(self.compiler())
check_valid_token = False
else: else:
if check_valid_token:
self.unexpected_token()
break break
# If there was no version in the spec, consier it an open range # If there was no version in the spec, consier it an open range