diff --git a/library/tools/inspector.factor b/library/tools/inspector.factor index d9a85a8411..47dfa1ed40 100644 --- a/library/tools/inspector.factor +++ b/library/tools/inspector.factor @@ -31,7 +31,7 @@ M: hashtable sheet hash>alist unzip 2list ; : describe ( obj -- list ) sheet dup first length count swons - dup peek over first zip [ uncons set ] each + dup peek over first [ set ] 2each [ column ] map seq-transpose [ " | " join ] map ; diff --git a/library/tools/memory.factor b/library/tools/memory.factor index 9d6076c08c..f803cf39f0 100644 --- a/library/tools/memory.factor +++ b/library/tools/memory.factor @@ -87,11 +87,10 @@ M: object (each-slot) ( quot obj -- ) [ dup size swap type rot seq+ ] keep 1 swap type rot seq+ ; -: heap-stats ( -- stats ) +: heap-stats ( -- counts sizes ) #! Return a list of instance count/total size pairs. num-types zero-vector num-types zero-vector - [ >r 2dup r> heap-stat-step ] each-object - swap >list swap >list zip ; + [ >r 2dup r> heap-stat-step ] each-object ; : heap-stat. ( type instances bytes -- ) dup 0 = [ @@ -104,7 +103,7 @@ M: object (each-slot) ( quot obj -- ) : heap-stats. ( -- ) #! Print heap allocation breakdown. - 0 heap-stats [ dupd uncons heap-stat. 1 + ] each drop ; + 0 heap-stats [ >r >r dup r> r> heap-stat. 1 + ] 2each drop ; : orphans ( word -- list ) #! Orphans are forgotten but still referenced. diff --git a/library/ui/layouts.factor b/library/ui/layouts.factor index f6440210c5..6b68458c5e 100644 --- a/library/ui/layouts.factor +++ b/library/ui/layouts.factor @@ -20,7 +20,7 @@ namespaces sdl sequences ; TUPLE: pack align fill vector ; : pref-dims ( gadget -- list ) - gadget-children [ pref-dim ] map >list ; + gadget-children [ pref-dim ] map ; : orient ( gadget list1 list2 -- list ) zip >r pack-vector r> [ uncons rot set-axis ] map-with ; @@ -31,28 +31,28 @@ TUPLE: pack align fill vector ; rot pack-fill v*n v+ ] map-with ; -: (packed-dims) ( gadget sizes -- list ) +: (packed-dims) ( gadget sizes -- seq ) 2dup packed-dim-2 swap orient ; -: packed-dims ( gadget sizes -- list ) - over gadget-children >list >r (packed-dims) r> - zip [ uncons set-gadget-dim ] each ; +: packed-dims ( gadget sizes -- seq ) + over gadget-children >r (packed-dims) r> + [ set-gadget-dim ] 2each ; -: packed-loc-1 ( sizes -- list ) +: packed-loc-1 ( sizes -- seq ) { 0 0 0 } [ v+ ] accumulate ; -: packed-loc-2 ( gadget sizes -- list ) +: packed-loc-2 ( gadget sizes -- seq ) >r dup rectangle-dim { 1 1 1 } vmax over r> packed-dim-2 [ v- ] map-with >r dup pack-align swap rectangle-dim { 1 1 1 } vmax r> [ >r 2dup r> v- n*v ] map 2nip ; -: (packed-locs) ( gadget sizes -- list ) +: (packed-locs) ( gadget sizes -- seq ) dup packed-loc-1 >r dupd packed-loc-2 r> orient ; : packed-locs ( gadget sizes -- ) - over gadget-children >list >r (packed-locs) r> - zip [ uncons set-rectangle-loc ] each ; + over gadget-children >r (packed-locs) r> + [ set-rectangle-loc ] 2each ; : packed-layout ( gadget sizes -- ) 2dup packed-locs packed-dims ;