suzanne.soy/compatibility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrote uses of mzlib/contract into racket/contract

Browse Source 
(and other minor rackety when the occasion arose)

original commit: e8eea05afc79e82b465ce5d95cefc36b59ea42eb
This commit is contained in:
Robby Findler 2011-03-31 18:21:11 -05:00
parent 124283c808
commit 6ae9dcae4a
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
collects/mzlib/cml.rkt
View File

@ -1,6 +1,5 @@
#lang racket/base
(module cml mzscheme (require racket/contract)
(require mzlib/contract)
(define (spawn thunk) (define (spawn thunk)
(thread/suspend-to-kill thunk)) (thread/suspend-to-kill thunk))
@ -32,5 +31,5 @@
(thread-done-evt (thread? . -> . evt?)) (thread-done-evt (thread? . -> . evt?))
(current-time (-> number?)) (current-time (-> number?))
(time-evt (real? . -> . evt?)))) (time-evt (real? . -> . evt?)))

23
collects/mzlib/integer-set.rkt
View File

@ -1,6 +1,6 @@
(module integer-set mzscheme (module integer-set mzscheme
(require (all-except mzlib/list merge) (require (all-except mzlib/list merge)
mzlib/contract) racket/contract)
#;(define-syntax test-block #;(define-syntax test-block
(syntax-rules () (syntax-rules ()
@ -22,9 +22,6 @@
;; one number between them. ;; one number between them.
(define-struct integer-set (contents)) (define-struct integer-set (contents))
(define (int? x)
(and (integer? x) (exact? x)))
;; well-formed-set? : X -> bool ;; well-formed-set? : X -> bool
(define (well-formed-set? x) (define (well-formed-set? x)
(let loop ((set x) (let loop ((set x)
@ -33,8 +30,8 @@
(null? set) (null? set)
(and (pair? set) (and (pair? set)
(pair? (car set)) (pair? (car set))
(int? (caar set)) (exact-integer? (caar set))
(int? (cdar set)) (exact-integer? (cdar set))
(< (add1 current-num) (caar set)) (< (add1 current-num) (caar set))
(<= (caar set) (cdar set)) (<= (caar set) (cdar set))
(loop (cdr set) (cdar set)))))) (loop (cdr set) (cdar set))))))
@ -429,22 +426,20 @@
(define (subset? s1 s2) (define (subset? s1 s2)
(subset?-helper (integer-set-contents s1) (integer-set-contents s2))) (subset?-helper (integer-set-contents s1) (integer-set-contents s2)))
(define int (flat-named-contract "exact-integer" int?))
(provide well-formed-set?) (provide well-formed-set?)
(provide/contract (struct integer-set ((contents (flat-named-contract "integer-set-list" well-formed-set?)))) (provide/contract (struct integer-set ((contents (flat-named-contract "integer-set-list" well-formed-set?))))
(make-range (case-> (-> integer-set?) (make-range
(int . -> . integer-set?) (->i () ((i exact-integer?) (j (i) (and/c exact-integer? (>=/c i)))) [res integer-set?]))
(((i int) (j (and/c int (>=/c i)))) . ->r . integer-set?)))
(rename merge union (integer-set? integer-set? . -> . integer-set?)) (rename merge union (integer-set? integer-set? . -> . integer-set?))
(split (integer-set? integer-set? . -> . (values integer-set? integer-set? integer-set?))) (split (integer-set? integer-set? . -> . (values integer-set? integer-set? integer-set?)))
(intersect (integer-set? integer-set? . -> . integer-set?)) (intersect (integer-set? integer-set? . -> . integer-set?))
(difference (integer-set? integer-set? . -> . integer-set?)) (difference (integer-set? integer-set? . -> . integer-set?))
(xor (integer-set? integer-set? . -> . integer-set?)) (xor (integer-set? integer-set? . -> . integer-set?))
(complement (((s integer-set?) (min int) (max (and/c int (>=/c min)))) . ->r . integer-set?)) (complement (->i ((s integer-set?) (min exact-integer?) (max (min) (and/c exact-integer? (>=/c min))))
(member? (int integer-set? . -> . any)) [res integer-set?]))
(get-integer (integer-set? . -> . (union false/c int))) (member? (exact-integer? integer-set? . -> . any))
(get-integer (integer-set? . -> . (or/c #f exact-integer?)))
(rename is-foldr foldr (any/c any/c integer-set? . -> . any)) (rename is-foldr foldr (any/c any/c integer-set? . -> . any))
(partition ((listof integer-set?) . -> . (listof integer-set?))) (partition ((listof integer-set?) . -> . (listof integer-set?)))
(card (integer-set? . -> . natural-number/c)) (card (integer-set? . -> . natural-number/c))