From 9782abba70fc2552b49ccfcda658c92422053da1 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 6 Mar 2015 13:29:19 +0000 Subject: [PATCH] Use patch-project/set in demand-matcher.rkt --- prospect/demand-matcher.rkt | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/prospect/demand-matcher.rkt b/prospect/demand-matcher.rkt index 6399b95..d3e2c07 100644 --- a/prospect/demand-matcher.rkt +++ b/prospect/demand-matcher.rkt @@ -49,19 +49,15 @@ ;; to increased unsatisfied demand and decreased demanded supply. (define (demand-matcher-update d s p) (match-define (demand-matcher demand-spec supply-spec inc-h dec-h demand supply) d) - (define added-demand (matcher-project/set (patch-added p) demand-spec)) - (define removed-demand (matcher-project/set (patch-removed p) demand-spec)) - (define added-supply (matcher-project/set (patch-added p) supply-spec)) - (define removed-supply (matcher-project/set (patch-removed p) supply-spec)) + (define-values (added-demand removed-demand) (patch-project/set p demand-spec)) + (define-values (added-supply removed-supply) (patch-project/set p supply-spec)) - (when (not added-demand) - (error 'demand-matcher "Wildcard demand of ~v:\n~a" - demand-spec - (matcher->pretty-string (patch-added p)))) - (when (not added-supply) - (error 'demand-matcher "Wildcard supply of ~v:\n~a" - supply-spec - (matcher->pretty-string (patch-added p)))) + (when (not added-demand) (error 'demand-matcher "Wildcard demand of ~v:\n~a" + demand-spec + (matcher->pretty-string (patch-added p)))) + (when (not added-supply) (error 'demand-matcher "Wildcard supply of ~v:\n~a" + supply-spec + (matcher->pretty-string (patch-added p)))) (set! supply (set-union supply added-supply)) (set! demand (set-subtract demand removed-demand))