From b31f8a0d15775357aabbd0ce8e04dea4ad7c3810 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Fri, 24 Apr 2009 23:23:02 -0500
Subject: [PATCH 01/20] peg lexer changes

---
 extra/peg-lexer/peg-lexer.factor | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extra/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor
index e7acf1f5bb..e58d8dd65b 100644
--- a/extra/peg-lexer/peg-lexer.factor
+++ b/extra/peg-lexer/peg-lexer.factor
@@ -1,5 +1,6 @@
 USING: hashtables assocs sequences locals math accessors multiline delegate strings
-delegate.protocols kernel peg peg.ebnf lexer namespaces combinators parser words ;
+delegate.protocols kernel peg peg.ebnf peg.private lexer namespaces combinators parser
+words ;
 IN: peg-lexer
 
 TUPLE: lex-hash hash ;
@@ -43,11 +44,11 @@ M: lex-hash at*
 
 : parse* ( parser -- ast )
     compile
-    [ execute( -- result ) [ error-stack get first throw ] unless* ] with-global-lexer
+    [ execute [ error-stack get first throw ] unless* ] with-global-lexer
     ast>> ;
 
 : create-bnf ( name parser -- )
-    reset-tokenizer [ lexer get skip-blank parse* parsed ] curry
+    reset-tokenizer [ lexer get skip-blank parse* dup ignore? [ drop ] [ parsed ] if ] curry
     define-syntax ;
     
 SYNTAX: ON-BNF:

From 8be8357e4d7393d114a588b2bee38ec2abdb6632 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Fri, 24 Apr 2009 23:23:35 -0500
Subject: [PATCH 02/20] ui.gadgets.alerts updated for new ui

---
 extra/ui/gadgets/alerts/alerts.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/ui/gadgets/alerts/alerts.factor b/extra/ui/gadgets/alerts/alerts.factor
index 04c6b013df..03d60957fa 100644
--- a/extra/ui/gadgets/alerts/alerts.factor
+++ b/extra/ui/gadgets/alerts/alerts.factor
@@ -1,4 +1,4 @@
-USING: accessors ui ui.gadgets ui.gadgets.labels ui.gadgets.buttons ui.gadgets.packs locals sequences io.styles ;
+USING: accessors ui ui.gadgets ui.gadgets.labels ui.gadgets.buttons ui.gadgets.packs locals sequences fonts io.styles ;
 IN: ui.gadgets.alerts
-:: alert ( quot string -- ) <pile> { 10 10 } >>gap 1 >>align string <label> { "sans-serif" plain 18 } >>font { 200 100 } >>pref-dim add-gadget 
+:: alert ( quot string -- ) <pile> { 10 10 } >>gap 1 >>align string <label> T{ font { name "sans-serif" } { size 18 } } >>font { 200 100 } >>pref-dim add-gadget 
    "okay" [ close-window ] quot append <border-button> add-gadget "" open-window ;
\ No newline at end of file

From de345b6fb648578b2382f9ef85bae08f5d78d13e Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Fri, 24 Apr 2009 23:24:23 -0500
Subject: [PATCH 03/20] misc drills improvements

---
 extra/drills/deployed/deploy.factor   | 15 ++++++++++
 extra/drills/deployed/deployed.factor | 36 ++++++++++++++++++++++++
 extra/drills/drills.factor            | 40 ++++++++++++---------------
 3 files changed, 68 insertions(+), 23 deletions(-)
 create mode 100644 extra/drills/deployed/deploy.factor
 create mode 100644 extra/drills/deployed/deployed.factor

diff --git a/extra/drills/deployed/deploy.factor b/extra/drills/deployed/deploy.factor
new file mode 100644
index 0000000000..2f62912360
--- /dev/null
+++ b/extra/drills/deployed/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-unicode? f }
+    { deploy-threads? t }
+    { deploy-math? t }
+    { deploy-name "drills" }
+    { deploy-ui? t }
+    { deploy-compiler? t }
+    { "stop-after-last-window?" t }
+    { deploy-word-props? f }
+    { deploy-c-types? f }
+    { deploy-io 2 }
+    { deploy-word-defs? f }
+    { deploy-reflection 1 }
+}
diff --git a/extra/drills/deployed/deployed.factor b/extra/drills/deployed/deployed.factor
new file mode 100644
index 0000000000..43873c99bb
--- /dev/null
+++ b/extra/drills/deployed/deployed.factor
@@ -0,0 +1,36 @@
+USING: accessors arrays cocoa.dialogs combinators continuations
+fry grouping io.encodings.utf8 io.files io.styles kernel math
+math.parser models models.arrow models.history namespaces random
+sequences splitting ui ui.gadgets.alerts ui.gadgets.book-extras
+ui.gadgets.books ui.gadgets.buttons ui.gadgets.frames
+ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks fonts
+wrap.strings system ;
+
+IN: drills.deployed
+SYMBOLS: it startLength ;
+: big ( gadget -- gadget ) T{ font { name "sans-serif" } { size 30 } } >>font ;
+: card ( model quot -- button ) <arrow> <label-control> big [ next ] <book-btn> ;
+: op ( quot str -- gadget ) <label> big swap <book-bevel-btn> ;
+
+: show ( model -- gadget ) dup it set-global [ random ] <arrow>
+   { [ [ first ] card ]
+     [ [ second ] card ]
+     [ '[ |<< it get _ model-changed ] "No" op ]
+          [ '[ |<< [ it get [
+        _ value>> swap remove
+        [ [ it get go-back ] "Drill Complete" alert return ] when-empty
+     ] change-model ] with-return ] "Yes" op ]
+   } cleave
+2array { 1 0 } <track> swap [ 0.5 track-add ] each
+3array <book*> 3 3 <frame> { 1 1 } >>filled-cell { 450 175 } >>pref-dim swap { 1 1 } grid-add
+it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <arrow> <label-control> { 1 2 } grid-add ;
+
+: drill ( -- ) [
+   open-panel [
+         [ utf8 file-lines [ "\t" split [ 25 wrap-string ] map ] map dup [ first2 swap 2array ] map append ] map concat
+            [ length startLength set-global ] keep <history> [ add-history ] [ show ] bi
+         "Got it?" open-window
+   ] [ 0 exit ] if*
+] with-ui ;
+
+MAIN: drill
\ No newline at end of file
diff --git a/extra/drills/drills.factor b/extra/drills/drills.factor
index 98da12959b..9ee4e9b6eb 100644
--- a/extra/drills/drills.factor
+++ b/extra/drills/drills.factor
@@ -3,40 +3,34 @@ fry grouping io.encodings.utf8 io.files io.styles kernel math
 math.parser models models.arrow models.history namespaces random
 sequences splitting ui ui.gadgets.alerts ui.gadgets.book-extras
 ui.gadgets.books ui.gadgets.buttons ui.gadgets.frames
-ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks ui.gestures
-ui.gadgets.corners ;
+ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks fonts
+wrap.strings ;
 
 IN: drills
 SYMBOLS: it startLength ;
-: big ( gadget -- gadget ) { "sans-serif" plain 30 } >>font ;
+: big ( gadget -- gadget ) T{ font { name "sans-serif" } { size 30 } } >>font ;
 : card ( model quot -- button ) <arrow> <label-control> big [ next ] <book-btn> ;
 : op ( quot str -- gadget ) <label> big swap <book-bevel-btn> ;
 
 : show ( model -- gadget ) dup it set-global [ random ] <arrow>
    { [ [ first ] card ]
-   [ [ [ second ] [ drop [ "malformed input" throw ] "Malformed Input" alert ] recover ] card ]
-   [ '[ |<< [ it get [
-      _ value>> swap remove
-      [ [ it get go-back ] "Drill Complete" alert return ] when-empty
-   ] change-model ] with-return ] "Yes" op ]
-   [ '[ |<< it get _ model-changed ] "No" op ] } cleave
+     [ [ second ] card ]
+     [ '[ |<< it get _ model-changed ] "No" op ]
+          [ '[ |<< [ it get [
+        _ value>> swap remove
+        [ [ it get go-back ] "Drill Complete" alert return ] when-empty
+     ] change-model ] with-return ] "Yes" op ]
+   } cleave
 2array { 1 0 } <track> swap [ 0.5 track-add ] each
-3array <book*> 3 3 <frame> { 450 175 } >>pref-dim swap @center grid-add
-it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <arrow> <label-control> @bottom grid-add ;
+3array <book*> 3 3 <frame> { 1 1 } >>filled-cell { 450 175 } >>pref-dim swap { 1 1 } grid-add
+it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <arrow> <label-control> { 1 2 } grid-add ;
 
