From 15a8ff071cb9d5708fd48a1177cb2194d271cdde Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sun, 31 Aug 2008 11:00:26 -0700
Subject: [PATCH 01/55] Load game-input backend at compile time

---
 extra/game-input/backend/backend.factor       | 6 ++++--
 extra/game-input/backend/dinput/dinput.factor | 3 ++-
 extra/game-input/backend/iokit/iokit.factor   | 5 +++--
 extra/game-input/game-input.factor            | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/extra/game-input/backend/backend.factor b/extra/game-input/backend/backend.factor
index cfba0a52f5..df61179da7 100644
--- a/extra/game-input/backend/backend.factor
+++ b/extra/game-input/backend/backend.factor
@@ -2,12 +2,14 @@ USING: eval multiline system combinators ;
 IN: game-input.backend
 
 STRING: set-backend-for-macosx
-USING: namespaces game-input.backend.iokit game-input ;
+USING: namespaces parser game-input.backend.iokit ;
+<< "game-input" (use+) >>
 iokit-game-input-backend game-input-backend set-global
 ;
 
 STRING: set-backend-for-windows
-USING: namespaces game-input.backend.dinput game-input ;
+USING: namespaces parser game-input.backend.dinput ;
+<< "game-input" (use+) >>
 dinput-game-input-backend game-input-backend set-global
 ;
 
diff --git a/extra/game-input/backend/dinput/dinput.factor b/extra/game-input/backend/dinput/dinput.factor
index 73c9f511a1..116faf60cd 100755
--- a/extra/game-input/backend/dinput/dinput.factor
+++ b/extra/game-input/backend/dinput/dinput.factor
@@ -1,10 +1,11 @@
-USING: windows.dinput windows.dinput.constants game-input
+USING: windows.dinput windows.dinput.constants parser
 symbols alien.c-types windows.ole32 namespaces assocs kernel
 arrays vectors windows.kernel32 windows.com windows.dinput
 shuffle windows.user32 windows.messages sequences combinators
 math.geometry.rect ui.windows accessors math windows alien
 alien.strings io.encodings.utf16 continuations byte-arrays
 locals game-input.backend.dinput.keys-array ;
+<< "game-input" (use+) >>
 IN: game-input.backend.dinput
 
 SINGLETON: dinput-game-input-backend
diff --git a/extra/game-input/backend/iokit/iokit.factor b/extra/game-input/backend/iokit/iokit.factor
index dcdfa6d192..4a7d251425 100755
--- a/extra/game-input/backend/iokit/iokit.factor
+++ b/extra/game-input/backend/iokit/iokit.factor
@@ -1,9 +1,10 @@
 USING: cocoa cocoa.plists core-foundation iokit iokit.hid
 kernel cocoa.enumeration destructors math.parser cocoa.application 
-sequences locals combinators.short-circuit game-input threads
+sequences locals combinators.short-circuit threads
 symbols namespaces assocs vectors arrays combinators
 core-foundation.run-loop accessors sequences.private
-alien.c-types math ;
+alien.c-types math parser ;
+<< "game-input" (use+) >>
 IN: game-input.backend.iokit
 
 SINGLETON: iokit-game-input-backend
diff --git a/extra/game-input/game-input.factor b/extra/game-input/game-input.factor
index 208c8476fc..18ec04df1f 100755
--- a/extra/game-input/game-input.factor
+++ b/extra/game-input/game-input.factor
@@ -28,7 +28,6 @@ M: f (reset-game-input) ;
 PRIVATE>
 
 : open-game-input ( -- )
-    load-game-input-backend
     game-input-opened? [
         (open-game-input) 
         game-input-opened on
@@ -76,3 +75,6 @@ M: keyboard-state clone
     call-next-method dup keys>> clone >>keys ;
 
 HOOK: read-keyboard game-input-backend ( -- keyboard-state )
+
+load-game-input-backend
+

From 2a8c9bb56f0d879d533455415d5a7ebe6f997674 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 1 Sep 2008 08:12:08 -0700
Subject: [PATCH 02/55] deploy.factor for joystick-demo

---
 extra/joystick-demo/deploy.factor | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 extra/joystick-demo/deploy.factor

diff --git a/extra/joystick-demo/deploy.factor b/extra/joystick-demo/deploy.factor
new file mode 100644
index 0000000000..8843ae66f3
--- /dev/null
+++ b/extra/joystick-demo/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-name "joystick-demo" }
+    { deploy-io 2 }
+    { deploy-word-defs? f }
+    { deploy-c-types? t }
+    { deploy-random? t }
+    { deploy-word-props? f }
+    { deploy-reflection 1 }
+    { deploy-threads? t }
+    { deploy-math? t }
+    { "stop-after-last-window?" t }
+    { deploy-ui? t }
+    { deploy-compiler? t }
+}

From 9dbe18e07d77ca702309cf2c90f5760a1ef57aff Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 1 Sep 2008 08:53:32 -0700
Subject: [PATCH 03/55] remove obsolete reference to "construct" in
 bunny.outlined. clean up >r imbalance in opengl.capabilities

---
 basis/opengl/capabilities/capabilities.factor               | 6 +++---
 {unmaintained => extra}/bunny/authors.txt                   | 0
 {unmaintained => extra}/bunny/bun_zipper.ply                | 0
 {unmaintained => extra}/bunny/bunny.factor                  | 0
 {unmaintained => extra}/bunny/cel-shaded/cel-shaded.factor  | 0
 {unmaintained => extra}/bunny/deploy.factor                 | 0
 .../bunny/fixed-pipeline/fixed-pipeline.factor              | 0
 {unmaintained => extra}/bunny/model/model.factor            | 0
 {unmaintained => extra}/bunny/outlined/outlined.factor      | 6 +-----
 {unmaintained => extra}/bunny/summary.txt                   | 0
 {unmaintained => extra}/bunny/tags.txt                      | 0
 11 files changed, 4 insertions(+), 8 deletions(-)
 rename {unmaintained => extra}/bunny/authors.txt (100%)
 rename {unmaintained => extra}/bunny/bun_zipper.ply (100%)
 rename {unmaintained => extra}/bunny/bunny.factor (100%)
 rename {unmaintained => extra}/bunny/cel-shaded/cel-shaded.factor (100%)
 rename {unmaintained => extra}/bunny/deploy.factor (100%)
 rename {unmaintained => extra}/bunny/fixed-pipeline/fixed-pipeline.factor (100%)
 rename {unmaintained => extra}/bunny/model/model.factor (100%)
 rename {unmaintained => extra}/bunny/outlined/outlined.factor (97%)
 rename {unmaintained => extra}/bunny/summary.txt (100%)
 rename {unmaintained => extra}/bunny/tags.txt (100%)

diff --git a/basis/opengl/capabilities/capabilities.factor b/basis/opengl/capabilities/capabilities.factor
index d658235cf6..806935d5c9 100755
--- a/basis/opengl/capabilities/capabilities.factor
+++ b/basis/opengl/capabilities/capabilities.factor
@@ -5,9 +5,9 @@ continuations math.parser math arrays sets math.order ;
 IN: opengl.capabilities
 
 : (require-gl) ( thing require-quot make-error-quot -- )
-    >r dupd call
-    [ r> 2drop ]
-    [ r> " " make throw ]
+    -rot dupd call
+    [ 2drop ]
+    [ swap " " make throw ]
     if ; inline
 
 : gl-extensions ( -- seq )
diff --git a/unmaintained/bunny/authors.txt b/extra/bunny/authors.txt
similarity index 100%
rename from unmaintained/bunny/authors.txt
rename to extra/bunny/authors.txt
diff --git a/unmaintained/bunny/bun_zipper.ply b/extra/bunny/bun_zipper.ply
similarity index 100%
rename from unmaintained/bunny/bun_zipper.ply
rename to extra/bunny/bun_zipper.ply
diff --git a/unmaintained/bunny/bunny.factor b/extra/bunny/bunny.factor
similarity index 100%
rename from unmaintained/bunny/bunny.factor
rename to extra/bunny/bunny.factor
diff --git a/unmaintained/bunny/cel-shaded/cel-shaded.factor b/extra/bunny/cel-shaded/cel-shaded.factor
similarity index 100%
rename from unmaintained/bunny/cel-shaded/cel-shaded.factor
rename to extra/bunny/cel-shaded/cel-shaded.factor
diff --git a/unmaintained/bunny/deploy.factor b/extra/bunny/deploy.factor
similarity index 100%
rename from unmaintained/bunny/deploy.factor
rename to extra/bunny/deploy.factor
diff --git a/unmaintained/bunny/fixed-pipeline/fixed-pipeline.factor b/extra/bunny/fixed-pipeline/fixed-pipeline.factor
similarity index 100%
rename from unmaintained/bunny/fixed-pipeline/fixed-pipeline.factor
rename to extra/bunny/fixed-pipeline/fixed-pipeline.factor
diff --git a/unmaintained/bunny/model/model.factor b/extra/bunny/model/model.factor
similarity index 100%
rename from unmaintained/bunny/model/model.factor
rename to extra/bunny/model/model.factor
diff --git a/unmaintained/bunny/outlined/outlined.factor b/extra/bunny/outlined/outlined.factor
similarity index 97%
rename from unmaintained/bunny/outlined/outlined.factor
rename to extra/bunny/outlined/outlined.factor
index bf757c4fb3..cd67b8b33e 100755
--- a/unmaintained/bunny/outlined/outlined.factor
+++ b/extra/bunny/outlined/outlined.factor
@@ -139,11 +139,7 @@ TUPLE: bunny-outlined
 
 : <bunny-outlined> ( gadget -- draw )
     outlining-supported? [
-        pass1-program pass2-program {
-            (>>gadget)
-            (>>pass1-program)
-            (>>pass2-program)
-        } bunny-outlined construct
+        pass1-program pass2-program f f f f f bunny-outlined boa
     ] [ drop f ] if ;
 
 : (framebuffer-texture) ( dim iformat xformat -- texture )
