From 47cedd8d3d0a459662ac9ad872bc1c4384f5c634 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 9 Nov 2011 19:22:09 -0800 Subject: [PATCH] slice boa -> If you didn't define it, don't boa it --- basis/grouping/grouping.factor | 2 +- basis/regexp/regexp.factor | 6 +++--- basis/sequences/parser/parser.factor | 2 +- basis/tuple-arrays/tuple-arrays.factor | 2 +- core/sequences/sequences.factor | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/basis/grouping/grouping.factor b/basis/grouping/grouping.factor index 09e87698cf..6cc5bb164a 100644 --- a/basis/grouping/grouping.factor +++ b/basis/grouping/grouping.factor @@ -25,7 +25,7 @@ INSTANCE: slice-chunking chunking INSTANCE: slice-chunking sequence M: slice-chunking nth group@ ; inline -M: slice-chunking nth-unsafe group@ slice boa ; inline +M: slice-chunking nth-unsafe group@ ; inline MIXIN: abstract-groups INSTANCE: abstract-groups sequence diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor index 6ad6060dcf..6070921d8d 100644 --- a/basis/regexp/regexp.factor +++ b/basis/regexp/regexp.factor @@ -103,7 +103,7 @@ PRIVATE> collector [ each-match ] dip >array ; inline : all-matching-slices ( string regexp -- seq ) - [ slice boa ] map-matches ; + [ ] map-matches ; : all-matching-subseqs ( string regexp -- seq ) [ subseq ] map-matches ; @@ -126,14 +126,14 @@ PRIVATE> :: first-match ( string regexp -- slice/f ) string regexp prepare-match-iterator do-next-match [ regexp reverse-regexp? [ [ 1 + ] bi@ ] when - string slice boa + string ] [ 2drop f ] if ; : re-contains? ( string regexp -- ? ) prepare-match-iterator do-next-match [ 2drop ] dip >boolean ; : re-split ( string regexp -- seq ) - [ slice boa ] (re-split) ; + [ ] (re-split) ; : re-replace ( string regexp replacement -- result ) [ [ subseq ] (re-split) ] dip join ; diff --git a/basis/sequences/parser/parser.factor b/basis/sequences/parser/parser.factor index 8e1b1f540c..c1494fed09 100644 --- a/basis/sequences/parser/parser.factor +++ b/basis/sequences/parser/parser.factor @@ -64,7 +64,7 @@ TUPLE: sequence-parser sequence n ; [ 2drop 0 < ] [ [ drop ] 2dip length > ] [ drop > ] - } 3|| [ 3drop f ] [ slice boa ] if ; inline + } 3|| [ 3drop f ] [ ] if ; inline :: take-sequence ( sequence-parser sequence -- obj/f ) sequence-parser [ n>> dup sequence length + ] [ sequence>> ] bi diff --git a/basis/tuple-arrays/tuple-arrays.factor b/basis/tuple-arrays/tuple-arrays.factor index 1a3091c1e2..869f8bf5a1 100644 --- a/basis/tuple-arrays/tuple-arrays.factor +++ b/basis/tuple-arrays/tuple-arrays.factor @@ -21,7 +21,7 @@ MACRO: boa-unsafe ( class -- quot ) tuple-layout '[ _ ] ; [ new ] [ smart-tuple>array ] bi ; inline : tuple-slice ( n seq -- slice ) - [ n>> [ * dup ] keep + ] [ seq>> ] bi slice boa ; inline + [ n>> [ * dup ] keep + ] [ seq>> ] bi ; inline : read-tuple ( slice class -- tuple ) '[ _ boa-unsafe ] input : ( from to seq -- slice ) check-slice dup slice? [ collapse-slice ] when - slice boa ; inline + ; inline M: slice virtual-exemplar seq>> ; inline -- 2.34.1