From 83e8cdae1c5d1188e5018734674baa8c2d75f7a6 Mon Sep 17 00:00:00 2001 From: "U-SLAVA-DFB8FF805\\Slava" Date: Wed, 4 Mar 2009 21:33:34 -0600 Subject: [PATCH] io.encodings.utf8 fixed for bootstrap; add unit tests --- core/io/encodings/utf8/utf8-tests.factor | 3 +++ core/io/encodings/utf8/utf8.factor | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 core/io/encodings/utf8/utf8-tests.factor mode change 100644 => 100755 core/io/encodings/utf8/utf8.factor diff --git a/core/io/encodings/utf8/utf8-tests.factor b/core/io/encodings/utf8/utf8-tests.factor old mode 100644 new mode 100755 index a99575b4ba..e30e9be0d0 --- a/core/io/encodings/utf8/utf8-tests.factor +++ b/core/io/encodings/utf8/utf8-tests.factor @@ -22,3 +22,6 @@ IN: io.encodings.utf8.tests [ { BIN: 11110101 BIN: 10111111 BIN: 10000000 BIN: 10111111 BIN: 11101111 BIN: 10000000 BIN: 10111111 BIN: 11011111 BIN: 10000000 CHAR: x } ] [ { BIN: 101111111000000111111 BIN: 1111000000111111 BIN: 11111000000 CHAR: x } encode-utf8-w/stream ] unit-test + +[ 3 ] [ 1 "日本語" >utf8-index ] unit-test +[ 3 ] [ 9 "日本語" utf8-index> ] unit-test diff --git a/core/io/encodings/utf8/utf8.factor b/core/io/encodings/utf8/utf8.factor old mode 100644 new mode 100755 index 69a6abf2c7..aca36c8551 --- a/core/io/encodings/utf8/utf8.factor +++ b/core/io/encodings/utf8/utf8.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2006, 2008 Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. USING: math math.order kernel sequences sbufs vectors growable io -continuations namespaces io.encodings combinators strings -binary-search ; +continuations namespaces io.encodings combinators strings ; IN: io.encodings.utf8 ! Decoding UTF-8 @@ -85,7 +84,7 @@ PRIVATE> 0 [ code-point-length + ] accumulate swap suffix ; : utf8-index> ( n string -- n' ) - code-point-offsets natural-search drop ; + code-point-offsets [ <= ] with find drop ; : >utf8-index ( n string -- n' ) code-point-offsets nth ; \ No newline at end of file