Move mirrors out of the boot image

core/alien/compiler/compiler.factor

@@ -4,7 +4,7 @@ USING: arrays generator generator.registers generator.fixup
 hashtables kernel math namespaces sequences words
 inference.state inference.backend inference.dataflow system
 math.parser classes alien.arrays alien.c-types alien.strings
-alien.structs alien.syntax cpu.architecture alien inspector
+alien.structs alien.syntax cpu.architecture alien summary
 quotations assocs kernel.private threads continuations.private
 libc combinators compiler.errors continuations layouts accessors
 init sets ;

core/classes/tuple/parser/parser-tests.factor

@@ -51,7 +51,7 @@ must-fail-with
 [ error>> unexpected-eof? ]
 must-fail-with
 
-[ "IN: classes.tuple.parser.tests USE: alien TUPLE: foo { slot alien } ;" eval ]
+[ "IN: classes.tuple.parser.tests USE: generic.standard TUPLE: foo { slot no-method } ;" eval ]
 [ error>> no-initial-value? ]
 must-fail-with
 

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 inspector parser
+USING: accessors kernel sets namespaces sequences summary parser
 lexer combinators words classes.parser classes.tuple arrays ;
 IN: classes.tuple.parser
 

core/classes/tuple/tuple-tests.factor

@@ -3,7 +3,7 @@ math.constants parser sequences tools.test words assocs
 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 inspector
+calendar prettyprint io.streams.string splitting summary
 columns math.order classes.private slots slots.private ;
 IN: classes.tuple.tests
 

core/debugger/debugger.factor

@@ -1,12 +1,12 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: slots arrays definitions generic hashtables inspector io
+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
 continuations.private combinators generic.math classes.builtin
 classes compiler.units generic.standard vocabs threads
-threads.private init kernel.private libc io.encodings mirrors
+threads.private init kernel.private libc io.encodings
 accessors math.order destructors ;
 IN: debugger
 
@@ -16,7 +16,6 @@ GENERIC: error-help ( error -- topic )
 M: object error. . ;
 M: object error-help drop f ;
 
-M: tuple error. describe ;
 M: tuple error-help class ;
 
 M: string error. print ;
@@ -33,9 +32,6 @@ M: string error. print ;
 : :get ( variable -- value )
     error-continuation get continuation-name assoc-stack ;
 
-: :vars ( -- )
-    error-continuation get continuation-name namestack. ;
-
 : :res ( n -- * )
     1- restarts get-global nth f restarts set-global restart ;
 

core/dlists/dlists.factor

@@ -1,7 +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 inspector
+USING: combinators kernel math sequences accessors summary
 dequeues ;
 IN: dlists
 

core/generic/parser/parser.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: parser kernel words generic namespaces inspector ;
+USING: parser kernel words generic namespaces summary ;
 IN: generic.parser
 
 ERROR: not-in-a-method-error ;

core/generic/standard/standard.factor

