no reexporting

diff --git a/extra/darcs-ui-demo/darcs-ui-demo.factor b/extra/darcs-ui-demo/darcs-ui-demo.factor
index fadd4cf7a50aca93eb77d2fecc25efa72e825a64..739254b6c8fdc217985d6265055847b22843ce72 100644 (file)
--- a/extra/darcs-ui-demo/darcs-ui-demo.factor
+++ b/extra/darcs-ui-demo/darcs-ui-demo.factor
@@ -1,7 +1,8 @@
 USING: accessors arrays cocoa.dialogs closures continuations
 darcs-ui.commands fry file-trees io io.files io.directories
 io.encodings.utf8 kernel math models monads sequences
-splitting ui ui.gadgets.alerts ui.frp ui.gadgets.comboboxes
+splitting ui ui.gadgets.alerts ui.frp.gadgets ui.frp.layout
+ui.frp.signals ui.frp.instances ui.gadgets.comboboxes
 ui.gadgets.labels ui.gadgets.scrollers ui.baseline-alignment
 ui.images unicode.case ;
 EXCLUDE: fries => _ ;

diff --git a/extra/file-trees/file-trees.factor b/extra/file-trees/file-trees.factor
index a3108aa92290420b010de796ba9d93c18d9d4490..fa9411cfbf655053ef7befcbeb80257f95bdf604 100644 (file)
--- a/extra/file-trees/file-trees.factor
+++ b/extra/file-trees/file-trees.factor
@@ -1,7 +1,6 @@
 USING: accessors arrays delegate delegate.protocols
 io.pathnames kernel locals sequences
-vectors make strings ;
-EXCLUDE: ui.frp => , ;
+vectors make strings ui.frp.signals ui.frp.gadgets ;
 IN: file-trees
 
 TUPLE: walkable-vector vector father ;

diff --git a/extra/modules/util/util.factor b/extra/modules/util/util.factor
deleted file mode 100644 (file)
index 4e92d41..0000000
--- a/extra/modules/util/util.factor
+++ /dev/null
@@ -1,7 +0,0 @@
-USING: accessors assocs kernel lexer locals namespaces sequences
-vocabs vocabs.parser ;
-IN: modules.util
-SYNTAX: EXPORT-FROM: [let | v [ current-vocab ] |
-   v words>> ";" parse-tokens
-   [ load-vocab vocab-words [ clone v name>> >>vocabulary ] assoc-map ] map
-   assoc-combine update ] ;
\ No newline at end of file

diff --git a/extra/ui/frp/authors.txt b/extra/ui/frp/authors.txt
deleted file mode 100644 (file)
index 2300f69..0000000
--- a/extra/ui/frp/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sam Anklesaria

diff --git a/extra/ui/frp/frp-docs.factor b/extra/ui/frp/frp-docs.factor
deleted file mode 100644 (file)
index 1e9c0b7..0000000
--- a/extra/ui/frp/frp-docs.factor
+++ /dev/null
@@ -1,13 +0,0 @@
-USING: help.syntax help.markup ;
-IN: ui.frp
-ARTICLE: { "ui.frp" "index" } "Functional Reactive Programming"
-"The " { $vocab-link "ui.frp" } " vocabulary is a take on functional reactive programming for user interfaces. The library is implimented as a set of models collectively called signals, and is made up of multiple submodles, all of which can be imported collectively from ui.frp" $nl
-{ $vocab-subsection "Using signals:" "ui.frp.signals" }
-{ $vocab-subsection "Creating user interfaces:" "ui.frp.layout" }
-{ $vocab-subsection "Using gadgets:" "ui.frp.gadgets" }
-{ $vocab-subsection "Combining signals:" "ui.frp.functors" }
-{ $vocab-subsection "Typeclass instances:" "ui.frp.instances" }
-"To get the hang of using the library, check out " { $vocab-link "darcs-ui-demo" } $nl
-"For more information about frp, go to http://haskell.org/haskellwiki/Functional_Reactive_Programming"
-;
-ABOUT: { "ui.frp" "index" }
\ No newline at end of file

diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor
deleted file mode 100644 (file)
index f97dccd..0000000
--- a/extra/ui/frp/frp.factor
+++ /dev/null
@@ -1,4 +0,0 @@
-USING: modules.util ui.frp.functors monads ;
-IN: ui.frp
-EXPORT-FROM: ui.frp.signals ui.frp.gadgets ui.frp.instances ui.frp.layout ;
-FMAPS: $> <$ fmap FOR & | ;
\ No newline at end of file

diff --git a/extra/ui/frp/signals/signals.factor b/extra/ui/frp/signals/signals.factor
index 8dc87a7fbb54719c062a89f6932dff33b6a84a67..3c6c4103bc4f452a09372b2695388d0200e67739 100644 (file)
--- a/extra/ui/frp/signals/signals.factor
+++ b/extra/ui/frp/signals/signals.factor
@@ -1,4 +1,4 @@
-USING: accessors arrays kernel models models.product sequences ;
+USING: accessors arrays kernel monads models models.product sequences ui.frp.functors ;
 IN: ui.frp.signals
 
 TUPLE: multi-model < model ;
@@ -81,4 +81,6 @@ M: | model-activated dup model-changed ;
 ! Only when everything's true does he make it false
 TUPLE: & < | ;
 : <&> ( models -- product ) & <multi-model> ;
-M: & models-changed dependencies>> [ f swap (>>value) ] each ;
\ No newline at end of file
+M: & models-changed dependencies>> [ f swap (>>value) ] each ;
+
+FMAPS: $> <$ fmap FOR & | ;
\ No newline at end of file

diff --git a/extra/ui/gadgets/alerts/alerts.factor b/extra/ui/gadgets/alerts/alerts.factor
index edecb90ee32c3a909da1a6f1dfbf1609ebc6b4ff..599bdd7279a99e38c22c9bad83b8dbe3afde9380 100644 (file)
--- a/extra/ui/gadgets/alerts/alerts.factor
+++ b/extra/ui/gadgets/alerts/alerts.factor
@@ -1,5 +1,6 @@
-USING: accessors models macros generalizations kernel ui ui.frp
-ui.gadgets ui.gadgets.labels ui.gadgets.editors ui.gadgets.buttons
+USING: accessors models macros generalizations kernel ui
+ui.frp.gadgets ui.frp.signals ui.frp.layout ui.gadgets
+ui.gadgets.labels ui.gadgets.editors ui.gadgets.buttons
 ui.gadgets.packs locals sequences fonts io.styles wrap.strings ;
 
 IN: ui.gadgets.alerts