From 74197538f560c660b1b888d4f834ae415ed36237 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 27 Jul 2008 20:25:42 -0500
Subject: [PATCH 01/77] Change high-level IR to not use 'successor' links; add
 normalization pass

---
 .../tree/branch-fusion/branch-fusion.factor   |   5 +
 .../compiler/tree/builder/builder.factor      |  12 +-
 .../compiler/tree/cleanup/cleanup.factor      |   5 +
 .../tree/combinators/combinators-tests.factor |  15 +--
 .../tree/combinators/combinators.factor       |  73 ++---------
 .../backward/backward.factor                  |   4 +-
 .../dataflow-analysis.factor}                 |   2 +-
 .../compiler/tree/dead-code/dead-code.factor  |   4 +-
 .../compiler/tree/def-use/def-use.factor      |  48 +++----
 .../tree/loop-detection/loop-detection.factor |   5 +
 .../normalization/normalization-tests.factor  |  27 ++++
 .../tree/normalization/normalization.factor   |  94 ++++++++++++++
 .../compiler/tree/optimizer/optimizer.factor  |  21 ++++
 .../tree/propagation/branches/branches.factor |  21 ++--
 .../tree/propagation/inlining/inlining.factor |   3 +
 .../tree/propagation/nodes/nodes.factor       |   7 +-
 .../tree/propagation/propagation-tests.factor |   6 +-
 .../propagation/recursive/recursive.factor    |   2 +-
 .../tree/propagation/simple/simple.factor     |   2 +-
 .../strength-reduction.factor                 |   5 +
 unfinished/compiler/tree/tree.factor          | 117 ++++++------------
 .../compiler/tree/untupling/untupling.factor  |   3 +-
 .../stack-checker/backend/backend.factor      |   7 +-
 .../stack-checker/visitor/visitor.factor      |   2 +-
 24 files changed, 280 insertions(+), 210 deletions(-)
 create mode 100644 unfinished/compiler/tree/branch-fusion/branch-fusion.factor
 create mode 100644 unfinished/compiler/tree/cleanup/cleanup.factor
 rename unfinished/compiler/tree/{dfa => dataflow-analysis}/backward/backward.factor (94%)
 rename unfinished/compiler/tree/{dfa/dfa.factor => dataflow-analysis/dataflow-analysis.factor} (96%)
 create mode 100644 unfinished/compiler/tree/loop-detection/loop-detection.factor
 create mode 100644 unfinished/compiler/tree/normalization/normalization-tests.factor
 create mode 100644 unfinished/compiler/tree/normalization/normalization.factor
 create mode 100644 unfinished/compiler/tree/optimizer/optimizer.factor
 create mode 100644 unfinished/compiler/tree/propagation/inlining/inlining.factor
 create mode 100644 unfinished/compiler/tree/strength-reduction/strength-reduction.factor

diff --git a/unfinished/compiler/tree/branch-fusion/branch-fusion.factor b/unfinished/compiler/tree/branch-fusion/branch-fusion.factor
new file mode 100644
index 0000000000..b1078c85fb
--- /dev/null
+++ b/unfinished/compiler/tree/branch-fusion/branch-fusion.factor
@@ -0,0 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.tree.branch-fusion
+
+: fuse-branches ( nodes -- nodes' ) ;
diff --git a/unfinished/compiler/tree/builder/builder.factor b/unfinished/compiler/tree/builder/builder.factor
index 79a2786f64..c390658597 100644
--- a/unfinished/compiler/tree/builder/builder.factor
+++ b/unfinished/compiler/tree/builder/builder.factor
@@ -7,11 +7,11 @@ stack-checker.state stack-checker.visitor stack-checker.errors
 stack-checker.backend compiler.tree ;
 IN: compiler.tree.builder
 
-: with-tree-builder ( quot -- dataflow )
-    [ node-list new stack-visitor set ] prepose
-    with-infer first>> ; inline
+: with-tree-builder ( quot -- nodes )
+    [ V{ } clone stack-visitor set ] prepose
+    with-infer ; inline
 
-GENERIC# build-tree-with 1 ( quot stack -- dataflow )
+GENERIC# build-tree-with 1 ( quot stack -- nodes )
 
 M: callable build-tree-with
     #! Not safe to call from inference transforms.
@@ -20,7 +20,7 @@ M: callable build-tree-with
         f infer-quot
     ] with-tree-builder nip ;
 
-: build-tree ( quot -- dataflow ) f build-tree-with ;
+: build-tree ( quot -- nodes ) f build-tree-with ;
 
 : (make-specializer) ( class picker -- quot )
     swap "predicate" word-prop append ;
@@ -65,7 +65,7 @@ M: callable build-tree-with
         [ drop ]
     } cond ;
 
-: build-tree-from-word ( word -- effect dataflow )
+: build-tree-from-word ( word -- effect nodes )
     [
         [
             dup +cannot-infer+ word-prop [ cannot-infer-effect ] when
diff --git a/unfinished/compiler/tree/cleanup/cleanup.factor b/unfinished/compiler/tree/cleanup/cleanup.factor
new file mode 100644
index 0000000000..725d6c0abe
--- /dev/null
+++ b/unfinished/compiler/tree/cleanup/cleanup.factor
@@ -0,0 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.tree.cleanup
+
+: cleanup ( nodes -- nodes' ) ;
diff --git a/unfinished/compiler/tree/combinators/combinators-tests.factor b/unfinished/compiler/tree/combinators/combinators-tests.factor
index 15c07635ad..12ab7e3563 100644
--- a/unfinished/compiler/tree/combinators/combinators-tests.factor
+++ b/unfinished/compiler/tree/combinators/combinators-tests.factor
@@ -1,17 +1,4 @@
 IN: compiler.tree.combinators.tests
-USING: compiler.tree.combinators compiler.tree.builder tools.test
-kernel ;
-
-[ ] [ [ 1 ] build-tree [ ] transform-nodes drop ] unit-test
-[ ] [ [ 1 2 3 ] build-tree [ ] transform-nodes drop ] unit-test
-
-{ 1 0 } [ [ iterate-next ] iterate-nodes ] must-infer-as
-
-{ 1 0 }
-[
-    [ [ iterate-next ] iterate-nodes ] with-node-iterator
-] must-infer-as
+USING: compiler.tree.combinators tools.test kernel ;
 
 { 1 0 } [ [ drop ] each-node ] must-infer-as
-
-{ 1 0 } [ [ ] map-children ] must-infer-as
diff --git a/unfinished/compiler/tree/combinators/combinators.factor b/unfinished/compiler/tree/combinators/combinators.factor
index 1f626163e5..94bcdb2d95 100644
--- a/unfinished/compiler/tree/combinators/combinators.factor
+++ b/unfinished/compiler/tree/combinators/combinators.factor
@@ -1,64 +1,17 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry arrays generic assocs kernel math namespaces parser
-sequences words vectors math.intervals effects classes
-accessors combinators compiler.tree ;
+USING: fry kernel accessors sequences compiler.tree ;
 IN: compiler.tree.combinators
 
-SYMBOL: node-stack
-
-: >node ( node -- ) node-stack get push ;
-: node> ( -- node ) node-stack get pop ;
-: node@ ( -- node ) node-stack get peek ;
-
-: iterate-next ( -- node ) node@ successor>> ;
-
-: iterate-nodes ( node quot -- )
-    over [
-        [ swap >node call node> drop ] keep iterate-nodes
-    ] [
-        2drop
-    ] if ; inline
-
-: (each-node) ( quot -- next )
-    node@ [ swap call ] 2keep
-    children>> [
-        first>> [
-            [ (each-node) ] keep swap
-        ] iterate-nodes
-    ] each drop
-    iterate-next ; inline
-
-: with-node-iterator ( quot -- )
-    >r V{ } clone node-stack r> with-variable ; inline
-
-: each-node ( node quot -- )
-    [
-        swap [
-            [ (each-node) ] keep swap
-        ] iterate-nodes drop
-    ] with-node-iterator ; inline
-
-: map-children ( node quot -- )
-    [ children>> ] dip '[ , change-first drop ] each ; inline
-
-: (transform-nodes) ( prev node quot -- )
-    dup >r call dup [
-        >>successor
-        successor>> dup successor>>
-        r> (transform-nodes)
-    ] [
-        r> 2drop f >>successor drop
-    ] if ; inline
-
-: transform-nodes ( node quot -- new-node )
-    over [
-        [ call dup dup successor>> ] keep (transform-nodes)
-    ] [ drop ] if ; inline
-
-: tail-call? ( -- ? )
-    #! We don't consider calls which do non-local exits to be
-    #! tail calls, because this gives better error traces.
-    node-stack get [
-        successor>> [ #tail? ] [ #terminate? not ] bi and
-    ] all? ;
+: each-node ( nodes quot -- )
+    dup dup '[
+        , [
+            dup #branch? [
+                children>> [ , each-node ] each
+            ] [
+                dup #recursive? [
+                    child>> , each-node
+                ] [ drop ] if
+            ] if
+        ] bi
+    ] each ; inline
diff --git a/unfinished/compiler/tree/dfa/backward/backward.factor b/unfinished/compiler/tree/dataflow-analysis/backward/backward.factor
similarity index 94%
rename from unfinished/compiler/tree/dfa/backward/backward.factor
rename to unfinished/compiler/tree/dataflow-analysis/backward/backward.factor
index cb2b13e6bb..c9caeb864b 100644
--- a/unfinished/compiler/tree/dfa/backward/backward.factor
+++ b/unfinished/compiler/tree/dataflow-analysis/backward/backward.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-IN: compiler.tree.dfa.backward
+IN: compiler.tree.dataflow-analysis.backward
 USING: accessors sequences assocs kernel compiler.tree
-compiler.tree.dfa ;
+compiler.tree.dataflow-analysis ;
 
 GENERIC: backward ( value node -- )
 
diff --git a/unfinished/compiler/tree/dfa/dfa.factor b/unfinished/compiler/tree/dataflow-analysis/dataflow-analysis.factor
similarity index 96%
rename from unfinished/compiler/tree/dfa/dfa.factor
rename to unfinished/compiler/tree/dataflow-analysis/dataflow-analysis.factor
index 3a7770c53f..b6772650b6 100644
--- a/unfinished/compiler/tree/dfa/dfa.factor
+++ b/unfinished/compiler/tree/dataflow-analysis/dataflow-analysis.factor
@@ -3,7 +3,7 @@
 USING: fry accessors namespaces assocs dequeues search-dequeues
 kernel sequences words sets stack-checker.inlining compiler.tree
 compiler.tree.def-use compiler.tree.combinators ;
-IN: compiler.tree.dfa
+IN: compiler.tree.dataflow-analysis
 
 ! Dataflow analysis
 SYMBOL: work-list
diff --git a/unfinished/compiler/tree/dead-code/dead-code.factor b/unfinished/compiler/tree/dead-code/dead-code.factor
index fb5bc36dd7..ccf8a9cd09 100644
--- a/unfinished/compiler/tree/dead-code/dead-code.factor
+++ b/unfinished/compiler/tree/dead-code/dead-code.factor
@@ -3,8 +3,8 @@
 USING: fry accessors namespaces assocs dequeues search-dequeues
 kernel sequences words sets stack-checker.inlining
 compiler.tree
-compiler.tree.dfa
-compiler.tree.dfa.backward
+compiler.tree.dataflow-analysis
+compiler.tree.dataflow-analysis.backward
 compiler.tree.combinators ;
 IN: compiler.tree.dead-code
 
diff --git a/unfinished/compiler/tree/def-use/def-use.factor b/unfinished/compiler/tree/def-use/def-use.factor
index d58a446030..189dd292a2 100755
--- a/unfinished/compiler/tree/def-use/def-use.factor
+++ b/unfinished/compiler/tree/def-use/def-use.factor
@@ -1,7 +1,7 @@
-! Copyright (C) 2004, 2008 Slava Pestov.
+! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces assocs sequences kernel generic assocs classes
-vectors accessors combinators sets stack-checker.state
+USING: arrays namespaces assocs sequences kernel generic assocs
+classes vectors accessors combinators sets stack-checker.state
 compiler.tree compiler.tree.combinators ;
 IN: compiler.tree.def-use
 
@@ -9,60 +9,60 @@ SYMBOL: def-use
 
 TUPLE: definition value node uses ;
 
-: <definition> ( value -- definition )
+: <definition> ( node value -- definition )
     definition new
         swap >>value
+        swap >>node
         V{ } clone >>uses ;
 
 : def-of ( value -- definition )
-    def-use get [ <definition> ] cache ;
+    def-use get at* [ "No def" throw ] unless ;
 
 : def-value ( node value -- )
-    def-of [ [ "Multiple defs" throw ] when ] change-node drop ;
+    def-use get 2dup key? [
+        "Multiple defs" throw
+    ] [
+        [ [ <definition> ] keep ] dip set-at
+    ] if ;
 
 : used-by ( value -- nodes ) def-of uses>> ;
 
 : use-value ( node value -- ) used-by push ;
 
-: defined-by ( value -- node ) def-use get at node>> ;
+: defined-by ( value -- node ) def-of node>> ;
 
 GENERIC: node-uses-values ( node -- values )
 
-M: #declare node-uses-values declaration>> keys ;
-
-M: #phi node-uses-values
-    [ phi-in-d>> concat ] [ phi-in-r>> concat ] bi
-    append sift prune ;
-
+M: #introduce node-uses-values drop f ;
+M: #push node-uses-values drop f ;
 M: #r> node-uses-values in-r>> ;
-
+M: #phi node-uses-values
+    [ phi-in-d>> ] [ phi-in-r>> ] bi append concat sift prune ;
+M: #declare node-uses-values declaration>> keys ;
 M: node node-uses-values in-d>> ;
 
 GENERIC: node-defs-values ( node -- values )
 
-M: #introduce node-defs-values values>> ;
-
+M: #introduce node-defs-values value>> 1array ;
 M: #>r node-defs-values out-r>> ;
-
+M: #branch node-defs-values drop f ;
 M: #phi node-defs-values [ out-d>> ] [ out-r>> ] bi append ;
-
+M: #declare node-defs-values drop f ;
+M: #return node-defs-values drop f ;
+M: #recursive node-defs-values drop f ;
+M: #terminate node-defs-values drop f ;
 M: node node-defs-values out-d>> ;
 
 : node-def-use ( node -- )
     [ dup node-uses-values [ use-value ] with each ]
     [ dup node-defs-values [ def-value ] with each ] bi ;
 
-: check-def ( node -- )
-    [ "No def" throw ] unless ;
-
 : check-use ( uses -- )
     [ empty? [ "No use" throw ] when ]
     [ all-unique? [ "Uses not all unique" throw ] unless ] bi ;
 
 : check-def-use ( -- )
-    def-use get [
-        nip [ node>> check-def ] [ uses>> check-use ] bi
-    ] assoc-each ;
+    def-use get [ nip uses>> check-use ] assoc-each ;
 
 : compute-def-use ( node -- node )
     H{ } clone def-use set
diff --git a/unfinished/compiler/tree/loop-detection/loop-detection.factor b/unfinished/compiler/tree/loop-detection/loop-detection.factor
new file mode 100644
index 0000000000..e29ae22f0d
--- /dev/null
+++ b/unfinished/compiler/tree/loop-detection/loop-detection.factor
@@ -0,0 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.tree.loop-detection
+
+: detect-loops ( nodes -- nodes' ) ;
diff --git a/unfinished/compiler/tree/normalization/normalization-tests.factor b/unfinished/compiler/tree/normalization/normalization-tests.factor
new file mode 100644
index 0000000000..39a71ad0a6
--- /dev/null
+++ b/unfinished/compiler/tree/normalization/normalization-tests.factor
@@ -0,0 +1,27 @@
+IN: compiler.tree.normalization.tests
+USING: compiler.tree.builder compiler.tree.normalization
+compiler.tree sequences accessors tools.test kernel ;
+
+\ collect-introductions must-infer
+\ fixup-enter-recursive must-infer
+\ eliminate-introductions must-infer
+\ normalize must-infer
+
+[ 3 ] [ [ 3drop 1 2 3 ] build-tree collect-introductions ] unit-test
+
+[ 4 ] [ [ 3drop 1 2 3 3drop drop ] build-tree collect-introductions ] unit-test
+
+[ 3 ] [ [ [ drop ] [ 2drop 3 ] if ] build-tree collect-introductions ] unit-test
+
+[ 2 ] [ [ 3 [ drop ] [ 2drop 3 ] if ] build-tree collect-introductions ] unit-test
+
+: foo ( -- ) swap ; inline recursive
+
+: recursive-inputs ( nodes -- n )
+    [ #recursive? ] find nip child>> first in-d>> length ;
+
+[ 0 2 ] [
+    [ foo ] build-tree
+    [ recursive-inputs ]
+    [ normalize recursive-inputs ] bi
+] unit-test
diff --git a/unfinished/compiler/tree/normalization/normalization.factor b/unfinished/compiler/tree/normalization/normalization.factor
new file mode 100644
index 0000000000..38fa3e11b3
--- /dev/null
+++ b/unfinished/compiler/tree/normalization/normalization.factor
@@ -0,0 +1,94 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: namespaces sequences math accessors kernel arrays
+stack-checker.backend compiler.tree compiler.tree.combinators ;
+IN: compiler.tree.normalization
+
+! A transform pass done before optimization can begin to
+! fix up some oddities in the tree output by the stack checker:
+!
+! - We rewrite the code is that #introduce nodes only appear
+! at the top level, and not inside #recursive. This enables more
+! accurate type inference for 'row polymorphic' combinators.
+!
+! - We collect #return-recursive and #call-recursive nodes and
+! store them in the #recursive's label slot.
+
+GENERIC: normalize* ( node -- )
+
+! Collect introductions
+SYMBOL: introductions
+
+GENERIC: collect-introductions* ( node -- )
+
+: collect-introductions ( nodes -- n )
+    [
+        0 introductions set
+        [ collect-introductions* ] each
+        introductions get
+    ] with-scope ;
+
+M: #introduce collect-introductions* drop introductions inc ;
+
+M: #branch collect-introductions*
+    children>>
+    [ collect-introductions ] map supremum
+    introductions [ + ] change ;
+
+M: node collect-introductions* drop ;
+
+! Eliminate introductions
+SYMBOL: introduction-stack
+
+: fixup-enter-recursive ( recursive -- )
+    [ child>> first ] [ in-d>> ] bi >>in-d
+    [ introduction-stack get prepend ] change-out-d
+    drop ;
+
+GENERIC: eliminate-introductions* ( node -- node' )
+
+: pop-introduction ( -- value )
+    introduction-stack [ unclip-last swap ] change ;
+
+M: #introduce eliminate-introductions*
+    pop-introduction swap value>> [ 1array ] bi@ #copy ;
+
+SYMBOL: remaining-introductions
+
+M: #branch eliminate-introductions*
+    dup children>> [
+        [
+            [ eliminate-introductions* ] change-each
+            introduction-stack get
+        ] with-scope
+    ] map
+    [ remaining-introductions set ]
+    [ [ length ] map infimum introduction-stack [ swap head ] change ]
+    bi ;
+
+M: #phi eliminate-introductions*
+    remaining-introductions get swap
+    [ flip [ over length tail append ] 2map flip ] change-phi-in-d ;
+
+M: node eliminate-introductions* ;
+
+: eliminate-introductions ( recursive n -- )
+    make-values introduction-stack set
+    [ fixup-enter-recursive ]
+    [ child>> [ eliminate-introductions* ] change-each ] bi ;
+
+M: #recursive normalize*
+    [
+        [ child>> collect-introductions ]
+        [ swap eliminate-introductions ]
+        bi
+    ] with-scope ;
+
+! Collect label info
+M: #return-recursive normalize* dup label>> (>>return) ;
+
+M: #call-recursive normalize* dup label>> calls>> push ;
+
+M: node normalize* drop ;
+
+: normalize ( node -- node ) dup [ normalize* ] each-node ;
diff --git a/unfinished/compiler/tree/optimizer/optimizer.factor b/unfinished/compiler/tree/optimizer/optimizer.factor
new file mode 100644
index 0000000000..bb33deb7e7
--- /dev/null
+++ b/unfinished/compiler/tree/optimizer/optimizer.factor
@@ -0,0 +1,21 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: compiler.tree.normalization compiler.tree.copy-equiv
+compiler.tree.propagation compiler.tree.cleanup
+compiler.tree.def-use compiler.tree.untupling
+compiler.tree.dead-code compiler.tree.strength-reduction
+compiler.tree.loop-detection compiler.tree.branch-fusion ;
+IN: compiler.tree.optimizer
+
+: optimize-tree ( nodes -- nodes' )
+    normalize
+    compute-copy-equiv
+    propagate
+    cleanup
+    compute-def-use
+    unbox-tuples
+    compute-def-use
+    remove-dead-code
+    strength-reduce
+    detect-loops
+    fuse-branches ;
diff --git a/unfinished/compiler/tree/propagation/branches/branches.factor b/unfinished/compiler/tree/propagation/branches/branches.factor
index 22f0978e22..a8b623eb51 100644
--- a/unfinished/compiler/tree/propagation/branches/branches.factor
+++ b/unfinished/compiler/tree/propagation/branches/branches.factor
@@ -31,21 +31,23 @@ M: #dispatch live-children
     [ children>> ] [ in-d>> first value-info interval>> ] bi
     '[ , interval-contains? [ drop f ] unless ] map-index ;
 
-: infer-children ( node -- assocs )
+SYMBOL: infer-children-data
+
+: infer-children ( node -- )
     [ live-children ] [ child-constraints ] bi [
         [
             over [
                 value-infos [ clone ] change
                 constraints [ clone ] change
                 assume
-                first>> (propagate)
+                (propagate)
             ] [
                 2drop
                 value-infos off
                 constraints off
             ] if
         ] H{ } make-assoc
-    ] 2map ;
+    ] 2map infer-children-data set ;
 
 : (merge-value-infos) ( inputs results -- infos )
     '[ , [ [ value-info ] bind ] 2map value-infos-union ] map ;
@@ -53,7 +55,8 @@ M: #dispatch live-children
 : merge-value-infos ( results inputs outputs -- )
     [ swap (merge-value-infos) ] dip set-value-infos ;
 
-: propagate-branch-phi ( results #phi -- )
+M: #phi propagate-before ( #phi -- )
+    infer-children-data get swap
     [ [ phi-in-d>> ] [ out-d>> ] bi merge-value-infos ]
     [ [ phi-in-r>> ] [ out-r>> ] bi merge-value-infos ]
     2bi ;
@@ -67,10 +70,10 @@ M: #dispatch live-children
         ] [ 3drop ] if
     ] 2each ;
 
-: merge-children ( results node -- )
-    [ successor>> propagate-branch-phi ]
-    [ [ in-d>> first ] [ successor>> ] bi 2drop ] ! branch-phi-constraints ]
-    bi ;
+! : merge-children
+!     [ successor>> propagate-branch-phi ]
+!     [ [ in-d>> first ] [ successor>> ] bi 2drop ] ! branch-phi-constraints ]
+!     bi ;
 
 M: #branch propagate-around
-    [ infer-children ] [ merge-children ] [ annotate-node ] tri ;
+    [ infer-children ] [ annotate-node ] bi ;
diff --git a/unfinished/compiler/tree/propagation/inlining/inlining.factor b/unfinished/compiler/tree/propagation/inlining/inlining.factor
new file mode 100644
index 0000000000..a33ef00c34
--- /dev/null
+++ b/unfinished/compiler/tree/propagation/inlining/inlining.factor
@@ -0,0 +1,3 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.tree.propagation.inlining
diff --git a/unfinished/compiler/tree/propagation/nodes/nodes.factor b/unfinished/compiler/tree/propagation/nodes/nodes.factor
index f4712f0d5d..2cc98b28c6 100644
--- a/unfinished/compiler/tree/propagation/nodes/nodes.factor
+++ b/unfinished/compiler/tree/propagation/nodes/nodes.factor
@@ -14,9 +14,4 @@ GENERIC: propagate-after ( node -- )
 
 GENERIC: propagate-around ( node -- )
 
-: (propagate) ( node -- )
-    [
-        USING: classes prettyprint ; dup class .
-        [ propagate-around ] [ successor>> ] bi
-        (propagate)
-    ] when* ;
+: (propagate) ( node -- ) [ [ propagate-around ] each ] when* ;
diff --git a/unfinished/compiler/tree/propagation/propagation-tests.factor b/unfinished/compiler/tree/propagation/propagation-tests.factor
index 531284b4fb..f15927c8f4 100644
--- a/unfinished/compiler/tree/propagation/propagation-tests.factor
+++ b/unfinished/compiler/tree/propagation/propagation-tests.factor
@@ -1,6 +1,6 @@
 USING: kernel compiler.tree.builder compiler.tree
 compiler.tree.propagation compiler.tree.copy-equiv
-compiler.tree.def-use tools.test math math.order
+compiler.tree.normalization tools.test math math.order
 accessors sequences arrays kernel.private vectors
 alien.accessors alien.c-types sequences.private
 byte-arrays classes.algebra classes.tuple.private
@@ -13,10 +13,10 @@ IN: compiler.tree.propagation.tests
 
 : final-info ( quot -- seq )
     build-tree
-    compute-def-use
+    normalize
     compute-copy-equiv
     propagate
-    last-node node-input-infos ;
+    peek node-input-infos ;
 
 : final-classes ( quot -- seq )
     final-info [ class>> ] map ;
diff --git a/unfinished/compiler/tree/propagation/recursive/recursive.factor b/unfinished/compiler/tree/propagation/recursive/recursive.factor
index f5755d77b2..e1905d5b44 100644
--- a/unfinished/compiler/tree/propagation/recursive/recursive.factor
+++ b/unfinished/compiler/tree/propagation/recursive/recursive.factor
@@ -59,7 +59,7 @@ M: #recursive propagate-around ( #recursive -- )
     iter-counter inc
     iter-counter get 10 > [ "Oops" throw ] when
     dup label>> t >>fixed-point drop
-    [ node-child first>> [ propagate-recursive-phi ] [ (propagate) ] bi ]
+    [ child>> [ first propagate-recursive-phi ] [ (propagate) ] bi ]
     [ dup label>> fixed-point>> [ drop ] [ propagate-around ] if ]
     bi ;
 
diff --git a/unfinished/compiler/tree/propagation/simple/simple.factor b/unfinished/compiler/tree/propagation/simple/simple.factor
index 10beb6f6e0..42468dff8d 100644
--- a/unfinished/compiler/tree/propagation/simple/simple.factor
+++ b/unfinished/compiler/tree/propagation/simple/simple.factor
@@ -13,7 +13,7 @@ compiler.tree.propagation.constraints ;
 IN: compiler.tree.propagation.simple
 
 M: #introduce propagate-before
-    object <class-info> swap values>> [ set-value-info ] with each ;
+    value>> object <class-info> swap set-value-info ;
 
 M: #push propagate-before
     [ literal>> value>> <literal-info> ] [ out-d>> first ] bi
diff --git a/unfinished/compiler/tree/strength-reduction/strength-reduction.factor b/unfinished/compiler/tree/strength-reduction/strength-reduction.factor
new file mode 100644
index 0000000000..c36395bbee
--- /dev/null
+++ b/unfinished/compiler/tree/strength-reduction/strength-reduction.factor
@@ -0,0 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.tree.strength-reduction
+
+: strength-reduce ( nodes -- nodes' ) ;
diff --git a/unfinished/compiler/tree/tree.factor b/unfinished/compiler/tree/tree.factor
index 9a41181726..b0dde22112 100755
--- a/unfinished/compiler/tree/tree.factor
+++ b/unfinished/compiler/tree/tree.factor
@@ -6,41 +6,17 @@ accessors combinators stack-checker.state stack-checker.visitor ;
 IN: compiler.tree
 
 ! High-level tree SSA form.
-!
-! Invariants:
-! 1) Each value has exactly one definition. A "definition" means
-! the value appears in the out-d or out-r slot of a node, or the
-! values slot of an #introduce node.
-! 2) Each value appears only once in the inputs of a node, where
-! the inputs are the concatenation of in-d and in-r, or in the
-! case of a #phi node, the sequence of sequences in the phi-in-r
-! and phi-in-d slots.
-! 3) A value is never used in the same node where it is defined.
-TUPLE: node < identity-tuple
-in-d out-d in-r out-r info
-successor children ;
+
+TUPLE: node < identity-tuple info ;
 
 M: node hashcode* drop node hashcode* ;
 
-: node-child ( node -- child ) children>> first ;
+TUPLE: #introduce < node value ;
 
-: last-node ( node -- last )
-    dup successor>> [ last-node ] [ ] ?if ;
+: #introduce ( value -- node )
+    \ #introduce new swap >>value ;
 
-: penultimate-node ( node -- penultimate )
-    dup successor>> dup [
-        dup successor>>
-        [ nip penultimate-node ] [ drop ] if
-    ] [
-        2drop f
-    ] if ;
-
-TUPLE: #introduce < node values ;
-
-: #introduce ( values -- node )
-    \ #introduce new swap >>values ;
-
-TUPLE: #call < node word history ;
+TUPLE: #call < node word history in-d out-d ;
 
 : #call ( inputs outputs word -- node )
     \ #call new
@@ -48,7 +24,7 @@ TUPLE: #call < node word history ;
         swap >>out-d
         swap >>in-d ;
 
-TUPLE: #call-recursive < node label ;
+TUPLE: #call-recursive < node label in-d out-d ;
 
 : #call-recursive ( inputs outputs label -- node )
     \ #call-recursive new
@@ -56,14 +32,14 @@ TUPLE: #call-recursive < node label ;
         swap >>out-d
         swap >>in-d ;
 
-TUPLE: #push < node literal ;
+TUPLE: #push < node literal out-d ;
 
 : #push ( literal value -- node )
     \ #push new
         swap 1array >>out-d
         swap >>literal ;
 
-TUPLE: #shuffle < node mapping ;
+TUPLE: #shuffle < node mapping in-d out-d ;
 
 : #shuffle ( inputs outputs mapping -- node )
     \ #shuffle new
@@ -74,27 +50,27 @@ TUPLE: #shuffle < node mapping ;
 : #drop ( inputs -- node )
     { } { } #shuffle ;
 
-TUPLE: #>r < node ;
+TUPLE: #>r < node in-d out-r ;
 
 : #>r ( inputs outputs -- node )
     \ #>r new
         swap >>out-r
         swap >>in-d ;
 
-TUPLE: #r> < node ;
+TUPLE: #r> < node in-r out-d ;
 
 : #r> ( inputs outputs -- node )
     \ #r> new
         swap >>out-d
         swap >>in-r ;
 
-TUPLE: #terminate < node ;
+TUPLE: #terminate < node in-d ;
 
 : #terminate ( stack -- node )
     \ #terminate new
         swap >>in-d ;
 
-TUPLE: #branch < node ;
+TUPLE: #branch < node in-d children ;
 
 : new-branch ( value children class -- node )
     new
@@ -111,7 +87,7 @@ TUPLE: #dispatch < #branch ;
 : #dispatch ( n branches -- node )
     \ #dispatch new-branch ;
 
-TUPLE: #phi < node phi-in-d phi-in-r ;
+TUPLE: #phi < node phi-in-d phi-in-r out-d out-r ;
 
 : #phi ( d-phi-in d-phi-out r-phi-in r-phi-out -- node )
     \ #phi new
@@ -126,22 +102,22 @@ TUPLE: #declare < node declaration ;
     \ #declare new
         swap >>declaration ;
 
-TUPLE: #return < node ;
+TUPLE: #return < node in-d ;
 
 : #return ( stack -- node )
     \ #return new
         swap >>in-d ;
 
-TUPLE: #recursive < node word label loop? returns calls ;
+TUPLE: #recursive < node in-d word label loop? returns calls child ;
 
 : #recursive ( word label inputs child -- node )
     \ #recursive new
-        swap 1array >>children
+        swap >>child
         swap >>in-d
         swap >>label
         swap >>word ;
 
-TUPLE: #enter-recursive < node label ;
+TUPLE: #enter-recursive < node in-d out-d label ;
 
 : #enter-recursive ( label inputs outputs -- node )
     \ #enter-recursive new
@@ -149,7 +125,7 @@ TUPLE: #enter-recursive < node label ;
         swap >>in-d
         swap >>label ;
 
-TUPLE: #return-recursive < node label ;
+TUPLE: #return-recursive < node in-d out-d label ;
 
 : #return-recursive ( label inputs outputs -- node )
     \ #return-recursive new
@@ -157,44 +133,31 @@ TUPLE: #return-recursive < node label ;
         swap >>in-d
         swap >>label ;
 
-TUPLE: #copy < node ;
+TUPLE: #copy < node in-d out-d ;
 
 : #copy ( inputs outputs -- node )
     \ #copy new
         swap >>out-d
         swap >>in-d ;
 
-DEFER: #tail?
+: node, ( node -- ) stack-visitor get push ;
 
-PREDICATE: #tail-phi < #phi successor>> #tail? ;
-
-UNION: #tail POSTPONE: f #return #tail-phi #terminate ;
-
-TUPLE: node-list first last ;
-
-: node, ( node -- )
-    stack-visitor get swap
-    over last>>
-    [ [ [ last>> ] dip >>successor drop ] [ >>last drop ] 2bi ]
-    [ [ >>first ] [ >>last ] bi drop ]
-    if ;
-
-M: node-list child-visitor node-list new ;
-M: node-list #introduce, #introduce node, ;
-M: node-list #call, #call node, ;
-M: node-list #push, #push node, ;
-M: node-list #shuffle, #shuffle node, ;
-M: node-list #drop, #drop node, ;
-M: node-list #>r, #>r node, ;
-M: node-list #r>, #r> node, ;
-M: node-list #return, #return node, ;
-M: node-list #enter-recursive, #enter-recursive node, ;
-M: node-list #return-recursive, #return-recursive [ node, ] [ dup label>> (>>return) ] bi ;
-M: node-list #call-recursive, #call-recursive [ node, ] [ dup label>> calls>> push ] bi ;
-M: node-list #terminate, #terminate node, ;
-M: node-list #if, #if node, ;
-M: node-list #dispatch, #dispatch node, ;
-M: node-list #phi, #phi node, ;
-M: node-list #declare, #declare node, ;
-M: node-list #recursive, #recursive node, ;
-M: node-list #copy, #copy node, ;
+M: vector child-visitor V{ } clone ;
+M: vector #introduce, #introduce node, ;
+M: vector #call, #call node, ;
+M: vector #push, #push node, ;
+M: vector #shuffle, #shuffle node, ;
+M: vector #drop, #drop node, ;
+M: vector #>r, #>r node, ;
+M: vector #r>, #r> node, ;
+M: vector #return, #return node, ;
+M: vector #enter-recursive, #enter-recursive node, ;
+M: vector #return-recursive, #return-recursive node, ;
+M: vector #call-recursive, #call-recursive node, ;
+M: vector #terminate, #terminate node, ;
+M: vector #if, #if node, ;
+M: vector #dispatch, #dispatch node, ;
+M: vector #phi, #phi node, ;
+M: vector #declare, #declare node, ;
+M: vector #recursive, #recursive node, ;
+M: vector #copy, #copy node, ;
diff --git a/unfinished/compiler/tree/untupling/untupling.factor b/unfinished/compiler/tree/untupling/untupling.factor
index ebc43ece08..7286e6fb65 100644
--- a/unfinished/compiler/tree/untupling/untupling.factor
+++ b/unfinished/compiler/tree/untupling/untupling.factor
@@ -3,7 +3,8 @@
 USING: accessors slots.private kernel namespaces disjoint-sets
 math sequences assocs classes.tuple.private combinators fry sets
 compiler.tree compiler.tree.combinators compiler.tree.copy-equiv
-compiler.tree.dfa compiler.tree.dfa.backward ;
+compiler.tree.dataflow-analysis
+compiler.tree.dataflow-analysis.backward ;
 IN: compiler.tree.untupling
 
 SYMBOL: escaping-values
diff --git a/unfinished/stack-checker/backend/backend.factor b/unfinished/stack-checker/backend/backend.factor
index 2977f2520a..658a1e9fa1 100755
--- a/unfinished/stack-checker/backend/backend.factor
+++ b/unfinished/stack-checker/backend/backend.factor
@@ -41,7 +41,7 @@ SYMBOL: visited
 
 : pop-d  ( -- obj )
     meta-d get dup empty? [
-        drop <value> dup 1array #introduce, d-in inc
+        drop <value> dup #introduce, d-in inc
     ] [ pop ] if ;
 
 : peek-d ( -- obj ) pop-d dup push-d ;
@@ -52,8 +52,11 @@ SYMBOL: visited
 
 : ensure-d ( n -- values ) consume-d dup output-d ;
 
+: make-values ( n -- values )
+    [ <value> ] replicate ;
+
 : produce-d ( n -- values )
-    [ <value> ] replicate dup meta-d get push-all ;
+    make-values dup meta-d get push-all ;
 
 : push-r ( obj -- ) meta-r get push ;
 
diff --git a/unfinished/stack-checker/visitor/visitor.factor b/unfinished/stack-checker/visitor/visitor.factor
index 231b0ab9bf..ce30d12c7e 100644
--- a/unfinished/stack-checker/visitor/visitor.factor
+++ b/unfinished/stack-checker/visitor/visitor.factor
@@ -9,7 +9,7 @@ HOOK: child-visitor stack-visitor ( -- visitor )
 
 : nest-visitor ( -- ) child-visitor stack-visitor set ;
 
-HOOK: #introduce, stack-visitor ( values -- )
+HOOK: #introduce, stack-visitor ( value -- )
 HOOK: #call, stack-visitor ( inputs outputs word -- )
 HOOK: #call-recursive, stack-visitor ( inputs outputs word -- )
 HOOK: #push, stack-visitor ( literal value -- )

From 9cc761d8991f5cd60e559b11e8bef1ea7f863dd9 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 27 Jul 2008 22:45:46 -0500
Subject: [PATCH 02/77] More efficient branch? word

---
 extra/sequences/deep/deep.factor | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/extra/sequences/deep/deep.factor b/extra/sequences/deep/deep.factor
index 3ec793f458..2e50fa5411 100644
--- a/extra/sequences/deep/deep.factor
+++ b/extra/sequences/deep/deep.factor
@@ -5,10 +5,12 @@ IN: sequences.deep
 
 ! All traversal goes in postorder
 
-: branch? ( object -- ? )
-    dup sequence? [
-        dup string? swap number? or not
-    ] [ drop f ] if ;
+GENERIC: branch? ( object -- ? )
+
+M: sequence branch? drop t ;
+M: integer branch? drop f ;
+M: string branch? drop f ;
+M: object branch? drop f ;
 
 : deep-each ( obj quot: ( elt -- ) -- )
     [ call ] 2keep over branch?

From 9d248286045f3dd8f003c4292d711be65d2f813a Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 27 Jul 2008 22:47:40 -0500
Subject: [PATCH 03/77] Beefed up normalization pass cleans up stack usage,
 simplifying recursive propagation

---
 .../tree/combinators/combinators-tests.factor |  1 +
 .../tree/combinators/combinators.factor       | 15 +++-
 .../tree/copy-equiv/copy-equiv.factor         |  7 --
 .../normalization/normalization-tests.factor  | 10 +--
 .../tree/normalization/normalization.factor   | 79 +++++++++++++------
 .../tree/propagation/propagation-tests.factor |  7 ++
 .../propagation/recursive/recursive.factor    | 35 +++-----
 .../stack-checker/inlining/inlining.factor    |  2 +-
 8 files changed, 95 insertions(+), 61 deletions(-)

diff --git a/unfinished/compiler/tree/combinators/combinators-tests.factor b/unfinished/compiler/tree/combinators/combinators-tests.factor
index 12ab7e3563..66ad5e11f4 100644
--- a/unfinished/compiler/tree/combinators/combinators-tests.factor
+++ b/unfinished/compiler/tree/combinators/combinators-tests.factor
@@ -2,3 +2,4 @@ IN: compiler.tree.combinators.tests
 USING: compiler.tree.combinators tools.test kernel ;
 
 { 1 0 } [ [ drop ] each-node ] must-infer-as
+{ 1 1 } [ [ ] map-nodes ] must-infer-as
diff --git a/unfinished/compiler/tree/combinators/combinators.factor b/unfinished/compiler/tree/combinators/combinators.factor
index 94bcdb2d95..eafbb198a1 100644
--- a/unfinished/compiler/tree/combinators/combinators.factor
+++ b/unfinished/compiler/tree/combinators/combinators.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry kernel accessors sequences compiler.tree ;
+USING: fry kernel accessors sequences sequences.deep
+compiler.tree ;
 IN: compiler.tree.combinators
 
 : each-node ( nodes quot -- )
@@ -15,3 +16,15 @@ IN: compiler.tree.combinators
             ] if
         ] bi
     ] each ; inline
+
+: map-nodes ( nodes quot: ( node -- node' ) -- nodes )
+    dup dup '[
+        @
+        dup #branch? [
+            [ [ , map-nodes ] map ] change-children
+        ] [
+            dup #recursive? [
+                [ , map-nodes ] change-child
+            ] when
+        ] if
+    ] map flatten ; inline recursive
diff --git a/unfinished/compiler/tree/copy-equiv/copy-equiv.factor b/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
index 2b7b6c5ecb..a414554efc 100644
--- a/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
+++ b/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
@@ -34,13 +34,6 @@ M: #copy compute-copy-equiv*
 M: #return-recursive compute-copy-equiv*
     [ in-d>> ] [ out-d>> ] bi are-copies-of ;
 
-: unchanged-underneath ( #call-recursive -- n )
-    [ out-d>> length ] [ label>> return>> in-d>> length ] bi - ;
-
-M: #call-recursive compute-copy-equiv*
-    [ in-d>> ] [ out-d>> ] [ unchanged-underneath ] tri
-    '[ , head ] bi@ are-copies-of ;
-
 M: node compute-copy-equiv* drop ;
 
 : compute-copy-equiv ( node -- node )
diff --git a/unfinished/compiler/tree/normalization/normalization-tests.factor b/unfinished/compiler/tree/normalization/normalization-tests.factor
index 39a71ad0a6..91c11f3be6 100644
--- a/unfinished/compiler/tree/normalization/normalization-tests.factor
+++ b/unfinished/compiler/tree/normalization/normalization-tests.factor
@@ -2,18 +2,18 @@ IN: compiler.tree.normalization.tests
 USING: compiler.tree.builder compiler.tree.normalization
 compiler.tree sequences accessors tools.test kernel ;
 
-\ collect-introductions must-infer
+\ count-introductions must-infer
 \ fixup-enter-recursive must-infer
 \ eliminate-introductions must-infer
 \ normalize must-infer
 
-[ 3 ] [ [ 3drop 1 2 3 ] build-tree collect-introductions ] unit-test
+[ 3 ] [ [ 3drop 1 2 3 ] build-tree count-introductions ] unit-test
 
-[ 4 ] [ [ 3drop 1 2 3 3drop drop ] build-tree collect-introductions ] unit-test
+[ 4 ] [ [ 3drop 1 2 3 3drop drop ] build-tree count-introductions ] unit-test
 
-[ 3 ] [ [ [ drop ] [ 2drop 3 ] if ] build-tree collect-introductions ] unit-test
+[ 3 ] [ [ [ drop ] [ 2drop 3 ] if ] build-tree count-introductions ] unit-test
 
-[ 2 ] [ [ 3 [ drop ] [ 2drop 3 ] if ] build-tree collect-introductions ] unit-test
+[ 2 ] [ [ 3 [ drop ] [ 2drop 3 ] if ] build-tree count-introductions ] unit-test
 
 : foo ( -- ) swap ; inline recursive
 
diff --git a/unfinished/compiler/tree/normalization/normalization.factor b/unfinished/compiler/tree/normalization/normalization.factor
index 38fa3e11b3..976d51dfb6 100644
--- a/unfinished/compiler/tree/normalization/normalization.factor
+++ b/unfinished/compiler/tree/normalization/normalization.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces sequences math accessors kernel arrays
-stack-checker.backend compiler.tree compiler.tree.combinators ;
+USING: fry namespaces sequences math accessors kernel arrays
+stack-checker.backend stack-checker.inlining compiler.tree
+compiler.tree.combinators ;
 IN: compiler.tree.normalization
 
 ! A transform pass done before optimization can begin to
@@ -13,29 +14,52 @@ IN: compiler.tree.normalization
 !
 ! - We collect #return-recursive and #call-recursive nodes and
 ! store them in the #recursive's label slot.
-
-GENERIC: normalize* ( node -- )
+!
+! - We normalize #call-recursive as follows. The stack checker
+! says that the inputs of a #call-recursive are the entire stack
+! at the time of the call. This is a conservative estimate; we
+! don't know the exact number of stack values it touches until
+! the #return-recursive node has been visited, because of row
+! polymorphism. So in the normalize pass, we split a
+! #call-recursive into a #copy of the unchanged values and a
+! #call-recursive with trimmed inputs and outputs.
 
 ! Collect introductions
 SYMBOL: introductions
 
-GENERIC: collect-introductions* ( node -- )
+GENERIC: count-introductions* ( node -- )
 
-: collect-introductions ( nodes -- n )
+: count-introductions ( nodes -- n )
+    #! Note: we use each, not each-node, since the #branch
+    #! method recurses into children directly and we don't
+    #! recurse into #recursive at all.
     [
         0 introductions set
-        [ collect-introductions* ] each
+        [ count-introductions* ] each
         introductions get
     ] with-scope ;
 
-M: #introduce collect-introductions* drop introductions inc ;
+M: #introduce count-introductions* drop introductions inc ;
 
-M: #branch collect-introductions*
+M: #branch count-introductions*
     children>>
-    [ collect-introductions ] map supremum
+    [ count-introductions ] map supremum
     introductions [ + ] change ;
 
-M: node collect-introductions* drop ;
+M: node count-introductions* drop ;
+
+! Collect label info
+GENERIC: collect-label-info ( node -- )
+
+M: #return-recursive collect-label-info dup label>> (>>return) ;
+
+M: #call-recursive collect-label-info dup label>> calls>> push ;
+
+M: #recursive collect-label-info
+    [ label>> ] [ child>> count-introductions ] bi
+    >>introductions drop ;
+
+M: node collect-label-info drop ;
 
 ! Eliminate introductions
 SYMBOL: introduction-stack
@@ -73,22 +97,29 @@ M: #phi eliminate-introductions*
 M: node eliminate-introductions* ;
 
 : eliminate-introductions ( recursive n -- )
-    make-values introduction-stack set
-    [ fixup-enter-recursive ]
-    [ child>> [ eliminate-introductions* ] change-each ] bi ;
+    make-values introduction-stack [
+        [ fixup-enter-recursive ]
+        [ child>> [ eliminate-introductions* ] change-each ] bi
+    ] with-variable ;
+
+! Normalize
+GENERIC: normalize* ( node -- node' )
 
 M: #recursive normalize*
-    [
-        [ child>> collect-introductions ]
-        [ swap eliminate-introductions ]
-        bi
-    ] with-scope ;
+    dup dup label>> introductions>> eliminate-introductions ;
 
-! Collect label info
-M: #return-recursive normalize* dup label>> (>>return) ;
+: unchanged-underneath ( #call-recursive -- n )
+    [ out-d>> length ] [ label>> return>> in-d>> length ] bi - ;
 
-M: #call-recursive normalize* dup label>> calls>> push ;
+M: #call-recursive normalize*
+    dup unchanged-underneath
+    [ [ [ in-d>> ] [ out-d>> ] bi ] [ '[ , head ] ] bi* bi@ #copy ]
+    [ '[ , tail ] [ change-in-d ] [ change-out-d ] bi ]
+    2bi 2array ;
 
-M: node normalize* drop ;
+M: node normalize* ;
 
-: normalize ( node -- node ) dup [ normalize* ] each-node ;
+: normalize ( nodes -- nodes' )
+    [ [ collect-label-info ] each-node ]
+    [ [ normalize* ] map-nodes ]
+    bi ;
diff --git a/unfinished/compiler/tree/propagation/propagation-tests.factor b/unfinished/compiler/tree/propagation/propagation-tests.factor
index f15927c8f4..6deb80947a 100644
--- a/unfinished/compiler/tree/propagation/propagation-tests.factor
+++ b/unfinished/compiler/tree/propagation/propagation-tests.factor
@@ -406,3 +406,10 @@ TUPLE: mixed-mutable-immutable { x integer } { y sequence read-only } ;
     dup 1 <= [ drop 1 ] [ dup 1 - recursive-test-6 swap 2 - recursive-test-6 + ] if ; inline recursive
 
 [ V{ integer } ] [ [ { fixnum } declare recursive-test-6 ] final-classes ] unit-test
+
+: recursive-test-7 ( a -- b )
+    dup 10 < [ 1+ recursive-test-7 ] when ; inline recursive
+
+[ V{ fixnum } ] [ [ 0 recursive-test-7 ] final-classes ] unit-test
+
+[ V{ fixnum } ] [ [ 1 10 [ dup 10 < [ 2 * ] when ] times ] final-classes ] unit-test
diff --git a/unfinished/compiler/tree/propagation/recursive/recursive.factor b/unfinished/compiler/tree/propagation/recursive/recursive.factor
index e1905d5b44..8f50add191 100644
--- a/unfinished/compiler/tree/propagation/recursive/recursive.factor
+++ b/unfinished/compiler/tree/propagation/recursive/recursive.factor
@@ -10,33 +10,25 @@ compiler.tree.propagation.simple
 compiler.tree.propagation.branches ;
 IN: compiler.tree.propagation.recursive
 
-! row polymorphism is causing problems
-
-: longest-suffix ( seq1 seq2 -- seq1' seq2' )
-    2dup min-length [ tail-slice* ] curry bi@ ;
-
-: suffixes= ( seq1 seq2 -- ? )
-    longest-suffix sequence= ;
-
 : check-fixed-point ( node infos1 infos2 -- node )
-    suffixes= [ dup label>> f >>fixed-point drop ] unless ; inline
+    sequence= [ dup label>> f >>fixed-point drop ] unless ; inline
 
 : recursive-stacks ( #enter-recursive -- stacks initial )
-    [ label>> calls>> [ node-input-infos ] map ]
-    [ in-d>> [ value-info ] map ] bi
-    [ length '[ , tail* ] map flip ] keep ;
+    [ label>> calls>> [ node-input-infos ] map flip ]
+    [ in-d>> [ value-info ] map ] bi ;
 
-: generalize-counter-interval ( i1 i2 -- i3 )
+: generalize-counter-interval ( interval initial-interval -- interval' )
     {
-        { [ 2dup interval<= ] [ 1./0. [a,a] ] }
-        { [ 2dup interval>= ] [ -1./0. [a,a] ] }
+        { [ 2dup = ] [ empty-interval ] }
+        { [ over empty-interval eq? ] [ empty-interval ] }
+        { [ 2dup interval>= t eq? ] [ 1./0. [a,a] ] }
+        { [ 2dup interval<= t eq? ] [ -1./0. [a,a] ] }
         [ [-inf,inf] ]
     } cond nip interval-union ;
 
 : generalize-counter ( info' initial -- info )
     [ drop clone ] [ [ interval>> ] bi@ ] 2bi
-    generalize-counter-interval >>interval
-    f >>literal? f >>literal ;
+    generalize-counter-interval >>interval ;
 
 : unify-recursive-stacks ( stacks initial -- infos )
     over empty? [ nip ] [
@@ -72,12 +64,9 @@ M: #recursive propagate-around ( #recursive -- )
     [ generalize-return-interval ] map ;
 
 M: #call-recursive propagate-before ( #call-label -- )
-    dup
-    [ node-output-infos ]
-    [ label>> return>> node-input-infos ]
-    bi check-fixed-point
-    [ label>> return>> node-input-infos generalize-return ] [ out-d>> ] bi
-    longest-suffix set-value-infos ;
+    dup [ node-output-infos ] [ label>> return>> node-input-infos ] bi
+    [ check-fixed-point ] keep
+    generalize-return swap out-d>> set-value-infos ;
 
 M: #return-recursive propagate-before ( #return-recursive -- )
     dup [ node-input-infos ] [ in-d>> [ value-info ] map ] bi
diff --git a/unfinished/stack-checker/inlining/inlining.factor b/unfinished/stack-checker/inlining/inlining.factor
index 5dc159bcc4..ace1a043cb 100644
--- a/unfinished/stack-checker/inlining/inlining.factor
+++ b/unfinished/stack-checker/inlining/inlining.factor
@@ -17,7 +17,7 @@ IN: stack-checker.inlining
 : (inline-word) ( word label -- )
     [ [ def>> ] keep ] dip infer-quot-recursive ;
 
-TUPLE: inline-recursive word enter-out return calls fixed-point ;
+TUPLE: inline-recursive word enter-out return calls fixed-point introductions ;
 
 : <inline-recursive> ( word -- label )
     inline-recursive new

From 1c091ed24b04cc85f639616af2e0ba80d71aef1b Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 00:48:29 -0500
Subject: [PATCH 04/77] processing.shapes: Factor out shape drawing code. It is
 not specific to processing.

---
 extra/processing/shapes/shapes.factor | 112 ++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 extra/processing/shapes/shapes.factor

diff --git a/extra/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor
new file mode 100644
index 0000000000..6f680a87e6
--- /dev/null
+++ b/extra/processing/shapes/shapes.factor
@@ -0,0 +1,112 @@
+
+USING: kernel namespaces arrays sequences grouping
+       alien.c-types
+       math math.vectors math.geometry.rect
+       opengl.gl opengl.glu opengl generalizations vars
+       combinators.cleave  ;
+
+IN: processing.shapes
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+VAR: fill-color
+VAR: stroke-color
+
+{ 0 0 0 1 } stroke-color set-global
+{ 1 1 1 1 } fill-color   set-global
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: fill-mode ( -- )
+  GL_FRONT_AND_BACK GL_FILL glPolygonMode
+  fill-color> first4 glColor4d ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: stroke-mode ( -- )
+  GL_FRONT_AND_BACK GL_LINE glPolygonMode
+  stroke-color> first4 glColor4d ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: gl-vertex-2d ( vertex -- ) first2 glVertex2d ;
+
+: gl-vertices-2d ( vertices -- ) [ gl-vertex-2d ] each ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: point* ( x y    -- ) stroke-mode GL_POINTS [ glVertex2d     ] do-state ;
+: point  ( point  -- ) stroke-mode GL_POINTS [ gl-vertex-2d   ] do-state ;
+: points ( points -- ) stroke-mode GL_POINTS [ gl-vertices-2d ] do-state ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: line** ( x y x y -- )
+  stroke-mode GL_LINES [ glVertex2d glVertex2d ] do-state ;
+
+: line* ( a b -- ) stroke-mode GL_LINES [ [ gl-vertex-2d ] bi@ ] do-state ;
+
+: lines ( seq -- ) stroke-mode GL_LINES [ gl-vertices-2d ] do-state ;
+
+: line ( seq -- ) lines ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: triangles ( seq -- )
+  [ fill-mode   GL_TRIANGLES [ gl-vertices-2d ] do-state ]
+  [ stroke-mode GL_TRIANGLES [ gl-vertices-2d ] do-state ] bi ;
+
+: triangle ( seq -- ) triangles ;
+
+: triangle* ( a b c -- ) 3array triangles ;
+
+: triangle** ( x y x y x y -- ) 6 narray 2 group triangles ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: polygon ( seq -- )
+  [ fill-mode   GL_POLYGON [ gl-vertices-2d ] do-state ]
+  [ stroke-mode GL_POLYGON [ gl-vertices-2d ] do-state ] bi ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: rectangle ( loc dim -- )
+  <rect>
+    { top-left top-right bottom-right bottom-left }
+  1arr
+  polygon ;
+
+: rectangle* ( x y width height -- ) [ 2array ] 2bi@ rectangle ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: gl-translate-2d ( pos -- ) first2 0 glTranslated ;
+
+: gl-scale-2d ( xy -- ) first2 1 glScaled ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: gl-ellipse ( center dim -- )
+  glPushMatrix
+    [ gl-translate-2d ] [ gl-scale-2d ] bi*
+    gluNewQuadric
+      dup 0 0.5 20 1 gluDisk
+    gluDeleteQuadric
+  glPopMatrix ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: gl-get-line-width ( -- width )
+  GL_LINE_WIDTH 0 <double> tuck glGetDoublev *double ;
+
+: ellipse ( center dim -- )
+  GL_FRONT_AND_BACK GL_FILL glPolygonMode
+  [ stroke-color> gl-color                                 gl-ellipse ]
+  [ fill-color> gl-color gl-get-line-width 2 * dup 2array v- gl-ellipse ] 2bi ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: circle ( center size -- ) dup 2array ellipse ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+

From d6ad62ebf031a247b97ad0b47667df1006de6230 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 00:49:34 -0500
Subject: [PATCH 05/77] golden-section: Use processing.shapes

---
 extra/golden-section/golden-section.factor | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/extra/golden-section/golden-section.factor b/extra/golden-section/golden-section.factor
index 8ae8bccc25..a83dc988fd 100644
--- a/extra/golden-section/golden-section.factor
+++ b/extra/golden-section/golden-section.factor
@@ -1,21 +1,14 @@
 
-USING: kernel namespaces math math.constants math.functions arrays sequences
+USING: kernel namespaces math math.constants math.functions math.order
+       arrays sequences
        opengl opengl.gl opengl.glu ui ui.render ui.gadgets ui.gadgets.theme
-       ui.gadgets.slate colors accessors combinators.cleave ;
+       ui.gadgets.slate colors accessors combinators.cleave
+       processing.shapes ;
 
 IN: golden-section
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: disk ( radius center -- )
-  glPushMatrix
-  gl-translate
-  dup 0 glScalef
-  gluNewQuadric [ 0 1 20 20 gluDisk ] [ gluDeleteQuadric ] bi
-  glPopMatrix ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 ! omega(i) = 2*pi*i*(phi-1)
 
 ! x(i) = 0.5*i*cos(omega(i))
@@ -34,12 +27,13 @@ IN: golden-section
 
 : radius ( i -- radius ) pi * 720 / sin 10 * ;
 
-: color ( i -- color ) 360.0 / dup 0.25 1 4array ;
+: color ( i -- i ) dup 360.0 / dup 0.25 1 4array >fill-color ;
 
-: rim   ( i -- ) [ drop black gl-color ] [ radius 1.5 * ] [ center ] tri disk ;
-: inner ( i -- ) [      color gl-color ] [ radius       ] [ center ] tri disk ;
+: line-width ( i -- i ) dup radius 0.5 * 1 max glLineWidth ;
 
-: dot ( i -- ) [ rim ] [ inner ] bi ;
+: draw ( i -- ) [ center ] [ radius 1.5 * 2 * ] bi circle ;
+
+: dot ( i -- ) color line-width draw ;
 
 : golden-section ( -- ) 720 [ dot ] each ;
 

From 7a3a0d3677b523442b11b605f888ba7bb91fb6f6 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 00:50:08 -0500
Subject: [PATCH 06/77] boids: Up the initial boids count to 100

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

diff --git a/extra/boids/boids.factor b/extra/boids/boids.factor
index ab624a606b..8c045ee270 100644
--- a/extra/boids/boids.factor
+++ b/extra/boids/boids.factor
@@ -220,7 +220,7 @@ cond ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: init-boids ( -- ) 50 random-boids >boids ;
+: init-boids ( -- ) 100 random-boids >boids ;
 
 : init-world-size ( -- ) { 100 100 } >world-size ;
 

From 86a881f1f2b8facdb37258610f87298abffa0963 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 00:50:22 -0500
Subject: [PATCH 07/77] boids.ui: Use processing.shapes

---
 extra/boids/ui/ui.factor | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/extra/boids/ui/ui.factor b/extra/boids/ui/ui.factor
index 064eda841b..f380441960 100755
--- a/extra/boids/ui/ui.factor
+++ b/extra/boids/ui/ui.factor
@@ -1,6 +1,7 @@
 
 USING: combinators.short-circuit kernel namespaces
        math
+       math.trig
        math.functions
        math.vectors
        math.parser
@@ -21,7 +22,8 @@ USING: combinators.short-circuit kernel namespaces
        ui.gestures
        assocs.lib vars rewrite-closures boids accessors
        math.geometry.rect
-       newfx ;
+       newfx
+       processing.shapes ;
 
 IN: boids.ui
 
@@ -29,17 +31,22 @@ IN: boids.ui
 ! draw-boid
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: point-a ( boid -- a ) pos>> ;
-
-: point-b ( boid -- b ) [ pos>> ] [ vel>> normalize* 20 v*n ] bi v+ ;
-
-: boid-points ( boid -- point-a point-b ) [ point-a ] [ point-b ] bi ;
-
-: draw-boid ( boid -- ) boid-points gl-line ;
+: draw-boid ( boid -- )
+  glPushMatrix
+    dup pos>> gl-translate-2d
+        vel>> first2 rect> arg rad>deg 0 0 1 glRotated
+    { { 0 5 } { 0 -5 } { 20 0 } } triangle
+  glPopMatrix ;
 
 : draw-boids ( -- ) boids> [ draw-boid ] each ;
 
-: display ( -- ) black gl-color draw-boids ;
+: boid-color ( -- color ) { 1.0 0 0 0.3 } ;
+
+: display ( -- )
+  white gl-clear
+  boid-color >fill-color
+  2 glLineWidth
+  draw-boids ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From d2352a15e6b5e039d4e249b590ce37b4ea9e8c7c Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 01:41:10 -0500
Subject: [PATCH 08/77] processing.shapes: Use 'gl-color' in a couple of places

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

diff --git a/extra/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor
index 6f680a87e6..16530c5414 100644
--- a/extra/processing/shapes/shapes.factor
+++ b/extra/processing/shapes/shapes.factor
@@ -19,13 +19,13 @@ VAR: stroke-color
 
 : fill-mode ( -- )
   GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  fill-color> first4 glColor4d ;
+  fill-color> gl-color ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : stroke-mode ( -- )
   GL_FRONT_AND_BACK GL_LINE glPolygonMode
-  stroke-color> first4 glColor4d ;
+  stroke-color> gl-color ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From 4f10ed4aaf1dd545c2e44a8266e27f8ebe0c12e8 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 01:41:49 -0500
Subject: [PATCH 09/77] boids.ui: Add workaround for display glitch

---
 extra/boids/ui/ui.factor | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extra/boids/ui/ui.factor b/extra/boids/ui/ui.factor
index f380441960..38dd9b4f78 100755
--- a/extra/boids/ui/ui.factor
+++ b/extra/boids/ui/ui.factor
@@ -36,6 +36,7 @@ IN: boids.ui
     dup pos>> gl-translate-2d
         vel>> first2 rect> arg rad>deg 0 0 1 glRotated
     { { 0 5 } { 0 -5 } { 20 0 } } triangle
+    fill-mode
   glPopMatrix ;
 
 : draw-boids ( -- ) boids> [ draw-boid ] each ;
@@ -43,9 +44,7 @@ IN: boids.ui
 : boid-color ( -- color ) { 1.0 0 0 0.3 } ;
 
 : display ( -- )
-  white gl-clear
   boid-color >fill-color
-  2 glLineWidth
   draw-boids ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

From ed7ad146d8ba10c92ed217ddf07bceed805a64a4 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 06:31:11 -0500
Subject: [PATCH 10/77] Fix NaN handling in math.intervals

---
 core/math/intervals/intervals.factor | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/math/intervals/intervals.factor b/core/math/intervals/intervals.factor
index 8afbee3478..6e50f42726 100755
--- a/core/math/intervals/intervals.factor
+++ b/core/math/intervals/intervals.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2007 Slava Pestov.
+! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Based on Slate's src/unfinished/interval.slate by Brian Rice.
 USING: accessors kernel sequences arrays math math.order
@@ -76,9 +76,11 @@ TUPLE: interval { from read-only } { to read-only } ;
     [ from>> ] [ to>> ] bi ;
 
 : points>interval ( seq -- interval )
-    dup first
-    [ [ endpoint-min ] reduce ] 2keep
-    [ endpoint-max ] reduce <interval> ;
+    dup [ first fp-nan? ] contains? [ drop [-inf,inf] ] [
+        dup first
+        [ [ endpoint-min ] reduce ] 2keep
+        [ endpoint-max ] reduce <interval>
+    ] if ;
 
 : (interval-op) ( p1 p2 quot -- p3 )
     [ [ first ] [ first ] [ ] tri* call ]

From d817efe1dd4dad34323b51876b48d6f514057504 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 06:31:26 -0500
Subject: [PATCH 11/77] Working on predicate constraint propagation

---
 .../tree/copy-equiv/copy-equiv.factor         |  13 +++
 .../tree/elaboration/elaboration.factor       |   5 +
 .../compiler/tree/optimizer/optimizer.factor  |   3 +-
 .../tree/propagation/branches/branches.factor | 104 ++++++++++++++----
 .../constraints/constraints.factor            |  82 ++++++--------
 .../tree/propagation/info/info.factor         |  11 +-
 .../known-words/known-words.factor            |  11 +-
 .../tree/propagation/propagation-tests.factor |  38 +++++++
 .../propagation/recursive/recursive.factor    |  15 ++-
 .../tree/propagation/simple/simple.factor     |   7 +-
 .../tree/propagation/slots/slots.factor       |   2 +-
 unfinished/compiler/tree/tree.factor          |   2 +-
 .../stack-checker/backend/backend.factor      |   2 +-
 13 files changed, 203 insertions(+), 92 deletions(-)
 create mode 100644 unfinished/compiler/tree/elaboration/elaboration.factor

diff --git a/unfinished/compiler/tree/copy-equiv/copy-equiv.factor b/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
index a414554efc..b45bc4bbe2 100644
--- a/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
+++ b/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
@@ -34,6 +34,19 @@ M: #copy compute-copy-equiv*
 M: #return-recursive compute-copy-equiv*
     [ in-d>> ] [ out-d>> ] bi are-copies-of ;
 
+: compute-phi-equiv ( inputs outputs -- )
+    #! An output is a copy of every input if all inputs are
+    #! copies of the same original value.
+    [
+        swap [ resolve-copy ] map sift
+        dup [ all-equal? ] [ empty? not ] bi and
+        [ first swap is-copy-of ] [ 2drop ] if
+    ] 2each ;
+
+M: #phi compute-copy-equiv*
+    [ [ phi-in-d>> ] [ out-d>> ] bi compute-phi-equiv ]
+    [ [ phi-in-r>> ] [ out-r>> ] bi compute-phi-equiv ] bi ;
+
 M: node compute-copy-equiv* drop ;
 
 : compute-copy-equiv ( node -- node )
diff --git a/unfinished/compiler/tree/elaboration/elaboration.factor b/unfinished/compiler/tree/elaboration/elaboration.factor
new file mode 100644
index 0000000000..b0f4306964
--- /dev/null
+++ b/unfinished/compiler/tree/elaboration/elaboration.factor
@@ -0,0 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.tree.elaboration
+
+: elaborate ( nodes -- nodes' ) ;
diff --git a/unfinished/compiler/tree/optimizer/optimizer.factor b/unfinished/compiler/tree/optimizer/optimizer.factor
index bb33deb7e7..753c962061 100644
--- a/unfinished/compiler/tree/optimizer/optimizer.factor
+++ b/unfinished/compiler/tree/optimizer/optimizer.factor
@@ -18,4 +18,5 @@ IN: compiler.tree.optimizer
     remove-dead-code
     strength-reduce
     detect-loops
-    fuse-branches ;
+    fuse-branches
+    elaborate ;
diff --git a/unfinished/compiler/tree/propagation/branches/branches.factor b/unfinished/compiler/tree/propagation/branches/branches.factor
index a8b623eb51..9480033ccc 100644
--- a/unfinished/compiler/tree/propagation/branches/branches.factor
+++ b/unfinished/compiler/tree/propagation/branches/branches.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: fry kernel sequences assocs accessors namespaces
-math.intervals arrays classes.algebra locals
+math.intervals arrays classes.algebra combinators
 compiler.tree
 compiler.tree.def-use
 compiler.tree.propagation.info
@@ -33,12 +33,15 @@ M: #dispatch live-children
 
 SYMBOL: infer-children-data
 
+: copy-value-info ( -- )
+    value-infos [ clone ] change
+    constraints [ clone ] change ;
+
 : infer-children ( node -- )
     [ live-children ] [ child-constraints ] bi [
         [
             over [
-                value-infos [ clone ] change
-                constraints [ clone ] change
+                copy-value-info
                 assume
                 (propagate)
             ] [
@@ -49,31 +52,86 @@ SYMBOL: infer-children-data
         ] H{ } make-assoc
     ] 2map infer-children-data set ;
 
-: (merge-value-infos) ( inputs results -- infos )
-    '[ , [ [ value-info ] bind ] 2map value-infos-union ] map ;
+: compute-phi-input-infos ( phi-in -- phi-info )
+    infer-children-data get
+    '[ , [ [ value-info ] bind ] 2map ] map ;
 
-: merge-value-infos ( results inputs outputs -- )
-    [ swap (merge-value-infos) ] dip set-value-infos ;
+: annotate-phi-node ( #phi -- )
+    dup phi-in-d>> compute-phi-input-infos >>phi-info-d
+    dup phi-in-r>> compute-phi-input-infos >>phi-info-r
+    dup [ out-d>> ] [ out-r>> ] bi append extract-value-info >>info
+    drop ;
+
+: merge-value-infos ( infos outputs -- )
+    [ [ value-infos-union ] map ] dip set-value-infos ;
+
+SYMBOL: condition-value
+
+! :: branch-phi-constraints ( x #phi -- )
+!     #phi [ out-d>> ] [ phi-in-d>> ] bi [
+!         first2 2dup and [ USE: prettyprint
+!             [ [ =t x =t /\ ] [ =t x =f /\ ] bi* \/ swap t--> dup  . assume ]
+!             [ [ =f x =t /\ ] [ =f x =f /\ ] bi* \/ swap f--> dup  . assume ]
+!             3bi
+!         ] [ 3drop ] if
+!     ] 2each ;
 
 M: #phi propagate-before ( #phi -- )
-    infer-children-data get swap
-    [ [ phi-in-d>> ] [ out-d>> ] bi merge-value-infos ]
-    [ [ phi-in-r>> ] [ out-r>> ] bi merge-value-infos ]
-    2bi ;
+    [ annotate-phi-node ]
+    [ [ phi-info-d>> ] [ out-d>> ] bi merge-value-infos ]
+    [ [ phi-info-r>> ] [ out-r>> ] bi merge-value-infos ]
+    tri ;
 
-:: branch-phi-constraints ( x #phi -- )
-    #phi [ out-d>> ] [ phi-in-d>> ] bi [
-        first2 2dup and [ USE: prettyprint
-            [ [ =t x =t /\ ] [ =t x =f /\ ] bi* \/ swap t--> dup  . assume ]
-            [ [ =f x =t /\ ] [ =f x =f /\ ] bi* \/ swap f--> dup  . assume ]
-            3bi
-        ] [ 3drop ] if
-    ] 2each ;
+: branch-phi-constraints ( output values booleans -- )
+     {
+        {
+            { { t } { f } }
+            [
+                drop condition-value get
+                [ [ =t ] [ =t ] bi* <--> ]
+                [ [ =f ] [ =f ] bi* <--> ] 2bi /\ assume
+            ]
+        }
+        {
+            { { f } { t } }
+            [
+                drop condition-value get
+                [ [ =t ] [ =f ] bi* <--> ]
+                [ [ =f ] [ =t ] bi* <--> ] 2bi /\ assume
+            ]
+        }
+        {
+            { { t f } { f } }
+            [ first =t condition-value get =t /\ swap t--> assume ]
+        }
+        {
+            { { f } { t f } }
+            [ second =t condition-value get =f /\ swap t--> assume ]
+        }
+        ! {
+        !     { { f } { t f } }
+        !     [ ]
+        ! }
+        [ 3drop ]
+    } case ;
 
-! : merge-children
-!     [ successor>> propagate-branch-phi ]
-!     [ [ in-d>> first ] [ successor>> ] bi 2drop ] ! branch-phi-constraints ]
-!     bi ;
+M: #phi propagate-after ( #phi -- )
+    condition-value get [
+        [ out-d>> ] [ phi-in-d>> ] [ phi-info-d>> ] tri
+        3array flip [
+            first3 [ possible-boolean-values ] map
+            branch-phi-constraints
+        ] each
+    ] [ drop ] if ;
+
+M: #phi propagate-around ( #phi -- )
+    [ propagate-before ] [ propagate-after ] bi ;
 
 M: #branch propagate-around
     [ infer-children ] [ annotate-node ] bi ;
+
+M: #if propagate-around
+    [ in-d>> first condition-value set ] [ call-next-method ] bi ;
+
+M: #dispatch propagate-around
+    condition-value off call-next-method ;
diff --git a/unfinished/compiler/tree/propagation/constraints/constraints.factor b/unfinished/compiler/tree/propagation/constraints/constraints.factor
index 42c094db5a..0b19d34a20 100644
--- a/unfinished/compiler/tree/propagation/constraints/constraints.factor
+++ b/unfinished/compiler/tree/propagation/constraints/constraints.factor
@@ -12,38 +12,42 @@ IN: compiler.tree.propagation.constraints
 ! Maps constraints to constraints ("A implies B")
 SYMBOL: constraints
 
-GENERIC: assume ( constraint -- )
+GENERIC: assume* ( constraint -- )
 GENERIC: satisfied? ( constraint -- ? )
-GENERIC: satisfiable? ( constraint -- ? )
+
+M: f assume* drop ;
+
+! satisfied? is inaccurate. It's just used to prevent infinite
+! loops so its only implemented for true-constraints and
+! false-constraints.
+M: object satisfied? drop f ;
+
+: assume ( constraint -- ) dup satisfied? [ drop ] [ assume* ] if ;
 
 ! Boolean constraints
 TUPLE: true-constraint value ;
 
 : =t ( value -- constriant ) resolve-copy true-constraint boa ;
 
-M: true-constraint assume
-    [ constraints get at [ assume ] when* ]
+M: true-constraint assume*
     [ \ f class-not <class-info> swap value>> refine-value-info ]
+    [ constraints get at [ assume ] when* ]
     bi ;
 
-M: true-constraint satisfied? value>> \ f class-not value-is? ;
-
-M: true-constraint satisfiable? value>> \ f class-not value-is? ;
+M: true-constraint satisfied?
+    value>> value-info class>> true-class? ;
 
 TUPLE: false-constraint value ;
 
 : =f ( value -- constriant ) resolve-copy false-constraint boa ;
 
-M: false-constraint assume
-    [ constraints get at [ assume ] when* ]
+M: false-constraint assume*
     [ \ f <class-info> swap value>> refine-value-info ]
+    [ constraints get at [ assume ] when* ]
     bi ;
 
 M: false-constraint satisfied?
-    value>> value-info class>> \ f class<= ;
-
-M: false-constraint satisfiable?
-    value>> value-info class>> \ f classes-intersect? ;
+    value>> value-info class>> false-class? ;
 
 ! Class constraints
 TUPLE: class-constraint value class ;
@@ -51,7 +55,7 @@ TUPLE: class-constraint value class ;
 : is-instance-of ( value class -- constraint )
     [ resolve-copy ] dip class-constraint boa ;
 
-M: class-constraint assume
+M: class-constraint assume*
     [ class>> <class-info> ] [ value>> ] bi refine-value-info ;
 
 ! Interval constraints
@@ -60,7 +64,7 @@ TUPLE: interval-constraint value interval ;
 : is-in-interval ( value interval -- constraint )
     [ resolve-copy ] dip interval-constraint boa ;
 
-M: interval-constraint assume
+M: interval-constraint assume*
     [ interval>> <interval-info> ] [ value>> ] bi refine-value-info ;
 
 ! Literal constraints
@@ -69,7 +73,7 @@ TUPLE: literal-constraint value literal ;
 : is-equal-to ( value literal -- constraint )
     [ resolve-copy ] dip literal-constraint boa ;
 
-M: literal-constraint assume
+M: literal-constraint assume*
     [ literal>> <literal-info> ] [ value>> ] bi refine-value-info ;
 
 ! Implication constraints
@@ -77,46 +81,32 @@ TUPLE: implication p q ;
 
 C: --> implication
 
-M: implication assume
-    [ q>> ] [ p>> ] bi
-    [ constraints get set-at ]
+: assume-implication ( p q -- )
+    [ constraints get [ swap suffix ] change-at ]
     [ satisfied? [ assume ] [ drop ] if ] 2bi ;
 
-M: implication satisfiable?
-    [ q>> satisfiable? ] [ p>> satisfiable? not ] bi or ;
+M: implication assume*
+    [ q>> ] [ p>> ] bi assume-implication ;
 
-! Conjunction constraints
-TUPLE: conjunction p q ;
+! Equivalence constraints
+TUPLE: equivalence p q ;
 
-C: /\ conjunction
+C: <--> equivalence
 
-M: conjunction assume [ p>> assume ] [ q>> assume ] bi ;
+M: equivalence assume*
+    [ p>> ] [ q>> ] bi
+    [ assume-implication ]
+    [ swap assume-implication ] 2bi ;
 
-M: conjunction satisfiable?
-    [ p>> satisfiable? ] [ q>> satisfiable? ] bi and ;
+! Conjunction constraints -- sequences act as conjunctions
+M: sequence assume* [ assume ] each ;
 
-! Disjunction constraints
-TUPLE: disjunction p q ;
-
-C: \/ disjunction
-
-M: disjunction assume
-    {
-        { [ dup p>> satisfiable? not ] [ q>> assume ] }
-        { [ dup q>> satisfiable? not ] [ p>> assume ] }
-        [ drop ]
-    } cond ;
-
-M: disjunction satisfiable?
-    [ p>> satisfiable? ] [ q>> satisfiable? ] bi or ;
-
-! No-op
-M: f assume drop ;
+: /\ ( p q -- constraint ) 2array ;
 
 ! Utilities
 : t--> ( constraint boolean-value -- constraint' ) =t swap --> ;
 
 : f--> ( constraint boolean-value -- constraint' ) =f swap --> ;
 
-: <conditional> ( true-constr false-constr boolean-value -- constraint )
-    tuck [ t--> ] [ f--> ] 2bi* /\ ;
+: save-constraints ( quot -- )
+    constraints get clone slip constraints set ; inline
diff --git a/unfinished/compiler/tree/propagation/info/info.factor b/unfinished/compiler/tree/propagation/info/info.factor
index 8c76f9330c..166cc08c17 100644
--- a/unfinished/compiler/tree/propagation/info/info.factor
+++ b/unfinished/compiler/tree/propagation/info/info.factor
@@ -220,21 +220,22 @@ SYMBOL: value-infos
 : value-literal ( value -- obj ? )
     value-info >literal< ;
 
+: false-class? ( class -- ? ) \ f class<= ;
+
+: true-class? ( class -- ? ) \ f class-not class<= ;
+
 : possible-boolean-values ( info -- values )
     dup literal?>> [
         literal>> 1array
     ] [
         class>> {
             { [ dup null class<= ] [ { } ] }
-            { [ dup \ f class-not class<= ] [ { t } ] }
-            { [ dup \ f class<= ] [ { f } ] }
+            { [ dup true-class? ] [ { t } ] }
+            { [ dup false-class? ] [ { f } ] }
             [ { t f } ]
         } cond nip
     ] if ;
 
-: value-is? ( value class -- ? )
-    [ value-info class>> ] dip class<= ;
-
 : node-value-info ( node value -- info )
     swap info>> at* [ drop null-info ] unless ;
 
diff --git a/unfinished/compiler/tree/propagation/known-words/known-words.factor b/unfinished/compiler/tree/propagation/known-words/known-words.factor
index eef34f6f8f..e0a341f66a 100644
--- a/unfinished/compiler/tree/propagation/known-words/known-words.factor
+++ b/unfinished/compiler/tree/propagation/known-words/known-words.factor
@@ -149,12 +149,9 @@ most-negative-fixnum most-positive-fixnum [a,b]
        /\
     ] ;
 
-: comparison-constraints ( in1 in2 out op -- constraint )
-    swap [
-        [ (comparison-constraints) ]
-        [ negate-comparison (comparison-constraints) ]
-        3bi
-    ] dip <conditional> ;
+:: comparison-constraints ( in1 in2 out op -- constraint )
+    in1 in2 op (comparison-constraints) out t-->
+    in1 in2 op negate-comparison (comparison-constraints) out f--> /\ ;
 
 : define-comparison-constraints ( word op -- )
     '[ , comparison-constraints ] +constraints+ set-word-prop ;
@@ -204,7 +201,7 @@ generic-comparison-ops [
 \ eq? [
     [ info-intervals-intersect? ]
     [ info-classes-intersect? ]
-    bi or maybe-or-never
+    2bi or maybe-or-never
 ] +outputs+ set-word-prop
 
 {
diff --git a/unfinished/compiler/tree/propagation/propagation-tests.factor b/unfinished/compiler/tree/propagation/propagation-tests.factor
index 6deb80947a..4da40f8a2d 100644
--- a/unfinished/compiler/tree/propagation/propagation-tests.factor
+++ b/unfinished/compiler/tree/propagation/propagation-tests.factor
@@ -129,6 +129,36 @@ IN: compiler.tree.propagation.tests
     ] final-literals
 ] unit-test
 
+[ V{ string } ] [
+    [ dup string? not [ "Oops" throw ] [ ] if ] final-classes
+] unit-test
+
+[ V{ string } ] [
+    [ dup string? not not >boolean [ ] [ "Oops" throw ] if ] final-classes
+] unit-test
+
+[ V{ string } ] [
+    [ dup string? t xor [ "A" throw ] [ ] if ] final-classes
+] unit-test
+
+[ t ] [ [ t or ] final-classes first true-class? ] unit-test
+
+[ t ] [ [ t swap or ] final-classes first true-class? ] unit-test
+
+[ t ] [ [ f and ] final-classes first false-class? ] unit-test
+
+[ t ] [ [ f swap and ] final-classes first false-class? ] unit-test
+
+[ t ] [ [ dup not or ] final-classes first true-class? ] unit-test
+
+[ t ] [ [ dup not swap or ] final-classes first true-class? ] unit-test
+
+[ t ] [ [ dup not and ] final-classes first false-class? ] unit-test
+
+[ t ] [ [ dup not swap and ] final-classes first false-class? ] unit-test
+
+[ t ] [ [ over [ drop f ] when [ "A" throw ] unless ] final-classes first false-class? ] unit-test
+
 [ V{ fixnum } ] [
     [
         >fixnum
@@ -240,6 +270,12 @@ IN: compiler.tree.propagation.tests
     [ 0 * 10 < ] final-classes
 ] unit-test
 
+[ V{ 27 } ] [
+    [
+        123 bitand dup 10 < over 8 > and [ 3 * ] [ "B" throw ] if
+    ] final-literals
+] unit-test
+
 [ V{ string string } ] [
     [
         2dup [ dup string? [ "Oops" throw ] unless ] bi@ 2drop
@@ -413,3 +449,5 @@ TUPLE: mixed-mutable-immutable { x integer } { y sequence read-only } ;
 [ V{ fixnum } ] [ [ 0 recursive-test-7 ] final-classes ] unit-test
 
 [ V{ fixnum } ] [ [ 1 10 [ dup 10 < [ 2 * ] when ] times ] final-classes ] unit-test
+
+[ V{ integer } ] [ [ 0 2 100 ^ [ nip ] each-integer ] final-classes ] unit-test
diff --git a/unfinished/compiler/tree/propagation/recursive/recursive.factor b/unfinished/compiler/tree/propagation/recursive/recursive.factor
index 8f50add191..005199afaf 100644
--- a/unfinished/compiler/tree/propagation/recursive/recursive.factor
+++ b/unfinished/compiler/tree/propagation/recursive/recursive.factor
@@ -7,7 +7,8 @@ compiler.tree
 compiler.tree.propagation.info
 compiler.tree.propagation.nodes
 compiler.tree.propagation.simple
-compiler.tree.propagation.branches ;
+compiler.tree.propagation.branches
+compiler.tree.propagation.constraints ;
 IN: compiler.tree.propagation.recursive
 
 : check-fixed-point ( node infos1 infos2 -- node )
@@ -50,10 +51,14 @@ SYMBOL: iter-counter
 M: #recursive propagate-around ( #recursive -- )
     iter-counter inc
     iter-counter get 10 > [ "Oops" throw ] when
-    dup label>> t >>fixed-point drop
-    [ child>> [ first propagate-recursive-phi ] [ (propagate) ] bi ]
-    [ dup label>> fixed-point>> [ drop ] [ propagate-around ] if ]
-    bi ;
+    dup label>> t >>fixed-point drop [
+        [
+            child>>
+            [ first propagate-recursive-phi ]
+            [ (propagate) ]
+            bi
+        ] save-constraints
+    ] [ dup label>> fixed-point>> [ drop ] [ propagate-around ] if ] bi ;
 
 : generalize-return-interval ( info -- info' )
     dup literal?>> [
diff --git a/unfinished/compiler/tree/propagation/simple/simple.factor b/unfinished/compiler/tree/propagation/simple/simple.factor
index 42468dff8d..f30f154285 100644
--- a/unfinished/compiler/tree/propagation/simple/simple.factor
+++ b/unfinished/compiler/tree/propagation/simple/simple.factor
@@ -16,7 +16,7 @@ M: #introduce propagate-before
     value>> object <class-info> swap set-value-info ;
 
 M: #push propagate-before
-    [ literal>> value>> <literal-info> ] [ out-d>> first ] bi
+    [ literal>> <literal-info> ] [ out-d>> first ] bi
     set-value-info ;
 
 : refine-value-infos ( classes values -- )
@@ -117,10 +117,13 @@ M: #call propagate-after
 
 M: node propagate-after drop ;
 
+: extract-value-info ( values -- assoc )
+    [ dup value-info ] H{ } map>assoc ;
+
 : annotate-node ( node -- )
     dup
     [ node-defs-values ] [ node-uses-values ] bi append
-    [ dup value-info ] H{ } map>assoc
+    extract-value-info
     >>info drop ;
 
 M: node propagate-around
diff --git a/unfinished/compiler/tree/propagation/slots/slots.factor b/unfinished/compiler/tree/propagation/slots/slots.factor
index c0a445d237..b92479490c 100644
--- a/unfinished/compiler/tree/propagation/slots/slots.factor
+++ b/unfinished/compiler/tree/propagation/slots/slots.factor
@@ -29,7 +29,7 @@ UNION: fixed-length-sequence array byte-array string ;
     bi value-info-intersect 1array ;
 
 : length-accessor? ( node -- ? )
-    dup in-d>> first fixed-length-sequence value-is?
+    dup in-d>> first value-info class>> fixed-length-sequence class<=
     [ word>> \ length eq? ] [ drop f ] if ;
 
 : propagate-length ( node -- infos )
diff --git a/unfinished/compiler/tree/tree.factor b/unfinished/compiler/tree/tree.factor
index b0dde22112..7ff798de8f 100755
--- a/unfinished/compiler/tree/tree.factor
+++ b/unfinished/compiler/tree/tree.factor
@@ -87,7 +87,7 @@ TUPLE: #dispatch < #branch ;
 : #dispatch ( n branches -- node )
     \ #dispatch new-branch ;
 
-TUPLE: #phi < node phi-in-d phi-in-r out-d out-r ;
+TUPLE: #phi < node phi-in-d phi-info-d phi-in-r phi-info-r out-d out-r ;
 
 : #phi ( d-phi-in d-phi-out r-phi-in r-phi-out -- node )
     \ #phi new
diff --git a/unfinished/stack-checker/backend/backend.factor b/unfinished/stack-checker/backend/backend.factor
index 658a1e9fa1..853579217b 100755
--- a/unfinished/stack-checker/backend/backend.factor
+++ b/unfinished/stack-checker/backend/backend.factor
@@ -74,7 +74,7 @@ SYMBOL: visited
 GENERIC: apply-object ( obj -- )
 
 : push-literal ( obj -- )
-    <literal> dup make-known [ nip push-d ] [ #push, ] 2bi ;
+    dup <literal> make-known [ nip push-d ] [ #push, ] 2bi ;
 
 M: wrapper apply-object
     wrapped>>

From 7768bae3f6fec72def62ee8fa7dd524c6b937251 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 06:33:06 -0500
Subject: [PATCH 12/77] Remove dead code

---
 .../tree/propagation/branches/branches.factor       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/unfinished/compiler/tree/propagation/branches/branches.factor b/unfinished/compiler/tree/propagation/branches/branches.factor
index 9480033ccc..50e3f5c9e2 100644
--- a/unfinished/compiler/tree/propagation/branches/branches.factor
+++ b/unfinished/compiler/tree/propagation/branches/branches.factor
@@ -67,15 +67,6 @@ SYMBOL: infer-children-data
 
 SYMBOL: condition-value
 
-! :: branch-phi-constraints ( x #phi -- )
-!     #phi [ out-d>> ] [ phi-in-d>> ] bi [
-!         first2 2dup and [ USE: prettyprint
-!             [ [ =t x =t /\ ] [ =t x =f /\ ] bi* \/ swap t--> dup  . assume ]
-!             [ [ =f x =t /\ ] [ =f x =f /\ ] bi* \/ swap f--> dup  . assume ]
-!             3bi
-!         ] [ 3drop ] if
-!     ] 2each ;
-
 M: #phi propagate-before ( #phi -- )
     [ annotate-phi-node ]
     [ [ phi-info-d>> ] [ out-d>> ] bi merge-value-infos ]
@@ -108,10 +99,6 @@ M: #phi propagate-before ( #phi -- )
             { { f } { t f } }
             [ second =t condition-value get =f /\ swap t--> assume ]
         }
-        ! {
-        !     { { f } { t f } }
-        !     [ ]
-        ! }
         [ 3drop ]
     } case ;
 

From ac23f41198acd8a786d24bac458425f4377b0f88 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 12:54:21 -0500
Subject: [PATCH 13/77] processing: Update to use 'processing.shapes'

---
 extra/processing/processing.factor | 274 ++++++++++++++---------------
 1 file changed, 128 insertions(+), 146 deletions(-)

diff --git a/extra/processing/processing.factor b/extra/processing/processing.factor
index f786628c79..bcfe314d45 100644
--- a/extra/processing/processing.factor
+++ b/extra/processing/processing.factor
@@ -10,7 +10,8 @@ USING: kernel namespaces threads combinators sequences arrays
        combinators.cleave
        rewrite-closures fry accessors newfx
        processing.color
-       processing.gadget math.geometry.rect ;
+       processing.gadget math.geometry.rect
+       processing.shapes ;
        
 IN: processing
 
@@ -36,53 +37,34 @@ IN: processing
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-VAR: fill-color
-VAR: stroke-color
+! VAR: fill-color
+! VAR: stroke-color
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-GENERIC: set-color ( value -- )
+GENERIC: canonical-color-value ( obj -- color )
 
-METHOD: set-color { number } dup dup glColor3d ;
+METHOD: canonical-color-value { number } dup dup 1 4array ;
 
-METHOD: set-color { array }
+METHOD: canonical-color-value { array }
    dup length
    {
-     { 2 [ first2 >r dup dup r> glColor4d ] }
-     { 3 [ first3 glColor3d ] }
-     { 4 [ first4 glColor4d ] }
+     { 2 [ first2 >r dup dup r> 4array ] }
+     { 3 [ 1 suffix ] }
+     { 4 [ ] }
    }
    case ;
 
-METHOD: set-color { rgba }
-  { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave glColor4d ;
+METHOD: canonical-color-value { rgba }
+  { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave 4array ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: fill   ( value -- )  >fill-color ;
-: stroke ( value -- ) >stroke-color ;
+: fill   ( value -- ) canonical-color-value >fill-color   ;
+: stroke ( value -- ) canonical-color-value >stroke-color ;
 
-: no-fill ( -- )
-  fill-color>
-    {
-      { [ dup number? ] [ 0 2array fill ] }
-      { [ t           ]
-        [
-          [ drop 0 ] [ length 1- ] [ ] tri set-nth
-        ] }
-    }
-  cond ;
-
-: no-stroke ( -- )
-  stroke-color>
-    {
-      { [ dup number? ] [ 0 2array stroke ] }
-      { [ t           ]
-        [
-          [ drop 0 ] [ length 1- ] [ ] tri set-nth
-        ] }
-    }
-  cond ;
+: no-fill   ( -- ) 0 fill-color>   set-fourth ;
+: no-stroke ( -- ) 0 stroke-color> set-fourth ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -90,163 +72,163 @@ METHOD: set-color { rgba }
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: point* ( x y -- )
-  stroke-color> set-color
-  GL_POINTS glBegin
-    glVertex2d
-  glEnd ;
+! : point* ( x y -- )
+!   stroke-color> set-color
+!   GL_POINTS glBegin
+!     glVertex2d
+!   glEnd ;
 
-: point ( seq -- ) first2 point* ;
+! : point ( seq -- ) first2 point* ;
 
-: line ( x1 y1 x2 y2 -- )
-  stroke-color> set-color
-  GL_LINES glBegin
-    glVertex2d
-    glVertex2d
-  glEnd ;
+! : line ( x1 y1 x2 y2 -- )
+!   stroke-color> set-color
+!   GL_LINES glBegin
+!     glVertex2d
+!     glVertex2d
+!   glEnd ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: triangle ( x1 y1 x2 y2 x3 y3 -- )
+! : triangle ( x1 y1 x2 y2 x3 y3 -- )
 
-  GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  fill-color> set-color
+!   GL_FRONT_AND_BACK GL_FILL glPolygonMode
+!   fill-color> set-color
 
-  6 ndup
+!   6 ndup
   
-  GL_TRIANGLES glBegin
-    glVertex2d
-    glVertex2d
-    glVertex2d
-  glEnd
+!   GL_TRIANGLES glBegin
+!     glVertex2d
+!     glVertex2d
+!     glVertex2d
+!   glEnd
 
-  GL_FRONT_AND_BACK GL_LINE glPolygonMode
-  stroke-color> set-color
+!   GL_FRONT_AND_BACK GL_LINE glPolygonMode
+!   stroke-color> set-color
 
-  GL_TRIANGLES glBegin
-    glVertex2d
-    glVertex2d
-    glVertex2d
-  glEnd ;
+!   GL_TRIANGLES glBegin
+!     glVertex2d
+!     glVertex2d
+!     glVertex2d
+!   glEnd ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: quad-vertices ( x1 y1 x2 y2 x3 y3 x4 y4 -- )
-  GL_POLYGON glBegin
-    glVertex2d
-    glVertex2d
-    glVertex2d
-    glVertex2d
-  glEnd ;
+! : quad-vertices ( x1 y1 x2 y2 x3 y3 x4 y4 -- )
+!   GL_POLYGON glBegin
+!     glVertex2d
+!     glVertex2d
+!     glVertex2d
+!     glVertex2d
+!   glEnd ;
 
-: quad ( x1 y1 x2 y2 x3 y3 x4 y4 -- )
+! : quad ( x1 y1 x2 y2 x3 y3 x4 y4 -- )
 
-  8 ndup
+!   8 ndup
 
-  GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  fill-color> set-color
+!   GL_FRONT_AND_BACK GL_FILL glPolygonMode
+!   fill-color> set-color
 
-  quad-vertices
+!   quad-vertices
   
-  GL_FRONT_AND_BACK GL_LINE glPolygonMode
-  stroke-color> set-color
+!   GL_FRONT_AND_BACK GL_LINE glPolygonMode
+!   stroke-color> set-color
 
-  quad-vertices ;
+!   quad-vertices ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: rect-vertices ( x y width height -- )
-  GL_POLYGON glBegin
-    [ 2drop                      glVertex2d ] 4keep
-    [ drop swap >r + 1- r>       glVertex2d ] 4keep
-    [ >r swap >r + 1- r> r> + 1- glVertex2d ] 4keep
-    [ nip + 1-                   glVertex2d ] 4keep
-    4drop
-  glEnd ;
+! : rect-vertices ( x y width height -- )
+!   GL_POLYGON glBegin
+!     [ 2drop                      glVertex2d ] 4keep
+!     [ drop swap >r + 1- r>       glVertex2d ] 4keep
+!     [ >r swap >r + 1- r> r> + 1- glVertex2d ] 4keep
+!     [ nip + 1-                   glVertex2d ] 4keep
+!     4drop
+!   glEnd ;
 
-: rect ( x y width height -- )
+! : rect ( x y width height -- )
 
-  4dup
+!   4dup
 
-  GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  fill-color> set-color
+!   GL_FRONT_AND_BACK GL_FILL glPolygonMode
+!   fill-color> set-color
 
-  rect-vertices
+!   rect-vertices
 
-  GL_FRONT_AND_BACK GL_LINE glPolygonMode
-  stroke-color> set-color
+!   GL_FRONT_AND_BACK GL_LINE glPolygonMode
+!   stroke-color> set-color
 
-  rect-vertices ;
+!   rect-vertices ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: ellipse-disk ( x y width height -- )
-  glPushMatrix
-    >r >r
-    0 glTranslated
-    r> r> 1 glScaled
-    gluNewQuadric
-      dup 0 0.5 20 1 gluDisk
-    gluDeleteQuadric
-  glPopMatrix ;
+! : ellipse-disk ( x y width height -- )
+!   glPushMatrix
+!     >r >r
+!     0 glTranslated
+!     r> r> 1 glScaled
+!     gluNewQuadric
+!       dup 0 0.5 20 1 gluDisk
+!     gluDeleteQuadric
+!   glPopMatrix ;
 
-: ellipse-center ( x y width height -- )
+! : ellipse-center ( x y width height -- )
 
-  4dup
+!   4dup
 
-  GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  stroke-color> set-color
+!   GL_FRONT_AND_BACK GL_FILL glPolygonMode
+!   stroke-color> set-color
 
-  ellipse-disk
+!   ellipse-disk
 
-  GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  fill-color> set-color
+!   GL_FRONT_AND_BACK GL_FILL glPolygonMode
+!   fill-color> set-color
 
-  [ 2 - ] bi@ ! [ stroke-width 1+ - ] bi@
+!   [ 2 - ] bi@ ! [ stroke-width 1+ - ] bi@
 
-  ellipse-disk ;
+!   ellipse-disk ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-SYMBOL: CENTER
-SYMBOL: RADIUS
-SYMBOL: CORNER
-SYMBOL: CORNERS
+! SYMBOL: CENTER
+! SYMBOL: RADIUS
+! SYMBOL: CORNER
+! SYMBOL: CORNERS
 
-SYMBOL: ellipse-mode-value
+! SYMBOL: ellipse-mode-value
 
-: ellipse-mode ( val -- ) ellipse-mode-value set ;
+! : ellipse-mode ( val -- ) ellipse-mode-value set ;
 
-: ellipse-radius ( x y hori vert -- ) [ 2 * ] bi@ ellipse-center ;
+! : ellipse-radius ( x y hori vert -- ) [ 2 * ] bi@ ellipse-center ;
 
-: ellipse-corner ( x y width height -- )
-  [ drop nip     2 / + ] 4keep
-  [ nip rot drop 2 / + ] 4keep
-  [ >r >r 2drop r> r>  ] 4keep
-  4drop
-  ellipse-center ;
+! : ellipse-corner ( x y width height -- )
+!   [ drop nip     2 / + ] 4keep
+!   [ nip rot drop 2 / + ] 4keep
+!   [ >r >r 2drop r> r>  ] 4keep
+!   4drop
+!   ellipse-center ;
 
-: ellipse-corners ( x1 y1 x2 y2 -- )
-  [ drop nip     + 2 /    ] 4keep
-  [ nip rot drop + 2 /    ] 4keep
-  [ drop nip     - abs 1+ ] 4keep
-  [ nip rot drop - abs 1+ ] 4keep
-  4drop
-  ellipse-center ;
+! : ellipse-corners ( x1 y1 x2 y2 -- )
+!   [ drop nip     + 2 /    ] 4keep
+!   [ nip rot drop + 2 /    ] 4keep
+!   [ drop nip     - abs 1+ ] 4keep
+!   [ nip rot drop - abs 1+ ] 4keep
+!   4drop
+!   ellipse-center ;
 
-: ellipse ( a b c d -- )
-  ellipse-mode-value get
-    {
-      { CENTER  [ ellipse-center ] }
-      { RADIUS  [ ellipse-radius ] }
-      { CORNER  [ ellipse-corner ] }
-      { CORNERS [ ellipse-corners ] }
-    }
-  case ;
+! : ellipse ( a b c d -- )
+!   ellipse-mode-value get
+!     {
+!       { CENTER  [ ellipse-center ] }
+!       { RADIUS  [ ellipse-radius ] }
+!       { CORNER  [ ellipse-corner ] }
+!       { CORNERS [ ellipse-corners ] }
+!     }
+!   case ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: circle ( pos size -- ) [ first2 ] [ dup ] bi* ellipse ;
+! : circle ( pos size -- ) [ first2 ] [ dup ] bi* ellipse ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -279,8 +261,8 @@ METHOD: background { array }
 
 : mouse ( -- point ) hand-loc get ;
 
-: mouse-x mouse first  ;
-: mouse-y mouse second ;
+: mouse-x ( -- x ) mouse first  ;
+: mouse-y ( -- y ) mouse second ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -296,9 +278,9 @@ VAR: loop-flag
 
 : defaults ( -- )
   0.8    background
-  0      >stroke-color
-  1      >fill-color
-  CENTER ellipse-mode
+  ! 0      >stroke-color
+  ! 1      >fill-color
+  ! CENTER ellipse-mode
   60 frame-rate ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

From fce11759e9e258843d11d7d170712e954d9ac58f Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 12:54:47 -0500
Subject: [PATCH 14/77] processing.gallery.trails: Update for processing
 changes

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

diff --git a/extra/processing/gallery/trails/trails.factor b/extra/processing/gallery/trails/trails.factor
index 5abe23bb90..a5b2b7b02a 100644
--- a/extra/processing/gallery/trails/trails.factor
+++ b/extra/processing/gallery/trails/trails.factor
@@ -1,6 +1,6 @@
 
 USING: kernel arrays sequences math math.order qualified
-       sequences.lib circular processing ui newfx ;
+       sequences.lib circular processing ui newfx processing.shapes ;
 
 IN: processing.gallery.trails
 

From 72344abf718dc39a2c6404f6cf7d6d94ff797c87 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 12:55:08 -0500
Subject: [PATCH 15/77] bubble-chamber: Update for processing changes

---
 extra/bubble-chamber/particle/axion/axion.factor   | 3 ++-
 extra/bubble-chamber/particle/hadron/hadron.factor | 2 +-
 extra/bubble-chamber/particle/muon/muon.factor     | 1 +
 extra/bubble-chamber/particle/quark/quark.factor   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/extra/bubble-chamber/particle/axion/axion.factor b/extra/bubble-chamber/particle/axion/axion.factor
index 54865894c6..2dafc36cde 100644
--- a/extra/bubble-chamber/particle/axion/axion.factor
+++ b/extra/bubble-chamber/particle/axion/axion.factor
@@ -1,7 +1,8 @@
 
 USING: kernel sequences random accessors multi-methods
        math math.constants math.ranges math.points combinators.cleave
-       processing bubble-chamber.common bubble-chamber.particle ;
+       processing processing.shapes
+       bubble-chamber.common bubble-chamber.particle ;
 
 IN: bubble-chamber.particle.axion
 
diff --git a/extra/bubble-chamber/particle/hadron/hadron.factor b/extra/bubble-chamber/particle/hadron/hadron.factor
index 9eecf2dd93..10a5431e57 100644
--- a/extra/bubble-chamber/particle/hadron/hadron.factor
+++ b/extra/bubble-chamber/particle/hadron/hadron.factor
@@ -1,6 +1,6 @@
 
 USING: kernel random math math.constants math.points accessors multi-methods
-       processing
+       processing processing.shapes
        processing.color
        bubble-chamber.common
        bubble-chamber.particle ;
diff --git a/extra/bubble-chamber/particle/muon/muon.factor b/extra/bubble-chamber/particle/muon/muon.factor
index a61526fdf7..c5ee71c1b0 100644
--- a/extra/bubble-chamber/particle/muon/muon.factor
+++ b/extra/bubble-chamber/particle/muon/muon.factor
@@ -7,6 +7,7 @@ USING: kernel arrays sequences random
        multi-methods accessors
        combinators.cleave
        processing
+       processing.shapes
        bubble-chamber.common
        bubble-chamber.particle
        bubble-chamber.particle.muon.colors ;
diff --git a/extra/bubble-chamber/particle/quark/quark.factor b/extra/bubble-chamber/particle/quark/quark.factor
index 595c3b5329..194b97a9cd 100644
--- a/extra/bubble-chamber/particle/quark/quark.factor
+++ b/extra/bubble-chamber/particle/quark/quark.factor
@@ -1,6 +1,6 @@
 
 USING: kernel arrays sequences random math accessors multi-methods
-       processing
+       processing processing.shapes
        bubble-chamber.common
        bubble-chamber.particle ;
 

From e10507e9ad146c342aec1fabdb1b2c557389466d Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 12:58:30 -0500
Subject: [PATCH 16/77] processing: Minor cleanups

---
 extra/processing/processing.factor | 81 ------------------------------
 1 file changed, 81 deletions(-)

diff --git a/extra/processing/processing.factor b/extra/processing/processing.factor
index bcfe314d45..f365f80d78 100644
--- a/extra/processing/processing.factor
+++ b/extra/processing/processing.factor
@@ -37,11 +37,6 @@ IN: processing
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-! VAR: fill-color
-! VAR: stroke-color
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 GENERIC: canonical-color-value ( obj -- color )
 
 METHOD: canonical-color-value { number } dup dup 1 4array ;
@@ -72,47 +67,6 @@ METHOD: canonical-color-value { rgba }
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-! : point* ( x y -- )
-!   stroke-color> set-color
-!   GL_POINTS glBegin
-!     glVertex2d
-!   glEnd ;
-
-! : point ( seq -- ) first2 point* ;
-
-! : line ( x1 y1 x2 y2 -- )
-!   stroke-color> set-color
-!   GL_LINES glBegin
-!     glVertex2d
-!     glVertex2d
-!   glEnd ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-! : triangle ( x1 y1 x2 y2 x3 y3 -- )
-
-!   GL_FRONT_AND_BACK GL_FILL glPolygonMode
-!   fill-color> set-color
-
-!   6 ndup
-  
-!   GL_TRIANGLES glBegin
-!     glVertex2d
-!     glVertex2d
-!     glVertex2d
-!   glEnd
-
-!   GL_FRONT_AND_BACK GL_LINE glPolygonMode
-!   stroke-color> set-color
-
-!   GL_TRIANGLES glBegin
-!     glVertex2d
-!     glVertex2d
-!     glVertex2d
-!   glEnd ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 ! : quad-vertices ( x1 y1 x2 y2 x3 y3 x4 y4 -- )
 !   GL_POLYGON glBegin
 !     glVertex2d
@@ -137,31 +91,6 @@ METHOD: canonical-color-value { rgba }
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-! : rect-vertices ( x y width height -- )
-!   GL_POLYGON glBegin
-!     [ 2drop                      glVertex2d ] 4keep
-!     [ drop swap >r + 1- r>       glVertex2d ] 4keep
-!     [ >r swap >r + 1- r> r> + 1- glVertex2d ] 4keep
-!     [ nip + 1-                   glVertex2d ] 4keep
-!     4drop
-!   glEnd ;
-
-! : rect ( x y width height -- )
-
-!   4dup
-
-!   GL_FRONT_AND_BACK GL_FILL glPolygonMode
-!   fill-color> set-color
-
-!   rect-vertices
-
-!   GL_FRONT_AND_BACK GL_LINE glPolygonMode
-!   stroke-color> set-color
-
-!   rect-vertices ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 ! : ellipse-disk ( x y width height -- )
 !   glPushMatrix
 !     >r >r
@@ -228,14 +157,6 @@ METHOD: canonical-color-value { rgba }
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-! : circle ( pos size -- ) [ first2 ] [ dup ] bi* ellipse ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-USING: multi-methods ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 GENERIC: background ( value -- )
 
 METHOD: background { number }
@@ -278,8 +199,6 @@ VAR: loop-flag
 
 : defaults ( -- )
   0.8    background
-  ! 0      >stroke-color
-  ! 1      >fill-color
   ! CENTER ellipse-mode
   60 frame-rate ;
 

From e9e1313b6cbdaa2e5edad6179136149b6a3eeb63 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:19:11 -0500
Subject: [PATCH 17/77] colors: Add color tuples

---
 extra/colors/colors.factor | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/extra/colors/colors.factor b/extra/colors/colors.factor
index 911f3d0b59..f8de326b4d 100644
--- a/extra/colors/colors.factor
+++ b/extra/colors/colors.factor
@@ -1,7 +1,43 @@
 ! Copyright (C) 2003, 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
+
+USING: kernel combinators sequences arrays
+       classes.tuple multi-methods accessors colors.hsv ;
+
 IN: colors
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+TUPLE: color ;
+
+TUPLE: rgba < color red green blue alpha ;
+
+TUPLE: hsva < color hue saturation value alpha ;
+
+TUPLE: grey < color grey alpha ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+GENERIC: >rgba ( object -- rgba )
+
+METHOD: >rgba { rgba } ;
+
+METHOD: >rgba { hsva }
+  { [ hue>> ] [ saturation>> ] [ value>> ] [ alpha>> ] } cleave 4array
+  [ hsv>rgb ] [ peek ] bi suffix first4 rgba boa ;
+
+METHOD: >rgba { grey } [ grey>> dup dup ] [ alpha>> ] bi rgba boa ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+USE: syntax
+
+M: color red>>   >rgba red>> ;
+M: color green>> >rgba green>> ;
+M: color blue>>  >rgba blue>> ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 : black { 0.0 0.0 0.0 1.0 } ;
 : blue { 0.0 0.0 1.0 1.0 } ;
 : cyan { 0 0.941 0.941 1 } ;

From 47d8a56dc01bbcd2cc0c5861f8060261001d9a1b Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:19:35 -0500
Subject: [PATCH 18/77] opengl: Add words to work with color objects

---
 extra/opengl/opengl.factor | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/extra/opengl/opengl.factor b/extra/opengl/opengl.factor
index be70b1e176..3964288666 100755
--- a/extra/opengl/opengl.factor
+++ b/extra/opengl/opengl.factor
@@ -2,10 +2,12 @@
 ! Portions copyright (C) 2007 Eduardo Cavazos.
 ! Portions copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
+
 USING: alien alien.c-types continuations kernel libc math macros
-namespaces math.vectors math.constants math.functions
-math.parser opengl.gl opengl.glu combinators arrays sequences
-splitting words byte-arrays assocs ;
+       namespaces math.vectors math.constants math.functions
+       math.parser opengl.gl opengl.glu combinators arrays sequences
+       splitting words byte-arrays assocs colors accessors ;
+
 IN: opengl
 
 : coordinates ( point1 point2 -- x1 y2 x2 y2 )
@@ -14,6 +16,8 @@ IN: opengl
 : fix-coordinates ( point1 point2 -- x1 y2 x2 y2 )
     [ first2 [ >fixnum ] bi@ ] bi@ ;
 
+
+
 : gl-color ( color -- ) first4 glColor4d ; inline
 
 : gl-clear-color ( color -- )
@@ -22,6 +26,16 @@ IN: opengl
 : gl-clear ( color -- )
     gl-clear-color GL_COLOR_BUFFER_BIT glClear ;
 
+: color>raw ( object -- 4array )
+  >rgba
+    { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave
+  4array ;
+
+: set-color       ( object -- ) color>raw first4 glColor4d ;
+: set-clear-color ( object -- ) color>raw first4 glClearColor ;
+
+
+
 : gl-error ( -- )
     glGetError dup zero? [
         "GL error: " over gluErrorString append throw

From 4f4edfee30ff29f54f0d13b627686cde165efc8f Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:47:51 -0500
Subject: [PATCH 19/77] opengl: color>raw word

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

diff --git a/extra/opengl/opengl.factor b/extra/opengl/opengl.factor
index 3964288666..6e6302b305 100755
--- a/extra/opengl/opengl.factor
+++ b/extra/opengl/opengl.factor
@@ -16,7 +16,7 @@ IN: opengl
 : fix-coordinates ( point1 point2 -- x1 y2 x2 y2 )
     [ first2 [ >fixnum ] bi@ ] bi@ ;
 
-
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : gl-color ( color -- ) first4 glColor4d ; inline
 
@@ -26,15 +26,13 @@ IN: opengl
 : gl-clear ( color -- )
     gl-clear-color GL_COLOR_BUFFER_BIT glClear ;
 
-: color>raw ( object -- 4array )
-  >rgba
-    { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave
-  4array ;
-
-: set-color       ( object -- ) color>raw first4 glColor4d ;
-: set-clear-color ( object -- ) color>raw first4 glClearColor ;
+: color>raw ( object -- r g b a )
+  >rgba { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave ;
 
+: set-color       ( object -- ) color>raw glColor4d ;
+: set-clear-color ( object -- ) color>raw glClearColor ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : gl-error ( -- )
     glGetError dup zero? [

From 19feaebb19b615083cdc8bd6bb43b29700a539ea Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:49:20 -0500
Subject: [PATCH 20/77] processing.shapes: use color objects

---
 extra/processing/shapes/shapes.factor | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extra/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor
index 16530c5414..d92da8c869 100644
--- a/extra/processing/shapes/shapes.factor
+++ b/extra/processing/shapes/shapes.factor
@@ -3,7 +3,7 @@ USING: kernel namespaces arrays sequences grouping
        alien.c-types
        math math.vectors math.geometry.rect
        opengl.gl opengl.glu opengl generalizations vars
-       combinators.cleave  ;
+       combinators.cleave colors ;
 
 IN: processing.shapes
 
@@ -12,20 +12,20 @@ IN: processing.shapes
 VAR: fill-color
 VAR: stroke-color
 
-{ 0 0 0 1 } stroke-color set-global
-{ 1 1 1 1 } fill-color   set-global
+T{ rgba f 0 0 0 1 } stroke-color set-global
+T{ rgba f 1 1 1 1 } fill-color   set-global
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : fill-mode ( -- )
   GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  fill-color> gl-color ;
+  fill-color> set-color ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : stroke-mode ( -- )
   GL_FRONT_AND_BACK GL_LINE glPolygonMode
-  stroke-color> gl-color ;
+  stroke-color> set-color ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -101,8 +101,8 @@ VAR: stroke-color
 
 : ellipse ( center dim -- )
   GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  [ stroke-color> gl-color                                 gl-ellipse ]
-  [ fill-color> gl-color gl-get-line-width 2 * dup 2array v- gl-ellipse ] 2bi ;
+  [ stroke-color> set-color                                 gl-ellipse ]
+  [ fill-color> set-color gl-get-line-width 2 * dup 2array v- gl-ellipse ] 2bi ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From 1324f6e096380a6a57dec15938918a5e7ffeadb2 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:49:41 -0500
Subject: [PATCH 21/77] processing: use color objects

---
 extra/processing/processing.factor | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/extra/processing/processing.factor b/extra/processing/processing.factor
index f365f80d78..07b92fa8fd 100644
--- a/extra/processing/processing.factor
+++ b/extra/processing/processing.factor
@@ -9,9 +9,9 @@ USING: kernel namespaces threads combinators sequences arrays
        combinators.lib
        combinators.cleave
        rewrite-closures fry accessors newfx
-       processing.color
        processing.gadget math.geometry.rect
-       processing.shapes ;
+       processing.shapes
+       colors ;
        
 IN: processing
 
@@ -39,27 +39,32 @@ IN: processing
 
 GENERIC: canonical-color-value ( obj -- color )
 
-METHOD: canonical-color-value { number } dup dup 1 4array ;
+METHOD: canonical-color-value { number } dup dup 1 rgba boa ;
 
 METHOD: canonical-color-value { array }
    dup length
    {
-     { 2 [ first2 >r dup dup r> 4array ] }
-     { 3 [ 1 suffix ] }
-     { 4 [ ] }
+     { 2 [ first2 >r dup dup r> rgba boa ] }
+     { 3 [ first3 1             rgba boa ] }
+     { 4 [ first4               rgba boa ] }
    }
    case ;
 
-METHOD: canonical-color-value { rgba }
-  { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave 4array ;
+! METHOD: canonical-color-value { rgba }
+!   { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave 4array ;
+
+METHOD: canonical-color-value { color } ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : fill   ( value -- ) canonical-color-value >fill-color   ;
 : stroke ( value -- ) canonical-color-value >stroke-color ;
 
-: no-fill   ( -- ) 0 fill-color>   set-fourth ;
-: no-stroke ( -- ) 0 stroke-color> set-fourth ;
+! : no-fill   ( -- ) 0 fill-color>   set-fourth ;
+! : no-stroke ( -- ) 0 stroke-color> set-fourth ;
+
+: no-fill   ( -- ) fill-color>   0 >>alpha drop ;
+: no-stroke ( -- ) stroke-color> 0 >>alpha drop ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From 4c9c8ede6fbc3b5f396f0c67137de79133f30bf1 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:49:54 -0500
Subject: [PATCH 22/77] bubble-chamber: use color objects

---
 extra/bubble-chamber/particle/hadron/hadron.factor      | 5 ++---
 extra/bubble-chamber/particle/muon/colors/colors.factor | 2 +-
 extra/bubble-chamber/particle/particle.factor           | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/extra/bubble-chamber/particle/hadron/hadron.factor b/extra/bubble-chamber/particle/hadron/hadron.factor
index 10a5431e57..910df97789 100644
--- a/extra/bubble-chamber/particle/hadron/hadron.factor
+++ b/extra/bubble-chamber/particle/hadron/hadron.factor
@@ -1,9 +1,8 @@
 
 USING: kernel random math math.constants math.points accessors multi-methods
        processing processing.shapes
-       processing.color
        bubble-chamber.common
-       bubble-chamber.particle ;
+       bubble-chamber.particle colors ;
 
 IN: bubble-chamber.particle.hadron
 
@@ -26,7 +25,7 @@ METHOD: collide { hadron }
 
   [ 0.00001 theta-dd-small? ] [ -0.001 0.001 random-theta-dd ] [ ] while
 
-  0 1 0 <rgb> >>myc
+  0 1 0 1 rgba boa >>myc
 
   drop ;
 
diff --git a/extra/bubble-chamber/particle/muon/colors/colors.factor b/extra/bubble-chamber/particle/muon/colors/colors.factor
index e68fff5efd..644bed833b 100644
--- a/extra/bubble-chamber/particle/muon/colors/colors.factor
+++ b/extra/bubble-chamber/particle/muon/colors/colors.factor
@@ -1,7 +1,7 @@
 
 USING: kernel sequences math math.constants math.order accessors
        processing
-       processing.color ;
+       colors ;
 
 IN: bubble-chamber.particle.muon.colors
 
diff --git a/extra/bubble-chamber/particle/particle.factor b/extra/bubble-chamber/particle/particle.factor
index 755a414b71..8b13e9b4b7 100644
--- a/extra/bubble-chamber/particle/particle.factor
+++ b/extra/bubble-chamber/particle/particle.factor
@@ -1,8 +1,8 @@
 
 USING: kernel sequences combinators
        math math.vectors math.functions multi-methods
-       accessors combinators.cleave processing processing.color
-       bubble-chamber.common ;
+       accessors combinators.cleave processing
+       bubble-chamber.common colors ;
 
 IN: bubble-chamber.particle
 
@@ -28,8 +28,8 @@ TUPLE: particle pos vel speed speed-d theta theta-d theta-dd myc mya ;
   0 >>theta-d
   0 >>theta-dd
 
-  0 0 0 1 <rgba> >>myc
-  0 0 0 1 <rgba> >>mya ;
+  0 0 0 1 rgba boa >>myc
+  0 0 0 1 rgba boa >>mya ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From 4e8ac9d7be361774018c159fc9b277d5f93df44a Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:59:29 -0500
Subject: [PATCH 23/77] golden-section: use color objects

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

diff --git a/extra/golden-section/golden-section.factor b/extra/golden-section/golden-section.factor
index a83dc988fd..807ef1355a 100644
--- a/extra/golden-section/golden-section.factor
+++ b/extra/golden-section/golden-section.factor
@@ -27,7 +27,7 @@ IN: golden-section
 
 : radius ( i -- radius ) pi * 720 / sin 10 * ;
 
-: color ( i -- i ) dup 360.0 / dup 0.25 1 4array >fill-color ;
+: color ( i -- i ) dup 360.0 / dup 0.25 1 rgba boa >fill-color ;
 
 : line-width ( i -- i ) dup radius 0.5 * 1 max glLineWidth ;
 

From 86d2cd4066776e0177687f1d5e47be037f53c2a9 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 14:59:40 -0500
Subject: [PATCH 24/77] boids.ui: use color objects

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

diff --git a/extra/boids/ui/ui.factor b/extra/boids/ui/ui.factor
index 38dd9b4f78..cd73c67a71 100755
--- a/extra/boids/ui/ui.factor
+++ b/extra/boids/ui/ui.factor
@@ -41,7 +41,7 @@ IN: boids.ui
 
 : draw-boids ( -- ) boids> [ draw-boid ] each ;
 
-: boid-color ( -- color ) { 1.0 0 0 0.3 } ;
+: boid-color ( -- color ) T{ rgba f 1.0 0 0 0.3 } ;
 
 : display ( -- )
   boid-color >fill-color

From 2216486578242873e32cce400d96239d24a2e7d8 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 16:59:05 -0500
Subject: [PATCH 25/77] colors: Basic colors are now objects. Add the >rgba
 method on arrays (kludge).

---
 extra/colors/colors.factor | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/extra/colors/colors.factor b/extra/colors/colors.factor
index f8de326b4d..02ad3ac778 100644
--- a/extra/colors/colors.factor
+++ b/extra/colors/colors.factor
@@ -28,6 +28,8 @@ METHOD: >rgba { hsva }
 
 METHOD: >rgba { grey } [ grey>> dup dup ] [ alpha>> ] bi rgba boa ;
 
+METHOD: >rgba { array } first4 rgba boa ;
+
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 USE: syntax
@@ -38,16 +40,16 @@ M: color blue>>  >rgba blue>> ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: black { 0.0 0.0 0.0 1.0 } ;
-: blue { 0.0 0.0 1.0 1.0 } ;
-: cyan { 0 0.941 0.941 1 } ;
-: gray { 0.6 0.6 0.6 1.0 } ;
-: green { 0.0 1.0 0.0 1.0 } ;
-: light-gray { 0.95 0.95 0.95 0.95 } ;
-: light-purple { 0.8 0.8 1.0 1.0 } ;
-: magenta { 0.941 0 0.941 1 } ;
-: orange  { 0.941 0.627 0 1 } ;
-: purple  { 0.627 0 0.941 1 } ;
-: red { 1.0 0.0 0.0 1.0 } ;
-: white { 1.0 1.0 1.0 1.0 } ;
-: yellow { 1.0 1.0 0.0 1.0 } ;
+: black        T{ rgba f 0.0   0.0   0.0   1.0  } ;
+: blue         T{ rgba f 0.0   0.0   1.0   1.0  } ;
+: cyan         T{ rgba f 0     0.941 0.941 1    } ;
+: gray         T{ rgba f 0.6   0.6   0.6   1.0  } ;
+: green        T{ rgba f 0.0   1.0   0.0   1.0  } ;
+: light-gray   T{ rgba f 0.95  0.95  0.95  0.95 } ;
+: light-purple T{ rgba f 0.8   0.8   1.0   1.0  } ;
+: magenta      T{ rgba f 0.941 0     0.941 1    } ;
+: orange       T{ rgba f 0.941 0.627 0     1    } ;
+: purple       T{ rgba f 0.627 0     0.941 1    } ;
+: red          T{ rgba f 1.0   0.0   0.0   1.0  } ;
+: white        T{ rgba f 1.0   1.0   1.0   1.0  } ;
+: yellow       T{ rgba f 1.0   1.0   0.0   1.0  } ;

From 57f8f811b938da2cbcf3a7e264f75818b851e965 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 17:00:30 -0500
Subject: [PATCH 26/77] opengl: Change gl-gradient to handle color objects

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

diff --git a/extra/opengl/opengl.factor b/extra/opengl/opengl.factor
index 6e6302b305..29c2e5400a 100755
--- a/extra/opengl/opengl.factor
+++ b/extra/opengl/opengl.factor
@@ -124,7 +124,7 @@ MACRO: all-enabled-client-state ( seq quot -- )
     GL_QUAD_STRIP [
         swap >r prepare-gradient r>
         [ length dup 1- v/n ] keep [
-            >r >r 2dup r> r> gl-color v*n
+            >r >r 2dup r> r> set-color v*n
             dup gl-vertex v+ gl-vertex
         ] 2each 2drop
     ] do-state ;

From 4643501ba6f79986a96f940eef6a2784e43be0d6 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 17:01:08 -0500
Subject: [PATCH 27/77] slides: Update for color objects

---
 extra/slides/slides.factor | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index e73da15296..c3c105143e 100755
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -23,14 +23,14 @@ IN: slides
             H{
                 { font "monospace" }
                 { font-size 36 }
-                { page-color { 0.4 0.4 0.4 0.3 } }
+                { page-color T{ rgba f 0.4 0.4 0.4 0.3 } }
             }
         }
         { snippet-style
             H{
                 { font "monospace" }
                 { font-size 36 }
-                { foreground { 0.1 0.1 0.4 1 } }
+                { foreground T{ rgba f 0.1 0.1 0.4 1 } }
             }
         }
         { table-content-style
@@ -48,14 +48,19 @@ IN: slides
 : $divider ( -- )
     [
         <gadget>
-        T{ gradient f { { 0.25 0.25 0.25 1.0 } { 1.0 1.0 1.0 0.0 } } } >>interior
+        T{ gradient f
+           {
+             T{ rgba f 0.25 0.25 0.25 1.0 }
+             T{ rgba f 1.0 1.0 1.0 0.0 }
+           }
+         } >>interior
         { 800 10 } >>dim
         { 1 0 } >>orientation
         gadget.
     ] ($block) ;
 
 : page-theme ( gadget -- )
-    T{ gradient f { { 0.8 0.8 1.0 1.0 } { 0.8 1.0 1.0 1.0 } } }
+    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 ;
 
 : <page> ( list -- gadget )

From 20ee2dd2a7951f621647d4b5043cdb1c89c5fbf3 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 17:01:24 -0500
Subject: [PATCH 28/77] Update lot's of ui vocabularies for color objects

---
 extra/ui/gadgets/buttons/buttons.factor       |  6 +--
 extra/ui/gadgets/editors/editors.factor       |  6 +--
 extra/ui/gadgets/grid-lines/grid-lines.factor |  2 +-
 extra/ui/gadgets/labelled/labelled.factor     |  4 +-
 extra/ui/gadgets/labels/labels.factor         |  2 +-
 extra/ui/gadgets/lists/lists.factor           |  7 ++--
 extra/ui/gadgets/panes/panes.factor           |  2 +-
 extra/ui/gadgets/theme/theme.factor           | 38 +++++++++----------
 extra/ui/render/render.factor                 |  6 +--
 9 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/extra/ui/gadgets/buttons/buttons.factor b/extra/ui/gadgets/buttons/buttons.factor
index e9475495bf..c5a5e8bad8 100755
--- a/extra/ui/gadgets/buttons/buttons.factor
+++ b/extra/ui/gadgets/buttons/buttons.factor
@@ -106,7 +106,7 @@ TUPLE: checkmark-paint color ;
 C: <checkmark-paint> checkmark-paint
 
 M: checkmark-paint draw-interior
-    checkmark-paint-color gl-color
+    checkmark-paint-color set-color
     origin get [
         rect-dim
         { 0 0 } over gl-line
@@ -152,11 +152,11 @@ TUPLE: radio-paint color ;
 C: <radio-paint> radio-paint
 
 M: radio-paint draw-interior
-    radio-paint-color gl-color
+    radio-paint-color set-color
     origin get { 4 4 } v+ swap rect-dim { 8 8 } v- 12 gl-fill-circle ;
 
 M: radio-paint draw-boundary
-    radio-paint-color gl-color
+    radio-paint-color set-color
     origin get { 1 1 } v+ swap rect-dim { 2 2 } v- 12 gl-circle ;
 
 : radio-knob-theme ( gadget -- )
diff --git a/extra/ui/gadgets/editors/editors.factor b/extra/ui/gadgets/editors/editors.factor
index 8b0244900a..301121cdcc 100755
--- a/extra/ui/gadgets/editors/editors.factor
+++ b/extra/ui/gadgets/editors/editors.factor
@@ -129,7 +129,7 @@ M: editor ungraft*
 : draw-caret ( -- )
     editor get editor-focused? [
         editor get
-        dup editor-caret-color gl-color
+        dup editor-caret-color set-color
         dup caret-loc origin get v+
         swap caret-dim over v+
         [ { 0.5 -0.5 } v+ ] bi@ gl-line
@@ -173,7 +173,7 @@ M: editor ungraft*
 
 : draw-lines ( -- )
     \ first-visible-line get [
-        editor get dup editor-color gl-color
+        editor get dup editor-color set-color
         dup visible-lines
         [ draw-line 1 translate-lines ] with each
     ] with-editor-translation ;
@@ -192,7 +192,7 @@ M: editor ungraft*
     (draw-selection) ;
 
 : draw-selection ( -- )
-    editor get editor-selection-color gl-color
+    editor get editor-selection-color set-color
     editor get selection-start/end
     over first [
         2dup [
diff --git a/extra/ui/gadgets/grid-lines/grid-lines.factor b/extra/ui/gadgets/grid-lines/grid-lines.factor
index d0cedc985b..3f08425e95 100755
--- a/extra/ui/gadgets/grid-lines/grid-lines.factor
+++ b/extra/ui/gadgets/grid-lines/grid-lines.factor
@@ -25,7 +25,7 @@ SYMBOL: grid-dim
 M: grid-lines draw-boundary
     origin get [
         -0.5 -0.5 0.0 glTranslated
-        grid-lines-color gl-color [
+        grid-lines-color set-color [
             dup grid set
             dup rect-dim half-gap v- grid-dim set
             compute-grid
diff --git a/extra/ui/gadgets/labelled/labelled.factor b/extra/ui/gadgets/labelled/labelled.factor
index bd775a2d39..dd5b1124e1 100755
--- a/extra/ui/gadgets/labelled/labelled.factor
+++ b/extra/ui/gadgets/labelled/labelled.factor
@@ -31,8 +31,8 @@ M: labelled-gadget focusable-child* labelled-gadget-content ;
 : title-theme ( gadget -- )
     { 1 0 } over set-gadget-orientation
     T{ gradient f {
-        { 0.65 0.65 1.0 1.0 }
-        { 0.65 0.45 1.0 1.0 }
+        T{ rgba f 0.65 0.65 1.0 1.0 }
+        T{ rgba f 0.65 0.45 1.0 1.0 }
     } } swap set-gadget-interior ;
 
 : <title-label> ( text -- label ) <label> dup title-theme ;
diff --git a/extra/ui/gadgets/labels/labels.factor b/extra/ui/gadgets/labels/labels.factor
index a3a5c1a0a6..24dbd04fde 100755
--- a/extra/ui/gadgets/labels/labels.factor
+++ b/extra/ui/gadgets/labels/labels.factor
@@ -35,7 +35,7 @@ M: label pref-dim*
     [ font>> open-font ] [ text>> ] bi text-dim ;
 
 M: label draw-gadget*
-    [ color>> gl-color ]
+    [ color>> set-color ]
     [ [ font>> ] [ text>> ] bi origin get draw-text ] bi ;
 
 M: label gadget-text* label-string % ;
diff --git a/extra/ui/gadgets/lists/lists.factor b/extra/ui/gadgets/lists/lists.factor
index c2539e146a..a4c313f944 100755
--- a/extra/ui/gadgets/lists/lists.factor
+++ b/extra/ui/gadgets/lists/lists.factor
@@ -4,13 +4,14 @@ USING: accessors ui.commands ui.gestures ui.render ui.gadgets
 ui.gadgets.labels ui.gadgets.scrollers
 kernel sequences models opengl math math.order namespaces
 ui.gadgets.presentations ui.gadgets.viewports ui.gadgets.packs
-math.vectors classes.tuple math.geometry.rect ;
+math.vectors classes.tuple math.geometry.rect colors ;
+
 IN: ui.gadgets.lists
 
 TUPLE: list < pack index presenter color hook ;
 
 : list-theme ( list -- list )
-    { 0.8 0.8 1.0 1.0 } >>color ; inline
+    T{ rgba f 0.8 0.8 1.0 1.0 } >>color ; inline
 
 : <list> ( hook presenter model -- gadget )
     list new-gadget
@@ -56,7 +57,7 @@ M: list model-changed
 
 M: list draw-gadget*
     origin get [
-        dup list-color gl-color
+        dup list-color set-color
         selected-rect [ rect-extent gl-fill-rect ] when*
     ] with-translation ;
 
diff --git a/extra/ui/gadgets/panes/panes.factor b/extra/ui/gadgets/panes/panes.factor
index cca757e0eb..e7798404f4 100755
--- a/extra/ui/gadgets/panes/panes.factor
+++ b/extra/ui/gadgets/panes/panes.factor
@@ -68,7 +68,7 @@ M: node draw-selection ( loc node -- )
 
 M: pane draw-gadget*
     dup gadget-selection? [
-        dup pane-selection-color gl-color
+        dup pane-selection-color set-color
         origin get over rect-loc v- swap selected-children
         [ draw-selection ] with each
     ] [
diff --git a/extra/ui/gadgets/theme/theme.factor b/extra/ui/gadgets/theme/theme.factor
index 68bd3b201a..20f560e309 100644
--- a/extra/ui/gadgets/theme/theme.factor
+++ b/extra/ui/gadgets/theme/theme.factor
@@ -18,41 +18,41 @@ IN: ui.gadgets.theme
 
 : plain-gradient
     T{ gradient f {
-        { 0.94 0.94 0.94 1.0 }
-        { 0.83 0.83 0.83 1.0 }
-        { 0.83 0.83 0.83 1.0 }
-        { 0.62 0.62 0.62 1.0 }
+        T{ rgba f 0.94 0.94 0.94 1.0 }
+        T{ rgba f 0.83 0.83 0.83 1.0 }
+        T{ rgba f 0.83 0.83 0.83 1.0 }
+        T{ rgba f 0.62 0.62 0.62 1.0 }
     } } ;
 
 : rollover-gradient
     T{ gradient f {
-        { 1.0 1.0 1.0 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 0.75 0.75 0.75 1.0 }
+        T{ rgba f 1.0 1.0 1.0 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 0.75 0.75 0.75 1.0 }
     } } ;
 
 : pressed-gradient
     T{ gradient f {
-        { 0.75 0.75 0.75 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 0.9 0.9 0.9 1.0 }
-        { 1.0 1.0 1.0 1.0 }
+        T{ rgba f 0.75 0.75 0.75 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 0.9 0.9 0.9 1.0 }
+        T{ rgba f 1.0 1.0 1.0 1.0 }
     } } ;
 
 : selected-gradient
     T{ gradient f {
-        { 0.65 0.65 0.65 1.0 }
-        { 0.8 0.8 0.8 1.0 }
-        { 0.8 0.8 0.8 1.0 }
-        { 1.0 1.0 1.0 1.0 }
+        T{ rgba f 0.65 0.65 0.65 1.0 }
+        T{ rgba f 0.8 0.8 0.8 1.0 }
+        T{ rgba f 0.8 0.8 0.8 1.0 }
+        T{ rgba f 1.0 1.0 1.0 1.0 }
     } } ;
 
 : lowered-gradient
     T{ gradient f {
-        { 0.37 0.37 0.37 1.0 }
-        { 0.43 0.43 0.43 1.0 }
-        { 0.5 0.5 0.5 1.0 }
+        T{ rgba f 0.37 0.37 0.37 1.0 }
+        T{ rgba f 0.43 0.43 0.43 1.0 }
+        T{ rgba f 0.5 0.5 0.5 1.0 }
     } } ;
 
 : sans-serif-font { "sans-serif" plain 12 } ;
diff --git a/extra/ui/render/render.factor b/extra/ui/render/render.factor
index 6e9a4778a7..a0a51b09da 100644
--- a/extra/ui/render/render.factor
+++ b/extra/ui/render/render.factor
@@ -35,7 +35,7 @@ SYMBOL: viewport-translation
     init-clip
     ! white gl-clear is broken w.r.t window resizing
     ! Linux/PPC Radeon 9200
-    white gl-color
+    white set-color
     clip get rect-extent gl-fill-rect ;
 
 GENERIC: draw-gadget* ( gadget -- )
@@ -95,7 +95,7 @@ C: <solid> solid
 
 ! Solid pen
 : (solid) ( gadget paint -- loc dim )
-    solid-color gl-color rect-dim >r origin get dup r> v+ ;
+    solid-color set-color rect-dim >r origin get dup r> v+ ;
 
 M: solid draw-interior (solid) gl-fill-rect ;
 
@@ -121,7 +121,7 @@ C: <polygon> polygon
 
 : draw-polygon ( polygon quot -- )
     origin get [
-        >r dup polygon-color gl-color polygon-points r> call
+        >r dup polygon-color set-color polygon-points r> call
     ] with-translation ; inline
 
 M: polygon draw-boundary

From 4953ce5d2f7061db0b2e1ba6fb1b124e737df608 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 17:54:10 -0500
Subject: [PATCH 29/77] Cleanup

---
 extra/tools/test/test.factor | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/extra/tools/test/test.factor b/extra/tools/test/test.factor
index abbf5e5ab9..7b3f03e18a 100755
--- a/extra/tools/test/test.factor
+++ b/extra/tools/test/test.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces arrays prettyprint sequences kernel
-vectors quotations words parser assocs combinators
-continuations debugger io io.files vocabs
-vocabs.loader source-files compiler.units summary
-inference effects tools.vocabs ;
+USING: accessors namespaces arrays prettyprint sequences kernel
+vectors quotations words parser assocs combinators continuations
+debugger io io.files vocabs vocabs.loader source-files
+compiler.units summary inference effects tools.vocabs ;
 IN: tools.test
 
 SYMBOL: failures
@@ -31,7 +30,7 @@ SYMBOL: this-test
     ] 2curry (unit-test) ;
 
 : short-effect ( effect -- pair )
-    dup effect-in length swap effect-out length 2array ;
+    [ in>> length ] [ out>> length ] bi 2array ;
 
 : must-infer-as ( effect quot -- )
     >r 1quotation r> [ infer short-effect ] curry unit-test ;

From c8cafe5706e9285ecf579718548d21a768912e7e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 17:55:41 -0500
Subject: [PATCH 30/77] Fix dlist-member?

---
 core/dlists/dlists-tests.factor | 6 ++++++
 core/dlists/dlists.factor       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/dlists/dlists-tests.factor b/core/dlists/dlists-tests.factor
index ff015bf95b..119a0acadb 100755
--- a/core/dlists/dlists-tests.factor
+++ b/core/dlists/dlists-tests.factor
@@ -71,3 +71,9 @@ IN: dlists.tests
 [ <dlist> peek-back ] [ empty-dlist? ] must-fail-with
 [ <dlist> pop-front ] [ empty-dlist? ] must-fail-with
 [ <dlist> pop-back ] [ empty-dlist? ] must-fail-with
+
+[ t ] [ <dlist> 3 over push-front 4 over push-back 3 swap dequeue-member? ] unit-test
+
+[ f ] [ <dlist> 3 over push-front 4 over push-back -1 swap dequeue-member? ] unit-test
+
+[ f ] [ <dlist> 0 swap dequeue-member? ] unit-test
diff --git a/core/dlists/dlists.factor b/core/dlists/dlists.factor
index 370ec4042f..d996e3dcf9 100755
--- a/core/dlists/dlists.factor
+++ b/core/dlists/dlists.factor
@@ -122,7 +122,7 @@ M: dlist pop-back* ( dlist -- )
     dlist-find nip ; inline
 
 M: dlist dequeue-member? ( value dlist -- ? )
-    [ = ] curry dlist-contains? ;
+    [ = ] with dlist-contains? ;
 
 M: dlist delete-node ( dlist-node dlist -- )
     {

From 029e0e4bba6e9d5c324a2f78cb3cacf79b87cbcc Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 17:56:15 -0500
Subject: [PATCH 31/77] Fix stack-checker bug

---
 .../tree/propagation/propagation-tests.factor |  8 ++++++
 .../stack-checker/branches/branches.factor    | 28 +++++++++++--------
 .../stack-checker/stack-checker-tests.factor  | 13 +++++++++
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/unfinished/compiler/tree/propagation/propagation-tests.factor b/unfinished/compiler/tree/propagation/propagation-tests.factor
index 4da40f8a2d..7dd4835639 100644
--- a/unfinished/compiler/tree/propagation/propagation-tests.factor
+++ b/unfinished/compiler/tree/propagation/propagation-tests.factor
@@ -276,6 +276,14 @@ IN: compiler.tree.propagation.tests
     ] final-literals
 ] unit-test
 
+[ V{ 27 } ] [
+    [
+        dup number? over sequence? and [
+            dup 10 < over 8 <= not and [ 3 * ] [ "A" throw ] if
+        ] [ "B" throw ] if
+    ] final-literals
+] unit-test
+
 [ V{ string string } ] [
     [
         2dup [ dup string? [ "Oops" throw ] unless ] bi@ 2drop
diff --git a/unfinished/stack-checker/branches/branches.factor b/unfinished/stack-checker/branches/branches.factor
index 711fb3f151..45c0b6541b 100644
--- a/unfinished/stack-checker/branches/branches.factor
+++ b/unfinished/stack-checker/branches/branches.factor
@@ -6,18 +6,24 @@ stack-checker.backend stack-checker.errors stack-checker.visitor
 ;
 IN: stack-checker.branches
 
-: balanced? ( seq -- ? )
+: balanced? ( pairs -- ? )
     [ second ] filter [ first2 length - ] map all-equal? ;
 
-: phi-inputs ( seq -- newseq )
-    dup empty? [
-        dup [ length ] map supremum
-        '[ , f pad-left ] map flip
-    ] unless ;
+: unify-inputs ( max-d-in d-in meta-d -- new-meta-d )
+    dup [ [ - f <repetition> ] dip append ] [ 3drop f ] if ;
+
+: phi-inputs ( max-d-in pairs -- newseq )
+    dup empty? [ nip ] [
+        swap '[ , _ first2 unify-inputs ] map
+        dup [ length ] map supremum '[ , f pad-left ] map
+        flip
+    ] if ;
 
 : unify-values ( values -- phi-out )
-    dup sift [ known ] map dup all-eq?
-    [ nip first make-known ] [ 2drop <value> ] if ;
+    sift dup empty? [ drop <value> ] [
+        [ known ] map dup all-eq?
+        [ first make-known ] [ drop <value> ] if
+    ] if ;
 
 : phi-outputs ( phi-in -- stack )
     [ unify-values ] map ;
@@ -26,8 +32,8 @@ SYMBOL: quotations
 
 : unify-branches ( ins stacks -- in phi-in phi-out )
     zip dup empty? [ drop 0 { } { } ] [
-        dup balanced?
-        [ [ keys supremum ] [ values phi-inputs dup phi-outputs ] bi ]
+        [ keys supremum ] [ ] [ balanced? ] tri
+        [ dupd phi-inputs dup phi-outputs ]
         [ quotations get unbalanced-branches-error ]
         if
     ] if ;
@@ -72,7 +78,7 @@ SYMBOL: quotations
 
 : infer-if ( -- )
     2 consume-d
-    dup [ known [ curry? ] [ composed? ] bi or ] contains? [
+    dup [ known [ curried? ] [ composed? ] bi or ] contains? [
         output-d
         [ rot [ drop call ] [ nip call ] if ]
         recursive-state get infer-quot
diff --git a/unfinished/stack-checker/stack-checker-tests.factor b/unfinished/stack-checker/stack-checker-tests.factor
index e6dfbbdf26..3fcbc2d023 100755
--- a/unfinished/stack-checker/stack-checker-tests.factor
+++ b/unfinished/stack-checker/stack-checker-tests.factor
@@ -9,6 +9,16 @@ threads.private io.streams.string io.timeouts io.thread
 sequences.private destructors combinators ;
 IN: stack-checker.tests
 
+: short-effect ( effect -- pair )
+    [ in>> length ] [ out>> length ] bi 2array ;
+
+: must-infer-as ( effect quot -- )
+    >r 1quotation r> [ infer short-effect ] curry unit-test ;
+
+: must-infer ( word/quot -- )
+    dup word? [ 1quotation ] when
+    [ infer drop ] curry [ ] swap unit-test ;
+
 \ infer. must-infer
 
 { 0 2 } [ 2 "Hello" ] must-infer-as
@@ -560,3 +570,6 @@ M: object inference-invalidation-d inference-invalidation-c 2drop ;
 : bad-recursion-6 ( quot: ( -- ) -- )
     dup bad-recursion-6 call ; inline recursive
 [ [ [ drop f ] bad-recursion-6 ] infer ] must-fail
+
+{ 3 0 } [ [ 2drop "A" throw ] [ ] if 2drop ] must-infer-as
+{ 2 0 } [ drop f f [ 2drop "A" throw ] [ ] if 2drop ] must-infer-as

From 7c6b7762f9c5e853044573e31fed5b921022fdab Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 18:05:52 -0500
Subject: [PATCH 32/77] colors: fix copyright year

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

diff --git a/extra/colors/colors.factor b/extra/colors/colors.factor
index 02ad3ac778..ce141c489e 100644
--- a/extra/colors/colors.factor
+++ b/extra/colors/colors.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2003, 2007 Slava Pestov.
+! Copyright (C) 2003, 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: kernel combinators sequences arrays

From 1c61b7734c35e18fde50823c342527af4307bc9e Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 18:27:28 -0500
Subject: [PATCH 33/77] colors: 'gray' instead of 'grey'

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

diff --git a/extra/colors/colors.factor b/extra/colors/colors.factor
index ce141c489e..3621373d93 100644
--- a/extra/colors/colors.factor
+++ b/extra/colors/colors.factor
@@ -14,7 +14,7 @@ TUPLE: rgba < color red green blue alpha ;
 
 TUPLE: hsva < color hue saturation value alpha ;
 
-TUPLE: grey < color grey alpha ;
+TUPLE: gray < color gray alpha ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -26,7 +26,7 @@ METHOD: >rgba { hsva }
   { [ hue>> ] [ saturation>> ] [ value>> ] [ alpha>> ] } cleave 4array
   [ hsv>rgb ] [ peek ] bi suffix first4 rgba boa ;
 
-METHOD: >rgba { grey } [ grey>> dup dup ] [ alpha>> ] bi rgba boa ;
+METHOD: >rgba { gray } [ gray>> dup dup ] [ alpha>> ] bi rgba boa ;
 
 METHOD: >rgba { array } first4 rgba boa ;
 

From d66f887736c773cde29ae20d48517f6ed47787ff Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:03:13 -0500
Subject: [PATCH 34/77] Create basis vocab root

---
 {extra => basis}/alarms/alarms-docs.factor    |   0
 {extra => basis}/alarms/alarms-tests.factor   |   0
 {extra => basis}/alarms/alarms.factor         |   0
 {extra => basis}/alarms/authors.txt           |   0
 {extra => basis}/alias/alias.factor           |   0
 .../alien/arrays/arrays-docs.factor           |   0
 {core => basis}/alien/arrays/arrays.factor    |   0
 {core => basis}/alien/arrays/authors.txt      |   0
 {core => basis}/alien/arrays/summary.txt      |   0
 {core => basis}/alien/c-types/authors.txt     |   0
 .../alien/c-types/c-types-docs.factor         |   0
 .../alien/c-types/c-types-tests.factor        |   0
 {core => basis}/alien/c-types/c-types.factor  |   0
 {core => basis}/alien/c-types/summary.txt     |   0
 {core => basis}/alien/compiler/authors.txt    |   0
 .../alien/compiler/compiler-tests.factor      |   0
 .../alien/compiler/compiler.factor            |   0
 {core => basis}/alien/compiler/summary.txt    |   0
 .../alien/remote-control/authors.txt          |   0
 .../remote-control/remote-control.factor      |   2 +-
 .../alien/remote-control/summary.txt          |   0
 .../alien/strings/strings-docs.factor         |   0
 .../alien/strings/strings-tests.factor        |   0
 {core => basis}/alien/strings/strings.factor  |   0
 {core => basis}/alien/structs/authors.txt     |   0
 .../alien/structs/structs-docs.factor         |   0
 .../alien/structs/structs-tests.factor        |   0
 {core => basis}/alien/structs/structs.factor  |   0
 {core => basis}/alien/structs/summary.txt     |   0
 {core => basis}/alien/syntax/authors.txt      |   0
 {core => basis}/alien/syntax/summary.txt      |   0
 .../alien/syntax/syntax-docs.factor           |   0
 {core => basis}/alien/syntax/syntax.factor    |   0
 {extra => basis}/ascii/ascii-docs.factor      |   0
 {extra => basis}/ascii/ascii-tests.factor     |   0
 {extra => basis}/ascii/ascii.factor           |   0
 .../compiler => basis/ascii}/authors.txt      |   0
 {extra => basis}/ascii/summary.txt            |   0
 .../encodings/utf16 => basis/ascii}/tags.txt  |   0
 {extra => basis}/base64/authors.txt           |   0
 {extra => basis}/base64/base64-docs.factor    |   0
 {extra => basis}/base64/base64-tests.factor   |   0
 {extra => basis}/base64/base64.factor         |   0
 {extra => basis}/base64/summary.txt           |   0
 .../image => basis/biassocs}/authors.txt      |   0
 .../biassocs/biassocs-docs.factor             |   0
 .../biassocs/biassocs-tests.factor            |   0
 {extra => basis}/biassocs/biassocs.factor     |   0
 {extra => basis}/biassocs/summary.txt         |   0
 {core/dequeues => basis/biassocs}/tags.txt    |   0
 .../binary-search/binary-search-docs.factor   |   0
 .../binary-search/binary-search-tests.factor  |   0
 .../binary-search/binary-search.factor        |   0
 .../bit-arrays}/authors.txt                   |   0
 .../bit-arrays/bit-arrays-docs.factor         |   0
 .../bit-arrays/bit-arrays-tests.factor        |   0
 {extra => basis}/bit-arrays/bit-arrays.factor |   0
 {extra => basis}/bit-arrays/summary.txt       |   0
 {core/dlists => basis/bit-arrays}/tags.txt    |   0
 .../bit-vectors/bit-vectors-docs.factor       |   0
 .../bit-vectors/bit-vectors-tests.factor      |   0
 .../bit-vectors/bit-vectors.factor            |   0
 {extra => basis}/bit-vectors/summary.txt      |   0
 {core/heaps => basis/bit-vectors}/tags.txt    |   0
 .../bootstrap}/compiler/authors.txt           |   0
 .../bootstrap/compiler/compiler.factor        |   0
 .../bootstrap/compiler/summary.txt            |   0
 .../bootstrap/handbook/handbook.factor        |   0
 .../bootstrap/help}/authors.txt               |   0
 {extra => basis}/bootstrap/help/help.factor   |   0
 {extra => basis}/bootstrap/help/summary.txt   |   0
 .../bootstrap/image}/authors.txt              |   0
 .../bootstrap/image/download}/authors.txt     |   0
 .../bootstrap/image/download/download.factor  |   0
 .../bootstrap/image/download/summary.txt      |   0
 .../bootstrap/image/image-docs.factor         |   0
 .../bootstrap/image/image-tests.factor        |   0
 {core => basis}/bootstrap/image/image.factor  |   0
 {core => basis}/bootstrap/image/summary.txt   |   0
 {core => basis}/bootstrap/image/tags.txt      |   0
 .../bootstrap/image/upload}/authors.txt       |   0
 .../bootstrap/image/upload/summary.txt        |   0
 .../bootstrap/image/upload/upload.factor      |   0
 .../bootstrap/io}/authors.txt                 |   0
 {extra => basis}/bootstrap/io/io.factor       |   0
 {extra => basis}/bootstrap/io/summary.txt     |   0
 {extra => basis}/bootstrap/math/math.factor   |   0
 {extra => basis}/bootstrap/math/summary.txt   |   0
 .../bootstrap/random/random.factor            |   0
 {core => basis}/bootstrap/stage2.factor       |  99 ++++++++-------
 .../bootstrap/tools}/authors.txt              |   0
 {extra => basis}/bootstrap/tools/summary.txt  |   0
 {extra => basis}/bootstrap/tools/tools.factor |   0
 .../bootstrap/unicode/unicode.factor          |   0
 {core => basis}/boxes/boxes-docs.factor       |   0
 {core => basis}/boxes/boxes-tests.factor      |   0
 {core => basis}/boxes/boxes.factor            |   0
 {extra => basis}/calendar/authors.txt         |   0
 {extra => basis}/calendar/backend/authors.txt |   0
 .../calendar/backend/backend.factor           |   0
 .../calendar/calendar-tests.factor            |   0
 {extra => basis}/calendar/calendar.factor     |   0
 .../calendar/format/format-tests.factor       |   0
 .../calendar/format/format.factor             |   0
 .../format/macros/macros-tests.factor         |   0
 .../calendar/format/macros/macros.factor      |   0
 {extra => basis}/calendar/format/summary.txt  |   0
 {extra => basis}/calendar/model/model.factor  |   0
 {extra => basis}/calendar/model/summary.txt   |   0
 {extra => basis}/calendar/summary.txt         |   0
 {extra => basis}/calendar/unix/authors.txt    |   0
 {extra => basis}/calendar/unix/unix.factor    |   0
 {extra => basis}/calendar/windows/authors.txt |   0
 {extra => basis}/calendar/windows/tags.txt    |   0
 .../calendar/windows/windows.factor           |   0
 {extra => basis}/channels/authors.txt         |   0
 .../channels/channels-docs.factor             |   0
 .../channels/channels-tests.factor            |   0
 {extra => basis}/channels/channels.factor     |   0
 .../channels/examples/authors.txt             |   0
 .../channels/examples/examples.factor         |   0
 .../channels/examples/summary.txt             |   0
 {extra => basis}/channels/examples/tags.txt   |   0
 {extra => basis}/channels/remote/authors.txt  |   0
 .../channels/remote/remote-docs.factor        |   0
 .../channels/remote/remote-tests.factor       |   0
 .../channels/remote/remote.factor             |   0
 {extra => basis}/channels/remote/summary.txt  |   0
 {extra => basis}/channels/remote/tags.txt     |   0
 {extra => basis}/channels/summary.txt         |   0
 {extra => basis}/channels/tags.txt            |   0
 .../checksums/adler-32/adler-32-docs.factor   |   0
 .../checksums/adler-32/adler-32-tests.factor  |   0
 .../checksums/adler-32/adler-32.factor        |   0
 .../checksums/adler-32/authors.txt            |   0
 {extra => basis}/checksums/md5/authors.txt    |   0
 .../checksums/md5/md5-docs.factor             |   0
 .../checksums/md5/md5-tests.factor            |   0
 {extra => basis}/checksums/md5/md5.factor     |   0
 {extra => basis}/checksums/null/null.factor   |   0
 .../checksums/openssl/openssl-docs.factor     |   0
 .../checksums/openssl/openssl-tests.factor    |   0
 .../checksums/openssl/openssl.factor          |   0
 {extra => basis}/checksums/sha1/authors.txt   |   0
 .../checksums/sha1/sha1-docs.factor           |   0
 .../checksums/sha1/sha1-tests.factor          |   0
 {extra => basis}/checksums/sha1/sha1.factor   |   0
 {extra => basis}/checksums/sha2/authors.txt   |   0
 .../checksums/sha2/sha2-docs.factor           |   0
 .../checksums/sha2/sha2-tests.factor          |   0
 {extra => basis}/checksums/sha2/sha2.factor   |   0
 {extra => basis}/circular/authors.txt         |   0
 .../circular/circular-tests.factor            |   0
 {extra => basis}/circular/circular.factor     |   0
 {extra => basis}/circular/summary.txt         |   0
 .../circular}/tags.txt                        |   0
 .../cocoa/application/application-docs.factor |   0
 .../cocoa/application/application.factor      |   0
 .../cocoa/application}/authors.txt            |   0
 .../cocoa/application/summary.txt             |   0
 .../intrinsics => basis/cocoa}/authors.txt    |   0
 {extra => basis}/cocoa/callbacks/authors.txt  |   0
 .../cocoa/callbacks/callbacks.factor          |   0
 {extra => basis}/cocoa/callbacks/summary.txt  |   0
 {extra => basis}/cocoa/cocoa-docs.factor      |   0
 {extra => basis}/cocoa/cocoa-tests.factor     |   0
 {extra => basis}/cocoa/cocoa.factor           |   0
 .../allot => basis/cocoa/dialogs}/authors.txt |   0
 .../cocoa/dialogs/dialogs-docs.factor         |   0
 {extra => basis}/cocoa/dialogs/dialogs.factor |   0
 {extra => basis}/cocoa/dialogs/summary.txt    |   0
 .../cocoa/enumeration/enumeration.factor      |   0
 .../cocoa/messages}/authors.txt               |   0
 .../cocoa/messages/messages-docs.factor       |   0
 .../cocoa/messages/messages.factor            |   0
 {extra => basis}/cocoa/messages/summary.txt   |   0
 {extra => basis}/cocoa/nibs/authors.txt       |   0
 {extra => basis}/cocoa/nibs/nibs-docs.factor  |   0
 {extra => basis}/cocoa/nibs/nibs.factor       |   0
 {extra => basis}/cocoa/nibs/summary.txt       |   0
 .../cocoa/pasteboard}/authors.txt             |   0
 .../cocoa/pasteboard/pasteboard-docs.factor   |   0
 .../cocoa/pasteboard/pasteboard.factor        |   0
 {extra => basis}/cocoa/pasteboard/summary.txt |   0
 .../ppc => basis/cocoa/plists}/authors.txt    |   0
 {extra => basis}/cocoa/plists/plists.factor   |   0
 .../cocoa/runtime}/authors.txt                |   0
 {extra => basis}/cocoa/runtime/runtime.factor |   0
 {extra => basis}/cocoa/runtime/summary.txt    |   0
 .../cocoa/subclassing}/authors.txt            |   0
 .../cocoa/subclassing/subclassing-docs.factor |   0
 .../cocoa/subclassing/subclassing.factor      |   0
 .../cocoa/subclassing/summary.txt             |   0
 {extra => basis}/cocoa/summary.txt            |   0
 {extra => basis}/cocoa/tags.txt               |   0
 .../x86/64 => basis/cocoa/types}/authors.txt  |   0
 {extra => basis}/cocoa/types/summary.txt      |   0
 .../cocoa/types/types-docs.factor             |   0
 {extra => basis}/cocoa/types/types.factor     |   0
 .../allot => basis/cocoa/views}/authors.txt   |   0
 {extra => basis}/cocoa/views/summary.txt      |   0
 .../cocoa/views/views-docs.factor             |   0
 {extra => basis}/cocoa/views/views.factor     |   0
 .../cocoa/windows}/authors.txt                |   0
 {extra => basis}/cocoa/windows/summary.txt    |   0
 .../cocoa/windows/windows-docs.factor         |   0
 {extra => basis}/cocoa/windows/windows.factor |   0
 {extra => basis}/columns/authors.txt          |   0
 {extra => basis}/columns/columns-docs.factor  |   0
 {extra => basis}/columns/columns-tests.factor |   0
 {extra => basis}/columns/columns.factor       |   0
 {extra => basis}/columns/summary.txt          |   0
 {extra/biassocs => basis/columns}/tags.txt    |   0
 .../short-circuit/short-circuit-tests.factor  |   0
 .../short-circuit/short-circuit.factor        |   0
 .../short-circuit/smart/smart-tests.factor    |   0
 .../short-circuit/smart/smart.factor          |   0
 .../command-line}/authors.txt                 |   0
 .../command-line/command-line-docs.factor     |   0
 .../command-line/command-line-tests.factor    |   0
 .../command-line/command-line.factor          |   4 +-
 {core => basis}/command-line/summary.txt      |   0
 {core/cpu/x86 => basis/compiler}/authors.txt  |   0
 {core => basis}/compiler/compiler-docs.factor |   0
 {core => basis}/compiler/compiler.factor      |   0
 .../compiler/constants}/authors.txt           |   0
 .../compiler/constants/constants.factor       |   0
 .../compiler/constants/summary.txt            |   0
 {core => basis}/compiler/summary.txt          |   0
 {core => basis}/compiler/tags.txt             |   0
 {core => basis}/compiler/tests/curry.factor   |   0
 {core => basis}/compiler/tests/float.factor   |   0
 {core => basis}/compiler/tests/insane.factor  |   0
 .../compiler/tests/intrinsics.factor          |   0
 .../compiler/tests/redefine1.factor           |   0
 .../compiler/tests/redefine2.factor           |   0
 .../compiler/tests/redefine3.factor           |   0
 {core => basis}/compiler/tests/reload.factor  |   0
 {core => basis}/compiler/tests/simple.factor  |   0
 .../compiler/tests/stack-trace.factor         |   0
 .../compiler/tests/templates-early.factor     |   0
 .../compiler/tests/templates.factor           |   0
 {core => basis}/compiler/tests/tuples.factor  |   0
 .../combinators/combinators-docs.factor       |   0
 .../combinators/combinators-tests.factor      |   0
 .../combinators/combinators.factor            |   0
 .../concurrency/combinators/summary.txt       |   0
 .../concurrency/conditions/conditions.factor  |   0
 .../concurrency/conditions/summary.txt        |   0
 .../count-downs/count-downs-docs.factor       |   0
 .../count-downs/count-downs-tests.factor      |   0
 .../count-downs/count-downs.factor            |   0
 .../concurrency/count-downs/summary.txt       |   0
 .../concurrency/distributed/authors.txt       |   0
 .../distributed/distributed-docs.factor       |   0
 .../distributed/distributed-tests.factor      |   0
 .../distributed/distributed.factor            |   0
 .../concurrency/distributed/summary.txt       |   0
 .../concurrency/distributed/tags.txt          |   0
 .../concurrency/exchangers}/authors.txt       |   0
 .../exchangers/exchangers-docs.factor         |   0
 .../exchangers/exchangers-tests.factor        |   0
 .../concurrency/exchangers/exchangers.factor  |   0
 .../concurrency/exchangers/summary.txt        |   0
 .../concurrency/flags/flags-docs.factor       |   0
 .../concurrency/flags/flags-tests.factor      |   0
 .../concurrency/flags/flags.factor            |   0
 .../concurrency/futures/authors.txt           |   0
 .../concurrency/futures/futures-docs.factor   |   0
 .../concurrency/futures/futures-tests.factor  |   0
 .../concurrency/futures/futures.factor        |   0
 .../concurrency/futures/summary.txt           |   0
 .../concurrency/locks}/authors.txt            |   0
 .../concurrency/locks/locks-docs.factor       |   0
 .../concurrency/locks/locks-tests.factor      |   0
 .../concurrency/locks/locks.factor            |   0
 .../concurrency/locks/summary.txt             |   0
 .../mailboxes/mailboxes-docs.factor           |   0
 .../mailboxes/mailboxes-tests.factor          |   0
 .../concurrency/mailboxes/mailboxes.factor    |   0
 .../concurrency/messaging/authors.txt         |   0
 .../messaging/messaging-docs.factor           |   0
 .../messaging/messaging-tests.factor          |   0
 .../concurrency/messaging/messaging.factor    |   0
 .../concurrency/messaging/summary.txt         |   0
 .../concurrency/promises/authors.txt          |   0
 .../concurrency/promises/promises-docs.factor |   0
 .../promises/promises-tests.factor            |   0
 .../concurrency/promises/promises.factor      |   0
 .../concurrency/promises/summary.txt          |   0
 .../concurrency/semaphores}/authors.txt       |   0
 .../semaphores/semaphores-docs.factor         |   0
 .../concurrency/semaphores/semaphores.factor  |   0
 .../concurrency/semaphores/summary.txt        |   0
 .../core-foundation}/authors.txt              |   0
 .../core-foundation-docs.factor               |   0
 .../core-foundation/core-foundation.factor    |   0
 .../core-foundation/fsevents/fsevents.factor  |   0
 .../core-foundation/run-loop/run-loop.factor  |   0
 {extra => basis}/core-foundation/summary.txt  |   0
 {extra => basis}/core-foundation/tags.txt     |   0
 .../cpu/architecture/architecture.factor      |   0
 .../cpu/architecture}/authors.txt             |   0
 {core => basis}/cpu/architecture/summary.txt  |   0
 {core => basis}/cpu/architecture/tags.txt     |   0
 {core => basis}/cpu/arm/4/4.factor            |   0
 .../registers => basis/cpu/arm/4}/authors.txt |   0
 {core => basis}/cpu/arm/4/summary.txt         |   0
 {core => basis}/cpu/arm/allot/allot.factor    |   0
 .../cpu/arm/allot}/authors.txt                |   0
 .../cpu/arm/architecture/architecture.factor  |   0
 .../cpu/arm/architecture}/authors.txt         |   0
 {core => basis}/cpu/arm/arm.factor            |   0
 .../cpu/arm/assembler/assembler-tests.factor  |   0
 .../cpu/arm/assembler/assembler.factor        |   0
 .../cpu/arm/assembler}/authors.txt            |   0
 .../dataflow => basis/cpu/arm}/authors.txt    |   0
 {core => basis}/cpu/arm/bootstrap.factor      |   0
 .../cpu/arm/intrinsics}/authors.txt           |   0
 .../cpu/arm/intrinsics/intrinsics.factor      |   0
 {core => basis}/cpu/arm/summary.txt           |   0
 {core => basis}/cpu/arm/tags.txt              |   0
 {core => basis}/cpu/ppc/allot/allot.factor    |   0
 .../cpu/ppc/allot}/authors.txt                |   0
 {core => basis}/cpu/ppc/allot/summary.txt     |   0
 .../cpu/ppc/architecture/architecture.factor  |   0
 .../cpu/ppc/architecture}/authors.txt         |   0
 .../cpu/ppc/architecture/summary.txt          |   0
 .../cpu/ppc/assembler/assembler-tests.factor  |   0
 .../cpu/ppc/assembler/assembler.factor        |   0
 .../cpu/ppc/assembler}/authors.txt            |   0
 .../cpu/ppc/assembler/backend/backend.factor  |   0
 {core => basis}/cpu/ppc/assembler/summary.txt |   0
 {core/inspector => basis/cpu/ppc}/authors.txt |   0
 {core => basis}/cpu/ppc/bootstrap.factor      |   0
 .../cpu/ppc/intrinsics}/authors.txt           |   0
 .../cpu/ppc/intrinsics/intrinsics.factor      |   0
 .../cpu/ppc/linux/bootstrap.factor            |   0
 .../cpu/ppc/macosx/bootstrap.factor           |   0
 {core => basis}/cpu/ppc/ppc.factor            |   0
 {core => basis}/cpu/ppc/summary.txt           |   0
 {core => basis}/cpu/ppc/tags.txt              |   0
 {core => basis}/cpu/summary.txt               |   0
 {core => basis}/cpu/tags.txt                  |   0
 {core => basis}/cpu/x86/32/32.factor          |   0
 .../cpu/x86/32}/authors.txt                   |   0
 {core => basis}/cpu/x86/32/bootstrap.factor   |   2 +-
 {core => basis}/cpu/x86/32/tags.txt           |   0
 {core => basis}/cpu/x86/64/64.factor          |   0
 .../cpu/x86/64}/authors.txt                   |   0
 {core => basis}/cpu/x86/64/bootstrap.factor   |   2 +-
 {core => basis}/cpu/x86/64/summary.txt        |   0
 {core => basis}/cpu/x86/64/tags.txt           |   0
 {core => basis}/cpu/x86/allot/allot.factor    |   0
 .../cpu/x86/allot}/authors.txt                |   0
 .../cpu/x86/architecture/architecture.factor  |   0
 .../cpu/x86/architecture}/authors.txt         |   0
 .../cpu/x86/assembler/assembler-tests.factor  |   0
 .../cpu/x86/assembler/assembler.factor        |   0
 .../cpu/x86/assembler}/authors.txt            |   0
 .../cpu/x86/assembler/syntax/syntax.factor    |   0
 .../backend => basis/cpu/x86}/authors.txt     |   0
 {core => basis}/cpu/x86/bootstrap.factor      |   0
 .../cpu/x86/intrinsics}/authors.txt           |   0
 .../cpu/x86/intrinsics/intrinsics.factor      |   0
 .../cpu/x86/sse2}/authors.txt                 |   0
 {core => basis}/cpu/x86/sse2/sse2.factor      |   0
 {core => basis}/cpu/x86/sse2/summary.txt      |   0
 {core => basis}/cpu/x86/summary.txt           |   0
 {extra => basis}/csv/authors.txt              |   0
 {extra => basis}/csv/csv-docs.factor          |   0
 {extra => basis}/csv/csv-tests.factor         |   0
 {extra => basis}/csv/csv.factor               |   0
 {extra => basis}/csv/summary.txt              |   0
 .../math => basis/debugger}/authors.txt       |   0
 {core => basis}/debugger/debugger-docs.factor |  26 ----
 .../debugger/debugger-tests.factor            |   0
 {core => basis}/debugger/debugger.factor      | 115 ++++++++++++------
 {core => basis}/debugger/summary.txt          |   0
 {extra => basis}/delegate/author.txt          |   0
 .../string => basis/delegate}/authors.txt     |   0
 .../delegate/delegate-docs.factor             |   0
 .../delegate/delegate-tests.factor            |   0
 {extra => basis}/delegate/delegate.factor     |   0
 .../delegate/protocols}/authors.txt           |   0
 .../delegate/protocols/protocols.factor       |   0
 {extra => basis}/delegate/summary.txt         |   0
 .../dequeues}/authors.txt                     |   0
 {core => basis}/dequeues/dequeues-docs.factor |   0
 {core => basis}/dequeues/dequeues.factor      |   0
 {core => basis}/dequeues/summary.txt          |   0
 {extra/bit-arrays => basis/dequeues}/tags.txt |   0
 {extra => basis}/disjoint-sets/authors.txt    |   0
 .../disjoint-sets/disjoint-sets.factor        |   0
 {extra => basis}/disjoint-sets/summary.txt    |   0
 .../disjoint-sets}/tags.txt                   |   0
 {core => basis}/dlists/authors.txt            |   0
 {core => basis}/dlists/dlists-docs.factor     |   0
 {core => basis}/dlists/dlists-tests.factor    |   0
 {core => basis}/dlists/dlists.factor          |   6 +-
 {core => basis}/dlists/summary.txt            |   0
 {extra/circular => basis/dlists}/tags.txt     |   0
 .../documents}/authors.txt                    |   0
 .../documents/documents-docs.factor           |   0
 .../documents/documents-tests.factor          |   0
 {extra => basis}/documents/documents.factor   |   0
 {extra => basis}/documents/summary.txt        |   0
 .../backend => basis/editors}/authors.txt     |   0
 {extra => basis}/editors/editors-docs.factor  |   0
 {extra => basis}/editors/editors.factor       |   0
 .../editors/editpadpro/authors.txt            |   0
 .../editors/editpadpro/editpadpro-docs.factor |   0
 .../editors/editpadpro/editpadpro.factor      |   0
 .../editors/editpadpro/summary.txt            |   0
 {extra => basis}/editors/editplus/authors.txt |   0
 .../editors/editplus/editplus.factor          |   0
 {extra => basis}/editors/editplus/summary.txt |   0
 {extra => basis}/editors/emacs/authors.txt    |   0
 .../editors/emacs/emacs-docs.factor           |   0
 {extra => basis}/editors/emacs/emacs.factor   |   0
 {extra => basis}/editors/emacs/summary.txt    |   0
 {extra => basis}/editors/emeditor/authors.txt |   0
 .../editors/emeditor/emeditor.factor          |   0
 {extra => basis}/editors/emeditor/summary.txt |   0
 {extra => basis}/editors/gvim/authors.txt     |   0
 .../editors/gvim/backend/authors.txt          |   0
 .../editors/gvim/backend/backend.factor       |   0
 {extra => basis}/editors/gvim/gvim.factor     |   0
 {extra => basis}/editors/gvim/summary.txt     |   0
 .../editors/gvim/unix/authors.txt             |   0
 .../editors/gvim/unix/unix.factor             |   0
 .../editors/gvim/windows/authors.txt          |   0
 .../editors/gvim/windows/windows.factor       |   0
 .../editors/jedit}/authors.txt                |   0
 {extra => basis}/editors/jedit/jedit.factor   |   0
 {extra => basis}/editors/jedit/summary.txt    |   0
 .../editors/notepadpp/authors.txt             |   0
 .../editors/notepadpp/notepadpp.factor        |   0
 .../editors/notepadpp/summary.txt             |   0
 {extra => basis}/editors/scite/authors.txt    |   0
 {extra => basis}/editors/scite/scite.factor   |   0
 {extra => basis}/editors/scite/summary.txt    |   0
 {extra => basis}/editors/summary.txt          |   0
 {core/listener => basis/editors}/tags.txt     |   0
 .../editors/ted-notepad/authors.txt           |   0
 .../editors/ted-notepad/summary.txt           |   0
 .../editors/ted-notepad/ted-notepad.factor    |   0
 {extra => basis}/editors/textmate/authors.txt |   0
 {extra => basis}/editors/textmate/summary.txt |   0
 .../editors/textmate/textmate.factor          |   0
 .../editors/textwrangler/authors.txt          |   0
 .../editors/textwrangler/summary.txt          |   0
 .../editors/textwrangler/textwrangler.factor  |   0
 .../editors/ultraedit/authors.txt             |   0
 .../editors/ultraedit/summary.txt             |   0
 .../editors/ultraedit/ultraedit.factor        |   0
 {extra => basis}/editors/vim/authors.txt      |   0
 .../generate-syntax/generate-syntax.factor    |   0
 {extra => basis}/editors/vim/summary.txt      |   0
 {extra => basis}/editors/vim/vim-docs.factor  |   0
 {extra => basis}/editors/vim/vim.factor       |   0
 {extra => basis}/editors/wordpad/authors.txt  |   0
 {extra => basis}/editors/wordpad/summary.txt  |   0
 .../editors/wordpad/wordpad.factor            |   0
 basis/eval/eval-docs.factor                   |  18 +++
 basis/eval/eval.factor                        |  14 +++
 .../float-arrays}/authors.txt                 |   0
 .../float-arrays/float-arrays-docs.factor     |   0
 .../float-arrays/float-arrays-tests.factor    |   0
 .../float-arrays/float-arrays.factor          |   0
 {extra => basis}/float-arrays/summary.txt     |   0
 .../columns => basis/float-arrays}/tags.txt   |   0
 .../float-vectors/float-vectors-docs.factor   |   0
 .../float-vectors/float-vectors-tests.factor  |   0
 .../float-vectors/float-vectors.factor        |   0
 {extra => basis}/float-vectors/summary.txt    |   0
 .../float-vectors}/tags.txt                   |   0
 {core/refs => basis/freetype}/authors.txt     |   0
 {extra => basis}/freetype/freetype.factor     |   0
 {extra => basis}/freetype/summary.txt         |   0
 {extra => basis}/freetype/tags.txt            |   0
 {extra => basis}/fry/authors.txt              |   0
 {extra => basis}/fry/fry-docs.factor          |   0
 {extra => basis}/fry/fry-tests.factor         |   0
 {extra => basis}/fry/fry.factor               |   0
 {extra => basis}/fry/summary.txt              |   0
 {extra => basis}/fry/tags.txt                 |   0
 .../generalizations-docs.factor               |   0
 .../generalizations-tests.factor              |   0
 .../generalizations/generalizations.factor    |   0
 .../generator}/authors.txt                    |   0
 .../generator/fixup}/authors.txt              |   0
 .../generator/fixup/fixup-docs.factor         |   0
 {core => basis}/generator/fixup/fixup.factor  |   0
 {core => basis}/generator/fixup/summary.txt   |   0
 .../generator/generator-docs.factor           |   0
 {core => basis}/generator/generator.factor    |   0
 .../generator/registers}/authors.txt          |   0
 .../generator/registers/registers.factor      |   0
 .../generator/registers/summary.txt           |   0
 {core => basis}/generator/summary.txt         |   0
 {core => basis}/generator/tags.txt            |   0
 {extra/delegate => basis/hash2}/authors.txt   |   0
 {extra => basis}/hash2/hash2-docs.factor      |   0
 {extra => basis}/hash2/hash2-tests.factor     |   0
 {extra => basis}/hash2/hash2.factor           |   0
 {extra => basis}/hash2/summary.txt            |   0
 {extra/float-arrays => basis/hash2}/tags.txt  |   0
 {core => basis}/heaps/authors.txt             |   0
 {core => basis}/heaps/heaps-docs.factor       |   0
 {core => basis}/heaps/heaps-tests.factor      |   0
 {core => basis}/heaps/heaps.factor            |   0
 {core => basis}/heaps/summary.txt             |   0
 {extra/float-vectors => basis/heaps}/tags.txt |   0
 {extra/biassocs => basis/help}/authors.txt    |   0
 .../help/cookbook}/authors.txt                |   0
 .../help/cookbook/cookbook.factor             |   0
 .../help => basis/help/crossref}/authors.txt  |   0
 .../help/crossref/crossref-docs.factor        |   0
 .../help/crossref/crossref-tests.factor       |   0
 .../help/crossref/crossref.factor             |   0
 {extra => basis}/help/crossref/summary.txt    |   0
 .../help/definitions}/authors.txt             |   0
 .../help/definitions/definitions-tests.factor |   0
 .../help/definitions/definitions.factor       |   0
 {extra => basis}/help/definitions/summary.txt |   0
 .../help/handbook}/authors.txt                |   0
 .../help/handbook/handbook-tests.factor       |   0
 .../help/handbook/handbook.factor             |   0
 {extra => basis}/help/handbook/summary.txt    |   0
 {extra => basis}/help/help-docs.factor        |   0
 {extra => basis}/help/help-tests.factor       |   0
 {extra => basis}/help/help.factor             |   0
 {extra => basis}/help/html/html.factor        |   0
 .../io => basis/help/lint}/authors.txt        |   0
 {extra => basis}/help/lint/lint-docs.factor   |   0
 {extra => basis}/help/lint/lint.factor        |   2 +-
 {extra => basis}/help/lint/summary.txt        |   0
 {extra/editors => basis/help/lint}/tags.txt   |   0
 .../tools => basis/help/markup}/authors.txt   |   0
 .../help/markup/markup-tests.factor           |   0
 {extra => basis}/help/markup/markup.factor    |   0
 {extra => basis}/help/markup/summary.txt      |   0
 .../help/stylesheet}/authors.txt              |   0
 .../help/stylesheet/stylesheet.factor         |   0
 {extra => basis}/help/stylesheet/summary.txt  |   0
 {extra => basis}/help/summary.txt             |   0
 .../cocoa => basis/help/syntax}/authors.txt   |   0
 {extra => basis}/help/syntax/summary.txt      |   0
 .../help/syntax/syntax-tests.factor           |   0
 {extra => basis}/help/syntax/syntax.factor    |   0
 .../dialogs => basis/help/topics}/authors.txt |   0
 {extra => basis}/help/topics/summary.txt      |   0
 .../help/topics/topics-docs.factor            |   0
 .../help/topics/topics-tests.factor           |   0
 {extra => basis}/help/topics/topics.factor    |   0
 .../help/tutorial}/authors.txt                |   0
 .../help/tutorial/tutorial.factor             |   0
 .../pasteboard => basis/hints}/authors.txt    |   0
 {extra => basis}/hints/hints.factor           |   0
 {extra => basis}/hints/summary.txt            |   0
 {extra => basis}/hints/tags.txt               |   0
 .../plists => basis/inference}/authors.txt    |   0
 .../inference/backend}/authors.txt            |   0
 .../inference/backend/backend-docs.factor     |   0
 .../inference/backend/backend.factor          |   0
 {core => basis}/inference/backend/summary.txt |   0
 .../inference/class}/authors.txt              |   0
 .../inference/class/class-tests.factor        |   0
 {core => basis}/inference/class/class.factor  |   0
 {core => basis}/inference/class/summary.txt   |   0
 .../inference/dataflow}/authors.txt           |   0
 .../inference/dataflow/dataflow-docs.factor   |   0
 .../inference/dataflow/dataflow.factor        |   0
 .../inference/dataflow/summary.txt            |   0
 .../inference/errors}/authors.txt             |   0
 .../inference/errors/errors.factor            |   0
 {core => basis}/inference/errors/summary.txt  |   0
 .../inference/inference-docs.factor           |   0
 .../inference/inference-tests.factor          |   0
 {core => basis}/inference/inference.factor    |   0
 .../inference/known-words}/authors.txt        |   0
 .../inference/known-words/known-words.factor  |   0
 .../inference/known-words/summary.txt         |   0
 .../inference/state}/authors.txt              |   0
 .../inference/state/state-docs.factor         |   0
 .../inference/state/state-tests.factor        |   0
 {core => basis}/inference/state/state.factor  |   0
 {core => basis}/inference/state/summary.txt   |   0
 {core => basis}/inference/summary.txt         |   0
 {core => basis}/inference/tags.txt            |   0
 .../inference/transforms}/authors.txt         |   0
 .../inference/transforms/summary.txt          |   0
 .../transforms/transforms-docs.factor         |   0
 .../transforms/transforms-tests.factor        |   0
 .../inference/transforms/transforms.factor    |   0
 .../inspector}/authors.txt                    |   0
 .../inspector/inspector-docs.factor           |   0
 .../inspector/inspector-tests.factor          |   0
 {core => basis}/inspector/inspector.factor    |   0
 {core => basis}/inspector/summary.txt         |   0
 {core => basis}/inspector/tags.txt            |   0
 {extra => basis}/interval-maps/authors.txt    |   0
 .../interval-maps/interval-maps-docs.factor   |   0
 .../interval-maps/interval-maps-tests.factor  |   0
 .../interval-maps/interval-maps.factor        |   0
 {extra => basis}/interval-maps/summary.txt    |   0
 {extra => basis}/interval-maps/tags.txt       |   0
 .../io/buffers}/authors.txt                   |   0
 .../io/buffers/buffers-docs.factor            |   0
 .../io/buffers/buffers-tests.factor           |   0
 {extra => basis}/io/buffers/buffers.factor    |   0
 {extra => basis}/io/buffers/summary.txt       |   0
 .../io/encodings/8-bit/8-bit-docs.factor      |   0
 .../io/encodings/8-bit/8-bit-tests.factor     |   0
 .../io/encodings/8-bit/8-bit.factor           |   2 +-
 .../io/encodings/8-bit/8859-1.TXT             |   0
 .../io/encodings/8-bit/8859-10.TXT            |   0
 .../io/encodings/8-bit/8859-11.TXT            |   0
 .../io/encodings/8-bit/8859-13.TXT            |   0
 .../io/encodings/8-bit/8859-14.TXT            |   0
 .../io/encodings/8-bit/8859-15.TXT            |   0
 .../io/encodings/8-bit/8859-16.TXT            |   0
 .../io/encodings/8-bit/8859-2.TXT             |   0
 .../io/encodings/8-bit/8859-3.TXT             |   0
 .../io/encodings/8-bit/8859-4.TXT             |   0
 .../io/encodings/8-bit/8859-5.TXT             |   0
 .../io/encodings/8-bit/8859-6.TXT             |   0
 .../io/encodings/8-bit/8859-7.TXT             |   0
 .../io/encodings/8-bit/8859-8.TXT             |   0
 .../io/encodings/8-bit/8859-9.TXT             |   0
 {extra => basis}/io/encodings/8-bit/CP037.TXT |   0
 .../io/encodings/8-bit/CP1252.TXT             |   0
 .../io/encodings/8-bit/KOI8-R.TXT             |   0
 {extra => basis}/io/encodings/8-bit/ROMAN.TXT |   0
 .../io/encodings/8-bit}/authors.txt           |   0
 .../io/encodings/8-bit/summary.txt            |   0
 .../io/encodings/8-bit}/tags.txt              |   0
 .../io/encodings/ascii/ascii-docs.factor      |   0
 .../io/encodings/ascii/ascii-tests.factor     |   0
 .../io/encodings/ascii/ascii.factor           |   0
 .../io/encodings/ascii}/authors.txt           |   0
 .../io/encodings/ascii/summary.txt            |   0
 .../io/encodings/ascii}/tags.txt              |   0
 .../io/encodings/iana}/authors.txt            |   0
 .../io/encodings/iana/character-sets          |   0
 .../io/encodings/iana/iana-docs.factor        |   0
 .../io/encodings/iana/iana-tests.factor       |   0
 .../io/encodings/iana/iana.factor             |   2 +-
 .../io/encodings/iana/summary.txt             |   0
 .../io/encodings/strict}/authors.txt          |   0
 .../io/encodings/strict/strict-docs.factor    |   0
 .../io/encodings/strict/strict-tests.factor   |   0
 .../io/encodings/strict/strict.factor         |   0
 .../io/encodings/strict/summary.txt           |   0
 .../io/encodings/strict}/tags.txt             |   0
 .../io/encodings/string}/authors.txt          |   0
 .../io/encodings/string/string-docs.factor    |   0
 .../io/encodings/string/string-tests.factor   |   0
 .../io/encodings/string/string.factor         |   0
 .../io/encodings/string/summary.txt           |   0
 .../io/encodings/string/tags.factor           |   0
 .../io/encodings/utf16/.utf16.factor.swo      | Bin
 .../io/encodings/utf16}/authors.txt           |   0
 .../io/encodings/utf16/summary.txt            |   0
 .../io/encodings/utf16}/tags.txt              |   0
 .../io/encodings/utf16/utf16-docs.factor      |   0
 .../io/encodings/utf16/utf16-tests.factor     |   0
 .../io/encodings/utf16/utf16.factor           |   7 +-
 .../io/files/unique/backend/backend.factor    |   0
 .../io/files/unique/unique-docs.factor        |   0
 .../io/files/unique/unique.factor             |   0
 {extra => basis}/io/launcher/authors.txt      |   0
 .../io/launcher/launcher-docs.factor          |   0
 .../io/launcher/launcher-tests.factor         |   0
 {extra => basis}/io/launcher/launcher.factor  |   0
 {extra => basis}/io/launcher/summary.txt      |   0
 {extra => basis}/io/mmap/authors.txt          |   0
 {extra => basis}/io/mmap/mmap-docs.factor     |   0
 {extra => basis}/io/mmap/mmap-tests.factor    |   0
 {extra => basis}/io/mmap/mmap.factor          |   0
 {extra => basis}/io/mmap/summary.txt          |   0
 .../io/monitors}/authors.txt                  |   0
 .../io/monitors/monitors-docs.factor          |   0
 .../io/monitors/monitors-tests.factor         |   0
 {extra => basis}/io/monitors/monitors.factor  |   0
 .../monitors/recursive/recursive-tests.factor |   0
 .../io/monitors/recursive/recursive.factor    |   0
 {extra => basis}/io/monitors/summary.txt      |   0
 {extra => basis}/io/paths/authors.txt         |   0
 {extra => basis}/io/paths/paths.factor        |   0
 {extra => basis}/io/pipes/pipes-docs.factor   |   0
 {extra => basis}/io/pipes/pipes-tests.factor  |   0
 {extra => basis}/io/pipes/pipes.factor        |   0
 {extra/editors => basis/io/pools}/authors.txt |   0
 {extra => basis}/io/pools/pools-docs.factor   |   0
 {extra => basis}/io/pools/pools.factor        |   0
 {extra => basis}/io/pools/summary.txt         |   0
 {extra => basis}/io/pools/tags.txt            |   0
 .../jedit => basis/io/ports}/authors.txt      |   0
 {extra => basis}/io/ports/ports-docs.factor   |   0
 {extra => basis}/io/ports/ports.factor        |   0
 {extra => basis}/io/ports/summary.txt         |   0
 .../io/servers/connection}/authors.txt        |   0
 .../servers/connection/connection-docs.factor |   0
 .../connection/connection-tests.factor        |   0
 .../io/servers/connection/connection.factor   |   0
 .../io/servers/connection/summary.txt         |   0
 .../io/servers/connection/tags.txt            |   0
 .../io/servers/packet}/authors.txt            |   0
 .../io/servers/packet/datagram.factor         |   0
 .../io/servers/packet/summary.txt             |   0
 {extra => basis}/io/servers/packet/tags.txt   |   0
 {extra => basis}/io/sockets/authors.txt       |   0
 .../io/sockets/secure}/authors.txt            |   0
 .../io/sockets/secure/secure-docs.factor      |   0
 .../io/sockets/secure/secure-tests.factor     |   4 +-
 .../io/sockets/secure/secure.factor           |   2 +-
 .../io/sockets/secure/summary.txt             |   0
 {extra => basis}/io/sockets/secure/tags.txt   |   0
 .../io/sockets/sockets-docs.factor            |   0
 .../io/sockets/sockets-tests.factor           |   0
 {extra => basis}/io/sockets/sockets.factor    |   0
 {extra => basis}/io/sockets/summary.txt       |   0
 {extra => basis}/io/sockets/tags.txt          |   0
 .../io/streams/duplex}/authors.txt            |   0
 .../io/streams/duplex/duplex-docs.factor      |   0
 .../io/streams/duplex/duplex-tests.factor     |   0
 .../io/streams/duplex/duplex.factor           |   0
 .../io/streams/duplex/summary.txt             |   0
 .../io/streams/limited/limited-tests.factor   |   0
 .../io/streams/limited/limited.factor         |   0
 .../io/streams/memory/memory.factor           |   0
 .../io/streams/null}/authors.txt              |   0
 {extra => basis}/io/streams/null/null.factor  |   0
 {extra => basis}/io/timeouts/summary.txt      |   0
 .../io/timeouts/timeouts-docs.factor          |   0
 {extra => basis}/io/timeouts/timeouts.factor  |   0
 .../definitions => basis/io/unix}/authors.txt |   0
 .../io/unix/backend}/authors.txt              |   0
 .../io/unix/backend/backend.factor            |   0
 {extra => basis}/io/unix/backend/summary.txt  |   0
 .../lint => basis/io/unix/bsd}/authors.txt    |   0
 {extra => basis}/io/unix/bsd/bsd.factor       |   0
 .../io/unix/epoll}/authors.txt                |   0
 {extra => basis}/io/unix/epoll/epoll.factor   |   0
 .../io/unix/files}/authors.txt                |   0
 .../io/unix/files/files-tests.factor          |   0
 {extra => basis}/io/unix/files/files.factor   |   0
 {extra => basis}/io/unix/files/summary.txt    |   0
 .../io/unix/files/unique/unique.factor        |   0
 .../io/unix/freebsd/freebsd.factor            |   0
 .../io/unix/kqueue}/authors.txt               |   0
 {extra => basis}/io/unix/kqueue/kqueue.factor |   0
 .../io/unix/launcher}/authors.txt             |   0
 .../io/unix/launcher/launcher-tests.factor    |   0
 .../io/unix/launcher/launcher.factor          |   0
 .../unix/launcher/parser/parser-tests.factor  |   0
 .../io/unix/launcher/parser/parser.factor     |   0
 .../io/unix/linux}/authors.txt                |   0
 {extra => basis}/io/unix/linux/linux.factor   |   0
 .../unix/linux/monitors/monitors-tests.factor |   0
 .../io/unix/linux/monitors/monitors.factor    |   0
 {extra => basis}/io/unix/macosx/macosx.factor |   0
 .../io/unix/macosx/monitors/monitors.factor   |   0
 .../hints => basis/io/unix/mmap}/authors.txt  |   0
 {extra => basis}/io/unix/mmap/mmap.factor     |   0
 {extra => basis}/io/unix/netbsd/netbsd.factor |   0
 .../io/unix/openbsd/openbsd.factor            |   0
 .../io/unix/pipes/pipes-tests.factor          |   0
 {extra => basis}/io/unix/pipes/pipes.factor   |   0
 .../io/unix/select}/authors.txt               |   0
 {extra => basis}/io/unix/select/select.factor |   0
 .../io/unix/sockets}/authors.txt              |   0
 .../unix/sockets/secure/secure-tests.factor   |   4 +-
 .../io/unix/sockets/secure/secure.factor      |   0
 .../io/unix/sockets/sockets.factor            |   0
 {extra => basis}/io/unix/sockets/summary.txt  |   0
 {extra => basis}/io/unix/summary.txt          |   0
 {extra => basis}/io/unix/unix-tests.factor    |   0
 {extra => basis}/io/unix/unix.factor          |   0
 {extra => basis}/io/windows/authors.txt       |   0
 .../io/windows/ce}/authors.txt                |   0
 .../io/windows/ce/backend/authors.txt         |   0
 .../io/windows/ce/backend/backend.factor      |   0
 {extra => basis}/io/windows/ce/ce.factor      |   0
 .../io/windows/ce/files/authors.txt           |   0
 .../io/windows/ce/files/files.factor          |   0
 .../windows/ce/privileges/privileges.factor   |   0
 .../io/windows/ce/sockets/authors.txt         |   0
 .../io/windows/ce/sockets/sockets.factor      |   0
 {extra => basis}/io/windows/ce/summary.txt    |   0
 .../io/windows/files/files.factor             |   0
 .../io/windows/files/unique/unique.factor     |   0
 .../io/windows/launcher/authors.txt           |   0
 .../io/windows/launcher/launcher-tests.factor |   0
 .../io/windows/launcher/launcher.factor       |   0
 .../bsd => basis/io/windows/mmap}/authors.txt |   0
 .../io/windows/mmap/mmap-tests.factor         |   0
 {extra => basis}/io/windows/mmap/mmap.factor  |   0
 {extra => basis}/io/windows/nt/authors.txt    |   0
 .../io/windows/nt/backend/authors.txt         |   0
 .../io/windows/nt/backend/backend.factor      |   0
 .../io/windows/nt/files/authors.txt           |   0
 .../io/windows/nt/files/files-tests.factor    |   0
 .../io/windows/nt/files/files.factor          |   0
 .../io/windows/nt/launcher/authors.txt        |   0
 .../windows/nt/launcher/launcher-tests.factor |  16 +--
 .../io/windows/nt/launcher/launcher.factor    |   0
 .../io/windows/nt/launcher/test/append.factor |   0
 .../io/windows/nt/launcher/test/env.factor    |   0
 .../io/windows/nt/launcher/test/stderr.factor |   0
 .../io/windows/nt/monitors}/authors.txt       |   0
 .../windows/nt/monitors/monitors-tests.factor |   0
 .../io/windows/nt/monitors/monitors.factor    |   0
 {extra => basis}/io/windows/nt/nt.factor      |   0
 .../io/windows/nt/pipes}/authors.txt          |   0
 .../io/windows/nt/pipes/pipes.factor          |   0
 .../windows/nt/privileges/privileges.factor   |   0
 .../io/windows/nt/sockets/authors.txt         |   0
 .../io/windows/nt/sockets/sockets.factor      |   0
 {extra => basis}/io/windows/nt/summary.txt    |   0
 .../io/windows/privileges/privileges.factor   |   0
 .../io/windows/sockets/sockets.factor         |   0
 {extra => basis}/io/windows/summary.txt       |   0
 {extra => basis}/io/windows/tags.txt          |   0
 {extra => basis}/io/windows/windows.factor    |   0
 {extra => basis}/lcs/authors.txt              |   0
 .../lcs/diff2html/diff2html.factor            |   0
 {extra => basis}/lcs/lcs-docs.factor          |   0
 {extra => basis}/lcs/lcs-tests.factor         |   0
 {extra => basis}/lcs/lcs.factor               |   0
 {extra => basis}/lcs/summary.txt              |   0
 {extra => basis}/lcs/tags.txt                 |   0
 .../io/ports => basis/listener}/authors.txt   |   0
 {core => basis}/listener/listener-docs.factor |   0
 .../listener/listener-tests.factor            |   0
 {core => basis}/listener/listener.factor      |   0
 {core => basis}/listener/summary.txt          |   0
 {extra/help/lint => basis/listener}/tags.txt  |   0
 .../connection => basis/locals}/authors.txt   |   0
 .../locals/backend/backend-tests.factor       |   0
 .../locals/backend/backend.factor             |   0
 {extra => basis}/locals/locals-docs.factor    |   0
 {extra => basis}/locals/locals-tests.factor   |   0
 {extra => basis}/locals/locals.factor         |   0
 {extra => basis}/locals/summary.txt           |   0
 {extra => basis}/locals/tags.txt              |   0
 .../logging/analysis/analysis-docs.factor     |   0
 .../logging/analysis/analysis.factor          |   0
 {extra => basis}/logging/analysis/authors.txt |   0
 {extra => basis}/logging/analysis/summary.txt |   0
 {extra => basis}/logging/analysis/tags.txt    |   0
 {extra => basis}/logging/authors.txt          |   0
 .../logging/insomniac/authors.txt             |   0
 .../logging/insomniac/insomniac-docs.factor   |   0
 .../logging/insomniac/insomniac.factor        |   0
 .../logging/insomniac/summary.txt             |   0
 {extra => basis}/logging/insomniac/tags.txt   |   0
 {extra => basis}/logging/logging-docs.factor  |   0
 {extra => basis}/logging/logging-tests.factor |   0
 {extra => basis}/logging/logging.factor       |   0
 {extra => basis}/logging/parser/authors.txt   |   0
 .../logging/parser/parser-docs.factor         |   0
 {extra => basis}/logging/parser/parser.factor |   0
 {extra => basis}/logging/parser/summary.txt   |   0
 {extra => basis}/logging/parser/tags.txt      |   0
 {extra => basis}/logging/server/authors.txt   |   0
 .../logging/server/server-docs.factor         |   0
 {extra => basis}/logging/server/server.factor |   0
 {extra => basis}/logging/server/summary.txt   |   0
 {extra => basis}/logging/server/tags.txt      |   0
 {extra => basis}/logging/summary.txt          |   0
 {extra => basis}/logging/tags.txt             |   0
 .../packet => basis/macros}/authors.txt       |   0
 {extra => basis}/macros/macros-docs.factor    |   0
 {extra => basis}/macros/macros-tests.factor   |   0
 {extra => basis}/macros/macros.factor         |   0
 {extra => basis}/macros/summary.txt           |   0
 {extra => basis}/macros/tags.txt              |   0
 .../math/bitfields}/authors.txt               |   0
 .../math/bitfields/bitfields-docs.factor      |   0
 .../math/bitfields/bitfields-tests.factor     |   0
 .../math/bitfields/bitfields.factor           |   0
 {core => basis}/math/bitfields/summary.txt    |   0
 .../duplex => basis/math/complex}/authors.txt |   0
 .../math/complex/complex-docs.factor          |   0
 .../math/complex/complex-tests.factor         |   0
 {extra => basis}/math/complex/complex.factor  |   0
 {extra => basis}/math/complex/summary.txt     |   0
 .../null => basis/math/constants}/authors.txt |   0
 .../math/constants/constants-docs.factor      |   0
 .../math/constants/constants.factor           |   0
 {extra => basis}/math/constants/summary.txt   |   0
 .../unix => basis/math/functions}/authors.txt |   0
 .../math/functions/functions-docs.factor      |   0
 .../math/functions/functions-tests.factor     |   0
 .../math/functions/functions.factor           |   0
 {extra => basis}/math/functions/summary.txt   |   0
 .../math/intervals}/authors.txt               |   0
 .../math/intervals/intervals-docs.factor      |   0
 .../math/intervals/intervals-tests.factor     |   0
 .../math/intervals/intervals.factor           |   0
 {core => basis}/math/intervals/summary.txt    |   0
 .../unix/bsd => basis/math/libm}/authors.txt  |   0
 {extra => basis}/math/libm/libm-docs.factor   |   0
 {extra => basis}/math/libm/libm.factor        |   0
 {extra => basis}/math/libm/summary.txt        |   0
 {extra => basis}/math/libm/tags.txt           |   0
 {extra => basis}/math/ranges/authors.txt      |   0
 .../math/ranges/ranges-docs.factor            |   0
 .../math/ranges/ranges-tests.factor           |   0
 {extra => basis}/math/ranges/ranges.factor    |   0
 {extra => basis}/math/ranges/summary.txt      |   0
 .../epoll => basis/math/ratios}/authors.txt   |   0
 .../math/ratios/ratios-docs.factor            |   0
 .../math/ratios/ratios-tests.factor           |   0
 {extra => basis}/math/ratios/ratios.factor    |   0
 {extra => basis}/math/ratios/summary.txt      |   0
 .../files => basis/math/vectors}/authors.txt  |   0
 {extra => basis}/math/vectors/summary.txt     |   0
 .../math/vectors/vectors-docs.factor          |   0
 .../math/vectors/vectors-tests.factor         |   0
 {extra => basis}/math/vectors/vectors.factor  |   0
 {extra => basis}/memoize/authors.txt          |   0
 {extra => basis}/memoize/memoize-docs.factor  |   0
 {extra => basis}/memoize/memoize-tests.factor |   0
 {extra => basis}/memoize/memoize.factor       |   0
 {extra => basis}/memoize/summary.txt          |   0
 {extra => basis}/memoize/tags.txt             |   0
 .../kqueue => basis/mime-types}/authors.txt   |   0
 .../mime-types/mime-types-tests.factor        |   0
 {extra => basis}/mime-types/mime-types.factor |   2 +-
 {extra => basis}/mime-types/mime.types        |   0
 .../launcher => basis/mirrors}/authors.txt    |   0
 {core => basis}/mirrors/mirrors-docs.factor   |   0
 {core => basis}/mirrors/mirrors-tests.factor  |   0
 {core => basis}/mirrors/mirrors.factor        |   0
 {core => basis}/mirrors/summary.txt           |   0
 {core => basis}/mirrors/tags.txt              |   0
 .../unix/linux => basis/models}/authors.txt   |   0
 .../models/compose/compose-docs.factor        |   0
 .../models/compose/compose-tests.factor       |   0
 .../models/compose/compose.factor             |   0
 .../models/delay/delay-docs.factor            |   0
 {extra => basis}/models/delay/delay.factor    |   0
 .../models/filter/filter-docs.factor          |   0
 .../models/filter/filter-tests.factor         |   0
 {extra => basis}/models/filter/filter.factor  |   0
 .../models/history/history-docs.factor        |   0
 .../models/history/history-tests.factor       |   0
 .../models/history/history.factor             |   0
 .../models/mapping/mapping-tests.factor       |   0
 .../models/mapping/mapping.factor             |   0
 {extra => basis}/models/models-docs.factor    |   0
 {extra => basis}/models/models-tests.factor   |   0
 {extra => basis}/models/models.factor         |   0
 .../models/range/range-docs.factor            |   0
 .../models/range/range-tests.factor           |   0
 {extra => basis}/models/range/range.factor    |   0
 {extra => basis}/models/summary.txt           |   0
 {extra => basis}/models/tags.txt              |   0
 {extra => basis}/multiline/authors.txt        |   0
 .../multiline/multiline-docs.factor           |   0
 .../multiline/multiline-tests.factor          |   0
 {extra => basis}/multiline/multiline.factor   |   0
 {extra => basis}/multiline/summary.txt        |   0
 {extra => basis}/multiline/tags.txt           |   0
 .../io/unix/mmap => basis/none}/authors.txt   |   0
 {core => basis}/none/deploy.factor            |   0
 {core => basis}/none/none-docs.factor         |   0
 {core => basis}/none/none.factor              |   0
 {core => basis}/none/summary.txt              |   0
 {extra => basis}/openssl/authors.txt          |   0
 {extra => basis}/openssl/cacert.pem           |   0
 .../openssl/libcrypto/libcrypto.factor        |   0
 {extra => basis}/openssl/libssl/libssl.factor |   0
 {extra => basis}/openssl/openssl-tests.factor |  10 +-
 {extra => basis}/openssl/openssl.factor       |   0
 {extra => basis}/openssl/summary.txt          |   0
 {extra => basis}/openssl/tags.txt             |   0
 {extra => basis}/openssl/test/dh1024.pem      |   0
 {extra => basis}/openssl/test/errors.txt      |   0
 {extra => basis}/openssl/test/root.pem        |   0
 {extra => basis}/openssl/test/server.pem      |   0
 {core => basis}/optimizer/allot/allot.factor  |   0
 .../select => basis/optimizer}/authors.txt    |   0
 .../optimizer/backend}/authors.txt            |   0
 .../optimizer/backend/backend.factor          |   0
 {core => basis}/optimizer/backend/summary.txt |   0
 .../optimizer/collect/collect.factor          |   0
 .../optimizer/control/control-tests.factor    |   0
 .../optimizer/control/control.factor          |   0
 .../optimizer/def-use}/authors.txt            |   0
 .../optimizer/def-use/def-use-tests.factor    |   0
 .../optimizer/def-use/def-use.factor          |   0
 {core => basis}/optimizer/def-use/summary.txt |   0
 .../optimizer/inlining/inlining-tests.factor  |   0
 .../optimizer/inlining/inlining.factor        |   0
 .../optimizer/known-words}/authors.txt        |   0
 .../optimizer/known-words/known-words.factor  |   0
 .../optimizer/known-words/summary.txt         |   0
 .../optimizer/math}/authors.txt               |   0
 {core => basis}/optimizer/math/math.factor    |   0
 .../math/partial/partial-tests.factor         |   0
 .../optimizer/math/partial/partial.factor     |   0
 {core => basis}/optimizer/math/summary.txt    |   0
 .../optimizer/optimizer-docs.factor           |   0
 .../optimizer/optimizer-tests.factor          |   0
 {core => basis}/optimizer/optimizer.factor    |   0
 .../optimizer/pattern-match}/authors.txt      |   0
 .../pattern-match/pattern-match.factor        |   0
 .../optimizer/pattern-match/summary.txt       |   0
 .../specializers/specializers-docs.factor     |   0
 .../specializers/specializers.factor          |   0
 {core => basis}/optimizer/summary.txt         |   0
 {core => basis}/optimizer/tags.txt            |   0
 {extra => basis}/present/present.factor       |   0
 .../prettyprint}/authors.txt                  |   0
 .../prettyprint/backend}/authors.txt          |   0
 .../prettyprint/backend/backend-docs.factor   |   0
 .../prettyprint/backend/backend.factor        |   0
 .../prettyprint/backend/summary.txt           |   0
 .../prettyprint/config}/authors.txt           |   0
 .../prettyprint/config/config-docs.factor     |   0
 .../prettyprint/config/config.factor          |   0
 .../prettyprint/config/summary.txt            |   0
 .../prettyprint/prettyprint-docs.factor       |   0
 .../prettyprint/prettyprint-tests.factor      |   0
 .../prettyprint/prettyprint.factor            |   0
 .../prettyprint/sections}/authors.txt         |   0
 .../prettyprint/sections/sections-docs.factor |   0
 .../prettyprint/sections/sections.factor      |   0
 .../prettyprint/sections/summary.txt          |   0
 {core => basis}/prettyprint/summary.txt       |   0
 {core => basis}/prettyprint/tags.txt          |   0
 {extra => basis}/promises/authors.txt         |   0
 .../promises/promises-docs.factor             |   0
 {extra => basis}/promises/promises.factor     |   0
 {extra => basis}/promises/summary.txt         |   0
 {extra => basis}/promises/tags.txt            |   0
 {extra => basis}/qualified/authors.txt        |   0
 .../qualified/qualified-docs.factor           |   0
 .../qualified/qualified-tests.factor          |   0
 {extra => basis}/qualified/qualified.factor   |   0
 {extra => basis}/qualified/summary.txt        |   0
 {extra => basis}/qualified/tags.txt           |   0
 .../blum-blum-shub-tests.factor               |   0
 .../blum-blum-shub/blum-blum-shub.factor      |   0
 {extra => basis}/random/dummy/dummy.factor    |   0
 .../random/mersenne-twister}/authors.txt      |   0
 .../mersenne-twister-docs.factor.bak          |   0
 .../mersenne-twister-tests.factor             |   0
 .../mersenne-twister/mersenne-twister.factor  |   0
 .../random/mersenne-twister/summary.txt       |   0
 {extra => basis}/random/random-docs.factor    |   0
 {extra => basis}/random/random-tests.factor   |   0
 {extra => basis}/random/random.factor         |   0
 {extra => basis}/random/unix/unix.factor      |   0
 {extra => basis}/random/windows/tags.txt      |   0
 .../random/windows/windows.factor             |   0
 .../math/vectors => basis/refs}/authors.txt   |   0
 {core => basis}/refs/refs-docs.factor         |   0
 {core => basis}/refs/refs-tests.factor        |   0
 {core => basis}/refs/refs.factor              |   0
 {core => basis}/refs/summary.txt              |   0
 .../search-dequeues}/authors.txt              |   0
 .../search-dequeues-docs.factor               |   0
 .../search-dequeues-tests.factor              |   0
 .../search-dequeues/search-dequeues.factor    |   0
 {core => basis}/search-dequeues/summary.txt   |   0
 .../hash2 => basis/search-dequeues}/tags.txt  |   0
 {extra => basis}/sequences/deep/authors.txt   |   0
 .../sequences/deep/deep-docs.factor           |   0
 .../sequences/deep/deep-tests.factor          |   0
 {extra => basis}/sequences/deep/deep.factor   |   0
 {extra => basis}/sequences/deep/summary.txt   |   0
 {extra => basis}/sequences/deep/tags.txt      |   0
 {extra => basis}/sequences/next/authors.txt   |   0
 .../sequences/next/next-tests.factor          |   0
 {extra => basis}/sequences/next/next.factor   |   0
 {extra => basis}/sequences/next/summary.txt   |   0
 {extra => basis}/sequences/next/tags.txt      |   0
 {extra => basis}/serialize/authors.txt        |   0
 .../serialize/serialize-docs.factor           |   0
 .../serialize/serialize-tests.factor          |   0
 {extra => basis}/serialize/serialize.factor   |   0
 {extra => basis}/serialize/summary.txt        |   0
 {extra => basis}/shuffle/authors.txt          |   0
 {extra => basis}/shuffle/shuffle-tests.factor |   0
 {extra => basis}/shuffle/shuffle.factor       |   0
 {extra => basis}/shuffle/summary.txt          |   0
 {extra => basis}/shuffle/tags.txt             |   0
 {extra => basis}/smtp/authors.txt             |   0
 {extra => basis}/smtp/server/server.factor    |   0
 {extra => basis}/smtp/smtp-tests.factor       |   0
 {extra => basis}/smtp/smtp.factor             |   0
 {extra => basis}/smtp/summary.txt             |   0
 {extra => basis}/smtp/tags.txt                |   0
 .../sorting/insertion/authors.txt             |   0
 .../sorting/insertion/insertion-tests.factor  |   0
 .../sorting/insertion/insertion.factor        |   0
 .../sorting/insertion/summary.txt             |   0
 {extra => basis}/sorting/insertion/tags.txt   |   0
 {extra => basis}/state-parser/authors.txt     |   0
 .../state-parser/state-parser-docs.factor     |   0
 .../state-parser/state-parser-tests.factor    |   0
 .../state-parser/state-parser.factor          |   0
 {extra => basis}/state-parser/summary.txt     |   0
 .../nt/monitors => basis/structs}/authors.txt |   0
 {extra => basis}/structs/structs.factor       |   0
 {extra => basis}/structs/summary.txt          |   0
 {core => basis}/summary/summary-docs.factor   |   0
 {core => basis}/summary/summary.factor        |   2 +-
 {extra => basis}/symbols/authors.txt          |   0
 {extra => basis}/symbols/symbols-docs.factor  |   0
 {extra => basis}/symbols/symbols-tests.factor |   0
 {extra => basis}/symbols/symbols.factor       |   0
 {extra/models => basis/threads}/authors.txt   |   0
 {core => basis}/threads/summary.txt           |   0
 {core => basis}/threads/threads-docs.factor   |   0
 {core => basis}/threads/threads-tests.factor  |   0
 {core => basis}/threads/threads.factor        |   0
 .../tools/annotations/annotations-docs.factor |   0
 .../annotations/annotations-tests.factor      |   0
 .../tools/annotations/annotations.factor      |   0
 .../tools/annotations/authors.txt             |   0
 .../tools/annotations/summary.txt             |   0
 {extra => basis}/tools/annotations/tags.txt   |   0
 {extra => basis}/tools/completion/authors.txt |   0
 .../tools/completion/completion-docs.factor   |   0
 .../tools/completion/completion.factor        |   0
 {extra => basis}/tools/completion/summary.txt |   0
 {extra => basis}/tools/crossref/authors.txt   |   0
 .../tools/crossref/crossref-docs.factor       |   0
 .../tools/crossref/crossref-tests.factor      |   2 +-
 .../tools/crossref/crossref.factor            |   0
 {extra => basis}/tools/crossref/summary.txt   |   0
 {extra => basis}/tools/crossref/tags.txt      |   0
 .../tools/crossref/test/foo.factor            |   0
 {extra => basis}/tools/deploy/authors.txt     |   0
 .../tools/deploy/backend/authors.txt          |   0
 .../tools/deploy/backend/backend.factor       |   0
 .../tools/deploy/config/authors.txt           |   0
 .../tools/deploy/config/config-docs.factor    |   0
 .../tools/deploy/config/config.factor         |   0
 .../tools/deploy/deploy-docs.factor           |   0
 .../tools/deploy/deploy-tests.factor          |   2 +-
 {extra => basis}/tools/deploy/deploy.factor   |   0
 .../tools/deploy/macosx/authors.txt           |   0
 .../tools/deploy/macosx/macosx.factor         |   0
 .../tools/deploy/macosx/summary.txt           |   0
 {extra => basis}/tools/deploy/macosx/tags.txt |   0
 .../tools/deploy/restage/restage.factor       |   0
 .../tools/deploy/shaker/authors.txt           |   0
 .../tools/deploy/shaker/shaker.factor         |   6 +-
 .../tools/deploy/shaker/strip-cocoa.factor    |   0
 .../tools/deploy/shaker/strip-debugger.factor |   0
 .../tools/deploy/shaker/strip-libc.factor     |   0
 {extra => basis}/tools/deploy/summary.txt     |   0
 {extra => basis}/tools/deploy/tags.txt        |   0
 {extra => basis}/tools/deploy/test/1/1.factor |   0
 .../tools/deploy/test/1/deploy.factor         |   0
 {extra => basis}/tools/deploy/test/2/2.factor |   0
 .../tools/deploy/test/2/deploy.factor         |   0
 {extra => basis}/tools/deploy/test/3/3.factor |   0
 .../tools/deploy/test/3/deploy.factor         |   0
 {extra => basis}/tools/deploy/test/4/4.factor |   0
 .../tools/deploy/test/4/deploy.factor         |   0
 {extra => basis}/tools/deploy/test/5/5.factor |   0
 .../tools/deploy/test/5/deploy.factor         |   0
 .../tools/deploy/unix/authors.txt             |   0
 .../tools/deploy/unix/summary.txt             |   0
 {extra => basis}/tools/deploy/unix/tags.txt   |   0
 .../tools/deploy/unix/unix.factor             |   0
 .../tools/deploy/windows/authors.txt          |   0
 .../tools/deploy/windows/summary.txt          |   0
 .../tools/deploy/windows/tags.txt             |   0
 .../tools/deploy/windows/windows-tests.factor |   0
 .../tools/deploy/windows/windows.factor       |   0
 .../tools/disassembler/authors.txt            |   0
 .../disassembler/disassembler-docs.factor     |   0
 .../disassembler/disassembler-tests.factor    |   0
 .../tools/disassembler/disassembler.factor    |   0
 .../tools/disassembler/summary.txt            |   0
 {extra => basis}/tools/memory/authors.txt     |   0
 .../tools/memory/memory-docs.factor           |   0
 .../tools/memory/memory-tests.factor          |   0
 {extra => basis}/tools/memory/memory.factor   |   0
 {extra => basis}/tools/memory/summary.txt     |   0
 {extra => basis}/tools/memory/tags.txt        |   0
 {extra => basis}/tools/profiler/authors.txt   |   0
 .../tools/profiler/profiler-docs.factor       |   0
 .../tools/profiler/profiler-tests.factor      |   0
 .../tools/profiler/profiler.factor            |   0
 {extra => basis}/tools/profiler/summary.txt   |   0
 {extra => basis}/tools/profiler/tags.txt      |   0
 {extra => basis}/tools/summary.txt            |   0
 {extra => basis}/tools/test/authors.txt       |   0
 {extra => basis}/tools/test/summary.txt       |   0
 {extra => basis}/tools/test/tags.txt          |   0
 {extra => basis}/tools/test/test-docs.factor  |   0
 {extra => basis}/tools/test/test.factor       |   0
 {extra => basis}/tools/test/tools.factor      |   0
 {extra => basis}/tools/test/ui/authors.txt    |   0
 {extra => basis}/tools/test/ui/ui.factor      |   0
 .../tools/threads/threads-docs.factor         |   0
 {extra => basis}/tools/threads/threads.factor |   0
 {extra => basis}/tools/time/authors.txt       |   0
 {extra => basis}/tools/time/summary.txt       |   0
 {extra => basis}/tools/time/tags.txt          |   0
 {extra => basis}/tools/time/time-docs.factor  |   0
 {extra => basis}/tools/time/time.factor       |   0
 .../tools/vocabs/browser/authors.txt          |   0
 .../tools/vocabs/browser/browser-docs.factor  |   0
 .../tools/vocabs/browser/browser-tests.factor |   0
 .../tools/vocabs/browser/browser.factor       |   0
 .../tools/vocabs/browser/tags.txt             |   0
 .../tools/vocabs/monitor/authors.txt          |   0
 .../tools/vocabs/monitor/monitor-tests.factor |   0
 .../tools/vocabs/monitor/monitor.factor       |   0
 .../tools/vocabs/monitor/summary.txt          |   0
 .../tools/vocabs/vocabs-docs.factor           |   0
 .../tools/vocabs/vocabs-tests.factor          |   0
 {extra => basis}/tools/vocabs/vocabs.factor   |   0
 {extra => basis}/tools/walker/authors.txt     |   0
 .../tools/walker/debug/authors.txt            |   0
 .../tools/walker/debug/debug.factor           |   0
 {extra => basis}/tools/walker/summary.txt     |   0
 .../tools/walker/walker-tests.factor          |   0
 {extra => basis}/tools/walker/walker.factor   |   0
 {extra => basis}/tr/authors.txt               |   0
 {extra => basis}/tr/summary.txt               |   0
 {extra => basis}/tr/tr-tests.factor           |   0
 {extra => basis}/tr/tr.factor                 |   0
 {extra => basis}/tuple-arrays/authors.txt     |   0
 {extra => basis}/tuple-arrays/summary.txt     |   0
 {extra => basis}/tuple-arrays/tags.txt        |   0
 .../tuple-arrays/tuple-arrays-docs.factor     |   0
 .../tuple-arrays/tuple-arrays-tests.factor    |   0
 .../tuple-arrays/tuple-arrays.factor          |   0
 {extra => basis}/unicode/authors.txt          |   0
 {extra => basis}/unicode/breaks/authors.txt   |   0
 .../unicode/breaks/breaks-tests.factor        |   0
 {extra => basis}/unicode/breaks/breaks.factor |   0
 {extra => basis}/unicode/breaks/tags.txt      |   0
 .../unicode/case/SpecialCasing.txt            |   0
 {extra => basis}/unicode/case/authors.txt     |   0
 .../unicode/case/case-tests.factor            |   0
 {extra => basis}/unicode/case/case.factor     |   0
 {extra => basis}/unicode/case/tags.txt        |   0
 .../unicode/categories/authors.txt            |   0
 .../categories/categories-tests.factor        |   0
 .../unicode/categories/categories.factor      |   0
 {extra => basis}/unicode/categories/tags.txt  |   0
 .../collation/CollationTest_SHIFTED.txt       |   0
 .../unicode/collation/allkeys.txt             |   0
 .../unicode/collation/collation-docs.factor   |   0
 .../unicode/collation/collation-tests.factor  |   2 +-
 .../unicode/collation/collation.factor        |   2 +-
 {extra => basis}/unicode/data/PropList.txt    |   0
 .../unicode/data/SpecialCasing.txt            |   0
 {extra => basis}/unicode/data/UnicodeData.txt |   0
 {extra => basis}/unicode/data/authors.txt     |   0
 {extra => basis}/unicode/data/data.factor     |   6 +-
 {extra => basis}/unicode/data/tags.txt        |   0
 .../unicode/normalize/NormalizationTest.txt   |   0
 .../unicode/normalize/authors.txt             |   0
 .../unicode/normalize/normalize-tests.factor  |   2 +-
 .../unicode/normalize/normalize.factor        |   0
 {extra => basis}/unicode/normalize/tags.txt   |   0
 {extra => basis}/unicode/script/Scripts.txt   |   0
 {extra => basis}/unicode/script/authors.txt   |   0
 .../unicode/script/script-docs.factor         |   0
 .../unicode/script/script-tests.factor        |   0
 {extra => basis}/unicode/script/script.factor |   2 +-
 {extra => basis}/unicode/script/summary.txt   |   0
 {extra => basis}/unicode/summary.txt          |   0
 {extra => basis}/unicode/syntax/authors.txt   |   0
 {extra => basis}/unicode/syntax/syntax.factor |   2 +-
 {extra => basis}/unicode/syntax/tags.txt      |   0
 {extra => basis}/unicode/tags.txt             |   0
 .../units}/authors.txt                        |   0
 .../units/constants}/authors.txt              |   0
 .../units/constants/constants.factor          |   0
 .../units/constants/constants.txt             |   0
 .../units/imperial}/authors.txt               |   0
 .../units/imperial/imperial-tests.factor      |   0
 .../units/imperial/imperial.factor            |   0
 .../constants => basis/units/si}/authors.txt  |   0
 {extra => basis}/units/si/si-tests.factor     |   0
 {extra => basis}/units/si/si.factor           |   0
 {extra => basis}/units/units-tests.factor     |   0
 {extra => basis}/units/units.factor           |   0
 {extra => basis}/unix/authors.txt             |   0
 {extra => basis}/unix/bsd/authors.txt         |   0
 {extra => basis}/unix/bsd/bsd.factor          |   0
 .../unix/bsd/freebsd/freebsd.factor           |   0
 .../unix/bsd/macosx/macosx.factor             |   0
 .../unix/bsd/netbsd/netbsd.factor             |   0
 .../unix/bsd/openbsd/openbsd.factor           |   0
 {extra => basis}/unix/bsd/summary.txt         |   0
 {extra => basis}/unix/kqueue/authors.txt      |   0
 .../unix/kqueue/freebsd/freebsd.factor        |   0
 {extra => basis}/unix/kqueue/kqueue.factor    |   0
 .../unix/kqueue/macosx/macosx.factor          |   0
 .../unix/kqueue/netbsd/netbsd.factor          |   0
 .../unix/kqueue/openbsd/openbsd.factor        |   0
 {extra => basis}/unix/linux/authors.txt       |   0
 {extra => basis}/unix/linux/epoll/authors.txt |   0
 .../unix/linux/epoll/epoll.factor             |   0
 {extra => basis}/unix/linux/fs/authors.txt    |   0
 {extra => basis}/unix/linux/fs/fs.factor      |   0
 {extra => basis}/unix/linux/if/authors.txt    |   0
 {extra => basis}/unix/linux/if/if.factor      |   0
 {extra => basis}/unix/linux/ifreq/authors.txt |   0
 .../unix/linux/ifreq/ifreq.factor             |   0
 .../unix/linux/inotify/inotify.factor         |   0
 {extra => basis}/unix/linux/linux.factor      |   0
 {extra => basis}/unix/linux/route/authors.txt |   0
 .../unix/linux/route/route.factor             |   0
 .../unix/linux/sockios/authors.txt            |   0
 .../unix/linux/sockios/sockios.factor         |   0
 {extra => basis}/unix/linux/swap/authors.txt  |   0
 {extra => basis}/unix/linux/swap/swap.factor  |   0
 {extra => basis}/unix/process/authors.txt     |   0
 {extra => basis}/unix/process/process.factor  |   0
 {extra => basis}/unix/solaris/authors.txt     |   0
 {extra => basis}/unix/solaris/solaris.factor  |   0
 .../unix/stat/freebsd/32/32.factor            |   0
 .../unix/stat/freebsd/64/64.factor            |   0
 .../unix/stat/freebsd/freebsd.factor          |   0
 {extra => basis}/unix/stat/linux/32/32.factor |   0
 {extra => basis}/unix/stat/linux/64/64.factor |   0
 {extra => basis}/unix/stat/linux/linux.factor |   0
 .../unix/stat/macosx/macosx.factor            |   0
 .../unix/stat/netbsd/32/32.factor             |   0
 .../unix/stat/netbsd/64/64.factor             |   0
 .../unix/stat/netbsd/netbsd.factor            |   0
 .../unix/stat/openbsd/openbsd.factor          |   0
 {extra => basis}/unix/stat/stat.factor        |   0
 {extra => basis}/unix/summary.txt             |   0
 {extra => basis}/unix/tags.txt                |   0
 {extra => basis}/unix/time/time.factor        |   0
 .../unix/types/freebsd/freebsd.factor         |   0
 .../unix/types/linux/linux.factor             |   0
 .../unix/types/macosx/macosx.factor           |   0
 .../unix/types/netbsd/32/32.factor            |   0
 .../unix/types/netbsd/64/64.factor            |   0
 .../unix/types/netbsd/netbsd.factor           |   0
 .../unix/types/openbsd/openbsd.factor         |   0
 {extra => basis}/unix/types/types.factor      |   0
 {extra => basis}/unix/unix.factor             |   0
 {extra => basis}/urls/authors.txt             |   0
 {extra => basis}/urls/summary.txt             |   0
 {extra => basis}/urls/tags.txt                |   0
 {extra => basis}/urls/urls-tests.factor       |   0
 {extra => basis}/urls/urls.factor             |   0
 .../validators/validators-tests.factor        |   0
 {extra => basis}/validators/validators.factor |   0
 {extra => basis}/values/authors.txt           |   0
 {extra => basis}/values/summary.txt           |   0
 {extra => basis}/values/tags.txt              |   0
 {extra => basis}/values/values-docs.factor    |   0
 {extra => basis}/values/values-tests.factor   |   0
 {extra => basis}/values/values.factor         |   0
 .../windows/advapi32/advapi32.factor          |   0
 .../windows/advapi32}/authors.txt             |   0
 {extra => basis}/windows/authors.txt          |   0
 .../units/si => basis/windows/ce}/authors.txt |   0
 {extra => basis}/windows/ce/ce.factor         |   0
 {extra => basis}/windows/com/authors.txt      |   0
 {extra => basis}/windows/com/com-docs.factor  |   0
 {extra => basis}/windows/com/com-tests.factor |   0
 {extra => basis}/windows/com/com.factor       |   0
 {extra => basis}/windows/com/summary.txt      |   0
 .../windows/com/syntax/authors.txt            |   0
 .../windows/com/syntax/summary.txt            |   0
 .../windows/com/syntax/syntax-docs.factor     |   0
 .../windows/com/syntax/syntax.factor          |   0
 {extra => basis}/windows/com/syntax/tags.txt  |   0
 {extra => basis}/windows/com/tags.txt         |   0
 .../windows/com/wrapper/authors.txt           |   0
 .../windows/com/wrapper/summary.txt           |   0
 {extra => basis}/windows/com/wrapper/tags.txt |   0
 .../windows/com/wrapper/wrapper-docs.factor   |   0
 .../windows/com/wrapper/wrapper.factor        |   0
 {extra => basis}/windows/dinput/authors.txt   |   0
 .../windows/dinput/constants/constants.factor |   0
 {extra => basis}/windows/dinput/dinput.factor |   0
 {extra => basis}/windows/dinput/summary.txt   |   0
 {extra => basis}/windows/dinput/tags.txt      |   0
 .../dragdrop-listener.factor                  |   0
 .../windows/errors}/authors.txt               |   0
 {extra => basis}/windows/errors/errors.factor |   0
 .../ce => basis/windows/gdi32}/authors.txt    |   0
 {extra => basis}/windows/gdi32/gdi32.factor   |   0
 .../windows/kernel32}/authors.txt             |   0
 .../windows/kernel32/kernel32.factor          |   0
 .../windows/messages}/authors.txt             |   0
 .../windows/messages/messages.factor          |   0
 .../kernel32 => basis/windows/nt}/authors.txt |   0
 {extra => basis}/windows/nt/nt.factor         |   0
 {extra => basis}/windows/ole32/authors.txt    |   0
 {extra => basis}/windows/ole32/ole32.factor   |   0
 .../windows/opengl32}/authors.txt             |   0
 .../windows/opengl32/opengl32.factor          |   0
 .../nt => basis/windows/shell32}/authors.txt  |   0
 .../windows/shell32/shell32.factor            |   0
 {extra => basis}/windows/summary.txt          |   0
 {extra => basis}/windows/tags.txt             |   0
 .../windows/time}/authors.txt                 |   0
 .../windows/time/time-tests.factor            |   0
 {extra => basis}/windows/time/time.factor     |   0
 .../windows/types}/authors.txt                |   0
 {extra => basis}/windows/types/types.factor   |   0
 .../time => basis/windows/user32}/authors.txt |   0
 {extra => basis}/windows/user32/user32.factor |   0
 {extra => basis}/windows/windows.factor       |   0
 .../windows/winsock}/authors.txt              |   0
 .../windows/winsock/winsock.factor            |   0
 {extra => basis}/wrap/authors.txt             |   0
 {extra => basis}/wrap/summary.txt             |   0
 {extra => basis}/wrap/tags.txt                |   0
 {extra => basis}/wrap/wrap.factor             |   0
 {extra => basis}/x11/clipboard/authors.txt    |   0
 .../x11/clipboard/clipboard.factor            |   0
 {extra => basis}/x11/clipboard/summary.txt    |   0
 {extra => basis}/x11/constants/authors.txt    |   0
 .../x11/constants/constants.factor            |   0
 {extra => basis}/x11/constants/summary.txt    |   0
 {extra => basis}/x11/events/authors.txt       |   0
 {extra => basis}/x11/events/events.factor     |   0
 {extra => basis}/x11/events/summary.txt       |   0
 {extra => basis}/x11/glx/authors.txt          |   0
 {extra => basis}/x11/glx/glx.factor           |   0
 {extra => basis}/x11/glx/summary.txt          |   0
 {extra => basis}/x11/glx/tags.txt             |   0
 {extra => basis}/x11/summary.txt              |   0
 {extra => basis}/x11/tags.txt                 |   0
 {extra => basis}/x11/windows/authors.txt      |   0
 {extra => basis}/x11/windows/summary.txt      |   0
 {extra => basis}/x11/windows/windows.factor   |   0
 {extra => basis}/x11/xim/authors.txt          |   0
 {extra => basis}/x11/xim/summary.txt          |   0
 {extra => basis}/x11/xim/tags.txt             |   0
 {extra => basis}/x11/xim/xim.factor           |   0
 {extra => basis}/x11/xlib/authors.txt         |   0
 {extra => basis}/x11/xlib/summary.txt         |   0
 {extra => basis}/x11/xlib/tags.txt            |   0
 {extra => basis}/x11/xlib/xlib.factor         |   0
 {extra => basis}/xml-rpc/authors.txt          |   0
 {extra => basis}/xml-rpc/example.factor       |   0
 {extra => basis}/xml-rpc/summary.txt          |   0
 {extra => basis}/xml-rpc/tags.txt             |   0
 {extra => basis}/xml-rpc/xml-rpc-docs.factor  |   0
 {extra => basis}/xml-rpc/xml-rpc-tests.factor |   0
 {extra => basis}/xml-rpc/xml-rpc.factor       |   0
 {extra => basis}/xml/authors.txt              |   0
 {extra => basis}/xml/backend/backend.factor   |   0
 {extra => basis}/xml/char-classes/authors.txt |   0
 .../xml/char-classes/char-classes.factor      |   0
 {extra => basis}/xml/data/authors.txt         |   0
 {extra => basis}/xml/data/data.factor         |   0
 {extra => basis}/xml/entities/authors.txt     |   0
 {extra => basis}/xml/entities/entities.factor |   0
 {extra => basis}/xml/errors/authors.txt       |   0
 .../xml/errors/errors-tests.factor            |   0
 {extra => basis}/xml/errors/errors.factor     |   0
 {extra => basis}/xml/generator/authors.txt    |   0
 .../xml/generator/generator-tests.factor      |   0
 .../xml/generator/generator.factor            |   0
 {extra => basis}/xml/summary.txt              |   0
 {extra => basis}/xml/tags.txt                 |   0
 {extra => basis}/xml/tests/arithmetic.factor  |   0
 {extra => basis}/xml/tests/authors.txt        |   0
 {extra => basis}/xml/tests/soap.factor        |   2 +-
 {extra => basis}/xml/tests/soap.xml           |   0
 {extra => basis}/xml/tests/templating.factor  |   0
 {extra => basis}/xml/tests/test.factor        |   2 +-
 {extra => basis}/xml/tests/test.xml           |   0
 {extra => basis}/xml/tokenize/authors.txt     |   0
 {extra => basis}/xml/tokenize/tokenize.factor |   0
 {extra => basis}/xml/utilities/authors.txt    |   0
 .../xml/utilities/utilities-tests.factor      |   0
 .../xml/utilities/utilities.factor            |   0
 {extra => basis}/xml/writer/authors.txt       |   0
 {extra => basis}/xml/writer/writer.factor     |   0
 {extra => basis}/xml/xml-docs.factor          |   0
 {extra => basis}/xml/xml.factor               |   0
 core/alien/alien-docs.factor                  |   2 +-
 core/bootstrap/primitives.factor              |   2 +-
 core/bootstrap/stage1.factor                  |  13 +-
 core/classes/tuple/parser/parser.factor       |   8 +-
 core/combinators/combinators-docs.factor      |  12 ++
 core/combinators/combinators.factor           |  16 +++
 core/compiler/errors/errors.factor            |  24 ++--
 core/continuations/continuations.factor       |  17 +++
 core/effects/parser/parser.factor             |   7 +-
 core/generic/parser/parser.factor             |   5 +-
 core/init/init.factor                         |   4 +-
 core/kernel/kernel-docs.factor                |   5 +
 core/kernel/kernel.factor                     |   4 +
 core/lexer/lexer.factor                       |  27 +---
 core/parser/parser-docs.factor                |  18 +--
 core/parser/parser.factor                     |  40 ++----
 core/source-files/source-files.factor         |  22 +---
 core/strings/parser/parser.factor             |   4 +-
 core/syntax/syntax.factor                     |   2 +-
 core/vocabs/loader/loader.factor              |   7 +-
 extra/ui/cocoa/tools/tools.factor             |   2 +-
 extra/ui/gadgets/slots/slots.factor           |   2 +-
 .../headers}/authors.txt                      |   0
 .../headers/bsd}/authors.txt                  |   0
 .../headers/bsd/bsd.factor                    |   0
 .../headers/headers.factor                    |   0
 1516 files changed, 308 insertions(+), 306 deletions(-)
 rename {extra => basis}/alarms/alarms-docs.factor (100%)
 rename {extra => basis}/alarms/alarms-tests.factor (100%)
 rename {extra => basis}/alarms/alarms.factor (100%)
 rename {extra => basis}/alarms/authors.txt (100%)
 rename {extra => basis}/alias/alias.factor (100%)
 rename {core => basis}/alien/arrays/arrays-docs.factor (100%)
 rename {core => basis}/alien/arrays/arrays.factor (100%)
 rename {core => basis}/alien/arrays/authors.txt (100%)
 rename {core => basis}/alien/arrays/summary.txt (100%)
 rename {core => basis}/alien/c-types/authors.txt (100%)
 rename {core => basis}/alien/c-types/c-types-docs.factor (100%)
 rename {core => basis}/alien/c-types/c-types-tests.factor (100%)
 rename {core => basis}/alien/c-types/c-types.factor (100%)
 rename {core => basis}/alien/c-types/summary.txt (100%)
 rename {core => basis}/alien/compiler/authors.txt (100%)
 rename {core => basis}/alien/compiler/compiler-tests.factor (100%)
 rename {core => basis}/alien/compiler/compiler.factor (100%)
 rename {core => basis}/alien/compiler/summary.txt (100%)
 rename {core => basis}/alien/remote-control/authors.txt (100%)
 rename {core => basis}/alien/remote-control/remote-control.factor (92%)
 rename {core => basis}/alien/remote-control/summary.txt (100%)
 rename {core => basis}/alien/strings/strings-docs.factor (100%)
 rename {core => basis}/alien/strings/strings-tests.factor (100%)
 rename {core => basis}/alien/strings/strings.factor (100%)
 rename {core => basis}/alien/structs/authors.txt (100%)
 rename {core => basis}/alien/structs/structs-docs.factor (100%)
 rename {core => basis}/alien/structs/structs-tests.factor (100%)
 rename {core => basis}/alien/structs/structs.factor (100%)
 rename {core => basis}/alien/structs/summary.txt (100%)
 rename {core => basis}/alien/syntax/authors.txt (100%)
 rename {core => basis}/alien/syntax/summary.txt (100%)
 rename {core => basis}/alien/syntax/syntax-docs.factor (100%)
 rename {core => basis}/alien/syntax/syntax.factor (100%)
 rename {extra => basis}/ascii/ascii-docs.factor (100%)
 rename {extra => basis}/ascii/ascii-tests.factor (100%)
 rename {extra => basis}/ascii/ascii.factor (100%)
 rename {core/bootstrap/compiler => basis/ascii}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/ascii/summary.txt (100%)
 rename {core/io/encodings/utf16 => basis/ascii}/tags.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/base64/authors.txt (100%)
 rename {extra => basis}/base64/base64-docs.factor (100%)
 rename {extra => basis}/base64/base64-tests.factor (100%)
 rename {extra => basis}/base64/base64.factor (100%)
 rename {extra => basis}/base64/summary.txt (100%)
 rename {core/bootstrap/image => basis/biassocs}/authors.txt (100%)
 rename {extra => basis}/biassocs/biassocs-docs.factor (100%)
 rename {extra => basis}/biassocs/biassocs-tests.factor (100%)
 rename {extra => basis}/biassocs/biassocs.factor (100%)
 rename {extra => basis}/biassocs/summary.txt (100%)
 rename {core/dequeues => basis/biassocs}/tags.txt (100%)
 rename {core => basis}/binary-search/binary-search-docs.factor (100%)
 rename {core => basis}/binary-search/binary-search-tests.factor (100%)
 rename {core => basis}/binary-search/binary-search.factor (100%)
 rename {core/command-line => basis/bit-arrays}/authors.txt (100%)
 rename {extra => basis}/bit-arrays/bit-arrays-docs.factor (100%)
 rename {extra => basis}/bit-arrays/bit-arrays-tests.factor (100%)
 rename {extra => basis}/bit-arrays/bit-arrays.factor (100%)
 rename {extra => basis}/bit-arrays/summary.txt (100%)
 rename {core/dlists => basis/bit-arrays}/tags.txt (100%)
 rename {extra => basis}/bit-vectors/bit-vectors-docs.factor (100%)
 rename {extra => basis}/bit-vectors/bit-vectors-tests.factor (100%)
 rename {extra => basis}/bit-vectors/bit-vectors.factor (100%)
 rename {extra => basis}/bit-vectors/summary.txt (100%)
 rename {core/heaps => basis/bit-vectors}/tags.txt (100%)
 rename {core => basis/bootstrap}/compiler/authors.txt (100%)
 rename {core => basis}/bootstrap/compiler/compiler.factor (100%)
 rename {core => basis}/bootstrap/compiler/summary.txt (100%)
 rename {extra => basis}/bootstrap/handbook/handbook.factor (100%)
 rename {core/compiler/constants => basis/bootstrap/help}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/bootstrap/help/help.factor (100%)
 rename {extra => basis}/bootstrap/help/summary.txt (100%)
 rename {core/cpu/architecture => basis/bootstrap/image}/authors.txt (100%)
 rename {core/cpu/arm/4 => basis/bootstrap/image/download}/authors.txt (100%)
 rename {extra => basis}/bootstrap/image/download/download.factor (100%)
 rename {extra => basis}/bootstrap/image/download/summary.txt (100%)
 rename {core => basis}/bootstrap/image/image-docs.factor (100%)
 rename {core => basis}/bootstrap/image/image-tests.factor (100%)
 rename {core => basis}/bootstrap/image/image.factor (100%)
 rename {core => basis}/bootstrap/image/summary.txt (100%)
 rename {core => basis}/bootstrap/image/tags.txt (100%)
 rename {core/cpu/arm/allot => basis/bootstrap/image/upload}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/bootstrap/image/upload/summary.txt (100%)
 rename {extra => basis}/bootstrap/image/upload/upload.factor (100%)
 rename {core/cpu/arm/architecture => basis/bootstrap/io}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/bootstrap/io/io.factor (100%)
 rename {extra => basis}/bootstrap/io/summary.txt (100%)
 rename {extra => basis}/bootstrap/math/math.factor (100%)
 rename {extra => basis}/bootstrap/math/summary.txt (100%)
 rename {extra => basis}/bootstrap/random/random.factor (100%)
 rename {core => basis}/bootstrap/stage2.factor (52%)
 rename {core/cpu/arm/assembler => basis/bootstrap/tools}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/bootstrap/tools/summary.txt (100%)
 rename {extra => basis}/bootstrap/tools/tools.factor (100%)
 rename {extra => basis}/bootstrap/unicode/unicode.factor (100%)
 rename {core => basis}/boxes/boxes-docs.factor (100%)
 rename {core => basis}/boxes/boxes-tests.factor (100%)
 rename {core => basis}/boxes/boxes.factor (100%)
 rename {extra => basis}/calendar/authors.txt (100%)
 rename {extra => basis}/calendar/backend/authors.txt (100%)
 rename {extra => basis}/calendar/backend/backend.factor (100%)
 rename {extra => basis}/calendar/calendar-tests.factor (100%)
 rename {extra => basis}/calendar/calendar.factor (100%)
 rename {extra => basis}/calendar/format/format-tests.factor (100%)
 rename {extra => basis}/calendar/format/format.factor (100%)
 rename {extra => basis}/calendar/format/macros/macros-tests.factor (100%)
 rename {extra => basis}/calendar/format/macros/macros.factor (100%)
 rename {extra => basis}/calendar/format/summary.txt (100%)
 rename {extra => basis}/calendar/model/model.factor (100%)
 rename {extra => basis}/calendar/model/summary.txt (100%)
 rename {extra => basis}/calendar/summary.txt (100%)
 rename {extra => basis}/calendar/unix/authors.txt (100%)
 rename {extra => basis}/calendar/unix/unix.factor (100%)
 rename {extra => basis}/calendar/windows/authors.txt (100%)
 rename {extra => basis}/calendar/windows/tags.txt (100%)
 rename {extra => basis}/calendar/windows/windows.factor (100%)
 rename {extra => basis}/channels/authors.txt (100%)
 rename {extra => basis}/channels/channels-docs.factor (100%)
 rename {extra => basis}/channels/channels-tests.factor (100%)
 rename {extra => basis}/channels/channels.factor (100%)
 rename {extra => basis}/channels/examples/authors.txt (100%)
 rename {extra => basis}/channels/examples/examples.factor (100%)
 rename {extra => basis}/channels/examples/summary.txt (100%)
 rename {extra => basis}/channels/examples/tags.txt (100%)
 rename {extra => basis}/channels/remote/authors.txt (100%)
 rename {extra => basis}/channels/remote/remote-docs.factor (100%)
 rename {extra => basis}/channels/remote/remote-tests.factor (100%)
 rename {extra => basis}/channels/remote/remote.factor (100%)
 rename {extra => basis}/channels/remote/summary.txt (100%)
 rename {extra => basis}/channels/remote/tags.txt (100%)
 rename {extra => basis}/channels/summary.txt (100%)
 rename {extra => basis}/channels/tags.txt (100%)
 rename {extra => basis}/checksums/adler-32/adler-32-docs.factor (100%)
 rename {extra => basis}/checksums/adler-32/adler-32-tests.factor (100%)
 rename {extra => basis}/checksums/adler-32/adler-32.factor (100%)
 rename {extra => basis}/checksums/adler-32/authors.txt (100%)
 rename {extra => basis}/checksums/md5/authors.txt (100%)
 rename {extra => basis}/checksums/md5/md5-docs.factor (100%)
 rename {extra => basis}/checksums/md5/md5-tests.factor (100%)
 rename {extra => basis}/checksums/md5/md5.factor (100%)
 rename {extra => basis}/checksums/null/null.factor (100%)
 rename {extra => basis}/checksums/openssl/openssl-docs.factor (100%)
 rename {extra => basis}/checksums/openssl/openssl-tests.factor (100%)
 rename {extra => basis}/checksums/openssl/openssl.factor (100%)
 rename {extra => basis}/checksums/sha1/authors.txt (100%)
 rename {extra => basis}/checksums/sha1/sha1-docs.factor (100%)
 rename {extra => basis}/checksums/sha1/sha1-tests.factor (100%)
 rename {extra => basis}/checksums/sha1/sha1.factor (100%)
 rename {extra => basis}/checksums/sha2/authors.txt (100%)
 rename {extra => basis}/checksums/sha2/sha2-docs.factor (100%)
 rename {extra => basis}/checksums/sha2/sha2-tests.factor (100%)
 rename {extra => basis}/checksums/sha2/sha2.factor (100%)
 rename {extra => basis}/circular/authors.txt (100%)
 rename {extra => basis}/circular/circular-tests.factor (100%)
 rename {extra => basis}/circular/circular.factor (100%)
 rename {extra => basis}/circular/summary.txt (100%)
 rename {core/search-dequeues => basis/circular}/tags.txt (100%)
 rename {extra => basis}/cocoa/application/application-docs.factor (100%)
 rename {extra => basis}/cocoa/application/application.factor (100%)
 rename {core/cpu/arm => basis/cocoa/application}/authors.txt (100%)
 rename {extra => basis}/cocoa/application/summary.txt (100%)
 rename {core/cpu/arm/intrinsics => basis/cocoa}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/cocoa/callbacks/authors.txt (100%)
 rename {extra => basis}/cocoa/callbacks/callbacks.factor (100%)
 rename {extra => basis}/cocoa/callbacks/summary.txt (100%)
 rename {extra => basis}/cocoa/cocoa-docs.factor (100%)
 rename {extra => basis}/cocoa/cocoa-tests.factor (100%)
 rename {extra => basis}/cocoa/cocoa.factor (100%)
 rename {core/cpu/ppc/allot => basis/cocoa/dialogs}/authors.txt (100%)
 rename {extra => basis}/cocoa/dialogs/dialogs-docs.factor (100%)
 rename {extra => basis}/cocoa/dialogs/dialogs.factor (100%)
 rename {extra => basis}/cocoa/dialogs/summary.txt (100%)
 rename {extra => basis}/cocoa/enumeration/enumeration.factor (100%)
 rename {core/cpu/ppc/architecture => basis/cocoa/messages}/authors.txt (100%)
 rename {extra => basis}/cocoa/messages/messages-docs.factor (100%)
 rename {extra => basis}/cocoa/messages/messages.factor (100%)
 rename {extra => basis}/cocoa/messages/summary.txt (100%)
 rename {extra => basis}/cocoa/nibs/authors.txt (100%)
 rename {extra => basis}/cocoa/nibs/nibs-docs.factor (100%)
 rename {extra => basis}/cocoa/nibs/nibs.factor (100%)
 rename {extra => basis}/cocoa/nibs/summary.txt (100%)
 rename {core/cpu/ppc/assembler => basis/cocoa/pasteboard}/authors.txt (100%)
 rename {extra => basis}/cocoa/pasteboard/pasteboard-docs.factor (100%)
 rename {extra => basis}/cocoa/pasteboard/pasteboard.factor (100%)
 rename {extra => basis}/cocoa/pasteboard/summary.txt (100%)
 rename {core/cpu/ppc => basis/cocoa/plists}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/cocoa/plists/plists.factor (100%)
 rename {core/cpu/ppc/intrinsics => basis/cocoa/runtime}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/cocoa/runtime/runtime.factor (100%)
 rename {extra => basis}/cocoa/runtime/summary.txt (100%)
 rename {core/cpu/x86/32 => basis/cocoa/subclassing}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/cocoa/subclassing/subclassing-docs.factor (100%)
 rename {extra => basis}/cocoa/subclassing/subclassing.factor (100%)
 rename {extra => basis}/cocoa/subclassing/summary.txt (100%)
 rename {extra => basis}/cocoa/summary.txt (100%)
 rename {extra => basis}/cocoa/tags.txt (100%)
 rename {core/cpu/x86/64 => basis/cocoa/types}/authors.txt (100%)
 rename {extra => basis}/cocoa/types/summary.txt (100%)
 rename {extra => basis}/cocoa/types/types-docs.factor (100%)
 rename {extra => basis}/cocoa/types/types.factor (100%)
 rename {core/cpu/x86/allot => basis/cocoa/views}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/cocoa/views/summary.txt (100%)
 rename {extra => basis}/cocoa/views/views-docs.factor (100%)
 rename {extra => basis}/cocoa/views/views.factor (100%)
 rename {core/cpu/x86/architecture => basis/cocoa/windows}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/cocoa/windows/summary.txt (100%)
 rename {extra => basis}/cocoa/windows/windows-docs.factor (100%)
 rename {extra => basis}/cocoa/windows/windows.factor (100%)
 rename {extra => basis}/columns/authors.txt (100%)
 rename {extra => basis}/columns/columns-docs.factor (100%)
 rename {extra => basis}/columns/columns-tests.factor (100%)
 rename {extra => basis}/columns/columns.factor (100%)
 rename {extra => basis}/columns/summary.txt (100%)
 rename {extra/biassocs => basis/columns}/tags.txt (100%)
 rename {extra => basis}/combinators/short-circuit/short-circuit-tests.factor (100%)
 rename {extra => basis}/combinators/short-circuit/short-circuit.factor (100%)
 rename {extra => basis}/combinators/short-circuit/smart/smart-tests.factor (100%)
 rename {extra => basis}/combinators/short-circuit/smart/smart.factor (100%)
 rename {core/cpu/x86/assembler => basis/command-line}/authors.txt (100%)
 mode change 100755 => 100644
 rename {core => basis}/command-line/command-line-docs.factor (100%)
 rename {core => basis}/command-line/command-line-tests.factor (100%)
 rename {core => basis}/command-line/command-line.factor (95%)
 rename {core => basis}/command-line/summary.txt (100%)
 rename {core/cpu/x86 => basis/compiler}/authors.txt (100%)
 rename {core => basis}/compiler/compiler-docs.factor (100%)
 rename {core => basis}/compiler/compiler.factor (100%)
 rename {core/cpu/x86/intrinsics => basis/compiler/constants}/authors.txt (100%)
 rename {core => basis}/compiler/constants/constants.factor (100%)
 rename {core => basis}/compiler/constants/summary.txt (100%)
 rename {core => basis}/compiler/summary.txt (100%)
 rename {core => basis}/compiler/tags.txt (100%)
 rename {core => basis}/compiler/tests/curry.factor (100%)
 rename {core => basis}/compiler/tests/float.factor (100%)
 rename {core => basis}/compiler/tests/insane.factor (100%)
 rename {core => basis}/compiler/tests/intrinsics.factor (100%)
 rename {core => basis}/compiler/tests/redefine1.factor (100%)
 rename {core => basis}/compiler/tests/redefine2.factor (100%)
 rename {core => basis}/compiler/tests/redefine3.factor (100%)
 rename {core => basis}/compiler/tests/reload.factor (100%)
 rename {core => basis}/compiler/tests/simple.factor (100%)
 rename {core => basis}/compiler/tests/stack-trace.factor (100%)
 rename {core => basis}/compiler/tests/templates-early.factor (100%)
 rename {core => basis}/compiler/tests/templates.factor (100%)
 rename {core => basis}/compiler/tests/tuples.factor (100%)
 rename {extra => basis}/concurrency/combinators/combinators-docs.factor (100%)
 rename {extra => basis}/concurrency/combinators/combinators-tests.factor (100%)
 rename {extra => basis}/concurrency/combinators/combinators.factor (100%)
 rename {extra => basis}/concurrency/combinators/summary.txt (100%)
 rename {extra => basis}/concurrency/conditions/conditions.factor (100%)
 rename {extra => basis}/concurrency/conditions/summary.txt (100%)
 rename {extra => basis}/concurrency/count-downs/count-downs-docs.factor (100%)
 rename {extra => basis}/concurrency/count-downs/count-downs-tests.factor (100%)
 rename {extra => basis}/concurrency/count-downs/count-downs.factor (100%)
 rename {extra => basis}/concurrency/count-downs/summary.txt (100%)
 rename {extra => basis}/concurrency/distributed/authors.txt (100%)
 rename {extra => basis}/concurrency/distributed/distributed-docs.factor (100%)
 rename {extra => basis}/concurrency/distributed/distributed-tests.factor (100%)
 rename {extra => basis}/concurrency/distributed/distributed.factor (100%)
 rename {extra => basis}/concurrency/distributed/summary.txt (100%)
 rename {extra => basis}/concurrency/distributed/tags.txt (100%)
 rename {core/cpu/x86/sse2 => basis/concurrency/exchangers}/authors.txt (100%)
 rename {extra => basis}/concurrency/exchangers/exchangers-docs.factor (100%)
 rename {extra => basis}/concurrency/exchangers/exchangers-tests.factor (100%)
 rename {extra => basis}/concurrency/exchangers/exchangers.factor (100%)
 rename {extra => basis}/concurrency/exchangers/summary.txt (100%)
 rename {extra => basis}/concurrency/flags/flags-docs.factor (100%)
 rename {extra => basis}/concurrency/flags/flags-tests.factor (100%)
 rename {extra => basis}/concurrency/flags/flags.factor (100%)
 rename {extra => basis}/concurrency/futures/authors.txt (100%)
 rename {extra => basis}/concurrency/futures/futures-docs.factor (100%)
 rename {extra => basis}/concurrency/futures/futures-tests.factor (100%)
 rename {extra => basis}/concurrency/futures/futures.factor (100%)
 rename {extra => basis}/concurrency/futures/summary.txt (100%)
 rename {core/debugger => basis/concurrency/locks}/authors.txt (100%)
 rename {extra => basis}/concurrency/locks/locks-docs.factor (100%)
 rename {extra => basis}/concurrency/locks/locks-tests.factor (100%)
 rename {extra => basis}/concurrency/locks/locks.factor (100%)
 rename {extra => basis}/concurrency/locks/summary.txt (100%)
 rename {extra => basis}/concurrency/mailboxes/mailboxes-docs.factor (100%)
 rename {extra => basis}/concurrency/mailboxes/mailboxes-tests.factor (100%)
 rename {extra => basis}/concurrency/mailboxes/mailboxes.factor (100%)
 rename {extra => basis}/concurrency/messaging/authors.txt (100%)
 rename {extra => basis}/concurrency/messaging/messaging-docs.factor (100%)
 rename {extra => basis}/concurrency/messaging/messaging-tests.factor (100%)
 rename {extra => basis}/concurrency/messaging/messaging.factor (100%)
 rename {extra => basis}/concurrency/messaging/summary.txt (100%)
 rename {extra => basis}/concurrency/promises/authors.txt (100%)
 rename {extra => basis}/concurrency/promises/promises-docs.factor (100%)
 rename {extra => basis}/concurrency/promises/promises-tests.factor (100%)
 rename {extra => basis}/concurrency/promises/promises.factor (100%)
 rename {extra => basis}/concurrency/promises/summary.txt (100%)
 rename {core/dequeues => basis/concurrency/semaphores}/authors.txt (100%)
 rename {extra => basis}/concurrency/semaphores/semaphores-docs.factor (100%)
 rename {extra => basis}/concurrency/semaphores/semaphores.factor (100%)
 rename {extra => basis}/concurrency/semaphores/summary.txt (100%)
 rename {core/generator => basis/core-foundation}/authors.txt (100%)
 rename {extra => basis}/core-foundation/core-foundation-docs.factor (100%)
 rename {extra => basis}/core-foundation/core-foundation.factor (100%)
 rename {extra => basis}/core-foundation/fsevents/fsevents.factor (100%)
 rename {extra => basis}/core-foundation/run-loop/run-loop.factor (100%)
 rename {extra => basis}/core-foundation/summary.txt (100%)
 rename {extra => basis}/core-foundation/tags.txt (100%)
 rename {core => basis}/cpu/architecture/architecture.factor (100%)
 rename {core/generator/fixup => basis/cpu/architecture}/authors.txt (100%)
 rename {core => basis}/cpu/architecture/summary.txt (100%)
 rename {core => basis}/cpu/architecture/tags.txt (100%)
 rename {core => basis}/cpu/arm/4/4.factor (100%)
 rename {core/generator/registers => basis/cpu/arm/4}/authors.txt (100%)
 rename {core => basis}/cpu/arm/4/summary.txt (100%)
 rename {core => basis}/cpu/arm/allot/allot.factor (100%)
 rename {core/inference => basis/cpu/arm/allot}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/arm/architecture/architecture.factor (100%)
 rename {core/inference/backend => basis/cpu/arm/architecture}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/arm/arm.factor (100%)
 rename {core => basis}/cpu/arm/assembler/assembler-tests.factor (100%)
 rename {core => basis}/cpu/arm/assembler/assembler.factor (100%)
 rename {core/inference/class => basis/cpu/arm/assembler}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core/inference/dataflow => basis/cpu/arm}/authors.txt (100%)
 rename {core => basis}/cpu/arm/bootstrap.factor (100%)
 rename {core/inference/errors => basis/cpu/arm/intrinsics}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/arm/intrinsics/intrinsics.factor (100%)
 rename {core => basis}/cpu/arm/summary.txt (100%)
 rename {core => basis}/cpu/arm/tags.txt (100%)
 rename {core => basis}/cpu/ppc/allot/allot.factor (100%)
 rename {core/inference/known-words => basis/cpu/ppc/allot}/authors.txt (100%)
 rename {core => basis}/cpu/ppc/allot/summary.txt (100%)
 rename {core => basis}/cpu/ppc/architecture/architecture.factor (100%)
 rename {core/inference/state => basis/cpu/ppc/architecture}/authors.txt (100%)
 mode change 100755 => 100644
 rename {core => basis}/cpu/ppc/architecture/summary.txt (100%)
 rename {core => basis}/cpu/ppc/assembler/assembler-tests.factor (100%)
 rename {core => basis}/cpu/ppc/assembler/assembler.factor (100%)
 rename {core/inference/transforms => basis/cpu/ppc/assembler}/authors.txt (100%)
 rename {core => basis}/cpu/ppc/assembler/backend/backend.factor (100%)
 rename {core => basis}/cpu/ppc/assembler/summary.txt (100%)
 rename {core/inspector => basis/cpu/ppc}/authors.txt (100%)
 rename {core => basis}/cpu/ppc/bootstrap.factor (100%)
 rename {core/listener => basis/cpu/ppc/intrinsics}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/ppc/intrinsics/intrinsics.factor (100%)
 rename {core => basis}/cpu/ppc/linux/bootstrap.factor (100%)
 rename {core => basis}/cpu/ppc/macosx/bootstrap.factor (100%)
 rename {core => basis}/cpu/ppc/ppc.factor (100%)
 rename {core => basis}/cpu/ppc/summary.txt (100%)
 rename {core => basis}/cpu/ppc/tags.txt (100%)
 rename {core => basis}/cpu/summary.txt (100%)
 rename {core => basis}/cpu/tags.txt (100%)
 rename {core => basis}/cpu/x86/32/32.factor (100%)
 rename {core/math/bitfields => basis/cpu/x86/32}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/x86/32/bootstrap.factor (87%)
 rename {core => basis}/cpu/x86/32/tags.txt (100%)
 rename {core => basis}/cpu/x86/64/64.factor (100%)
 rename {core/math/intervals => basis/cpu/x86/64}/authors.txt (100%)
 rename {core => basis}/cpu/x86/64/bootstrap.factor (86%)
 rename {core => basis}/cpu/x86/64/summary.txt (100%)
 rename {core => basis}/cpu/x86/64/tags.txt (100%)
 rename {core => basis}/cpu/x86/allot/allot.factor (100%)
 rename {core/mirrors => basis/cpu/x86/allot}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/x86/architecture/architecture.factor (100%)
 rename {core/none => basis/cpu/x86/architecture}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/x86/assembler/assembler-tests.factor (100%)
 rename {core => basis}/cpu/x86/assembler/assembler.factor (100%)
 rename {core/optimizer => basis/cpu/x86/assembler}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/x86/assembler/syntax/syntax.factor (100%)
 rename {core/optimizer/backend => basis/cpu/x86}/authors.txt (100%)
 rename {core => basis}/cpu/x86/bootstrap.factor (100%)
 rename {core/optimizer/def-use => basis/cpu/x86/intrinsics}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/cpu/x86/intrinsics/intrinsics.factor (100%)
 rename {core/optimizer/known-words => basis/cpu/x86/sse2}/authors.txt (100%)
 rename {core => basis}/cpu/x86/sse2/sse2.factor (100%)
 rename {core => basis}/cpu/x86/sse2/summary.txt (100%)
 rename {core => basis}/cpu/x86/summary.txt (100%)
 rename {extra => basis}/csv/authors.txt (100%)
 rename {extra => basis}/csv/csv-docs.factor (100%)
 rename {extra => basis}/csv/csv-tests.factor (100%)
 rename {extra => basis}/csv/csv.factor (100%)
 rename {extra => basis}/csv/summary.txt (100%)
 rename {core/optimizer/math => basis/debugger}/authors.txt (100%)
 rename {core => basis}/debugger/debugger-docs.factor (89%)
 rename {core => basis}/debugger/debugger-tests.factor (100%)
 rename {core => basis}/debugger/debugger.factor (79%)
 rename {core => basis}/debugger/summary.txt (100%)
 rename {extra => basis}/delegate/author.txt (100%)
 rename {core/io/encodings/string => basis/delegate}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/delegate/delegate-docs.factor (100%)
 rename {extra => basis}/delegate/delegate-tests.factor (100%)
 rename {extra => basis}/delegate/delegate.factor (100%)
 rename {core/io/encodings/utf16 => basis/delegate/protocols}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/delegate/protocols/protocols.factor (100%)
 rename {extra => basis}/delegate/summary.txt (100%)
 rename {core/optimizer/pattern-match => basis/dequeues}/authors.txt (100%)
 rename {core => basis}/dequeues/dequeues-docs.factor (100%)
 rename {core => basis}/dequeues/dequeues.factor (100%)
 rename {core => basis}/dequeues/summary.txt (100%)
 rename {extra/bit-arrays => basis/dequeues}/tags.txt (100%)
 rename {extra => basis}/disjoint-sets/authors.txt (100%)
 rename {extra => basis}/disjoint-sets/disjoint-sets.factor (100%)
 rename {extra => basis}/disjoint-sets/summary.txt (100%)
 rename {extra/bit-vectors => basis/disjoint-sets}/tags.txt (100%)
 rename {core => basis}/dlists/authors.txt (100%)
 rename {core => basis}/dlists/dlists-docs.factor (100%)
 rename {core => basis}/dlists/dlists-tests.factor (100%)
 rename {core => basis}/dlists/dlists.factor (96%)
 rename {core => basis}/dlists/summary.txt (100%)
 rename {extra/circular => basis/dlists}/tags.txt (100%)
 rename {core/prettyprint => basis/documents}/authors.txt (100%)
 rename {extra => basis}/documents/documents-docs.factor (100%)
 rename {extra => basis}/documents/documents-tests.factor (100%)
 rename {extra => basis}/documents/documents.factor (100%)
 rename {extra => basis}/documents/summary.txt (100%)
 rename {core/prettyprint/backend => basis/editors}/authors.txt (100%)
 rename {extra => basis}/editors/editors-docs.factor (100%)
 rename {extra => basis}/editors/editors.factor (100%)
 rename {extra => basis}/editors/editpadpro/authors.txt (100%)
 rename {extra => basis}/editors/editpadpro/editpadpro-docs.factor (100%)
 rename {extra => basis}/editors/editpadpro/editpadpro.factor (100%)
 rename {extra => basis}/editors/editpadpro/summary.txt (100%)
 rename {extra => basis}/editors/editplus/authors.txt (100%)
 rename {extra => basis}/editors/editplus/editplus.factor (100%)
 rename {extra => basis}/editors/editplus/summary.txt (100%)
 rename {extra => basis}/editors/emacs/authors.txt (100%)
 rename {extra => basis}/editors/emacs/emacs-docs.factor (100%)
 rename {extra => basis}/editors/emacs/emacs.factor (100%)
 rename {extra => basis}/editors/emacs/summary.txt (100%)
 rename {extra => basis}/editors/emeditor/authors.txt (100%)
 rename {extra => basis}/editors/emeditor/emeditor.factor (100%)
 rename {extra => basis}/editors/emeditor/summary.txt (100%)
 rename {extra => basis}/editors/gvim/authors.txt (100%)
 rename {extra => basis}/editors/gvim/backend/authors.txt (100%)
 rename {extra => basis}/editors/gvim/backend/backend.factor (100%)
 rename {extra => basis}/editors/gvim/gvim.factor (100%)
 rename {extra => basis}/editors/gvim/summary.txt (100%)
 rename {extra => basis}/editors/gvim/unix/authors.txt (100%)
 rename {extra => basis}/editors/gvim/unix/unix.factor (100%)
 rename {extra => basis}/editors/gvim/windows/authors.txt (100%)
 rename {extra => basis}/editors/gvim/windows/windows.factor (100%)
 rename {core/prettyprint/config => basis/editors/jedit}/authors.txt (100%)
 rename {extra => basis}/editors/jedit/jedit.factor (100%)
 rename {extra => basis}/editors/jedit/summary.txt (100%)
 rename {extra => basis}/editors/notepadpp/authors.txt (100%)
 rename {extra => basis}/editors/notepadpp/notepadpp.factor (100%)
 rename {extra => basis}/editors/notepadpp/summary.txt (100%)
 rename {extra => basis}/editors/scite/authors.txt (100%)
 rename {extra => basis}/editors/scite/scite.factor (100%)
 rename {extra => basis}/editors/scite/summary.txt (100%)
 rename {extra => basis}/editors/summary.txt (100%)
 rename {core/listener => basis/editors}/tags.txt (100%)
 rename {extra => basis}/editors/ted-notepad/authors.txt (100%)
 rename {extra => basis}/editors/ted-notepad/summary.txt (100%)
 rename {extra => basis}/editors/ted-notepad/ted-notepad.factor (100%)
 rename {extra => basis}/editors/textmate/authors.txt (100%)
 rename {extra => basis}/editors/textmate/summary.txt (100%)
 rename {extra => basis}/editors/textmate/textmate.factor (100%)
 rename {extra => basis}/editors/textwrangler/authors.txt (100%)
 rename {extra => basis}/editors/textwrangler/summary.txt (100%)
 rename {extra => basis}/editors/textwrangler/textwrangler.factor (100%)
 rename {extra => basis}/editors/ultraedit/authors.txt (100%)
 rename {extra => basis}/editors/ultraedit/summary.txt (100%)
 rename {extra => basis}/editors/ultraedit/ultraedit.factor (100%)
 rename {extra => basis}/editors/vim/authors.txt (100%)
 rename {extra => basis}/editors/vim/generate-syntax/generate-syntax.factor (100%)
 rename {extra => basis}/editors/vim/summary.txt (100%)
 rename {extra => basis}/editors/vim/vim-docs.factor (100%)
 rename {extra => basis}/editors/vim/vim.factor (100%)
 rename {extra => basis}/editors/wordpad/authors.txt (100%)
 rename {extra => basis}/editors/wordpad/summary.txt (100%)
 rename {extra => basis}/editors/wordpad/wordpad.factor (100%)
 create mode 100644 basis/eval/eval-docs.factor
 create mode 100644 basis/eval/eval.factor
 rename {core/prettyprint/sections => basis/float-arrays}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/float-arrays/float-arrays-docs.factor (100%)
 rename {extra => basis}/float-arrays/float-arrays-tests.factor (100%)
 rename {extra => basis}/float-arrays/float-arrays.factor (100%)
 rename {extra => basis}/float-arrays/summary.txt (100%)
 rename {extra/columns => basis/float-arrays}/tags.txt (100%)
 rename {extra => basis}/float-vectors/float-vectors-docs.factor (100%)
 rename {extra => basis}/float-vectors/float-vectors-tests.factor (100%)
 rename {extra => basis}/float-vectors/float-vectors.factor (100%)
 rename {extra => basis}/float-vectors/summary.txt (100%)
 rename {extra/disjoint-sets => basis/float-vectors}/tags.txt (100%)
 rename {core/refs => basis/freetype}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/freetype/freetype.factor (100%)
 rename {extra => basis}/freetype/summary.txt (100%)
 rename {extra => basis}/freetype/tags.txt (100%)
 rename {extra => basis}/fry/authors.txt (100%)
 rename {extra => basis}/fry/fry-docs.factor (100%)
 rename {extra => basis}/fry/fry-tests.factor (100%)
 rename {extra => basis}/fry/fry.factor (100%)
 rename {extra => basis}/fry/summary.txt (100%)
 rename {extra => basis}/fry/tags.txt (100%)
 rename {extra => basis}/generalizations/generalizations-docs.factor (100%)
 rename {extra => basis}/generalizations/generalizations-tests.factor (100%)
 rename {extra => basis}/generalizations/generalizations.factor (100%)
 rename {core/search-dequeues => basis/generator}/authors.txt (100%)
 rename {core/threads => basis/generator/fixup}/authors.txt (100%)
 rename {core => basis}/generator/fixup/fixup-docs.factor (100%)
 rename {core => basis}/generator/fixup/fixup.factor (100%)
 rename {core => basis}/generator/fixup/summary.txt (100%)
 rename {core => basis}/generator/generator-docs.factor (100%)
 rename {core => basis}/generator/generator.factor (100%)
 rename {extra/ascii => basis/generator/registers}/authors.txt (100%)
 mode change 100755 => 100644
 rename {core => basis}/generator/registers/registers.factor (100%)
 rename {core => basis}/generator/registers/summary.txt (100%)
 rename {core => basis}/generator/summary.txt (100%)
 rename {core => basis}/generator/tags.txt (100%)
 rename {extra/delegate => basis/hash2}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/hash2/hash2-docs.factor (100%)
 rename {extra => basis}/hash2/hash2-tests.factor (100%)
 rename {extra => basis}/hash2/hash2.factor (100%)
 rename {extra => basis}/hash2/summary.txt (100%)
 rename {extra/float-arrays => basis/hash2}/tags.txt (100%)
 rename {core => basis}/heaps/authors.txt (100%)
 rename {core => basis}/heaps/heaps-docs.factor (100%)
 rename {core => basis}/heaps/heaps-tests.factor (100%)
 rename {core => basis}/heaps/heaps.factor (100%)
 rename {core => basis}/heaps/summary.txt (100%)
 rename {extra/float-vectors => basis/heaps}/tags.txt (100%)
 rename {extra/biassocs => basis/help}/authors.txt (100%)
 rename {extra/bit-arrays => basis/help/cookbook}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/help/cookbook/cookbook.factor (100%)
 rename {extra/bootstrap/help => basis/help/crossref}/authors.txt (100%)
 rename {extra => basis}/help/crossref/crossref-docs.factor (100%)
 rename {extra => basis}/help/crossref/crossref-tests.factor (100%)
 rename {extra => basis}/help/crossref/crossref.factor (100%)
 rename {extra => basis}/help/crossref/summary.txt (100%)
 rename {extra/bootstrap/image/download => basis/help/definitions}/authors.txt (100%)
 rename {extra => basis}/help/definitions/definitions-tests.factor (100%)
 rename {extra => basis}/help/definitions/definitions.factor (100%)
 rename {extra => basis}/help/definitions/summary.txt (100%)
 rename {extra/bootstrap/image/upload => basis/help/handbook}/authors.txt (100%)
 rename {extra => basis}/help/handbook/handbook-tests.factor (100%)
 rename {extra => basis}/help/handbook/handbook.factor (100%)
 rename {extra => basis}/help/handbook/summary.txt (100%)
 rename {extra => basis}/help/help-docs.factor (100%)
 rename {extra => basis}/help/help-tests.factor (100%)
 rename {extra => basis}/help/help.factor (100%)
 rename {extra => basis}/help/html/html.factor (100%)
 rename {extra/bootstrap/io => basis/help/lint}/authors.txt (100%)
 rename {extra => basis}/help/lint/lint-docs.factor (100%)
 rename {extra => basis}/help/lint/lint.factor (99%)
 rename {extra => basis}/help/lint/summary.txt (100%)
 rename {extra/editors => basis/help/lint}/tags.txt (100%)
 rename {extra/bootstrap/tools => basis/help/markup}/authors.txt (100%)
 rename {extra => basis}/help/markup/markup-tests.factor (100%)
 rename {extra => basis}/help/markup/markup.factor (100%)
 rename {extra => basis}/help/markup/summary.txt (100%)
 rename {extra/cocoa/application => basis/help/stylesheet}/authors.txt (100%)
 rename {extra => basis}/help/stylesheet/stylesheet.factor (100%)
 rename {extra => basis}/help/stylesheet/summary.txt (100%)
 rename {extra => basis}/help/summary.txt (100%)
 rename {extra/cocoa => basis/help/syntax}/authors.txt (100%)
 rename {extra => basis}/help/syntax/summary.txt (100%)
 rename {extra => basis}/help/syntax/syntax-tests.factor (100%)
 rename {extra => basis}/help/syntax/syntax.factor (100%)
 rename {extra/cocoa/dialogs => basis/help/topics}/authors.txt (100%)
 rename {extra => basis}/help/topics/summary.txt (100%)
 rename {extra => basis}/help/topics/topics-docs.factor (100%)
 rename {extra => basis}/help/topics/topics-tests.factor (100%)
 rename {extra => basis}/help/topics/topics.factor (100%)
 rename {extra/cocoa/messages => basis/help/tutorial}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/help/tutorial/tutorial.factor (100%)
 rename {extra/cocoa/pasteboard => basis/hints}/authors.txt (100%)
 rename {extra => basis}/hints/hints.factor (100%)
 rename {extra => basis}/hints/summary.txt (100%)
 rename {extra => basis}/hints/tags.txt (100%)
 rename {extra/cocoa/plists => basis/inference}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra/cocoa/runtime => basis/inference/backend}/authors.txt (100%)
 rename {core => basis}/inference/backend/backend-docs.factor (100%)
 rename {core => basis}/inference/backend/backend.factor (100%)
 rename {core => basis}/inference/backend/summary.txt (100%)
 rename {extra/cocoa/subclassing => basis/inference/class}/authors.txt (100%)
 rename {core => basis}/inference/class/class-tests.factor (100%)
 rename {core => basis}/inference/class/class.factor (100%)
 rename {core => basis}/inference/class/summary.txt (100%)
 rename {extra/cocoa/types => basis/inference/dataflow}/authors.txt (100%)
 rename {core => basis}/inference/dataflow/dataflow-docs.factor (100%)
 rename {core => basis}/inference/dataflow/dataflow.factor (100%)
 rename {core => basis}/inference/dataflow/summary.txt (100%)
 rename {extra/cocoa/views => basis/inference/errors}/authors.txt (100%)
 rename {core => basis}/inference/errors/errors.factor (100%)
 rename {core => basis}/inference/errors/summary.txt (100%)
 rename {core => basis}/inference/inference-docs.factor (100%)
 rename {core => basis}/inference/inference-tests.factor (100%)
 rename {core => basis}/inference/inference.factor (100%)
 rename {extra/cocoa/windows => basis/inference/known-words}/authors.txt (100%)
 rename {core => basis}/inference/known-words/known-words.factor (100%)
 rename {core => basis}/inference/known-words/summary.txt (100%)
 rename {extra/concurrency/exchangers => basis/inference/state}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/inference/state/state-docs.factor (100%)
 rename {core => basis}/inference/state/state-tests.factor (100%)
 rename {core => basis}/inference/state/state.factor (100%)
 rename {core => basis}/inference/state/summary.txt (100%)
 rename {core => basis}/inference/summary.txt (100%)
 rename {core => basis}/inference/tags.txt (100%)
 rename {extra/concurrency/locks => basis/inference/transforms}/authors.txt (100%)
 rename {core => basis}/inference/transforms/summary.txt (100%)
 rename {core => basis}/inference/transforms/transforms-docs.factor (100%)
 rename {core => basis}/inference/transforms/transforms-tests.factor (100%)
 rename {core => basis}/inference/transforms/transforms.factor (100%)
 rename {extra/concurrency/semaphores => basis/inspector}/authors.txt (100%)
 rename {core => basis}/inspector/inspector-docs.factor (100%)
 rename {core => basis}/inspector/inspector-tests.factor (100%)
 rename {core => basis}/inspector/inspector.factor (100%)
 rename {core => basis}/inspector/summary.txt (100%)
 rename {core => basis}/inspector/tags.txt (100%)
 rename {extra => basis}/interval-maps/authors.txt (100%)
 rename {extra => basis}/interval-maps/interval-maps-docs.factor (100%)
 rename {extra => basis}/interval-maps/interval-maps-tests.factor (100%)
 rename {extra => basis}/interval-maps/interval-maps.factor (100%)
 rename {extra => basis}/interval-maps/summary.txt (100%)
 rename {extra => basis}/interval-maps/tags.txt (100%)
 rename {extra/core-foundation => basis/io/buffers}/authors.txt (100%)
 rename {extra => basis}/io/buffers/buffers-docs.factor (100%)
 rename {extra => basis}/io/buffers/buffers-tests.factor (100%)
 rename {extra => basis}/io/buffers/buffers.factor (100%)
 rename {extra => basis}/io/buffers/summary.txt (100%)
 rename {extra => basis}/io/encodings/8-bit/8-bit-docs.factor (100%)
 rename {extra => basis}/io/encodings/8-bit/8-bit-tests.factor (100%)
 rename {extra => basis}/io/encodings/8-bit/8-bit.factor (97%)
 rename {extra => basis}/io/encodings/8-bit/8859-1.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-10.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-11.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-13.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-14.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-15.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-16.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-2.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-3.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-4.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-5.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-6.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-7.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-8.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/8859-9.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/CP037.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/CP1252.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/KOI8-R.TXT (100%)
 rename {extra => basis}/io/encodings/8-bit/ROMAN.TXT (100%)
 rename {extra/delegate/protocols => basis/io/encodings/8-bit}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/io/encodings/8-bit/summary.txt (100%)
 rename {extra/ascii => basis/io/encodings/8-bit}/tags.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/io/encodings/ascii/ascii-docs.factor (100%)
 rename {extra => basis}/io/encodings/ascii/ascii-tests.factor (100%)
 rename {extra => basis}/io/encodings/ascii/ascii.factor (100%)
 rename {extra/hash2 => basis/io/encodings/ascii}/authors.txt (100%)
 rename {extra => basis}/io/encodings/ascii/summary.txt (100%)
 rename {extra/io/encodings/8-bit => basis/io/encodings/ascii}/tags.txt (100%)
 rename {extra/io/encodings/8-bit => basis/io/encodings/iana}/authors.txt (100%)
 rename {extra => basis}/io/encodings/iana/character-sets (100%)
 rename {extra => basis}/io/encodings/iana/iana-docs.factor (100%)
 rename {extra => basis}/io/encodings/iana/iana-tests.factor (100%)
 rename {extra => basis}/io/encodings/iana/iana.factor (96%)
 rename {extra => basis}/io/encodings/iana/summary.txt (100%)
 rename {extra/io/encodings/ascii => basis/io/encodings/strict}/authors.txt (100%)
 rename {extra => basis}/io/encodings/strict/strict-docs.factor (100%)
 rename {extra => basis}/io/encodings/strict/strict-tests.factor (100%)
 rename {extra => basis}/io/encodings/strict/strict.factor (100%)
 rename {extra => basis}/io/encodings/strict/summary.txt (100%)
 rename {extra/io/encodings/ascii => basis/io/encodings/strict}/tags.txt (100%)
 rename {extra/io/encodings/iana => basis/io/encodings/string}/authors.txt (100%)
 rename {core => basis}/io/encodings/string/string-docs.factor (100%)
 rename {core => basis}/io/encodings/string/string-tests.factor (100%)
 rename {core => basis}/io/encodings/string/string.factor (100%)
 rename {core => basis}/io/encodings/string/summary.txt (100%)
 rename {core => basis}/io/encodings/string/tags.factor (100%)
 rename {core => basis}/io/encodings/utf16/.utf16.factor.swo (100%)
 rename {extra/io/encodings/strict => basis/io/encodings/utf16}/authors.txt (100%)
 rename {core => basis}/io/encodings/utf16/summary.txt (100%)
 rename {extra/io/encodings/strict => basis/io/encodings/utf16}/tags.txt (100%)
 rename {core => basis}/io/encodings/utf16/utf16-docs.factor (100%)
 rename {core => basis}/io/encodings/utf16/utf16-tests.factor (100%)
 rename {core => basis}/io/encodings/utf16/utf16.factor (95%)
 rename {extra => basis}/io/files/unique/backend/backend.factor (100%)
 rename {extra => basis}/io/files/unique/unique-docs.factor (100%)
 rename {extra => basis}/io/files/unique/unique.factor (100%)
 rename {extra => basis}/io/launcher/authors.txt (100%)
 rename {extra => basis}/io/launcher/launcher-docs.factor (100%)
 rename {extra => basis}/io/launcher/launcher-tests.factor (100%)
 rename {extra => basis}/io/launcher/launcher.factor (100%)
 rename {extra => basis}/io/launcher/summary.txt (100%)
 rename {extra => basis}/io/mmap/authors.txt (100%)
 rename {extra => basis}/io/mmap/mmap-docs.factor (100%)
 rename {extra => basis}/io/mmap/mmap-tests.factor (100%)
 rename {extra => basis}/io/mmap/mmap.factor (100%)
 rename {extra => basis}/io/mmap/summary.txt (100%)
 rename {extra/documents => basis/io/monitors}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/monitors/monitors-docs.factor (100%)
 rename {extra => basis}/io/monitors/monitors-tests.factor (100%)
 rename {extra => basis}/io/monitors/monitors.factor (100%)
 rename {extra => basis}/io/monitors/recursive/recursive-tests.factor (100%)
 rename {extra => basis}/io/monitors/recursive/recursive.factor (100%)
 rename {extra => basis}/io/monitors/summary.txt (100%)
 rename {extra => basis}/io/paths/authors.txt (100%)
 rename {extra => basis}/io/paths/paths.factor (100%)
 rename {extra => basis}/io/pipes/pipes-docs.factor (100%)
 rename {extra => basis}/io/pipes/pipes-tests.factor (100%)
 rename {extra => basis}/io/pipes/pipes.factor (100%)
 rename {extra/editors => basis/io/pools}/authors.txt (100%)
 rename {extra => basis}/io/pools/pools-docs.factor (100%)
 rename {extra => basis}/io/pools/pools.factor (100%)
 rename {extra => basis}/io/pools/summary.txt (100%)
 rename {extra => basis}/io/pools/tags.txt (100%)
 rename {extra/editors/jedit => basis/io/ports}/authors.txt (100%)
 rename {extra => basis}/io/ports/ports-docs.factor (100%)
 rename {extra => basis}/io/ports/ports.factor (100%)
 rename {extra => basis}/io/ports/summary.txt (100%)
 rename {extra/float-arrays => basis/io/servers/connection}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/io/servers/connection/connection-docs.factor (100%)
 rename {extra => basis}/io/servers/connection/connection-tests.factor (100%)
 rename {extra => basis}/io/servers/connection/connection.factor (100%)
 rename {extra => basis}/io/servers/connection/summary.txt (100%)
 rename {extra => basis}/io/servers/connection/tags.txt (100%)
 rename {extra/freetype => basis/io/servers/packet}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/servers/packet/datagram.factor (100%)
 rename {extra => basis}/io/servers/packet/summary.txt (100%)
 rename {extra => basis}/io/servers/packet/tags.txt (100%)
 rename {extra => basis}/io/sockets/authors.txt (100%)
 rename {extra/help => basis/io/sockets/secure}/authors.txt (100%)
 rename {extra => basis}/io/sockets/secure/secure-docs.factor (100%)
 rename {extra => basis}/io/sockets/secure/secure-tests.factor (69%)
 rename {extra => basis}/io/sockets/secure/secure.factor (97%)
 rename {extra => basis}/io/sockets/secure/summary.txt (100%)
 rename {extra => basis}/io/sockets/secure/tags.txt (100%)
 rename {extra => basis}/io/sockets/sockets-docs.factor (100%)
 rename {extra => basis}/io/sockets/sockets-tests.factor (100%)
 rename {extra => basis}/io/sockets/sockets.factor (100%)
 rename {extra => basis}/io/sockets/summary.txt (100%)
 rename {extra => basis}/io/sockets/tags.txt (100%)
 rename {extra/help/cookbook => basis/io/streams/duplex}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/io/streams/duplex/duplex-docs.factor (100%)
 rename {extra => basis}/io/streams/duplex/duplex-tests.factor (100%)
 rename {extra => basis}/io/streams/duplex/duplex.factor (100%)
 rename {extra => basis}/io/streams/duplex/summary.txt (100%)
 rename {extra => basis}/io/streams/limited/limited-tests.factor (100%)
 rename {extra => basis}/io/streams/limited/limited.factor (100%)
 rename {core => basis}/io/streams/memory/memory.factor (100%)
 rename {extra/help/crossref => basis/io/streams/null}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/streams/null/null.factor (100%)
 rename {extra => basis}/io/timeouts/summary.txt (100%)
 rename {extra => basis}/io/timeouts/timeouts-docs.factor (100%)
 rename {extra => basis}/io/timeouts/timeouts.factor (100%)
 rename {extra/help/definitions => basis/io/unix}/authors.txt (100%)
 rename {extra/help/handbook => basis/io/unix/backend}/authors.txt (100%)
 rename {extra => basis}/io/unix/backend/backend.factor (100%)
 rename {extra => basis}/io/unix/backend/summary.txt (100%)
 rename {extra/help/lint => basis/io/unix/bsd}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/unix/bsd/bsd.factor (100%)
 rename {extra/help/markup => basis/io/unix/epoll}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/unix/epoll/epoll.factor (100%)
 rename {extra/help/stylesheet => basis/io/unix/files}/authors.txt (100%)
 rename {extra => basis}/io/unix/files/files-tests.factor (100%)
 rename {extra => basis}/io/unix/files/files.factor (100%)
 rename {extra => basis}/io/unix/files/summary.txt (100%)
 rename {extra => basis}/io/unix/files/unique/unique.factor (100%)
 rename {extra => basis}/io/unix/freebsd/freebsd.factor (100%)
 rename {extra/help/syntax => basis/io/unix/kqueue}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/unix/kqueue/kqueue.factor (100%)
 rename {extra/help/topics => basis/io/unix/launcher}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/unix/launcher/launcher-tests.factor (100%)
 rename {extra => basis}/io/unix/launcher/launcher.factor (100%)
 rename {extra => basis}/io/unix/launcher/parser/parser-tests.factor (100%)
 rename {extra => basis}/io/unix/launcher/parser/parser.factor (100%)
 rename {extra/help/tutorial => basis/io/unix/linux}/authors.txt (100%)
 rename {extra => basis}/io/unix/linux/linux.factor (100%)
 rename {extra => basis}/io/unix/linux/monitors/monitors-tests.factor (100%)
 rename {extra => basis}/io/unix/linux/monitors/monitors.factor (100%)
 rename {extra => basis}/io/unix/macosx/macosx.factor (100%)
 rename {extra => basis}/io/unix/macosx/monitors/monitors.factor (100%)
 rename {extra/hints => basis/io/unix/mmap}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/unix/mmap/mmap.factor (100%)
 rename {extra => basis}/io/unix/netbsd/netbsd.factor (100%)
 rename {extra => basis}/io/unix/openbsd/openbsd.factor (100%)
 rename {extra => basis}/io/unix/pipes/pipes-tests.factor (100%)
 rename {extra => basis}/io/unix/pipes/pipes.factor (100%)
 rename {extra/io/buffers => basis/io/unix/select}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/unix/select/select.factor (100%)
 rename {extra/io/monitors => basis/io/unix/sockets}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/io/unix/sockets/secure/secure-tests.factor (97%)
 rename {extra => basis}/io/unix/sockets/secure/secure.factor (100%)
 rename {extra => basis}/io/unix/sockets/sockets.factor (100%)
 rename {extra => basis}/io/unix/sockets/summary.txt (100%)
 rename {extra => basis}/io/unix/summary.txt (100%)
 rename {extra => basis}/io/unix/unix-tests.factor (100%)
 rename {extra => basis}/io/unix/unix.factor (100%)
 rename {extra => basis}/io/windows/authors.txt (100%)
 rename {extra/io/sockets/headers => basis/io/windows/ce}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/io/windows/ce/backend/authors.txt (100%)
 rename {extra => basis}/io/windows/ce/backend/backend.factor (100%)
 rename {extra => basis}/io/windows/ce/ce.factor (100%)
 rename {extra => basis}/io/windows/ce/files/authors.txt (100%)
 rename {extra => basis}/io/windows/ce/files/files.factor (100%)
 rename {extra => basis}/io/windows/ce/privileges/privileges.factor (100%)
 rename {extra => basis}/io/windows/ce/sockets/authors.txt (100%)
 rename {extra => basis}/io/windows/ce/sockets/sockets.factor (100%)
 rename {extra => basis}/io/windows/ce/summary.txt (100%)
 rename {extra => basis}/io/windows/files/files.factor (100%)
 rename {extra => basis}/io/windows/files/unique/unique.factor (100%)
 rename {extra => basis}/io/windows/launcher/authors.txt (100%)
 rename {extra => basis}/io/windows/launcher/launcher-tests.factor (100%)
 rename {extra => basis}/io/windows/launcher/launcher.factor (100%)
 rename {extra/io/sockets/headers/bsd => basis/io/windows/mmap}/authors.txt (100%)
 rename {extra => basis}/io/windows/mmap/mmap-tests.factor (100%)
 rename {extra => basis}/io/windows/mmap/mmap.factor (100%)
 rename {extra => basis}/io/windows/nt/authors.txt (100%)
 rename {extra => basis}/io/windows/nt/backend/authors.txt (100%)
 rename {extra => basis}/io/windows/nt/backend/backend.factor (100%)
 rename {extra => basis}/io/windows/nt/files/authors.txt (100%)
 rename {extra => basis}/io/windows/nt/files/files-tests.factor (100%)
 rename {extra => basis}/io/windows/nt/files/files.factor (100%)
 rename {extra => basis}/io/windows/nt/launcher/authors.txt (100%)
 rename {extra => basis}/io/windows/nt/launcher/launcher-tests.factor (85%)
 rename {extra => basis}/io/windows/nt/launcher/launcher.factor (100%)
 rename {extra => basis}/io/windows/nt/launcher/test/append.factor (100%)
 rename {extra => basis}/io/windows/nt/launcher/test/env.factor (100%)
 rename {extra => basis}/io/windows/nt/launcher/test/stderr.factor (100%)
 rename {extra/io/windows/ce => basis/io/windows/nt/monitors}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/windows/nt/monitors/monitors-tests.factor (100%)
 rename {extra => basis}/io/windows/nt/monitors/monitors.factor (100%)
 rename {extra => basis}/io/windows/nt/nt.factor (100%)
 rename {extra/io/pools => basis/io/windows/nt/pipes}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra => basis}/io/windows/nt/pipes/pipes.factor (100%)
 rename {extra => basis}/io/windows/nt/privileges/privileges.factor (100%)
 rename {extra => basis}/io/windows/nt/sockets/authors.txt (100%)
 rename {extra => basis}/io/windows/nt/sockets/sockets.factor (100%)
 rename {extra => basis}/io/windows/nt/summary.txt (100%)
 rename {extra => basis}/io/windows/privileges/privileges.factor (100%)
 rename {extra => basis}/io/windows/sockets/sockets.factor (100%)
 rename {extra => basis}/io/windows/summary.txt (100%)
 rename {extra => basis}/io/windows/tags.txt (100%)
 rename {extra => basis}/io/windows/windows.factor (100%)
 rename {extra => basis}/lcs/authors.txt (100%)
 rename {extra => basis}/lcs/diff2html/diff2html.factor (100%)
 rename {extra => basis}/lcs/lcs-docs.factor (100%)
 rename {extra => basis}/lcs/lcs-tests.factor (100%)
 rename {extra => basis}/lcs/lcs.factor (100%)
 rename {extra => basis}/lcs/summary.txt (100%)
 rename {extra => basis}/lcs/tags.txt (100%)
 rename {extra/io/ports => basis/listener}/authors.txt (100%)
 rename {core => basis}/listener/listener-docs.factor (100%)
 rename {core => basis}/listener/listener-tests.factor (100%)
 rename {core => basis}/listener/listener.factor (100%)
 rename {core => basis}/listener/summary.txt (100%)
 rename {extra/help/lint => basis/listener}/tags.txt (100%)
 rename {extra/io/servers/connection => basis/locals}/authors.txt (100%)
 rename {extra => basis}/locals/backend/backend-tests.factor (100%)
 rename {extra => basis}/locals/backend/backend.factor (100%)
 rename {extra => basis}/locals/locals-docs.factor (100%)
 rename {extra => basis}/locals/locals-tests.factor (100%)
 rename {extra => basis}/locals/locals.factor (100%)
 rename {extra => basis}/locals/summary.txt (100%)
 rename {extra => basis}/locals/tags.txt (100%)
 rename {extra => basis}/logging/analysis/analysis-docs.factor (100%)
 rename {extra => basis}/logging/analysis/analysis.factor (100%)
 rename {extra => basis}/logging/analysis/authors.txt (100%)
 rename {extra => basis}/logging/analysis/summary.txt (100%)
 rename {extra => basis}/logging/analysis/tags.txt (100%)
 rename {extra => basis}/logging/authors.txt (100%)
 rename {extra => basis}/logging/insomniac/authors.txt (100%)
 rename {extra => basis}/logging/insomniac/insomniac-docs.factor (100%)
 rename {extra => basis}/logging/insomniac/insomniac.factor (100%)
 rename {extra => basis}/logging/insomniac/summary.txt (100%)
 rename {extra => basis}/logging/insomniac/tags.txt (100%)
 rename {extra => basis}/logging/logging-docs.factor (100%)
 rename {extra => basis}/logging/logging-tests.factor (100%)
 rename {extra => basis}/logging/logging.factor (100%)
 rename {extra => basis}/logging/parser/authors.txt (100%)
 rename {extra => basis}/logging/parser/parser-docs.factor (100%)
 rename {extra => basis}/logging/parser/parser.factor (100%)
 rename {extra => basis}/logging/parser/summary.txt (100%)
 rename {extra => basis}/logging/parser/tags.txt (100%)
 rename {extra => basis}/logging/server/authors.txt (100%)
 rename {extra => basis}/logging/server/server-docs.factor (100%)
 rename {extra => basis}/logging/server/server.factor (100%)
 rename {extra => basis}/logging/server/summary.txt (100%)
 rename {extra => basis}/logging/server/tags.txt (100%)
 rename {extra => basis}/logging/summary.txt (100%)
 rename {extra => basis}/logging/tags.txt (100%)
 rename {extra/io/servers/packet => basis/macros}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/macros/macros-docs.factor (100%)
 rename {extra => basis}/macros/macros-tests.factor (100%)
 rename {extra => basis}/macros/macros.factor (100%)
 rename {extra => basis}/macros/summary.txt (100%)
 rename {extra => basis}/macros/tags.txt (100%)
 rename {extra/io/sockets/secure => basis/math/bitfields}/authors.txt (100%)
 rename {core => basis}/math/bitfields/bitfields-docs.factor (100%)
 rename {core => basis}/math/bitfields/bitfields-tests.factor (100%)
 rename {core => basis}/math/bitfields/bitfields.factor (100%)
 rename {core => basis}/math/bitfields/summary.txt (100%)
 rename {extra/io/streams/duplex => basis/math/complex}/authors.txt (100%)
 rename {extra => basis}/math/complex/complex-docs.factor (100%)
 rename {extra => basis}/math/complex/complex-tests.factor (100%)
 rename {extra => basis}/math/complex/complex.factor (100%)
 rename {extra => basis}/math/complex/summary.txt (100%)
 rename {extra/io/streams/null => basis/math/constants}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/math/constants/constants-docs.factor (100%)
 rename {extra => basis}/math/constants/constants.factor (100%)
 rename {extra => basis}/math/constants/summary.txt (100%)
 rename {extra/io/unix => basis/math/functions}/authors.txt (100%)
 rename {extra => basis}/math/functions/functions-docs.factor (100%)
 rename {extra => basis}/math/functions/functions-tests.factor (100%)
 rename {extra => basis}/math/functions/functions.factor (100%)
 rename {extra => basis}/math/functions/summary.txt (100%)
 rename {extra/io/unix/backend => basis/math/intervals}/authors.txt (100%)
 rename {core => basis}/math/intervals/intervals-docs.factor (100%)
 rename {core => basis}/math/intervals/intervals-tests.factor (100%)
 rename {core => basis}/math/intervals/intervals.factor (100%)
 rename {core => basis}/math/intervals/summary.txt (100%)
 rename {extra/io/unix/bsd => basis/math/libm}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/math/libm/libm-docs.factor (100%)
 rename {extra => basis}/math/libm/libm.factor (100%)
 rename {extra => basis}/math/libm/summary.txt (100%)
 rename {extra => basis}/math/libm/tags.txt (100%)
 rename {extra => basis}/math/ranges/authors.txt (100%)
 rename {extra => basis}/math/ranges/ranges-docs.factor (100%)
 rename {extra => basis}/math/ranges/ranges-tests.factor (100%)
 rename {extra => basis}/math/ranges/ranges.factor (100%)
 rename {extra => basis}/math/ranges/summary.txt (100%)
 rename {extra/io/unix/epoll => basis/math/ratios}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/math/ratios/ratios-docs.factor (100%)
 rename {extra => basis}/math/ratios/ratios-tests.factor (100%)
 rename {extra => basis}/math/ratios/ratios.factor (100%)
 rename {extra => basis}/math/ratios/summary.txt (100%)
 rename {extra/io/unix/files => basis/math/vectors}/authors.txt (100%)
 rename {extra => basis}/math/vectors/summary.txt (100%)
 rename {extra => basis}/math/vectors/vectors-docs.factor (100%)
 rename {extra => basis}/math/vectors/vectors-tests.factor (100%)
 rename {extra => basis}/math/vectors/vectors.factor (100%)
 rename {extra => basis}/memoize/authors.txt (100%)
 rename {extra => basis}/memoize/memoize-docs.factor (100%)
 rename {extra => basis}/memoize/memoize-tests.factor (100%)
 rename {extra => basis}/memoize/memoize.factor (100%)
 rename {extra => basis}/memoize/summary.txt (100%)
 rename {extra => basis}/memoize/tags.txt (100%)
 rename {extra/io/unix/kqueue => basis/mime-types}/authors.txt (100%)
 rename {extra => basis}/mime-types/mime-types-tests.factor (100%)
 rename {extra => basis}/mime-types/mime-types.factor (92%)
 rename {extra => basis}/mime-types/mime.types (100%)
 rename {extra/io/unix/launcher => basis/mirrors}/authors.txt (100%)
 mode change 100755 => 100644
 rename {core => basis}/mirrors/mirrors-docs.factor (100%)
 rename {core => basis}/mirrors/mirrors-tests.factor (100%)
 rename {core => basis}/mirrors/mirrors.factor (100%)
 rename {core => basis}/mirrors/summary.txt (100%)
 rename {core => basis}/mirrors/tags.txt (100%)
 rename {extra/io/unix/linux => basis/models}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/models/compose/compose-docs.factor (100%)
 rename {extra => basis}/models/compose/compose-tests.factor (100%)
 rename {extra => basis}/models/compose/compose.factor (100%)
 rename {extra => basis}/models/delay/delay-docs.factor (100%)
 rename {extra => basis}/models/delay/delay.factor (100%)
 rename {extra => basis}/models/filter/filter-docs.factor (100%)
 rename {extra => basis}/models/filter/filter-tests.factor (100%)
 rename {extra => basis}/models/filter/filter.factor (100%)
 rename {extra => basis}/models/history/history-docs.factor (100%)
 rename {extra => basis}/models/history/history-tests.factor (100%)
 rename {extra => basis}/models/history/history.factor (100%)
 rename {extra => basis}/models/mapping/mapping-tests.factor (100%)
 rename {extra => basis}/models/mapping/mapping.factor (100%)
 rename {extra => basis}/models/models-docs.factor (100%)
 rename {extra => basis}/models/models-tests.factor (100%)
 rename {extra => basis}/models/models.factor (100%)
 rename {extra => basis}/models/range/range-docs.factor (100%)
 rename {extra => basis}/models/range/range-tests.factor (100%)
 rename {extra => basis}/models/range/range.factor (100%)
 rename {extra => basis}/models/summary.txt (100%)
 rename {extra => basis}/models/tags.txt (100%)
 rename {extra => basis}/multiline/authors.txt (100%)
 rename {extra => basis}/multiline/multiline-docs.factor (100%)
 rename {extra => basis}/multiline/multiline-tests.factor (100%)
 rename {extra => basis}/multiline/multiline.factor (100%)
 rename {extra => basis}/multiline/summary.txt (100%)
 rename {extra => basis}/multiline/tags.txt (100%)
 rename {extra/io/unix/mmap => basis/none}/authors.txt (100%)
 mode change 100755 => 100644
 rename {core => basis}/none/deploy.factor (100%)
 rename {core => basis}/none/none-docs.factor (100%)
 rename {core => basis}/none/none.factor (100%)
 rename {core => basis}/none/summary.txt (100%)
 rename {extra => basis}/openssl/authors.txt (100%)
 rename {extra => basis}/openssl/cacert.pem (100%)
 rename {extra => basis}/openssl/libcrypto/libcrypto.factor (100%)
 rename {extra => basis}/openssl/libssl/libssl.factor (100%)
 rename {extra => basis}/openssl/openssl-tests.factor (56%)
 rename {extra => basis}/openssl/openssl.factor (100%)
 rename {extra => basis}/openssl/summary.txt (100%)
 rename {extra => basis}/openssl/tags.txt (100%)
 rename {extra => basis}/openssl/test/dh1024.pem (100%)
 rename {extra => basis}/openssl/test/errors.txt (100%)
 rename {extra => basis}/openssl/test/root.pem (100%)
 rename {extra => basis}/openssl/test/server.pem (100%)
 rename {core => basis}/optimizer/allot/allot.factor (100%)
 rename {extra/io/unix/select => basis/optimizer}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra/io/unix/sockets => basis/optimizer/backend}/authors.txt (100%)
 rename {core => basis}/optimizer/backend/backend.factor (100%)
 rename {core => basis}/optimizer/backend/summary.txt (100%)
 rename {core => basis}/optimizer/collect/collect.factor (100%)
 rename {core => basis}/optimizer/control/control-tests.factor (100%)
 rename {core => basis}/optimizer/control/control.factor (100%)
 rename {extra/io/windows/nt/pipes => basis/optimizer/def-use}/authors.txt (100%)
 mode change 100755 => 100644
 rename {core => basis}/optimizer/def-use/def-use-tests.factor (100%)
 rename {core => basis}/optimizer/def-use/def-use.factor (100%)
 rename {core => basis}/optimizer/def-use/summary.txt (100%)
 rename {core => basis}/optimizer/inlining/inlining-tests.factor (100%)
 rename {core => basis}/optimizer/inlining/inlining.factor (100%)
 rename {extra/locals => basis/optimizer/known-words}/authors.txt (100%)
 rename {core => basis}/optimizer/known-words/known-words.factor (100%)
 rename {core => basis}/optimizer/known-words/summary.txt (100%)
 rename {extra/macros => basis/optimizer/math}/authors.txt (100%)
 rename {core => basis}/optimizer/math/math.factor (100%)
 rename {core => basis}/optimizer/math/partial/partial-tests.factor (100%)
 rename {core => basis}/optimizer/math/partial/partial.factor (100%)
 rename {core => basis}/optimizer/math/summary.txt (100%)
 rename {core => basis}/optimizer/optimizer-docs.factor (100%)
 rename {core => basis}/optimizer/optimizer-tests.factor (100%)
 rename {core => basis}/optimizer/optimizer.factor (100%)
 rename {extra/math/complex => basis/optimizer/pattern-match}/authors.txt (100%)
 rename {core => basis}/optimizer/pattern-match/pattern-match.factor (100%)
 rename {core => basis}/optimizer/pattern-match/summary.txt (100%)
 rename {core => basis}/optimizer/specializers/specializers-docs.factor (100%)
 rename {core => basis}/optimizer/specializers/specializers.factor (100%)
 rename {core => basis}/optimizer/summary.txt (100%)
 rename {core => basis}/optimizer/tags.txt (100%)
 rename {extra => basis}/present/present.factor (100%)
 rename {extra/math/constants => basis/prettyprint}/authors.txt (100%)
 rename {extra/math/functions => basis/prettyprint/backend}/authors.txt (100%)
 rename {core => basis}/prettyprint/backend/backend-docs.factor (100%)
 rename {core => basis}/prettyprint/backend/backend.factor (100%)
 rename {core => basis}/prettyprint/backend/summary.txt (100%)
 rename {extra/math/libm => basis/prettyprint/config}/authors.txt (100%)
 rename {core => basis}/prettyprint/config/config-docs.factor (100%)
 rename {core => basis}/prettyprint/config/config.factor (100%)
 rename {core => basis}/prettyprint/config/summary.txt (100%)
 rename {core => basis}/prettyprint/prettyprint-docs.factor (100%)
 rename {core => basis}/prettyprint/prettyprint-tests.factor (100%)
 rename {core => basis}/prettyprint/prettyprint.factor (100%)
 rename {extra/math/ratios => basis/prettyprint/sections}/authors.txt (100%)
 rename {core => basis}/prettyprint/sections/sections-docs.factor (100%)
 rename {core => basis}/prettyprint/sections/sections.factor (100%)
 rename {core => basis}/prettyprint/sections/summary.txt (100%)
 rename {core => basis}/prettyprint/summary.txt (100%)
 rename {core => basis}/prettyprint/tags.txt (100%)
 rename {extra => basis}/promises/authors.txt (100%)
 rename {extra => basis}/promises/promises-docs.factor (100%)
 rename {extra => basis}/promises/promises.factor (100%)
 rename {extra => basis}/promises/summary.txt (100%)
 rename {extra => basis}/promises/tags.txt (100%)
 rename {extra => basis}/qualified/authors.txt (100%)
 rename {extra => basis}/qualified/qualified-docs.factor (100%)
 rename {extra => basis}/qualified/qualified-tests.factor (100%)
 rename {extra => basis}/qualified/qualified.factor (100%)
 rename {extra => basis}/qualified/summary.txt (100%)
 rename {extra => basis}/qualified/tags.txt (100%)
 rename {extra => basis}/random/blum-blum-shub/blum-blum-shub-tests.factor (100%)
 rename {extra => basis}/random/blum-blum-shub/blum-blum-shub.factor (100%)
 rename {extra => basis}/random/dummy/dummy.factor (100%)
 rename {extra/io/windows/mmap => basis/random/mersenne-twister}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/random/mersenne-twister/mersenne-twister-docs.factor.bak (100%)
 rename {extra => basis}/random/mersenne-twister/mersenne-twister-tests.factor (100%)
 rename {extra => basis}/random/mersenne-twister/mersenne-twister.factor (100%)
 rename {extra => basis}/random/mersenne-twister/summary.txt (100%)
 rename {extra => basis}/random/random-docs.factor (100%)
 rename {extra => basis}/random/random-tests.factor (100%)
 rename {extra => basis}/random/random.factor (100%)
 rename {extra => basis}/random/unix/unix.factor (100%)
 rename {extra => basis}/random/windows/tags.txt (100%)
 rename {extra => basis}/random/windows/windows.factor (100%)
 rename {extra/math/vectors => basis/refs}/authors.txt (100%)
 mode change 100644 => 100755
 rename {core => basis}/refs/refs-docs.factor (100%)
 rename {core => basis}/refs/refs-tests.factor (100%)
 rename {core => basis}/refs/refs.factor (100%)
 rename {core => basis}/refs/summary.txt (100%)
 rename {extra/mime-types => basis/search-dequeues}/authors.txt (100%)
 mode change 100755 => 100644
 rename {core => basis}/search-dequeues/search-dequeues-docs.factor (100%)
 rename {core => basis}/search-dequeues/search-dequeues-tests.factor (100%)
 rename {core => basis}/search-dequeues/search-dequeues.factor (100%)
 rename {core => basis}/search-dequeues/summary.txt (100%)
 rename {extra/hash2 => basis/search-dequeues}/tags.txt (100%)
 rename {extra => basis}/sequences/deep/authors.txt (100%)
 rename {extra => basis}/sequences/deep/deep-docs.factor (100%)
 rename {extra => basis}/sequences/deep/deep-tests.factor (100%)
 rename {extra => basis}/sequences/deep/deep.factor (100%)
 rename {extra => basis}/sequences/deep/summary.txt (100%)
 rename {extra => basis}/sequences/deep/tags.txt (100%)
 rename {extra => basis}/sequences/next/authors.txt (100%)
 rename {extra => basis}/sequences/next/next-tests.factor (100%)
 rename {extra => basis}/sequences/next/next.factor (100%)
 rename {extra => basis}/sequences/next/summary.txt (100%)
 rename {extra => basis}/sequences/next/tags.txt (100%)
 rename {extra => basis}/serialize/authors.txt (100%)
 rename {extra => basis}/serialize/serialize-docs.factor (100%)
 rename {extra => basis}/serialize/serialize-tests.factor (100%)
 rename {extra => basis}/serialize/serialize.factor (100%)
 rename {extra => basis}/serialize/summary.txt (100%)
 rename {extra => basis}/shuffle/authors.txt (100%)
 rename {extra => basis}/shuffle/shuffle-tests.factor (100%)
 rename {extra => basis}/shuffle/shuffle.factor (100%)
 rename {extra => basis}/shuffle/summary.txt (100%)
 rename {extra => basis}/shuffle/tags.txt (100%)
 rename {extra => basis}/smtp/authors.txt (100%)
 rename {extra => basis}/smtp/server/server.factor (100%)
 rename {extra => basis}/smtp/smtp-tests.factor (100%)
 rename {extra => basis}/smtp/smtp.factor (100%)
 rename {extra => basis}/smtp/summary.txt (100%)
 rename {extra => basis}/smtp/tags.txt (100%)
 rename {extra => basis}/sorting/insertion/authors.txt (100%)
 rename {extra => basis}/sorting/insertion/insertion-tests.factor (100%)
 rename {extra => basis}/sorting/insertion/insertion.factor (100%)
 rename {extra => basis}/sorting/insertion/summary.txt (100%)
 rename {extra => basis}/sorting/insertion/tags.txt (100%)
 rename {extra => basis}/state-parser/authors.txt (100%)
 rename {extra => basis}/state-parser/state-parser-docs.factor (100%)
 rename {extra => basis}/state-parser/state-parser-tests.factor (100%)
 rename {extra => basis}/state-parser/state-parser.factor (100%)
 rename {extra => basis}/state-parser/summary.txt (100%)
 rename {extra/io/windows/nt/monitors => basis/structs}/authors.txt (100%)
 rename {extra => basis}/structs/structs.factor (100%)
 rename {extra => basis}/structs/summary.txt (100%)
 rename {core => basis}/summary/summary-docs.factor (100%)
 rename {core => basis}/summary/summary.factor (95%)
 rename {extra => basis}/symbols/authors.txt (100%)
 rename {extra => basis}/symbols/symbols-docs.factor (100%)
 rename {extra => basis}/symbols/symbols-tests.factor (100%)
 rename {extra => basis}/symbols/symbols.factor (100%)
 rename {extra/models => basis/threads}/authors.txt (100%)
 rename {core => basis}/threads/summary.txt (100%)
 rename {core => basis}/threads/threads-docs.factor (100%)
 rename {core => basis}/threads/threads-tests.factor (100%)
 rename {core => basis}/threads/threads.factor (100%)
 rename {extra => basis}/tools/annotations/annotations-docs.factor (100%)
 rename {extra => basis}/tools/annotations/annotations-tests.factor (100%)
 rename {extra => basis}/tools/annotations/annotations.factor (100%)
 rename {extra => basis}/tools/annotations/authors.txt (100%)
 rename {extra => basis}/tools/annotations/summary.txt (100%)
 rename {extra => basis}/tools/annotations/tags.txt (100%)
 rename {extra => basis}/tools/completion/authors.txt (100%)
 rename {extra => basis}/tools/completion/completion-docs.factor (100%)
 rename {extra => basis}/tools/completion/completion.factor (100%)
 rename {extra => basis}/tools/completion/summary.txt (100%)
 rename {extra => basis}/tools/crossref/authors.txt (100%)
 rename {extra => basis}/tools/crossref/crossref-docs.factor (100%)
 rename {extra => basis}/tools/crossref/crossref-tests.factor (83%)
 rename {extra => basis}/tools/crossref/crossref.factor (100%)
 rename {extra => basis}/tools/crossref/summary.txt (100%)
 rename {extra => basis}/tools/crossref/tags.txt (100%)
 rename {extra => basis}/tools/crossref/test/foo.factor (100%)
 rename {extra => basis}/tools/deploy/authors.txt (100%)
 rename {extra => basis}/tools/deploy/backend/authors.txt (100%)
 rename {extra => basis}/tools/deploy/backend/backend.factor (100%)
 rename {extra => basis}/tools/deploy/config/authors.txt (100%)
 rename {extra => basis}/tools/deploy/config/config-docs.factor (100%)
 rename {extra => basis}/tools/deploy/config/config.factor (100%)
 rename {extra => basis}/tools/deploy/deploy-docs.factor (100%)
 rename {extra => basis}/tools/deploy/deploy-tests.factor (93%)
 rename {extra => basis}/tools/deploy/deploy.factor (100%)
 rename {extra => basis}/tools/deploy/macosx/authors.txt (100%)
 rename {extra => basis}/tools/deploy/macosx/macosx.factor (100%)
 rename {extra => basis}/tools/deploy/macosx/summary.txt (100%)
 rename {extra => basis}/tools/deploy/macosx/tags.txt (100%)
 rename {extra => basis}/tools/deploy/restage/restage.factor (100%)
 rename {extra => basis}/tools/deploy/shaker/authors.txt (100%)
 rename {extra => basis}/tools/deploy/shaker/shaker.factor (97%)
 rename {extra => basis}/tools/deploy/shaker/strip-cocoa.factor (100%)
 rename {extra => basis}/tools/deploy/shaker/strip-debugger.factor (100%)
 rename {extra => basis}/tools/deploy/shaker/strip-libc.factor (100%)
 rename {extra => basis}/tools/deploy/summary.txt (100%)
 rename {extra => basis}/tools/deploy/tags.txt (100%)
 rename {extra => basis}/tools/deploy/test/1/1.factor (100%)
 rename {extra => basis}/tools/deploy/test/1/deploy.factor (100%)
 rename {extra => basis}/tools/deploy/test/2/2.factor (100%)
 rename {extra => basis}/tools/deploy/test/2/deploy.factor (100%)
 rename {extra => basis}/tools/deploy/test/3/3.factor (100%)
 rename {extra => basis}/tools/deploy/test/3/deploy.factor (100%)
 rename {extra => basis}/tools/deploy/test/4/4.factor (100%)
 rename {extra => basis}/tools/deploy/test/4/deploy.factor (100%)
 rename {extra => basis}/tools/deploy/test/5/5.factor (100%)
 rename {extra => basis}/tools/deploy/test/5/deploy.factor (100%)
 rename {extra => basis}/tools/deploy/unix/authors.txt (100%)
 rename {extra => basis}/tools/deploy/unix/summary.txt (100%)
 rename {extra => basis}/tools/deploy/unix/tags.txt (100%)
 rename {extra => basis}/tools/deploy/unix/unix.factor (100%)
 rename {extra => basis}/tools/deploy/windows/authors.txt (100%)
 rename {extra => basis}/tools/deploy/windows/summary.txt (100%)
 rename {extra => basis}/tools/deploy/windows/tags.txt (100%)
 rename {extra => basis}/tools/deploy/windows/windows-tests.factor (100%)
 rename {extra => basis}/tools/deploy/windows/windows.factor (100%)
 rename {extra => basis}/tools/disassembler/authors.txt (100%)
 rename {extra => basis}/tools/disassembler/disassembler-docs.factor (100%)
 rename {extra => basis}/tools/disassembler/disassembler-tests.factor (100%)
 rename {extra => basis}/tools/disassembler/disassembler.factor (100%)
 rename {extra => basis}/tools/disassembler/summary.txt (100%)
 rename {extra => basis}/tools/memory/authors.txt (100%)
 rename {extra => basis}/tools/memory/memory-docs.factor (100%)
 rename {extra => basis}/tools/memory/memory-tests.factor (100%)
 rename {extra => basis}/tools/memory/memory.factor (100%)
 rename {extra => basis}/tools/memory/summary.txt (100%)
 rename {extra => basis}/tools/memory/tags.txt (100%)
 rename {extra => basis}/tools/profiler/authors.txt (100%)
 rename {extra => basis}/tools/profiler/profiler-docs.factor (100%)
 rename {extra => basis}/tools/profiler/profiler-tests.factor (100%)
 rename {extra => basis}/tools/profiler/profiler.factor (100%)
 rename {extra => basis}/tools/profiler/summary.txt (100%)
 rename {extra => basis}/tools/profiler/tags.txt (100%)
 rename {extra => basis}/tools/summary.txt (100%)
 rename {extra => basis}/tools/test/authors.txt (100%)
 rename {extra => basis}/tools/test/summary.txt (100%)
 rename {extra => basis}/tools/test/tags.txt (100%)
 rename {extra => basis}/tools/test/test-docs.factor (100%)
 rename {extra => basis}/tools/test/test.factor (100%)
 rename {extra => basis}/tools/test/tools.factor (100%)
 rename {extra => basis}/tools/test/ui/authors.txt (100%)
 rename {extra => basis}/tools/test/ui/ui.factor (100%)
 rename {extra => basis}/tools/threads/threads-docs.factor (100%)
 rename {extra => basis}/tools/threads/threads.factor (100%)
 rename {extra => basis}/tools/time/authors.txt (100%)
 rename {extra => basis}/tools/time/summary.txt (100%)
 rename {extra => basis}/tools/time/tags.txt (100%)
 rename {extra => basis}/tools/time/time-docs.factor (100%)
 rename {extra => basis}/tools/time/time.factor (100%)
 rename {extra => basis}/tools/vocabs/browser/authors.txt (100%)
 rename {extra => basis}/tools/vocabs/browser/browser-docs.factor (100%)
 rename {extra => basis}/tools/vocabs/browser/browser-tests.factor (100%)
 rename {extra => basis}/tools/vocabs/browser/browser.factor (100%)
 rename {extra => basis}/tools/vocabs/browser/tags.txt (100%)
 rename {extra => basis}/tools/vocabs/monitor/authors.txt (100%)
 rename {extra => basis}/tools/vocabs/monitor/monitor-tests.factor (100%)
 rename {extra => basis}/tools/vocabs/monitor/monitor.factor (100%)
 rename {extra => basis}/tools/vocabs/monitor/summary.txt (100%)
 rename {extra => basis}/tools/vocabs/vocabs-docs.factor (100%)
 rename {extra => basis}/tools/vocabs/vocabs-tests.factor (100%)
 rename {extra => basis}/tools/vocabs/vocabs.factor (100%)
 rename {extra => basis}/tools/walker/authors.txt (100%)
 rename {extra => basis}/tools/walker/debug/authors.txt (100%)
 rename {extra => basis}/tools/walker/debug/debug.factor (100%)
 rename {extra => basis}/tools/walker/summary.txt (100%)
 rename {extra => basis}/tools/walker/walker-tests.factor (100%)
 rename {extra => basis}/tools/walker/walker.factor (100%)
 rename {extra => basis}/tr/authors.txt (100%)
 rename {extra => basis}/tr/summary.txt (100%)
 rename {extra => basis}/tr/tr-tests.factor (100%)
 rename {extra => basis}/tr/tr.factor (100%)
 rename {extra => basis}/tuple-arrays/authors.txt (100%)
 rename {extra => basis}/tuple-arrays/summary.txt (100%)
 rename {extra => basis}/tuple-arrays/tags.txt (100%)
 rename {extra => basis}/tuple-arrays/tuple-arrays-docs.factor (100%)
 rename {extra => basis}/tuple-arrays/tuple-arrays-tests.factor (100%)
 rename {extra => basis}/tuple-arrays/tuple-arrays.factor (100%)
 rename {extra => basis}/unicode/authors.txt (100%)
 rename {extra => basis}/unicode/breaks/authors.txt (100%)
 rename {extra => basis}/unicode/breaks/breaks-tests.factor (100%)
 rename {extra => basis}/unicode/breaks/breaks.factor (100%)
 rename {extra => basis}/unicode/breaks/tags.txt (100%)
 rename {extra => basis}/unicode/case/SpecialCasing.txt (100%)
 rename {extra => basis}/unicode/case/authors.txt (100%)
 rename {extra => basis}/unicode/case/case-tests.factor (100%)
 rename {extra => basis}/unicode/case/case.factor (100%)
 rename {extra => basis}/unicode/case/tags.txt (100%)
 rename {extra => basis}/unicode/categories/authors.txt (100%)
 rename {extra => basis}/unicode/categories/categories-tests.factor (100%)
 rename {extra => basis}/unicode/categories/categories.factor (100%)
 rename {extra => basis}/unicode/categories/tags.txt (100%)
 rename {extra => basis}/unicode/collation/CollationTest_SHIFTED.txt (100%)
 rename {extra => basis}/unicode/collation/allkeys.txt (100%)
 rename {extra => basis}/unicode/collation/collation-docs.factor (100%)
 rename {extra => basis}/unicode/collation/collation-tests.factor (91%)
 rename {extra => basis}/unicode/collation/collation.factor (95%)
 rename {extra => basis}/unicode/data/PropList.txt (100%)
 rename {extra => basis}/unicode/data/SpecialCasing.txt (100%)
 rename {extra => basis}/unicode/data/UnicodeData.txt (100%)
 rename {extra => basis}/unicode/data/authors.txt (100%)
 rename {extra => basis}/unicode/data/data.factor (97%)
 rename {extra => basis}/unicode/data/tags.txt (100%)
 rename {extra => basis}/unicode/normalize/NormalizationTest.txt (100%)
 rename {extra => basis}/unicode/normalize/authors.txt (100%)
 rename {extra => basis}/unicode/normalize/normalize-tests.factor (96%)
 rename {extra => basis}/unicode/normalize/normalize.factor (100%)
 rename {extra => basis}/unicode/normalize/tags.txt (100%)
 rename {extra => basis}/unicode/script/Scripts.txt (100%)
 rename {extra => basis}/unicode/script/authors.txt (100%)
 rename {extra => basis}/unicode/script/script-docs.factor (100%)
 rename {extra => basis}/unicode/script/script-tests.factor (100%)
 rename {extra => basis}/unicode/script/script.factor (96%)
 rename {extra => basis}/unicode/script/summary.txt (100%)
 rename {extra => basis}/unicode/summary.txt (100%)
 rename {extra => basis}/unicode/syntax/authors.txt (100%)
 rename {extra => basis}/unicode/syntax/syntax.factor (97%)
 rename {extra => basis}/unicode/syntax/tags.txt (100%)
 rename {extra => basis}/unicode/tags.txt (100%)
 rename {extra/random/mersenne-twister => basis/units}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra/structs => basis/units/constants}/authors.txt (100%)
 rename {extra => basis}/units/constants/constants.factor (100%)
 rename {extra => basis}/units/constants/constants.txt (100%)
 rename {extra/units => basis/units/imperial}/authors.txt (100%)
 rename {extra => basis}/units/imperial/imperial-tests.factor (100%)
 rename {extra => basis}/units/imperial/imperial.factor (100%)
 rename {extra/units/constants => basis/units/si}/authors.txt (100%)
 rename {extra => basis}/units/si/si-tests.factor (100%)
 rename {extra => basis}/units/si/si.factor (100%)
 rename {extra => basis}/units/units-tests.factor (100%)
 rename {extra => basis}/units/units.factor (100%)
 rename {extra => basis}/unix/authors.txt (100%)
 rename {extra => basis}/unix/bsd/authors.txt (100%)
 rename {extra => basis}/unix/bsd/bsd.factor (100%)
 rename {extra => basis}/unix/bsd/freebsd/freebsd.factor (100%)
 rename {extra => basis}/unix/bsd/macosx/macosx.factor (100%)
 rename {extra => basis}/unix/bsd/netbsd/netbsd.factor (100%)
 rename {extra => basis}/unix/bsd/openbsd/openbsd.factor (100%)
 rename {extra => basis}/unix/bsd/summary.txt (100%)
 rename {extra => basis}/unix/kqueue/authors.txt (100%)
 rename {extra => basis}/unix/kqueue/freebsd/freebsd.factor (100%)
 rename {extra => basis}/unix/kqueue/kqueue.factor (100%)
 rename {extra => basis}/unix/kqueue/macosx/macosx.factor (100%)
 rename {extra => basis}/unix/kqueue/netbsd/netbsd.factor (100%)
 rename {extra => basis}/unix/kqueue/openbsd/openbsd.factor (100%)
 rename {extra => basis}/unix/linux/authors.txt (100%)
 rename {extra => basis}/unix/linux/epoll/authors.txt (100%)
 rename {extra => basis}/unix/linux/epoll/epoll.factor (100%)
 rename {extra => basis}/unix/linux/fs/authors.txt (100%)
 rename {extra => basis}/unix/linux/fs/fs.factor (100%)
 rename {extra => basis}/unix/linux/if/authors.txt (100%)
 rename {extra => basis}/unix/linux/if/if.factor (100%)
 rename {extra => basis}/unix/linux/ifreq/authors.txt (100%)
 rename {extra => basis}/unix/linux/ifreq/ifreq.factor (100%)
 rename {extra => basis}/unix/linux/inotify/inotify.factor (100%)
 rename {extra => basis}/unix/linux/linux.factor (100%)
 rename {extra => basis}/unix/linux/route/authors.txt (100%)
 rename {extra => basis}/unix/linux/route/route.factor (100%)
 rename {extra => basis}/unix/linux/sockios/authors.txt (100%)
 rename {extra => basis}/unix/linux/sockios/sockios.factor (100%)
 rename {extra => basis}/unix/linux/swap/authors.txt (100%)
 rename {extra => basis}/unix/linux/swap/swap.factor (100%)
 rename {extra => basis}/unix/process/authors.txt (100%)
 rename {extra => basis}/unix/process/process.factor (100%)
 rename {extra => basis}/unix/solaris/authors.txt (100%)
 rename {extra => basis}/unix/solaris/solaris.factor (100%)
 rename {extra => basis}/unix/stat/freebsd/32/32.factor (100%)
 rename {extra => basis}/unix/stat/freebsd/64/64.factor (100%)
 rename {extra => basis}/unix/stat/freebsd/freebsd.factor (100%)
 rename {extra => basis}/unix/stat/linux/32/32.factor (100%)
 rename {extra => basis}/unix/stat/linux/64/64.factor (100%)
 rename {extra => basis}/unix/stat/linux/linux.factor (100%)
 rename {extra => basis}/unix/stat/macosx/macosx.factor (100%)
 rename {extra => basis}/unix/stat/netbsd/32/32.factor (100%)
 rename {extra => basis}/unix/stat/netbsd/64/64.factor (100%)
 rename {extra => basis}/unix/stat/netbsd/netbsd.factor (100%)
 rename {extra => basis}/unix/stat/openbsd/openbsd.factor (100%)
 rename {extra => basis}/unix/stat/stat.factor (100%)
 rename {extra => basis}/unix/summary.txt (100%)
 rename {extra => basis}/unix/tags.txt (100%)
 rename {extra => basis}/unix/time/time.factor (100%)
 rename {extra => basis}/unix/types/freebsd/freebsd.factor (100%)
 rename {extra => basis}/unix/types/linux/linux.factor (100%)
 rename {extra => basis}/unix/types/macosx/macosx.factor (100%)
 rename {extra => basis}/unix/types/netbsd/32/32.factor (100%)
 rename {extra => basis}/unix/types/netbsd/64/64.factor (100%)
 rename {extra => basis}/unix/types/netbsd/netbsd.factor (100%)
 rename {extra => basis}/unix/types/openbsd/openbsd.factor (100%)
 rename {extra => basis}/unix/types/types.factor (100%)
 rename {extra => basis}/unix/unix.factor (100%)
 rename {extra => basis}/urls/authors.txt (100%)
 rename {extra => basis}/urls/summary.txt (100%)
 rename {extra => basis}/urls/tags.txt (100%)
 rename {extra => basis}/urls/urls-tests.factor (100%)
 rename {extra => basis}/urls/urls.factor (100%)
 rename {extra => basis}/validators/validators-tests.factor (100%)
 rename {extra => basis}/validators/validators.factor (100%)
 rename {extra => basis}/values/authors.txt (100%)
 rename {extra => basis}/values/summary.txt (100%)
 rename {extra => basis}/values/tags.txt (100%)
 rename {extra => basis}/values/values-docs.factor (100%)
 rename {extra => basis}/values/values-tests.factor (100%)
 rename {extra => basis}/values/values.factor (100%)
 rename {extra => basis}/windows/advapi32/advapi32.factor (100%)
 rename {extra/units/imperial => basis/windows/advapi32}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/windows/authors.txt (100%)
 rename {extra/units/si => basis/windows/ce}/authors.txt (100%)
 mode change 100755 => 100644
 rename {extra => basis}/windows/ce/ce.factor (100%)
 rename {extra => basis}/windows/com/authors.txt (100%)
 rename {extra => basis}/windows/com/com-docs.factor (100%)
 rename {extra => basis}/windows/com/com-tests.factor (100%)
 rename {extra => basis}/windows/com/com.factor (100%)
 rename {extra => basis}/windows/com/summary.txt (100%)
 rename {extra => basis}/windows/com/syntax/authors.txt (100%)
 rename {extra => basis}/windows/com/syntax/summary.txt (100%)
 rename {extra => basis}/windows/com/syntax/syntax-docs.factor (100%)
 rename {extra => basis}/windows/com/syntax/syntax.factor (100%)
 rename {extra => basis}/windows/com/syntax/tags.txt (100%)
 rename {extra => basis}/windows/com/tags.txt (100%)
 rename {extra => basis}/windows/com/wrapper/authors.txt (100%)
 rename {extra => basis}/windows/com/wrapper/summary.txt (100%)
 rename {extra => basis}/windows/com/wrapper/tags.txt (100%)
 rename {extra => basis}/windows/com/wrapper/wrapper-docs.factor (100%)
 rename {extra => basis}/windows/com/wrapper/wrapper.factor (100%)
 rename {extra => basis}/windows/dinput/authors.txt (100%)
 rename {extra => basis}/windows/dinput/constants/constants.factor (100%)
 rename {extra => basis}/windows/dinput/dinput.factor (100%)
 rename {extra => basis}/windows/dinput/summary.txt (100%)
 rename {extra => basis}/windows/dinput/tags.txt (100%)
 rename {extra => basis}/windows/dragdrop-listener/dragdrop-listener.factor (100%)
 rename {extra/windows/advapi32 => basis/windows/errors}/authors.txt (100%)
 rename {extra => basis}/windows/errors/errors.factor (100%)
 rename {extra/windows/ce => basis/windows/gdi32}/authors.txt (100%)
 rename {extra => basis}/windows/gdi32/gdi32.factor (100%)
 rename {extra/windows/errors => basis/windows/kernel32}/authors.txt (100%)
 rename {extra => basis}/windows/kernel32/kernel32.factor (100%)
 rename {extra/windows/gdi32 => basis/windows/messages}/authors.txt (100%)
 rename {extra => basis}/windows/messages/messages.factor (100%)
 rename {extra/windows/kernel32 => basis/windows/nt}/authors.txt (100%)
 rename {extra => basis}/windows/nt/nt.factor (100%)
 rename {extra => basis}/windows/ole32/authors.txt (100%)
 rename {extra => basis}/windows/ole32/ole32.factor (100%)
 rename {extra/windows/messages => basis/windows/opengl32}/authors.txt (100%)
 rename {extra => basis}/windows/opengl32/opengl32.factor (100%)
 rename {extra/windows/nt => basis/windows/shell32}/authors.txt (100%)
 rename {extra => basis}/windows/shell32/shell32.factor (100%)
 rename {extra => basis}/windows/summary.txt (100%)
 rename {extra => basis}/windows/tags.txt (100%)
 rename {extra/windows/opengl32 => basis/windows/time}/authors.txt (100%)
 rename {extra => basis}/windows/time/time-tests.factor (100%)
 rename {extra => basis}/windows/time/time.factor (100%)
 rename {extra/windows/shell32 => basis/windows/types}/authors.txt (100%)
 rename {extra => basis}/windows/types/types.factor (100%)
 rename {extra/windows/time => basis/windows/user32}/authors.txt (100%)
 rename {extra => basis}/windows/user32/user32.factor (100%)
 rename {extra => basis}/windows/windows.factor (100%)
 rename {extra/windows/types => basis/windows/winsock}/authors.txt (100%)
 rename {extra => basis}/windows/winsock/winsock.factor (100%)
 rename {extra => basis}/wrap/authors.txt (100%)
 rename {extra => basis}/wrap/summary.txt (100%)
 rename {extra => basis}/wrap/tags.txt (100%)
 rename {extra => basis}/wrap/wrap.factor (100%)
 rename {extra => basis}/x11/clipboard/authors.txt (100%)
 rename {extra => basis}/x11/clipboard/clipboard.factor (100%)
 rename {extra => basis}/x11/clipboard/summary.txt (100%)
 rename {extra => basis}/x11/constants/authors.txt (100%)
 rename {extra => basis}/x11/constants/constants.factor (100%)
 rename {extra => basis}/x11/constants/summary.txt (100%)
 rename {extra => basis}/x11/events/authors.txt (100%)
 rename {extra => basis}/x11/events/events.factor (100%)
 rename {extra => basis}/x11/events/summary.txt (100%)
 rename {extra => basis}/x11/glx/authors.txt (100%)
 rename {extra => basis}/x11/glx/glx.factor (100%)
 rename {extra => basis}/x11/glx/summary.txt (100%)
 rename {extra => basis}/x11/glx/tags.txt (100%)
 rename {extra => basis}/x11/summary.txt (100%)
 rename {extra => basis}/x11/tags.txt (100%)
 rename {extra => basis}/x11/windows/authors.txt (100%)
 rename {extra => basis}/x11/windows/summary.txt (100%)
 rename {extra => basis}/x11/windows/windows.factor (100%)
 rename {extra => basis}/x11/xim/authors.txt (100%)
 rename {extra => basis}/x11/xim/summary.txt (100%)
 rename {extra => basis}/x11/xim/tags.txt (100%)
 rename {extra => basis}/x11/xim/xim.factor (100%)
 rename {extra => basis}/x11/xlib/authors.txt (100%)
 rename {extra => basis}/x11/xlib/summary.txt (100%)
 rename {extra => basis}/x11/xlib/tags.txt (100%)
 rename {extra => basis}/x11/xlib/xlib.factor (100%)
 rename {extra => basis}/xml-rpc/authors.txt (100%)
 rename {extra => basis}/xml-rpc/example.factor (100%)
 rename {extra => basis}/xml-rpc/summary.txt (100%)
 rename {extra => basis}/xml-rpc/tags.txt (100%)
 rename {extra => basis}/xml-rpc/xml-rpc-docs.factor (100%)
 rename {extra => basis}/xml-rpc/xml-rpc-tests.factor (100%)
 rename {extra => basis}/xml-rpc/xml-rpc.factor (100%)
 rename {extra => basis}/xml/authors.txt (100%)
 rename {extra => basis}/xml/backend/backend.factor (100%)
 rename {extra => basis}/xml/char-classes/authors.txt (100%)
 rename {extra => basis}/xml/char-classes/char-classes.factor (100%)
 rename {extra => basis}/xml/data/authors.txt (100%)
 rename {extra => basis}/xml/data/data.factor (100%)
 rename {extra => basis}/xml/entities/authors.txt (100%)
 rename {extra => basis}/xml/entities/entities.factor (100%)
 rename {extra => basis}/xml/errors/authors.txt (100%)
 rename {extra => basis}/xml/errors/errors-tests.factor (100%)
 rename {extra => basis}/xml/errors/errors.factor (100%)
 rename {extra => basis}/xml/generator/authors.txt (100%)
 rename {extra => basis}/xml/generator/generator-tests.factor (100%)
 rename {extra => basis}/xml/generator/generator.factor (100%)
 rename {extra => basis}/xml/summary.txt (100%)
 rename {extra => basis}/xml/tags.txt (100%)
 rename {extra => basis}/xml/tests/arithmetic.factor (100%)
 rename {extra => basis}/xml/tests/authors.txt (100%)
 rename {extra => basis}/xml/tests/soap.factor (88%)
 rename {extra => basis}/xml/tests/soap.xml (100%)
 rename {extra => basis}/xml/tests/templating.factor (100%)
 rename {extra => basis}/xml/tests/test.factor (98%)
 rename {extra => basis}/xml/tests/test.xml (100%)
 rename {extra => basis}/xml/tokenize/authors.txt (100%)
 rename {extra => basis}/xml/tokenize/tokenize.factor (100%)
 rename {extra => basis}/xml/utilities/authors.txt (100%)
 rename {extra => basis}/xml/utilities/utilities-tests.factor (100%)
 rename {extra => basis}/xml/utilities/utilities.factor (100%)
 rename {extra => basis}/xml/writer/authors.txt (100%)
 rename {extra => basis}/xml/writer/writer.factor (100%)
 rename {extra => basis}/xml/xml-docs.factor (100%)
 rename {extra => basis}/xml/xml.factor (100%)
 rename {extra/windows/user32 => unmaintained/headers}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra/windows/winsock => unmaintained/headers/bsd}/authors.txt (100%)
 mode change 100644 => 100755
 rename {extra/io/sockets => unmaintained}/headers/bsd/bsd.factor (100%)
 rename {extra/io/sockets => unmaintained}/headers/headers.factor (100%)

diff --git a/extra/alarms/alarms-docs.factor b/basis/alarms/alarms-docs.factor
similarity index 100%
rename from extra/alarms/alarms-docs.factor
rename to basis/alarms/alarms-docs.factor
diff --git a/extra/alarms/alarms-tests.factor b/basis/alarms/alarms-tests.factor
similarity index 100%
rename from extra/alarms/alarms-tests.factor
rename to basis/alarms/alarms-tests.factor
diff --git a/extra/alarms/alarms.factor b/basis/alarms/alarms.factor
similarity index 100%
rename from extra/alarms/alarms.factor
rename to basis/alarms/alarms.factor
diff --git a/extra/alarms/authors.txt b/basis/alarms/authors.txt
similarity index 100%
rename from extra/alarms/authors.txt
rename to basis/alarms/authors.txt
diff --git a/extra/alias/alias.factor b/basis/alias/alias.factor
similarity index 100%
rename from extra/alias/alias.factor
rename to basis/alias/alias.factor
diff --git a/core/alien/arrays/arrays-docs.factor b/basis/alien/arrays/arrays-docs.factor
similarity index 100%
rename from core/alien/arrays/arrays-docs.factor
rename to basis/alien/arrays/arrays-docs.factor
diff --git a/core/alien/arrays/arrays.factor b/basis/alien/arrays/arrays.factor
similarity index 100%
rename from core/alien/arrays/arrays.factor
rename to basis/alien/arrays/arrays.factor
diff --git a/core/alien/arrays/authors.txt b/basis/alien/arrays/authors.txt
similarity index 100%
rename from core/alien/arrays/authors.txt
rename to basis/alien/arrays/authors.txt
diff --git a/core/alien/arrays/summary.txt b/basis/alien/arrays/summary.txt
similarity index 100%
rename from core/alien/arrays/summary.txt
rename to basis/alien/arrays/summary.txt
diff --git a/core/alien/c-types/authors.txt b/basis/alien/c-types/authors.txt
similarity index 100%
rename from core/alien/c-types/authors.txt
rename to basis/alien/c-types/authors.txt
diff --git a/core/alien/c-types/c-types-docs.factor b/basis/alien/c-types/c-types-docs.factor
similarity index 100%
rename from core/alien/c-types/c-types-docs.factor
rename to basis/alien/c-types/c-types-docs.factor
diff --git a/core/alien/c-types/c-types-tests.factor b/basis/alien/c-types/c-types-tests.factor
similarity index 100%
rename from core/alien/c-types/c-types-tests.factor
rename to basis/alien/c-types/c-types-tests.factor
diff --git a/core/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
similarity index 100%
rename from core/alien/c-types/c-types.factor
rename to basis/alien/c-types/c-types.factor
diff --git a/core/alien/c-types/summary.txt b/basis/alien/c-types/summary.txt
similarity index 100%
rename from core/alien/c-types/summary.txt
rename to basis/alien/c-types/summary.txt
diff --git a/core/alien/compiler/authors.txt b/basis/alien/compiler/authors.txt
similarity index 100%
rename from core/alien/compiler/authors.txt
rename to basis/alien/compiler/authors.txt
diff --git a/core/alien/compiler/compiler-tests.factor b/basis/alien/compiler/compiler-tests.factor
similarity index 100%
rename from core/alien/compiler/compiler-tests.factor
rename to basis/alien/compiler/compiler-tests.factor
diff --git a/core/alien/compiler/compiler.factor b/basis/alien/compiler/compiler.factor
similarity index 100%
rename from core/alien/compiler/compiler.factor
rename to basis/alien/compiler/compiler.factor
diff --git a/core/alien/compiler/summary.txt b/basis/alien/compiler/summary.txt
similarity index 100%
rename from core/alien/compiler/summary.txt
rename to basis/alien/compiler/summary.txt
diff --git a/core/alien/remote-control/authors.txt b/basis/alien/remote-control/authors.txt
similarity index 100%
rename from core/alien/remote-control/authors.txt
rename to basis/alien/remote-control/authors.txt
diff --git a/core/alien/remote-control/remote-control.factor b/basis/alien/remote-control/remote-control.factor
similarity index 92%
rename from core/alien/remote-control/remote-control.factor
rename to basis/alien/remote-control/remote-control.factor
index 344c8a2c5a..9cd9050ea8 100755
--- a/core/alien/remote-control/remote-control.factor
+++ b/basis/alien/remote-control/remote-control.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.strings parser
-threads words kernel.private kernel io.encodings.utf8 ;
+threads words kernel.private kernel io.encodings.utf8 eval ;
 IN: alien.remote-control
 
 : eval-callback ( -- callback )
diff --git a/core/alien/remote-control/summary.txt b/basis/alien/remote-control/summary.txt
similarity index 100%
rename from core/alien/remote-control/summary.txt
rename to basis/alien/remote-control/summary.txt
diff --git a/core/alien/strings/strings-docs.factor b/basis/alien/strings/strings-docs.factor
similarity index 100%
rename from core/alien/strings/strings-docs.factor
rename to basis/alien/strings/strings-docs.factor
diff --git a/core/alien/strings/strings-tests.factor b/basis/alien/strings/strings-tests.factor
similarity index 100%
rename from core/alien/strings/strings-tests.factor
rename to basis/alien/strings/strings-tests.factor
diff --git a/core/alien/strings/strings.factor b/basis/alien/strings/strings.factor
similarity index 100%
rename from core/alien/strings/strings.factor
rename to basis/alien/strings/strings.factor
diff --git a/core/alien/structs/authors.txt b/basis/alien/structs/authors.txt
similarity index 100%
rename from core/alien/structs/authors.txt
rename to basis/alien/structs/authors.txt
diff --git a/core/alien/structs/structs-docs.factor b/basis/alien/structs/structs-docs.factor
similarity index 100%
rename from core/alien/structs/structs-docs.factor
rename to basis/alien/structs/structs-docs.factor
diff --git a/core/alien/structs/structs-tests.factor b/basis/alien/structs/structs-tests.factor
similarity index 100%
rename from core/alien/structs/structs-tests.factor
rename to basis/alien/structs/structs-tests.factor
diff --git a/core/alien/structs/structs.factor b/basis/alien/structs/structs.factor
similarity index 100%
rename from core/alien/structs/structs.factor
rename to basis/alien/structs/structs.factor
diff --git a/core/alien/structs/summary.txt b/basis/alien/structs/summary.txt
similarity index 100%
rename from core/alien/structs/summary.txt
rename to basis/alien/structs/summary.txt
diff --git a/core/alien/syntax/authors.txt b/basis/alien/syntax/authors.txt
similarity index 100%
rename from core/alien/syntax/authors.txt
rename to basis/alien/syntax/authors.txt
diff --git a/core/alien/syntax/summary.txt b/basis/alien/syntax/summary.txt
similarity index 100%
rename from core/alien/syntax/summary.txt
rename to basis/alien/syntax/summary.txt
diff --git a/core/alien/syntax/syntax-docs.factor b/basis/alien/syntax/syntax-docs.factor
similarity index 100%
rename from core/alien/syntax/syntax-docs.factor
rename to basis/alien/syntax/syntax-docs.factor
diff --git a/core/alien/syntax/syntax.factor b/basis/alien/syntax/syntax.factor
similarity index 100%
rename from core/alien/syntax/syntax.factor
rename to basis/alien/syntax/syntax.factor
diff --git a/extra/ascii/ascii-docs.factor b/basis/ascii/ascii-docs.factor
similarity index 100%
rename from extra/ascii/ascii-docs.factor
rename to basis/ascii/ascii-docs.factor
diff --git a/extra/ascii/ascii-tests.factor b/basis/ascii/ascii-tests.factor
similarity index 100%
rename from extra/ascii/ascii-tests.factor
rename to basis/ascii/ascii-tests.factor
diff --git a/extra/ascii/ascii.factor b/basis/ascii/ascii.factor
similarity index 100%
rename from extra/ascii/ascii.factor
rename to basis/ascii/ascii.factor
diff --git a/core/bootstrap/compiler/authors.txt b/basis/ascii/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/bootstrap/compiler/authors.txt
rename to basis/ascii/authors.txt
diff --git a/extra/ascii/summary.txt b/basis/ascii/summary.txt
similarity index 100%
rename from extra/ascii/summary.txt
rename to basis/ascii/summary.txt
diff --git a/core/io/encodings/utf16/tags.txt b/basis/ascii/tags.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/io/encodings/utf16/tags.txt
rename to basis/ascii/tags.txt
diff --git a/extra/base64/authors.txt b/basis/base64/authors.txt
similarity index 100%
rename from extra/base64/authors.txt
rename to basis/base64/authors.txt
diff --git a/extra/base64/base64-docs.factor b/basis/base64/base64-docs.factor
similarity index 100%
rename from extra/base64/base64-docs.factor
rename to basis/base64/base64-docs.factor
diff --git a/extra/base64/base64-tests.factor b/basis/base64/base64-tests.factor
similarity index 100%
rename from extra/base64/base64-tests.factor
rename to basis/base64/base64-tests.factor
diff --git a/extra/base64/base64.factor b/basis/base64/base64.factor
similarity index 100%
rename from extra/base64/base64.factor
rename to basis/base64/base64.factor
diff --git a/extra/base64/summary.txt b/basis/base64/summary.txt
similarity index 100%
rename from extra/base64/summary.txt
rename to basis/base64/summary.txt
diff --git a/core/bootstrap/image/authors.txt b/basis/biassocs/authors.txt
similarity index 100%
rename from core/bootstrap/image/authors.txt
rename to basis/biassocs/authors.txt
diff --git a/extra/biassocs/biassocs-docs.factor b/basis/biassocs/biassocs-docs.factor
similarity index 100%
rename from extra/biassocs/biassocs-docs.factor
rename to basis/biassocs/biassocs-docs.factor
diff --git a/extra/biassocs/biassocs-tests.factor b/basis/biassocs/biassocs-tests.factor
similarity index 100%
rename from extra/biassocs/biassocs-tests.factor
rename to basis/biassocs/biassocs-tests.factor
diff --git a/extra/biassocs/biassocs.factor b/basis/biassocs/biassocs.factor
similarity index 100%
rename from extra/biassocs/biassocs.factor
rename to basis/biassocs/biassocs.factor
diff --git a/extra/biassocs/summary.txt b/basis/biassocs/summary.txt
similarity index 100%
rename from extra/biassocs/summary.txt
rename to basis/biassocs/summary.txt
diff --git a/core/dequeues/tags.txt b/basis/biassocs/tags.txt
similarity index 100%
rename from core/dequeues/tags.txt
rename to basis/biassocs/tags.txt
diff --git a/core/binary-search/binary-search-docs.factor b/basis/binary-search/binary-search-docs.factor
similarity index 100%
rename from core/binary-search/binary-search-docs.factor
rename to basis/binary-search/binary-search-docs.factor
diff --git a/core/binary-search/binary-search-tests.factor b/basis/binary-search/binary-search-tests.factor
similarity index 100%
rename from core/binary-search/binary-search-tests.factor
rename to basis/binary-search/binary-search-tests.factor
diff --git a/core/binary-search/binary-search.factor b/basis/binary-search/binary-search.factor
similarity index 100%
rename from core/binary-search/binary-search.factor
rename to basis/binary-search/binary-search.factor
diff --git a/core/command-line/authors.txt b/basis/bit-arrays/authors.txt
similarity index 100%
rename from core/command-line/authors.txt
rename to basis/bit-arrays/authors.txt
diff --git a/extra/bit-arrays/bit-arrays-docs.factor b/basis/bit-arrays/bit-arrays-docs.factor
similarity index 100%
rename from extra/bit-arrays/bit-arrays-docs.factor
rename to basis/bit-arrays/bit-arrays-docs.factor
diff --git a/extra/bit-arrays/bit-arrays-tests.factor b/basis/bit-arrays/bit-arrays-tests.factor
similarity index 100%
rename from extra/bit-arrays/bit-arrays-tests.factor
rename to basis/bit-arrays/bit-arrays-tests.factor
diff --git a/extra/bit-arrays/bit-arrays.factor b/basis/bit-arrays/bit-arrays.factor
similarity index 100%
rename from extra/bit-arrays/bit-arrays.factor
rename to basis/bit-arrays/bit-arrays.factor
diff --git a/extra/bit-arrays/summary.txt b/basis/bit-arrays/summary.txt
similarity index 100%
rename from extra/bit-arrays/summary.txt
rename to basis/bit-arrays/summary.txt
diff --git a/core/dlists/tags.txt b/basis/bit-arrays/tags.txt
similarity index 100%
rename from core/dlists/tags.txt
rename to basis/bit-arrays/tags.txt
diff --git a/extra/bit-vectors/bit-vectors-docs.factor b/basis/bit-vectors/bit-vectors-docs.factor
similarity index 100%
rename from extra/bit-vectors/bit-vectors-docs.factor
rename to basis/bit-vectors/bit-vectors-docs.factor
diff --git a/extra/bit-vectors/bit-vectors-tests.factor b/basis/bit-vectors/bit-vectors-tests.factor
similarity index 100%
rename from extra/bit-vectors/bit-vectors-tests.factor
rename to basis/bit-vectors/bit-vectors-tests.factor
diff --git a/extra/bit-vectors/bit-vectors.factor b/basis/bit-vectors/bit-vectors.factor
similarity index 100%
rename from extra/bit-vectors/bit-vectors.factor
rename to basis/bit-vectors/bit-vectors.factor
diff --git a/extra/bit-vectors/summary.txt b/basis/bit-vectors/summary.txt
similarity index 100%
rename from extra/bit-vectors/summary.txt
rename to basis/bit-vectors/summary.txt
diff --git a/core/heaps/tags.txt b/basis/bit-vectors/tags.txt
similarity index 100%
rename from core/heaps/tags.txt
rename to basis/bit-vectors/tags.txt
diff --git a/core/compiler/authors.txt b/basis/bootstrap/compiler/authors.txt
similarity index 100%
rename from core/compiler/authors.txt
rename to basis/bootstrap/compiler/authors.txt
diff --git a/core/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor
similarity index 100%
rename from core/bootstrap/compiler/compiler.factor
rename to basis/bootstrap/compiler/compiler.factor
diff --git a/core/bootstrap/compiler/summary.txt b/basis/bootstrap/compiler/summary.txt
similarity index 100%
rename from core/bootstrap/compiler/summary.txt
rename to basis/bootstrap/compiler/summary.txt
diff --git a/extra/bootstrap/handbook/handbook.factor b/basis/bootstrap/handbook/handbook.factor
similarity index 100%
rename from extra/bootstrap/handbook/handbook.factor
rename to basis/bootstrap/handbook/handbook.factor
diff --git a/core/compiler/constants/authors.txt b/basis/bootstrap/help/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/compiler/constants/authors.txt
rename to basis/bootstrap/help/authors.txt
diff --git a/extra/bootstrap/help/help.factor b/basis/bootstrap/help/help.factor
similarity index 100%
rename from extra/bootstrap/help/help.factor
rename to basis/bootstrap/help/help.factor
diff --git a/extra/bootstrap/help/summary.txt b/basis/bootstrap/help/summary.txt
similarity index 100%
rename from extra/bootstrap/help/summary.txt
rename to basis/bootstrap/help/summary.txt
diff --git a/core/cpu/architecture/authors.txt b/basis/bootstrap/image/authors.txt
similarity index 100%
rename from core/cpu/architecture/authors.txt
rename to basis/bootstrap/image/authors.txt
diff --git a/core/cpu/arm/4/authors.txt b/basis/bootstrap/image/download/authors.txt
similarity index 100%
rename from core/cpu/arm/4/authors.txt
rename to basis/bootstrap/image/download/authors.txt
diff --git a/extra/bootstrap/image/download/download.factor b/basis/bootstrap/image/download/download.factor
similarity index 100%
rename from extra/bootstrap/image/download/download.factor
rename to basis/bootstrap/image/download/download.factor
diff --git a/extra/bootstrap/image/download/summary.txt b/basis/bootstrap/image/download/summary.txt
similarity index 100%
rename from extra/bootstrap/image/download/summary.txt
rename to basis/bootstrap/image/download/summary.txt
diff --git a/core/bootstrap/image/image-docs.factor b/basis/bootstrap/image/image-docs.factor
similarity index 100%
rename from core/bootstrap/image/image-docs.factor
rename to basis/bootstrap/image/image-docs.factor
diff --git a/core/bootstrap/image/image-tests.factor b/basis/bootstrap/image/image-tests.factor
similarity index 100%
rename from core/bootstrap/image/image-tests.factor
rename to basis/bootstrap/image/image-tests.factor
diff --git a/core/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
similarity index 100%
rename from core/bootstrap/image/image.factor
rename to basis/bootstrap/image/image.factor
diff --git a/core/bootstrap/image/summary.txt b/basis/bootstrap/image/summary.txt
similarity index 100%
rename from core/bootstrap/image/summary.txt
rename to basis/bootstrap/image/summary.txt
diff --git a/core/bootstrap/image/tags.txt b/basis/bootstrap/image/tags.txt
similarity index 100%
rename from core/bootstrap/image/tags.txt
rename to basis/bootstrap/image/tags.txt
diff --git a/core/cpu/arm/allot/authors.txt b/basis/bootstrap/image/upload/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/arm/allot/authors.txt
rename to basis/bootstrap/image/upload/authors.txt
diff --git a/extra/bootstrap/image/upload/summary.txt b/basis/bootstrap/image/upload/summary.txt
similarity index 100%
rename from extra/bootstrap/image/upload/summary.txt
rename to basis/bootstrap/image/upload/summary.txt
diff --git a/extra/bootstrap/image/upload/upload.factor b/basis/bootstrap/image/upload/upload.factor
similarity index 100%
rename from extra/bootstrap/image/upload/upload.factor
rename to basis/bootstrap/image/upload/upload.factor
diff --git a/core/cpu/arm/architecture/authors.txt b/basis/bootstrap/io/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/arm/architecture/authors.txt
rename to basis/bootstrap/io/authors.txt
diff --git a/extra/bootstrap/io/io.factor b/basis/bootstrap/io/io.factor
similarity index 100%
rename from extra/bootstrap/io/io.factor
rename to basis/bootstrap/io/io.factor
diff --git a/extra/bootstrap/io/summary.txt b/basis/bootstrap/io/summary.txt
similarity index 100%
rename from extra/bootstrap/io/summary.txt
rename to basis/bootstrap/io/summary.txt
diff --git a/extra/bootstrap/math/math.factor b/basis/bootstrap/math/math.factor
similarity index 100%
rename from extra/bootstrap/math/math.factor
rename to basis/bootstrap/math/math.factor
diff --git a/extra/bootstrap/math/summary.txt b/basis/bootstrap/math/summary.txt
similarity index 100%
rename from extra/bootstrap/math/summary.txt
rename to basis/bootstrap/math/summary.txt
diff --git a/extra/bootstrap/random/random.factor b/basis/bootstrap/random/random.factor
similarity index 100%
rename from extra/bootstrap/random/random.factor
rename to basis/bootstrap/random/random.factor
diff --git a/core/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor
similarity index 52%
rename from core/bootstrap/stage2.factor
rename to basis/bootstrap/stage2.factor
index c6afdfe749..586032c2e8 100755
--- a/core/bootstrap/stage2.factor
+++ b/basis/bootstrap/stage2.factor
@@ -44,57 +44,64 @@ SYMBOL: bootstrap-time
     "Now, you can run Factor:" print
     vm write " -i=" write "output-image" get print flush ;
 
-! We time bootstrap
-millis >r
-
-default-image-name "output-image" set-global
-
-"math compiler help io random tools ui ui.tools unicode handbook" "include" set-global
-"" "exclude" set-global
-
-parse-command-line
-
-"-no-crossref" cli-args member? [ do-crossref ] unless
-
-"io.thread" require
-
-! Set dll paths
-os wince? [ "windows.ce" require ] when
-os winnt? [ "windows.nt" require ] when
-
-"deploy-vocab" get [
-    "stage2: deployment mode" print
-] [
-    "listener" require
-    "none" require
-] if
-
 [
-    load-components
+    ! We time bootstrap
+    millis >r
 
-    run-bootstrap-init
-] with-compiler-errors
-:errors
+    default-image-name "output-image" set-global
 
-f error set-global
-f error-continuation set-global
+    "math compiler help io random tools ui ui.tools unicode handbook" "include" set-global
+    "" "exclude" set-global
+
+    parse-command-line
+
+    "-no-crossref" cli-args member? [ do-crossref ] unless
+
+    ! Set dll paths
+    os wince? [ "windows.ce" require ] when
+    os winnt? [ "windows.nt" require ] when
+
+    "deploy-vocab" get [
+        "stage2: deployment mode" print
+    ] [
+        "listener" require
+        "none" require
+    ] if
 
-"deploy-vocab" get [
-    "tools.deploy.shaker" run
-] [
     [
-        boot
-        do-init-hooks
+        load-components
+
+        run-bootstrap-init
+    ] with-compiler-errors
+    :errors
+
+    f error set-global
+    f error-continuation set-global
+
+    "deploy-vocab" get [
+        "tools.deploy.shaker" run
+    ] [
         [
-            parse-command-line
-            run-user-init
-            "run" get run
-            output-stream get [ stream-flush ] when*
-        ] [ print-error 1 exit ] recover
-    ] set-boot-quot
+            boot
+            do-init-hooks
+            [
+                parse-command-line
+                run-user-init
+                "run" get run
+                output-stream get [ stream-flush ] when*
+            ] [ print-error 1 exit ] recover
+        ] set-boot-quot
 
-    millis r> - dup bootstrap-time set-global
-    print-report
+        millis r> - dup bootstrap-time set-global
+        print-report
 
-    "output-image" get save-image-and-exit
-] if
+        "output-image" get save-image-and-exit
+    ] if
+] [
+    :c
+    dup print-error flush
+    "listener" vocab
+    [ restarts. vocab-main execute ]
+    [ die ] if*
+    1 exit
+] recover
diff --git a/core/cpu/arm/assembler/authors.txt b/basis/bootstrap/tools/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/arm/assembler/authors.txt
rename to basis/bootstrap/tools/authors.txt
diff --git a/extra/bootstrap/tools/summary.txt b/basis/bootstrap/tools/summary.txt
similarity index 100%
rename from extra/bootstrap/tools/summary.txt
rename to basis/bootstrap/tools/summary.txt
diff --git a/extra/bootstrap/tools/tools.factor b/basis/bootstrap/tools/tools.factor
similarity index 100%
rename from extra/bootstrap/tools/tools.factor
rename to basis/bootstrap/tools/tools.factor
diff --git a/extra/bootstrap/unicode/unicode.factor b/basis/bootstrap/unicode/unicode.factor
similarity index 100%
rename from extra/bootstrap/unicode/unicode.factor
rename to basis/bootstrap/unicode/unicode.factor
diff --git a/core/boxes/boxes-docs.factor b/basis/boxes/boxes-docs.factor
similarity index 100%
rename from core/boxes/boxes-docs.factor
rename to basis/boxes/boxes-docs.factor
diff --git a/core/boxes/boxes-tests.factor b/basis/boxes/boxes-tests.factor
similarity index 100%
rename from core/boxes/boxes-tests.factor
rename to basis/boxes/boxes-tests.factor
diff --git a/core/boxes/boxes.factor b/basis/boxes/boxes.factor
similarity index 100%
rename from core/boxes/boxes.factor
rename to basis/boxes/boxes.factor
diff --git a/extra/calendar/authors.txt b/basis/calendar/authors.txt
similarity index 100%
rename from extra/calendar/authors.txt
rename to basis/calendar/authors.txt
diff --git a/extra/calendar/backend/authors.txt b/basis/calendar/backend/authors.txt
similarity index 100%
rename from extra/calendar/backend/authors.txt
rename to basis/calendar/backend/authors.txt
diff --git a/extra/calendar/backend/backend.factor b/basis/calendar/backend/backend.factor
similarity index 100%
rename from extra/calendar/backend/backend.factor
rename to basis/calendar/backend/backend.factor
diff --git a/extra/calendar/calendar-tests.factor b/basis/calendar/calendar-tests.factor
similarity index 100%
rename from extra/calendar/calendar-tests.factor
rename to basis/calendar/calendar-tests.factor
diff --git a/extra/calendar/calendar.factor b/basis/calendar/calendar.factor
similarity index 100%
rename from extra/calendar/calendar.factor
rename to basis/calendar/calendar.factor
diff --git a/extra/calendar/format/format-tests.factor b/basis/calendar/format/format-tests.factor
similarity index 100%
rename from extra/calendar/format/format-tests.factor
rename to basis/calendar/format/format-tests.factor
diff --git a/extra/calendar/format/format.factor b/basis/calendar/format/format.factor
similarity index 100%
rename from extra/calendar/format/format.factor
rename to basis/calendar/format/format.factor
diff --git a/extra/calendar/format/macros/macros-tests.factor b/basis/calendar/format/macros/macros-tests.factor
similarity index 100%
rename from extra/calendar/format/macros/macros-tests.factor
rename to basis/calendar/format/macros/macros-tests.factor
diff --git a/extra/calendar/format/macros/macros.factor b/basis/calendar/format/macros/macros.factor
similarity index 100%
rename from extra/calendar/format/macros/macros.factor
rename to basis/calendar/format/macros/macros.factor
diff --git a/extra/calendar/format/summary.txt b/basis/calendar/format/summary.txt
similarity index 100%
rename from extra/calendar/format/summary.txt
rename to basis/calendar/format/summary.txt
diff --git a/extra/calendar/model/model.factor b/basis/calendar/model/model.factor
similarity index 100%
rename from extra/calendar/model/model.factor
rename to basis/calendar/model/model.factor
diff --git a/extra/calendar/model/summary.txt b/basis/calendar/model/summary.txt
similarity index 100%
rename from extra/calendar/model/summary.txt
rename to basis/calendar/model/summary.txt
diff --git a/extra/calendar/summary.txt b/basis/calendar/summary.txt
similarity index 100%
rename from extra/calendar/summary.txt
rename to basis/calendar/summary.txt
diff --git a/extra/calendar/unix/authors.txt b/basis/calendar/unix/authors.txt
similarity index 100%
rename from extra/calendar/unix/authors.txt
rename to basis/calendar/unix/authors.txt
diff --git a/extra/calendar/unix/unix.factor b/basis/calendar/unix/unix.factor
similarity index 100%
rename from extra/calendar/unix/unix.factor
rename to basis/calendar/unix/unix.factor
diff --git a/extra/calendar/windows/authors.txt b/basis/calendar/windows/authors.txt
similarity index 100%
rename from extra/calendar/windows/authors.txt
rename to basis/calendar/windows/authors.txt
diff --git a/extra/calendar/windows/tags.txt b/basis/calendar/windows/tags.txt
similarity index 100%
rename from extra/calendar/windows/tags.txt
rename to basis/calendar/windows/tags.txt
diff --git a/extra/calendar/windows/windows.factor b/basis/calendar/windows/windows.factor
similarity index 100%
rename from extra/calendar/windows/windows.factor
rename to basis/calendar/windows/windows.factor
diff --git a/extra/channels/authors.txt b/basis/channels/authors.txt
similarity index 100%
rename from extra/channels/authors.txt
rename to basis/channels/authors.txt
diff --git a/extra/channels/channels-docs.factor b/basis/channels/channels-docs.factor
similarity index 100%
rename from extra/channels/channels-docs.factor
rename to basis/channels/channels-docs.factor
diff --git a/extra/channels/channels-tests.factor b/basis/channels/channels-tests.factor
similarity index 100%
rename from extra/channels/channels-tests.factor
rename to basis/channels/channels-tests.factor
diff --git a/extra/channels/channels.factor b/basis/channels/channels.factor
similarity index 100%
rename from extra/channels/channels.factor
rename to basis/channels/channels.factor
diff --git a/extra/channels/examples/authors.txt b/basis/channels/examples/authors.txt
similarity index 100%
rename from extra/channels/examples/authors.txt
rename to basis/channels/examples/authors.txt
diff --git a/extra/channels/examples/examples.factor b/basis/channels/examples/examples.factor
similarity index 100%
rename from extra/channels/examples/examples.factor
rename to basis/channels/examples/examples.factor
diff --git a/extra/channels/examples/summary.txt b/basis/channels/examples/summary.txt
similarity index 100%
rename from extra/channels/examples/summary.txt
rename to basis/channels/examples/summary.txt
diff --git a/extra/channels/examples/tags.txt b/basis/channels/examples/tags.txt
similarity index 100%
rename from extra/channels/examples/tags.txt
rename to basis/channels/examples/tags.txt
diff --git a/extra/channels/remote/authors.txt b/basis/channels/remote/authors.txt
similarity index 100%
rename from extra/channels/remote/authors.txt
rename to basis/channels/remote/authors.txt
diff --git a/extra/channels/remote/remote-docs.factor b/basis/channels/remote/remote-docs.factor
similarity index 100%
rename from extra/channels/remote/remote-docs.factor
rename to basis/channels/remote/remote-docs.factor
diff --git a/extra/channels/remote/remote-tests.factor b/basis/channels/remote/remote-tests.factor
similarity index 100%
rename from extra/channels/remote/remote-tests.factor
rename to basis/channels/remote/remote-tests.factor
diff --git a/extra/channels/remote/remote.factor b/basis/channels/remote/remote.factor
similarity index 100%
rename from extra/channels/remote/remote.factor
rename to basis/channels/remote/remote.factor
diff --git a/extra/channels/remote/summary.txt b/basis/channels/remote/summary.txt
similarity index 100%
rename from extra/channels/remote/summary.txt
rename to basis/channels/remote/summary.txt
diff --git a/extra/channels/remote/tags.txt b/basis/channels/remote/tags.txt
similarity index 100%
rename from extra/channels/remote/tags.txt
rename to basis/channels/remote/tags.txt
diff --git a/extra/channels/summary.txt b/basis/channels/summary.txt
similarity index 100%
rename from extra/channels/summary.txt
rename to basis/channels/summary.txt
diff --git a/extra/channels/tags.txt b/basis/channels/tags.txt
similarity index 100%
rename from extra/channels/tags.txt
rename to basis/channels/tags.txt
diff --git a/extra/checksums/adler-32/adler-32-docs.factor b/basis/checksums/adler-32/adler-32-docs.factor
similarity index 100%
rename from extra/checksums/adler-32/adler-32-docs.factor
rename to basis/checksums/adler-32/adler-32-docs.factor
diff --git a/extra/checksums/adler-32/adler-32-tests.factor b/basis/checksums/adler-32/adler-32-tests.factor
similarity index 100%
rename from extra/checksums/adler-32/adler-32-tests.factor
rename to basis/checksums/adler-32/adler-32-tests.factor
diff --git a/extra/checksums/adler-32/adler-32.factor b/basis/checksums/adler-32/adler-32.factor
similarity index 100%
rename from extra/checksums/adler-32/adler-32.factor
rename to basis/checksums/adler-32/adler-32.factor
diff --git a/extra/checksums/adler-32/authors.txt b/basis/checksums/adler-32/authors.txt
similarity index 100%
rename from extra/checksums/adler-32/authors.txt
rename to basis/checksums/adler-32/authors.txt
diff --git a/extra/checksums/md5/authors.txt b/basis/checksums/md5/authors.txt
similarity index 100%
rename from extra/checksums/md5/authors.txt
rename to basis/checksums/md5/authors.txt
diff --git a/extra/checksums/md5/md5-docs.factor b/basis/checksums/md5/md5-docs.factor
similarity index 100%
rename from extra/checksums/md5/md5-docs.factor
rename to basis/checksums/md5/md5-docs.factor
diff --git a/extra/checksums/md5/md5-tests.factor b/basis/checksums/md5/md5-tests.factor
similarity index 100%
rename from extra/checksums/md5/md5-tests.factor
rename to basis/checksums/md5/md5-tests.factor
diff --git a/extra/checksums/md5/md5.factor b/basis/checksums/md5/md5.factor
similarity index 100%
rename from extra/checksums/md5/md5.factor
rename to basis/checksums/md5/md5.factor
diff --git a/extra/checksums/null/null.factor b/basis/checksums/null/null.factor
similarity index 100%
rename from extra/checksums/null/null.factor
rename to basis/checksums/null/null.factor
diff --git a/extra/checksums/openssl/openssl-docs.factor b/basis/checksums/openssl/openssl-docs.factor
similarity index 100%
rename from extra/checksums/openssl/openssl-docs.factor
rename to basis/checksums/openssl/openssl-docs.factor
diff --git a/extra/checksums/openssl/openssl-tests.factor b/basis/checksums/openssl/openssl-tests.factor
similarity index 100%
rename from extra/checksums/openssl/openssl-tests.factor
rename to basis/checksums/openssl/openssl-tests.factor
diff --git a/extra/checksums/openssl/openssl.factor b/basis/checksums/openssl/openssl.factor
similarity index 100%
rename from extra/checksums/openssl/openssl.factor
rename to basis/checksums/openssl/openssl.factor
diff --git a/extra/checksums/sha1/authors.txt b/basis/checksums/sha1/authors.txt
similarity index 100%
rename from extra/checksums/sha1/authors.txt
rename to basis/checksums/sha1/authors.txt
diff --git a/extra/checksums/sha1/sha1-docs.factor b/basis/checksums/sha1/sha1-docs.factor
similarity index 100%
rename from extra/checksums/sha1/sha1-docs.factor
rename to basis/checksums/sha1/sha1-docs.factor
diff --git a/extra/checksums/sha1/sha1-tests.factor b/basis/checksums/sha1/sha1-tests.factor
similarity index 100%
rename from extra/checksums/sha1/sha1-tests.factor
rename to basis/checksums/sha1/sha1-tests.factor
diff --git a/extra/checksums/sha1/sha1.factor b/basis/checksums/sha1/sha1.factor
similarity index 100%
rename from extra/checksums/sha1/sha1.factor
rename to basis/checksums/sha1/sha1.factor
diff --git a/extra/checksums/sha2/authors.txt b/basis/checksums/sha2/authors.txt
similarity index 100%
rename from extra/checksums/sha2/authors.txt
rename to basis/checksums/sha2/authors.txt
diff --git a/extra/checksums/sha2/sha2-docs.factor b/basis/checksums/sha2/sha2-docs.factor
similarity index 100%
rename from extra/checksums/sha2/sha2-docs.factor
rename to basis/checksums/sha2/sha2-docs.factor
diff --git a/extra/checksums/sha2/sha2-tests.factor b/basis/checksums/sha2/sha2-tests.factor
similarity index 100%
rename from extra/checksums/sha2/sha2-tests.factor
rename to basis/checksums/sha2/sha2-tests.factor
diff --git a/extra/checksums/sha2/sha2.factor b/basis/checksums/sha2/sha2.factor
similarity index 100%
rename from extra/checksums/sha2/sha2.factor
rename to basis/checksums/sha2/sha2.factor
diff --git a/extra/circular/authors.txt b/basis/circular/authors.txt
similarity index 100%
rename from extra/circular/authors.txt
rename to basis/circular/authors.txt
diff --git a/extra/circular/circular-tests.factor b/basis/circular/circular-tests.factor
similarity index 100%
rename from extra/circular/circular-tests.factor
rename to basis/circular/circular-tests.factor
diff --git a/extra/circular/circular.factor b/basis/circular/circular.factor
similarity index 100%
rename from extra/circular/circular.factor
rename to basis/circular/circular.factor
diff --git a/extra/circular/summary.txt b/basis/circular/summary.txt
similarity index 100%
rename from extra/circular/summary.txt
rename to basis/circular/summary.txt
diff --git a/core/search-dequeues/tags.txt b/basis/circular/tags.txt
similarity index 100%
rename from core/search-dequeues/tags.txt
rename to basis/circular/tags.txt
diff --git a/extra/cocoa/application/application-docs.factor b/basis/cocoa/application/application-docs.factor
similarity index 100%
rename from extra/cocoa/application/application-docs.factor
rename to basis/cocoa/application/application-docs.factor
diff --git a/extra/cocoa/application/application.factor b/basis/cocoa/application/application.factor
similarity index 100%
rename from extra/cocoa/application/application.factor
rename to basis/cocoa/application/application.factor
diff --git a/core/cpu/arm/authors.txt b/basis/cocoa/application/authors.txt
similarity index 100%
rename from core/cpu/arm/authors.txt
rename to basis/cocoa/application/authors.txt
diff --git a/extra/cocoa/application/summary.txt b/basis/cocoa/application/summary.txt
similarity index 100%
rename from extra/cocoa/application/summary.txt
rename to basis/cocoa/application/summary.txt
diff --git a/core/cpu/arm/intrinsics/authors.txt b/basis/cocoa/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/arm/intrinsics/authors.txt
rename to basis/cocoa/authors.txt
diff --git a/extra/cocoa/callbacks/authors.txt b/basis/cocoa/callbacks/authors.txt
similarity index 100%
rename from extra/cocoa/callbacks/authors.txt
rename to basis/cocoa/callbacks/authors.txt
diff --git a/extra/cocoa/callbacks/callbacks.factor b/basis/cocoa/callbacks/callbacks.factor
similarity index 100%
rename from extra/cocoa/callbacks/callbacks.factor
rename to basis/cocoa/callbacks/callbacks.factor
diff --git a/extra/cocoa/callbacks/summary.txt b/basis/cocoa/callbacks/summary.txt
similarity index 100%
rename from extra/cocoa/callbacks/summary.txt
rename to basis/cocoa/callbacks/summary.txt
diff --git a/extra/cocoa/cocoa-docs.factor b/basis/cocoa/cocoa-docs.factor
similarity index 100%
rename from extra/cocoa/cocoa-docs.factor
rename to basis/cocoa/cocoa-docs.factor
diff --git a/extra/cocoa/cocoa-tests.factor b/basis/cocoa/cocoa-tests.factor
similarity index 100%
rename from extra/cocoa/cocoa-tests.factor
rename to basis/cocoa/cocoa-tests.factor
diff --git a/extra/cocoa/cocoa.factor b/basis/cocoa/cocoa.factor
similarity index 100%
rename from extra/cocoa/cocoa.factor
rename to basis/cocoa/cocoa.factor
diff --git a/core/cpu/ppc/allot/authors.txt b/basis/cocoa/dialogs/authors.txt
similarity index 100%
rename from core/cpu/ppc/allot/authors.txt
rename to basis/cocoa/dialogs/authors.txt
diff --git a/extra/cocoa/dialogs/dialogs-docs.factor b/basis/cocoa/dialogs/dialogs-docs.factor
similarity index 100%
rename from extra/cocoa/dialogs/dialogs-docs.factor
rename to basis/cocoa/dialogs/dialogs-docs.factor
diff --git a/extra/cocoa/dialogs/dialogs.factor b/basis/cocoa/dialogs/dialogs.factor
similarity index 100%
rename from extra/cocoa/dialogs/dialogs.factor
rename to basis/cocoa/dialogs/dialogs.factor
diff --git a/extra/cocoa/dialogs/summary.txt b/basis/cocoa/dialogs/summary.txt
similarity index 100%
rename from extra/cocoa/dialogs/summary.txt
rename to basis/cocoa/dialogs/summary.txt
diff --git a/extra/cocoa/enumeration/enumeration.factor b/basis/cocoa/enumeration/enumeration.factor
similarity index 100%
rename from extra/cocoa/enumeration/enumeration.factor
rename to basis/cocoa/enumeration/enumeration.factor
diff --git a/core/cpu/ppc/architecture/authors.txt b/basis/cocoa/messages/authors.txt
similarity index 100%
rename from core/cpu/ppc/architecture/authors.txt
rename to basis/cocoa/messages/authors.txt
diff --git a/extra/cocoa/messages/messages-docs.factor b/basis/cocoa/messages/messages-docs.factor
similarity index 100%
rename from extra/cocoa/messages/messages-docs.factor
rename to basis/cocoa/messages/messages-docs.factor
diff --git a/extra/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor
similarity index 100%
rename from extra/cocoa/messages/messages.factor
rename to basis/cocoa/messages/messages.factor
diff --git a/extra/cocoa/messages/summary.txt b/basis/cocoa/messages/summary.txt
similarity index 100%
rename from extra/cocoa/messages/summary.txt
rename to basis/cocoa/messages/summary.txt
diff --git a/extra/cocoa/nibs/authors.txt b/basis/cocoa/nibs/authors.txt
similarity index 100%
rename from extra/cocoa/nibs/authors.txt
rename to basis/cocoa/nibs/authors.txt
diff --git a/extra/cocoa/nibs/nibs-docs.factor b/basis/cocoa/nibs/nibs-docs.factor
similarity index 100%
rename from extra/cocoa/nibs/nibs-docs.factor
rename to basis/cocoa/nibs/nibs-docs.factor
diff --git a/extra/cocoa/nibs/nibs.factor b/basis/cocoa/nibs/nibs.factor
similarity index 100%
rename from extra/cocoa/nibs/nibs.factor
rename to basis/cocoa/nibs/nibs.factor
diff --git a/extra/cocoa/nibs/summary.txt b/basis/cocoa/nibs/summary.txt
similarity index 100%
rename from extra/cocoa/nibs/summary.txt
rename to basis/cocoa/nibs/summary.txt
diff --git a/core/cpu/ppc/assembler/authors.txt b/basis/cocoa/pasteboard/authors.txt
similarity index 100%
rename from core/cpu/ppc/assembler/authors.txt
rename to basis/cocoa/pasteboard/authors.txt
diff --git a/extra/cocoa/pasteboard/pasteboard-docs.factor b/basis/cocoa/pasteboard/pasteboard-docs.factor
similarity index 100%
rename from extra/cocoa/pasteboard/pasteboard-docs.factor
rename to basis/cocoa/pasteboard/pasteboard-docs.factor
diff --git a/extra/cocoa/pasteboard/pasteboard.factor b/basis/cocoa/pasteboard/pasteboard.factor
similarity index 100%
rename from extra/cocoa/pasteboard/pasteboard.factor
rename to basis/cocoa/pasteboard/pasteboard.factor
diff --git a/extra/cocoa/pasteboard/summary.txt b/basis/cocoa/pasteboard/summary.txt
similarity index 100%
rename from extra/cocoa/pasteboard/summary.txt
rename to basis/cocoa/pasteboard/summary.txt
diff --git a/core/cpu/ppc/authors.txt b/basis/cocoa/plists/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/cpu/ppc/authors.txt
rename to basis/cocoa/plists/authors.txt
diff --git a/extra/cocoa/plists/plists.factor b/basis/cocoa/plists/plists.factor
similarity index 100%
rename from extra/cocoa/plists/plists.factor
rename to basis/cocoa/plists/plists.factor
diff --git a/core/cpu/ppc/intrinsics/authors.txt b/basis/cocoa/runtime/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/ppc/intrinsics/authors.txt
rename to basis/cocoa/runtime/authors.txt
diff --git a/extra/cocoa/runtime/runtime.factor b/basis/cocoa/runtime/runtime.factor
similarity index 100%
rename from extra/cocoa/runtime/runtime.factor
rename to basis/cocoa/runtime/runtime.factor
diff --git a/extra/cocoa/runtime/summary.txt b/basis/cocoa/runtime/summary.txt
similarity index 100%
rename from extra/cocoa/runtime/summary.txt
rename to basis/cocoa/runtime/summary.txt
diff --git a/core/cpu/x86/32/authors.txt b/basis/cocoa/subclassing/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/x86/32/authors.txt
rename to basis/cocoa/subclassing/authors.txt
diff --git a/extra/cocoa/subclassing/subclassing-docs.factor b/basis/cocoa/subclassing/subclassing-docs.factor
similarity index 100%
rename from extra/cocoa/subclassing/subclassing-docs.factor
rename to basis/cocoa/subclassing/subclassing-docs.factor
diff --git a/extra/cocoa/subclassing/subclassing.factor b/basis/cocoa/subclassing/subclassing.factor
similarity index 100%
rename from extra/cocoa/subclassing/subclassing.factor
rename to basis/cocoa/subclassing/subclassing.factor
diff --git a/extra/cocoa/subclassing/summary.txt b/basis/cocoa/subclassing/summary.txt
similarity index 100%
rename from extra/cocoa/subclassing/summary.txt
rename to basis/cocoa/subclassing/summary.txt
diff --git a/extra/cocoa/summary.txt b/basis/cocoa/summary.txt
similarity index 100%
rename from extra/cocoa/summary.txt
rename to basis/cocoa/summary.txt
diff --git a/extra/cocoa/tags.txt b/basis/cocoa/tags.txt
similarity index 100%
rename from extra/cocoa/tags.txt
rename to basis/cocoa/tags.txt
diff --git a/core/cpu/x86/64/authors.txt b/basis/cocoa/types/authors.txt
similarity index 100%
rename from core/cpu/x86/64/authors.txt
rename to basis/cocoa/types/authors.txt
diff --git a/extra/cocoa/types/summary.txt b/basis/cocoa/types/summary.txt
similarity index 100%
rename from extra/cocoa/types/summary.txt
rename to basis/cocoa/types/summary.txt
diff --git a/extra/cocoa/types/types-docs.factor b/basis/cocoa/types/types-docs.factor
similarity index 100%
rename from extra/cocoa/types/types-docs.factor
rename to basis/cocoa/types/types-docs.factor
diff --git a/extra/cocoa/types/types.factor b/basis/cocoa/types/types.factor
similarity index 100%
rename from extra/cocoa/types/types.factor
rename to basis/cocoa/types/types.factor
diff --git a/core/cpu/x86/allot/authors.txt b/basis/cocoa/views/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/x86/allot/authors.txt
rename to basis/cocoa/views/authors.txt
diff --git a/extra/cocoa/views/summary.txt b/basis/cocoa/views/summary.txt
similarity index 100%
rename from extra/cocoa/views/summary.txt
rename to basis/cocoa/views/summary.txt
diff --git a/extra/cocoa/views/views-docs.factor b/basis/cocoa/views/views-docs.factor
similarity index 100%
rename from extra/cocoa/views/views-docs.factor
rename to basis/cocoa/views/views-docs.factor
diff --git a/extra/cocoa/views/views.factor b/basis/cocoa/views/views.factor
similarity index 100%
rename from extra/cocoa/views/views.factor
rename to basis/cocoa/views/views.factor
diff --git a/core/cpu/x86/architecture/authors.txt b/basis/cocoa/windows/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/x86/architecture/authors.txt
rename to basis/cocoa/windows/authors.txt
diff --git a/extra/cocoa/windows/summary.txt b/basis/cocoa/windows/summary.txt
similarity index 100%
rename from extra/cocoa/windows/summary.txt
rename to basis/cocoa/windows/summary.txt
diff --git a/extra/cocoa/windows/windows-docs.factor b/basis/cocoa/windows/windows-docs.factor
similarity index 100%
rename from extra/cocoa/windows/windows-docs.factor
rename to basis/cocoa/windows/windows-docs.factor
diff --git a/extra/cocoa/windows/windows.factor b/basis/cocoa/windows/windows.factor
similarity index 100%
rename from extra/cocoa/windows/windows.factor
rename to basis/cocoa/windows/windows.factor
diff --git a/extra/columns/authors.txt b/basis/columns/authors.txt
similarity index 100%
rename from extra/columns/authors.txt
rename to basis/columns/authors.txt
diff --git a/extra/columns/columns-docs.factor b/basis/columns/columns-docs.factor
similarity index 100%
rename from extra/columns/columns-docs.factor
rename to basis/columns/columns-docs.factor
diff --git a/extra/columns/columns-tests.factor b/basis/columns/columns-tests.factor
similarity index 100%
rename from extra/columns/columns-tests.factor
rename to basis/columns/columns-tests.factor
diff --git a/extra/columns/columns.factor b/basis/columns/columns.factor
similarity index 100%
rename from extra/columns/columns.factor
rename to basis/columns/columns.factor
diff --git a/extra/columns/summary.txt b/basis/columns/summary.txt
similarity index 100%
rename from extra/columns/summary.txt
rename to basis/columns/summary.txt
diff --git a/extra/biassocs/tags.txt b/basis/columns/tags.txt
similarity index 100%
rename from extra/biassocs/tags.txt
rename to basis/columns/tags.txt
diff --git a/extra/combinators/short-circuit/short-circuit-tests.factor b/basis/combinators/short-circuit/short-circuit-tests.factor
similarity index 100%
rename from extra/combinators/short-circuit/short-circuit-tests.factor
rename to basis/combinators/short-circuit/short-circuit-tests.factor
diff --git a/extra/combinators/short-circuit/short-circuit.factor b/basis/combinators/short-circuit/short-circuit.factor
similarity index 100%
rename from extra/combinators/short-circuit/short-circuit.factor
rename to basis/combinators/short-circuit/short-circuit.factor
diff --git a/extra/combinators/short-circuit/smart/smart-tests.factor b/basis/combinators/short-circuit/smart/smart-tests.factor
similarity index 100%
rename from extra/combinators/short-circuit/smart/smart-tests.factor
rename to basis/combinators/short-circuit/smart/smart-tests.factor
diff --git a/extra/combinators/short-circuit/smart/smart.factor b/basis/combinators/short-circuit/smart/smart.factor
similarity index 100%
rename from extra/combinators/short-circuit/smart/smart.factor
rename to basis/combinators/short-circuit/smart/smart.factor
diff --git a/core/cpu/x86/assembler/authors.txt b/basis/command-line/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/cpu/x86/assembler/authors.txt
rename to basis/command-line/authors.txt
diff --git a/core/command-line/command-line-docs.factor b/basis/command-line/command-line-docs.factor
similarity index 100%
rename from core/command-line/command-line-docs.factor
rename to basis/command-line/command-line-docs.factor
diff --git a/core/command-line/command-line-tests.factor b/basis/command-line/command-line-tests.factor
similarity index 100%
rename from core/command-line/command-line-tests.factor
rename to basis/command-line/command-line-tests.factor
diff --git a/core/command-line/command-line.factor b/basis/command-line/command-line.factor
similarity index 95%
rename from core/command-line/command-line.factor
rename to basis/command-line/command-line.factor
index fb4fd374a7..37dbf9b7a6 100644
--- a/core/command-line/command-line.factor
+++ b/basis/command-line/command-line.factor
@@ -1,8 +1,8 @@
-! Copyright (C) 2003, 2007 Slava Pestov.
+! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: init continuations debugger hashtables io kernel
 kernel.private namespaces parser sequences strings system
-splitting io.files ;
+splitting io.files eval ;
 IN: command-line
 
 : run-bootstrap-init ( -- )
diff --git a/core/command-line/summary.txt b/basis/command-line/summary.txt
similarity index 100%
rename from core/command-line/summary.txt
rename to basis/command-line/summary.txt
diff --git a/core/cpu/x86/authors.txt b/basis/compiler/authors.txt
similarity index 100%
rename from core/cpu/x86/authors.txt
rename to basis/compiler/authors.txt
diff --git a/core/compiler/compiler-docs.factor b/basis/compiler/compiler-docs.factor
similarity index 100%
rename from core/compiler/compiler-docs.factor
rename to basis/compiler/compiler-docs.factor
diff --git a/core/compiler/compiler.factor b/basis/compiler/compiler.factor
similarity index 100%
rename from core/compiler/compiler.factor
rename to basis/compiler/compiler.factor
diff --git a/core/cpu/x86/intrinsics/authors.txt b/basis/compiler/constants/authors.txt
similarity index 100%
rename from core/cpu/x86/intrinsics/authors.txt
rename to basis/compiler/constants/authors.txt
diff --git a/core/compiler/constants/constants.factor b/basis/compiler/constants/constants.factor
similarity index 100%
rename from core/compiler/constants/constants.factor
rename to basis/compiler/constants/constants.factor
diff --git a/core/compiler/constants/summary.txt b/basis/compiler/constants/summary.txt
similarity index 100%
rename from core/compiler/constants/summary.txt
rename to basis/compiler/constants/summary.txt
diff --git a/core/compiler/summary.txt b/basis/compiler/summary.txt
similarity index 100%
rename from core/compiler/summary.txt
rename to basis/compiler/summary.txt
diff --git a/core/compiler/tags.txt b/basis/compiler/tags.txt
similarity index 100%
rename from core/compiler/tags.txt
rename to basis/compiler/tags.txt
diff --git a/core/compiler/tests/curry.factor b/basis/compiler/tests/curry.factor
similarity index 100%
rename from core/compiler/tests/curry.factor
rename to basis/compiler/tests/curry.factor
diff --git a/core/compiler/tests/float.factor b/basis/compiler/tests/float.factor
similarity index 100%
rename from core/compiler/tests/float.factor
rename to basis/compiler/tests/float.factor
diff --git a/core/compiler/tests/insane.factor b/basis/compiler/tests/insane.factor
similarity index 100%
rename from core/compiler/tests/insane.factor
rename to basis/compiler/tests/insane.factor
diff --git a/core/compiler/tests/intrinsics.factor b/basis/compiler/tests/intrinsics.factor
similarity index 100%
rename from core/compiler/tests/intrinsics.factor
rename to basis/compiler/tests/intrinsics.factor
diff --git a/core/compiler/tests/redefine1.factor b/basis/compiler/tests/redefine1.factor
similarity index 100%
rename from core/compiler/tests/redefine1.factor
rename to basis/compiler/tests/redefine1.factor
diff --git a/core/compiler/tests/redefine2.factor b/basis/compiler/tests/redefine2.factor
similarity index 100%
rename from core/compiler/tests/redefine2.factor
rename to basis/compiler/tests/redefine2.factor
diff --git a/core/compiler/tests/redefine3.factor b/basis/compiler/tests/redefine3.factor
similarity index 100%
rename from core/compiler/tests/redefine3.factor
rename to basis/compiler/tests/redefine3.factor
diff --git a/core/compiler/tests/reload.factor b/basis/compiler/tests/reload.factor
similarity index 100%
rename from core/compiler/tests/reload.factor
rename to basis/compiler/tests/reload.factor
diff --git a/core/compiler/tests/simple.factor b/basis/compiler/tests/simple.factor
similarity index 100%
rename from core/compiler/tests/simple.factor
rename to basis/compiler/tests/simple.factor
diff --git a/core/compiler/tests/stack-trace.factor b/basis/compiler/tests/stack-trace.factor
similarity index 100%
rename from core/compiler/tests/stack-trace.factor
rename to basis/compiler/tests/stack-trace.factor
diff --git a/core/compiler/tests/templates-early.factor b/basis/compiler/tests/templates-early.factor
similarity index 100%
rename from core/compiler/tests/templates-early.factor
rename to basis/compiler/tests/templates-early.factor
diff --git a/core/compiler/tests/templates.factor b/basis/compiler/tests/templates.factor
similarity index 100%
rename from core/compiler/tests/templates.factor
rename to basis/compiler/tests/templates.factor
diff --git a/core/compiler/tests/tuples.factor b/basis/compiler/tests/tuples.factor
similarity index 100%
rename from core/compiler/tests/tuples.factor
rename to basis/compiler/tests/tuples.factor
diff --git a/extra/concurrency/combinators/combinators-docs.factor b/basis/concurrency/combinators/combinators-docs.factor
similarity index 100%
rename from extra/concurrency/combinators/combinators-docs.factor
rename to basis/concurrency/combinators/combinators-docs.factor
diff --git a/extra/concurrency/combinators/combinators-tests.factor b/basis/concurrency/combinators/combinators-tests.factor
similarity index 100%
rename from extra/concurrency/combinators/combinators-tests.factor
rename to basis/concurrency/combinators/combinators-tests.factor
diff --git a/extra/concurrency/combinators/combinators.factor b/basis/concurrency/combinators/combinators.factor
similarity index 100%
rename from extra/concurrency/combinators/combinators.factor
rename to basis/concurrency/combinators/combinators.factor
diff --git a/extra/concurrency/combinators/summary.txt b/basis/concurrency/combinators/summary.txt
similarity index 100%
rename from extra/concurrency/combinators/summary.txt
rename to basis/concurrency/combinators/summary.txt
diff --git a/extra/concurrency/conditions/conditions.factor b/basis/concurrency/conditions/conditions.factor
similarity index 100%
rename from extra/concurrency/conditions/conditions.factor
rename to basis/concurrency/conditions/conditions.factor
diff --git a/extra/concurrency/conditions/summary.txt b/basis/concurrency/conditions/summary.txt
similarity index 100%
rename from extra/concurrency/conditions/summary.txt
rename to basis/concurrency/conditions/summary.txt
diff --git a/extra/concurrency/count-downs/count-downs-docs.factor b/basis/concurrency/count-downs/count-downs-docs.factor
similarity index 100%
rename from extra/concurrency/count-downs/count-downs-docs.factor
rename to basis/concurrency/count-downs/count-downs-docs.factor
diff --git a/extra/concurrency/count-downs/count-downs-tests.factor b/basis/concurrency/count-downs/count-downs-tests.factor
similarity index 100%
rename from extra/concurrency/count-downs/count-downs-tests.factor
rename to basis/concurrency/count-downs/count-downs-tests.factor
diff --git a/extra/concurrency/count-downs/count-downs.factor b/basis/concurrency/count-downs/count-downs.factor
similarity index 100%
rename from extra/concurrency/count-downs/count-downs.factor
rename to basis/concurrency/count-downs/count-downs.factor
diff --git a/extra/concurrency/count-downs/summary.txt b/basis/concurrency/count-downs/summary.txt
similarity index 100%
rename from extra/concurrency/count-downs/summary.txt
rename to basis/concurrency/count-downs/summary.txt
diff --git a/extra/concurrency/distributed/authors.txt b/basis/concurrency/distributed/authors.txt
similarity index 100%
rename from extra/concurrency/distributed/authors.txt
rename to basis/concurrency/distributed/authors.txt
diff --git a/extra/concurrency/distributed/distributed-docs.factor b/basis/concurrency/distributed/distributed-docs.factor
similarity index 100%
rename from extra/concurrency/distributed/distributed-docs.factor
rename to basis/concurrency/distributed/distributed-docs.factor
diff --git a/extra/concurrency/distributed/distributed-tests.factor b/basis/concurrency/distributed/distributed-tests.factor
similarity index 100%
rename from extra/concurrency/distributed/distributed-tests.factor
rename to basis/concurrency/distributed/distributed-tests.factor
diff --git a/extra/concurrency/distributed/distributed.factor b/basis/concurrency/distributed/distributed.factor
similarity index 100%
rename from extra/concurrency/distributed/distributed.factor
rename to basis/concurrency/distributed/distributed.factor
diff --git a/extra/concurrency/distributed/summary.txt b/basis/concurrency/distributed/summary.txt
similarity index 100%
rename from extra/concurrency/distributed/summary.txt
rename to basis/concurrency/distributed/summary.txt
diff --git a/extra/concurrency/distributed/tags.txt b/basis/concurrency/distributed/tags.txt
similarity index 100%
rename from extra/concurrency/distributed/tags.txt
rename to basis/concurrency/distributed/tags.txt
diff --git a/core/cpu/x86/sse2/authors.txt b/basis/concurrency/exchangers/authors.txt
similarity index 100%
rename from core/cpu/x86/sse2/authors.txt
rename to basis/concurrency/exchangers/authors.txt
diff --git a/extra/concurrency/exchangers/exchangers-docs.factor b/basis/concurrency/exchangers/exchangers-docs.factor
similarity index 100%
rename from extra/concurrency/exchangers/exchangers-docs.factor
rename to basis/concurrency/exchangers/exchangers-docs.factor
diff --git a/extra/concurrency/exchangers/exchangers-tests.factor b/basis/concurrency/exchangers/exchangers-tests.factor
similarity index 100%
rename from extra/concurrency/exchangers/exchangers-tests.factor
rename to basis/concurrency/exchangers/exchangers-tests.factor
diff --git a/extra/concurrency/exchangers/exchangers.factor b/basis/concurrency/exchangers/exchangers.factor
similarity index 100%
rename from extra/concurrency/exchangers/exchangers.factor
rename to basis/concurrency/exchangers/exchangers.factor
diff --git a/extra/concurrency/exchangers/summary.txt b/basis/concurrency/exchangers/summary.txt
similarity index 100%
rename from extra/concurrency/exchangers/summary.txt
rename to basis/concurrency/exchangers/summary.txt
diff --git a/extra/concurrency/flags/flags-docs.factor b/basis/concurrency/flags/flags-docs.factor
similarity index 100%
rename from extra/concurrency/flags/flags-docs.factor
rename to basis/concurrency/flags/flags-docs.factor
diff --git a/extra/concurrency/flags/flags-tests.factor b/basis/concurrency/flags/flags-tests.factor
similarity index 100%
rename from extra/concurrency/flags/flags-tests.factor
rename to basis/concurrency/flags/flags-tests.factor
diff --git a/extra/concurrency/flags/flags.factor b/basis/concurrency/flags/flags.factor
similarity index 100%
rename from extra/concurrency/flags/flags.factor
rename to basis/concurrency/flags/flags.factor
diff --git a/extra/concurrency/futures/authors.txt b/basis/concurrency/futures/authors.txt
similarity index 100%
rename from extra/concurrency/futures/authors.txt
rename to basis/concurrency/futures/authors.txt
diff --git a/extra/concurrency/futures/futures-docs.factor b/basis/concurrency/futures/futures-docs.factor
similarity index 100%
rename from extra/concurrency/futures/futures-docs.factor
rename to basis/concurrency/futures/futures-docs.factor
diff --git a/extra/concurrency/futures/futures-tests.factor b/basis/concurrency/futures/futures-tests.factor
similarity index 100%
rename from extra/concurrency/futures/futures-tests.factor
rename to basis/concurrency/futures/futures-tests.factor
diff --git a/extra/concurrency/futures/futures.factor b/basis/concurrency/futures/futures.factor
similarity index 100%
rename from extra/concurrency/futures/futures.factor
rename to basis/concurrency/futures/futures.factor
diff --git a/extra/concurrency/futures/summary.txt b/basis/concurrency/futures/summary.txt
similarity index 100%
rename from extra/concurrency/futures/summary.txt
rename to basis/concurrency/futures/summary.txt
diff --git a/core/debugger/authors.txt b/basis/concurrency/locks/authors.txt
similarity index 100%
rename from core/debugger/authors.txt
rename to basis/concurrency/locks/authors.txt
diff --git a/extra/concurrency/locks/locks-docs.factor b/basis/concurrency/locks/locks-docs.factor
similarity index 100%
rename from extra/concurrency/locks/locks-docs.factor
rename to basis/concurrency/locks/locks-docs.factor
diff --git a/extra/concurrency/locks/locks-tests.factor b/basis/concurrency/locks/locks-tests.factor
similarity index 100%
rename from extra/concurrency/locks/locks-tests.factor
rename to basis/concurrency/locks/locks-tests.factor
diff --git a/extra/concurrency/locks/locks.factor b/basis/concurrency/locks/locks.factor
similarity index 100%
rename from extra/concurrency/locks/locks.factor
rename to basis/concurrency/locks/locks.factor
diff --git a/extra/concurrency/locks/summary.txt b/basis/concurrency/locks/summary.txt
similarity index 100%
rename from extra/concurrency/locks/summary.txt
rename to basis/concurrency/locks/summary.txt
diff --git a/extra/concurrency/mailboxes/mailboxes-docs.factor b/basis/concurrency/mailboxes/mailboxes-docs.factor
similarity index 100%
rename from extra/concurrency/mailboxes/mailboxes-docs.factor
rename to basis/concurrency/mailboxes/mailboxes-docs.factor
diff --git a/extra/concurrency/mailboxes/mailboxes-tests.factor b/basis/concurrency/mailboxes/mailboxes-tests.factor
similarity index 100%
rename from extra/concurrency/mailboxes/mailboxes-tests.factor
rename to basis/concurrency/mailboxes/mailboxes-tests.factor
diff --git a/extra/concurrency/mailboxes/mailboxes.factor b/basis/concurrency/mailboxes/mailboxes.factor
similarity index 100%
rename from extra/concurrency/mailboxes/mailboxes.factor
rename to basis/concurrency/mailboxes/mailboxes.factor
diff --git a/extra/concurrency/messaging/authors.txt b/basis/concurrency/messaging/authors.txt
similarity index 100%
rename from extra/concurrency/messaging/authors.txt
rename to basis/concurrency/messaging/authors.txt
diff --git a/extra/concurrency/messaging/messaging-docs.factor b/basis/concurrency/messaging/messaging-docs.factor
similarity index 100%
rename from extra/concurrency/messaging/messaging-docs.factor
rename to basis/concurrency/messaging/messaging-docs.factor
diff --git a/extra/concurrency/messaging/messaging-tests.factor b/basis/concurrency/messaging/messaging-tests.factor
similarity index 100%
rename from extra/concurrency/messaging/messaging-tests.factor
rename to basis/concurrency/messaging/messaging-tests.factor
diff --git a/extra/concurrency/messaging/messaging.factor b/basis/concurrency/messaging/messaging.factor
similarity index 100%
rename from extra/concurrency/messaging/messaging.factor
rename to basis/concurrency/messaging/messaging.factor
diff --git a/extra/concurrency/messaging/summary.txt b/basis/concurrency/messaging/summary.txt
similarity index 100%
rename from extra/concurrency/messaging/summary.txt
rename to basis/concurrency/messaging/summary.txt
diff --git a/extra/concurrency/promises/authors.txt b/basis/concurrency/promises/authors.txt
similarity index 100%
rename from extra/concurrency/promises/authors.txt
rename to basis/concurrency/promises/authors.txt
diff --git a/extra/concurrency/promises/promises-docs.factor b/basis/concurrency/promises/promises-docs.factor
similarity index 100%
rename from extra/concurrency/promises/promises-docs.factor
rename to basis/concurrency/promises/promises-docs.factor
diff --git a/extra/concurrency/promises/promises-tests.factor b/basis/concurrency/promises/promises-tests.factor
similarity index 100%
rename from extra/concurrency/promises/promises-tests.factor
rename to basis/concurrency/promises/promises-tests.factor
diff --git a/extra/concurrency/promises/promises.factor b/basis/concurrency/promises/promises.factor
similarity index 100%
rename from extra/concurrency/promises/promises.factor
rename to basis/concurrency/promises/promises.factor
diff --git a/extra/concurrency/promises/summary.txt b/basis/concurrency/promises/summary.txt
similarity index 100%
rename from extra/concurrency/promises/summary.txt
rename to basis/concurrency/promises/summary.txt
diff --git a/core/dequeues/authors.txt b/basis/concurrency/semaphores/authors.txt
similarity index 100%
rename from core/dequeues/authors.txt
rename to basis/concurrency/semaphores/authors.txt
diff --git a/extra/concurrency/semaphores/semaphores-docs.factor b/basis/concurrency/semaphores/semaphores-docs.factor
similarity index 100%
rename from extra/concurrency/semaphores/semaphores-docs.factor
rename to basis/concurrency/semaphores/semaphores-docs.factor
diff --git a/extra/concurrency/semaphores/semaphores.factor b/basis/concurrency/semaphores/semaphores.factor
similarity index 100%
rename from extra/concurrency/semaphores/semaphores.factor
rename to basis/concurrency/semaphores/semaphores.factor
diff --git a/extra/concurrency/semaphores/summary.txt b/basis/concurrency/semaphores/summary.txt
similarity index 100%
rename from extra/concurrency/semaphores/summary.txt
rename to basis/concurrency/semaphores/summary.txt
diff --git a/core/generator/authors.txt b/basis/core-foundation/authors.txt
similarity index 100%
rename from core/generator/authors.txt
rename to basis/core-foundation/authors.txt
diff --git a/extra/core-foundation/core-foundation-docs.factor b/basis/core-foundation/core-foundation-docs.factor
similarity index 100%
rename from extra/core-foundation/core-foundation-docs.factor
rename to basis/core-foundation/core-foundation-docs.factor
diff --git a/extra/core-foundation/core-foundation.factor b/basis/core-foundation/core-foundation.factor
similarity index 100%
rename from extra/core-foundation/core-foundation.factor
rename to basis/core-foundation/core-foundation.factor
diff --git a/extra/core-foundation/fsevents/fsevents.factor b/basis/core-foundation/fsevents/fsevents.factor
similarity index 100%
rename from extra/core-foundation/fsevents/fsevents.factor
rename to basis/core-foundation/fsevents/fsevents.factor
diff --git a/extra/core-foundation/run-loop/run-loop.factor b/basis/core-foundation/run-loop/run-loop.factor
similarity index 100%
rename from extra/core-foundation/run-loop/run-loop.factor
rename to basis/core-foundation/run-loop/run-loop.factor
diff --git a/extra/core-foundation/summary.txt b/basis/core-foundation/summary.txt
similarity index 100%
rename from extra/core-foundation/summary.txt
rename to basis/core-foundation/summary.txt
diff --git a/extra/core-foundation/tags.txt b/basis/core-foundation/tags.txt
similarity index 100%
rename from extra/core-foundation/tags.txt
rename to basis/core-foundation/tags.txt
diff --git a/core/cpu/architecture/architecture.factor b/basis/cpu/architecture/architecture.factor
similarity index 100%
rename from core/cpu/architecture/architecture.factor
rename to basis/cpu/architecture/architecture.factor
diff --git a/core/generator/fixup/authors.txt b/basis/cpu/architecture/authors.txt
similarity index 100%
rename from core/generator/fixup/authors.txt
rename to basis/cpu/architecture/authors.txt
diff --git a/core/cpu/architecture/summary.txt b/basis/cpu/architecture/summary.txt
similarity index 100%
rename from core/cpu/architecture/summary.txt
rename to basis/cpu/architecture/summary.txt
diff --git a/core/cpu/architecture/tags.txt b/basis/cpu/architecture/tags.txt
similarity index 100%
rename from core/cpu/architecture/tags.txt
rename to basis/cpu/architecture/tags.txt
diff --git a/core/cpu/arm/4/4.factor b/basis/cpu/arm/4/4.factor
similarity index 100%
rename from core/cpu/arm/4/4.factor
rename to basis/cpu/arm/4/4.factor
diff --git a/core/generator/registers/authors.txt b/basis/cpu/arm/4/authors.txt
similarity index 100%
rename from core/generator/registers/authors.txt
rename to basis/cpu/arm/4/authors.txt
diff --git a/core/cpu/arm/4/summary.txt b/basis/cpu/arm/4/summary.txt
similarity index 100%
rename from core/cpu/arm/4/summary.txt
rename to basis/cpu/arm/4/summary.txt
diff --git a/core/cpu/arm/allot/allot.factor b/basis/cpu/arm/allot/allot.factor
similarity index 100%
rename from core/cpu/arm/allot/allot.factor
rename to basis/cpu/arm/allot/allot.factor
diff --git a/core/inference/authors.txt b/basis/cpu/arm/allot/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/inference/authors.txt
rename to basis/cpu/arm/allot/authors.txt
diff --git a/core/cpu/arm/architecture/architecture.factor b/basis/cpu/arm/architecture/architecture.factor
similarity index 100%
rename from core/cpu/arm/architecture/architecture.factor
rename to basis/cpu/arm/architecture/architecture.factor
diff --git a/core/inference/backend/authors.txt b/basis/cpu/arm/architecture/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/inference/backend/authors.txt
rename to basis/cpu/arm/architecture/authors.txt
diff --git a/core/cpu/arm/arm.factor b/basis/cpu/arm/arm.factor
similarity index 100%
rename from core/cpu/arm/arm.factor
rename to basis/cpu/arm/arm.factor
diff --git a/core/cpu/arm/assembler/assembler-tests.factor b/basis/cpu/arm/assembler/assembler-tests.factor
similarity index 100%
rename from core/cpu/arm/assembler/assembler-tests.factor
rename to basis/cpu/arm/assembler/assembler-tests.factor
diff --git a/core/cpu/arm/assembler/assembler.factor b/basis/cpu/arm/assembler/assembler.factor
similarity index 100%
rename from core/cpu/arm/assembler/assembler.factor
rename to basis/cpu/arm/assembler/assembler.factor
diff --git a/core/inference/class/authors.txt b/basis/cpu/arm/assembler/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/inference/class/authors.txt
rename to basis/cpu/arm/assembler/authors.txt
diff --git a/core/inference/dataflow/authors.txt b/basis/cpu/arm/authors.txt
similarity index 100%
rename from core/inference/dataflow/authors.txt
rename to basis/cpu/arm/authors.txt
diff --git a/core/cpu/arm/bootstrap.factor b/basis/cpu/arm/bootstrap.factor
similarity index 100%
rename from core/cpu/arm/bootstrap.factor
rename to basis/cpu/arm/bootstrap.factor
diff --git a/core/inference/errors/authors.txt b/basis/cpu/arm/intrinsics/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/inference/errors/authors.txt
rename to basis/cpu/arm/intrinsics/authors.txt
diff --git a/core/cpu/arm/intrinsics/intrinsics.factor b/basis/cpu/arm/intrinsics/intrinsics.factor
similarity index 100%
rename from core/cpu/arm/intrinsics/intrinsics.factor
rename to basis/cpu/arm/intrinsics/intrinsics.factor
diff --git a/core/cpu/arm/summary.txt b/basis/cpu/arm/summary.txt
similarity index 100%
rename from core/cpu/arm/summary.txt
rename to basis/cpu/arm/summary.txt
diff --git a/core/cpu/arm/tags.txt b/basis/cpu/arm/tags.txt
similarity index 100%
rename from core/cpu/arm/tags.txt
rename to basis/cpu/arm/tags.txt
diff --git a/core/cpu/ppc/allot/allot.factor b/basis/cpu/ppc/allot/allot.factor
similarity index 100%
rename from core/cpu/ppc/allot/allot.factor
rename to basis/cpu/ppc/allot/allot.factor
diff --git a/core/inference/known-words/authors.txt b/basis/cpu/ppc/allot/authors.txt
similarity index 100%
rename from core/inference/known-words/authors.txt
rename to basis/cpu/ppc/allot/authors.txt
diff --git a/core/cpu/ppc/allot/summary.txt b/basis/cpu/ppc/allot/summary.txt
similarity index 100%
rename from core/cpu/ppc/allot/summary.txt
rename to basis/cpu/ppc/allot/summary.txt
diff --git a/core/cpu/ppc/architecture/architecture.factor b/basis/cpu/ppc/architecture/architecture.factor
similarity index 100%
rename from core/cpu/ppc/architecture/architecture.factor
rename to basis/cpu/ppc/architecture/architecture.factor
diff --git a/core/inference/state/authors.txt b/basis/cpu/ppc/architecture/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/inference/state/authors.txt
rename to basis/cpu/ppc/architecture/authors.txt
diff --git a/core/cpu/ppc/architecture/summary.txt b/basis/cpu/ppc/architecture/summary.txt
similarity index 100%
rename from core/cpu/ppc/architecture/summary.txt
rename to basis/cpu/ppc/architecture/summary.txt
diff --git a/core/cpu/ppc/assembler/assembler-tests.factor b/basis/cpu/ppc/assembler/assembler-tests.factor
similarity index 100%
rename from core/cpu/ppc/assembler/assembler-tests.factor
rename to basis/cpu/ppc/assembler/assembler-tests.factor
diff --git a/core/cpu/ppc/assembler/assembler.factor b/basis/cpu/ppc/assembler/assembler.factor
similarity index 100%
rename from core/cpu/ppc/assembler/assembler.factor
rename to basis/cpu/ppc/assembler/assembler.factor
diff --git a/core/inference/transforms/authors.txt b/basis/cpu/ppc/assembler/authors.txt
similarity index 100%
rename from core/inference/transforms/authors.txt
rename to basis/cpu/ppc/assembler/authors.txt
diff --git a/core/cpu/ppc/assembler/backend/backend.factor b/basis/cpu/ppc/assembler/backend/backend.factor
similarity index 100%
rename from core/cpu/ppc/assembler/backend/backend.factor
rename to basis/cpu/ppc/assembler/backend/backend.factor
diff --git a/core/cpu/ppc/assembler/summary.txt b/basis/cpu/ppc/assembler/summary.txt
similarity index 100%
rename from core/cpu/ppc/assembler/summary.txt
rename to basis/cpu/ppc/assembler/summary.txt
diff --git a/core/inspector/authors.txt b/basis/cpu/ppc/authors.txt
similarity index 100%
rename from core/inspector/authors.txt
rename to basis/cpu/ppc/authors.txt
diff --git a/core/cpu/ppc/bootstrap.factor b/basis/cpu/ppc/bootstrap.factor
similarity index 100%
rename from core/cpu/ppc/bootstrap.factor
rename to basis/cpu/ppc/bootstrap.factor
diff --git a/core/listener/authors.txt b/basis/cpu/ppc/intrinsics/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/listener/authors.txt
rename to basis/cpu/ppc/intrinsics/authors.txt
diff --git a/core/cpu/ppc/intrinsics/intrinsics.factor b/basis/cpu/ppc/intrinsics/intrinsics.factor
similarity index 100%
rename from core/cpu/ppc/intrinsics/intrinsics.factor
rename to basis/cpu/ppc/intrinsics/intrinsics.factor
diff --git a/core/cpu/ppc/linux/bootstrap.factor b/basis/cpu/ppc/linux/bootstrap.factor
similarity index 100%
rename from core/cpu/ppc/linux/bootstrap.factor
rename to basis/cpu/ppc/linux/bootstrap.factor
diff --git a/core/cpu/ppc/macosx/bootstrap.factor b/basis/cpu/ppc/macosx/bootstrap.factor
similarity index 100%
rename from core/cpu/ppc/macosx/bootstrap.factor
rename to basis/cpu/ppc/macosx/bootstrap.factor
diff --git a/core/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor
similarity index 100%
rename from core/cpu/ppc/ppc.factor
rename to basis/cpu/ppc/ppc.factor
diff --git a/core/cpu/ppc/summary.txt b/basis/cpu/ppc/summary.txt
similarity index 100%
rename from core/cpu/ppc/summary.txt
rename to basis/cpu/ppc/summary.txt
diff --git a/core/cpu/ppc/tags.txt b/basis/cpu/ppc/tags.txt
similarity index 100%
rename from core/cpu/ppc/tags.txt
rename to basis/cpu/ppc/tags.txt
diff --git a/core/cpu/summary.txt b/basis/cpu/summary.txt
similarity index 100%
rename from core/cpu/summary.txt
rename to basis/cpu/summary.txt
diff --git a/core/cpu/tags.txt b/basis/cpu/tags.txt
similarity index 100%
rename from core/cpu/tags.txt
rename to basis/cpu/tags.txt
diff --git a/core/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor
similarity index 100%
rename from core/cpu/x86/32/32.factor
rename to basis/cpu/x86/32/32.factor
diff --git a/core/math/bitfields/authors.txt b/basis/cpu/x86/32/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/math/bitfields/authors.txt
rename to basis/cpu/x86/32/authors.txt
diff --git a/core/cpu/x86/32/bootstrap.factor b/basis/cpu/x86/32/bootstrap.factor
similarity index 87%
rename from core/cpu/x86/32/bootstrap.factor
rename to basis/cpu/x86/32/bootstrap.factor
index 386f1366fc..81779ac9f4 100755
--- a/core/cpu/x86/32/bootstrap.factor
+++ b/basis/cpu/x86/32/bootstrap.factor
@@ -15,5 +15,5 @@ IN: bootstrap.x86
 : fixnum>slot@ ( -- ) arg0 1 SAR ;
 : rex-length ( -- n ) 0 ;
 
-<< "resource:core/cpu/x86/bootstrap.factor" parse-file parsed >>
+<< "resource:basis/cpu/x86/bootstrap.factor" parse-file parsed >>
 call
diff --git a/core/cpu/x86/32/tags.txt b/basis/cpu/x86/32/tags.txt
similarity index 100%
rename from core/cpu/x86/32/tags.txt
rename to basis/cpu/x86/32/tags.txt
diff --git a/core/cpu/x86/64/64.factor b/basis/cpu/x86/64/64.factor
similarity index 100%
rename from core/cpu/x86/64/64.factor
rename to basis/cpu/x86/64/64.factor
diff --git a/core/math/intervals/authors.txt b/basis/cpu/x86/64/authors.txt
similarity index 100%
rename from core/math/intervals/authors.txt
rename to basis/cpu/x86/64/authors.txt
diff --git a/core/cpu/x86/64/bootstrap.factor b/basis/cpu/x86/64/bootstrap.factor
similarity index 86%
rename from core/cpu/x86/64/bootstrap.factor
rename to basis/cpu/x86/64/bootstrap.factor
index 0c9ce92edf..0092843bca 100755
--- a/core/cpu/x86/64/bootstrap.factor
+++ b/basis/cpu/x86/64/bootstrap.factor
@@ -15,5 +15,5 @@ IN: bootstrap.x86
 : fixnum>slot@ ( -- ) ;
 : rex-length ( -- n ) 1 ;
 
-<< "resource:core/cpu/x86/bootstrap.factor" parse-file parsed >>
+<< "resource:basis/cpu/x86/bootstrap.factor" parse-file parsed >>
 call
diff --git a/core/cpu/x86/64/summary.txt b/basis/cpu/x86/64/summary.txt
similarity index 100%
rename from core/cpu/x86/64/summary.txt
rename to basis/cpu/x86/64/summary.txt
diff --git a/core/cpu/x86/64/tags.txt b/basis/cpu/x86/64/tags.txt
similarity index 100%
rename from core/cpu/x86/64/tags.txt
rename to basis/cpu/x86/64/tags.txt
diff --git a/core/cpu/x86/allot/allot.factor b/basis/cpu/x86/allot/allot.factor
similarity index 100%
rename from core/cpu/x86/allot/allot.factor
rename to basis/cpu/x86/allot/allot.factor
diff --git a/core/mirrors/authors.txt b/basis/cpu/x86/allot/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/mirrors/authors.txt
rename to basis/cpu/x86/allot/authors.txt
diff --git a/core/cpu/x86/architecture/architecture.factor b/basis/cpu/x86/architecture/architecture.factor
similarity index 100%
rename from core/cpu/x86/architecture/architecture.factor
rename to basis/cpu/x86/architecture/architecture.factor
diff --git a/core/none/authors.txt b/basis/cpu/x86/architecture/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/none/authors.txt
rename to basis/cpu/x86/architecture/authors.txt
diff --git a/core/cpu/x86/assembler/assembler-tests.factor b/basis/cpu/x86/assembler/assembler-tests.factor
similarity index 100%
rename from core/cpu/x86/assembler/assembler-tests.factor
rename to basis/cpu/x86/assembler/assembler-tests.factor
diff --git a/core/cpu/x86/assembler/assembler.factor b/basis/cpu/x86/assembler/assembler.factor
similarity index 100%
rename from core/cpu/x86/assembler/assembler.factor
rename to basis/cpu/x86/assembler/assembler.factor
diff --git a/core/optimizer/authors.txt b/basis/cpu/x86/assembler/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/optimizer/authors.txt
rename to basis/cpu/x86/assembler/authors.txt
diff --git a/core/cpu/x86/assembler/syntax/syntax.factor b/basis/cpu/x86/assembler/syntax/syntax.factor
similarity index 100%
rename from core/cpu/x86/assembler/syntax/syntax.factor
rename to basis/cpu/x86/assembler/syntax/syntax.factor
diff --git a/core/optimizer/backend/authors.txt b/basis/cpu/x86/authors.txt
similarity index 100%
rename from core/optimizer/backend/authors.txt
rename to basis/cpu/x86/authors.txt
diff --git a/core/cpu/x86/bootstrap.factor b/basis/cpu/x86/bootstrap.factor
similarity index 100%
rename from core/cpu/x86/bootstrap.factor
rename to basis/cpu/x86/bootstrap.factor
diff --git a/core/optimizer/def-use/authors.txt b/basis/cpu/x86/intrinsics/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/optimizer/def-use/authors.txt
rename to basis/cpu/x86/intrinsics/authors.txt
diff --git a/core/cpu/x86/intrinsics/intrinsics.factor b/basis/cpu/x86/intrinsics/intrinsics.factor
similarity index 100%
rename from core/cpu/x86/intrinsics/intrinsics.factor
rename to basis/cpu/x86/intrinsics/intrinsics.factor
diff --git a/core/optimizer/known-words/authors.txt b/basis/cpu/x86/sse2/authors.txt
similarity index 100%
rename from core/optimizer/known-words/authors.txt
rename to basis/cpu/x86/sse2/authors.txt
diff --git a/core/cpu/x86/sse2/sse2.factor b/basis/cpu/x86/sse2/sse2.factor
similarity index 100%
rename from core/cpu/x86/sse2/sse2.factor
rename to basis/cpu/x86/sse2/sse2.factor
diff --git a/core/cpu/x86/sse2/summary.txt b/basis/cpu/x86/sse2/summary.txt
similarity index 100%
rename from core/cpu/x86/sse2/summary.txt
rename to basis/cpu/x86/sse2/summary.txt
diff --git a/core/cpu/x86/summary.txt b/basis/cpu/x86/summary.txt
similarity index 100%
rename from core/cpu/x86/summary.txt
rename to basis/cpu/x86/summary.txt
diff --git a/extra/csv/authors.txt b/basis/csv/authors.txt
similarity index 100%
rename from extra/csv/authors.txt
rename to basis/csv/authors.txt
diff --git a/extra/csv/csv-docs.factor b/basis/csv/csv-docs.factor
similarity index 100%
rename from extra/csv/csv-docs.factor
rename to basis/csv/csv-docs.factor
diff --git a/extra/csv/csv-tests.factor b/basis/csv/csv-tests.factor
similarity index 100%
rename from extra/csv/csv-tests.factor
rename to basis/csv/csv-tests.factor
diff --git a/extra/csv/csv.factor b/basis/csv/csv.factor
similarity index 100%
rename from extra/csv/csv.factor
rename to basis/csv/csv.factor
diff --git a/extra/csv/summary.txt b/basis/csv/summary.txt
similarity index 100%
rename from extra/csv/summary.txt
rename to basis/csv/summary.txt
diff --git a/core/optimizer/math/authors.txt b/basis/debugger/authors.txt
similarity index 100%
rename from core/optimizer/math/authors.txt
rename to basis/debugger/authors.txt
diff --git a/core/debugger/debugger-docs.factor b/basis/debugger/debugger-docs.factor
similarity index 89%
rename from core/debugger/debugger-docs.factor
rename to basis/debugger/debugger-docs.factor
index 9dd23c6011..72463caf26 100755
--- a/core/debugger/debugger-docs.factor
+++ b/basis/debugger/debugger-docs.factor
@@ -4,14 +4,6 @@ help generic.standard continuations system debugger.private
 io.files.private listener ;
 IN: debugger
 
-ARTICLE: "errors-assert" "Assertions"
-"Some words to make assertions easier to enforce:"
-{ $subsection assert }
-{ $subsection assert= }
-"Runtime stack depth checking:"
-{ $subsection depth }
-{ $subsection assert-depth } ;
-
 ARTICLE: "debugger" "The debugger"
 "Caught errors can be logged in human-readable form:"
 { $subsection print-error }
@@ -156,21 +148,3 @@ HELP: memory-error.
 HELP: primitive-error.
 { $error-description "Thrown by the Factor VM if an unsupported primitive word is called." }
 { $notes "This word is only ever thrown on Windows CE, where the " { $link cwd } ", " { $link cd } ", and " { $link os-env } " primitives are unsupported." } ;
-
-HELP: assert
-{ $values { "got" "the obtained value" } { "expect" "the expected value" } }
-{ $description "Throws an " { $link assert } " error." }
-{ $error-description "Thrown when a unit test or other assertion fails." } ;
-
-{ assert assert-depth } related-words
-
-HELP: depth
-{ $values { "n" "a non-negative integer" } }
-{ $description "Outputs the number of elements on the data stack." } ;
-
-HELP: assert-depth
-{ $values { "quot" "a quotation" } }
-{ $description "Runs a quotation. Throws an error if the total number of elements on the stack is not the same before and after the quotation runs." } ;
-
-HELP: init-debugger
-{ $description "Called on startup to set a pair of hooks which allow the " { $link throw } " word to function." } ;
diff --git a/core/debugger/debugger-tests.factor b/basis/debugger/debugger-tests.factor
similarity index 100%
rename from core/debugger/debugger-tests.factor
rename to basis/debugger/debugger-tests.factor
diff --git a/core/debugger/debugger.factor b/basis/debugger/debugger.factor
similarity index 79%
rename from core/debugger/debugger.factor
rename to basis/debugger/debugger.factor
index 151ef3b6e9..a33b6ce8aa 100755
--- a/core/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -2,12 +2,14 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: slots arrays definitions generic hashtables summary io
 kernel math namespaces prettyprint prettyprint.config sequences
-assocs sequences.private strings io.styles vectors words system
-splitting math.parser classes.tuple continuations
+assocs sequences.private strings io.styles io.files vectors
+words system splitting math.parser classes.tuple continuations
 continuations.private combinators generic.math classes.builtin
 classes compiler.units generic.standard vocabs threads
-threads.private init kernel.private libc io.encodings
-accessors math.order destructors ;
+threads.private init kernel.private libc io.encodings accessors
+math.order destructors source-files parser classes.tuple.parser
+effects.parser lexer compiler.errors dlists generic.parser
+strings.parser ;
 IN: debugger
 
 GENERIC: error. ( error -- )
@@ -69,33 +71,12 @@ M: string error. print ;
 : try ( quot -- )
     [ print-error-and-restarts ] recover ;
 
-ERROR: assert got expect ;
-
-: assert= ( a b -- ) 2dup = [ 2drop ] [ assert ] if ;
-
-: depth ( -- n ) datastack length ;
-
-: trim-datastacks ( seq1 seq2 -- seq1' seq2' )
-    2dup [ length ] bi@ min tuck tail >r tail r> ;
-
-ERROR: relative-underflow stack ;
-
 M: relative-underflow summary
     drop "Too many items removed from data stack" ;
 
-ERROR: relative-overflow stack ;
-
 M: relative-overflow summary
     drop "Superfluous items pushed to data stack" ;
 
-: assert-depth ( quot -- )
-    >r datastack r> dip >r datastack r>
-    2dup [ length ] compare {
-        { +lt+ [ trim-datastacks nip relative-underflow ] }
-        { +eq+ [ 2drop ] }
-        { +gt+ [ trim-datastacks drop relative-overflow ] }
-    } case ; inline
-
 : expired-error. ( obj -- )
     "Object did not survive image save/load: " write third . ;
 
@@ -301,20 +282,76 @@ M: attempt-all-error summary drop "Nothing to attempt" ;
 
 M: already-disposed summary drop "Attempting to operate on disposed object" ;
 
-<PRIVATE
+M: no-current-vocab summary
+    drop "Not in a vocabulary; IN: form required" ;
 
-: init-debugger ( -- )
-    V{ } clone set-catchstack
-    ! VM calls on error
-    [
-        self error-thread set-global
-        continuation error-continuation set-global
-        rethrow
-    ] 5 setenv
-    ! VM adds this to kernel errors, so that user-space
-    ! can identify them
-    "kernel-error" 6 setenv ;
+M: no-word-error summary
+    drop "Word not found in current vocabulary search path" ;
 
-PRIVATE>
+M: staging-violation summary
+    drop
+    "A parsing word cannot be used in the same file it is defined in." ;
 
-[ init-debugger ] "debugger" add-init-hook
+M: bad-number summary
+    drop "Bad number literal" ;
+
+M: duplicate-slot-names summary
+    drop "Duplicate slot names" ;
+
+M: invalid-slot-name summary
+    drop "Invalid slot name" ;
+
+: file. ( file -- ) path>> <pathname> . ;
+
+M: source-file-error error.
+    [ file>> file. ] [ error>> error. ] bi ;
+
+M: source-file-error summary
+    error>> summary ;
+
+M: source-file-error compute-restarts
+    error>> compute-restarts ;
+
+M: source-file-error error-help
+    error>> error-help ;
+
+M: not-in-a-method-error summary
+    drop "call-next-method can only be called in a method definition" ;
+
+GENERIC: expected>string ( obj -- str )
+
+M: f expected>string drop "end of input" ;
+M: word expected>string name>> ;
+M: string expected>string ;
+
+M: unexpected error.
+    "Expected " write
+    dup unexpected-want expected>string write
+    " but got " write
+    unexpected-got expected>string print ;
+
+M: lexer-error error.
+    [ lexer-dump ] [ error>> error. ] bi ;
+
+M: lexer-error summary
+    error>> summary ;
+
+M: lexer-error compute-restarts
+    error>> compute-restarts ;
+
+M: lexer-error error-help
+    error>> error-help ;
+
+M: object compiler-error. ( error word -- )
+    nl
+    "While compiling " write pprint ": " print
+    nl
+    print-error ;
+
+M: empty-dlist summary ( dlist -- )
+    drop "Empty dlist" ;
+
+M: bad-effect summary
+    drop "Bad stack effect declaration" ;
+
+M: bad-escape summary drop "Bad escape code" ;
diff --git a/core/debugger/summary.txt b/basis/debugger/summary.txt
similarity index 100%
rename from core/debugger/summary.txt
rename to basis/debugger/summary.txt
diff --git a/extra/delegate/author.txt b/basis/delegate/author.txt
similarity index 100%
rename from extra/delegate/author.txt
rename to basis/delegate/author.txt
diff --git a/core/io/encodings/string/authors.txt b/basis/delegate/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/io/encodings/string/authors.txt
rename to basis/delegate/authors.txt
diff --git a/extra/delegate/delegate-docs.factor b/basis/delegate/delegate-docs.factor
similarity index 100%
rename from extra/delegate/delegate-docs.factor
rename to basis/delegate/delegate-docs.factor
diff --git a/extra/delegate/delegate-tests.factor b/basis/delegate/delegate-tests.factor
similarity index 100%
rename from extra/delegate/delegate-tests.factor
rename to basis/delegate/delegate-tests.factor
diff --git a/extra/delegate/delegate.factor b/basis/delegate/delegate.factor
similarity index 100%
rename from extra/delegate/delegate.factor
rename to basis/delegate/delegate.factor
diff --git a/core/io/encodings/utf16/authors.txt b/basis/delegate/protocols/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/io/encodings/utf16/authors.txt
rename to basis/delegate/protocols/authors.txt
diff --git a/extra/delegate/protocols/protocols.factor b/basis/delegate/protocols/protocols.factor
similarity index 100%
rename from extra/delegate/protocols/protocols.factor
rename to basis/delegate/protocols/protocols.factor
diff --git a/extra/delegate/summary.txt b/basis/delegate/summary.txt
similarity index 100%
rename from extra/delegate/summary.txt
rename to basis/delegate/summary.txt
diff --git a/core/optimizer/pattern-match/authors.txt b/basis/dequeues/authors.txt
similarity index 100%
rename from core/optimizer/pattern-match/authors.txt
rename to basis/dequeues/authors.txt
diff --git a/core/dequeues/dequeues-docs.factor b/basis/dequeues/dequeues-docs.factor
similarity index 100%
rename from core/dequeues/dequeues-docs.factor
rename to basis/dequeues/dequeues-docs.factor
diff --git a/core/dequeues/dequeues.factor b/basis/dequeues/dequeues.factor
similarity index 100%
rename from core/dequeues/dequeues.factor
rename to basis/dequeues/dequeues.factor
diff --git a/core/dequeues/summary.txt b/basis/dequeues/summary.txt
similarity index 100%
rename from core/dequeues/summary.txt
rename to basis/dequeues/summary.txt
diff --git a/extra/bit-arrays/tags.txt b/basis/dequeues/tags.txt
similarity index 100%
rename from extra/bit-arrays/tags.txt
rename to basis/dequeues/tags.txt
diff --git a/extra/disjoint-sets/authors.txt b/basis/disjoint-sets/authors.txt
similarity index 100%
rename from extra/disjoint-sets/authors.txt
rename to basis/disjoint-sets/authors.txt
diff --git a/extra/disjoint-sets/disjoint-sets.factor b/basis/disjoint-sets/disjoint-sets.factor
similarity index 100%
rename from extra/disjoint-sets/disjoint-sets.factor
rename to basis/disjoint-sets/disjoint-sets.factor
diff --git a/extra/disjoint-sets/summary.txt b/basis/disjoint-sets/summary.txt
similarity index 100%
rename from extra/disjoint-sets/summary.txt
rename to basis/disjoint-sets/summary.txt
diff --git a/extra/bit-vectors/tags.txt b/basis/disjoint-sets/tags.txt
similarity index 100%
rename from extra/bit-vectors/tags.txt
rename to basis/disjoint-sets/tags.txt
diff --git a/core/dlists/authors.txt b/basis/dlists/authors.txt
similarity index 100%
rename from core/dlists/authors.txt
rename to basis/dlists/authors.txt
diff --git a/core/dlists/dlists-docs.factor b/basis/dlists/dlists-docs.factor
similarity index 100%
rename from core/dlists/dlists-docs.factor
rename to basis/dlists/dlists-docs.factor
diff --git a/core/dlists/dlists-tests.factor b/basis/dlists/dlists-tests.factor
similarity index 100%
rename from core/dlists/dlists-tests.factor
rename to basis/dlists/dlists-tests.factor
diff --git a/core/dlists/dlists.factor b/basis/dlists/dlists.factor
similarity index 96%
rename from core/dlists/dlists.factor
rename to basis/dlists/dlists.factor
index d996e3dcf9..192b5cb948 100755
--- a/core/dlists/dlists.factor
+++ b/basis/dlists/dlists.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2007, 2008 Mackenzie Straight, Doug Coleman,
 ! Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators kernel math sequences accessors summary
-dequeues ;
+USING: combinators kernel math sequences accessors dequeues ;
 IN: dlists
 
 TUPLE: dlist front back length ;
@@ -81,9 +80,6 @@ M: dlist push-back* ( obj dlist -- dlist-node )
 
 ERROR: empty-dlist ;
 
-M: empty-dlist summary ( dlist -- )
-    drop "Empty dlist" ;
-
 M: dlist peek-front ( dlist -- obj )
     front>> [ obj>> ] [ empty-dlist ] if* ;
 
diff --git a/core/dlists/summary.txt b/basis/dlists/summary.txt
similarity index 100%
rename from core/dlists/summary.txt
rename to basis/dlists/summary.txt
diff --git a/extra/circular/tags.txt b/basis/dlists/tags.txt
similarity index 100%
rename from extra/circular/tags.txt
rename to basis/dlists/tags.txt
diff --git a/core/prettyprint/authors.txt b/basis/documents/authors.txt
similarity index 100%
rename from core/prettyprint/authors.txt
rename to basis/documents/authors.txt
diff --git a/extra/documents/documents-docs.factor b/basis/documents/documents-docs.factor
similarity index 100%
rename from extra/documents/documents-docs.factor
rename to basis/documents/documents-docs.factor
diff --git a/extra/documents/documents-tests.factor b/basis/documents/documents-tests.factor
similarity index 100%
rename from extra/documents/documents-tests.factor
rename to basis/documents/documents-tests.factor
diff --git a/extra/documents/documents.factor b/basis/documents/documents.factor
similarity index 100%
rename from extra/documents/documents.factor
rename to basis/documents/documents.factor
diff --git a/extra/documents/summary.txt b/basis/documents/summary.txt
similarity index 100%
rename from extra/documents/summary.txt
rename to basis/documents/summary.txt
diff --git a/core/prettyprint/backend/authors.txt b/basis/editors/authors.txt
similarity index 100%
rename from core/prettyprint/backend/authors.txt
rename to basis/editors/authors.txt
diff --git a/extra/editors/editors-docs.factor b/basis/editors/editors-docs.factor
similarity index 100%
rename from extra/editors/editors-docs.factor
rename to basis/editors/editors-docs.factor
diff --git a/extra/editors/editors.factor b/basis/editors/editors.factor
similarity index 100%
rename from extra/editors/editors.factor
rename to basis/editors/editors.factor
diff --git a/extra/editors/editpadpro/authors.txt b/basis/editors/editpadpro/authors.txt
similarity index 100%
rename from extra/editors/editpadpro/authors.txt
rename to basis/editors/editpadpro/authors.txt
diff --git a/extra/editors/editpadpro/editpadpro-docs.factor b/basis/editors/editpadpro/editpadpro-docs.factor
similarity index 100%
rename from extra/editors/editpadpro/editpadpro-docs.factor
rename to basis/editors/editpadpro/editpadpro-docs.factor
diff --git a/extra/editors/editpadpro/editpadpro.factor b/basis/editors/editpadpro/editpadpro.factor
similarity index 100%
rename from extra/editors/editpadpro/editpadpro.factor
rename to basis/editors/editpadpro/editpadpro.factor
diff --git a/extra/editors/editpadpro/summary.txt b/basis/editors/editpadpro/summary.txt
similarity index 100%
rename from extra/editors/editpadpro/summary.txt
rename to basis/editors/editpadpro/summary.txt
diff --git a/extra/editors/editplus/authors.txt b/basis/editors/editplus/authors.txt
similarity index 100%
rename from extra/editors/editplus/authors.txt
rename to basis/editors/editplus/authors.txt
diff --git a/extra/editors/editplus/editplus.factor b/basis/editors/editplus/editplus.factor
similarity index 100%
rename from extra/editors/editplus/editplus.factor
rename to basis/editors/editplus/editplus.factor
diff --git a/extra/editors/editplus/summary.txt b/basis/editors/editplus/summary.txt
similarity index 100%
rename from extra/editors/editplus/summary.txt
rename to basis/editors/editplus/summary.txt
diff --git a/extra/editors/emacs/authors.txt b/basis/editors/emacs/authors.txt
similarity index 100%
rename from extra/editors/emacs/authors.txt
rename to basis/editors/emacs/authors.txt
diff --git a/extra/editors/emacs/emacs-docs.factor b/basis/editors/emacs/emacs-docs.factor
similarity index 100%
rename from extra/editors/emacs/emacs-docs.factor
rename to basis/editors/emacs/emacs-docs.factor
diff --git a/extra/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
similarity index 100%
rename from extra/editors/emacs/emacs.factor
rename to basis/editors/emacs/emacs.factor
diff --git a/extra/editors/emacs/summary.txt b/basis/editors/emacs/summary.txt
similarity index 100%
rename from extra/editors/emacs/summary.txt
rename to basis/editors/emacs/summary.txt
diff --git a/extra/editors/emeditor/authors.txt b/basis/editors/emeditor/authors.txt
similarity index 100%
rename from extra/editors/emeditor/authors.txt
rename to basis/editors/emeditor/authors.txt
diff --git a/extra/editors/emeditor/emeditor.factor b/basis/editors/emeditor/emeditor.factor
similarity index 100%
rename from extra/editors/emeditor/emeditor.factor
rename to basis/editors/emeditor/emeditor.factor
diff --git a/extra/editors/emeditor/summary.txt b/basis/editors/emeditor/summary.txt
similarity index 100%
rename from extra/editors/emeditor/summary.txt
rename to basis/editors/emeditor/summary.txt
diff --git a/extra/editors/gvim/authors.txt b/basis/editors/gvim/authors.txt
similarity index 100%
rename from extra/editors/gvim/authors.txt
rename to basis/editors/gvim/authors.txt
diff --git a/extra/editors/gvim/backend/authors.txt b/basis/editors/gvim/backend/authors.txt
similarity index 100%
rename from extra/editors/gvim/backend/authors.txt
rename to basis/editors/gvim/backend/authors.txt
diff --git a/extra/editors/gvim/backend/backend.factor b/basis/editors/gvim/backend/backend.factor
similarity index 100%
rename from extra/editors/gvim/backend/backend.factor
rename to basis/editors/gvim/backend/backend.factor
diff --git a/extra/editors/gvim/gvim.factor b/basis/editors/gvim/gvim.factor
similarity index 100%
rename from extra/editors/gvim/gvim.factor
rename to basis/editors/gvim/gvim.factor
diff --git a/extra/editors/gvim/summary.txt b/basis/editors/gvim/summary.txt
similarity index 100%
rename from extra/editors/gvim/summary.txt
rename to basis/editors/gvim/summary.txt
diff --git a/extra/editors/gvim/unix/authors.txt b/basis/editors/gvim/unix/authors.txt
similarity index 100%
rename from extra/editors/gvim/unix/authors.txt
rename to basis/editors/gvim/unix/authors.txt
diff --git a/extra/editors/gvim/unix/unix.factor b/basis/editors/gvim/unix/unix.factor
similarity index 100%
rename from extra/editors/gvim/unix/unix.factor
rename to basis/editors/gvim/unix/unix.factor
diff --git a/extra/editors/gvim/windows/authors.txt b/basis/editors/gvim/windows/authors.txt
similarity index 100%
rename from extra/editors/gvim/windows/authors.txt
rename to basis/editors/gvim/windows/authors.txt
diff --git a/extra/editors/gvim/windows/windows.factor b/basis/editors/gvim/windows/windows.factor
similarity index 100%
rename from extra/editors/gvim/windows/windows.factor
rename to basis/editors/gvim/windows/windows.factor
diff --git a/core/prettyprint/config/authors.txt b/basis/editors/jedit/authors.txt
similarity index 100%
rename from core/prettyprint/config/authors.txt
rename to basis/editors/jedit/authors.txt
diff --git a/extra/editors/jedit/jedit.factor b/basis/editors/jedit/jedit.factor
similarity index 100%
rename from extra/editors/jedit/jedit.factor
rename to basis/editors/jedit/jedit.factor
diff --git a/extra/editors/jedit/summary.txt b/basis/editors/jedit/summary.txt
similarity index 100%
rename from extra/editors/jedit/summary.txt
rename to basis/editors/jedit/summary.txt
diff --git a/extra/editors/notepadpp/authors.txt b/basis/editors/notepadpp/authors.txt
similarity index 100%
rename from extra/editors/notepadpp/authors.txt
rename to basis/editors/notepadpp/authors.txt
diff --git a/extra/editors/notepadpp/notepadpp.factor b/basis/editors/notepadpp/notepadpp.factor
similarity index 100%
rename from extra/editors/notepadpp/notepadpp.factor
rename to basis/editors/notepadpp/notepadpp.factor
diff --git a/extra/editors/notepadpp/summary.txt b/basis/editors/notepadpp/summary.txt
similarity index 100%
rename from extra/editors/notepadpp/summary.txt
rename to basis/editors/notepadpp/summary.txt
diff --git a/extra/editors/scite/authors.txt b/basis/editors/scite/authors.txt
similarity index 100%
rename from extra/editors/scite/authors.txt
rename to basis/editors/scite/authors.txt
diff --git a/extra/editors/scite/scite.factor b/basis/editors/scite/scite.factor
similarity index 100%
rename from extra/editors/scite/scite.factor
rename to basis/editors/scite/scite.factor
diff --git a/extra/editors/scite/summary.txt b/basis/editors/scite/summary.txt
similarity index 100%
rename from extra/editors/scite/summary.txt
rename to basis/editors/scite/summary.txt
diff --git a/extra/editors/summary.txt b/basis/editors/summary.txt
similarity index 100%
rename from extra/editors/summary.txt
rename to basis/editors/summary.txt
diff --git a/core/listener/tags.txt b/basis/editors/tags.txt
similarity index 100%
rename from core/listener/tags.txt
rename to basis/editors/tags.txt
diff --git a/extra/editors/ted-notepad/authors.txt b/basis/editors/ted-notepad/authors.txt
similarity index 100%
rename from extra/editors/ted-notepad/authors.txt
rename to basis/editors/ted-notepad/authors.txt
diff --git a/extra/editors/ted-notepad/summary.txt b/basis/editors/ted-notepad/summary.txt
similarity index 100%
rename from extra/editors/ted-notepad/summary.txt
rename to basis/editors/ted-notepad/summary.txt
diff --git a/extra/editors/ted-notepad/ted-notepad.factor b/basis/editors/ted-notepad/ted-notepad.factor
similarity index 100%
rename from extra/editors/ted-notepad/ted-notepad.factor
rename to basis/editors/ted-notepad/ted-notepad.factor
diff --git a/extra/editors/textmate/authors.txt b/basis/editors/textmate/authors.txt
similarity index 100%
rename from extra/editors/textmate/authors.txt
rename to basis/editors/textmate/authors.txt
diff --git a/extra/editors/textmate/summary.txt b/basis/editors/textmate/summary.txt
similarity index 100%
rename from extra/editors/textmate/summary.txt
rename to basis/editors/textmate/summary.txt
diff --git a/extra/editors/textmate/textmate.factor b/basis/editors/textmate/textmate.factor
similarity index 100%
rename from extra/editors/textmate/textmate.factor
rename to basis/editors/textmate/textmate.factor
diff --git a/extra/editors/textwrangler/authors.txt b/basis/editors/textwrangler/authors.txt
similarity index 100%
rename from extra/editors/textwrangler/authors.txt
rename to basis/editors/textwrangler/authors.txt
diff --git a/extra/editors/textwrangler/summary.txt b/basis/editors/textwrangler/summary.txt
similarity index 100%
rename from extra/editors/textwrangler/summary.txt
rename to basis/editors/textwrangler/summary.txt
diff --git a/extra/editors/textwrangler/textwrangler.factor b/basis/editors/textwrangler/textwrangler.factor
similarity index 100%
rename from extra/editors/textwrangler/textwrangler.factor
rename to basis/editors/textwrangler/textwrangler.factor
diff --git a/extra/editors/ultraedit/authors.txt b/basis/editors/ultraedit/authors.txt
similarity index 100%
rename from extra/editors/ultraedit/authors.txt
rename to basis/editors/ultraedit/authors.txt
diff --git a/extra/editors/ultraedit/summary.txt b/basis/editors/ultraedit/summary.txt
similarity index 100%
rename from extra/editors/ultraedit/summary.txt
rename to basis/editors/ultraedit/summary.txt
diff --git a/extra/editors/ultraedit/ultraedit.factor b/basis/editors/ultraedit/ultraedit.factor
similarity index 100%
rename from extra/editors/ultraedit/ultraedit.factor
rename to basis/editors/ultraedit/ultraedit.factor
diff --git a/extra/editors/vim/authors.txt b/basis/editors/vim/authors.txt
similarity index 100%
rename from extra/editors/vim/authors.txt
rename to basis/editors/vim/authors.txt
diff --git a/extra/editors/vim/generate-syntax/generate-syntax.factor b/basis/editors/vim/generate-syntax/generate-syntax.factor
similarity index 100%
rename from extra/editors/vim/generate-syntax/generate-syntax.factor
rename to basis/editors/vim/generate-syntax/generate-syntax.factor
diff --git a/extra/editors/vim/summary.txt b/basis/editors/vim/summary.txt
similarity index 100%
rename from extra/editors/vim/summary.txt
rename to basis/editors/vim/summary.txt
diff --git a/extra/editors/vim/vim-docs.factor b/basis/editors/vim/vim-docs.factor
similarity index 100%
rename from extra/editors/vim/vim-docs.factor
rename to basis/editors/vim/vim-docs.factor
diff --git a/extra/editors/vim/vim.factor b/basis/editors/vim/vim.factor
similarity index 100%
rename from extra/editors/vim/vim.factor
rename to basis/editors/vim/vim.factor
diff --git a/extra/editors/wordpad/authors.txt b/basis/editors/wordpad/authors.txt
similarity index 100%
rename from extra/editors/wordpad/authors.txt
rename to basis/editors/wordpad/authors.txt
diff --git a/extra/editors/wordpad/summary.txt b/basis/editors/wordpad/summary.txt
similarity index 100%
rename from extra/editors/wordpad/summary.txt
rename to basis/editors/wordpad/summary.txt
diff --git a/extra/editors/wordpad/wordpad.factor b/basis/editors/wordpad/wordpad.factor
similarity index 100%
rename from extra/editors/wordpad/wordpad.factor
rename to basis/editors/wordpad/wordpad.factor
diff --git a/basis/eval/eval-docs.factor b/basis/eval/eval-docs.factor
new file mode 100644
index 0000000000..057d291b7f
--- /dev/null
+++ b/basis/eval/eval-docs.factor
@@ -0,0 +1,18 @@
+IN: eval
+USING: help.markup help.syntax strings io ;
+
+HELP: eval
+{ $values { "str" string } }
+{ $description "Parses Factor source code from a string, and calls the resulting quotation." }
+{ $errors "Throws an error if the input is malformed, or if the evaluation itself throws an error." } ;
+
+HELP: eval>string
+{ $values { "str" string } { "output" string } }
+{ $description "Evaluates the Factor code in " { $snippet "str" } " with " { $link output-stream } " rebound to a string output stream, then outputs the resulting string." } ;
+
+ARTICLE: "eval" "Evaluating strings at runtime"
+"Evaluating strings at runtime:"
+{ $subsection eval }
+{ $subsection eval>string } ;
+
+ABOUT: "eval"
diff --git a/basis/eval/eval.factor b/basis/eval/eval.factor
new file mode 100644
index 0000000000..5b22fec159
--- /dev/null
+++ b/basis/eval/eval.factor
@@ -0,0 +1,14 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: splitting parser compiler.units kernel namespaces
+debugger io.streams.string ;
+IN: eval
+
+: eval ( str -- )
+    [ string-lines parse-fresh ] with-compilation-unit call ;
+
+: eval>string ( str -- output )
+    [
+        parser-notes off
+        [ [ eval ] keep ] try drop
+    ] with-string-writer ;
diff --git a/core/prettyprint/sections/authors.txt b/basis/float-arrays/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from core/prettyprint/sections/authors.txt
rename to basis/float-arrays/authors.txt
diff --git a/extra/float-arrays/float-arrays-docs.factor b/basis/float-arrays/float-arrays-docs.factor
similarity index 100%
rename from extra/float-arrays/float-arrays-docs.factor
rename to basis/float-arrays/float-arrays-docs.factor
diff --git a/extra/float-arrays/float-arrays-tests.factor b/basis/float-arrays/float-arrays-tests.factor
similarity index 100%
rename from extra/float-arrays/float-arrays-tests.factor
rename to basis/float-arrays/float-arrays-tests.factor
diff --git a/extra/float-arrays/float-arrays.factor b/basis/float-arrays/float-arrays.factor
similarity index 100%
rename from extra/float-arrays/float-arrays.factor
rename to basis/float-arrays/float-arrays.factor
diff --git a/extra/float-arrays/summary.txt b/basis/float-arrays/summary.txt
similarity index 100%
rename from extra/float-arrays/summary.txt
rename to basis/float-arrays/summary.txt
diff --git a/extra/columns/tags.txt b/basis/float-arrays/tags.txt
similarity index 100%
rename from extra/columns/tags.txt
rename to basis/float-arrays/tags.txt
diff --git a/extra/float-vectors/float-vectors-docs.factor b/basis/float-vectors/float-vectors-docs.factor
similarity index 100%
rename from extra/float-vectors/float-vectors-docs.factor
rename to basis/float-vectors/float-vectors-docs.factor
diff --git a/extra/float-vectors/float-vectors-tests.factor b/basis/float-vectors/float-vectors-tests.factor
similarity index 100%
rename from extra/float-vectors/float-vectors-tests.factor
rename to basis/float-vectors/float-vectors-tests.factor
diff --git a/extra/float-vectors/float-vectors.factor b/basis/float-vectors/float-vectors.factor
similarity index 100%
rename from extra/float-vectors/float-vectors.factor
rename to basis/float-vectors/float-vectors.factor
diff --git a/extra/float-vectors/summary.txt b/basis/float-vectors/summary.txt
similarity index 100%
rename from extra/float-vectors/summary.txt
rename to basis/float-vectors/summary.txt
diff --git a/extra/disjoint-sets/tags.txt b/basis/float-vectors/tags.txt
similarity index 100%
rename from extra/disjoint-sets/tags.txt
rename to basis/float-vectors/tags.txt
diff --git a/core/refs/authors.txt b/basis/freetype/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from core/refs/authors.txt
rename to basis/freetype/authors.txt
diff --git a/extra/freetype/freetype.factor b/basis/freetype/freetype.factor
similarity index 100%
rename from extra/freetype/freetype.factor
rename to basis/freetype/freetype.factor
diff --git a/extra/freetype/summary.txt b/basis/freetype/summary.txt
similarity index 100%
rename from extra/freetype/summary.txt
rename to basis/freetype/summary.txt
diff --git a/extra/freetype/tags.txt b/basis/freetype/tags.txt
similarity index 100%
rename from extra/freetype/tags.txt
rename to basis/freetype/tags.txt
diff --git a/extra/fry/authors.txt b/basis/fry/authors.txt
similarity index 100%
rename from extra/fry/authors.txt
rename to basis/fry/authors.txt
diff --git a/extra/fry/fry-docs.factor b/basis/fry/fry-docs.factor
similarity index 100%
rename from extra/fry/fry-docs.factor
rename to basis/fry/fry-docs.factor
diff --git a/extra/fry/fry-tests.factor b/basis/fry/fry-tests.factor
similarity index 100%
rename from extra/fry/fry-tests.factor
rename to basis/fry/fry-tests.factor
diff --git a/extra/fry/fry.factor b/basis/fry/fry.factor
similarity index 100%
rename from extra/fry/fry.factor
rename to basis/fry/fry.factor
diff --git a/extra/fry/summary.txt b/basis/fry/summary.txt
similarity index 100%
rename from extra/fry/summary.txt
rename to basis/fry/summary.txt
diff --git a/extra/fry/tags.txt b/basis/fry/tags.txt
similarity index 100%
rename from extra/fry/tags.txt
rename to basis/fry/tags.txt
diff --git a/extra/generalizations/generalizations-docs.factor b/basis/generalizations/generalizations-docs.factor
similarity index 100%
rename from extra/generalizations/generalizations-docs.factor
rename to basis/generalizations/generalizations-docs.factor
diff --git a/extra/generalizations/generalizations-tests.factor b/basis/generalizations/generalizations-tests.factor
similarity index 100%
rename from extra/generalizations/generalizations-tests.factor
rename to basis/generalizations/generalizations-tests.factor
diff --git a/extra/generalizations/generalizations.factor b/basis/generalizations/generalizations.factor
similarity index 100%
rename from extra/generalizations/generalizations.factor
rename to basis/generalizations/generalizations.factor
diff --git a/core/search-dequeues/authors.txt b/basis/generator/authors.txt
similarity index 100%
rename from core/search-dequeues/authors.txt
rename to basis/generator/authors.txt
diff --git a/core/threads/authors.txt b/basis/generator/fixup/authors.txt
similarity index 100%
rename from core/threads/authors.txt
rename to basis/generator/fixup/authors.txt
diff --git a/core/generator/fixup/fixup-docs.factor b/basis/generator/fixup/fixup-docs.factor
similarity index 100%
rename from core/generator/fixup/fixup-docs.factor
rename to basis/generator/fixup/fixup-docs.factor
diff --git a/core/generator/fixup/fixup.factor b/basis/generator/fixup/fixup.factor
similarity index 100%
rename from core/generator/fixup/fixup.factor
rename to basis/generator/fixup/fixup.factor
diff --git a/core/generator/fixup/summary.txt b/basis/generator/fixup/summary.txt
similarity index 100%
rename from core/generator/fixup/summary.txt
rename to basis/generator/fixup/summary.txt
diff --git a/core/generator/generator-docs.factor b/basis/generator/generator-docs.factor
similarity index 100%
rename from core/generator/generator-docs.factor
rename to basis/generator/generator-docs.factor
diff --git a/core/generator/generator.factor b/basis/generator/generator.factor
similarity index 100%
rename from core/generator/generator.factor
rename to basis/generator/generator.factor
diff --git a/extra/ascii/authors.txt b/basis/generator/registers/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/ascii/authors.txt
rename to basis/generator/registers/authors.txt
diff --git a/core/generator/registers/registers.factor b/basis/generator/registers/registers.factor
similarity index 100%
rename from core/generator/registers/registers.factor
rename to basis/generator/registers/registers.factor
diff --git a/core/generator/registers/summary.txt b/basis/generator/registers/summary.txt
similarity index 100%
rename from core/generator/registers/summary.txt
rename to basis/generator/registers/summary.txt
diff --git a/core/generator/summary.txt b/basis/generator/summary.txt
similarity index 100%
rename from core/generator/summary.txt
rename to basis/generator/summary.txt
diff --git a/core/generator/tags.txt b/basis/generator/tags.txt
similarity index 100%
rename from core/generator/tags.txt
rename to basis/generator/tags.txt
diff --git a/extra/delegate/authors.txt b/basis/hash2/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/delegate/authors.txt
rename to basis/hash2/authors.txt
diff --git a/extra/hash2/hash2-docs.factor b/basis/hash2/hash2-docs.factor
similarity index 100%
rename from extra/hash2/hash2-docs.factor
rename to basis/hash2/hash2-docs.factor
diff --git a/extra/hash2/hash2-tests.factor b/basis/hash2/hash2-tests.factor
similarity index 100%
rename from extra/hash2/hash2-tests.factor
rename to basis/hash2/hash2-tests.factor
diff --git a/extra/hash2/hash2.factor b/basis/hash2/hash2.factor
similarity index 100%
rename from extra/hash2/hash2.factor
rename to basis/hash2/hash2.factor
diff --git a/extra/hash2/summary.txt b/basis/hash2/summary.txt
similarity index 100%
rename from extra/hash2/summary.txt
rename to basis/hash2/summary.txt
diff --git a/extra/float-arrays/tags.txt b/basis/hash2/tags.txt
similarity index 100%
rename from extra/float-arrays/tags.txt
rename to basis/hash2/tags.txt
diff --git a/core/heaps/authors.txt b/basis/heaps/authors.txt
similarity index 100%
rename from core/heaps/authors.txt
rename to basis/heaps/authors.txt
diff --git a/core/heaps/heaps-docs.factor b/basis/heaps/heaps-docs.factor
similarity index 100%
rename from core/heaps/heaps-docs.factor
rename to basis/heaps/heaps-docs.factor
diff --git a/core/heaps/heaps-tests.factor b/basis/heaps/heaps-tests.factor
similarity index 100%
rename from core/heaps/heaps-tests.factor
rename to basis/heaps/heaps-tests.factor
diff --git a/core/heaps/heaps.factor b/basis/heaps/heaps.factor
similarity index 100%
rename from core/heaps/heaps.factor
rename to basis/heaps/heaps.factor
diff --git a/core/heaps/summary.txt b/basis/heaps/summary.txt
similarity index 100%
rename from core/heaps/summary.txt
rename to basis/heaps/summary.txt
diff --git a/extra/float-vectors/tags.txt b/basis/heaps/tags.txt
similarity index 100%
rename from extra/float-vectors/tags.txt
rename to basis/heaps/tags.txt
diff --git a/extra/biassocs/authors.txt b/basis/help/authors.txt
similarity index 100%
rename from extra/biassocs/authors.txt
rename to basis/help/authors.txt
diff --git a/extra/bit-arrays/authors.txt b/basis/help/cookbook/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/bit-arrays/authors.txt
rename to basis/help/cookbook/authors.txt
diff --git a/extra/help/cookbook/cookbook.factor b/basis/help/cookbook/cookbook.factor
similarity index 100%
rename from extra/help/cookbook/cookbook.factor
rename to basis/help/cookbook/cookbook.factor
diff --git a/extra/bootstrap/help/authors.txt b/basis/help/crossref/authors.txt
similarity index 100%
rename from extra/bootstrap/help/authors.txt
rename to basis/help/crossref/authors.txt
diff --git a/extra/help/crossref/crossref-docs.factor b/basis/help/crossref/crossref-docs.factor
similarity index 100%
rename from extra/help/crossref/crossref-docs.factor
rename to basis/help/crossref/crossref-docs.factor
diff --git a/extra/help/crossref/crossref-tests.factor b/basis/help/crossref/crossref-tests.factor
similarity index 100%
rename from extra/help/crossref/crossref-tests.factor
rename to basis/help/crossref/crossref-tests.factor
diff --git a/extra/help/crossref/crossref.factor b/basis/help/crossref/crossref.factor
similarity index 100%
rename from extra/help/crossref/crossref.factor
rename to basis/help/crossref/crossref.factor
diff --git a/extra/help/crossref/summary.txt b/basis/help/crossref/summary.txt
similarity index 100%
rename from extra/help/crossref/summary.txt
rename to basis/help/crossref/summary.txt
diff --git a/extra/bootstrap/image/download/authors.txt b/basis/help/definitions/authors.txt
similarity index 100%
rename from extra/bootstrap/image/download/authors.txt
rename to basis/help/definitions/authors.txt
diff --git a/extra/help/definitions/definitions-tests.factor b/basis/help/definitions/definitions-tests.factor
similarity index 100%
rename from extra/help/definitions/definitions-tests.factor
rename to basis/help/definitions/definitions-tests.factor
diff --git a/extra/help/definitions/definitions.factor b/basis/help/definitions/definitions.factor
similarity index 100%
rename from extra/help/definitions/definitions.factor
rename to basis/help/definitions/definitions.factor
diff --git a/extra/help/definitions/summary.txt b/basis/help/definitions/summary.txt
similarity index 100%
rename from extra/help/definitions/summary.txt
rename to basis/help/definitions/summary.txt
diff --git a/extra/bootstrap/image/upload/authors.txt b/basis/help/handbook/authors.txt
similarity index 100%
rename from extra/bootstrap/image/upload/authors.txt
rename to basis/help/handbook/authors.txt
diff --git a/extra/help/handbook/handbook-tests.factor b/basis/help/handbook/handbook-tests.factor
similarity index 100%
rename from extra/help/handbook/handbook-tests.factor
rename to basis/help/handbook/handbook-tests.factor
diff --git a/extra/help/handbook/handbook.factor b/basis/help/handbook/handbook.factor
similarity index 100%
rename from extra/help/handbook/handbook.factor
rename to basis/help/handbook/handbook.factor
diff --git a/extra/help/handbook/summary.txt b/basis/help/handbook/summary.txt
similarity index 100%
rename from extra/help/handbook/summary.txt
rename to basis/help/handbook/summary.txt
diff --git a/extra/help/help-docs.factor b/basis/help/help-docs.factor
similarity index 100%
rename from extra/help/help-docs.factor
rename to basis/help/help-docs.factor
diff --git a/extra/help/help-tests.factor b/basis/help/help-tests.factor
similarity index 100%
rename from extra/help/help-tests.factor
rename to basis/help/help-tests.factor
diff --git a/extra/help/help.factor b/basis/help/help.factor
similarity index 100%
rename from extra/help/help.factor
rename to basis/help/help.factor
diff --git a/extra/help/html/html.factor b/basis/help/html/html.factor
similarity index 100%
rename from extra/help/html/html.factor
rename to basis/help/html/html.factor
diff --git a/extra/bootstrap/io/authors.txt b/basis/help/lint/authors.txt
similarity index 100%
rename from extra/bootstrap/io/authors.txt
rename to basis/help/lint/authors.txt
diff --git a/extra/help/lint/lint-docs.factor b/basis/help/lint/lint-docs.factor
similarity index 100%
rename from extra/help/lint/lint-docs.factor
rename to basis/help/lint/lint-docs.factor
diff --git a/extra/help/lint/lint.factor b/basis/help/lint/lint.factor
similarity index 99%
rename from extra/help/lint/lint.factor
rename to basis/help/lint/lint.factor
index 0926a30adc..9cbffe2d33 100755
--- a/extra/help/lint/lint.factor
+++ b/basis/help/lint/lint.factor
@@ -5,7 +5,7 @@ help.topics words strings classes tools.vocabs namespaces io
 io.streams.string prettyprint definitions arrays vectors
 combinators splitting debugger hashtables sorting effects vocabs
 vocabs.loader assocs editors continuations classes.predicate
-macros math sets ;
+macros math sets eval ;
 IN: help.lint
 
 : check-example ( element -- )
diff --git a/extra/help/lint/summary.txt b/basis/help/lint/summary.txt
similarity index 100%
rename from extra/help/lint/summary.txt
rename to basis/help/lint/summary.txt
diff --git a/extra/editors/tags.txt b/basis/help/lint/tags.txt
similarity index 100%
rename from extra/editors/tags.txt
rename to basis/help/lint/tags.txt
diff --git a/extra/bootstrap/tools/authors.txt b/basis/help/markup/authors.txt
similarity index 100%
rename from extra/bootstrap/tools/authors.txt
rename to basis/help/markup/authors.txt
diff --git a/extra/help/markup/markup-tests.factor b/basis/help/markup/markup-tests.factor
similarity index 100%
rename from extra/help/markup/markup-tests.factor
rename to basis/help/markup/markup-tests.factor
diff --git a/extra/help/markup/markup.factor b/basis/help/markup/markup.factor
similarity index 100%
rename from extra/help/markup/markup.factor
rename to basis/help/markup/markup.factor
diff --git a/extra/help/markup/summary.txt b/basis/help/markup/summary.txt
similarity index 100%
rename from extra/help/markup/summary.txt
rename to basis/help/markup/summary.txt
diff --git a/extra/cocoa/application/authors.txt b/basis/help/stylesheet/authors.txt
similarity index 100%
rename from extra/cocoa/application/authors.txt
rename to basis/help/stylesheet/authors.txt
diff --git a/extra/help/stylesheet/stylesheet.factor b/basis/help/stylesheet/stylesheet.factor
similarity index 100%
rename from extra/help/stylesheet/stylesheet.factor
rename to basis/help/stylesheet/stylesheet.factor
diff --git a/extra/help/stylesheet/summary.txt b/basis/help/stylesheet/summary.txt
similarity index 100%
rename from extra/help/stylesheet/summary.txt
rename to basis/help/stylesheet/summary.txt
diff --git a/extra/help/summary.txt b/basis/help/summary.txt
similarity index 100%
rename from extra/help/summary.txt
rename to basis/help/summary.txt
diff --git a/extra/cocoa/authors.txt b/basis/help/syntax/authors.txt
similarity index 100%
rename from extra/cocoa/authors.txt
rename to basis/help/syntax/authors.txt
diff --git a/extra/help/syntax/summary.txt b/basis/help/syntax/summary.txt
similarity index 100%
rename from extra/help/syntax/summary.txt
rename to basis/help/syntax/summary.txt
diff --git a/extra/help/syntax/syntax-tests.factor b/basis/help/syntax/syntax-tests.factor
similarity index 100%
rename from extra/help/syntax/syntax-tests.factor
rename to basis/help/syntax/syntax-tests.factor
diff --git a/extra/help/syntax/syntax.factor b/basis/help/syntax/syntax.factor
similarity index 100%
rename from extra/help/syntax/syntax.factor
rename to basis/help/syntax/syntax.factor
diff --git a/extra/cocoa/dialogs/authors.txt b/basis/help/topics/authors.txt
similarity index 100%
rename from extra/cocoa/dialogs/authors.txt
rename to basis/help/topics/authors.txt
diff --git a/extra/help/topics/summary.txt b/basis/help/topics/summary.txt
similarity index 100%
rename from extra/help/topics/summary.txt
rename to basis/help/topics/summary.txt
diff --git a/extra/help/topics/topics-docs.factor b/basis/help/topics/topics-docs.factor
similarity index 100%
rename from extra/help/topics/topics-docs.factor
rename to basis/help/topics/topics-docs.factor
diff --git a/extra/help/topics/topics-tests.factor b/basis/help/topics/topics-tests.factor
similarity index 100%
rename from extra/help/topics/topics-tests.factor
rename to basis/help/topics/topics-tests.factor
diff --git a/extra/help/topics/topics.factor b/basis/help/topics/topics.factor
similarity index 100%
rename from extra/help/topics/topics.factor
rename to basis/help/topics/topics.factor
diff --git a/extra/cocoa/messages/authors.txt b/basis/help/tutorial/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/cocoa/messages/authors.txt
rename to basis/help/tutorial/authors.txt
diff --git a/extra/help/tutorial/tutorial.factor b/basis/help/tutorial/tutorial.factor
similarity index 100%
rename from extra/help/tutorial/tutorial.factor
rename to basis/help/tutorial/tutorial.factor
diff --git a/extra/cocoa/pasteboard/authors.txt b/basis/hints/authors.txt
similarity index 100%
rename from extra/cocoa/pasteboard/authors.txt
rename to basis/hints/authors.txt
diff --git a/extra/hints/hints.factor b/basis/hints/hints.factor
similarity index 100%
rename from extra/hints/hints.factor
rename to basis/hints/hints.factor
diff --git a/extra/hints/summary.txt b/basis/hints/summary.txt
similarity index 100%
rename from extra/hints/summary.txt
rename to basis/hints/summary.txt
diff --git a/extra/hints/tags.txt b/basis/hints/tags.txt
similarity index 100%
rename from extra/hints/tags.txt
rename to basis/hints/tags.txt
diff --git a/extra/cocoa/plists/authors.txt b/basis/inference/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/cocoa/plists/authors.txt
rename to basis/inference/authors.txt
diff --git a/extra/cocoa/runtime/authors.txt b/basis/inference/backend/authors.txt
similarity index 100%
rename from extra/cocoa/runtime/authors.txt
rename to basis/inference/backend/authors.txt
diff --git a/core/inference/backend/backend-docs.factor b/basis/inference/backend/backend-docs.factor
similarity index 100%
rename from core/inference/backend/backend-docs.factor
rename to basis/inference/backend/backend-docs.factor
diff --git a/core/inference/backend/backend.factor b/basis/inference/backend/backend.factor
similarity index 100%
rename from core/inference/backend/backend.factor
rename to basis/inference/backend/backend.factor
diff --git a/core/inference/backend/summary.txt b/basis/inference/backend/summary.txt
similarity index 100%
rename from core/inference/backend/summary.txt
rename to basis/inference/backend/summary.txt
diff --git a/extra/cocoa/subclassing/authors.txt b/basis/inference/class/authors.txt
similarity index 100%
rename from extra/cocoa/subclassing/authors.txt
rename to basis/inference/class/authors.txt
diff --git a/core/inference/class/class-tests.factor b/basis/inference/class/class-tests.factor
similarity index 100%
rename from core/inference/class/class-tests.factor
rename to basis/inference/class/class-tests.factor
diff --git a/core/inference/class/class.factor b/basis/inference/class/class.factor
similarity index 100%
rename from core/inference/class/class.factor
rename to basis/inference/class/class.factor
diff --git a/core/inference/class/summary.txt b/basis/inference/class/summary.txt
similarity index 100%
rename from core/inference/class/summary.txt
rename to basis/inference/class/summary.txt
diff --git a/extra/cocoa/types/authors.txt b/basis/inference/dataflow/authors.txt
similarity index 100%
rename from extra/cocoa/types/authors.txt
rename to basis/inference/dataflow/authors.txt
diff --git a/core/inference/dataflow/dataflow-docs.factor b/basis/inference/dataflow/dataflow-docs.factor
similarity index 100%
rename from core/inference/dataflow/dataflow-docs.factor
rename to basis/inference/dataflow/dataflow-docs.factor
diff --git a/core/inference/dataflow/dataflow.factor b/basis/inference/dataflow/dataflow.factor
similarity index 100%
rename from core/inference/dataflow/dataflow.factor
rename to basis/inference/dataflow/dataflow.factor
diff --git a/core/inference/dataflow/summary.txt b/basis/inference/dataflow/summary.txt
similarity index 100%
rename from core/inference/dataflow/summary.txt
rename to basis/inference/dataflow/summary.txt
diff --git a/extra/cocoa/views/authors.txt b/basis/inference/errors/authors.txt
similarity index 100%
rename from extra/cocoa/views/authors.txt
rename to basis/inference/errors/authors.txt
diff --git a/core/inference/errors/errors.factor b/basis/inference/errors/errors.factor
similarity index 100%
rename from core/inference/errors/errors.factor
rename to basis/inference/errors/errors.factor
diff --git a/core/inference/errors/summary.txt b/basis/inference/errors/summary.txt
similarity index 100%
rename from core/inference/errors/summary.txt
rename to basis/inference/errors/summary.txt
diff --git a/core/inference/inference-docs.factor b/basis/inference/inference-docs.factor
similarity index 100%
rename from core/inference/inference-docs.factor
rename to basis/inference/inference-docs.factor
diff --git a/core/inference/inference-tests.factor b/basis/inference/inference-tests.factor
similarity index 100%
rename from core/inference/inference-tests.factor
rename to basis/inference/inference-tests.factor
diff --git a/core/inference/inference.factor b/basis/inference/inference.factor
similarity index 100%
rename from core/inference/inference.factor
rename to basis/inference/inference.factor
diff --git a/extra/cocoa/windows/authors.txt b/basis/inference/known-words/authors.txt
similarity index 100%
rename from extra/cocoa/windows/authors.txt
rename to basis/inference/known-words/authors.txt
diff --git a/core/inference/known-words/known-words.factor b/basis/inference/known-words/known-words.factor
similarity index 100%
rename from core/inference/known-words/known-words.factor
rename to basis/inference/known-words/known-words.factor
diff --git a/core/inference/known-words/summary.txt b/basis/inference/known-words/summary.txt
similarity index 100%
rename from core/inference/known-words/summary.txt
rename to basis/inference/known-words/summary.txt
diff --git a/extra/concurrency/exchangers/authors.txt b/basis/inference/state/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/concurrency/exchangers/authors.txt
rename to basis/inference/state/authors.txt
diff --git a/core/inference/state/state-docs.factor b/basis/inference/state/state-docs.factor
similarity index 100%
rename from core/inference/state/state-docs.factor
rename to basis/inference/state/state-docs.factor
diff --git a/core/inference/state/state-tests.factor b/basis/inference/state/state-tests.factor
similarity index 100%
rename from core/inference/state/state-tests.factor
rename to basis/inference/state/state-tests.factor
diff --git a/core/inference/state/state.factor b/basis/inference/state/state.factor
similarity index 100%
rename from core/inference/state/state.factor
rename to basis/inference/state/state.factor
diff --git a/core/inference/state/summary.txt b/basis/inference/state/summary.txt
similarity index 100%
rename from core/inference/state/summary.txt
rename to basis/inference/state/summary.txt
diff --git a/core/inference/summary.txt b/basis/inference/summary.txt
similarity index 100%
rename from core/inference/summary.txt
rename to basis/inference/summary.txt
diff --git a/core/inference/tags.txt b/basis/inference/tags.txt
similarity index 100%
rename from core/inference/tags.txt
rename to basis/inference/tags.txt
diff --git a/extra/concurrency/locks/authors.txt b/basis/inference/transforms/authors.txt
similarity index 100%
rename from extra/concurrency/locks/authors.txt
rename to basis/inference/transforms/authors.txt
diff --git a/core/inference/transforms/summary.txt b/basis/inference/transforms/summary.txt
similarity index 100%
rename from core/inference/transforms/summary.txt
rename to basis/inference/transforms/summary.txt
diff --git a/core/inference/transforms/transforms-docs.factor b/basis/inference/transforms/transforms-docs.factor
similarity index 100%
rename from core/inference/transforms/transforms-docs.factor
rename to basis/inference/transforms/transforms-docs.factor
diff --git a/core/inference/transforms/transforms-tests.factor b/basis/inference/transforms/transforms-tests.factor
similarity index 100%
rename from core/inference/transforms/transforms-tests.factor
rename to basis/inference/transforms/transforms-tests.factor
diff --git a/core/inference/transforms/transforms.factor b/basis/inference/transforms/transforms.factor
similarity index 100%
rename from core/inference/transforms/transforms.factor
rename to basis/inference/transforms/transforms.factor
diff --git a/extra/concurrency/semaphores/authors.txt b/basis/inspector/authors.txt
similarity index 100%
rename from extra/concurrency/semaphores/authors.txt
rename to basis/inspector/authors.txt
diff --git a/core/inspector/inspector-docs.factor b/basis/inspector/inspector-docs.factor
similarity index 100%
rename from core/inspector/inspector-docs.factor
rename to basis/inspector/inspector-docs.factor
diff --git a/core/inspector/inspector-tests.factor b/basis/inspector/inspector-tests.factor
similarity index 100%
rename from core/inspector/inspector-tests.factor
rename to basis/inspector/inspector-tests.factor
diff --git a/core/inspector/inspector.factor b/basis/inspector/inspector.factor
similarity index 100%
rename from core/inspector/inspector.factor
rename to basis/inspector/inspector.factor
diff --git a/core/inspector/summary.txt b/basis/inspector/summary.txt
similarity index 100%
rename from core/inspector/summary.txt
rename to basis/inspector/summary.txt
diff --git a/core/inspector/tags.txt b/basis/inspector/tags.txt
similarity index 100%
rename from core/inspector/tags.txt
rename to basis/inspector/tags.txt
diff --git a/extra/interval-maps/authors.txt b/basis/interval-maps/authors.txt
similarity index 100%
rename from extra/interval-maps/authors.txt
rename to basis/interval-maps/authors.txt
diff --git a/extra/interval-maps/interval-maps-docs.factor b/basis/interval-maps/interval-maps-docs.factor
similarity index 100%
rename from extra/interval-maps/interval-maps-docs.factor
rename to basis/interval-maps/interval-maps-docs.factor
diff --git a/extra/interval-maps/interval-maps-tests.factor b/basis/interval-maps/interval-maps-tests.factor
similarity index 100%
rename from extra/interval-maps/interval-maps-tests.factor
rename to basis/interval-maps/interval-maps-tests.factor
diff --git a/extra/interval-maps/interval-maps.factor b/basis/interval-maps/interval-maps.factor
similarity index 100%
rename from extra/interval-maps/interval-maps.factor
rename to basis/interval-maps/interval-maps.factor
diff --git a/extra/interval-maps/summary.txt b/basis/interval-maps/summary.txt
similarity index 100%
rename from extra/interval-maps/summary.txt
rename to basis/interval-maps/summary.txt
diff --git a/extra/interval-maps/tags.txt b/basis/interval-maps/tags.txt
similarity index 100%
rename from extra/interval-maps/tags.txt
rename to basis/interval-maps/tags.txt
diff --git a/extra/core-foundation/authors.txt b/basis/io/buffers/authors.txt
similarity index 100%
rename from extra/core-foundation/authors.txt
rename to basis/io/buffers/authors.txt
diff --git a/extra/io/buffers/buffers-docs.factor b/basis/io/buffers/buffers-docs.factor
similarity index 100%
rename from extra/io/buffers/buffers-docs.factor
rename to basis/io/buffers/buffers-docs.factor
diff --git a/extra/io/buffers/buffers-tests.factor b/basis/io/buffers/buffers-tests.factor
similarity index 100%
rename from extra/io/buffers/buffers-tests.factor
rename to basis/io/buffers/buffers-tests.factor
diff --git a/extra/io/buffers/buffers.factor b/basis/io/buffers/buffers.factor
similarity index 100%
rename from extra/io/buffers/buffers.factor
rename to basis/io/buffers/buffers.factor
diff --git a/extra/io/buffers/summary.txt b/basis/io/buffers/summary.txt
similarity index 100%
rename from extra/io/buffers/summary.txt
rename to basis/io/buffers/summary.txt
diff --git a/extra/io/encodings/8-bit/8-bit-docs.factor b/basis/io/encodings/8-bit/8-bit-docs.factor
similarity index 100%
rename from extra/io/encodings/8-bit/8-bit-docs.factor
rename to basis/io/encodings/8-bit/8-bit-docs.factor
diff --git a/extra/io/encodings/8-bit/8-bit-tests.factor b/basis/io/encodings/8-bit/8-bit-tests.factor
similarity index 100%
rename from extra/io/encodings/8-bit/8-bit-tests.factor
rename to basis/io/encodings/8-bit/8-bit-tests.factor
diff --git a/extra/io/encodings/8-bit/8-bit.factor b/basis/io/encodings/8-bit/8-bit.factor
similarity index 97%
rename from extra/io/encodings/8-bit/8-bit.factor
rename to basis/io/encodings/8-bit/8-bit.factor
index 16fe052867..cb645379b8 100755
--- a/extra/io/encodings/8-bit/8-bit.factor
+++ b/basis/io/encodings/8-bit/8-bit.factor
@@ -30,7 +30,7 @@ IN: io.encodings.8-bit
 } ;
 
 : encoding-file ( file-name -- stream )
-    "resource:extra/io/encodings/8-bit/" swap ".TXT"
+    "resource:basis/io/encodings/8-bit/" swap ".TXT"
     3append ascii <file-reader> ;
 
 : process-contents ( lines -- assoc )
diff --git a/extra/io/encodings/8-bit/8859-1.TXT b/basis/io/encodings/8-bit/8859-1.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-1.TXT
rename to basis/io/encodings/8-bit/8859-1.TXT
diff --git a/extra/io/encodings/8-bit/8859-10.TXT b/basis/io/encodings/8-bit/8859-10.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-10.TXT
rename to basis/io/encodings/8-bit/8859-10.TXT
diff --git a/extra/io/encodings/8-bit/8859-11.TXT b/basis/io/encodings/8-bit/8859-11.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-11.TXT
rename to basis/io/encodings/8-bit/8859-11.TXT
diff --git a/extra/io/encodings/8-bit/8859-13.TXT b/basis/io/encodings/8-bit/8859-13.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-13.TXT
rename to basis/io/encodings/8-bit/8859-13.TXT
diff --git a/extra/io/encodings/8-bit/8859-14.TXT b/basis/io/encodings/8-bit/8859-14.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-14.TXT
rename to basis/io/encodings/8-bit/8859-14.TXT
diff --git a/extra/io/encodings/8-bit/8859-15.TXT b/basis/io/encodings/8-bit/8859-15.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-15.TXT
rename to basis/io/encodings/8-bit/8859-15.TXT
diff --git a/extra/io/encodings/8-bit/8859-16.TXT b/basis/io/encodings/8-bit/8859-16.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-16.TXT
rename to basis/io/encodings/8-bit/8859-16.TXT
diff --git a/extra/io/encodings/8-bit/8859-2.TXT b/basis/io/encodings/8-bit/8859-2.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-2.TXT
rename to basis/io/encodings/8-bit/8859-2.TXT
diff --git a/extra/io/encodings/8-bit/8859-3.TXT b/basis/io/encodings/8-bit/8859-3.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-3.TXT
rename to basis/io/encodings/8-bit/8859-3.TXT
diff --git a/extra/io/encodings/8-bit/8859-4.TXT b/basis/io/encodings/8-bit/8859-4.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-4.TXT
rename to basis/io/encodings/8-bit/8859-4.TXT
diff --git a/extra/io/encodings/8-bit/8859-5.TXT b/basis/io/encodings/8-bit/8859-5.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-5.TXT
rename to basis/io/encodings/8-bit/8859-5.TXT
diff --git a/extra/io/encodings/8-bit/8859-6.TXT b/basis/io/encodings/8-bit/8859-6.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-6.TXT
rename to basis/io/encodings/8-bit/8859-6.TXT
diff --git a/extra/io/encodings/8-bit/8859-7.TXT b/basis/io/encodings/8-bit/8859-7.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-7.TXT
rename to basis/io/encodings/8-bit/8859-7.TXT
diff --git a/extra/io/encodings/8-bit/8859-8.TXT b/basis/io/encodings/8-bit/8859-8.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-8.TXT
rename to basis/io/encodings/8-bit/8859-8.TXT
diff --git a/extra/io/encodings/8-bit/8859-9.TXT b/basis/io/encodings/8-bit/8859-9.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/8859-9.TXT
rename to basis/io/encodings/8-bit/8859-9.TXT
diff --git a/extra/io/encodings/8-bit/CP037.TXT b/basis/io/encodings/8-bit/CP037.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/CP037.TXT
rename to basis/io/encodings/8-bit/CP037.TXT
diff --git a/extra/io/encodings/8-bit/CP1252.TXT b/basis/io/encodings/8-bit/CP1252.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/CP1252.TXT
rename to basis/io/encodings/8-bit/CP1252.TXT
diff --git a/extra/io/encodings/8-bit/KOI8-R.TXT b/basis/io/encodings/8-bit/KOI8-R.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/KOI8-R.TXT
rename to basis/io/encodings/8-bit/KOI8-R.TXT
diff --git a/extra/io/encodings/8-bit/ROMAN.TXT b/basis/io/encodings/8-bit/ROMAN.TXT
similarity index 100%
rename from extra/io/encodings/8-bit/ROMAN.TXT
rename to basis/io/encodings/8-bit/ROMAN.TXT
diff --git a/extra/delegate/protocols/authors.txt b/basis/io/encodings/8-bit/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/delegate/protocols/authors.txt
rename to basis/io/encodings/8-bit/authors.txt
diff --git a/extra/io/encodings/8-bit/summary.txt b/basis/io/encodings/8-bit/summary.txt
similarity index 100%
rename from extra/io/encodings/8-bit/summary.txt
rename to basis/io/encodings/8-bit/summary.txt
diff --git a/extra/ascii/tags.txt b/basis/io/encodings/8-bit/tags.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/ascii/tags.txt
rename to basis/io/encodings/8-bit/tags.txt
diff --git a/extra/io/encodings/ascii/ascii-docs.factor b/basis/io/encodings/ascii/ascii-docs.factor
similarity index 100%
rename from extra/io/encodings/ascii/ascii-docs.factor
rename to basis/io/encodings/ascii/ascii-docs.factor
diff --git a/extra/io/encodings/ascii/ascii-tests.factor b/basis/io/encodings/ascii/ascii-tests.factor
similarity index 100%
rename from extra/io/encodings/ascii/ascii-tests.factor
rename to basis/io/encodings/ascii/ascii-tests.factor
diff --git a/extra/io/encodings/ascii/ascii.factor b/basis/io/encodings/ascii/ascii.factor
similarity index 100%
rename from extra/io/encodings/ascii/ascii.factor
rename to basis/io/encodings/ascii/ascii.factor
diff --git a/extra/hash2/authors.txt b/basis/io/encodings/ascii/authors.txt
similarity index 100%
rename from extra/hash2/authors.txt
rename to basis/io/encodings/ascii/authors.txt
diff --git a/extra/io/encodings/ascii/summary.txt b/basis/io/encodings/ascii/summary.txt
similarity index 100%
rename from extra/io/encodings/ascii/summary.txt
rename to basis/io/encodings/ascii/summary.txt
diff --git a/extra/io/encodings/8-bit/tags.txt b/basis/io/encodings/ascii/tags.txt
similarity index 100%
rename from extra/io/encodings/8-bit/tags.txt
rename to basis/io/encodings/ascii/tags.txt
diff --git a/extra/io/encodings/8-bit/authors.txt b/basis/io/encodings/iana/authors.txt
similarity index 100%
rename from extra/io/encodings/8-bit/authors.txt
rename to basis/io/encodings/iana/authors.txt
diff --git a/extra/io/encodings/iana/character-sets b/basis/io/encodings/iana/character-sets
similarity index 100%
rename from extra/io/encodings/iana/character-sets
rename to basis/io/encodings/iana/character-sets
diff --git a/extra/io/encodings/iana/iana-docs.factor b/basis/io/encodings/iana/iana-docs.factor
similarity index 100%
rename from extra/io/encodings/iana/iana-docs.factor
rename to basis/io/encodings/iana/iana-docs.factor
diff --git a/extra/io/encodings/iana/iana-tests.factor b/basis/io/encodings/iana/iana-tests.factor
similarity index 100%
rename from extra/io/encodings/iana/iana-tests.factor
rename to basis/io/encodings/iana/iana-tests.factor
diff --git a/extra/io/encodings/iana/iana.factor b/basis/io/encodings/iana/iana.factor
similarity index 96%
rename from extra/io/encodings/iana/iana.factor
rename to basis/io/encodings/iana/iana.factor
index 4368360a4d..dcd806d9a0 100755
--- a/extra/io/encodings/iana/iana.factor
+++ b/basis/io/encodings/iana/iana.factor
@@ -58,5 +58,5 @@ PRIVATE>
     ] each ] H{ } make-assoc more-aliases assoc-union ;
 PRIVATE>
 
-"resource:extra/io/encodings/iana/character-sets"
+"resource:basis/io/encodings/iana/character-sets"
 ascii <file-reader> make-n>e \ n>e-table set-value
diff --git a/extra/io/encodings/iana/summary.txt b/basis/io/encodings/iana/summary.txt
similarity index 100%
rename from extra/io/encodings/iana/summary.txt
rename to basis/io/encodings/iana/summary.txt
diff --git a/extra/io/encodings/ascii/authors.txt b/basis/io/encodings/strict/authors.txt
similarity index 100%
rename from extra/io/encodings/ascii/authors.txt
rename to basis/io/encodings/strict/authors.txt
diff --git a/extra/io/encodings/strict/strict-docs.factor b/basis/io/encodings/strict/strict-docs.factor
similarity index 100%
rename from extra/io/encodings/strict/strict-docs.factor
rename to basis/io/encodings/strict/strict-docs.factor
diff --git a/extra/io/encodings/strict/strict-tests.factor b/basis/io/encodings/strict/strict-tests.factor
similarity index 100%
rename from extra/io/encodings/strict/strict-tests.factor
rename to basis/io/encodings/strict/strict-tests.factor
diff --git a/extra/io/encodings/strict/strict.factor b/basis/io/encodings/strict/strict.factor
similarity index 100%
rename from extra/io/encodings/strict/strict.factor
rename to basis/io/encodings/strict/strict.factor
diff --git a/extra/io/encodings/strict/summary.txt b/basis/io/encodings/strict/summary.txt
similarity index 100%
rename from extra/io/encodings/strict/summary.txt
rename to basis/io/encodings/strict/summary.txt
diff --git a/extra/io/encodings/ascii/tags.txt b/basis/io/encodings/strict/tags.txt
similarity index 100%
rename from extra/io/encodings/ascii/tags.txt
rename to basis/io/encodings/strict/tags.txt
diff --git a/extra/io/encodings/iana/authors.txt b/basis/io/encodings/string/authors.txt
similarity index 100%
rename from extra/io/encodings/iana/authors.txt
rename to basis/io/encodings/string/authors.txt
diff --git a/core/io/encodings/string/string-docs.factor b/basis/io/encodings/string/string-docs.factor
similarity index 100%
rename from core/io/encodings/string/string-docs.factor
rename to basis/io/encodings/string/string-docs.factor
diff --git a/core/io/encodings/string/string-tests.factor b/basis/io/encodings/string/string-tests.factor
similarity index 100%
rename from core/io/encodings/string/string-tests.factor
rename to basis/io/encodings/string/string-tests.factor
diff --git a/core/io/encodings/string/string.factor b/basis/io/encodings/string/string.factor
similarity index 100%
rename from core/io/encodings/string/string.factor
rename to basis/io/encodings/string/string.factor
diff --git a/core/io/encodings/string/summary.txt b/basis/io/encodings/string/summary.txt
similarity index 100%
rename from core/io/encodings/string/summary.txt
rename to basis/io/encodings/string/summary.txt
diff --git a/core/io/encodings/string/tags.factor b/basis/io/encodings/string/tags.factor
similarity index 100%
rename from core/io/encodings/string/tags.factor
rename to basis/io/encodings/string/tags.factor
diff --git a/core/io/encodings/utf16/.utf16.factor.swo b/basis/io/encodings/utf16/.utf16.factor.swo
similarity index 100%
rename from core/io/encodings/utf16/.utf16.factor.swo
rename to basis/io/encodings/utf16/.utf16.factor.swo
diff --git a/extra/io/encodings/strict/authors.txt b/basis/io/encodings/utf16/authors.txt
similarity index 100%
rename from extra/io/encodings/strict/authors.txt
rename to basis/io/encodings/utf16/authors.txt
diff --git a/core/io/encodings/utf16/summary.txt b/basis/io/encodings/utf16/summary.txt
similarity index 100%
rename from core/io/encodings/utf16/summary.txt
rename to basis/io/encodings/utf16/summary.txt
diff --git a/extra/io/encodings/strict/tags.txt b/basis/io/encodings/utf16/tags.txt
similarity index 100%
rename from extra/io/encodings/strict/tags.txt
rename to basis/io/encodings/utf16/tags.txt
diff --git a/core/io/encodings/utf16/utf16-docs.factor b/basis/io/encodings/utf16/utf16-docs.factor
similarity index 100%
rename from core/io/encodings/utf16/utf16-docs.factor
rename to basis/io/encodings/utf16/utf16-docs.factor
diff --git a/core/io/encodings/utf16/utf16-tests.factor b/basis/io/encodings/utf16/utf16-tests.factor
similarity index 100%
rename from core/io/encodings/utf16/utf16-tests.factor
rename to basis/io/encodings/utf16/utf16-tests.factor
diff --git a/core/io/encodings/utf16/utf16.factor b/basis/io/encodings/utf16/utf16.factor
similarity index 95%
rename from core/io/encodings/utf16/utf16.factor
rename to basis/io/encodings/utf16/utf16.factor
index 80706233db..037087e452 100755
--- a/core/io/encodings/utf16/utf16.factor
+++ b/basis/io/encodings/utf16/utf16.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: math kernel sequences sbufs vectors namespaces io.binary
-io.encodings combinators splitting io byte-arrays summary ;
+io.encodings combinators splitting io byte-arrays ;
 IN: io.encodings.utf16
 
 SINGLETON: utf16be
@@ -10,6 +10,8 @@ SINGLETON: utf16le
 
 SINGLETON: utf16
 
+ERROR: missing-bom ;
+
 <PRIVATE
 
 ! UTF-16BE decoding
@@ -107,9 +109,6 @@ M: utf16le encode-char ( char stream encoding -- )
 
 : start-utf16be? ( seq1 -- seq2 ? ) bom-be ?head ;
 
-TUPLE: missing-bom ;
-M: missing-bom summary drop "The BOM for a UTF-16 stream was missing" ;
-
 : bom>le/be ( bom -- le/be )
     dup bom-le sequence= [ drop utf16le ] [
         bom-be sequence= [ utf16be ] [ missing-bom ] if
diff --git a/extra/io/files/unique/backend/backend.factor b/basis/io/files/unique/backend/backend.factor
similarity index 100%
rename from extra/io/files/unique/backend/backend.factor
rename to basis/io/files/unique/backend/backend.factor
diff --git a/extra/io/files/unique/unique-docs.factor b/basis/io/files/unique/unique-docs.factor
similarity index 100%
rename from extra/io/files/unique/unique-docs.factor
rename to basis/io/files/unique/unique-docs.factor
diff --git a/extra/io/files/unique/unique.factor b/basis/io/files/unique/unique.factor
similarity index 100%
rename from extra/io/files/unique/unique.factor
rename to basis/io/files/unique/unique.factor
diff --git a/extra/io/launcher/authors.txt b/basis/io/launcher/authors.txt
similarity index 100%
rename from extra/io/launcher/authors.txt
rename to basis/io/launcher/authors.txt
diff --git a/extra/io/launcher/launcher-docs.factor b/basis/io/launcher/launcher-docs.factor
similarity index 100%
rename from extra/io/launcher/launcher-docs.factor
rename to basis/io/launcher/launcher-docs.factor
diff --git a/extra/io/launcher/launcher-tests.factor b/basis/io/launcher/launcher-tests.factor
similarity index 100%
rename from extra/io/launcher/launcher-tests.factor
rename to basis/io/launcher/launcher-tests.factor
diff --git a/extra/io/launcher/launcher.factor b/basis/io/launcher/launcher.factor
similarity index 100%
rename from extra/io/launcher/launcher.factor
rename to basis/io/launcher/launcher.factor
diff --git a/extra/io/launcher/summary.txt b/basis/io/launcher/summary.txt
similarity index 100%
rename from extra/io/launcher/summary.txt
rename to basis/io/launcher/summary.txt
diff --git a/extra/io/mmap/authors.txt b/basis/io/mmap/authors.txt
similarity index 100%
rename from extra/io/mmap/authors.txt
rename to basis/io/mmap/authors.txt
diff --git a/extra/io/mmap/mmap-docs.factor b/basis/io/mmap/mmap-docs.factor
similarity index 100%
rename from extra/io/mmap/mmap-docs.factor
rename to basis/io/mmap/mmap-docs.factor
diff --git a/extra/io/mmap/mmap-tests.factor b/basis/io/mmap/mmap-tests.factor
similarity index 100%
rename from extra/io/mmap/mmap-tests.factor
rename to basis/io/mmap/mmap-tests.factor
diff --git a/extra/io/mmap/mmap.factor b/basis/io/mmap/mmap.factor
similarity index 100%
rename from extra/io/mmap/mmap.factor
rename to basis/io/mmap/mmap.factor
diff --git a/extra/io/mmap/summary.txt b/basis/io/mmap/summary.txt
similarity index 100%
rename from extra/io/mmap/summary.txt
rename to basis/io/mmap/summary.txt
diff --git a/extra/documents/authors.txt b/basis/io/monitors/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/documents/authors.txt
rename to basis/io/monitors/authors.txt
diff --git a/extra/io/monitors/monitors-docs.factor b/basis/io/monitors/monitors-docs.factor
similarity index 100%
rename from extra/io/monitors/monitors-docs.factor
rename to basis/io/monitors/monitors-docs.factor
diff --git a/extra/io/monitors/monitors-tests.factor b/basis/io/monitors/monitors-tests.factor
similarity index 100%
rename from extra/io/monitors/monitors-tests.factor
rename to basis/io/monitors/monitors-tests.factor
diff --git a/extra/io/monitors/monitors.factor b/basis/io/monitors/monitors.factor
similarity index 100%
rename from extra/io/monitors/monitors.factor
rename to basis/io/monitors/monitors.factor
diff --git a/extra/io/monitors/recursive/recursive-tests.factor b/basis/io/monitors/recursive/recursive-tests.factor
similarity index 100%
rename from extra/io/monitors/recursive/recursive-tests.factor
rename to basis/io/monitors/recursive/recursive-tests.factor
diff --git a/extra/io/monitors/recursive/recursive.factor b/basis/io/monitors/recursive/recursive.factor
similarity index 100%
rename from extra/io/monitors/recursive/recursive.factor
rename to basis/io/monitors/recursive/recursive.factor
diff --git a/extra/io/monitors/summary.txt b/basis/io/monitors/summary.txt
similarity index 100%
rename from extra/io/monitors/summary.txt
rename to basis/io/monitors/summary.txt
diff --git a/extra/io/paths/authors.txt b/basis/io/paths/authors.txt
similarity index 100%
rename from extra/io/paths/authors.txt
rename to basis/io/paths/authors.txt
diff --git a/extra/io/paths/paths.factor b/basis/io/paths/paths.factor
similarity index 100%
rename from extra/io/paths/paths.factor
rename to basis/io/paths/paths.factor
diff --git a/extra/io/pipes/pipes-docs.factor b/basis/io/pipes/pipes-docs.factor
similarity index 100%
rename from extra/io/pipes/pipes-docs.factor
rename to basis/io/pipes/pipes-docs.factor
diff --git a/extra/io/pipes/pipes-tests.factor b/basis/io/pipes/pipes-tests.factor
similarity index 100%
rename from extra/io/pipes/pipes-tests.factor
rename to basis/io/pipes/pipes-tests.factor
diff --git a/extra/io/pipes/pipes.factor b/basis/io/pipes/pipes.factor
similarity index 100%
rename from extra/io/pipes/pipes.factor
rename to basis/io/pipes/pipes.factor
diff --git a/extra/editors/authors.txt b/basis/io/pools/authors.txt
similarity index 100%
rename from extra/editors/authors.txt
rename to basis/io/pools/authors.txt
diff --git a/extra/io/pools/pools-docs.factor b/basis/io/pools/pools-docs.factor
similarity index 100%
rename from extra/io/pools/pools-docs.factor
rename to basis/io/pools/pools-docs.factor
diff --git a/extra/io/pools/pools.factor b/basis/io/pools/pools.factor
similarity index 100%
rename from extra/io/pools/pools.factor
rename to basis/io/pools/pools.factor
diff --git a/extra/io/pools/summary.txt b/basis/io/pools/summary.txt
similarity index 100%
rename from extra/io/pools/summary.txt
rename to basis/io/pools/summary.txt
diff --git a/extra/io/pools/tags.txt b/basis/io/pools/tags.txt
similarity index 100%
rename from extra/io/pools/tags.txt
rename to basis/io/pools/tags.txt
diff --git a/extra/editors/jedit/authors.txt b/basis/io/ports/authors.txt
similarity index 100%
rename from extra/editors/jedit/authors.txt
rename to basis/io/ports/authors.txt
diff --git a/extra/io/ports/ports-docs.factor b/basis/io/ports/ports-docs.factor
similarity index 100%
rename from extra/io/ports/ports-docs.factor
rename to basis/io/ports/ports-docs.factor
diff --git a/extra/io/ports/ports.factor b/basis/io/ports/ports.factor
similarity index 100%
rename from extra/io/ports/ports.factor
rename to basis/io/ports/ports.factor
diff --git a/extra/io/ports/summary.txt b/basis/io/ports/summary.txt
similarity index 100%
rename from extra/io/ports/summary.txt
rename to basis/io/ports/summary.txt
diff --git a/extra/float-arrays/authors.txt b/basis/io/servers/connection/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/float-arrays/authors.txt
rename to basis/io/servers/connection/authors.txt
diff --git a/extra/io/servers/connection/connection-docs.factor b/basis/io/servers/connection/connection-docs.factor
similarity index 100%
rename from extra/io/servers/connection/connection-docs.factor
rename to basis/io/servers/connection/connection-docs.factor
diff --git a/extra/io/servers/connection/connection-tests.factor b/basis/io/servers/connection/connection-tests.factor
similarity index 100%
rename from extra/io/servers/connection/connection-tests.factor
rename to basis/io/servers/connection/connection-tests.factor
diff --git a/extra/io/servers/connection/connection.factor b/basis/io/servers/connection/connection.factor
similarity index 100%
rename from extra/io/servers/connection/connection.factor
rename to basis/io/servers/connection/connection.factor
diff --git a/extra/io/servers/connection/summary.txt b/basis/io/servers/connection/summary.txt
similarity index 100%
rename from extra/io/servers/connection/summary.txt
rename to basis/io/servers/connection/summary.txt
diff --git a/extra/io/servers/connection/tags.txt b/basis/io/servers/connection/tags.txt
similarity index 100%
rename from extra/io/servers/connection/tags.txt
rename to basis/io/servers/connection/tags.txt
diff --git a/extra/freetype/authors.txt b/basis/io/servers/packet/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/freetype/authors.txt
rename to basis/io/servers/packet/authors.txt
diff --git a/extra/io/servers/packet/datagram.factor b/basis/io/servers/packet/datagram.factor
similarity index 100%
rename from extra/io/servers/packet/datagram.factor
rename to basis/io/servers/packet/datagram.factor
diff --git a/extra/io/servers/packet/summary.txt b/basis/io/servers/packet/summary.txt
similarity index 100%
rename from extra/io/servers/packet/summary.txt
rename to basis/io/servers/packet/summary.txt
diff --git a/extra/io/servers/packet/tags.txt b/basis/io/servers/packet/tags.txt
similarity index 100%
rename from extra/io/servers/packet/tags.txt
rename to basis/io/servers/packet/tags.txt
diff --git a/extra/io/sockets/authors.txt b/basis/io/sockets/authors.txt
similarity index 100%
rename from extra/io/sockets/authors.txt
rename to basis/io/sockets/authors.txt
diff --git a/extra/help/authors.txt b/basis/io/sockets/secure/authors.txt
similarity index 100%
rename from extra/help/authors.txt
rename to basis/io/sockets/secure/authors.txt
diff --git a/extra/io/sockets/secure/secure-docs.factor b/basis/io/sockets/secure/secure-docs.factor
similarity index 100%
rename from extra/io/sockets/secure/secure-docs.factor
rename to basis/io/sockets/secure/secure-docs.factor
diff --git a/extra/io/sockets/secure/secure-tests.factor b/basis/io/sockets/secure/secure-tests.factor
similarity index 69%
rename from extra/io/sockets/secure/secure-tests.factor
rename to basis/io/sockets/secure/secure-tests.factor
index 311127e333..557bba52d2 100755
--- a/extra/io/sockets/secure/secure-tests.factor
+++ b/basis/io/sockets/secure/secure-tests.factor
@@ -5,8 +5,8 @@ USING: accessors kernel io.sockets io.sockets.secure tools.test ;
 
 [ ] [
     <secure-config>
-        "resource:extra/openssl/test/server.pem" >>key-file
-        "resource:extra/openssl/test/dh1024.pem" >>dh-file
+        "resource:basis/openssl/test/server.pem" >>key-file
+        "resource:basis/openssl/test/dh1024.pem" >>dh-file
         "password" >>password
     [ ] with-secure-context
 ] unit-test
diff --git a/extra/io/sockets/secure/secure.factor b/basis/io/sockets/secure/secure.factor
similarity index 97%
rename from extra/io/sockets/secure/secure.factor
rename to basis/io/sockets/secure/secure.factor
index d399163dd8..3e516dff8b 100755
--- a/extra/io/sockets/secure/secure.factor
+++ b/basis/io/sockets/secure/secure.factor
@@ -26,7 +26,7 @@ ephemeral-key-bits ;
     secure-config new
         SSLv23 >>method
         1024 >>ephemeral-key-bits
-        "resource:extra/openssl/cacert.pem" >>ca-file
+        "resource:basis/openssl/cacert.pem" >>ca-file
         t >>verify ;
 
 TUPLE: secure-context config handle disposed ;
diff --git a/extra/io/sockets/secure/summary.txt b/basis/io/sockets/secure/summary.txt
similarity index 100%
rename from extra/io/sockets/secure/summary.txt
rename to basis/io/sockets/secure/summary.txt
diff --git a/extra/io/sockets/secure/tags.txt b/basis/io/sockets/secure/tags.txt
similarity index 100%
rename from extra/io/sockets/secure/tags.txt
rename to basis/io/sockets/secure/tags.txt
diff --git a/extra/io/sockets/sockets-docs.factor b/basis/io/sockets/sockets-docs.factor
similarity index 100%
rename from extra/io/sockets/sockets-docs.factor
rename to basis/io/sockets/sockets-docs.factor
diff --git a/extra/io/sockets/sockets-tests.factor b/basis/io/sockets/sockets-tests.factor
similarity index 100%
rename from extra/io/sockets/sockets-tests.factor
rename to basis/io/sockets/sockets-tests.factor
diff --git a/extra/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor
similarity index 100%
rename from extra/io/sockets/sockets.factor
rename to basis/io/sockets/sockets.factor
diff --git a/extra/io/sockets/summary.txt b/basis/io/sockets/summary.txt
similarity index 100%
rename from extra/io/sockets/summary.txt
rename to basis/io/sockets/summary.txt
diff --git a/extra/io/sockets/tags.txt b/basis/io/sockets/tags.txt
similarity index 100%
rename from extra/io/sockets/tags.txt
rename to basis/io/sockets/tags.txt
diff --git a/extra/help/cookbook/authors.txt b/basis/io/streams/duplex/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/help/cookbook/authors.txt
rename to basis/io/streams/duplex/authors.txt
diff --git a/extra/io/streams/duplex/duplex-docs.factor b/basis/io/streams/duplex/duplex-docs.factor
similarity index 100%
rename from extra/io/streams/duplex/duplex-docs.factor
rename to basis/io/streams/duplex/duplex-docs.factor
diff --git a/extra/io/streams/duplex/duplex-tests.factor b/basis/io/streams/duplex/duplex-tests.factor
similarity index 100%
rename from extra/io/streams/duplex/duplex-tests.factor
rename to basis/io/streams/duplex/duplex-tests.factor
diff --git a/extra/io/streams/duplex/duplex.factor b/basis/io/streams/duplex/duplex.factor
similarity index 100%
rename from extra/io/streams/duplex/duplex.factor
rename to basis/io/streams/duplex/duplex.factor
diff --git a/extra/io/streams/duplex/summary.txt b/basis/io/streams/duplex/summary.txt
similarity index 100%
rename from extra/io/streams/duplex/summary.txt
rename to basis/io/streams/duplex/summary.txt
diff --git a/extra/io/streams/limited/limited-tests.factor b/basis/io/streams/limited/limited-tests.factor
similarity index 100%
rename from extra/io/streams/limited/limited-tests.factor
rename to basis/io/streams/limited/limited-tests.factor
diff --git a/extra/io/streams/limited/limited.factor b/basis/io/streams/limited/limited.factor
similarity index 100%
rename from extra/io/streams/limited/limited.factor
rename to basis/io/streams/limited/limited.factor
diff --git a/core/io/streams/memory/memory.factor b/basis/io/streams/memory/memory.factor
similarity index 100%
rename from core/io/streams/memory/memory.factor
rename to basis/io/streams/memory/memory.factor
diff --git a/extra/help/crossref/authors.txt b/basis/io/streams/null/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/help/crossref/authors.txt
rename to basis/io/streams/null/authors.txt
diff --git a/extra/io/streams/null/null.factor b/basis/io/streams/null/null.factor
similarity index 100%
rename from extra/io/streams/null/null.factor
rename to basis/io/streams/null/null.factor
diff --git a/extra/io/timeouts/summary.txt b/basis/io/timeouts/summary.txt
similarity index 100%
rename from extra/io/timeouts/summary.txt
rename to basis/io/timeouts/summary.txt
diff --git a/extra/io/timeouts/timeouts-docs.factor b/basis/io/timeouts/timeouts-docs.factor
similarity index 100%
rename from extra/io/timeouts/timeouts-docs.factor
rename to basis/io/timeouts/timeouts-docs.factor
diff --git a/extra/io/timeouts/timeouts.factor b/basis/io/timeouts/timeouts.factor
similarity index 100%
rename from extra/io/timeouts/timeouts.factor
rename to basis/io/timeouts/timeouts.factor
diff --git a/extra/help/definitions/authors.txt b/basis/io/unix/authors.txt
similarity index 100%
rename from extra/help/definitions/authors.txt
rename to basis/io/unix/authors.txt
diff --git a/extra/help/handbook/authors.txt b/basis/io/unix/backend/authors.txt
similarity index 100%
rename from extra/help/handbook/authors.txt
rename to basis/io/unix/backend/authors.txt
diff --git a/extra/io/unix/backend/backend.factor b/basis/io/unix/backend/backend.factor
similarity index 100%
rename from extra/io/unix/backend/backend.factor
rename to basis/io/unix/backend/backend.factor
diff --git a/extra/io/unix/backend/summary.txt b/basis/io/unix/backend/summary.txt
similarity index 100%
rename from extra/io/unix/backend/summary.txt
rename to basis/io/unix/backend/summary.txt
diff --git a/extra/help/lint/authors.txt b/basis/io/unix/bsd/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/help/lint/authors.txt
rename to basis/io/unix/bsd/authors.txt
diff --git a/extra/io/unix/bsd/bsd.factor b/basis/io/unix/bsd/bsd.factor
similarity index 100%
rename from extra/io/unix/bsd/bsd.factor
rename to basis/io/unix/bsd/bsd.factor
diff --git a/extra/help/markup/authors.txt b/basis/io/unix/epoll/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/help/markup/authors.txt
rename to basis/io/unix/epoll/authors.txt
diff --git a/extra/io/unix/epoll/epoll.factor b/basis/io/unix/epoll/epoll.factor
similarity index 100%
rename from extra/io/unix/epoll/epoll.factor
rename to basis/io/unix/epoll/epoll.factor
diff --git a/extra/help/stylesheet/authors.txt b/basis/io/unix/files/authors.txt
similarity index 100%
rename from extra/help/stylesheet/authors.txt
rename to basis/io/unix/files/authors.txt
diff --git a/extra/io/unix/files/files-tests.factor b/basis/io/unix/files/files-tests.factor
similarity index 100%
rename from extra/io/unix/files/files-tests.factor
rename to basis/io/unix/files/files-tests.factor
diff --git a/extra/io/unix/files/files.factor b/basis/io/unix/files/files.factor
similarity index 100%
rename from extra/io/unix/files/files.factor
rename to basis/io/unix/files/files.factor
diff --git a/extra/io/unix/files/summary.txt b/basis/io/unix/files/summary.txt
similarity index 100%
rename from extra/io/unix/files/summary.txt
rename to basis/io/unix/files/summary.txt
diff --git a/extra/io/unix/files/unique/unique.factor b/basis/io/unix/files/unique/unique.factor
similarity index 100%
rename from extra/io/unix/files/unique/unique.factor
rename to basis/io/unix/files/unique/unique.factor
diff --git a/extra/io/unix/freebsd/freebsd.factor b/basis/io/unix/freebsd/freebsd.factor
similarity index 100%
rename from extra/io/unix/freebsd/freebsd.factor
rename to basis/io/unix/freebsd/freebsd.factor
diff --git a/extra/help/syntax/authors.txt b/basis/io/unix/kqueue/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/help/syntax/authors.txt
rename to basis/io/unix/kqueue/authors.txt
diff --git a/extra/io/unix/kqueue/kqueue.factor b/basis/io/unix/kqueue/kqueue.factor
similarity index 100%
rename from extra/io/unix/kqueue/kqueue.factor
rename to basis/io/unix/kqueue/kqueue.factor
diff --git a/extra/help/topics/authors.txt b/basis/io/unix/launcher/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/help/topics/authors.txt
rename to basis/io/unix/launcher/authors.txt
diff --git a/extra/io/unix/launcher/launcher-tests.factor b/basis/io/unix/launcher/launcher-tests.factor
similarity index 100%
rename from extra/io/unix/launcher/launcher-tests.factor
rename to basis/io/unix/launcher/launcher-tests.factor
diff --git a/extra/io/unix/launcher/launcher.factor b/basis/io/unix/launcher/launcher.factor
similarity index 100%
rename from extra/io/unix/launcher/launcher.factor
rename to basis/io/unix/launcher/launcher.factor
diff --git a/extra/io/unix/launcher/parser/parser-tests.factor b/basis/io/unix/launcher/parser/parser-tests.factor
similarity index 100%
rename from extra/io/unix/launcher/parser/parser-tests.factor
rename to basis/io/unix/launcher/parser/parser-tests.factor
diff --git a/extra/io/unix/launcher/parser/parser.factor b/basis/io/unix/launcher/parser/parser.factor
similarity index 100%
rename from extra/io/unix/launcher/parser/parser.factor
rename to basis/io/unix/launcher/parser/parser.factor
diff --git a/extra/help/tutorial/authors.txt b/basis/io/unix/linux/authors.txt
similarity index 100%
rename from extra/help/tutorial/authors.txt
rename to basis/io/unix/linux/authors.txt
diff --git a/extra/io/unix/linux/linux.factor b/basis/io/unix/linux/linux.factor
similarity index 100%
rename from extra/io/unix/linux/linux.factor
rename to basis/io/unix/linux/linux.factor
diff --git a/extra/io/unix/linux/monitors/monitors-tests.factor b/basis/io/unix/linux/monitors/monitors-tests.factor
similarity index 100%
rename from extra/io/unix/linux/monitors/monitors-tests.factor
rename to basis/io/unix/linux/monitors/monitors-tests.factor
diff --git a/extra/io/unix/linux/monitors/monitors.factor b/basis/io/unix/linux/monitors/monitors.factor
similarity index 100%
rename from extra/io/unix/linux/monitors/monitors.factor
rename to basis/io/unix/linux/monitors/monitors.factor
diff --git a/extra/io/unix/macosx/macosx.factor b/basis/io/unix/macosx/macosx.factor
similarity index 100%
rename from extra/io/unix/macosx/macosx.factor
rename to basis/io/unix/macosx/macosx.factor
diff --git a/extra/io/unix/macosx/monitors/monitors.factor b/basis/io/unix/macosx/monitors/monitors.factor
similarity index 100%
rename from extra/io/unix/macosx/monitors/monitors.factor
rename to basis/io/unix/macosx/monitors/monitors.factor
diff --git a/extra/hints/authors.txt b/basis/io/unix/mmap/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/hints/authors.txt
rename to basis/io/unix/mmap/authors.txt
diff --git a/extra/io/unix/mmap/mmap.factor b/basis/io/unix/mmap/mmap.factor
similarity index 100%
rename from extra/io/unix/mmap/mmap.factor
rename to basis/io/unix/mmap/mmap.factor
diff --git a/extra/io/unix/netbsd/netbsd.factor b/basis/io/unix/netbsd/netbsd.factor
similarity index 100%
rename from extra/io/unix/netbsd/netbsd.factor
rename to basis/io/unix/netbsd/netbsd.factor
diff --git a/extra/io/unix/openbsd/openbsd.factor b/basis/io/unix/openbsd/openbsd.factor
similarity index 100%
rename from extra/io/unix/openbsd/openbsd.factor
rename to basis/io/unix/openbsd/openbsd.factor
diff --git a/extra/io/unix/pipes/pipes-tests.factor b/basis/io/unix/pipes/pipes-tests.factor
similarity index 100%
rename from extra/io/unix/pipes/pipes-tests.factor
rename to basis/io/unix/pipes/pipes-tests.factor
diff --git a/extra/io/unix/pipes/pipes.factor b/basis/io/unix/pipes/pipes.factor
similarity index 100%
rename from extra/io/unix/pipes/pipes.factor
rename to basis/io/unix/pipes/pipes.factor
diff --git a/extra/io/buffers/authors.txt b/basis/io/unix/select/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/io/buffers/authors.txt
rename to basis/io/unix/select/authors.txt
diff --git a/extra/io/unix/select/select.factor b/basis/io/unix/select/select.factor
similarity index 100%
rename from extra/io/unix/select/select.factor
rename to basis/io/unix/select/select.factor
diff --git a/extra/io/monitors/authors.txt b/basis/io/unix/sockets/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/monitors/authors.txt
rename to basis/io/unix/sockets/authors.txt
diff --git a/extra/io/unix/sockets/secure/secure-tests.factor b/basis/io/unix/sockets/secure/secure-tests.factor
similarity index 97%
rename from extra/io/unix/sockets/secure/secure-tests.factor
rename to basis/io/unix/sockets/secure/secure-tests.factor
index 52bee63850..d2a1649686 100644
--- a/extra/io/unix/sockets/secure/secure-tests.factor
+++ b/basis/io/unix/sockets/secure/secure-tests.factor
@@ -11,8 +11,8 @@ concurrency.promises byte-arrays locals calendar io.timeouts ;
 
 : with-test-context ( quot -- )
     <secure-config>
-        "resource:extra/openssl/test/server.pem" >>key-file
-        "resource:extra/openssl/test/dh1024.pem" >>dh-file
+        "resource:basis/openssl/test/server.pem" >>key-file
+        "resource:basis/openssl/test/dh1024.pem" >>dh-file
         "password" >>password
     swap with-secure-context ; inline
 
diff --git a/extra/io/unix/sockets/secure/secure.factor b/basis/io/unix/sockets/secure/secure.factor
similarity index 100%
rename from extra/io/unix/sockets/secure/secure.factor
rename to basis/io/unix/sockets/secure/secure.factor
diff --git a/extra/io/unix/sockets/sockets.factor b/basis/io/unix/sockets/sockets.factor
similarity index 100%
rename from extra/io/unix/sockets/sockets.factor
rename to basis/io/unix/sockets/sockets.factor
diff --git a/extra/io/unix/sockets/summary.txt b/basis/io/unix/sockets/summary.txt
similarity index 100%
rename from extra/io/unix/sockets/summary.txt
rename to basis/io/unix/sockets/summary.txt
diff --git a/extra/io/unix/summary.txt b/basis/io/unix/summary.txt
similarity index 100%
rename from extra/io/unix/summary.txt
rename to basis/io/unix/summary.txt
diff --git a/extra/io/unix/unix-tests.factor b/basis/io/unix/unix-tests.factor
similarity index 100%
rename from extra/io/unix/unix-tests.factor
rename to basis/io/unix/unix-tests.factor
diff --git a/extra/io/unix/unix.factor b/basis/io/unix/unix.factor
similarity index 100%
rename from extra/io/unix/unix.factor
rename to basis/io/unix/unix.factor
diff --git a/extra/io/windows/authors.txt b/basis/io/windows/authors.txt
similarity index 100%
rename from extra/io/windows/authors.txt
rename to basis/io/windows/authors.txt
diff --git a/extra/io/sockets/headers/authors.txt b/basis/io/windows/ce/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/sockets/headers/authors.txt
rename to basis/io/windows/ce/authors.txt
diff --git a/extra/io/windows/ce/backend/authors.txt b/basis/io/windows/ce/backend/authors.txt
similarity index 100%
rename from extra/io/windows/ce/backend/authors.txt
rename to basis/io/windows/ce/backend/authors.txt
diff --git a/extra/io/windows/ce/backend/backend.factor b/basis/io/windows/ce/backend/backend.factor
similarity index 100%
rename from extra/io/windows/ce/backend/backend.factor
rename to basis/io/windows/ce/backend/backend.factor
diff --git a/extra/io/windows/ce/ce.factor b/basis/io/windows/ce/ce.factor
similarity index 100%
rename from extra/io/windows/ce/ce.factor
rename to basis/io/windows/ce/ce.factor
diff --git a/extra/io/windows/ce/files/authors.txt b/basis/io/windows/ce/files/authors.txt
similarity index 100%
rename from extra/io/windows/ce/files/authors.txt
rename to basis/io/windows/ce/files/authors.txt
diff --git a/extra/io/windows/ce/files/files.factor b/basis/io/windows/ce/files/files.factor
similarity index 100%
rename from extra/io/windows/ce/files/files.factor
rename to basis/io/windows/ce/files/files.factor
diff --git a/extra/io/windows/ce/privileges/privileges.factor b/basis/io/windows/ce/privileges/privileges.factor
similarity index 100%
rename from extra/io/windows/ce/privileges/privileges.factor
rename to basis/io/windows/ce/privileges/privileges.factor
diff --git a/extra/io/windows/ce/sockets/authors.txt b/basis/io/windows/ce/sockets/authors.txt
similarity index 100%
rename from extra/io/windows/ce/sockets/authors.txt
rename to basis/io/windows/ce/sockets/authors.txt
diff --git a/extra/io/windows/ce/sockets/sockets.factor b/basis/io/windows/ce/sockets/sockets.factor
similarity index 100%
rename from extra/io/windows/ce/sockets/sockets.factor
rename to basis/io/windows/ce/sockets/sockets.factor
diff --git a/extra/io/windows/ce/summary.txt b/basis/io/windows/ce/summary.txt
similarity index 100%
rename from extra/io/windows/ce/summary.txt
rename to basis/io/windows/ce/summary.txt
diff --git a/extra/io/windows/files/files.factor b/basis/io/windows/files/files.factor
similarity index 100%
rename from extra/io/windows/files/files.factor
rename to basis/io/windows/files/files.factor
diff --git a/extra/io/windows/files/unique/unique.factor b/basis/io/windows/files/unique/unique.factor
similarity index 100%
rename from extra/io/windows/files/unique/unique.factor
rename to basis/io/windows/files/unique/unique.factor
diff --git a/extra/io/windows/launcher/authors.txt b/basis/io/windows/launcher/authors.txt
similarity index 100%
rename from extra/io/windows/launcher/authors.txt
rename to basis/io/windows/launcher/authors.txt
diff --git a/extra/io/windows/launcher/launcher-tests.factor b/basis/io/windows/launcher/launcher-tests.factor
similarity index 100%
rename from extra/io/windows/launcher/launcher-tests.factor
rename to basis/io/windows/launcher/launcher-tests.factor
diff --git a/extra/io/windows/launcher/launcher.factor b/basis/io/windows/launcher/launcher.factor
similarity index 100%
rename from extra/io/windows/launcher/launcher.factor
rename to basis/io/windows/launcher/launcher.factor
diff --git a/extra/io/sockets/headers/bsd/authors.txt b/basis/io/windows/mmap/authors.txt
similarity index 100%
rename from extra/io/sockets/headers/bsd/authors.txt
rename to basis/io/windows/mmap/authors.txt
diff --git a/extra/io/windows/mmap/mmap-tests.factor b/basis/io/windows/mmap/mmap-tests.factor
similarity index 100%
rename from extra/io/windows/mmap/mmap-tests.factor
rename to basis/io/windows/mmap/mmap-tests.factor
diff --git a/extra/io/windows/mmap/mmap.factor b/basis/io/windows/mmap/mmap.factor
similarity index 100%
rename from extra/io/windows/mmap/mmap.factor
rename to basis/io/windows/mmap/mmap.factor
diff --git a/extra/io/windows/nt/authors.txt b/basis/io/windows/nt/authors.txt
similarity index 100%
rename from extra/io/windows/nt/authors.txt
rename to basis/io/windows/nt/authors.txt
diff --git a/extra/io/windows/nt/backend/authors.txt b/basis/io/windows/nt/backend/authors.txt
similarity index 100%
rename from extra/io/windows/nt/backend/authors.txt
rename to basis/io/windows/nt/backend/authors.txt
diff --git a/extra/io/windows/nt/backend/backend.factor b/basis/io/windows/nt/backend/backend.factor
similarity index 100%
rename from extra/io/windows/nt/backend/backend.factor
rename to basis/io/windows/nt/backend/backend.factor
diff --git a/extra/io/windows/nt/files/authors.txt b/basis/io/windows/nt/files/authors.txt
similarity index 100%
rename from extra/io/windows/nt/files/authors.txt
rename to basis/io/windows/nt/files/authors.txt
diff --git a/extra/io/windows/nt/files/files-tests.factor b/basis/io/windows/nt/files/files-tests.factor
similarity index 100%
rename from extra/io/windows/nt/files/files-tests.factor
rename to basis/io/windows/nt/files/files-tests.factor
diff --git a/extra/io/windows/nt/files/files.factor b/basis/io/windows/nt/files/files.factor
similarity index 100%
rename from extra/io/windows/nt/files/files.factor
rename to basis/io/windows/nt/files/files.factor
diff --git a/extra/io/windows/nt/launcher/authors.txt b/basis/io/windows/nt/launcher/authors.txt
similarity index 100%
rename from extra/io/windows/nt/launcher/authors.txt
rename to basis/io/windows/nt/launcher/authors.txt
diff --git a/extra/io/windows/nt/launcher/launcher-tests.factor b/basis/io/windows/nt/launcher/launcher-tests.factor
similarity index 85%
rename from extra/io/windows/nt/launcher/launcher-tests.factor
rename to basis/io/windows/nt/launcher/launcher-tests.factor
index 254f845c48..d82871ec9e 100755
--- a/extra/io/windows/nt/launcher/launcher-tests.factor
+++ b/basis/io/windows/nt/launcher/launcher-tests.factor
@@ -41,7 +41,7 @@ sequences parser assocs hashtables math continuations ;
 ] unit-test
 
 [ ] [
-    "resource:extra/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
         <process>
             vm "-script" "stderr.factor" 3array >>command
             "out.txt" temp-file >>stdout
@@ -59,7 +59,7 @@ sequences parser assocs hashtables math continuations ;
 ] unit-test
 
 [ ] [
-    "resource:extra/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
         <process>
             vm "-script" "stderr.factor" 3array >>command
             "out.txt" temp-file >>stdout
@@ -73,7 +73,7 @@ sequences parser assocs hashtables math continuations ;
 ] unit-test
 
 [ "output" ] [
-    "resource:extra/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
         <process>
             vm "-script" "stderr.factor" 3array >>command
             "err2.txt" temp-file >>stderr
@@ -86,7 +86,7 @@ sequences parser assocs hashtables math continuations ;
 ] unit-test
 
 [ t ] [
-    "resource:extra/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
         <process>
             vm "-script" "env.factor" 3array >>command
         ascii <process-reader> contents
@@ -96,7 +96,7 @@ sequences parser assocs hashtables math continuations ;
 ] unit-test
 
 [ t ] [
-    "resource:extra/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
         <process>
             vm "-script" "env.factor" 3array >>command
             +replace-environment+ >>environment-mode
@@ -108,7 +108,7 @@ sequences parser assocs hashtables math continuations ;
 ] unit-test
 
 [ "B" ] [
-    "resource:extra/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
         <process>
             vm "-script" "env.factor" 3array >>command
             { { "A" "B" } } >>environment
@@ -119,7 +119,7 @@ sequences parser assocs hashtables math continuations ;
 ] unit-test
 
 [ f ] [
-    "resource:extra/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
         <process>
             vm "-script" "env.factor" 3array >>command
             { { "HOME" "XXX" } } >>environment
@@ -145,7 +145,7 @@ sequences parser assocs hashtables math continuations ;
 
 [ "Hello appender\r\nHello appender\r\n" ] [
     2 [
-        "resource:extra/io/windows/nt/launcher/test" [
+        "resource:basis/io/windows/nt/launcher/test" [
             <process>
                 vm "-script" "append.factor" 3array >>command
                 "append-test" temp-file <appender> >>stdout
diff --git a/extra/io/windows/nt/launcher/launcher.factor b/basis/io/windows/nt/launcher/launcher.factor
similarity index 100%
rename from extra/io/windows/nt/launcher/launcher.factor
rename to basis/io/windows/nt/launcher/launcher.factor
diff --git a/extra/io/windows/nt/launcher/test/append.factor b/basis/io/windows/nt/launcher/test/append.factor
similarity index 100%
rename from extra/io/windows/nt/launcher/test/append.factor
rename to basis/io/windows/nt/launcher/test/append.factor
diff --git a/extra/io/windows/nt/launcher/test/env.factor b/basis/io/windows/nt/launcher/test/env.factor
similarity index 100%
rename from extra/io/windows/nt/launcher/test/env.factor
rename to basis/io/windows/nt/launcher/test/env.factor
diff --git a/extra/io/windows/nt/launcher/test/stderr.factor b/basis/io/windows/nt/launcher/test/stderr.factor
similarity index 100%
rename from extra/io/windows/nt/launcher/test/stderr.factor
rename to basis/io/windows/nt/launcher/test/stderr.factor
diff --git a/extra/io/windows/ce/authors.txt b/basis/io/windows/nt/monitors/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/io/windows/ce/authors.txt
rename to basis/io/windows/nt/monitors/authors.txt
diff --git a/extra/io/windows/nt/monitors/monitors-tests.factor b/basis/io/windows/nt/monitors/monitors-tests.factor
similarity index 100%
rename from extra/io/windows/nt/monitors/monitors-tests.factor
rename to basis/io/windows/nt/monitors/monitors-tests.factor
diff --git a/extra/io/windows/nt/monitors/monitors.factor b/basis/io/windows/nt/monitors/monitors.factor
similarity index 100%
rename from extra/io/windows/nt/monitors/monitors.factor
rename to basis/io/windows/nt/monitors/monitors.factor
diff --git a/extra/io/windows/nt/nt.factor b/basis/io/windows/nt/nt.factor
similarity index 100%
rename from extra/io/windows/nt/nt.factor
rename to basis/io/windows/nt/nt.factor
diff --git a/extra/io/pools/authors.txt b/basis/io/windows/nt/pipes/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/io/pools/authors.txt
rename to basis/io/windows/nt/pipes/authors.txt
diff --git a/extra/io/windows/nt/pipes/pipes.factor b/basis/io/windows/nt/pipes/pipes.factor
similarity index 100%
rename from extra/io/windows/nt/pipes/pipes.factor
rename to basis/io/windows/nt/pipes/pipes.factor
diff --git a/extra/io/windows/nt/privileges/privileges.factor b/basis/io/windows/nt/privileges/privileges.factor
similarity index 100%
rename from extra/io/windows/nt/privileges/privileges.factor
rename to basis/io/windows/nt/privileges/privileges.factor
diff --git a/extra/io/windows/nt/sockets/authors.txt b/basis/io/windows/nt/sockets/authors.txt
similarity index 100%
rename from extra/io/windows/nt/sockets/authors.txt
rename to basis/io/windows/nt/sockets/authors.txt
diff --git a/extra/io/windows/nt/sockets/sockets.factor b/basis/io/windows/nt/sockets/sockets.factor
similarity index 100%
rename from extra/io/windows/nt/sockets/sockets.factor
rename to basis/io/windows/nt/sockets/sockets.factor
diff --git a/extra/io/windows/nt/summary.txt b/basis/io/windows/nt/summary.txt
similarity index 100%
rename from extra/io/windows/nt/summary.txt
rename to basis/io/windows/nt/summary.txt
diff --git a/extra/io/windows/privileges/privileges.factor b/basis/io/windows/privileges/privileges.factor
similarity index 100%
rename from extra/io/windows/privileges/privileges.factor
rename to basis/io/windows/privileges/privileges.factor
diff --git a/extra/io/windows/sockets/sockets.factor b/basis/io/windows/sockets/sockets.factor
similarity index 100%
rename from extra/io/windows/sockets/sockets.factor
rename to basis/io/windows/sockets/sockets.factor
diff --git a/extra/io/windows/summary.txt b/basis/io/windows/summary.txt
similarity index 100%
rename from extra/io/windows/summary.txt
rename to basis/io/windows/summary.txt
diff --git a/extra/io/windows/tags.txt b/basis/io/windows/tags.txt
similarity index 100%
rename from extra/io/windows/tags.txt
rename to basis/io/windows/tags.txt
diff --git a/extra/io/windows/windows.factor b/basis/io/windows/windows.factor
similarity index 100%
rename from extra/io/windows/windows.factor
rename to basis/io/windows/windows.factor
diff --git a/extra/lcs/authors.txt b/basis/lcs/authors.txt
similarity index 100%
rename from extra/lcs/authors.txt
rename to basis/lcs/authors.txt
diff --git a/extra/lcs/diff2html/diff2html.factor b/basis/lcs/diff2html/diff2html.factor
similarity index 100%
rename from extra/lcs/diff2html/diff2html.factor
rename to basis/lcs/diff2html/diff2html.factor
diff --git a/extra/lcs/lcs-docs.factor b/basis/lcs/lcs-docs.factor
similarity index 100%
rename from extra/lcs/lcs-docs.factor
rename to basis/lcs/lcs-docs.factor
diff --git a/extra/lcs/lcs-tests.factor b/basis/lcs/lcs-tests.factor
similarity index 100%
rename from extra/lcs/lcs-tests.factor
rename to basis/lcs/lcs-tests.factor
diff --git a/extra/lcs/lcs.factor b/basis/lcs/lcs.factor
similarity index 100%
rename from extra/lcs/lcs.factor
rename to basis/lcs/lcs.factor
diff --git a/extra/lcs/summary.txt b/basis/lcs/summary.txt
similarity index 100%
rename from extra/lcs/summary.txt
rename to basis/lcs/summary.txt
diff --git a/extra/lcs/tags.txt b/basis/lcs/tags.txt
similarity index 100%
rename from extra/lcs/tags.txt
rename to basis/lcs/tags.txt
diff --git a/extra/io/ports/authors.txt b/basis/listener/authors.txt
similarity index 100%
rename from extra/io/ports/authors.txt
rename to basis/listener/authors.txt
diff --git a/core/listener/listener-docs.factor b/basis/listener/listener-docs.factor
similarity index 100%
rename from core/listener/listener-docs.factor
rename to basis/listener/listener-docs.factor
diff --git a/core/listener/listener-tests.factor b/basis/listener/listener-tests.factor
similarity index 100%
rename from core/listener/listener-tests.factor
rename to basis/listener/listener-tests.factor
diff --git a/core/listener/listener.factor b/basis/listener/listener.factor
similarity index 100%
rename from core/listener/listener.factor
rename to basis/listener/listener.factor
diff --git a/core/listener/summary.txt b/basis/listener/summary.txt
similarity index 100%
rename from core/listener/summary.txt
rename to basis/listener/summary.txt
diff --git a/extra/help/lint/tags.txt b/basis/listener/tags.txt
similarity index 100%
rename from extra/help/lint/tags.txt
rename to basis/listener/tags.txt
diff --git a/extra/io/servers/connection/authors.txt b/basis/locals/authors.txt
similarity index 100%
rename from extra/io/servers/connection/authors.txt
rename to basis/locals/authors.txt
diff --git a/extra/locals/backend/backend-tests.factor b/basis/locals/backend/backend-tests.factor
similarity index 100%
rename from extra/locals/backend/backend-tests.factor
rename to basis/locals/backend/backend-tests.factor
diff --git a/extra/locals/backend/backend.factor b/basis/locals/backend/backend.factor
similarity index 100%
rename from extra/locals/backend/backend.factor
rename to basis/locals/backend/backend.factor
diff --git a/extra/locals/locals-docs.factor b/basis/locals/locals-docs.factor
similarity index 100%
rename from extra/locals/locals-docs.factor
rename to basis/locals/locals-docs.factor
diff --git a/extra/locals/locals-tests.factor b/basis/locals/locals-tests.factor
similarity index 100%
rename from extra/locals/locals-tests.factor
rename to basis/locals/locals-tests.factor
diff --git a/extra/locals/locals.factor b/basis/locals/locals.factor
similarity index 100%
rename from extra/locals/locals.factor
rename to basis/locals/locals.factor
diff --git a/extra/locals/summary.txt b/basis/locals/summary.txt
similarity index 100%
rename from extra/locals/summary.txt
rename to basis/locals/summary.txt
diff --git a/extra/locals/tags.txt b/basis/locals/tags.txt
similarity index 100%
rename from extra/locals/tags.txt
rename to basis/locals/tags.txt
diff --git a/extra/logging/analysis/analysis-docs.factor b/basis/logging/analysis/analysis-docs.factor
similarity index 100%
rename from extra/logging/analysis/analysis-docs.factor
rename to basis/logging/analysis/analysis-docs.factor
diff --git a/extra/logging/analysis/analysis.factor b/basis/logging/analysis/analysis.factor
similarity index 100%
rename from extra/logging/analysis/analysis.factor
rename to basis/logging/analysis/analysis.factor
diff --git a/extra/logging/analysis/authors.txt b/basis/logging/analysis/authors.txt
similarity index 100%
rename from extra/logging/analysis/authors.txt
rename to basis/logging/analysis/authors.txt
diff --git a/extra/logging/analysis/summary.txt b/basis/logging/analysis/summary.txt
similarity index 100%
rename from extra/logging/analysis/summary.txt
rename to basis/logging/analysis/summary.txt
diff --git a/extra/logging/analysis/tags.txt b/basis/logging/analysis/tags.txt
similarity index 100%
rename from extra/logging/analysis/tags.txt
rename to basis/logging/analysis/tags.txt
diff --git a/extra/logging/authors.txt b/basis/logging/authors.txt
similarity index 100%
rename from extra/logging/authors.txt
rename to basis/logging/authors.txt
diff --git a/extra/logging/insomniac/authors.txt b/basis/logging/insomniac/authors.txt
similarity index 100%
rename from extra/logging/insomniac/authors.txt
rename to basis/logging/insomniac/authors.txt
diff --git a/extra/logging/insomniac/insomniac-docs.factor b/basis/logging/insomniac/insomniac-docs.factor
similarity index 100%
rename from extra/logging/insomniac/insomniac-docs.factor
rename to basis/logging/insomniac/insomniac-docs.factor
diff --git a/extra/logging/insomniac/insomniac.factor b/basis/logging/insomniac/insomniac.factor
similarity index 100%
rename from extra/logging/insomniac/insomniac.factor
rename to basis/logging/insomniac/insomniac.factor
diff --git a/extra/logging/insomniac/summary.txt b/basis/logging/insomniac/summary.txt
similarity index 100%
rename from extra/logging/insomniac/summary.txt
rename to basis/logging/insomniac/summary.txt
diff --git a/extra/logging/insomniac/tags.txt b/basis/logging/insomniac/tags.txt
similarity index 100%
rename from extra/logging/insomniac/tags.txt
rename to basis/logging/insomniac/tags.txt
diff --git a/extra/logging/logging-docs.factor b/basis/logging/logging-docs.factor
similarity index 100%
rename from extra/logging/logging-docs.factor
rename to basis/logging/logging-docs.factor
diff --git a/extra/logging/logging-tests.factor b/basis/logging/logging-tests.factor
similarity index 100%
rename from extra/logging/logging-tests.factor
rename to basis/logging/logging-tests.factor
diff --git a/extra/logging/logging.factor b/basis/logging/logging.factor
similarity index 100%
rename from extra/logging/logging.factor
rename to basis/logging/logging.factor
diff --git a/extra/logging/parser/authors.txt b/basis/logging/parser/authors.txt
similarity index 100%
rename from extra/logging/parser/authors.txt
rename to basis/logging/parser/authors.txt
diff --git a/extra/logging/parser/parser-docs.factor b/basis/logging/parser/parser-docs.factor
similarity index 100%
rename from extra/logging/parser/parser-docs.factor
rename to basis/logging/parser/parser-docs.factor
diff --git a/extra/logging/parser/parser.factor b/basis/logging/parser/parser.factor
similarity index 100%
rename from extra/logging/parser/parser.factor
rename to basis/logging/parser/parser.factor
diff --git a/extra/logging/parser/summary.txt b/basis/logging/parser/summary.txt
similarity index 100%
rename from extra/logging/parser/summary.txt
rename to basis/logging/parser/summary.txt
diff --git a/extra/logging/parser/tags.txt b/basis/logging/parser/tags.txt
similarity index 100%
rename from extra/logging/parser/tags.txt
rename to basis/logging/parser/tags.txt
diff --git a/extra/logging/server/authors.txt b/basis/logging/server/authors.txt
similarity index 100%
rename from extra/logging/server/authors.txt
rename to basis/logging/server/authors.txt
diff --git a/extra/logging/server/server-docs.factor b/basis/logging/server/server-docs.factor
similarity index 100%
rename from extra/logging/server/server-docs.factor
rename to basis/logging/server/server-docs.factor
diff --git a/extra/logging/server/server.factor b/basis/logging/server/server.factor
similarity index 100%
rename from extra/logging/server/server.factor
rename to basis/logging/server/server.factor
diff --git a/extra/logging/server/summary.txt b/basis/logging/server/summary.txt
similarity index 100%
rename from extra/logging/server/summary.txt
rename to basis/logging/server/summary.txt
diff --git a/extra/logging/server/tags.txt b/basis/logging/server/tags.txt
similarity index 100%
rename from extra/logging/server/tags.txt
rename to basis/logging/server/tags.txt
diff --git a/extra/logging/summary.txt b/basis/logging/summary.txt
similarity index 100%
rename from extra/logging/summary.txt
rename to basis/logging/summary.txt
diff --git a/extra/logging/tags.txt b/basis/logging/tags.txt
similarity index 100%
rename from extra/logging/tags.txt
rename to basis/logging/tags.txt
diff --git a/extra/io/servers/packet/authors.txt b/basis/macros/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/servers/packet/authors.txt
rename to basis/macros/authors.txt
diff --git a/extra/macros/macros-docs.factor b/basis/macros/macros-docs.factor
similarity index 100%
rename from extra/macros/macros-docs.factor
rename to basis/macros/macros-docs.factor
diff --git a/extra/macros/macros-tests.factor b/basis/macros/macros-tests.factor
similarity index 100%
rename from extra/macros/macros-tests.factor
rename to basis/macros/macros-tests.factor
diff --git a/extra/macros/macros.factor b/basis/macros/macros.factor
similarity index 100%
rename from extra/macros/macros.factor
rename to basis/macros/macros.factor
diff --git a/extra/macros/summary.txt b/basis/macros/summary.txt
similarity index 100%
rename from extra/macros/summary.txt
rename to basis/macros/summary.txt
diff --git a/extra/macros/tags.txt b/basis/macros/tags.txt
similarity index 100%
rename from extra/macros/tags.txt
rename to basis/macros/tags.txt
diff --git a/extra/io/sockets/secure/authors.txt b/basis/math/bitfields/authors.txt
similarity index 100%
rename from extra/io/sockets/secure/authors.txt
rename to basis/math/bitfields/authors.txt
diff --git a/core/math/bitfields/bitfields-docs.factor b/basis/math/bitfields/bitfields-docs.factor
similarity index 100%
rename from core/math/bitfields/bitfields-docs.factor
rename to basis/math/bitfields/bitfields-docs.factor
diff --git a/core/math/bitfields/bitfields-tests.factor b/basis/math/bitfields/bitfields-tests.factor
similarity index 100%
rename from core/math/bitfields/bitfields-tests.factor
rename to basis/math/bitfields/bitfields-tests.factor
diff --git a/core/math/bitfields/bitfields.factor b/basis/math/bitfields/bitfields.factor
similarity index 100%
rename from core/math/bitfields/bitfields.factor
rename to basis/math/bitfields/bitfields.factor
diff --git a/core/math/bitfields/summary.txt b/basis/math/bitfields/summary.txt
similarity index 100%
rename from core/math/bitfields/summary.txt
rename to basis/math/bitfields/summary.txt
diff --git a/extra/io/streams/duplex/authors.txt b/basis/math/complex/authors.txt
similarity index 100%
rename from extra/io/streams/duplex/authors.txt
rename to basis/math/complex/authors.txt
diff --git a/extra/math/complex/complex-docs.factor b/basis/math/complex/complex-docs.factor
similarity index 100%
rename from extra/math/complex/complex-docs.factor
rename to basis/math/complex/complex-docs.factor
diff --git a/extra/math/complex/complex-tests.factor b/basis/math/complex/complex-tests.factor
similarity index 100%
rename from extra/math/complex/complex-tests.factor
rename to basis/math/complex/complex-tests.factor
diff --git a/extra/math/complex/complex.factor b/basis/math/complex/complex.factor
similarity index 100%
rename from extra/math/complex/complex.factor
rename to basis/math/complex/complex.factor
diff --git a/extra/math/complex/summary.txt b/basis/math/complex/summary.txt
similarity index 100%
rename from extra/math/complex/summary.txt
rename to basis/math/complex/summary.txt
diff --git a/extra/io/streams/null/authors.txt b/basis/math/constants/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/streams/null/authors.txt
rename to basis/math/constants/authors.txt
diff --git a/extra/math/constants/constants-docs.factor b/basis/math/constants/constants-docs.factor
similarity index 100%
rename from extra/math/constants/constants-docs.factor
rename to basis/math/constants/constants-docs.factor
diff --git a/extra/math/constants/constants.factor b/basis/math/constants/constants.factor
similarity index 100%
rename from extra/math/constants/constants.factor
rename to basis/math/constants/constants.factor
diff --git a/extra/math/constants/summary.txt b/basis/math/constants/summary.txt
similarity index 100%
rename from extra/math/constants/summary.txt
rename to basis/math/constants/summary.txt
diff --git a/extra/io/unix/authors.txt b/basis/math/functions/authors.txt
similarity index 100%
rename from extra/io/unix/authors.txt
rename to basis/math/functions/authors.txt
diff --git a/extra/math/functions/functions-docs.factor b/basis/math/functions/functions-docs.factor
similarity index 100%
rename from extra/math/functions/functions-docs.factor
rename to basis/math/functions/functions-docs.factor
diff --git a/extra/math/functions/functions-tests.factor b/basis/math/functions/functions-tests.factor
similarity index 100%
rename from extra/math/functions/functions-tests.factor
rename to basis/math/functions/functions-tests.factor
diff --git a/extra/math/functions/functions.factor b/basis/math/functions/functions.factor
similarity index 100%
rename from extra/math/functions/functions.factor
rename to basis/math/functions/functions.factor
diff --git a/extra/math/functions/summary.txt b/basis/math/functions/summary.txt
similarity index 100%
rename from extra/math/functions/summary.txt
rename to basis/math/functions/summary.txt
diff --git a/extra/io/unix/backend/authors.txt b/basis/math/intervals/authors.txt
similarity index 100%
rename from extra/io/unix/backend/authors.txt
rename to basis/math/intervals/authors.txt
diff --git a/core/math/intervals/intervals-docs.factor b/basis/math/intervals/intervals-docs.factor
similarity index 100%
rename from core/math/intervals/intervals-docs.factor
rename to basis/math/intervals/intervals-docs.factor
diff --git a/core/math/intervals/intervals-tests.factor b/basis/math/intervals/intervals-tests.factor
similarity index 100%
rename from core/math/intervals/intervals-tests.factor
rename to basis/math/intervals/intervals-tests.factor
diff --git a/core/math/intervals/intervals.factor b/basis/math/intervals/intervals.factor
similarity index 100%
rename from core/math/intervals/intervals.factor
rename to basis/math/intervals/intervals.factor
diff --git a/core/math/intervals/summary.txt b/basis/math/intervals/summary.txt
similarity index 100%
rename from core/math/intervals/summary.txt
rename to basis/math/intervals/summary.txt
diff --git a/extra/io/unix/bsd/authors.txt b/basis/math/libm/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/unix/bsd/authors.txt
rename to basis/math/libm/authors.txt
diff --git a/extra/math/libm/libm-docs.factor b/basis/math/libm/libm-docs.factor
similarity index 100%
rename from extra/math/libm/libm-docs.factor
rename to basis/math/libm/libm-docs.factor
diff --git a/extra/math/libm/libm.factor b/basis/math/libm/libm.factor
similarity index 100%
rename from extra/math/libm/libm.factor
rename to basis/math/libm/libm.factor
diff --git a/extra/math/libm/summary.txt b/basis/math/libm/summary.txt
similarity index 100%
rename from extra/math/libm/summary.txt
rename to basis/math/libm/summary.txt
diff --git a/extra/math/libm/tags.txt b/basis/math/libm/tags.txt
similarity index 100%
rename from extra/math/libm/tags.txt
rename to basis/math/libm/tags.txt
diff --git a/extra/math/ranges/authors.txt b/basis/math/ranges/authors.txt
similarity index 100%
rename from extra/math/ranges/authors.txt
rename to basis/math/ranges/authors.txt
diff --git a/extra/math/ranges/ranges-docs.factor b/basis/math/ranges/ranges-docs.factor
similarity index 100%
rename from extra/math/ranges/ranges-docs.factor
rename to basis/math/ranges/ranges-docs.factor
diff --git a/extra/math/ranges/ranges-tests.factor b/basis/math/ranges/ranges-tests.factor
similarity index 100%
rename from extra/math/ranges/ranges-tests.factor
rename to basis/math/ranges/ranges-tests.factor
diff --git a/extra/math/ranges/ranges.factor b/basis/math/ranges/ranges.factor
similarity index 100%
rename from extra/math/ranges/ranges.factor
rename to basis/math/ranges/ranges.factor
diff --git a/extra/math/ranges/summary.txt b/basis/math/ranges/summary.txt
similarity index 100%
rename from extra/math/ranges/summary.txt
rename to basis/math/ranges/summary.txt
diff --git a/extra/io/unix/epoll/authors.txt b/basis/math/ratios/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/unix/epoll/authors.txt
rename to basis/math/ratios/authors.txt
diff --git a/extra/math/ratios/ratios-docs.factor b/basis/math/ratios/ratios-docs.factor
similarity index 100%
rename from extra/math/ratios/ratios-docs.factor
rename to basis/math/ratios/ratios-docs.factor
diff --git a/extra/math/ratios/ratios-tests.factor b/basis/math/ratios/ratios-tests.factor
similarity index 100%
rename from extra/math/ratios/ratios-tests.factor
rename to basis/math/ratios/ratios-tests.factor
diff --git a/extra/math/ratios/ratios.factor b/basis/math/ratios/ratios.factor
similarity index 100%
rename from extra/math/ratios/ratios.factor
rename to basis/math/ratios/ratios.factor
diff --git a/extra/math/ratios/summary.txt b/basis/math/ratios/summary.txt
similarity index 100%
rename from extra/math/ratios/summary.txt
rename to basis/math/ratios/summary.txt
diff --git a/extra/io/unix/files/authors.txt b/basis/math/vectors/authors.txt
similarity index 100%
rename from extra/io/unix/files/authors.txt
rename to basis/math/vectors/authors.txt
diff --git a/extra/math/vectors/summary.txt b/basis/math/vectors/summary.txt
similarity index 100%
rename from extra/math/vectors/summary.txt
rename to basis/math/vectors/summary.txt
diff --git a/extra/math/vectors/vectors-docs.factor b/basis/math/vectors/vectors-docs.factor
similarity index 100%
rename from extra/math/vectors/vectors-docs.factor
rename to basis/math/vectors/vectors-docs.factor
diff --git a/extra/math/vectors/vectors-tests.factor b/basis/math/vectors/vectors-tests.factor
similarity index 100%
rename from extra/math/vectors/vectors-tests.factor
rename to basis/math/vectors/vectors-tests.factor
diff --git a/extra/math/vectors/vectors.factor b/basis/math/vectors/vectors.factor
similarity index 100%
rename from extra/math/vectors/vectors.factor
rename to basis/math/vectors/vectors.factor
diff --git a/extra/memoize/authors.txt b/basis/memoize/authors.txt
similarity index 100%
rename from extra/memoize/authors.txt
rename to basis/memoize/authors.txt
diff --git a/extra/memoize/memoize-docs.factor b/basis/memoize/memoize-docs.factor
similarity index 100%
rename from extra/memoize/memoize-docs.factor
rename to basis/memoize/memoize-docs.factor
diff --git a/extra/memoize/memoize-tests.factor b/basis/memoize/memoize-tests.factor
similarity index 100%
rename from extra/memoize/memoize-tests.factor
rename to basis/memoize/memoize-tests.factor
diff --git a/extra/memoize/memoize.factor b/basis/memoize/memoize.factor
similarity index 100%
rename from extra/memoize/memoize.factor
rename to basis/memoize/memoize.factor
diff --git a/extra/memoize/summary.txt b/basis/memoize/summary.txt
similarity index 100%
rename from extra/memoize/summary.txt
rename to basis/memoize/summary.txt
diff --git a/extra/memoize/tags.txt b/basis/memoize/tags.txt
similarity index 100%
rename from extra/memoize/tags.txt
rename to basis/memoize/tags.txt
diff --git a/extra/io/unix/kqueue/authors.txt b/basis/mime-types/authors.txt
similarity index 100%
rename from extra/io/unix/kqueue/authors.txt
rename to basis/mime-types/authors.txt
diff --git a/extra/mime-types/mime-types-tests.factor b/basis/mime-types/mime-types-tests.factor
similarity index 100%
rename from extra/mime-types/mime-types-tests.factor
rename to basis/mime-types/mime-types-tests.factor
diff --git a/extra/mime-types/mime-types.factor b/basis/mime-types/mime-types.factor
similarity index 92%
rename from extra/mime-types/mime-types.factor
rename to basis/mime-types/mime-types.factor
index a228a8904c..9489da8149 100755
--- a/extra/mime-types/mime-types.factor
+++ b/basis/mime-types/mime-types.factor
@@ -5,7 +5,7 @@ kernel namespaces fry memoize ;
 IN: mime-types
 
 MEMO: mime-db ( -- seq )
-    "resource:extra/mime-types/mime.types" ascii file-lines
+    "resource:basis/mime-types/mime.types" ascii file-lines
     [ "#" head? not ] filter [ " \t" split harvest ] map harvest ;
 
 : nonstandard-mime-types ( -- assoc )
diff --git a/extra/mime-types/mime.types b/basis/mime-types/mime.types
similarity index 100%
rename from extra/mime-types/mime.types
rename to basis/mime-types/mime.types
diff --git a/extra/io/unix/launcher/authors.txt b/basis/mirrors/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/unix/launcher/authors.txt
rename to basis/mirrors/authors.txt
diff --git a/core/mirrors/mirrors-docs.factor b/basis/mirrors/mirrors-docs.factor
similarity index 100%
rename from core/mirrors/mirrors-docs.factor
rename to basis/mirrors/mirrors-docs.factor
diff --git a/core/mirrors/mirrors-tests.factor b/basis/mirrors/mirrors-tests.factor
similarity index 100%
rename from core/mirrors/mirrors-tests.factor
rename to basis/mirrors/mirrors-tests.factor
diff --git a/core/mirrors/mirrors.factor b/basis/mirrors/mirrors.factor
similarity index 100%
rename from core/mirrors/mirrors.factor
rename to basis/mirrors/mirrors.factor
diff --git a/core/mirrors/summary.txt b/basis/mirrors/summary.txt
similarity index 100%
rename from core/mirrors/summary.txt
rename to basis/mirrors/summary.txt
diff --git a/core/mirrors/tags.txt b/basis/mirrors/tags.txt
similarity index 100%
rename from core/mirrors/tags.txt
rename to basis/mirrors/tags.txt
diff --git a/extra/io/unix/linux/authors.txt b/basis/models/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/unix/linux/authors.txt
rename to basis/models/authors.txt
diff --git a/extra/models/compose/compose-docs.factor b/basis/models/compose/compose-docs.factor
similarity index 100%
rename from extra/models/compose/compose-docs.factor
rename to basis/models/compose/compose-docs.factor
diff --git a/extra/models/compose/compose-tests.factor b/basis/models/compose/compose-tests.factor
similarity index 100%
rename from extra/models/compose/compose-tests.factor
rename to basis/models/compose/compose-tests.factor
diff --git a/extra/models/compose/compose.factor b/basis/models/compose/compose.factor
similarity index 100%
rename from extra/models/compose/compose.factor
rename to basis/models/compose/compose.factor
diff --git a/extra/models/delay/delay-docs.factor b/basis/models/delay/delay-docs.factor
similarity index 100%
rename from extra/models/delay/delay-docs.factor
rename to basis/models/delay/delay-docs.factor
diff --git a/extra/models/delay/delay.factor b/basis/models/delay/delay.factor
similarity index 100%
rename from extra/models/delay/delay.factor
rename to basis/models/delay/delay.factor
diff --git a/extra/models/filter/filter-docs.factor b/basis/models/filter/filter-docs.factor
similarity index 100%
rename from extra/models/filter/filter-docs.factor
rename to basis/models/filter/filter-docs.factor
diff --git a/extra/models/filter/filter-tests.factor b/basis/models/filter/filter-tests.factor
similarity index 100%
rename from extra/models/filter/filter-tests.factor
rename to basis/models/filter/filter-tests.factor
diff --git a/extra/models/filter/filter.factor b/basis/models/filter/filter.factor
similarity index 100%
rename from extra/models/filter/filter.factor
rename to basis/models/filter/filter.factor
diff --git a/extra/models/history/history-docs.factor b/basis/models/history/history-docs.factor
similarity index 100%
rename from extra/models/history/history-docs.factor
rename to basis/models/history/history-docs.factor
diff --git a/extra/models/history/history-tests.factor b/basis/models/history/history-tests.factor
similarity index 100%
rename from extra/models/history/history-tests.factor
rename to basis/models/history/history-tests.factor
diff --git a/extra/models/history/history.factor b/basis/models/history/history.factor
similarity index 100%
rename from extra/models/history/history.factor
rename to basis/models/history/history.factor
diff --git a/extra/models/mapping/mapping-tests.factor b/basis/models/mapping/mapping-tests.factor
similarity index 100%
rename from extra/models/mapping/mapping-tests.factor
rename to basis/models/mapping/mapping-tests.factor
diff --git a/extra/models/mapping/mapping.factor b/basis/models/mapping/mapping.factor
similarity index 100%
rename from extra/models/mapping/mapping.factor
rename to basis/models/mapping/mapping.factor
diff --git a/extra/models/models-docs.factor b/basis/models/models-docs.factor
similarity index 100%
rename from extra/models/models-docs.factor
rename to basis/models/models-docs.factor
diff --git a/extra/models/models-tests.factor b/basis/models/models-tests.factor
similarity index 100%
rename from extra/models/models-tests.factor
rename to basis/models/models-tests.factor
diff --git a/extra/models/models.factor b/basis/models/models.factor
similarity index 100%
rename from extra/models/models.factor
rename to basis/models/models.factor
diff --git a/extra/models/range/range-docs.factor b/basis/models/range/range-docs.factor
similarity index 100%
rename from extra/models/range/range-docs.factor
rename to basis/models/range/range-docs.factor
diff --git a/extra/models/range/range-tests.factor b/basis/models/range/range-tests.factor
similarity index 100%
rename from extra/models/range/range-tests.factor
rename to basis/models/range/range-tests.factor
diff --git a/extra/models/range/range.factor b/basis/models/range/range.factor
similarity index 100%
rename from extra/models/range/range.factor
rename to basis/models/range/range.factor
diff --git a/extra/models/summary.txt b/basis/models/summary.txt
similarity index 100%
rename from extra/models/summary.txt
rename to basis/models/summary.txt
diff --git a/extra/models/tags.txt b/basis/models/tags.txt
similarity index 100%
rename from extra/models/tags.txt
rename to basis/models/tags.txt
diff --git a/extra/multiline/authors.txt b/basis/multiline/authors.txt
similarity index 100%
rename from extra/multiline/authors.txt
rename to basis/multiline/authors.txt
diff --git a/extra/multiline/multiline-docs.factor b/basis/multiline/multiline-docs.factor
similarity index 100%
rename from extra/multiline/multiline-docs.factor
rename to basis/multiline/multiline-docs.factor
diff --git a/extra/multiline/multiline-tests.factor b/basis/multiline/multiline-tests.factor
similarity index 100%
rename from extra/multiline/multiline-tests.factor
rename to basis/multiline/multiline-tests.factor
diff --git a/extra/multiline/multiline.factor b/basis/multiline/multiline.factor
similarity index 100%
rename from extra/multiline/multiline.factor
rename to basis/multiline/multiline.factor
diff --git a/extra/multiline/summary.txt b/basis/multiline/summary.txt
similarity index 100%
rename from extra/multiline/summary.txt
rename to basis/multiline/summary.txt
diff --git a/extra/multiline/tags.txt b/basis/multiline/tags.txt
similarity index 100%
rename from extra/multiline/tags.txt
rename to basis/multiline/tags.txt
diff --git a/extra/io/unix/mmap/authors.txt b/basis/none/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/unix/mmap/authors.txt
rename to basis/none/authors.txt
diff --git a/core/none/deploy.factor b/basis/none/deploy.factor
similarity index 100%
rename from core/none/deploy.factor
rename to basis/none/deploy.factor
diff --git a/core/none/none-docs.factor b/basis/none/none-docs.factor
similarity index 100%
rename from core/none/none-docs.factor
rename to basis/none/none-docs.factor
diff --git a/core/none/none.factor b/basis/none/none.factor
similarity index 100%
rename from core/none/none.factor
rename to basis/none/none.factor
diff --git a/core/none/summary.txt b/basis/none/summary.txt
similarity index 100%
rename from core/none/summary.txt
rename to basis/none/summary.txt
diff --git a/extra/openssl/authors.txt b/basis/openssl/authors.txt
similarity index 100%
rename from extra/openssl/authors.txt
rename to basis/openssl/authors.txt
diff --git a/extra/openssl/cacert.pem b/basis/openssl/cacert.pem
similarity index 100%
rename from extra/openssl/cacert.pem
rename to basis/openssl/cacert.pem
diff --git a/extra/openssl/libcrypto/libcrypto.factor b/basis/openssl/libcrypto/libcrypto.factor
similarity index 100%
rename from extra/openssl/libcrypto/libcrypto.factor
rename to basis/openssl/libcrypto/libcrypto.factor
diff --git a/extra/openssl/libssl/libssl.factor b/basis/openssl/libssl/libssl.factor
similarity index 100%
rename from extra/openssl/libssl/libssl.factor
rename to basis/openssl/libssl/libssl.factor
diff --git a/extra/openssl/openssl-tests.factor b/basis/openssl/openssl-tests.factor
similarity index 56%
rename from extra/openssl/openssl-tests.factor
rename to basis/openssl/openssl-tests.factor
index 5990153073..93af70b3e0 100755
--- a/extra/openssl/openssl-tests.factor
+++ b/basis/openssl/openssl-tests.factor
@@ -4,17 +4,17 @@ openssl namespaces accessors tools.test continuations kernel ;
 openssl secure-socket-backend [
     [ ] [
         <secure-config>
-            "resource:extra/openssl/test/server.pem" >>key-file
-            "resource:extra/openssl/test/root.pem" >>ca-file
-            "resource:extra/openssl/test/dh1024.pem" >>dh-file
+            "resource:basis/openssl/test/server.pem" >>key-file
+            "resource:basis/openssl/test/root.pem" >>ca-file
+            "resource:basis/openssl/test/dh1024.pem" >>dh-file
             "password" >>password
         [ ] with-secure-context
     ] unit-test
 
     [
         <secure-config>
-            "resource:extra/openssl/test/server.pem" >>key-file
-            "resource:extra/openssl/test/root.pem" >>ca-file
+            "resource:basis/openssl/test/server.pem" >>key-file
+            "resource:basis/openssl/test/root.pem" >>ca-file
             "wrong password" >>password
         [ ] with-secure-context
     ] must-fail
diff --git a/extra/openssl/openssl.factor b/basis/openssl/openssl.factor
similarity index 100%
rename from extra/openssl/openssl.factor
rename to basis/openssl/openssl.factor
diff --git a/extra/openssl/summary.txt b/basis/openssl/summary.txt
similarity index 100%
rename from extra/openssl/summary.txt
rename to basis/openssl/summary.txt
diff --git a/extra/openssl/tags.txt b/basis/openssl/tags.txt
similarity index 100%
rename from extra/openssl/tags.txt
rename to basis/openssl/tags.txt
diff --git a/extra/openssl/test/dh1024.pem b/basis/openssl/test/dh1024.pem
similarity index 100%
rename from extra/openssl/test/dh1024.pem
rename to basis/openssl/test/dh1024.pem
diff --git a/extra/openssl/test/errors.txt b/basis/openssl/test/errors.txt
similarity index 100%
rename from extra/openssl/test/errors.txt
rename to basis/openssl/test/errors.txt
diff --git a/extra/openssl/test/root.pem b/basis/openssl/test/root.pem
similarity index 100%
rename from extra/openssl/test/root.pem
rename to basis/openssl/test/root.pem
diff --git a/extra/openssl/test/server.pem b/basis/openssl/test/server.pem
similarity index 100%
rename from extra/openssl/test/server.pem
rename to basis/openssl/test/server.pem
diff --git a/core/optimizer/allot/allot.factor b/basis/optimizer/allot/allot.factor
similarity index 100%
rename from core/optimizer/allot/allot.factor
rename to basis/optimizer/allot/allot.factor
diff --git a/extra/io/unix/select/authors.txt b/basis/optimizer/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/unix/select/authors.txt
rename to basis/optimizer/authors.txt
diff --git a/extra/io/unix/sockets/authors.txt b/basis/optimizer/backend/authors.txt
similarity index 100%
rename from extra/io/unix/sockets/authors.txt
rename to basis/optimizer/backend/authors.txt
diff --git a/core/optimizer/backend/backend.factor b/basis/optimizer/backend/backend.factor
similarity index 100%
rename from core/optimizer/backend/backend.factor
rename to basis/optimizer/backend/backend.factor
diff --git a/core/optimizer/backend/summary.txt b/basis/optimizer/backend/summary.txt
similarity index 100%
rename from core/optimizer/backend/summary.txt
rename to basis/optimizer/backend/summary.txt
diff --git a/core/optimizer/collect/collect.factor b/basis/optimizer/collect/collect.factor
similarity index 100%
rename from core/optimizer/collect/collect.factor
rename to basis/optimizer/collect/collect.factor
diff --git a/core/optimizer/control/control-tests.factor b/basis/optimizer/control/control-tests.factor
similarity index 100%
rename from core/optimizer/control/control-tests.factor
rename to basis/optimizer/control/control-tests.factor
diff --git a/core/optimizer/control/control.factor b/basis/optimizer/control/control.factor
similarity index 100%
rename from core/optimizer/control/control.factor
rename to basis/optimizer/control/control.factor
diff --git a/extra/io/windows/nt/pipes/authors.txt b/basis/optimizer/def-use/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/windows/nt/pipes/authors.txt
rename to basis/optimizer/def-use/authors.txt
diff --git a/core/optimizer/def-use/def-use-tests.factor b/basis/optimizer/def-use/def-use-tests.factor
similarity index 100%
rename from core/optimizer/def-use/def-use-tests.factor
rename to basis/optimizer/def-use/def-use-tests.factor
diff --git a/core/optimizer/def-use/def-use.factor b/basis/optimizer/def-use/def-use.factor
similarity index 100%
rename from core/optimizer/def-use/def-use.factor
rename to basis/optimizer/def-use/def-use.factor
diff --git a/core/optimizer/def-use/summary.txt b/basis/optimizer/def-use/summary.txt
similarity index 100%
rename from core/optimizer/def-use/summary.txt
rename to basis/optimizer/def-use/summary.txt
diff --git a/core/optimizer/inlining/inlining-tests.factor b/basis/optimizer/inlining/inlining-tests.factor
similarity index 100%
rename from core/optimizer/inlining/inlining-tests.factor
rename to basis/optimizer/inlining/inlining-tests.factor
diff --git a/core/optimizer/inlining/inlining.factor b/basis/optimizer/inlining/inlining.factor
similarity index 100%
rename from core/optimizer/inlining/inlining.factor
rename to basis/optimizer/inlining/inlining.factor
diff --git a/extra/locals/authors.txt b/basis/optimizer/known-words/authors.txt
similarity index 100%
rename from extra/locals/authors.txt
rename to basis/optimizer/known-words/authors.txt
diff --git a/core/optimizer/known-words/known-words.factor b/basis/optimizer/known-words/known-words.factor
similarity index 100%
rename from core/optimizer/known-words/known-words.factor
rename to basis/optimizer/known-words/known-words.factor
diff --git a/core/optimizer/known-words/summary.txt b/basis/optimizer/known-words/summary.txt
similarity index 100%
rename from core/optimizer/known-words/summary.txt
rename to basis/optimizer/known-words/summary.txt
diff --git a/extra/macros/authors.txt b/basis/optimizer/math/authors.txt
similarity index 100%
rename from extra/macros/authors.txt
rename to basis/optimizer/math/authors.txt
diff --git a/core/optimizer/math/math.factor b/basis/optimizer/math/math.factor
similarity index 100%
rename from core/optimizer/math/math.factor
rename to basis/optimizer/math/math.factor
diff --git a/core/optimizer/math/partial/partial-tests.factor b/basis/optimizer/math/partial/partial-tests.factor
similarity index 100%
rename from core/optimizer/math/partial/partial-tests.factor
rename to basis/optimizer/math/partial/partial-tests.factor
diff --git a/core/optimizer/math/partial/partial.factor b/basis/optimizer/math/partial/partial.factor
similarity index 100%
rename from core/optimizer/math/partial/partial.factor
rename to basis/optimizer/math/partial/partial.factor
diff --git a/core/optimizer/math/summary.txt b/basis/optimizer/math/summary.txt
similarity index 100%
rename from core/optimizer/math/summary.txt
rename to basis/optimizer/math/summary.txt
diff --git a/core/optimizer/optimizer-docs.factor b/basis/optimizer/optimizer-docs.factor
similarity index 100%
rename from core/optimizer/optimizer-docs.factor
rename to basis/optimizer/optimizer-docs.factor
diff --git a/core/optimizer/optimizer-tests.factor b/basis/optimizer/optimizer-tests.factor
similarity index 100%
rename from core/optimizer/optimizer-tests.factor
rename to basis/optimizer/optimizer-tests.factor
diff --git a/core/optimizer/optimizer.factor b/basis/optimizer/optimizer.factor
similarity index 100%
rename from core/optimizer/optimizer.factor
rename to basis/optimizer/optimizer.factor
diff --git a/extra/math/complex/authors.txt b/basis/optimizer/pattern-match/authors.txt
similarity index 100%
rename from extra/math/complex/authors.txt
rename to basis/optimizer/pattern-match/authors.txt
diff --git a/core/optimizer/pattern-match/pattern-match.factor b/basis/optimizer/pattern-match/pattern-match.factor
similarity index 100%
rename from core/optimizer/pattern-match/pattern-match.factor
rename to basis/optimizer/pattern-match/pattern-match.factor
diff --git a/core/optimizer/pattern-match/summary.txt b/basis/optimizer/pattern-match/summary.txt
similarity index 100%
rename from core/optimizer/pattern-match/summary.txt
rename to basis/optimizer/pattern-match/summary.txt
diff --git a/core/optimizer/specializers/specializers-docs.factor b/basis/optimizer/specializers/specializers-docs.factor
similarity index 100%
rename from core/optimizer/specializers/specializers-docs.factor
rename to basis/optimizer/specializers/specializers-docs.factor
diff --git a/core/optimizer/specializers/specializers.factor b/basis/optimizer/specializers/specializers.factor
similarity index 100%
rename from core/optimizer/specializers/specializers.factor
rename to basis/optimizer/specializers/specializers.factor
diff --git a/core/optimizer/summary.txt b/basis/optimizer/summary.txt
similarity index 100%
rename from core/optimizer/summary.txt
rename to basis/optimizer/summary.txt
diff --git a/core/optimizer/tags.txt b/basis/optimizer/tags.txt
similarity index 100%
rename from core/optimizer/tags.txt
rename to basis/optimizer/tags.txt
diff --git a/extra/present/present.factor b/basis/present/present.factor
similarity index 100%
rename from extra/present/present.factor
rename to basis/present/present.factor
diff --git a/extra/math/constants/authors.txt b/basis/prettyprint/authors.txt
similarity index 100%
rename from extra/math/constants/authors.txt
rename to basis/prettyprint/authors.txt
diff --git a/extra/math/functions/authors.txt b/basis/prettyprint/backend/authors.txt
similarity index 100%
rename from extra/math/functions/authors.txt
rename to basis/prettyprint/backend/authors.txt
diff --git a/core/prettyprint/backend/backend-docs.factor b/basis/prettyprint/backend/backend-docs.factor
similarity index 100%
rename from core/prettyprint/backend/backend-docs.factor
rename to basis/prettyprint/backend/backend-docs.factor
diff --git a/core/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor
similarity index 100%
rename from core/prettyprint/backend/backend.factor
rename to basis/prettyprint/backend/backend.factor
diff --git a/core/prettyprint/backend/summary.txt b/basis/prettyprint/backend/summary.txt
similarity index 100%
rename from core/prettyprint/backend/summary.txt
rename to basis/prettyprint/backend/summary.txt
diff --git a/extra/math/libm/authors.txt b/basis/prettyprint/config/authors.txt
similarity index 100%
rename from extra/math/libm/authors.txt
rename to basis/prettyprint/config/authors.txt
diff --git a/core/prettyprint/config/config-docs.factor b/basis/prettyprint/config/config-docs.factor
similarity index 100%
rename from core/prettyprint/config/config-docs.factor
rename to basis/prettyprint/config/config-docs.factor
diff --git a/core/prettyprint/config/config.factor b/basis/prettyprint/config/config.factor
similarity index 100%
rename from core/prettyprint/config/config.factor
rename to basis/prettyprint/config/config.factor
diff --git a/core/prettyprint/config/summary.txt b/basis/prettyprint/config/summary.txt
similarity index 100%
rename from core/prettyprint/config/summary.txt
rename to basis/prettyprint/config/summary.txt
diff --git a/core/prettyprint/prettyprint-docs.factor b/basis/prettyprint/prettyprint-docs.factor
similarity index 100%
rename from core/prettyprint/prettyprint-docs.factor
rename to basis/prettyprint/prettyprint-docs.factor
diff --git a/core/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor
similarity index 100%
rename from core/prettyprint/prettyprint-tests.factor
rename to basis/prettyprint/prettyprint-tests.factor
diff --git a/core/prettyprint/prettyprint.factor b/basis/prettyprint/prettyprint.factor
similarity index 100%
rename from core/prettyprint/prettyprint.factor
rename to basis/prettyprint/prettyprint.factor
diff --git a/extra/math/ratios/authors.txt b/basis/prettyprint/sections/authors.txt
similarity index 100%
rename from extra/math/ratios/authors.txt
rename to basis/prettyprint/sections/authors.txt
diff --git a/core/prettyprint/sections/sections-docs.factor b/basis/prettyprint/sections/sections-docs.factor
similarity index 100%
rename from core/prettyprint/sections/sections-docs.factor
rename to basis/prettyprint/sections/sections-docs.factor
diff --git a/core/prettyprint/sections/sections.factor b/basis/prettyprint/sections/sections.factor
similarity index 100%
rename from core/prettyprint/sections/sections.factor
rename to basis/prettyprint/sections/sections.factor
diff --git a/core/prettyprint/sections/summary.txt b/basis/prettyprint/sections/summary.txt
similarity index 100%
rename from core/prettyprint/sections/summary.txt
rename to basis/prettyprint/sections/summary.txt
diff --git a/core/prettyprint/summary.txt b/basis/prettyprint/summary.txt
similarity index 100%
rename from core/prettyprint/summary.txt
rename to basis/prettyprint/summary.txt
diff --git a/core/prettyprint/tags.txt b/basis/prettyprint/tags.txt
similarity index 100%
rename from core/prettyprint/tags.txt
rename to basis/prettyprint/tags.txt
diff --git a/extra/promises/authors.txt b/basis/promises/authors.txt
similarity index 100%
rename from extra/promises/authors.txt
rename to basis/promises/authors.txt
diff --git a/extra/promises/promises-docs.factor b/basis/promises/promises-docs.factor
similarity index 100%
rename from extra/promises/promises-docs.factor
rename to basis/promises/promises-docs.factor
diff --git a/extra/promises/promises.factor b/basis/promises/promises.factor
similarity index 100%
rename from extra/promises/promises.factor
rename to basis/promises/promises.factor
diff --git a/extra/promises/summary.txt b/basis/promises/summary.txt
similarity index 100%
rename from extra/promises/summary.txt
rename to basis/promises/summary.txt
diff --git a/extra/promises/tags.txt b/basis/promises/tags.txt
similarity index 100%
rename from extra/promises/tags.txt
rename to basis/promises/tags.txt
diff --git a/extra/qualified/authors.txt b/basis/qualified/authors.txt
similarity index 100%
rename from extra/qualified/authors.txt
rename to basis/qualified/authors.txt
diff --git a/extra/qualified/qualified-docs.factor b/basis/qualified/qualified-docs.factor
similarity index 100%
rename from extra/qualified/qualified-docs.factor
rename to basis/qualified/qualified-docs.factor
diff --git a/extra/qualified/qualified-tests.factor b/basis/qualified/qualified-tests.factor
similarity index 100%
rename from extra/qualified/qualified-tests.factor
rename to basis/qualified/qualified-tests.factor
diff --git a/extra/qualified/qualified.factor b/basis/qualified/qualified.factor
similarity index 100%
rename from extra/qualified/qualified.factor
rename to basis/qualified/qualified.factor
diff --git a/extra/qualified/summary.txt b/basis/qualified/summary.txt
similarity index 100%
rename from extra/qualified/summary.txt
rename to basis/qualified/summary.txt
diff --git a/extra/qualified/tags.txt b/basis/qualified/tags.txt
similarity index 100%
rename from extra/qualified/tags.txt
rename to basis/qualified/tags.txt
diff --git a/extra/random/blum-blum-shub/blum-blum-shub-tests.factor b/basis/random/blum-blum-shub/blum-blum-shub-tests.factor
similarity index 100%
rename from extra/random/blum-blum-shub/blum-blum-shub-tests.factor
rename to basis/random/blum-blum-shub/blum-blum-shub-tests.factor
diff --git a/extra/random/blum-blum-shub/blum-blum-shub.factor b/basis/random/blum-blum-shub/blum-blum-shub.factor
similarity index 100%
rename from extra/random/blum-blum-shub/blum-blum-shub.factor
rename to basis/random/blum-blum-shub/blum-blum-shub.factor
diff --git a/extra/random/dummy/dummy.factor b/basis/random/dummy/dummy.factor
similarity index 100%
rename from extra/random/dummy/dummy.factor
rename to basis/random/dummy/dummy.factor
diff --git a/extra/io/windows/mmap/authors.txt b/basis/random/mersenne-twister/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/io/windows/mmap/authors.txt
rename to basis/random/mersenne-twister/authors.txt
diff --git a/extra/random/mersenne-twister/mersenne-twister-docs.factor.bak b/basis/random/mersenne-twister/mersenne-twister-docs.factor.bak
similarity index 100%
rename from extra/random/mersenne-twister/mersenne-twister-docs.factor.bak
rename to basis/random/mersenne-twister/mersenne-twister-docs.factor.bak
diff --git a/extra/random/mersenne-twister/mersenne-twister-tests.factor b/basis/random/mersenne-twister/mersenne-twister-tests.factor
similarity index 100%
rename from extra/random/mersenne-twister/mersenne-twister-tests.factor
rename to basis/random/mersenne-twister/mersenne-twister-tests.factor
diff --git a/extra/random/mersenne-twister/mersenne-twister.factor b/basis/random/mersenne-twister/mersenne-twister.factor
similarity index 100%
rename from extra/random/mersenne-twister/mersenne-twister.factor
rename to basis/random/mersenne-twister/mersenne-twister.factor
diff --git a/extra/random/mersenne-twister/summary.txt b/basis/random/mersenne-twister/summary.txt
similarity index 100%
rename from extra/random/mersenne-twister/summary.txt
rename to basis/random/mersenne-twister/summary.txt
diff --git a/extra/random/random-docs.factor b/basis/random/random-docs.factor
similarity index 100%
rename from extra/random/random-docs.factor
rename to basis/random/random-docs.factor
diff --git a/extra/random/random-tests.factor b/basis/random/random-tests.factor
similarity index 100%
rename from extra/random/random-tests.factor
rename to basis/random/random-tests.factor
diff --git a/extra/random/random.factor b/basis/random/random.factor
similarity index 100%
rename from extra/random/random.factor
rename to basis/random/random.factor
diff --git a/extra/random/unix/unix.factor b/basis/random/unix/unix.factor
similarity index 100%
rename from extra/random/unix/unix.factor
rename to basis/random/unix/unix.factor
diff --git a/extra/random/windows/tags.txt b/basis/random/windows/tags.txt
similarity index 100%
rename from extra/random/windows/tags.txt
rename to basis/random/windows/tags.txt
diff --git a/extra/random/windows/windows.factor b/basis/random/windows/windows.factor
similarity index 100%
rename from extra/random/windows/windows.factor
rename to basis/random/windows/windows.factor
diff --git a/extra/math/vectors/authors.txt b/basis/refs/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/math/vectors/authors.txt
rename to basis/refs/authors.txt
diff --git a/core/refs/refs-docs.factor b/basis/refs/refs-docs.factor
similarity index 100%
rename from core/refs/refs-docs.factor
rename to basis/refs/refs-docs.factor
diff --git a/core/refs/refs-tests.factor b/basis/refs/refs-tests.factor
similarity index 100%
rename from core/refs/refs-tests.factor
rename to basis/refs/refs-tests.factor
diff --git a/core/refs/refs.factor b/basis/refs/refs.factor
similarity index 100%
rename from core/refs/refs.factor
rename to basis/refs/refs.factor
diff --git a/core/refs/summary.txt b/basis/refs/summary.txt
similarity index 100%
rename from core/refs/summary.txt
rename to basis/refs/summary.txt
diff --git a/extra/mime-types/authors.txt b/basis/search-dequeues/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/mime-types/authors.txt
rename to basis/search-dequeues/authors.txt
diff --git a/core/search-dequeues/search-dequeues-docs.factor b/basis/search-dequeues/search-dequeues-docs.factor
similarity index 100%
rename from core/search-dequeues/search-dequeues-docs.factor
rename to basis/search-dequeues/search-dequeues-docs.factor
diff --git a/core/search-dequeues/search-dequeues-tests.factor b/basis/search-dequeues/search-dequeues-tests.factor
similarity index 100%
rename from core/search-dequeues/search-dequeues-tests.factor
rename to basis/search-dequeues/search-dequeues-tests.factor
diff --git a/core/search-dequeues/search-dequeues.factor b/basis/search-dequeues/search-dequeues.factor
similarity index 100%
rename from core/search-dequeues/search-dequeues.factor
rename to basis/search-dequeues/search-dequeues.factor
diff --git a/core/search-dequeues/summary.txt b/basis/search-dequeues/summary.txt
similarity index 100%
rename from core/search-dequeues/summary.txt
rename to basis/search-dequeues/summary.txt
diff --git a/extra/hash2/tags.txt b/basis/search-dequeues/tags.txt
similarity index 100%
rename from extra/hash2/tags.txt
rename to basis/search-dequeues/tags.txt
diff --git a/extra/sequences/deep/authors.txt b/basis/sequences/deep/authors.txt
similarity index 100%
rename from extra/sequences/deep/authors.txt
rename to basis/sequences/deep/authors.txt
diff --git a/extra/sequences/deep/deep-docs.factor b/basis/sequences/deep/deep-docs.factor
similarity index 100%
rename from extra/sequences/deep/deep-docs.factor
rename to basis/sequences/deep/deep-docs.factor
diff --git a/extra/sequences/deep/deep-tests.factor b/basis/sequences/deep/deep-tests.factor
similarity index 100%
rename from extra/sequences/deep/deep-tests.factor
rename to basis/sequences/deep/deep-tests.factor
diff --git a/extra/sequences/deep/deep.factor b/basis/sequences/deep/deep.factor
similarity index 100%
rename from extra/sequences/deep/deep.factor
rename to basis/sequences/deep/deep.factor
diff --git a/extra/sequences/deep/summary.txt b/basis/sequences/deep/summary.txt
similarity index 100%
rename from extra/sequences/deep/summary.txt
rename to basis/sequences/deep/summary.txt
diff --git a/extra/sequences/deep/tags.txt b/basis/sequences/deep/tags.txt
similarity index 100%
rename from extra/sequences/deep/tags.txt
rename to basis/sequences/deep/tags.txt
diff --git a/extra/sequences/next/authors.txt b/basis/sequences/next/authors.txt
similarity index 100%
rename from extra/sequences/next/authors.txt
rename to basis/sequences/next/authors.txt
diff --git a/extra/sequences/next/next-tests.factor b/basis/sequences/next/next-tests.factor
similarity index 100%
rename from extra/sequences/next/next-tests.factor
rename to basis/sequences/next/next-tests.factor
diff --git a/extra/sequences/next/next.factor b/basis/sequences/next/next.factor
similarity index 100%
rename from extra/sequences/next/next.factor
rename to basis/sequences/next/next.factor
diff --git a/extra/sequences/next/summary.txt b/basis/sequences/next/summary.txt
similarity index 100%
rename from extra/sequences/next/summary.txt
rename to basis/sequences/next/summary.txt
diff --git a/extra/sequences/next/tags.txt b/basis/sequences/next/tags.txt
similarity index 100%
rename from extra/sequences/next/tags.txt
rename to basis/sequences/next/tags.txt
diff --git a/extra/serialize/authors.txt b/basis/serialize/authors.txt
similarity index 100%
rename from extra/serialize/authors.txt
rename to basis/serialize/authors.txt
diff --git a/extra/serialize/serialize-docs.factor b/basis/serialize/serialize-docs.factor
similarity index 100%
rename from extra/serialize/serialize-docs.factor
rename to basis/serialize/serialize-docs.factor
diff --git a/extra/serialize/serialize-tests.factor b/basis/serialize/serialize-tests.factor
similarity index 100%
rename from extra/serialize/serialize-tests.factor
rename to basis/serialize/serialize-tests.factor
diff --git a/extra/serialize/serialize.factor b/basis/serialize/serialize.factor
similarity index 100%
rename from extra/serialize/serialize.factor
rename to basis/serialize/serialize.factor
diff --git a/extra/serialize/summary.txt b/basis/serialize/summary.txt
similarity index 100%
rename from extra/serialize/summary.txt
rename to basis/serialize/summary.txt
diff --git a/extra/shuffle/authors.txt b/basis/shuffle/authors.txt
similarity index 100%
rename from extra/shuffle/authors.txt
rename to basis/shuffle/authors.txt
diff --git a/extra/shuffle/shuffle-tests.factor b/basis/shuffle/shuffle-tests.factor
similarity index 100%
rename from extra/shuffle/shuffle-tests.factor
rename to basis/shuffle/shuffle-tests.factor
diff --git a/extra/shuffle/shuffle.factor b/basis/shuffle/shuffle.factor
similarity index 100%
rename from extra/shuffle/shuffle.factor
rename to basis/shuffle/shuffle.factor
diff --git a/extra/shuffle/summary.txt b/basis/shuffle/summary.txt
similarity index 100%
rename from extra/shuffle/summary.txt
rename to basis/shuffle/summary.txt
diff --git a/extra/shuffle/tags.txt b/basis/shuffle/tags.txt
similarity index 100%
rename from extra/shuffle/tags.txt
rename to basis/shuffle/tags.txt
diff --git a/extra/smtp/authors.txt b/basis/smtp/authors.txt
similarity index 100%
rename from extra/smtp/authors.txt
rename to basis/smtp/authors.txt
diff --git a/extra/smtp/server/server.factor b/basis/smtp/server/server.factor
similarity index 100%
rename from extra/smtp/server/server.factor
rename to basis/smtp/server/server.factor
diff --git a/extra/smtp/smtp-tests.factor b/basis/smtp/smtp-tests.factor
similarity index 100%
rename from extra/smtp/smtp-tests.factor
rename to basis/smtp/smtp-tests.factor
diff --git a/extra/smtp/smtp.factor b/basis/smtp/smtp.factor
similarity index 100%
rename from extra/smtp/smtp.factor
rename to basis/smtp/smtp.factor
diff --git a/extra/smtp/summary.txt b/basis/smtp/summary.txt
similarity index 100%
rename from extra/smtp/summary.txt
rename to basis/smtp/summary.txt
diff --git a/extra/smtp/tags.txt b/basis/smtp/tags.txt
similarity index 100%
rename from extra/smtp/tags.txt
rename to basis/smtp/tags.txt
diff --git a/extra/sorting/insertion/authors.txt b/basis/sorting/insertion/authors.txt
similarity index 100%
rename from extra/sorting/insertion/authors.txt
rename to basis/sorting/insertion/authors.txt
diff --git a/extra/sorting/insertion/insertion-tests.factor b/basis/sorting/insertion/insertion-tests.factor
similarity index 100%
rename from extra/sorting/insertion/insertion-tests.factor
rename to basis/sorting/insertion/insertion-tests.factor
diff --git a/extra/sorting/insertion/insertion.factor b/basis/sorting/insertion/insertion.factor
similarity index 100%
rename from extra/sorting/insertion/insertion.factor
rename to basis/sorting/insertion/insertion.factor
diff --git a/extra/sorting/insertion/summary.txt b/basis/sorting/insertion/summary.txt
similarity index 100%
rename from extra/sorting/insertion/summary.txt
rename to basis/sorting/insertion/summary.txt
diff --git a/extra/sorting/insertion/tags.txt b/basis/sorting/insertion/tags.txt
similarity index 100%
rename from extra/sorting/insertion/tags.txt
rename to basis/sorting/insertion/tags.txt
diff --git a/extra/state-parser/authors.txt b/basis/state-parser/authors.txt
similarity index 100%
rename from extra/state-parser/authors.txt
rename to basis/state-parser/authors.txt
diff --git a/extra/state-parser/state-parser-docs.factor b/basis/state-parser/state-parser-docs.factor
similarity index 100%
rename from extra/state-parser/state-parser-docs.factor
rename to basis/state-parser/state-parser-docs.factor
diff --git a/extra/state-parser/state-parser-tests.factor b/basis/state-parser/state-parser-tests.factor
similarity index 100%
rename from extra/state-parser/state-parser-tests.factor
rename to basis/state-parser/state-parser-tests.factor
diff --git a/extra/state-parser/state-parser.factor b/basis/state-parser/state-parser.factor
similarity index 100%
rename from extra/state-parser/state-parser.factor
rename to basis/state-parser/state-parser.factor
diff --git a/extra/state-parser/summary.txt b/basis/state-parser/summary.txt
similarity index 100%
rename from extra/state-parser/summary.txt
rename to basis/state-parser/summary.txt
diff --git a/extra/io/windows/nt/monitors/authors.txt b/basis/structs/authors.txt
similarity index 100%
rename from extra/io/windows/nt/monitors/authors.txt
rename to basis/structs/authors.txt
diff --git a/extra/structs/structs.factor b/basis/structs/structs.factor
similarity index 100%
rename from extra/structs/structs.factor
rename to basis/structs/structs.factor
diff --git a/extra/structs/summary.txt b/basis/structs/summary.txt
similarity index 100%
rename from extra/structs/summary.txt
rename to basis/structs/summary.txt
diff --git a/core/summary/summary-docs.factor b/basis/summary/summary-docs.factor
similarity index 100%
rename from core/summary/summary-docs.factor
rename to basis/summary/summary-docs.factor
diff --git a/core/summary/summary.factor b/basis/summary/summary.factor
similarity index 95%
rename from core/summary/summary.factor
rename to basis/summary/summary.factor
index 61f59682e8..5da6599c63 100644
--- a/core/summary/summary.factor
+++ b/basis/summary/summary.factor
@@ -14,7 +14,7 @@ M: object summary object-summary ;
 M: input summary
     [
         "Input: " %
-        input-string "\n" split1 swap %
+        string>> "\n" split1 swap %
         "..." "" ? %
     ] "" make ;
 
diff --git a/extra/symbols/authors.txt b/basis/symbols/authors.txt
similarity index 100%
rename from extra/symbols/authors.txt
rename to basis/symbols/authors.txt
diff --git a/extra/symbols/symbols-docs.factor b/basis/symbols/symbols-docs.factor
similarity index 100%
rename from extra/symbols/symbols-docs.factor
rename to basis/symbols/symbols-docs.factor
diff --git a/extra/symbols/symbols-tests.factor b/basis/symbols/symbols-tests.factor
similarity index 100%
rename from extra/symbols/symbols-tests.factor
rename to basis/symbols/symbols-tests.factor
diff --git a/extra/symbols/symbols.factor b/basis/symbols/symbols.factor
similarity index 100%
rename from extra/symbols/symbols.factor
rename to basis/symbols/symbols.factor
diff --git a/extra/models/authors.txt b/basis/threads/authors.txt
similarity index 100%
rename from extra/models/authors.txt
rename to basis/threads/authors.txt
diff --git a/core/threads/summary.txt b/basis/threads/summary.txt
similarity index 100%
rename from core/threads/summary.txt
rename to basis/threads/summary.txt
diff --git a/core/threads/threads-docs.factor b/basis/threads/threads-docs.factor
similarity index 100%
rename from core/threads/threads-docs.factor
rename to basis/threads/threads-docs.factor
diff --git a/core/threads/threads-tests.factor b/basis/threads/threads-tests.factor
similarity index 100%
rename from core/threads/threads-tests.factor
rename to basis/threads/threads-tests.factor
diff --git a/core/threads/threads.factor b/basis/threads/threads.factor
similarity index 100%
rename from core/threads/threads.factor
rename to basis/threads/threads.factor
diff --git a/extra/tools/annotations/annotations-docs.factor b/basis/tools/annotations/annotations-docs.factor
similarity index 100%
rename from extra/tools/annotations/annotations-docs.factor
rename to basis/tools/annotations/annotations-docs.factor
diff --git a/extra/tools/annotations/annotations-tests.factor b/basis/tools/annotations/annotations-tests.factor
similarity index 100%
rename from extra/tools/annotations/annotations-tests.factor
rename to basis/tools/annotations/annotations-tests.factor
diff --git a/extra/tools/annotations/annotations.factor b/basis/tools/annotations/annotations.factor
similarity index 100%
rename from extra/tools/annotations/annotations.factor
rename to basis/tools/annotations/annotations.factor
diff --git a/extra/tools/annotations/authors.txt b/basis/tools/annotations/authors.txt
similarity index 100%
rename from extra/tools/annotations/authors.txt
rename to basis/tools/annotations/authors.txt
diff --git a/extra/tools/annotations/summary.txt b/basis/tools/annotations/summary.txt
similarity index 100%
rename from extra/tools/annotations/summary.txt
rename to basis/tools/annotations/summary.txt
diff --git a/extra/tools/annotations/tags.txt b/basis/tools/annotations/tags.txt
similarity index 100%
rename from extra/tools/annotations/tags.txt
rename to basis/tools/annotations/tags.txt
diff --git a/extra/tools/completion/authors.txt b/basis/tools/completion/authors.txt
similarity index 100%
rename from extra/tools/completion/authors.txt
rename to basis/tools/completion/authors.txt
diff --git a/extra/tools/completion/completion-docs.factor b/basis/tools/completion/completion-docs.factor
similarity index 100%
rename from extra/tools/completion/completion-docs.factor
rename to basis/tools/completion/completion-docs.factor
diff --git a/extra/tools/completion/completion.factor b/basis/tools/completion/completion.factor
similarity index 100%
rename from extra/tools/completion/completion.factor
rename to basis/tools/completion/completion.factor
diff --git a/extra/tools/completion/summary.txt b/basis/tools/completion/summary.txt
similarity index 100%
rename from extra/tools/completion/summary.txt
rename to basis/tools/completion/summary.txt
diff --git a/extra/tools/crossref/authors.txt b/basis/tools/crossref/authors.txt
similarity index 100%
rename from extra/tools/crossref/authors.txt
rename to basis/tools/crossref/authors.txt
diff --git a/extra/tools/crossref/crossref-docs.factor b/basis/tools/crossref/crossref-docs.factor
similarity index 100%
rename from extra/tools/crossref/crossref-docs.factor
rename to basis/tools/crossref/crossref-docs.factor
diff --git a/extra/tools/crossref/crossref-tests.factor b/basis/tools/crossref/crossref-tests.factor
similarity index 83%
rename from extra/tools/crossref/crossref-tests.factor
rename to basis/tools/crossref/crossref-tests.factor
index 0717763ed0..5bf917f906 100755
--- a/extra/tools/crossref/crossref-tests.factor
+++ b/basis/tools/crossref/crossref-tests.factor
@@ -6,7 +6,7 @@ GENERIC: foo
 
 M: integer foo + ;
 
-"resource:extra/tools/crossref/test/foo.factor" run-file
+"resource:basis/tools/crossref/test/foo.factor" run-file
 
 [ t ] [ integer \ foo method \ + usage member? ] unit-test
 [ t ] [ \ foo usage [ pathname? ] contains? ] unit-test
diff --git a/extra/tools/crossref/crossref.factor b/basis/tools/crossref/crossref.factor
similarity index 100%
rename from extra/tools/crossref/crossref.factor
rename to basis/tools/crossref/crossref.factor
diff --git a/extra/tools/crossref/summary.txt b/basis/tools/crossref/summary.txt
similarity index 100%
rename from extra/tools/crossref/summary.txt
rename to basis/tools/crossref/summary.txt
diff --git a/extra/tools/crossref/tags.txt b/basis/tools/crossref/tags.txt
similarity index 100%
rename from extra/tools/crossref/tags.txt
rename to basis/tools/crossref/tags.txt
diff --git a/extra/tools/crossref/test/foo.factor b/basis/tools/crossref/test/foo.factor
similarity index 100%
rename from extra/tools/crossref/test/foo.factor
rename to basis/tools/crossref/test/foo.factor
diff --git a/extra/tools/deploy/authors.txt b/basis/tools/deploy/authors.txt
similarity index 100%
rename from extra/tools/deploy/authors.txt
rename to basis/tools/deploy/authors.txt
diff --git a/extra/tools/deploy/backend/authors.txt b/basis/tools/deploy/backend/authors.txt
similarity index 100%
rename from extra/tools/deploy/backend/authors.txt
rename to basis/tools/deploy/backend/authors.txt
diff --git a/extra/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
similarity index 100%
rename from extra/tools/deploy/backend/backend.factor
rename to basis/tools/deploy/backend/backend.factor
diff --git a/extra/tools/deploy/config/authors.txt b/basis/tools/deploy/config/authors.txt
similarity index 100%
rename from extra/tools/deploy/config/authors.txt
rename to basis/tools/deploy/config/authors.txt
diff --git a/extra/tools/deploy/config/config-docs.factor b/basis/tools/deploy/config/config-docs.factor
similarity index 100%
rename from extra/tools/deploy/config/config-docs.factor
rename to basis/tools/deploy/config/config-docs.factor
diff --git a/extra/tools/deploy/config/config.factor b/basis/tools/deploy/config/config.factor
similarity index 100%
rename from extra/tools/deploy/config/config.factor
rename to basis/tools/deploy/config/config.factor
diff --git a/extra/tools/deploy/deploy-docs.factor b/basis/tools/deploy/deploy-docs.factor
similarity index 100%
rename from extra/tools/deploy/deploy-docs.factor
rename to basis/tools/deploy/deploy-docs.factor
diff --git a/extra/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
similarity index 93%
rename from extra/tools/deploy/deploy-tests.factor
rename to basis/tools/deploy/deploy-tests.factor
index b66688b63a..ffbf764de1 100755
--- a/extra/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -79,7 +79,7 @@ M: quit-responder call-responder*
     [
         <dispatcher>
             add-quot-responder
-            "resource:extra/http/test" <static> >>default
+            "resource:basis/http/test" <static> >>default
         main-responder set
 
         test-httpd
diff --git a/extra/tools/deploy/deploy.factor b/basis/tools/deploy/deploy.factor
similarity index 100%
rename from extra/tools/deploy/deploy.factor
rename to basis/tools/deploy/deploy.factor
diff --git a/extra/tools/deploy/macosx/authors.txt b/basis/tools/deploy/macosx/authors.txt
similarity index 100%
rename from extra/tools/deploy/macosx/authors.txt
rename to basis/tools/deploy/macosx/authors.txt
diff --git a/extra/tools/deploy/macosx/macosx.factor b/basis/tools/deploy/macosx/macosx.factor
similarity index 100%
rename from extra/tools/deploy/macosx/macosx.factor
rename to basis/tools/deploy/macosx/macosx.factor
diff --git a/extra/tools/deploy/macosx/summary.txt b/basis/tools/deploy/macosx/summary.txt
similarity index 100%
rename from extra/tools/deploy/macosx/summary.txt
rename to basis/tools/deploy/macosx/summary.txt
diff --git a/extra/tools/deploy/macosx/tags.txt b/basis/tools/deploy/macosx/tags.txt
similarity index 100%
rename from extra/tools/deploy/macosx/tags.txt
rename to basis/tools/deploy/macosx/tags.txt
diff --git a/extra/tools/deploy/restage/restage.factor b/basis/tools/deploy/restage/restage.factor
similarity index 100%
rename from extra/tools/deploy/restage/restage.factor
rename to basis/tools/deploy/restage/restage.factor
diff --git a/extra/tools/deploy/shaker/authors.txt b/basis/tools/deploy/shaker/authors.txt
similarity index 100%
rename from extra/tools/deploy/shaker/authors.txt
rename to basis/tools/deploy/shaker/authors.txt
diff --git a/extra/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
similarity index 97%
rename from extra/tools/deploy/shaker/shaker.factor
rename to basis/tools/deploy/shaker/shaker.factor
index 0e20384839..a3fc08554c 100755
--- a/extra/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -45,21 +45,21 @@ IN: tools.deploy.shaker
 : strip-debugger ( -- )
     strip-debugger? [
         "Stripping debugger" show
-        "resource:extra/tools/deploy/shaker/strip-debugger.factor"
+        "resource:basis/tools/deploy/shaker/strip-debugger.factor"
         run-file
     ] when ;
 
 : strip-libc ( -- )
     "libc" vocab [
         "Stripping manual memory management debug code" show
-        "resource:extra/tools/deploy/shaker/strip-libc.factor"
+        "resource:basis/tools/deploy/shaker/strip-libc.factor"
         run-file
     ] when ;
 
 : strip-cocoa ( -- )
     "cocoa" vocab [
         "Stripping unused Cocoa methods" show
-        "resource:extra/tools/deploy/shaker/strip-cocoa.factor"
+        "resource:basis/tools/deploy/shaker/strip-cocoa.factor"
         run-file
     ] when ;
 
diff --git a/extra/tools/deploy/shaker/strip-cocoa.factor b/basis/tools/deploy/shaker/strip-cocoa.factor
similarity index 100%
rename from extra/tools/deploy/shaker/strip-cocoa.factor
rename to basis/tools/deploy/shaker/strip-cocoa.factor
diff --git a/extra/tools/deploy/shaker/strip-debugger.factor b/basis/tools/deploy/shaker/strip-debugger.factor
similarity index 100%
rename from extra/tools/deploy/shaker/strip-debugger.factor
rename to basis/tools/deploy/shaker/strip-debugger.factor
diff --git a/extra/tools/deploy/shaker/strip-libc.factor b/basis/tools/deploy/shaker/strip-libc.factor
similarity index 100%
rename from extra/tools/deploy/shaker/strip-libc.factor
rename to basis/tools/deploy/shaker/strip-libc.factor
diff --git a/extra/tools/deploy/summary.txt b/basis/tools/deploy/summary.txt
similarity index 100%
rename from extra/tools/deploy/summary.txt
rename to basis/tools/deploy/summary.txt
diff --git a/extra/tools/deploy/tags.txt b/basis/tools/deploy/tags.txt
similarity index 100%
rename from extra/tools/deploy/tags.txt
rename to basis/tools/deploy/tags.txt
diff --git a/extra/tools/deploy/test/1/1.factor b/basis/tools/deploy/test/1/1.factor
similarity index 100%
rename from extra/tools/deploy/test/1/1.factor
rename to basis/tools/deploy/test/1/1.factor
diff --git a/extra/tools/deploy/test/1/deploy.factor b/basis/tools/deploy/test/1/deploy.factor
similarity index 100%
rename from extra/tools/deploy/test/1/deploy.factor
rename to basis/tools/deploy/test/1/deploy.factor
diff --git a/extra/tools/deploy/test/2/2.factor b/basis/tools/deploy/test/2/2.factor
similarity index 100%
rename from extra/tools/deploy/test/2/2.factor
rename to basis/tools/deploy/test/2/2.factor
diff --git a/extra/tools/deploy/test/2/deploy.factor b/basis/tools/deploy/test/2/deploy.factor
similarity index 100%
rename from extra/tools/deploy/test/2/deploy.factor
rename to basis/tools/deploy/test/2/deploy.factor
diff --git a/extra/tools/deploy/test/3/3.factor b/basis/tools/deploy/test/3/3.factor
similarity index 100%
rename from extra/tools/deploy/test/3/3.factor
rename to basis/tools/deploy/test/3/3.factor
diff --git a/extra/tools/deploy/test/3/deploy.factor b/basis/tools/deploy/test/3/deploy.factor
similarity index 100%
rename from extra/tools/deploy/test/3/deploy.factor
rename to basis/tools/deploy/test/3/deploy.factor
diff --git a/extra/tools/deploy/test/4/4.factor b/basis/tools/deploy/test/4/4.factor
similarity index 100%
rename from extra/tools/deploy/test/4/4.factor
rename to basis/tools/deploy/test/4/4.factor
diff --git a/extra/tools/deploy/test/4/deploy.factor b/basis/tools/deploy/test/4/deploy.factor
similarity index 100%
rename from extra/tools/deploy/test/4/deploy.factor
rename to basis/tools/deploy/test/4/deploy.factor
diff --git a/extra/tools/deploy/test/5/5.factor b/basis/tools/deploy/test/5/5.factor
similarity index 100%
rename from extra/tools/deploy/test/5/5.factor
rename to basis/tools/deploy/test/5/5.factor
diff --git a/extra/tools/deploy/test/5/deploy.factor b/basis/tools/deploy/test/5/deploy.factor
similarity index 100%
rename from extra/tools/deploy/test/5/deploy.factor
rename to basis/tools/deploy/test/5/deploy.factor
diff --git a/extra/tools/deploy/unix/authors.txt b/basis/tools/deploy/unix/authors.txt
similarity index 100%
rename from extra/tools/deploy/unix/authors.txt
rename to basis/tools/deploy/unix/authors.txt
diff --git a/extra/tools/deploy/unix/summary.txt b/basis/tools/deploy/unix/summary.txt
similarity index 100%
rename from extra/tools/deploy/unix/summary.txt
rename to basis/tools/deploy/unix/summary.txt
diff --git a/extra/tools/deploy/unix/tags.txt b/basis/tools/deploy/unix/tags.txt
similarity index 100%
rename from extra/tools/deploy/unix/tags.txt
rename to basis/tools/deploy/unix/tags.txt
diff --git a/extra/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor
similarity index 100%
rename from extra/tools/deploy/unix/unix.factor
rename to basis/tools/deploy/unix/unix.factor
diff --git a/extra/tools/deploy/windows/authors.txt b/basis/tools/deploy/windows/authors.txt
similarity index 100%
rename from extra/tools/deploy/windows/authors.txt
rename to basis/tools/deploy/windows/authors.txt
diff --git a/extra/tools/deploy/windows/summary.txt b/basis/tools/deploy/windows/summary.txt
similarity index 100%
rename from extra/tools/deploy/windows/summary.txt
rename to basis/tools/deploy/windows/summary.txt
diff --git a/extra/tools/deploy/windows/tags.txt b/basis/tools/deploy/windows/tags.txt
similarity index 100%
rename from extra/tools/deploy/windows/tags.txt
rename to basis/tools/deploy/windows/tags.txt
diff --git a/extra/tools/deploy/windows/windows-tests.factor b/basis/tools/deploy/windows/windows-tests.factor
similarity index 100%
rename from extra/tools/deploy/windows/windows-tests.factor
rename to basis/tools/deploy/windows/windows-tests.factor
diff --git a/extra/tools/deploy/windows/windows.factor b/basis/tools/deploy/windows/windows.factor
similarity index 100%
rename from extra/tools/deploy/windows/windows.factor
rename to basis/tools/deploy/windows/windows.factor
diff --git a/extra/tools/disassembler/authors.txt b/basis/tools/disassembler/authors.txt
similarity index 100%
rename from extra/tools/disassembler/authors.txt
rename to basis/tools/disassembler/authors.txt
diff --git a/extra/tools/disassembler/disassembler-docs.factor b/basis/tools/disassembler/disassembler-docs.factor
similarity index 100%
rename from extra/tools/disassembler/disassembler-docs.factor
rename to basis/tools/disassembler/disassembler-docs.factor
diff --git a/extra/tools/disassembler/disassembler-tests.factor b/basis/tools/disassembler/disassembler-tests.factor
similarity index 100%
rename from extra/tools/disassembler/disassembler-tests.factor
rename to basis/tools/disassembler/disassembler-tests.factor
diff --git a/extra/tools/disassembler/disassembler.factor b/basis/tools/disassembler/disassembler.factor
similarity index 100%
rename from extra/tools/disassembler/disassembler.factor
rename to basis/tools/disassembler/disassembler.factor
diff --git a/extra/tools/disassembler/summary.txt b/basis/tools/disassembler/summary.txt
similarity index 100%
rename from extra/tools/disassembler/summary.txt
rename to basis/tools/disassembler/summary.txt
diff --git a/extra/tools/memory/authors.txt b/basis/tools/memory/authors.txt
similarity index 100%
rename from extra/tools/memory/authors.txt
rename to basis/tools/memory/authors.txt
diff --git a/extra/tools/memory/memory-docs.factor b/basis/tools/memory/memory-docs.factor
similarity index 100%
rename from extra/tools/memory/memory-docs.factor
rename to basis/tools/memory/memory-docs.factor
diff --git a/extra/tools/memory/memory-tests.factor b/basis/tools/memory/memory-tests.factor
similarity index 100%
rename from extra/tools/memory/memory-tests.factor
rename to basis/tools/memory/memory-tests.factor
diff --git a/extra/tools/memory/memory.factor b/basis/tools/memory/memory.factor
similarity index 100%
rename from extra/tools/memory/memory.factor
rename to basis/tools/memory/memory.factor
diff --git a/extra/tools/memory/summary.txt b/basis/tools/memory/summary.txt
similarity index 100%
rename from extra/tools/memory/summary.txt
rename to basis/tools/memory/summary.txt
diff --git a/extra/tools/memory/tags.txt b/basis/tools/memory/tags.txt
similarity index 100%
rename from extra/tools/memory/tags.txt
rename to basis/tools/memory/tags.txt
diff --git a/extra/tools/profiler/authors.txt b/basis/tools/profiler/authors.txt
similarity index 100%
rename from extra/tools/profiler/authors.txt
rename to basis/tools/profiler/authors.txt
diff --git a/extra/tools/profiler/profiler-docs.factor b/basis/tools/profiler/profiler-docs.factor
similarity index 100%
rename from extra/tools/profiler/profiler-docs.factor
rename to basis/tools/profiler/profiler-docs.factor
diff --git a/extra/tools/profiler/profiler-tests.factor b/basis/tools/profiler/profiler-tests.factor
similarity index 100%
rename from extra/tools/profiler/profiler-tests.factor
rename to basis/tools/profiler/profiler-tests.factor
diff --git a/extra/tools/profiler/profiler.factor b/basis/tools/profiler/profiler.factor
similarity index 100%
rename from extra/tools/profiler/profiler.factor
rename to basis/tools/profiler/profiler.factor
diff --git a/extra/tools/profiler/summary.txt b/basis/tools/profiler/summary.txt
similarity index 100%
rename from extra/tools/profiler/summary.txt
rename to basis/tools/profiler/summary.txt
diff --git a/extra/tools/profiler/tags.txt b/basis/tools/profiler/tags.txt
similarity index 100%
rename from extra/tools/profiler/tags.txt
rename to basis/tools/profiler/tags.txt
diff --git a/extra/tools/summary.txt b/basis/tools/summary.txt
similarity index 100%
rename from extra/tools/summary.txt
rename to basis/tools/summary.txt
diff --git a/extra/tools/test/authors.txt b/basis/tools/test/authors.txt
similarity index 100%
rename from extra/tools/test/authors.txt
rename to basis/tools/test/authors.txt
diff --git a/extra/tools/test/summary.txt b/basis/tools/test/summary.txt
similarity index 100%
rename from extra/tools/test/summary.txt
rename to basis/tools/test/summary.txt
diff --git a/extra/tools/test/tags.txt b/basis/tools/test/tags.txt
similarity index 100%
rename from extra/tools/test/tags.txt
rename to basis/tools/test/tags.txt
diff --git a/extra/tools/test/test-docs.factor b/basis/tools/test/test-docs.factor
similarity index 100%
rename from extra/tools/test/test-docs.factor
rename to basis/tools/test/test-docs.factor
diff --git a/extra/tools/test/test.factor b/basis/tools/test/test.factor
similarity index 100%
rename from extra/tools/test/test.factor
rename to basis/tools/test/test.factor
diff --git a/extra/tools/test/tools.factor b/basis/tools/test/tools.factor
similarity index 100%
rename from extra/tools/test/tools.factor
rename to basis/tools/test/tools.factor
diff --git a/extra/tools/test/ui/authors.txt b/basis/tools/test/ui/authors.txt
similarity index 100%
rename from extra/tools/test/ui/authors.txt
rename to basis/tools/test/ui/authors.txt
diff --git a/extra/tools/test/ui/ui.factor b/basis/tools/test/ui/ui.factor
similarity index 100%
rename from extra/tools/test/ui/ui.factor
rename to basis/tools/test/ui/ui.factor
diff --git a/extra/tools/threads/threads-docs.factor b/basis/tools/threads/threads-docs.factor
similarity index 100%
rename from extra/tools/threads/threads-docs.factor
rename to basis/tools/threads/threads-docs.factor
diff --git a/extra/tools/threads/threads.factor b/basis/tools/threads/threads.factor
similarity index 100%
rename from extra/tools/threads/threads.factor
rename to basis/tools/threads/threads.factor
diff --git a/extra/tools/time/authors.txt b/basis/tools/time/authors.txt
similarity index 100%
rename from extra/tools/time/authors.txt
rename to basis/tools/time/authors.txt
diff --git a/extra/tools/time/summary.txt b/basis/tools/time/summary.txt
similarity index 100%
rename from extra/tools/time/summary.txt
rename to basis/tools/time/summary.txt
diff --git a/extra/tools/time/tags.txt b/basis/tools/time/tags.txt
similarity index 100%
rename from extra/tools/time/tags.txt
rename to basis/tools/time/tags.txt
diff --git a/extra/tools/time/time-docs.factor b/basis/tools/time/time-docs.factor
similarity index 100%
rename from extra/tools/time/time-docs.factor
rename to basis/tools/time/time-docs.factor
diff --git a/extra/tools/time/time.factor b/basis/tools/time/time.factor
similarity index 100%
rename from extra/tools/time/time.factor
rename to basis/tools/time/time.factor
diff --git a/extra/tools/vocabs/browser/authors.txt b/basis/tools/vocabs/browser/authors.txt
similarity index 100%
rename from extra/tools/vocabs/browser/authors.txt
rename to basis/tools/vocabs/browser/authors.txt
diff --git a/extra/tools/vocabs/browser/browser-docs.factor b/basis/tools/vocabs/browser/browser-docs.factor
similarity index 100%
rename from extra/tools/vocabs/browser/browser-docs.factor
rename to basis/tools/vocabs/browser/browser-docs.factor
diff --git a/extra/tools/vocabs/browser/browser-tests.factor b/basis/tools/vocabs/browser/browser-tests.factor
similarity index 100%
rename from extra/tools/vocabs/browser/browser-tests.factor
rename to basis/tools/vocabs/browser/browser-tests.factor
diff --git a/extra/tools/vocabs/browser/browser.factor b/basis/tools/vocabs/browser/browser.factor
similarity index 100%
rename from extra/tools/vocabs/browser/browser.factor
rename to basis/tools/vocabs/browser/browser.factor
diff --git a/extra/tools/vocabs/browser/tags.txt b/basis/tools/vocabs/browser/tags.txt
similarity index 100%
rename from extra/tools/vocabs/browser/tags.txt
rename to basis/tools/vocabs/browser/tags.txt
diff --git a/extra/tools/vocabs/monitor/authors.txt b/basis/tools/vocabs/monitor/authors.txt
similarity index 100%
rename from extra/tools/vocabs/monitor/authors.txt
rename to basis/tools/vocabs/monitor/authors.txt
diff --git a/extra/tools/vocabs/monitor/monitor-tests.factor b/basis/tools/vocabs/monitor/monitor-tests.factor
similarity index 100%
rename from extra/tools/vocabs/monitor/monitor-tests.factor
rename to basis/tools/vocabs/monitor/monitor-tests.factor
diff --git a/extra/tools/vocabs/monitor/monitor.factor b/basis/tools/vocabs/monitor/monitor.factor
similarity index 100%
rename from extra/tools/vocabs/monitor/monitor.factor
rename to basis/tools/vocabs/monitor/monitor.factor
diff --git a/extra/tools/vocabs/monitor/summary.txt b/basis/tools/vocabs/monitor/summary.txt
similarity index 100%
rename from extra/tools/vocabs/monitor/summary.txt
rename to basis/tools/vocabs/monitor/summary.txt
diff --git a/extra/tools/vocabs/vocabs-docs.factor b/basis/tools/vocabs/vocabs-docs.factor
similarity index 100%
rename from extra/tools/vocabs/vocabs-docs.factor
rename to basis/tools/vocabs/vocabs-docs.factor
diff --git a/extra/tools/vocabs/vocabs-tests.factor b/basis/tools/vocabs/vocabs-tests.factor
similarity index 100%
rename from extra/tools/vocabs/vocabs-tests.factor
rename to basis/tools/vocabs/vocabs-tests.factor
diff --git a/extra/tools/vocabs/vocabs.factor b/basis/tools/vocabs/vocabs.factor
similarity index 100%
rename from extra/tools/vocabs/vocabs.factor
rename to basis/tools/vocabs/vocabs.factor
diff --git a/extra/tools/walker/authors.txt b/basis/tools/walker/authors.txt
similarity index 100%
rename from extra/tools/walker/authors.txt
rename to basis/tools/walker/authors.txt
diff --git a/extra/tools/walker/debug/authors.txt b/basis/tools/walker/debug/authors.txt
similarity index 100%
rename from extra/tools/walker/debug/authors.txt
rename to basis/tools/walker/debug/authors.txt
diff --git a/extra/tools/walker/debug/debug.factor b/basis/tools/walker/debug/debug.factor
similarity index 100%
rename from extra/tools/walker/debug/debug.factor
rename to basis/tools/walker/debug/debug.factor
diff --git a/extra/tools/walker/summary.txt b/basis/tools/walker/summary.txt
similarity index 100%
rename from extra/tools/walker/summary.txt
rename to basis/tools/walker/summary.txt
diff --git a/extra/tools/walker/walker-tests.factor b/basis/tools/walker/walker-tests.factor
similarity index 100%
rename from extra/tools/walker/walker-tests.factor
rename to basis/tools/walker/walker-tests.factor
diff --git a/extra/tools/walker/walker.factor b/basis/tools/walker/walker.factor
similarity index 100%
rename from extra/tools/walker/walker.factor
rename to basis/tools/walker/walker.factor
diff --git a/extra/tr/authors.txt b/basis/tr/authors.txt
similarity index 100%
rename from extra/tr/authors.txt
rename to basis/tr/authors.txt
diff --git a/extra/tr/summary.txt b/basis/tr/summary.txt
similarity index 100%
rename from extra/tr/summary.txt
rename to basis/tr/summary.txt
diff --git a/extra/tr/tr-tests.factor b/basis/tr/tr-tests.factor
similarity index 100%
rename from extra/tr/tr-tests.factor
rename to basis/tr/tr-tests.factor
diff --git a/extra/tr/tr.factor b/basis/tr/tr.factor
similarity index 100%
rename from extra/tr/tr.factor
rename to basis/tr/tr.factor
diff --git a/extra/tuple-arrays/authors.txt b/basis/tuple-arrays/authors.txt
similarity index 100%
rename from extra/tuple-arrays/authors.txt
rename to basis/tuple-arrays/authors.txt
diff --git a/extra/tuple-arrays/summary.txt b/basis/tuple-arrays/summary.txt
similarity index 100%
rename from extra/tuple-arrays/summary.txt
rename to basis/tuple-arrays/summary.txt
diff --git a/extra/tuple-arrays/tags.txt b/basis/tuple-arrays/tags.txt
similarity index 100%
rename from extra/tuple-arrays/tags.txt
rename to basis/tuple-arrays/tags.txt
diff --git a/extra/tuple-arrays/tuple-arrays-docs.factor b/basis/tuple-arrays/tuple-arrays-docs.factor
similarity index 100%
rename from extra/tuple-arrays/tuple-arrays-docs.factor
rename to basis/tuple-arrays/tuple-arrays-docs.factor
diff --git a/extra/tuple-arrays/tuple-arrays-tests.factor b/basis/tuple-arrays/tuple-arrays-tests.factor
similarity index 100%
rename from extra/tuple-arrays/tuple-arrays-tests.factor
rename to basis/tuple-arrays/tuple-arrays-tests.factor
diff --git a/extra/tuple-arrays/tuple-arrays.factor b/basis/tuple-arrays/tuple-arrays.factor
similarity index 100%
rename from extra/tuple-arrays/tuple-arrays.factor
rename to basis/tuple-arrays/tuple-arrays.factor
diff --git a/extra/unicode/authors.txt b/basis/unicode/authors.txt
similarity index 100%
rename from extra/unicode/authors.txt
rename to basis/unicode/authors.txt
diff --git a/extra/unicode/breaks/authors.txt b/basis/unicode/breaks/authors.txt
similarity index 100%
rename from extra/unicode/breaks/authors.txt
rename to basis/unicode/breaks/authors.txt
diff --git a/extra/unicode/breaks/breaks-tests.factor b/basis/unicode/breaks/breaks-tests.factor
similarity index 100%
rename from extra/unicode/breaks/breaks-tests.factor
rename to basis/unicode/breaks/breaks-tests.factor
diff --git a/extra/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor
similarity index 100%
rename from extra/unicode/breaks/breaks.factor
rename to basis/unicode/breaks/breaks.factor
diff --git a/extra/unicode/breaks/tags.txt b/basis/unicode/breaks/tags.txt
similarity index 100%
rename from extra/unicode/breaks/tags.txt
rename to basis/unicode/breaks/tags.txt
diff --git a/extra/unicode/case/SpecialCasing.txt b/basis/unicode/case/SpecialCasing.txt
similarity index 100%
rename from extra/unicode/case/SpecialCasing.txt
rename to basis/unicode/case/SpecialCasing.txt
diff --git a/extra/unicode/case/authors.txt b/basis/unicode/case/authors.txt
similarity index 100%
rename from extra/unicode/case/authors.txt
rename to basis/unicode/case/authors.txt
diff --git a/extra/unicode/case/case-tests.factor b/basis/unicode/case/case-tests.factor
similarity index 100%
rename from extra/unicode/case/case-tests.factor
rename to basis/unicode/case/case-tests.factor
diff --git a/extra/unicode/case/case.factor b/basis/unicode/case/case.factor
similarity index 100%
rename from extra/unicode/case/case.factor
rename to basis/unicode/case/case.factor
diff --git a/extra/unicode/case/tags.txt b/basis/unicode/case/tags.txt
similarity index 100%
rename from extra/unicode/case/tags.txt
rename to basis/unicode/case/tags.txt
diff --git a/extra/unicode/categories/authors.txt b/basis/unicode/categories/authors.txt
similarity index 100%
rename from extra/unicode/categories/authors.txt
rename to basis/unicode/categories/authors.txt
diff --git a/extra/unicode/categories/categories-tests.factor b/basis/unicode/categories/categories-tests.factor
similarity index 100%
rename from extra/unicode/categories/categories-tests.factor
rename to basis/unicode/categories/categories-tests.factor
diff --git a/extra/unicode/categories/categories.factor b/basis/unicode/categories/categories.factor
similarity index 100%
rename from extra/unicode/categories/categories.factor
rename to basis/unicode/categories/categories.factor
diff --git a/extra/unicode/categories/tags.txt b/basis/unicode/categories/tags.txt
similarity index 100%
rename from extra/unicode/categories/tags.txt
rename to basis/unicode/categories/tags.txt
diff --git a/extra/unicode/collation/CollationTest_SHIFTED.txt b/basis/unicode/collation/CollationTest_SHIFTED.txt
similarity index 100%
rename from extra/unicode/collation/CollationTest_SHIFTED.txt
rename to basis/unicode/collation/CollationTest_SHIFTED.txt
diff --git a/extra/unicode/collation/allkeys.txt b/basis/unicode/collation/allkeys.txt
similarity index 100%
rename from extra/unicode/collation/allkeys.txt
rename to basis/unicode/collation/allkeys.txt
diff --git a/extra/unicode/collation/collation-docs.factor b/basis/unicode/collation/collation-docs.factor
similarity index 100%
rename from extra/unicode/collation/collation-docs.factor
rename to basis/unicode/collation/collation-docs.factor
diff --git a/extra/unicode/collation/collation-tests.factor b/basis/unicode/collation/collation-tests.factor
similarity index 91%
rename from extra/unicode/collation/collation-tests.factor
rename to basis/unicode/collation/collation-tests.factor
index d523a15ada..bf87c6b7da 100755
--- a/extra/unicode/collation/collation-tests.factor
+++ b/basis/unicode/collation/collation-tests.factor
@@ -4,7 +4,7 @@ tools.test assocs io.streams.null words ;
 IN: unicode.collation.tests
 
 : parse-test ( -- strings )
-    "resource:extra/unicode/collation/CollationTest_SHIFTED.txt"
+    "resource:basis/unicode/collation/CollationTest_SHIFTED.txt"
     utf8 file-lines 5 tail
     [ ";" split1 drop " " split [ hex> ] "" map-as ] map ;
 
diff --git a/extra/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
similarity index 95%
rename from extra/unicode/collation/collation.factor
rename to basis/unicode/collation/collation.factor
index 3e239430d4..b5c7665b8b 100755
--- a/extra/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -26,7 +26,7 @@ TUPLE: weight primary secondary tertiary ignorable? ;
     lines filter-comments
     [ parse-line ] H{ } map>assoc ;
 
-"resource:extra/unicode/collation/allkeys.txt"
+"resource:basis/unicode/collation/allkeys.txt"
 ascii <file-reader> parse-ducet \ ducet set-value
 
 ! Fix up table for long contractions
diff --git a/extra/unicode/data/PropList.txt b/basis/unicode/data/PropList.txt
similarity index 100%
rename from extra/unicode/data/PropList.txt
rename to basis/unicode/data/PropList.txt
diff --git a/extra/unicode/data/SpecialCasing.txt b/basis/unicode/data/SpecialCasing.txt
similarity index 100%
rename from extra/unicode/data/SpecialCasing.txt
rename to basis/unicode/data/SpecialCasing.txt
diff --git a/extra/unicode/data/UnicodeData.txt b/basis/unicode/data/UnicodeData.txt
similarity index 100%
rename from extra/unicode/data/UnicodeData.txt
rename to basis/unicode/data/UnicodeData.txt
diff --git a/extra/unicode/data/authors.txt b/basis/unicode/data/authors.txt
similarity index 100%
rename from extra/unicode/data/authors.txt
rename to basis/unicode/data/authors.txt
diff --git a/extra/unicode/data/data.factor b/basis/unicode/data/data.factor
similarity index 97%
rename from extra/unicode/data/data.factor
rename to basis/unicode/data/data.factor
index fdcf495307..6d6ed276a8 100755
--- a/extra/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -39,7 +39,7 @@ VALUE: properties
     ascii file-lines [ split-; ] map ;
 
 : load-data ( -- data )
-    "resource:extra/unicode/data/UnicodeData.txt" data ;
+    "resource:basis/unicode/data/UnicodeData.txt" data ;
 
 : filter-comments ( lines -- lines )
     [ "#@" split first ] map harvest ;
@@ -140,7 +140,7 @@ C: <code-point> code-point
 
 ! Extra properties
 : properties-lines ( -- lines )
-    "resource:extra/unicode/data/PropList.txt"
+    "resource:basis/unicode/data/PropList.txt"
     ascii file-lines ;
 
 : parse-properties ( -- {{[a,b],prop}} )
@@ -159,7 +159,7 @@ C: <code-point> code-point
 
 ! Special casing data
 : load-special-casing ( -- special-casing )
-    "resource:extra/unicode/data/SpecialCasing.txt" data
+    "resource:basis/unicode/data/SpecialCasing.txt" data
     [ length 5 = ] filter
     [ [ set-code-point ] each ] H{ } make-assoc ;
 
diff --git a/extra/unicode/data/tags.txt b/basis/unicode/data/tags.txt
similarity index 100%
rename from extra/unicode/data/tags.txt
rename to basis/unicode/data/tags.txt
diff --git a/extra/unicode/normalize/NormalizationTest.txt b/basis/unicode/normalize/NormalizationTest.txt
similarity index 100%
rename from extra/unicode/normalize/NormalizationTest.txt
rename to basis/unicode/normalize/NormalizationTest.txt
diff --git a/extra/unicode/normalize/authors.txt b/basis/unicode/normalize/authors.txt
similarity index 100%
rename from extra/unicode/normalize/authors.txt
rename to basis/unicode/normalize/authors.txt
diff --git a/extra/unicode/normalize/normalize-tests.factor b/basis/unicode/normalize/normalize-tests.factor
similarity index 96%
rename from extra/unicode/normalize/normalize-tests.factor
rename to basis/unicode/normalize/normalize-tests.factor
index d4de423e36..cae1380ab4 100755
--- a/extra/unicode/normalize/normalize-tests.factor
+++ b/basis/unicode/normalize/normalize-tests.factor
@@ -21,7 +21,7 @@ IN: unicode.normalize.tests
 [ "\u00d55c" ] [ "\u001112\u001161\u0011ab" nfc ] unit-test
 
 : parse-test ( -- tests )
-    "resource:extra/unicode/normalize/NormalizationTest.txt"
+    "resource:basis/unicode/normalize/NormalizationTest.txt"
     utf8 file-lines filter-comments
     [ ";" split 5 head [ " " split [ hex> ] "" map-as ] map ] map ;
 
diff --git a/extra/unicode/normalize/normalize.factor b/basis/unicode/normalize/normalize.factor
similarity index 100%
rename from extra/unicode/normalize/normalize.factor
rename to basis/unicode/normalize/normalize.factor
diff --git a/extra/unicode/normalize/tags.txt b/basis/unicode/normalize/tags.txt
similarity index 100%
rename from extra/unicode/normalize/tags.txt
rename to basis/unicode/normalize/tags.txt
diff --git a/extra/unicode/script/Scripts.txt b/basis/unicode/script/Scripts.txt
similarity index 100%
rename from extra/unicode/script/Scripts.txt
rename to basis/unicode/script/Scripts.txt
diff --git a/extra/unicode/script/authors.txt b/basis/unicode/script/authors.txt
similarity index 100%
rename from extra/unicode/script/authors.txt
rename to basis/unicode/script/authors.txt
diff --git a/extra/unicode/script/script-docs.factor b/basis/unicode/script/script-docs.factor
similarity index 100%
rename from extra/unicode/script/script-docs.factor
rename to basis/unicode/script/script-docs.factor
diff --git a/extra/unicode/script/script-tests.factor b/basis/unicode/script/script-tests.factor
similarity index 100%
rename from extra/unicode/script/script-tests.factor
rename to basis/unicode/script/script-tests.factor
diff --git a/extra/unicode/script/script.factor b/basis/unicode/script/script.factor
similarity index 96%
rename from extra/unicode/script/script.factor
rename to basis/unicode/script/script.factor
index d100d6dbc3..40b0751e2c 100755
--- a/extra/unicode/script/script.factor
+++ b/basis/unicode/script/script.factor
@@ -36,7 +36,7 @@ SYMBOL: interned
     ] with-variable ;
 
 : load-script ( -- )
-    "resource:extra/unicode/script/Scripts.txt"
+    "resource:basis/unicode/script/Scripts.txt"
     ascii <file-reader> parse-script process-script ;
 
 load-script
diff --git a/extra/unicode/script/summary.txt b/basis/unicode/script/summary.txt
similarity index 100%
rename from extra/unicode/script/summary.txt
rename to basis/unicode/script/summary.txt
diff --git a/extra/unicode/summary.txt b/basis/unicode/summary.txt
similarity index 100%
rename from extra/unicode/summary.txt
rename to basis/unicode/summary.txt
diff --git a/extra/unicode/syntax/authors.txt b/basis/unicode/syntax/authors.txt
similarity index 100%
rename from extra/unicode/syntax/authors.txt
rename to basis/unicode/syntax/authors.txt
diff --git a/extra/unicode/syntax/syntax.factor b/basis/unicode/syntax/syntax.factor
similarity index 97%
rename from extra/unicode/syntax/syntax.factor
rename to basis/unicode/syntax/syntax.factor
index 2410779804..9df14a3928 100755
--- a/extra/unicode/syntax/syntax.factor
+++ b/basis/unicode/syntax/syntax.factor
@@ -1,6 +1,6 @@
 USING: unicode.data kernel math sequences parser lexer bit-arrays
 namespaces sequences.private arrays quotations assocs
-classes.predicate math.order ;
+classes.predicate math.order eval ;
 IN: unicode.syntax
 
 ! Character classes (categories)
diff --git a/extra/unicode/syntax/tags.txt b/basis/unicode/syntax/tags.txt
similarity index 100%
rename from extra/unicode/syntax/tags.txt
rename to basis/unicode/syntax/tags.txt
diff --git a/extra/unicode/tags.txt b/basis/unicode/tags.txt
similarity index 100%
rename from extra/unicode/tags.txt
rename to basis/unicode/tags.txt
diff --git a/extra/random/mersenne-twister/authors.txt b/basis/units/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/random/mersenne-twister/authors.txt
rename to basis/units/authors.txt
diff --git a/extra/structs/authors.txt b/basis/units/constants/authors.txt
similarity index 100%
rename from extra/structs/authors.txt
rename to basis/units/constants/authors.txt
diff --git a/extra/units/constants/constants.factor b/basis/units/constants/constants.factor
similarity index 100%
rename from extra/units/constants/constants.factor
rename to basis/units/constants/constants.factor
diff --git a/extra/units/constants/constants.txt b/basis/units/constants/constants.txt
similarity index 100%
rename from extra/units/constants/constants.txt
rename to basis/units/constants/constants.txt
diff --git a/extra/units/authors.txt b/basis/units/imperial/authors.txt
similarity index 100%
rename from extra/units/authors.txt
rename to basis/units/imperial/authors.txt
diff --git a/extra/units/imperial/imperial-tests.factor b/basis/units/imperial/imperial-tests.factor
similarity index 100%
rename from extra/units/imperial/imperial-tests.factor
rename to basis/units/imperial/imperial-tests.factor
diff --git a/extra/units/imperial/imperial.factor b/basis/units/imperial/imperial.factor
similarity index 100%
rename from extra/units/imperial/imperial.factor
rename to basis/units/imperial/imperial.factor
diff --git a/extra/units/constants/authors.txt b/basis/units/si/authors.txt
similarity index 100%
rename from extra/units/constants/authors.txt
rename to basis/units/si/authors.txt
diff --git a/extra/units/si/si-tests.factor b/basis/units/si/si-tests.factor
similarity index 100%
rename from extra/units/si/si-tests.factor
rename to basis/units/si/si-tests.factor
diff --git a/extra/units/si/si.factor b/basis/units/si/si.factor
similarity index 100%
rename from extra/units/si/si.factor
rename to basis/units/si/si.factor
diff --git a/extra/units/units-tests.factor b/basis/units/units-tests.factor
similarity index 100%
rename from extra/units/units-tests.factor
rename to basis/units/units-tests.factor
diff --git a/extra/units/units.factor b/basis/units/units.factor
similarity index 100%
rename from extra/units/units.factor
rename to basis/units/units.factor
diff --git a/extra/unix/authors.txt b/basis/unix/authors.txt
similarity index 100%
rename from extra/unix/authors.txt
rename to basis/unix/authors.txt
diff --git a/extra/unix/bsd/authors.txt b/basis/unix/bsd/authors.txt
similarity index 100%
rename from extra/unix/bsd/authors.txt
rename to basis/unix/bsd/authors.txt
diff --git a/extra/unix/bsd/bsd.factor b/basis/unix/bsd/bsd.factor
similarity index 100%
rename from extra/unix/bsd/bsd.factor
rename to basis/unix/bsd/bsd.factor
diff --git a/extra/unix/bsd/freebsd/freebsd.factor b/basis/unix/bsd/freebsd/freebsd.factor
similarity index 100%
rename from extra/unix/bsd/freebsd/freebsd.factor
rename to basis/unix/bsd/freebsd/freebsd.factor
diff --git a/extra/unix/bsd/macosx/macosx.factor b/basis/unix/bsd/macosx/macosx.factor
similarity index 100%
rename from extra/unix/bsd/macosx/macosx.factor
rename to basis/unix/bsd/macosx/macosx.factor
diff --git a/extra/unix/bsd/netbsd/netbsd.factor b/basis/unix/bsd/netbsd/netbsd.factor
similarity index 100%
rename from extra/unix/bsd/netbsd/netbsd.factor
rename to basis/unix/bsd/netbsd/netbsd.factor
diff --git a/extra/unix/bsd/openbsd/openbsd.factor b/basis/unix/bsd/openbsd/openbsd.factor
similarity index 100%
rename from extra/unix/bsd/openbsd/openbsd.factor
rename to basis/unix/bsd/openbsd/openbsd.factor
diff --git a/extra/unix/bsd/summary.txt b/basis/unix/bsd/summary.txt
similarity index 100%
rename from extra/unix/bsd/summary.txt
rename to basis/unix/bsd/summary.txt
diff --git a/extra/unix/kqueue/authors.txt b/basis/unix/kqueue/authors.txt
similarity index 100%
rename from extra/unix/kqueue/authors.txt
rename to basis/unix/kqueue/authors.txt
diff --git a/extra/unix/kqueue/freebsd/freebsd.factor b/basis/unix/kqueue/freebsd/freebsd.factor
similarity index 100%
rename from extra/unix/kqueue/freebsd/freebsd.factor
rename to basis/unix/kqueue/freebsd/freebsd.factor
diff --git a/extra/unix/kqueue/kqueue.factor b/basis/unix/kqueue/kqueue.factor
similarity index 100%
rename from extra/unix/kqueue/kqueue.factor
rename to basis/unix/kqueue/kqueue.factor
diff --git a/extra/unix/kqueue/macosx/macosx.factor b/basis/unix/kqueue/macosx/macosx.factor
similarity index 100%
rename from extra/unix/kqueue/macosx/macosx.factor
rename to basis/unix/kqueue/macosx/macosx.factor
diff --git a/extra/unix/kqueue/netbsd/netbsd.factor b/basis/unix/kqueue/netbsd/netbsd.factor
similarity index 100%
rename from extra/unix/kqueue/netbsd/netbsd.factor
rename to basis/unix/kqueue/netbsd/netbsd.factor
diff --git a/extra/unix/kqueue/openbsd/openbsd.factor b/basis/unix/kqueue/openbsd/openbsd.factor
similarity index 100%
rename from extra/unix/kqueue/openbsd/openbsd.factor
rename to basis/unix/kqueue/openbsd/openbsd.factor
diff --git a/extra/unix/linux/authors.txt b/basis/unix/linux/authors.txt
similarity index 100%
rename from extra/unix/linux/authors.txt
rename to basis/unix/linux/authors.txt
diff --git a/extra/unix/linux/epoll/authors.txt b/basis/unix/linux/epoll/authors.txt
similarity index 100%
rename from extra/unix/linux/epoll/authors.txt
rename to basis/unix/linux/epoll/authors.txt
diff --git a/extra/unix/linux/epoll/epoll.factor b/basis/unix/linux/epoll/epoll.factor
similarity index 100%
rename from extra/unix/linux/epoll/epoll.factor
rename to basis/unix/linux/epoll/epoll.factor
diff --git a/extra/unix/linux/fs/authors.txt b/basis/unix/linux/fs/authors.txt
similarity index 100%
rename from extra/unix/linux/fs/authors.txt
rename to basis/unix/linux/fs/authors.txt
diff --git a/extra/unix/linux/fs/fs.factor b/basis/unix/linux/fs/fs.factor
similarity index 100%
rename from extra/unix/linux/fs/fs.factor
rename to basis/unix/linux/fs/fs.factor
diff --git a/extra/unix/linux/if/authors.txt b/basis/unix/linux/if/authors.txt
similarity index 100%
rename from extra/unix/linux/if/authors.txt
rename to basis/unix/linux/if/authors.txt
diff --git a/extra/unix/linux/if/if.factor b/basis/unix/linux/if/if.factor
similarity index 100%
rename from extra/unix/linux/if/if.factor
rename to basis/unix/linux/if/if.factor
diff --git a/extra/unix/linux/ifreq/authors.txt b/basis/unix/linux/ifreq/authors.txt
similarity index 100%
rename from extra/unix/linux/ifreq/authors.txt
rename to basis/unix/linux/ifreq/authors.txt
diff --git a/extra/unix/linux/ifreq/ifreq.factor b/basis/unix/linux/ifreq/ifreq.factor
similarity index 100%
rename from extra/unix/linux/ifreq/ifreq.factor
rename to basis/unix/linux/ifreq/ifreq.factor
diff --git a/extra/unix/linux/inotify/inotify.factor b/basis/unix/linux/inotify/inotify.factor
similarity index 100%
rename from extra/unix/linux/inotify/inotify.factor
rename to basis/unix/linux/inotify/inotify.factor
diff --git a/extra/unix/linux/linux.factor b/basis/unix/linux/linux.factor
similarity index 100%
rename from extra/unix/linux/linux.factor
rename to basis/unix/linux/linux.factor
diff --git a/extra/unix/linux/route/authors.txt b/basis/unix/linux/route/authors.txt
similarity index 100%
rename from extra/unix/linux/route/authors.txt
rename to basis/unix/linux/route/authors.txt
diff --git a/extra/unix/linux/route/route.factor b/basis/unix/linux/route/route.factor
similarity index 100%
rename from extra/unix/linux/route/route.factor
rename to basis/unix/linux/route/route.factor
diff --git a/extra/unix/linux/sockios/authors.txt b/basis/unix/linux/sockios/authors.txt
similarity index 100%
rename from extra/unix/linux/sockios/authors.txt
rename to basis/unix/linux/sockios/authors.txt
diff --git a/extra/unix/linux/sockios/sockios.factor b/basis/unix/linux/sockios/sockios.factor
similarity index 100%
rename from extra/unix/linux/sockios/sockios.factor
rename to basis/unix/linux/sockios/sockios.factor
diff --git a/extra/unix/linux/swap/authors.txt b/basis/unix/linux/swap/authors.txt
similarity index 100%
rename from extra/unix/linux/swap/authors.txt
rename to basis/unix/linux/swap/authors.txt
diff --git a/extra/unix/linux/swap/swap.factor b/basis/unix/linux/swap/swap.factor
similarity index 100%
rename from extra/unix/linux/swap/swap.factor
rename to basis/unix/linux/swap/swap.factor
diff --git a/extra/unix/process/authors.txt b/basis/unix/process/authors.txt
similarity index 100%
rename from extra/unix/process/authors.txt
rename to basis/unix/process/authors.txt
diff --git a/extra/unix/process/process.factor b/basis/unix/process/process.factor
similarity index 100%
rename from extra/unix/process/process.factor
rename to basis/unix/process/process.factor
diff --git a/extra/unix/solaris/authors.txt b/basis/unix/solaris/authors.txt
similarity index 100%
rename from extra/unix/solaris/authors.txt
rename to basis/unix/solaris/authors.txt
diff --git a/extra/unix/solaris/solaris.factor b/basis/unix/solaris/solaris.factor
similarity index 100%
rename from extra/unix/solaris/solaris.factor
rename to basis/unix/solaris/solaris.factor
diff --git a/extra/unix/stat/freebsd/32/32.factor b/basis/unix/stat/freebsd/32/32.factor
similarity index 100%
rename from extra/unix/stat/freebsd/32/32.factor
rename to basis/unix/stat/freebsd/32/32.factor
diff --git a/extra/unix/stat/freebsd/64/64.factor b/basis/unix/stat/freebsd/64/64.factor
similarity index 100%
rename from extra/unix/stat/freebsd/64/64.factor
rename to basis/unix/stat/freebsd/64/64.factor
diff --git a/extra/unix/stat/freebsd/freebsd.factor b/basis/unix/stat/freebsd/freebsd.factor
similarity index 100%
rename from extra/unix/stat/freebsd/freebsd.factor
rename to basis/unix/stat/freebsd/freebsd.factor
diff --git a/extra/unix/stat/linux/32/32.factor b/basis/unix/stat/linux/32/32.factor
similarity index 100%
rename from extra/unix/stat/linux/32/32.factor
rename to basis/unix/stat/linux/32/32.factor
diff --git a/extra/unix/stat/linux/64/64.factor b/basis/unix/stat/linux/64/64.factor
similarity index 100%
rename from extra/unix/stat/linux/64/64.factor
rename to basis/unix/stat/linux/64/64.factor
diff --git a/extra/unix/stat/linux/linux.factor b/basis/unix/stat/linux/linux.factor
similarity index 100%
rename from extra/unix/stat/linux/linux.factor
rename to basis/unix/stat/linux/linux.factor
diff --git a/extra/unix/stat/macosx/macosx.factor b/basis/unix/stat/macosx/macosx.factor
similarity index 100%
rename from extra/unix/stat/macosx/macosx.factor
rename to basis/unix/stat/macosx/macosx.factor
diff --git a/extra/unix/stat/netbsd/32/32.factor b/basis/unix/stat/netbsd/32/32.factor
similarity index 100%
rename from extra/unix/stat/netbsd/32/32.factor
rename to basis/unix/stat/netbsd/32/32.factor
diff --git a/extra/unix/stat/netbsd/64/64.factor b/basis/unix/stat/netbsd/64/64.factor
similarity index 100%
rename from extra/unix/stat/netbsd/64/64.factor
rename to basis/unix/stat/netbsd/64/64.factor
diff --git a/extra/unix/stat/netbsd/netbsd.factor b/basis/unix/stat/netbsd/netbsd.factor
similarity index 100%
rename from extra/unix/stat/netbsd/netbsd.factor
rename to basis/unix/stat/netbsd/netbsd.factor
diff --git a/extra/unix/stat/openbsd/openbsd.factor b/basis/unix/stat/openbsd/openbsd.factor
similarity index 100%
rename from extra/unix/stat/openbsd/openbsd.factor
rename to basis/unix/stat/openbsd/openbsd.factor
diff --git a/extra/unix/stat/stat.factor b/basis/unix/stat/stat.factor
similarity index 100%
rename from extra/unix/stat/stat.factor
rename to basis/unix/stat/stat.factor
diff --git a/extra/unix/summary.txt b/basis/unix/summary.txt
similarity index 100%
rename from extra/unix/summary.txt
rename to basis/unix/summary.txt
diff --git a/extra/unix/tags.txt b/basis/unix/tags.txt
similarity index 100%
rename from extra/unix/tags.txt
rename to basis/unix/tags.txt
diff --git a/extra/unix/time/time.factor b/basis/unix/time/time.factor
similarity index 100%
rename from extra/unix/time/time.factor
rename to basis/unix/time/time.factor
diff --git a/extra/unix/types/freebsd/freebsd.factor b/basis/unix/types/freebsd/freebsd.factor
similarity index 100%
rename from extra/unix/types/freebsd/freebsd.factor
rename to basis/unix/types/freebsd/freebsd.factor
diff --git a/extra/unix/types/linux/linux.factor b/basis/unix/types/linux/linux.factor
similarity index 100%
rename from extra/unix/types/linux/linux.factor
rename to basis/unix/types/linux/linux.factor
diff --git a/extra/unix/types/macosx/macosx.factor b/basis/unix/types/macosx/macosx.factor
similarity index 100%
rename from extra/unix/types/macosx/macosx.factor
rename to basis/unix/types/macosx/macosx.factor
diff --git a/extra/unix/types/netbsd/32/32.factor b/basis/unix/types/netbsd/32/32.factor
similarity index 100%
rename from extra/unix/types/netbsd/32/32.factor
rename to basis/unix/types/netbsd/32/32.factor
diff --git a/extra/unix/types/netbsd/64/64.factor b/basis/unix/types/netbsd/64/64.factor
similarity index 100%
rename from extra/unix/types/netbsd/64/64.factor
rename to basis/unix/types/netbsd/64/64.factor
diff --git a/extra/unix/types/netbsd/netbsd.factor b/basis/unix/types/netbsd/netbsd.factor
similarity index 100%
rename from extra/unix/types/netbsd/netbsd.factor
rename to basis/unix/types/netbsd/netbsd.factor
diff --git a/extra/unix/types/openbsd/openbsd.factor b/basis/unix/types/openbsd/openbsd.factor
similarity index 100%
rename from extra/unix/types/openbsd/openbsd.factor
rename to basis/unix/types/openbsd/openbsd.factor
diff --git a/extra/unix/types/types.factor b/basis/unix/types/types.factor
similarity index 100%
rename from extra/unix/types/types.factor
rename to basis/unix/types/types.factor
diff --git a/extra/unix/unix.factor b/basis/unix/unix.factor
similarity index 100%
rename from extra/unix/unix.factor
rename to basis/unix/unix.factor
diff --git a/extra/urls/authors.txt b/basis/urls/authors.txt
similarity index 100%
rename from extra/urls/authors.txt
rename to basis/urls/authors.txt
diff --git a/extra/urls/summary.txt b/basis/urls/summary.txt
similarity index 100%
rename from extra/urls/summary.txt
rename to basis/urls/summary.txt
diff --git a/extra/urls/tags.txt b/basis/urls/tags.txt
similarity index 100%
rename from extra/urls/tags.txt
rename to basis/urls/tags.txt
diff --git a/extra/urls/urls-tests.factor b/basis/urls/urls-tests.factor
similarity index 100%
rename from extra/urls/urls-tests.factor
rename to basis/urls/urls-tests.factor
diff --git a/extra/urls/urls.factor b/basis/urls/urls.factor
similarity index 100%
rename from extra/urls/urls.factor
rename to basis/urls/urls.factor
diff --git a/extra/validators/validators-tests.factor b/basis/validators/validators-tests.factor
similarity index 100%
rename from extra/validators/validators-tests.factor
rename to basis/validators/validators-tests.factor
diff --git a/extra/validators/validators.factor b/basis/validators/validators.factor
similarity index 100%
rename from extra/validators/validators.factor
rename to basis/validators/validators.factor
diff --git a/extra/values/authors.txt b/basis/values/authors.txt
similarity index 100%
rename from extra/values/authors.txt
rename to basis/values/authors.txt
diff --git a/extra/values/summary.txt b/basis/values/summary.txt
similarity index 100%
rename from extra/values/summary.txt
rename to basis/values/summary.txt
diff --git a/extra/values/tags.txt b/basis/values/tags.txt
similarity index 100%
rename from extra/values/tags.txt
rename to basis/values/tags.txt
diff --git a/extra/values/values-docs.factor b/basis/values/values-docs.factor
similarity index 100%
rename from extra/values/values-docs.factor
rename to basis/values/values-docs.factor
diff --git a/extra/values/values-tests.factor b/basis/values/values-tests.factor
similarity index 100%
rename from extra/values/values-tests.factor
rename to basis/values/values-tests.factor
diff --git a/extra/values/values.factor b/basis/values/values.factor
similarity index 100%
rename from extra/values/values.factor
rename to basis/values/values.factor
diff --git a/extra/windows/advapi32/advapi32.factor b/basis/windows/advapi32/advapi32.factor
similarity index 100%
rename from extra/windows/advapi32/advapi32.factor
rename to basis/windows/advapi32/advapi32.factor
diff --git a/extra/units/imperial/authors.txt b/basis/windows/advapi32/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/units/imperial/authors.txt
rename to basis/windows/advapi32/authors.txt
diff --git a/extra/windows/authors.txt b/basis/windows/authors.txt
similarity index 100%
rename from extra/windows/authors.txt
rename to basis/windows/authors.txt
diff --git a/extra/units/si/authors.txt b/basis/windows/ce/authors.txt
old mode 100755
new mode 100644
similarity index 100%
rename from extra/units/si/authors.txt
rename to basis/windows/ce/authors.txt
diff --git a/extra/windows/ce/ce.factor b/basis/windows/ce/ce.factor
similarity index 100%
rename from extra/windows/ce/ce.factor
rename to basis/windows/ce/ce.factor
diff --git a/extra/windows/com/authors.txt b/basis/windows/com/authors.txt
similarity index 100%
rename from extra/windows/com/authors.txt
rename to basis/windows/com/authors.txt
diff --git a/extra/windows/com/com-docs.factor b/basis/windows/com/com-docs.factor
similarity index 100%
rename from extra/windows/com/com-docs.factor
rename to basis/windows/com/com-docs.factor
diff --git a/extra/windows/com/com-tests.factor b/basis/windows/com/com-tests.factor
similarity index 100%
rename from extra/windows/com/com-tests.factor
rename to basis/windows/com/com-tests.factor
diff --git a/extra/windows/com/com.factor b/basis/windows/com/com.factor
similarity index 100%
rename from extra/windows/com/com.factor
rename to basis/windows/com/com.factor
diff --git a/extra/windows/com/summary.txt b/basis/windows/com/summary.txt
similarity index 100%
rename from extra/windows/com/summary.txt
rename to basis/windows/com/summary.txt
diff --git a/extra/windows/com/syntax/authors.txt b/basis/windows/com/syntax/authors.txt
similarity index 100%
rename from extra/windows/com/syntax/authors.txt
rename to basis/windows/com/syntax/authors.txt
diff --git a/extra/windows/com/syntax/summary.txt b/basis/windows/com/syntax/summary.txt
similarity index 100%
rename from extra/windows/com/syntax/summary.txt
rename to basis/windows/com/syntax/summary.txt
diff --git a/extra/windows/com/syntax/syntax-docs.factor b/basis/windows/com/syntax/syntax-docs.factor
similarity index 100%
rename from extra/windows/com/syntax/syntax-docs.factor
rename to basis/windows/com/syntax/syntax-docs.factor
diff --git a/extra/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor
similarity index 100%
rename from extra/windows/com/syntax/syntax.factor
rename to basis/windows/com/syntax/syntax.factor
diff --git a/extra/windows/com/syntax/tags.txt b/basis/windows/com/syntax/tags.txt
similarity index 100%
rename from extra/windows/com/syntax/tags.txt
rename to basis/windows/com/syntax/tags.txt
diff --git a/extra/windows/com/tags.txt b/basis/windows/com/tags.txt
similarity index 100%
rename from extra/windows/com/tags.txt
rename to basis/windows/com/tags.txt
diff --git a/extra/windows/com/wrapper/authors.txt b/basis/windows/com/wrapper/authors.txt
similarity index 100%
rename from extra/windows/com/wrapper/authors.txt
rename to basis/windows/com/wrapper/authors.txt
diff --git a/extra/windows/com/wrapper/summary.txt b/basis/windows/com/wrapper/summary.txt
similarity index 100%
rename from extra/windows/com/wrapper/summary.txt
rename to basis/windows/com/wrapper/summary.txt
diff --git a/extra/windows/com/wrapper/tags.txt b/basis/windows/com/wrapper/tags.txt
similarity index 100%
rename from extra/windows/com/wrapper/tags.txt
rename to basis/windows/com/wrapper/tags.txt
diff --git a/extra/windows/com/wrapper/wrapper-docs.factor b/basis/windows/com/wrapper/wrapper-docs.factor
similarity index 100%
rename from extra/windows/com/wrapper/wrapper-docs.factor
rename to basis/windows/com/wrapper/wrapper-docs.factor
diff --git a/extra/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor
similarity index 100%
rename from extra/windows/com/wrapper/wrapper.factor
rename to basis/windows/com/wrapper/wrapper.factor
diff --git a/extra/windows/dinput/authors.txt b/basis/windows/dinput/authors.txt
similarity index 100%
rename from extra/windows/dinput/authors.txt
rename to basis/windows/dinput/authors.txt
diff --git a/extra/windows/dinput/constants/constants.factor b/basis/windows/dinput/constants/constants.factor
similarity index 100%
rename from extra/windows/dinput/constants/constants.factor
rename to basis/windows/dinput/constants/constants.factor
diff --git a/extra/windows/dinput/dinput.factor b/basis/windows/dinput/dinput.factor
similarity index 100%
rename from extra/windows/dinput/dinput.factor
rename to basis/windows/dinput/dinput.factor
diff --git a/extra/windows/dinput/summary.txt b/basis/windows/dinput/summary.txt
similarity index 100%
rename from extra/windows/dinput/summary.txt
rename to basis/windows/dinput/summary.txt
diff --git a/extra/windows/dinput/tags.txt b/basis/windows/dinput/tags.txt
similarity index 100%
rename from extra/windows/dinput/tags.txt
rename to basis/windows/dinput/tags.txt
diff --git a/extra/windows/dragdrop-listener/dragdrop-listener.factor b/basis/windows/dragdrop-listener/dragdrop-listener.factor
similarity index 100%
rename from extra/windows/dragdrop-listener/dragdrop-listener.factor
rename to basis/windows/dragdrop-listener/dragdrop-listener.factor
diff --git a/extra/windows/advapi32/authors.txt b/basis/windows/errors/authors.txt
similarity index 100%
rename from extra/windows/advapi32/authors.txt
rename to basis/windows/errors/authors.txt
diff --git a/extra/windows/errors/errors.factor b/basis/windows/errors/errors.factor
similarity index 100%
rename from extra/windows/errors/errors.factor
rename to basis/windows/errors/errors.factor
diff --git a/extra/windows/ce/authors.txt b/basis/windows/gdi32/authors.txt
similarity index 100%
rename from extra/windows/ce/authors.txt
rename to basis/windows/gdi32/authors.txt
diff --git a/extra/windows/gdi32/gdi32.factor b/basis/windows/gdi32/gdi32.factor
similarity index 100%
rename from extra/windows/gdi32/gdi32.factor
rename to basis/windows/gdi32/gdi32.factor
diff --git a/extra/windows/errors/authors.txt b/basis/windows/kernel32/authors.txt
similarity index 100%
rename from extra/windows/errors/authors.txt
rename to basis/windows/kernel32/authors.txt
diff --git a/extra/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
similarity index 100%
rename from extra/windows/kernel32/kernel32.factor
rename to basis/windows/kernel32/kernel32.factor
diff --git a/extra/windows/gdi32/authors.txt b/basis/windows/messages/authors.txt
similarity index 100%
rename from extra/windows/gdi32/authors.txt
rename to basis/windows/messages/authors.txt
diff --git a/extra/windows/messages/messages.factor b/basis/windows/messages/messages.factor
similarity index 100%
rename from extra/windows/messages/messages.factor
rename to basis/windows/messages/messages.factor
diff --git a/extra/windows/kernel32/authors.txt b/basis/windows/nt/authors.txt
similarity index 100%
rename from extra/windows/kernel32/authors.txt
rename to basis/windows/nt/authors.txt
diff --git a/extra/windows/nt/nt.factor b/basis/windows/nt/nt.factor
similarity index 100%
rename from extra/windows/nt/nt.factor
rename to basis/windows/nt/nt.factor
diff --git a/extra/windows/ole32/authors.txt b/basis/windows/ole32/authors.txt
similarity index 100%
rename from extra/windows/ole32/authors.txt
rename to basis/windows/ole32/authors.txt
diff --git a/extra/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor
similarity index 100%
rename from extra/windows/ole32/ole32.factor
rename to basis/windows/ole32/ole32.factor
diff --git a/extra/windows/messages/authors.txt b/basis/windows/opengl32/authors.txt
similarity index 100%
rename from extra/windows/messages/authors.txt
rename to basis/windows/opengl32/authors.txt
diff --git a/extra/windows/opengl32/opengl32.factor b/basis/windows/opengl32/opengl32.factor
similarity index 100%
rename from extra/windows/opengl32/opengl32.factor
rename to basis/windows/opengl32/opengl32.factor
diff --git a/extra/windows/nt/authors.txt b/basis/windows/shell32/authors.txt
similarity index 100%
rename from extra/windows/nt/authors.txt
rename to basis/windows/shell32/authors.txt
diff --git a/extra/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor
similarity index 100%
rename from extra/windows/shell32/shell32.factor
rename to basis/windows/shell32/shell32.factor
diff --git a/extra/windows/summary.txt b/basis/windows/summary.txt
similarity index 100%
rename from extra/windows/summary.txt
rename to basis/windows/summary.txt
diff --git a/extra/windows/tags.txt b/basis/windows/tags.txt
similarity index 100%
rename from extra/windows/tags.txt
rename to basis/windows/tags.txt
diff --git a/extra/windows/opengl32/authors.txt b/basis/windows/time/authors.txt
similarity index 100%
rename from extra/windows/opengl32/authors.txt
rename to basis/windows/time/authors.txt
diff --git a/extra/windows/time/time-tests.factor b/basis/windows/time/time-tests.factor
similarity index 100%
rename from extra/windows/time/time-tests.factor
rename to basis/windows/time/time-tests.factor
diff --git a/extra/windows/time/time.factor b/basis/windows/time/time.factor
similarity index 100%
rename from extra/windows/time/time.factor
rename to basis/windows/time/time.factor
diff --git a/extra/windows/shell32/authors.txt b/basis/windows/types/authors.txt
similarity index 100%
rename from extra/windows/shell32/authors.txt
rename to basis/windows/types/authors.txt
diff --git a/extra/windows/types/types.factor b/basis/windows/types/types.factor
similarity index 100%
rename from extra/windows/types/types.factor
rename to basis/windows/types/types.factor
diff --git a/extra/windows/time/authors.txt b/basis/windows/user32/authors.txt
similarity index 100%
rename from extra/windows/time/authors.txt
rename to basis/windows/user32/authors.txt
diff --git a/extra/windows/user32/user32.factor b/basis/windows/user32/user32.factor
similarity index 100%
rename from extra/windows/user32/user32.factor
rename to basis/windows/user32/user32.factor
diff --git a/extra/windows/windows.factor b/basis/windows/windows.factor
similarity index 100%
rename from extra/windows/windows.factor
rename to basis/windows/windows.factor
diff --git a/extra/windows/types/authors.txt b/basis/windows/winsock/authors.txt
similarity index 100%
rename from extra/windows/types/authors.txt
rename to basis/windows/winsock/authors.txt
diff --git a/extra/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor
similarity index 100%
rename from extra/windows/winsock/winsock.factor
rename to basis/windows/winsock/winsock.factor
diff --git a/extra/wrap/authors.txt b/basis/wrap/authors.txt
similarity index 100%
rename from extra/wrap/authors.txt
rename to basis/wrap/authors.txt
diff --git a/extra/wrap/summary.txt b/basis/wrap/summary.txt
similarity index 100%
rename from extra/wrap/summary.txt
rename to basis/wrap/summary.txt
diff --git a/extra/wrap/tags.txt b/basis/wrap/tags.txt
similarity index 100%
rename from extra/wrap/tags.txt
rename to basis/wrap/tags.txt
diff --git a/extra/wrap/wrap.factor b/basis/wrap/wrap.factor
similarity index 100%
rename from extra/wrap/wrap.factor
rename to basis/wrap/wrap.factor
diff --git a/extra/x11/clipboard/authors.txt b/basis/x11/clipboard/authors.txt
similarity index 100%
rename from extra/x11/clipboard/authors.txt
rename to basis/x11/clipboard/authors.txt
diff --git a/extra/x11/clipboard/clipboard.factor b/basis/x11/clipboard/clipboard.factor
similarity index 100%
rename from extra/x11/clipboard/clipboard.factor
rename to basis/x11/clipboard/clipboard.factor
diff --git a/extra/x11/clipboard/summary.txt b/basis/x11/clipboard/summary.txt
similarity index 100%
rename from extra/x11/clipboard/summary.txt
rename to basis/x11/clipboard/summary.txt
diff --git a/extra/x11/constants/authors.txt b/basis/x11/constants/authors.txt
similarity index 100%
rename from extra/x11/constants/authors.txt
rename to basis/x11/constants/authors.txt
diff --git a/extra/x11/constants/constants.factor b/basis/x11/constants/constants.factor
similarity index 100%
rename from extra/x11/constants/constants.factor
rename to basis/x11/constants/constants.factor
diff --git a/extra/x11/constants/summary.txt b/basis/x11/constants/summary.txt
similarity index 100%
rename from extra/x11/constants/summary.txt
rename to basis/x11/constants/summary.txt
diff --git a/extra/x11/events/authors.txt b/basis/x11/events/authors.txt
similarity index 100%
rename from extra/x11/events/authors.txt
rename to basis/x11/events/authors.txt
diff --git a/extra/x11/events/events.factor b/basis/x11/events/events.factor
similarity index 100%
rename from extra/x11/events/events.factor
rename to basis/x11/events/events.factor
diff --git a/extra/x11/events/summary.txt b/basis/x11/events/summary.txt
similarity index 100%
rename from extra/x11/events/summary.txt
rename to basis/x11/events/summary.txt
diff --git a/extra/x11/glx/authors.txt b/basis/x11/glx/authors.txt
similarity index 100%
rename from extra/x11/glx/authors.txt
rename to basis/x11/glx/authors.txt
diff --git a/extra/x11/glx/glx.factor b/basis/x11/glx/glx.factor
similarity index 100%
rename from extra/x11/glx/glx.factor
rename to basis/x11/glx/glx.factor
diff --git a/extra/x11/glx/summary.txt b/basis/x11/glx/summary.txt
similarity index 100%
rename from extra/x11/glx/summary.txt
rename to basis/x11/glx/summary.txt
diff --git a/extra/x11/glx/tags.txt b/basis/x11/glx/tags.txt
similarity index 100%
rename from extra/x11/glx/tags.txt
rename to basis/x11/glx/tags.txt
diff --git a/extra/x11/summary.txt b/basis/x11/summary.txt
similarity index 100%
rename from extra/x11/summary.txt
rename to basis/x11/summary.txt
diff --git a/extra/x11/tags.txt b/basis/x11/tags.txt
similarity index 100%
rename from extra/x11/tags.txt
rename to basis/x11/tags.txt
diff --git a/extra/x11/windows/authors.txt b/basis/x11/windows/authors.txt
similarity index 100%
rename from extra/x11/windows/authors.txt
rename to basis/x11/windows/authors.txt
diff --git a/extra/x11/windows/summary.txt b/basis/x11/windows/summary.txt
similarity index 100%
rename from extra/x11/windows/summary.txt
rename to basis/x11/windows/summary.txt
diff --git a/extra/x11/windows/windows.factor b/basis/x11/windows/windows.factor
similarity index 100%
rename from extra/x11/windows/windows.factor
rename to basis/x11/windows/windows.factor
diff --git a/extra/x11/xim/authors.txt b/basis/x11/xim/authors.txt
similarity index 100%
rename from extra/x11/xim/authors.txt
rename to basis/x11/xim/authors.txt
diff --git a/extra/x11/xim/summary.txt b/basis/x11/xim/summary.txt
similarity index 100%
rename from extra/x11/xim/summary.txt
rename to basis/x11/xim/summary.txt
diff --git a/extra/x11/xim/tags.txt b/basis/x11/xim/tags.txt
similarity index 100%
rename from extra/x11/xim/tags.txt
rename to basis/x11/xim/tags.txt
diff --git a/extra/x11/xim/xim.factor b/basis/x11/xim/xim.factor
similarity index 100%
rename from extra/x11/xim/xim.factor
rename to basis/x11/xim/xim.factor
diff --git a/extra/x11/xlib/authors.txt b/basis/x11/xlib/authors.txt
similarity index 100%
rename from extra/x11/xlib/authors.txt
rename to basis/x11/xlib/authors.txt
diff --git a/extra/x11/xlib/summary.txt b/basis/x11/xlib/summary.txt
similarity index 100%
rename from extra/x11/xlib/summary.txt
rename to basis/x11/xlib/summary.txt
diff --git a/extra/x11/xlib/tags.txt b/basis/x11/xlib/tags.txt
similarity index 100%
rename from extra/x11/xlib/tags.txt
rename to basis/x11/xlib/tags.txt
diff --git a/extra/x11/xlib/xlib.factor b/basis/x11/xlib/xlib.factor
similarity index 100%
rename from extra/x11/xlib/xlib.factor
rename to basis/x11/xlib/xlib.factor
diff --git a/extra/xml-rpc/authors.txt b/basis/xml-rpc/authors.txt
similarity index 100%
rename from extra/xml-rpc/authors.txt
rename to basis/xml-rpc/authors.txt
diff --git a/extra/xml-rpc/example.factor b/basis/xml-rpc/example.factor
similarity index 100%
rename from extra/xml-rpc/example.factor
rename to basis/xml-rpc/example.factor
diff --git a/extra/xml-rpc/summary.txt b/basis/xml-rpc/summary.txt
similarity index 100%
rename from extra/xml-rpc/summary.txt
rename to basis/xml-rpc/summary.txt
diff --git a/extra/xml-rpc/tags.txt b/basis/xml-rpc/tags.txt
similarity index 100%
rename from extra/xml-rpc/tags.txt
rename to basis/xml-rpc/tags.txt
diff --git a/extra/xml-rpc/xml-rpc-docs.factor b/basis/xml-rpc/xml-rpc-docs.factor
similarity index 100%
rename from extra/xml-rpc/xml-rpc-docs.factor
rename to basis/xml-rpc/xml-rpc-docs.factor
diff --git a/extra/xml-rpc/xml-rpc-tests.factor b/basis/xml-rpc/xml-rpc-tests.factor
similarity index 100%
rename from extra/xml-rpc/xml-rpc-tests.factor
rename to basis/xml-rpc/xml-rpc-tests.factor
diff --git a/extra/xml-rpc/xml-rpc.factor b/basis/xml-rpc/xml-rpc.factor
similarity index 100%
rename from extra/xml-rpc/xml-rpc.factor
rename to basis/xml-rpc/xml-rpc.factor
diff --git a/extra/xml/authors.txt b/basis/xml/authors.txt
similarity index 100%
rename from extra/xml/authors.txt
rename to basis/xml/authors.txt
diff --git a/extra/xml/backend/backend.factor b/basis/xml/backend/backend.factor
similarity index 100%
rename from extra/xml/backend/backend.factor
rename to basis/xml/backend/backend.factor
diff --git a/extra/xml/char-classes/authors.txt b/basis/xml/char-classes/authors.txt
similarity index 100%
rename from extra/xml/char-classes/authors.txt
rename to basis/xml/char-classes/authors.txt
diff --git a/extra/xml/char-classes/char-classes.factor b/basis/xml/char-classes/char-classes.factor
similarity index 100%
rename from extra/xml/char-classes/char-classes.factor
rename to basis/xml/char-classes/char-classes.factor
diff --git a/extra/xml/data/authors.txt b/basis/xml/data/authors.txt
similarity index 100%
rename from extra/xml/data/authors.txt
rename to basis/xml/data/authors.txt
diff --git a/extra/xml/data/data.factor b/basis/xml/data/data.factor
similarity index 100%
rename from extra/xml/data/data.factor
rename to basis/xml/data/data.factor
diff --git a/extra/xml/entities/authors.txt b/basis/xml/entities/authors.txt
similarity index 100%
rename from extra/xml/entities/authors.txt
rename to basis/xml/entities/authors.txt
diff --git a/extra/xml/entities/entities.factor b/basis/xml/entities/entities.factor
similarity index 100%
rename from extra/xml/entities/entities.factor
rename to basis/xml/entities/entities.factor
diff --git a/extra/xml/errors/authors.txt b/basis/xml/errors/authors.txt
similarity index 100%
rename from extra/xml/errors/authors.txt
rename to basis/xml/errors/authors.txt
diff --git a/extra/xml/errors/errors-tests.factor b/basis/xml/errors/errors-tests.factor
similarity index 100%
rename from extra/xml/errors/errors-tests.factor
rename to basis/xml/errors/errors-tests.factor
diff --git a/extra/xml/errors/errors.factor b/basis/xml/errors/errors.factor
similarity index 100%
rename from extra/xml/errors/errors.factor
rename to basis/xml/errors/errors.factor
diff --git a/extra/xml/generator/authors.txt b/basis/xml/generator/authors.txt
similarity index 100%
rename from extra/xml/generator/authors.txt
rename to basis/xml/generator/authors.txt
diff --git a/extra/xml/generator/generator-tests.factor b/basis/xml/generator/generator-tests.factor
similarity index 100%
rename from extra/xml/generator/generator-tests.factor
rename to basis/xml/generator/generator-tests.factor
diff --git a/extra/xml/generator/generator.factor b/basis/xml/generator/generator.factor
similarity index 100%
rename from extra/xml/generator/generator.factor
rename to basis/xml/generator/generator.factor
diff --git a/extra/xml/summary.txt b/basis/xml/summary.txt
similarity index 100%
rename from extra/xml/summary.txt
rename to basis/xml/summary.txt
diff --git a/extra/xml/tags.txt b/basis/xml/tags.txt
similarity index 100%
rename from extra/xml/tags.txt
rename to basis/xml/tags.txt
diff --git a/extra/xml/tests/arithmetic.factor b/basis/xml/tests/arithmetic.factor
similarity index 100%
rename from extra/xml/tests/arithmetic.factor
rename to basis/xml/tests/arithmetic.factor
diff --git a/extra/xml/tests/authors.txt b/basis/xml/tests/authors.txt
similarity index 100%
rename from extra/xml/tests/authors.txt
rename to basis/xml/tests/authors.txt
diff --git a/extra/xml/tests/soap.factor b/basis/xml/tests/soap.factor
similarity index 88%
rename from extra/xml/tests/soap.factor
rename to basis/xml/tests/soap.factor
index c7452bb079..d2568a24e1 100755
--- a/extra/xml/tests/soap.factor
+++ b/basis/xml/tests/soap.factor
@@ -10,6 +10,6 @@ IN: xml.tests
     [ assemble-data ] map ;
 
 [ "http://www.foxnews.com/oreilly/" ] [
-    "resource:extra/xml/tests/soap.xml" file>xml
+    "resource:basis/xml/tests/soap.xml" file>xml
     parse-result first first
 ] unit-test
diff --git a/extra/xml/tests/soap.xml b/basis/xml/tests/soap.xml
similarity index 100%
rename from extra/xml/tests/soap.xml
rename to basis/xml/tests/soap.xml
diff --git a/extra/xml/tests/templating.factor b/basis/xml/tests/templating.factor
similarity index 100%
rename from extra/xml/tests/templating.factor
rename to basis/xml/tests/templating.factor
diff --git a/extra/xml/tests/test.factor b/basis/xml/tests/test.factor
similarity index 98%
rename from extra/xml/tests/test.factor
rename to basis/xml/tests/test.factor
index 7794930144..e3fc9d9bca 100644
--- a/extra/xml/tests/test.factor
+++ b/basis/xml/tests/test.factor
@@ -9,7 +9,7 @@ USING: kernel xml tools.test io namespaces sequences xml.errors xml.entities
 \ read-xml must-infer
 
 SYMBOL: xml-file
-[ ] [ "resource:extra/xml/tests/test.xml"
+[ ] [ "resource:basis/xml/tests/test.xml"
     [ file>xml ] with-html-entities xml-file set ] unit-test
 [ "1.0" ] [ xml-file get xml-prolog prolog-version ] unit-test
 [ f ] [ xml-file get xml-prolog prolog-standalone ] unit-test
diff --git a/extra/xml/tests/test.xml b/basis/xml/tests/test.xml
similarity index 100%
rename from extra/xml/tests/test.xml
rename to basis/xml/tests/test.xml
diff --git a/extra/xml/tokenize/authors.txt b/basis/xml/tokenize/authors.txt
similarity index 100%
rename from extra/xml/tokenize/authors.txt
rename to basis/xml/tokenize/authors.txt
diff --git a/extra/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor
similarity index 100%
rename from extra/xml/tokenize/tokenize.factor
rename to basis/xml/tokenize/tokenize.factor
diff --git a/extra/xml/utilities/authors.txt b/basis/xml/utilities/authors.txt
similarity index 100%
rename from extra/xml/utilities/authors.txt
rename to basis/xml/utilities/authors.txt
diff --git a/extra/xml/utilities/utilities-tests.factor b/basis/xml/utilities/utilities-tests.factor
similarity index 100%
rename from extra/xml/utilities/utilities-tests.factor
rename to basis/xml/utilities/utilities-tests.factor
diff --git a/extra/xml/utilities/utilities.factor b/basis/xml/utilities/utilities.factor
similarity index 100%
rename from extra/xml/utilities/utilities.factor
rename to basis/xml/utilities/utilities.factor
diff --git a/extra/xml/writer/authors.txt b/basis/xml/writer/authors.txt
similarity index 100%
rename from extra/xml/writer/authors.txt
rename to basis/xml/writer/authors.txt
diff --git a/extra/xml/writer/writer.factor b/basis/xml/writer/writer.factor
similarity index 100%
rename from extra/xml/writer/writer.factor
rename to basis/xml/writer/writer.factor
diff --git a/extra/xml/xml-docs.factor b/basis/xml/xml-docs.factor
similarity index 100%
rename from extra/xml/xml-docs.factor
rename to basis/xml/xml-docs.factor
diff --git a/extra/xml/xml.factor b/basis/xml/xml.factor
similarity index 100%
rename from extra/xml/xml.factor
rename to basis/xml/xml.factor
diff --git a/core/alien/alien-docs.factor b/core/alien/alien-docs.factor
index 70e1d2b399..7eca2af858 100755
--- a/core/alien/alien-docs.factor
+++ b/core/alien/alien-docs.factor
@@ -1,7 +1,7 @@
 USING: byte-arrays arrays help.syntax help.markup
 alien.syntax compiler definitions math libc
 debugger parser io io.backend system
-alien.accessors ;
+alien.accessors eval ;
 IN: alien
 
 HELP: alien
diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index b512ea6380..5d7d5e0d2c 100755
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -18,7 +18,7 @@ H{ } clone sub-primitives set
 
 "resource:core/bootstrap/syntax.factor" parse-file
 
-"resource:core/cpu/" architecture get {
+"resource:basis/cpu/" architecture get {
     { "x86.32" "x86/32" }
     { "x86.64" "x86/64" }
     { "linux-ppc" "ppc/linux" }
diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 9a0f8f9d1f..8ca3c151ac 100755
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -36,6 +36,7 @@ load-help? off
     ! this must add its init hook before io.backend does
     "libc" require
 
+    ! "io.thread" require
     "io.streams.c" require
     "vocabs.loader" require
     
@@ -43,17 +44,9 @@ load-help? off
     "bootstrap.layouts" require
 
     [
-        "resource:core/bootstrap/stage2.factor"
+        "resource:basis/bootstrap/stage2.factor"
         dup exists? [
-            [ run-file ]
-            [
-                :c
-                dup print-error flush
-                "listener" vocab
-                [ restarts. vocab-main execute ]
-                [ die ] if*
-                1 exit
-            ] recover
+            run-file
         ] [
             "Cannot find " write write "." print
             "Please move " write image write " to the same directory as the Factor sources," print
diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor
index ded0ca2a72..47363378fa 100644
--- a/core/classes/tuple/parser/parser.factor
+++ b/core/classes/tuple/parser/parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel sets namespaces sequences summary parser
+USING: accessors kernel sets namespaces sequences parser
 lexer combinators words classes.parser classes.tuple arrays ;
 IN: classes.tuple.parser
 
@@ -23,18 +23,12 @@ IN: classes.tuple.parser
 
 ERROR: duplicate-slot-names names ;
 
-M: duplicate-slot-names summary
-    drop "Duplicate slot names" ;
-
 : check-duplicate-slots ( slots -- )
     slot-names duplicates
     dup empty? [ drop ] [ duplicate-slot-names ] if ;
 
 ERROR: invalid-slot-name name ;
 
-M: invalid-slot-name summary
-    drop "Invalid slot name" ;
-
 : parse-long-slot-name ( -- )
     [ scan , \ } parse-until % ] { } make ;
 
diff --git a/core/combinators/combinators-docs.factor b/core/combinators/combinators-docs.factor
index 4f8efc499f..af79b92bea 100755
--- a/core/combinators/combinators-docs.factor
+++ b/core/combinators/combinators-docs.factor
@@ -25,9 +25,17 @@ $nl
 $nl
 "A combinator which can help with implementing methods on " { $link hashcode* } ":"
 { $subsection recursive-hashcode }
+{ $subsection "assertions" }
 { $subsection "combinators-quot" }
 { $see-also "quotations" "dataflow" } ;
 
+ARTICLE: "assertions" "Assertions"
+"Some words to make assertions easier to enforce:"
+{ $subsection assert }
+{ $subsection assert= }
+"Runtime stack depth checking:"
+{ $subsection assert-depth } ;
+
 ABOUT: "combinators"
 
 HELP: cleave
@@ -145,3 +153,7 @@ HELP: dispatch ( n array -- )
 { $values { "n" "a fixnum" } { "array" "an array of quotations" } }
 { $description "Calls the " { $snippet "n" } "th quotation in the array." }
 { $warning "This word is in the " { $vocab-link "kernel.private" } " vocabulary because it is an implementation detail used by the generic word system to accelerate method dispatch. It does not perform type or bounds checks, and user code should not need to call it directly." } ;
+
+HELP: assert-depth
+{ $values { "quot" "a quotation" } }
+{ $description "Runs a quotation. Throws an error if the total number of elements on the stack is not the same before and after the quotation runs." } ;
diff --git a/core/combinators/combinators.factor b/core/combinators/combinators.factor
index 1cc64432cc..188dcb3d11 100755
--- a/core/combinators/combinators.factor
+++ b/core/combinators/combinators.factor
@@ -138,6 +138,22 @@ ERROR: no-case ;
         [ drop linear-case-quot ]
     } cond ;
 
+! assert-depth
+: trim-datastacks ( seq1 seq2 -- seq1' seq2' )
+    2dup [ length ] bi@ min tuck tail >r tail r> ;
+
+ERROR: relative-underflow stack ;
+
+ERROR: relative-overflow stack ;
+
+: assert-depth ( quot -- )
+    >r datastack r> dip >r datastack r>
+    2dup [ length ] compare {
+        { +lt+ [ trim-datastacks nip relative-underflow ] }
+        { +eq+ [ 2drop ] }
+        { +gt+ [ trim-datastacks drop relative-overflow ] }
+    } case ; inline
+
 ! recursive-hashcode
 : recursive-hashcode ( n obj quot -- code )
     pick 0 <= [ 3drop 0 ] [ rot 1- -rot call ] if ; inline
diff --git a/core/compiler/errors/errors.factor b/core/compiler/errors/errors.factor
index 2bea6ad974..e21348fd19 100755
--- a/core/compiler/errors/errors.factor
+++ b/core/compiler/errors/errors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces assocs prettyprint io sequences
-sorting continuations debugger math math.parser ;
+USING: kernel namespaces assocs io sequences
+sorting continuations math math.parser ;
 IN: compiler.errors
 
 SYMBOL: +error+
@@ -12,18 +12,14 @@ GENERIC: compiler-error-type ( error -- ? )
 
 M: object compiler-error-type drop +error+ ;
 
+GENERIC# compiler-error. 1 ( error word -- )
+
 <PRIVATE
 
 SYMBOL: compiler-errors
 
 SYMBOL: with-compiler-errors?
 
-: compiler-error. ( error word -- )
-    nl
-    "While compiling " write pprint ": " print
-    nl
-    print-error ;
-
 : errors-of-type ( type -- assoc )
     compiler-errors get-global
     swap [ >r nip compiler-error-type r> eq? ] curry
@@ -53,18 +49,18 @@ SYMBOL: with-compiler-errors?
 
 PRIVATE>
 
-: compiler-error ( error word -- )
-    with-compiler-errors? get [
-        compiler-errors get pick
-        [ set-at ] [ delete-at drop ] if
-    ] [ 2drop ] if ;
-
 : :errors ( -- ) +error+ compiler-errors. ;
 
 : :warnings ( -- ) +warning+ compiler-errors. ;
 
 : :linkage ( -- ) +linkage+ compiler-errors. ;
 
+: compiler-error ( error word -- )
+    with-compiler-errors? get [
+        compiler-errors get pick
+        [ set-at ] [ delete-at drop ] if
+    ] [ 2drop ] if ;
+
 : with-compiler-errors ( quot -- )
     with-compiler-errors? get "quiet" get or [ call ] [
         [
diff --git a/core/continuations/continuations.factor b/core/continuations/continuations.factor
index f2cc0f74ba..11162be4d3 100755
--- a/core/continuations/continuations.factor
+++ b/core/continuations/continuations.factor
@@ -184,3 +184,20 @@ M: condition compute-restarts
         [ condition-continuation [ <restart> ] curry ] bi
         { } assoc>map
     ] bi append ;
+
+<PRIVATE
+
+: init-error-handler ( -- )
+    V{ } clone set-catchstack
+    ! VM calls on error
+    [
+        ! 63 = self
+        63 getenv error-thread set-global
+        continuation error-continuation set-global
+        rethrow
+    ] 5 setenv
+    ! VM adds this to kernel errors, so that user-space
+    ! can identify them
+    "kernel-error" 6 setenv ;
+
+PRIVATE>
diff --git a/core/effects/parser/parser.factor b/core/effects/parser/parser.factor
index 93401d321c..77bcd7cad6 100644
--- a/core/effects/parser/parser.factor
+++ b/core/effects/parser/parser.factor
@@ -1,16 +1,13 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: lexer sets sequences kernel splitting effects summary
-combinators debugger arrays parser ;
+USING: lexer sets sequences kernel splitting effects
+combinators arrays parser ;
 IN: effects.parser
 
 DEFER: parse-effect
 
 ERROR: bad-effect ;
 
-M: bad-effect summary
-    drop "Bad stack effect declaration" ;
-
 : parse-effect-token ( end -- token/f )
     scan tuck = [ drop f ] [
         dup { f "(" "((" } member? [ bad-effect ] [
diff --git a/core/generic/parser/parser.factor b/core/generic/parser/parser.factor
index 74ab769933..70f57f85e3 100644
--- a/core/generic/parser/parser.factor
+++ b/core/generic/parser/parser.factor
@@ -1,13 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: parser kernel words generic namespaces summary ;
+USING: parser kernel words generic namespaces ;
 IN: generic.parser
 
 ERROR: not-in-a-method-error ;
 
-M: not-in-a-method-error summary
-    drop "call-next-method can only be called in a method definition" ;
-
 : CREATE-GENERIC ( -- word ) CREATE dup reset-word ;
 
 : create-method-in ( class generic -- method )
diff --git a/core/init/init.factor b/core/init/init.factor
index 6ee11c76fc..953340b985 100755
--- a/core/init/init.factor
+++ b/core/init/init.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2004, 2007 Slava Pestov.
+! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations continuations.private kernel
 kernel.private sequences assocs namespaces namespaces.private ;
@@ -15,7 +15,7 @@ init-hooks global [ drop V{ } clone ] cache drop
     dup init-hooks get at [ over call ] unless
     init-hooks get set-at ;
 
-: boot ( -- ) init-namespaces init-catchstack ;
+: boot ( -- ) init-namespaces init-catchstack init-error-handler ;
 
 : boot-quot ( -- quot ) 20 getenv ;
 
diff --git a/core/kernel/kernel-docs.factor b/core/kernel/kernel-docs.factor
index a04a698965..3d210e0000 100755
--- a/core/kernel/kernel-docs.factor
+++ b/core/kernel/kernel-docs.factor
@@ -903,3 +903,8 @@ $nl
     "[ P ] [ Q ] [ ] while T"
 }
 "However, depending on the stack effects of " { $snippet "pred" } " and " { $snippet "quot" } ", the " { $snippet "tail" } " quotation might need to be non-empty in order to balance out the stack effect of branches for stack effect inference." } ;
+
+HELP: assert
+{ $values { "got" "the obtained value" } { "expect" "the expected value" } }
+{ $description "Throws an " { $link assert } " error." }
+{ $error-description "Thrown when a unit test or other assertion fails." } ;
diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index e8d3de4b11..47e0d76bf7 100755
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -186,6 +186,10 @@ GENERIC: boa ( ... class -- tuple )
 ! throw errors before continuations are loaded
 : throw ( error -- * ) 5 getenv [ die ] or 1 (throw) ;
 
+ERROR: assert got expect ;
+
+: assert= ( a b -- ) 2dup = [ 2drop ] [ assert ] if ;
+
 <PRIVATE
 
 : hi-tag ( obj -- n ) 0 slot ; inline
diff --git a/core/lexer/lexer.factor b/core/lexer/lexer.factor
index 48724e6009..397aef8e07 100644
--- a/core/lexer/lexer.factor
+++ b/core/lexer/lexer.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel sequences accessors namespaces math words strings
-debugger io vectors arrays math.parser combinators summary
-continuations ;
+io vectors arrays math.parser combinators continuations ;
 IN: lexer
 
 TUPLE: lexer text line line-text line-length column ;
@@ -68,18 +67,6 @@ M: lexer skip-word ( lexer -- )
 
 ERROR: unexpected want got ;
 
-GENERIC: expected>string ( obj -- str )
-
-M: f expected>string drop "end of input" ;
-M: word expected>string name>> ;
-M: string expected>string ;
-
-M: unexpected error.
-    "Expected " write
-    dup unexpected-want expected>string write
-    " but got " write
-    unexpected-got expected>string print ;
-
 PREDICATE: unexpected-eof < unexpected
     unexpected-got not ;
 
@@ -113,18 +100,6 @@ TUPLE: lexer-error line column line-text error ;
     pick length + CHAR: \s <string>
     [ write ] [ print ] [ write "^" print ] tri* ;
 
-M: lexer-error error.
-    [ lexer-dump ] [ error>> error. ] bi ;
-
-M: lexer-error summary
-    error>> summary ;
-
-M: lexer-error compute-restarts
-    error>> compute-restarts ;
-
-M: lexer-error error-help
-    error>> error-help ;
-
 : with-lexer ( lexer quot -- newquot )
     [ lexer set ] dip [ <lexer-error> rethrow ] recover ; inline
 
diff --git a/core/parser/parser-docs.factor b/core/parser/parser-docs.factor
index 9fe17af35b..1d8d1f0714 100755
--- a/core/parser/parser-docs.factor
+++ b/core/parser/parser-docs.factor
@@ -144,12 +144,6 @@ $nl
 "While the above words are useful for one-off experiments, real programs should be written to use the vocabulary system instead; see " { $link "vocabs.loader" } "."
 { $see-also "source-files" } ;
 
-ARTICLE: "parser-usage" "Reflective parser usage"
-"The parser can be called on a string:"
-{ $subsection eval }
-"The parser can also parse from a stream:"
-{ $subsection parse-stream } ;
-
 ARTICLE: "top-level-forms" "Top level forms"
 "Any code outside of a definition is known as a " { $emphasis "top-level form" } "; top-level forms are run after the entire source file has been parsed, regardless of their position in the file."
 $nl
@@ -163,11 +157,12 @@ $nl
 "This section concerns itself with usage and extension of the parser. Standard syntax is described in " { $link "syntax" } "."
 { $subsection "vocabulary-search" }
 { $subsection "parser-files" }
-{ $subsection "parser-usage" }
 { $subsection "top-level-forms" }
 "The parser can be extended."
 { $subsection "parsing-words" }
 { $subsection "parser-lexer" }
+"The parser can be invoked reflectively;"
+{ $subsection parse-stream }
 { $see-also "definitions" "definition-checking" } ;
 
 ABOUT: "parser"
@@ -322,11 +317,6 @@ HELP: parse-fresh
 { $description "Parses Factor source code in a sequence of lines. The initial vocabulary search path is used (see " { $link with-file-vocabs } ")." }
 { $errors "Throws a parse error if the input is malformed." } ;
 
-HELP: eval
-{ $values { "str" string } }
-{ $description "Parses Factor source code from a string, and calls the resulting quotation." }
-{ $errors "Throws an error if the input is malformed, or if the evaluation itself throws an error." } ;
-
 HELP: filter-moved
 { $values { "assoc1" assoc } { "assoc2" assoc } { "seq" "an seqence of definitions" } }
 { $description "Removes all definitions from " { $snippet "assoc2" } " which are in " { $snippet "assoc1" } " or are are no longer present in the current " { $link file } "." } ;
@@ -358,10 +348,6 @@ HELP: ?run-file
 { $values { "path" "a pathname string" } }
 { $description "If the file exists, runs it with " { $link run-file } ", otherwise does nothing." } ;
 
-HELP: eval>string
-{ $values { "str" string } { "output" string } }
-{ $description "Evaluates the Factor code in " { $snippet "str" } " with " { $link output-stream } " rebound to a string output stream, then outputs the resulting string." } ;
-
 HELP: staging-violation
 { $values { "word" word } }
 { $description "Throws a " { $link staging-violation } " error." }
diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index 2e42c3a678..013e2c19bf 100755
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays definitions generic assocs kernel math namespaces
-prettyprint sequences strings vectors words quotations summary
-io.styles io combinators sorting splitting math.parser effects
-continuations debugger io.files io.streams.string vocabs
-io.encodings.utf8 source-files classes hashtables
-compiler.errors compiler.units accessors sets lexer ;
+sequences strings vectors words quotations io.styles io
+combinators sorting splitting math.parser effects continuations
+io.files io.streams.string vocabs io.encodings.utf8 source-files
+classes hashtables compiler.errors compiler.units accessors sets
+lexer ;
 IN: parser
 
 : location ( -- loc )
@@ -24,7 +24,7 @@ t parser-notes set-global
 
 : note. ( str -- )
     parser-notes? [
-        file get [ file. ] when*
+        file get [ path>> write ] when*
         lexer get line>> number>string write ": " write
         "Note: " write dup print
     ] when drop ;
@@ -54,9 +54,6 @@ M: parsing-word stack-effect drop (( parsed -- parsed )) ;
 
 ERROR: no-current-vocab ;
 
-M: no-current-vocab summary ( obj -- )
-    drop "Not in a vocabulary; IN: form required" ;
-
 : current-vocab ( -- str )
     in get [ no-current-vocab ] unless* ;
 
@@ -69,14 +66,13 @@ M: no-current-vocab summary ( obj -- )
 
 : word-restarts ( possibilities -- restarts )
     natural-sort [
-        [ "Use the word " swap summary append ] keep
+        [
+            "Use the " swap vocabulary>> " vocabulary" 3append
+        ] keep
     ] { } map>assoc ;
 
 TUPLE: no-word-error name ;
 
-M: no-word-error summary
-    drop "Word not found in current vocabulary search path" ;
-
 : no-word ( name -- newword )
     dup no-word-error boa
     swap words-named [ forward-reference? not ] filter
@@ -105,10 +101,6 @@ M: no-word-error summary
 
 ERROR: staging-violation word ;
 
-M: staging-violation summary
-    drop
-    "A parsing word cannot be used in the same file it is defined in." ;
-
 : execute-parsing ( word -- )
     dup changed-definitions get key? [ staging-violation ] when
     execute ;
@@ -150,9 +142,6 @@ M: staging-violation summary
 
 ERROR: bad-number ;
 
-M: bad-number summary
-    drop "Bad number literal" ;
-
 : parse-base ( parsed base -- parsed )
     scan swap base> [ bad-number ] unless* parsed ;
 
@@ -221,7 +210,7 @@ SYMBOL: interactive-vocabs
     "quiet" get [
         drop
     ] [
-        "Loading " write <pathname> . flush
+        "Loading " write print flush
     ] if ;
 
 : filter-moved ( assoc1 assoc2 -- seq )
@@ -292,12 +281,3 @@ SYMBOL: interactive-vocabs
 
 : ?run-file ( path -- )
     dup exists? [ run-file ] [ drop ] if ;
-
-: eval ( str -- )
-    [ string-lines parse-fresh ] with-compilation-unit call ;
-
-: eval>string ( str -- output )
-    [
-        parser-notes off
-        [ [ eval ] keep ] try drop
-    ] with-string-writer ;
diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor
index abe1b8b661..3023c4e8d2 100755
--- a/core/source-files/source-files.factor
+++ b/core/source-files/source-files.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays definitions generic assocs kernel math namespaces
-prettyprint sequences strings vectors words quotations summary
-io.styles io combinators sorting splitting math.parser effects
-continuations debugger io.files checksums checksums.crc32 vocabs
-hashtables graphs compiler.units io.encodings.utf8 accessors ;
+sequences strings vectors words quotations io.styles io
+combinators sorting splitting math.parser effects continuations
+io.files checksums checksums.crc32 vocabs hashtables graphs
+compiler.units io.encodings.utf8 accessors ;
 IN: source-files
 
 SYMBOL: source-files
@@ -82,20 +82,6 @@ TUPLE: source-file-error file error ;
         file get >>file
         swap >>error ;
 
-: file. ( file -- ) path>> <pathname> . ;
-
-M: source-file-error error.
-    [ file>> file. ] [ error>> error. ] bi ;
-
-M: source-file-error summary
-    error>> summary ;
-
-M: source-file-error compute-restarts
-    error>> compute-restarts ;
-
-M: source-file-error error-help
-    error>> error-help ;
-
 : with-source-file ( name quot -- )
     #! Should be called from inside with-compilation-unit.
     [
diff --git a/core/strings/parser/parser.factor b/core/strings/parser/parser.factor
index 847fba9530..7304df2419 100644
--- a/core/strings/parser/parser.factor
+++ b/core/strings/parser/parser.factor
@@ -1,13 +1,11 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel summary assocs namespaces splitting sequences
+USING: kernel assocs namespaces splitting sequences
 strings math.parser lexer ;
 IN: strings.parser
 
 ERROR: bad-escape ;
 
-M: bad-escape summary drop "Bad escape code" ;
-
 : escape ( escape -- ch )
     H{
         { CHAR: a  CHAR: \a }
diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor
index 54df692895..ce84943328 100755
--- a/core/syntax/syntax.factor
+++ b/core/syntax/syntax.factor
@@ -8,7 +8,7 @@ generic.standard generic.math generic.parser classes io.files
 vocabs classes.parser classes.union
 classes.intersection classes.mixin classes.predicate
 classes.singleton classes.tuple.parser compiler.units
-combinators debugger effects.parser slots ;
+combinators effects.parser slots ;
 IN: bootstrap.syntax
 
 ! These words are defined as a top-level form, instead of with
diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 51a82da96b..d51a2a88b0 100755
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -1,15 +1,16 @@
 ! Copyright (C) 2007, 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces sequences io.files kernel assocs words vocabs
-definitions parser continuations summary debugger io io.styles
-hashtables sorting prettyprint source-files arrays combinators
-strings system math.parser compiler.errors splitting init ;
+definitions parser continuations io io.styles hashtables sorting
+source-files arrays combinators strings system math.parser
+compiler.errors splitting init ;
 IN: vocabs.loader
 
 SYMBOL: vocab-roots
 
 V{
     "resource:core"
+    "resource:basis"
     "resource:extra"
     "resource:work"
 } clone vocab-roots set-global
diff --git a/extra/ui/cocoa/tools/tools.factor b/extra/ui/cocoa/tools/tools.factor
index 3ff34f677d..2b0792902b 100755
--- a/extra/ui/cocoa/tools/tools.factor
+++ b/extra/ui/cocoa/tools/tools.factor
@@ -4,7 +4,7 @@ USING: alien.syntax cocoa cocoa.nibs cocoa.application
 cocoa.classes cocoa.dialogs cocoa.pasteboard cocoa.subclassing
 core-foundation help.topics kernel memory namespaces parser
 system ui ui.tools.browser ui.tools.listener ui.tools.workspace
-ui.cocoa ;
+ui.cocoa eval ;
 IN: ui.cocoa.tools
 
 : finder-run-files ( alien -- )
diff --git a/extra/ui/gadgets/slots/slots.factor b/extra/ui/gadgets/slots/slots.factor
index 0102876136..43e0c0bca9 100755
--- a/extra/ui/gadgets/slots/slots.factor
+++ b/extra/ui/gadgets/slots/slots.factor
@@ -4,7 +4,7 @@ USING: accessors namespaces kernel parser prettyprint
 sequences arrays io math definitions math.vectors assocs refs
 ui.gadgets ui.gestures ui.commands ui.gadgets.scrollers
 ui.gadgets.buttons ui.gadgets.borders ui.gadgets.tracks
-ui.gadgets.editors ;
+ui.gadgets.editors eval ;
 IN: ui.gadgets.slots
 
 TUPLE: update-object ;
diff --git a/extra/windows/user32/authors.txt b/unmaintained/headers/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/windows/user32/authors.txt
rename to unmaintained/headers/authors.txt
diff --git a/extra/windows/winsock/authors.txt b/unmaintained/headers/bsd/authors.txt
old mode 100644
new mode 100755
similarity index 100%
rename from extra/windows/winsock/authors.txt
rename to unmaintained/headers/bsd/authors.txt
diff --git a/extra/io/sockets/headers/bsd/bsd.factor b/unmaintained/headers/bsd/bsd.factor
similarity index 100%
rename from extra/io/sockets/headers/bsd/bsd.factor
rename to unmaintained/headers/bsd/bsd.factor
diff --git a/extra/io/sockets/headers/headers.factor b/unmaintained/headers/headers.factor
similarity index 100%
rename from extra/io/sockets/headers/headers.factor
rename to unmaintained/headers/headers.factor

From 463b3ff87d20032443dafdba9bc4760742825867 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 22:04:18 -0500
Subject: [PATCH 35/77] colors: use old style methods

---
 extra/colors/colors.factor | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/extra/colors/colors.factor b/extra/colors/colors.factor
index 3621373d93..e3920bebe3 100644
--- a/extra/colors/colors.factor
+++ b/extra/colors/colors.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2003, 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: kernel combinators sequences arrays
-       classes.tuple multi-methods accessors colors.hsv ;
+USING: kernel combinators sequences arrays classes.tuple accessors colors.hsv ;
 
 IN: colors
 
@@ -20,23 +19,19 @@ TUPLE: gray < color gray alpha ;
 
 GENERIC: >rgba ( object -- rgba )
 
-METHOD: >rgba { rgba } ;
+M: rgba >rgba ( rgba -- rgba ) ;
 
-METHOD: >rgba { hsva }
+M: hsva >rgba ( hsva -- rgba )
   { [ hue>> ] [ saturation>> ] [ value>> ] [ alpha>> ] } cleave 4array
   [ hsv>rgb ] [ peek ] bi suffix first4 rgba boa ;
 
-METHOD: >rgba { gray } [ gray>> dup dup ] [ alpha>> ] bi rgba boa ;
+M: gray >rgba ( gray -- rgba ) [ gray>> dup dup ] [ alpha>> ] bi rgba boa ;
 
-METHOD: >rgba { array } first4 rgba boa ;
+M: array >rgba ( array -- rgba ) first4 rgba boa ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-USE: syntax
-
-M: color red>>   >rgba red>> ;
-M: color green>> >rgba green>> ;
-M: color blue>>  >rgba blue>> ;
+M: color ( color -- red   ) red>>   >rgba red>> ;
+M: color ( color -- green ) green>> >rgba green>> ;
+M: color ( color -- blue  ) blue>>  >rgba blue>> ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From 2f4500c74295ab7820d22ced006e08108513ea54 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:05:34 -0500
Subject: [PATCH 36/77] Fix help lint

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

diff --git a/core/continuations/continuations-docs.factor b/core/continuations/continuations-docs.factor
index 332e8eea67..3949c4b566 100755
--- a/core/continuations/continuations-docs.factor
+++ b/core/continuations/continuations-docs.factor
@@ -209,5 +209,5 @@ HELP: with-datastack
 { $values { "stack" sequence } { "quot" quotation } { "newstack" sequence } }
 { $description "Executes the quotation with the given data stack contents, and outputs the new data stack after the word returns. The input sequence is not modified. Does not affect the data stack in surrounding code, other than consuming the two inputs and pushing the output." }
 { $examples
-    { $example "USING: combinators math prettyprint ;" "{ 3 7 } [ + ] with-datastack ." "{ 10 }" }
+    { $example "USING: continuations math prettyprint ;" "{ 3 7 } [ + ] with-datastack ." "{ 10 }" }
 } ;

From ba61e15689a376c80091515303d111156f502601 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 28 Jul 2008 22:06:46 -0500
Subject: [PATCH 37/77] colors: minor change

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

diff --git a/extra/colors/colors.factor b/extra/colors/colors.factor
index e3920bebe3..ae3695cf8b 100644
--- a/extra/colors/colors.factor
+++ b/extra/colors/colors.factor
@@ -29,9 +29,9 @@ M: gray >rgba ( gray -- rgba ) [ gray>> dup dup ] [ alpha>> ] bi rgba boa ;
 
 M: array >rgba ( array -- rgba ) first4 rgba boa ;
 
-M: color ( color -- red   ) red>>   >rgba red>> ;
-M: color ( color -- green ) green>> >rgba green>> ;
-M: color ( color -- blue  ) blue>>  >rgba blue>> ;
+M: color red>>   ( color -- red   ) >rgba red>>   ;
+M: color green>> ( color -- green ) >rgba green>> ;
+M: color blue>>  ( color -- blue  ) >rgba blue>>  ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From d60449d3a888f37aed6f153bb22572cf754c946b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:09:35 -0500
Subject: [PATCH 38/77] Move a few things around

---
 {basis => extra}/io/files/unique/backend/backend.factor           | 0
 {basis => extra}/io/files/unique/unique-docs.factor               | 0
 {basis => extra}/io/files/unique/unique.factor                    | 0
 {basis => extra}/io/paths/authors.txt                             | 0
 {basis => extra}/io/paths/paths.factor                            | 0
 {basis => extra}/promises/authors.txt                             | 0
 {basis => extra}/promises/promises-docs.factor                    | 0
 {basis => extra}/promises/promises.factor                         | 0
 {basis => extra}/promises/summary.txt                             | 0
 {basis => extra}/promises/tags.txt                                | 0
 .../random/blum-blum-shub/blum-blum-shub-tests.factor             | 0
 {basis => extra}/random/blum-blum-shub/blum-blum-shub.factor      | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename {basis => extra}/io/files/unique/backend/backend.factor (100%)
 rename {basis => extra}/io/files/unique/unique-docs.factor (100%)
 rename {basis => extra}/io/files/unique/unique.factor (100%)
 rename {basis => extra}/io/paths/authors.txt (100%)
 rename {basis => extra}/io/paths/paths.factor (100%)
 rename {basis => extra}/promises/authors.txt (100%)
 rename {basis => extra}/promises/promises-docs.factor (100%)
 rename {basis => extra}/promises/promises.factor (100%)
 rename {basis => extra}/promises/summary.txt (100%)
 rename {basis => extra}/promises/tags.txt (100%)
 rename {basis => extra}/random/blum-blum-shub/blum-blum-shub-tests.factor (100%)
 rename {basis => extra}/random/blum-blum-shub/blum-blum-shub.factor (100%)

diff --git a/basis/io/files/unique/backend/backend.factor b/extra/io/files/unique/backend/backend.factor
similarity index 100%
rename from basis/io/files/unique/backend/backend.factor
rename to extra/io/files/unique/backend/backend.factor
diff --git a/basis/io/files/unique/unique-docs.factor b/extra/io/files/unique/unique-docs.factor
similarity index 100%
rename from basis/io/files/unique/unique-docs.factor
rename to extra/io/files/unique/unique-docs.factor
diff --git a/basis/io/files/unique/unique.factor b/extra/io/files/unique/unique.factor
similarity index 100%
rename from basis/io/files/unique/unique.factor
rename to extra/io/files/unique/unique.factor
diff --git a/basis/io/paths/authors.txt b/extra/io/paths/authors.txt
similarity index 100%
rename from basis/io/paths/authors.txt
rename to extra/io/paths/authors.txt
diff --git a/basis/io/paths/paths.factor b/extra/io/paths/paths.factor
similarity index 100%
rename from basis/io/paths/paths.factor
rename to extra/io/paths/paths.factor
diff --git a/basis/promises/authors.txt b/extra/promises/authors.txt
similarity index 100%
rename from basis/promises/authors.txt
rename to extra/promises/authors.txt
diff --git a/basis/promises/promises-docs.factor b/extra/promises/promises-docs.factor
similarity index 100%
rename from basis/promises/promises-docs.factor
rename to extra/promises/promises-docs.factor
diff --git a/basis/promises/promises.factor b/extra/promises/promises.factor
similarity index 100%
rename from basis/promises/promises.factor
rename to extra/promises/promises.factor
diff --git a/basis/promises/summary.txt b/extra/promises/summary.txt
similarity index 100%
rename from basis/promises/summary.txt
rename to extra/promises/summary.txt
diff --git a/basis/promises/tags.txt b/extra/promises/tags.txt
similarity index 100%
rename from basis/promises/tags.txt
rename to extra/promises/tags.txt
diff --git a/basis/random/blum-blum-shub/blum-blum-shub-tests.factor b/extra/random/blum-blum-shub/blum-blum-shub-tests.factor
similarity index 100%
rename from basis/random/blum-blum-shub/blum-blum-shub-tests.factor
rename to extra/random/blum-blum-shub/blum-blum-shub-tests.factor
diff --git a/basis/random/blum-blum-shub/blum-blum-shub.factor b/extra/random/blum-blum-shub/blum-blum-shub.factor
similarity index 100%
rename from basis/random/blum-blum-shub/blum-blum-shub.factor
rename to extra/random/blum-blum-shub/blum-blum-shub.factor

From 59ab854480ab8f7ed843fd8d2ccb49a3ea5a0f04 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:11:24 -0500
Subject: [PATCH 39/77] Move unmaintained code out

---
 basis/macros/macros-docs.factor                                 | 2 +-
 {basis/io/windows => unmaintained}/ce/authors.txt               | 0
 {basis/io/windows => unmaintained}/ce/backend/authors.txt       | 0
 {basis/io/windows => unmaintained}/ce/backend/backend.factor    | 0
 {basis/io/windows => unmaintained}/ce/ce.factor                 | 0
 {basis/io/windows => unmaintained}/ce/files/authors.txt         | 0
 {basis/io/windows => unmaintained}/ce/files/files.factor        | 0
 .../io/windows => unmaintained}/ce/privileges/privileges.factor | 0
 {basis/io/windows => unmaintained}/ce/sockets/authors.txt       | 0
 {basis/io/windows => unmaintained}/ce/sockets/sockets.factor    | 0
 {basis/io/windows => unmaintained}/ce/summary.txt               | 0
 11 files changed, 1 insertion(+), 1 deletion(-)
 rename {basis/io/windows => unmaintained}/ce/authors.txt (100%)
 rename {basis/io/windows => unmaintained}/ce/backend/authors.txt (100%)
 rename {basis/io/windows => unmaintained}/ce/backend/backend.factor (100%)
 rename {basis/io/windows => unmaintained}/ce/ce.factor (100%)
 rename {basis/io/windows => unmaintained}/ce/files/authors.txt (100%)
 rename {basis/io/windows => unmaintained}/ce/files/files.factor (100%)
 rename {basis/io/windows => unmaintained}/ce/privileges/privileges.factor (100%)
 rename {basis/io/windows => unmaintained}/ce/sockets/authors.txt (100%)
 rename {basis/io/windows => unmaintained}/ce/sockets/sockets.factor (100%)
 rename {basis/io/windows => unmaintained}/ce/summary.txt (100%)

diff --git a/basis/macros/macros-docs.factor b/basis/macros/macros-docs.factor
index 022458cc7c..6b54da0856 100644
--- a/basis/macros/macros-docs.factor
+++ b/basis/macros/macros-docs.factor
@@ -21,7 +21,7 @@ HELP: macro-expand
 { $values { "..." "inputs to a macro" } { "word" macro } { "quot" quotation } }
 { $description "Expands a macro. Useful for debugging." }
 { $examples
-    { $code "USING: math macros combinators.lib ;" "{ [ integer? ] [ 0 > ] [ 13 mod zero? ] } \ 1&& macro-expand ." }
+    { $code "USING: math macros combinators.short-circuit ;" "{ [ integer? ] [ 0 > ] [ 13 mod zero? ] } \ 1&& macro-expand ." }
 } ;
 
 ARTICLE: "macros" "Macros"
diff --git a/basis/io/windows/ce/authors.txt b/unmaintained/ce/authors.txt
similarity index 100%
rename from basis/io/windows/ce/authors.txt
rename to unmaintained/ce/authors.txt
diff --git a/basis/io/windows/ce/backend/authors.txt b/unmaintained/ce/backend/authors.txt
similarity index 100%
rename from basis/io/windows/ce/backend/authors.txt
rename to unmaintained/ce/backend/authors.txt
diff --git a/basis/io/windows/ce/backend/backend.factor b/unmaintained/ce/backend/backend.factor
similarity index 100%
rename from basis/io/windows/ce/backend/backend.factor
rename to unmaintained/ce/backend/backend.factor
diff --git a/basis/io/windows/ce/ce.factor b/unmaintained/ce/ce.factor
similarity index 100%
rename from basis/io/windows/ce/ce.factor
rename to unmaintained/ce/ce.factor
diff --git a/basis/io/windows/ce/files/authors.txt b/unmaintained/ce/files/authors.txt
similarity index 100%
rename from basis/io/windows/ce/files/authors.txt
rename to unmaintained/ce/files/authors.txt
diff --git a/basis/io/windows/ce/files/files.factor b/unmaintained/ce/files/files.factor
similarity index 100%
rename from basis/io/windows/ce/files/files.factor
rename to unmaintained/ce/files/files.factor
diff --git a/basis/io/windows/ce/privileges/privileges.factor b/unmaintained/ce/privileges/privileges.factor
similarity index 100%
rename from basis/io/windows/ce/privileges/privileges.factor
rename to unmaintained/ce/privileges/privileges.factor
diff --git a/basis/io/windows/ce/sockets/authors.txt b/unmaintained/ce/sockets/authors.txt
similarity index 100%
rename from basis/io/windows/ce/sockets/authors.txt
rename to unmaintained/ce/sockets/authors.txt
diff --git a/basis/io/windows/ce/sockets/sockets.factor b/unmaintained/ce/sockets/sockets.factor
similarity index 100%
rename from basis/io/windows/ce/sockets/sockets.factor
rename to unmaintained/ce/sockets/sockets.factor
diff --git a/basis/io/windows/ce/summary.txt b/unmaintained/ce/summary.txt
similarity index 100%
rename from basis/io/windows/ce/summary.txt
rename to unmaintained/ce/summary.txt

From f5c15481febc99c5e9d15108e75c8d7aecd9068f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:28:13 -0500
Subject: [PATCH 40/77] Move io.styles to basis

---
 basis/bootstrap/stage2.factor                |  2 +-
 basis/bootstrap/threads/threads.factor       |  6 ++++++
 {core => basis}/io/styles/authors.txt        |  0
 {core => basis}/io/styles/styles-docs.factor |  8 +++++++-
 {core => basis}/io/styles/styles.factor      |  5 ++++-
 {core => basis}/io/styles/summary.txt        |  0
 {core => basis}/io/thread/thread.factor      |  0
 core/io/encodings/encodings.factor           |  2 +-
 core/io/files/files-docs.factor              | 12 ++++++------
 core/io/io-docs.factor                       |  6 ------
 core/io/io.factor                            |  5 +----
 core/parser/parser.factor                    |  2 +-
 core/source-files/source-files.factor        |  2 +-
 core/vocabs/loader/loader.factor             |  2 +-
 14 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 basis/bootstrap/threads/threads.factor
 rename {core => basis}/io/styles/authors.txt (100%)
 rename {core => basis}/io/styles/styles-docs.factor (93%)
 rename {core => basis}/io/styles/styles.factor (84%)
 rename {core => basis}/io/styles/summary.txt (100%)
 rename {core => basis}/io/thread/thread.factor (100%)

diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor
index 586032c2e8..08da2ae14b 100755
--- a/basis/bootstrap/stage2.factor
+++ b/basis/bootstrap/stage2.factor
@@ -50,7 +50,7 @@ SYMBOL: bootstrap-time
 
     default-image-name "output-image" set-global
 
-    "math compiler help io random tools ui ui.tools unicode handbook" "include" set-global
+    "threads math compiler help io random tools ui ui.tools unicode handbook" "include" set-global
     "" "exclude" set-global
 
     parse-command-line
diff --git a/basis/bootstrap/threads/threads.factor b/basis/bootstrap/threads/threads.factor
new file mode 100644
index 0000000000..8f4a05ef52
--- /dev/null
+++ b/basis/bootstrap/threads/threads.factor
@@ -0,0 +1,6 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: bootstrap.threads
+
+USE: io.thread
+USE: threads
diff --git a/core/io/styles/authors.txt b/basis/io/styles/authors.txt
similarity index 100%
rename from core/io/styles/authors.txt
rename to basis/io/styles/authors.txt
diff --git a/core/io/styles/styles-docs.factor b/basis/io/styles/styles-docs.factor
similarity index 93%
rename from core/io/styles/styles-docs.factor
rename to basis/io/styles/styles-docs.factor
index 43d93c86e7..48b72255a7 100644
--- a/core/io/styles/styles-docs.factor
+++ b/basis/io/styles/styles-docs.factor
@@ -24,8 +24,14 @@ ARTICLE: "table-styles" "Table styles"
 { $subsection table-gap }
 { $subsection table-border } ;
 
+HELP: write-object
+{ $values { "str" string } { "obj" "an object" } }
+{ $description "Writes a string to " { $link output-stream } ", associating it with the object. If formatted output is supported, the string will become a clickable presentation of the object, otherwise this word behaves like a call to " { $link write } "." }
+$io-error ;
+
 ARTICLE: "presentations" "Presentations"
-"The " { $link presented } " style can be used to emit clickable objects. The " { $link write-object } " word should be used instead of setting this directly." ;
+"The " { $link presented } " style can be used to emit clickable objects. A utility word for outputting this style:"
+{ $subsection write-object } ;
 
 ARTICLE: "styles" "Formatted output"
 "The " { $link stream-format } ", " { $link with-style } ", " { $link with-nesting } " and " { $link tabular-output } " words take a hashtable of style attributes. Output stream implementations are free to ignore style information."
diff --git a/core/io/styles/styles.factor b/basis/io/styles/styles.factor
similarity index 84%
rename from core/io/styles/styles.factor
rename to basis/io/styles/styles.factor
index 4c19d87435..14827dc7a6 100644
--- a/core/io/styles/styles.factor
+++ b/basis/io/styles/styles.factor
@@ -1,5 +1,6 @@
-! Copyright (C) 2005, 2006 Slava Pestov.
+! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
+USING: hashtables io ;
 IN: io.styles
 
 SYMBOL: plain
@@ -39,3 +40,5 @@ SYMBOL: table-border
 TUPLE: input string ;
 
 C: <input> input
+
+: write-object ( str obj -- ) presented associate format ;
diff --git a/core/io/styles/summary.txt b/basis/io/styles/summary.txt
similarity index 100%
rename from core/io/styles/summary.txt
rename to basis/io/styles/summary.txt
diff --git a/core/io/thread/thread.factor b/basis/io/thread/thread.factor
similarity index 100%
rename from core/io/thread/thread.factor
rename to basis/io/thread/thread.factor
diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor
index fc02d880f1..3df441ae03 100755
--- a/core/io/encodings/encodings.factor
+++ b/core/io/encodings/encodings.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: math kernel sequences sbufs vectors namespaces growable
 strings io classes continuations destructors combinators
-io.styles io.streams.plain splitting byte-arrays
+io.streams.plain splitting byte-arrays
 sequences.private accessors ;
 IN: io.encodings
 
diff --git a/core/io/files/files-docs.factor b/core/io/files/files-docs.factor
index cac8a4c6c5..8e32c100e0 100755
--- a/core/io/files/files-docs.factor
+++ b/core/io/files/files-docs.factor
@@ -1,4 +1,4 @@
-USING: help.markup help.syntax io io.styles strings
+USING: help.markup help.syntax io strings
        io.backend io.files.private quotations ;
 IN: io.files
 
@@ -170,16 +170,16 @@ HELP: +symbolic-link+
 { $description "A symbolic link file.  This type is currently implemented on Unix platforms only. See " { $link "symbolic-links" } " for words operating on symbolic links." } ;
 
 HELP: +character-device+
-{ $description "A Unix character device file. This type exists on unix platforms only." } ;
+{ $description "A Unix character device file. This type exists on Unix platforms only." } ;
 
 HELP: +block-device+
-{ $description "A Unix block device file. This type exists on unix platforms only." } ;
+{ $description "A Unix block device file. This type exists on Unix platforms only." } ;
 
 HELP: +fifo+
-{ $description "A Unix fifo file. This type exists on unix platforms only." } ;
+{ $description "A Unix fifo file. This type exists on Unix platforms only." } ;
 
 HELP: +socket+
-{ $description "A Unix socket file. This type exists on unix platforms only." } ;
+{ $description "A Unix socket file. This type exists on Unix platforms only." } ;
 
 HELP: +unknown+
 { $description "A unknown file type." } ;
@@ -327,7 +327,7 @@ HELP: resource-path
 { $description "Resolve a path relative to the Factor source code location." } ;
 
 HELP: pathname
-{ $class-description "Class of pathname presentations. Path name presentations can be created by calling " { $link <pathname> } ". Instances can be passed to " { $link write-object } " to output a clickable pathname." } ;
+{ $class-description "Class of path name objects. Path name objects can be created by calling " { $link <pathname> } "." } ;
 
 HELP: normalize-directory
 { $values { "str" "a pathname string" } { "newstr" "a new pathname string" } }
diff --git a/core/io/io-docs.factor b/core/io/io-docs.factor
index 782d4044ae..b639696f57 100755
--- a/core/io/io-docs.factor
+++ b/core/io/io-docs.factor
@@ -87,7 +87,6 @@ $nl
 { $subsection bl }
 "Formatted output:"
 { $subsection format }
-{ $subsection write-object }
 { $subsection with-style }
 { $subsection with-nesting }
 "Tabular output:"
@@ -356,11 +355,6 @@ HELP: bl
 { $description "Outputs a space character (" { $snippet "\" \"" } ") to " { $link output-stream } "." }
 $io-error ;
 
-HELP: write-object
-{ $values { "str" string } { "obj" "an object" } }
-{ $description "Writes a string to " { $link output-stream } ", associating it with the object. If formatted output is supported, the string will become a clickable presentation of the object, otherwise this word behaves like a call to " { $link write } "." }
-$io-error ;
-
 HELP: lines
 { $values { "stream" "an input stream" } { "seq" "a sequence of strings" } }
 { $description "Reads lines of text until the stream is exhausted, collecting them in a sequence of strings." } ;
diff --git a/core/io/io.factor b/core/io/io.factor
index da7585e7ea..a03aaac6d8 100755
--- a/core/io/io.factor
+++ b/core/io/io.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2003, 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: hashtables generic kernel math namespaces sequences
-continuations destructors assocs io.styles ;
+continuations destructors assocs ;
 IN: io
 
 GENERIC: stream-readln ( stream -- str/f )
@@ -96,9 +96,6 @@ SYMBOL: error-stream
 
 : bl ( -- ) " " write ;
 
-: write-object ( str obj -- )
-    presented associate format ;
-
 : lines ( stream -- seq )
     [ [ readln dup ] [ ] [ drop ] produce ] with-input-stream ;
 
diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index 013e2c19bf..502d4c1eba 100755
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays definitions generic assocs kernel math namespaces
-sequences strings vectors words quotations io.styles io
+sequences strings vectors words quotations io
 combinators sorting splitting math.parser effects continuations
 io.files io.streams.string vocabs io.encodings.utf8 source-files
 classes hashtables compiler.errors compiler.units accessors sets
diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor
index 3023c4e8d2..50c79fc2c6 100755
--- a/core/source-files/source-files.factor
+++ b/core/source-files/source-files.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays definitions generic assocs kernel math namespaces
-sequences strings vectors words quotations io.styles io
+sequences strings vectors words quotations io
 combinators sorting splitting math.parser effects continuations
 io.files checksums checksums.crc32 vocabs hashtables graphs
 compiler.units io.encodings.utf8 accessors ;
diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index d51a2a88b0..26a6e8ae7a 100755
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces sequences io.files kernel assocs words vocabs
-definitions parser continuations io io.styles hashtables sorting
+definitions parser continuations io hashtables sorting
 source-files arrays combinators strings system math.parser
 compiler.errors splitting init ;
 IN: vocabs.loader

From 4be5b70695be4ede67741ce4644fb7320ba57590 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:32:34 -0500
Subject: [PATCH 41/77] Move csv back to extra, it uses vars

---
 {basis => extra}/csv/authors.txt      | 0
 {basis => extra}/csv/csv-docs.factor  | 0
 {basis => extra}/csv/csv-tests.factor | 0
 {basis => extra}/csv/csv.factor       | 0
 {basis => extra}/csv/summary.txt      | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {basis => extra}/csv/authors.txt (100%)
 rename {basis => extra}/csv/csv-docs.factor (100%)
 rename {basis => extra}/csv/csv-tests.factor (100%)
 rename {basis => extra}/csv/csv.factor (100%)
 rename {basis => extra}/csv/summary.txt (100%)

diff --git a/basis/csv/authors.txt b/extra/csv/authors.txt
similarity index 100%
rename from basis/csv/authors.txt
rename to extra/csv/authors.txt
diff --git a/basis/csv/csv-docs.factor b/extra/csv/csv-docs.factor
similarity index 100%
rename from basis/csv/csv-docs.factor
rename to extra/csv/csv-docs.factor
diff --git a/basis/csv/csv-tests.factor b/extra/csv/csv-tests.factor
similarity index 100%
rename from basis/csv/csv-tests.factor
rename to extra/csv/csv-tests.factor
diff --git a/basis/csv/csv.factor b/extra/csv/csv.factor
similarity index 100%
rename from basis/csv/csv.factor
rename to extra/csv/csv.factor
diff --git a/basis/csv/summary.txt b/extra/csv/summary.txt
similarity index 100%
rename from basis/csv/summary.txt
rename to extra/csv/summary.txt

From 8a2f1d0451cdb10ef6eb843b5774c6a4de7eaf3e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:57:43 -0500
Subject: [PATCH 42/77] More core cleanups

---
 {core => basis}/libc/authors.txt           |  0
 {core => basis}/libc/libc-docs.factor      |  0
 {core => basis}/libc/libc-tests.factor     |  0
 {core => basis}/libc/libc.factor           | 19 ++++++++++++-------
 {core => basis}/libc/summary.txt           |  0
 {core => basis}/libc/tags.txt              |  0
 core/bootstrap/stage1.factor               |  6 +-----
 core/init/init-tests.factor                |  7 -------
 core/io/streams/nested/nested-tests.factor |  3 ---
 9 files changed, 13 insertions(+), 22 deletions(-)
 rename {core => basis}/libc/authors.txt (100%)
 rename {core => basis}/libc/libc-docs.factor (100%)
 rename {core => basis}/libc/libc-tests.factor (100%)
 rename {core => basis}/libc/libc.factor (85%)
 rename {core => basis}/libc/summary.txt (100%)
 rename {core => basis}/libc/tags.txt (100%)
 delete mode 100644 core/init/init-tests.factor
 delete mode 100644 core/io/streams/nested/nested-tests.factor

diff --git a/core/libc/authors.txt b/basis/libc/authors.txt
similarity index 100%
rename from core/libc/authors.txt
rename to basis/libc/authors.txt
diff --git a/core/libc/libc-docs.factor b/basis/libc/libc-docs.factor
similarity index 100%
rename from core/libc/libc-docs.factor
rename to basis/libc/libc-docs.factor
diff --git a/core/libc/libc-tests.factor b/basis/libc/libc-tests.factor
similarity index 100%
rename from core/libc/libc-tests.factor
rename to basis/libc/libc-tests.factor
diff --git a/core/libc/libc.factor b/basis/libc/libc.factor
similarity index 85%
rename from core/libc/libc.factor
rename to basis/libc/libc.factor
index cda5260397..ca651e3990 100755
--- a/core/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -2,7 +2,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov
 ! Copyright (C) 2007, 2008 Doug Coleman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien assocs continuations destructors init kernel
+USING: alien assocs continuations destructors kernel
 namespaces accessors sets ;
 IN: libc
 
@@ -20,7 +20,14 @@ IN: libc
 : (realloc) ( alien size -- newalien )
     "void*" "libc" "realloc" { "void*" "ulong" } alien-invoke ;
 
-SYMBOL: mallocs
+SYMBOL: malloc-expiry
+
+: mallocs ( -- assoc )
+    malloc-expiry get-global dup expired? [
+        drop
+        -1 <alien> malloc-expiry set-global
+        H{ } clone dup \ mallocs set-global
+    ] when ;
 
 PRIVATE>
 
@@ -35,19 +42,17 @@ ERROR: realloc-error ptr size ;
 
 <PRIVATE
 
-[ H{ } clone mallocs set-global ] "libc" add-init-hook
-
 : add-malloc ( alien -- )
-    mallocs get-global conjoin ;
+    mallocs conjoin ;
 
 : delete-malloc ( alien -- )
     [
-        mallocs get-global delete-at*
+        mallocs delete-at*
         [ double-free ] unless drop
     ] when* ;
 
 : malloc-exists? ( alien -- ? )
-    mallocs get-global key? ;
+    mallocs key? ;
 
 PRIVATE>
 
diff --git a/core/libc/summary.txt b/basis/libc/summary.txt
similarity index 100%
rename from core/libc/summary.txt
rename to basis/libc/summary.txt
diff --git a/core/libc/tags.txt b/basis/libc/tags.txt
similarity index 100%
rename from core/libc/tags.txt
rename to basis/libc/tags.txt
diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 8ca3c151ac..f9a0ddce8f 100755
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-IN: bootstrap.stage1
 USING: arrays debugger generic hashtables io assocs
 kernel.private kernel math memory namespaces parser
 prettyprint sequences vectors words system splitting
 init io.files bootstrap.image bootstrap.image.private vocabs
 vocabs.loader system debugger continuations ;
+IN: bootstrap.stage1
 
 { "resource:core" } vocab-roots set
 
@@ -33,10 +33,6 @@ load-help? off
     "math.floats" require
     "memory" require
 
-    ! this must add its init hook before io.backend does
-    "libc" require
-
-    ! "io.thread" require
     "io.streams.c" require
     "vocabs.loader" require
     
diff --git a/core/init/init-tests.factor b/core/init/init-tests.factor
deleted file mode 100644
index ce68a1d7ab..0000000000
--- a/core/init/init-tests.factor
+++ /dev/null
@@ -1,7 +0,0 @@
-IN: init.tests
-USING: init namespaces sequences math tools.test kernel ;
-
-[ t ] [
-    init-hooks get [ first "libc" = ] find drop
-    init-hooks get [ first "io.backend" = ] find drop <
-] unit-test
diff --git a/core/io/streams/nested/nested-tests.factor b/core/io/streams/nested/nested-tests.factor
deleted file mode 100644
index 402cb19c3b..0000000000
--- a/core/io/streams/nested/nested-tests.factor
+++ /dev/null
@@ -1,3 +0,0 @@
-USING: io io.streams.string io.streams.nested kernel math
-namespaces io.styles tools.test ;
-IN: io.streams.nested.tests

From 13f52ea6593f7581edc0fe5c3b4bcadb92709c69 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 23:20:54 -0500
Subject: [PATCH 43/77] Fix minor load problems from words being moved around

---
 basis/libc/libc.factor         | 7 ++++---
 extra/builder/util/util.factor | 2 +-
 extra/shell/shell.factor       | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/basis/libc/libc.factor b/basis/libc/libc.factor
index ca651e3990..627caa7b77 100755
--- a/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -23,11 +23,12 @@ IN: libc
 SYMBOL: malloc-expiry
 
 : mallocs ( -- assoc )
-    malloc-expiry get-global dup expired? [
-        drop
+    malloc-expiry get-global expired? [
         -1 <alien> malloc-expiry set-global
         H{ } clone dup \ mallocs set-global
-    ] when ;
+    ] [
+        \ mallocs get-global
+    ] if ;
 
 PRIVATE>
 
diff --git a/extra/builder/util/util.factor b/extra/builder/util/util.factor
index 47db4c52c9..32d1e45066 100644
--- a/extra/builder/util/util.factor
+++ b/extra/builder/util/util.factor
@@ -6,7 +6,7 @@ USING: kernel words namespaces classes parser continuations
        combinators sequences splitting quotations arrays strings tools.time
        sequences.deep accessors assocs.lib
        io.encodings.utf8
-       combinators.cleave calendar calendar.format ;
+       combinators.cleave calendar calendar.format eval ;
 
 IN: builder.util
 
diff --git a/extra/shell/shell.factor b/extra/shell/shell.factor
index e694b36007..0ed594602a 100644
--- a/extra/shell/shell.factor
+++ b/extra/shell/shell.factor
@@ -3,7 +3,7 @@ USING: kernel parser words continuations namespaces debugger
        sequences combinators splitting prettyprint
        system io io.files io.launcher io.encodings.utf8 io.pipes sequences.deep
        accessors multi-methods newfx shell.parser
-       combinators.short-circuit ;
+       combinators.short-circuit eval ;
 
 IN: shell
 

From 4cb64aaeb8e7cfda8ff0bc9aa3375df926b68285 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 00:05:01 -0500
Subject: [PATCH 44/77] Fixing unit tests for eval word being moved

---
 basis/delegate/delegate-tests.factor             | 2 +-
 basis/help/crossref/crossref-tests.factor        | 2 +-
 basis/help/definitions/definitions-tests.factor  | 2 +-
 basis/help/syntax/syntax-tests.factor            | 2 +-
 basis/help/topics/topics-tests.factor            | 2 +-
 basis/inference/inference-tests.factor           | 2 +-
 basis/libc/libc-tests.factor                     | 4 ++--
 basis/listener/listener-tests.factor             | 2 +-
 basis/macros/macros-tests.factor                 | 2 +-
 basis/memoize/memoize-tests.factor               | 2 +-
 basis/mirrors/mirrors-tests.factor               | 2 +-
 basis/prettyprint/prettyprint-tests.factor       | 4 ++--
 basis/symbols/symbols-tests.factor               | 3 ++-
 basis/tools/annotations/annotations-tests.factor | 2 +-
 basis/tools/deploy/backend/backend.factor        | 1 +
 basis/tools/deploy/shaker/shaker.factor          | 3 +--
 core/classes/mixin/mixin-tests.factor            | 2 +-
 core/classes/tuple/parser/parser-tests.factor    | 2 +-
 core/classes/tuple/tuple-tests.factor            | 2 +-
 core/classes/union/union-tests.factor            | 3 ++-
 core/continuations/continuations-tests.factor    | 2 +-
 core/generic/generic-tests.factor                | 2 +-
 core/parser/parser-tests.factor                  | 2 +-
 core/slots/slots-tests.factor                    | 2 +-
 core/vocabs/loader/loader-tests.factor           | 2 +-
 core/words/words-tests.factor                    | 2 +-
 extra/money/money.factor                         | 2 +-
 extra/peg/ebnf/ebnf-tests.factor                 | 2 +-
 28 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/basis/delegate/delegate-tests.factor b/basis/delegate/delegate-tests.factor
index bc173ab0c8..09a90121bd 100755
--- a/basis/delegate/delegate-tests.factor
+++ b/basis/delegate/delegate-tests.factor
@@ -1,6 +1,6 @@
 USING: delegate kernel arrays tools.test words math definitions
 compiler.units parser generic prettyprint io.streams.string
-accessors ;
+accessors eval ;
 IN: delegate.tests
 
 TUPLE: hello this that ;
diff --git a/basis/help/crossref/crossref-tests.factor b/basis/help/crossref/crossref-tests.factor
index 1d569d8a8f..2e8c173944 100755
--- a/basis/help/crossref/crossref-tests.factor
+++ b/basis/help/crossref/crossref-tests.factor
@@ -1,7 +1,7 @@
 IN: help.crossref.tests
 USING: help.crossref help.topics help.markup tools.test words
 definitions assocs sequences kernel namespaces parser arrays
-io.streams.string continuations debugger compiler.units ;
+io.streams.string continuations debugger compiler.units eval ;
 
 [ ] [
     "IN: help.crossref.tests USING: help.syntax help.markup ; : foo ; HELP: foo \"foo is great\" ; ARTICLE: \"foo\" \"Foo\" { $subsection foo } ;" eval
diff --git a/basis/help/definitions/definitions-tests.factor b/basis/help/definitions/definitions-tests.factor
index 7134c6b0b0..2c894c3812 100755
--- a/basis/help/definitions/definitions-tests.factor
+++ b/basis/help/definitions/definitions-tests.factor
@@ -1,6 +1,6 @@
 USING: math definitions help.topics help tools.test
 prettyprint parser io.streams.string kernel source-files
-assocs namespaces words io sequences ;
+assocs namespaces words io sequences eval ;
 IN: help.definitions.tests
 
 [ ] [ \ + >link see ] unit-test
diff --git a/basis/help/syntax/syntax-tests.factor b/basis/help/syntax/syntax-tests.factor
index 5d8a1a0b78..68306263a5 100755
--- a/basis/help/syntax/syntax-tests.factor
+++ b/basis/help/syntax/syntax-tests.factor
@@ -1,5 +1,5 @@
 IN: help.syntax.tests
-USING: tools.test parser vocabs help.syntax namespaces ;
+USING: tools.test parser vocabs help.syntax namespaces eval ;
 
 [
     [ "foobar" ] [
diff --git a/basis/help/topics/topics-tests.factor b/basis/help/topics/topics-tests.factor
index 1099f747bc..a343aa1734 100644
--- a/basis/help/topics/topics-tests.factor
+++ b/basis/help/topics/topics-tests.factor
@@ -1,6 +1,6 @@
 USING: definitions help help.topics help.crossref help.markup
 help.syntax kernel sequences tools.test words parser namespaces
-assocs source-files ;
+assocs source-files eval ;
 IN: help.topics.tests
 
 ! Test help cross-referencing
diff --git a/basis/inference/inference-tests.factor b/basis/inference/inference-tests.factor
index d66821e230..22a384f235 100755
--- a/basis/inference/inference-tests.factor
+++ b/basis/inference/inference-tests.factor
@@ -5,7 +5,7 @@ sequences strings vectors words quotations effects tools.test
 continuations generic.standard sorting assocs definitions
 prettyprint io inspector classes.tuple classes.union
 classes.predicate debugger threads.private io.streams.string
-io.timeouts io.thread sequences.private destructors ;
+io.timeouts io.thread sequences.private destructors eval ;
 IN: inference.tests
 
 [ ] [ [ 1 ] dataflow [ ] transform-nodes drop ] unit-test
diff --git a/basis/libc/libc-tests.factor b/basis/libc/libc-tests.factor
index 249399bdd0..b00463127f 100755
--- a/basis/libc/libc-tests.factor
+++ b/basis/libc/libc-tests.factor
@@ -4,8 +4,8 @@ destructors kernel ;
 
 100 malloc "block" set
 
-[ t ] [ "block" get mallocs get key? ] unit-test
+[ t ] [ "block" get mallocs key? ] unit-test
 
 [ ] [ [ "block" get &free drop ] with-destructors ] unit-test
 
-[ f ] [ "block" get mallocs get key? ] unit-test
+[ f ] [ "block" get mallocs key? ] unit-test
diff --git a/basis/listener/listener-tests.factor b/basis/listener/listener-tests.factor
index 24449049e0..e681bac314 100755
--- a/basis/listener/listener-tests.factor
+++ b/basis/listener/listener-tests.factor
@@ -1,6 +1,6 @@
 USING: io io.streams.string io.streams.duplex listener
 tools.test parser math namespaces continuations vocabs kernel
-compiler.units ;
+compiler.units eval ;
 IN: listener.tests
 
 : hello "Hi" print ; parsing
diff --git a/basis/macros/macros-tests.factor b/basis/macros/macros-tests.factor
index 91527c2125..150fd9eeaa 100644
--- a/basis/macros/macros-tests.factor
+++ b/basis/macros/macros-tests.factor
@@ -1,6 +1,6 @@
 IN: macros.tests
 USING: tools.test macros math kernel arrays
-vectors io.streams.string prettyprint parser ;
+vectors io.streams.string prettyprint parser eval ;
 
 MACRO: see-test ( a b -- c ) + ;
 
diff --git a/basis/memoize/memoize-tests.factor b/basis/memoize/memoize-tests.factor
index c2592b38ca..1f819d281d 100644
--- a/basis/memoize/memoize-tests.factor
+++ b/basis/memoize/memoize-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: math kernel memoize tools.test parser
-prettyprint io.streams.string sequences ;
+prettyprint io.streams.string sequences eval ;
 IN: memoize.tests
 
 MEMO: fib ( m -- n )
diff --git a/basis/mirrors/mirrors-tests.factor b/basis/mirrors/mirrors-tests.factor
index 879ec55861..2eda136ae5 100755
--- a/basis/mirrors/mirrors-tests.factor
+++ b/basis/mirrors/mirrors-tests.factor
@@ -1,5 +1,5 @@
 USING: mirrors tools.test assocs kernel arrays accessors words
-namespaces math slots parser ;
+namespaces math slots parser eval ;
 IN: mirrors.tests
 
 TUPLE: foo bar baz ;
diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor
index fd76b87dbb..534ab0fd09 100755
--- a/basis/prettyprint/prettyprint-tests.factor
+++ b/basis/prettyprint/prettyprint-tests.factor
@@ -2,7 +2,7 @@ USING: arrays definitions io.streams.string io.streams.duplex
 kernel math namespaces parser prettyprint prettyprint.config
 prettyprint.sections sequences tools.test vectors words
 effects splitting generic.standard prettyprint.private
-continuations generic compiler.units tools.walker ;
+continuations generic compiler.units tools.walker eval ;
 IN: prettyprint.tests
 
 [ "4" ] [ 4 unparse ] unit-test
@@ -194,7 +194,7 @@ DEFER: parse-error-file
 
 : string-layout
     {
-        "USING: io kernel lexer ;"
+        "USING: debugger io kernel lexer ;"
         "IN: prettyprint.tests"
         ": string-layout-test ( error -- )"
         "    \"Expected \" write dup unexpected-want expected>string write"
diff --git a/basis/symbols/symbols-tests.factor b/basis/symbols/symbols-tests.factor
index 1ae4a38cb7..274c4de85b 100755
--- a/basis/symbols/symbols-tests.factor
+++ b/basis/symbols/symbols-tests.factor
@@ -1,4 +1,5 @@
-USING: kernel symbols tools.test parser generic words accessors ;
+USING: kernel symbols tools.test parser generic words accessors
+eval ;
 IN: symbols.tests
 
 [ ] [ SYMBOLS: a b c ; ] unit-test
diff --git a/basis/tools/annotations/annotations-tests.factor b/basis/tools/annotations/annotations-tests.factor
index ec8f48a161..2bdcab50cb 100755
--- a/basis/tools/annotations/annotations-tests.factor
+++ b/basis/tools/annotations/annotations-tests.factor
@@ -1,4 +1,4 @@
-USING: tools.test tools.annotations math parser ;
+USING: tools.test tools.annotations math parser eval ;
 IN: tools.annotations.tests
 
 : foo ;
diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 7559b44832..723f9461a8 100755
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -42,6 +42,7 @@ IN: tools.deploy.backend
 
 : bootstrap-profile ( -- profile )
     {
+        { "threads"  deploy-threads?  }
         { "math"     deploy-math?     }
         { "compiler" deploy-compiler? }
         { "ui"       deploy-ui?       }
diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index a3fc08554c..7a4d93c4bd 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -21,7 +21,6 @@ QUALIFIED: libc.private
 QUALIFIED: listener
 QUALIFIED: prettyprint.config
 QUALIFIED: source-files
-QUALIFIED: threads
 QUALIFIED: vocabs
 IN: tools.deploy.shaker
 
@@ -187,7 +186,7 @@ IN: tools.deploy.shaker
         } %
 
         deploy-threads? [
-            threads:initial-thread ,
+            "initial-thread" "threads" lookup ,
         ] unless
 
         strip-io? [ io.backend:io-backend , ] when
diff --git a/core/classes/mixin/mixin-tests.factor b/core/classes/mixin/mixin-tests.factor
index b455676c38..f6ca9184b2 100644
--- a/core/classes/mixin/mixin-tests.factor
+++ b/core/classes/mixin/mixin-tests.factor
@@ -3,7 +3,7 @@ kernel math namespaces parser prettyprint sequences strings
 tools.test vectors words quotations classes
 classes.private classes.union classes.mixin classes.predicate
 classes.algebra vectors definitions source-files
-compiler.units kernel.private sorting vocabs ;
+compiler.units kernel.private sorting vocabs eval ;
 IN: classes.mixin.tests
 
 ! Test mixins
diff --git a/core/classes/tuple/parser/parser-tests.factor b/core/classes/tuple/parser/parser-tests.factor
index 6f7d4af6bc..7b0cb998e4 100644
--- a/core/classes/tuple/parser/parser-tests.factor
+++ b/core/classes/tuple/parser/parser-tests.factor
@@ -1,7 +1,7 @@
 IN: classes.tuple.parser.tests
 USING: accessors classes.tuple.parser lexer words classes
 sequences math kernel slots tools.test parser compiler.units
-arrays classes.tuple ;
+arrays classes.tuple eval ;
 
 TUPLE: test-1 ;
 
diff --git a/core/classes/tuple/tuple-tests.factor b/core/classes/tuple/tuple-tests.factor
index 35d4149d37..dc83a15e9b 100755
--- a/core/classes/tuple/tuple-tests.factor
+++ b/core/classes/tuple/tuple-tests.factor
@@ -4,7 +4,7 @@ namespaces quotations sequences.private classes continuations
 generic.standard effects classes.tuple classes.tuple.private
 arrays vectors strings compiler.units accessors classes.algebra
 calendar prettyprint io.streams.string splitting summary
-columns math.order classes.private slots slots.private ;
+columns math.order classes.private slots slots.private eval ;
 IN: classes.tuple.tests
 
 TUPLE: rect x y w h ;
diff --git a/core/classes/union/union-tests.factor b/core/classes/union/union-tests.factor
index 4fd8cf643e..97baf08874 100644
--- a/core/classes/union/union-tests.factor
+++ b/core/classes/union/union-tests.factor
@@ -3,7 +3,8 @@ kernel math namespaces parser prettyprint sequences strings
 tools.test vectors words quotations classes
 classes.private classes.union classes.mixin classes.predicate
 classes.algebra vectors definitions source-files
-compiler.units kernel.private sorting vocabs io.streams.string ;
+compiler.units kernel.private sorting vocabs io.streams.string
+eval ;
 IN: classes.union.tests
 
 ! DEFER: bah
diff --git a/core/continuations/continuations-tests.factor b/core/continuations/continuations-tests.factor
index c292cf7691..28658d67d7 100755
--- a/core/continuations/continuations-tests.factor
+++ b/core/continuations/continuations-tests.factor
@@ -1,6 +1,6 @@
 USING: kernel math namespaces io tools.test sequences vectors
 continuations debugger parser memory arrays words
-kernel.private accessors ;
+kernel.private accessors eval ;
 IN: continuations.tests
 
 : (callcc1-test)
diff --git a/core/generic/generic-tests.factor b/core/generic/generic-tests.factor
index f3c51506fb..5927927122 100755
--- a/core/generic/generic-tests.factor
+++ b/core/generic/generic-tests.factor
@@ -2,7 +2,7 @@ USING: accessors alien arrays definitions generic generic.standard
 generic.math assocs hashtables io kernel math namespaces parser
 prettyprint sequences strings tools.test vectors words
 quotations classes classes.algebra classes.tuple continuations
-layouts classes.union sorting compiler.units ;
+layouts classes.union sorting compiler.units eval ;
 IN: generic.tests
 
 GENERIC: foobar ( x -- y )
diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor
index 074b3738ac..2d4073d107 100755
--- a/core/parser/parser-tests.factor
+++ b/core/parser/parser-tests.factor
@@ -2,7 +2,7 @@ USING: arrays math parser tools.test kernel generic words
 io.streams.string namespaces classes effects source-files
 assocs sequences strings io.files definitions continuations
 sorting classes.tuple compiler.units debugger vocabs
-vocabs.loader accessors ;
+vocabs.loader accessors eval combinators ;
 
 IN: parser.tests
 
diff --git a/core/slots/slots-tests.factor b/core/slots/slots-tests.factor
index c1d2a5cf9b..4f4a0cadad 100644
--- a/core/slots/slots-tests.factor
+++ b/core/slots/slots-tests.factor
@@ -1,6 +1,6 @@
 IN: slots.tests
 USING: math accessors slots strings generic.standard kernel
-tools.test generic words parser ;
+tools.test generic words parser eval ;
 
 TUPLE: r/w-test foo ;
 
diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index 5ed0b0a34c..b945126be4 100755
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -3,7 +3,7 @@ IN: vocabs.loader.tests
 USING: vocabs.loader tools.test continuations vocabs math
 kernel arrays sequences namespaces io.streams.string
 parser source-files words assocs classes.tuple definitions
-debugger compiler.units tools.vocabs accessors ;
+debugger compiler.units tools.vocabs accessors eval ;
 
 ! This vocab should not exist, but just in case...
 [ ] [
diff --git a/core/words/words-tests.factor b/core/words/words-tests.factor
index 3f8c492aff..09ebcb6b77 100755
--- a/core/words/words-tests.factor
+++ b/core/words/words-tests.factor
@@ -1,7 +1,7 @@
 USING: arrays generic assocs kernel math namespaces
 sequences tools.test words definitions parser quotations
 vocabs continuations classes.tuple compiler.units
-io.streams.string accessors ;
+io.streams.string accessors eval ;
 IN: words.tests
 
 [ 4 ] [
diff --git a/extra/money/money.factor b/extra/money/money.factor
index ba7a0ae04f..0c654c4819 100644
--- a/extra/money/money.factor
+++ b/extra/money/money.factor
@@ -1,6 +1,6 @@
 USING: io kernel math math.functions math.parser parser lexer
 namespaces sequences splitting grouping combinators
-continuations sequences.lib ;
+continuations sequences.lib eval ;
 IN: money
 
 : dollars/cents ( dollars -- dollars cents )
diff --git a/extra/peg/ebnf/ebnf-tests.factor b/extra/peg/ebnf/ebnf-tests.factor
index 45e1e9b218..47f19920c7 100644
--- a/extra/peg/ebnf/ebnf-tests.factor
+++ b/extra/peg/ebnf/ebnf-tests.factor
@@ -3,7 +3,7 @@
 !
 USING: kernel tools.test peg peg.ebnf words math math.parser 
        sequences accessors peg.parsers parser namespaces arrays 
-       strings ;
+       strings eval ;
 IN: peg.ebnf.tests
 
 { T{ ebnf-non-terminal f "abc" } } [

From f6ef258f0da3906d40e887fa7776bfed1f5eee31 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 00:05:50 -0500
Subject: [PATCH 45/77] Oops

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

diff --git a/extra/money/money-tests.factor b/extra/money/money-tests.factor
index b2ccdf93b7..78c168015f 100644
--- a/extra/money/money-tests.factor
+++ b/extra/money/money-tests.factor
@@ -1,4 +1,4 @@
-USING: money parser tools.test ;
+USING: money parser tools.test eval ;
 IN: money.tests
 
 [ -1/10 ] [ DECIMAL: -.1 ] unit-test
diff --git a/extra/money/money.factor b/extra/money/money.factor
index 0c654c4819..ba7a0ae04f 100644
--- a/extra/money/money.factor
+++ b/extra/money/money.factor
@@ -1,6 +1,6 @@
 USING: io kernel math math.functions math.parser parser lexer
 namespaces sequences splitting grouping combinators
-continuations sequences.lib eval ;
+continuations sequences.lib ;
 IN: money
 
 : dollars/cents ( dollars -- dollars cents )

From 04df07ae7e01e58d71370002c1c7720aa188f8e7 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 00:07:31 -0500
Subject: [PATCH 46/77] Fix PowerPC make-image

---
 basis/cpu/ppc/linux/bootstrap.factor  | 2 +-
 basis/cpu/ppc/macosx/bootstrap.factor | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/basis/cpu/ppc/linux/bootstrap.factor b/basis/cpu/ppc/linux/bootstrap.factor
index e0f8bf0b21..fd9bab4835 100755
--- a/basis/cpu/ppc/linux/bootstrap.factor
+++ b/basis/cpu/ppc/linux/bootstrap.factor
@@ -6,5 +6,5 @@ IN: bootstrap.ppc
 : c-area-size ( -- n ) 10 bootstrap-cells ;
 : lr-save ( -- n ) bootstrap-cell ;
 
-<< "resource:core/cpu/ppc/bootstrap.factor" parse-file parsed >>
+<< "resource:basis/cpu/ppc/bootstrap.factor" parse-file parsed >>
 call
diff --git a/basis/cpu/ppc/macosx/bootstrap.factor b/basis/cpu/ppc/macosx/bootstrap.factor
index 06b02d3182..f2ddc42688 100755
--- a/basis/cpu/ppc/macosx/bootstrap.factor
+++ b/basis/cpu/ppc/macosx/bootstrap.factor
@@ -6,5 +6,5 @@ IN: bootstrap.ppc
 : c-area-size ( -- n ) 14 bootstrap-cells ;
 : lr-save ( -- n ) 2 bootstrap-cells ;
 
-<< "resource:core/cpu/ppc/bootstrap.factor" parse-file parsed >>
+<< "resource:basis/cpu/ppc/bootstrap.factor" parse-file parsed >>
 call

From 0ed6fb0555aeabfbaa12ffa1c75bcd2bc642c659 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 28 Jul 2008 22:42:28 -0700
Subject: [PATCH 47/77] Rewrite string>guid and guid>string in windows.ole32 so
 it can load on any platform. Add an init hook to game-input to put it back in
 the "off" state on image load.

---
 extra/game-input/game-input.factor     | 14 ++++++-
 extra/windows/ole32/ole32-tests.factor | 36 +++++++++++++++++
 extra/windows/ole32/ole32.factor       | 54 ++++++++++++++++++++++----
 3 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 extra/windows/ole32/ole32-tests.factor

diff --git a/extra/game-input/game-input.factor b/extra/game-input/game-input.factor
index 5472eead9c..4d25b06ead 100755
--- a/extra/game-input/game-input.factor
+++ b/extra/game-input/game-input.factor
@@ -1,5 +1,5 @@
 USING: arrays accessors continuations kernel symbols
-combinators.lib sequences namespaces ;
+combinators.lib sequences namespaces init ;
 IN: game-input
 
 SYMBOLS: game-input-backend game-input-opened ;
@@ -10,6 +10,16 @@ HOOK: (close-game-input) game-input-backend ( -- )
 : game-input-opened? ( -- ? )
     game-input-opened get ;
 
+<PRIVATE
+
+: reset-game-input ( -- )
+    game-input-opened off ;
+
+[ reset-game-input ] "game-input" add-init-hook
+
+PRIVATE>
+
+
 : open-game-input ( -- )
     game-input-opened? [
         (open-game-input) 
@@ -18,7 +28,7 @@ HOOK: (close-game-input) game-input-backend ( -- )
 : close-game-input ( -- )
     game-input-opened? [
         (close-game-input) 
-        game-input-opened off
+        reset-game-input
     ] when ;
 
 : with-game-input ( quot -- )
diff --git a/extra/windows/ole32/ole32-tests.factor b/extra/windows/ole32/ole32-tests.factor
new file mode 100644
index 0000000000..ecd25738b1
--- /dev/null
+++ b/extra/windows/ole32/ole32-tests.factor
@@ -0,0 +1,36 @@
+USING: kernel tools.test windows.ole32 alien.c-types ;
+IN: windows.ole32.tests
+
+[ t ] [
+    "{01234567-89ab-cdef-0123-456789abcdef}" string>guid
+    "{01234567-89ab-cdef-0123-456789abcdef}" string>guid
+    guid=
+] unit-test
+        
+[ f ] [
+    "{76543210-89ab-cdef-0123-456789abcdef}" string>guid
+    "{01234567-89ab-cdef-0123-456789abcdef}" string>guid
+    guid=
+] unit-test
+        
+[ f ] [
+    "{01234567-89ab-cdef-0123-fedcba987654}" string>guid
+    "{01234567-89ab-cdef-0123-456789abcdef}" string>guid
+    guid=
+] unit-test
+        
+little-endian?
+[ B{
+    HEX: 67 HEX: 45 HEX: 23 HEX: 01 HEX: ab HEX: 89 HEX: ef HEX: cd
+    HEX: 01 HEX: 23 HEX: 45 HEX: 67 HEX: 89 HEX: ab HEX: cd HEX: ef
+} ]
+[ B{
+    HEX: 01 HEX: 23 HEX: 45 HEX: 67 HEX: 89 HEX: ab HEX: cd HEX: ef
+    HEX: 01 HEX: 23 HEX: 45 HEX: 67 HEX: 89 HEX: ab HEX: cd HEX: ef
+} ] ?
+[ "{01234567-89ab-cdef-0123-456789abcdef}" string>guid ]
+unit-test
+
+[ "{01234567-89ab-cdef-0123-456789abcdef}" ]
+[ "{01234567-89ab-cdef-0123-456789abcdef}" string>guid guid>string ]
+unit-test
diff --git a/extra/windows/ole32/ole32.factor b/extra/windows/ole32/ole32.factor
index e33c2e2437..21b07f9a7d 100755
--- a/extra/windows/ole32/ole32.factor
+++ b/extra/windows/ole32/ole32.factor
@@ -1,6 +1,6 @@
 USING: alien alien.syntax alien.c-types alien.strings math
 kernel sequences windows windows.types debugger io accessors
-math.order ;
+math.order namespaces math.parser windows.kernel32 combinators ;
 IN: windows.ole32
 
 LIBRARY: ole32
@@ -128,14 +128,54 @@ M: ole32-error error.
     f OleInitialize ole32-error ;
 
 : guid= ( a b -- ? )
-    IsEqualGUID c-bool> ;
+    [ 16 memory>byte-array ] bi@ = ;
 
 : GUID-STRING-LENGTH
     "{01234567-89ab-cdef-0123-456789abcdef}" length ; inline
 
-: string>guid ( string -- guid )
-    utf16n string>alien "GUID" <c-object> [ CLSIDFromString ole32-error ] keep ;
-: guid>string ( guid -- string )
-    GUID-STRING-LENGTH 1+ [ "ushort" <c-array> ] keep
-    [ StringFromGUID2 drop ] 2keep drop utf16n alien>string ;
+: (guid-section>guid) ( guid string start end quot -- )
+    [ roll subseq hex> swap ] dip call ; inline
+: (guid-byte>guid) ( guid string start end byte -- )
+    [ roll subseq hex> ] dip
+    rot GUID-Data4 set-uchar-nth ; inline
+
+: string>guid ( string -- guid )
+    "GUID" <c-object> [ {
+        [  1  9 [ set-GUID-Data1 ] (guid-section>guid) ]
+
+        [ 10 14 [ set-GUID-Data2 ] (guid-section>guid) ]
+
+        [ 15 19 [ set-GUID-Data3 ] (guid-section>guid) ]
+
+        [ 20 22 0 (guid-byte>guid) ]
+        [ 22 24 1 (guid-byte>guid) ]
+
+        [ 25 27 2 (guid-byte>guid) ]
+        [ 27 29 3 (guid-byte>guid) ]
+        [ 29 31 4 (guid-byte>guid) ]
+        [ 31 33 5 (guid-byte>guid) ]
+        [ 33 35 6 (guid-byte>guid) ]
+        [ 35 37 7 (guid-byte>guid) ]
+    } 2cleave ] keep ;
+
+: (guid-section%) ( guid quot len -- )
+    [ call >hex ] dip CHAR: 0 pad-left % ; inline
+: (guid-byte%) ( guid byte -- )
+    swap GUID-Data4 uchar-nth >hex 2
+    CHAR: 0 pad-left % ; inline
+
+: guid>string ( guid -- string )
+    [ "{" % {
+        [ [ GUID-Data1 ] 8 (guid-section%) "-" % ]
+        [ [ GUID-Data2 ] 4 (guid-section%) "-" % ]
+        [ [ GUID-Data3 ] 4 (guid-section%) "-" % ]
+        [ 0 (guid-byte%) ]
+        [ 1 (guid-byte%) "-" % ]
+        [ 2 (guid-byte%) ]
+        [ 3 (guid-byte%) ]
+        [ 4 (guid-byte%) ]
+        [ 5 (guid-byte%) ]
+        [ 6 (guid-byte%) ]
+        [ 7 (guid-byte%) "}" % ]
+    } cleave ] "" make ;
 

From a9cf3facbbb83f1878eb28ca2b82346e224760cb Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 03:17:21 -0500
Subject: [PATCH 48/77] More load fixes

---
 basis/help/help.factor               | 10 +++++-----
 basis/help/topics/topics-docs.factor |  2 +-
 basis/tools/test/test.factor         |  2 +-
 basis/tools/vocabs/vocabs.factor     |  8 ++++----
 extra/ui/tools/tools-docs.factor     | 14 +++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/basis/help/help.factor b/basis/help/help.factor
index 2ebb914564..7535ba8c1a 100755
--- a/basis/help/help.factor
+++ b/basis/help/help.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays io kernel namespaces parser prettyprint
-sequences words assocs definitions generic quotations effects
-slots continuations classes.tuple debugger combinators vocabs
-help.stylesheet help.topics help.crossref help.markup sorting
-classes vocabs.loader ;
+USING: accessors arrays io io.styles kernel namespaces parser
+prettyprint sequences words assocs definitions generic
+quotations effects slots continuations classes.tuple debugger
+combinators vocabs help.stylesheet help.topics help.crossref
+help.markup sorting classes vocabs.loader ;
 IN: help
 
 GENERIC: word-help* ( word -- content )
diff --git a/basis/help/topics/topics-docs.factor b/basis/help/topics/topics-docs.factor
index 8afdb59245..f2f3e8e82f 100644
--- a/basis/help/topics/topics-docs.factor
+++ b/basis/help/topics/topics-docs.factor
@@ -1,5 +1,5 @@
 USING: help.markup help.syntax help.topics help.crossref help io
-hashtables ;
+io.styles hashtables ;
 
 HELP: articles
 { $var-description "Hashtable mapping article names to " { $link article } " instances." } ;
diff --git a/basis/tools/test/test.factor b/basis/tools/test/test.factor
index 7b3f03e18a..025ee9d696 100755
--- a/basis/tools/test/test.factor
+++ b/basis/tools/test/test.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors namespaces arrays prettyprint sequences kernel
 vectors quotations words parser assocs combinators continuations
-debugger io io.files vocabs vocabs.loader source-files
+debugger io io.styles io.files vocabs vocabs.loader source-files
 compiler.units summary inference effects tools.vocabs ;
 IN: tools.test
 
diff --git a/basis/tools/vocabs/vocabs.factor b/basis/tools/vocabs/vocabs.factor
index 34bd3c81c8..442e15935c 100755
--- a/basis/tools/vocabs/vocabs.factor
+++ b/basis/tools/vocabs/vocabs.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.files kernel io.encodings.utf8 vocabs.loader vocabs
-sequences namespaces math.parser arrays hashtables assocs
-memoize summary sorting splitting combinators source-files
-io debugger continuations compiler.errors init
+USING: kernel io io.styles io.files io.encodings.utf8
+vocabs.loader vocabs sequences namespaces math.parser arrays
+hashtables assocs memoize summary sorting splitting combinators
+source-files debugger continuations compiler.errors init
 checksums checksums.crc32 sets ;
 IN: tools.vocabs
 
diff --git a/extra/ui/tools/tools-docs.factor b/extra/ui/tools/tools-docs.factor
index 387f9742f0..7f7b012a35 100755
--- a/extra/ui/tools/tools-docs.factor
+++ b/extra/ui/tools/tools-docs.factor
@@ -1,10 +1,10 @@
-USING: editors help.markup help.syntax summary inspector io listener
-parser prettyprint tools.profiler tools.walker ui.commands
-ui.gadgets.editors ui.gadgets.panes ui.gadgets.presentations
-ui.gadgets.slots ui.operations ui.tools.browser
-ui.tools.interactor ui.tools.inspector ui.tools.listener
-ui.tools.operations ui.tools.profiler ui.tools.walker
-ui.tools.workspace vocabs ;
+USING: editors help.markup help.syntax summary inspector io
+io.styles listener parser prettyprint tools.profiler
+tools.walker ui.commands ui.gadgets.editors ui.gadgets.panes
+ui.gadgets.presentations ui.gadgets.slots ui.operations
+ui.tools.browser ui.tools.interactor ui.tools.inspector
+ui.tools.listener ui.tools.operations ui.tools.profiler
+ui.tools.walker ui.tools.workspace vocabs ;
 IN: ui.tools
 
 ARTICLE: "ui-presentations" "Presentations in the UI"

From 6408b01e9dec05aada22c65b259e5a03354e45b5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 16:47:52 -0500
Subject: [PATCH 49/77] Add 'unportable' tag in place of hard-coded list of
 'dangerous' vocabs in load-everything

---
 basis/calendar/unix/tags.txt                  |  1 +
 basis/calendar/windows/tags.txt               |  1 +
 basis/cocoa/application/tags.txt              |  1 +
 basis/cocoa/callbacks/tags.txt                |  1 +
 basis/cocoa/dialogs/tags.txt                  |  1 +
 basis/cocoa/enumeration/tags.txt              |  1 +
 basis/cocoa/messages/tags.txt                 |  1 +
 basis/cocoa/nibs/tags.txt                     |  1 +
 basis/cocoa/pasteboard/tags.txt               |  1 +
 basis/cocoa/plists/tags.txt                   |  1 +
 basis/cocoa/runtime/tags.txt                  |  1 +
 basis/cocoa/subclassing/tags.txt              |  1 +
 basis/cocoa/tags.txt                          |  1 +
 basis/cocoa/types/tags.txt                    |  1 +
 basis/cocoa/views/tags.txt                    |  1 +
 basis/cocoa/windows/tags.txt                  |  1 +
 basis/core-foundation/fsevents/tags.txt       |  1 +
 basis/core-foundation/run-loop/tags.txt       |  1 +
 basis/core-foundation/tags.txt                |  1 +
 basis/cpu/ppc/allot/tags.txt                  |  1 +
 basis/cpu/ppc/architecture/tags.txt           |  1 +
 basis/cpu/ppc/assembler/backend/tags.txt      |  1 +
 basis/cpu/ppc/intrinsics/tags.txt             |  1 +
 basis/cpu/ppc/tags.txt                        |  1 +
 basis/cpu/x86/32/tags.txt                     |  1 +
 basis/cpu/x86/64/tags.txt                     |  1 +
 basis/cpu/x86/allot/tags.txt                  |  1 +
 basis/cpu/x86/architecture/tags.txt           |  1 +
 basis/cpu/x86/assembler/syntax/tags.txt       |  1 +
 basis/cpu/x86/intrinsics/tags.txt             |  1 +
 basis/cpu/x86/sse2/tags.txt                   |  1 +
 basis/disjoint-sets/disjoint-sets.factor      |  4 +++
 basis/editors/editpadpro/tags.txt             |  1 +
 basis/editors/editplus/tags.txt               |  1 +
 basis/editors/emacs/tags.txt                  |  1 +
 basis/editors/emeditor/tags.txt               |  1 +
 basis/editors/gvim/backend/tags.txt           |  1 +
 basis/editors/gvim/tags.txt                   |  1 +
 basis/editors/gvim/unix/tags.txt              |  1 +
 basis/editors/gvim/windows/tags.txt           |  1 +
 basis/editors/jedit/tags.txt                  |  1 +
 basis/editors/notepadpp/tags.txt              |  1 +
 basis/editors/scite/tags.txt                  |  1 +
 basis/editors/ted-notepad/tags.txt            |  1 +
 basis/editors/textmate/tags.txt               |  1 +
 basis/editors/textwrangler/tags.txt           |  1 +
 basis/editors/ultraedit/tags.txt              |  1 +
 basis/editors/vim/generate-syntax/tags.txt    |  1 +
 basis/editors/vim/tags.txt                    |  1 +
 basis/editors/wordpad/tags.txt                |  1 +
 basis/io/unix/backend/tags.txt                |  1 +
 basis/io/unix/bsd/tags.txt                    |  1 +
 basis/io/unix/epoll/tags.txt                  |  1 +
 basis/io/unix/files/tags.txt                  |  1 +
 basis/io/unix/files/unique/tags.txt           |  1 +
 basis/io/unix/freebsd/tags.txt                |  1 +
 basis/io/unix/kqueue/tags.txt                 |  1 +
 basis/io/unix/launcher/parser/tags.txt        |  1 +
 basis/io/unix/launcher/tags.txt               |  1 +
 basis/io/unix/linux/monitors/tags.txt         |  1 +
 basis/io/unix/linux/tags.txt                  |  1 +
 basis/io/unix/macosx/monitors/tags.txt        |  1 +
 basis/io/unix/macosx/tags.txt                 |  1 +
 basis/io/unix/mmap/tags.txt                   |  1 +
 basis/io/unix/netbsd/tags.txt                 |  1 +
 basis/io/unix/openbsd/tags.txt                |  1 +
 basis/io/unix/pipes/tags.txt                  |  1 +
 basis/io/unix/select/tags.txt                 |  1 +
 basis/io/unix/sockets/secure/tags.txt         |  1 +
 basis/io/unix/sockets/tags.txt                |  1 +
 basis/io/unix/tags.txt                        |  1 +
 basis/io/windows/files/tags.txt               |  1 +
 basis/io/windows/files/unique/tags.txt        |  1 +
 basis/io/windows/launcher/tags.txt            |  1 +
 basis/io/windows/mmap/tags.txt                |  1 +
 basis/io/windows/nt/backend/tags.txt          |  1 +
 basis/io/windows/nt/files/tags.txt            |  1 +
 basis/io/windows/nt/launcher/tags.txt         |  1 +
 basis/io/windows/nt/monitors/tags.txt         |  1 +
 basis/io/windows/nt/pipes/tags.txt            |  1 +
 basis/io/windows/nt/privileges/tags.txt       |  1 +
 basis/io/windows/nt/sockets/tags.txt          |  1 +
 basis/io/windows/nt/tags.txt                  |  1 +
 basis/io/windows/privileges/tags.txt          |  1 +
 basis/io/windows/sockets/tags.txt             |  1 +
 basis/io/windows/tags.txt                     |  1 +
 basis/random/unix/tags.txt                    |  1 +
 basis/random/windows/tags.txt                 |  1 +
 basis/tools/deploy/macosx/tags.txt            |  1 +
 basis/tools/deploy/unix/tags.txt              |  1 +
 basis/tools/deploy/windows/tags.txt           |  1 +
 basis/tools/vocabs/vocabs.factor              | 34 +++----------------
 basis/unix/bsd/freebsd/tags.txt               |  1 +
 basis/unix/bsd/macosx/tags.txt                |  1 +
 basis/unix/bsd/netbsd/tags.txt                |  1 +
 basis/unix/bsd/openbsd/tags.txt               |  1 +
 basis/unix/bsd/tags.txt                       |  1 +
 basis/unix/kqueue/freebsd/tags.txt            |  1 +
 basis/unix/kqueue/macosx/tags.txt             |  1 +
 basis/unix/kqueue/netbsd/tags.txt             |  1 +
 basis/unix/kqueue/openbsd/tags.txt            |  1 +
 basis/unix/kqueue/tags.txt                    |  1 +
 basis/unix/linux/epoll/tags.txt               |  1 +
 basis/unix/linux/fs/tags.txt                  |  1 +
 basis/unix/linux/if/tags.txt                  |  1 +
 basis/unix/linux/ifreq/tags.txt               |  1 +
 basis/unix/linux/inotify/tags.txt             |  1 +
 basis/unix/linux/route/tags.txt               |  1 +
 basis/unix/linux/sockios/tags.txt             |  1 +
 basis/unix/linux/swap/tags.txt                |  1 +
 basis/unix/linux/tags.txt                     |  1 +
 basis/unix/process/tags.txt                   |  1 +
 basis/unix/solaris/tags.txt                   |  1 +
 basis/unix/stat/freebsd/32/tags.txt           |  1 +
 basis/unix/stat/freebsd/64/tags.txt           |  1 +
 basis/unix/stat/freebsd/tags.txt              |  1 +
 basis/unix/stat/linux/32/tags.txt             |  1 +
 basis/unix/stat/linux/64/tags.txt             |  1 +
 basis/unix/stat/linux/tags.txt                |  1 +
 basis/unix/stat/macosx/tags.txt               |  1 +
 basis/unix/stat/netbsd/32/tags.txt            |  1 +
 basis/unix/stat/netbsd/64/tags.txt            |  1 +
 basis/unix/stat/netbsd/tags.txt               |  1 +
 basis/unix/stat/openbsd/tags.txt              |  1 +
 basis/unix/stat/tags.txt                      |  1 +
 basis/unix/tags.txt                           |  1 +
 basis/unix/time/tags.txt                      |  1 +
 basis/unix/types/freebsd/tags.txt             |  1 +
 basis/unix/types/linux/tags.txt               |  1 +
 basis/unix/types/macosx/tags.txt              |  1 +
 basis/unix/types/netbsd/32/tags.txt           |  1 +
 basis/unix/types/netbsd/64/tags.txt           |  1 +
 basis/unix/types/netbsd/tags.txt              |  1 +
 basis/unix/types/openbsd/tags.txt             |  1 +
 basis/unix/types/tags.txt                     |  1 +
 basis/windows/advapi32/tags.txt               |  1 +
 basis/windows/ce/tags.txt                     |  1 +
 basis/windows/com/syntax/tags.txt             |  7 ++--
 basis/windows/com/tags.txt                    |  7 ++--
 basis/windows/com/wrapper/tags.txt            |  1 +
 basis/windows/dinput/constants/tags.txt       |  1 +
 basis/windows/dinput/tags.txt                 |  1 +
 basis/windows/dragdrop-listener/tags.txt      |  1 +
 basis/windows/errors/tags.txt                 |  1 +
 basis/windows/gdi32/tags.txt                  |  1 +
 basis/windows/kernel32/tags.txt               |  1 +
 basis/windows/messages/tags.txt               |  1 +
 basis/windows/nt/tags.txt                     |  1 +
 basis/windows/ole32/tags.txt                  |  1 +
 basis/windows/opengl32/tags.txt               |  1 +
 basis/windows/shell32/tags.txt                |  1 +
 basis/windows/tags.txt                        |  1 +
 basis/windows/time/tags.txt                   |  1 +
 basis/windows/types/tags.txt                  |  1 +
 basis/windows/user32/tags.txt                 |  1 +
 basis/windows/winsock/tags.txt                |  1 +
 basis/x11/windows/tags.txt                    |  1 +
 core/vocabs/loader/test/a/tags.txt            |  1 +
 core/vocabs/loader/test/b/tags.txt            |  1 +
 core/vocabs/loader/test/c/tags.txt            |  1 +
 core/vocabs/loader/test/d/tags.txt            |  1 +
 extra/game-input/backend/dinput/tags.txt      |  1 +
 extra/game-input/backend/iokit/tags.txt       |  1 +
 extra/hardware-info/linux/tags.txt            |  1 +
 extra/hardware-info/macosx/tags.txt           |  1 +
 extra/hardware-info/windows/tags.txt          |  1 +
 extra/micros/unix/tags.txt                    |  1 +
 extra/micros/windows/tags.txt                 |  1 +
 extra/openal/macosx/tags.txt                  |  1 +
 extra/opengl/gl/macosx/tags.txt               |  1 +
 extra/opengl/gl/unix/tags.txt                 |  1 +
 extra/opengl/gl/windows/tags.txt              |  1 +
 extra/raptor/cron/tags.txt                    |  1 +
 extra/raptor/tags.txt                         |  1 +
 extra/ui/cocoa/tags.txt                       |  1 +
 extra/ui/cocoa/tools/tags.txt                 |  1 +
 extra/ui/cocoa/views/tags.txt                 |  1 +
 extra/ui/windows/tags.txt                     |  1 +
 extra/ui/x11/tags.txt                         |  1 +
 {basis/cpu => unmaintained}/arm/4/4.factor    |  0
 {basis/cpu => unmaintained}/arm/4/authors.txt |  0
 {basis/cpu => unmaintained}/arm/4/summary.txt |  0
 .../arm/allot/allot.factor                    |  0
 .../arm/allot/authors.txt                     |  0
 .../arm/architecture/architecture.factor      |  0
 .../arm/architecture/authors.txt              |  0
 {basis/cpu => unmaintained}/arm/arm.factor    |  0
 .../arm/assembler/assembler-tests.factor      |  0
 .../arm/assembler/assembler.factor            |  0
 .../arm/assembler/authors.txt                 |  0
 {basis/cpu => unmaintained}/arm/authors.txt   |  0
 .../cpu => unmaintained}/arm/bootstrap.factor |  0
 .../arm/intrinsics/authors.txt                |  0
 .../arm/intrinsics/intrinsics.factor          |  0
 {basis/cpu => unmaintained}/arm/summary.txt   |  0
 {basis/cpu => unmaintained}/arm/tags.txt      |  0
 196 files changed, 192 insertions(+), 35 deletions(-)
 create mode 100644 basis/calendar/unix/tags.txt
 create mode 100644 basis/cocoa/application/tags.txt
 create mode 100644 basis/cocoa/callbacks/tags.txt
 create mode 100644 basis/cocoa/dialogs/tags.txt
 create mode 100644 basis/cocoa/enumeration/tags.txt
 create mode 100644 basis/cocoa/messages/tags.txt
 create mode 100644 basis/cocoa/nibs/tags.txt
 create mode 100644 basis/cocoa/pasteboard/tags.txt
 create mode 100644 basis/cocoa/plists/tags.txt
 create mode 100644 basis/cocoa/runtime/tags.txt
 create mode 100644 basis/cocoa/subclassing/tags.txt
 create mode 100644 basis/cocoa/types/tags.txt
 create mode 100644 basis/cocoa/views/tags.txt
 create mode 100644 basis/cocoa/windows/tags.txt
 create mode 100644 basis/core-foundation/fsevents/tags.txt
 create mode 100644 basis/core-foundation/run-loop/tags.txt
 create mode 100644 basis/cpu/ppc/allot/tags.txt
 create mode 100644 basis/cpu/ppc/architecture/tags.txt
 create mode 100644 basis/cpu/ppc/assembler/backend/tags.txt
 create mode 100644 basis/cpu/ppc/intrinsics/tags.txt
 create mode 100644 basis/cpu/x86/allot/tags.txt
 create mode 100644 basis/cpu/x86/architecture/tags.txt
 create mode 100644 basis/cpu/x86/assembler/syntax/tags.txt
 create mode 100644 basis/cpu/x86/intrinsics/tags.txt
 create mode 100644 basis/cpu/x86/sse2/tags.txt
 create mode 100644 basis/editors/editpadpro/tags.txt
 create mode 100644 basis/editors/editplus/tags.txt
 create mode 100644 basis/editors/emacs/tags.txt
 create mode 100644 basis/editors/emeditor/tags.txt
 create mode 100644 basis/editors/gvim/backend/tags.txt
 create mode 100644 basis/editors/gvim/tags.txt
 create mode 100644 basis/editors/gvim/unix/tags.txt
 create mode 100644 basis/editors/gvim/windows/tags.txt
 create mode 100644 basis/editors/jedit/tags.txt
 create mode 100644 basis/editors/notepadpp/tags.txt
 create mode 100644 basis/editors/scite/tags.txt
 create mode 100644 basis/editors/ted-notepad/tags.txt
 create mode 100644 basis/editors/textmate/tags.txt
 create mode 100644 basis/editors/textwrangler/tags.txt
 create mode 100644 basis/editors/ultraedit/tags.txt
 create mode 100644 basis/editors/vim/generate-syntax/tags.txt
 create mode 100644 basis/editors/vim/tags.txt
 create mode 100644 basis/editors/wordpad/tags.txt
 create mode 100644 basis/io/unix/backend/tags.txt
 create mode 100644 basis/io/unix/bsd/tags.txt
 create mode 100644 basis/io/unix/epoll/tags.txt
 create mode 100644 basis/io/unix/files/tags.txt
 create mode 100644 basis/io/unix/files/unique/tags.txt
 create mode 100644 basis/io/unix/freebsd/tags.txt
 create mode 100644 basis/io/unix/kqueue/tags.txt
 create mode 100644 basis/io/unix/launcher/parser/tags.txt
 create mode 100644 basis/io/unix/launcher/tags.txt
 create mode 100644 basis/io/unix/linux/monitors/tags.txt
 create mode 100644 basis/io/unix/linux/tags.txt
 create mode 100644 basis/io/unix/macosx/monitors/tags.txt
 create mode 100644 basis/io/unix/macosx/tags.txt
 create mode 100644 basis/io/unix/mmap/tags.txt
 create mode 100644 basis/io/unix/netbsd/tags.txt
 create mode 100644 basis/io/unix/openbsd/tags.txt
 create mode 100644 basis/io/unix/pipes/tags.txt
 create mode 100644 basis/io/unix/select/tags.txt
 create mode 100644 basis/io/unix/sockets/secure/tags.txt
 create mode 100644 basis/io/unix/sockets/tags.txt
 create mode 100644 basis/io/unix/tags.txt
 create mode 100644 basis/io/windows/files/tags.txt
 create mode 100644 basis/io/windows/files/unique/tags.txt
 create mode 100644 basis/io/windows/launcher/tags.txt
 create mode 100644 basis/io/windows/mmap/tags.txt
 create mode 100644 basis/io/windows/nt/backend/tags.txt
 create mode 100644 basis/io/windows/nt/files/tags.txt
 create mode 100644 basis/io/windows/nt/launcher/tags.txt
 create mode 100644 basis/io/windows/nt/monitors/tags.txt
 create mode 100644 basis/io/windows/nt/pipes/tags.txt
 create mode 100644 basis/io/windows/nt/privileges/tags.txt
 create mode 100644 basis/io/windows/nt/sockets/tags.txt
 create mode 100644 basis/io/windows/nt/tags.txt
 create mode 100644 basis/io/windows/privileges/tags.txt
 create mode 100644 basis/io/windows/sockets/tags.txt
 create mode 100644 basis/random/unix/tags.txt
 create mode 100644 basis/unix/bsd/freebsd/tags.txt
 create mode 100644 basis/unix/bsd/macosx/tags.txt
 create mode 100644 basis/unix/bsd/netbsd/tags.txt
 create mode 100644 basis/unix/bsd/openbsd/tags.txt
 create mode 100644 basis/unix/bsd/tags.txt
 create mode 100644 basis/unix/kqueue/freebsd/tags.txt
 create mode 100644 basis/unix/kqueue/macosx/tags.txt
 create mode 100644 basis/unix/kqueue/netbsd/tags.txt
 create mode 100644 basis/unix/kqueue/openbsd/tags.txt
 create mode 100644 basis/unix/kqueue/tags.txt
 create mode 100644 basis/unix/linux/epoll/tags.txt
 create mode 100644 basis/unix/linux/fs/tags.txt
 create mode 100644 basis/unix/linux/if/tags.txt
 create mode 100644 basis/unix/linux/ifreq/tags.txt
 create mode 100644 basis/unix/linux/inotify/tags.txt
 create mode 100644 basis/unix/linux/route/tags.txt
 create mode 100644 basis/unix/linux/sockios/tags.txt
 create mode 100644 basis/unix/linux/swap/tags.txt
 create mode 100644 basis/unix/linux/tags.txt
 create mode 100644 basis/unix/process/tags.txt
 create mode 100644 basis/unix/solaris/tags.txt
 create mode 100644 basis/unix/stat/freebsd/32/tags.txt
 create mode 100644 basis/unix/stat/freebsd/64/tags.txt
 create mode 100644 basis/unix/stat/freebsd/tags.txt
 create mode 100644 basis/unix/stat/linux/32/tags.txt
 create mode 100644 basis/unix/stat/linux/64/tags.txt
 create mode 100644 basis/unix/stat/linux/tags.txt
 create mode 100644 basis/unix/stat/macosx/tags.txt
 create mode 100644 basis/unix/stat/netbsd/32/tags.txt
 create mode 100644 basis/unix/stat/netbsd/64/tags.txt
 create mode 100644 basis/unix/stat/netbsd/tags.txt
 create mode 100644 basis/unix/stat/openbsd/tags.txt
 create mode 100644 basis/unix/stat/tags.txt
 create mode 100644 basis/unix/time/tags.txt
 create mode 100644 basis/unix/types/freebsd/tags.txt
 create mode 100644 basis/unix/types/linux/tags.txt
 create mode 100644 basis/unix/types/macosx/tags.txt
 create mode 100644 basis/unix/types/netbsd/32/tags.txt
 create mode 100644 basis/unix/types/netbsd/64/tags.txt
 create mode 100644 basis/unix/types/netbsd/tags.txt
 create mode 100644 basis/unix/types/openbsd/tags.txt
 create mode 100644 basis/unix/types/tags.txt
 create mode 100644 basis/windows/advapi32/tags.txt
 create mode 100644 basis/windows/ce/tags.txt
 create mode 100644 basis/windows/dinput/constants/tags.txt
 create mode 100644 basis/windows/dragdrop-listener/tags.txt
 create mode 100644 basis/windows/errors/tags.txt
 create mode 100644 basis/windows/gdi32/tags.txt
 create mode 100644 basis/windows/kernel32/tags.txt
 create mode 100644 basis/windows/messages/tags.txt
 create mode 100644 basis/windows/nt/tags.txt
 create mode 100644 basis/windows/ole32/tags.txt
 create mode 100644 basis/windows/opengl32/tags.txt
 create mode 100644 basis/windows/shell32/tags.txt
 create mode 100644 basis/windows/time/tags.txt
 create mode 100644 basis/windows/types/tags.txt
 create mode 100644 basis/windows/user32/tags.txt
 create mode 100644 basis/windows/winsock/tags.txt
 create mode 100644 basis/x11/windows/tags.txt
 create mode 100644 core/vocabs/loader/test/a/tags.txt
 create mode 100644 core/vocabs/loader/test/b/tags.txt
 create mode 100644 core/vocabs/loader/test/c/tags.txt
 create mode 100644 core/vocabs/loader/test/d/tags.txt
 create mode 100644 extra/hardware-info/linux/tags.txt
 create mode 100644 extra/hardware-info/macosx/tags.txt
 create mode 100644 extra/micros/unix/tags.txt
 create mode 100644 extra/micros/windows/tags.txt
 create mode 100644 extra/openal/macosx/tags.txt
 create mode 100644 extra/opengl/gl/macosx/tags.txt
 create mode 100644 extra/opengl/gl/unix/tags.txt
 create mode 100644 extra/raptor/cron/tags.txt
 create mode 100644 extra/raptor/tags.txt
 create mode 100644 extra/ui/cocoa/tags.txt
 create mode 100644 extra/ui/cocoa/tools/tags.txt
 create mode 100644 extra/ui/cocoa/views/tags.txt
 create mode 100644 extra/ui/windows/tags.txt
 create mode 100644 extra/ui/x11/tags.txt
 rename {basis/cpu => unmaintained}/arm/4/4.factor (100%)
 rename {basis/cpu => unmaintained}/arm/4/authors.txt (100%)
 rename {basis/cpu => unmaintained}/arm/4/summary.txt (100%)
 rename {basis/cpu => unmaintained}/arm/allot/allot.factor (100%)
 rename {basis/cpu => unmaintained}/arm/allot/authors.txt (100%)
 rename {basis/cpu => unmaintained}/arm/architecture/architecture.factor (100%)
 rename {basis/cpu => unmaintained}/arm/architecture/authors.txt (100%)
 rename {basis/cpu => unmaintained}/arm/arm.factor (100%)
 rename {basis/cpu => unmaintained}/arm/assembler/assembler-tests.factor (100%)
 rename {basis/cpu => unmaintained}/arm/assembler/assembler.factor (100%)
 rename {basis/cpu => unmaintained}/arm/assembler/authors.txt (100%)
 rename {basis/cpu => unmaintained}/arm/authors.txt (100%)
 rename {basis/cpu => unmaintained}/arm/bootstrap.factor (100%)
 rename {basis/cpu => unmaintained}/arm/intrinsics/authors.txt (100%)
 rename {basis/cpu => unmaintained}/arm/intrinsics/intrinsics.factor (100%)
 rename {basis/cpu => unmaintained}/arm/summary.txt (100%)
 rename {basis/cpu => unmaintained}/arm/tags.txt (100%)

diff --git a/basis/calendar/unix/tags.txt b/basis/calendar/unix/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/calendar/unix/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/calendar/windows/tags.txt b/basis/calendar/windows/tags.txt
index 8e1a55995e..02ec70f741 100644
--- a/basis/calendar/windows/tags.txt
+++ b/basis/calendar/windows/tags.txt
@@ -1 +1,2 @@
+unportable
 windows
diff --git a/basis/cocoa/application/tags.txt b/basis/cocoa/application/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/application/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/callbacks/tags.txt b/basis/cocoa/callbacks/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/callbacks/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/dialogs/tags.txt b/basis/cocoa/dialogs/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/dialogs/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/enumeration/tags.txt b/basis/cocoa/enumeration/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/enumeration/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/messages/tags.txt b/basis/cocoa/messages/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/messages/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/nibs/tags.txt b/basis/cocoa/nibs/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/nibs/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/pasteboard/tags.txt b/basis/cocoa/pasteboard/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/pasteboard/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/plists/tags.txt b/basis/cocoa/plists/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/plists/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/runtime/tags.txt b/basis/cocoa/runtime/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/runtime/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/subclassing/tags.txt b/basis/cocoa/subclassing/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/subclassing/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/tags.txt b/basis/cocoa/tags.txt
index bb863cf9a0..2320bdd648 100644
--- a/basis/cocoa/tags.txt
+++ b/basis/cocoa/tags.txt
@@ -1 +1,2 @@
+unportable
 bindings
diff --git a/basis/cocoa/types/tags.txt b/basis/cocoa/types/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/types/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/views/tags.txt b/basis/cocoa/views/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/views/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cocoa/windows/tags.txt b/basis/cocoa/windows/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cocoa/windows/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/core-foundation/fsevents/tags.txt b/basis/core-foundation/fsevents/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/core-foundation/fsevents/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/core-foundation/run-loop/tags.txt b/basis/core-foundation/run-loop/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/core-foundation/run-loop/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/core-foundation/tags.txt b/basis/core-foundation/tags.txt
index bb863cf9a0..2320bdd648 100644
--- a/basis/core-foundation/tags.txt
+++ b/basis/core-foundation/tags.txt
@@ -1 +1,2 @@
+unportable
 bindings
diff --git a/basis/cpu/ppc/allot/tags.txt b/basis/cpu/ppc/allot/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/ppc/allot/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/ppc/architecture/tags.txt b/basis/cpu/ppc/architecture/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/ppc/architecture/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/ppc/assembler/backend/tags.txt b/basis/cpu/ppc/assembler/backend/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/ppc/assembler/backend/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/ppc/intrinsics/tags.txt b/basis/cpu/ppc/intrinsics/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/ppc/intrinsics/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/ppc/tags.txt b/basis/cpu/ppc/tags.txt
index 86a7c8e637..8e66660f70 100644
--- a/basis/cpu/ppc/tags.txt
+++ b/basis/cpu/ppc/tags.txt
@@ -1 +1,2 @@
+unportable
 compiler
diff --git a/basis/cpu/x86/32/tags.txt b/basis/cpu/x86/32/tags.txt
index 86a7c8e637..8e66660f70 100644
--- a/basis/cpu/x86/32/tags.txt
+++ b/basis/cpu/x86/32/tags.txt
@@ -1 +1,2 @@
+unportable
 compiler
diff --git a/basis/cpu/x86/64/tags.txt b/basis/cpu/x86/64/tags.txt
index 86a7c8e637..8e66660f70 100644
--- a/basis/cpu/x86/64/tags.txt
+++ b/basis/cpu/x86/64/tags.txt
@@ -1 +1,2 @@
+unportable
 compiler
diff --git a/basis/cpu/x86/allot/tags.txt b/basis/cpu/x86/allot/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/x86/allot/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/x86/architecture/tags.txt b/basis/cpu/x86/architecture/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/x86/architecture/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/x86/assembler/syntax/tags.txt b/basis/cpu/x86/assembler/syntax/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/x86/assembler/syntax/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/x86/intrinsics/tags.txt b/basis/cpu/x86/intrinsics/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/x86/intrinsics/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/x86/sse2/tags.txt b/basis/cpu/x86/sse2/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/cpu/x86/sse2/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/disjoint-sets/disjoint-sets.factor b/basis/disjoint-sets/disjoint-sets.factor
index 7879f3fbb6..284d206da4 100644
--- a/basis/disjoint-sets/disjoint-sets.factor
+++ b/basis/disjoint-sets/disjoint-sets.factor
@@ -86,3 +86,7 @@ M:: disjoint-set equate ( a b disjoint-set -- )
         [ swap ] [ over disjoint-set inc-rank ] [ ] branch
         disjoint-set link-sets
     ] if ;
+
+M: disjoint-set clone
+    [ parents>> ] [ ranks>> ] [ counts>> ] tri [ clone ] tri@
+    disjoint-set boa ;
diff --git a/basis/editors/editpadpro/tags.txt b/basis/editors/editpadpro/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/editpadpro/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/editplus/tags.txt b/basis/editors/editplus/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/editplus/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/emacs/tags.txt b/basis/editors/emacs/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/emacs/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/emeditor/tags.txt b/basis/editors/emeditor/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/emeditor/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/gvim/backend/tags.txt b/basis/editors/gvim/backend/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/gvim/backend/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/gvim/tags.txt b/basis/editors/gvim/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/gvim/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/gvim/unix/tags.txt b/basis/editors/gvim/unix/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/gvim/unix/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/gvim/windows/tags.txt b/basis/editors/gvim/windows/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/gvim/windows/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/jedit/tags.txt b/basis/editors/jedit/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/jedit/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/notepadpp/tags.txt b/basis/editors/notepadpp/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/notepadpp/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/scite/tags.txt b/basis/editors/scite/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/scite/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/ted-notepad/tags.txt b/basis/editors/ted-notepad/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/ted-notepad/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/textmate/tags.txt b/basis/editors/textmate/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/textmate/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/textwrangler/tags.txt b/basis/editors/textwrangler/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/textwrangler/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/ultraedit/tags.txt b/basis/editors/ultraedit/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/ultraedit/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/vim/generate-syntax/tags.txt b/basis/editors/vim/generate-syntax/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/vim/generate-syntax/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/vim/tags.txt b/basis/editors/vim/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/vim/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/editors/wordpad/tags.txt b/basis/editors/wordpad/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/wordpad/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/backend/tags.txt b/basis/io/unix/backend/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/backend/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/bsd/tags.txt b/basis/io/unix/bsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/bsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/epoll/tags.txt b/basis/io/unix/epoll/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/epoll/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/files/tags.txt b/basis/io/unix/files/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/files/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/files/unique/tags.txt b/basis/io/unix/files/unique/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/files/unique/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/freebsd/tags.txt b/basis/io/unix/freebsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/freebsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/kqueue/tags.txt b/basis/io/unix/kqueue/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/kqueue/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/launcher/parser/tags.txt b/basis/io/unix/launcher/parser/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/launcher/parser/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/launcher/tags.txt b/basis/io/unix/launcher/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/launcher/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/linux/monitors/tags.txt b/basis/io/unix/linux/monitors/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/linux/monitors/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/linux/tags.txt b/basis/io/unix/linux/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/linux/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/macosx/monitors/tags.txt b/basis/io/unix/macosx/monitors/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/macosx/monitors/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/macosx/tags.txt b/basis/io/unix/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/mmap/tags.txt b/basis/io/unix/mmap/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/mmap/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/netbsd/tags.txt b/basis/io/unix/netbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/netbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/openbsd/tags.txt b/basis/io/unix/openbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/openbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/pipes/tags.txt b/basis/io/unix/pipes/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/pipes/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/select/tags.txt b/basis/io/unix/select/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/select/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/sockets/secure/tags.txt b/basis/io/unix/sockets/secure/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/sockets/secure/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/sockets/tags.txt b/basis/io/unix/sockets/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/sockets/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/unix/tags.txt b/basis/io/unix/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/files/tags.txt b/basis/io/windows/files/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/files/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/files/unique/tags.txt b/basis/io/windows/files/unique/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/files/unique/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/launcher/tags.txt b/basis/io/windows/launcher/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/launcher/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/mmap/tags.txt b/basis/io/windows/mmap/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/mmap/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/backend/tags.txt b/basis/io/windows/nt/backend/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/backend/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/files/tags.txt b/basis/io/windows/nt/files/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/files/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/launcher/tags.txt b/basis/io/windows/nt/launcher/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/launcher/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/monitors/tags.txt b/basis/io/windows/nt/monitors/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/monitors/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/pipes/tags.txt b/basis/io/windows/nt/pipes/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/pipes/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/privileges/tags.txt b/basis/io/windows/nt/privileges/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/privileges/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/sockets/tags.txt b/basis/io/windows/nt/sockets/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/sockets/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/nt/tags.txt b/basis/io/windows/nt/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/nt/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/privileges/tags.txt b/basis/io/windows/privileges/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/privileges/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/sockets/tags.txt b/basis/io/windows/sockets/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/windows/sockets/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/io/windows/tags.txt b/basis/io/windows/tags.txt
index 8e1a55995e..02ec70f741 100644
--- a/basis/io/windows/tags.txt
+++ b/basis/io/windows/tags.txt
@@ -1 +1,2 @@
+unportable
 windows
diff --git a/basis/random/unix/tags.txt b/basis/random/unix/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/random/unix/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/random/windows/tags.txt b/basis/random/windows/tags.txt
index 8e1a55995e..02ec70f741 100644
--- a/basis/random/windows/tags.txt
+++ b/basis/random/windows/tags.txt
@@ -1 +1,2 @@
+unportable
 windows
diff --git a/basis/tools/deploy/macosx/tags.txt b/basis/tools/deploy/macosx/tags.txt
index ef1aab0d0e..660d511420 100644
--- a/basis/tools/deploy/macosx/tags.txt
+++ b/basis/tools/deploy/macosx/tags.txt
@@ -1 +1,2 @@
+unportable
 tools
diff --git a/basis/tools/deploy/unix/tags.txt b/basis/tools/deploy/unix/tags.txt
index ef1aab0d0e..660d511420 100644
--- a/basis/tools/deploy/unix/tags.txt
+++ b/basis/tools/deploy/unix/tags.txt
@@ -1 +1,2 @@
+unportable
 tools
diff --git a/basis/tools/deploy/windows/tags.txt b/basis/tools/deploy/windows/tags.txt
index 6eee6b9766..b58a515ed8 100644
--- a/basis/tools/deploy/windows/tags.txt
+++ b/basis/tools/deploy/windows/tags.txt
@@ -1,2 +1,3 @@
+unportable
 windows
 tools
diff --git a/basis/tools/vocabs/vocabs.factor b/basis/tools/vocabs/vocabs.factor
index 442e15935c..6328a3d06d 100755
--- a/basis/tools/vocabs/vocabs.factor
+++ b/basis/tools/vocabs/vocabs.factor
@@ -232,39 +232,15 @@ M: vocab-link summary vocab-summary ;
 MEMO: all-vocabs-seq ( -- seq )
     all-vocabs values concat ;
 
-: dangerous? ( name -- ? )
-    #! Hack
-    {
-        { [ "cpu." ?head ] [ t ] }
-        { [ "io.unix" ?head ] [ t ] }
-        { [ "io.windows" ?head ] [ t ] }
-        { [ "ui.x11" ?head ] [ t ] }
-        { [ "ui.windows" ?head ] [ t ] }
-        { [ "ui.cocoa" ?head ] [ t ] }
-        { [ "cocoa" ?head ] [ t ] }
-        { [ "core-foundation" ?head ] [ t ] }
-        { [ "vocabs.loader.test" ?head ] [ t ] }
-        { [ "editors." ?head ] [ t ] }
-        { [ ".windows" ?tail ] [ t ] }
-        { [ ".unix" ?tail ] [ t ] }
-        { [ "unix" ?head ] [ t ] }
-        { [ ".linux" ?tail ] [ t ] }
-        { [ ".bsd" ?tail ] [ t ] }
-        { [ ".macosx" ?tail ] [ t ] }
-        { [ "windows." ?head ] [ t ] }
-        { [ "cocoa" ?head ] [ t ] }
-        { [ ".test" ?tail ] [ t ] }
-        { [ "raptor" ?head ] [ t ] }
-        { [ dup "tools.deploy.app" = ] [ t ] }
-        [ f ]
-    } cond nip ;
+: unportable? ( name -- ? )
+    vocab-tags "unportable" swap member? ;
 
-: filter-dangerous ( seq -- seq' )
-    [ vocab-name dangerous? not ] filter ;
+: filter-unportable ( seq -- seq' )
+    [ vocab-name unportable? not ] filter ;
 
 : try-everything ( -- failures )
     all-vocabs-seq
-    filter-dangerous
+    filter-unportable
     require-all ;
 
 : load-everything ( -- )
diff --git a/basis/unix/bsd/freebsd/tags.txt b/basis/unix/bsd/freebsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/bsd/freebsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/bsd/macosx/tags.txt b/basis/unix/bsd/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/bsd/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/bsd/netbsd/tags.txt b/basis/unix/bsd/netbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/bsd/netbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/bsd/openbsd/tags.txt b/basis/unix/bsd/openbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/bsd/openbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/bsd/tags.txt b/basis/unix/bsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/bsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/kqueue/freebsd/tags.txt b/basis/unix/kqueue/freebsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/kqueue/freebsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/kqueue/macosx/tags.txt b/basis/unix/kqueue/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/kqueue/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/kqueue/netbsd/tags.txt b/basis/unix/kqueue/netbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/kqueue/netbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/kqueue/openbsd/tags.txt b/basis/unix/kqueue/openbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/kqueue/openbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/kqueue/tags.txt b/basis/unix/kqueue/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/kqueue/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/epoll/tags.txt b/basis/unix/linux/epoll/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/epoll/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/fs/tags.txt b/basis/unix/linux/fs/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/fs/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/if/tags.txt b/basis/unix/linux/if/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/if/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/ifreq/tags.txt b/basis/unix/linux/ifreq/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/ifreq/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/inotify/tags.txt b/basis/unix/linux/inotify/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/inotify/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/route/tags.txt b/basis/unix/linux/route/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/route/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/sockios/tags.txt b/basis/unix/linux/sockios/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/sockios/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/swap/tags.txt b/basis/unix/linux/swap/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/swap/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/linux/tags.txt b/basis/unix/linux/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/linux/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/process/tags.txt b/basis/unix/process/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/process/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/solaris/tags.txt b/basis/unix/solaris/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/solaris/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/freebsd/32/tags.txt b/basis/unix/stat/freebsd/32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/freebsd/32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/freebsd/64/tags.txt b/basis/unix/stat/freebsd/64/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/freebsd/64/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/freebsd/tags.txt b/basis/unix/stat/freebsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/freebsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/linux/32/tags.txt b/basis/unix/stat/linux/32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/linux/32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/linux/64/tags.txt b/basis/unix/stat/linux/64/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/linux/64/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/linux/tags.txt b/basis/unix/stat/linux/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/linux/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/macosx/tags.txt b/basis/unix/stat/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/netbsd/32/tags.txt b/basis/unix/stat/netbsd/32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/netbsd/32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/netbsd/64/tags.txt b/basis/unix/stat/netbsd/64/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/netbsd/64/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/netbsd/tags.txt b/basis/unix/stat/netbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/netbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/openbsd/tags.txt b/basis/unix/stat/openbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/openbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/stat/tags.txt b/basis/unix/stat/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/stat/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/tags.txt b/basis/unix/tags.txt
index bb863cf9a0..2320bdd648 100644
--- a/basis/unix/tags.txt
+++ b/basis/unix/tags.txt
@@ -1 +1,2 @@
+unportable
 bindings
diff --git a/basis/unix/time/tags.txt b/basis/unix/time/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/time/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/freebsd/tags.txt b/basis/unix/types/freebsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/freebsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/linux/tags.txt b/basis/unix/types/linux/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/linux/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/macosx/tags.txt b/basis/unix/types/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/netbsd/32/tags.txt b/basis/unix/types/netbsd/32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/netbsd/32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/netbsd/64/tags.txt b/basis/unix/types/netbsd/64/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/netbsd/64/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/netbsd/tags.txt b/basis/unix/types/netbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/netbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/openbsd/tags.txt b/basis/unix/types/openbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/openbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/types/tags.txt b/basis/unix/types/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/unix/types/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/advapi32/tags.txt b/basis/windows/advapi32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/advapi32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/ce/tags.txt b/basis/windows/ce/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/ce/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/com/syntax/tags.txt b/basis/windows/com/syntax/tags.txt
index 49139bab66..71c5900baf 100644
--- a/basis/windows/com/syntax/tags.txt
+++ b/basis/windows/com/syntax/tags.txt
@@ -1,3 +1,4 @@
-windows
-com
-bindings
+unportable
+windows
+com
+bindings
diff --git a/basis/windows/com/tags.txt b/basis/windows/com/tags.txt
index 49139bab66..71c5900baf 100644
--- a/basis/windows/com/tags.txt
+++ b/basis/windows/com/tags.txt
@@ -1,3 +1,4 @@
-windows
-com
-bindings
+unportable
+windows
+com
+bindings
diff --git a/basis/windows/com/wrapper/tags.txt b/basis/windows/com/wrapper/tags.txt
index ffb665dc8f..71c5900baf 100644
--- a/basis/windows/com/wrapper/tags.txt
+++ b/basis/windows/com/wrapper/tags.txt
@@ -1,3 +1,4 @@
+unportable
 windows
 com
 bindings
diff --git a/basis/windows/dinput/constants/tags.txt b/basis/windows/dinput/constants/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/dinput/constants/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/dinput/tags.txt b/basis/windows/dinput/tags.txt
index 5aebfa6848..1431506222 100755
--- a/basis/windows/dinput/tags.txt
+++ b/basis/windows/dinput/tags.txt
@@ -1,2 +1,3 @@
+unportable
 windows
 bindings
diff --git a/basis/windows/dragdrop-listener/tags.txt b/basis/windows/dragdrop-listener/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/dragdrop-listener/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/errors/tags.txt b/basis/windows/errors/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/errors/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/gdi32/tags.txt b/basis/windows/gdi32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/gdi32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/kernel32/tags.txt b/basis/windows/kernel32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/kernel32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/messages/tags.txt b/basis/windows/messages/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/messages/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/nt/tags.txt b/basis/windows/nt/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/nt/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/ole32/tags.txt b/basis/windows/ole32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/ole32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/opengl32/tags.txt b/basis/windows/opengl32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/opengl32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/shell32/tags.txt b/basis/windows/shell32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/shell32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/tags.txt b/basis/windows/tags.txt
index 5aebfa6848..1431506222 100644
--- a/basis/windows/tags.txt
+++ b/basis/windows/tags.txt
@@ -1,2 +1,3 @@
+unportable
 windows
 bindings
diff --git a/basis/windows/time/tags.txt b/basis/windows/time/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/time/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/types/tags.txt b/basis/windows/types/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/types/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/user32/tags.txt b/basis/windows/user32/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/user32/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/windows/winsock/tags.txt b/basis/windows/winsock/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/windows/winsock/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/x11/windows/tags.txt b/basis/x11/windows/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/x11/windows/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/core/vocabs/loader/test/a/tags.txt b/core/vocabs/loader/test/a/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/core/vocabs/loader/test/a/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/core/vocabs/loader/test/b/tags.txt b/core/vocabs/loader/test/b/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/core/vocabs/loader/test/b/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/core/vocabs/loader/test/c/tags.txt b/core/vocabs/loader/test/c/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/core/vocabs/loader/test/c/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/core/vocabs/loader/test/d/tags.txt b/core/vocabs/loader/test/d/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/core/vocabs/loader/test/d/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/game-input/backend/dinput/tags.txt b/extra/game-input/backend/dinput/tags.txt
index 70912457cb..9098dfdba4 100755
--- a/extra/game-input/backend/dinput/tags.txt
+++ b/extra/game-input/backend/dinput/tags.txt
@@ -1,3 +1,4 @@
+unportable
 input
 gamepads
 joysticks
diff --git a/extra/game-input/backend/iokit/tags.txt b/extra/game-input/backend/iokit/tags.txt
index b3bc4f873b..704b10bc4c 100644
--- a/extra/game-input/backend/iokit/tags.txt
+++ b/extra/game-input/backend/iokit/tags.txt
@@ -1,3 +1,4 @@
+unportable
 gamepads
 joysticks
 mac
diff --git a/extra/hardware-info/linux/tags.txt b/extra/hardware-info/linux/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/hardware-info/linux/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/hardware-info/macosx/tags.txt b/extra/hardware-info/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/hardware-info/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/hardware-info/windows/tags.txt b/extra/hardware-info/windows/tags.txt
index 8e1a55995e..02ec70f741 100644
--- a/extra/hardware-info/windows/tags.txt
+++ b/extra/hardware-info/windows/tags.txt
@@ -1 +1,2 @@
+unportable
 windows
diff --git a/extra/micros/unix/tags.txt b/extra/micros/unix/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/micros/unix/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/micros/windows/tags.txt b/extra/micros/windows/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/micros/windows/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/openal/macosx/tags.txt b/extra/openal/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/openal/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/opengl/gl/macosx/tags.txt b/extra/opengl/gl/macosx/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/opengl/gl/macosx/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/opengl/gl/unix/tags.txt b/extra/opengl/gl/unix/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/opengl/gl/unix/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/opengl/gl/windows/tags.txt b/extra/opengl/gl/windows/tags.txt
index 8e1a55995e..02ec70f741 100644
--- a/extra/opengl/gl/windows/tags.txt
+++ b/extra/opengl/gl/windows/tags.txt
@@ -1 +1,2 @@
+unportable
 windows
diff --git a/extra/raptor/cron/tags.txt b/extra/raptor/cron/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/raptor/cron/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/raptor/tags.txt b/extra/raptor/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/raptor/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/ui/cocoa/tags.txt b/extra/ui/cocoa/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/ui/cocoa/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/ui/cocoa/tools/tags.txt b/extra/ui/cocoa/tools/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/ui/cocoa/tools/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/ui/cocoa/views/tags.txt b/extra/ui/cocoa/views/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/ui/cocoa/views/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/ui/windows/tags.txt b/extra/ui/windows/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/ui/windows/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/extra/ui/x11/tags.txt b/extra/ui/x11/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/ui/x11/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/cpu/arm/4/4.factor b/unmaintained/arm/4/4.factor
similarity index 100%
rename from basis/cpu/arm/4/4.factor
rename to unmaintained/arm/4/4.factor
diff --git a/basis/cpu/arm/4/authors.txt b/unmaintained/arm/4/authors.txt
similarity index 100%
rename from basis/cpu/arm/4/authors.txt
rename to unmaintained/arm/4/authors.txt
diff --git a/basis/cpu/arm/4/summary.txt b/unmaintained/arm/4/summary.txt
similarity index 100%
rename from basis/cpu/arm/4/summary.txt
rename to unmaintained/arm/4/summary.txt
diff --git a/basis/cpu/arm/allot/allot.factor b/unmaintained/arm/allot/allot.factor
similarity index 100%
rename from basis/cpu/arm/allot/allot.factor
rename to unmaintained/arm/allot/allot.factor
diff --git a/basis/cpu/arm/allot/authors.txt b/unmaintained/arm/allot/authors.txt
similarity index 100%
rename from basis/cpu/arm/allot/authors.txt
rename to unmaintained/arm/allot/authors.txt
diff --git a/basis/cpu/arm/architecture/architecture.factor b/unmaintained/arm/architecture/architecture.factor
similarity index 100%
rename from basis/cpu/arm/architecture/architecture.factor
rename to unmaintained/arm/architecture/architecture.factor
diff --git a/basis/cpu/arm/architecture/authors.txt b/unmaintained/arm/architecture/authors.txt
similarity index 100%
rename from basis/cpu/arm/architecture/authors.txt
rename to unmaintained/arm/architecture/authors.txt
diff --git a/basis/cpu/arm/arm.factor b/unmaintained/arm/arm.factor
similarity index 100%
rename from basis/cpu/arm/arm.factor
rename to unmaintained/arm/arm.factor
diff --git a/basis/cpu/arm/assembler/assembler-tests.factor b/unmaintained/arm/assembler/assembler-tests.factor
similarity index 100%
rename from basis/cpu/arm/assembler/assembler-tests.factor
rename to unmaintained/arm/assembler/assembler-tests.factor
diff --git a/basis/cpu/arm/assembler/assembler.factor b/unmaintained/arm/assembler/assembler.factor
similarity index 100%
rename from basis/cpu/arm/assembler/assembler.factor
rename to unmaintained/arm/assembler/assembler.factor
diff --git a/basis/cpu/arm/assembler/authors.txt b/unmaintained/arm/assembler/authors.txt
similarity index 100%
rename from basis/cpu/arm/assembler/authors.txt
rename to unmaintained/arm/assembler/authors.txt
diff --git a/basis/cpu/arm/authors.txt b/unmaintained/arm/authors.txt
similarity index 100%
rename from basis/cpu/arm/authors.txt
rename to unmaintained/arm/authors.txt
diff --git a/basis/cpu/arm/bootstrap.factor b/unmaintained/arm/bootstrap.factor
similarity index 100%
rename from basis/cpu/arm/bootstrap.factor
rename to unmaintained/arm/bootstrap.factor
diff --git a/basis/cpu/arm/intrinsics/authors.txt b/unmaintained/arm/intrinsics/authors.txt
similarity index 100%
rename from basis/cpu/arm/intrinsics/authors.txt
rename to unmaintained/arm/intrinsics/authors.txt
diff --git a/basis/cpu/arm/intrinsics/intrinsics.factor b/unmaintained/arm/intrinsics/intrinsics.factor
similarity index 100%
rename from basis/cpu/arm/intrinsics/intrinsics.factor
rename to unmaintained/arm/intrinsics/intrinsics.factor
diff --git a/basis/cpu/arm/summary.txt b/unmaintained/arm/summary.txt
similarity index 100%
rename from basis/cpu/arm/summary.txt
rename to unmaintained/arm/summary.txt
diff --git a/basis/cpu/arm/tags.txt b/unmaintained/arm/tags.txt
similarity index 100%
rename from basis/cpu/arm/tags.txt
rename to unmaintained/arm/tags.txt

From 6047429401aa6790ba6ca9c6832f30d3327ec36f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 16:57:30 -0500
Subject: [PATCH 50/77] More unit test fixes

---
 basis/compiler/tests/redefine1.factor | 2 +-
 basis/compiler/tests/redefine2.factor | 2 +-
 basis/compiler/tests/redefine3.factor | 2 +-
 basis/compiler/tests/simple.factor    | 2 +-
 basis/locals/locals-tests.factor      | 2 +-
 core/bootstrap/stage1.factor          | 3 +--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/basis/compiler/tests/redefine1.factor b/basis/compiler/tests/redefine1.factor
index d448d031b9..6773eb6b6a 100644
--- a/basis/compiler/tests/redefine1.factor
+++ b/basis/compiler/tests/redefine1.factor
@@ -1,7 +1,7 @@
 IN: compiler.tests
 USING: accessors compiler compiler.units tools.test math parser
 kernel sequences sequences.private classes.mixin generic
-definitions arrays words assocs ;
+definitions arrays words assocs eval ;
 
 GENERIC: method-redefine-test ( a -- b )
 
diff --git a/basis/compiler/tests/redefine2.factor b/basis/compiler/tests/redefine2.factor
index 107381c4d3..c20a6d6233 100644
--- a/basis/compiler/tests/redefine2.factor
+++ b/basis/compiler/tests/redefine2.factor
@@ -1,7 +1,7 @@
 IN: compiler.tests
 USING: compiler compiler.units tools.test math parser kernel
 sequences sequences.private classes.mixin generic definitions
-arrays words assocs ;
+arrays words assocs eval ;
 
 DEFER: blah
 
diff --git a/basis/compiler/tests/redefine3.factor b/basis/compiler/tests/redefine3.factor
index f7175aac55..941d086312 100644
--- a/basis/compiler/tests/redefine3.factor
+++ b/basis/compiler/tests/redefine3.factor
@@ -1,7 +1,7 @@
 IN: compiler.tests
 USING: accessors compiler compiler.units tools.test math parser
 kernel sequences sequences.private classes.mixin generic
-definitions arrays words assocs ;
+definitions arrays words assocs eval ;
 
 GENERIC: sheeple ( obj -- x )
 
diff --git a/basis/compiler/tests/simple.factor b/basis/compiler/tests/simple.factor
index 272f92ec07..c18ab3e335 100755
--- a/basis/compiler/tests/simple.factor
+++ b/basis/compiler/tests/simple.factor
@@ -1,6 +1,6 @@
 USING: compiler.units tools.test kernel kernel.private
 sequences.private math.private math combinators strings
-alien arrays memory vocabs parser ;
+alien arrays memory vocabs parser eval ;
 IN: compiler.tests
 
 ! Test empty word
diff --git a/basis/locals/locals-tests.factor b/basis/locals/locals-tests.factor
index 025e175bc2..23a1ee9284 100755
--- a/basis/locals/locals-tests.factor
+++ b/basis/locals/locals-tests.factor
@@ -1,6 +1,6 @@
 USING: locals math sequences tools.test hashtables words kernel
 namespaces arrays strings prettyprint io.streams.string parser
-accessors generic ;
+accessors generic eval ;
 IN: locals.tests
 
 :: foo ( a b -- a a ) a a ;
diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index f9a0ddce8f..92558561d2 100755
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -7,13 +7,12 @@ init io.files bootstrap.image bootstrap.image.private vocabs
 vocabs.loader system debugger continuations ;
 IN: bootstrap.stage1
 
-{ "resource:core" } vocab-roots set
-
 "Bootstrap stage 1..." print flush
 
 "resource:core/bootstrap/primitives.factor" run-file
 
 load-help? off
+{ "resource:core" } vocab-roots set
 
 ! Create a boot quotation for the target
 [

From 1bb4763927654768fc77659af56999e63eda0ac3 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 16:59:24 -0500
Subject: [PATCH 51/77] Move file

---
 {extra => basis}/windows/ole32/ole32-tests.factor | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {extra => basis}/windows/ole32/ole32-tests.factor (100%)

diff --git a/extra/windows/ole32/ole32-tests.factor b/basis/windows/ole32/ole32-tests.factor
similarity index 100%
rename from extra/windows/ole32/ole32-tests.factor
rename to basis/windows/ole32/ole32-tests.factor

From e61ef195b63dda659a8e73cc29d8da383664ecc2 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 18:44:44 -0500
Subject: [PATCH 52/77] Fix erg's bug

---
 basis/threads/threads-tests.factor |  2 ++
 basis/threads/threads.factor       | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/basis/threads/threads-tests.factor b/basis/threads/threads-tests.factor
index 122b7f1d59..adac84338d 100755
--- a/basis/threads/threads-tests.factor
+++ b/basis/threads/threads-tests.factor
@@ -41,3 +41,5 @@ yield
     ] ;
 
 [ t ] [ spawn-namespace-test ] unit-test
+
+[ "a" [ 1 1 + ] spawn 100 sleep ] must-fail
diff --git a/basis/threads/threads.factor b/basis/threads/threads.factor
index 4b32f4519d..c406d0db12 100755
--- a/basis/threads/threads.factor
+++ b/basis/threads/threads.factor
@@ -4,16 +4,22 @@
 USING: arrays hashtables heaps kernel kernel.private math
 namespaces sequences vectors continuations continuations.private
 dlists assocs system combinators init boxes accessors
-math.order dequeues ;
+math.order dequeues strings quotations ;
 IN: threads
 
 SYMBOL: initial-thread
 
 TUPLE: thread
-name quot exit-handler
-id
-continuation state runnable
-mailbox variables sleep-entry ;
+{ name string }
+{ quot callable initial: [ ] }
+{ exit-handler callable initial: [ ] }
+{ id integer }
+continuation
+state
+runnable
+mailbox
+variables
+sleep-entry ;
 
 : self ( -- thread ) 63 getenv ; inline
 
@@ -62,8 +68,7 @@ PRIVATE>
         swap >>name
         swap >>quot
         \ thread counter >>id
-        <box> >>continuation
-        [ ] >>exit-handler ; inline
+        <box> >>continuation ; inline
 
 : <thread> ( quot name -- thread )
     \ thread new-thread ;
@@ -211,7 +216,7 @@ GENERIC: error-in-thread ( error thread -- )
     <dlist> 65 setenv
     <min-heap> 66 setenv
     initial-thread global
-    [ drop f "Initial" <thread> ] cache
+    [ drop [ ] "Initial" <thread> ] cache
     <box> >>continuation
     t >>runnable
     f >>state

From ed9093c263ae8566725f1dab7baa3fee911899cc Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 18:45:39 -0500
Subject: [PATCH 53/77] Update readme

---
 README.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.txt b/README.txt
index dd7c3e7ad3..754791aa1a 100755
--- a/README.txt
+++ b/README.txt
@@ -146,12 +146,13 @@ usage documentation, enter the following in the UI listener:
 The Factor source tree is organized as follows:
 
   build-support/ - scripts used for compiling Factor
-  core/ - Factor core library and compiler
-  extra/ - more libraries
+  vm/ - sources for the Factor VM, written in C
+  core/ - Factor core library
+  basis/ - Factor basis library, compiler, tools
+  extra/ - more libraries and applications
   fonts/ - TrueType fonts used by UI
   misc/ - editor modes, icons, etc
   unmaintained/ - unmaintained contributions, please help!
-  vm/ - sources for the Factor VM, written in C
 
 * Community
 

From cf104ef0db7370eb15f16b64432587b41bae4198 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 29 Jul 2008 19:09:00 -0500
Subject: [PATCH 54/77] slides: use colors

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

diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index c3c105143e..05aa6779f5 100755
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -3,7 +3,7 @@
 USING: arrays hashtables help.markup help.stylesheet io
 io.styles kernel math models namespaces sequences ui ui.gadgets
 ui.gadgets.books ui.gadgets.panes ui.gestures ui.render
-parser accessors ;
+parser accessors colors ;
 IN: slides
 
 : stylesheet

From 95b097789ce37ef87414a7ff0f80d0352a00fa88 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 29 Jul 2008 19:37:24 -0500
Subject: [PATCH 55/77] Add ui.gadgets.cartesian

---
 extra/ui/gadgets/cartesian/cartesian.factor | 50 +++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 extra/ui/gadgets/cartesian/cartesian.factor

diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/extra/ui/gadgets/cartesian/cartesian.factor
new file mode 100644
index 0000000000..08e04e669e
--- /dev/null
+++ b/extra/ui/gadgets/cartesian/cartesian.factor
@@ -0,0 +1,50 @@
+
+USING: kernel combinators opengl.gl
+       ui.render ui.gadgets ui.gadgets.slate
+       accessors ;
+
+IN: ui.gadgets.cartesian
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: init-slate ( slate -- slate )
+  init-gadget
+  [ ]         >>action
+  { 200 200 } >>pdim
+  [ ]         >>graft
+  [ ]         >>ungraft ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+TUPLE: cartesian < slate x-min x-max y-min y-max z-min z-max perspective ;
+
+: init-cartesian ( cartesian -- cartesian )
+  init-slate
+  -10 >>x-min
+   10 >>x-max
+  -10 >>y-min
+   10 >>y-max
+   -1 >>z-min
+    1 >>z-max ;
+
+: <cartesian> ( -- cartesian ) cartesian new init-cartesian ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+M: cartesian draw-gadget* ( cartesian -- )
+   GL_PROJECTION glMatrixMode
+   glLoadIdentity
+   dup
+       {
+         [ x-min>> ] [ x-max>> ]
+         [ y-min>> ] [ y-max>> ]
+         [ z-min>> ] [ z-max>> ]
+       }
+     cleave
+     glOrtho
+   GL_MODELVIEW glMatrixMode
+   glLoadIdentity
+   call-next-method ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+

From 80c599e9ea7b4783d13385dbe2c2388ee71bc59a Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 29 Jul 2008 21:15:27 -0500
Subject: [PATCH 56/77] automata.ui: Use color objects

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

diff --git a/extra/automata/ui/ui.factor b/extra/automata/ui/ui.factor
index cfb0462877..037cf41118 100644
--- a/extra/automata/ui/ui.factor
+++ b/extra/automata/ui/ui.factor
@@ -30,7 +30,7 @@ IN: automata.ui
 
 : draw-bitmap ( bitmap -- ) GL_POINTS glBegin (draw-bitmap) glEnd ;
 
-: display ( -- ) black gl-color bitmap> draw-bitmap ;
+: display ( -- ) black set-color bitmap> draw-bitmap ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From c7048ccacc266640ec4d4bcc51ef02f7d923eab8 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 29 Jul 2008 21:15:54 -0500
Subject: [PATCH 57/77] ui.gadgets.slate: init-slate

---
 extra/ui/gadgets/slate/slate.factor | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/extra/ui/gadgets/slate/slate.factor b/extra/ui/gadgets/slate/slate.factor
index 2ef740e580..05b2de2e06 100644
--- a/extra/ui/gadgets/slate/slate.factor
+++ b/extra/ui/gadgets/slate/slate.factor
@@ -5,12 +5,19 @@ IN: ui.gadgets.slate
 
 TUPLE: slate < gadget action pdim graft ungraft ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: init-slate ( slate -- slate )
+  init-gadget
+  [ ]         >>action
+  { 200 200 } >>pdim
+  [ ]         >>graft
+  [ ]         >>ungraft ;
+
 : <slate> ( action -- slate )
-  slate new-gadget
-    swap        >>action
-    { 100 100 } >>pdim
-    [ ]         >>graft
-    [ ]         >>ungraft ;
+  slate new
+    init-slate
+    swap >>action ;
 
 M: slate pref-dim* ( slate -- dim ) pdim>> ;
 

From 0b9e6538c0ae6c2428cfba45dfc8801520b1ee79 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 29 Jul 2008 21:16:14 -0500
Subject: [PATCH 58/77] ui.gadgets.cartesian: range words

---
 extra/ui/gadgets/cartesian/cartesian.factor | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/extra/ui/gadgets/cartesian/cartesian.factor
index 08e04e669e..027c1061a8 100644
--- a/extra/ui/gadgets/cartesian/cartesian.factor
+++ b/extra/ui/gadgets/cartesian/cartesian.factor
@@ -1,5 +1,5 @@
 
-USING: kernel combinators opengl.gl
+USING: kernel combinators sequences opengl.gl
        ui.render ui.gadgets ui.gadgets.slate
        accessors ;
 
@@ -7,15 +7,6 @@ IN: ui.gadgets.cartesian
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: init-slate ( slate -- slate )
-  init-gadget
-  [ ]         >>action
-  { 200 200 } >>pdim
-  [ ]         >>graft
-  [ ]         >>ungraft ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 TUPLE: cartesian < slate x-min x-max y-min y-max z-min z-max perspective ;
 
 : init-cartesian ( cartesian -- cartesian )
@@ -48,3 +39,9 @@ M: cartesian draw-gadget* ( cartesian -- )
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+: x-range ( cartesian range -- cartesian ) first2 [ >>x-min ] [ >>x-max ] bi* ;
+: y-range ( cartesian range -- cartesian ) first2 [ >>y-min ] [ >>y-max ] bi* ;
+: z-range ( cartesian range -- cartesian ) first2 [ >>z-min ] [ >>z-max ] bi* ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+

From 6ac694f70fdbbf218c0b3bcc76af38779a9d8070 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 29 Jul 2008 21:16:34 -0500
Subject: [PATCH 59/77] golden-section: Use cartesian gadget

---
 extra/golden-section/golden-section.factor | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/extra/golden-section/golden-section.factor b/extra/golden-section/golden-section.factor
index 807ef1355a..05e7f68d0a 100644
--- a/extra/golden-section/golden-section.factor
+++ b/extra/golden-section/golden-section.factor
@@ -2,7 +2,7 @@
 USING: kernel namespaces math math.constants math.functions math.order
        arrays sequences
        opengl opengl.gl opengl.glu ui ui.render ui.gadgets ui.gadgets.theme
-       ui.gadgets.slate colors accessors combinators.cleave
+       ui.gadgets.cartesian colors accessors combinators.cleave
        processing.shapes ;
 
 IN: golden-section
@@ -39,20 +39,17 @@ IN: golden-section
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: display ( -- )
-  GL_PROJECTION glMatrixMode
-  glLoadIdentity
-  -400 400 -400 400 -1 1 glOrtho
-  GL_MODELVIEW glMatrixMode
-  glLoadIdentity
-  golden-section ;
-
 : golden-section-window ( -- )
     [
-      [ display ] <slate>
-        { 600 600 } >>pdim
+      <cartesian>
+        {  600 600 }       >>pdim
+        { -400 400 }       x-range
+        { -400 400 }       y-range
+        [ golden-section ] >>action
       "Golden Section" open-window
     ]
   with-ui ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 MAIN: golden-section-window

From 6726b0b92025e58091f89d222cbfb069357b3b78 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 21:31:58 -0500
Subject: [PATCH 60/77] Fix typo

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

diff --git a/core/generic/generic.factor b/core/generic/generic.factor
index a621c7fa91..80cf790b23 100755
--- a/core/generic/generic.factor
+++ b/core/generic/generic.factor
@@ -39,7 +39,7 @@ GENERIC: effective-method ( generic -- method )
     order [ class<= ] with filter reverse dup length 1 =
     [ drop f ] [ second ] if ;
 
-: next-method ( class generic -- class/f )
+: next-method ( class generic -- method/f )
     [ next-method-class ] keep method ;
 
 GENERIC: next-method-quot* ( class generic combination -- quot )

From 45c1da32eb3e10f96bcdaee3df6c7cf7cf33bebe Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 03:38:10 -0500
Subject: [PATCH 61/77] Propagation now does method inlining; working on
 cleanup pass

---
 .../compiler/tree/builder/builder-docs.factor |   6 +-
 .../compiler/tree/builder/builder.factor      |  14 +-
 .../tree/cleanup/cleanup-tests.factor         | 578 ++++++++++++++++++
 .../compiler/tree/cleanup/cleanup.factor      | 103 +++-
 .../tree/combinators/combinators-tests.factor |   1 +
 .../tree/combinators/combinators.factor       |  20 +-
 .../tree/copy-equiv/copy-equiv.factor         |  12 +-
 .../tree/loop/detection/detection.factor      |   5 +
 .../tree/normalization/normalization.factor   |  11 +-
 .../tree/propagation/branches/branches.factor |  42 +-
 .../constraints/constraints.factor            |   3 -
 .../tree/propagation/info/info-tests.factor   |  10 +-
 .../tree/propagation/info/info.factor         |  11 +-
 .../tree/propagation/inlining/inlining.factor | 141 +++++
 .../known-words/known-words.factor            |   4 +-
 .../tree/propagation/nodes/nodes.factor       |  21 +-
 .../tree/propagation/propagation-tests.factor |  44 +-
 .../tree/propagation/propagation.factor       |  12 +-
 .../propagation/recursive/recursive.factor    |   6 +-
 .../tree/propagation/simple/simple.factor     | 120 ++--
 .../tree/propagation/slots/slots.factor       | 103 ++--
 unfinished/compiler/tree/tree.factor          |   6 +-
 .../stack-checker/branches/branches.factor    |   5 +-
 .../stack-checker/inlining/inlining.factor    |   4 +-
 24 files changed, 1064 insertions(+), 218 deletions(-)
 create mode 100644 unfinished/compiler/tree/cleanup/cleanup-tests.factor
 create mode 100644 unfinished/compiler/tree/loop/detection/detection.factor

diff --git a/unfinished/compiler/tree/builder/builder-docs.factor b/unfinished/compiler/tree/builder/builder-docs.factor
index 77b6193f8f..7829cd0460 100644
--- a/unfinished/compiler/tree/builder/builder-docs.factor
+++ b/unfinished/compiler/tree/builder/builder-docs.factor
@@ -23,14 +23,14 @@ $nl
 { $subsection specialized-def } ;
 
 HELP: build-tree
-{ $values { "quot" quotation } { "dataflow" node } }
+{ $values { "quot" quotation } { "nodes" "a sequence of nodes" } }
 { $description "Attempts to construct tree SSA IR from a quotation." }
 { $notes "This is the first stage of the compiler." }
 { $errors "Throws an " { $link inference-error } " if stack effect inference fails." } ;
 
 HELP: build-tree-with
-{ $values { "quot" quotation } { "stack" sequence } { "dataflow" node } }
-{ $description "Attempts to construct tree SSA IR from a quotaiton, starting with an initial data stack of values." }
+{ $values { "in-stack" "a sequence of values" } { "quot" quotation } { "nodes" "a sequence of nodes" } { "out-stack" "a sequence of values" } }
+{ $description "Attempts to construct tree SSA IR from a quotaiton, starting with an initial data stack of values, and outputting stack resulting at the end." }
 { $errors "Throws an " { $link inference-error } " if stack effect inference fails." } ;
 
 HELP: specialized-def
diff --git a/unfinished/compiler/tree/builder/builder.factor b/unfinished/compiler/tree/builder/builder.factor
index c390658597..afa57556ca 100644
--- a/unfinished/compiler/tree/builder/builder.factor
+++ b/unfinished/compiler/tree/builder/builder.factor
@@ -11,16 +11,16 @@ IN: compiler.tree.builder
     [ V{ } clone stack-visitor set ] prepose
     with-infer ; inline
 
-GENERIC# build-tree-with 1 ( quot stack -- nodes )
+: build-tree ( quot -- nodes )
+    #! Not safe to call from inference transforms.
+    [ f infer-quot ] with-tree-builder nip ;
 
-M: callable build-tree-with
+: build-tree-with ( in-stack quot -- nodes out-stack )
     #! Not safe to call from inference transforms.
     [
-        >vector meta-d set
-        f infer-quot
-    ] with-tree-builder nip ;
-
-: build-tree ( quot -- nodes ) f build-tree-with ;
+        [ >vector meta-d set ] [ f infer-quot ] bi*
+    ] with-tree-builder nip
+    unclip-last in-d>> ;
 
 : (make-specializer) ( class picker -- quot )
     swap "predicate" word-prop append ;
diff --git a/unfinished/compiler/tree/cleanup/cleanup-tests.factor b/unfinished/compiler/tree/cleanup/cleanup-tests.factor
new file mode 100644
index 0000000000..75477508c9
--- /dev/null
+++ b/unfinished/compiler/tree/cleanup/cleanup-tests.factor
@@ -0,0 +1,578 @@
+IN: compiler.tree.cleanup.tests
+USING: tools.test kernel.private kernel arrays sequences
+math.private math generic words quotations alien alien.c-types
+strings sbufs sequences.private slots.private combinators
+definitions system layouts vectors math.partial-dispatch
+math.order math.functions accessors hashtables classes assocs
+io.encodings.utf8 io.encodings.ascii io.encodings fry
+compiler.tree
+compiler.tree.combinators
+compiler.tree.cleanup
+compiler.tree.builder
+compiler.tree.copy-equiv
+compiler.tree.normalization
+compiler.tree.propagation ;
+
+: cleaned-up-tree ( quot -- nodes )
+    build-tree normalize compute-copy-equiv propagate cleanup ;
+
+[ t ] [ [ [ 1 ] [ 2 ] if ] cleaned-up-tree [ #if? ] contains-node? ] unit-test
+
+[ f ] [ [ f [ 1 ] [ 2 ] if ] cleaned-up-tree [ #if? ] contains-node? ] unit-test
+
+[ f ] [ [ { array } declare [ 1 ] [ 2 ] if ] cleaned-up-tree [ #if? ] contains-node? ] unit-test
+
+[ t ] [ [ { sequence } declare [ 1 ] [ 2 ] if ] cleaned-up-tree [ #if? ] contains-node? ] unit-test
+
+: recursive-test ( a -- b ) dup [ not recursive-test ] when ; inline recursive
+
+[ t ] [ [ recursive-test ] cleaned-up-tree [ #recursive? ] contains-node? ] unit-test
+
+[ f ] [ [ f recursive-test ] cleaned-up-tree [ #recursive? ] contains-node? ] unit-test
+
+[ t ] [ [ t recursive-test ] cleaned-up-tree [ #recursive? ] contains-node? ] unit-test
+
+: inlined? ( quot seq/word -- ? )
+    [ cleaned-up-tree ] dip
+    dup word? [ 1array ] when
+    '[ dup #call? [ word>> , member? ] [ drop f ] if ]
+    contains-node? not ;
+
+[ f ] [
+    [ { integer } declare >fixnum ]
+    \ >fixnum inlined?
+] unit-test
+
+GENERIC: mynot ( x -- y )
+
+M: f mynot drop t ;
+
+M: object mynot drop f ;
+
+GENERIC: detect-f ( x -- y )
+
+M: f detect-f ;
+
+[ t ] [
+    [ dup [ mynot ] [ ] if detect-f ] \ detect-f inlined?
+] unit-test
+
+GENERIC: xyz ( n -- n )
+
+M: integer xyz ;
+
+M: object xyz ;
+
+[ t ] [
+    [ { integer } declare xyz ] \ xyz inlined?
+] unit-test
+
+[ t ] [
+    [ dup fixnum? [ xyz ] [ drop "hi" ] if ]
+    \ xyz inlined?
+] unit-test
+
+: (fx-repeat) ( i n quot: ( i -- i ) -- )
+    2over fixnum>= [
+        3drop
+    ] [
+        [ swap >r call 1 fixnum+fast r> ] keep (fx-repeat)
+    ] if ; inline recursive
+
+: fx-repeat ( n quot -- )
+    0 -rot (fx-repeat) ; inline
+
+! The + should be optimized into fixnum+, if it was not, then
+! the type of the loop index was not inferred correctly
+[ t ] [
+    [ [ dup 2 + drop ] fx-repeat ] \ + inlined?
+] unit-test
+
+: (i-repeat) ( i n quot: ( i -- i ) -- )
+    2over dup xyz drop >= [
+        3drop
+    ] [
+        [ swap >r call 1+ r> ] keep (i-repeat)
+    ] if ; inline recursive
+
+: i-repeat >r { integer } declare r> 0 -rot (i-repeat) ; inline
+
+[ t ] [
+    [ [ dup xyz drop ] i-repeat ] \ xyz inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare dup 100 >= [ 1 + ] unless ] \ fixnum+ inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum fixnum } declare dupd < [ 1 + 1 + ] when ]
+    \ + inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum fixnum } declare dupd < [ 1 + 1 + ] when ]
+    \ + inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare [ ] times ] \ >= inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare [ ] times ] \ 1+ inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare [ ] times ] \ + inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare [ ] times ] \ fixnum+ inlined?
+] unit-test
+
+[ t ] [
+    [ { integer fixnum } declare dupd < [ 1 + ] when ]
+    \ + inlined?
+] unit-test
+
+[ f ] [
+    [ { integer fixnum } declare dupd < [ 1 + ] when ]
+    \ +-integer-fixnum inlined?
+] unit-test
+
+[ f ] [ [ dup 0 < [ neg ] when ] \ - inlined? ] unit-test
+
+[ f ] [
+    [
+        [ no-cond ] 1
+        [ 1array dup quotation? [ >quotation ] unless ] times
+    ] \ quotation? inlined?
+] unit-test
+
+[ t ] [
+    [
+        1000000000000000000000000000000000 [ ] times
+    ] \ + inlined?
+] unit-test
+[ f ] [
+    [
+        1000000000000000000000000000000000 [ ] times
+    ] \ +-integer-fixnum inlined?
+] unit-test
+
+[ f ] [
+    [ { bignum } declare [ ] times ]
+    \ +-integer-fixnum inlined?
+] unit-test
+
+
+[ t ] [
+    [ { string sbuf } declare ] \ push-all def>> append \ + inlined?
+] unit-test
+
+[ t ] [
+    [ { string sbuf } declare ] \ push-all def>> append \ fixnum+ inlined?
+] unit-test
+
+[ t ] [
+    [ { string sbuf } declare ] \ push-all def>> append \ >fixnum inlined?
+] unit-test
+
+[ t ] [
+    [ { array-capacity } declare 0 < ] \ < inlined?
+] unit-test
+
+[ t ] [
+    [ { array-capacity } declare 0 < ] \ fixnum< inlined?
+] unit-test
+
+[ t ] [
+    [ { array-capacity } declare 1 fixnum- ] \ fixnum- inlined?
+] unit-test
+
+[ t ] [
+    [ 5000 [ 5000 [ ] times ] times ] \ 1+ inlined?
+] unit-test
+
+[ t ] [
+    [ 5000 [ [ ] times ] each ] \ 1+ inlined?
+] unit-test
+
+[ t ] [
+    [ 5000 0 [ dup 2 - swap [ 2drop ] curry each ] reduce ]
+    \ 1+ inlined?
+] unit-test
+
+GENERIC: annotate-entry-test-1 ( x -- )
+
+M: fixnum annotate-entry-test-1 drop ;
+
+: (annotate-entry-test-2) ( from to quot: ( -- ) -- )
+    2over >= [
+        3drop
+    ] [
+        [ swap >r call dup annotate-entry-test-1 1+ r> ] keep (annotate-entry-test-2)
+    ] if ; inline recursive
+
+: annotate-entry-test-2 0 -rot (annotate-entry-test-2) ; inline
+
+[ f ] [
+    [ { bignum } declare [ ] annotate-entry-test-2 ]
+    \ annotate-entry-test-1 inlined?
+] unit-test
+
+[ t ] [
+    [ { float } declare 10 [ 2.3 * ] times >float ]
+    \ >float inlined?
+] unit-test
+
+GENERIC: detect-float ( a -- b )
+
+M: float detect-float ;
+
+[ t ] [
+    [ { real float } declare + detect-float ]
+    \ detect-float inlined?
+] unit-test
+
+[ t ] [
+    [ { float real } declare + detect-float ]
+    \ detect-float inlined?
+] unit-test
+
+[ t ] [
+    [ 3 + = ] \ equal? inlined?
+] unit-test
+
+[ f ] [
+    [ { fixnum fixnum } declare 7 bitand neg shift ]
+    \ fixnum-shift-fast inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum fixnum } declare 7 bitand neg shift ]
+    { shift fixnum-shift } inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum fixnum } declare 1 swap 7 bitand shift ]
+    { shift fixnum-shift } inlined?
+] unit-test
+
+[ f ] [
+    [ { fixnum fixnum } declare 1 swap 7 bitand shift ]
+    { fixnum-shift-fast } inlined?
+] unit-test
+
+cell-bits 32 = [
+    [ t ] [
+        [ { fixnum fixnum } declare 1 swap 31 bitand shift ]
+        \ shift inlined?
+    ] unit-test
+
+    [ f ] [
+        [ { fixnum fixnum } declare 1 swap 31 bitand shift ]
+        \ fixnum-shift inlined?
+    ] unit-test
+] when
+
+[ f ] [
+    [ { integer } declare -63 shift 4095 bitand ]
+    \ shift inlined?
+] unit-test
+
+[ t ] [
+    [ B{ 1 0 } *short 0 number= ]
+    \ number= inlined?
+] unit-test
+
+[ t ] [
+    [ B{ 1 0 } *short 0 { number number } declare number= ]
+    \ number= inlined?
+] unit-test
+
+[ t ] [
+    [ B{ 1 0 } *short 0 = ]
+    \ number= inlined?
+] unit-test
+
+[ t ] [
+    [ B{ 1 0 } *short dup number? [ 0 number= ] [ drop f ] if ]
+    \ number= inlined?
+] unit-test
+
+[ t ] [
+    [ HEX: ff bitand 0 HEX: ff between? ]
+    \ >= inlined?
+] unit-test
+
+[ t ] [
+    [ HEX: ff swap HEX: ff bitand >= ]
+    \ >= inlined?
+] unit-test
+
+[ t ] [
+    [ { vector } declare nth-unsafe ] \ nth-unsafe inlined?
+] unit-test
+
+[ t ] [
+    [
+        dup integer? [
+            dup fixnum? [
+                1 +
+            ] [
+                2 +
+            ] if
+        ] when
+    ] \ + inlined?
+] unit-test
+
+[ f ] [
+    [
+        256 mod
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ f ] [
+    [
+        dup 0 >= [ 256 mod ] when
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare dup 0 >= [ 256 mod ] when
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare 256 rem
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare [ 256 rem ] map
+    ] { mod fixnum-mod rem } inlined?
+] unit-test
+
+[ t ] [
+    [ 1000 [ 1+ ] map ] { 1+ fixnum+ } inlined?
+] unit-test
+
+: rec ( a -- b )
+    dup 0 > [ 1 - rec ] when ; inline recursive
+
+[ t ] [
+    [ { fixnum } declare rec 1 + ]
+    { > - + } inlined?
+] unit-test
+
+: fib ( m -- n )
+    dup 2 < [ drop 1 ] [ dup 1 - fib swap 2 - fib + ] if ; inline recursive
+
+[ t ] [
+    [ 27.0 fib ] { < - + } inlined?
+] unit-test
+
+[ f ] [
+    [ 27.0 fib ] { +-integer-integer } inlined?
+] unit-test
+
+[ t ] [
+    [ 27 fib ] { < - + } inlined?
+] unit-test
+
+[ t ] [
+    [ 27 >bignum fib ] { < - + } inlined?
+] unit-test
+
+[ f ] [
+    [ 27/2 fib ] { < - } inlined?
+] unit-test
+
+: hang-regression ( m n -- x )
+    over 0 number= [
+        nip
+    ] [
+        dup [
+            drop 1 hang-regression
+        ] [
+            dupd hang-regression hang-regression
+        ] if
+    ] if ; inline recursive
+
+[ t ] [
+    [ dup fixnum? [ 3 over hang-regression ] [ 3 over hang-regression ] if
+] { } inlined? ] unit-test
+
+[ t ] [
+    [ { fixnum } declare 10 [ -1 shift ] times ] \ shift inlined?
+] unit-test
+
+[ f ] [
+    [ { integer } declare 10 [ -1 shift ] times ] \ shift inlined?
+] unit-test
+
+[ f ] [
+    [ { fixnum } declare 1048575 fixnum-bitand 524288 fixnum- ]
+    \ fixnum-bitand inlined?
+] unit-test
+
+[ t ] [
+    [ { integer } declare 127 bitand 3 + ]
+    { + +-integer-fixnum +-integer-fixnum-fast bitand } inlined?
+] unit-test
+
+[ f ] [
+    [ { integer } declare 127 bitand 3 + ]
+    { >fixnum } inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare [ drop ] each-integer ]
+    { < <-integer-fixnum +-integer-fixnum + } inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare length [ drop ] each-integer ]
+    { < <-integer-fixnum +-integer-fixnum + } inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare [ drop ] each ]
+    { < <-integer-fixnum +-integer-fixnum + } inlined?
+] unit-test
+
+[ t ] [
+    [ { fixnum } declare 0 [ + ] reduce ]
+    { < <-integer-fixnum } inlined?
+] unit-test
+
+[ f ] [
+    [ { fixnum } declare 0 [ + ] reduce ]
+    \ +-integer-fixnum inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare
+        dup 0 >= [
+            615949 * 797807 + 20 2^ mod dup 19 2^ -
+        ] [ dup ] if
+    ] { * + shift mod fixnum-mod fixnum* fixnum+ fixnum- } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { fixnum } declare
+        615949 * 797807 + 20 2^ mod dup 19 2^ -
+    ] { >fixnum } inlined?
+] unit-test
+
+[ f ] [
+    [
+        { integer } declare [ ] map
+    ] \ >fixnum inlined?
+] unit-test
+
+[ f ] [
+    [
+        { integer } declare { } set-nth-unsafe
+    ] \ >fixnum inlined?
+] unit-test
+
+[ f ] [
+    [
+        { integer } declare 1 + { } set-nth-unsafe
+    ] \ >fixnum inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare 0 swap
+        [
+            drop 615949 * 797807 + 20 2^ rem dup 19 2^ -
+        ] map
+    ] { * + shift rem mod fixnum-mod fixnum* fixnum+ fixnum- } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { fixnum } declare 0 swap
+        [
+            drop 615949 * 797807 + 20 2^ rem dup 19 2^ -
+        ] map
+    ] { * + shift rem mod fixnum-mod fixnum* fixnum+ fixnum- >fixnum } inlined?
+] unit-test
+
+[ t ] [
+    [ hashtable new ] \ new inlined?
+] unit-test
+
+[ t ] [
+    [ dup hashtable eq? [ new ] when ] \ new inlined?
+] unit-test
+
+[ t ] [
+    [ { hashtable } declare hashtable instance? ] \ instance? inlined?
+] unit-test
+
+[ t ] [
+    [ { vector } declare hashtable instance? ] \ instance? inlined?
+] unit-test
+
+[ f ] [
+    [ { assoc } declare hashtable instance? ] \ instance? inlined?
+] unit-test
+
+TUPLE: declared-fixnum { x fixnum } ;
+
+[ t ] [
+    [ { declared-fixnum } declare [ 1 + ] change-x ]
+    { + fixnum+ >fixnum } inlined?
+] unit-test
+
+[ t ] [
+    [ { declared-fixnum } declare x>> drop ]
+    { slot } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { array } declare length
+        1 + dup 100 fixnum> [ 1 fixnum+ ] when
+    ] \ fixnum+ inlined?
+] unit-test
+ 
+[ t ] [
+    [ [ resize-array ] keep length ] \ length inlined?
+] unit-test
+
+[ t ] [
+    [ dup 0 > [ sqrt ] when ] \ sqrt inlined?
+] unit-test
+
+[ t ] [
+    [ { utf8 } declare decode-char ] \ decode-char inlined?
+] unit-test
+
+[ t ] [
+    [ { ascii } declare decode-char ] \ decode-char inlined?
+] unit-test
+
+[ t ] [ [ { 1 2 } length ] { length length>> slot } inlined? ] unit-test
+
+[ t ] [
+    [
+        { integer } declare [ 256 mod ] map
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare [ 0 >= ] map
+    ] { >= fixnum>= } inlined?
+] unit-test
diff --git a/unfinished/compiler/tree/cleanup/cleanup.factor b/unfinished/compiler/tree/cleanup/cleanup.factor
index 725d6c0abe..7b4727ffcf 100644
--- a/unfinished/compiler/tree/cleanup/cleanup.factor
+++ b/unfinished/compiler/tree/cleanup/cleanup.factor
@@ -1,5 +1,106 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
+USING: kernel accessors sequences sequences.deep combinators fry
+namespaces
+compiler.tree
+compiler.tree.combinators
+compiler.tree.propagation.info
+compiler.tree.propagation.branches ;
 IN: compiler.tree.cleanup
 
-: cleanup ( nodes -- nodes' ) ;
+! A phase run after propagation to finish the job, so to speak.
+! Codifies speculative inlining decisions, deletes branches
+! marked as never taken, and flattens local recursive blocks
+! that do not call themselves.
+
+GENERIC: cleanup* ( node -- node/nodes )
+
+: cleanup ( nodes -- nodes' )
+    #! We don't recurse into children here, instead the methods
+    #! do it since the logic is a bit more involved
+    [ cleanup* ] map flatten ;
+
+: cleanup-constant-folding ( #call -- nodes )
+    [
+        [ node-output-infos ] [ out-d>> ] bi
+        [ [ literal>> ] dip #push ] 2map
+    ]
+    [ in-d>> #drop ] bi prefix ;
+
+: cleanup-inlining ( #call -- nodes )
+    body>> cleanup ;
+
+M: #call cleanup*
+    {
+        { [ dup node-output-infos [ literal?>> ] all? ] [ cleanup-constant-folding ] }
+        { [ dup body>> ] [ cleanup-inlining ] }
+        [ ]
+    } cond ;
+
+GENERIC: delete-node ( node -- )
+
+M: #call-recursive delete-node
+    dup label>> [ [ eq? not ] with filter ] change-calls drop ;
+
+M: #return-recursive delete-node
+    label>> f >>return drop ;
+
+M: node delete-node drop ;
+
+: delete-nodes ( nodes -- ) [ delete-node ] each-node ;
+
+: delete-unreachable-branches ( #branch -- )
+    dup live-branches>> '[
+        ,
+        [ [ [ drop ] [ delete-nodes ] if ] 2each ]
+        [ select-children ]
+        2bi
+    ] change-children drop ;
+
+: fold-only-branch ( #branch -- node/nodes )
+    #! If only one branch is live we don't need to branch at
+    #! all; just drop the condition value.
+    dup live-children sift dup length 1 =
+    [ first swap in-d>> #drop prefix ] [ drop ] if ;
+
+SYMBOL: live-branches
+
+: cleanup-children ( #branch -- )
+    [ [ cleanup ] map ] change-children drop ;
+
+M: #branch cleanup*
+    {
+        [ live-branches>> live-branches set ]
+        [ delete-unreachable-branches ]
+        [ cleanup-children ]
+        [ fold-only-branch ]
+    } cleave ;
+
+: cleanup-phi-in ( phi-in live-branches -- phi-in' )
+    swap dup empty?
+    [ nip ] [ flip swap select-children sift flip ] if ;
+
+M: #phi cleanup*
+    #! Remove #phi function inputs which no longer exist.
+    live-branches get {
+        [ '[ , cleanup-phi-in ] change-phi-in-d ]
+        [ '[ , cleanup-phi-in ] change-phi-in-r ]
+        [ '[ , cleanup-phi-in ] change-phi-info-d ]
+        [ '[ , cleanup-phi-in ] change-phi-info-r ]
+    } cleave ;
+
+: >copy ( node -- #copy ) [ in-d>> ] [ out-d>> ] bi #copy ;
+
+: flatten-recursive ( #recursive -- nodes )
+    #! convert #enter-recursive and #return-recursive into
+    #! #copy nodes.
+    child>>
+    unclip >copy prefix
+    unclip-last >copy suffix ;
+
+M: #recursive cleanup*
+    #! Inline bodies of #recursive blocks with no calls left.
+    [ cleanup ] change-child
+    dup label>> calls>> empty? [ flatten-recursive ] when ;
+
+M: node cleanup* ;
diff --git a/unfinished/compiler/tree/combinators/combinators-tests.factor b/unfinished/compiler/tree/combinators/combinators-tests.factor
index 66ad5e11f4..d012b5f658 100644
--- a/unfinished/compiler/tree/combinators/combinators-tests.factor
+++ b/unfinished/compiler/tree/combinators/combinators-tests.factor
@@ -3,3 +3,4 @@ USING: compiler.tree.combinators tools.test kernel ;
 
 { 1 0 } [ [ drop ] each-node ] must-infer-as
 { 1 1 } [ [ ] map-nodes ] must-infer-as
+{ 1 1 } [ [ ] contains-node? ] must-infer-as
diff --git a/unfinished/compiler/tree/combinators/combinators.factor b/unfinished/compiler/tree/combinators/combinators.factor
index eafbb198a1..d3009daf80 100644
--- a/unfinished/compiler/tree/combinators/combinators.factor
+++ b/unfinished/compiler/tree/combinators/combinators.factor
@@ -4,7 +4,7 @@ USING: fry kernel accessors sequences sequences.deep
 compiler.tree ;
 IN: compiler.tree.combinators
 
-: each-node ( nodes quot -- )
+: each-node ( nodes quot: ( node -- ) -- )
     dup dup '[
         , [
             dup #branch? [
@@ -15,7 +15,7 @@ IN: compiler.tree.combinators
                 ] [ drop ] if
             ] if
         ] bi
-    ] each ; inline
+    ] each ; inline recursive
 
 : map-nodes ( nodes quot: ( node -- node' ) -- nodes )
     dup dup '[
@@ -28,3 +28,19 @@ IN: compiler.tree.combinators
             ] when
         ] if
     ] map flatten ; inline recursive
+
+: contains-node? ( nodes quot: ( node -- ? ) -- ? )
+    dup dup '[
+        , keep swap [ drop t ] [
+            dup #branch? [
+                children>> [ , contains-node? ] contains?
+            ] [
+                dup #recursive? [
+                    child>> , contains-node?
+                ] [ drop f ] if
+            ] if
+        ] if
+    ] contains? ; inline recursive
+
+: select-children ( seq flags -- seq' )
+    [ [ drop f ] unless ] 2map ;
diff --git a/unfinished/compiler/tree/copy-equiv/copy-equiv.factor b/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
index b45bc4bbe2..bd3375a78d 100644
--- a/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
+++ b/unfinished/compiler/tree/copy-equiv/copy-equiv.factor
@@ -5,6 +5,9 @@ kernel accessors fry
 compiler.tree compiler.tree.def-use compiler.tree.combinators ;
 IN: compiler.tree.copy-equiv
 
+! Two values are copy-equivalent if they are always identical
+! at run-time ("DS" relation).
+
 ! Disjoint set of copy equivalence
 SYMBOL: copies
 
@@ -49,10 +52,13 @@ M: #phi compute-copy-equiv*
 
 M: node compute-copy-equiv* drop ;
 
-: compute-copy-equiv ( node -- node )
-    <disjoint-set> copies set
-    dup [
+: amend-copy-equiv ( node -- )
+    [
         [ node-defs-values [ introduce-value ] each ]
         [ compute-copy-equiv* ]
         bi
     ] each-node ;
+
+: compute-copy-equiv ( node -- node )
+    <disjoint-set> copies set
+    dup amend-copy-equiv ;
diff --git a/unfinished/compiler/tree/loop/detection/detection.factor b/unfinished/compiler/tree/loop/detection/detection.factor
new file mode 100644
index 0000000000..e29ae22f0d
--- /dev/null
+++ b/unfinished/compiler/tree/loop/detection/detection.factor
@@ -0,0 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.tree.loop-detection
+
+: detect-loops ( nodes -- nodes' ) ;
diff --git a/unfinished/compiler/tree/normalization/normalization.factor b/unfinished/compiler/tree/normalization/normalization.factor
index 976d51dfb6..72ea885967 100644
--- a/unfinished/compiler/tree/normalization/normalization.factor
+++ b/unfinished/compiler/tree/normalization/normalization.factor
@@ -51,13 +51,16 @@ M: node count-introductions* drop ;
 ! Collect label info
 GENERIC: collect-label-info ( node -- )
 
-M: #return-recursive collect-label-info dup label>> (>>return) ;
+M: #return-recursive collect-label-info
+    dup label>> (>>return) ;
 
-M: #call-recursive collect-label-info dup label>> calls>> push ;
+M: #call-recursive collect-label-info
+    dup label>> calls>> push ;
 
 M: #recursive collect-label-info
-    [ label>> ] [ child>> count-introductions ] bi
-    >>introductions drop ;
+    [ label>> V{ } clone >>calls ]
+    [ child>> count-introductions ]
+    bi >>introductions drop ;
 
 M: node collect-label-info drop ;
 
diff --git a/unfinished/compiler/tree/propagation/branches/branches.factor b/unfinished/compiler/tree/propagation/branches/branches.factor
index 50e3f5c9e2..2442a796f2 100644
--- a/unfinished/compiler/tree/propagation/branches/branches.factor
+++ b/unfinished/compiler/tree/propagation/branches/branches.factor
@@ -4,6 +4,7 @@ USING: fry kernel sequences assocs accessors namespaces
 math.intervals arrays classes.algebra combinators
 compiler.tree
 compiler.tree.def-use
+compiler.tree.combinators
 compiler.tree.propagation.info
 compiler.tree.propagation.nodes
 compiler.tree.propagation.simple
@@ -19,17 +20,22 @@ M: #if child-constraints
 M: #dispatch child-constraints
     children>> length f <repetition> ;
 
-GENERIC: live-children ( #branch -- children )
+GENERIC: live-branches ( #branch -- indices )
 
-M: #if live-children
-    [ children>> ] [ in-d>> first value-info possible-boolean-values ] bi
-    [ t swap memq? [ first ] [ drop f ] if ]
-    [ f swap memq? [ second ] [ drop f ] if ]
-    2bi 2array ;
+M: #if live-branches
+    in-d>> first value-info class>> {
+        { [ dup null class<= ] [ { f f } ] }
+        { [ dup true-class? ] [ { t f } ] }
+        { [ dup false-class? ] [ { f t } ] }
+        [ { t t } ]
+    } cond nip ;
 
-M: #dispatch live-children
-    [ children>> ] [ in-d>> first value-info interval>> ] bi
-    '[ , interval-contains? [ drop f ] unless ] map-index ;
+M: #dispatch live-branches
+    [ children>> length ] [ in-d>> first value-info interval>> ] bi
+    '[ , interval-contains? ] map ;
+
+: live-children ( #branch -- children )
+    [ children>> ] [ live-branches>> ] bi select-children ;
 
 SYMBOL: infer-children-data
 
@@ -56,22 +62,27 @@ SYMBOL: infer-children-data
     infer-children-data get
     '[ , [ [ value-info ] bind ] 2map ] map ;
 
-: annotate-phi-node ( #phi -- )
+: annotate-phi-inputs ( #phi -- )
     dup phi-in-d>> compute-phi-input-infos >>phi-info-d
     dup phi-in-r>> compute-phi-input-infos >>phi-info-r
-    dup [ out-d>> ] [ out-r>> ] bi append extract-value-info >>info
     drop ;
 
+: annotate-phi-outputs ( #phi -- )
+    dup [ out-d>> ] [ out-r>> ] bi append extract-value-info
+    >>info drop ;
+
 : merge-value-infos ( infos outputs -- )
     [ [ value-infos-union ] map ] dip set-value-infos ;
 
 SYMBOL: condition-value
 
 M: #phi propagate-before ( #phi -- )
-    [ annotate-phi-node ]
-    [ [ phi-info-d>> ] [ out-d>> ] bi merge-value-infos ]
-    [ [ phi-info-r>> ] [ out-r>> ] bi merge-value-infos ]
-    tri ;
+    {
+        [ annotate-phi-inputs ]
+        [ [ phi-info-d>> ] [ out-d>> ] bi merge-value-infos ]
+        [ [ phi-info-r>> ] [ out-r>> ] bi merge-value-infos ]
+        [ annotate-phi-outputs ]
+    } cleave ;
 
 : branch-phi-constraints ( output values booleans -- )
      {
@@ -115,6 +126,7 @@ M: #phi propagate-around ( #phi -- )
     [ propagate-before ] [ propagate-after ] bi ;
 
 M: #branch propagate-around
+    dup live-branches >>live-branches
     [ infer-children ] [ annotate-node ] bi ;
 
 M: #if propagate-around
diff --git a/unfinished/compiler/tree/propagation/constraints/constraints.factor b/unfinished/compiler/tree/propagation/constraints/constraints.factor
index 0b19d34a20..f6495d2998 100644
--- a/unfinished/compiler/tree/propagation/constraints/constraints.factor
+++ b/unfinished/compiler/tree/propagation/constraints/constraints.factor
@@ -107,6 +107,3 @@ M: sequence assume* [ assume ] each ;
 : t--> ( constraint boolean-value -- constraint' ) =t swap --> ;
 
 : f--> ( constraint boolean-value -- constraint' ) =f swap --> ;
-
-: save-constraints ( quot -- )
-    constraints get clone slip constraints set ; inline
diff --git a/unfinished/compiler/tree/propagation/info/info-tests.factor b/unfinished/compiler/tree/propagation/info/info-tests.factor
index d7d4b509d3..5991af92ee 100644
--- a/unfinished/compiler/tree/propagation/info/info-tests.factor
+++ b/unfinished/compiler/tree/propagation/info/info-tests.factor
@@ -1,5 +1,5 @@
 USING: accessors math math.intervals sequences classes.algebra
-math kernel tools.test compiler.tree.propagation.info ;
+math kernel tools.test compiler.tree.propagation.info arrays ;
 IN: compiler.tree.propagation.info.tests
 
 [ f ] [ 0.0 -0.0 eql? ] unit-test
@@ -63,3 +63,11 @@ IN: compiler.tree.propagation.info.tests
 ] unit-test
 
 [ ] [ { } value-infos-union drop ] unit-test
+
+TUPLE: test-tuple { x read-only } ;
+
+[ t ] [
+    f f 3 <literal-info> 3array test-tuple <tuple-info> dup
+    object <class-info>
+    value-info-intersect =
+] unit-test
diff --git a/unfinished/compiler/tree/propagation/info/info.factor b/unfinished/compiler/tree/propagation/info/info.factor
index 166cc08c17..93057aebc1 100644
--- a/unfinished/compiler/tree/propagation/info/info.factor
+++ b/unfinished/compiler/tree/propagation/info/info.factor
@@ -132,9 +132,14 @@ DEFER: (value-info-intersect)
     } cond ;
 
 : intersect-slots ( info1 info2 -- slots )
-    [ slots>> ] bi@
-    2dup [ length ] bi@ =
-    [ [ intersect-slot ] 2map ] [ 2drop f ] if ;
+    [ slots>> ] bi@ {
+        { [ dup not ] [ drop ] }
+        { [ over not ] [ nip ] }
+        [
+            2dup [ length ] bi@ =
+            [ [ intersect-slot ] 2map ] [ 2drop f ] if
+        ]
+    } cond ;
 
 : (value-info-intersect) ( info1 info2 -- info )
     [ <value-info> ] 2dip
diff --git a/unfinished/compiler/tree/propagation/inlining/inlining.factor b/unfinished/compiler/tree/propagation/inlining/inlining.factor
index a33ef00c34..1182d8211f 100644
--- a/unfinished/compiler/tree/propagation/inlining/inlining.factor
+++ b/unfinished/compiler/tree/propagation/inlining/inlining.factor
@@ -1,3 +1,144 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
+USING: accessors kernel arrays sequences math math.order
+math.partial-dispatch generic generic.standard classes.algebra
+classes.union sets quotations assocs combinators words
+namespaces
+compiler.tree
+compiler.tree.builder
+compiler.tree.copy-equiv
+compiler.tree.normalization
+compiler.tree.propagation.info
+compiler.tree.propagation.nodes ;
 IN: compiler.tree.propagation.inlining
+
+! Splicing nodes
+GENERIC: splicing-nodes ( #call word/quot/f -- nodes )
+
+M: word splicing-nodes
+    [ [ in-d>> ] [ out-d>> ] bi ] dip #call 1array ;
+
+M: quotation splicing-nodes
+    [ [ out-d>> ] [ in-d>> ] bi ] dip
+    build-tree-with
+    rot #copy suffix
+    normalize ;
+
+: propagate-body ( #call -- )
+    body>> [ amend-copy-equiv ] [ (propagate) ] bi ;
+
+! Dispatch elimination
+: eliminate-dispatch ( #call word/quot/f -- ? )
+    [
+        over method>> over = [ drop ] [
+            2dup splicing-nodes
+            [ >>method ] [ >>body ] bi*
+        ] if
+        propagate-body t
+    ] [ f >>method f >>body drop f ] if* ;
+
+: inlining-standard-method ( #call word -- method/f )
+    [ in-d>> <reversed> ] [ [ dispatch# ] keep ] bi*
+    [ swap nth value-info class>> ] dip
+    specific-method ;
+
+: inline-standard-method ( #call word -- ? )
+    dupd inlining-standard-method eliminate-dispatch ;
+
+: normalize-math-class ( class -- class' )
+    {
+        null
+        fixnum bignum integer
+        ratio rational
+        float real
+        complex number
+        object
+    } [ class<= ] with find nip ;
+
+: inlining-math-method ( #call word -- quot/f )
+    swap in-d>>
+    first2 [ value-info class>> normalize-math-class ] bi@
+    3dup math-both-known? [ math-method* ] [ 3drop f ] if ;
+
+: inline-math-method ( #call word -- ? )
+    dupd inlining-math-method eliminate-dispatch ;
+
+: inlining-math-partial ( #call word -- quot/f )
+    [ "derived-from" word-prop first inlining-math-method ]
+    [ nip 1quotation ] 2bi
+    [ = not ] [ drop ] 2bi and ;
+
+: inline-math-partial ( #call word -- ? )
+    dupd inlining-math-partial eliminate-dispatch ;
+
+! Method body inlining
+SYMBOL: recursive-calls
+DEFER: (flat-length)
+
+: word-flat-length ( word -- n )
+    {
+        ! not inline
+        { [ dup inline? not ] [ drop 1 ] }
+        ! recursive and inline
+        { [ dup recursive-calls get key? ] [ drop 10 ] }
+        ! inline
+        [ [ recursive-calls get conjoin ] [ def>> (flat-length) ] bi ]
+    } cond ;
+
+: (flat-length) ( seq -- n )
+    [
+        {
+            { [ dup quotation? ] [ (flat-length) 2 + ] }
+            { [ dup array? ] [ (flat-length) ] }
+            { [ dup word? ] [ word-flat-length ] }
+            [ drop 0 ]
+        } cond
+    ] sigma ;
+
+: flat-length ( word -- n )
+    H{ } clone recursive-calls [
+        [ recursive-calls get conjoin ]
+        [ def>> (flat-length) 5 /i ]
+        bi
+    ] with-variable ;
+
+: classes-known? ( #call -- ? )
+    in-d>> [
+        value-info class>>
+        [ class-types length 1 = ]
+        [ union-class? not ]
+        bi and
+    ] contains? ;
+
+: inlining-rank ( #call word -- n )
+    [ classes-known? 2 0 ? ]
+    [
+        {
+            [ flat-length 24 swap [-] 4 /i ]
+            [ "default" word-prop -4 0 ? ]
+            [ "specializer" word-prop 1 0 ? ]
+            [ method-body? 1 0 ? ]
+        } cleave
+    ] bi* + + + + ;
+
+: should-inline? ( #call word -- ? )
+    inlining-rank 5 >= ;
+
+SYMBOL: history
+
+: remember-inlining ( word -- )
+    history get [ swap suffix ] change ;
+
+: inline-word ( #call word -- )
+    dup history get memq? [
+        2drop
+    ] [
+        [
+            dup remember-inlining
+            dupd def>> splicing-nodes >>body
+            propagate-body
+        ] with-scope
+    ] if ;
+
+: inline-method-body ( #call word -- ? )
+    2dup should-inline? [ inline-word t ] [ 2drop f ] if ;
diff --git a/unfinished/compiler/tree/propagation/known-words/known-words.factor b/unfinished/compiler/tree/propagation/known-words/known-words.factor
index e0a341f66a..af9d9bab4a 100644
--- a/unfinished/compiler/tree/propagation/known-words/known-words.factor
+++ b/unfinished/compiler/tree/propagation/known-words/known-words.factor
@@ -173,8 +173,8 @@ generic-comparison-ops [
     } case ;
 
 comparison-ops [
-    [
-        dup '[ , fold-comparison ] +outputs+ set-word-prop
+    dup '[
+        [ , fold-comparison ] +outputs+ set-word-prop
     ] each-derived-op
 ] each
 
diff --git a/unfinished/compiler/tree/propagation/nodes/nodes.factor b/unfinished/compiler/tree/propagation/nodes/nodes.factor
index 2cc98b28c6..6317ec4e06 100644
--- a/unfinished/compiler/tree/propagation/nodes/nodes.factor
+++ b/unfinished/compiler/tree/propagation/nodes/nodes.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: sequences accessors kernel
+USING: sequences accessors kernel assocs sequences
+compiler.tree
 compiler.tree.def-use
 compiler.tree.propagation.info ;
 IN: compiler.tree.propagation.nodes
@@ -14,4 +15,20 @@ GENERIC: propagate-after ( node -- )
 
 GENERIC: propagate-around ( node -- )
 
-: (propagate) ( node -- ) [ [ propagate-around ] each ] when* ;
+: (propagate) ( node -- ) [ propagate-around ] each ;
+
+: extract-value-info ( values -- assoc )
+    [ dup value-info ] H{ } map>assoc ;
+
+: annotate-node ( node -- )
+    dup
+    [ node-defs-values ] [ node-uses-values ] bi append
+    extract-value-info
+    >>info drop ;
+
+M: node propagate-before drop ;
+
+M: node propagate-after drop ;
+
+M: node propagate-around
+    [ propagate-before ] [ annotate-node ] [ propagate-after ] tri ;
diff --git a/unfinished/compiler/tree/propagation/propagation-tests.factor b/unfinished/compiler/tree/propagation/propagation-tests.factor
index 7dd4835639..3c85665ba7 100644
--- a/unfinished/compiler/tree/propagation/propagation-tests.factor
+++ b/unfinished/compiler/tree/propagation/propagation-tests.factor
@@ -5,11 +5,10 @@ accessors sequences arrays kernel.private vectors
 alien.accessors alien.c-types sequences.private
 byte-arrays classes.algebra classes.tuple.private
 math.functions math.private strings layouts
-compiler.tree.propagation.info ;
+compiler.tree.propagation.info slots.private ;
 IN: compiler.tree.propagation.tests
 
 \ propagate must-infer
-\ propagate/node must-infer
 
 : final-info ( quot -- seq )
     build-tree
@@ -52,6 +51,10 @@ IN: compiler.tree.propagation.tests
 
 [ V{ integer } ] [ [ /i ] final-classes ] unit-test
 
+[ V{ integer } ] [
+    [ { integer } declare bitnot ] final-classes
+] unit-test
+
 [ V{ integer } ] [ [ 255 bitand ] final-classes ] unit-test
 
 [ V{ integer } ] [
@@ -316,7 +319,7 @@ cell-bits 32 = [
 ! Array length propagation
 [ V{ t } ] [ [ 10 f <array> length 10 = ] final-literals ] unit-test
 
-[ V{ t } ] [ [ [ 10 f <array> ] [ 10 <byte-array> ] if length 10 = ] final-literals ] unit-test
+[ V{ t } ] [ [ [ 10 f <array> length ] [ 10 <byte-array> length ] if 10 = ] final-literals ] unit-test
 
 [ V{ t } ] [ [ [ 1 f <array> ] [ 2 f <array> ] if length 3 < ] final-literals ] unit-test
 
@@ -325,15 +328,6 @@ TUPLE: prop-test-tuple { x integer } ;
 
 [ V{ integer } ] [ [ { prop-test-tuple } declare x>> ] final-classes ] unit-test
 
-TUPLE: another-prop-test-tuple { x ratio initial: 1/2 } ;
-
-UNION: prop-test-union prop-test-tuple another-prop-test-tuple ;
-
-[ t ] [
-    [ { prop-test-union } declare x>> ] final-classes first
-    rational class=
-] unit-test
-
 TUPLE: fold-boa-test-tuple { x read-only } { y read-only } { z read-only } ;
 
 [ V{ T{ fold-boa-test-tuple f 1 2 3 } } ]
@@ -377,6 +371,8 @@ TUPLE: immutable-prop-test-tuple { x sequence read-only } ;
     ] final-classes
 ] unit-test
 
+[ ] [ [ dup 3 slot swap 4 slot dup 3 slot swap 4 slot ] final-info drop ] unit-test
+
 [ V{ number } ] [ [ [ "Oops" throw ] [ 2 + ] if ] final-classes ] unit-test
 [ V{ number } ] [ [ [ 2 + ] [ "Oops" throw ] if ] final-classes ] unit-test
 
@@ -404,8 +400,13 @@ TUPLE: mixed-mutable-immutable { x integer } { y sequence read-only } ;
 
 [ V{ integer array } ] [
     [
-        3 { 2 1 } mixed-mutable-immutable boa
-        [ x>> ] [ y>> ] bi
+        3 { 2 1 } mixed-mutable-immutable boa [ x>> ] [ y>> ] bi
+    ] final-classes
+] unit-test
+
+[ V{ array integer } ] [
+    [
+        3 { 2 1 } mixed-mutable-immutable boa [ y>> ] [ x>> ] bi
     ] final-classes
 ] unit-test
 
@@ -459,3 +460,18 @@ TUPLE: mixed-mutable-immutable { x integer } { y sequence read-only } ;
 [ V{ fixnum } ] [ [ 1 10 [ dup 10 < [ 2 * ] when ] times ] final-classes ] unit-test
 
 [ V{ integer } ] [ [ 0 2 100 ^ [ nip ] each-integer ] final-classes ] unit-test
+
+[ ] [ [ [ ] [ ] compose curry call ] final-info drop ] unit-test
+
+[ V{ } ] [
+    [ [ drop ] [ drop ] compose curry (each-integer) ] final-classes
+] unit-test
+
+GENERIC: iterate ( obj -- next-obj ? )
+M: fixnum iterate f ;
+M: array iterate first t ;
+
+: dead-loop ( obj -- final-obj )
+    iterate [ dead-loop ] when ; inline recursive
+
+[ V{ fixnum } ] [ [ { fixnum } declare dead-loop ] final-classes ] unit-test
diff --git a/unfinished/compiler/tree/propagation/propagation.factor b/unfinished/compiler/tree/propagation/propagation.factor
index 4a8686a1e4..db69024413 100755
--- a/unfinished/compiler/tree/propagation/propagation.factor
+++ b/unfinished/compiler/tree/propagation/propagation.factor
@@ -12,15 +12,9 @@ compiler.tree.propagation.constraints
 compiler.tree.propagation.known-words ;
 IN: compiler.tree.propagation
 
-: propagate-with ( node infos -- )
+: propagate ( node -- node )
     [
         H{ } clone constraints set
-        >hashtable value-infos set
-        (propagate)
+        H{ } clone value-infos set
+        dup (propagate)
     ] with-scope ;
-
-: propagate ( node -- node )
-    dup f propagate-with ;
-
-: propagate/node ( node existing -- )
-    info>> propagate-with ;
diff --git a/unfinished/compiler/tree/propagation/recursive/recursive.factor b/unfinished/compiler/tree/propagation/recursive/recursive.factor
index 005199afaf..97801e289e 100644
--- a/unfinished/compiler/tree/propagation/recursive/recursive.factor
+++ b/unfinished/compiler/tree/propagation/recursive/recursive.factor
@@ -4,6 +4,7 @@ USING: kernel sequences accessors arrays fry math.intervals
 combinators
 stack-checker.inlining
 compiler.tree
+compiler.tree.copy-equiv
 compiler.tree.propagation.info
 compiler.tree.propagation.nodes
 compiler.tree.propagation.simple
@@ -53,11 +54,14 @@ M: #recursive propagate-around ( #recursive -- )
     iter-counter get 10 > [ "Oops" throw ] when
     dup label>> t >>fixed-point drop [
         [
+            copies [ clone ] change
+            constraints [ clone ] change
+
             child>>
             [ first propagate-recursive-phi ]
             [ (propagate) ]
             bi
-        ] save-constraints
+        ] with-scope
     ] [ dup label>> fixed-point>> [ drop ] [ propagate-around ] if ] bi ;
 
 : generalize-return-interval ( info -- info' )
diff --git a/unfinished/compiler/tree/propagation/simple/simple.factor b/unfinished/compiler/tree/propagation/simple/simple.factor
index f30f154285..d0e2426b0c 100644
--- a/unfinished/compiler/tree/propagation/simple/simple.factor
+++ b/unfinished/compiler/tree/propagation/simple/simple.factor
@@ -1,17 +1,21 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry accessors kernel sequences sequences.private assocs
-words namespaces classes.algebra combinators classes
-classes.tuple classes.tuple.private continuations arrays
-byte-arrays strings math math.private slots
+USING: fry accessors kernel sequences sequences.private assocs words
+namespaces classes.algebra combinators classes classes.tuple
+classes.tuple.private continuations arrays byte-arrays strings
+math math.partial-dispatch math.private slots generic
+generic.standard generic.math
 compiler.tree
 compiler.tree.def-use
 compiler.tree.propagation.info
 compiler.tree.propagation.nodes
 compiler.tree.propagation.slots
+compiler.tree.propagation.inlining
 compiler.tree.propagation.constraints ;
 IN: compiler.tree.propagation.simple
 
+! Propagation for straight-line code.
+
 M: #introduce propagate-before
     value>> object <class-info> swap set-value-info ;
 
@@ -40,91 +44,61 @@ M: #declare propagate-before
     [ [ in-d>> ] [ out-d>> ] bi append ] dip
     with-datastack first assume ;
 
-: compute-constraints ( #call -- )
-    dup word>> +constraints+ word-prop [ custom-constraints ] [
-        dup word>> predicate? [
-            [ in-d>> first ]
-            [ word>> "predicating" word-prop ]
-            [ out-d>> first ]
-            tri predicate-constraints assume
-        ] [ drop ] if
+: compute-constraints ( #call word -- )
+    dup +constraints+ word-prop [ nip custom-constraints ] [
+        dup predicate? [
+            [ [ in-d>> first ] [ out-d>> first ] bi ]
+            [ "predicating" word-prop ] bi*
+            swap predicate-constraints assume
+        ] [ 2drop ] if
     ] if* ;
 
-: call-outputs-quot ( node -- infos )
-    [ in-d>> [ value-info ] map ]
-    [ word>> +outputs+ word-prop ]
-    bi with-datastack ;
+: call-outputs-quot ( #call word -- infos )
+    [ in-d>> [ value-info ] map ] [ +outputs+ word-prop ] bi*
+    with-datastack ;
 
-: foldable-word? ( #call -- ? )
-    dup word>> "foldable" word-prop [
-        drop t
-    ] [
-        dup word>> \ <tuple-boa> eq? [
-            in-d>> peek value-info literal>> immutable-tuple-class?
-        ] [
-            drop f
-        ] if
-    ] if ;
+: foldable-call? ( #call word -- ? )
+    "foldable" word-prop
+    [ in-d>> [ value-info literal?>> ] all? ] [ drop f ] if ;
 
-: foldable-call? ( #call -- ? )
-    dup word>> "foldable" word-prop [
-        in-d>> [ value-info literal?>> ] all?
-    ] [
-        drop f
-    ] if ;
-
-: fold-call ( #call -- infos )
+: fold-call ( #call word -- infos )
     [ in-d>> [ value-info literal>> ] map ]
-    [ word>> [ execute ] curry ]
-    bi with-datastack
+    [ [ execute ] curry ]
+    bi* with-datastack
     [ <literal-info> ] map ;
 
-: default-output-value-infos ( node -- infos )
-    dup word>> "default-output-classes" word-prop [
-        class-infos
-    ] [
-        out-d>> length object <class-info> <repetition>
-    ] ?if ;
+: default-output-value-infos ( #call word -- infos )
+    "default-output-classes" word-prop
+    [ class-infos ] [ out-d>> length object <class-info> <repetition> ] ?if ;
 
-: output-value-infos ( node -- infos )
+: output-value-infos ( #call word -- infos )
     {
-        { [ dup foldable-call? ] [ fold-call ] }
+        { [ 2dup foldable-call? ] [ fold-call ] }
         { [ dup tuple-constructor? ] [ propagate-tuple-constructor ] }
-        { [ dup word>> reader? ] [ reader-word-outputs ] }
         { [ dup sequence-constructor? ] [ propagate-sequence-constructor ] }
-        { [ dup length-accessor? ] [ propagate-length ] }
-        { [ dup word>> +outputs+ word-prop ] [ call-outputs-quot ] }
+        { [ dup +outputs+ word-prop ] [ call-outputs-quot ] }
         [ default-output-value-infos ]
     } cond ;
 
-M: #call propagate-before
-    [ [ output-value-infos ] [ out-d>> ] bi set-value-infos ]
-    [ compute-constraints ]
-    bi ;
-
-M: node propagate-before drop ;
-
-: propagate-input-classes ( node -- )
-    [ word>> "input-classes" word-prop class-infos ] [ in-d>> ] bi
-    refine-value-infos ;
-
-M: #call propagate-after
+: do-inlining ( #call word -- ? )
     {
-        { [ dup reader? ] [ reader-word-inputs ] }
-        { [ dup word>> "input-classes" word-prop ] [ propagate-input-classes ] }
-        [ drop ]
+        { [ dup standard-generic? ] [ inline-standard-method ] }
+        { [ dup math-generic? ] [ inline-math-method ] }
+        { [ dup math-partial? ] [ inline-math-partial ] }
+        { [ dup method-body? ] [ inline-method-body ] }
+        [ 2drop f ]
     } cond ;
 
-M: node propagate-after drop ;
+M: #call propagate-before
+    dup word>> 2dup do-inlining [ 2drop ] [
+        [ [ output-value-infos ] [ drop out-d>> ] 2bi set-value-infos ]
+        [ compute-constraints ]
+        2bi
+    ] if ;
 
-: extract-value-info ( values -- assoc )
-    [ dup value-info ] H{ } map>assoc ;
+: propagate-input-classes ( node input-classes -- )
+    class-infos swap in-d>> refine-value-infos ;
 
-: annotate-node ( node -- )
-    dup
-    [ node-defs-values ] [ node-uses-values ] bi append
-    extract-value-info
-    >>info drop ;
-
-M: node propagate-around
-    [ propagate-before ] [ annotate-node ] [ propagate-after ] tri ;
+M: #call propagate-after
+    dup word>> "input-classes" word-prop dup
+    [ propagate-input-classes ] [ 2drop ] if ;
diff --git a/unfinished/compiler/tree/propagation/slots/slots.factor b/unfinished/compiler/tree/propagation/slots/slots.factor
index b92479490c..8a23d360cc 100644
--- a/unfinished/compiler/tree/propagation/slots/slots.factor
+++ b/unfinished/compiler/tree/propagation/slots/slots.factor
@@ -3,7 +3,7 @@
 USING: fry assocs arrays byte-arrays strings accessors sequences
 kernel slots classes.algebra classes.tuple classes.tuple.private
 words math math.private combinators sequences.private namespaces
-compiler.tree.propagation.info ;
+classes compiler.tree.propagation.info ;
 IN: compiler.tree.propagation.slots
 
 ! Propagation of immutable slots and array lengths
@@ -13,8 +13,8 @@ IN: compiler.tree.propagation.slots
 
 UNION: fixed-length-sequence array byte-array string ;
 
-: sequence-constructor? ( node -- ? )
-    word>> { <array> <byte-array> <string> } memq? ;
+: sequence-constructor? ( word -- ? )
+    { <array> <byte-array> <string> } memq? ;
 
 : constructor-output-class ( word -- class )
     {
@@ -23,21 +23,13 @@ UNION: fixed-length-sequence array byte-array string ;
         { <string> string }
     } at ;
 
-: propagate-sequence-constructor ( node -- infos )
-    [ word>> constructor-output-class <class-info> ]
+: propagate-sequence-constructor ( #call word -- infos )
     [ in-d>> first <sequence-info> ]
-    bi value-info-intersect 1array ;
+    [ constructor-output-class <class-info> ]
+    bi* value-info-intersect 1array ;
 
-: length-accessor? ( node -- ? )
-    dup in-d>> first value-info class>> fixed-length-sequence class<=
-    [ word>> \ length eq? ] [ drop f ] if ;
-
-: propagate-length ( node -- infos )
-    in-d>> first value-info length>>
-    [ array-capacity <class-info> ] unless* 1array ;
-
-: tuple-constructor? ( node -- ? )
-    word>> { <tuple-boa> <complex> } memq? ;
+: tuple-constructor? ( word -- ? )
+    { <tuple-boa> <complex> } memq? ;
 
 : read-only-slots ( values class -- slots )
     #! Delegation.
@@ -49,7 +41,7 @@ UNION: fixed-length-sequence array byte-array string ;
     [ , f , [ literal>> ] map % ] { } make >tuple
     <literal-info> ;
 
-: propagate-<tuple-boa> ( node -- info )
+: propagate-<tuple-boa> ( #call -- info )
     #! Delegation
     in-d>> [ value-info ] map unclip-last
     literal>> class>> [ read-only-slots ] keep
@@ -59,72 +51,45 @@ UNION: fixed-length-sequence array byte-array string ;
         <tuple-info>
     ] if ;
 
-: propagate-<complex> ( node -- info )
+: propagate-<complex> ( #call -- info )
     in-d>> [ value-info ] map complex <tuple-info> ;
 
-: propagate-tuple-constructor ( node -- infos )
-    dup word>> {
+: propagate-tuple-constructor ( #call word -- infos )
+    {
         { \ <tuple-boa> [ propagate-<tuple-boa> ] }
         { \ <complex> [ propagate-<complex> ] }
     } case 1array ;
 
-: relevant-methods ( node -- methods )
-    [ word>> "methods" word-prop ]
-    [ in-d>> first value-info class>> ] bi
-    '[ drop , classes-intersect? ] assoc-filter ;
-
-: relevant-slots ( node -- slots )
-    relevant-methods [ nip "reading" word-prop ] { } assoc>map ;
-
-: no-reader-methods ( input slots -- info )
-    2drop null-info ;
-
-: same-offset ( slots -- slot/f )
-    dup [ dup [ read-only>> ] when ] all? [
-        [ offset>> ] map dup all-equal? [ first ] [ drop f ] if
-    ] [ drop f ] if ;
-
-: (reader-word-outputs) ( reader -- info )
-    null
-    [ [ class>> ] [ object ] if* class-or ] reduce
-    <class-info> ;
-
 : tuple>array* ( tuple -- array )
     prepare-tuple>array
     >r copy-tuple-slots r>
     prefix ;
 
-: literal-info-slot ( slot info -- info' )
-    {
-        { [ dup tuple? ] [
-            tuple>array* nth <literal-info>
-        ] }
-        { [ dup complex? ] [
-            [ real-part ] [ imaginary-part ] bi
-            2array nth <literal-info>
-        ] }
-    } cond ;
+: read-only-slot? ( n class -- ? )
+    all-slots [ offset>> = ] with find nip
+    dup [ read-only>> ] when ;
+
+: literal-info-slot ( slot object -- info/f )
+    2dup class read-only-slot? [
+        {
+            { [ dup tuple? ] [
+                [ 1- ] [ tuple>array* ] bi* nth <literal-info>
+            ] }
+            { [ dup complex? ] [
+                [ 1- ] [ [ real-part ] [ imaginary-part ] bi ] bi*
+                2array nth <literal-info>
+            ] }
+        } cond
+    ] [ 2drop f ] if ;
+
+: length-accessor? ( slot info -- ? )
+    [ 1 = ] [ length>> ] bi* and ;
 
 : value-info-slot ( slot info -- info' )
     #! Delegation.
     {
         { [ over 0 = ] [ 2drop fixnum <class-info> ] }
-        { [ dup literal?>> ] [ [ 1- ] [ literal>> ] bi* literal-info-slot ] }
+        { [ 2dup length-accessor? ] [ nip length>> ] }
+        { [ dup literal?>> ] [ literal>> literal-info-slot ] }
         [ [ 1- ] [ slots>> ] bi* ?nth ]
-    } cond ;
-
-: reader-word-outputs ( node -- infos )
-    [ relevant-slots ] [ in-d>> first ] bi
-    over empty? [ no-reader-methods ] [
-        over same-offset dup
-        [ swap value-info value-info-slot ] [ 2drop f ] if
-        [ ] [ (reader-word-outputs) ] ?if
-    ] if 1array ;
-
-: reader-word-inputs ( node -- )
-    [ in-d>> first ] [
-        relevant-slots keys
-        object [ class>> [ class-and ] when* ] reduce
-        <class-info>
-    ] bi
-    refine-value-info ;
+    } cond [ object <class-info> ] unless* ;
diff --git a/unfinished/compiler/tree/tree.factor b/unfinished/compiler/tree/tree.factor
index 7ff798de8f..a4c78bc6bb 100755
--- a/unfinished/compiler/tree/tree.factor
+++ b/unfinished/compiler/tree/tree.factor
@@ -16,7 +16,7 @@ TUPLE: #introduce < node value ;
 : #introduce ( value -- node )
     \ #introduce new swap >>value ;
 
-TUPLE: #call < node word history in-d out-d ;
+TUPLE: #call < node word in-d out-d body method ;
 
 : #call ( inputs outputs word -- node )
     \ #call new
@@ -70,7 +70,7 @@ TUPLE: #terminate < node in-d ;
     \ #terminate new
         swap >>in-d ;
 
-TUPLE: #branch < node in-d children ;
+TUPLE: #branch < node in-d children live-branches ;
 
 : new-branch ( value children class -- node )
     new
@@ -140,6 +140,8 @@ TUPLE: #copy < node in-d out-d ;
         swap >>out-d
         swap >>in-d ;
 
+: in/out ( node -- in-d out-d ) [ in-d>> ] [ out-d>> ] bi ; inline
+
 : node, ( node -- ) stack-visitor get push ;
 
 M: vector child-visitor V{ } clone ;
diff --git a/unfinished/stack-checker/branches/branches.factor b/unfinished/stack-checker/branches/branches.factor
index 45c0b6541b..4b63e540dc 100644
--- a/unfinished/stack-checker/branches/branches.factor
+++ b/unfinished/stack-checker/branches/branches.factor
@@ -12,10 +12,13 @@ IN: stack-checker.branches
 : unify-inputs ( max-d-in d-in meta-d -- new-meta-d )
     dup [ [ - f <repetition> ] dip append ] [ 3drop f ] if ;
 
+: pad-with-f ( seq -- newseq )
+    dup [ length ] map supremum '[ , f pad-left ] map ;
+
 : phi-inputs ( max-d-in pairs -- newseq )
     dup empty? [ nip ] [
         swap '[ , _ first2 unify-inputs ] map
-        dup [ length ] map supremum '[ , f pad-left ] map
+        pad-with-f
         flip
     ] if ;
 
diff --git a/unfinished/stack-checker/inlining/inlining.factor b/unfinished/stack-checker/inlining/inlining.factor
index ace1a043cb..068dbaba02 100644
--- a/unfinished/stack-checker/inlining/inlining.factor
+++ b/unfinished/stack-checker/inlining/inlining.factor
@@ -20,9 +20,7 @@ IN: stack-checker.inlining
 TUPLE: inline-recursive word enter-out return calls fixed-point introductions ;
 
 : <inline-recursive> ( word -- label )
-    inline-recursive new
-        swap >>word
-        V{ } clone >>calls ;
+    inline-recursive new swap >>word ;
 
 : quotation-param? ( obj -- ? )
     dup pair? [ second effect? ] [ drop f ] if ;

From 75c077ebd59b4b1d12148d327e0aa3c8a59e49db Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 03:38:50 -0500
Subject: [PATCH 62/77] Remove file

---
 .../compiler/tree/loop-detection/loop-detection.factor       | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 unfinished/compiler/tree/loop-detection/loop-detection.factor

diff --git a/unfinished/compiler/tree/loop-detection/loop-detection.factor b/unfinished/compiler/tree/loop-detection/loop-detection.factor
deleted file mode 100644
index e29ae22f0d..0000000000
--- a/unfinished/compiler/tree/loop-detection/loop-detection.factor
+++ /dev/null
@@ -1,5 +0,0 @@
-! Copyright (C) 2008 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-IN: compiler.tree.loop-detection
-
-: detect-loops ( nodes -- nodes' ) ;

From 279aeddeb35d72ee62b748eb14639cb56e7c2cc1 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 04:12:17 -0500
Subject: [PATCH 63/77] Various fixes

---
 basis/bootstrap/threads/threads.factor       |  1 +
 basis/concurrency/mailboxes/mailboxes.factor |  2 +-
 basis/debugger/debugger.factor               | 38 +++-----------------
 basis/debugger/threads/threads.factor        | 22 ++++++++++++
 basis/dlists/dlists.factor                   |  6 +++-
 basis/libc/libc.factor                       | 11 +++++-
 basis/tools/deploy/deploy-tests.factor       |  4 +--
 7 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 basis/debugger/threads/threads.factor

diff --git a/basis/bootstrap/threads/threads.factor b/basis/bootstrap/threads/threads.factor
index 8f4a05ef52..6c30489bb4 100644
--- a/basis/bootstrap/threads/threads.factor
+++ b/basis/bootstrap/threads/threads.factor
@@ -4,3 +4,4 @@ IN: bootstrap.threads
 
 USE: io.thread
 USE: threads
+USE: debugger.threads
diff --git a/basis/concurrency/mailboxes/mailboxes.factor b/basis/concurrency/mailboxes/mailboxes.factor
index b7d9e46aa8..11624ab473 100755
--- a/basis/concurrency/mailboxes/mailboxes.factor
+++ b/basis/concurrency/mailboxes/mailboxes.factor
@@ -4,7 +4,7 @@ IN: concurrency.mailboxes
 USING: dlists dequeues threads sequences continuations
 destructors namespaces random math quotations words kernel
 arrays assocs init system concurrency.conditions accessors
-debugger ;
+debugger debugger.threads ;
 
 TUPLE: mailbox threads data disposed ;
 
diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index a33b6ce8aa..eacbd6a125 100755
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -5,10 +5,10 @@ kernel math namespaces prettyprint prettyprint.config sequences
 assocs sequences.private strings io.styles io.files vectors
 words system splitting math.parser classes.tuple continuations
 continuations.private combinators generic.math classes.builtin
-classes compiler.units generic.standard vocabs threads
-threads.private init kernel.private libc io.encodings accessors
-math.order destructors source-files parser classes.tuple.parser
-effects.parser lexer compiler.errors dlists generic.parser
+classes compiler.units generic.standard vocabs init
+kernel.private io.encodings accessors math.order
+destructors source-files parser classes.tuple.parser
+effects.parser lexer compiler.errors generic.parser
 strings.parser ;
 IN: debugger
 
@@ -245,33 +245,6 @@ M: no-compilation-unit error.
 M: no-vocab summary
     drop "Vocabulary does not exist" ;
 
-M: bad-ptr summary
-    drop "Memory allocation failed" ;
-
-M: double-free summary
-    drop "Free failed since memory is not allocated" ;
-
-M: realloc-error summary
-    drop "Memory reallocation failed" ;
-
-: error-in-thread. ( thread -- )
-    "Error in thread " write
-    [
-        dup thread-id #
-        " (" % dup thread-name %
-        ", " % dup thread-quot unparse-short % ")" %
-    ] "" make swap write-object ":" print nl ;
-
-! Hooks
-M: thread error-in-thread ( error thread -- )
-    initial-thread get-global eq? [
-        die drop
-    ] [
-        global [
-            error-thread get-global error-in-thread. print-error flush
-        ] bind
-    ] if ;
-
 M: encode-error summary drop "Character encoding error" ;
 
 M: decode-error summary drop "Character decoding error" ;
@@ -348,9 +321,6 @@ M: object compiler-error. ( error word -- )
     nl
     print-error ;
 
-M: empty-dlist summary ( dlist -- )
-    drop "Empty dlist" ;
-
 M: bad-effect summary
     drop "Bad stack effect declaration" ;
 
diff --git a/basis/debugger/threads/threads.factor b/basis/debugger/threads/threads.factor
new file mode 100644
index 0000000000..90d70f6754
--- /dev/null
+++ b/basis/debugger/threads/threads.factor
@@ -0,0 +1,22 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors debugger continuations threads threads.private
+io io.styles prettyprint kernel math.parser namespaces ;
+IN: debugger.threads
+
+: error-in-thread. ( thread -- )
+    "Error in thread " write
+    [
+        dup id>> #
+        " (" % dup name>> %
+        ", " % dup quot>> unparse-short % ")" %
+    ] "" make swap write-object ":" print nl ;
+
+M: thread error-in-thread ( error thread -- )
+    initial-thread get-global eq? [
+        die drop
+    ] [
+        global [
+            error-thread get-global error-in-thread. print-error flush
+        ] bind
+    ] if ;
diff --git a/basis/dlists/dlists.factor b/basis/dlists/dlists.factor
index 192b5cb948..91a5f610ad 100755
--- a/basis/dlists/dlists.factor
+++ b/basis/dlists/dlists.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2007, 2008 Mackenzie Straight, Doug Coleman,
 ! Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators kernel math sequences accessors dequeues ;
+USING: combinators kernel math sequences accessors dequeues
+summary ;
 IN: dlists
 
 TUPLE: dlist front back length ;
@@ -80,6 +81,9 @@ M: dlist push-back* ( obj dlist -- dlist-node )
 
 ERROR: empty-dlist ;
 
+M: empty-dlist summary ( dlist -- )
+    drop "Empty dlist" ;
+
 M: dlist peek-front ( dlist -- obj )
     front>> [ obj>> ] [ empty-dlist ] if* ;
 
diff --git a/basis/libc/libc.factor b/basis/libc/libc.factor
index 627caa7b77..cf4e2fb722 100755
--- a/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -3,7 +3,7 @@
 ! Copyright (C) 2007, 2008 Doug Coleman
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien assocs continuations destructors kernel
-namespaces accessors sets ;
+namespaces accessors sets summary ;
 IN: libc
 
 <PRIVATE
@@ -34,13 +34,22 @@ PRIVATE>
 
 ERROR: bad-ptr ;
 
+M: bad-ptr summary
+    drop "Memory allocation failed" ;
+
 : check-ptr ( c-ptr -- c-ptr )
     [ bad-ptr ] unless* ;
 
 ERROR: double-free ;
 
+M: double-free summary
+    drop "Free failed since memory is not allocated" ;
+
 ERROR: realloc-error ptr size ;
 
+M: realloc-error summary
+    drop "Memory reallocation failed" ;
+
 <PRIVATE
 
 : add-malloc ( alien -- )
diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index ffbf764de1..5ca63a254f 100755
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -26,7 +26,7 @@ namespaces continuations layouts accessors ;
 
 [ t ] [ 1300000 small-enough? ] unit-test
 
-[ "staging.math-compiler-ui-strip.image" ] [
+[ "staging.threads-math-compiler-ui-strip.image" ] [
     "hello-ui" deploy-config
     [ bootstrap-profile staging-image-name file-name ] bind
 ] unit-test
@@ -79,7 +79,7 @@ M: quit-responder call-responder*
     [
         <dispatcher>
             add-quot-responder
-            "resource:basis/http/test" <static> >>default
+            "resource:extra/http/test" <static> >>default
         main-responder set
 
         test-httpd

From d8b6a7f7e6b6e889f503ff187fbde87a9b7680be Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 04:12:27 -0500
Subject: [PATCH 64/77] Remove unused word

---
 unfinished/compiler/tree/tree.factor | 2 --
 1 file changed, 2 deletions(-)

diff --git a/unfinished/compiler/tree/tree.factor b/unfinished/compiler/tree/tree.factor
index a4c78bc6bb..2a6e6cfa2f 100755
--- a/unfinished/compiler/tree/tree.factor
+++ b/unfinished/compiler/tree/tree.factor
@@ -140,8 +140,6 @@ TUPLE: #copy < node in-d out-d ;
         swap >>out-d
         swap >>in-d ;
 
-: in/out ( node -- in-d out-d ) [ in-d>> ] [ out-d>> ] bi ; inline
-
 : node, ( node -- ) stack-visitor get push ;
 
 M: vector child-visitor V{ } clone ;

From eaaa3c20600d9110223ef6f38b4d97faf757872d Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Wed, 30 Jul 2008 04:33:37 -0500
Subject: [PATCH 65/77] processing.shapes: line-strip

---
 extra/processing/shapes/shapes.factor | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extra/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor
index d92da8c869..f577010544 100644
--- a/extra/processing/shapes/shapes.factor
+++ b/extra/processing/shapes/shapes.factor
@@ -52,6 +52,10 @@ T{ rgba f 1 1 1 1 } fill-color   set-global
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+: line-strip ( seq -- ) stroke-mode GL_LINE_STRIP [ gl-vertices-2d ] do-state ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 : triangles ( seq -- )
   [ fill-mode   GL_TRIANGLES [ gl-vertices-2d ] do-state ]
   [ stroke-mode GL_TRIANGLES [ gl-vertices-2d ] do-state ] bi ;

From 553fd4939196efa39e9b7f2403b8b61458f2207c Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Wed, 30 Jul 2008 04:33:58 -0500
Subject: [PATCH 66/77] ui.gadgets.plot: Basic function plotter

---
 extra/ui/gadgets/plot/plot.factor | 62 +++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 extra/ui/gadgets/plot/plot.factor

diff --git a/extra/ui/gadgets/plot/plot.factor b/extra/ui/gadgets/plot/plot.factor
new file mode 100644
index 0000000000..7eb79dd6fe
--- /dev/null
+++ b/extra/ui/gadgets/plot/plot.factor
@@ -0,0 +1,62 @@
+
+USING: kernel quotations arrays sequences math math.ranges fry
+       opengl opengl.gl ui.render ui.gadgets.cartesian processing.shapes
+       accessors ;
+
+IN: ui.gadgets.plot
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+TUPLE: plot < cartesian functions points ;
+
+: init-plot ( plot -- plot )
+  init-cartesian
+    { } >>functions
+    100 >>points ;
+
+: <plot> ( -- plot ) plot new init-plot ;
+
+: step-size ( plot -- step-size )
+  [ [ x-max>> ] [ x-min>> ] bi - ] [ points>> ] bi / ;
+
+: plot-range ( plot -- range )
+  [ x-min>> ] [ x-max>> ] [ step-size ] tri <range> ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+TUPLE: function function color ;
+
+GENERIC: plot-function ( plot object -- plot )
+
+M: quotation plot-function ( plot quotation -- plot )
+  >r dup plot-range r> '[ dup @ 2array ] map line-strip ;
+
+M: function plot-function ( plot function -- plot )
+   dup color>> dup [ >stroke-color ] [ drop ] if
+   >r dup plot-range r> function>> '[ dup @ 2array ] map line-strip ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: plot-functions ( plot -- plot ) dup functions>> [ plot-function ] each ;
+
+: draw-axis ( plot -- plot )
+  dup
+    [ [ x-min>> ] [ drop 0  ] bi 2array ]
+    [ [ x-max>> ] [ drop 0  ] bi 2array ] bi line*
+  dup
+    [ [ drop 0  ] [ y-min>> ] bi 2array ]
+    [ [ drop 0  ] [ y-max>> ] bi 2array ] bi line* ;
+
+M: plot draw-gadget* ( plot -- )
+   dup call-next-method
+   2 glLineWidth
+   draw-axis
+   plot-functions
+   drop
+   fill-mode
+   1 glLineWidth ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: add-function ( plot function -- plot )
+  over functions>> swap suffix >>functions ;
\ No newline at end of file

From 9a2ff5ba055b98c15c1c3cec0625ba9baad5345b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 07:35:58 -0500
Subject: [PATCH 67/77] New demo

---
 extra/boolean-expr/authors.txt         |  1 +
 extra/boolean-expr/boolean-expr.factor | 96 ++++++++++++++++++++++++++
 extra/boolean-expr/summary.txt         |  1 +
 extra/boolean-expr/tags.txt            |  1 +
 4 files changed, 99 insertions(+)
 create mode 100644 extra/boolean-expr/authors.txt
 create mode 100644 extra/boolean-expr/boolean-expr.factor
 create mode 100644 extra/boolean-expr/summary.txt
 create mode 100644 extra/boolean-expr/tags.txt

diff --git a/extra/boolean-expr/authors.txt b/extra/boolean-expr/authors.txt
new file mode 100644
index 0000000000..1901f27a24
--- /dev/null
+++ b/extra/boolean-expr/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
diff --git a/extra/boolean-expr/boolean-expr.factor b/extra/boolean-expr/boolean-expr.factor
new file mode 100644
index 0000000000..b2083eed55
--- /dev/null
+++ b/extra/boolean-expr/boolean-expr.factor
@@ -0,0 +1,96 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors arrays classes kernel sequences sets
+io prettyprint multi-methods symbols ;
+IN: boolean-expr
+
+! Demonstrates the use of Unicode symbols in source files, and
+! multi-method dispatch.
+
+TUPLE: ⋀ x y ;
+TUPLE: ⋁ x y ;
+TUPLE: ¬ x ;
+
+SINGLETON: ⊤
+SINGLETON: ⊥
+
+SINGLETONS: P Q R S T U V W X Y Z ;
+
+UNION: □ ⋀ ⋁ ¬ ⊤ ⊥ P Q R S T U V W X Y Z ;
+
+GENERIC: ⋀ ( x y -- expr )
+
+METHOD: ⋀ { ⊤ □ } nip ;
+METHOD: ⋀ { □ ⊤ } drop ;
+METHOD: ⋀ { ⊥ □ } drop ;
+METHOD: ⋀ { □ ⊥ } nip ;
+
+METHOD: ⋀ { ⋁ □ } [ [ x>> ] dip ⋀ ] [ [ y>> ] dip ⋀ ] 2bi ⋁ ;
+METHOD: ⋀ { □ ⋁ } [ x>> ⋀ ] [ y>> ⋀ ] 2bi ⋁ ;
+
+METHOD: ⋀ { □ □ } \ ⋀ boa ;
+
+GENERIC: ⋁ ( x y -- expr )
+
+METHOD: ⋁ { ⊤ □ } drop ;
+METHOD: ⋁ { □ ⊤ } nip ;
+METHOD: ⋁ { ⊥ □ } nip ;
+METHOD: ⋁ { □ ⊥ } drop ;
+
+METHOD: ⋁ { □ □ } \ ⋁ boa ;
+
+GENERIC: ¬ ( x -- expr )
+
+METHOD: ¬ { ⊤ } drop ⊥ ;
+METHOD: ¬ { ⊥ } drop ⊤ ;
+
+METHOD: ¬ { ⋀ } [ x>> ¬ ] [ y>> ¬ ] bi ⋁ ;
+METHOD: ¬ { ⋁ } [ x>> ¬ ] [ y>> ¬ ] bi ⋀ ;
+
+METHOD: ¬ { □ } \ ¬ boa ;
+
+: → ( x y -- expr ) ¬ ⋀ ;
+: ⊕ ( x y -- expr ) [ ⋁ ] [ ⋀ ¬ ] 2bi ⋀ ;
+: ≣ ( x y -- expr ) [ ⋀ ] [ [ ¬ ] bi@ ⋀ ] 2bi ⋁ ;
+
+GENERIC: (cnf) ( expr -- cnf )
+
+METHOD: (cnf) { ⋀ } [ x>> (cnf) ] [ y>> (cnf) ] bi append ;
+METHOD: (cnf) { □ } 1array ;
+
+GENERIC: cnf ( expr -- cnf )
+
+METHOD: cnf { ⋁ } [ x>> cnf ] [ y>> cnf ] bi append ;
+METHOD: cnf { □ } (cnf) 1array ;
+
+GENERIC: satisfiable? ( expr -- ? )
+
+METHOD: satisfiable? { ⊤ } drop t ;
+METHOD: satisfiable? { ⊥ } drop f ;
+
+: partition ( seq quot -- left right )
+    [ [ not ] compose filter ] [ filter ] 2bi ; inline
+
+: (satisfiable?) ( seq -- ? )
+    [ \ ¬ instance? ] partition [ x>> ] map intersect empty? ;
+
+METHOD: satisfiable? { □ }
+    cnf [ (satisfiable?) ] contains? ;
+
+GENERIC: (expr.) ( expr -- )
+
+METHOD: (expr.) { □ } pprint ;
+
+: op. ( expr -- )
+    "(" write
+    [ x>> (expr.) ]
+    [ bl class pprint bl ]
+    [ y>> (expr.) ]
+    tri
+    ")" write ;
+
+METHOD: (expr.) { ⋀ } op. ;
+METHOD: (expr.) { ⋁ } op. ;
+METHOD: (expr.) { ¬ } [ class pprint ] [ x>> (expr.) ] bi ;
+
+: expr. ( expr -- ) (expr.) nl ;
diff --git a/extra/boolean-expr/summary.txt b/extra/boolean-expr/summary.txt
new file mode 100644
index 0000000000..9b51186ca9
--- /dev/null
+++ b/extra/boolean-expr/summary.txt
@@ -0,0 +1 @@
+Simple boolean expression evaluator and simplifier
diff --git a/extra/boolean-expr/tags.txt b/extra/boolean-expr/tags.txt
new file mode 100644
index 0000000000..cb5fc203e1
--- /dev/null
+++ b/extra/boolean-expr/tags.txt
@@ -0,0 +1 @@
+demos

From c61226c0b80bbd725d11047bc30eb3654358373d Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 10:23:21 -0500
Subject: [PATCH 68/77] Add comment

---
 extra/boolean-expr/boolean-expr.factor | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extra/boolean-expr/boolean-expr.factor b/extra/boolean-expr/boolean-expr.factor
index b2083eed55..5bf4bf3ad3 100644
--- a/extra/boolean-expr/boolean-expr.factor
+++ b/extra/boolean-expr/boolean-expr.factor
@@ -11,8 +11,7 @@ TUPLE: ⋀ x y ;
 TUPLE: ⋁ x y ;
 TUPLE: ¬ x ;
 
-SINGLETON: ⊤
-SINGLETON: ⊥
+SINGLETONS: ⊤ ⊥ ;
 
 SINGLETONS: P Q R S T U V W X Y Z ;
 

From a202812ba0682f2c2f3ee6bec9ed31ae6f607bbd Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 10:23:33 -0500
Subject: [PATCH 69/77] Fix deployment

---
 basis/tools/deploy/shaker/shaker.factor | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 7a4d93c4bd..eaa0342c25 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -16,8 +16,6 @@ QUALIFIED: init
 QUALIFIED: io.backend
 QUALIFIED: io.thread
 QUALIFIED: layouts
-QUALIFIED: libc.private
-QUALIFIED: libc.private
 QUALIFIED: listener
 QUALIFIED: prettyprint.config
 QUALIFIED: source-files
@@ -178,13 +176,14 @@ IN: tools.deploy.shaker
             listener:error-hook
             init:init-hooks
             io.thread:io-thread
-            libc.private:mallocs
             source-files:source-files
             input-stream
             output-stream
             error-stream
         } %
 
+        "mallocs" "libc.private" lookup ,
+
         deploy-threads? [
             "initial-thread" "threads" lookup ,
         ] unless

From 65df4739ceec6713dc26ea27f0bfbab28ba9420b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 15:37:40 -0500
Subject: [PATCH 70/77] Working on propagation, move some tests that don't
 apply out of cleanup-tests

---
 .../tree/cleanup/cleanup-tests.factor         | 145 ------------------
 .../compiler/tree/cleanup/cleanup.factor      |  29 +++-
 .../tree/propagation/branches/branches.factor |   2 +-
 .../tree/propagation/info/info-tests.factor   |   3 +-
 .../tree/propagation/info/info.factor         |  24 +--
 .../known-words/known-words.factor            |  33 ++--
 .../tree/propagation/propagation-tests.factor |  47 +++++-
 .../propagation/recursive/recursive.factor    |   8 +-
 .../tree/propagation/simple/simple.factor     |  16 +-
 .../tree/propagation/slots/slots.factor       |  22 +--
 .../strength-reduction-tests.factor           | 119 ++++++++++++++
 .../partial-dispatch/partial-dispatch.factor  |  42 ++---
 12 files changed, 269 insertions(+), 221 deletions(-)
 create mode 100644 unfinished/compiler/tree/strength-reduction/strength-reduction-tests.factor

diff --git a/unfinished/compiler/tree/cleanup/cleanup-tests.factor b/unfinished/compiler/tree/cleanup/cleanup-tests.factor
index 75477508c9..22f53e2488 100644
--- a/unfinished/compiler/tree/cleanup/cleanup-tests.factor
+++ b/unfinished/compiler/tree/cleanup/cleanup-tests.factor
@@ -166,19 +166,6 @@ M: object xyz ;
     \ +-integer-fixnum inlined?
 ] unit-test
 
-
-[ t ] [
-    [ { string sbuf } declare ] \ push-all def>> append \ + inlined?
-] unit-test
-
-[ t ] [
-    [ { string sbuf } declare ] \ push-all def>> append \ fixnum+ inlined?
-] unit-test
-
-[ t ] [
-    [ { string sbuf } declare ] \ push-all def>> append \ >fixnum inlined?
-] unit-test
-
 [ t ] [
     [ { array-capacity } declare 0 < ] \ < inlined?
 ] unit-test
@@ -277,11 +264,6 @@ cell-bits 32 = [
     ] unit-test
 ] when
 
-[ f ] [
-    [ { integer } declare -63 shift 4095 bitand ]
-    \ shift inlined?
-] unit-test
-
 [ t ] [
     [ B{ 1 0 } *short 0 number= ]
     \ number= inlined?
@@ -328,36 +310,6 @@ cell-bits 32 = [
     ] \ + inlined?
 ] unit-test
 
-[ f ] [
-    [
-        256 mod
-    ] { mod fixnum-mod } inlined?
-] unit-test
-
-[ f ] [
-    [
-        dup 0 >= [ 256 mod ] when
-    ] { mod fixnum-mod } inlined?
-] unit-test
-
-[ t ] [
-    [
-        { integer } declare dup 0 >= [ 256 mod ] when
-    ] { mod fixnum-mod } inlined?
-] unit-test
-
-[ t ] [
-    [
-        { integer } declare 256 rem
-    ] { mod fixnum-mod } inlined?
-] unit-test
-
-[ t ] [
-    [
-        { integer } declare [ 256 rem ] map
-    ] { mod fixnum-mod rem } inlined?
-] unit-test
-
 [ t ] [
     [ 1000 [ 1+ ] map ] { 1+ fixnum+ } inlined?
 ] unit-test
@@ -393,21 +345,6 @@ cell-bits 32 = [
     [ 27/2 fib ] { < - } inlined?
 ] unit-test
 
-: hang-regression ( m n -- x )
-    over 0 number= [
-        nip
-    ] [
-        dup [
-            drop 1 hang-regression
-        ] [
-            dupd hang-regression hang-regression
-        ] if
-    ] if ; inline recursive
-
-[ t ] [
-    [ dup fixnum? [ 3 over hang-regression ] [ 3 over hang-regression ] if
-] { } inlined? ] unit-test
-
 [ t ] [
     [ { fixnum } declare 10 [ -1 shift ] times ] \ shift inlined?
 ] unit-test
@@ -421,16 +358,6 @@ cell-bits 32 = [
     \ fixnum-bitand inlined?
 ] unit-test
 
-[ t ] [
-    [ { integer } declare 127 bitand 3 + ]
-    { + +-integer-fixnum +-integer-fixnum-fast bitand } inlined?
-] unit-test
-
-[ f ] [
-    [ { integer } declare 127 bitand 3 + ]
-    { >fixnum } inlined?
-] unit-test
-
 [ t ] [
     [ { fixnum } declare [ drop ] each-integer ]
     { < <-integer-fixnum +-integer-fixnum + } inlined?
@@ -456,22 +383,6 @@ cell-bits 32 = [
     \ +-integer-fixnum inlined?
 ] unit-test
 
-[ t ] [
-    [
-        { integer } declare
-        dup 0 >= [
-            615949 * 797807 + 20 2^ mod dup 19 2^ -
-        ] [ dup ] if
-    ] { * + shift mod fixnum-mod fixnum* fixnum+ fixnum- } inlined?
-] unit-test
-
-[ t ] [
-    [
-        { fixnum } declare
-        615949 * 797807 + 20 2^ mod dup 19 2^ -
-    ] { >fixnum } inlined?
-] unit-test
-
 [ f ] [
     [
         { integer } declare [ ] map
@@ -490,56 +401,6 @@ cell-bits 32 = [
     ] \ >fixnum inlined?
 ] unit-test
 
-[ t ] [
-    [
-        { integer } declare 0 swap
-        [
-            drop 615949 * 797807 + 20 2^ rem dup 19 2^ -
-        ] map
-    ] { * + shift rem mod fixnum-mod fixnum* fixnum+ fixnum- } inlined?
-] unit-test
-
-[ t ] [
-    [
-        { fixnum } declare 0 swap
-        [
-            drop 615949 * 797807 + 20 2^ rem dup 19 2^ -
-        ] map
-    ] { * + shift rem mod fixnum-mod fixnum* fixnum+ fixnum- >fixnum } inlined?
-] unit-test
-
-[ t ] [
-    [ hashtable new ] \ new inlined?
-] unit-test
-
-[ t ] [
-    [ dup hashtable eq? [ new ] when ] \ new inlined?
-] unit-test
-
-[ t ] [
-    [ { hashtable } declare hashtable instance? ] \ instance? inlined?
-] unit-test
-
-[ t ] [
-    [ { vector } declare hashtable instance? ] \ instance? inlined?
-] unit-test
-
-[ f ] [
-    [ { assoc } declare hashtable instance? ] \ instance? inlined?
-] unit-test
-
-TUPLE: declared-fixnum { x fixnum } ;
-
-[ t ] [
-    [ { declared-fixnum } declare [ 1 + ] change-x ]
-    { + fixnum+ >fixnum } inlined?
-] unit-test
-
-[ t ] [
-    [ { declared-fixnum } declare x>> drop ]
-    { slot } inlined?
-] unit-test
-
 [ t ] [
     [
         { array } declare length
@@ -565,12 +426,6 @@ TUPLE: declared-fixnum { x fixnum } ;
 
 [ t ] [ [ { 1 2 } length ] { length length>> slot } inlined? ] unit-test
 
-[ t ] [
-    [
-        { integer } declare [ 256 mod ] map
-    ] { mod fixnum-mod } inlined?
-] unit-test
-
 [ t ] [
     [
         { integer } declare [ 0 >= ] map
diff --git a/unfinished/compiler/tree/cleanup/cleanup.factor b/unfinished/compiler/tree/cleanup/cleanup.factor
index 7b4727ffcf..40a8da1562 100644
--- a/unfinished/compiler/tree/cleanup/cleanup.factor
+++ b/unfinished/compiler/tree/cleanup/cleanup.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel accessors sequences sequences.deep combinators fry
-namespaces
+classes.algebra namespaces assocs math math.private
+math.partial-dispatch
 compiler.tree
 compiler.tree.combinators
 compiler.tree.propagation.info
@@ -20,7 +21,12 @@ GENERIC: cleanup* ( node -- node/nodes )
     #! do it since the logic is a bit more involved
     [ cleanup* ] map flatten ;
 
-: cleanup-constant-folding ( #call -- nodes )
+: cleanup-folding? ( #call -- ? )
+    node-output-infos [ literal?>> ] all? ;
+
+: cleanup-folding ( #call -- nodes )
+    #! Replace a #call having a known result with a #drop of its
+    #! inputs followed by #push nodes for the outputs.
     [
         [ node-output-infos ] [ out-d>> ] bi
         [ [ literal>> ] dip #push ] 2map
@@ -30,10 +36,27 @@ GENERIC: cleanup* ( node -- node/nodes )
 : cleanup-inlining ( #call -- nodes )
     body>> cleanup ;
 
+! Removing overflow checks
+: no-overflow-variant ( op -- fast-op )
+    H{
+        { fixnum+ fixnum+fast }
+        { fixnum- fixnum-fast }
+        { fixnum* fixnum*fast }
+        { fixnum-shift fixnum-shift-fast }
+    } at ;
+
+: remove-overflow-check? ( #call -- ? )
+    dup word>> no-overflow-variant
+    [ node-output-infos first class>> fixnum class<= ] [ drop f ] if ;
+
+: remove-overflow-check ( #call -- #call )
+    [ in-d>> ] [ out-d>> ] [ word>> no-overflow-variant ] tri #call cleanup* ;
+
 M: #call cleanup*
     {
-        { [ dup node-output-infos [ literal?>> ] all? ] [ cleanup-constant-folding ] }
         { [ dup body>> ] [ cleanup-inlining ] }
+        { [ dup cleanup-folding? ] [ cleanup-folding ] }
+        { [ dup remove-overflow-check? ] [ remove-overflow-check ] }
         [ ]
     } cond ;
 
diff --git a/unfinished/compiler/tree/propagation/branches/branches.factor b/unfinished/compiler/tree/propagation/branches/branches.factor
index 2442a796f2..bba920949b 100644
--- a/unfinished/compiler/tree/propagation/branches/branches.factor
+++ b/unfinished/compiler/tree/propagation/branches/branches.factor
@@ -24,7 +24,7 @@ GENERIC: live-branches ( #branch -- indices )
 
 M: #if live-branches
     in-d>> first value-info class>> {
-        { [ dup null class<= ] [ { f f } ] }
+        { [ dup null-class? ] [ { f f } ] }
         { [ dup true-class? ] [ { t f } ] }
         { [ dup false-class? ] [ { f t } ] }
         [ { t t } ]
diff --git a/unfinished/compiler/tree/propagation/info/info-tests.factor b/unfinished/compiler/tree/propagation/info/info-tests.factor
index 5991af92ee..24f4ca59dc 100644
--- a/unfinished/compiler/tree/propagation/info/info-tests.factor
+++ b/unfinished/compiler/tree/propagation/info/info-tests.factor
@@ -68,6 +68,5 @@ TUPLE: test-tuple { x read-only } ;
 
 [ t ] [
     f f 3 <literal-info> 3array test-tuple <tuple-info> dup
-    object <class-info>
-    value-info-intersect =
+    object-info value-info-intersect =
 ] unit-test
diff --git a/unfinished/compiler/tree/propagation/info/info.factor b/unfinished/compiler/tree/propagation/info/info.factor
index 93057aebc1..3d79840f7e 100644
--- a/unfinished/compiler/tree/propagation/info/info.factor
+++ b/unfinished/compiler/tree/propagation/info/info.factor
@@ -5,6 +5,12 @@ accessors math math.intervals namespaces sequences words
 combinators arrays compiler.tree.copy-equiv ;
 IN: compiler.tree.propagation.info
 
+: false-class? ( class -- ? ) \ f class<= ;
+
+: true-class? ( class -- ? ) \ f class-not class<= ;
+
+: null-class? ( class -- ? ) null class<= ;
+
 SYMBOL: +interval+
 
 GENERIC: eql? ( obj1 obj2 -- ? )
@@ -29,6 +35,8 @@ slots ;
 
 : null-info T{ value-info f null empty-interval } ; inline
 
+: object-info T{ value-info f object T{ interval f { -1.0/0.0 t } { 1.0/0.0 t } } } ; inline
+
 : class-interval ( class -- interval )
     dup real class<=
     [ +interval+ word-prop [-inf,inf] or ] [ drop f ] if ;
@@ -57,7 +65,7 @@ slots ;
         dup literal>> class >>class
         dup literal>> dup real? [ [a,a] ] [ drop [-inf,inf] ] if >>interval
     ] [
-        dup [ class>> null class<= ] [ interval>> empty-interval eq? ] bi or [
+        dup [ class>> null-class? ] [ interval>> empty-interval eq? ] bi or [
             null >>class
             empty-interval >>interval
         ] [
@@ -154,8 +162,8 @@ DEFER: (value-info-intersect)
 
 : value-info-intersect ( info1 info2 -- info )
     {
-        { [ dup class>> null class<= ] [ nip ] }
-        { [ over class>> null class<= ] [ drop ] }
+        { [ dup class>> null-class? ] [ nip ] }
+        { [ over class>> null-class? ] [ drop ] }
         [ (value-info-intersect) ]
     } cond ;
 
@@ -200,8 +208,8 @@ DEFER: (value-info-union)
 
 : value-info-union ( info1 info2 -- info )
     {
-        { [ dup class>> null class<= ] [ drop ] }
-        { [ over class>> null class<= ] [ nip ] }
+        { [ dup class>> null-class? ] [ drop ] }
+        { [ over class>> null-class? ] [ nip ] }
         [ (value-info-union) ]
     } cond ;
 
@@ -225,16 +233,12 @@ SYMBOL: value-infos
 : value-literal ( value -- obj ? )
     value-info >literal< ;
 
-: false-class? ( class -- ? ) \ f class<= ;
-
-: true-class? ( class -- ? ) \ f class-not class<= ;
-
 : possible-boolean-values ( info -- values )
     dup literal?>> [
         literal>> 1array
     ] [
         class>> {
-            { [ dup null class<= ] [ { } ] }
+            { [ dup null-class? ] [ { } ] }
             { [ dup true-class? ] [ { t } ] }
             { [ dup false-class? ] [ { f } ] }
             [ { t f } ]
diff --git a/unfinished/compiler/tree/propagation/known-words/known-words.factor b/unfinished/compiler/tree/propagation/known-words/known-words.factor
index af9d9bab4a..08fdb36cae 100644
--- a/unfinished/compiler/tree/propagation/known-words/known-words.factor
+++ b/unfinished/compiler/tree/propagation/known-words/known-words.factor
@@ -5,10 +5,12 @@ math.partial-dispatch math.intervals math.parser math.order
 layouts words sequences sequences.private arrays assocs classes
 classes.algebra combinators generic.math splitting fry locals
 classes.tuple alien.accessors classes.tuple.private slots.private
-compiler.tree.propagation.info compiler.tree.propagation.nodes
-compiler.tree.propagation.constraints
+compiler.tree.comparisons
+compiler.tree.propagation.info
+compiler.tree.propagation.nodes
 compiler.tree.propagation.slots
-compiler.tree.comparisons ;
+compiler.tree.propagation.simple
+compiler.tree.propagation.constraints ;
 IN: compiler.tree.propagation.known-words
 
 \ fixnum
@@ -76,7 +78,7 @@ most-negative-fixnum most-positive-fixnum [a,b]
 
 : binary-op-class ( info1 info2 -- newclass )
     [ class>> ] bi@
-    2dup [ null class<= ] either? [ 2drop null ] [
+    2dup [ null-class? ] either? [ 2drop null ] [
         [ math-closure ] bi@ math-class-max
     ] if ;
 
@@ -87,13 +89,13 @@ most-negative-fixnum most-positive-fixnum [a,b]
     [ fixnum class<= ] [ fixnum fits? ] bi* and ;
 
 : may-overflow ( class interval -- class' interval' )
-    over null class<= [
+    over null-class? [
         2dup won't-overflow?
         [ [ integer math-class-max ] dip ] unless
     ] unless ;
 
 : may-be-rational ( class interval -- class' interval' )
-    over null class<= [
+    over null-class? [
         [ rational math-class-max ] dip
     ] unless ;
 
@@ -107,7 +109,7 @@ most-negative-fixnum most-positive-fixnum [a,b]
     [ real math-class-min ] dip ;
 
 : float-valued ( class interval -- class' interval' )
-    over null class<= [
+    over null-class? [
         [ drop float ] dip
     ] unless ;
 
@@ -167,7 +169,7 @@ generic-comparison-ops [
 ! Remove redundant comparisons
 : fold-comparison ( info1 info2 word -- info )
     [ [ interval>> ] bi@ ] dip interval-comparison {
-        { incomparable [ object <class-info> ] }
+        { incomparable [ object-info ] }
         { t [ t <literal-info> ] }
         { f [ f <literal-info> ] }
     } case ;
@@ -184,7 +186,7 @@ generic-comparison-ops [
 ] each
 
 : maybe-or-never ( ? -- info )
-    [ object <class-info> ] [ \ f <class-info> ] if ;
+    [ object-info ] [ f <literal-info> ] if ;
 
 : info-intervals-intersect? ( info1 info2 -- ? )
     [ interval>> ] bi@ intervals-intersect? ;
@@ -259,5 +261,16 @@ generic-comparison-ops [
 
 \ slot [
     dup literal?>>
-    [ literal>> swap value-info-slot ] [ 2drop object <class-info> ] if
+    [ literal>> swap value-info-slot ] [ 2drop object-info ] if
+] +outputs+ set-word-prop
+
+\ instance? [
+    [ value-info ] dip over literal>> class? [
+        [ literal>> ] dip predicate-constraints
+    ] [ 2drop f ] if
+] +constraints+ set-word-prop
+
+\ instance? [
+    dup literal>> class?
+    [ literal>> predicate-output-infos ] [ 2drop f ] if
 ] +outputs+ set-word-prop
diff --git a/unfinished/compiler/tree/propagation/propagation-tests.factor b/unfinished/compiler/tree/propagation/propagation-tests.factor
index 3c85665ba7..de6d6c72cb 100644
--- a/unfinished/compiler/tree/propagation/propagation-tests.factor
+++ b/unfinished/compiler/tree/propagation/propagation-tests.factor
@@ -5,7 +5,8 @@ accessors sequences arrays kernel.private vectors
 alien.accessors alien.c-types sequences.private
 byte-arrays classes.algebra classes.tuple.private
 math.functions math.private strings layouts
-compiler.tree.propagation.info slots.private ;
+compiler.tree.propagation.info slots.private words hashtables
+classes assocs ;
 IN: compiler.tree.propagation.tests
 
 \ propagate must-infer
@@ -475,3 +476,47 @@ M: array iterate first t ;
     iterate [ dead-loop ] when ; inline recursive
 
 [ V{ fixnum } ] [ [ { fixnum } declare dead-loop ] final-classes ] unit-test
+
+: hang-1 ( m -- x )
+    dup 0 number= [ hang-1 ] unless ; inline recursive
+
+[ ] [ [ 3 hang-1 ] final-info drop ] unit-test
+
+: hang-2 ( m n -- x )
+    over 0 number= [
+        nip
+    ] [
+        dup [
+            drop 1 hang-2
+        ] [
+            dupd hang-2 hang-2
+        ] if
+    ] if ; inline recursive
+
+[ ] [ [ 3 over hang-2 ] final-info drop ] unit-test
+
+[ ] [
+    [
+        dup fixnum? [ 3 over hang-2 ] [ 3 over hang-2 ] if
+    ] final-info drop
+] unit-test
+
+[ V{ word } ] [
+    [ { hashtable } declare hashtable instance? ] final-classes
+] unit-test
+
+[ V{ POSTPONE: f } ] [
+    [ { vector } declare hashtable instance? ] final-classes
+] unit-test
+
+[ V{ object } ] [
+    [ { assoc } declare hashtable instance? ] final-classes
+] unit-test
+
+[ V{ word } ] [
+    [ { string } declare string? ] final-classes
+] unit-test
+
+[ V{ POSTPONE: f } ] [
+    [ 3 string? ] final-classes
+] unit-test
diff --git a/unfinished/compiler/tree/propagation/recursive/recursive.factor b/unfinished/compiler/tree/propagation/recursive/recursive.factor
index 97801e289e..425d5fb26f 100644
--- a/unfinished/compiler/tree/propagation/recursive/recursive.factor
+++ b/unfinished/compiler/tree/propagation/recursive/recursive.factor
@@ -29,8 +29,10 @@ IN: compiler.tree.propagation.recursive
     } cond nip interval-union ;
 
 : generalize-counter ( info' initial -- info )
-    [ drop clone ] [ [ interval>> ] bi@ ] 2bi
-    generalize-counter-interval >>interval ;
+    2dup [ class>> null-class? ] either? [ drop ] [
+        [ drop clone ] [ [ interval>> ] bi@ ] 2bi
+        generalize-counter-interval >>interval
+    ] if ;
 
 : unify-recursive-stacks ( stacks initial -- infos )
     over empty? [ nip ] [
@@ -65,7 +67,7 @@ M: #recursive propagate-around ( #recursive -- )
     ] [ dup label>> fixed-point>> [ drop ] [ propagate-around ] if ] bi ;
 
 : generalize-return-interval ( info -- info' )
-    dup literal?>> [
+    dup [ literal?>> ] [ class>> null-class? ] bi or [
         clone [-inf,inf] >>interval
     ] unless ;
 
diff --git a/unfinished/compiler/tree/propagation/simple/simple.factor b/unfinished/compiler/tree/propagation/simple/simple.factor
index d0e2426b0c..589ad6db4c 100644
--- a/unfinished/compiler/tree/propagation/simple/simple.factor
+++ b/unfinished/compiler/tree/propagation/simple/simple.factor
@@ -17,7 +17,7 @@ IN: compiler.tree.propagation.simple
 ! Propagation for straight-line code.
 
 M: #introduce propagate-before
-    value>> object <class-info> swap set-value-info ;
+    value>> object-info swap set-value-info ;
 
 M: #push propagate-before
     [ literal>> <literal-info> ] [ out-d>> first ] bi
@@ -67,15 +67,27 @@ M: #declare propagate-before
     bi* with-datastack
     [ <literal-info> ] map ;
 
+: predicate-output-infos ( info class -- info )
+    [ class>> ] dip {
+        { [ 2dup class<= ] [ t <literal-info> ] }
+        { [ 2dup classes-intersect? not ] [ f <literal-info> ] }
+        [ object-info ]
+    } cond 2nip ;
+
+: propagate-predicate ( #call word -- infos )
+    [ in-d>> first value-info ] [ "predicating" word-prop ] bi*
+    predicate-output-infos 1array ;
+
 : default-output-value-infos ( #call word -- infos )
     "default-output-classes" word-prop
-    [ class-infos ] [ out-d>> length object <class-info> <repetition> ] ?if ;
+    [ class-infos ] [ out-d>> length object-info <repetition> ] ?if ;
 
 : output-value-infos ( #call word -- infos )
     {
         { [ 2dup foldable-call? ] [ fold-call ] }
         { [ dup tuple-constructor? ] [ propagate-tuple-constructor ] }
         { [ dup sequence-constructor? ] [ propagate-sequence-constructor ] }
+        { [ dup predicate? ] [ propagate-predicate ] }
         { [ dup +outputs+ word-prop ] [ call-outputs-quot ] }
         [ default-output-value-infos ]
     } cond ;
diff --git a/unfinished/compiler/tree/propagation/slots/slots.factor b/unfinished/compiler/tree/propagation/slots/slots.factor
index 8a23d360cc..713ac1703f 100644
--- a/unfinished/compiler/tree/propagation/slots/slots.factor
+++ b/unfinished/compiler/tree/propagation/slots/slots.factor
@@ -3,7 +3,7 @@
 USING: fry assocs arrays byte-arrays strings accessors sequences
 kernel slots classes.algebra classes.tuple classes.tuple.private
 words math math.private combinators sequences.private namespaces
-classes compiler.tree.propagation.info ;
+slots.private classes compiler.tree.propagation.info ;
 IN: compiler.tree.propagation.slots
 
 ! Propagation of immutable slots and array lengths
@@ -60,27 +60,13 @@ UNION: fixed-length-sequence array byte-array string ;
         { \ <complex> [ propagate-<complex> ] }
     } case 1array ;
 
-: tuple>array* ( tuple -- array )
-    prepare-tuple>array
-    >r copy-tuple-slots r>
-    prefix ;
-
 : read-only-slot? ( n class -- ? )
     all-slots [ offset>> = ] with find nip
     dup [ read-only>> ] when ;
 
 : literal-info-slot ( slot object -- info/f )
-    2dup class read-only-slot? [
-        {
-            { [ dup tuple? ] [
-                [ 1- ] [ tuple>array* ] bi* nth <literal-info>
-            ] }
-            { [ dup complex? ] [
-                [ 1- ] [ [ real-part ] [ imaginary-part ] bi ] bi*
-                2array nth <literal-info>
-            ] }
-        } cond
-    ] [ 2drop f ] if ;
+    2dup class read-only-slot?
+    [ swap slot <literal-info> ] [ 2drop f ] if ;
 
 : length-accessor? ( slot info -- ? )
     [ 1 = ] [ length>> ] bi* and ;
@@ -92,4 +78,4 @@ UNION: fixed-length-sequence array byte-array string ;
         { [ 2dup length-accessor? ] [ nip length>> ] }
         { [ dup literal?>> ] [ literal>> literal-info-slot ] }
         [ [ 1- ] [ slots>> ] bi* ?nth ]
-    } cond [ object <class-info> ] unless* ;
+    } cond [ object-info ] unless* ;
diff --git a/unfinished/compiler/tree/strength-reduction/strength-reduction-tests.factor b/unfinished/compiler/tree/strength-reduction/strength-reduction-tests.factor
new file mode 100644
index 0000000000..a940a63421
--- /dev/null
+++ b/unfinished/compiler/tree/strength-reduction/strength-reduction-tests.factor
@@ -0,0 +1,119 @@
+TUPLE: declared-fixnum { x fixnum } ;
+
+[ t ] [
+    [ { declared-fixnum } declare [ 1 + ] change-x ]
+    { + fixnum+ >fixnum } inlined?
+] unit-test
+
+[ t ] [
+    [ { declared-fixnum } declare x>> drop ]
+    { slot } inlined?
+] unit-test
+
+[ t ] [
+    [ hashtable new ] \ new inlined?
+] unit-test
+
+[ t ] [
+    [ dup hashtable eq? [ new ] when ] \ new inlined?
+] unit-test
+
+[ f ] [
+    [ { integer } declare -63 shift 4095 bitand ]
+    \ shift inlined?
+] unit-test
+
+[ t ] [
+    [ { integer } declare 127 bitand 3 + ]
+    { + +-integer-fixnum +-integer-fixnum-fast bitand } inlined?
+] unit-test
+
+[ f ] [
+    [ { integer } declare 127 bitand 3 + ]
+    { >fixnum } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare
+        dup 0 >= [
+            615949 * 797807 + 20 2^ mod dup 19 2^ -
+        ] [ dup ] if
+    ] { * + shift mod fixnum-mod fixnum* fixnum+ fixnum- } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { fixnum } declare
+        615949 * 797807 + 20 2^ mod dup 19 2^ -
+    ] { >fixnum } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare 0 swap
+        [
+            drop 615949 * 797807 + 20 2^ rem dup 19 2^ -
+        ] map
+    ] { * + shift rem mod fixnum-mod fixnum* fixnum+ fixnum- } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { fixnum } declare 0 swap
+        [
+            drop 615949 * 797807 + 20 2^ rem dup 19 2^ -
+        ] map
+    ] { * + shift rem mod fixnum-mod fixnum* fixnum+ fixnum- >fixnum } inlined?
+] unit-test
+
+[ t ] [
+    [ { string sbuf } declare ] \ push-all def>> append \ + inlined?
+] unit-test
+
+[ t ] [
+    [ { string sbuf } declare ] \ push-all def>> append \ fixnum+ inlined?
+] unit-test
+
+[ t ] [
+    [ { string sbuf } declare ] \ push-all def>> append \ >fixnum inlined?
+] unit-test
+
+
+
+[ t ] [
+    [
+        { integer } declare [ 256 mod ] map
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+
+[ f ] [
+    [
+        256 mod
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ f ] [
+    [
+        dup 0 >= [ 256 mod ] when
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare dup 0 >= [ 256 mod ] when
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare 256 rem
+    ] { mod fixnum-mod } inlined?
+] unit-test
+
+[ t ] [
+    [
+        { integer } declare [ 256 rem ] map
+    ] { mod fixnum-mod rem } inlined?
+] unit-test
diff --git a/unfinished/math/partial-dispatch/partial-dispatch.factor b/unfinished/math/partial-dispatch/partial-dispatch.factor
index 625770e09f..9211a41aa7 100644
--- a/unfinished/math/partial-dispatch/partial-dispatch.factor
+++ b/unfinished/math/partial-dispatch/partial-dispatch.factor
@@ -44,28 +44,23 @@ PREDICATE: math-partial < word
         bi
     ] "" make "math.partial-dispatch" lookup ;
 
-: integer-op-word ( triple fix-word big-word -- word )
-    [
-        drop
-        name>> "fast" tail? >r
-        [ "-" % ] [ name>> % ] interleave
-        r> [ "-fast" % ] when
-    ] "" make "math.partial-dispatch" create ;
+: integer-op-word ( triple -- word )
+    [ name>> ] map "-" join "math.partial-dispatch" create ;
 
-: integer-op-quot ( word fix-word big-word -- quot )
+: integer-op-quot ( triple fix-word big-word -- quot )
     rot integer-op-combinator 1quotation 2curry ;
 
-: define-integer-op-word ( word fix-word big-word -- )
+: define-integer-op-word ( triple fix-word big-word -- )
     [
-        [ integer-op-word ] [ integer-op-quot ] 3bi
+        [ 2drop integer-op-word ] [ integer-op-quot ] 3bi
         (( x y -- z )) define-declared
-    ]
-    [
-        [ integer-op-word ] [ 2drop ] 3bi
+    ] [
+        2drop
+        [ integer-op-word ] keep
         "derived-from" set-word-prop
     ] 3bi ;
 
-: define-integer-op-words ( words fix-word big-word -- )
+: define-integer-op-words ( triples fix-word big-word -- )
     [ define-integer-op-word ] 2curry each ;
 
 : integer-op-triples ( word -- triples )
@@ -78,7 +73,7 @@ PREDICATE: math-partial < word
 : define-integer-ops ( word fix-word big-word -- )
     >r >r integer-op-triples r> r>
     [ define-integer-op-words ]
-    [ [ 2drop ] [ [ integer-op-word ] 2curry map ] 3bi zip % ]
+    [ 2drop [ dup integer-op-word ] { } map>assoc % ]
     3bi ;
 
 : define-math-ops ( op -- )
@@ -160,15 +155,10 @@ SYMBOL: fast-math-ops
         \ number= \ eq? \ bignum= define-integer-ops
     ] { } make >hashtable math-ops set-global
 
-    [
-        { { + fixnum fixnum } fixnum+fast } ,
-        { { - fixnum fixnum } fixnum-fast } ,
-        { { * fixnum fixnum } fixnum*fast } ,
-        { { shift fixnum fixnum } fixnum-shift-fast } ,
-
-        \ + \ fixnum+fast \ bignum+ define-integer-ops
-        \ - \ fixnum-fast \ bignum- define-integer-ops
-        \ * \ fixnum*fast \ bignum* define-integer-ops
-        \ shift \ fixnum-shift-fast \ bignum-shift define-integer-ops
-    ] { } make >hashtable fast-math-ops set-global
+    H{
+        { { + fixnum fixnum } fixnum+fast }
+        { { - fixnum fixnum } fixnum-fast }
+        { { * fixnum fixnum } fixnum*fast }
+        { { shift fixnum fixnum } fixnum-shift-fast }
+    } fast-math-ops set-global
 ] with-compilation-unit

From e61f2321d0c39b66acf8df37a2e0456d47d6758f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 30 Jul 2008 17:36:24 -0500
Subject: [PATCH 71/77] More debugging

---
 .../tree/cleanup/cleanup-tests.factor         | 12 +++++------
 .../compiler/tree/cleanup/cleanup.factor      |  3 ++-
 .../tree/propagation/propagation-tests.factor |  8 +++++++
 .../recursive/recursive-tests.factor          | 19 +++++++++++++++++
 .../propagation/recursive/recursive.factor    |  4 ++--
 .../tree/propagation/slots/slots.factor       | 21 ++++++++++++++-----
 .../stack-checker/stack-checker-tests.factor  |  2 +-
 7 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 unfinished/compiler/tree/propagation/recursive/recursive-tests.factor

diff --git a/unfinished/compiler/tree/cleanup/cleanup-tests.factor b/unfinished/compiler/tree/cleanup/cleanup-tests.factor
index 22f53e2488..c483b8bdc6 100644
--- a/unfinished/compiler/tree/cleanup/cleanup-tests.factor
+++ b/unfinished/compiler/tree/cleanup/cleanup-tests.factor
@@ -195,17 +195,17 @@ GENERIC: annotate-entry-test-1 ( x -- )
 
 M: fixnum annotate-entry-test-1 drop ;
 
-: (annotate-entry-test-2) ( from to quot: ( -- ) -- )
-    2over >= [
-        3drop
+: (annotate-entry-test-2) ( from to -- )
+    2dup >= [
+        2drop
     ] [
-        [ swap >r call dup annotate-entry-test-1 1+ r> ] keep (annotate-entry-test-2)
+        >r dup annotate-entry-test-1 1+ r> (annotate-entry-test-2)
     ] if ; inline recursive
 
 : annotate-entry-test-2 0 -rot (annotate-entry-test-2) ; inline
 
 [ f ] [
-    [ { bignum } declare [ ] annotate-entry-test-2 ]
+    [ { bignum } declare annotate-entry-test-2 ]
     \ annotate-entry-test-1 inlined?
 ] unit-test
 
@@ -375,7 +375,7 @@ cell-bits 32 = [
 
 [ t ] [
     [ { fixnum } declare 0 [ + ] reduce ]
-    { < <-integer-fixnum } inlined?
+    { < <-integer-fixnum nth-unsafe } inlined?
 ] unit-test
 
 [ f ] [
diff --git a/unfinished/compiler/tree/cleanup/cleanup.factor b/unfinished/compiler/tree/cleanup/cleanup.factor
index 40a8da1562..08fd12f177 100644
--- a/unfinished/compiler/tree/cleanup/cleanup.factor
+++ b/unfinished/compiler/tree/cleanup/cleanup.factor
@@ -22,7 +22,8 @@ GENERIC: cleanup* ( node -- node/nodes )
     [ cleanup* ] map flatten ;
 
 : cleanup-folding? ( #call -- ? )
-    node-output-infos [ literal?>> ] all? ;
+    node-output-infos dup empty?
+    [ drop f ] [ [ literal?>> ] all? ] if ;
 
 : cleanup-folding ( #call -- nodes )
     #! Replace a #call having a known result with a #drop of its
diff --git a/unfinished/compiler/tree/propagation/propagation-tests.factor b/unfinished/compiler/tree/propagation/propagation-tests.factor
index de6d6c72cb..c6e7865c48 100644
--- a/unfinished/compiler/tree/propagation/propagation-tests.factor
+++ b/unfinished/compiler/tree/propagation/propagation-tests.factor
@@ -520,3 +520,11 @@ M: array iterate first t ;
 [ V{ POSTPONE: f } ] [
     [ 3 string? ] final-classes
 ] unit-test
+
+[ V{ fixnum } ] [
+    [ { fixnum } declare [ ] curry obj>> ] final-classes
+] unit-test
+
+[ V{ fixnum } ] [
+    [ { fixnum fixnum } declare [ nth-unsafe ] curry call ] final-classes
+] unit-test
diff --git a/unfinished/compiler/tree/propagation/recursive/recursive-tests.factor b/unfinished/compiler/tree/propagation/recursive/recursive-tests.factor
new file mode 100644
index 0000000000..cf72a2a135
--- /dev/null
+++ b/unfinished/compiler/tree/propagation/recursive/recursive-tests.factor
@@ -0,0 +1,19 @@
+IN: compiler.tree.propagation.recursive.tests
+USING: tools.test compiler.tree.propagation.recursive
+math.intervals kernel ;
+
+[ T{ interval f { 0 t } { 1/0. t } } ] [
+    T{ interval f { 1 t } { 1 t } }
+    T{ interval f { 0 t } { 0 t } } generalize-counter-interval
+] unit-test
+
+[ T{ interval f { -1/0. t } { 10 t } } ] [
+    T{ interval f { -1 t } { -1 t } }
+    T{ interval f { 10 t } { 10 t } } generalize-counter-interval
+] unit-test
+
+[ t ] [
+    T{ interval f { 1 t } { 268435455 t } }
+    T{ interval f { -268435456 t } { 268435455 t } } tuck
+    generalize-counter-interval =
+] unit-test
diff --git a/unfinished/compiler/tree/propagation/recursive/recursive.factor b/unfinished/compiler/tree/propagation/recursive/recursive.factor
index 425d5fb26f..c5fb04e322 100644
--- a/unfinished/compiler/tree/propagation/recursive/recursive.factor
+++ b/unfinished/compiler/tree/propagation/recursive/recursive.factor
@@ -21,12 +21,12 @@ IN: compiler.tree.propagation.recursive
 
 : generalize-counter-interval ( interval initial-interval -- interval' )
     {
-        { [ 2dup = ] [ empty-interval ] }
+        { [ 2dup interval-subset? ] [ empty-interval ] }
         { [ over empty-interval eq? ] [ empty-interval ] }
         { [ 2dup interval>= t eq? ] [ 1./0. [a,a] ] }
         { [ 2dup interval<= t eq? ] [ -1./0. [a,a] ] }
         [ [-inf,inf] ]
-    } cond nip interval-union ;
+    } cond interval-union nip ;
 
 : generalize-counter ( info' initial -- info )
     2dup [ class>> null-class? ] either? [ drop ] [
diff --git a/unfinished/compiler/tree/propagation/slots/slots.factor b/unfinished/compiler/tree/propagation/slots/slots.factor
index 713ac1703f..2924eb4369 100644
--- a/unfinished/compiler/tree/propagation/slots/slots.factor
+++ b/unfinished/compiler/tree/propagation/slots/slots.factor
@@ -29,7 +29,7 @@ UNION: fixed-length-sequence array byte-array string ;
     bi* value-info-intersect 1array ;
 
 : tuple-constructor? ( word -- ? )
-    { <tuple-boa> <complex> } memq? ;
+    { <tuple-boa> curry compose <complex> } memq? ;
 
 : read-only-slots ( values class -- slots )
     #! Delegation.
@@ -41,22 +41,33 @@ UNION: fixed-length-sequence array byte-array string ;
     [ , f , [ literal>> ] map % ] { } make >tuple
     <literal-info> ;
 
-: propagate-<tuple-boa> ( #call -- info )
-    #! Delegation
-    in-d>> [ value-info ] map unclip-last
-    literal>> class>> [ read-only-slots ] keep
+: (propagate-tuple-constructor) ( values class -- info )
+    [ [ value-info ] map ] dip [ read-only-slots ] keep
     over 2 tail-slice [ dup [ literal?>> ] when ] all? [
         [ 2 tail-slice ] dip fold-<tuple-boa>
     ] [
         <tuple-info>
     ] if ;
 
+: propagate-<tuple-boa> ( #call -- info )
+    #! Delegation
+    in-d>> unclip-last
+    value-info literal>> class>> (propagate-tuple-constructor) ;
+
+: propagate-curry ( #call -- info )
+    in-d>> \ curry (propagate-tuple-constructor) ;
+
+: propagate-compose ( #call -- info )
+    in-d>> \ compose (propagate-tuple-constructor) ;
+
 : propagate-<complex> ( #call -- info )
     in-d>> [ value-info ] map complex <tuple-info> ;
 
 : propagate-tuple-constructor ( #call word -- infos )
     {
         { \ <tuple-boa> [ propagate-<tuple-boa> ] }
+        { \ curry [ propagate-curry ] }
+        { \ compose [ propagate-compose ] } 
         { \ <complex> [ propagate-<complex> ] }
     } case 1array ;
 
diff --git a/unfinished/stack-checker/stack-checker-tests.factor b/unfinished/stack-checker/stack-checker-tests.factor
index 3fcbc2d023..3c7ae101e3 100755
--- a/unfinished/stack-checker/stack-checker-tests.factor
+++ b/unfinished/stack-checker/stack-checker-tests.factor
@@ -6,7 +6,7 @@ quotations effects tools.test continuations generic.standard
 sorting assocs definitions prettyprint io inspector
 classes.tuple classes.union classes.predicate debugger
 threads.private io.streams.string io.timeouts io.thread
-sequences.private destructors combinators ;
+sequences.private destructors combinators eval ;
 IN: stack-checker.tests
 
 : short-effect ( effect -- pair )

From 9ded594f14344a5a64355522d22174cde3ce7b85 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:11:03 -0500
Subject: [PATCH 72/77] springies.ui: Use color objects

---
 extra/springies/ui/ui.factor | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extra/springies/ui/ui.factor b/extra/springies/ui/ui.factor
index f2248ba6f2..75d3087fe5 100644
--- a/extra/springies/ui/ui.factor
+++ b/extra/springies/ui/ui.factor
@@ -23,7 +23,9 @@ IN: springies.ui
   GL_MODELVIEW glMatrixMode
   glLoadIdentity ;
 
-: display ( -- ) set-projection black gl-color draw-nodes draw-springs ;
+! : display ( -- ) set-projection black gl-color draw-nodes draw-springs ;
+
+: display ( -- ) set-projection black set-color draw-nodes draw-springs ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From 1906efc1bd9238061692ed341d85ac214b8d5b5d Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:11:21 -0500
Subject: [PATCH 73/77] ui.gadgets.slate: It slices! It dices! Order now and
 get a free apron!

---
 extra/ui/gadgets/slate/slate.factor | 87 ++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 1 deletion(-)

diff --git a/extra/ui/gadgets/slate/slate.factor b/extra/ui/gadgets/slate/slate.factor
index 05b2de2e06..08e8b2765c 100644
--- a/extra/ui/gadgets/slate/slate.factor
+++ b/extra/ui/gadgets/slate/slate.factor
@@ -21,8 +21,93 @@ TUPLE: slate < gadget action pdim graft ungraft ;
 
 M: slate pref-dim* ( slate -- dim ) pdim>> ;
 
-M: slate draw-gadget* ( slate -- ) origin get swap action>> with-translation ;
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+USING: combinators arrays sequences math math.geometry
+       opengl.gl ui.gadgets.worlds ;
+
+: screen-y* ( gadget -- loc )
+  {
+    [ find-world height ]
+    [ screen-loc second ]
+    [ height ]
+  }
+  cleave
+  + - ;
+
+: screen-loc* ( gadget -- loc )
+  {
+    [ screen-loc first ]
+    [ screen-y* ]
+  }
+  cleave
+  2array ;
+
+: setup-viewport ( gadget -- gadget )
+  dup
+  {
+    [ screen-loc* ]
+    [ dim>>       ]
+  }
+  cleave
+  gl-viewport ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: default-coordinate-system ( gadget -- gadget )
+  dup
+  {
+    [ drop 0 ]
+    [ width 1 - ]
+    [ height 1 - ]
+    [ drop 0 ]
+  }
+  cleave
+  -1 1
+  glOrtho ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 M: slate graft*   ( slate -- ) graft>>   call ;
 M: slate ungraft* ( slate -- ) ungraft>> call ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+GENERIC: establish-coordinate-system ( gadget -- gadget )
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+M: slate establish-coordinate-system ( slate -- slate )
+   default-coordinate-system ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+GENERIC: draw-slate ( slate -- slate )
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+M: slate draw-slate ( slate -- slate ) dup action>> call ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+M: slate draw-gadget* ( slate -- )
+
+   GL_PROJECTION glMatrixMode glPushMatrix glLoadIdentity
+
+   establish-coordinate-system
+
+   GL_MODELVIEW glMatrixMode glLoadIdentity glPushMatrix
+
+   setup-viewport
+
+   draw-slate
+
+   GL_PROJECTION glMatrixMode glPopMatrix
+   GL_MODELVIEW  glMatrixMode glPopMatrix
+
+   dup
+   find-world
+   default-coordinate-system
+   setup-viewport
+   drop
+   drop ;
\ No newline at end of file

From 22f2a0d856b5e680d74f20dad2d7646d4037bfad Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:12:58 -0500
Subject: [PATCH 74/77] ui.gadgets.cartesian: Use the new slate

---
 extra/ui/gadgets/cartesian/cartesian.factor | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/extra/ui/gadgets/cartesian/cartesian.factor
index 027c1061a8..730b0f5b44 100644
--- a/extra/ui/gadgets/cartesian/cartesian.factor
+++ b/extra/ui/gadgets/cartesian/cartesian.factor
@@ -22,20 +22,15 @@ TUPLE: cartesian < slate x-min x-max y-min y-max z-min z-max perspective ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-M: cartesian draw-gadget* ( cartesian -- )
-   GL_PROJECTION glMatrixMode
-   glLoadIdentity
+M: cartesian establish-coordinate-system ( cartesian -- cartesian )
    dup
-       {
-         [ x-min>> ] [ x-max>> ]
-         [ y-min>> ] [ y-max>> ]
-         [ z-min>> ] [ z-max>> ]
-       }
-     cleave
-     glOrtho
-   GL_MODELVIEW glMatrixMode
-   glLoadIdentity
-   call-next-method ;
+   {
+     [ x-min>> ] [ x-max>> ]
+     [ y-min>> ] [ y-max>> ]
+     [ z-min>> ] [ z-max>> ]
+   }
+   cleave
+   glOrtho ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

From 52085a4e49f983ec04e6efca4eea8c737c241d81 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:13:27 -0500
Subject: [PATCH 75/77] ui.gadgets.plot: Use the new slate

---
 extra/ui/gadgets/plot/plot.factor | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/extra/ui/gadgets/plot/plot.factor b/extra/ui/gadgets/plot/plot.factor
index 7eb79dd6fe..0a6f22f080 100644
--- a/extra/ui/gadgets/plot/plot.factor
+++ b/extra/ui/gadgets/plot/plot.factor
@@ -47,12 +47,14 @@ M: function plot-function ( plot function -- plot )
     [ [ drop 0  ] [ y-min>> ] bi 2array ]
     [ [ drop 0  ] [ y-max>> ] bi 2array ] bi line* ;
 
-M: plot draw-gadget* ( plot -- )
-   dup call-next-method
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+USING: ui.gadgets.slate ;
+
+M: plot draw-slate ( plot -- plot )
    2 glLineWidth
    draw-axis
    plot-functions
-   drop
    fill-mode
    1 glLineWidth ;
 

From 28abbfc6c2d90859faa1452cabb793e1059b9d31 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 21:53:37 -0500
Subject: [PATCH 76/77] ui.gadgets.plot: Keyboard controls

---
 extra/ui/gadgets/plot/plot.factor | 75 ++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/extra/ui/gadgets/plot/plot.factor b/extra/ui/gadgets/plot/plot.factor
index 0a6f22f080..cf48c5ab9d 100644
--- a/extra/ui/gadgets/plot/plot.factor
+++ b/extra/ui/gadgets/plot/plot.factor
@@ -61,4 +61,77 @@ M: plot draw-slate ( plot -- plot )
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : add-function ( plot function -- plot )
-  over functions>> swap suffix >>functions ;
\ No newline at end of file
+  over functions>> swap suffix >>functions ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: x-span ( plot -- span ) [ x-max>> ] [ x-min>> ] bi - ;
+: y-span ( plot -- span ) [ y-max>> ] [ y-min>> ] bi - ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+USING: ui.gestures ui.gadgets ;
+
+: left ( plot -- plot )
+  dup [ x-min>> ] [ x-span 1/10 * ] bi - >>x-min
+  dup [ x-max>> ] [ x-span 1/10 * ] bi - >>x-max
+  dup relayout-1 ;
+
+: right ( plot -- plot )
+  dup [ x-min>> ] [ x-span 1/10 * ] bi + >>x-min
+  dup [ x-max>> ] [ x-span 1/10 * ] bi + >>x-max
+  dup relayout-1 ;
+
+: down ( plot -- plot )
+  dup [ y-min>> ] [ y-span 1/10 * ] bi - >>y-min
+  dup [ y-max>> ] [ y-span 1/10 * ] bi - >>y-max
+  dup relayout-1 ;
+
+: up ( plot -- plot )
+  dup [ y-min>> ] [ y-span 1/10 * ] bi + >>y-min
+  dup [ y-max>> ] [ y-span 1/10 * ] bi + >>y-max
+  dup relayout-1 ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: zoom-in-horizontal ( plot -- plot )
+  dup [ x-min>> ] [ x-span 1/10 * ] bi + >>x-min
+  dup [ x-max>> ] [ x-span 1/10 * ] bi - >>x-max ;
+
+: zoom-in-vertical ( plot -- plot )
+  dup [ y-min>> ] [ y-span 1/10 * ] bi + >>y-min
+  dup [ y-max>> ] [ y-span 1/10 * ] bi - >>y-max ;
+
+: zoom-in ( plot -- plot )
+  zoom-in-horizontal
+  zoom-in-vertical
+  dup relayout-1 ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: zoom-out-horizontal ( plot -- plot )
+  dup [ x-min>> ] [ x-span 1/10 * ] bi - >>x-min
+  dup [ x-max>> ] [ x-span 1/10 * ] bi + >>x-max ;
+
+: zoom-out-vertical ( plot -- plot )
+  dup [ y-min>> ] [ y-span 1/10 * ] bi - >>y-min
+  dup [ y-max>> ] [ y-span 1/10 * ] bi + >>y-max ;
+
+: zoom-out ( plot -- plot )
+  zoom-out-horizontal
+  zoom-out-vertical
+  dup relayout-1 ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+plot
+  H{
+    { T{ mouse-enter } [ request-focus ] }
+    { T{ key-down f f "LEFT"  } [ left drop  ] }
+    { T{ key-down f f "RIGHT" } [ right drop ] }
+    { T{ key-down f f "DOWN"  } [ down drop  ] }
+    { T{ key-down f f "UP"    } [ up drop    ] }
+    { T{ key-down f f "a"     } [ zoom-in  drop ] }
+    { T{ key-down f f "z"     } [ zoom-out drop ] }
+  }
+set-gestures
\ No newline at end of file

From 9a84cfe6568f41d03d70d4dbe3eff1f78c1787eb Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Fri, 1 Aug 2008 19:59:18 -0300
Subject: [PATCH 77/77] irc.client: Fix user quit notification

---
 extra/irc/client/client-tests.factor | 17 ++++++++++++++++-
 extra/irc/client/client.factor       | 27 +++++++--------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/extra/irc/client/client-tests.factor b/extra/irc/client/client-tests.factor
index e021ff4ff4..1b338df442 100644
--- a/extra/irc/client/client-tests.factor
+++ b/extra/irc/client/client-tests.factor
@@ -160,7 +160,7 @@ IN: irc.client.tests
     } cleave
     ] unit-test
 
-! Namelist notification
+! Namelist change notification
 { T{ participant-changed f f f } } [
     { ":ircserver.net 353 factorbot @ #factortest :@factorbot "
       ":ircserver.net 366 factorbot #factortest :End of /NAMES list." } make-client
@@ -172,4 +172,19 @@ IN: irc.client.tests
       [ listeners>> [ "#factortest" ] dip at [ read-message drop ] [ read-message ] bi ]
       [ terminate-irc ]
     } cleave
+    ] unit-test
+
+{ T{ participant-changed f "somedude" +part+ } } [
+    { ":somedude!n=user@isp.net QUIT" } make-client
+    { [ "factorbot" set-nick ]
+      [ listeners>>
+        [ "#factortest" [ <irc-channel-listener>
+                          H{ { "somedude" +normal+ } } clone >>participants ] keep
+        ] dip set-at ]
+      [ connect-irc ]
+      [ drop 0.1 seconds sleep ]
+      [ listeners>> [ "#factortest" ] dip at
+        [ read-message drop ] [ read-message drop ] [ read-message ] tri ]
+      [ terminate-irc ]
+    } cleave
     ] unit-test
\ No newline at end of file
diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 813de0f57c..99922b1fb5 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -88,10 +88,11 @@ SYMBOL: current-irc-client
 : irc-stream> ( -- stream ) irc> stream>> ;
 : irc-write ( s -- ) irc-stream> stream-write ;
 : irc-print ( s -- ) irc-stream> [ stream-print ] keep stream-flush ;
+: irc-send ( irc-message -- ) irc> out-messages>> mailbox-put ;
 : listener> ( name -- listener/f ) irc> listeners>> at ;
 
 : maybe-mailbox-get ( mailbox quot: ( irc-message -- ) -- )
-    [ dup mailbox-empty? [ drop yield ] ] dip '[ mailbox-get @ ] if ; inline
+    [ dup mailbox-empty? [ drop 0.1 sleep ] ] dip '[ mailbox-get @ ] if ; inline
 
 GENERIC: to-listener ( message obj -- )
 
@@ -147,24 +148,6 @@ DEFER: me?
     "JOIN " irc-write
     [ [ " :" ] dip 3append ] when* irc-print ;
 
-: /PART ( channel text -- )
-    [ "PART " irc-write irc-write ] dip
-    " :" irc-write irc-print ;
-
-: /KICK ( channel who -- )
-    [ "KICK " irc-write irc-write ] dip
-    " " irc-write irc-print ;
-
-: /PRIVMSG ( nick line -- )
-    [ "PRIVMSG " irc-write irc-write ] dip
-    " :" irc-write irc-print ;
-
-: /ACTION ( nick line -- )
-    [ 1 , "ACTION " % % 1 , ] "" make /PRIVMSG ;
-
-: /QUIT ( text -- )
-    "QUIT :" irc-write irc-print ;
-
 : /PONG ( text -- )
     "PONG " irc-write irc-print ;
 
@@ -240,10 +223,14 @@ M: kick handle-incoming-irc ( kick -- )
 M: quit handle-incoming-irc ( quit -- )
     [ dup prefix>> parse-name listeners-with-participant
       [ to-listener ] with each ]
-    [ prefix>> parse-name remove-participant-from-all ]
     [ handle-participant-change ]
+    [ prefix>> parse-name remove-participant-from-all ]
     tri ;
 
+! FIXME: implement this
+! M: mode handle-incoming-irc ( mode -- ) call-next-method ;
+! M: nick handle-incoming-irc ( nick -- ) call-next-method ;
+
 : >nick/mode ( string -- nick mode )
     dup first "+@" member? [ unclip ] [ 0 ] if participant-mode ;