Fix conflict

basis/alarms/alarms-docs.factor

@@ -5,7 +5,7 @@ HELP: alarm
 { $class-description "An alarm. Can be passed to " { $link cancel-alarm } "." } ;
 
 HELP: add-alarm
-{ $values { "quot" quotation } { "time" timestamp } { "frequency" "a " { $link duration } " or " { $link f } } { "alarm" alarm } }
+{ $values { "quot" quotation } { "time" timestamp } { "frequency" { $maybe duration } } { "alarm" alarm } }
 { $description "Creates and registers an alarm. If " { $snippet "frequency" } " is " { $link f } ", this will be a one-time alarm, otherwise it will fire with the given frequency. The quotation will be called from the alarm thread." } ;
 
 HELP: later

basis/alien/c-types/c-types-docs.factor

@@ -39,12 +39,12 @@ HELP: byte-length
 { $contract "Outputs the size of the byte array or float array data in bytes as presented to the C library interface." } ;
 
 HELP: c-getter
-{ $values { "name" string } { "quot" "a quotation with stack effect " { $snippet "( c-ptr n -- obj )" } } }
+{ $values { "name" string } { "quot" { $quotation "( c-ptr n -- obj )" } } }
 { $description "Outputs a quotation which reads values of this C type from a C structure." }
 { $errors "Throws a " { $link no-c-type } " error if the type does not exist." } ;
 
 HELP: c-setter
-{ $values { "name" string } { "quot" "a quotation with stack effect " { $snippet "( obj c-ptr n -- )" } } }
+{ $values { "name" string } { "quot" { $quotation "( obj c-ptr n -- )" } } }
 { $description "Outputs a quotation which writes values of this C type to a C structure." }
 { $errors "Throws an error if the type does not exist." } ;
 

basis/alien/c-types/c-types.factor

@@ -164,7 +164,7 @@ GENERIC: stack-size ( type -- size ) foldable
 
 M: string stack-size c-type stack-size ;
 
-M: c-type stack-size size>> ;
+M: c-type stack-size size>> cell align ;
 
 GENERIC: byte-length ( seq -- n ) flushable
 
@@ -404,6 +404,6 @@ M: long-long-type box-return ( type -- )
     "double" define-primitive-type
 
     "long" "ptrdiff_t" typedef
-
+    "long" "intptr_t" typedef
     "ulong" "size_t" typedef
 ] with-compilation-unit

basis/alien/structs/structs.factor

@@ -1,14 +1,10 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays generic hashtables kernel kernel.private
-math namespaces parser sequences strings words libc
+math namespaces parser sequences strings words libc fry
 alien.c-types alien.structs.fields cpu.architecture ;
 IN: alien.structs
 
-: if-value-structs? ( ctype true false -- )
-    value-structs?
-    [ drop call ] [ >r 2drop "void*" r> call ] if ; inline
-
 TUPLE: struct-type size align fields ;
 
 M: struct-type heap-size size>> ;
@@ -17,20 +13,26 @@ M: struct-type c-type-align align>> ;
 
 M: struct-type c-type-stack-align? drop f ;
 
-M: struct-type unbox-parameter
+: if-value-struct ( ctype true false -- )
-    [ %unbox-struct ] [ unbox-parameter ] if-value-structs? ;
+    [ dup value-struct? ] 2dip '[ drop "void*" @ ] if ; inline
 
-M: struct-type unbox-return
+M: struct-type unbox-parameter
-    f swap %unbox-struct ;
+    [ %unbox-large-struct ] [ unbox-parameter ] if-value-struct ;
 
 M: struct-type box-parameter
-    [ %box-struct ] [ box-parameter ] if-value-structs? ;
+    [ %box-large-struct ] [ box-parameter ] if-value-struct ;
+
+: if-small-struct ( c-type true false -- ? )
+    [ dup struct-small-enough? ] 2dip '[ f swap @ ] if ; inline
+
+M: struct-type unbox-return
+    [ %unbox-small-struct ] [ %unbox-large-struct ] if-small-struct ;
 
 M: struct-type box-return
-    f swap %box-struct ;
+    [ %box-small-struct ] [ %box-large-struct ] if-small-struct ;
 
 M: struct-type stack-size
-    [ heap-size ] [ stack-size ] if-value-structs? ;
+    [ heap-size ] [ stack-size ] if-value-struct ;
 
 : c-struct? ( type -- ? ) (c-type) struct-type? ;
 
@@ -40,7 +42,7 @@ M: struct-type stack-size
     swap typedef ;
 
 : define-struct-early ( name vocab fields -- fields )
-    -rot [ rot first2 <field-spec> ] 2curry map ;
+    [ first2 <field-spec> ] with with map ;
 
 : compute-struct-align ( types -- n )
     [ c-type-align ] map supremum ;

basis/binary-search/binary-search-docs.factor

@@ -2,7 +2,7 @@ IN: binary-search
 USING: help.markup help.syntax sequences kernel math.order ;
 
 HELP: search
