From c2676d4ca70bb05b65b831a73a43e5edc0805264 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 25 Jun 2009 19:07:46 +0000 Subject: [PATCH] Rearranging top level collect directory svn: r15271 --- collects/frtime/{ => core}/dv.ss | 0 collects/frtime/{ => core}/erl.ss | 0 collects/frtime/{frp-core.ss => core/frp.ss} | 0 collects/frtime/{ => core}/heap.ss | 0 collects/frtime/{ => core}/mailbox.ss | 0 collects/frtime/demos/tetris.ss | 2 +- collects/frtime/frp-snip.ss | 2 +- collects/frtime/frtime-lang-only.ss | 2 +- collects/frtime/frtime-opt.ss | 4 ++-- collects/frtime/frtime.ss | 2 +- collects/frtime/graphics-posn-less-unit.ss | 6 +----- collects/frtime/gui.ss | 2 +- collects/frtime/lang-ext.ss | 4 ++-- collects/frtime/lang.ss | 2 +- collects/frtime/mzscheme-core.ss | 2 +- collects/frtime/mzscheme-utils.ss | 2 +- collects/frtime/reactive.ss | 2 +- 17 files changed, 14 insertions(+), 18 deletions(-) rename collects/frtime/{ => core}/dv.ss (100%) rename collects/frtime/{ => core}/erl.ss (100%) rename collects/frtime/{frp-core.ss => core/frp.ss} (100%) rename collects/frtime/{ => core}/heap.ss (100%) rename collects/frtime/{ => core}/mailbox.ss (100%) diff --git a/collects/frtime/dv.ss b/collects/frtime/core/dv.ss similarity index 100% rename from collects/frtime/dv.ss rename to collects/frtime/core/dv.ss diff --git a/collects/frtime/erl.ss b/collects/frtime/core/erl.ss similarity index 100% rename from collects/frtime/erl.ss rename to collects/frtime/core/erl.ss diff --git a/collects/frtime/frp-core.ss b/collects/frtime/core/frp.ss similarity index 100% rename from collects/frtime/frp-core.ss rename to collects/frtime/core/frp.ss diff --git a/collects/frtime/heap.ss b/collects/frtime/core/heap.ss similarity index 100% rename from collects/frtime/heap.ss rename to collects/frtime/core/heap.ss diff --git a/collects/frtime/mailbox.ss b/collects/frtime/core/mailbox.ss similarity index 100% rename from collects/frtime/mailbox.ss rename to collects/frtime/core/mailbox.ss diff --git a/collects/frtime/demos/tetris.ss b/collects/frtime/demos/tetris.ss index c4e396559d..60bb20d32f 100644 --- a/collects/frtime/demos/tetris.ss +++ b/collects/frtime/demos/tetris.ss @@ -3,7 +3,7 @@ dc-for-text-size) (lifted texpict/utils filled-rectangle rectangle) frtime/gui/fred mred - (only frtime/frp-core do-in-manager do-in-manager-after)) + (only frtime/core/frp do-in-manager do-in-manager-after)) ;; TODO: layered drawing, pause, game over diff --git a/collects/frtime/frp-snip.ss b/collects/frtime/frp-snip.ss index f0509919cd..8cf7b49029 100644 --- a/collects/frtime/frp-snip.ss +++ b/collects/frtime/frp-snip.ss @@ -8,7 +8,7 @@ ;; FRP requires - frtime/frp-core + frtime/core/frp (all-except frtime/lang-ext undefined?) (only frtime/mzscheme-core any-nested-reactivity? raise-reactivity) diff --git a/collects/frtime/frtime-lang-only.ss b/collects/frtime/frtime-lang-only.ss index fea1cf5415..62bee08aef 100644 --- a/collects/frtime/frtime-lang-only.ss +++ b/collects/frtime/frtime-lang-only.ss @@ -1,6 +1,6 @@ (module frtime-lang-only "mzscheme-utils.ss" (require frtime/lang-ext) - (require (as-is:unchecked frtime/frp-core + (require (as-is:unchecked frtime/core/frp event-set? signal-value)) (define (value-nowable? x) diff --git a/collects/frtime/frtime-opt.ss b/collects/frtime/frtime-opt.ss index fec797e104..f6497d2e9a 100644 --- a/collects/frtime/frtime-opt.ss +++ b/collects/frtime/frtime-opt.ss @@ -11,7 +11,7 @@ (require-for-syntax frtime/lowered-equivs) (require-for-syntax (only srfi/1 lset-union lset-difference every)) (require-for-syntax mzlib/list) - (require (only frtime/frp-core super-lift undefined undefined?)) + (require (only frtime/core/frp super-lift undefined undefined?)) (require (rename frtime/lang-ext frtime:lift lift) (rename frtime/mzscheme-core frtime:if if) (only frtime/mzscheme-core frp:copy-list)) @@ -81,7 +81,7 @@ ;; The variables are projected before evaluating the expression, ;; and the result is then injected into the dataflow graph as a ;; single node. - (require (only frtime/frp-core proc->signal value-now)) + (require (only frtime/core/frp proc->signal value-now)) (define-syntax (dip stx) (syntax-case stx (begin) ;; special case: don't dip lone identifiers diff --git a/collects/frtime/frtime.ss b/collects/frtime/frtime.ss index 4db2c946bb..0501b96836 100644 --- a/collects/frtime/frtime.ss +++ b/collects/frtime/frtime.ss @@ -1,7 +1,7 @@ (module frtime "mzscheme-utils.ss" (require (all-except "lang-ext.ss" lift deep-value-now)) (require "frp-snip.ss") - (require (as-is:unchecked "frp-core.ss" + (require (as-is:unchecked frtime/core/frp event-set? signal-value)) (define (value-nowable? x) diff --git a/collects/frtime/graphics-posn-less-unit.ss b/collects/frtime/graphics-posn-less-unit.ss index 29d84313a7..b3db52b1b6 100644 --- a/collects/frtime/graphics-posn-less-unit.ss +++ b/collects/frtime/graphics-posn-less-unit.ss @@ -10,11 +10,7 @@ mzlib/class mzlib/class100 mzlib/etc - "erl.ss" - ;(rename "frp-core.ss" event-receiver event-receiver) - ;(rename "frp-core.ss" frp-man man) - ;(rename "frp-core.ss" send-event send-event) - frtime/frp-core + frtime/core/frp "graphics-sig.ss") (import (prefix mred: mred^) diff --git a/collects/frtime/gui.ss b/collects/frtime/gui.ss index 5b1965fdf2..18e6dcf3b5 100644 --- a/collects/frtime/gui.ss +++ b/collects/frtime/gui.ss @@ -3,7 +3,7 @@ (all-except mzlib/etc rec) mzlib/list frtime/gui/fred - (rename frtime/frp-core proc->signal proc->signal) + (rename frtime/core/frp proc->signal proc->signal) (all-except mred send-event)) (define frame (new ft-frame% [label "GUI"] [min-height 150] [min-width 200] [shown #t])) diff --git a/collects/frtime/lang-ext.ss b/collects/frtime/lang-ext.ss index 6708e8a664..99103b89f0 100644 --- a/collects/frtime/lang-ext.ss +++ b/collects/frtime/lang-ext.ss @@ -1,5 +1,5 @@ (module lang-ext mzscheme - (require frtime/frp-core + (require frtime/core/frp mzlib/etc mzlib/list) @@ -879,7 +879,7 @@ split define-reactive - ;; from frp-core + ;; from core/frp event-receiver send-event send-synchronous-event diff --git a/collects/frtime/lang.ss b/collects/frtime/lang.ss index 583049834e..a26b644a5b 100644 --- a/collects/frtime/lang.ss +++ b/collects/frtime/lang.ss @@ -1,6 +1,6 @@ (module lang frtime/mzscheme-utils (require frtime/lang-ext) - (require (as-is:unchecked frtime/frp-core + (require (as-is:unchecked frtime/core/frp event-set? signal-value)) (define (value-nowable? x) diff --git a/collects/frtime/mzscheme-core.ss b/collects/frtime/mzscheme-core.ss index b535b7a33e..612c695375 100644 --- a/collects/frtime/mzscheme-core.ss +++ b/collects/frtime/mzscheme-core.ss @@ -1,7 +1,7 @@ (module mzscheme-core mzscheme (require-for-syntax frtime/struct mzlib/list) (require mzlib/list - frtime/frp-core + frtime/core/frp (only srfi/43/vector-lib vector-any) (only frtime/lang-ext lift new-cell switch ==> changes deep-value-now) (only mzlib/etc build-vector rec build-list opt-lambda identity)) diff --git a/collects/frtime/mzscheme-utils.ss b/collects/frtime/mzscheme-utils.ss index 02ebe00f1c..667cfb5462 100644 --- a/collects/frtime/mzscheme-utils.ss +++ b/collects/frtime/mzscheme-utils.ss @@ -34,7 +34,7 @@ map ormap andmap assoc member) (rename mzscheme mzscheme:if if) (rename "lang-ext.ss" lift lift) - (only "frp-core.ss" super-lift behavior? value-now) + (only frtime/core/frp super-lift behavior? value-now) (rename "lang-ext.ss" undefined undefined) (rename "lang-ext.ss" undefined? undefined?) mzlib/class) diff --git a/collects/frtime/reactive.ss b/collects/frtime/reactive.ss index 69affd2357..3bda144ec0 100644 --- a/collects/frtime/reactive.ss +++ b/collects/frtime/reactive.ss @@ -3,7 +3,7 @@ (require "frp-snip.ss") (require frtime/list) (require frtime/etc) - (require (as-is:unchecked "frp-core.ss" + (require (as-is:unchecked frtime/core/frp event-set? snap? signal-value)) (snap? #t)