diff --git a/unmaintained/bunny/summary.txt b/extra/bunny/summary.txt
similarity index 100%
rename from unmaintained/bunny/summary.txt
rename to extra/bunny/summary.txt
diff --git a/unmaintained/bunny/tags.txt b/extra/bunny/tags.txt
similarity index 100%
rename from unmaintained/bunny/tags.txt
rename to extra/bunny/tags.txt

From 56ed8b8637ecab21f50e03b5246807842ce173c2 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 2 Sep 2008 02:41:52 -0500
Subject: [PATCH 04/55] Fix test

---
 basis/cocoa/cocoa-tests.factor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/basis/cocoa/cocoa-tests.factor b/basis/cocoa/cocoa-tests.factor
index 631695340e..e1d6672872 100644
--- a/basis/cocoa/cocoa-tests.factor
+++ b/basis/cocoa/cocoa-tests.factor
@@ -41,7 +41,7 @@ Bar [
     -> release
 ] compile-call
 
-[ 1 ] [ "x" get NSRect-x ] unit-test
-[ 2 ] [ "x" get NSRect-y ] unit-test
-[ 101 ] [ "x" get NSRect-w ] unit-test
-[ 102 ] [ "x" get NSRect-h ] unit-test
+[ 1.0 ] [ "x" get NSRect-x ] unit-test
+[ 2.0 ] [ "x" get NSRect-y ] unit-test
+[ 101.0 ] [ "x" get NSRect-w ] unit-test
+[ 102.0 ] [ "x" get NSRect-h ] unit-test

From 04fde421251f2ddf665ccad417ce6154ae5241fa Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 02:48:35 -0500
Subject: [PATCH 05/55] fix two unit tests

---
 basis/calendar/calendar-tests.factor      | 4 ++--
 basis/calendar/format/format-tests.factor | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/basis/calendar/calendar-tests.factor b/basis/calendar/calendar-tests.factor
index 7d9716ae1a..995bd23c09 100755
--- a/basis/calendar/calendar-tests.factor
+++ b/basis/calendar/calendar-tests.factor
@@ -33,8 +33,8 @@ IN: calendar.tests
 
 [ t ] [ 2006 10 10 0 0 0 instant <timestamp> 10 minutes time+
         2006 10 10 0 10 0 instant <timestamp> = ] unit-test
-[ t ] [ 2006 10 10 0 0 0 instant <timestamp> 10.5 minutes time+
-        2006 10 10 0 10 30 instant <timestamp> = ] unit-test
+[ +eq+ ] [ 2006 10 10 0 0 0 instant <timestamp> 10.5 minutes time+
+        2006 10 10 0 10 30 instant <timestamp> <=> ] unit-test
 [ t ] [ 2006 10 10 0 0 0 instant <timestamp> 3/4 minutes time+
         2006 10 10 0 0 45 instant <timestamp> = ] unit-test
 [ t ] [ 2006 10 10 0 0 0 instant <timestamp> -3/4 minutes time+
diff --git a/basis/calendar/format/format-tests.factor b/basis/calendar/format/format-tests.factor
index 978a4dca7f..c433a118c2 100755
--- a/basis/calendar/format/format-tests.factor
+++ b/basis/calendar/format/format-tests.factor
@@ -58,7 +58,7 @@ IN: calendar.format.tests
         26
         0
         37
-        42.12345
+        42+2469/20000
         T{ duration f 0 0 0 -5 0 0 }
     }
 ] [ "2008-05-26T00:37:42.12345-05:00" rfc3339>timestamp ] unit-test

From c2c23fd6ea572c9c22e77d1d12f125065f029b40 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 03:00:25 -0500
Subject: [PATCH 06/55] fix accessors

---
 basis/ui/x11/x11.factor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/basis/ui/x11/x11.factor b/basis/ui/x11/x11.factor
index b4e6a5889e..be9ee660df 100755
--- a/basis/ui/x11/x11.factor
+++ b/basis/ui/x11/x11.factor
@@ -149,7 +149,7 @@ M: world selection-notify-event
     >r 8 PropModeReplace r>
     [
         XSelectionRequestEvent-selection
-        clipboard-for-atom x-clipboard-contents
+        clipboard-for-atom contents>>
     ] keep encode-clipboard dup length XChangeProperty drop ;
 
 M: world selection-request-event
@@ -188,16 +188,16 @@ M: x11-ui-backend do-events
     [ [ 2dup handle-event ] assert-depth ] when 2drop ;
 
 : x-clipboard@ ( gadget clipboard -- prop win )
-    x-clipboard-atom swap
+    atom>> swap
     find-world handle>> window>> ;
 
 M: x-clipboard copy-clipboard
     [ x-clipboard@ own-selection ] keep
-    set-x-clipboard-contents ;
+    (>>clipboard-contents) ;
 
 M: x-clipboard paste-clipboard
     >r find-world handle>> window>>
-    r> x-clipboard-atom convert-selection ;
+    r> atom>> convert-selection ;
 
 : init-clipboard ( -- )
     XA_PRIMARY <x-clipboard> selection set-global

From afbe5df0bd3cfcc4e27b4b30e28e3d1ef36da00a Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 03:01:19 -0500
Subject: [PATCH 07/55] new accessors

---
 extra/xmode/marker/marker.factor | 14 ++++++--------
 extra/xmode/rules/rules.factor   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/extra/xmode/marker/marker.factor b/extra/xmode/marker/marker.factor
index 707449a23f..f11ac6b5b2 100755
--- a/extra/xmode/marker/marker.factor
+++ b/extra/xmode/marker/marker.factor
@@ -63,10 +63,8 @@ M: f text-matches?
 
 M: string-matcher text-matches?
     [
-        dup string-matcher-string
-        swap string-matcher-ignore-case?
-        string-head?
-    ] keep string-matcher-string length and ;
+        [ string>> ] [ ignore-case?>> ] bi string-head?
+    ] keep string>> length and ;
 
 M: regexp text-matches?
     >r >string r> match-head ;
@@ -177,17 +175,17 @@ M: mark-following-rule handle-rule-start
     ?end-rule
     mark-token add-remaining-token
     tuck rule-match-token* next-token,
-    f context get set-line-context-end
-    context get set-line-context-in-rule ;
+    f context get (>>end)
+    context get (>>in-rule) ;
 
 M: mark-following-rule handle-rule-end
     nip rule-match-token* prev-token,
-    f context get set-line-context-in-rule ;
+    f context get (>>in-rule) ;
 
 M: mark-previous-rule handle-rule-start
     ?end-rule
     mark-token
-    dup rule-body-token prev-token,
+    dup body-token>> prev-token,
     rule-match-token* next-token, ;
 
 : do-escaped ( -- )
diff --git a/extra/xmode/rules/rules.factor b/extra/xmode/rules/rules.factor
index 4ab45d7539..e3c0c65db0 100755
--- a/extra/xmode/rules/rules.factor
+++ b/extra/xmode/rules/rules.factor
@@ -97,7 +97,7 @@ GENERIC: text-hash-char ( text -- ch )
 
 M: f text-hash-char ;
 
-M: string-matcher text-hash-char string-matcher-string first ;
+M: string-matcher text-hash-char string>> first ;
 
 M: regexp text-hash-char drop f ;
 

From 299719ed5e4f3e16f682742d1946412168198702 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 03:01:27 -0500
Subject: [PATCH 08/55] new accessors

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

diff --git a/extra/regexp/regexp.factor b/extra/regexp/regexp.factor
index 4920d481b1..cd2d0790ab 100755
--- a/extra/regexp/regexp.factor
+++ b/extra/regexp/regexp.factor
@@ -323,8 +323,8 @@ TUPLE: regexp source parser ignore-case? ;
 
 M: regexp pprint*
     [
-        dup regexp-source
+        dup source>>
         dup find-regexp-syntax swap % swap % %
-        dup regexp-ignore-case? [ "i" % ] when
+        dup ignore-case?>> [ "i" % ] when
     ] "" make
     swap present-text ;

From f98b424d1891fe600fc35104e0ef18f4bfc0a1ae Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 03:04:14 -0500
Subject: [PATCH 09/55] new accessors

---
 extra/furnace/furnace.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/furnace/furnace.factor b/extra/furnace/furnace.factor
index 11250ba644..46aba06c9c 100644
--- a/extra/furnace/furnace.factor
+++ b/extra/furnace/furnace.factor
@@ -203,6 +203,6 @@ CHLOE: button
     {
         [ [ attrs>> chloe-attrs-only ] dip add-tag-attrs ]
         [ [ attrs>> non-chloe-attrs-only ] dip "button" tag-named add-tag-attrs ]
-        [ [ children>string 1array ] dip "button" tag-named set-tag-children ]
+        [ [ children>string 1array ] dip "button" tag-named (>>children) ]
         [ nip ]
     } 2cleave process-chloe-tag ;

From 27ab6d699c2b7c9f9cfc4314186bb40d4c305b8a Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 03:04:34 -0500
Subject: [PATCH 10/55] new accessors

---
 .../parser-combinators.factor                 | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/extra/parser-combinators/parser-combinators.factor b/extra/parser-combinators/parser-combinators.factor
index a05c140b86..da723bae9d 100755
--- a/extra/parser-combinators/parser-combinators.factor
+++ b/extra/parser-combinators/parser-combinators.factor
@@ -59,7 +59,7 @@ C: <token-parser> token-parser
 : case-insensitive-token ( string -- parser ) t <token-parser> ;
 
 M: token-parser parse ( input parser -- list )
-    dup token-parser-string swap token-parser-ignore-case?
+    [ string>> ] [ ignore-case?>> ] bi
     >r tuck r> ?string-head
     [ <parse-results> ] [ 2drop nil ] if ;
 
@@ -76,7 +76,7 @@ M: satisfy-parser parse ( input parser -- list )
     over empty? [
         2drop nil
     ] [
-        satisfy-parser-quot >r unclip-slice dup r> call
+        quot>> >r unclip-slice dup r> call
         [ swap <parse-results> ] [ 2drop nil ] if
     ] if ;
 