@@ -93,7 +93,7 @@ ERROR: no-next-method class generic ;
 
 : single-next-method-quot ( class generic -- quot )
     [
-        [ drop [ instance? ] curry % ]
+        [ drop "predicate" word-prop % ]
         [
             2dup next-method
             [ 2nip 1quotation ]

core/inference/errors/errors.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 IN: inference.errors
 USING: inference.backend inference.dataflow kernel generic
-sequences prettyprint io words arrays inspector effects debugger
+sequences prettyprint io words arrays summary effects debugger
 assocs accessors ;
 
 M: inference-error error-help error>> error-help ;

core/inference/known-words/known-words.factor

@@ -10,7 +10,7 @@ namespaces.private parser prettyprint quotations
 quotations.private sbufs sbufs.private sequences
 sequences.private slots.private strings strings.private system
 threads.private classes.tuple classes.tuple.private vectors
-vectors.private words words.private assocs inspector
+vectors.private words words.private assocs summary
 compiler.units system.private ;
 IN: inference.known-words
 

core/inference/transforms/transforms.factor

@@ -3,7 +3,7 @@
 USING: accessors arrays kernel words sequences generic math
 namespaces quotations assocs combinators math.bitfields
 inference.backend inference.dataflow inference.state
-classes.tuple classes.tuple.private effects inspector hashtables
+classes.tuple classes.tuple.private effects summary hashtables
 classes generic sets definitions generic.standard slots.private ;
 IN: inference.transforms
 

core/inspector/inspector-docs.factor

@@ -22,9 +22,7 @@ $nl
 { $subsection inspector-hook }
 "A description of an object can be printed without starting the inspector:"
 { $subsection describe }
-{ $subsection describe* }
+{ $subsection describe* } ;
-"A word for getting very brief descriptions of words and general objects:"
-{ $subsection summary } ;
 
 ABOUT: "inspector"
 
@@ -54,10 +52,6 @@ $nl
 } }
 { $notes "This word is a factor of " { $link describe } " and " { $link inspect } "." } ;
 
-HELP: summary
-{ $values { "object" object } { "string" "a string" } }
-{ $contract "Outputs a brief description of the object." } ;
-
 HELP: inspector-stack
 { $var-description "If the inspector is running, this variable holds previously-inspected objects." } ;
 

core/inspector/inspector.factor

@@ -3,46 +3,9 @@
 USING: accessors arrays generic hashtables io kernel assocs math
 namespaces prettyprint sequences strings io.styles vectors words
 quotations mirrors splitting math.parser classes vocabs refs
-sets sorting ;
+sets sorting summary debugger continuations ;
 IN: inspector
 