-{ $values { "seq" "a sorted sequence" } { "quot" "a quotation with stack effect " { $snippet "( elt -- <=> )" } } { "i" "an index, or " { $link f } } { "elt" "an element, or " { $link f } } }
+{ $values { "seq" "a sorted sequence" } { "quot" { $quotation "( elt -- <=> )" } } { "i" "an index, or " { $link f } } { "elt" "an element, or " { $link f } } }
 { $description "Performs a binary search on a sequence, calling the quotation to decide whether to end the search (" { $link +eq+ } "), search lower (" { $link +lt+ } ") or search higher (" { $link +gt+ } ")."
 $nl
 "If the sequence is non-empty, outputs the index and value of the closest match, which is either an element for which the quotation output " { $link +eq+ } ", or failing that, least element for which the quotation output " { $link +lt+ } "."

basis/bootstrap/image/download/download.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: http.client checksums checksums.openssl splitting assocs
+USING: http.client checksums checksums.md5 splitting assocs
 kernel io.files bootstrap.image sequences io urls ;
 IN: bootstrap.image.download
 
@@ -13,7 +13,7 @@ IN: bootstrap.image.download
 : need-new-image? ( image -- ? )
     dup exists?
     [
-        [ openssl-md5 checksum-file hex-string ]
+        [ md5 checksum-file hex-string ]
         [ download-checksums at ]
         bi = not
     ] [ drop t ] if ;

basis/calendar/windows/tags.txt

@@ -1,2 +1 @@
 unportable
-windows

basis/cocoa/messages/messages-docs.factor

@@ -31,7 +31,7 @@ HELP: alien>objc-types
 { objc>alien-types alien>objc-types } related-words
 
 HELP: import-objc-class
-{ $values { "name" string } { "quot" "a quotation with stack effect " { $snippet "( -- )" } } }
+{ $values { "name" string } { "quot" { $quotation "( -- )" } } }
 { $description "If a class named " { $snippet "name" } " is already known to the Objective C interface, does nothing. Otherwise, first calls the quotation. The quotation should make the class available to the Objective C runtime if necessary, either by loading a framework or defining it directly. After the quotation returns, this word makes the class available to Factor programs by importing methods and creating a class word the class object in the " { $vocab-link "cocoa.classes" } " vocabulary." } ;
 
 HELP: root-class

basis/command-line/command-line-docs.factor

@@ -2,10 +2,10 @@ USING: help.markup help.syntax parser vocabs.loader strings ;
 IN: command-line
 
 HELP: run-bootstrap-init
-{ $description "Runs the " { $snippet ".factor-boot-rc" } " file in the user's home directory unless the " { $snippet "-no-user-init" } " command line switch was given." } ;
+{ $description "Runs the bootstrap initialization file in the user's home directory, unless the " { $snippet "-no-user-init" } " command line switch was given. This file is named " { $snippet ".factor-boot-rc" } " on Unix and " { $snippet "factor-boot-rc" } " on Windows." } ;
 
 HELP: run-user-init
-{ $description "Runs the " { $snippet ".factor-rc" } " file in the user's home directory unless the " { $snippet "-no-user-init" } " command line switch was given." } ;
+{ $description "Runs the startup initialization file in the user's home directory, unless the " { $snippet "-no-user-init" } " command line switch was given. This file is named " { $snippet ".factor-rc" } " on Unix and " { $snippet "factor-rc" } " on Windows." } ;
 
 HELP: cli-param
 { $values { "param" string } }
@@ -57,7 +57,7 @@ ARTICLE: "bootstrap-cli-args" "Command line switches for bootstrap"
 "A number of command line switches can be passed to a bootstrap image to modify the behavior of the resulting image:"
 { $table
     { { $snippet "-output-image=" { $emphasis "image" } } { "Save the result to " { $snippet "image" } ". The default is " { $snippet "factor.image" } "." } }
-    { { $snippet "-no-user-init" } { "Inhibits the running of the " { $snippet ".factor-boot-rc" } " file in the user's home directory." } }
+    { { $snippet "-no-user-init" } { "Inhibits the running of user initialization files on startup. See " { $link "rc-files" } "." } }
     { { $snippet "-include=" { $emphasis "components..." } } "A list of components to include (see below)." }
     { { $snippet "-exclude=" { $emphasis "components..." } } "A list of components to exclude." }
     { { $snippet "-ui-backend=" { $emphasis "backend" } } { "One of " { $snippet "x11" } ", " { $snippet "windows" } ", or " { $snippet "cocoa" } ". The default is platform-specific." } }
@@ -74,9 +74,9 @@ ARTICLE: "bootstrap-cli-args" "Command line switches for bootstrap"
 "By default, all optional components are loaded. To load all optional components except for a given list, use the " { $snippet "-exclude=" } " switch; to only load specified optional components, use the " { $snippet "-include=" } "."
 $nl
 "For example, to build an image with the compiler but no other components, you could do:"
-{ $code "./factor -i=boot.ppc.image -include=compiler" }
+{ $code "./factor -i=boot.macosx-ppc.image -include=compiler" }
 "To build an image with everything except for the user interface and graphical tools,"
-{ $code "./factor -i=boot.ppc.image -exclude=\"ui ui.tools\"" }
+{ $code "./factor -i=boot.macosx-ppc.image -exclude=\"ui ui.tools\"" }
 "To generate a bootstrap image in the first place, see " { $link "bootstrap.image" } "." ;
 
 ARTICLE: "standard-cli-args" "Command line switches for general usage"
@@ -84,17 +84,43 @@ ARTICLE: "standard-cli-args" "Command line switches for general usage"
 { $table
     { { $snippet "-e=" { $emphasis "code" } } { "This specifies a code snippet to evaluate. If you want Factor to exit immediately after, also specify " { $snippet "-run=none" } "." } }
     { { $snippet "-run=" { $emphasis "vocab" } } { { $snippet { $emphasis "vocab" } } " is the name of a vocabulary with a " { $link POSTPONE: MAIN: } " hook to run on startup, for example " { $vocab-link "listener" } ", " { $vocab-link "ui" } " or " { $vocab-link "none" } "." } }
-    { { $snippet "-no-user-init" } { "Inhibits the running of the " { $snippet ".factor-rc" } " file in the user's home directory on startup." } }
+    { { $snippet "-no-user-init" } { "Inhibits the running of user initialization files on startup. See " { $link "rc-files" } "." } }
     { { $snippet "-quiet" } { "If set, " { $link run-file } " and " { $link require } " will not print load messages." } }
     { { $snippet "-script" } { "Equivalent to " { $snippet "-quiet -run=none" } "." $nl "On Unix systems, Factor can be used for scripting - just create an executable text file whose first line is:" { $code "#! /usr/local/bin/factor -script" } "The space after " { $snippet "#!" } " is necessary because of Factor syntax." } }
 } ;
 
-ARTICLE: "rc-files" "Running code on startup"
+ARTICLE: "factor-boot-rc" "Bootstrap initialization file"
-"Unless the " { $snippet "-no-user-init" } " command line switch is specified, The startup routine runs the " { $snippet ".factor-rc" } " file in the user's home directory, if it exists. This file can contain initialization and customization for your development environment."
+"The botstrap initialization file is named " { $snippet "factor-boot-rc" } " on Windows and " { $snippet ".factor-boot-rc" } " on Unix. This file can contain " { $link require } " calls for vocabularies you use frequently, and other such long-running tasks that you do not want to perform every time Factor starts."
 $nl
-"The " { $snippet ".factor-rc" } " and " { $snippet ".factor-boot-rc" } " files can be run explicitly:"
+"A word to run this file from an existing Factor session:"
-{ $subsection run-user-init }
+{ $subsection run-bootstrap-init }
-{ $subsection run-bootstrap-init } ;
+"For example, if you changed " { $snippet ".factor-boot-rc" } " and do not want to bootstrap again, you can just invoke " { $link run-bootstrap-init } " in the listener." ;
+
+ARTICLE: "factor-rc" "Startup initialization file"
+"The startup initialization file is named " { $snippet "factor-rc" } " on Windows and " { $snippet ".factor-rc" } " on Unix. If it exists, it is run every time Factor starts."
+$nl
+"A word to run this file from an existing Factor session:"
+{ $subsection run-user-init } ;
+
+ARTICLE: "rc-files" "Running code on startup"
+"Factor looks for two files in your home directory."
+{ $subsection "factor-boot-rc" }
+{ $subsection "factor-rc" }
+"The " { $snippet "-no-user-init" } " command line switch will inhibit the running of these files."
+$nl
+"If you are unsure where the files should be located, evaluate the following code:"
+{ $code
+    "USE: command-line"
+    "\"factor-rc\" rc-path print"
+    "\"factor-boot-rc\" rc-path print"
+}
+"Here is an example " { $snippet ".factor-boot-rc" } " which sets up GVIM editor integration, adds an additional vocabulary root (see " { $link "vocabs.roots" } "), and increases the font size in the UI by setting the DPI (dots-per-inch) variable:"
+{ $code
+    "USING: editors.gvim vocabs.loader ui.freetype namespaces sequences ;"
+    "\"/opt/local/bin\" \\ gvim-path set-global"
+    "\"/home/jane/src/\" vocab-roots get push"
+    "100 dpi set-global"
+} ;
 
 ARTICLE: "cli" "Command line usage"
 "Zero or more command line arguments may be passed to the Factor runtime. Command line arguments starting with a dash (" { $snippet "-" } ") is interpreted as switches. All other arguments are taken to be file names to be run by " { $link run-file } "."

basis/command-line/command-line.factor

@@ -5,14 +5,18 @@ kernel.private namespaces parser sequences strings system
 splitting io.files eval ;
 IN: command-line
 
+: rc-path ( name -- path )
+    os windows? [ "." prepend ] unless
+    home prepend-path ;
+
 : run-bootstrap-init ( -- )
     "user-init" get [
-        home ".factor-boot-rc" append-path ?run-file
+        "factor-boot-rc" rc-path ?run-file
     ] when ;
 
 : run-user-init ( -- )
     "user-init" get [
-        home ".factor-rc" append-path ?run-file
+        "factor-rc" rc-path ?run-file
     ] when ;
 
 : cli-var-param ( name value -- ) swap set-global ;

basis/compiler/codegen/codegen.factor

@@ -235,7 +235,7 @@ M: float-regs reg-class-variable drop float-regs ;
 GENERIC: inc-reg-class ( register-class -- )
 
 : ?dummy-stack-params ( reg-class -- )
-    dummy-stack-params? [ reg-size stack-params +@ ] [ drop ] if ;
+    dummy-stack-params? [ reg-size cell align stack-params +@ ] [ drop ] if ;
 
 : ?dummy-int-params ( reg-class -- )
     dummy-int-params? [ reg-size cell /i 1 max int-regs +@ ] [ drop ] if ;
@@ -264,7 +264,7 @@ M: object reg-class-full?
 
 : spill-param ( reg-class -- n reg-class )
     stack-params get
-    >r reg-size stack-params +@ r>
+    >r reg-size cell align stack-params +@ r>
     stack-params ;
 
 : fastcall-param ( reg-class -- n reg-class )

basis/compiler/compiler-docs.factor

@@ -6,7 +6,7 @@ HELP: enable-compiler
 { $description "Enables the optimizing compiler." } ;
 
 HELP: disable-compiler
-{ $description "Enables the optimizing compiler." } ;
+{ $description "Disable the optimizing compiler." } ;
 
 ARTICLE: "compiler-usage" "Calling the optimizing compiler"
 "Normally, new word definitions are recompiled automatically. This can be changed:"

basis/compiler/compiler.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel namespaces arrays sequences io debugger
-words fry continuations vocabs assocs dlists definitions math
+words fry continuations vocabs assocs dlists definitions
-threads graphs generic combinators deques search-deques
+math threads graphs generic combinators deques search-deques
 prettyprint io stack-checker stack-checker.state
 stack-checker.inlining compiler.errors compiler.units
 compiler.tree.builder compiler.tree.optimizer

basis/compiler/tests/alien.factor

@@ -147,13 +147,21 @@ FUNCTION: void ffi_test_20 double x1, double x2, double x3,
 
 ! Make sure XT doesn't get clobbered in stack frame
 
-: ffi_test_31 ( a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a ptr -- result y )
+: ffi_test_31 ( a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a -- result y )
-    "void"
+    "int"
     f "ffi_test_31"
     { "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" }
     alien-invoke gc 3 ;
 
-[ 3 ] [ 42 [ ] each ffi_test_31 ] unit-test
+[ 861 3 ] [ 42 [ ] each ffi_test_31 ] unit-test
+
+: ffi_test_31_point_5 ( a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a -- result )
+    "float"
+    f "ffi_test_31_point_5"
+    { "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" "float" }
+    alien-invoke ;
+
+[ 861.0 ] [ 42 [ >float ] each ffi_test_31_point_5 ] unit-test
 
 FUNCTION: longlong ffi_test_21 long x long y ;
 

basis/compiler/tree/builder/builder.factor

@@ -34,14 +34,10 @@ IN: compiler.tree.builder
     if ;
 
 : (build-tree-from-word) ( word -- )
-    dup
+    dup initial-recursive-state recursive-state set
-    [ "inline" word-prop ]
+    dup [ "inline" word-prop ] [ "recursive" word-prop ] bi and
-    [ "recursive" word-prop ] bi and [
+    [ 1quotation ] [ specialized-def ] if
-        1quotation f initial-recursive-state infer-quot
+    infer-quot-here ;
-    ] [
-        [ specialized-def ] [ initial-recursive-state ] bi
-        infer-quot
-    ] if ;
 
 : check-cannot-infer ( word -- )
     dup "cannot-infer" word-prop [ cannot-infer-effect ] [ drop ] if ;

basis/compiler/tree/dead-code/liveness/liveness.factor

@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: fry accessors namespaces assocs deques search-deques
-kernel sequences sequences.deep words sets stack-checker.branches
+dlists kernel sequences sequences.deep words sets
-compiler.tree compiler.tree.def-use compiler.tree.combinators ;
+stack-checker.branches compiler.tree compiler.tree.def-use
+compiler.tree.combinators ;
 IN: compiler.tree.dead-code.liveness
 
 SYMBOL: work-list

basis/compiler/tree/def-use/def-use.factor

@@ -18,12 +18,16 @@ TUPLE: definition value node uses ;
         swap >>node
         V{ } clone >>uses ;
 
+ERROR: no-def-error value ;
+
 : def-of ( value -- definition )
-    def-use get at* [ "No def" throw ] unless ;
+    dup def-use get at* [ nip ] [ no-def-error ] if ;
+
+ERROR: multiple-defs-error ;
 
 : def-value ( node value -- )
     def-use get 2dup key? [
-        "Multiple defs" throw
+        multiple-defs-error
     ] [
         [ [ <definition> ] keep ] dip set-at
     ] if ;

basis/compiler/tree/recursive/recursive.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel assocs arrays namespaces accessors sequences deques
-search-deques compiler.tree compiler.tree.combinators ;
+search-deques dlists compiler.tree compiler.tree.combinators ;
 IN: compiler.tree.recursive
 
 ! Collect label info

basis/concurrency/combinators/combinators-docs.factor

@@ -2,27 +2,27 @@ USING: help.markup help.syntax sequences ;
 IN: concurrency.combinators
 
 HELP: parallel-map
-{ $values { "seq" sequence } { "quot" "a quotation with stack effect " { $snippet "( elt -- newelt )" } } { "newseq" sequence } }
+{ $values { "seq" sequence } { "quot" { $quotation "( elt -- newelt )" } } { "newseq" sequence } }
 { $description "Spawns a new thread for applying " { $snippet "quot" } " to every element of " { $snippet "seq" } ", collecting the results at the end." }
 { $errors "Throws an error if one of the iterations throws an error." } ;
 
 HELP: 2parallel-map
-{ $values { "seq1" sequence } { "seq2" sequence } { "quot" "a quotation with stack effect " { $snippet "( elt -- newelt )" } } { "newseq" sequence } }
+{ $values { "seq1" sequence } { "seq2" sequence } { "quot" { $quotation "( elt -- newelt )" } } { "newseq" sequence } }
 { $description "Spawns a new thread for applying " { $snippet "quot" } " to pairwise elements of " { $snippet "seq1" } " and " { $snippet "seq2" } ", collecting the results at the end." }
 { $errors "Throws an error if one of the iterations throws an error." } ;
 
 HELP: parallel-each
-{ $values { "seq" sequence } { "quot" "a quotation with stack effect " { $snippet "( elt -- )" } } }
+{ $values { "seq" sequence } { "quot" { $quotation "( elt -- )" } } }
 { $description "Spawns a new thread for applying " { $snippet "quot" } " to every element of " { $snippet "seq" } ", blocking until all quotations complete." }
 { $errors "Throws an error if one of the iterations throws an error." } ;
 
 HELP: 2parallel-each
-{ $values { "seq1" sequence } { "seq2" sequence } { "quot" "a quotation with stack effect " { $snippet "( elt -- )" } } }
+{ $values { "seq1" sequence } { "seq2" sequence } { "quot" { $quotation "( elt -- )" } } }
 { $description "Spawns a new thread for applying " { $snippet "quot" } " to pairwise elements of " { $snippet "seq1" } " and " { $snippet "seq2" } ", blocking until all quotations complete." }
 { $errors "Throws an error if one of the iterations throws an error." } ;
 
 HELP: parallel-filter
-{ $values { "seq" sequence } { "quot" "a quotation with stack effect " { $snippet "( elt -- ? )" } } { "newseq" sequence } }
+{ $values { "seq" sequence } { "quot" { $quotation "( elt -- ? )" } } { "newseq" sequence } }
 { $description "Spawns a new thread for applying " { $snippet "quot" } " to every element of " { $snippet "seq" } ", collecting the elements for which the quotation yielded a true value." }
 { $errors "Throws an error if one of the iterations throws an error." } ;
 

basis/concurrency/futures/futures-docs.factor

@@ -5,7 +5,7 @@ continuations help.markup help.syntax quotations ;
 IN: concurrency.futures
 
 HELP: future
-{ $values { "quot" "a quotation with stack effect " { $snippet "( -- value )" } } { "future" future } }
+{ $values { "quot" { $quotation "( -- value )" } } { "future" future } }
 { $description "Creates a deferred computation."
 $nl
 "The quotation begins with an empty data stack, an empty catch stack, and a name stack containing the global namespace only. This means that the only way to pass data to the quotation is to partially apply the data, for example using " { $link curry } " or " { $link compose } "." } ;

basis/concurrency/locks/locks-docs.factor

@@ -14,7 +14,7 @@ HELP: <reentrant-lock>
 { $description "Creates a reentrant lock." } ;
 
 HELP: with-lock-timeout
-{ $values { "lock" lock } { "timeout" "a " { $link duration } " or " { $link f } } { "quot" quotation } }
+{ $values { "lock" lock } { "timeout" { $maybe duration } } { "quot" quotation } }
 { $description "Calls the quotation, ensuring that only one thread executes with the lock held at a time. If another thread is holding the lock, blocks until the thread releases the lock." }
 { $errors "Throws an error if the lock could not be acquired before the timeout expires. A timeout value of " { $link f } " means the thread is willing to wait indefinitely." } ;
 
@@ -36,7 +36,7 @@ HELP: rw-lock
 { $class-description "The class of reader/writer locks." } ;
 
 HELP: with-read-lock-timeout
-{ $values { "lock" lock } { "timeout" "a " { $link duration } " or " { $link f } } { "quot" quotation } }
+{ $values { "lock" lock } { "timeout" { $maybe duration } } { "quot" quotation } }
 { $description "Calls the quotation, ensuring that no other thread is holding a write lock at the same time. If another thread is holding a write lock, blocks until the thread releases the lock." }
 { $errors "Throws an error if the lock could not be acquired before the timeout expires. A timeout value of " { $link f } " means the thread is willing to wait indefinitely." } ;
 
@@ -45,7 +45,7 @@ HELP: with-read-lock
 { $description "Calls the quotation, ensuring that no other thread is holding a write lock at the same time. If another thread is holding a write lock, blocks until the thread releases the lock." } ;
 
 HELP: with-write-lock-timeout
-{ $values { "lock" lock } { "timeout" "a " { $link duration } " or " { $link f } } { "quot" quotation } }
+{ $values { "lock" lock } { "timeout" { $maybe duration } } { "quot" quotation } }
 { $description "Calls the quotation, ensuring that no other thread is holding a read or write lock at the same time. If another thread is holding a read or write lock, blocks until the thread releases the lock." }
 { $errors "Throws an error if the lock could not be acquired before the timeout expires. A timeout value of " { $link f } " means the thread is willing to wait indefinitely." } ;
 

basis/concurrency/mailboxes/mailboxes-docs.factor

@@ -1,4 +1,4 @@
-USING: help.markup help.syntax kernel arrays ;
+USING: help.markup help.syntax kernel arrays calendar ;
 IN: concurrency.mailboxes
 
 HELP: <mailbox>
@@ -18,46 +18,41 @@ HELP: mailbox-put
 { $description "Put the object into the mailbox. Any threads that have a blocking get on the mailbox are resumed. Only one of those threads will successfully get the object, the rest will immediately block waiting for the next item in the mailbox." } ;
 
 HELP: block-unless-pred
-{ $values { "pred" "a quotation with stack effect " { $snippet "( X -- bool )" } } 
+{ $values { "pred" { $quotation "( obj -- ? )" } } 
-          { "mailbox" mailbox }
+    { "mailbox" mailbox }
-          { "timeout" "a timeout in milliseconds, or " { $link f } }
+    { "timeout" "a " { $link duration } " or " { $link f } }
 }
 { $description "Block the thread if there are no items in the mailbox that return true when the predicate is called with the item on the stack." } ;
 
 HELP: block-if-empty
 { $values { "mailbox" mailbox } 
-      { "timeout" "a timeout in milliseconds, or " { $link f } }
+    { "timeout" "a " { $link duration } " or " { $link f } }
 }
 { $description "Block the thread if the mailbox is empty." } ;
 
 HELP: mailbox-get
-{ $values { "mailbox" mailbox } 
+{ $values { "mailbox" mailbox } { "obj" object } }
-          { "obj" object }
-}
 { $description "Get the first item put into the mailbox. If it is empty the thread blocks until an item is put into it. The thread then resumes, leaving the item on the stack." } ;
 
 HELP: mailbox-get-all
-{ $values { "mailbox" mailbox } 
+{ $values { "mailbox" mailbox } { "array" array } }
-          { "array" array }
-}
 { $description "Blocks the thread if the mailbox is empty, otherwise removes all objects in the mailbox and returns an array containing the objects." } ;
 
 HELP: while-mailbox-empty
 { $values { "mailbox" mailbox } 
-          { "quot" "a quotation with stack effect " { $snippet "( -- )" } }
+          { "quot" { $quotation "( -- )" } }
 }
 { $description "Repeatedly call the quotation while there are no items in the mailbox." } ;
 
 HELP: mailbox-get?
 { $values { "mailbox" mailbox } 
-          { "pred" "a quotation with stack effect " { $snippet "( X -- bool )" } }
+          { "pred" { $quotation "( obj -- ? )" } }
           { "obj" object }
 }
-{ $description "Get the first item in the mailbox which satisfies the predicate. 'pred' will be called repeatedly for each item in the mailbox. When 'pred' returns true that item will be returned. If nothing in the mailbox satisfies the predicate then the thread will block until something does." } ;
+{ $description "Get the first item in the mailbox which satisfies the predicate. When the predicate returns true that item will be returned. If nothing in the mailbox satisfies the predicate then the thread will block until something does." } ;
-
 
 ARTICLE: "concurrency.mailboxes" "Mailboxes"
-"A " { $emphasis "mailbox" } " is a first-in-first-out queue where the operation of removing an element blocks if the queue is empty, instead of throwing an error. Mailboxes are implemented in the " { $vocab-link "concurrency.mailboxes" } " vocabulary."
+"A " { $emphasis "mailbox" } " is a first-in-first-out queue where the operation of removing an element blocks if the queue is empty. Mailboxes are implemented in the " { $vocab-link "concurrency.mailboxes" } " vocabulary."
 { $subsection mailbox }
 { $subsection <mailbox> }
 "Removing the first element:"

basis/concurrency/promises/promises-docs.factor

@@ -12,7 +12,7 @@ HELP: promise-fulfilled?
 { $description "Tests if " { $link fulfill } " has previously been called on the promise, in which case " { $link ?promise } " will return immediately without blocking." } ;
 
 HELP: ?promise-timeout
-{ $values { "promise" promise } { "timeout" "a " { $link duration } " or " { $link f } } { "result" object } }
+{ $values { "promise" promise } { "timeout" { $maybe duration } } { "result" object } }
 { $description "Waits for another thread to fulfill a promise, returning immediately if the promise has already been fulfilled. A timeout of " { $link f } " indicates that the thread may block indefinitely, otherwise it will wait up to " { $snippet "timeout" } " milliseconds." }
 { $errors "Throws an error if the timeout expires before the promise has been fulfilled." } ;
 

basis/concurrency/semaphores/semaphores-docs.factor

@@ -9,7 +9,7 @@ HELP: <semaphore>
 { $description "Creates a counting semaphore with the specified initial count." } ;
 
 HELP: acquire-timeout
-{ $values { "semaphore" semaphore } { "timeout" "a " { $link duration } " or " { $link f } } }
+{ $values { "semaphore" semaphore } { "timeout" { $maybe duration } } }
 { $description "If the semaphore has a non-zero count, decrements it and returns immediately. Otherwise, if the timeout is " { $link f } ", waits indefinitely for the semaphore to be released. If the timeout is not " { $link f } ", waits a certain period of time, and if the semaphore still has not been released, throws an error." }
 { $errors "Throws an error if the timeout expires before the semaphore is released." } ;
 
@@ -22,7 +22,7 @@ HELP: release
 { $description "Increments a semaphore's count. If the count was previously zero, any threads waiting on the semaphore are woken up." } ;
 
 HELP: with-semaphore-timeout
-{ $values { "semaphore" semaphore } { "timeout" "a " { $link duration } " or " { $link f } } { "quot" quotation } }
+{ $values { "semaphore" semaphore } { "timeout" { $maybe duration } } { "quot" quotation } }
 { $description "Calls the quotation with the semaphore held." } ;
 
 HELP: with-semaphore

basis/cpu/architecture/architecture.factor

@@ -141,10 +141,10 @@ HOOK: %loop-entry cpu ( -- )
 HOOK: small-enough? cpu ( n -- ? )
 
 ! Is this structure small enough to be returned in registers?
-HOOK: struct-small-enough? cpu ( heap-size -- ? )
+HOOK: struct-small-enough? cpu ( c-type -- ? )
 
-! Do we pass value structs by value or hidden reference?
+! Do we pass this struct by value or hidden reference?
-HOOK: value-structs? cpu ( -- ? )
+HOOK: value-struct? cpu ( c-type -- ? )
 
 ! If t, all parameters are shadowed by dummy stack parameters
 HOOK: dummy-stack-params? cpu ( -- ? )
@@ -207,14 +207,3 @@ M: object %callback-return drop %return ;
 M: stack-params param-reg drop ;
 
 M: stack-params param-regs drop f ;
-
-: if-small-struct ( n size true false -- ? )
-    [ 2dup [ not ] [ struct-small-enough? ] bi* and ] 2dip
-    [ '[ nip @ ] ] dip if ;
-    inline
-
-: %unbox-struct ( n c-type -- )
-    [ %unbox-small-struct ] [ %unbox-large-struct ] if-small-struct ;
-
-: %box-struct ( n c-type -- )
-    [ %box-small-struct ] [ %box-large-struct ] if-small-struct ;

basis/cpu/ppc/linux/linux.factor

@@ -15,7 +15,7 @@ M: linux lr-save 1 cells ;
 
 M: float-regs param-regs drop { 1 2 3 4 5 6 7 8 } ;
 
-M: ppc value-structs? f ;
+M: ppc value-struct? drop f ;
 
 M: ppc dummy-stack-params? f ;
 

basis/cpu/ppc/macosx/macosx.factor

@@ -16,7 +16,7 @@ M: macosx lr-save 2 cells ;
 
 M: float-regs param-regs drop { 1 2 3 4 5 6 7 8 9 10 11 12 13 } ;
 
-M: ppc value-structs? t ;
+M: ppc value-struct? drop t ;
 
 M: ppc dummy-stack-params? t ;
 

basis/cpu/x86/64/winnt/winnt.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel layouts system math alien.c-types
+USING: kernel layouts system math alien.c-types sequences
 compiler.cfg.registers cpu.architecture cpu.x86.assembler cpu.x86 ;
 IN: cpu.x86.64.winnt
 
@@ -10,8 +10,9 @@ M: float-regs param-regs drop { XMM0 XMM1 XMM2 XMM3 } ;
 
 M: x86.64 reserved-area-size 4 cells ;
 
-M: x86.64 struct-small-enough? ( size -- ? )
+M: x86.64 struct-small-enough? heap-size { 1 2 4 8 } member? ;
-    heap-size cell <= ;
+
+M: x86.64 value-struct? heap-size { 1 2 4 8 } member? ;
 
 M: x86.64 dummy-stack-params? f ;
 
@@ -21,6 +22,7 @@ M: x86.64 dummy-fp-params? t ;
 
 <<
 "longlong" "ptrdiff_t" typedef
+"longlong" "intptr_t" typedef
 "int" "long" typedef
 "uint" "ulong" typedef
 >>

basis/cpu/x86/x86.factor

@@ -507,7 +507,7 @@ M: x86 %prepare-alien-invoke
     temp-reg-1 2 cells [+] ds-reg MOV
     temp-reg-1 3 cells [+] rs-reg MOV ;
 
-M: x86 value-structs? t ;
+M: x86 value-struct? drop t ;
 
 M: x86 small-enough? ( n -- ? )
     HEX: -80000000 HEX: 7fffffff between? ;

basis/deques/deques-docs.factor

@@ -4,7 +4,7 @@ IN: deques
 
 HELP: deque-empty?
 { $values { "deque" deque } { "?" "a boolean" } }
-{ $description "Returns true if a deque is empty." }
+{ $contract "Returns true if a deque is empty." }
 { $notes "This operation is O(1)." } ;
 
 HELP: clear-deque
@@ -12,12 +12,6 @@ HELP: clear-deque
      { "deque" deque } }
 { $description "Removes all elements from a deque." } ;
 
-HELP: deque-length
-{ $values
-     { "deque" deque }
-     { "n" integer } }
-{ $description "Returns the number of elements in a deque." } ;
-
 HELP: deque-member?
 { $values
      { "value" object } { "deque" deque }
@@ -31,7 +25,7 @@ HELP: push-front
 
 HELP: push-front*
 { $values { "obj" object } { "deque" deque } { "node" "a node" } }
-{ $description "Push the object onto the front of the deque and return the newly created node." } 
+{ $contract "Push the object onto the front of the deque and return the newly created node." } 
 { $notes "This operation is O(1)." } ;
 
 HELP: push-back
@@ -41,7 +35,7 @@ HELP: push-back
 
 HELP: push-back*
 { $values { "obj" object } { "deque" deque } { "node" "a node" } }
-{ $description "Push the object onto the back of the deque and return the newly created node." } 
+{ $contract "Push the object onto the back of the deque and return the newly created node." } 
 { $notes "This operation is O(1)." } ;
 
 HELP: push-all-back
@@ -56,7 +50,7 @@ HELP: push-all-front
 
 HELP: peek-front
 { $values { "deque" deque } { "obj" object } }
-{ $description "Returns the object at the front of the deque." } ;
+{ $contract "Returns the object at the front of the deque." } ;
 
 HELP: pop-front
 { $values { "deque" deque } { "obj" object } }
@@ -65,12 +59,12 @@ HELP: pop-front
 
 HELP: pop-front*
 { $values { "deque" deque } }
-{ $description "Pop the object off the front of the deque." }
+{ $contract "Pop the object off the front of the deque." }
 { $notes "This operation is O(1)." } ;
 
 HELP: peek-back
 { $values { "deque" deque } { "obj" object } }
-{ $description "Returns the object at the back of the deque." } ;
+{ $contract "Returns the object at the back of the deque." } ;
 
 HELP: pop-back
 { $values { "deque" deque } { "obj" object } }
@@ -79,13 +73,13 @@ HELP: pop-back
 
 HELP: pop-back*
 { $values { "deque" deque } }
-{ $description "Pop the object off the back of the deque." }
+{ $contract "Pop the object off the back of the deque." }
 { $notes "This operation is O(1)." } ;
 
 HELP: delete-node
 { $values
      { "node" object } { "deque" deque } }
-{ $description "Deletes the node from the deque." } ;
+{ $contract "Deletes the node from the deque." } ;
 
 HELP: deque
 { $description "A data structure that has constant-time insertion and removal of elements at both ends." } ;
@@ -111,7 +105,7 @@ $nl
 "Querying the deque:"
 { $subsection peek-front }
 { $subsection peek-back }
-{ $subsection deque-length }
+{ $subsection deque-empty? }
 { $subsection deque-member? }
 "Adding and removing elements:"
 { $subsection push-front* }
@@ -123,7 +117,6 @@ $nl
 { $subsection delete-node }
 { $subsection node-value }
 "Utility operations built in terms of the above:"
-{ $subsection deque-empty? }
 { $subsection push-front }
 { $subsection push-all-front }
 { $subsection push-back }

basis/deques/deques.factor

@@ -10,13 +10,10 @@ GENERIC: peek-back ( deque -- obj )
 GENERIC: pop-front* ( deque -- )
 GENERIC: pop-back* ( deque -- )
 GENERIC: delete-node ( node deque -- )
-GENERIC: deque-length ( deque -- n )
 GENERIC: deque-member? ( value deque -- ? )
 GENERIC: clear-deque ( deque -- )
 GENERIC: node-value ( node -- value )
-
+GENERIC: deque-empty? ( deque -- ? )
-: deque-empty? ( deque -- ? )
-    deque-length zero? ;
 
 : push-front ( obj deque -- )
     push-front* drop ;

basis/dlists/dlists-docs.factor

@@ -1,5 +1,5 @@
 USING: help.markup help.syntax kernel quotations
-deques ;
+deques search-deques hashtables ;
 IN: dlists
 
 ARTICLE: "dlists" "Double-linked lists"
@@ -18,10 +18,20 @@ $nl
 { $subsection dlist-contains? }
 "Deleting a node matching a predicate:"
 { $subsection delete-node-if* }
-{ $subsection delete-node-if } ;
+{ $subsection delete-node-if }
+"Search deque implementation:"
+{ $subsection <hashed-dlist> } ;
 
 ABOUT: "dlists"
 
+HELP: <dlist>
+{ $values { "list" dlist } }
+{ $description "Creates a new double-linked list." } ;
+
+HELP: <hashed-dlist>
+{ $values { "search-deque" search-deque } }
+{ $description "Creates a new " { $link search-deque } " backed by a " { $link dlist } ", with a " { $link hashtable } " for fast membership tests." } ;
+
 HELP: dlist-find
 { $values { "dlist" { $link dlist } } { "quot" quotation } { "obj/f" "an object or " { $link f } } { "?" "a boolean" } }
 { $description "Applies the quotation to each element of the " { $link dlist } " in turn, until it outputs a true value or the end of the " { $link dlist } " is reached.  Outputs either the object it found or " { $link f } ", and a boolean which is true if an object is found." }

basis/dlists/dlists-tests.factor

@@ -5,7 +5,7 @@ IN: dlists.tests
 
 [ t ] [ <dlist> deque-empty? ] unit-test
 
-[ T{ dlist f T{ dlist-node f 1 f f } T{ dlist-node f 1 f f } 1 } ]
+[ T{ dlist f T{ dlist-node f 1 f f } T{ dlist-node f 1 f f } } ]
 [ <dlist> 1 over push-front ] unit-test
 
 ! Make sure empty lists are empty
@@ -17,10 +17,10 @@ IN: dlists.tests
 [ 1 ] [ <dlist> 1 over push-front pop-back ] unit-test
 [ 1 ] [ <dlist> 1 over push-back pop-front ] unit-test
 [ 1 ] [ <dlist> 1 over push-back pop-back ] unit-test
-[ T{ dlist f f f 0 } ] [ <dlist> 1 over push-front dup pop-front* ] unit-test
+[ T{ dlist f f f } ] [ <dlist> 1 over push-front dup pop-front* ] unit-test
-[ T{ dlist f f f 0 } ] [ <dlist> 1 over push-front dup pop-back* ] unit-test
+[ T{ dlist f f f } ] [ <dlist> 1 over push-front dup pop-back* ] unit-test
-[ T{ dlist f f f 0 } ] [ <dlist> 1 over push-back dup pop-front* ] unit-test
+[ T{ dlist f f f } ] [ <dlist> 1 over push-back dup pop-front* ] unit-test
-[ T{ dlist f f f 0 } ] [ <dlist> 1 over push-back dup pop-back* ] unit-test
+[ T{ dlist f f f } ] [ <dlist> 1 over push-back dup pop-back* ] unit-test
 
 ! Test the prev,next links for two nodes
 [ f ] [
@@ -52,15 +52,6 @@ IN: dlists.tests
 [ 1 ] [ <dlist> 1 over push-back [ 1 = ] delete-node-if ] unit-test
 [ t ] [ <dlist> 1 over push-back dup [ 1 = ] delete-node-if drop deque-empty? ] unit-test
 [ t ] [ <dlist> 1 over push-back dup [ 1 = ] delete-node-if drop deque-empty? ] unit-test
-[ 0 ] [ <dlist> 1 over push-back dup [ 1 = ] delete-node-if drop deque-length ] unit-test
-[ 1 ] [ <dlist> 1 over push-back 2 over push-back dup [ 1 = ] delete-node-if drop deque-length ] unit-test
-[ 2 ] [ <dlist> 1 over push-back 2 over push-back 3 over push-back dup [ 1 = ] delete-node-if drop deque-length ] unit-test
-[ 2 ] [ <dlist> 1 over push-back 2 over push-back 3 over push-back dup [ 2 = ] delete-node-if drop deque-length ] unit-test
-[ 2 ] [ <dlist> 1 over push-back 2 over push-back 3 over push-back dup [ 3 = ] delete-node-if drop deque-length ] unit-test
-
-[ 0 ] [ <dlist> deque-length ] unit-test
-[ 1 ] [ <dlist> 1 over push-front deque-length ] unit-test
-[ 0 ] [ <dlist> 1 over push-front dup pop-front* deque-length ] unit-test
 
 [ t ] [ <dlist> 4 over push-back 5 over push-back [ obj>> 4 = ] dlist-find-node drop class dlist-node = ] unit-test
 [ t ] [ <dlist> 4 over push-back 5 over push-back [ obj>> 5 = ] dlist-find-node drop class dlist-node = ] unit-test

basis/dlists/dlists.factor

@@ -2,51 +2,57 @@
 ! Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators kernel math sequences accessors deques
-summary ;
+search-deques summary hashtables ;
 IN: dlists
 
-TUPLE: dlist front back length ;
-
-: <dlist> ( -- obj )
-    dlist new
-        0 >>length ;
-
-M: dlist deque-length length>> ;
-
 <PRIVATE
 
-TUPLE: dlist-node obj prev next ;
+MIXIN: ?dlist-node
+
+INSTANCE: f ?dlist-node
+
+TUPLE: dlist-node obj { prev ?dlist-node } { next ?dlist-node } ;
+
+INSTANCE: dlist-node ?dlist-node
 
 C: <dlist-node> dlist-node
 
+PRIVATE>
+
+TUPLE: dlist
+{ front ?dlist-node }
+{ back ?dlist-node } ;
+
+: <dlist> ( -- list )
+    dlist new ; inline
+
+: <hashed-dlist> ( -- search-deque )
+    20 <hashtable> <dlist> <search-deque> ;
+
+M: dlist deque-empty? front>> not ;
+
 M: dlist-node node-value obj>> ;
 
-: inc-length ( dlist -- )
-    [ 1+ ] change-length drop ; inline
-
-: dec-length ( dlist -- )
-    [ 1- ] change-length drop ; inline
-
 : set-prev-when ( dlist-node dlist-node/f -- )
-    [ (>>prev) ] [ drop ] if* ;
+    [ (>>prev) ] [ drop ] if* ; inline
 
 : set-next-when ( dlist-node dlist-node/f -- )
-    [ (>>next) ] [ drop ] if* ;
+    [ (>>next) ] [ drop ] if* ; inline
 
 : set-next-prev ( dlist-node -- )
-    dup next>> set-prev-when ;
+    dup next>> set-prev-when ; inline
 
 : normalize-front ( dlist -- )
-    dup back>> [ f >>front ] unless drop ;
+    dup back>> [ f >>front ] unless drop ; inline
 
 : normalize-back ( dlist -- )
-    dup front>> [ f >>back ] unless drop ;
+    dup front>> [ f >>back ] unless drop ; inline
 
 : set-back-to-front ( dlist -- )
-    dup back>> [ dup front>> >>back ] unless drop ;
+    dup back>> [ dup front>> >>back ] unless drop ; inline
 
 : set-front-to-back ( dlist -- )
-    dup front>> [ dup back>> >>front ] unless drop ;
+    dup front>> [ dup back>> >>front ] unless drop ; inline
 
 : (dlist-find-node) ( dlist-node quot: ( node -- ? ) -- node/f ? )
     over [
@@ -62,22 +68,20 @@ M: dlist-node node-value obj>> ;
 
 : unlink-node ( dlist-node -- )
     dup prev>> over next>> set-prev-when
-    dup next>> swap prev>> set-next-when ;
+    dup next>> swap prev>> set-next-when ; inline
 
 PRIVATE>
 
 M: dlist push-front* ( obj dlist -- dlist-node )
     [ front>> f swap <dlist-node> dup dup set-next-prev ] keep
     [ (>>front) ] keep
-    [ set-back-to-front ] keep
+    set-back-to-front ;
-    inc-length ;
 
 M: dlist push-back* ( obj dlist -- dlist-node )
     [ back>> f <dlist-node> ] keep
     [ back>> set-next-when ] 2keep
     [ (>>back) ] 2keep
-    [ set-front-to-back ] keep
+    set-front-to-back ;
-    inc-length ;
 
 ERROR: empty-dlist ;
 
@@ -88,31 +92,27 @@ M: dlist peek-front ( dlist -- obj )
     front>> [ obj>> ] [ empty-dlist ] if* ;
 
 M: dlist pop-front* ( dlist -- )
-    dup front>> [ empty-dlist ] unless
     [
-        dup front>>
+        dup front>> [ empty-dlist ] unless*
         dup next>>
         f rot (>>next)
         f over set-prev-when
         swap (>>front)
     ] keep
-    [ normalize-back ] keep
+    normalize-back ;
-    dec-length ;
 
 M: dlist peek-back ( dlist -- obj )
     back>> [ obj>> ] [ empty-dlist ] if* ;
 
 M: dlist pop-back* ( dlist -- )
-    dup back>> [ empty-dlist ] unless
     [
-        dup back>>
+        dup back>> [ empty-dlist ] unless*
         dup prev>>
         f rot (>>prev)
         f over set-next-when
         swap (>>back)
     ] keep
-    [ normalize-front ] keep
+    normalize-front ;
-    dec-length ;
 
 : dlist-find ( dlist quot -- obj/f ? )
     [ obj>> ] prepose
@@ -128,7 +128,7 @@ M: dlist delete-node ( dlist-node dlist -- )
     {
         { [ 2dup front>> eq? ] [ nip pop-front* ] }
         { [ 2dup back>> eq? ] [ nip pop-back* ] }
-        [ dec-length unlink-node ]
+        [ drop unlink-node ]
     } cond ;
 
 : delete-node-if* ( dlist quot -- obj/f ? )
@@ -148,7 +148,6 @@ M: dlist delete-node ( dlist-node dlist -- )
 M: dlist clear-deque ( dlist -- )
     f >>front
     f >>back
-    0 >>length
     drop ;
 
 : dlist-each ( dlist quot -- )

basis/documents/documents-docs.factor

@@ -42,7 +42,7 @@ HELP: doc-lines
 { $errors "Throws an error if " { $snippet "from" } " or " { $snippet "to" } " is out of bounds." } ;
 
 HELP: each-line
-{ $values { "from" "a non-negative integer" } { "to" "a non-negative integer" } { "quot" "a quotation with stack effect " { $snippet "( string -- )" } } }
+{ $values { "from" "a non-negative integer" } { "to" "a non-negative integer" } { "quot" { $quotation "( string -- )" } } }
 { $description "Applies the quotation to each line in the range." }
 { $notes "The range is created by calling " { $link <slice> } "." }
 { $errors "Throws an error if " { $snippet "from" } " or " { $snippet "to" } " is out of bounds." } ;

basis/editors/emacs/emacs.factor

@@ -1,11 +1,11 @@
 USING: definitions io.launcher kernel parser words sequences math
-math.parser namespaces editors make ;
+math.parser namespaces editors make system ;
 IN: editors.emacs
 
 : emacsclient ( file line -- )
     [
         \ emacsclient get "emacsclient" or ,
-        "--no-wait" ,
+        os windows? [ "--no-wait" , ] unless
         "+" swap number>string append ,
         ,
     ] { } make try-process ;

basis/freetype/freetype.factor

@@ -64,7 +64,7 @@ C-STRUCT: glyph
     { "FT_Pos" "advance-x" }
     { "FT_Pos" "advance-y" }
 
-    { "long" "format" }
+    { "intptr_t" "format" }
 
     { "int" "bitmap-rows" }
     { "int" "bitmap-width" }

basis/furnace/actions/actions-docs.factor

@@ -19,7 +19,7 @@ HELP: <page-action>
 { $description "Creates a new action which serves a Chloe template when servicing a GET request." } ;
 
 HELP: action
-{ $description "The class of Furnace actions. New instances are created with " { $link <action> } ". New instances of subclasses can be created with " { $link new-action } ". The " { $link page-action } " class is a useful subclass."
+{ $class-description "The class of Furnace actions. New instances are created with " { $link <action> } ". New instances of subclasses can be created with " { $link new-action } ". The " { $link page-action } " class is a useful subclass."
 $nl
 "Action slots are documented in " { $link "furnace.actions.config" } "." } ;
 
@@ -31,7 +31,7 @@ HELP: new-action
 { $description "Constructs a subclass of " { $link action } "." } ;
 
 HELP: page-action
-{ $description "The class of Chloe page actions. These are actions whose " { $slot "display" } " slot is pre-set to serve the Chloe template stored in the " { $slot "page" } " slot." } ;
+{ $class-description "The class of Chloe page actions. These are actions whose " { $slot "display" } " slot is pre-set to serve the Chloe template stored in the " { $slot "page" } " slot." } ;
 
 HELP: param
 { $values

basis/furnace/alloy/alloy.factor

@@ -4,7 +4,6 @@ USING: kernel sequences db.tuples alarms calendar db fry
 furnace.db
 furnace.cache
 furnace.asides
-furnace.referrer
 furnace.sessions
 furnace.conversations
 furnace.auth.providers
@@ -24,8 +23,7 @@ IN: furnace.alloy
         <conversations>
         <sessions>
     ] dip
-    <db-persistence>
+    <db-persistence> ;
-    <check-form-submissions> ;
 
 : start-expiring ( db -- )
     '[

basis/furnace/asides/asides-docs.factor

@@ -5,7 +5,7 @@ IN: furnace.asides
 HELP: <asides>
 { $values
      { "responder" "a responder" }
-     { "responder'" asides }
+     { "responder'" "a new responder" }
 }
 { $description "Creates a new " { $link asides } " responder wrapping an existing responder." } ;
 
@@ -22,7 +22,7 @@ ARTICLE: "furnace.asides" "Furnace asides"
 $nl
 "To use asides, wrap your responder in an aside responder:"
 { $subsection <asides> }
-"The aside responder must be wrapped inside a session responder (" { $link <sessions> } "), which in turn must be wrapped inside a database persistence responder (" { $link <db-persistence> } "). The " { $vocab-link "furnace.alloy" } " vocabulary combines all of these responders into one."
+"The asides responder must be wrapped inside a session responder (" { $link <sessions> } "), which in turn must be wrapped inside a database persistence responder (" { $link <db-persistence> } "). The " { $vocab-link "furnace.alloy" } " vocabulary combines all of these responders into one."
 $nl
 "Saving the current page in an aside which propagates through " { $link <redirect> } " responses:"
 { $subsection begin-aside }

basis/furnace/auth/auth-docs.factor

@@ -0,0 +1,193 @@
+USING: assocs classes help.markup help.syntax kernel
+quotations strings words furnace.auth.providers.db
+checksums.sha2 furnace.auth.providers math byte-arrays
+http multiline ;
+IN: furnace.auth
+
+HELP: <protected>
+{ $values
+     { "responder" "a responder" }
+     { "protected" "a new responder" }
+}
+{ $description "Wraps a responder in a protected responder. Access to the wrapped responder will be conditional upon the client authenticating with the current authentication realm." } ;
+
+HELP: >>encoded-password
+{ $values { "user" user } { "string" string } }
+{ $description "Sets the user's password by combining it with a random salt and encoding it with the current authentication realm's checksum." } ;
+
+HELP: capabilities
+{ $var-description "Global variable holding all defined capabilities. New capabilities may be defined with " { $link define-capability } "." } ;
+
+HELP: check-login
+{ $values { "password" string } { "username" string } { "user/f" { $maybe user } } }
+{ $description "Checks a username/password pair with the current authentication realm. Outputs a user if authentication succeeded, otherwise outputs " { $link f } "." } ;
+
+HELP: define-capability
+{ $values { "word" symbol } }
+{ $description "Defines a new capability by adding it to the " { $link capabilities } " global variable." } ;
+
+HELP: encode-password
+{ $values
+     { "string" string } { "salt" integer }
+     { "bytes" byte-array }
+}
+{ $description "Encodes a password with the current authentication realm's checksum." } ;
+
+HELP: have-capabilities?
+{ $values
+     { "capabilities" "a sequence of capabilities" }
+     { "?" "a boolean" }
+}
+{ $description "Tests if the currently logged-in user possesses the given capabilities." } ;
+
+HELP: logged-in-user
+{ $var-description "Holds the currently logged-in user." } ;
+
+HELP: login-required
+{ $values
+     { "description" string } { "capabilities" "a sequence of capabilities" }
+}
+{ $description "Redirects the client to a login page." } ;
+
+HELP: login-required*
+{ $values
+     { "description" string } { "capabilities" "a sequence of capabilities" } { "realm" "an authenticaiton realm" }
+     { "response" response }
+}
+{ $contract "Constructs an HTTP response for redirecting the client to a login page." } ;
+
+HELP: protected
+{ $class-description "The class of protected responders. See " { $link "furnace.auth.protected" } " for a description of usage and slots." } ;
+
+HELP: realm
+{ $class-description "The class of authentication realms. See " { $link "furnace.auth.realms" } " for details." } ;
+
+HELP: uchange
+{ $values { "key" symbol } { "quot" { $quotation "( old -- new )" } } }
+{ $description "Applies the quotation to the old value of the user profile variable, and assigns the resulting value back to the variable." } ;
+
+HELP: uget
+{ $values { "key" symbol } { "value" object } }
+{ $description "Outputs the value of a user profile variable." } ;
+
+HELP: uset
+{ $values { "value" object } { "key" symbol } }
+{ $description "Sets the value of a user profile variable." } ;
+
+HELP: username
+{ $values { "string/f" { $maybe string } }
+}
+{ $description "Outputs the currently logged-in username, or " { $link f } " if no user is logged in." } ;
+HELP: users
+{ $values { "provider" "an authentication provider" } }
+{ $description "Outputs the current authentication provider." } ;
+
+ARTICLE: "furnace.auth.capabilities" "Authentication capabilities"
+"Every user in the authentication framework has a set of associated capabilities."
+$nl
+"Defining new capabilities:"
+{ $subsection define-capability }
+"Capabilities are stored in a global variable:"
+{ $subsection capabilities }
+"Protected resources can be restricted to users possessing certain capabilities only by storing a sequence of capabilities in the " { $slot "capabilities" } " slot of a " { $link protected } " instance." ;
+
+ARTICLE: "furnace.auth.protected" "Protected resources"
+"To restrict access to authenticated clients only, wrap a responder in a protected responder."
+{ $subsection protected }
+{ $subsection <protected> }
+"Protected responders have the following two slots which may be set:"
+{ $table
+    { { $slot "description" } "A string identifying the protected resource for user interface purposes" }
+    { { $slot "capabilities" } { "A sequence of capabilities; see " { $link "furnace.auth.capabilities" } } }
+} ;
+
+ARTICLE: "furnace.auth.realm-config" "Authentication realm configuration"
+"Instances of subclasses of " { $link realm } " have the following slots which may be set:"
+{ $table
+    { { $slot "name" } "A string identifying the realm for user interface purposes" }
+    { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } ". By default, the " { $link users-in-db } " provider is used." } }
+    { { $slot "checksum" } { "An implementation of the checksum protocol used for verifying passwords (see " { $link "checksums" } "). The " { $link sha-256 } " checksum is used by default." } }
+    { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } } }
+    { { $slot "secure" } { "A boolean, that when set to a true value, forces the client to access the authentication realm via HTTPS. An attempt to access the realm via HTTP results in a redirect to the corresponding HTTPS URL. On by default." } }
+} ;
+
+ARTICLE: "furnace.auth.providers" "Authentication providers"
+"The " { $vocab-link "furnace.auth" } " framework looks up users using an authentication provider. Different authentication providers can be swapped in to implement various authentication strategies."
+$nl
+"Each authentication realm has a provider stored in the " { $slot "users" } " slot. The default provider is " { $link users-in-db } "."
+{ $subsection "furnace.auth.providers.protocol" }
+{ $subsection "furnace.auth.providers.null" }
+{ $subsection "furnace.auth.providers.assoc" }
+{ $subsection "furnace.auth.providers.db" } ;
+
+ARTICLE: "furnace.auth.features" "Optional authentication features"
+"Vocabularies having names prefixed by " { $code "furnace.auth.features" } "  implement optional features which can be enabled by calling special words. These words define new actions on an authentication realm."
+{ $subsection "furnace.auth.features.deactivate-user" }
+{ $subsection "furnace.auth.features.edit-profile" }
+{ $subsection "furnace.auth.features.recover-password" }
+{ $subsection "furnace.auth.features.registration" } ;
+
+ARTICLE: "furnace.auth.realms" "Authentication realms"
+"The superclass of authentication realms:"
+{ $subsection realm }
+"There are two concrete implementations:"
+{ $subsection "furnace.auth.basic" }
+{ $subsection "furnace.auth.login" }
+"Authentication realms need to be configured after construction."
+{ $subsection "furnace.auth.realm-config" } ;
+
+ARTICLE: "furnace.auth.users" "User profiles"
+"A responder wrapped in an authentication realm may access the currently logged-in user,"
+{ $subsection logged-in-user }
+"as well as the logged-in username:"
+{ $subsection username }
+"Values can also be stored in user profile variables:"
+{ $subsection uget }
+{ $subsection uset }
+{ $subsection uchange }
+"User profile variables have the same restrictions on their values as session variables; see " { $link "furnace.sessions.serialize" } " for a discussion." ;
+
+ARTICLE: "furnace.auth.example" "Furnace authentication example"
+"The " { $vocab-link "webapps.todo" } " vocabulary wraps all of its responders in a protected responder. The " { $slot "description" } " slot is set so that the login page contains the message ``You must log in to view your todo list'':"
+{ $code
+    <" <protected>
+    "view your todo list" >>description">
+}
+"The " { $vocab-link "webapps.wiki" } " vocabulary defines a mix of protected and unprotected actions. One example of a protected action is that for deleting wiki pages, an action normally reserved for administrators. This action is protected with the following code:"
+{ $code
+    <" <protected>
+    "delete wiki articles" >>description
+    { can-delete-wiki-articles? } >>capabilities">
+}
+"The " { $vocab-link "websites.concatenative" } " vocabulary wraps all of its responders, including the wiki, in a login authentication realm:"
+{ $code
+<" : <login-config> ( responder -- responder' )
+    "Factor website" <login-realm>
+        "Factor website" >>name
+        allow-registration
+        allow-password-recovery
+        allow-edit-profile
+        allow-deactivation ;">
+} ;
+
+ARTICLE: "furnace.auth" "Furnace authentication"
+"The " { $vocab-link "furnace.auth" } " vocabulary implements a pluggable authentication framework."
+$nl
+"Usernames and passwords are verified using an " { $emphasis "authentication provider" } "."
+{ $subsection "furnace.auth.providers" }
+"Users have capabilities assigned to them."
+{ $subsection "furnace.auth.capabilities" }
+"An " { $emphasis "authentication realm" } " is a responder which manages access to protected resources."
+{ $subsection "furnace.auth.realms" }
+"Actions contained inside an authentication realm can be protected by wrapping them with a responder."
+{ $subsection "furnace.auth.protected" }
+"Actions contained inside an authentication realm can access the currently logged-in user profile."
+{ $subsection "furnace.auth.users" }
+"Authentication realms can be adorned with additional functionality."
+{ $subsection "furnace.auth.features" }
+"An administration tool."
+{ $subsection "furnace.auth.user-admin" }
+"A concrete example."
+{ $subsection "furnace.auth.example" } ;
+
+ABOUT: "furnace.auth"

basis/furnace/auth/basic/basic-docs.factor

@@ -0,0 +1,16 @@
+USING: help.markup help.syntax ;
+IN: furnace.auth.basic
+
+HELP: <basic-auth-realm>
+{ $values { "responder" "a responder" } { "name" "an authentication realm name" } { "realm" basic-auth-realm } }
+{ $description "Wraps a responder in a basic authentication realm. The realm must be configured before use; see " { $link "furnace.auth.realm-config" } "." } ;
+
+HELP: basic-auth-realm
+{ $class-description "The basic authentication realm class. Slots are described in " { $link "furnace.auth.realm-config" } "." } ;
+
+ARTICLE: "furnace.auth.basic" "Basic authentication"
+"The " { $vocab-link "furnace.auth.basic" } " vocabulary implements HTTP basic authentication."
+{ $subsection basic-auth-realm }
+{ $subsection <basic-auth-realm> } ;
+
+ABOUT: "furnace.auth.basic"

basis/furnace/auth/features/deactivate-user/deactivate-user-docs.factor

@@ -0,0 +1,26 @@
+USING: help.markup help.syntax kernel ;
+IN: furnace.auth.features.deactivate-user
+
+HELP: allow-deactivation
+{ $values { "realm" "an authentication realm" } }
+{ $description "Adds a " { $snippet "deactivate-user" } " action to an authentication realm." } ;
+
+HELP: allow-deactivation?
+{ $values { "?" "a boolean" } }
+{ $description "Outputs true if the current authentication realm allows user profile deactivation." } ;
+
+ARTICLE: "furnace.auth.features.deactivate-user" "User profile deactivation"
+"The " { $vocab-link "furnace.auth.features.deactivate-user" } " vocabulary implements an authentication feature for user profile deactivation, allowing users to voluntarily deactivate their account."
+$nl
+"To enable this feature, call the following word on an authentication realm:"
+{ $subsection allow-deactivation }
+"To check if deactivation is enabled:"
+{ $subsection allow-deactivation? }
+"This feature adds a " { $snippet "deactivate-user" } " action to the realm, and a link to this action can be inserted in Chloe templates using the following XML snippet:"
+{ $code
+    "<t:if t:code=\"furnace.auth.features.deactivate-user:allow-deactivation?\">"
+    "    <t:button t:action=\"$realm/deactivate-user\">Deactivate user</t:button>"
+    "</t:if>"
+} ;
+
+ABOUT: "furnace.auth.features.deactivate-user"

basis/furnace/auth/features/edit-profile/edit-profile-docs.factor

@@ -0,0 +1,24 @@
+USING: help.markup help.syntax kernel ;
+IN: furnace.auth.features.edit-profile
+
+HELP: allow-edit-profile
+{ $values { "realm" "an authentication realm" } }
+{ $description "Adds an " { $snippet "edit-profile" } " action to an authentication realm." } ;
+
+HELP: allow-edit-profile?
+{ $values { "?" "a boolean" } }
+{ $description "Outputs true if the current authentication realm allows user profile editing." } ;
+
+ARTICLE: "furnace.auth.features.edit-profile" "User profile editing"
+"The " { $vocab-link "furnace.auth.features.edit-profile" } " vocabulary implements an authentication feature for user profile editing, allowing users to change some details of their account."
+$nl
+"To enable this feature, call the following word on an authentication realm:"
+{ $subsection allow-edit-profile }
+"To check if profile editing is enabled:"
+{ $subsection allow-edit-profile? }
+"This feature adds an " { $snippet "edit-profile" } " action to the realm, and a link to this action can be inserted in Chloe templates using the following XML snippet:"
+{ $code
+    "<t:if t:code=\"furnace.auth.features.edit-profile:allow-edit-profile?\">"
+    "    <t:button t:action=\"$realm/edit-profile\">Edit profile</t:button>"
+    "</t:if>"
+} ;

basis/furnace/auth/features/edit-profile/edit-profile.factor

@@ -58,7 +58,7 @@ IN: furnace.auth.features.edit-profile
     <protected>
         "edit your profile" >>description ;
 
-: allow-edit-profile ( login -- login )
+: allow-edit-profile ( realm -- realm )
     <edit-profile-action> <auth-boilerplate> "edit-profile" add-responder ;
 
 : allow-edit-profile? ( -- ? )

basis/furnace/auth/features/edit-profile/edit-profile.xml

@@ -61,7 +61,7 @@
 	</table>
 
 	<p>
-		<button>Update</button>
+		<button type="submit">Update</button>
 		<t:validation-errors />
 	</p>
 

basis/furnace/auth/features/recover-password/recover-1.xml

@@ -32,7 +32,7 @@
 
 		</table>
 
-		<button>Recover password</button>
+		<button type="submit">Recover password</button>
 
 	</t:form>
 

basis/furnace/auth/features/recover-password/recover-3.xml

@@ -31,7 +31,7 @@
 		</table>
 
 		<p>
-			<button>Set password</button>
+			<button type="submit">Set password</button>
 			<t:validation-errors />
 		</p>
 

basis/furnace/auth/features/recover-password/recover-password-docs.factor

@@ -0,0 +1,34 @@
+USING: help.markup help.syntax kernel strings urls ;
+IN: furnace.auth.features.recover-password
+
+HELP: allow-password-recovery
+{ $values { "realm" "an authentication realm" } }
+{ $description "Adds a " { $snippet "recover-password" } " action to an authentication realm." } ;
+
+HELP: allow-password-recovery?
+{ $values { "?" "a boolean" } }
+{ $description "Outputs true if the current authentication realm allows user password recovery." } ;
+
+HELP: lost-password-from
+{ $var-description "A variable with the source e-mail address of password recovery e-mails." } ;
+
+ARTICLE: "furnace.auth.features.recover-password" "User password recovery"
+"The " { $vocab-link "furnace.auth.features.recover-password" }
+" vocabulary implements an authentication feature for user password recovery, allowing users to get a new password e-mailed to them in the event they forget their current one."
+$nl
+"To enable this feature, first call the following word on an authentication realm,"
+{ $subsection allow-password-recovery }
+"Then set a global configuration variable:"
+{ $subsection lost-password-from }
+"In addition, the " { $link "smtp" } " may need to be configured as well."
+$nl
+"To check if password recovery is enabled:"
+{ $subsection allow-password-recovery? }
+"This feature adds a " { $snippet "recover-password" } " action to the realm, and a link to this action can be inserted in Chloe templates using the following XML snippet:"
+{ $code
+    "<t:if t:code=\"furnace.auth.features.recover-password:allow-password-recovery?\">"
+    "    <t:button t:action=\"$realm/recover-password\">Recover password</t:button>"
+    "</t:if>"
+} ;
+
+ABOUT: "furnace.auth.features.recover-password"

basis/furnace/auth/features/recover-password/recover-password.factor

@@ -110,7 +110,7 @@ SYMBOL: lost-password-from
     <page-action>
         { realm "features/recover-password/recover-4" } >>template ;
 
-: allow-password-recovery ( login -- login )
+: allow-password-recovery ( realm -- realm )
     <recover-action-1> <auth-boilerplate>
         "recover-password" add-responder
     <recover-action-2> <auth-boilerplate>

basis/furnace/auth/features/registration/register.xml

@@ -62,7 +62,7 @@
 
 		<p>
 
-			<button>Register</button>
+			<button type="submit">Register</button>
 			<t:validation-errors />
 
 		</p>

basis/furnace/auth/features/registration/registration-docs.factor

@@ -0,0 +1,24 @@
+USING: help.markup help.syntax kernel ;
+IN: furnace.auth.features.registration
+
+HELP: allow-registration
+{ $values { "realm" "an authentication realm" } }
+{ $description "Adds a " { $snippet "registration" } " action to an authentication realm." } ;
+
+HELP: allow-registration?
+{ $values { "?" "a boolean" } }
+{ $description "Outputs true if the current authentication realm allows user registration." } ;
+
+ARTICLE: "furnace.auth.features.registration" "User registration"
+"The " { $vocab-link "furnace.auth.features.registration" } " vocabulary implements an authentication feature for user registration, allowing new users to create accounts."
+$nl
+"To enable this feature, call the following word on an authentication realm:"
+{ $subsection allow-registration }
+"To check if user registration is enabled:"
+{ $subsection allow-registration? }
+"This feature adds a " { $snippet "register" } " action to the realm. A link to this action is inserted on the login page if the " { $vocab-link "furnace.auth.login" } " authentication realm is used. Links to this action can be inserted from other pages using the following Chloe XML snippet:"
+{ $code
+    "<t:if t:code=\"furnace.auth.features.registration:allow-registration?\">"
+    "    <t:button t:action=\"$realm/register\">Register</t:button>"
+    "</t:if>"
+} ;

basis/furnace/auth/features/registration/registration.factor

@@ -38,7 +38,7 @@ IN: furnace.auth.features.registration
     <auth-boilerplate>
     <secure-realm-only> ;
 
-: allow-registration ( login -- login )
+: allow-registration ( realm -- realm )
     <register-action> "register" add-responder ;
 
 : allow-registration? ( -- ? )

basis/furnace/auth/login/login-docs.factor

@@ -0,0 +1,23 @@
+USING: help.markup help.syntax kernel strings ;
+IN: furnace.auth.login
+
+HELP: <login-realm>
+{ $values
+     { "responder" "a responder" } { "name" string }
+     { "realm" "a new responder" }
+}
+{ $description "Wraps a responder in a new login realm with the given name. The realm must be configured before use; see " { $link "furnace.auth.realm-config" } "." } ;
+
+HELP: login-realm
+{ $class-description "The login realm class. Slots are described in " { $link "furnace.auth.realm-config" } "." } ;
+
+ARTICLE: "furnace.auth.login" "Login authentication"
+"The " { $vocab-link "furnace.auth.login" } " vocabulary implements an authentication realm which displays a login page with a username and password field."
+{ $subsection login-realm }
+{ $subsection <login-realm> }
+"The " { $snippet "logout" } " action logs the user out of the realm, and a link to this action can be inserted in Chloe templates using the following XML snippet:"
+{ $code
+    "<t:button t:action=\"$login-realm/logout\">Logout</t:button>"
+} ;
+
+ABOUT: "furnace.auth.login"

basis/furnace/auth/login/login.factor

@@ -58,9 +58,13 @@ M: login-realm modify-form ( responder -- )
     permit-id get [ delete-permit ] when*
     URL" $realm" end-aside ;
 
+<PRIVATE
+
 SYMBOL: description
 SYMBOL: capabilities
 
+PRIVATE>
+
 : flashed-variables { description capabilities } ;
 
 : login-failed ( -- * )
@@ -107,7 +111,7 @@ M: login-realm login-required* ( description capabilities login -- response )
 M: login-realm user-registered ( user realm -- )
     drop successful-login ;
 
-: <login-realm> ( responder name -- auth )
+: <login-realm> ( responder name -- realm )
     login-realm new-realm
         <login-action> "login" add-responder
         <logout-action> "logout" add-responder

basis/furnace/auth/login/login.xml

@@ -35,7 +35,7 @@
 
 		<p>
 
-			<button>Log in</button>
+			<button type="submit">Log in</button>
 			<t:validation-errors />
 
 		</p>

basis/furnace/auth/providers/assoc/assoc-docs.factor

@@ -0,0 +1,14 @@
+USING: help.markup help.syntax io.streams.string ;
+IN: furnace.auth.providers.assoc
+
+HELP: <users-in-memory>
+{ $values { "provider" users-in-memory } }
+{ $description "Creates a new authentication provider which stores the usernames and passwords in an associative mapping." } ;
+
+ARTICLE: "furnace.auth.providers.assoc" "In-memory authentication provider"
+"The " { $vocab-link "furnace.auth.providers.assoc" } " vocabulary implements an authentication provider which looks up usernames and passwords in an associative mapping."
+{ $subsection users-in-memory }
+{ $subsection <users-in-memory> }
+"The " { $slot "assoc" } " slot of the " { $link users-in-memory } " tuple maps usernames to checksums of passwords." ;
+
+ABOUT: "furnace.auth.providers.assoc"

basis/furnace/auth/providers/db/db-docs.factor

@@ -0,0 +1,13 @@
+USING: help.markup help.syntax ;
+IN: furnace.auth.providers.db
+
+HELP: users-in-db
+{ $class-description "Singleton class implementing the database authentication provider." } ;
+
+ARTICLE: "furnace.auth.providers.db" "Database authentication provider"
+"The " { $vocab-link "furnace.auth.providers.db" } " vocabulary implements an authentication provider which looks up authentication requests in the " { $snippet "USERS" } " table of the current database. The database schema is Factor-specific, and the table should be initialized by calling"
+{ $code "users create-table" }
+"The authentication provider class:"
+{ $subsection users-in-db } ;
+
+ABOUT: "furnace.auth.providers.db"

basis/furnace/auth/providers/null/null-docs.factor

@@ -0,0 +1,10 @@
+USING: help.markup help.syntax ;
+IN: furnace.auth.providers.null
+
+HELP: no-users
+{ $class-description "Singleton class implementing the dummy authentication provider." } ;
+
+ARTICLE: "furnace.auth.providers.null" "Dummy authentication provider"
+"The " { $vocab-link "furnace.auth.providers.null" } " vocabulary implements an authentication provider which refuses all authentication requests. It is only useful for testing purposes." ;
+
+ABOUT: "furnace.auth.providers.null"

basis/furnace/auth/providers/providers-docs.factor

@@ -0,0 +1,45 @@
+USING: help.markup help.syntax strings ;
+IN: furnace.auth.providers
+
+HELP: user
+{ $class-description "The class of users. Instances have the following slots:"
+{ $table
+    { { $slot "username" } { "The username, used to identify the user for login purposes" } }
+    { { $slot "realname" } { "The user's real name, optional" } }
+    { { $slot "password" } { "The user's password, encoded with a checksum" } }
+    { { $slot "salt" } { "A random salt prepended to the password to ensure that two users with the same plain-text password still have different checksum output" } }
+    { { $slot "email" } { "The user's e-mail address, optional" } }
+    { { $slot "ticket" } { "Used for password recovery" } }
+    { { $slot "capabilities" } { "A sequence of capabilities; see " { $link "furnace.auth.capabilities" } } }
+    { { $slot "profile" } { "A hashtable with webapp-specific configuration" } }
+    { { $slot "deleted" } { "A boolean indicating whether the user is active or not. This allows a user account to be deactivated without removing the user from the database" } }
+    { { $slot "changed?" } { "A boolean indicating whether the user has changed since being retrieved from the database" } }
+} } ;
+
+HELP: add-user
+{ $values { "provider" "an authentication provider" } { "user" user } }
+{ $description "A utility word which calls " { $link new-user }  " and throws an error if the user already exists." } ;
+
+HELP: get-user
+{ $values { "username" string } { "provider" "an authentication provider" } { "user/f" { $maybe user } } }
+{ $contract "Looks up a username in the authentication provider." } ;
+
+HELP: new-user
+{ $values { "user" user } { "provider" "an authentication provider" } { "user/f" { $maybe user } } }
+{ $contract "Adds a new user to the authentication provider. Outputs " { $link f } " if a user with this username already exists." } ;
+
+HELP: update-user
+{ $values { "user" user } { "provider" "an authentication provider" } }
+{ $contract "Stores a user back to an authentication provider after being changed. This is a no-op with in-memory providers; providers which use an external store will save the user in this word. " } ;
+
+ARTICLE: "furnace.auth.providers.protocol" "Authentication provider protocol"
+"The " { $vocab-link "furnace.auth.providers" } " vocabulary implements a protocol for persistence and authentication of users."
+$nl
+"The class of users:"
+{ $subsection user }
+"Generic protocol:"
+{ $subsection get-user }
+{ $subsection new-user }
+{ $subsection update-user } ;
+
+ABOUT: "furnace.auth.providers.protocol"

basis/furnace/boilerplate/boilerplate-docs.factor

@@ -1,27 +1,35 @@
-! Copyright (C) 2008 Your name.
+USING: help.markup help.syntax io.streams.string
-! See http://factorcode.org/license.txt for BSD license.
+http.server.dispatchers ;
-USING: help.markup help.syntax io.streams.string ;
 IN: furnace.boilerplate
 
 HELP: <boilerplate>
 { $values
-     { "responder" null }
+     { "responder" "a responder" }
-     { "boilerplate" null }
+     { "boilerplate" "a new boilerplate responder" }
 }
-{ $description "" } ;
+{ $description "Wraps a responder in a boilerplate responder. The boilerplate responder needs to be configured before use; see " { $link "furnace.boilerplate.config" } "." } ;
 
 HELP: boilerplate
-{ $description "" } ;
+{ $class-description "The class of boilerplate responders. Slots are documented in " { $link "furnace.boilerplate.config" } "." } ;
 
-HELP: wrap-boilerplate?
+ARTICLE: "furnace.boilerplate.config" "Boilerplate configuration"
-{ $values
+"The " { $link boilerplate } " tuple has two slots which can be set:"
-     { "response" null }
+{ $table
-     { "?" "a boolean" }
+    { { $slot "template" } { "A pair with shape " { $snippet "{ responder name }" } ", where " { $snippet "responder" } " is a responder class, usually a subclass of " { $link dispatcher } ", and " { $snippet "name" } " is the name of a template file, without the " { $snippet ".xml" } " extension, relative to the directory containing the responder's vocabulary source file." } }
-}
+    { { $slot "init" } { "A quotation run before the boilerplate template is rendered. This quotation can set values which the template can then display." } }
-{ $description "" } ;
+} ;
+
+ARTICLE: "furnace.boilerplate.example" "Boilerplate example"
+"The " { $vocab-link "webapps.wiki" } " vocabulary uses boilerplate to add a footer and sidebar to every page. Since the footer and sidebar are themselves dynamic content, it sets the " { $slot "init" } " quotation as well as the " { $slot "template" } " slot:"
+{ $code "<boilerplate>"
+"    [ init-sidebars init-relative-link-prefix ] >>init"
+"    { wiki \"wiki-common\" } >>template" } ;
 
 ARTICLE: "furnace.boilerplate" "Furnace boilerplate support"
-{ $vocab-link "furnace.boilerplate" }
+"The " { $vocab-link "furnace.boilerplate" } " vocabulary implements a facility for sharing a common header and footer between different pages on a web site. It builds on top of " { $link "html.templates.boilerplate" } "."
-;
+{ $subsection <boilerplate> }
+{ $subsection "furnace.boilerplate.config" }
+{ $subsection "furnace.boilerplate.example" }
+{ $see-also "html.templates.chloe.tags.boilerplate" } ;
 
 ABOUT: "furnace.boilerplate"

basis/furnace/conversations/conversations-docs.factor

@@ -1,6 +1,53 @@
-USING: help.markup help.syntax ;
+USING: help.markup help.syntax urls http words kernel
+furnace.sessions furnace.db ;
 IN: furnace.conversations
 
-ARTICLE: "furnace.conversations" "Furnace conversation scope"
+HELP: <conversations>
+{ $values
+     { "responder" "a responder" }
+     { "responder'" "a new responder" }
+}
+{ $description "Creates a new " { $link conversations } " responder wrapping an existing responder." } ;
 
-;
+HELP: begin-conversation
+{ $description "Starts a new conversation scope. Values can be stored in the conversation scope with " { $link cset } ", and the conversation can be continued with " { $link <continue-conversation> } "." } ;
+
+HELP: end-conversation
+{ $description "Ends the current conversation scope." } ;
+
+HELP: <continue-conversation>
+{ $values { "url" url } { "response" response } }
+{ $description "Creates an HTTP response which redirects the client to the specified URL while continuing the conversation. Any values set in the current conversation scope will be visible to the resonder handling the URL." } ;
+
+HELP: cget
+{ $values { "key" symbol } { "value" object } }
+{ $description "Outputs the value of a conversation variable." } ;
+
+HELP: cset
+{ $values { "value" object } { "key" symbol } }
+{ $description "Sets the value of a conversation variable." } ;
+
+HELP: cchange
+{ $values { "key" symbol } { "quot" { $quotation "( old -- new )" } } }
+{ $description "Applies the quotation to the old value of the conversation variable, and assigns the resulting value back to the variable." } ;
+
+ARTICLE: "furnace.conversations" "Furnace conversation scope"
+"The " { $vocab-link "furnace.conversations" } " vocabulary implements conversation scope, which allows data to be passed between requests on a finer level of granularity than session scope."
+$nl
+"Conversation scope is used by form validation to pass validation errors between requests."
+$nl
+"To use conversation scope, wrap your responder in an conversation responder:"
+{ $subsection <conversations> }
+"The conversations responder must be wrapped inside a session responder (" { $link <sessions> } "), which in turn must be wrapped inside a database persistence responder (" { $link <db-persistence> } "). The " { $vocab-link "furnace.alloy" } " vocabulary combines all of these responders into one."
+$nl
+"Managing conversation scopes:"
+{ $subsection begin-conversation }
+{ $subsection end-conversation }
+{ $subsection <continue-conversation> }
+"Reading and writing conversation variables:"
+{ $subsection cget }
+{ $subsection cset }
+{ $subsection cchange }
+"Note that conversation scope is serialized as part of the session, which means that only serializable objects can be stored there. See " { $link "furnace.sessions.serialize" } " for details." ;
+
+ABOUT: "furnace.conversations"

basis/furnace/furnace-docs.factor

@@ -1,161 +1,155 @@
-USING: assocs help.markup help.syntax io.streams.string quotations sequences strings urls ;
+USING: assocs help.markup help.syntax kernel
+quotations sequences strings urls xml.data http ;
 IN: furnace
 
 HELP: adjust-redirect-url
-{ $values
+{ $values { "url" url } { "url'" url } }
-     { "url" url }
+{ $description "Adjusts a redirection URL by filtering the URL's query parameters through the " { $link modify-redirect-query } " generic word on every responder involved in handling the current request." } ;
-     { "url'" url }
-}
-{ $description "" } ;
 
 HELP: adjust-url
-{ $values
+{ $values { "url" url } { "url'" url } }
-     { "url" url }
+{ $description "Adjusts a link URL by filtering the URL's query parameters through the " { $link modify-query } " generic word on every responder involved in handling the current request." } ;
-     { "url'" url }
-}
-{ $description "" } ;
-
-HELP: base-path
-{ $values
-     { "string" string }
-     { "pair" null }
-}
-{ $description "" } ;
 
 HELP: client-state
-{ $values
+{ $values { "key" string } { "value/f" { $maybe string } } }
-     { "key" null }
+{ $description "Looks up a cookie (if the current request is a GET or HEAD request) or a POST parameter (if the current request is a POST request)." }
-     { "value/f" null }
+{ $notes "This word is used by session management, conversation scope and asides." } ;
-}
-{ $description "" } ;
-
-HELP: cookie-client-state
-{ $values
-     { "key" null } { "request" null }
-     { "value/f" null }
-}
-{ $description "" } ;
 
 HELP: each-responder
-{ $values
+{ $values { "quot" { $quotation "( responder -- )" } } }
-     { "quot" quotation }
+{ $description "Applies the quotation to each responder involved in processing the current request." } ;
-}
-{ $description "" } ;
-
-HELP: exit-continuation
-{ $description "" } ;
-
-HELP: exit-with
-{ $values
-     { "value" null }
-}
-{ $description "" } ;
 
 HELP: hidden-form-field
-{ $values
+{ $values { "value" string } { "name" string } }
-     { "value" null } { "name" null }
+{ $description "Renders an HTML hidden form field tag." }
-}
+{ $notes "This word is used by session management, conversation scope and asides." }
-{ $description "" } ;
+{ $examples
+    { $example
+        "USING: furnace io ;"
+        "\"bar\" \"foo\" hidden-form-field nl"
+        "<input type='hidden' name='foo' value='bar'/>"
+    }
+} ;
 
 HELP: link-attr
-{ $values
+{ $values { "tag" tag } { "responder" "a responder" } }
-     { "tag" null } { "responder" null }
+{ $contract "Modifies an XHTML " { $snippet "a" } " tag." }
-}
+{ $notes "This word is called by " { $link "html.templates.chloe.tags.form" } "." }
-{ $description "" } ;
+{ $examples "Conversation scope adds attributes to link tags." } ;
 
 HELP: modify-form
-{ $values
+{ $values { "responder" "a responder" } }
-     { "responder" null }
+{ $contract "Emits hidden form fields using " { $link hidden-form-field } "." }
-}
+{ $notes "This word is called by " { $link "html.templates.chloe.tags.form" } "." }
-{ $description "" } ;
+{ $examples "Session management, conversation scope and asides use hidden form fields to pass state." } ;
 
 HELP: modify-query
-{ $values
+{ $values { "query" assoc } { "responder" "a responder" } { "query'" assoc } }
-     { "query" null } { "responder" null }
+{ $contract "Modifies the query parameters of a URL destined to be displayed as a link." }
-     { "query'" null }
+{ $notes "This word is called by " { $link "html.templates.chloe.tags.form" } "." }
-}
+{ $examples "Asides add query parameters to URLs." } ;
-{ $description "" } ;
 
 HELP: modify-redirect-query
-{ $values
+{ $values { "query" assoc } { "responder" "a responder" } { "query'" assoc } }
-     { "query" null } { "responder" null }
+{ $contract "Modifies the query parameters of a URL destined to be used with a redirect." }
-     { "query'" null }
+{ $notes "This word is called by " { $link "furnace.redirection" } "." }
-}
+{ $examples "Conversation scope and asides add query parameters to redirect URLs." } ;
-{ $description "" } ;
-
-HELP: nested-forms-key
-{ $description "" } ;
 
 HELP: nested-responders
-{ $values
+{ $values { "seq" "a sequence of responders" } }
-    
-     { "seq" sequence }
-}
-{ $description "" } ;
-
-HELP: post-client-state
-{ $values
-     { "key" null } { "request" null }
-     { "value/f" null }
-}
 { $description "" } ;
 
 HELP: referrer
-{ $values
+{ $values { "referrer/f" { $maybe string } } }
-    
+{ $description "Outputs the current request's referrer URL." } ;
-     { "referrer/f" null }
-}
-{ $description "" } ;
 
 HELP: request-params
-{ $values
+{ $values { "request" request } { "assoc" assoc } }
-     { "request" null }
+{ $description "Outputs the query parameters (if the current request is a GET or HEAD request) or the POST parameters (if the current request is a POST request)." } ;
-     { "assoc" assoc }
-}
-{ $description "" } ;
 
 HELP: resolve-base-path
-{ $values
+{ $values { "string" string } { "string'" string } }
-     { "string" string }
-     { "string'" string }
-}
 { $description "" } ;
 
 HELP: resolve-template-path
-{ $values
+{ $values { "pair" "a pair with shape " { $snippet "{ class string }" } } { "path" "a pathname string" } }
-     { "pair" null }
-     { "path" "a pathname string" }
-}
 { $description "" } ;
 
 HELP: same-host?
-{ $values
+{ $values { "url" url } { "?" "a boolean" } }
-     { "url" url }
+{ $description "Tests if the given URL is located on the same host as the URL of the current request." } ;
-     { "?" "a boolean" }
-}
-{ $description "" } ;
 
 HELP: user-agent
-{ $values
+{ $values { "user-agent" { $maybe string } } }
-    
+{ $description "Outputs the user agent reported by the client for the current request." } ;
-     { "user-agent" null }
-}
-{ $description "" } ;
 
 HELP: vocab-path
-{ $values
+{ $values { "vocab" "a vocabulary specifier" } { "path" "a pathname string" } }
-     { "vocab" "a vocabulary specifier" }
-     { "path" "a pathname string" }
-}
 { $description "" } ;
 
+HELP: exit-with
+{ $values { "value" object } }
+{ $description "Exits from an outer " { $link with-exit-continuation } "." } ;
+
 HELP: with-exit-continuation
-{ $values
+{ $values { "quot" { $quotation { "( -- value )" } } } { "value" "a value returned by the quotation or an " { $link exit-with } " invocation" } }
-     { "quot" quotation }
+{ $description "Runs a quotation with the " { $link exit-continuation } " variable bound. Calling " { $link exit-with } " in the quotation will immediately return." }
-}
+{ $notes "Furnace actions and authentication realms wrap their execution in this combinator, allowing form validation failures and login requests, respectively, to immediately return an HTTP response to the client without running any more responder code." } ;
-{ $description "" } ;
 
-ARTICLE: "furnace" "Furnace web framework"
+ARTICLE: "furnace.extension-points" "Furnace extension points"
+"Furnace features such as session management, conversation scope and asides need to modify URLs in links and redirects, and insert hidden form fields, to implement state on top of the stateless HTTP protocol. In order to decouple the server-side state management code from the HTML templating code, a series of hooks are used."
+$nl
+"Responders can implement methods on the following generic words:"
+{ $subsection modify-query }
+{ $subsection modify-redirect-query }
+{ $subsection link-attr }
+{ $subsection modify-form }
+"Presentation-level code can call the following words:"
+{ $subsection adjust-url }
+{ $subsection adjust-redirect-url } ;
+
+ARTICLE: "furnace.misc" "Miscellaneous Furnace features"
+"Inspecting the chain of responders handling the current request:"
+{ $subsection nested-responders }
+{ $subsection each-responder }
+{ $subsection resolve-base-path }
+"Vocabulary root-relative resources:"
+{ $subsection vocab-path }
+{ $subsection resolve-template-path }
+"Early return from a responder:"
+{ $subsection with-exit-continuation }
+{ $subsection exit-with }
+"Other useful words:"
+{ $subsection hidden-form-field }
+{ $subsection request-params }
+{ $subsection client-state }
+{ $subsection user-agent } ;
+
+ARTICLE: "furnace.persistence" "Furnace persistence layer"
+{ $subsection "furnace.db" }
+"Server-side state:"
+{ $subsection "furnace.sessions" }
+{ $subsection "furnace.conversations" }
+{ $subsection "furnace.asides" }
+{ $subsection "furnace.presentation" } ;
+
+ARTICLE: "furnace.presentation" "Furnace presentation layer"
+"HTML components:"
+{ $subsection "html.components" }
+{ $subsection "html.forms" }
+"Content templates:"
+{ $subsection "html.templates" }
+{ $subsection "html.templates.chloe" }
+{ $subsection "html.templates.fhtml" }
+{ $subsection "furnace.boilerplate" }
+"Other types of content:"
+{ $subsection "furnace.syndication" }
+{ $subsection "furnace.json" } ;
+
+ARTICLE: "furnace.load-balancing" "Load balancing and fail-over with Furnace"
+"The Furnace session manager persists sessions to a database. This means that HTTP requests can be transparently distributed between multiple Factor HTTP server instances, running the same web app on top of the same database, as long as the web applications do not use mutable global state, such as global variables. The Furnace framework itself does not use any mutable global state." ;
+
+ARTICLE: "furnace" "Furnace framework"
 "The " { $vocab-link "furnace" } " vocabulary implements a full-featured web framework on top of the " { $link "http.server" } ". Some of its features include:"
 { $list
     "Session management capable of load-balancing and fail-over"
@@ -166,24 +160,21 @@ ARTICLE: "furnace" "Furnace web framework"
 }
 "Major functionality:"
 { $subsection "furnace.actions" }
-{ $subsection "furnace.syndication" }
-{ $subsection "furnace.boilerplate" }
-{ $subsection "furnace.db" }
-"Server-side state:"
-{ $subsection "furnace.sessions" }
-{ $subsection "furnace.conversations" }
-{ $subsection "furnace.asides" }
-"HTML components:"
-{ $subsection "html.components" }
-{ $subsection "html.forms" }
-"Content templates:"
-{ $subsection "html.templates" }
-{ $subsection "html.templates.chloe" }
-{ $subsection "html.templates.fhtml" }
-"Utilities:"
 { $subsection "furnace.alloy" }
-{ $subsection "furnace.json" }
+{ $subsection "furnace.persistence" }
+{ $subsection "furnace.presentation" }
+{ $subsection "furnace.auth" }
+{ $subsection "furnace.load-balancing" }
+"Utilities:"
+{ $subsection "furnace.referrer" }
 { $subsection "furnace.redirection" }
-{ $subsection "furnace.referrer" } ;
+{ $subsection "furnace.extension-points" }
+{ $subsection "furnace.misc" }
+"Related frameworks:"
+{ $subsection "db" }
+{ $subsection "xml" }
+{ $subsection "http.server" }
+{ $subsection "logging" }
+{ $subsection "urls" } ;
 
 ABOUT: "furnace"

basis/furnace/furnace.factor

@@ -90,7 +90,7 @@ M: object modify-form drop ;
     } case ;
 
 : referrer ( -- referrer/f )
-    #! Typo is intentional, its in the HTTP spec!
+    #! Typo is intentional, it's in the HTTP spec!
     "referer" request get header>> at
     dup [ >url ensure-port [ remap-port ] change-port ] when ;
 
@@ -125,7 +125,7 @@ SYMBOL: exit-continuation
 : exit-with ( value -- )
     exit-continuation get continue-with ;
 
-: with-exit-continuation ( quot -- )
+: with-exit-continuation ( quot -- value )
     '[ exit-continuation set @ ] callcc1 exit-continuation off ;
 
 USE: vocabs.loader
@@ -152,3 +152,4 @@ USE: vocabs.loader
 "furnace.scopes" require
 "furnace.sessions" require
 "furnace.syndication" require
+"webapps.user-admin" require

basis/furnace/referrer/referrer-docs.factor

@@ -1,4 +1,5 @@
-USING: help.markup help.syntax io.streams.string ;
+USING: help.markup help.syntax io.streams.string
+furnace ;
 IN: furnace.referrer
 
 HELP: <check-form-submissions>
@@ -10,6 +11,9 @@ HELP: <check-form-submissions>
 
 ARTICLE: "furnace.referrer" "Form submission referrer checking"
 "The " { $vocab-link "furnace.referrer" } " implements a simple security measure which can be used to thwart cross-site scripting attacks."
-{ $subsection <check-form-submissions> } ;
+{ $subsection <check-form-submissions> }
+"Explicit referrer checking:"
+{ $subsection referrer }
+{ $subsection same-host? } ;
 
 ABOUT: "furnace.referrer"

basis/furnace/sessions/sessions-docs.factor

@@ -1,149 +1,55 @@
-! Copyright (C) 2008 Your name.
+USING: help.markup help.syntax io.streams.string quotations strings calendar serialize kernel furnace.db words kernel ;
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax io.streams.string quotations strings ;
 IN: furnace.sessions
 
-HELP: <session-cookie>
-{ $values
-    
-     { "cookie" null }
-}
-{ $description "" } ;
-
-HELP: <session>
-{ $values
-     { "id" null }
-     { "session" null }
-}
-{ $description "" } ;
-
 HELP: <sessions>
 { $values
-     { "responder" null }
+     { "responder" "a responder" }
-     { "responder'" null }
+     { "responder'" "a new responder" }
 }
-{ $description "" } ;
+{ $description "Wraps a responder in a session manager responder." } ;
-
-HELP: begin-session
-{ $values
-    
-     { "session" null }
-}
-{ $description "" } ;
-
-HELP: check-session
-{ $values
-     { "state/f" null }
-     { "state/f" null }
-}
-{ $description "" } ;
-
-HELP: empty-session
-{ $values
-    
-     { "session" null }
-}
-{ $description "" } ;
-
-HELP: existing-session
-{ $values
-     { "path" "a pathname string" } { "session" null }
-     { "response" null }
-}
-{ $description "" } ;
-
-HELP: get-session
-{ $values
-     { "id" null }
-     { "session" null }
-}
-{ $description "" } ;
-
-HELP: init-session
-{ $values
-     { "session" null }
-}
-{ $description "" } ;
-
-HELP: init-session*
-{ $values
-     { "responder" null }
-}
-{ $description "" } ;
-
-HELP: put-session-cookie
-{ $values
-     { "response" null }
-     { "response'" null }
-}
-{ $description "" } ;
-
-HELP: remote-host
-{ $values
-    
-     { "string" string }
-}
-{ $description "" } ;
-
-HELP: request-session
-{ $values
-    
-     { "session/f" null }
-}
-{ $description "" } ;
-
-HELP: save-session-after
-{ $values
-     { "session" null }
-}
-{ $description "" } ;
 
 HELP: schange
-{ $values
+{ $values { "key" symbol } { "quot" { $quotation "( old -- new )" } } }
-     { "key" null } { "quot" quotation }
+{ $description "Applies the quotation to the old value of the session variable, and assigns the resulting value back to the variable." } ;
-}
-{ $description "" } ;
-
-HELP: session
-{ $description "" } ;
-
-HELP: session-changed
-{ $description "" } ;
-
-HELP: session-id-key
-{ $description "" } ;
-
-HELP: sessions
-{ $description "" } ;
 
 HELP: sget
-{ $values
+{ $values { "key" symbol } { "value" object } }
-     { "key" null }
+{ $description "Outputs the value of a session variable." } ;
-     { "value" null }
-}
-{ $description "" } ;
 
 HELP: sset
-{ $values
+{ $values { "value" object } { "key" symbol } }
-     { "value" null } { "key" null }
+{ $description "Sets the value of a session variable." } ;
-}
-{ $description "" } ;
 
-HELP: touch-session
+ARTICLE: "furnace.sessions.config" "Session manager configuration"
-{ $values
+"The " { $link sessions } " tuple has two slots which contain configuration parameters:"
-     { "session" null }
+{ $table
-}
+    { { $slot "verify?" } { "If set to a true value, the client IP address and user agent of each session is tracked, and checked every time a client attempts to re-establish a session. While this does not offer any real security, it can thwart unskilled packet-sniffing attacks. On by default." } }
-{ $description "" } ;
+    { { $slot "timeout" } { "A " { $link duration } " storing the maximum time that inactive sessions will be stored on the server. The default timeout is 20 minutes. Note that for sessions to actually expire, you must start a thread to do so; see the " { $vocab-link "furnace.alloy" } " vocabulary for an easy way of doing this." } }
+} ;
 
-HELP: verify-session
+ARTICLE: "furnace.sessions.serialize" "Session state serialization"
-{ $values
+"Session variable values are serialized to the database using the " { $link "serialize" } " library."
-     { "session" null }
+$nl
-     { "session" null }
+"This means that there are three restrictions on the values stored in the session:"
-}
+{ $list
-{ $description "" } ;
+    "Continuations cannot be stored at all."
+    { "Object identity is not preserved between serialization and deserialization. That is, if an object is stored with " { $link sset } " and later retrieved with " { $link sget } ", the retrieved value will be " { $link = } " to the original, but not necessarily " { $link eq? } "." }
+    { "All objects reachable from the value passed to " { $link sset } " are serialized, so large structures should not be stored in the session state, and neither should anything that can reference the global namespace. Large structures should be persisted in the database directly instead, using " { $vocab-link "db.tuples" } "." }
+} ;
 
 ARTICLE: "furnace.sessions" "Furnace sessions"
-{ $vocab-link "furnace.sessions" }
+"The " { $vocab-link "furnace.sessions" } " vocabulary implements session management, which allows state to be maintained between HTTP requests. The session state is stored on the server; the client receives an opaque ID which is saved in a cookie (for GET requests) or a hidden form field (for POST requests)."
-;
+$nl
+"To use session management, wrap your responder in an session manager:"
+{ $subsection <sessions> }
+"The sessions responder must be wrapped inside a database persistence responder (" { $link <db-persistence> } "). The " { $vocab-link "furnace.alloy" } " vocabulary combines all of these responders into one."
+$nl
+"Reading and writing session variables from a request:"
+{ $subsection sget }
+{ $subsection sset }
+{ $subsection schange }
+"Additional topics:"
+{ $subsection "furnace.sessions.config" }
+{ $subsection "furnace.sessions.serialize" } ;
 
 ABOUT: "furnace.sessions"

basis/furnace/summary.txt

@@ -0,0 +1 @@
+Furnace web framework

basis/furnace/syndication/syndication-docs.factor

@@ -1,69 +1,73 @@
-! Copyright (C) 2008 Your name.
+USING: help.markup help.syntax io.streams.string kernel sequences strings urls syndication calendar ;
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax io.streams.string kernel sequences strings urls ;
 IN: furnace.syndication
 
 HELP: <feed-action>
-{ $values
+{ $values { "action" feed-action } }
-    
+{ $description "Creates a new Atom feed action." } ;
-     { "action" null }
-}
-{ $description "" } ;
-
-HELP: <feed-content>
-{ $values
-     { "body" null }
-     { "response" null }
-}
-{ $description "" } ;
 
 HELP: >entry
 { $values
      { "object" object }
-     { "entry" null }
+     { "entry" entry }
 }
-{ $description "" } ;
+{ $contract "Converts an object into an Atom feed entry. The default implementation constructs an entry by calling "
+{ $link feed-entry-title } ", "
+{ $link feed-entry-description } ", "
+{ $link feed-entry-date } ", and "
+{ $link feed-entry-url } "." } ;
 
 HELP: feed-action
-{ $description "" } ;
+{ $class-description "The class of feed actions. Contains several slots, documented in " { $link "furnace.syndication.config" } "." } ;
 
 HELP: feed-entry-date
 { $values
      { "object" object }
-     { "timestamp" null }
+     { "timestamp" timestamp }
 }
-{ $description "" } ;
+{ $contract "Outputs a feed entry timestmap." } ;
 
 HELP: feed-entry-description
 { $values
      { "object" object }
      { "description" null }
 }
-{ $description "" } ;
+{ $contract "Outputs a feed entry description." } ;
 
 HELP: feed-entry-title
 { $values
      { "object" object }
      { "string" string }
 }
-{ $description "" } ;
+{ $contract "Outputs a feed entry title." } ;
 
 HELP: feed-entry-url
 { $values
      { "object" object }
      { "url" url }
 }
-{ $description "" } ;
+{ $contract "Outputs a feed entry URL." } ;
 
-HELP: process-entries
+ARTICLE: "furnace.syndication.config" "Configuring Atom feed actions"
-{ $values
+"Instances of " { $link feed-action } " have three slots which need to be set:"
-     { "seq" sequence }
+{ $table
-     { "seq'" sequence }
+    { { $slot "title" } "The title of the feed as a string" }
-}
+    { { $slot "url" } { "The feed " { $link url } } }
-{ $description "" } ;
+    { { $slot "entries" } { "A quotation with stack effect " { $snippet "( -- seq )" } ", which produces a sequence of objects responding to the " { $link "furnace.syndication.protocol" } " protocol" } }
+} ;
+
+ARTICLE: "furnace.syndication.protocol" "Atom feed entry protocol"
+"An Atom feed action takes a sequence of objects and converts them into Atom feed entries. The objects must implement a protocol consisting of either a single generic word:"
+{ $subsection >entry }
+"Or a series of generic words, called by the default implementation of " { $link >entry } ":"
+{ $subsection feed-entry-title }
+{ $subsection feed-entry-description }
+{ $subsection feed-entry-date }
+{ $subsection feed-entry-url } ;
 
 ARTICLE: "furnace.syndication" "Furnace Atom syndication support"
-{ $vocab-link "furnace.syndication" }
+"The " { $vocab-link "furnace.syndication" } " vocabulary builds on the " { $link "syndication" } " library by providing easy support for generating Atom feeds from " { $link "furnace.actions" } "."
-;
+{ $subsection <feed-action> }
+{ $subsection "furnace.syndication.config" }
+{ $subsection "furnace.syndication.protocol" } ;
 
 ABOUT: "furnace.syndication"

basis/help/help-docs.factor

@@ -1,6 +1,6 @@
 USING: help.markup help.crossref help.stylesheet help.topics
 help.syntax definitions io prettyprint summary arrays math
-sequences vocabs ;
+sequences vocabs strings ;
 IN: help
 
 ARTICLE: "printing-elements" "Printing markup elements"
@@ -33,6 +33,10 @@ ARTICLE: "block-elements" "Block elements"
 { $subsection $side-effects }
 { $subsection $errors }
 { $subsection $see-also }
+"Elements used in " { $link $values } " forms:"
+{ $subsection $instance }
+{ $subsection $maybe }
+{ $subsection $quotation }
 "Boilerplate paragraphs:"
 { $subsection $low-level-note }
 { $subsection $io-error }
@@ -281,7 +285,7 @@ HELP: $link
 } ;
 
 HELP: textual-list
-{ $values { "seq" "a sequence" } { "quot" "a quotation with stack effect " { $snippet "( elt -- )" } } }
+{ $values { "seq" "a sequence" } { "quot" { $quotation "( elt -- )" } } }
 { $description "Applies the quotation to each element of the sequence, printing a comma between each pair of elements." }
 { $examples
     { $example "USING: help.markup io ;" "{ \"fish\" \"chips\" \"salt\" } [ write ] textual-list" "fish, chips, salt" }
@@ -318,7 +322,37 @@ HELP: $table
 
 HELP: $values
 { $values { "element" "an array of pairs of markup elements" } }
-{ $description "Prints the description of arguments and values found on every word help page. The first element of a pair is the argument name and is output with " { $link $snippet } ". The remainder can be an element of any form." } ;
+{ $description "Prints the description of arguments and values found on every word help page. The first element of a pair is the argument name and is output with " { $link $snippet } ". The remainder is either a single class word, or an element. If it is a class word " { $snippet "class" } ", it is intereted as if it were shorthand for " { $snippet "{ $instance class }" } "." }
+{ $see-also $maybe $instance $quotation } ;
+
+HELP: $instance
+{ $values { "element" "an array with shape " { $snippet "{ class }" } } }
+{ $description
+    "Produces the text ``a " { $emphasis "class" } "'' or ``an " { $emphasis "class" } "'', depending on the first letter of " { $emphasis "class" } "."
+}
+{ $examples
+    { $markup-example { $instance string } }
+    { $markup-example { $instance integer } }
+    { $markup-example { $instance f } }
+} ;
+
+HELP: $maybe
+{ $values { "element" "an array with shape " { $snippet "{ class }" } } }
+{ $description
+    "Produces the text ``a " { $emphasis "class" } " or f'' or ``an " { $emphasis "class" } " or f'', depending on the first letter of " { $emphasis "class" } "."
+}
+{ $examples
+    { $markup-example { $maybe string } }
+} ;
+
+HELP: $quotation
+{ $values { "element" "an array with shape " { $snippet "{ effect }" } } }
+{ $description
+    "Produces the text ``a quotation with stack effect " { $emphasis "effect" } "''."
+}
+{ $examples
+    { $markup-example { $quotation "( obj -- )" } }
+} ;
 
 HELP: $list
 { $values { "element" "an array of markup elements" } }

basis/help/html/html.factor

@@ -5,23 +5,22 @@ io.files html.streams html.elements html.components help kernel
 assocs sequences make words accessors arrays help.topics vocabs
 tools.vocabs tools.vocabs.browser namespaces prettyprint io
 vocabs.loader serialize fry memoize unicode.case math.order
-sorting ;
+sorting debugger ;
 IN: help.html
 
 : escape-char ( ch -- )
     dup H{
-        { CHAR: " "__quote__" }
+        { CHAR: " "__quo__" }
         { CHAR: * "__star__" }
         { CHAR: : "__colon__" }
         { CHAR: < "__lt__" }
         { CHAR: > "__gt__" }
-        { CHAR: ? "__question__" }
+        { CHAR: ? "__que__" }
-        { CHAR: \\ "__backslash__" }
+        { CHAR: \\ "__back__" }
         { CHAR: | "__pipe__" }
-        { CHAR: _ "__underscore__" }
         { CHAR: / "__slash__" }
-        { CHAR: \\ "__backslash__" }
         { CHAR: , "__comma__" }
+        { CHAR: @ "__at__" }
     } at [ % ] [ , ] ?if ;
 
 : escape-filename ( string -- filename )
@@ -88,19 +87,17 @@ M: topic browser-link-href topic>filename ;
     all-vocabs-really [ dup vocab-name ] { } map>assoc "vocabs.idx" serialize-index ;
 
 : generate-help-files ( -- )
-    all-topics [ help>html ] each ;
+    all-topics [ '[ _ help>html ] try ] each ;
 
 : generate-help ( -- )
-    { "resource:core" "resource:basis" "resource:extra" } vocab-roots [
+    "docs" temp-file
-        load-everything
+    [ make-directories ]
-
+    [
-        "/tmp/docs/" make-directory
+        [
-
-        "/tmp/docs/" [
             generate-indices
             generate-help-files
         ] with-directory
-    ] with-variable ;
+    ] bi ;
 
 MEMO: load-index ( name -- index )
     binary file-contents bytes>object ;

basis/help/markup/markup.factor

@@ -3,7 +3,8 @@
 USING: accessors arrays definitions generic io kernel assocs
 hashtables namespaces make parser prettyprint sequences strings
 io.styles vectors words math sorting splitting classes slots
-vocabs help.stylesheet help.topics vocabs.loader alias ;
+vocabs help.stylesheet help.topics vocabs.loader alias
+quotations ;
 IN: help.markup
 
 ! Simple markup language.
@@ -234,7 +235,8 @@ ALIAS: $slot $snippet
     ] ($grid) ;
 
 : a/an ( str -- str )
-    first "aeiou" member? "an" "a" ? ;
+    [ first ] [ length ] bi 1 =
+    "afhilmnorsx" "aeiou" ? member? "an" "a" ? ;
 
 GENERIC: ($instance) ( element -- )
 
@@ -244,7 +246,17 @@ M: word ($instance)
 M: string ($instance)
     dup a/an write bl $snippet ;
 
-: $instance ( children -- ) first ($instance) ;
+M: f ($instance)
+    drop { f } $link ;
+
+: $instance ( element -- ) first ($instance) ;
+
+: $maybe ( element -- )
+    $instance " or " print-element { f } $instance ;
+
+: $quotation ( element -- )
+    { "a " { $link quotation } " with stack effect " } print-element
+    $snippet ;
 
 : values-row ( seq -- seq )
     unclip \ $snippet swap ?word-name 2array

basis/html/templates/chloe/chloe-docs.factor

@@ -14,7 +14,7 @@ HELP: required-attr
 { $errors "Throws an error if the attribute is not specified." } ;
 
 HELP: optional-attr
-{ $values { "tag" tag } { "name" string } { "value" "a " { $link string } " or " { $link f } } }
+{ $values { "tag" tag } { "name" string } { "value" { $maybe string } } }
 { $description "Extracts an attribute from a tag." }
 { $notes "Outputs " { $link f } " if the attribute is not specified." } ;
 
@@ -24,7 +24,7 @@ HELP: compile-attr
 
 HELP: CHLOE:
 { $syntax "name definition... ;" }
-{ $values { "name" "the tag name" } { "definition" "a quotation with stack effect " { $snippet "( tag -- )" } } }
+{ $values { "name" "the tag name" } { "definition" { $quotation "( tag -- )" } } }
 { $description "Defines compilation semantics for the Chloe tag named " { $snippet "tag" } ". The definition body receives a " { $link tag } " on the stack." } ;
 
 HELP: COMPONENT:
@@ -46,7 +46,7 @@ HELP: [code]
 { $description "Compiles the quotation. It will be called when the template is called." } ;
 
 HELP: process-children
-{ $values { "tag" tag } { "quot" "a quotation with stack effect " { $snippet "( compiled-tag -- )" } } }
+{ $values { "tag" tag } { "quot" { $quotation "( compiled-tag -- )" } } }
 { $description "Compiles the tag. The quotation will be applied to the resulting quotation when the template is called." }
 { $examples "See " { $link "html.templates.chloe.extend.tags.example" } " for an example which uses this word to implement a custom control flow tag." } ;
 

basis/html/templates/fhtml/fhtml-tests.factor

@@ -1,6 +1,6 @@
 USING: io io.files io.streams.string io.encodings.utf8
 html.templates html.templates.fhtml kernel
-tools.test sequences parser ;
+tools.test sequences parser splitting prettyprint ;
 IN: html.templates.fhtml.tests
 
 : test-template ( path -- ? )
@@ -8,8 +8,10 @@ IN: html.templates.fhtml.tests
     prepend
     [
         ".fhtml" append <fhtml> [ call-template ] with-string-writer
+        <string-reader> lines
     ] keep
-    ".html" append utf8 file-contents = ;
+    ".html" append utf8 file-lines
+    [ . . ] [ = ] 2bi ;
 
 [ t ] [ "example" test-template ] unit-test
 [ t ] [ "bug" test-template ] unit-test

basis/http/client/client-docs.factor

@@ -40,7 +40,7 @@ HELP: http-post
 { $errors "Throws an error if the HTTP request fails." } ;
 
 HELP: with-http-get
-{ $values { "url" "a " { $link url } " or " { $link string } } { "quot" "a quotation with stack effect " { $snippet "( chunk -- )" } } { "response" response } }
+{ $values { "url" "a " { $link url } " or " { $link string } } { "quot" { $quotation "( chunk -- )" } } { "response" response } }
 { $description "Downloads the contents of a URL. Chunks of data are passed to the quotation as they are read." }
 { $errors "Throws an error if the HTTP request fails." } ;
 
@@ -50,7 +50,7 @@ HELP: http-request
 { $errors "Throws an error if the HTTP request fails." } ;
 
 HELP: with-http-request
-{ $values { "request" request } { "quot" "a quotation with stack effect " { $snippet "( chunk -- )" } } { "response" response } }
+{ $values { "request" request } { "quot" { $quotation "( chunk -- )" } } { "response" response } }
 { $description "Sends an HTTP request to an HTTP server, and reads the response incrementally. Chunks of data are passed to the quotation as they are read." }
 { $errors "Throws an error if the HTTP request fails." } ;
 

basis/http/http-docs.factor

@@ -81,7 +81,7 @@ HELP: delete-cookie
 { $side-effects "request/response" } ;
 
 HELP: get-cookie
-{ $values { "request/response" "a " { $link request } " or a " { $link response } } { "name" string } { "cookie/f" "a " { $link cookie } " or " { $link f } } }
+{ $values { "request/response" "a " { $link request } " or a " { $link response } } { "name" string } { "cookie/f" { $maybe cookie } } }
 { $description "Gets a named cookie from a request or response." } ;
 
 HELP: put-cookie

basis/http/server/static/static-docs.factor

@@ -4,7 +4,7 @@ USING: help.markup help.syntax io.streams.string ;
 IN: http.server.static
 
 HELP: <file-responder>
-{ $values { "root" "a pathname string" } { "hook" "a quotation with stack effect " { $snippet "( path mime-type -- response )" } } { "responder" file-responder } }
+{ $values { "root" "a pathname string" } { "hook" { $quotation "( path mime-type -- response )" } } { "responder" file-responder } }
 { $description "Creates a file responder which serves content from " { $snippet "path" } " by using the hook to generate a response." } ;
 
 HELP: <static>

basis/io/files/listing/listing-tests.factor

@@ -3,4 +3,6 @@
 USING: tools.test io.files.listing strings kernel ;
 IN: io.files.listing.tests
 
+\ directory. must-infer
+
 [ ] [ "" directory. ] unit-test

basis/io/mmap/mmap-docs.factor

@@ -17,7 +17,7 @@ HELP: <mapped-file>
 { $errors "Throws an error if a memory mapping could not be established." } ;
 
 HELP: with-mapped-file
-{ $values { "path" "a pathname string" } { "length" integer } { "quot" "a quotation with stack effect " { $snippet "( mmap -- )" } } }
+{ $values { "path" "a pathname string" } { "length" integer } { "quot" { $quotation "( mmap -- )" } } }
 { $contract "Opens a file and maps its contents into memory, passing the " { $link mapped-file } " instance to the quotation. The mapped file is disposed of when the quotation returns, or if an error is thrown." }
 { $errors "Throws an error if a memory mapping could not be established." } ;
 

basis/io/monitors/monitors-docs.factor

@@ -23,7 +23,7 @@ HELP: next-change
 { $errors "Throws an error if the monitor is closed from another thread." } ;
 
 HELP: with-monitor
-{ $values { "path" "a pathname string" } { "recursive?" "a boolean" } { "quot" "a quotation with stack effect " { $snippet "( monitor -- )" } } }
+{ $values { "path" "a pathname string" } { "recursive?" "a boolean" } { "quot" { $quotation "( monitor -- )" } } }
 { $description "Opens a file system change monitor and passes it to the quotation. Closes the monitor after the quotation returns or throws an error." }
 { $errors "Throws an error if the pathname does not exist, if a monitor could not be created or if the platform does not support monitors." } ;
 

basis/io/pools/pools-docs.factor

@@ -22,7 +22,7 @@ HELP: return-connection
 { $description "Returns a connection to the pool." } ;
 
 HELP: with-pooled-connection
-{ $values { "pool" pool } { "quot" "a quotation with stack effect " { $snippet "( conn -- )" } } }
+{ $values { "pool" pool } { "quot" { $quotation "( conn -- )" } } }
 { $description "Calls a quotation with a pooled connection on the stack. If the quotation returns successfully, the connection is returned to the pool; if the quotation throws an error, the connection is disposed of with " { $link dispose } "." } ;
 
 HELP: make-connection

basis/io/servers/connection/connection-docs.factor

@@ -114,11 +114,11 @@ HELP: stop-this-server
 { $description "Stops the current threaded server, preventing it from accepting any more connections and returning to the caller of " { $link start-server } ". All client connections which have already been opened continue to be serviced." } ;
 
 HELP: secure-port
-{ $values { "n" "an " { $link integer } " or " { $link f } } }
+{ $values { "n" { $maybe integer } } }
 { $description "Outputs the port number on which the current threaded server accepts secure socket connections. Outputs " { $link f } " if the current threaded server does not accept secure socket connections." }
 { $notes "Can only be used from the dynamic scope of a " { $link handle-client* } " call." } ;
 
 HELP: insecure-port
-{ $values { "n" "an " { $link integer } " or " { $link f } } }
+{ $values { "n" { $maybe integer } } }
 { $description "Outputs the port number on which the current threaded server accepts ordinary socket connections. Outputs " { $link f } " if the current threaded server does not accept ordinary socket connections." }
 { $notes "Can only be used from the dynamic scope of a " { $link handle-client* } " call." } ;

basis/io/servers/connection/connection.factor

@@ -114,19 +114,29 @@ M: threaded-server handle-client* handler>> call ;
         ] when*
     ] unless ;
 
+: (start-server) ( threaded-server -- )
+    init-server
+    dup threaded-server [
+        dup name>> [
+            [ listen-on [ start-accept-loop ] parallel-each ]
+            [ ready>> raise-flag ]
+            bi
+        ] with-logging
+    ] with-variable ;
+
 PRIVATE>
 
 : start-server ( threaded-server -- )
-    init-server
+    #! Only create a secure-context if we want to listen on
-    dup secure-config>> [
+    #! a secure port, otherwise start-server won't work at
-        dup threaded-server [
+    #! all if SSL is not available.
-            dup name>> [
+    dup secure>> [
-                [ listen-on [ start-accept-loop ] parallel-each ]
+        dup secure-config>> [
-                [ ready>> raise-flag ]
+            (start-server)
-                bi
+        ] with-secure-context
-            ] with-logging
+    ] [
-        ] with-variable
+        (start-server)
-    ] with-secure-context ;
+    ] if ;
 
 : wait-for-server ( threaded-server -- )
     ready>> wait-for-flag ;

basis/io/sockets/sockets-docs.factor

@@ -56,7 +56,7 @@ ARTICLE: "network-streams" "Networking"
 { $subsection "network-addressing" }
 { $subsection "network-connection" }
 { $subsection "network-packet" }
-{ $subsection "io.sockets.secure" }
+{ $vocab-subsection "Secure sockets (SSL, TLS)" "io.sockets.secure" }
 { $see-also "io.pipes" } ;
 
 ABOUT: "network-streams"

basis/io/timeouts/timeouts-docs.factor

@@ -2,11 +2,11 @@ IN: io.timeouts
 USING: help.markup help.syntax math kernel calendar ;
 
 HELP: timeout
-{ $values { "obj" object } { "dt/f" "a " { $link duration } " or " { $link f } } }
+{ $values { "obj" object } { "dt/f" { $maybe duration } } }
 { $contract "Outputs an object's timeout." } ;
 
 HELP: set-timeout
-{ $values { "dt/f" "a " { $link duration } " or " { $link f } } { "obj" object } }
+{ $values { "dt/f" { $maybe duration } } { "obj" object } }
 { $contract "Sets an object's timeout." } ;
 
 HELP: cancel-operation
@@ -14,7 +14,7 @@ HELP: cancel-operation
 { $contract "Handles a timeout, usually by waking up all threads waiting on the object." } ;
 
 HELP: with-timeout
-{ $values { "obj" object } { "quot" "a quotation with stack effect " { $snippet "( obj -- )" } } }
+{ $values { "obj" object } { "quot" { $quotation "( obj -- )" } } }
 { $description "Applies the quotation to the object. If the object's timeout expires before the quotation returns, " { $link cancel-operation } " is called on the object." } ;
 
 ARTICLE: "io.timeouts" "I/O timeout protocol"

basis/io/windows/nt/launcher/launcher-tests.factor

@@ -1,157 +1,157 @@
-USING: io.launcher tools.test calendar accessors environment
+USING: io.launcher tools.test calendar accessors environment
-namespaces kernel system arrays io io.files io.encodings.ascii
+namespaces kernel system arrays io io.files io.encodings.ascii
-sequences parser assocs hashtables math continuations eval ;
+sequences parser assocs hashtables math continuations eval ;
-IN: io.windows.launcher.nt.tests
+IN: io.windows.launcher.nt.tests
-
+
-[ ] [
+[ ] [
-    <process>
+    <process>
-        "notepad" >>command
+        "notepad" >>command
-        1/2 seconds >>timeout
+        1/2 seconds >>timeout
-    "notepad" set
+    "notepad" set
-] unit-test
+] unit-test
-
+
-[ f ] [ "notepad" get process-running? ] unit-test
+[ f ] [ "notepad" get process-running? ] unit-test
-
+
-[ f ] [ "notepad" get process-started? ] unit-test
+[ f ] [ "notepad" get process-started? ] unit-test
-
+
-[ ] [ "notepad" [ run-detached ] change ] unit-test
+[ ] [ "notepad" [ run-detached ] change ] unit-test
-
+
-[ "notepad" get wait-for-process ] must-fail
+[ "notepad" get wait-for-process ] must-fail
-
+
-[ t ] [ "notepad" get killed>> ] unit-test
+[ t ] [ "notepad" get killed>> ] unit-test
-
+
-[ f ] [ "notepad" get process-running? ] unit-test
+[ f ] [ "notepad" get process-running? ] unit-test
-
+
-[ ] [
+[ ] [
-    <process>
+    <process>
-        vm "-quiet" "-run=hello-world" 3array >>command
+        vm "-quiet" "-run=hello-world" 3array >>command
-        "out.txt" temp-file >>stdout
+        "out.txt" temp-file >>stdout
-    try-process
+    try-process
-] unit-test
+] unit-test
-
+
-[ "Hello world" ] [
+[ "Hello world" ] [
-    "out.txt" temp-file ascii file-lines first
+    "out.txt" temp-file ascii file-lines first
-] unit-test
+] unit-test
-
+
-[ ] [
+[ ] [
-    <process>
+    <process>
-        vm "-run=listener" 2array >>command
+        vm "-run=listener" 2array >>command
-        +closed+ >>stdin
+        +closed+ >>stdin
-    try-process
+    try-process
-] unit-test
+] unit-test
-
+
-[ ] [
+[ ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
-        <process>
+        <process>
-            vm "-script" "stderr.factor" 3array >>command
+            vm "-script" "stderr.factor" 3array >>command
-            "out.txt" temp-file >>stdout
+            "out.txt" temp-file >>stdout
-            "err.txt" temp-file >>stderr
+            "err.txt" temp-file >>stderr
-        try-process
+        try-process
-    ] with-directory
+    ] with-directory
-] unit-test
+] unit-test
-
+
-[ "output" ] [
+[ "output" ] [
-    "out.txt" temp-file ascii file-lines first
+    "out.txt" temp-file ascii file-lines first
-] unit-test
+] unit-test
-
+
-[ "error" ] [
+[ "error" ] [
-    "err.txt" temp-file ascii file-lines first
+    "err.txt" temp-file ascii file-lines first
-] unit-test
+] unit-test
-
+
-[ ] [
+[ ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
-        <process>
+        <process>
-            vm "-script" "stderr.factor" 3array >>command
+            vm "-script" "stderr.factor" 3array >>command
-            "out.txt" temp-file >>stdout
+            "out.txt" temp-file >>stdout
-            +stdout+ >>stderr
+            +stdout+ >>stderr
-        try-process
+        try-process
-    ] with-directory
+    ] with-directory
-] unit-test
+] unit-test
-
+
-[ "outputerror" ] [
+[ "outputerror" ] [
-    "out.txt" temp-file ascii file-lines first
+    "out.txt" temp-file ascii file-lines first
-] unit-test
+] unit-test
-
+
-[ "output" ] [
+[ "output" ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
-        <process>
+        <process>
-            vm "-script" "stderr.factor" 3array >>command
+            vm "-script" "stderr.factor" 3array >>command
-            "err2.txt" temp-file >>stderr
+            "err2.txt" temp-file >>stderr
-        ascii <process-reader> lines first
+        ascii <process-reader> lines first
-    ] with-directory
+    ] with-directory
-] unit-test
+] unit-test
-
+
-[ "error" ] [
+[ "error" ] [
-    "err2.txt" temp-file ascii file-lines first
+    "err2.txt" temp-file ascii file-lines first
-] unit-test
+] unit-test
-
+
-[ t ] [
+[ t ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
-        <process>
+        <process>
-            vm "-script" "env.factor" 3array >>command
+            vm "-script" "env.factor" 3array >>command
-        ascii <process-reader> contents
+        ascii <process-reader> contents
-    ] with-directory eval
+    ] with-directory eval
-
+
-    os-envs =
+    os-envs =
-] unit-test
+] unit-test
-
+
-[ t ] [
+[ t ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
-        <process>
+        <process>
-            vm "-script" "env.factor" 3array >>command
+            vm "-script" "env.factor" 3array >>command
-            +replace-environment+ >>environment-mode
+            +replace-environment+ >>environment-mode
-            os-envs >>environment
+            os-envs >>environment
-        ascii <process-reader> contents
+        ascii <process-reader> contents
-    ] with-directory eval
+    ] with-directory eval
-    
+    
-    os-envs =
+    os-envs =
-] unit-test
+] unit-test
-
+
-[ "B" ] [
+[ "B" ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
-        <process>
+        <process>
-            vm "-script" "env.factor" 3array >>command
+            vm "-script" "env.factor" 3array >>command
-            { { "A" "B" } } >>environment
+            { { "A" "B" } } >>environment
-        ascii <process-reader> contents
+        ascii <process-reader> contents
-    ] with-directory eval
+    ] with-directory eval
-
+
-    "A" swap at
+    "A" swap at
-] unit-test
+] unit-test
-
+
-[ f ] [
+[ f ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    "resource:basis/io/windows/nt/launcher/test" [
-        <process>
+        <process>
-            vm "-script" "env.factor" 3array >>command
+            vm "-script" "env.factor" 3array >>command
-            { { "HOME" "XXX" } } >>environment
+            { { "USERPROFILE" "XXX" } } >>environment
-            +prepend-environment+ >>environment-mode
+            +prepend-environment+ >>environment-mode
-        ascii <process-reader> contents
+        ascii <process-reader> contents
-    ] with-directory eval
+    ] with-directory eval
-
+
-    "HOME" swap at "XXX" =
+    "USERPROFILE" swap at "XXX" =
-] unit-test
+] unit-test
-
+
-2 [
+2 [
-    [ ] [
+    [ ] [
-        <process>
+        <process>
-            "cmd.exe /c dir" >>command
+            "cmd.exe /c dir" >>command
-            "dir.txt" temp-file >>stdout
+            "dir.txt" temp-file >>stdout
-        try-process
+        try-process
-    ] unit-test
+    ] unit-test
-
+
-    [ ] [ "dir.txt" temp-file delete-file ] unit-test
+    [ ] [ "dir.txt" temp-file delete-file ] unit-test
-] times
+] times
-
+
-[ "append-test" temp-file delete-file ] ignore-errors
+[ "append-test" temp-file delete-file ] ignore-errors
-
+
-[ "Hello appender\r\nHello appender\r\n" ] [
+[ "Hello appender\r\nHello appender\r\n" ] [
-    2 [
+    2 [
-        "resource:basis/io/windows/nt/launcher/test" [
+        "resource:basis/io/windows/nt/launcher/test" [
-            <process>
+            <process>
-                vm "-script" "append.factor" 3array >>command
+                vm "-script" "append.factor" 3array >>command
-                "append-test" temp-file <appender> >>stdout
+                "append-test" temp-file <appender> >>stdout
-            try-process
+            try-process
-        ] with-directory
+        ] with-directory
-    ] times
+    ] times
-   
+   
-    "append-test" temp-file ascii file-contents
+    "append-test" temp-file ascii file-contents
-] unit-test
+] unit-test

