From 4daa358f40443514d03ffda73669978ac4dc4ede Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 13 Jul 2008 23:59:32 -0500
Subject: [PATCH 1/3] ui.tools.walker: Rewrite to remove 'g'
---
extra/ui/tools/walker/walker.factor | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/extra/ui/tools/walker/walker.factor b/extra/ui/tools/walker/walker.factor
index 3588b44644..e5141fb844 100755
--- a/extra/ui/tools/walker/walker.factor
+++ b/extra/ui/tools/walker/walker.factor
@@ -61,12 +61,11 @@ M: walker-gadget focusable-child*
swap >>continuation
swap >>status
dup continuation>> <traceback-gadget> >>traceback
- [
- toolbar,
- g status>> self <thread-status> f track,
- g traceback>> 1 track,
- ] make-gadget ;
+ dup <toolbar> f track-add*
+ dup status>> self <thread-status> f track-add*
+ dup traceback>> 1 track-add* ;
+
: walker-help ( -- ) "ui-walker" help-window ;
\ walker-help H{ { +nullary+ t } } define-command
From f48efe054070b71d85764dbfd99f2505889961c1 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 14 Jul 2008 00:06:15 -0500
Subject: [PATCH 2/3] ui.tools.browser: Refactor to not use 'g' and 'g->'
---
extra/ui/tools/browser/browser.factor | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/extra/ui/tools/browser/browser.factor b/extra/ui/tools/browser/browser.factor
index 421ffdbaaf..ee427625f5 100755
--- a/extra/ui/tools/browser/browser.factor
+++ b/extra/ui/tools/browser/browser.factor
@@ -20,13 +20,11 @@ TUPLE: browser-gadget < track pane history ;
"handbook" >link <history> >>history drop ;
: <browser-gadget> ( -- gadget )
- { 0 1 } browser-gadget new-track
+ { 0 1 } browser-gadget new-track
dup init-history
- [
- toolbar,
- g <help-pane> g-> set-browser-gadget-pane
- <scroller> 1 track,
- ] make-gadget ;
+ dup <toolbar> f track-add*
+ dup <help-pane> >>pane
+ dup pane>> <scroller> 1 track-add* ;
M: browser-gadget call-tool* show-help ;
From 4e5551759ac0f5a88ab510c6fde44be0c9aa5ca0 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 14 Jul 2008 00:39:02 -0500
Subject: [PATCH 3/3] ui.tools.traceback: rewrite <traceback-gadget>
---
extra/ui/tools/traceback/traceback.factor | 35 +++++++++++------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/extra/ui/tools/traceback/traceback.factor b/extra/ui/tools/traceback/traceback.factor
index e1743a4bc8..ffea857429 100755
--- a/extra/ui/tools/traceback/traceback.factor
+++ b/extra/ui/tools/traceback/traceback.factor
@@ -1,10 +1,11 @@
! Copyright (C) 2006, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors continuations kernel models namespaces
-prettyprint ui ui.commands ui.gadgets ui.gadgets.labelled assocs
-ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes
-ui.gadgets.status-bar ui.gadgets.scrollers ui.gestures sequences
-hashtables inspector ;
+ prettyprint ui ui.commands ui.gadgets ui.gadgets.labelled assocs
+ ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes
+ ui.gadgets.status-bar ui.gadgets.scrollers ui.gestures sequences
+ hashtables inspector ;
+
IN: ui.tools.traceback
: <callstack-display> ( model -- gadget )
@@ -24,20 +25,18 @@ TUPLE: traceback-gadget < track ;
M: traceback-gadget pref-dim* drop { 550 600 } ;
: <traceback-gadget> ( model -- gadget )
- { 0 1 } traceback-gadget new-track
- swap >>model
- [
- g model>>
- [
- [
- [ <datastack-display> 1/2 track, ]
- [ <retainstack-display> 1/2 track, ]
- bi
- ] { 1 0 } make-track 1/3 track,
- ]
- [ <callstack-display> 2/3 track, ] bi
- toolbar,
- ] make-gadget ;
+ { 0 1 } traceback-gadget new-track
+ swap >>model
+
+ dup model>>
+ { 1 0 } <track>
+ over <datastack-display> 1/2 track-add*
+ swap <retainstack-display> 1/2 track-add*
+ 1/3 track-add*
+
+ dup model>> <callstack-display> 2/3 track-add*
+
+ dup <toolbar> f track-add* ;
: <namestack-display> ( model -- gadget )
[ [ continuation-name namestack. ] when* ]