over push -> suffix!, over push-all -> append!

[factor.git] / extra / ui / gadgets / layout / layout.factor

diff --git a/extra/ui/gadgets/layout/layout.factor b/extra/ui/gadgets/layout/layout.factor
index bd3ab1dbc72ffd579915113797e40ef5e917ba45..7bdde95d60e8fd4499be1a6e2b0ee3d492e15e95 100644 (file)
--- a/extra/ui/gadgets/layout/layout.factor
+++ b/extra/ui/gadgets/layout/layout.factor
@@ -26,8 +26,8 @@ DEFER: with-interface
 : insertion-quot ( quot -- quot' ) make:building get [ [ placeholder? ] find-last nip [ <placeholder> dup , ] unless*
     templates get spin '[ [ _ templates set _ , @ ] with-interface ] ] when* ;
 
-SYNTAX: ,% scan string>number [ <layout> , ] curry over push-all ;
-SYNTAX: ->% scan string>number '[ [ _ <layout> , ] [ output-model ] bi ] over push-all ;
+SYNTAX: ,% scan string>number [ <layout> , ] curry append! ;
+SYNTAX: ->% scan string>number '[ [ _ <layout> , ] [ output-model ] bi ] append! ;
 
 GENERIC: -> ( uiitem -- model )
 M: gadget -> dup , output-model ;
@@ -55,7 +55,7 @@ M: model -> dup , ;
 ERROR: not-in-template word ;
 SYNTAX: $ CREATE-WORD dup
     [ [ dup templates get at [ nip , ] [ not-in-template ] if* ] curry (( -- )) define-declared "$" expect ]
-    [ [ <placeholder> [ swap templates get set-at ] keep , ] curry ] bi over push-all ;
+    [ [ <placeholder> [ swap templates get set-at ] keep , ] curry ] bi append! ;
 
 : insert-gadget ( number parent gadget -- ) -rot [ but-last insert-nth ] change-children drop ;
 : insert-size ( number parent size -- ) -rot [ but-last insert-nth ] change-sizes drop ;
@@ -86,4 +86,4 @@ M: model add-gadget-at parent>> dup book:book? [ "No models in books" throw ]
 M: model >>= [ swap insertion-quot <action> ] curry ;
 M: model fmap insertion-quot <mapped> ;
 M: model $> insertion-quot side-effect-model new-mapped-model ;
-M: model <$ insertion-quot quot-model new-mapped-model ;
\ No newline at end of file
+M: model <$ insertion-quot quot-model new-mapped-model ;