diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index 0f2e12119d..58c7a5d10e 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -72,7 +72,7 @@ VALUE: grapheme-table grapheme-table nth nth not ; : chars ( i str n -- str[i] str[i+n] ) - swap >r dupd + r> [ ?nth ] curry bi@ ; + swap [ dupd + ] dip [ ?nth ] curry bi@ ; : find-index ( seq quot -- i ) find drop ; inline : find-last-index ( seq quot -- i ) find-last drop ; inline diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor index 7f445b8513..90b280ee09 100644 --- a/basis/unicode/collation/collation.factor +++ b/basis/unicode/collation/collation.factor @@ -124,7 +124,7 @@ PRIVATE> [ zero? ] tri@ and and ; : filter-ignorable ( weights -- weights' ) - >r f r> [ + f swap [ tuck primary>> zero? and [ swap ignorable?>> or ] [ swap completely-ignorable? or not ] 2bi