-: drill ( -- ) [ 
+: drill ( -- ) [
    open-panel [
-      [ utf8 file-lines [ "\t" split
-         [ " " split 4 group [ " " join ] map ] map ] map ] map concat dup [ [ first ] [ second ] bi swap 2array ] map append
-         [ length startLength set-global ] keep <history> [ add-history ] [ show ] bi
-      "Got it?" open-window
+         [ utf8 file-lines [ "\t" split [ 25 wrap-string ] map ] map dup [ first2 swap 2array ] map append ] map concat
+            [ length startLength set-global ] keep <history> [ add-history ] [ show ] bi
+         "Got it?" open-window
    ] when*
 ] with-ui ;
 
-
-MAIN: drill
-
-    
-! FIXME: command-line opening
-! TODO: Menu bar
-! TODO: Pious hot-buttons
\ No newline at end of file
+MAIN: drill
\ No newline at end of file

From ddc565eb9912639600a3e5418a49ce3689b6b27b Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Fri, 24 Apr 2009 23:25:16 -0500
Subject: [PATCH 04/20] frp library

---
 extra/ui/frp/authors.txt     |  1 +
 extra/ui/frp/frp-docs.factor | 36 ++++++++++++++++
 extra/ui/frp/frp.factor      | 80 ++++++++++++++++++++++++++++++++++++
 extra/ui/frp/frp.factor copy | 73 ++++++++++++++++++++++++++++++++
 extra/ui/frp/summary.txt     |  1 +
 5 files changed, 191 insertions(+)
 create mode 100644 extra/ui/frp/authors.txt
 create mode 100644 extra/ui/frp/frp-docs.factor
 create mode 100644 extra/ui/frp/frp.factor
 create mode 100644 extra/ui/frp/frp.factor copy
 create mode 100644 extra/ui/frp/summary.txt

diff --git a/extra/ui/frp/authors.txt b/extra/ui/frp/authors.txt
new file mode 100644
index 0000000000..2300f69f11
--- /dev/null
+++ b/extra/ui/frp/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
diff --git a/extra/ui/frp/frp-docs.factor b/extra/ui/frp/frp-docs.factor
new file mode 100644
index 0000000000..ac3306a54a
--- /dev/null
+++ b/extra/ui/frp/frp-docs.factor
@@ -0,0 +1,36 @@
+USING: ui.frp help.syntax help.markup monads sequences ;
+IN: ui.frp
+
+! Layout utilities
+
+HELP: ,
+{ $description "Used in a series of gadgets created by a box, accumulating the gadget" } ;
+HELP: ->
+{ $description "Like " { $link , } "but passes its model on for further use." } ;
+HELP: <hbox>
+{ $syntax "[ gadget , gadget , ... ] <hbox>" }
+{ $description "Creates an horizontal track containing the gadgets listed in the quotation" } ;
+HELP: <vbox>
+{ $syntax "[ gadget , gadget , ... ] <hbox>" }
+{ $description "Creates an vertical track containing the gadgets listed in the quotation" } ;
+
+! Gadgets
+HELP: <model-button>
+{ $description "Creates an button whose model updates on clicks" } ;
+
+HELP: <merge>
+{ $description "Creates a model that merges the updates of two others" } ;
+
+HELP: <filter>
+{ $description "Creates a model that uses the updates of another model when they satisfy a given predicate" } ;
+
+HELP: <fold>
+{ $description "Similar to " { $link reduce } " but works on models, applying a quotation to the previous and new values at each update" } ;
+
+HELP: switch
+{ $description "Creates a model that starts with the behavior of model1 and switches to the behavior of model2 on its update" } ;
+
+ARTICLE: { "frp" "instances" } "FRP Instances"
+"Models are all functors, as " { $link fmap } " corresponds directly to the " { $link "models.arrow" } " vocabulary.  "
+"Also, a gadget is a monad.  Binding recieves a model and creates a new gadget." ;
+
diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor
new file mode 100644
index 0000000000..685d9af124
--- /dev/null
+++ b/extra/ui/frp/frp.factor
@@ -0,0 +1,80 @@
+USING: accessors arrays fry kernel models models.product
+monads sequences ui.gadgets ui.gadgets.buttons ui.gadgets.tracks
+ui.gadgets.tables ;
+QUALIFIED: make
+IN: ui.frp
+
+! Layout utilities
+
+GENERIC: , ( object -- )
+M: gadget , make:, ;
+M: model , activate-model ;
+
+GENERIC: -> ( object -- model )
+M: gadget -> dup make:, model>> ;
+M: model -> dup , ;
+
+: <box> ( models type -- track )
+   [ { } make:make ] dip <track> swap dup [ model>> ] map <product>
+   [ [ f track-add ] each ] dip >>model ; inline
+: <hbox> ( models -- track ) horizontal <box> ; inline
+: <vbox> ( models -- track ) vertical <box> ; inline
+
+! Gadgets
+: <frp-button> ( text -- button ) [ t swap set-control-value ] <bevel-button> f <model> >>model ;
+TUPLE: frp-table < table quot ;
+M: frp-table row-columns quot>> call( a -- b ) ;
+: <frp-table> ( model quot -- table )
+    frp-table new-line-gadget dup >>renderer swap >>quot swap >>model
+    f <model> >>selected-value sans-serif-font >>font
+    focus-border-color >>focus-border-color
+    transparent >>column-line-color ;
+
+! Model utilities
+TUPLE: multi-model < model ;
+! M: multi-model model-activated dup model-changed ;
+: <multi-model> ( models kind -- model ) f swap new-model [ [ add-dependency ] curry each ] keep ;
+
+TUPLE: merge-model < multi-model ;
+M: merge-model model-changed [ value>> ] dip set-model ;
+: <merge> ( models -- model ) merge-model <multi-model> ;
+
+TUPLE: filter-model < multi-model quot ;
+M: filter-model model-changed [ value>> ] dip [ quot>> call( val -- bool ) ] 2keep
+   [ set-model ] [ 2drop ] if ;
+: <filter> ( model quot -- filter-model ) [ 1array filter-model <multi-model> ] dip >>quot ;
+
+TUPLE: fold-model < multi-model oldval quot ;
+M: fold-model model-changed [ [ value>> ] [ [ oldval>> ] [ quot>> ] bi ] bi*
+   call( val oldval -- newval ) ] keep set-model ;
+: <fold> ( oldval quot model -- model' ) 1array fold-model <multi-model> swap >>quot swap >>oldval ;
+
+TUPLE: switch-model < multi-model switcher on ;
+M: switch-model model-changed tuck [ switcher>> = ] 2keep
+   '[ on>> [ _ value>> _ set-model ] when ] [ t swap (>>on) ] if ;
+: switch ( signal1 signal2 -- signal' ) [ 2array switch-model <multi-model> ] keep >>switcher ;
+
+TUPLE: mapped < model model quot ;
+
+: <mapped> ( model quot -- arrow )
+    f mapped new-model
+        swap >>quot
+        over >>model
+        [ add-dependency ] keep ;
+
+M: mapped model-changed
+    [ [ value>> ] [ quot>> ] bi* call( old -- new ) ] [ nip ] 2bi
+    set-model ;
+
+! Instances
+M: model fmap <mapped> ;
+
+SINGLETON: gadget-monad
+INSTANCE: gadget-monad monad
+INSTANCE: gadget monad
+M: gadget monad-of drop gadget-monad ;
+M: gadget-monad return drop <gadget> swap >>model ;
+M: gadget >>= model>> '[ _ swap call( x -- y ) ] ; 
+ 
+! ! list (model = Columns), listContent (model = contents)
+
diff --git a/extra/ui/frp/frp.factor copy b/extra/ui/frp/frp.factor copy
new file mode 100644
index 0000000000..3ebb33e2d6
--- /dev/null
+++ b/extra/ui/frp/frp.factor copy	
@@ -0,0 +1,73 @@
+USING: accessors arrays fry kernel models models.product
+monads sequences ui.gadgets ui.gadgets.buttons ui.gadgets.tracks ;
+QUALIFIED: make
+IN: ui.frp
+
+! Layout utilities
+
+GENERIC: , ( object -- )
+M: gadget , make:, ;
+M: model , activate-model ;
+
+GENERIC: -> ( object -- model )
+M: gadget -> dup make:, model>> ;
+M: model -> dup , ;
+
+: <box> ( models type -- track )
+   [ { } make:make ] dip <track> swap dup [ model>> ] map <product>
+   [ [ f track-add ] each ] dip >>model ; inline
+: <hbox> ( models -- track ) horizontal <box> ; inline
+: <vbox> ( models -- track ) vertical <box> ; inline
+
+! Gadgets
+: <model-button> ( text -- button ) [ t swap set-control-value ] <button> f <model> >>model ;
+
+
+! Model utilities
+TUPLE: multi-model < model ;
+! M: multi-model model-activated dup model-changed ;
+: <multi-model> ( models kind -- model ) f swap new-model [ [ add-dependency ] curry each ] keep ;
+
+TUPLE: merge-model < multi-model ;
+M: merge-model model-changed [ value>> ] dip set-model ;
+: <merge> ( models -- model ) merge-model <multi-model> ;
+
+TUPLE: filter-model < multi-model quot ;
+M: filter-model model-changed [ value>> ] dip [ quot>> call( val -- bool ) ] 2keep
+   [ set-model ] [ 2drop ] if ;
+: <filter> ( model quot -- filter-model ) [ 1array filter-model <multi-model> ] dip >>quot ;
+
+TUPLE: fold-model < multi-model oldval quot ;
+M: fold-model model-changed [ [ value>> ] [ [ oldval>> ] [ quot>> ] bi ] bi*
+   call( val oldval -- newval ) ] keep set-model ;
+: <fold> ( oldval quot model -- model' ) 1array fold-model <multi-model> swap >>quot swap >>oldval ;
+
+TUPLE: switch-model < multi-model switcher on ;
+M: switch-model model-changed tuck [ switcher>> = ] 2keep
+   '[ on>> [ _ value>> _ set-model ] when ] [ t swap (>>on) ] if ;
+: switch ( signal1 signal2 -- signal' ) [ 2array switch-model <multi-model> ] keep >>switcher ;
+
+TUPLE: mapped < model model quot ;
+
+: <mapped> ( model quot -- arrow )
+    f mapped new-model
+        swap >>quot
+        over >>model
+        [ add-dependency ] keep ;
+
+M: mapped model-changed
+    [ [ value>> ] [ quot>> ] bi* call( old -- new ) ] [ nip ] 2bi
+    set-model ;
+
+! Instances
+M: model fmap <mapped> ;
+
+SINGLETON: gadget-monad
+INSTANCE: gadget-monad monad
+INSTANCE: gadget monad
+M: gadget monad-of drop gadget-monad ;
+M: gadget-monad return drop <gadget> swap >>model ;
+M: gadget >>= model>> '[ _ swap call( x -- y ) ] ; 
+ 
+! ! list (model = Columns), listContent (model = contents)
+
diff --git a/extra/ui/frp/summary.txt b/extra/ui/frp/summary.txt
new file mode 100644
index 0000000000..3b49d34fa8
--- /dev/null
+++ b/extra/ui/frp/summary.txt
@@ -0,0 +1 @@
+Utilities for functional reactive programming in user interfaces

From 959f022290e647f062aa6bb12bfdb124ac955d63 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Fri, 24 Apr 2009 23:25:48 -0500
Subject: [PATCH 05/20] simple file merging for mac

---
 extra/merger/deploy.factor | 15 +++++++++++++++
 extra/merger/merger.factor | 30 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 extra/merger/deploy.factor
 create mode 100644 extra/merger/merger.factor

diff --git a/extra/merger/deploy.factor b/extra/merger/deploy.factor
new file mode 100644
index 0000000000..54535d5bc8
--- /dev/null
+++ b/extra/merger/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-math? t }
+    { deploy-io 2 }
+    { deploy-unicode? t }
+    { deploy-c-types? f }
+    { "stop-after-last-window?" t }
+    { deploy-ui? t }
+    { deploy-reflection 1 }
+    { deploy-compiler? t }
+    { deploy-name "Merger" }
+    { deploy-word-props? f }
+    { deploy-threads? t }
+    { deploy-word-defs? f }
+}
diff --git a/extra/merger/merger.factor b/extra/merger/merger.factor
new file mode 100644
index 0000000000..c4986bf47f
--- /dev/null
+++ b/extra/merger/merger.factor
@@ -0,0 +1,30 @@
+USING: accessors arrays fry io.directories kernel models sequences sets ui
+ui.gadgets ui.gadgets.buttons ui.gadgets.labeled
+ui.gadgets.tracks ui.gadgets.labels ui.gadgets.glass
+math.rectangles cocoa.dialogs ;
+IN: merger
+: main ( -- ) [
+   vertical <track>
+    { "From:" "To:" } f <model> f <model> 2array
+    [
+      [
+         "…" [
+            open-panel [ first
+            [ <label> 1array >>children drop ]
+            [ swap set-control-value ] 2bi ] [ drop ] if*
+         ] <border-button> swap >>model swap <labeled-gadget>
+         1 track-add
+      ] 2each
+    ] keep
+    dup first2
+    '[ _ [ value>> ] all? [ parent>> "processing..." <label> [
+         <zero-rect> show-glass
+         _ value>> [
+            "." _ value>> [ [ directory-files ] bi@ diff ] keep copy-files-into
+         ] with-directory
+      ] keep hide-glass
+    ] [ drop ] if ]
+    "merge" swap <border-button> 0.4 track-add { 300 220 } >>pref-dim "Merging" open-window
+] with-ui ;
+
+MAIN: main
\ No newline at end of file