basis/io/windows/tags.txt

@@ -1,2 +1 @@
 unportable
-windows

basis/json/authors.txt

@@ -1 +1,2 @@
 Chris Double
+Peter Burns

basis/json/json-docs.factor

@@ -0,0 +1,8 @@
+IN: json
+USING: help.markup help.syntax ;
+
+ARTICLE: "json" "JSON serialization"
+{ $subsection "json.reader" }
+{ $subsection "json.writer" } ;
+
+ABOUT: "json"

basis/json/json.factor

@@ -0,0 +1,7 @@
+IN: json
+USE: vocabs.loader
+
+SINGLETON: json-null
+
+"json.reader" require
+"json.writer" require

basis/json/reader/reader-docs.factor

@@ -3,6 +3,12 @@
 USING: help.markup help.syntax ;
 IN: json.reader
 
-HELP: json> "( string -- object )"
+HELP: json>
-{ $values { "string" "a string in JSON format" } { "object" "yhe object deserialized from the JSON string" } }
+{ $values { "string" "a string in JSON format" } { "object" "a deserialized object" } }
 { $description "Deserializes the JSON formatted string into a Factor object. JSON objects are converted to Factor hashtables. All other JSON objects convert to their obvious Factor equivalents." } ;
+
+ARTICLE: "json.reader" "JSON reader"
+"The " { $vocab-link "json.reader" } " vocabulary defines a word for parsing strings in JSON format."
+{ $subsection json> } ;
+
+ABOUT: "json.reader"

