From 536a7d8e3d466e6d158d632b2973a00c75f7ee19 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 13 May 2014 23:12:42 -0400 Subject: [PATCH] Update gestalt union and erasure to match current API --- minimart/core.rkt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/minimart/core.rkt b/minimart/core.rkt index 0bf52c4..a72d918 100644 --- a/minimart/core.rkt +++ b/minimart/core.rkt @@ -183,11 +183,14 @@ (define (update-aggregate-gestalt w pid old-g new-g) (struct-copy world w [aggregate-gestalt - (gestalt-combine (gestalt-combine old-g - (world-aggregate-gestalt w) - matcher-erase-path) - new-g - matcher-union)])) + (gestalt-union (gestalt-combine-straight old-g + (world-aggregate-gestalt w) + (lambda (side x) + (case side + [(left-longer) '()] + [(right-longer) x])) + matcher-erase-path) + new-g)])) (define (issue-local-routing-update w relevant-gestalt) (enqueue-event (routing-update relevant-gestalt) w))