@@ -101,7 +101,7 @@ C: succeed succeed-parser ( result -- parser )
 M: succeed-parser parse ( input parser -- list )
     #! A parser that always returns 'result' as a
     #! successful parse with no input consumed.
-    succeed-parser-result swap <parse-results> ;
+    result>> swap <parse-results> ;
 
 TUPLE: fail-parser ;
 
@@ -118,7 +118,7 @@ TUPLE: ensure-parser test ;
     ensure-parser boa ;
 
 M: ensure-parser parse ( input parser -- list )
-    2dup ensure-parser-test parse nil?
+    2dup test>> parse nil?
     [ 2drop nil ] [ drop t swap <parse-results> ] if ;
 
 TUPLE: ensure-not-parser test ;
@@ -127,7 +127,7 @@ TUPLE: ensure-not-parser test ;
     ensure-not-parser boa ;
 
 M: ensure-not-parser parse ( input parser -- list )
-    2dup ensure-not-parser-test parse nil?
+    2dup test>> parse nil?
     [ drop t swap <parse-results> ] [ 2drop nil ] if ;
 
 TUPLE: and-parser parsers ;
@@ -157,7 +157,7 @@ M: and-parser parse ( input parser -- list )
     #! two parsers. First parser1 is applied to the
     #! input then parser2 is applied to the rest of
     #! the input strings from the first parser.
-    and-parser-parsers unclip swapd parse
+    parsers>> unclip swapd parse
     [ [ and-parser-parse ] reduce ] 2curry promise ;
 
 TUPLE: or-parser parsers ;
@@ -172,7 +172,7 @@ M: or-parser parse ( input parser1 -- list )
     #! Return the combined list resulting from the parses
     #! of parser1 and parser2 being applied to the same
     #! input. This implements the choice parsing operator.
-    or-parser-parsers 0 swap seq>list
+    parsers>> 0 swap seq>list
     [ parse ] lazy-map-with lconcat ;
 
 : left-trim-slice ( string -- string )
@@ -191,7 +191,7 @@ C: sp sp-parser ( p1 -- parser )
 M: sp-parser parse ( input parser -- list )
     #! Skip all leading whitespace from the input then call
     #! the parser on the remaining input.
-    >r left-trim-slice r> sp-parser-p1 parse ;
+    >r left-trim-slice r> p1>> parse ;
 
 TUPLE: just-parser p1 ;
 
@@ -202,7 +202,7 @@ M: just-parser parse ( input parser -- result )
     #! from the results anything where the remaining
     #! input to be parsed is not empty. So ensures a
     #! fully parsed input string.
-    just-parser-p1 parse [ parse-result-unparsed empty? ] lfilter ;
+    p1>> parse [ unparsed>> empty? ] lfilter ;
 
 TUPLE: apply-parser p1 quot ;
 
@@ -214,10 +214,10 @@ M: apply-parser parse ( input parser -- result )
     #! The result of that quotation then becomes the new parse result.
     #! This allows modification of parse tree results (like
     #! converting strings to integers, etc).
-    [ apply-parser-p1 ] keep apply-parser-quot
+    [ p1>> ] [ quot>> ] bi
     -rot parse [
-        [ parse-result-parsed swap call ] keep
-        parse-result-unparsed <parse-result>
+        [ parsed>> swap call ] keep
+        unparsed>> <parse-result>
     ] lazy-map-with ;
 
 TUPLE: some-parser p1 ;
@@ -229,7 +229,7 @@ M: some-parser parse ( input parser -- result )
     #! the parse is complete (the remaining input is empty),
     #! picks the first solution and only returns the parse
     #! tree since the remaining input is empty.
-    some-parser-p1 just parse-1 ;
+    p1>> just parse-1 ;
 
 : <& ( parser1 parser2 -- parser )
     #! Same as <&> except discard the results of the second parser.
@@ -272,7 +272,7 @@ LAZY: only-first ( parser -- parser )
 M: only-first-parser parse ( input parser -- list )
     #! Transform a parser into a parser that only yields
     #! the first possibility.
-    only-first-parser-p1 parse 1 swap ltake ;
+    p1>> parse 1 swap ltake ;
 
 LAZY: <!*> ( parser -- parser )
     #! Like <*> but only return one possible result

From 1df3257a6b3fdb4c42c06be3eb37f855dafbd2b1 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 09:00:37 -0500
Subject: [PATCH 11/55] fix accessor

---
 basis/ui/x11/x11.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/ui/x11/x11.factor b/basis/ui/x11/x11.factor
index be9ee660df..854a0b0c62 100755
--- a/basis/ui/x11/x11.factor
+++ b/basis/ui/x11/x11.factor
@@ -193,7 +193,7 @@ M: x11-ui-backend do-events
 
 M: x-clipboard copy-clipboard
     [ x-clipboard@ own-selection ] keep
-    (>>clipboard-contents) ;
+    (>>contents) ;
 
 M: x-clipboard paste-clipboard
     >r find-world handle>> window>>

From 379bf455595c2af7edf87a779a7069bd8d47a9d3 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:06:11 -0500
Subject: [PATCH 12/55] fix private word

---
 basis/calendar/calendar.factor | 2 --
 1 file changed, 2 deletions(-)

diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor
index cb0112a3a0..c2c386a790 100755
--- a/basis/calendar/calendar.factor
+++ b/basis/calendar/calendar.factor
@@ -278,12 +278,10 @@ GENERIC: time- ( time1 time2 -- time3 )
 M: timestamp <=> ( ts1 ts2 -- n )
     [ >gmt tuple-slots ] compare ;
 
-<PRIVATE
 : (time-) ( timestamp timestamp -- n )
     [ >gmt ] bi@
     [ [ >date< julian-day-number ] bi@ - 86400 * ] 2keep
     [ >time< >r >r 3600 * r> 60 * r> + + ] bi@ - + ;
-PRIVATE>
 
 M: timestamp time-
     #! Exact calendar-time difference

From 7b35f8ba48efc91d7682aee4c8895741c466ba21 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:14:54 -0500
Subject: [PATCH 13/55] new accessors

---
 extra/nehe/4/4.factor | 2 +-
 extra/nehe/5/5.factor | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/nehe/4/4.factor b/extra/nehe/4/4.factor
index 429e6d9d9c..b57269700b 100644
--- a/extra/nehe/4/4.factor
+++ b/extra/nehe/4/4.factor
@@ -31,7 +31,7 @@ M: nehe4-gadget draw-gadget* ( gadget -- )
   GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
   glLoadIdentity
   -1.5 0.0 -6.0 glTranslatef
