factor: trim using lists

[factor.git] / basis / sequences / parser / parser.factor

diff --git a/basis/sequences/parser/parser.factor b/basis/sequences/parser/parser.factor
index 322d4cf48872a24a3360ca16037cc69d884bf018..b9fd4dd1d4cc3929ba6a3b2d7264fb3f476133f8 100644 (file)
--- a/basis/sequences/parser/parser.factor
+++ b/basis/sequences/parser/parser.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2005, 2009 Daniel Ehrenberg, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors circular combinators.short-circuit fry io
-kernel locals math math.order sequences sorting.functor
-sorting.slots unicode.categories ;
+USING: accessors circular combinators.short-circuit io kernel
+math math.order sequences sequences.parser sequences.private
+sorting.functor sorting.slots unicode ;
 IN: sequences.parser
 
 TUPLE: sequence-parser sequence n ;
@@ -15,7 +15,7 @@ TUPLE: sequence-parser sequence n ;
 :: with-sequence-parser ( sequence-parser quot -- seq/f )
     sequence-parser n>> :> n
     sequence-parser quot call [
-        n sequence-parser (>>n) f
+        n sequence-parser n<< f
     ] unless* ; inline
 
 : offset  ( sequence-parser offset -- char/f )
@@ -62,9 +62,9 @@ TUPLE: sequence-parser sequence n ;
 : <safe-slice> ( from to seq -- slice/f )
     3dup {
         [ 2drop 0 < ]
-        [ [ drop ] 2dip length > ]
+        [ nipd length > ]
         [ drop > ]
-    } 3|| [ 3drop f ] [ slice boa ] if ; inline
+    } 3|| [ 3drop f ] [ <slice-unsafe> ] if ; inline
 
 :: take-sequence ( sequence-parser sequence -- obj/f )
     sequence-parser [ n>> dup sequence length + ] [ sequence>> ] bi
@@ -92,7 +92,7 @@ TUPLE: sequence-parser sequence n ;
         sequence-parser [ growing length - 1 + ] change-n drop
         ! sequence-parser advance drop
     ] [
-        saved sequence-parser (>>n)
+        saved sequence-parser n<<
         f
     ] if ;