From f432ea8208ac157938f8f55550ffad1b48f7f254 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Fri, 24 Apr 2009 23:26:10 -0500
Subject: [PATCH 06/20] distributed module system w/ qualified + from syntax

---
 extra/modules/authors.txt                     |  1 +
 .../remote-loading/remote-loading.factor      |  3 ++
 extra/modules/rpc-server/rpc-server.factor    | 24 +++++++++++++
 extra/modules/rpc/rpc-docs.factor             |  9 +++++
 extra/modules/rpc/rpc.factor                  | 26 ++++++++++++++
 extra/modules/summary.txt                     |  1 +
 extra/modules/using/tests/test-server.factor  |  3 ++
 extra/modules/using/tests/tests.factor        |  4 +++
 extra/modules/using/using-docs.factor         | 14 ++++++++
 extra/modules/using/using.factor              | 36 +++++++++++++++++++
 extra/modules/util/util.factor                |  4 +++
 11 files changed, 125 insertions(+)
 create mode 100644 extra/modules/authors.txt
 create mode 100644 extra/modules/remote-loading/remote-loading.factor
 create mode 100644 extra/modules/rpc-server/rpc-server.factor
 create mode 100644 extra/modules/rpc/rpc-docs.factor
 create mode 100644 extra/modules/rpc/rpc.factor
 create mode 100644 extra/modules/summary.txt
 create mode 100644 extra/modules/using/tests/test-server.factor
 create mode 100644 extra/modules/using/tests/tests.factor
 create mode 100644 extra/modules/using/using-docs.factor
 create mode 100644 extra/modules/using/using.factor
 create mode 100644 extra/modules/util/util.factor