basis/json/reader/reader-tests.factor

@@ -1,4 +1,5 @@
-USING: arrays json.reader kernel multiline strings tools.test ;
+USING: arrays json.reader kernel multiline strings tools.test
+hashtables json ;
 IN: json.reader.tests
 
 { f } [ "false" json> ] unit-test
@@ -8,21 +9,35 @@ IN: json.reader.tests
 { 102 } [ "102" json> ] unit-test
 { -102 } [ "-102" json> ] unit-test
 { 102 } [ "+102" json> ] unit-test
+{ 1000.0 } [ "1.0e3" json> ] unit-test
+{ 1000.0 } [ "10e2" json> ] unit-test
 { 102.0 } [ "102.0" json> ] unit-test
 { 102.5 } [ "102.5" json> ] unit-test
 { 102.5 } [ "102.50" json> ] unit-test
 { -10250.0 } [ "-102.5e2" json> ] unit-test
 { -10250.0 } [ "-102.5E+2" json> ] unit-test
-{ 10+1/4 } [ "1025e-2" json> ] unit-test
+{ 10.25 } [ "1025e-2" json> ] unit-test
 { 0.125 } [ "0.125" json> ] unit-test
 { -0.125 } [ "-0.125" json> ] unit-test
 
+! not widely supported by javascript, but allowed in the grammar, and a nice
+! feature to get
+{ -0.0 } [ "-0.0" json> ] unit-test
+
 { " fuzzy  pickles " } [ <" " fuzzy  pickles " "> json> ] unit-test
 { "while 1:\n\tpass" } [ <" "while 1:\n\tpass" "> json> ] unit-test
