From cb8ca505ef7987fff5f4e839386d780405c47016 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 2 Jan 2020 22:12:19 -0800 Subject: concretizer: make some rules into facts --- lib/spack/spack/solver/asp.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index eec0e01eca..cc0616f24d 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -327,23 +327,19 @@ class AspGenerator(object): # variants for name, variant in sorted(pkg.variants.items()): - self.rule(fn.variant(pkg.name, name), - fn.node(pkg.name)) + self.fact(fn.variant(pkg.name, name)) single_value = not variant.multi single = fn.variant_single_value(pkg.name, name) if single_value: - self.rule(single, fn.node(pkg.name)) - self.rule( - fn.variant_default_value(pkg.name, name, variant.default), - fn.node(pkg.name)) + self.fact(single) + self.fact( + fn.variant_default_value(pkg.name, name, variant.default)) else: self.rule(self._not(single), fn.node(pkg.name)) defaults = variant.default.split(',') for val in sorted(defaults): - self.rule( - fn.variant_default_value(pkg.name, name, val), - fn.node(pkg.name)) + self.fact(fn.variant_default_value(pkg.name, name, val)) values = variant.values if values is None: -- cgit v1.2.3-60-g2f50