merged in work from other computer and starting to track down bugs

This commit is contained in:
Gregory Becker 2015-11-11 10:09:03 -08:00
parent 5417a514e9
commit cd69681ae5

View File

@ -1834,6 +1834,7 @@ def do_parse(self):
except spack.parse.ParseError, e: except spack.parse.ParseError, e:
raise SpecParseError(e) raise SpecParseError(e)
return specs return specs
@ -1900,15 +1901,16 @@ def spec(self, name, check_valid_token = False):
elif self.accept(ON): elif self.accept(ON):
self.expect(ID) self.expect(ID)
self.check_identifier() self.check_identifier()
input = 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(input,self.token.value) print "about to add", option, "=", self.token.value
spec._add_flag(option,self.token.value)
else: else:
spec._add_variant(self.variant(input),True) spec._add_variant(self.variant(option),True)
check_valid_token = False check_valid_token = False
elif self.accept(OFF): elif self.accept(OFF):