+! unicode is allowed in json
+{ "ß∂¬ƒ˚∆" } [ <" "ß∂¬ƒ˚∆""> json> ] unit-test
 { 8 9 10 12 13 34 47 92 } >string 1array [ <" "\b\t\n\f\r\"\/\\" "> json> ] unit-test
 { HEX: abcd } >string 1array [ <" "\uaBCd" "> json> ] unit-test
 
+{ { } } [ "[]" json> ] unit-test 
 { { 1 "two" 3.0 } } [ <" [1, "two", 3.0] "> json> ] unit-test
+{ H{ } } [ "{}" json> ] unit-test
+
+! the returned hashtable should be different every time
+{ H{ } } [ "key" "value" "{}" json> ?set-at "{}" json> nip ] unit-test
+
 { H{ { "US$" 1.0 } { "EU€" 1.5 } } } [ <" { "US$":1.00, "EU\u20AC":1.50 } "> json> ] unit-test
 { H{
     { "fib" { 1 1 2 3 5 8 H{ { "etc" "etc" } } } }
@@ -40,4 +55,3 @@ IN: json.reader.tests
 { 0 } [ "      0" json> ] unit-test
 { 0 } [ "0      " json> ] unit-test
 { 0 } [ "   0   " json> ] unit-test
-

basis/json/reader/reader.factor

@@ -1,180 +1,61 @@
-! Copyright (C) 2006 Chris Double.
+! Copyright (C) 2008 Peter Burns.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel parser-combinators namespaces make sequences promises strings 
+USING: kernel peg peg.ebnf math.parser math.private strings math
-       assocs math math.parser math.vectors math.functions math.order
+math.functions sequences arrays vectors hashtables assocs
-       lists hashtables ascii accessors ;
+prettyprint json ;
 IN: json.reader
 
+<PRIVATE
+
+: grammar-list>vector ( seq -- vec ) first2 values swap prefix ;
+
 ! Grammar for JSON from RFC 4627
+EBNF: (json>)
 
-SYMBOL: json-null
+ws = (" " | "\r" | "\t" | "\n")*
 
-: [<&>] ( quot -- quot )
+true = "true" => [[ t ]]
-  { } make unclip [ <&> ] reduce ;
+false = "false" => [[ f ]]
+null = "null" => [[ json-null ]]
 
-: [<|>] ( quot -- quot )
+hex = [0-9a-fA-F]
-  { } make unclip [ <|> ] reduce ;
+char = '\\"'  [[ CHAR: "  ]]
+     | "\\\\" [[ CHAR: \  ]]
+     | "\\/"  [[ CHAR: /  ]]
+     | "\\b"  [[ 8        ]]
+     | "\\f"  [[ 12       ]]
+     | "\\n"  [[ CHAR: \n ]]
+     | "\\r"  [[ CHAR: \r ]]
+     | "\\t"  [[ CHAR: \t ]]
+     | "\\u" (hex hex hex hex) [[ hex> ]] => [[ second ]]
+     | [^"\]
+string = '"' char*:cs '"' => [[ cs >string ]]
 
-LAZY: 'ws' ( -- parser )
+sign = ("-" | "+")? => [[ "-" = "-" "" ? ]]
-  " " token 
+digits = [0-9]+     => [[ >string ]]
-  "\n" token <|>
+decimal = "." digits  => [[ concat ]]
-  "\r" token <|>
+exp = ("e" | "E") sign digits => [[ concat ]]
-  "\t" token <|> <*> ;
+number = sign digits decimal? exp? => [[ dup concat swap fourth [ string>float ] [ string>number ] if ]]
 
-LAZY: spaced ( parser -- parser )
+elements = value ("," value)* => [[ grammar-list>vector ]]
-  'ws' swap &> 'ws' <& ;
+array = "[" elements?:arr "]" => [[ arr >array ]]
 
-LAZY: 'begin-array' ( -- parser )
+pair = ws string:key ws ":" value:val => [[ { key val } ]]
-  "[" token spaced ;
+members = pair ("," pair)* => [[ grammar-list>vector ]]
+object = "{" members?:hash "}" => [[ hash >hashtable ]]
 
-LAZY: 'begin-object' ( -- parser )
+val = true
-  "{" token spaced ;
+    | false
+    | null
+    | string
+    | number
+    | array
+    | object
 
-LAZY: 'end-array' ( -- parser )
+value = ws val:v ws => [[ v ]]
-  "]" token spaced ;
 
-LAZY: 'end-object' ( -- parser )
+;EBNF
-  "}" token spaced ;
 
-LAZY: 'name-separator' ( -- parser )
+PRIVATE>
-  ":" token spaced ;
 
-LAZY: 'value-separator' ( -- parser )
+: json> ( string -- object ) (json>) ;
-  "," token spaced ;
-
-LAZY: 'false' ( -- parser )
-  "false" token [ drop f ] <@ ;
-
-LAZY: 'null' ( -- parser )
-  "null" token [ drop json-null ] <@ ;
-
-LAZY: 'true' ( -- parser )
-  "true" token [ drop t ] <@ ;
-
-LAZY: 'quot' ( -- parser )
-  "\"" token ;
-
-LAZY: 'hex-digit' ( -- parser )
-  [ digit> ] satisfy [ digit> ] <@ ;
-
-: hex-digits>ch ( digits -- ch )
-    0 [ swap 16 * + ] reduce ;
-
-LAZY: 'string-char' ( -- parser )
-  [ quotable? ] satisfy
-  "\\b" token [ drop 8 ] <@ <|>
-  "\\t" token [ drop CHAR: \t ] <@ <|>
-  "\\n" token [ drop CHAR: \n ] <@ <|>
-  "\\f" token [ drop 12 ] <@ <|>
-  "\\r" token [ drop CHAR: \r ] <@ <|>
-  "\\\"" token [ drop CHAR: " ] <@ <|>
-  "\\/" token [ drop CHAR: / ] <@ <|>
-  "\\\\" token [ drop CHAR: \\ ] <@ <|>
-  "\\u" token 'hex-digit' 4 exactly-n &>
-  [ hex-digits>ch ] <@ <|> ;
-
-LAZY: 'string' ( -- parser )
-  'quot' 
-  'string-char' <*> &> 
-  'quot' <& [ >string ] <@  ;
-
-DEFER: 'value'
-
-LAZY: 'member' ( -- parser )
-  'string'
-  'name-separator' <&  
-  'value' <&> ;
-
-USE: prettyprint 
-LAZY: 'object' ( -- parser )
-  'begin-object' 
-  'member' 'value-separator' list-of &>
-  'end-object' <& [ >hashtable ] <@ ;
-
-LAZY: 'array' ( -- parser )
-  'begin-array' 
-  'value' 'value-separator' list-of &>
-  'end-array' <&  ;
-  
-LAZY: 'minus' ( -- parser )
-  "-" token ;
-
-LAZY: 'plus' ( -- parser )
-  "+" token ;
-
-LAZY: 'sign' ( -- parser )
-  'minus' 'plus' <|> ;
-
-LAZY: 'zero' ( -- parser )
-  "0" token [ drop 0 ] <@ ;
-
-LAZY: 'decimal-point' ( -- parser )
-  "." token ;
-
-LAZY: 'digit1-9' ( -- parser )
-  [ 
-    dup integer? [ 
-      CHAR: 1 CHAR: 9 between? 
-    ] [ 
-      drop f 
-    ] if 
-  ] satisfy [ digit> ] <@ ;
-
-LAZY: 'digit0-9' ( -- parser )
-  [ digit? ] satisfy [ digit> ] <@ ;
-
-: decimal>integer ( seq -- num ) 10 digits>integer ;
-
-LAZY: 'int' ( -- parser )
-  'zero' 
-  'digit1-9' 'digit0-9' <*> <&:> [ decimal>integer ] <@ <|>  ;
-
-LAZY: 'e' ( -- parser )
-  "e" token "E" token <|> ;
-
-: sign-number ( pair -- number )
-  #! Pair is { minus? num }
-  #! Convert the json number value to a factor number
-  dup second swap first [ first "-" = [ -1 * ] when ] when* ;
-
-LAZY: 'exp' ( -- parser )
-    'e' 
-    'sign' <?> &>
-    'digit0-9' <+> [ decimal>integer ] <@ <&> [ sign-number ] <@ ;
-
-: sequence>frac ( seq -- num ) 
-  #! { 1 2 3 } => 0.123
-  reverse 0 [ swap 10 / + ] reduce 10 / >float ;
-
-LAZY: 'frac' ( -- parser )
-  'decimal-point' 'digit0-9' <+> &> [ sequence>frac ] <@ ;
-
-: raise-to-power ( pair -- num )
-  #! Pair is { num exp }.
-  #! Multiply 'num' by 10^exp
-  dup second dup [ 10 swap first ^ swap first * ] [ drop first ] if ;
-
-LAZY: 'number' ( -- parser )
-  'sign' <?>
-  [ 'int' , 'frac' 0 succeed <|> , ] [<&>] [ sum ] <@ 
-  'exp' <?> <&> [ raise-to-power ] <@ <&> [ sign-number ] <@ ;
-
-LAZY: 'value' ( -- parser )
-  [
-    'false' ,
-    'null' ,
-    'true' ,
-    'string' ,
-    'object' ,
-    'array' ,
-    'number' ,
-  ] [<|>] spaced ;
-ERROR: could-not-parse-json ;
-
-: json> ( string -- object )
-  #! Parse a json formatted string to a factor object
-  'value' parse dup nil? [ 
-      could-not-parse-json
-  ] [ 
-    car parsed>> 
-  ] if ;

basis/json/writer/writer-docs.factor

@@ -3,13 +3,19 @@
 USING: help.markup help.syntax ;
 IN: json.writer
 
-HELP: >json "( obj -- string )"
+HELP: >json
 { $values { "obj" "an object" } { "string" "the object converted to JSON format" } }
 { $description "Serializes the object into a JSON formatted string." } 
 { $see-also json-print } ;
 
-HELP: json-print "( obj -- )"
+HELP: json-print
 { $values { "obj" "an object" } }
 { $description "Serializes the object into a JSON formatted string and outputs it to the standard output stream." } 
 { $see-also >json } ;
 
+ARTICLE: "json.writer" "JSON writer"
+"The " { $vocab-link "json.writer" } " vocabulary defines words for converting objects to JSON format."
+{ $subsection >json }
+{ $subsection json-print } ;
+
+ABOUT: "json.writer"

basis/json/writer/writer-tests.factor

@@ -0,0 +1,20 @@
+USING: json.writer tools.test multiline json.reader json ;
+IN: json.writer.tests
+
+{ "false" } [ f >json ] unit-test
+{ "true" } [ t >json ] unit-test
+{ "null" } [ json-null >json ] unit-test
+{ "0" } [ 0 >json ] unit-test
+{ "102" } [ 102 >json ] unit-test
+{ "-102" } [ -102 >json ] unit-test
+{ "102.0" } [ 102.0 >json ] unit-test
+{ "102.5" } [ 102.5 >json ] unit-test
+
+{ "[1,\"two\",3.0]" } [ { 1 "two" 3.0 } >json ] unit-test
+{ <" {"US$":1.0,"EU€":1.5}"> } [ H{ { "US$" 1.0 } { "EU€" 1.5 } } >json ] unit-test
+
+! Random symbols are written simply as strings
+SYMBOL: testSymbol
+{ <" "testSymbol""> } [ testSymbol >json ] unit-test
+
+[ { 0.5 } ] [ { 1/2 } >json json> ] unit-test

basis/json/writer/writer.factor

@@ -1,44 +1,52 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel io.streams.string io strings splitting sequences
+USING: accessors kernel io.streams.string io strings splitting
-math math.parser assocs classes words namespaces make
+sequences math math.parser assocs classes words namespaces make
-prettyprint hashtables mirrors tr ;
+prettyprint hashtables mirrors tr json ;
 IN: json.writer
 
 #! Writes the object out to a stream in JSON format
 GENERIC: json-print ( obj -- )
 
 : >json ( obj -- string )
-  #! Returns a string representing the factor object in JSON format
+    #! Returns a string representing the factor object in JSON format
-  [ json-print ] with-string-writer ;
+    [ json-print ] with-string-writer ;
 
 M: f json-print ( f -- )
-  drop "false" write ;
+    drop "false" write ;
+
+M: t json-print ( t -- )
+    drop "true" write ;
+
+M: json-null json-print ( null -- )
+    drop "null" write ;
 
 M: string json-print ( obj -- )
-  CHAR: " write1 "\"" split "\\\"" join CHAR: \r swap remove "\n" split "\\r\\n" join write CHAR: " write1 ;
+    CHAR: " write1 "\"" split "\\\"" join CHAR: \r swap remove "\n" split "\\r\\n" join write CHAR: " write1 ;
 
-M: number json-print ( num -- )  
+M: integer json-print ( num -- )
-  number>string write ;
+    number>string write ;
+
+M: real json-print ( num -- )
+    >float number>string write ;
 
 M: sequence json-print ( array -- ) 
-  CHAR: [ write1 [ >json ] map "," join write CHAR: ] write1 ;
+    CHAR: [ write1 [ >json ] map "," join write CHAR: ] write1 ;
 
 TR: jsvar-encode "-" "_" ;
   
 : tuple>fields ( object -- seq )
-  <mirror> [
+    <mirror> [
-    [ swap jsvar-encode >json % " : " % >json % ] "" make
+        [ swap jsvar-encode >json % " : " % >json % ] "" make
-  ] { } assoc>map ;
+    ] { } assoc>map ;
 
 M: tuple json-print ( tuple -- )
-  CHAR: { write1 tuple>fields "," join write CHAR: } write1 ;
+    CHAR: { write1 tuple>fields "," join write CHAR: } write1 ;
 
 M: hashtable json-print ( hashtable -- )
-  CHAR: { write1 
+    CHAR: { write1 
-  [ [ swap jsvar-encode >json % CHAR: : , >json % ] "" make ]
+    [ [ swap jsvar-encode >json % CHAR: : , >json % ] "" make ]
-  { } assoc>map "," join write 
+    { } assoc>map "," join write 
-  CHAR: } write1 ;
+    CHAR: } write1 ;
 
-M: object json-print ( object -- )
+M: word json-print name>> json-print ;
-    unparse json-print ;

basis/libc/libc-docs.factor

@@ -33,7 +33,7 @@ HELP: free
 { $description "Deallocates a block of memory allocated by " { $link malloc } ", " { $link calloc } " or " { $link realloc } "." } ;
 
 HELP: with-malloc
-{ $values { "size" "a positive integer" } { "quot" "a quotation with stack effect " { $snippet "( c-ptr -- )" } } }
+{ $values { "size" "a positive integer" } { "quot" { $quotation "( c-ptr -- )" } } }
 { $description "Allocates a zeroed block of " { $snippet "n" } " bytes and passes it to the quotation. When the quotation returns, the block is freed." } ;
 
 HELP: &free

basis/locals/locals-tests.factor

@@ -355,6 +355,10 @@ M:: sequence method-with-locals ( a -- y ) a reverse ;
     swapd [ eq? ] [ eq? ] 2bi*
 ] unit-test
 
+:: mutable-local-in-literal-test ( a! -- b ) a 1 + a! { a } ;
+
+[ { 4 } ] [ 3 mutable-local-in-literal-test ] unit-test
+
 :: compare-case ( obj1 obj2 lt-quot eq-quot gt-quot -- )
     obj1 obj2 <=> {
         { +lt+ [ lt-quot call ] }

basis/locals/locals.factor

@@ -229,6 +229,8 @@ M: tuple rewrite-element
 
 M: local rewrite-element , ;
 
+M: local-reader rewrite-element , ;
+
 M: word rewrite-element literalize , ;
 
 M: object rewrite-element , ;

basis/math/bitwise/bitwise.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel math math.functions sequences
 sequences.private words namespaces macros hints
-combinators fry ;
+combinators fry io.binary ;
 IN: math.bitwise
 
 ! utilities
@@ -93,3 +93,11 @@ PRIVATE>
 
 : bit-count ( x -- n )
     dup 0 < [ bitnot ] when (bit-count) ; inline
+
+! Signed byte array to integer conversion
+: signed-le> ( bytes -- x )
+    [ le> ] [ length 8 * 1- on-bits ] bi
+    2dup > [ bitnot bitor ] [ drop ] if ;
+
+: signed-be> ( bytes -- x )
+    <reversed> signed-le> ;

basis/math/functions/functions-docs.factor

@@ -279,7 +279,7 @@ HELP: mod-inv
 } ;
 
 HELP: each-bit
-{ $values { "n" integer } { "quot" "a quotation with stack effect " { $snippet "( ? -- )" } } }
+{ $values { "n" integer } { "quot" { $quotation "( ? -- )" } } }
 { $description "Applies the quotation to each bit of the integer, starting from the least significant bit, and stopping at the last bit from which point on all bits are either clear (if the integer is positive) or all bits are set (if the integer is negataive)." }
 { $examples
     { $example "USING: math.functions make prettyprint ;" "[ BIN: 1101 [ , ] each-bit ] { } make ." "{ t f t t }" }