Assorted bug fixes

TODO.FACTOR.txt

@@ -1,5 +1,14 @@
 + 0.84:
 
+- support function keys
+- write "foo| " and put caret at | then select word element: selects
+  space
+- workspace:
+  - maybe open-window should take a world
+  - book: request focus on selected gadget
+  - each workspace page has a toolbar
+  - selecting walker when no quotation is being walked throws an error
+  - replacement for call-tool functionality
 - new browser:
   - show currently selected vocab & words
   - scroll to existing won't work

library/bootstrap/image.facts

@@ -3,4 +3,6 @@ USING: help io ;
 
 HELP: make-image
 { $values { "architecture" "a string" } }
-{ $description "Creates a bootstrap image from sources, where " { $snippet "architecture" } " is one of " { $snippet "x86" } ", " { $snippet "ppc" } " or " { $snippet "amd64" } ". The new image file is written to the current working directory (see " { $link cwd } ") and is named " { $snippet "boot.image." { $emphasis "architecture" } } "." } ;
+{ $description "Creates a bootstrap image from sources, where " { $snippet "architecture" } " is one of the following:"
+{ $code "amd64" "pentium4" "ppc" "x86" }
+"The new image file is written to the " { $link resource-path } " and is named " { $snippet "boot.image." { $emphasis "architecture" } } "." } ;

library/syntax/early-parser.factor

@@ -32,7 +32,9 @@ TUPLE: check-vocab name ;
 : parsing? ( obj -- ? )
     dup word? [ "parsing" word-prop ] [ drop f ] if ;
 
-: location ( -- loc ) file get line-number get 2array ;
+: location ( -- loc )
+    file get line-number get 2dup and
+    [ 2array ] [ 2drop f ] if ;
 
 : save-location ( word -- )
     dup set-word location "loc" set-word-prop ;

library/test/words.factor

@@ -1,6 +1,6 @@
 IN: temporary
 USING: arrays errors generic hashtables kernel math namespaces
-sequences test words ;
+sequences test words definitions parser ;
 
 [ 4 ] [
     "poo" "scratchpad" create [ 2 2 + ] define-compound
@@ -112,7 +112,11 @@ M: array freakish ;
 DEFER: x
 [ t ] [ [ x ] catch third \ x eq? ] unit-test
 
-! This has to be the last test in the file.
-: test-last ( -- ) ;
+[ ] [ "no-loc" "temporary" create drop ] unit-test
+[ f ] [ "no-loc" "temporary" lookup where ] unit-test
 
+[ ] [ "IN: temporary : no-loc-2 ;" eval ] unit-test
+[ f ] [ "no-loc-2" "temporary" lookup where ] unit-test
+
+[ ] [ "IN: temporary : test-last ( -- ) ;" eval ] unit-test
 [ "test-last" ] [ word word-name ] unit-test

library/tools/definitions.factor

@@ -8,7 +8,7 @@ namespaces parser prettyprint sequences styles words ;
     "resource:/" ?head [ resource-path ] when ;
 
 : where ( defspec -- loc )
-    where* first2 >r ?resource-path r> 2array ;
+    where* dup [ first2 >r ?resource-path r> 2array ] when ;
 
 : reload ( defspec -- )
     where first [ run-file ] when* ;

library/ui/tools/workspace.factor

@@ -3,7 +3,8 @@
 IN: gadgets-workspace
 USING: arrays gadgets gadgets-listener gadgets-buttons
 gadgets-walker gadgets-help gadgets-walker sequences
-gadgets-books gadgets-frames kernel models namespaces ;
+gadgets-browser gadgets-books gadgets-frames kernel models
+namespaces ;
 
 TUPLE: workspace model ;
 

library/ui/ui.factor

@@ -154,7 +154,7 @@ C: titled-gadget ( gadget title -- )
 
 : commands. ( gadget -- )
     dup gadget-info
-    dup all-commands
+    all-commands
     [ first command-gesture key-down? ] subset
     [ first2 swap command-description ] map
     { "Command" "Gesture" } add* $table ;