From f8d4935e0d699d2d1b40354ab516f13c5d5f3f91 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 25 Nov 2008 23:04:34 -0600 Subject: [PATCH] Remove two remaining usage s of -roll from UI --- basis/ui/gadgets/menus/menus.factor | 3 +-- basis/ui/traverse/traverse.factor | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/basis/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor index 7dd57e526a..e973dd07dc 100644 --- a/basis/ui/gadgets/menus/menus.factor +++ b/basis/ui/gadgets/menus/menus.factor @@ -46,7 +46,6 @@ M: menu-glass layout* gadget-child prefer ; faint-boundary ; : ( hook target commands -- gadget ) - - -roll + [ ] 3dip [ add-gadget ] with with each 5 menu-theme ; diff --git a/basis/ui/traverse/traverse.factor b/basis/ui/traverse/traverse.factor index eadd110fe7..5135c3da6e 100644 --- a/basis/ui/traverse/traverse.factor +++ b/basis/ui/traverse/traverse.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2007 Slava Pestov. +! Copyright (C) 2007, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors namespaces make sequences kernel math arrays io ui.gadgets generic combinators ; @@ -7,7 +7,7 @@ IN: ui.traverse TUPLE: node value children ; : traverse-step ( path gadget -- path' gadget' ) - >r unclip r> children>> ?nth ; + [ unclip ] dip children>> ?nth ; : make-node ( quot -- ) { } make node boa , ; inline @@ -43,7 +43,7 @@ TUPLE: node value children ; traverse-step traverse-from-path ; : (traverse-middle) ( frompath topath gadget -- ) - >r >r first 1+ r> first r> children>> % ; + [ first 1+ ] [ first ] [ children>> ] tri* % ; : traverse-post ( topath gadget -- ) traverse-step traverse-to-path ; @@ -59,8 +59,8 @@ TUPLE: node value children ; DEFER: (gadget-subtree) : traverse-child ( frompath topath gadget -- ) - dup -roll [ - >r >r rest-slice r> r> traverse-step (gadget-subtree) + [ -rot ] keep [ + [ rest-slice ] 2dip traverse-step (gadget-subtree) ] make-node ; : (gadget-subtree) ( frompath topath gadget -- )