Rearranging top level collect directory

svn: r15271

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
 

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)
 

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)

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

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)

collects/frtime/graphics-posn-less-unit.ss

@@ -10,11 +10,7 @@
 	   mzlib/class
 	   mzlib/class100
 	   mzlib/etc
-           "erl.ss"
+           frtime/core/frp
-           ;(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
 	   "graphics-sig.ss")
 
   (import (prefix mred: mred^)

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]))

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

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)

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))

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)

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)