-GENERIC: summary ( object -- string )
-
-: object-summary ( object -- string )
-    class name>> " instance" append ;
-
-M: object summary object-summary ;
-
-M: input summary
-    [
-        "Input: " %
-        input-string "\n" split1 swap %
-        "..." "" ? %
-    ] "" make ;
-
-M: word summary synopsis ;
-
-M: sequence summary
-    [
-        dup class name>> %
-        " with " %
-        length #
-        " elements" %
-    ] "" make ;
-
-M: assoc summary
-    [
-        dup class name>> %
-        " with " %
-        assoc-size #
-        " entries" %
-    ] "" make ;
-
-! Override sequence => integer instance
-M: f summary object-summary ;
-
-M: integer summary object-summary ;
-
 : value-editor ( path -- )
     [
         [ pprint-short ] presented-printer set
@@ -101,6 +64,8 @@ SYMBOL: +editable+
 
 : describe ( obj -- ) H{ } describe* ;
 
+M: tuple error. describe ;
+
 : namestack. ( seq -- )
     [ [ global eq? not ] filter [ keys ] gather ] keep
     [ dupd assoc-stack ] curry H{ } map>assoc describe ;
@@ -108,6 +73,9 @@ SYMBOL: +editable+
 : .vars ( -- )
     namestack namestack. ;
 
+: :vars ( -- )
+    error-continuation get continuation-name namestack. ;
+
 SYMBOL: inspector-hook
 
 [ H{ { +number-rows+ t } } describe* ] inspector-hook set-global

core/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 inspector ;
+io.encodings combinators splitting io byte-arrays summary ;
 IN: io.encodings.utf16
 
 SINGLETON: utf16be

core/lexer/lexer.factor

@@ -1,7 +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 inspector
+debugger io vectors arrays math.parser combinators summary
 continuations ;
 IN: lexer
 

core/optimizer/backend/backend.factor

@@ -115,3 +115,15 @@ M: f set-node-successor 2drop ;
 
 : drop-inputs ( node -- #shuffle )
     node-in-d clone \ #shuffle in-node ;
+
+: optimizer-hooks ( node -- conditions )
+    param>> "optimizer-hooks" word-prop ;
+
+: optimizer-hook ( node -- pair/f )
+    dup optimizer-hooks [ first call ] find 2nip ;
+
+: optimize-hook ( node -- )
+    dup optimizer-hook second call ;
+
+: define-optimizers ( word optimizers -- )
+    "optimizer-hooks" set-word-prop ;

core/optimizer/inlining/inlining.factor

@@ -107,19 +107,6 @@ DEFER: (flat-length)
         [ 2drop t ]
     } cond ;
 
-! Resolve type checks at compile time where possible
-: comparable? ( actual testing -- ? )
-    #! If actual is a subset of testing or if the two classes
-    #! are disjoint, return t.
-    2dup class<= >r classes-intersect? not r> or ;
-
-: optimize-predicate? ( #call -- ? )
-    dup node-param "predicating" word-prop dup [
-        >r node-class-first r> comparable?
-    ] [
-        2drop f
-    ] if ;
-
 : literal-quot ( node literals -- quot )
     #! Outputs a quotation which drops the node's inputs, and
     #! pushes some literals.
@@ -130,33 +117,40 @@ DEFER: (flat-length)
     #! Make #shuffle -> #push -> #return -> successor
     dupd literal-quot f splice-quot ;
 
-: evaluate-predicate ( #call -- ? )
+! Resolve type checks at compile time where possible
-    dup node-param "predicating" word-prop >r
+: comparable? ( actual testing -- ? )
-    node-class-first r> class<= ;
+    #! If actual is a subset of testing or if the two classes
+    #! are disjoint, return t.
+    2dup class<= >r classes-intersect? not r> or ;
 
-: optimize-predicate ( #call -- node )
+: optimize-check? ( #call value class -- ? )
+    >r node-class r> comparable? ;
+
+: evaluate-check ( node value class -- ? )
+    >r node-class r> class<= ;
+
+: optimize-check ( #call value class -- node )
     #! If the predicate is followed by a branch we fold it
     #! immediately
-    dup evaluate-predicate swap
+    [ evaluate-check ] [ 2drop ] 3bi
-    dup node-successor #if? [
+    dup successor>> #if? [
         dup drop-inputs >r
-        node-successor swap 0 1 ? fold-branch
+        successor>> swap 0 1 ? fold-branch
-        r> [ set-node-successor ] keep
+        r> swap >>successor
     ] [
         swap 1array inline-literals
     ] if ;
 
-: optimizer-hooks ( node -- conditions )
+: (optimize-predicate) ( #call -- #call value class )
-    node-param "optimizer-hooks" word-prop ;
+    [ ] [ in-d>> first ] [ param>> "predicating" word-prop ] tri ;
 
-: optimizer-hook ( node -- pair/f )
+: optimize-predicate? ( #call -- ? )
-    dup optimizer-hooks [ first call ] find 2nip ;
+    dup param>> "predicating" word-prop [
+        (optimize-predicate) optimize-check?
+    ] [ drop f ] if ;
 
-: optimize-hook ( node -- )
+: optimize-predicate ( #call -- node )
-    dup optimizer-hook second call ;
+    (optimize-predicate) optimize-check ;
-
-: define-optimizers ( word optimizers -- )
-    "optimizer-hooks" set-word-prop ;
 
 : flush-eval? ( #call -- ? )
     dup node-param "flushable" word-prop [

core/optimizer/known-words/known-words.factor

@@ -145,18 +145,19 @@ byte-vectors ;
     ] if
 ] "constraints" set-word-prop
 
-! open-code instance? checks on predicate classes
+! Eliminate instance? checks when the outcome is known at compile time
-: literal-predicate-class? ( #call -- ? )
+: (optimize-instance) ( #call -- #call value class/f )
-    dup in-d>> second node-literal predicate-class? ;
+    [ ] [ in-d>> first ] [ dup in-d>> second node-literal ] tri ;
 
-: expand-predicate-instance ( #call -- node )
+: optimize-instance? ( #call -- ? )
-    dup dup in-d>> second node-literal
+    (optimize-instance) dup class?
-    [ +inlined+ depends-on ]
+    [ optimize-check? ] [ 3drop f ] if ;
-    [ "predicate-definition" word-prop [ drop ] prepose ] bi
-    f splice-quot ;
 
-\ predicate-instance? {
+: optimize-instance ( #call -- node )
-    { [ dup literal-predicate-class? ] [ expand-predicate-instance ] }
+    (optimize-instance) optimize-check ;
+
+\ instance? {
+    { [ dup optimize-instance? ] [ optimize-instance ] }
 } define-optimizers
 
 ! eq? on the same object is always t

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
-prettyprint sequences strings vectors words quotations inspector
+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

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
-prettyprint sequences strings vectors words quotations inspector
+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 ;

core/strings/parser/parser.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel inspector assocs namespaces splitting sequences
+USING: kernel summary assocs namespaces splitting sequences
 strings math.parser lexer ;
 IN: strings.parser
 

core/summary/summary-docs.factor

@@ -0,0 +1,12 @@
+IN: summary
+USING: kernel strings help.markup help.syntax ;
+
+ARTICLE: "summary" "Summary"
+"A word for getting very brief descriptions of words and general objects:"
+{ $subsection summary } ;
+
+HELP: summary
+{ $values { "object" object } { "string" string } }
+{ $contract "Outputs a brief description of the object." } ;
+
+ABOUT: "summary"

core/summary/summary.factor

@@ -0,0 +1,42 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors classes sequences splitting kernel namespaces
+words math math.parser io.styles prettyprint assocs ;
+IN: summary
+
+GENERIC: summary ( object -- string )
+
+: object-summary ( object -- string )
+    class name>> " instance" append ;
+
+M: object summary object-summary ;
+
+M: input summary
+    [
+        "Input: " %
+        input-string "\n" split1 swap %
+        "..." "" ? %
+    ] "" make ;
+
+M: word summary synopsis ;
+
+M: sequence summary
+    [
+        dup class name>> %
+        " with " %
+        length #
+        " elements" %
+    ] "" make ;
+
+M: assoc summary
+    [
+        dup class name>> %
+        " with " %
+        assoc-size #
+        " entries" %
+    ] "" make ;
+
+! Override sequence => integer instance
+M: f summary object-summary ;
+
+M: integer summary object-summary ;

core/vocabs/loader/loader.factor

@@ -1,10 +1,9 @@
 ! 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 inspector debugger io io.styles
+definitions parser continuations summary debugger io io.styles
-hashtables sorting prettyprint source-files
+hashtables sorting prettyprint source-files arrays combinators
-arrays combinators strings system math.parser compiler.errors
+strings system math.parser compiler.errors splitting init ;
-splitting init ;
 IN: vocabs.loader
 
 SYMBOL: vocab-roots

extra/bitfields/bitfields.factor

@@ -1,4 +1,4 @@
-USING: parser lexer kernel math sequences namespaces assocs inspector
+USING: parser lexer kernel math sequences namespaces assocs summary
 words splitting math.parser arrays sequences.next mirrors
 shuffle compiler.units ;
 IN: bitfields

extra/bootstrap/tools/tools.factor

@@ -1,6 +1,7 @@
 USING: vocabs.loader sequences ;
 
 {
+    "inspector"
     "bootstrap.image"
     "tools.annotations"
     "tools.crossref"

extra/cocoa/application/application.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax io kernel namespaces core-foundation
 core-foundation.run-loop cocoa.messages cocoa cocoa.classes
-cocoa.runtime sequences threads debugger init inspector
+cocoa.runtime sequences threads debugger init summary
 kernel.private ;
 IN: cocoa.application
 

extra/db/postgresql/lib/lib.factor

@@ -5,7 +5,7 @@ quotations sequences db.postgresql.ffi alien alien.c-types
 db.types tools.walker ascii splitting math.parser combinators
 libc shuffle calendar.format byte-arrays destructors prettyprint
 accessors strings serialize io.encodings.binary io.encodings.utf8
-alien.strings io.streams.byte-array inspector present urls ;
+alien.strings io.streams.byte-array summary present urls ;
 IN: db.postgresql.lib
 
 : postgresql-result-error-message ( res -- str/f )

extra/descriptive/descriptive.factor

@@ -1,6 +1,6 @@
 USING: words kernel sequences combinators.lib locals
 locals.private accessors parser namespaces continuations
-inspector definitions arrays.lib arrays ;
+summary definitions arrays.lib arrays ;
 IN: descriptive
 
 ERROR: descriptive-error args underlying word ;

extra/editors/editors.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: parser lexer kernel namespaces sequences definitions
-io.files inspector continuations tools.crossref tools.vocabs io
+io.files summary continuations tools.crossref tools.vocabs io
 prettyprint source-files assocs vocabs vocabs.loader io.backend
 splitting accessors ;
 IN: editors

extra/graphics/bitmap/bitmap.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: alien arrays byte-arrays combinators inspector
+USING: alien arrays byte-arrays combinators summary
 io.backend graphics.viewer io io.binary io.files kernel libc
 math math.functions namespaces opengl opengl.gl prettyprint
 sequences strings ui ui.gadgets.panes io.encodings.binary ;

extra/hello-world/deploy.factor

@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-word-defs? f }
-    { deploy-random? f }
-    { deploy-name "Hello world (console)" }
-    { deploy-threads? f }
-    { deploy-compiler? f }
-    { deploy-math? f }
-    { deploy-c-types? f }
-    { deploy-io 2 }
-    { deploy-reflection 1 }
-    { deploy-ui? f }
-    { "stop-after-last-window?" t }
     { deploy-word-props? f }
+    { deploy-random? f }
+    { deploy-compiler? f }
+    { deploy-c-types? f }
+    { deploy-ui? f }
+    { deploy-reflection 1 }
+    { deploy-threads? f }
+    { deploy-io 2 }
+    { deploy-word-defs? f }
+    { "stop-after-last-window?" t }
+    { deploy-name "Hello world (console)" }
+    { deploy-math? f }
 }

extra/help/crossref/crossref.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays definitions generic assocs
 io kernel namespaces prettyprint prettyprint.sections
-sequences words inspector classes help.topics help.markup ;
+sequences words summary classes help.topics help.markup ;
 IN: help.crossref
 
 : article-children ( topic -- seq )

extra/help/help-docs.factor

@@ -1,5 +1,5 @@
 USING: help.markup help.crossref help.stylesheet help.topics
-help.syntax definitions io prettyprint inspector arrays math
+help.syntax definitions io prettyprint summary arrays math
 sequences vocabs ;
 IN: help
 

extra/help/topics/topics.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.x
 USING: arrays definitions generic assocs
 io kernel namespaces prettyprint prettyprint.sections
-sequences words inspector classes strings vocabs ;
+sequences words summary classes strings vocabs ;
 IN: help.topics
 
 TUPLE: link name ;

extra/http/client/client.factor

@@ -9,7 +9,7 @@ io.encodings.ascii
 io.encodings.8-bit
 io.encodings.binary
 io.streams.duplex
-fry debugger inspector ascii urls present ;
+fry debugger summary ascii urls present ;
 IN: http.client
 
 : max-redirects 10 ;

extra/inverse/inverse.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel words inspector slots quotations
+USING: accessors kernel words summary slots quotations
 sequences assocs math arrays inference effects shuffle
 continuations debugger classes.tuple namespaces vectors
 bit-arrays byte-arrays strings sbufs math.functions macros

extra/io/encodings/strict/strict.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.encodings kernel accessors inspector ;
+USING: io.encodings kernel accessors summary ;
 IN: io.encodings.strict
 
 TUPLE: strict code ;

extra/io/launcher/launcher.factor

@@ -2,9 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: system kernel namespaces strings hashtables sequences 
 assocs combinators vocabs.loader init threads continuations
-math accessors concurrency.flags destructors
+math accessors concurrency.flags destructors inspector
 io io.backend io.timeouts io.pipes io.pipes.private io.encodings
-io.streams.duplex io.ports debugger prettyprint inspector ;
+io.streams.duplex io.ports debugger prettyprint summary ;
 IN: io.launcher
 
 TUPLE: process < identity-tuple

extra/io/ports/ports.factor

@@ -3,7 +3,7 @@
 USING: math kernel io sequences io.buffers io.timeouts generic
 byte-vectors system io.encodings math.order io.backend
 continuations debugger classes byte-arrays namespaces splitting
-grouping dlists assocs io.encodings.binary inspector accessors
+grouping dlists assocs io.encodings.binary summary accessors
 destructors ;
 IN: io.ports
 

extra/io/sockets/secure/secure.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel symbols namespaces continuations
-destructors io.sockets sequences inspector calendar delegate ;
+destructors io.sockets sequences summary calendar delegate ;
 IN: io.sockets.secure
 
 SYMBOL: secure-socket-timeout

extra/io/sockets/sockets.factor

@@ -6,7 +6,7 @@ sequences arrays io.encodings io.ports io.streams.duplex
 io.encodings.ascii alien.strings io.binary accessors destructors
 classes debugger byte-arrays system combinators parser
 alien.c-types math.parser splitting grouping
-math assocs inspector ;
+math assocs summary ;
 IN: io.sockets
 
 << {

extra/io/streams/duplex/duplex.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel continuations destructors io io.encodings
-io.encodings.private io.timeouts debugger inspector listener
+io.encodings.private io.timeouts debugger summary listener
 accessors delegate delegate.protocols ;
 IN: io.streams.duplex
 

extra/io/unix/backend/backend.factor

@@ -4,7 +4,7 @@ USING: alien generic assocs kernel kernel.private math
 io.ports sequences strings structs sbufs threads unix
 vectors io.buffers io.backend io.encodings math.parser
 continuations system libc qualified namespaces io.timeouts
-io.encodings.utf8 destructors accessors inspector combinators ;
+io.encodings.utf8 destructors accessors summary combinators ;
 QUALIFIED: io
 IN: io.unix.backend
 

extra/io/unix/sockets/secure/secure.factor

@@ -6,7 +6,7 @@ continuations destructors
 openssl openssl.libcrypto openssl.libssl
 io.files io.ports io.unix.backend io.unix.sockets
 io.encodings.ascii io.buffers io.sockets io.sockets.secure
-io.timeouts system inspector ;
+io.timeouts system summary ;
 IN: io.unix.sockets.secure
 
 M: ssl-handle handle-fd file>> handle-fd ;

extra/lisp/lisp.factor

@@ -3,7 +3,7 @@
 USING: kernel peg sequences arrays strings combinators.lib
 namespaces combinators math locals locals.private locals.backend accessors
 vectors syntax lisp.parser assocs parser sequences.lib words
-quotations fry lists inspector combinators.short-circuit ;
+quotations fry lists summary combinators.short-circuit ;
 IN: lisp
 
 DEFER: convert-form

extra/maze/deploy.factor

@@ -1,12 +1,15 @@
 USING: tools.deploy.config ;
-V{
+H{
-    { deploy-ui? t }
-    { deploy-io 1 }
-    { deploy-reflection 1 }
-    { deploy-compiler? t }
-    { deploy-math? t }
-    { deploy-word-props? f }
-    { deploy-c-types? f }
-    { "stop-after-last-window?" t }
     { deploy-name "Maze" }
+    { deploy-word-props? f }
+    { deploy-ui? t }
+    { deploy-c-types? f }
+    { deploy-compiler? t }
+    { deploy-io 1 }
+    { deploy-random? t }
+    { deploy-word-defs? f }
+    { deploy-math? t }
+    { "stop-after-last-window?" t }
+    { deploy-reflection 1 }
+    { deploy-threads? t }
 }

extra/openssl/openssl.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors byte-arrays kernel debugger sequences namespaces math
 math.order combinators init alien alien.c-types alien.strings libc
-continuations destructors debugger inspector splitting assocs
+continuations destructors debugger summary splitting assocs
 random math.parser locals unicode.case
 openssl.libcrypto openssl.libssl
 io.backend io.ports io.files io.encodings.8-bit io.sockets.secure

extra/random/random.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types kernel math namespaces sequences
 io.backend io.binary combinators system vocabs.loader
-inspector ;
+summary ;
 IN: random
 
 SYMBOL: system-random-generator

extra/state-parser/state-parser.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.streams.string kernel math namespaces sequences
-strings circular prettyprint debugger ascii sbufs fry inspector
+strings circular prettyprint debugger ascii sbufs fry summary
 accessors sequences.lib ;
 IN: state-parser
 

extra/tar/tar.factor

@@ -1,6 +1,6 @@
 USING: combinators io io.files io.streams.string kernel math
 math.parser continuations namespaces pack prettyprint sequences
-strings system hexdump io.encodings.binary inspector accessors
+strings system hexdump io.encodings.binary summary accessors
 io.backend symbols byte-arrays ;
 IN: tar
 

extra/tools/annotations/annotations.factor

@@ -1,8 +1,9 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel words parser io inspector quotations
+USING: accessors kernel words parser io summary quotations
 sequences prettyprint continuations effects definitions
-compiler.units namespaces assocs tools.walker generic ;
+compiler.units namespaces assocs tools.walker generic
+inspector ;
 IN: tools.annotations
 
 GENERIC: reset ( word -- )

extra/tools/crossref/crossref.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays definitions assocs io kernel
 math namespaces prettyprint sequences strings io.styles words
-generic tools.completion quotations parser inspector
+generic tools.completion quotations parser summary
 sorting hashtables vocabs parser source-files ;
 IN: tools.crossref
 

extra/tools/deploy/backend/backend.factor

@@ -3,7 +3,7 @@
 USING: namespaces continuations.private kernel.private init
 assocs kernel vocabs words sequences memory io system arrays
 continuations math definitions mirrors splitting parser classes
-inspector layouts vocabs.loader prettyprint.config prettyprint
+summary layouts vocabs.loader prettyprint.config prettyprint
 debugger io.streams.c io.files io.backend
 quotations io.launcher words.private tools.deploy.config
 bootstrap.image io.encodings.utf8 destructors accessors ;

extra/tools/deploy/shaker/shaker.factor

@@ -13,7 +13,6 @@ QUALIFIED: compiler.units
 QUALIFIED: continuations
 QUALIFIED: definitions
 QUALIFIED: init
-QUALIFIED: inspector
 QUALIFIED: io.backend
 QUALIFIED: io.thread
 QUALIFIED: layouts
@@ -155,6 +154,8 @@ IN: tools.deploy.shaker
     [
         "callbacks" "alien.compiler" lookup ,
 
+        "inspector-hook" "inspector" lookup ,
+
         {
             bootstrap.stage2:bootstrap-time
             continuations:error
@@ -163,7 +164,6 @@ IN: tools.deploy.shaker
             continuations:restarts
             listener:error-hook
             init:init-hooks
-            inspector:inspector-hook
             io.thread:io-thread
             libc.private:mallocs
             source-files:source-files

extra/tools/test/test.factor

@@ -3,7 +3,7 @@
 USING: namespaces arrays prettyprint sequences kernel
 vectors quotations words parser assocs combinators
 continuations debugger io io.files vocabs
-vocabs.loader source-files compiler.units inspector
+vocabs.loader source-files compiler.units summary
 inference effects tools.vocabs ;
 IN: tools.test
 

extra/tools/vocabs/browser/browser.factor

@@ -3,7 +3,7 @@
 USING: accessors kernel combinators vocabs vocabs.loader
 tools.vocabs io io.files io.styles help.markup help.stylesheet
 sequences assocs help.topics namespaces prettyprint words
-sorting definitions arrays inspector sets ;
+sorting definitions arrays summary sets ;
 IN: tools.vocabs.browser
 
 : vocab-status-string ( vocab -- string )

extra/tools/vocabs/vocabs.factor

@@ -2,7 +2,7 @@
 ! 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 inspector sorting splitting combinators source-files
+memoize summary sorting splitting combinators source-files
 io debugger continuations compiler.errors init
 checksums checksums.crc32 sets ;
 IN: tools.vocabs

extra/ui/gadgets/panes/panes-tests.factor

@@ -2,7 +2,7 @@ IN: ui.gadgets.panes.tests
 USING: alien ui.gadgets.panes ui.gadgets namespaces
 kernel sequences io io.styles io.streams.string tools.test
 prettyprint definitions help help.syntax help.markup
-help.stylesheet splitting tools.test.ui models math inspector ;
+help.stylesheet splitting tools.test.ui models math summary ;
 
 : #children "pane" get gadget-children length ;
 

extra/ui/gadgets/presentations/presentations-docs.factor

@@ -1,5 +1,5 @@
 USING: help.markup help.syntax ui.gadgets.buttons
-ui.gadgets.menus models ui.operations inspector kernel
+ui.gadgets.menus models ui.operations summary kernel
 ui.gadgets.worlds ui.gadgets ;
 IN: ui.gadgets.presentations
 

extra/ui/gadgets/worlds/worlds.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs continuations kernel math models
 namespaces opengl sequences io combinators math.vectors
-ui.gadgets ui.gestures ui.render ui.backend inspector
+ui.gadgets ui.gestures ui.render ui.backend summary
 debugger ;
 IN: ui.gadgets.worlds
 

extra/ui/gestures/gestures.factor

@@ -54,7 +54,7 @@ TUPLE: zoom-in-action ;  C: <zoom-in-action> zoom-in-action
 TUPLE: zoom-out-action ; C: <zoom-out-action> zoom-out-action
 
 : generalize-gesture ( gesture -- newgesture )
-    tuple>array but-last >tuple ;
+    clone f >># ;
 
 ! Modifiers
 SYMBOLS: C+ A+ M+ S+ ;

extra/ui/tools/operations/operations.factor

@@ -3,7 +3,7 @@
 USING: continuations definitions ui.tools.browser
 ui.tools.interactor ui.tools.listener ui.tools.profiler
 ui.tools.search ui.tools.traceback ui.tools.workspace generic
-help.topics inference inspector io.files io.styles kernel
+help.topics inference summary inspector io.files io.styles kernel
 namespaces parser prettyprint quotations tools.annotations
 editors tools.profiler tools.test tools.time tools.walker
 ui.commands ui.gadgets.editors ui.gestures ui.operations

extra/ui/tools/tools-docs.factor

@@ -1,4 +1,4 @@
-USING: editors help.markup help.syntax inspector io listener
+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

extra/units/units.factor

@@ -1,5 +1,5 @@
 USING: arrays io kernel math namespaces splitting prettyprint
-sequences sorting vectors words inverse inspector shuffle
+sequences sorting vectors words inverse summary shuffle
 math.functions sets ;
 IN: units
 

extra/usa-cities/usa-cities.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files io.encodings.ascii sequences sequences.lib
-math.parser combinators kernel memoize csv symbols inspector
+math.parser combinators kernel memoize csv symbols summary
 words accessors math.order sorting ;
 IN: usa-cities
 

extra/xml/errors/errors.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml.data xml.writer kernel generic io prettyprint math 
-debugger sequences state-parser accessors inspector
+debugger sequences state-parser accessors summary
 namespaces io.streams.string xml.backend ;
 IN: xml.errors