make-frame/track now compiles (except that add-gadget doesn't; this is pending)

library/ui/gadgets/frames.factor

@@ -38,7 +38,7 @@ M: frame layout* ( frame -- dim )
     ] with-grid ;
 
 : make-frame ( specs -- gadget )
-    <frame> [ swap build-grid ] keep ;
+    <frame> [ swap build-grid ] keep ; inline
 
 : make-frame* ( gadget specs -- gadget )
-    over [ delegate>frame build-grid ] keep ;
+    over [ delegate>frame build-grid ] keep ; inline

library/ui/gadgets/grids.factor

@@ -72,4 +72,4 @@ M: grid layout* ( frame -- dim )
     #! Specs is an array of quadruples { quot post setter loc }.
     #! The setter has stack effect ( new gadget -- ),
     #! the loc is @center, @top, etc.
-    swap [ [ [ grid-add ] add-spec ] each ] with-gadget ;
+    swap [ [ grid-add ] build-spec ] with-gadget ; inline

library/ui/gadgets/tracks.factor

@@ -135,13 +135,12 @@ C: divider ( -- divider )
     #! Specs is an array of quadruples { quot post setter loc }.
     #! The setter has stack effect ( new gadget -- ),
     #! the loc is a ratio from 0 to 1.
-    swap [
+    2dup
-        [ [ [ drop track-add ] add-spec ] each ] keep
+    swap [ [ drop track-add ] build-spec ] with-gadget
-        [ peek ] map gadget get set-track-sizes
+    [ peek ] map swap set-track-sizes ; inline
-    ] with-gadget ;
 
 : make-track ( specs orientation -- gadget )
-    <track> [ swap build-track ] keep ;
+    <track> [ swap build-track ] keep ; inline
 
 : make-track* ( gadget specs orientation -- gadget )
-    <track> pick [ set-delegate build-track ] keep ;
+    <track> pick [ set-delegate build-track ] keep ; inline

library/ui/hierarchy.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2005, 2006 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 IN: gadgets
-USING: generic hashtables kernel math namespaces sequences
+USING: generic hashtables inference kernel math namespaces
-vectors words ;
+sequences vectors words ;
 
 GENERIC: graft* ( gadget -- )
 
@@ -61,15 +61,25 @@ M: gadget ungraft* drop ;
     #! Add all gadgets in a sequence to a parent gadget.
     swap [ over (add-gadget) ] each relayout ;
 
-: add-spec ( { quot setter post loc } quot -- )
+: add-spec ( quot { quot setter post loc } -- )
-    [
+    dup first %
-        over first %
+    dup second [ [ dup gadget get ] % , ] when*
-        over second [ [ dup gadget get ] % , ] when*
+    dup third %
-        over third %
     [ gadget get ] %
-        swap fourth ,
+    fourth ,
-        %
+    % ;
-    ] [ ] make call ;
+
+: (build-spec) ( quot spec -- quot )
+    [ [ add-spec ] each-with ] [ ] make ;
+
+: build-spec ( spec quot -- )
+    swap (build-spec) call ;
+
+\ build-spec { 2 0 } "infer-effect" set-word-prop
+
+\ build-spec [
+    pop-literal pop-literal nip (build-spec) infer-quot-value
+] "infer" set-word-prop
 
 : (parents) ( gadget -- )
     [ dup , gadget-parent (parents) ] when* ;

library/ui/models.factor

@@ -124,7 +124,7 @@ M: compose model-changed ( compose -- )
     swap delegate set-model ;
 
 M: compose set-model ( value compose -- )
-    model-dependencies [ set-model ] 2map ;
+    model-dependencies [ set-model ] 2each ;
 
 TUPLE: history back forward ;