Fixing some things I broke

diff --git a/basis/checksums/openssl/openssl-docs.factor b/basis/checksums/openssl/openssl-docs.factor
index 750e05f3c89bea6b2d61366189bb119f3044fcb5..234e032406cb5eae5fd45834e77f5579b6edc509 100644 (file)
--- a/basis/checksums/openssl/openssl-docs.factor
+++ b/basis/checksums/openssl/openssl-docs.factor
@@ -1,5 +1,5 @@
 IN: checksums.openssl
-USING: help.syntax help.markup ;
+USING: checksums help.syntax help.markup ;
 
 HELP: openssl-checksum
 { $class-description "The class of checksum algorithms implemented by OpenSSL. The exact set of algorithms supported depends on how the OpenSSL library was compiled; " { $snippet "md5" } " and " { $snippet "sha1" } " should be universally available." } ;
@@ -9,9 +9,11 @@ HELP: <openssl-checksum>
 { $description "Creates a new OpenSSL checksum object." } ;
 
 HELP: openssl-md5
+{ $values { "value" checksum } }
 { $description "The OpenSSL MD5 message digest implementation." } ;
 
 HELP: openssl-sha1
+{ $values { "value" checksum } }
 { $description "The OpenSSL SHA1 message digest implementation." } ;
 
 HELP: unknown-digest

diff --git a/basis/memoize/memoize-tests.factor b/basis/memoize/memoize-tests.factor
index 03549d9b80601f72311eeb78aec1a7160d59481f..168a0061e320ea9bd251c328814a1f00dfc349cc 100644 (file)
--- a/basis/memoize/memoize-tests.factor
+++ b/basis/memoize/memoize-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: math kernel memoize tools.test parser generalizations
-prettyprint io.streams.string sequences eval ;
+prettyprint io.streams.string sequences eval namespaces ;
 IN: memoize.tests
 
 MEMO: fib ( m -- n )

diff --git a/basis/tools/profiler/profiler-tests.factor b/basis/tools/profiler/profiler-tests.factor
index 5bf62ef1566e3731c7003ea1f7b4786b8867acca..3924cc7b8351c7e0e9adffdf9037e01416914f7d 100644 (file)
--- a/basis/tools/profiler/profiler-tests.factor
+++ b/basis/tools/profiler/profiler-tests.factor
@@ -1,6 +1,6 @@
 IN: tools.profiler.tests
 USING: accessors tools.profiler tools.test kernel memory math