-  dup nehe4-gadget-rtri 0.0 1.0 0.0 glRotatef
+  dup rtri>> 0.0 1.0 0.0 glRotatef
 
   GL_TRIANGLES [
     1.0 0.0 0.0 glColor3f
diff --git a/extra/nehe/5/5.factor b/extra/nehe/5/5.factor
index ebdfcd5367..461a90271e 100755
--- a/extra/nehe/5/5.factor
+++ b/extra/nehe/5/5.factor
@@ -30,7 +30,7 @@ M: nehe5-gadget draw-gadget* ( gadget -- )
   GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
   glLoadIdentity
   -1.5 0.0 -6.0 glTranslatef
-  dup nehe5-gadget-rtri 0.0 1.0 0.0 glRotatef
+  dup rtri>> 0.0 1.0 0.0 glRotatef
 
   GL_TRIANGLES [
     1.0 0.0 0.0 glColor3f

From bb5980a561795eb675fc5feb698f3324d2c4397b Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:15:08 -0500
Subject: [PATCH 14/55] new accessors

---
 basis/xml-rpc/xml-rpc.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/xml-rpc/xml-rpc.factor b/basis/xml-rpc/xml-rpc.factor
index ade9b34d93..465c2fd1e9 100755
--- a/basis/xml-rpc/xml-rpc.factor
+++ b/basis/xml-rpc/xml-rpc.factor
@@ -48,7 +48,7 @@ TUPLE: base64 string ;
 C: <base64> base64
 
 M: base64 item>xml
-    base64-string >base64 "base64" build-tag ;
+    string>> >base64 "base64" build-tag ;
 
 : params ( seq -- xml )
     [ item>xml "value" build-tag "param" build-tag ] map

From eb0abca39b025572649f7499adfafaa1e7c91667 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:35:14 -0500
Subject: [PATCH 15/55] fix nehe

---
 extra/nehe/4/4.factor | 2 +-
 extra/nehe/5/5.factor | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/nehe/4/4.factor b/extra/nehe/4/4.factor
index b57269700b..0bbd4d593f 100644
--- a/extra/nehe/4/4.factor
+++ b/extra/nehe/4/4.factor
@@ -45,7 +45,7 @@ M: nehe4-gadget draw-gadget* ( gadget -- )
   glLoadIdentity
 
   1.5 0.0 -6.0 glTranslatef
-  dup nehe4-gadget-rquad 1.0 0.0 0.0 glRotatef
+  dup rquad>> 1.0 0.0 0.0 glRotatef
   0.5 0.5 1.0 glColor3f
   GL_QUADS [
     -1.0 1.0 0.0 glVertex3f
diff --git a/extra/nehe/5/5.factor b/extra/nehe/5/5.factor
index 461a90271e..1a416c9d95 100755
--- a/extra/nehe/5/5.factor
+++ b/extra/nehe/5/5.factor
@@ -65,7 +65,7 @@ M: nehe5-gadget draw-gadget* ( gadget -- )
   glLoadIdentity
 
   1.5 0.0 -7.0 glTranslatef
-  dup nehe5-gadget-rquad 1.0 0.0 0.0 glRotatef
+  dup rquad>> 1.0 0.0 0.0 glRotatef
   GL_QUADS [
     0.0 1.0 0.0 glColor3f
     1.0 1.0 -1.0 glVertex3f

From c26bf504ca8e7ff8b3f00c7b545991faea60f0e0 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:35:24 -0500
Subject: [PATCH 16/55] new accessors

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

diff --git a/extra/processing/gadget/gadget.factor b/extra/processing/gadget/gadget.factor
index c1a4c77703..0b3bb6dc01 100644
--- a/extra/processing/gadget/gadget.factor
+++ b/extra/processing/gadget/gadget.factor
@@ -32,7 +32,7 @@ M: processing-gadget handle-gesture ( gesture gadget -- ? )
      {
        [ dup key-down? ]
        [
-         key-down-sym key-value set
+         sym>> key-value set
          key-pressed-value on
          key-down>> dup [ call ] [ drop ] if
          t
@@ -49,7 +49,7 @@ M: processing-gadget handle-gesture ( gesture gadget -- ? )
      {
        [ dup button-down? ]
        [
-         button-down-# button-value set
+         #>> button-value set
          mouse-pressed-value on
          button-down>> dup [ call ] [ drop ] if
          t
@@ -66,4 +66,4 @@ M: processing-gadget handle-gesture ( gesture gadget -- ? )
      }
      { [ t ] [ 2drop t ] }
    }
-   cond ;
\ No newline at end of file
+   cond ;

From 6607d8c47e1d6a66b1c4e043aa51383a72185481 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:35:34 -0500
Subject: [PATCH 17/55] new accessors

---
 extra/sequences/repeating/repeating.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/sequences/repeating/repeating.factor b/extra/sequences/repeating/repeating.factor
index 92b0925907..77fddd5510 100644
--- a/extra/sequences/repeating/repeating.factor
+++ b/extra/sequences/repeating/repeating.factor
@@ -11,7 +11,7 @@ TUPLE: repeating circular len ;
 : repeated ( seq length -- new-seq )
     dupd <repeating> swap like ;
 
-M: repeating length repeating-len ;
+M: repeating length len>> ;
 M: repeating set-length (>>len) ;
 
 M: repeating virtual@ ( n seq -- n' seq' ) circular>> ;

From b210f43768d52a7e8863d8d4f873834d5d7e5b32 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:35:42 -0500
Subject: [PATCH 18/55] new accessors

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

diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index 05aa6779f5..a3031a7557 100755
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -61,7 +61,7 @@ IN: slides
 
 : page-theme ( gadget -- )
     T{ gradient f { T{ rgba f 0.8 0.8 1.0 1.0 } T{ rgba f 0.8 1.0 1.0 1.0 } } }
-    swap set-gadget-interior ;
+    >>interior drop ;
 
 : <page> ( list -- gadget )
     [
@@ -82,8 +82,8 @@ TUPLE: slides < book ;
     [ <page> ] map 0 <model> slides new-book ;
 
 : change-page ( book n -- )
-    over control-value + over gadget-children length rem
-    swap gadget-model set-model ;
+    over control-value + over children>> length rem
+    swap model>> set-model ;
 
 : next-page ( book -- ) 1 change-page ;
 

From d45b7afc3c43d01c3f7d64b740780f5a86f7ca4e Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:35:50 -0500
Subject: [PATCH 19/55] find-world can return f, handle this case, new
 accessors

---
 basis/ui/gadgets/lib/lib.factor | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/basis/ui/gadgets/lib/lib.factor b/basis/ui/gadgets/lib/lib.factor
index 12385f0808..866369b0af 100644
--- a/basis/ui/gadgets/lib/lib.factor
+++ b/basis/ui/gadgets/lib/lib.factor
@@ -1,6 +1,8 @@
 
-USING: ui.backend ui.gadgets.worlds ;
+USING: accessors kernel ui.backend ui.gadgets.worlds ;
 
 IN: ui.gadgets.lib
 
-: find-gl-context ( gadget -- ) find-world world-handle select-gl-context ;
+ERROR: no-world-found ;
+: find-gl-context ( gadget -- )
+    find-world dup [ handle>> select-gl-context ] [ no-world-found ] if ;

From 24736c038c5a27cba13385edca99771fe2b737a3 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:36:15 -0500
Subject: [PATCH 20/55] new accessors

---
 basis/xml-rpc/xml-rpc.factor | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/basis/xml-rpc/xml-rpc.factor b/basis/xml-rpc/xml-rpc.factor
index 465c2fd1e9..9472f5e09d 100755
--- a/basis/xml-rpc/xml-rpc.factor
+++ b/basis/xml-rpc/xml-rpc.factor
@@ -80,11 +80,11 @@ C: <rpc-fault> rpc-fault
 
 GENERIC: send-rpc ( rpc -- xml )
 M: rpc-method send-rpc
-    [ rpc-method-name ] keep rpc-method-params method-call ;
+    [ name>> ] [ params>> ] bi method-call ;
 M: rpc-response send-rpc
-    rpc-response-params return-params ;
+    params>> return-params ;
 M: rpc-fault send-rpc
-    [ rpc-fault-code ] keep rpc-fault-string return-fault ;
+    [ code>> ] [ string>> ] bi return-fault ;
 
 ! * Recieving RPC requests
 ! this needs to have much better error checking
@@ -96,8 +96,8 @@ TUPLE: server-error tag message ;
 
 M: server-error error.
     "Error in XML supplied to server" print
-    "Description: " write dup server-error-message print
-    "Tag: " write server-error-tag xml>string print ;
+    "Description: " write dup message>> print
+    "Tag: " write tag>> xml>string print ;
 
 PROCESS: xml>item ( tag -- object )
 
@@ -139,8 +139,8 @@ TAG: array xml>item
     first-child-tag params>array ;
 
 : parse-method ( xml -- string array )
-    children-tags dup first children>string
-    swap second params>array ;
+    children-tags first2
+    [ children>string ] [ params>array ] bi* ;
 
 : parse-fault ( xml -- fault-code fault-string )
     first-child-tag first-child-tag first-child-tag

From 9ad4b508551b06706d8e70a173dd2864c5d2f508 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:36:35 -0500
Subject: [PATCH 21/55] new accessors

---
 extra/asn1/asn1.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/asn1/asn1.factor b/extra/asn1/asn1.factor
index 3c4aea028b..df5d11be75 100644
--- a/extra/asn1/asn1.factor
+++ b/extra/asn1/asn1.factor
@@ -184,7 +184,7 @@ TUPLE: tag value ;
     tagnum get (>>value) ;
 
 M: string >ber ( str -- byte-array )
-    tagnum get tag-value 1array "C" pack-native swap dup
+    tagnum get value>> 1array "C" pack-native swap dup
     length >ber-length-encoding swapd append swap
     >byte-array append ;
 

From 4425c471ca68e76189f71466ad0d697390a1c5d0 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:36:43 -0500
Subject: [PATCH 22/55] new accessors

---
 extra/boids/ui/ui.factor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extra/boids/ui/ui.factor b/extra/boids/ui/ui.factor
index cd73c67a71..ddb25ccd8d 100755
--- a/extra/boids/ui/ui.factor
+++ b/extra/boids/ui/ui.factor
@@ -121,25 +121,25 @@ VARS: population-label cohesion-label alignment-label separation-label ;
     
       "1 - Randomize" [ drop randomize ] button* add-gadget
     
-      <pile> 1 over set-pack-fill
+      <pile> 1 >>fill
         population-label> add-gadget
         "3 - Add 10" [ drop add-10-boids ] button* add-gadget
         "2 - Sub 10" [ drop sub-10-boids ] button* add-gadget
       add-gadget
     
-      <pile> 1 over set-pack-fill
+      <pile> 1 >>fill
         cohesion-label> add-gadget
         "q - +0.1" [ drop inc-cohesion-weight ] button* add-gadget
         "a - -0.1" [ drop dec-cohesion-weight ] button* add-gadget
       add-gadget
 
-      <pile> 1 over set-pack-fill
+      <pile> 1 >>fill
         alignment-label> add-gadget
         "w - +0.1" [ drop inc-alignment-weight ] button* add-gadget
         "s - -0.1" [ drop dec-alignment-weight ] button* add-gadget
       add-gadget
 
-      <pile> 1 over set-pack-fill
+      <pile> 1 >>fill
         separation-label> add-gadget
         "e - +0.1" [ drop inc-separation-weight ] button* add-gadget
         "d - -0.1" [ drop dec-separation-weight ] button* add-gadget

From acc3badbe73dae7df7d2c89e68325485ae53bd54 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:36:51 -0500
Subject: [PATCH 23/55] new accessors

---
 extra/project-euler/059/059.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/project-euler/059/059.factor b/extra/project-euler/059/059.factor
index 63a8e3e2c4..17621accfc 100644
--- a/extra/project-euler/059/059.factor
+++ b/extra/project-euler/059/059.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays ascii assocs hashtables io.encodings.ascii io.files kernel math
     math.parser namespaces sequences sequences.lib sequences.private sorting
-    splitting grouping strings sets ;
+    splitting grouping strings sets accessors ;
 IN: project-euler.059
 
 ! http://projecteuler.net/index.php?section=problems&id=59
@@ -60,7 +60,7 @@ TUPLE: rollover seq n ;
 
 C: <rollover> rollover
 
-M: rollover length rollover-n ;
+M: rollover length n>> ;
 
 M: rollover nth-unsafe rollover-seq [ length mod ] keep nth-unsafe ;
 

From 052b7b91559b394e1cce65c5b277e8b3d9c483fe Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:36:57 -0500
Subject: [PATCH 24/55] new accessors

---
 basis/concurrency/distributed/distributed.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/concurrency/distributed/distributed.factor b/basis/concurrency/distributed/distributed.factor
index 4da079e812..5e2f1bb6d1 100755
--- a/basis/concurrency/distributed/distributed.factor
+++ b/basis/concurrency/distributed/distributed.factor
@@ -37,7 +37,7 @@ M: remote-process send ( message thread -- )
     send-remote-message ;
 
 M: thread (serialize) ( obj -- )
-    thread-id local-node get-global <remote-process>
+    id>> local-node get-global <remote-process>
     (serialize) ;
 
 : stop-node ( node -- )

From ad5eb9399fff57086d46e1354101c2c1b593ac9a Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:48:45 -0500
Subject: [PATCH 25/55] new accessors

---
 basis/channels/remote/remote.factor | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/basis/channels/remote/remote.factor b/basis/channels/remote/remote.factor
index c9cfc83d27..9c1878e14d 100755
--- a/basis/channels/remote/remote.factor
+++ b/basis/channels/remote/remote.factor
@@ -4,7 +4,7 @@
 ! Remote Channels
 USING: kernel init namespaces assocs arrays random
 sequences channels match concurrency.messaging
-concurrency.distributed threads ;
+concurrency.distributed threads accessors ;
 IN: channels.remote
 
 <PRIVATE
@@ -52,13 +52,13 @@ TUPLE: remote-channel node id ;
 C: <remote-channel> remote-channel 
 
 M: remote-channel to ( value remote-channel -- )
-    [ [ \ to , remote-channel-id , , ] { } make ] keep
-    remote-channel-node "remote-channels" <remote-process> 
+    [ [ \ to , id>> , , ] { } make ] keep
+    node>> "remote-channels" <remote-process> 
     send-synchronous no-channel = [ no-channel throw ] when ;
 
 M: remote-channel from ( remote-channel -- value )
-    [ [ \ from , remote-channel-id , ] { } make ] keep
-    remote-channel-node "remote-channels" <remote-process> 
+    [ [ \ from , id>> , ] { } make ] keep
+    node>> "remote-channels" <remote-process> 
     send-synchronous dup no-channel = [ no-channel throw ] when* ;
 
 [

From a9c45629faa21185bfeb4e50d41ab6cb2530a6c7 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:50:27 -0500
Subject: [PATCH 26/55] new accessors

---
 extra/color-picker/color-picker.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index 5400a12f89..4a0c148145 100755
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -10,7 +10,7 @@ IN: color-picker
 ! Simple example demonstrating the use of models.
 
 : <color-slider> ( model -- gadget )
-    <x-slider> 1 over set-slider-line ;
+    <x-slider> 1 >>line ;
 
 TUPLE: color-preview < gadget ;
 
@@ -20,7 +20,7 @@ TUPLE: color-preview < gadget ;
       { 100 100 } >>dim ;
 
 M: color-preview model-changed
-    swap model-value over set-gadget-interior relayout-1 ;
+    swap value>> >>interior relayout-1 ;
 
 : <color-model> ( model -- model )
     [ [ 256 /f ] map 1 suffix first4 rgba boa <solid> ] <filter> ;

From 85769f60f829a370a0978843b5dc2db0674baca4 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 12:52:31 -0500
Subject: [PATCH 27/55] new accessors

---
 extra/fjsc/fjsc.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/fjsc/fjsc.factor b/extra/fjsc/fjsc.factor
index e12092603a..ac3b447f1c 100755
--- a/extra/fjsc/fjsc.factor
+++ b/extra/fjsc/fjsc.factor
@@ -336,7 +336,7 @@ M: wrapper (parse-factor-quotation) ( object -- ast )
 GENERIC: fjsc-parse ( object -- ast )
 
 M: string fjsc-parse ( object -- ast )
-  'expression' parse parse-result-ast ;
+  'expression' parse ast>> ;
 
 M: quotation fjsc-parse ( object -- ast )
   [

From 51db0d7e7ddeb8eeaa5f5e566de6fb86901367b1 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:01:20 -0500
Subject: [PATCH 28/55] fix accessors

---
 extra/project-euler/059/059.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/project-euler/059/059.factor b/extra/project-euler/059/059.factor
index 17621accfc..7cc6df3525 100644
--- a/extra/project-euler/059/059.factor
+++ b/extra/project-euler/059/059.factor
@@ -62,7 +62,7 @@ C: <rollover> rollover
 
 M: rollover length n>> ;
 
-M: rollover nth-unsafe rollover-seq [ length mod ] keep nth-unsafe ;
+M: rollover nth-unsafe seq>> [ length mod ] keep nth-unsafe ;
 
 INSTANCE: rollover immutable-sequence
 

From 4c2cd48d9a3c5c6abc050531a5a181a17953bf82 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:02:38 -0500
Subject: [PATCH 29/55] new accessors, slight refactoring

---
 basis/ui/gadgets/canvas/canvas.factor | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/basis/ui/gadgets/canvas/canvas.factor b/basis/ui/gadgets/canvas/canvas.factor
index ba5aeaf95b..b137fd888d 100644
--- a/basis/ui/gadgets/canvas/canvas.factor
+++ b/basis/ui/gadgets/canvas/canvas.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ui.backend ui.gadgets ui.gadgets.theme ui.gadgets.lib
 ui.gadgets.worlds ui.render opengl opengl.gl kernel namespaces
-classes.tuple colors ;
+classes.tuple colors accessors ;
 IN: ui.gadgets.canvas
 
 TUPLE: canvas < gadget dlist ;
@@ -11,16 +11,16 @@ TUPLE: canvas < gadget dlist ;
     new-gadget black solid-interior ; inline
 
 : delete-canvas-dlist ( canvas -- )
-    dup find-gl-context
-    dup canvas-dlist [ delete-dlist ] when*
-    f swap set-canvas-dlist ;
+    [ find-gl-context ]
+    [ dlist>> [ delete-dlist ] when* ]
+    [ f >>dlist drop ] tri ;
 
 : make-canvas-dlist ( canvas quot -- dlist )
-    over >r GL_COMPILE swap make-dlist dup r>
-    set-canvas-dlist ;
+    [ GL_COMPILE ] dip make-dlist
+    [ >>dlist drop ] keep ;
 
 : cache-canvas-dlist ( canvas quot -- dlist )
-    over canvas-dlist dup
+    over dlist>> dup
     [ 2nip ] [ drop make-canvas-dlist ] if ; inline
 
 : draw-canvas ( canvas quot -- )

From 09cce11af705b250f3d5768b259928b79da125e2 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:02:51 -0500
Subject: [PATCH 30/55] new accessors

---
 extra/gesture-logger/gesture-logger.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/gesture-logger/gesture-logger.factor b/extra/gesture-logger/gesture-logger.factor
index b990de03fc..61dc8cf77e 100644
--- a/extra/gesture-logger/gesture-logger.factor
+++ b/extra/gesture-logger/gesture-logger.factor
@@ -19,7 +19,7 @@ M: gesture-logger handle-gesture
     t ;
 
 M: gesture-logger user-input*
-    gesture-logger-stream [
+    stream>> [
         "User input: " write print
     ] with-output-stream* t ;
 

From a512141d3a6b540c9fb86d3be9857f64f63d465c Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:02:58 -0500
Subject: [PATCH 31/55] new accessors

---
 extra/lcd/lcd.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/lcd/lcd.factor b/extra/lcd/lcd.factor
index d1646a4089..8123576f5e 100755
--- a/extra/lcd/lcd.factor
+++ b/extra/lcd/lcd.factor
@@ -26,7 +26,7 @@ IN: lcd
 : <time-display> ( timestamp -- gadget )
     [ hh:mm:ss lcd ] <filter> <label-control>
     "99:99:99" lcd over set-label-string
-    monospace-font over set-label-font ;
+    monospace-font >>font ;
 
 : time-window ( -- )
     [ time get <time-display> "Time" open-window ] with-ui ;

From 43712ae792f93824e4cbce1104f613cacb1d8575 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:04:33 -0500
Subject: [PATCH 32/55] fix test

---
 basis/tuple-arrays/tuple-arrays-tests.factor | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/basis/tuple-arrays/tuple-arrays-tests.factor b/basis/tuple-arrays/tuple-arrays-tests.factor
index 4c288b1c9e..b4b7a76497 100755
--- a/basis/tuple-arrays/tuple-arrays-tests.factor
+++ b/basis/tuple-arrays/tuple-arrays-tests.factor
@@ -1,4 +1,5 @@
-USING: tuple-arrays sequences tools.test namespaces kernel math accessors ;
+USING: tuple-arrays sequences tools.test namespaces kernel
+math accessors ;
 IN: tuple-arrays.tests
 
 SYMBOL: mat
@@ -9,7 +10,7 @@ C: <foo> foo
 [ T{ foo 2 1 } ] [ T{ foo 2 1 } 0 mat get [ set-nth ] keep first ] unit-test
 [ t ] [ { T{ foo f 1 } T{ foo f 2 } } >tuple-array dup mat set tuple-array? ] unit-test
 [ T{ foo f 3 } t ] 
-[ mat get [ foo-bar 2 + <foo> ] map [ first ] keep tuple-array? ] unit-test
+[ mat get [ bar>> 2 + <foo> ] map [ first ] keep tuple-array? ] unit-test
 
 [ 2 ] [ 2 foo <tuple-array> dup mat set length ] unit-test
 [ T{ foo } ] [ mat get first ] unit-test

From b1401423d36b015b34d5a292c7a980f232055df5 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:05:49 -0500
Subject: [PATCH 33/55] new accessors

---
 extra/html/streams/streams-tests.factor | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/extra/html/streams/streams-tests.factor b/extra/html/streams/streams-tests.factor
index 948c998e13..b5707c158f 100644
--- a/extra/html/streams/streams-tests.factor
+++ b/extra/html/streams/streams-tests.factor
@@ -1,8 +1,6 @@
-
-USING: html.streams html.streams.private
-       io io.streams.string io.styles kernel
-       namespaces tools.test xml.writer sbufs sequences inspector colors ;
-
+USING: html.streams html.streams.private accessors io
+io.streams.string io.styles kernel namespaces tools.test
+xml.writer sbufs sequences inspector colors ;
 IN: html.streams.tests
 
 : make-html-string
@@ -33,7 +31,7 @@ IN: html.streams.tests
 TUPLE: funky town ;
 
 M: funky browser-link-href
-    "http://www.funky-town.com/" swap funky-town append ;
+    "http://www.funky-town.com/" swap town>> append ;
 
 [ "<a href='http://www.funky-town.com/austin'>&lt;</a>" ] [
     [

From 4dc89ae42785cc2f700adb2dff036171ec4d9e44 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:07:37 -0500
Subject: [PATCH 34/55] fix tests

---
 extra/math/statistics/statistics-tests.factor | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/extra/math/statistics/statistics-tests.factor b/extra/math/statistics/statistics-tests.factor
index 0884e1aed2..b6ff421956 100644
--- a/extra/math/statistics/statistics-tests.factor
+++ b/extra/math/statistics/statistics-tests.factor
@@ -5,7 +5,7 @@ IN: math.statistics.tests
 [ 3/2 ] [ { 1 2 } mean ] unit-test
 [ 0 ] [ { 0 0 0 } geometric-mean ] unit-test
 [ t ] [ { 2 2 2 2 } geometric-mean 2.0 .0001 ~ ] unit-test
-[ 1 ] [ { 1 1 1 } geometric-mean ] unit-test
+[ 1.0 ] [ { 1 1 1 } geometric-mean ] unit-test
 [ 1/3 ] [ { 1 1 1 } harmonic-mean ] unit-test
 
 [ 0 ] [ { 1 } range ] unit-test
@@ -14,12 +14,11 @@ IN: math.statistics.tests
 [ 5/2 ] [ { 1 2 3 4 } median ] unit-test
 
 [ 1 ] [ { 1 2 3 } var ] unit-test
-[ 1 ] [ { 1 2 3 } std ] unit-test
+[ 1.0 ] [ { 1 2 3 } std ] unit-test
 [ t ] [ { 1 2 3 4 } ste 0.6454972243679028 - .0001 < ] unit-test
 
 [ t ] [ { 23.2 33.4 22.5 66.3 44.5 } std 18.1906 - .0001 < ] unit-test
 
 [ 0 ] [ { 1 } var ] unit-test
-[ 0 ] [ { 1 } std ] unit-test
-[ 0 ] [ { 1 } ste ] unit-test
-
+[ 0.0 ] [ { 1 } std ] unit-test
+[ 0.0 ] [ { 1 } ste ] unit-test

From b7c83ff83eefa5a83da70b77d0e5cf1e31fe25cf Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 13:42:05 -0500
Subject: [PATCH 35/55] new accessors

---
 basis/io/windows/launcher/launcher.factor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/basis/io/windows/launcher/launcher.factor b/basis/io/windows/launcher/launcher.factor
index ed9b53675b..eabd044bb4 100755
--- a/basis/io/windows/launcher/launcher.factor
+++ b/basis/io/windows/launcher/launcher.factor
@@ -151,13 +151,13 @@ M: windows kill-process* ( handle -- )
     swap win32-error=0/f ;
 
 : process-exited ( process -- )
-    dup process-handle exit-code
-    over process-handle dispose-process
+    dup handle>> exit-code
+    over handle>> dispose-process
     notify-exit ;
 
 M: windows wait-for-processes ( -- ? )
     processes get keys dup
-    [ process-handle PROCESS_INFORMATION-hProcess ] map
+    [ handle>> PROCESS_INFORMATION-hProcess ] map
     dup length swap >c-void*-array 0 0
     WaitForMultipleObjects
     dup HEX: ffffffff = [ win32-error ] when

From a5660aa55d7e1aa33ebeff76a7f49f0fb4bb7dc4 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:08:23 -0500
Subject: [PATCH 36/55] new accessors

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

diff --git a/extra/db/tuples/tuples-tests.factor b/extra/db/tuples/tuples-tests.factor
index f5b74b51c8..5dd3ec8ae0 100755
--- a/extra/db/tuples/tuples-tests.factor
+++ b/extra/db/tuples/tuples-tests.factor
@@ -41,9 +41,9 @@ SYMBOL: person4
     
     [ ] [ person1 get insert-tuple ] unit-test
 
-    [ 1 ] [ person1 get person-the-id ] unit-test
+    [ 1 ] [ person1 get the-id>> ] unit-test
 
-    [ ] [ 200 person1 get set-person-the-number ] unit-test
+    [ ] [ person1 get 200 >>the-number drop ] unit-test
 
     [ ] [ person1 get update-tuple ] unit-test
 

From 1b88074853f9a7a3be1227b1cf14687c74d347a7 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:09:14 -0500
Subject: [PATCH 37/55] floating point test fix

---
 extra/json/reader/reader-tests.factor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extra/json/reader/reader-tests.factor b/extra/json/reader/reader-tests.factor
index 4b7bd56f01..995ae0e0b8 100644
--- a/extra/json/reader/reader-tests.factor
+++ b/extra/json/reader/reader-tests.factor
@@ -11,9 +11,9 @@ IN: json.reader.tests
 { 102.0 } [ "102.0" json> ] unit-test
 { 102.5 } [ "102.5" json> ] unit-test
 { 102.5 } [ "102.50" json> ] unit-test
-{ -10250 } [ "-102.5e2" json> ] unit-test
-{ -10250 } [ "-102.5E+2" json> ] unit-test
-{ 10.25 } [ "1025e-2" json> ] unit-test
+{ -10250.0 } [ "-102.5e2" json> ] unit-test
+{ -10250.0 } [ "-102.5E+2" json> ] unit-test
+{ 10+1/4 } [ "1025e-2" json> ] unit-test
 { 0.125 } [ "0.125" json> ] unit-test
 { -0.125 } [ "-0.125" json> ] unit-test
 

From 8d260bb01ba462987f429a263cdf421b2713c039 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:10:02 -0500
Subject: [PATCH 38/55] fix test

---
 extra/math/polynomials/polynomials-tests.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/math/polynomials/polynomials-tests.factor b/extra/math/polynomials/polynomials-tests.factor
index 73215f9167..cccf24fbff 100644
--- a/extra/math/polynomials/polynomials-tests.factor
+++ b/extra/math/polynomials/polynomials-tests.factor
@@ -22,7 +22,7 @@ USING: kernel math math.polynomials tools.test ;
 [ V{ 1 0 1 } V{ 0 0 0 } ] [ { 1 1 1 1 } { 1 1 } p/mod ] unit-test
 [ V{ 1 0 1 } V{ 0 0 0 } ] [ { 1 1 1 1 } { 1 1 0 0 0 0 0 0 } p/mod ] unit-test
 [ V{ 1 0 1 } V{ 0 0 0 } ] [ { 1 1 1 1 0 0 0 0 } { 1 1 0 0 } p/mod ] unit-test
-[ V{ 5.0 } V{ 0.0 } ] [ { 10.0 } { 2.0 } p/mod ] unit-test
+[ V{ 5.0 } V{ 0 } ] [ { 10.0 } { 2.0 } p/mod ] unit-test
 [ V{ 15/16 } V{ 0 } ] [ { 3/4 } { 4/5 } p/mod ] unit-test
 [ t ] [ { 0 1 } { 0 1 0 } p= ] unit-test
 [ f ] [ { 0 0 1 } { 0 1 0 } p= ] unit-test

From 591839db9cac26134f9ee15458228a213f43cf40 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:10:37 -0500
Subject: [PATCH 39/55] fix tests

---
 extra/math/quaternions/quaternions-tests.factor | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extra/math/quaternions/quaternions-tests.factor b/extra/math/quaternions/quaternions-tests.factor
index b30a1bc271..a6d255e421 100644
--- a/extra/math/quaternions/quaternions-tests.factor
+++ b/extra/math/quaternions/quaternions-tests.factor
@@ -2,11 +2,11 @@ IN: math.quaternions.tests
 USING: tools.test math.quaternions kernel math.vectors
 math.constants ;
 
-[ 1 ] [ qi norm ] unit-test
-[ 1 ] [ qj norm ] unit-test
-[ 1 ] [ qk norm ] unit-test
-[ 1 ] [ q1 norm ] unit-test
-[ 0 ] [ q0 norm ] unit-test
+[ 1.0 ] [ qi norm ] unit-test
+[ 1.0 ] [ qj norm ] unit-test
+[ 1.0 ] [ qk norm ] unit-test
+[ 1.0 ] [ q1 norm ] unit-test
+[ 0.0 ] [ q0 norm ] unit-test
 [ t ] [ qi qj q* qk = ] unit-test
 [ t ] [ qj qk q* qi = ] unit-test
 [ t ] [ qk qi q* qj = ] unit-test

From 3dc4de438976385dd03dececa35608facb87175a Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:13:01 -0500
Subject: [PATCH 40/55] new accessors

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

diff --git a/extra/peg/ebnf/ebnf-tests.factor b/extra/peg/ebnf/ebnf-tests.factor
index 47f19920c7..a6d3cf0b21 100644
--- a/extra/peg/ebnf/ebnf-tests.factor
+++ b/extra/peg/ebnf/ebnf-tests.factor
@@ -105,11 +105,11 @@ IN: peg.ebnf.tests
 ] unit-test
 
 { "foo" } [
-  "foo" 'non-terminal' parse ebnf-non-terminal-symbol
+  "foo" 'non-terminal' parse symbol>>
 ] unit-test
 
 { "foo" } [
-  "foo]" 'non-terminal' parse ebnf-non-terminal-symbol
+  "foo]" 'non-terminal' parse symbol>>
 ] unit-test
 
 { V{ "a" "b" } } [

From bb8fcf245f5bc660b8b03e5d8ab64100b7f9d278 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:17:18 -0500
Subject: [PATCH 41/55] fix math docs

---
 core/math/math-docs.factor | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/math/math-docs.factor b/core/math/math-docs.factor
index 07e2de2f8f..cc59094529 100755
--- a/core/math/math-docs.factor
+++ b/core/math/math-docs.factor
@@ -66,7 +66,7 @@ HELP: number=
 { $notes "This word differs from " { $link = } " in that it disregards differences in type when comparing numbers." }
 { $examples
     { $example "USING: math prettyprint ;" "3.0 3 number= ." "t" }
-    { $example "USING: math prettyprint ;" "3.0 3 = ." "f" }
+    { $example "USING: kernel math prettyprint ;" "3.0 3 = ." "f" }
 } ;
 
 HELP: <
@@ -294,7 +294,7 @@ HELP: times
 { $description "Calls the quotation " { $snippet "n" } " times." }
 { $notes "If you need to pass the current index to the quotation, use " { $link each } "." }
 { $examples
-    { $example "USING: io math ;" "3 [ \"Hi\" print ] times" "Hi\nHi\nHi\n" }
+    { $example "USING: io math ;" "3 [ \"Hi\" print ] times" "Hi\nHi\nHi" }
 } ;
 
 HELP: fp-nan?
@@ -304,14 +304,14 @@ HELP: fp-nan?
 HELP: real-part
 { $values { "z" number } { "x" real } }
 { $description "Outputs the real part of a complex number. This acts as the identity on real numbers." }
-{ $examples { $example "C{ 1 2 } real-part ." "1" } } ;
+{ $examples { $example "USING: math prettyprint ; C{ 1 2 } real-part ." "1" } } ;
 
 HELP: imaginary-part
 { $values { "z" number } { "y" real } }
 { $description "Outputs the imaginary part of a complex number. This outputs zero for real numbers." }
 { $examples
-    { $example "C{ 1 2 } imaginary-part ." "2" }
-    { $example "3 imaginary-part ." "0" }
+    { $example "USING: math prettyprint ; C{ 1 2 } imaginary-part ." "2" }
+    { $example "USING: math prettyprint ; 3 imaginary-part ." "0" }
 } ;
 
 HELP: real

From eb48b92711a9732280b15190567c7621f4710db5 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:19:23 -0500
Subject: [PATCH 42/55] fix docs

---
 basis/ui/gadgets/worlds/worlds-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/ui/gadgets/worlds/worlds-docs.factor b/basis/ui/gadgets/worlds/worlds-docs.factor
index f3b85a2861..122d14eed7 100755
--- a/basis/ui/gadgets/worlds/worlds-docs.factor
+++ b/basis/ui/gadgets/worlds/worlds-docs.factor
@@ -46,7 +46,7 @@ HELP: <world>
 { $description "Creates a new " { $link world } " delegating to the given gadget." } ;
 
 HELP: find-world
-{ $values { "gadget" gadget } { "world" "a " { $link world } " or " { $link f } } }
+{ $values { "gadget" gadget } { "world/f" "a " { $link world } " or " { $link f } } }
 { $description "Finds the " { $link world } " containing the gadget, or outputs " { $link f } " if the gadget is not grafted." } ;
 
 HELP: draw-world

From 99f442c2c7e797608ef3f4b3c52dd71104d62ee8 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:19:32 -0500
Subject: [PATCH 43/55] fix docs

---
 core/syntax/syntax-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor
index df0c1b67e8..57dec876a5 100755
--- a/core/syntax/syntax-docs.factor
+++ b/core/syntax/syntax-docs.factor
@@ -390,7 +390,7 @@ HELP: P"
 { $syntax "P\" pathname\"" }
 { $values { "pathname" "a pathname string" } }
 { $description "Reads from the input string until the next occurrence of " { $link POSTPONE: " } ", creates a new " { $link pathname } ", and appends it to the parse tree." }
-{ $examples { $example "USING: io io.files ;" "P\" foo.txt\" pathname-string print" "foo.txt" } } ;
+{ $examples { $example "USING: accessors io io.files ;" "P\" foo.txt\" string>> print" "foo.txt" } } ;
 
 HELP: (
 { $syntax "( inputs -- outputs )" }

From bbcba1a7f64ff0f2b1cbc19f5bfa7de4efc29f6e Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:22:56 -0500
Subject: [PATCH 44/55] fix docs

---
 core/vocabs/vocabs-docs.factor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/vocabs/vocabs-docs.factor b/core/vocabs/vocabs-docs.factor
index 0d55499620..328dce9b03 100755
--- a/core/vocabs/vocabs-docs.factor
+++ b/core/vocabs/vocabs-docs.factor
@@ -46,19 +46,19 @@ HELP: vocab
 { $class-description "Instances represent vocabularies." } ;
 
 HELP: vocab-name
-{ $values { "vocab" "a vocabulary specifier" } { "name" string } }
+{ $values { "vocab-spec" "a vocabulary specifier" } { "name" string } }
 { $description "Outputs the name of a vocabulary." } ;
 
 HELP: vocab-words
-{ $values { "vocab" "a vocabulary specifier" } { "words" "an assoc mapping strings to words" } }
+{ $values { "vocab-spec" "a vocabulary specifier" } { "words" "an assoc mapping strings to words" } }
 { $description "Outputs the words defined in a vocabulary." } ;
 
 HELP: vocab-source-loaded?
-{ $values { "vocab" "a vocabulary specifier" } { "source-loaded?" "a boolean" } }
+{ $values { "vocab-spec" "a vocabulary specifier" } { "?" "a boolean" } }
 { $description "Outputs if the source for this vocubulary has been loaded." } ;
 
 HELP: vocab-docs-loaded?
-{ $values { "vocab" "a vocabulary specifier" } { "docs-loaded?" "a boolean" } }
+{ $values { "vocab-spec" "a vocabulary specifier" } { "?" "a boolean" } }
 { $description "Outputs if the documentation for this vocubulary has been loaded." } ;
 
 HELP: words

From 13722dd4a888e2116de70eb28515cfd4fff12c2e Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 15:34:40 -0500
Subject: [PATCH 45/55] fix help

---
 extra/math/derivatives/derivatives-docs.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/math/derivatives/derivatives-docs.factor b/extra/math/derivatives/derivatives-docs.factor
index 8e561f38ae..bbb793fe92 100644
--- a/extra/math/derivatives/derivatives-docs.factor
+++ b/extra/math/derivatives/derivatives-docs.factor
@@ -71,8 +71,8 @@ HELP: derivative-func
 { $examples
     { $example
         "USING: kernel math.derivatives math.functions math.trig prettyprint ;"
-        "60 deg>rad [ sin ] derivative-func call ."
-        "0.5000000000000173"
+        "60 deg>rad [ sin ] derivative-func call 0.5 .001 ~ ."
+        "t"
     }
     { $notes
         "Without a heavy algebraic system, derivatives must be "

From 56a1e8d0447eef00a67c8be7cb7d219132ccd9ff Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:01:19 -0500
Subject: [PATCH 46/55] fix readers>>, fix tests

---
 extra/inverse/inverse-tests.factor | 2 +-
 extra/inverse/inverse.factor       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/inverse/inverse-tests.factor b/extra/inverse/inverse-tests.factor
index 3206636ea9..d106b1068a 100644
--- a/extra/inverse/inverse-tests.factor
+++ b/extra/inverse/inverse-tests.factor
@@ -32,7 +32,7 @@ C: <foo> foo
 : f>c ( *fahrenheit -- *celsius )
     32 - 1.8 / ;
 
-[ { 212 32 } ] [ { 100 0 } [ [ f>c ] map ] undo ] unit-test
+[ { 212.0 32.0 } ] [ { 100 0 } [ [ f>c ] map ] undo ] unit-test
 [ { t t f } ] [ { t f 1 } [ [ >boolean ] matches? ] map ] unit-test
 [ { t f } ] [ { { 1 2 3 } 4 } [ [ >array ] matches? ] map ] unit-test
 [ 9 9 ] [ 3 [ 1/2 ^ ] undo 3 [ sqrt ] undo ] unit-test
diff --git a/extra/inverse/inverse.factor b/extra/inverse/inverse.factor
index 2340442d5b..1e71abf76d 100755
--- a/extra/inverse/inverse.factor
+++ b/extra/inverse/inverse.factor
@@ -208,7 +208,7 @@ DEFER: _
 
 : slot-readers ( class -- quot )
     all-slots rest ! tail gets rid of delegate
-    [ reader>> 1quotation [ keep ] curry ] map concat
+    [ name>> reader-word 1quotation [ keep ] curry ] map concat
     [ ] like [ drop ] compose ;
 
 : ?wrapped ( object -- wrapped )

From edd50715564bc628389429f3f0766c528920ab5f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:03:38 -0500
Subject: [PATCH 47/55] fix test

---
 basis/float-vectors/float-vectors-tests.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/basis/float-vectors/float-vectors-tests.factor b/basis/float-vectors/float-vectors-tests.factor
index 383dd4bcf2..1483b269e0 100755
--- a/basis/float-vectors/float-vectors-tests.factor
+++ b/basis/float-vectors/float-vectors-tests.factor
@@ -1,10 +1,10 @@
+USING: tools.test float-vectors vectors sequences kernel math ;
 IN: float-vectors.tests
-USING: tools.test float-vectors vectors sequences kernel ;
 
 [ 0 ] [ 123 <float-vector> length ] unit-test
 
 : do-it
-    12345 [ over push ] each ;
+    12345 [ >float over push ] each ;
 
 [ t ] [
     3 <float-vector> do-it

From 74a2e75c64820359ac5a6fd946e7af411c47d7ca Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:07:17 -0500
Subject: [PATCH 48/55] fix docs

---
 core/vocabs/loader/loader-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/vocabs/loader/loader-docs.factor b/core/vocabs/loader/loader-docs.factor
index e4cc6ac11f..ebaf8b3c8f 100755
--- a/core/vocabs/loader/loader-docs.factor
+++ b/core/vocabs/loader/loader-docs.factor
@@ -50,7 +50,7 @@ HELP: load-vocab
 { $error-description "Thrown by " { $link POSTPONE: USE: } " and " { $link POSTPONE: USING: } " when a given vocabulary does not exist. Vocabularies must be created by " { $link POSTPONE: IN: } " before being used." } ;
 
 HELP: vocab-main
-{ $values { "vocab" "a vocabulary specifier" } { "main" word } }
+{ $values { "vocab-spec" "a vocabulary specifier" } { "main" word } }
 { $description "Outputs the main entry point for a vocabulary. The entry point can be executed with " { $link run } " and set with " { $link POSTPONE: MAIN: } "." } ;
 
 HELP: vocab-roots

From f85e70a6ceb0400f70958d075356753df5091891 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:07:25 -0500
Subject: [PATCH 49/55] fix docs

---
 basis/help/help-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/help/help-docs.factor b/basis/help/help-docs.factor
index d329fa5d42..47cc2987d7 100755
--- a/basis/help/help-docs.factor
+++ b/basis/help/help-docs.factor
@@ -399,5 +399,5 @@ HELP: ABOUT:
 { $description "Defines the main documentation article for the current vocabulary." } ;
 
 HELP: vocab-help
-{ $values { "vocab" "a vocabulary specifier" } { "help" "a help article" } }
+{ $values { "vocab-spec" "a vocabulary specifier" } { "help" "a help article" } }
 { $description "Outputs the main help article for a vocabulary. The main help article can be set with " { $link POSTPONE: ABOUT:  } "." } ;

From cb45241fd72aee75a521a1b2e18b80e3e2921488 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:13:43 -0500
Subject: [PATCH 50/55] new accessors

---
 extra/springies/ui/ui.factor | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/extra/springies/ui/ui.factor b/extra/springies/ui/ui.factor
index f9a97ba945..423a68cf0d 100644
--- a/extra/springies/ui/ui.factor
+++ b/extra/springies/ui/ui.factor
@@ -52,16 +52,14 @@ DEFER: maybe-loop
 
 : springies-window* ( -- )
 
-  C[ display ] <slate> >slate
-    { 800 600 }                                      slate> set-slate-pdim
-    C[ { 500 500 } >world-size loop on [ run ] in-thread ]
-      slate> set-slate-graft
-    C[ loop off ]                                    slate> set-slate-ungraft
-
-  slate> "Springies" open-window ;
+  C[ display ] <slate>
+    { 800 600 } >>pdim
+    C[ { 500 500 } >world-size loop on [ run ] in-thread ] >>graft
+    C[ loop off ] >>ungraft
+  [ >slate ] [ "Springies" open-window ] bi ;
 
 : springies-window ( -- ) [ [ springies-window* ] with-scope ] with-ui ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: go* ( quot -- ) '[ [ springies-window* 1000 sleep @ ] with-scope ] with-ui ;
\ No newline at end of file
+: go* ( quot -- ) '[ [ springies-window* 1000 sleep @ ] with-scope ] with-ui ;

From 5dbf68f3852192e708c245c123a3f084c371d463 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:49:21 -0500
Subject: [PATCH 51/55] update the docs

---
 basis/io/encodings/ascii/ascii-docs.factor | 9 +++++++--
 basis/io/encodings/utf16/utf16-docs.factor | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/basis/io/encodings/ascii/ascii-docs.factor b/basis/io/encodings/ascii/ascii-docs.factor
index 9c9c3a5234..fa496a3526 100644
--- a/basis/io/encodings/ascii/ascii-docs.factor
+++ b/basis/io/encodings/ascii/ascii-docs.factor
@@ -2,5 +2,10 @@ USING: help.markup help.syntax ;
 IN: io.encodings.ascii
 
 HELP: ascii
-{ $class-description "This is the encoding descriptor which denotes an ASCII encoding. By default, if there's a non-ASCII character in an input stream, it will be replaced with a replacement character (U+FFFD), and if a non-ASCII character is used in output, an exception is thrown." }
-{ $see-also "encodings-introduction" } ;
+{ $class-description "ASCII encoding descriptor." } ;
+
+ARTICLE: "ascii" "ASCII encoding"
+"By default, if there's a non-ASCII character in an input stream, it will be replaced with a replacement character (U+FFFD), and if a non-ASCII character is used in output, an exception is thrown."
+{ $subsection ascii } ;
+
+ABOUT: "ascii"
diff --git a/basis/io/encodings/utf16/utf16-docs.factor b/basis/io/encodings/utf16/utf16-docs.factor
index f37a9d1d58..dc499b5ed4 100644
--- a/basis/io/encodings/utf16/utf16-docs.factor
+++ b/basis/io/encodings/utf16/utf16-docs.factor
@@ -1,7 +1,7 @@
 USING: help.markup help.syntax io.encodings strings ;
 IN: io.encodings.utf16
 
-ARTICLE: "io.encodings.utf16" "UTF-16"
+ARTICLE: "io.encodings.utf16" "UTF-16 encoding"
 "The UTF-16 encoding is a variable-width encoding. Unicode code points are encoded as 2 or 4 byte sequences. There are three encoding descriptor classes for working with UTF-16, depending on endianness or the presence of a BOM:"
 { $subsection utf16 }
 { $subsection utf16le }

From 8df32ea9e4f041328645a3cedc25312aee44705e Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:49:45 -0500
Subject: [PATCH 52/55] update the docs

---
 core/io/encodings/binary/binary-docs.factor | 9 +++++++--
 core/io/encodings/utf8/utf8-docs.factor     | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/core/io/encodings/binary/binary-docs.factor b/core/io/encodings/binary/binary-docs.factor
index 85045d8984..4da1e0811f 100644
--- a/core/io/encodings/binary/binary-docs.factor
+++ b/core/io/encodings/binary/binary-docs.factor
@@ -2,5 +2,10 @@ USING: help.syntax help.markup ;
 IN: io.encodings.binary
 
 HELP: binary
-{ $class-description "This is the encoding descriptor for binary I/O. Making an encoded stream with the binary encoding is a no-op; streams with this encoding deal with byte-arrays, not strings." }
-{ $see-also "encodings-introduction" } ;
+{ $class-description "Encoding descriptor for binary I/O." } ;
+
+ARTICLE: "io.encodings.binary" "Binary encoding"
+"Making an encoded stream with the binary encoding is a no-op; streams with this encoding deal with byte-arrays, not strings." 
+{ $subsection binary } ;
+
+ABOUT: "io.encodings.binary"
diff --git a/core/io/encodings/utf8/utf8-docs.factor b/core/io/encodings/utf8/utf8-docs.factor
index 1ac0252dbb..7e185fff69 100755
--- a/core/io/encodings/utf8/utf8-docs.factor
+++ b/core/io/encodings/utf8/utf8-docs.factor
@@ -2,5 +2,10 @@ USING: help.markup help.syntax ;
 IN: io.encodings.utf8
 
 HELP: utf8
-{ $class-description "This is the encoding descriptor for a UTF-8 encoding. UTF-8 is a variable-width encoding. 7-bit ASCII characters are encoded as single bytes, and other Unicode code points are encoded as 2 to 4 byte sequences." }
-{ $see-also "encodings-introduction" } ;
+{ $class-description "Encoding descriptor for UTF-8 encoding." } ;
+
+ARTICLE: "io.encodings.utf8" "UTF-8 encoding"
+"UTF-8 is a variable-width encoding. 7-bit ASCII characters are encoded as single bytes, and other Unicode code points are encoded as 2 to 4 byte sequences."
+{ $subsection utf8 } ;
+
+ABOUT: "io.encodings.utf8"

From 0910d858c515cde10d74cd54a674a52e238dc7ca Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:49:57 -0500
Subject: [PATCH 53/55] fix docs

---
 core/quotations/quotations-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/quotations/quotations-docs.factor b/core/quotations/quotations-docs.factor
index 74c296d94c..1a16d0f92a 100755
--- a/core/quotations/quotations-docs.factor
+++ b/core/quotations/quotations-docs.factor
@@ -17,7 +17,7 @@ $nl
 "Wrappers are used to push words on the data stack; they evaluate to the object being wrapped:"
 { $subsection wrapper }
 { $subsection literalize }
-{ $see-also "basic-combinators" "combinators" } ;
+{ $see-also "dataflow" "combinators" } ;
 
 ABOUT: "quotations"
 

From d3089375466e26831eca31d92258a95b062e3e12 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:52:58 -0500
Subject: [PATCH 54/55] fix docs

---
 basis/hints/hints-docs.factor | 1 -
 1 file changed, 1 deletion(-)

diff --git a/basis/hints/hints-docs.factor b/basis/hints/hints-docs.factor
index e6ca1ff26b..99c4a2ddfc 100644
--- a/basis/hints/hints-docs.factor
+++ b/basis/hints/hints-docs.factor
@@ -12,7 +12,6 @@ $nl
 $nl
 "Type hints are declared with a parsing word:"
 { $subsection POSTPONE: HINTS: }
-$nl
 "The specialized version of a word which will be compiled by the compiler can be inspected:"
 { $subsection specialized-def } ;
 

From dbd16b49785f48e0c5c4319f93d960147e0d60b7 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 2 Sep 2008 16:53:20 -0500
Subject: [PATCH 55/55] fix docs

---
 basis/compiler/compiler-docs.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/compiler/compiler-docs.factor b/basis/compiler/compiler-docs.factor
index 418aac6560..1f941a0f88 100755
--- a/basis/compiler/compiler-docs.factor
+++ b/basis/compiler/compiler-docs.factor
@@ -27,7 +27,7 @@ ARTICLE: "compiler" "Optimizing compiler"
 "The optimizing compiler only compiles words which have a static stack effect. This means that methods defined on fundamental generic words such as " { $link nth } " should have a static stack effect; for otherwise, most of the system would be compiled with the non-optimizing compiler. See " { $link "inference" } " and " { $link "cookbook-pitfalls" } "."
 { $subsection "compiler-usage" }
 { $subsection "compiler-errors" }
-{ $subsection "optimizer" }
+{ $subsection "hints" }
 { $subsection "generator" } ;
 
 ABOUT: "compiler"