diff --git a/collects/frtime/animation.ss b/collects/frtime/animation.ss index 9896f2f395..b966724968 100644 --- a/collects/frtime/animation.ss +++ b/collects/frtime/animation.ss @@ -5,9 +5,9 @@ mzlib/match (as-is:unchecked frtime/lang-ext lift) mzlib/class - frtime/list - frtime/etc - frtime/math + frtime/frlibs/list + frtime/frlibs/etc + frtime/frlibs/math (rename mzscheme mz:define-struct define-struct)) (require-for-syntax mzlib/etc) diff --git a/collects/frtime/demos/growing-points.ss b/collects/frtime/demos/growing-points.ss index 7bbbed5cbb..f45e1828db 100644 --- a/collects/frtime/demos/growing-points.ss +++ b/collects/frtime/demos/growing-points.ss @@ -10,8 +10,7 @@ ;; Require the animation library, the gui library, and the library ;; containing the build-list function. (require frtime/animation - frtime/gui - frtime/etc) + frtime/gui) ;; distance : number number number number -> number ;; Returns the distance between (x1, y1) and (x2, y2). diff --git a/collects/frtime/demos/needles.ss b/collects/frtime/demos/needles.ss index 081453b2d1..18c3cfc4bf 100644 --- a/collects/frtime/demos/needles.ss +++ b/collects/frtime/demos/needles.ss @@ -10,7 +10,6 @@ ;; Require the animation library and the library ;; containing the build-list function. (require frtime/animation - frtime/etc frtime/gui) ;; How many needles on one side of the grid of needles diff --git a/collects/frtime/demos/push-pull-ball.ss b/collects/frtime/demos/push-pull-ball.ss index f6df595a58..28436fd06d 100644 --- a/collects/frtime/demos/push-pull-ball.ss +++ b/collects/frtime/demos/push-pull-ball.ss @@ -1,6 +1,5 @@ #lang frtime -(require frtime/etc - frtime/animation) +(require frtime/animation) (define radius (new-cell 20)) diff --git a/collects/frtime/date.ss b/collects/frtime/frlibs/date.ss similarity index 99% rename from collects/frtime/date.ss rename to collects/frtime/frlibs/date.ss index 34853102ed..3c7cb0db6d 100644 --- a/collects/frtime/date.ss +++ b/collects/frtime/frlibs/date.ss @@ -1,6 +1,6 @@ #lang scheme (require "list.ss") -(require (rename-in (only-in "frtime.ss" provide) +(require (rename-in (only-in frtime/frtime provide) [provide frtime:provide])) (frtime:provide diff --git a/collects/frtime/etc.ss b/collects/frtime/frlibs/etc.ss similarity index 100% rename from collects/frtime/etc.ss rename to collects/frtime/frlibs/etc.ss diff --git a/collects/frtime/list.ss b/collects/frtime/frlibs/list.ss similarity index 100% rename from collects/frtime/list.ss rename to collects/frtime/frlibs/list.ss diff --git a/collects/frtime/math.ss b/collects/frtime/frlibs/math.ss similarity index 100% rename from collects/frtime/math.ss rename to collects/frtime/frlibs/math.ss diff --git a/collects/frtime/frtime-big.ss b/collects/frtime/frtime-big.ss index 7b10f8183f..af0a7f4132 100644 --- a/collects/frtime/frtime-big.ss +++ b/collects/frtime/frtime-big.ss @@ -1,9 +1,12 @@ -(module frtime-big "frtime.ss" +(module frtime-big frtime/frtime - (require (frlibs "list.ss" "etc.ss" "math.ss" "date.ss")) + (require frtime/frlibs/list + frtime/frlibs/etc + frtime/frlibs/math + frtime/frlibs/date) - (provide (all-from "frtime.ss") - (all-from (lib "list.ss" "frtime")) - (all-from (lib "etc.ss" "frtime")) - (all-from (lib "math.ss" "frtime")) - (all-from (lib "date.ss" "frtime")))) + (provide (all-from frtime/frtime) + (all-from frtime/frlibs/list) + (all-from frtime/frlibs/etc) + (all-from frtime/frlibs/math) + (all-from frtime/frlibs/date))) \ No newline at end of file diff --git a/collects/frtime/lang-core.ss b/collects/frtime/lang-core.ss index c7564fd858..26b6de48ce 100644 --- a/collects/frtime/lang-core.ss +++ b/collects/frtime/lang-core.ss @@ -482,7 +482,7 @@ (lambda (c prev) (syntax-case prev () [(begin clause ...) - (syntax-case c (lifted lifted:nonstrict as-is:unchecked as-is frlibs) + (syntax-case c (lifted lifted:nonstrict as-is:unchecked as-is) [(lifted:nonstrict module . ids) (with-syntax ([(fun-name ...) #'ids] [(tmp-name ...) (generate-temporaries/loc stx #'ids)]) @@ -511,10 +511,6 @@ (require (rename module tmp-name fun-name) ...) (define fun-name (ensure-no-signal-args tmp-name 'fun-name)) ...))] - [(frlibs str ...) - #'(begin - clause ... - (require (lib str "frtime") ...))] [require-spec #'(begin clause ... (require require-spec))])])) #'(begin) diff --git a/collects/frtime/reactive.ss b/collects/frtime/reactive.ss index 91e713e4e8..614f85fa40 100644 --- a/collects/frtime/reactive.ss +++ b/collects/frtime/reactive.ss @@ -1,25 +1,25 @@ (module reactive frtime/lang-utils - (require "lang-ext.ss") - (require "frp-snip.ss") - (require frtime/list) - (require frtime/etc) - (require (as-is:unchecked frtime/core/frp + (require "lang-ext.ss" + "frp-snip.ss" + frtime/frlibs/list + frtime/frlibs/etc + (as-is:unchecked frtime/core/frp event-set? snap? signal-value)) - + (snap? #t) (define (value-nowable? x) (or (not (signal? x)) - (not (event-set? (signal-value x))))) - + (not (event-set? (signal-value x))))) + (define ((behaviorof pred) x) (let ([v (value-now x)]) (or (undefined? v) (pred v)))) - + (provide value-nowable? behaviorof - (all-from frtime/list) - (all-from frtime/etc) - (all-from frtime/lang-utils) + (all-from frtime/frlibs/list) + (all-from frtime/frlibs/etc) + (all-from frtime/lang-utils) (all-from-except "lang-ext.ss" lift) (all-from "frp-snip.ss"))) diff --git a/collects/frtime/tests/time.ss b/collects/frtime/tests/time.ss index a780fb901c..853add28f9 100644 --- a/collects/frtime/tests/time.ss +++ b/collects/frtime/tests/time.ss @@ -1,5 +1,4 @@ #lang frtime -(require frtime/etc) (define x (rec y (0 . until . (add1 (inf-delay y))))) (==> (filter-e zero? (changes (modulo seconds 10)))