Merge OneEyed's patch

[factor.git] / basis / tools / walker / walker.factor

diff --git a/basis/tools/walker/walker.factor b/basis/tools/walker/walker.factor
index a614e2eb0a72400fe64191fdf26eb7196486d902..f0d9a084b13677494a1df9859cbf6c5f9f5eb0df 100644 (file)
--- a/basis/tools/walker/walker.factor
+++ b/basis/tools/walker/walker.factor
@@ -3,7 +3,7 @@
 USING: threads kernel namespaces continuations combinators
 sequences math namespaces.private continuations.private
 concurrency.messaging quotations kernel.private words
-sequences.private assocs models models.filter arrays accessors
+sequences.private assocs models models.arrow arrays accessors
 generic generic.standard definitions make sbufs ;
 IN: tools.walker
 
@@ -152,10 +152,6 @@ SYMBOL: +stopped+
     >n ndrop >c c>
     continue continue-with
     stop suspend (spawn)
-    ! Don't step into some sequence words since output of
-    ! (string) and new-sequence-unsafe may not print due to
-    ! memory safety issues
-    <sbuf> prepare-subseq subseq new-sequence-unsafe
 } [
     dup [ execute break ] curry
     "step-into" set-word-prop
@@ -209,7 +205,7 @@ SYMBOL: +stopped+
                 ]
             } case
         ] handle-synchronous
-    ] [ ] while ;
+    ] while ;
 
 : step-back-msg ( continuation -- continuation' )
     walker-history tget
@@ -232,12 +228,12 @@ SYMBOL: +stopped+
                 { step-into-all [ step-into-all-loop ] }
                 { abandon [ drop f keep-running ] }
                 ! Pass quotation to debugged thread
-                { call-in [ nip keep-running ] }
+                { call-in [ keep-running ] }
                 ! Pass previous continuation to debugged thread
                 { step-back [ step-back-msg ] }
             } case f
         ] handle-synchronous
-    ] [ ] while ;
+    ] while ;
 
 : walker-loop ( -- )
     +running+ set-status
@@ -260,7 +256,7 @@ SYMBOL: +stopped+
                 [ walker-suspended ]
             } case
         ] handle-synchronous
-    ] [ ] until ;
+    ] until ;
 
 : associate-thread ( walker -- )
     walker-thread tset