X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=basis%2Funicode%2Fbreaks%2Fbreaks.factor;h=7c7b8a1f50771499672eb752680021570141ccd4;hp=ed96842c41ad0f58d1c2e900c8b31ed451ff55c4;hb=3f3d57032bf29190e9bee12d168a4bce6d74653c;hpb=cd1bb8f4c8afba318249c7b756a45aa1c46ea51e diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index ed96842c41..7c7b8a1f50 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -93,7 +93,7 @@ PRIVATE> : first-grapheme ( str -- i ) unclip-slice grapheme-class over [ grapheme-class [ nip ] [ grapheme-break? ] 2bi ] find drop - nip swap length or 1+ ; + nip swap length or 1 + ; : first-grapheme-from ( start str -- i ) over tail-slice first-grapheme + ; @@ -192,13 +192,13 @@ to: word-table swap [ format/extended? not ] find-from drop ; : walk-up ( str i -- j ) - dupd 1+ (walk-up) [ 1+ (walk-up) ] [ drop f ] if* ; + dupd 1 + (walk-up) [ 1 + (walk-up) ] [ drop f ] if* ; : (walk-down) ( str i -- j ) swap [ format/extended? not ] find-last-from drop ; : walk-down ( str i -- j ) - dupd (walk-down) [ 1- (walk-down) ] [ drop f ] if* ; + dupd (walk-down) [ 1 - (walk-down) ] [ drop f ] if* ; : word-break? ( str i table-entry -- ? ) { @@ -226,7 +226,7 @@ PRIVATE> : first-word ( str -- i ) [ unclip-slice word-break-prop over ] keep '[ swap _ word-break-next ] assoc-find 2drop - nip swap length or 1+ ; + nip swap length or 1 + ; : >words ( str -- words ) [ first-word ] >pieces ; @@ -234,7 +234,7 @@ PRIVATE>