Seeing a tuple now shows the constructor, browser tile toolbar fix

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 0547bde6eabeb6d95b1a53415847e9bcc56d1f79..1e2299056e62c761b23450af5955157b810a41f4 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -12,7 +12,6 @@
 - minibuffer should show a title
 - clean up listener's minibuffer-related code
 - help search looks funny
-- parse errors: clickable pathnames
 
 + ui:
 

diff --git a/library/generic/methods.factor b/library/generic/methods.factor
index 10ea2534b99634f4a0a123660a6b484cc4b2e966..5a0f80f2e0fa74af6ef83b01dbca14078a929eb2 100644 (file)
--- a/library/generic/methods.factor
+++ b/library/generic/methods.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 IN: generic
 USING: arrays definitions errors hashtables help kernel
-sequences words ;
+sequences words namespaces ;
 
 PREDICATE: array method-spec
     dup length 2 = [
@@ -56,7 +56,10 @@ M: generic subdefs
     [ swap 2array ] map-with ;
 
 M: class subdefs
-    dup implementors natural-sort [ 2array ] map-with ;
+    [
+        dup "constructor" word-prop [ , ] when*
+        dup implementors natural-sort [ 2array , ] each-with
+    ] { } make ;
 
 M: method-spec forget
     first2 [ remove-hash ] with-methods ;

diff --git a/library/ui/tools/browser.factor b/library/ui/tools/browser.factor
index c4e14ac0bea2f65d0463f95ea95cc75c4317083a..0528ef2757bf3098dbe7861baf4be4a45d2be211 100644 (file)
--- a/library/ui/tools/browser.factor
+++ b/library/ui/tools/browser.factor
@@ -45,14 +45,10 @@ TUPLE: tile definition gadget ;
     <default-border> dup faint-boundary ;
 
 C: tile ( definition -- gadget )
-    2dup { tile } "Word commands" <toolbar>
+    2dup { tile } <toolbar>
     <tile-content> over set-gadget-delegate
     [ set-tile-definition ] keep ;
 
-tile "Tile commands" {
-    { "Close" f [ close-tile ] }
-} define-commands
-
 : show-definition ( definition definitions -- )
     2dup definition-index dup 0 >= [
         over nth-gadget swap scroll>rect drop

diff --git a/library/ui/tools/operations.factor b/library/ui/tools/operations.factor
index eeea6b14d619f6c20cff85d1d03e872e909c8abe..b007736ef0a73f03dd627f1a79e8df69710f7483 100644 (file)
--- a/library/ui/tools/operations.factor
+++ b/library/ui/tools/operations.factor
@@ -207,9 +207,10 @@ M: operation invoke-command ( target operation -- )
 ! Define commands in terms of operations
 
 ! Tile commands
-tile "Word commands"
+tile "Toolbar"
 \ word class-operations [ tile-definition ] modify-operations
 [ command-name "Browse" = not ] subset
+{ "Close" f [ close-tile ] } add*
 define-commands
 
 ! Interactor commands

diff --git a/library/ui/tools/workspace.factor b/library/ui/tools/workspace.factor
index c908a76270db22f1ce8fb373a5e5155e6a23c270..8ea6ed68e566a5edbc219831eebe19513a4e6f9a 100644 (file)
--- a/library/ui/tools/workspace.factor
+++ b/library/ui/tools/workspace.factor
@@ -12,7 +12,7 @@ gadgets-scrolling gadgets-panes gadgets-messages ;
 C: tool ( gadget -- tool )
     {
         {
-            [ dup dup class tool 2array "Toolbar" <toolbar> ]
+            [ dup dup class tool 2array <toolbar> ]
             f
             f
             @top

diff --git a/library/ui/ui.factor b/library/ui/ui.factor
index 308cf53440518e9f4b497a87dc0afd673b9de68d..bc81e37a0037d5afa2f72729ccaadf22afd0b24b 100644 (file)
--- a/library/ui/ui.factor
+++ b/library/ui/ui.factor
@@ -119,9 +119,8 @@ C: titled-gadget ( gadget title -- )
 : restore-windows? ( -- ? )
     windows get [ empty? not ] [ f ] if* ;
 
-: <toolbar> ( target classes group -- toolbar )
-    swap
-    [ commands hash ] map-with concat
+: <toolbar> ( target classes -- toolbar )
+    [ commands "Toolbar" swap hash ] map concat
     [ <command-presentation> ] map-with
     make-shelf ;