syndicate-lang
/
minimart-2014
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed to use the order? convention from data/order

This commit is contained in:
Tony Garnock-Jones 2014-07-18 11:43:15 -07:00
parent f6a8b84d81
commit 26bd5c7638
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
minimart/sorted-map.rkt
View File

@ -57,6 +57,7 @@
clause ...))])) clause ...))]))
; A form for matching the result of a comparison: ; A form for matching the result of a comparison:
;; tonyg 20140718: changed to use the order? convention from data/order
(define-syntax switch-compare (define-syntax switch-compare
(syntax-rules (= < >) (syntax-rules (= < >)
[(_ (cmp v1 v2) [(_ (cmp v1 v2)
@ -65,10 +66,10 @@
[> action3 ...]) [> action3 ...])
; => ; =>
(let ((dir (cmp v1 v2))) (let ((dir (cmp v1 v2)))
(cond (case dir
[(< dir 0) action1 ...] [(<) action1 ...]
[(= dir 0) action2 ...] [(=) action2 ...]
[(> dir 0) action3 ...]))])) [(>) action3 ...]))]))
;; tonyg 20140718: for hash-consing, we have to be able to compare ;; tonyg 20140718: for hash-consing, we have to be able to compare
;; trees using equal?, which necessitates use of #:transparent in our ;; trees using equal?, which necessitates use of #:transparent in our
@ -297,11 +298,10 @@
[(`((,k1 . ,v1) . ,rest1) [(`((,k1 . ,v1) . ,rest1)
`((,k2 . ,v2) . ,rest2)) `((,k2 . ,v2) . ,rest2))
; => ; =>
(let ((dir (cmp k1 k2))) (switch-compare (cmp k1 k2)
(cond [< #f]
[(< dir 0) #f] [= (and (by v1 v2) (compare-alists rest1 rest2))]
[(= dir 0) (and (by v1 v2) (compare-alists rest1 rest2))] [> (compare-alists amap1 rest2)])]
[else (compare-alists amap1 rest2)]))]
[('() '()) #t] [('() '()) #t]