diff --git a/extra/modules/authors.txt b/extra/modules/authors.txt
new file mode 100644
index 0000000000..2300f69f11
--- /dev/null
+++ b/extra/modules/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
diff --git a/extra/modules/remote-loading/remote-loading.factor b/extra/modules/remote-loading/remote-loading.factor
new file mode 100644
index 0000000000..72557f42f3
--- /dev/null
+++ b/extra/modules/remote-loading/remote-loading.factor
@@ -0,0 +1,3 @@
+USING: modules.rpc-server vocabs ;
+IN: modules.remote-loading service
+: get-vocab ( vocabstr -- vocab ) vocab ;
\ No newline at end of file
diff --git a/extra/modules/rpc-server/rpc-server.factor b/extra/modules/rpc-server/rpc-server.factor
new file mode 100644
index 0000000000..880af58581
--- /dev/null
+++ b/extra/modules/rpc-server/rpc-server.factor
@@ -0,0 +1,24 @@
+USING: accessors assocs effects generalizations io
+io.encodings.binary io.servers.connection kernel modules.util
+namespaces parser sets sequences serialize threads vocabs
+vocabs.parser words tools.walker ;
+
+IN: modules.rpc-server
+
+SYMBOL: serving-vocabs V{ } clone serving-vocabs set-global
+
+: process ( vocabspec -- ) vocab-words [ deserialize-args ] dip deserialize
+   swap at [ execute ] keep stack-effect out>> length narray serialize flush ;
+
+: (serve) ( -- ) deserialize dup serving-vocabs get-global index
+   [ process ] [ f ] if ;
+
+: start-serving-vocabs ( -- ) [
+   <threaded-server> 5000 >>insecure binary >>encoding [ (serve) ] >>handler
+   start-server ] in-thread ;
+
+SYNTAX: service serving-vocabs get-global empty? [ start-serving-vocabs ] when
+   current-vocab serving-vocabs get-global adjoin
+   "get-words" create-in
+   in get [ vocab vocab-words [ stack-effect ] { } assoc-map-as ] curry
+   (( -- words )) define-inline ;
\ No newline at end of file
diff --git a/extra/modules/rpc/rpc-docs.factor b/extra/modules/rpc/rpc-docs.factor
new file mode 100644
index 0000000000..af99d210ab
--- /dev/null
+++ b/extra/modules/rpc/rpc-docs.factor
@@ -0,0 +1,9 @@
+USING: help.syntax help.markup ;
+IN: modules.rpc
+ARTICLE: { "modules" "protocol" } "RPC Protocol"
+{ $list
+   "Send vocab as string"
+   "Send arglist"
+   "Send word as string"
+   "Receive result list"
+} ;
\ No newline at end of file
diff --git a/extra/modules/rpc/rpc.factor b/extra/modules/rpc/rpc.factor
new file mode 100644
index 0000000000..f574010aef
--- /dev/null
+++ b/extra/modules/rpc/rpc.factor
@@ -0,0 +1,26 @@
+USING: accessors compiler.units combinators fry generalizations io
+io.encodings.binary io.sockets kernel modules.util namespaces
+parser sequences serialize vocabs vocabs.parser words ;
+IN: modules.rpc
+
+DEFER: get-words
+
+: remote-quot ( addrspec vocabspec effect str -- quot )
+   '[ _ 5000 <inet> binary
+      [
+         _ serialize _ in>> length narray serialize _ serialize flush deserialize-args
+      ] with-client
+    ] ;
+
+: define-remote ( addrspec vocabspec effect str -- ) [
+      [ remote-quot ] 2keep create-in -rot define-declared
+   ] with-compilation-unit ;
+
+: with-in ( vocab quot -- vocab ) over
+   [ '[ _ set-in @ ] in get swap dip set-in ] dip vocab ; inline
+
+: remote-vocab ( addrspec vocabspec -- vocab )
+   dup "-remote" append [ 
+      [ (( -- words )) [ "get-words" remote-quot ] keep call-effect ] 2keep
+      [ rot first2 swap define-remote ] 2curry each
+   ] with-in ;
\ No newline at end of file
diff --git a/extra/modules/summary.txt b/extra/modules/summary.txt
new file mode 100644
index 0000000000..7ab3416915
--- /dev/null
+++ b/extra/modules/summary.txt
@@ -0,0 +1 @@
+Distributed module system + syntax
diff --git a/extra/modules/using/tests/test-server.factor b/extra/modules/using/tests/test-server.factor
new file mode 100644
index 0000000000..2fa813a382
--- /dev/null
+++ b/extra/modules/using/tests/test-server.factor
@@ -0,0 +1,3 @@
+USING: modules.rpc-server ;
+IN: modules.test-server service
+: rpc-hello ( -- str ) "hello world" ;
\ No newline at end of file
diff --git a/extra/modules/using/tests/tests.factor b/extra/modules/using/tests/tests.factor
new file mode 100644
index 0000000000..c76feed2c0
--- /dev/null
+++ b/extra/modules/using/tests/tests.factor
@@ -0,0 +1,4 @@
+USING: modules.using ;
+IN: modules.using.tests
+USING: prettyprint localhost::modules.test-server ;
+rpc-hello .
\ No newline at end of file
diff --git a/extra/modules/using/using-docs.factor b/extra/modules/using/using-docs.factor
new file mode 100644
index 0000000000..c78e546525
--- /dev/null
+++ b/extra/modules/using/using-docs.factor
@@ -0,0 +1,14 @@
+USING: modules.using modules.rpc-server help.syntax help.markup strings ;
+IN: modules
+
+HELP: service
+{ $syntax "IN: module service" }
+{ $description "Starts a server for requests for remote procedure calls." } ;
+
+ARTICLE: { "modules" "remote-loading" } "Using the remote-loading vocabulary"
+"If loaded, starts serving vocabularies, accessable through a " { $link POSTPONE: USING: } " form" ;
+
+HELP: USING:
+{ $syntax "USING: rpc-server::module fetch-sever::module { module qualified-name } { module => word ... } ... ;" }
+{ $description "Adds vocabularies to the front of the search path.  Vocabularies can be fetched remotely, if preceded by a valid hostname.  Name pairs facilitate imports like in the "
+{ $link POSTPONE: QUALIFIED: } " or " { $link POSTPONE: FROM: } " forms." } ;
\ No newline at end of file
diff --git a/extra/modules/using/using.factor b/extra/modules/using/using.factor
new file mode 100644
index 0000000000..b0891aa391
--- /dev/null
+++ b/extra/modules/using/using.factor
@@ -0,0 +1,36 @@
+USING: assocs kernel modules.remote-loading modules.rpc
+namespaces peg peg.ebnf peg-lexer sequences vocabs vocabs.parser
+strings ;
+IN: modules.using
+
+: >qualified ( vocab prefix -- assoc )
+    [ vocab-words ] [ 58 suffix ] bi* [ swap [ prepend ] dip ] curry assoc-map ;
+
+: >partial-vocab ( words assoc -- assoc )
+    [ dupd at [ no-word-error ] unless* ] curry { } map>assoc ;
+
+: remote-load ( addr vocabspec -- voab ) [ "modules.remote-loading" remote-vocab (use+) ] dip get-vocab ;
+
+: load'em ( vocab words/? -- ) [ swap >partial-vocab ] when* use get push ;
+
+EBNF: modulize
+tokenpart = (!(':').)+ => [[ >string ]]
+s = ':' => [[ drop ignore ]]
+rpc = tokenpart s s tokenpart => [[ first2 remote-vocab ]]
+remote = tokenpart s tokenpart => [[ first2 remote-load ]]
+plain = tokenpart => [[ load-vocab ]]
+module = rpc | remote | plain
+;EBNF
+
+ON-BNF: USING:
+tokenizer = <foreign factor>
+sym = !(";"|"}"|"=>").
+modspec = sym => [[ modulize ]]
+qualified = modspec sym => [[ first2 >qualified ]]
+unqualified = modspec => [[ vocab-words ]]
+words = ("=>" sym+ )? => [[ [ f ] [ second ] if-empty ]]
+long = "{" ( qualified | unqualified ) words "}" => [[ rest first2 load'em ignore ]]
+short = modspec => [[ use+ ignore ]]
+wordSpec = long | short
+using = wordSpec+ ";" => [[ drop ignore ]]
+;ON-BNF
\ No newline at end of file
diff --git a/extra/modules/util/util.factor b/extra/modules/util/util.factor
new file mode 100644
index 0000000000..7171ecb991
--- /dev/null
+++ b/extra/modules/util/util.factor
@@ -0,0 +1,4 @@
+USING: generalizations kernel namespaces sequences serialize ;
+IN: modules.util
+: deserialize-args ( -- ) deserialize dup length firstn ; inline
+: change-global ( var quot -- ) [ [ get-global ] keep ] dip dip set-global ; inline
\ No newline at end of file

From a5e7b34f6385b1ae028dc6eae01269a804413ee9 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Sun, 26 Apr 2009 18:56:24 -0500
Subject: [PATCH 07/20] modules compilation fixes

---
 .../remote-loading/remote-loading.factor      |  2 +-
 extra/modules/rpc-server/rpc-server.factor    | 23 ++++++++++++-------
 extra/modules/rpc/rpc.factor                  |  6 ++---
 extra/modules/util/util.factor                |  4 ----
 extra/peg-lexer/peg-lexer.factor              |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 extra/modules/util/util.factor

diff --git a/extra/modules/remote-loading/remote-loading.factor b/extra/modules/remote-loading/remote-loading.factor
index 72557f42f3..0106ba7dfe 100644
--- a/extra/modules/remote-loading/remote-loading.factor
+++ b/extra/modules/remote-loading/remote-loading.factor
@@ -1,3 +1,3 @@
 USING: modules.rpc-server vocabs ;
-IN: modules.remote-loading service
+IN: modules.remote-loading mem-service
 : get-vocab ( vocabstr -- vocab ) vocab ;
\ No newline at end of file
diff --git a/extra/modules/rpc-server/rpc-server.factor b/extra/modules/rpc-server/rpc-server.factor
index 880af58581..d1823fe5a1 100644
--- a/extra/modules/rpc-server/rpc-server.factor
+++ b/extra/modules/rpc-server/rpc-server.factor
@@ -1,24 +1,31 @@
-USING: accessors assocs effects generalizations io
-io.encodings.binary io.servers.connection kernel modules.util
-namespaces parser sets sequences serialize threads vocabs
+USING: accessors assocs continuations effects io
+io.encodings.binary io.servers.connection kernel
+memoize namespaces parser sets sequences serialize threads vocabs
 vocabs.parser words tools.walker ;
 
 IN: modules.rpc-server
 
 SYMBOL: serving-vocabs V{ } clone serving-vocabs set-global
 
-: process ( vocabspec -- ) vocab-words [ deserialize-args ] dip deserialize
-   swap at [ execute ] keep stack-effect out>> length narray serialize flush ;
+: do-rpc ( args word -- results ) [ execute ] curry with-datastack ; inline
+
+MEMO: mem-do-rpc ( args word -- results ) do-rpc ; inline
+
+: process ( vocabspec -- ) vocab-words [ deserialize ] dip deserialize
+   swap at "executer" get execute( args word -- results ) serialize flush ;
 
 : (serve) ( -- ) deserialize dup serving-vocabs get-global index
-   [ process ] [ f ] if ;
+   [ process ] [ drop ] if ;
 
 : start-serving-vocabs ( -- ) [
    <threaded-server> 5000 >>insecure binary >>encoding [ (serve) ] >>handler
    start-server ] in-thread ;
 
-SYNTAX: service serving-vocabs get-global empty? [ start-serving-vocabs ] when
+: (service) ( -- ) serving-vocabs get-global empty? [ start-serving-vocabs ] when
    current-vocab serving-vocabs get-global adjoin
    "get-words" create-in
    in get [ vocab vocab-words [ stack-effect ] { } assoc-map-as ] curry
-   (( -- words )) define-inline ;
\ No newline at end of file
+   (( -- words )) define-inline ;
+
+SYNTAX: service \ do-rpc  "executer" set (service) ;
+SYNTAX: mem-service \ mem-do-rpc "executer" set (service) ;
\ No newline at end of file
diff --git a/extra/modules/rpc/rpc.factor b/extra/modules/rpc/rpc.factor
index f574010aef..1c1217a71e 100644
--- a/extra/modules/rpc/rpc.factor
+++ b/extra/modules/rpc/rpc.factor
@@ -1,5 +1,5 @@
 USING: accessors compiler.units combinators fry generalizations io
-io.encodings.binary io.sockets kernel modules.util namespaces
+io.encodings.binary io.sockets kernel namespaces
 parser sequences serialize vocabs vocabs.parser words ;
 IN: modules.rpc
 
@@ -8,12 +8,12 @@ DEFER: get-words
 : remote-quot ( addrspec vocabspec effect str -- quot )
    '[ _ 5000 <inet> binary
       [
-         _ serialize _ in>> length narray serialize _ serialize flush deserialize-args
+         _ serialize _ in>> length narray serialize _ serialize flush deserialize dup length firstn
       ] with-client
     ] ;
 
 : define-remote ( addrspec vocabspec effect str -- ) [
-      [ remote-quot ] 2keep create-in -rot define-declared
+      [ remote-quot ] 2keep create-in -rot define-declared word make-inline
    ] with-compilation-unit ;
 
 : with-in ( vocab quot -- vocab ) over
diff --git a/extra/modules/util/util.factor b/extra/modules/util/util.factor
deleted file mode 100644
index 7171ecb991..0000000000
--- a/extra/modules/util/util.factor
+++ /dev/null
@@ -1,4 +0,0 @@
-USING: generalizations kernel namespaces sequences serialize ;
-IN: modules.util
-: deserialize-args ( -- ) deserialize dup length firstn ; inline
-: change-global ( var quot -- ) [ [ get-global ] keep ] dip dip set-global ; inline
\ No newline at end of file
diff --git a/extra/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor
index e58d8dd65b..eff0043ac3 100644
--- a/extra/peg-lexer/peg-lexer.factor
+++ b/extra/peg-lexer/peg-lexer.factor
@@ -45,11 +45,11 @@ M: lex-hash at*
 : parse* ( parser -- ast )
     compile
     [ execute [ error-stack get first throw ] unless* ] with-global-lexer
-    ast>> ;
+    ast>> ; inline
 
 : create-bnf ( name parser -- )
     reset-tokenizer [ lexer get skip-blank parse* dup ignore? [ drop ] [ parsed ] if ] curry
-    define-syntax ;
+    define-syntax word make-inline ;
     
 SYNTAX: ON-BNF:
     CREATE-WORD reset-tokenizer ";ON-BNF" parse-multiline-string parse-ebnf

From e6e32f052da39b20f7aefab1352df96948b232d7 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Sun, 26 Apr 2009 19:01:05 -0500
Subject: [PATCH 08/20] frp tables

---
 extra/ui/frp/frp.factor | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor
index 685d9af124..6e9a03cd86 100644
--- a/extra/ui/frp/frp.factor
+++ b/extra/ui/frp/frp.factor
@@ -6,12 +6,16 @@ IN: ui.frp
 
 ! Layout utilities
 
+GENERIC: output-model ( gadget -- model )
+M: gadget output-model model>> ;
+M: frp-table output-model selected-value>> ;
+
 GENERIC: , ( object -- )
 M: gadget , make:, ;
 M: model , activate-model ;
 
 GENERIC: -> ( object -- model )
-M: gadget -> dup make:, model>> ;
+M: gadget -> dup make:, output-model ;
 M: model -> dup , ;
 
 : <box> ( models type -- track )
@@ -22,7 +26,9 @@ M: model -> dup , ;
 
 ! Gadgets
 : <frp-button> ( text -- button ) [ t swap set-control-value ] <bevel-button> f <model> >>model ;
-TUPLE: frp-table < table quot ;
+TUPLE: frp-table < table quot column-titles column-alignment ;
+M: frp-table column-titles column-titles>> ;
+M: frp-table column-alignment column-alignment>> ;
 M: frp-table row-columns quot>> call( a -- b ) ;
 : <frp-table> ( model quot -- table )
     frp-table new-line-gadget dup >>renderer swap >>quot swap >>model

From 25002fbff0c3a0f13b1e215c881f1479e29867d2 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Sun, 26 Apr 2009 20:34:31 -0500
Subject: [PATCH 09/20] modules.rpc-server additions

---
 .../remote-loading/remote-loading.factor      |  1 +
 extra/modules/rpc-server/rpc-server.factor    | 20 +++++++++++++------
 extra/modules/uploads/uploads.factor          |  5 +++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 extra/modules/uploads/uploads.factor

diff --git a/extra/modules/remote-loading/remote-loading.factor b/extra/modules/remote-loading/remote-loading.factor
index 0106ba7dfe..7a51f2488d 100644
--- a/extra/modules/remote-loading/remote-loading.factor
+++ b/extra/modules/remote-loading/remote-loading.factor
@@ -1,3 +1,4 @@
 USING: modules.rpc-server vocabs ;
 IN: modules.remote-loading mem-service
+
 : get-vocab ( vocabstr -- vocab ) vocab ;
\ No newline at end of file
diff --git a/extra/modules/rpc-server/rpc-server.factor b/extra/modules/rpc-server/rpc-server.factor
index d1823fe5a1..63d5a870b4 100644
--- a/extra/modules/rpc-server/rpc-server.factor
+++ b/extra/modules/rpc-server/rpc-server.factor
@@ -1,18 +1,19 @@
 USING: accessors assocs continuations effects io
 io.encodings.binary io.servers.connection kernel
-memoize namespaces parser sets sequences serialize threads vocabs
-vocabs.parser words tools.walker ;
+memoize namespaces parser sets sequences serialize
+threads vocabs vocabs.parser words ;
 
 IN: modules.rpc-server
 
 SYMBOL: serving-vocabs V{ } clone serving-vocabs set-global
 
-: do-rpc ( args word -- results ) [ execute ] curry with-datastack ; inline
+: do-rpc ( args word -- bytes )
+   [ execute ] curry with-datastack object>bytes ; inline
 
-MEMO: mem-do-rpc ( args word -- results ) do-rpc ; inline
+MEMO: mem-do-rpc ( args word -- bytes ) do-rpc ; inline
 
 : process ( vocabspec -- ) vocab-words [ deserialize ] dip deserialize
-   swap at "executer" get execute( args word -- results ) serialize flush ;
+   swap at "executer" get execute( args word -- bytes ) write flush ;
 
 : (serve) ( -- ) deserialize dup serving-vocabs get-global index
    [ process ] [ drop ] if ;
@@ -28,4 +29,11 @@ MEMO: mem-do-rpc ( args word -- results ) do-rpc ; inline
    (( -- words )) define-inline ;
 
 SYNTAX: service \ do-rpc  "executer" set (service) ;
-SYNTAX: mem-service \ mem-do-rpc "executer" set (service) ;
\ No newline at end of file
+SYNTAX: mem-service \ mem-do-rpc "executer" set (service) ;
+
+: change-global ( var quot -- ) [ [ get-global ] keep ] dip dip set-global ; inline
+
+load-vocab-hook [
+   [ dup words>> values
+   \ mem-do-rpc "memoize" word-prop [ delete-at ] curry each ]
+append ] change-global
\ No newline at end of file
diff --git a/extra/modules/uploads/uploads.factor b/extra/modules/uploads/uploads.factor
new file mode 100644
index 0000000000..137a2c91d5
--- /dev/null
+++ b/extra/modules/uploads/uploads.factor
@@ -0,0 +1,5 @@
+USING: assocs modules.rpc-server vocabs
+modules.remote-loading words ;
+IN: modules.uploads service
+
+: upload-vocab ( word binary -- ) \ get-vocab "memoize" word-prop set-at ;
\ No newline at end of file

From 049cfb6dd4e3be06db04b1dbe528a6987d23441f Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 27 Apr 2009 18:53:13 -0500
Subject: [PATCH 10/20] authors and summaries updated

---
 extra/modules/{ => remote-loading}/authors.txt | 0
 extra/modules/remote-loading/summary.txt       | 1 +
 extra/modules/rpc-server/authors.txt           | 1 +
 extra/modules/rpc-server/summary.txt           | 1 +
 extra/modules/rpc/authors.txt                  | 1 +
 extra/modules/rpc/summary.txt                  | 1 +
 extra/modules/summary.txt                      | 1 -
 extra/modules/uploads/authors.txt              | 1 +
 extra/modules/uploads/summary.txt              | 1 +
 extra/modules/using/authors.txt                | 1 +
 extra/modules/using/summary.txt                | 1 +
 11 files changed, 9 insertions(+), 1 deletion(-)
 rename extra/modules/{ => remote-loading}/authors.txt (100%)
 create mode 100644 extra/modules/remote-loading/summary.txt
 create mode 100644 extra/modules/rpc-server/authors.txt
 create mode 100644 extra/modules/rpc-server/summary.txt
 create mode 100644 extra/modules/rpc/authors.txt
 create mode 100644 extra/modules/rpc/summary.txt
 delete mode 100644 extra/modules/summary.txt
 create mode 100644 extra/modules/uploads/authors.txt
 create mode 100644 extra/modules/uploads/summary.txt
 create mode 100644 extra/modules/using/authors.txt
 create mode 100644 extra/modules/using/summary.txt

diff --git a/extra/modules/authors.txt b/extra/modules/remote-loading/authors.txt
similarity index 100%
rename from extra/modules/authors.txt
rename to extra/modules/remote-loading/authors.txt
diff --git a/extra/modules/remote-loading/summary.txt b/extra/modules/remote-loading/summary.txt
new file mode 100644
index 0000000000..304f8550e4
--- /dev/null
+++ b/extra/modules/remote-loading/summary.txt
@@ -0,0 +1 @@
+required for listeners allowing remote loading of modules
\ No newline at end of file
diff --git a/extra/modules/rpc-server/authors.txt b/extra/modules/rpc-server/authors.txt
new file mode 100644
index 0000000000..2300f69f11
--- /dev/null
+++ b/extra/modules/rpc-server/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
diff --git a/extra/modules/rpc-server/summary.txt b/extra/modules/rpc-server/summary.txt
new file mode 100644
index 0000000000..396a1c8686
--- /dev/null
+++ b/extra/modules/rpc-server/summary.txt
@@ -0,0 +1 @@
+remote procedure call server
\ No newline at end of file
diff --git a/extra/modules/rpc/authors.txt b/extra/modules/rpc/authors.txt
new file mode 100644
index 0000000000..2300f69f11
--- /dev/null
+++ b/extra/modules/rpc/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
diff --git a/extra/modules/rpc/summary.txt b/extra/modules/rpc/summary.txt
new file mode 100644
index 0000000000..cc1501fa88
--- /dev/null
+++ b/extra/modules/rpc/summary.txt
@@ -0,0 +1 @@
+remote procedure call client
\ No newline at end of file
diff --git a/extra/modules/summary.txt b/extra/modules/summary.txt
deleted file mode 100644
index 7ab3416915..0000000000
--- a/extra/modules/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Distributed module system + syntax
diff --git a/extra/modules/uploads/authors.txt b/extra/modules/uploads/authors.txt
new file mode 100644
index 0000000000..2300f69f11
--- /dev/null
+++ b/extra/modules/uploads/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
diff --git a/extra/modules/uploads/summary.txt b/extra/modules/uploads/summary.txt
new file mode 100644
index 0000000000..1ba8ffe0f8
--- /dev/null
+++ b/extra/modules/uploads/summary.txt
@@ -0,0 +1 @@
+module pushing in remote-loading listeners
\ No newline at end of file
diff --git a/extra/modules/using/authors.txt b/extra/modules/using/authors.txt
new file mode 100644
index 0000000000..2300f69f11
--- /dev/null
+++ b/extra/modules/using/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
diff --git a/extra/modules/using/summary.txt b/extra/modules/using/summary.txt
new file mode 100644
index 0000000000..6bafda776a
--- /dev/null
+++ b/extra/modules/using/summary.txt
@@ -0,0 +1 @@
+improved module import syntax
\ No newline at end of file

From c580916f39b47a650e39ef0ad4c7515d199a73e7 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 27 Apr 2009 19:20:27 -0500
Subject: [PATCH 11/20] modules.using tests close server after use

---
 extra/modules/using/tests/test-server.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/modules/using/tests/test-server.factor b/extra/modules/using/tests/test-server.factor
index 2fa813a382..3e6b736ae1 100644
--- a/extra/modules/using/tests/test-server.factor
+++ b/extra/modules/using/tests/test-server.factor
@@ -1,3 +1,3 @@
-USING: modules.rpc-server ;
+USING: modules.rpc-server io.servers.connection ;
 IN: modules.test-server service
-: rpc-hello ( -- str ) "hello world" ;
\ No newline at end of file
+: rpc-hello ( -- str ) "hello world" stop-this-server ;
\ No newline at end of file

From d3cd8b9a463aae869279d41d2df77ee585d54fcf Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Tue, 28 Apr 2009 16:23:24 -0500
Subject: [PATCH 12/20] unit tests for modules.using

---
 extra/modules/using/tests/tests.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/modules/using/tests/tests.factor b/extra/modules/using/tests/tests.factor
index c76feed2c0..894075acf8 100644
--- a/extra/modules/using/tests/tests.factor
+++ b/extra/modules/using/tests/tests.factor
@@ -1,4 +1,4 @@
 USING: modules.using ;
 IN: modules.using.tests
-USING: prettyprint localhost::modules.test-server ;
-rpc-hello .
\ No newline at end of file
+USING: tools.test localhost::modules.test-server ;
+[ "hello world" ] [ rpc-hello ] unit-test
\ No newline at end of file

From 53302edb150551ba539c7a94e2f46fec199462e5 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Tue, 28 Apr 2009 20:37:00 -0500
Subject: [PATCH 13/20] moved change-global to namespaces

---
 core/namespaces/namespaces.factor          | 1 +
 extra/modules/rpc-server/rpc-server.factor | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/namespaces/namespaces.factor b/core/namespaces/namespaces.factor
index b0e764c94d..977e5a2961 100644
--- a/core/namespaces/namespaces.factor
+++ b/core/namespaces/namespaces.factor
@@ -24,6 +24,7 @@ PRIVATE>
 : get-global ( variable -- value ) global at ;
 : set-global ( value variable -- ) global set-at ;
 : change ( variable quot -- ) [ [ get ] keep ] dip dip set ; inline
+: change-global ( var quot -- ) [ [ get-global ] keep ] dip dip set-global ; inline
 : +@ ( n variable -- ) [ 0 or + ] change ;
 : inc ( variable -- ) 1 swap +@ ; inline
 : dec ( variable -- ) -1 swap +@ ; inline
diff --git a/extra/modules/rpc-server/rpc-server.factor b/extra/modules/rpc-server/rpc-server.factor
index 63d5a870b4..525ff35a09 100644
--- a/extra/modules/rpc-server/rpc-server.factor
+++ b/extra/modules/rpc-server/rpc-server.factor
@@ -31,8 +31,6 @@ MEMO: mem-do-rpc ( args word -- bytes ) do-rpc ; inline
 SYNTAX: service \ do-rpc  "executer" set (service) ;
 SYNTAX: mem-service \ mem-do-rpc "executer" set (service) ;
 
-: change-global ( var quot -- ) [ [ get-global ] keep ] dip dip set-global ; inline
-
 load-vocab-hook [
    [ dup words>> values
    \ mem-do-rpc "memoize" word-prop [ delete-at ] curry each ]

From 96474ab059f894e996919178c49d0c058d7d9745 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Tue, 28 Apr 2009 20:37:25 -0500
Subject: [PATCH 14/20] frp-table additions

---
 extra/ui/frp/frp-docs.factor |  2 +-
 extra/ui/frp/frp.factor      | 41 ++++++++++----------
 extra/ui/frp/frp.factor copy | 73 ------------------------------------
 3 files changed, 23 insertions(+), 93 deletions(-)
 delete mode 100644 extra/ui/frp/frp.factor copy

diff --git a/extra/ui/frp/frp-docs.factor b/extra/ui/frp/frp-docs.factor
index ac3306a54a..a6f625cc59 100644
--- a/extra/ui/frp/frp-docs.factor
+++ b/extra/ui/frp/frp-docs.factor
@@ -15,7 +15,7 @@ HELP: <vbox>
 { $description "Creates an vertical track containing the gadgets listed in the quotation" } ;
 
 ! Gadgets
-HELP: <model-button>
+HELP: <frp-button>
 { $description "Creates an button whose model updates on clicks" } ;
 
 HELP: <merge>
diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor
index 6e9a03cd86..38e4f77084 100644
--- a/extra/ui/frp/frp.factor
+++ b/extra/ui/frp/frp.factor
@@ -1,9 +1,26 @@
-USING: accessors arrays fry kernel models models.product
-monads sequences ui.gadgets ui.gadgets.buttons ui.gadgets.tracks
-ui.gadgets.tables ;
+USING: accessors arrays colors fonts fry kernel models
+models.product monads sequences ui.gadgets ui.gadgets.buttons
+ui.gadgets.editors ui.gadgets.line-support ui.gadgets.tables
+ui.gadgets.tracks ui.render ;
 QUALIFIED: make
 IN: ui.frp
 
+! Gadgets
+: <frp-button> ( text -- button ) [ t swap set-control-value ] <border-button> f <model> >>model ;
+TUPLE: frp-table < table quot val-quot color-quot column-titles column-alignment ;
+M: frp-table column-titles column-titles>> ;
+M: frp-table column-alignment column-alignment>> ;
+M: frp-table row-columns quot>> call( a -- b ) ;
+M: frp-table row-value val-quot>> call( a -- b ) ;
+M: frp-table row-color color-quot>> call( a -- b ) ;
+
+: <frp-table> ( model quot -- table )
+    frp-table new-line-gadget dup >>renderer swap >>quot swap >>model
+    f <model> >>selected-value sans-serif-font >>font
+    focus-border-color >>focus-border-color
+    transparent >>column-line-color ;
+: <frp-field> ( -- field ) f <model> <model-field> ;
+
 ! Layout utilities
 
 GENERIC: output-model ( gadget -- model )
@@ -17,6 +34,7 @@ M: model , activate-model ;
 GENERIC: -> ( object -- model )
 M: gadget -> dup make:, output-model ;
 M: model -> dup , ;
+M: table -> dup , selected-value>> ;
 
 : <box> ( models type -- track )
    [ { } make:make ] dip <track> swap dup [ model>> ] map <product>
@@ -24,18 +42,6 @@ M: model -> dup , ;
 : <hbox> ( models -- track ) horizontal <box> ; inline
 : <vbox> ( models -- track ) vertical <box> ; inline
 
-! Gadgets
-: <frp-button> ( text -- button ) [ t swap set-control-value ] <bevel-button> f <model> >>model ;
-TUPLE: frp-table < table quot column-titles column-alignment ;
-M: frp-table column-titles column-titles>> ;
-M: frp-table column-alignment column-alignment>> ;
-M: frp-table row-columns quot>> call( a -- b ) ;
-: <frp-table> ( model quot -- table )
-    frp-table new-line-gadget dup >>renderer swap >>quot swap >>model
-    f <model> >>selected-value sans-serif-font >>font
-    focus-border-color >>focus-border-color
-    transparent >>column-line-color ;
-
 ! Model utilities
 TUPLE: multi-model < model ;
 ! M: multi-model model-activated dup model-changed ;
@@ -80,7 +86,4 @@ INSTANCE: gadget-monad monad
 INSTANCE: gadget monad
 M: gadget monad-of drop gadget-monad ;
 M: gadget-monad return drop <gadget> swap >>model ;
-M: gadget >>= model>> '[ _ swap call( x -- y ) ] ; 
- 
-! ! list (model = Columns), listContent (model = contents)
-
+M: gadget >>= model>> '[ _ swap call( x -- y ) ] ; 
\ No newline at end of file
diff --git a/extra/ui/frp/frp.factor copy b/extra/ui/frp/frp.factor copy
deleted file mode 100644
index 3ebb33e2d6..0000000000
--- a/extra/ui/frp/frp.factor copy	
+++ /dev/null
@@ -1,73 +0,0 @@
-USING: accessors arrays fry kernel models models.product
-monads sequences ui.gadgets ui.gadgets.buttons ui.gadgets.tracks ;
-QUALIFIED: make
-IN: ui.frp
-
-! Layout utilities
-
-GENERIC: , ( object -- )
-M: gadget , make:, ;
-M: model , activate-model ;
-
-GENERIC: -> ( object -- model )
-M: gadget -> dup make:, model>> ;
-M: model -> dup , ;
-
-: <box> ( models type -- track )
-   [ { } make:make ] dip <track> swap dup [ model>> ] map <product>
-   [ [ f track-add ] each ] dip >>model ; inline
-: <hbox> ( models -- track ) horizontal <box> ; inline
-: <vbox> ( models -- track ) vertical <box> ; inline
-
-! Gadgets
-: <model-button> ( text -- button ) [ t swap set-control-value ] <button> f <model> >>model ;
-
-
-! Model utilities
-TUPLE: multi-model < model ;
-! M: multi-model model-activated dup model-changed ;
-: <multi-model> ( models kind -- model ) f swap new-model [ [ add-dependency ] curry each ] keep ;
-
-TUPLE: merge-model < multi-model ;
-M: merge-model model-changed [ value>> ] dip set-model ;
-: <merge> ( models -- model ) merge-model <multi-model> ;
-
-TUPLE: filter-model < multi-model quot ;
-M: filter-model model-changed [ value>> ] dip [ quot>> call( val -- bool ) ] 2keep
-   [ set-model ] [ 2drop ] if ;
-: <filter> ( model quot -- filter-model ) [ 1array filter-model <multi-model> ] dip >>quot ;
-
-TUPLE: fold-model < multi-model oldval quot ;
-M: fold-model model-changed [ [ value>> ] [ [ oldval>> ] [ quot>> ] bi ] bi*
-   call( val oldval -- newval ) ] keep set-model ;
-: <fold> ( oldval quot model -- model' ) 1array fold-model <multi-model> swap >>quot swap >>oldval ;
-
-TUPLE: switch-model < multi-model switcher on ;
-M: switch-model model-changed tuck [ switcher>> = ] 2keep
-   '[ on>> [ _ value>> _ set-model ] when ] [ t swap (>>on) ] if ;
-: switch ( signal1 signal2 -- signal' ) [ 2array switch-model <multi-model> ] keep >>switcher ;
-
-TUPLE: mapped < model model quot ;
-
-: <mapped> ( model quot -- arrow )
-    f mapped new-model
-        swap >>quot
-        over >>model
-        [ add-dependency ] keep ;
-
-M: mapped model-changed
-    [ [ value>> ] [ quot>> ] bi* call( old -- new ) ] [ nip ] 2bi
-    set-model ;
-
-! Instances
-M: model fmap <mapped> ;
-
-SINGLETON: gadget-monad
-INSTANCE: gadget-monad monad
-INSTANCE: gadget monad
-M: gadget monad-of drop gadget-monad ;
-M: gadget-monad return drop <gadget> swap >>model ;
-M: gadget >>= model>> '[ _ swap call( x -- y ) ] ; 
- 
-! ! list (model = Columns), listContent (model = contents)
-

From 4c8c1f96266c85c6af7ff62b8734142a58492917 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Tue, 28 Apr 2009 22:00:21 -0500
Subject: [PATCH 15/20] frp-table fixes

---
 extra/ui/frp/frp.factor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor
index 38e4f77084..9648652784 100644
--- a/extra/ui/frp/frp.factor
+++ b/extra/ui/frp/frp.factor
@@ -10,9 +10,9 @@ IN: ui.frp
 TUPLE: frp-table < table quot val-quot color-quot column-titles column-alignment ;
 M: frp-table column-titles column-titles>> ;
 M: frp-table column-alignment column-alignment>> ;
-M: frp-table row-columns quot>> call( a -- b ) ;
-M: frp-table row-value val-quot>> call( a -- b ) ;
-M: frp-table row-color color-quot>> call( a -- b ) ;
+M: frp-table row-columns quot>> [ call( a -- b ) ] [ drop f ] if* ;
+M: frp-table row-value val-quot>> [ call( a -- b ) ]  [ drop f ] if* ;
+M: frp-table row-color color-quot>> [ call( a -- b ) ]  [ drop f ] if* ;
 
 : <frp-table> ( model quot -- table )
     frp-table new-line-gadget dup >>renderer swap >>quot swap >>model

From 3cf4f45416db0b1980595bf4992e6742b2c88871 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Wed, 29 Apr 2009 14:19:30 -0500
Subject: [PATCH 16/20] comboboxes vocab + ui authors, summaries

---
 basis/ui/gadgets/tables/tables.factor         | 15 ++++++-------
 extra/ui/frp/frp.factor                       | 10 ++++-----
 extra/ui/gadgets/alerts/authors.txt           |  1 +
 extra/ui/gadgets/alerts/summary.txt           |  1 +
 extra/ui/gadgets/book-extras/authors.txt      |  1 +
 extra/ui/gadgets/book-extras/summary.txt      |  1 +
 extra/ui/gadgets/comboboxes/authors.txt       |  1 +
 extra/ui/gadgets/comboboxes/comboboxes.factor | 22 +++++++++++++++++++
 extra/ui/gadgets/comboboxes/summary.txt       |  1 +
 9 files changed, 40 insertions(+), 13 deletions(-)
 create mode 100644 extra/ui/gadgets/alerts/authors.txt
 create mode 100644 extra/ui/gadgets/alerts/summary.txt
 create mode 100644 extra/ui/gadgets/book-extras/authors.txt
 create mode 100644 extra/ui/gadgets/book-extras/summary.txt
 create mode 100644 extra/ui/gadgets/comboboxes/authors.txt
 create mode 100644 extra/ui/gadgets/comboboxes/comboboxes.factor
 create mode 100644 extra/ui/gadgets/comboboxes/summary.txt

diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor
index d390b1e49b..c726b7e9f1 100644
--- a/basis/ui/gadgets/tables/tables.factor
+++ b/basis/ui/gadgets/tables/tables.factor
@@ -46,14 +46,13 @@ mouse-index
 { takes-focus? initial: t }
 focused? ;
 
-: <table> ( rows renderer -- table )
-    table new-line-gadget
-        swap >>renderer
-        swap >>model
-        f <model> >>selected-value
-        sans-serif-font >>font
-        focus-border-color >>focus-border-color
-        transparent >>column-line-color ;
+: new-table ( rows renderer class -- table )
+   new-line-gadget swap >>renderer swap >>model
+    f <model> >>selected-value sans-serif-font >>font
+    focus-border-color >>focus-border-color
+    transparent >>column-line-color ;
+
+: <table> ( rows renderer -- table ) table new-table ;
 
 <PRIVATE
 
diff --git a/extra/ui/frp/frp.factor b/extra/ui/frp/frp.factor
index 9648652784..f5c0f1bd10 100644
--- a/extra/ui/frp/frp.factor
+++ b/extra/ui/frp/frp.factor
@@ -36,11 +36,11 @@ M: gadget -> dup make:, output-model ;
 M: model -> dup , ;
 M: table -> dup , selected-value>> ;
 
-: <box> ( models type -- track )
-   [ { } make:make ] dip <track> swap dup [ model>> ] map <product>
-   [ [ f track-add ] each ] dip >>model ; inline
-: <hbox> ( models -- track ) horizontal <box> ; inline
-: <vbox> ( models -- track ) vertical <box> ; inline
+: <box> ( gadgets type -- track )
+   [ { } make:make ] dip <track> swap [ f track-add ] each ; inline
+: <box*> ( gadgets type -- track ) [ <box> ] [ [ model>> ] map <product> ] bi >>model ; inline
+: <hbox> ( gadgets -- track ) horizontal <box> ; inline
+: <vbox> ( gadgets -- track ) vertical <box> ; inline
 
 ! Model utilities
 TUPLE: multi-model < model ;
diff --git a/extra/ui/gadgets/alerts/authors.txt b/extra/ui/gadgets/alerts/authors.txt
new file mode 100644
index 0000000000..ce0899f16e
--- /dev/null
+++ b/extra/ui/gadgets/alerts/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
\ No newline at end of file
diff --git a/extra/ui/gadgets/alerts/summary.txt b/extra/ui/gadgets/alerts/summary.txt
new file mode 100644
index 0000000000..f1cd4205d7
--- /dev/null
+++ b/extra/ui/gadgets/alerts/summary.txt
@@ -0,0 +1 @@
+Really simple dialog boxes
\ No newline at end of file
diff --git a/extra/ui/gadgets/book-extras/authors.txt b/extra/ui/gadgets/book-extras/authors.txt
new file mode 100644
index 0000000000..ce0899f16e
--- /dev/null
+++ b/extra/ui/gadgets/book-extras/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
\ No newline at end of file
diff --git a/extra/ui/gadgets/book-extras/summary.txt b/extra/ui/gadgets/book-extras/summary.txt
new file mode 100644
index 0000000000..5a221abffe
--- /dev/null
+++ b/extra/ui/gadgets/book-extras/summary.txt
@@ -0,0 +1 @@
+Easily switch between pages of book views
\ No newline at end of file
diff --git a/extra/ui/gadgets/comboboxes/authors.txt b/extra/ui/gadgets/comboboxes/authors.txt
new file mode 100644
index 0000000000..ce0899f16e
--- /dev/null
+++ b/extra/ui/gadgets/comboboxes/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
\ No newline at end of file
diff --git a/extra/ui/gadgets/comboboxes/comboboxes.factor b/extra/ui/gadgets/comboboxes/comboboxes.factor
new file mode 100644
index 0000000000..b0dbe34d16
--- /dev/null
+++ b/extra/ui/gadgets/comboboxes/comboboxes.factor
@@ -0,0 +1,22 @@
+USING: accessors arrays kernel math.rectangles models sequences
+ui.frp ui.gadgets ui.gadgets.glass ui.gadgets.labels
+ui.gadgets.tables ui.gestures ;
+IN: ui.gadgets.comboboxes
+
+TUPLE: combo-table < table spawner ;
+
+M: combo-table handle-gesture [ call-next-method ] 2keep swap
+   T{ button-up } = [
+      [ spawner>> ]
+      [ selected-value>> value>> [ swap set-control-value ] [ drop ] if* ]
+      [ hide-glass ] tri drop t
+   ] [ drop ] if ;
+
+TUPLE: combobox < label-control table ;
+combobox H{
+   { T{ button-down } [ dup table>> over >>spawner <zero-rect> show-glass ] }
+} set-gestures
+
+: <combobox> ( options -- combobox ) [ first [ combobox new-label ] keep <model> >>model ] keep
+   [ 1array ] map <model> trivial-renderer combo-table new-table
+   >>table ;
\ No newline at end of file
diff --git a/extra/ui/gadgets/comboboxes/summary.txt b/extra/ui/gadgets/comboboxes/summary.txt
new file mode 100644
index 0000000000..dcba8dace3
--- /dev/null
+++ b/extra/ui/gadgets/comboboxes/summary.txt
@@ -0,0 +1 @@
+Comboxes have a model choosen from a list of options
\ No newline at end of file

From 3e58a59335376ce1f7e87fd2f8297b304fd2dbe0 Mon Sep 17 00:00:00 2001
From: bogiebro <anklesaria@gmail.com>
Date: Wed, 29 Apr 2009 13:56:36 -0700
Subject: [PATCH 17/20] fixed comboboxes summary spelling error

---
 extra/ui/gadgets/comboboxes/summary.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/ui/gadgets/comboboxes/summary.txt b/extra/ui/gadgets/comboboxes/summary.txt
index dcba8dace3..0f2ce2b671 100644
--- a/extra/ui/gadgets/comboboxes/summary.txt
+++ b/extra/ui/gadgets/comboboxes/summary.txt
@@ -1 +1 @@
-Comboxes have a model choosen from a list of options
\ No newline at end of file
+Combo boxes have a model choosen from a list of options
\ No newline at end of file

From 7afaa255c15679c642b440fac17e481aaa0b63d5 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Wed, 29 Apr 2009 21:51:19 -0500
Subject: [PATCH 18/20] string frying

---
 extra/str-fry/authors.txt    | 1 +
 extra/str-fry/str-fry.factor | 4 ++++
 extra/str-fry/summary.txt    | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 extra/str-fry/authors.txt
 create mode 100644 extra/str-fry/str-fry.factor
 create mode 100644 extra/str-fry/summary.txt

diff --git a/extra/str-fry/authors.txt b/extra/str-fry/authors.txt
new file mode 100644
index 0000000000..ce0899f16e
--- /dev/null
+++ b/extra/str-fry/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
\ No newline at end of file
diff --git a/extra/str-fry/str-fry.factor b/extra/str-fry/str-fry.factor
new file mode 100644
index 0000000000..aafdaa95d9
--- /dev/null
+++ b/extra/str-fry/str-fry.factor
@@ -0,0 +1,4 @@
+USING: kernel sequences splitting strings.parser ;
+IN: str-fry
+: str-fry ( str -- quot ) "_" split unclip [ [ rot glue ] reduce ] 2curry ;
+SYNTAX: I" parse-string rest str-fry over push-all ;
\ No newline at end of file
diff --git a/extra/str-fry/summary.txt b/extra/str-fry/summary.txt
new file mode 100644
index 0000000000..7755f5ae9a
--- /dev/null
+++ b/extra/str-fry/summary.txt
@@ -0,0 +1 @@
+String Frying
\ No newline at end of file

From 59bec433f44c9895ccd5a5aebebd71748823ff97 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 30 Apr 2009 21:37:53 -0500
Subject: [PATCH 19/20] Add unportable tag to merger and fix indentation in
 ui.gadgets.tables

---
 basis/ui/gadgets/tables/tables.factor | 11 +++++++----
 extra/merger/tags.txt                 |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 extra/merger/tags.txt

diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor
index c726b7e9f1..ba3b5a2f78 100644
--- a/basis/ui/gadgets/tables/tables.factor
+++ b/basis/ui/gadgets/tables/tables.factor
@@ -47,10 +47,13 @@ mouse-index
 focused? ;
 
 : new-table ( rows renderer class -- table )
-   new-line-gadget swap >>renderer swap >>model
-    f <model> >>selected-value sans-serif-font >>font
-    focus-border-color >>focus-border-color
-    transparent >>column-line-color ;
+    new-line-gadget
+        swap >>renderer
+        swap >>model
+        f <model> >>selected-value
+        sans-serif-font >>font
+        focus-border-color >>focus-border-color
+        transparent >>column-line-color ; inline
 
 : <table> ( rows renderer -- table ) table new-table ;
 
diff --git a/extra/merger/tags.txt b/extra/merger/tags.txt
new file mode 100644
index 0000000000..c80b8b4fe1
--- /dev/null
+++ b/extra/merger/tags.txt
@@ -0,0 +1,2 @@
+unportable
+

From 9bb70c2c4da5bc7ab8f5d46daeaa4966fdb8d305 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 30 Apr 2009 21:38:14 -0500
Subject: [PATCH 20/20] Update usages of global ... change-at to use the new
 change-global combinator

---
 basis/alarms/alarms.factor                      |  2 +-
 basis/cocoa/cocoa.factor                        |  2 +-
 basis/core-foundation/fsevents/fsevents.factor  |  4 ++--
 basis/ui/tools/common/common.factor             |  2 +-
 basis/ui/ui.factor                              |  2 +-
 basis/windows/dinput/constants/constants.factor |  2 +-
 core/namespaces/namespaces-docs.factor          |  8 +++++++-
 core/namespaces/namespaces.factor               |  6 +++---
 extra/game-input/dinput/dinput.factor           | 15 +++++----------
 extra/game-input/iokit/iokit.factor             |  4 ++--
 extra/wordtimer/wordtimer.factor                |  3 ---
 11 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/basis/alarms/alarms.factor b/basis/alarms/alarms.factor
index 9cc05b4159..f9fdce806f 100644
--- a/basis/alarms/alarms.factor
+++ b/basis/alarms/alarms.factor
@@ -71,7 +71,7 @@ ERROR: bad-alarm-frequency frequency ;
     ] when* ;
 
 : init-alarms ( -- )
-    alarms global [ cancel-alarms <min-heap> ] change-at
+    alarms [ cancel-alarms <min-heap> ] change-global
     [ alarm-thread-loop t ] "Alarms" spawn-server
     alarm-thread set-global ;
 
diff --git a/basis/cocoa/cocoa.factor b/basis/cocoa/cocoa.factor
index 69d698f9b1..3e933e6643 100644
--- a/basis/cocoa/cocoa.factor
+++ b/basis/cocoa/cocoa.factor
@@ -7,7 +7,7 @@ compiler.units lexer init ;
 IN: cocoa
 
 : (remember-send) ( selector variable -- )
-    global [ dupd ?set-at ] change-at ;
+    [ dupd ?set-at ] change-global ;
 
 SYMBOL: sent-messages
 
diff --git a/basis/core-foundation/fsevents/fsevents.factor b/basis/core-foundation/fsevents/fsevents.factor
index 46f6639ab8..1956cd9c20 100644
--- a/basis/core-foundation/fsevents/fsevents.factor
+++ b/basis/core-foundation/fsevents/fsevents.factor
@@ -151,8 +151,8 @@ SYMBOL: event-stream-callbacks
     \ event-stream-counter counter ;
 
 [
-    event-stream-callbacks global
-    [ [ drop expired? not ] assoc-filter H{ } assoc-like ] change-at
+    event-stream-callbacks
+    [ [ drop expired? not ] assoc-filter H{ } assoc-like ] change-global
 ] "core-foundation" add-init-hook
 
 : add-event-source-callback ( quot -- id )
diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor
index e581e72e24..95af20ec72 100644
--- a/basis/ui/tools/common/common.factor
+++ b/basis/ui/tools/common/common.factor
@@ -7,7 +7,7 @@ IN: ui.tools.common
 
 SYMBOL: tool-dims
 
-tool-dims global [ H{ } clone or ] change-at
+tool-dims [ H{ } clone ] initialize
 
 TUPLE: tool < track ;
 
diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 8be486cb1a..09403cb2d2 100644
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -28,7 +28,7 @@ SYMBOL: windows
     [ [ length 1- dup 1- ] keep exchange ] [ drop ] if ;
 
 : unregister-window ( handle -- )
-    windows global [ [ first = not ] with filter ] change-at ;
+    windows [ [ first = not ] with filter ] change-global ;
 
 : raised-window ( world -- )
     windows get-global
diff --git a/basis/windows/dinput/constants/constants.factor b/basis/windows/dinput/constants/constants.factor
index 0f95c6d683..74238abed2 100755
--- a/basis/windows/dinput/constants/constants.factor
+++ b/basis/windows/dinput/constants/constants.factor
@@ -842,7 +842,7 @@ SYMBOLS:
 [ define-constants ] "windows.dinput.constants" add-init-hook
 
 : uninitialize ( variable quot -- )
-    [ global ] dip '[ _ when* f ] change-at ; inline
+    '[ _ when* f ] change-global ; inline
 
 : free-dinput-constants ( -- )
     {
diff --git a/core/namespaces/namespaces-docs.factor b/core/namespaces/namespaces-docs.factor
index 74d7c58963..de4737e7b0 100644
--- a/core/namespaces/namespaces-docs.factor
+++ b/core/namespaces/namespaces-docs.factor
@@ -14,7 +14,8 @@ ARTICLE: "namespaces-change" "Changing variable values"
 { $subsection off }
 { $subsection inc }
 { $subsection dec }
-{ $subsection change } ;
+{ $subsection change }
+{ $subsection change-global } ;
 
 ARTICLE: "namespaces-global" "Global variables"
 { $subsection namespace }
@@ -73,6 +74,11 @@ HELP: change
 { $description "Applies the quotation to the old value of the variable, and assigns the resulting value to the variable." }
 { $side-effects "variable" } ;
 
+HELP: change-global
+{ $values { "variable" "a variable, by convention a symbol" } { "quot" { $quotation "( old -- new )" } } }
+{ $description "Applies the quotation to the old value of the global variable, and assigns the resulting value to the global variable." }
+{ $side-effects "variable" } ;
+
 HELP: +@
 { $values { "n" "a number" } { "variable" "a variable, by convention a symbol" } }
 { $description "Adds " { $snippet "n" } " to the value of the variable. A variable value of " { $link f } " is interpreted as being zero." }
diff --git a/core/namespaces/namespaces.factor b/core/namespaces/namespaces.factor
index 977e5a2961..310816cbf7 100644
--- a/core/namespaces/namespaces.factor
+++ b/core/namespaces/namespaces.factor
@@ -24,13 +24,13 @@ PRIVATE>
 : get-global ( variable -- value ) global at ;
 : set-global ( value variable -- ) global set-at ;
 : change ( variable quot -- ) [ [ get ] keep ] dip dip set ; inline
-: change-global ( var quot -- ) [ [ get-global ] keep ] dip dip set-global ; inline
+: change-global ( variable quot -- ) [ global ] dip change-at ; inline
 : +@ ( n variable -- ) [ 0 or + ] change ;
 : inc ( variable -- ) 1 swap +@ ; inline
 : dec ( variable -- ) -1 swap +@ ; inline
 : bind ( ns quot -- ) swap >n call ndrop ; inline
-: counter ( variable -- n ) global [ 0 or 1+ dup ] change-at ;
+: counter ( variable -- n ) [ 0 or 1+ dup ] change-global ;
 : make-assoc ( quot exemplar -- hash ) 20 swap new-assoc [ swap bind ] keep ; inline
 : with-scope ( quot -- ) 5 <hashtable> swap bind ; inline
 : with-variable ( value key quot -- ) [ associate ] dip bind ; inline
-: initialize ( variable quot -- ) [ global ] dip [ unless* ] curry change-at ; inline
\ No newline at end of file
+: initialize ( variable quot -- ) [ unless* ] curry change-global ; inline
\ No newline at end of file
diff --git a/extra/game-input/dinput/dinput.factor b/extra/game-input/dinput/dinput.factor
index ce87c12237..20815859ab 100755
--- a/extra/game-input/dinput/dinput.factor
+++ b/extra/game-input/dinput/dinput.factor
@@ -22,7 +22,7 @@ SYMBOLS: +dinput+ +keyboard-device+ +keyboard-state+
     +dinput+ set-global ;
 
 : delete-dinput ( -- )
-    +dinput+ global [ com-release f ] change-at ;
+    +dinput+ [ com-release f ] change-global ;
 
 : device-for-guid ( guid -- device )
     +dinput+ get swap f <void*>
@@ -172,10 +172,8 @@ TUPLE: window-rect < rect window-loc ;
     [ +device-change-window+ set-global ] bi ;
 
 : close-device-change-window ( -- )
-    +device-change-handle+ global
-    [ UnregisterDeviceNotification drop f ] change-at
-    +device-change-window+ global
-    [ DestroyWindow win32-error=0/f f ] change-at ;
+    +device-change-handle+ [ UnregisterDeviceNotification drop f ] change-global
+    +device-change-window+ [ DestroyWindow win32-error=0/f f ] change-global ;
 
 : add-wm-devicechange ( -- )
     [ 4dup handle-wm-devicechange DefWindowProc ]
@@ -185,14 +183,11 @@ TUPLE: window-rect < rect window-loc ;
     WM_DEVICECHANGE wm-handlers get-global delete-at ;
 
 : release-controllers ( -- )
-    +controller-devices+ global [
-        [ drop com-release ] assoc-each f
-    ] change-at
+    +controller-devices+ [ [ drop com-release ] assoc-each f ] change-global
     f +controller-guids+ set-global ;
 
 : release-keyboard ( -- )
-    +keyboard-device+ global
-    [ com-release f ] change-at
+    +keyboard-device+ [ com-release f ] change-global
     f +keyboard-state+ set-global ;
 
 M: dinput-game-input-backend (open-game-input)
diff --git a/extra/game-input/iokit/iokit.factor b/extra/game-input/iokit/iokit.factor
index 254ed61ab0..2ded263899 100755
--- a/extra/game-input/iokit/iokit.factor
+++ b/extra/game-input/iokit/iokit.factor
@@ -239,7 +239,7 @@ M: iokit-game-input-backend (reset-game-input)
 
 M: iokit-game-input-backend (close-game-input)
     +hid-manager+ get-global [
-        +hid-manager+ global [ 
+        +hid-manager+ [ 
             [
                 CFRunLoopGetMain CFRunLoopDefaultMode
                 IOHIDManagerUnscheduleFromRunLoop
@@ -247,7 +247,7 @@ M: iokit-game-input-backend (close-game-input)
             [ 0 IOHIDManagerClose drop ]
             [ CFRelease ] tri
             f
-        ] change-at
+        ] change-global
         f +keyboard-state+ set-global
         f +controller-states+ set-global
     ] when ;
diff --git a/extra/wordtimer/wordtimer.factor b/extra/wordtimer/wordtimer.factor
index 11a1e325c3..e02701b690 100644
--- a/extra/wordtimer/wordtimer.factor
+++ b/extra/wordtimer/wordtimer.factor
@@ -56,9 +56,6 @@ SYMBOL: *calling*
 : subtract-overhead ( {oldtime,n} overhead -- {newtime,n} )
   [ first2 ] dip
   swap [ * - ] keep 2array ;
-  
-: change-global ( variable quot -- )
-  global swap change-at ; inline
 
 : (correct-for-timing-overhead) ( timingshash -- timingshash )
   time-dummy-word [ subtract-overhead ] curry assoc-map ;