From 77d23a0cbab70d4ec9c3af4ac3aacd62c1c78d5b Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Mon, 19 May 2014 20:01:43 -0400 Subject: [PATCH] Updates to changed API --- minimart/core.rkt | 6 ++++-- minimart/gestalt.rkt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/minimart/core.rkt b/minimart/core.rkt index 46ab9ed..29ebda4 100644 --- a/minimart/core.rkt +++ b/minimart/core.rkt @@ -75,8 +75,10 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Protocol and utilities -(define (sub p #:meta-level [ml 0] #:level [l 0]) (simple-gestalt (pattern->matcher #t p) #f l ml)) -(define (pub p #:meta-level [ml 0] #:level [l 0]) (simple-gestalt #f (pattern->matcher #t p) l ml)) +(define (sub p #:meta-level [ml 0] #:level [l 0]) + (simple-gestalt (pattern->matcher (set #t) p) #f l ml)) +(define (pub p #:meta-level [ml 0] #:level [l 0]) + (simple-gestalt #f (pattern->matcher (set #t) p) l ml)) (define (spawn behavior state [gestalt (gestalt-empty)]) (process gestalt behavior state)) (define (send body #:meta-level [ml 0]) (message body ml #f)) diff --git a/minimart/gestalt.rkt b/minimart/gestalt.rkt index 439a70e..ff966c2 100644 --- a/minimart/gestalt.rkt +++ b/minimart/gestalt.rkt @@ -152,7 +152,7 @@ (gestalt (map safe-cdr (gestalt-metalevels g2))) (lambda (side x) '()) (lambda (g1 g2) (matcher-intersect g1 g2 - (lambda (v1 v2) v1))))) + #:combine (lambda (v1 v2) v1))))) (define (gestalt-match g1 g2) (define (zu sa1 sa2)