-threads alien tools.profiler.private sequences compiler
+threads alien tools.profiler.private sequences compiler compiler.units
 words ;
 
 [ t ] [

diff --git a/basis/ui/gadgets/frames/frames-docs.factor b/basis/ui/gadgets/frames/frames-docs.factor
index 36c7feed9701c1166f10d2f2c19ce2b89ea87d2a..9b7bafd91411a775b9026ba4a05d8de71efbfa5e 100644 (file)
--- a/basis/ui/gadgets/frames/frames-docs.factor
+++ b/basis/ui/gadgets/frames/frames-docs.factor
@@ -1,4 +1,4 @@
-USING: help.syntax help.markup ui.gadgets kernel arrays
+USING: help.syntax help.markup ui.gadgets kernel arrays math help sequences
 quotations classes.tuple ui.gadgets.grids ;
 IN: ui.gadgets.frames
 
@@ -22,15 +22,15 @@ ARTICLE: "ui-frame-layout" "Frame layouts"
     drop
     { $description "Symbolic constant for a common input to " { $link grid-add } "." } print-element ;
 
-HELP: @center $ui-frame-constant ;
-HELP: @left $ui-frame-constant ;
-HELP: @right $ui-frame-constant ;
-HELP: @top $ui-frame-constant ;
-HELP: @bottom $ui-frame-constant ;
-HELP: @top-left $ui-frame-constant ;
-HELP: @top-right $ui-frame-constant ;
-HELP: @bottom-left $ui-frame-constant ;
-HELP: @bottom-right $ui-frame-constant ;
+{ @center @left @right @top @bottom @top-left @top-right @bottom-left @bottom-right }
+[
+    [
+        {
+            { $values { "i" integer } { "j" integer } }
+            { $ui-frame-constant }
+        }
+    ] dip set-word-help
+] each
 
 HELP: frame
 { $class-description "A frame is a gadget which lays out its children in a 3x3 grid. If the frame is enlarged past its preferred size, the center gadget fills up available room."

diff --git a/basis/ui/x11/x11.factor b/basis/ui/x11/x11.factor
index d0d7eeb2346dd2811c53cf83e7bb45a310c73a0b..2a622a698523ef03fe1e342f8f57d149cd46a4d5 100755 (executable)
--- a/basis/ui/x11/x11.factor
+++ b/basis/ui/x11/x11.factor
@@ -5,7 +5,7 @@ ui.gestures ui.backend ui.clipboards ui.gadgets.worlds ui.render
 ui.event-loop assocs kernel math namespaces opengl sequences
 strings x11.xlib x11.events x11.xim x11.glx x11.clipboard
 x11.constants x11.windows io.encodings.string io.encodings.ascii
-io.encodings.utf8 combinators command-line
+io.encodings.utf8 combinators combinators.short-circuit command-line
 math.vectors classes.tuple opengl.gl threads math.geometry.rect
 environment ascii ;
 IN: ui.x11
@@ -73,9 +73,9 @@ CONSTANT: key-codes
 : valid-input? ( string gesture -- ? )
     over empty? [ 2drop f ] [
         mods>> { f { S+ } } member? [
-            [ [ 127 = not ] [ CHAR: \s >= ] bi and ] all?
+            [ { [ 127 = not ] [ CHAR: \s >= ] } 1&& ] all?
         ] [
-            [ [ 127 = not ] [ CHAR: \s >= ] [ alpha? not ] tri and and ] all?
+            [ { [ 127 = not ] [ CHAR: \s >= ] [ alpha? not ] } 1&& ] all?
         ] if
     ] if ;
 

diff --git a/basis/xml/entities/entities-docs.factor b/basis/xml/entities/entities-docs.factor
index 2fccb500a4590b055bf7e645f412fba2ea3d533a..158b83d9a85e802cfc6712143aed099cb0363fcb 100644 (file)
--- a/basis/xml/entities/entities-docs.factor
+++ b/basis/xml/entities/entities-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax ;
+USING: help.markup help.syntax assocs ;
 IN: xml.entities
 
 ABOUT: "xml.entities"
@@ -12,6 +12,7 @@ ARTICLE: "xml.entities" "XML entities"
 "For entities used in HTML/XHTML, see " { $vocab-link "xml.entities.html" } ;
 
 HELP: entities
+{ $values { "value" assoc } }
 { $description "A hash table from default XML entity names (like " { $snippet "&" } " and " { $snippet "<" } ") to the characters they represent. This is automatically included when parsing any XML document." }
 { $see-also with-entities } ;
 

diff --git a/core/kernel/kernel-docs.factor b/core/kernel/kernel-docs.factor
index b8191004dbbff2139a4ff29878af00f74d2ede1b..342376fb22a424c1e4959aeaa95a5724e4ad240e 100644 (file)
--- a/core/kernel/kernel-docs.factor
+++ b/core/kernel/kernel-docs.factor
@@ -57,6 +57,7 @@ HELP: clear
 { $description "Clears the data stack." } ;
 
 HELP: build
+{ $values { "n" integer } }
 { $description "The current build number. Factor increments this number whenever a new boot image is created." } ;
 
 HELP: hashcode*

diff --git a/extra/game-input/dinput/dinput.factor b/extra/game-input/dinput/dinput.factor
index 328e4ff01388f89915372f8b1abd37439673fd77..d13fca28cba040cd61880bce0af7e564ff70048a 100755 (executable)
--- a/extra/game-input/dinput/dinput.factor
+++ b/extra/game-input/dinput/dinput.factor
@@ -235,11 +235,11 @@ M: dinput-game-input-backend instance-id
         succeeded-quot call
     ] failed-quot if ; inline
 
-: pov-values
+CONSTANT: pov-values
     {
         pov-up pov-up-right pov-right pov-down-right
         pov-down pov-down-left pov-left pov-up-left
-    } ; inline
+    }
 
 : >axis ( long -- float )
     32767 - 32767.0 /f ;