Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	basis/game/input/input.factor

basis/bootstrap/compiler/timing/tags.txt

@@ -1 +1 @@
-unportable
+untested

basis/calendar/calendar-docs.factor

@@ -309,7 +309,7 @@ HELP: time-
 } ;
 
 HELP: convert-timezone
-{ $values { "timestamp" timestamp } { "duration" duration } { "timestamp" timestamp } }
+{ $values { "timestamp" timestamp } { "duration" duration } { "timestamp'" timestamp } }
 { $description "Converts the " { $snippet "timestamp" } "'s " { $snippet "gmt-offset" } " to the GMT offset represented by the " { $snippet "duration" } "." }
 { $examples
     { $example "USING: accessors calendar prettyprint ;"
@@ -319,7 +319,7 @@ HELP: convert-timezone
 } ;
 
 HELP: >local-time
-{ $values { "timestamp" timestamp } { "timestamp" timestamp } }
+{ $values { "timestamp" timestamp } { "timestamp'" timestamp } }
 { $description "Converts the " { $snippet "timestamp" } " to the timezone of your computer." }
 { $examples
     { $example "USING: accessors calendar kernel prettyprint ;"
@@ -329,7 +329,7 @@ HELP: >local-time
 } ;
 
 HELP: >gmt
-{ $values { "timestamp" timestamp } { "timestamp" timestamp } }
+{ $values { "timestamp" timestamp } { "timestamp'" timestamp } }
 { $description "Converts the " { $snippet "timestamp" } " to the GMT timezone." }
 { $examples
     { $example "USING: accessors calendar kernel prettyprint ;"

basis/calendar/calendar.factor

@@ -316,15 +316,15 @@ M: duration <=> [ duration>years ] compare ;
 
 GENERIC: time- ( time1 time2 -- time3 )
 
-: convert-timezone ( timestamp duration -- timestamp )
+: convert-timezone ( timestamp duration -- timestamp' )
     over gmt-offset>> over = [ drop ] [
         [ over gmt-offset>> time- time+ ] keep >>gmt-offset
     ] if ;
 
-: >local-time ( timestamp -- timestamp )
+: >local-time ( timestamp -- timestamp' )
     gmt-offset-duration convert-timezone ;
 
-: >gmt ( timestamp -- timestamp )
+: >gmt ( timestamp -- timestamp' )
     instant convert-timezone ;
 
 M: timestamp <=> ( ts1 ts2 -- n )

basis/calendar/unix/platforms.txt

@@ -0,0 +1 @@
+unix

basis/calendar/unix/tags.txt

@@ -1 +0,0 @@
-unportable

basis/calendar/windows/platforms.txt

@@ -0,0 +1 @@
+windows

basis/calendar/windows/tags.txt

@@ -1 +0,0 @@
-unportable

basis/classes/struct/struct-tests.factor

@@ -1,11 +1,11 @@
 ! (c)Joe Groff bsd license
 USING: accessors alien alien.c-types alien.data ascii
-assocs byte-arrays classes.struct classes.tuple.private
+assocs byte-arrays classes.struct classes.tuple.private classes.tuple
 combinators compiler.tree.debugger compiler.units destructors
 io.encodings.utf8 io.pathnames io.streams.string kernel libc
 literals math mirrors namespaces prettyprint
 prettyprint.config see sequences specialized-arrays system
-tools.test parser lexer eval layouts ;
+tools.test parser lexer eval layouts generic.single classes ;
 FROM: math => float ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAY: char
@@ -338,13 +338,28 @@ STRUCT: struct-that's-a-word { x int } ;
 [
     "USE: classes.struct IN: classes.struct.tests TUPLE: not-a-struct ; S{ not-a-struct }"
     eval( -- value )
-] must-fail
+] [ error>> no-method? ] must-fail-with
 
 ! Subclassing a struct class should not be allowed
 [
-    "USE: classes.struct IN: classes.struct.tests STRUCT: a-struct { x int } ; TUPLE: not-a-struct < a-struct ;"
+    "USING: alien.c-types classes.struct ; IN: classes.struct.tests STRUCT: a-struct { x int } ; TUPLE: not-a-struct < a-struct ;"
     eval( -- )
-] must-fail
+] [ error>> bad-superclass? ] must-fail-with
+
+! Changing a superclass into a struct should reset the subclass
+TUPLE: will-become-struct ;
+
+TUPLE: a-subclass < will-become-struct ;
+
+[ f ] [ will-become-struct struct-class? ] unit-test
+
+[ will-become-struct ] [ a-subclass superclass ] unit-test
+
+[ ] [ "IN: classes.struct.tests USING: classes.struct alien.c-types ; STRUCT: will-become-struct { x int } ;" eval( -- ) ] unit-test
+
+[ t ] [ will-become-struct struct-class? ] unit-test
+
+[ tuple ] [ a-subclass superclass ] unit-test
 
 ! Remove c-type when struct class is forgotten
 [ ] [

basis/classes/struct/struct.factor

@@ -32,8 +32,6 @@ TUPLE: struct-bit-slot-spec < struct-slot-spec
 PREDICATE: struct-class < tuple-class
     superclass \ struct eq? ;
 
-M: struct-class valid-superclass? drop f ;
-
 SLOT: fields
 
 : struct-slots ( struct-class -- slots )
@@ -273,7 +271,7 @@ M: struct binary-zero? >c-ptr [ 0 = ] all? ;
     [ type>> c-type drop ] each ;
 
 : redefine-struct-tuple-class ( class -- )
-    [ dup class? [ forget-class ] [ drop ] if ] [ struct f define-tuple-class ] bi ;
+    [ struct f define-tuple-class ] [ make-final ] bi ;
 
 :: (define-struct-class) ( class slots offsets-quot -- )
     slots empty? [ struct-must-have-slots ] when

basis/cocoa/application/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/application/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/callbacks/callbacks.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2006 Kevin Reid.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs kernel namespaces cocoa cocoa.classes
-cocoa.subclassing debugger ;
+USING: alien.c-types assocs kernel namespaces cocoa
+cocoa.classes cocoa.runtime cocoa.subclassing debugger ;
 IN: cocoa.callbacks
 
 SYMBOL: callbacks

basis/cocoa/callbacks/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/callbacks/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/dialogs/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/dialogs/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/enumeration/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/enumeration/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/messages/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/messages/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/nibs/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/nibs/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/pasteboard/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/pasteboard/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/plists/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/plists/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/runtime/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/runtime/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/subclassing/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/subclassing/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/tags.txt

@@ -1,3 +1,2 @@
-unportable
 bindings
 ffi

basis/cocoa/types/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/types/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/views/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/views/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cocoa/windows/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/cocoa/windows/tags.txt

@@ -1 +0,0 @@
-unportable

basis/compiler/crossref/crossref-tests.factor

@@ -0,0 +1,9 @@
+USING: compiler.crossref fry kernel sequences tools.test vocabs words ;
+IN: compiler.crossref.tests
+
+! Dependencies of all words should always be satisfied unless we're
+! in the middle of recompiling something
+[ { } ] [
+    all-words dup [ subwords ] map concat append
+    H{ } clone '[ _ dependencies-satisfied? not ] filter
+] unit-test

basis/compiler/tests/redefine22.factor

@@ -0,0 +1,11 @@
+IN: compiler.tests.redefine22
+USING: kernel sequences compiler.units vocabs tools.test definitions ;
+
+TUPLE: ttt ;
+INSTANCE: ttt sequence
+M: ttt new-sequence 2drop ttt new ;
+
+: www-1 ( a -- b ) T{ ttt } new-sequence ;
+
+! This used to break with a compiler error in the above word
+[ ] [ [ \ ttt forget ] with-compilation-unit ] unit-test

basis/compiler/tests/redefine23.factor

@@ -0,0 +1,13 @@
+IN: compiler.tests.redefine23
+USING: classes.struct specialized-arrays alien.c-types sequences
+compiler.units vocabs tools.test ;
+
+STRUCT: my-struct { x int } ;
+SPECIALIZED-ARRAY: my-struct
+: my-word ( a -- b ) iota [ my-struct <struct-boa> ] my-struct-array{ } map-as ;
+
+[ ] [
+    [
+        "specialized-arrays.instances.compiler.tests.redefine23" forget-vocab
+    ] with-compilation-unit
+] unit-test

basis/compiler/tree/cleanup/cleanup.factor

@@ -51,11 +51,16 @@ GENERIC: cleanup* ( node -- node/nodes )
     [ in-d>> #drop ]
     bi prefix ;
 
-: record-predicate-folding ( #call -- )
-    [ node-input-infos first class>> ]
+: >predicate-folding< ( #call -- value-info class result )
+    [ node-input-infos first ]
     [ word>> "predicating" word-prop ]
-    [ node-output-infos first literal>> ] tri
-    [ depends-on-class<= ] [ depends-on-classes-disjoint ] if ;
+    [ node-output-infos first literal>> ] tri ;
+
+: record-predicate-folding ( #call -- )
+    >predicate-folding< pick literal?>>
+    [ [ literal>> ] 2dip depends-on-instance-predicate ]
+    [ [ class>> ] 2dip depends-on-class-predicate ]
+    if ;
 
 : record-folding ( #call -- )
     dup word>> predicate?

basis/compiler/tree/propagation/info/info.factor

@@ -1,10 +1,11 @@
-! Copyright (C) 2008, 2009 Slava Pestov.
+! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs classes classes.algebra classes.tuple
-classes.tuple.private kernel accessors math math.intervals namespaces
-sequences sequences.private words combinators memoize
-combinators.short-circuit byte-arrays strings arrays layouts
-cpu.architecture compiler.tree.propagation.copy ;
+classes.tuple.private classes.singleton kernel accessors math
+math.intervals namespaces sequences sequences.private words
+combinators memoize combinators.short-circuit byte-arrays
+strings arrays layouts cpu.architecture
+compiler.tree.propagation.copy ;
 IN: compiler.tree.propagation.info
 
 : false-class? ( class -- ? ) \ f class<= ;
@@ -65,9 +66,17 @@ DEFER: <literal-info>
 
 UNION: fixed-length array byte-array string ;
 
+: literal-class ( obj -- class )
+    #! Handle forgotten tuples and singleton classes properly
+    dup singleton-class? [
+        class dup class? [
+            drop tuple
+        ] unless
+    ] unless ;
+
 : init-literal-info ( info -- info )
     empty-interval >>interval
-    dup literal>> class >>class
+    dup literal>> literal-class >>class
     dup literal>> {
         { [ dup real? ] [ [a,a] >>interval ] }
         { [ dup tuple? ] [ tuple-slot-infos >>slots ] }

basis/compiler/tree/propagation/propagation-tests.factor

@@ -648,7 +648,7 @@ M: array iterate first t ; inline
     ] final-info drop
 ] unit-test
 
-[ V{ word } ] [
+[ V{ t } ] [
     [ { hashtable } declare hashtable instance? ] final-classes
 ] unit-test
 
@@ -660,7 +660,7 @@ M: array iterate first t ; inline
     [ { assoc } declare hashtable instance? ] final-classes
 ] unit-test
 
-[ V{ word } ] [
+[ V{ t } ] [
     [ { string } declare string? ] final-classes
 ] unit-test
 
@@ -774,7 +774,7 @@ MIXIN: empty-mixin
     [ { fixnum } declare log2 ] final-classes
 ] unit-test
 
-[ V{ word } ] [
+[ V{ t } ] [
     [ { fixnum } declare log2 0 >= ] final-classes
 ] unit-test
 

basis/compiler/tree/propagation/simple/simple.factor

@@ -1,4 +1,4 @@
-! Copyright (C) 2008, 2009 Slava Pestov.
+! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: fry accessors kernel sequences sequences.private assocs
 words namespaces classes.algebra combinators
@@ -93,11 +93,8 @@ M: #declare propagate-before
     recover ;
 
 : predicate-output-infos/class ( info class -- info )
-    [ class>> ] dip {
-        { [ 2dup class<= ] [ t <literal-info> ] }
-        { [ 2dup classes-intersect? not ] [ f <literal-info> ] }
-        [ object-info ]
-    } cond 2nip ;
+    [ class>> ] dip compare-classes
+    dup +incomparable+ eq? [ drop object-info ] [ <literal-info> ] if ;
 
 : predicate-output-infos ( info class -- info )
     over literal?>>

basis/compression/lzw/lzw-docs.factor

@@ -20,7 +20,6 @@ HELP: tiff-lzw-uncompress
 
 HELP: lzw-read
 { $values
-    { "lzw" lzw }
     { "lzw" lzw } { "n" integer }
 }
 { $description "Read the next LZW code." } ;
@@ -48,7 +47,6 @@ HELP: code-space-full?
 HELP: reset-lzw-uncompress
 { $values
     { "lzw" lzw }
-    { "lzw" lzw }
 }
 { $description "Reset the LZW uncompressor state (either at initialization time or immediately after receiving a Clear Code). " } ;
 

basis/concurrency/mailboxes/mailboxes-tests.factor

@@ -42,40 +42,6 @@ IN: concurrency.mailboxes.tests
     mailbox-get
 ] unit-test
 
-<mailbox> "m" set
-
-1 <count-down> "c" set
-1 <count-down> "d" set
-
-[
-    "c" get await
-    [ "m" get mailbox-get drop ]
-    [ drop "d" get count-down ] recover
-] "Mailbox close test" spawn drop
-
-[ ] [ "c" get count-down ] unit-test
-[ ] [ "m" get dispose ] unit-test
-[ ] [ "d" get 5 seconds await-timeout ] unit-test
-
-[ ] [ "m" get dispose ] unit-test
-
-<mailbox> "m" set
-
-1 <count-down> "c" set
-1 <count-down> "d" set
-
-[
-    "c" get await
-    "m" get wait-for-close
-    "d" get count-down
-] "Mailbox close test" spawn drop
-
-[ ] [ "c" get count-down ] unit-test
-[ ] [ "m" get dispose ] unit-test
-[ ] [ "d" get 5 seconds await-timeout ] unit-test
-
-[ ] [ "m" get dispose ] unit-test
-
 [ { "foo" "bar" } ] [
     <mailbox>
     "foo" over mailbox-put
@@ -86,4 +52,3 @@ IN: concurrency.mailboxes.tests
 [
     <mailbox> 1 seconds mailbox-get-timeout
 ] [ wait-timeout? ] must-fail-with
-    

basis/concurrency/mailboxes/mailboxes.factor

@@ -1,17 +1,17 @@
-! Copyright (C) 2005, 2008 Chris Double, Slava Pestov.
+! Copyright (C) 2005, 2010 Chris Double, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: dlists deques threads sequences continuations
-destructors namespaces math quotations words kernel
-arrays assocs init system concurrency.conditions accessors
-debugger debugger.threads locals fry ;
+USING: dlists deques threads sequences continuations namespaces
+math quotations words kernel arrays assocs init system
+concurrency.conditions accessors debugger debugger.threads
+locals fry ;
 IN: concurrency.mailboxes
 
-TUPLE: mailbox < disposable threads data ;
-
-M: mailbox dispose* threads>> notify-all ;
+TUPLE: mailbox threads data ;
 
 : <mailbox> ( -- mailbox )
-    mailbox new-disposable <dlist> >>threads <dlist> >>data ;
+    mailbox new
+        <dlist> >>threads
+        <dlist> >>data ;
 
 : mailbox-empty? ( mailbox -- bool )
     data>> deque-empty? ;
@@ -24,14 +24,12 @@ M: mailbox dispose* threads>> notify-all ;
     [ threads>> ] dip "mailbox" wait ;
 
 :: block-unless-pred ( mailbox timeout pred: ( message -- ? ) -- )
-    mailbox check-disposed
     mailbox data>> pred dlist-any? [
         mailbox timeout wait-for-mailbox
         mailbox timeout pred block-unless-pred
     ] unless ; inline recursive
 
 : block-if-empty ( mailbox timeout -- mailbox )
-    over check-disposed
     over mailbox-empty? [
         2dup wait-for-mailbox block-if-empty
     ] [

basis/concurrency/promises/promises.factor

@@ -12,6 +12,7 @@ TUPLE: promise mailbox ;
     mailbox>> mailbox-empty? not ;
 
 ERROR: promise-already-fulfilled promise ;
+
 : fulfill ( value promise -- )
     dup promise-fulfilled? [ 
         promise-already-fulfilled

basis/core-foundation/arrays/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/arrays/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/attributed-strings/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/attributed-strings/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/bundles/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/bundles/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/data/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/data/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/dictionaries/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/dictionaries/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/file-descriptors/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/file-descriptors/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/fsevents/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/fsevents/tags.txt

@@ -1 +0,0 @@
-unportable

basis/core-foundation/numbers/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/numbers/tags.txt

@@ -1 +0,0 @@
-unportable

basis/core-foundation/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/run-loop/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/run-loop/tags.txt

@@ -1 +0,0 @@
-unportable

basis/core-foundation/strings/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/strings/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/timers/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/timers/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/urls/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/urls/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-foundation/utilities/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-foundation/utilities/tags.txt

@@ -1 +0,0 @@
-unportable

basis/core-graphics/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-graphics/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-text/fonts/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-text/fonts/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/core-text/platforms.txt

@@ -0,0 +1 @@
+macosx

basis/core-text/tags.txt

@@ -1,2 +1 @@
-unportable
 bindings

basis/cpu/ppc/assembler/backend/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cpu/ppc/linux/tags.txt

@@ -1 +1 @@
-unportable
+untested

basis/cpu/ppc/macosx/tags.txt

@@ -1 +1 @@
-unportable
+untested

basis/cpu/ppc/tags.txt

@@ -1,2 +1,2 @@
-unportable
 compiler
+untested

basis/cpu/x86/32/tags.txt

@@ -1,2 +1,2 @@
-unportable
+untested
 compiler

basis/cpu/x86/64/tags.txt

@@ -1,2 +1,2 @@
-unportable
+untested
 compiler

basis/cpu/x86/64/unix/tags.txt

@@ -1 +1 @@
-unportable
+untested

basis/cpu/x86/64/winnt/tags.txt

@@ -1 +1 @@
-unportable
+untested

basis/cpu/x86/assembler/syntax/tags.txt

@@ -1 +0,0 @@
-unportable

basis/cpu/x86/features/tags.txt

@@ -1 +1 @@
-unportable
+untested

basis/cpu/x86/tags.txt

@@ -1,2 +1,2 @@
-unportable
+untested
 compiler

basis/db/tuples/tuples-docs.factor

@@ -51,7 +51,7 @@ HELP: <insert-user-assigned-statement>
 HELP: <select-by-slots-statement>
 { $values
      { "tuple" tuple } { "class" class }
-     { "tuple" tuple } }
+     { "statement" tuple } }
 { $description "A database-specific hook for generating the SQL for a select statement." } ;
 
 HELP: <update-tuple-statement>
@@ -267,7 +267,7 @@ T{ book
 { $list
     "Make a new tuple to represent your data"
     { "Map the Factor types to the database types with " { $link define-persistent } }
-    { "Make a custom database combinator (see" { $link "db-custom-database-combinators" } ") to open your database and run a " { $link quotation } }
+    { "Make a custom database combinator (see " { $link "db-custom-database-combinators" } ") to open your database and run a " { $link quotation } }
     { "Create a table with " { $link create-table } ", " { $link ensure-table } ", or " { $link recreate-table } }
     { "Start making and storing objects with " { $link insert-tuple } ", " { $link update-tuple } ", " { $link delete-tuples } ", and " { $link select-tuples } }
 } ;

basis/db/tuples/tuples.factor

@@ -14,7 +14,7 @@ HOOK: <insert-db-assigned-statement> db-connection ( class -- object )
 HOOK: <insert-user-assigned-statement> db-connection ( class -- object )
 HOOK: <update-tuple-statement> db-connection ( class -- object )
 HOOK: <delete-tuples-statement> db-connection ( tuple class -- object )
-HOOK: <select-by-slots-statement> db-connection ( tuple class -- tuple )
+HOOK: <select-by-slots-statement> db-connection ( tuple class -- statement )
 HOOK: <count-statement> db-connection ( query -- statement )
 HOOK: query>statement db-connection ( query -- statement )
 HOOK: insert-tuple-set-key db-connection ( tuple statement -- )

basis/debugger/debugger.factor

@@ -194,7 +194,7 @@ M: not-a-tuple summary
     drop "Not a tuple" ;
 
 M: bad-superclass summary
-    drop "Tuple classes can only inherit from other tuple classes" ;
+    drop "Tuple classes can only inherit from non-final tuple classes" ;
 
 M: no-initial-value summary
     drop "Initial value must be provided for slots specialized to this class" ;

basis/debugger/windows/platforms.txt

@@ -0,0 +1 @@
+windows

basis/debugger/windows/tags.txt

@@ -1 +0,0 @@
-unportable

basis/dlists/dlists-docs.factor

@@ -48,7 +48,7 @@ HELP: dlist-find
 } ;
 
 HELP: dlist-filter
-{ $values { "dlist" { $link dlist } } { "quot" quotation } { "dlist" { $link dlist } } }
+{ $values { "dlist" { $link dlist } } { "quot" quotation } { "dlist'" { $link dlist } } }
 { $description "Applies the quotation to each element of the " { $link dlist } " in turn, removing the corresponding nodes if the quotation returns " { $link f } "." }
 { $side-effects { "dlist" } } ;