tools.test: Make the flag public. Finish porting tester changes to fuzzer.

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

diff --git a/unmaintained/ui/gadgets/layout/layout.factor b/unmaintained/ui/gadgets/layout/layout.factor
index c287b9a0598ed33f4525c0b509ca30ca8ec8be59..06ec26cedefa8a100b940747e1d19ba40b9f3ecd 100644 (file)
--- a/unmaintained/ui/gadgets/layout/layout.factor
+++ b/unmaintained/ui/gadgets/layout/layout.factor
@@ -54,8 +54,8 @@ M: model -> dup , ;
 : <book*> ( quot -- book ) f make-layout f make-book ; inline
 
 ERROR: not-in-template word ;
-SYNTAX: $ CREATE-WORD dup
-    [ [ dup templates get at [ nip , ] [ not-in-template ] if* ] curry (( -- )) define-declared "$" expect ]
+SYNTAX: $ scan-new-word dup
+    [ [ dup templates get at [ nip , ] [ not-in-template ] if* ] curry ( -- ) define-declared "$" expect ]
     [ [ <placeholder> [ swap templates get set-at ] keep , ] curry ] bi append! ;
 
 : insert-gadget ( number parent gadget -- ) -rot [ but-last insert-nth ] change-children drop ;
@@ -66,14 +66,14 @@ GENERIC: >layout ( gadget -- layout )
 M: gadget >layout f <layout> ;
 M: layout >layout ;
 
-GENERIC# (add-gadget-at) 2 ( parent item n -- )
+GENERIC#: (add-gadget-at) 2 ( parent item n -- )
 M: gadget (add-gadget-at) -rot [ add-gadget ] keep insert-gadget ;
 M: track (add-gadget-at) -rot >layout [ add-layout ] keep [ gadget>> insert-gadget ] [ size>> insert-size ] 3bi ;
 
-GENERIC# add-gadget-at 1 ( item location -- )
+GENERIC#: add-gadget-at 1 ( item location -- )
 M: object add-gadget-at insertion-point -rot (add-gadget-at) ;
 M: model add-gadget-at parent>> dup book:book? [ "No models in books" throw ]
-   [ dup model>> dup collection? [ nip swap add-connection ] [ drop [ 1array <collection> ] dip (>>model) ] if ] if ;
+   [ dup model>> dup collection? [ nip swap add-connection ] [ drop [ 1array <collection> ] dip model<< ] if ] if ;
 : track-add-at ( item location size -- ) swap [ <layout> ] dip add-gadget-at ;
 : (track-add-at) ( parent item n size -- ) swap [ <layout> ] dip (add-gadget-at) ;