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

Removed extra plus signs from command line syntax. Did not yet remove them from printed format

Browse source
This commit is contained in:
Gregory Becker 2016-01-12 18:34:26 -08:00
parent 5e3c883f2c
commit 848728858c
2 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -182,7 +182,7 @@ def concretize_compiler_flags(self, spec):
Default specs set at the compiler level will still be added later. Default specs set at the compiler level will still be added later.
""" """
ret = False ret = False
for flag in Compiler.valid_compiler_flags(): for flag in spack.spec.FlagMap.valid_compiler_flags():
# if flag in spec.compiler_flags: # if flag in spec.compiler_flags:
# continue # continue
try: try:

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

@ -1801,7 +1801,7 @@ def __init__(self):
class SpecParser(spack.parse.Parser): class SpecParser(spack.parse.Parser):
def __init__(self): def __init__(self):
super(SpecParser, self).__init__(SpecLexer()) super(SpecParser, self).__init__(SpecLexer())
self.previous = None
def do_parse(self): def do_parse(self):
specs = [] specs = []
@ -1809,13 +1809,23 @@ def do_parse(self):
try: try:
while self.next: while self.next:
if self.accept(ID): if self.accept(ID):
specs.append(self.spec(self.token.value)) self.previous = self.token
if self.accept(EQ):
if not specs:
specs.append(self.spec(''))
if self.accept(QT):
self.token.value = self.token.value[1:-1]
else:
self.expect(ID)
specs[-1]._add_flag(self.previous.value, self.token.value)
else:
specs.append(self.spec(self.previous.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:
self.previous = self.token
specs.append(self.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())
@ -1887,6 +1897,13 @@ def spec(self, name, check_valid_token = False):
# unspecified or not. # unspecified or not.
added_version = False added_version = False
if self.previous.value == DEP:
if self.accept(HASH):
spec.add_dependency(self.spec_by_hash())
else:
self.expect(ID)
spec.add_dependency(self.spec(self.token.value))
while self.next: while self.next:
if self.accept(AT): if self.accept(AT):
vlist = self.version_list() vlist = self.version_list()
@ -1896,17 +1913,18 @@ def spec(self, name, check_valid_token = False):
check_valid_token = False check_valid_token = False
elif self.accept(ON): elif self.accept(ON):
self.expect(ID) # self.expect(ID)
self.check_identifier() # self.check_identifier()
option = self.token.value # option = 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(option,self.token.value) # spec._add_flag(option,self.token.value)
else: # else:
spec._add_variant(self.variant(option),True) # spec._add_variant(self.variant(option),True)
spec._add_variant(self.variatn(), True)
check_valid_token = False check_valid_token = False
elif self.accept(OFF): elif self.accept(OFF):