[Camomile-commits] camomile/public ucasemap.ml,1.4,1.5 ucomp.ml,1.10,1.11 ustorage.ml,1.3,1.4

[<yo...@us...>]

Update of /cvsroot/camomile/camomile/public
In directory usw-pr-cvs1:/tmp/cvs-serv22332/public

Modified Files:
	ucasemap.ml ucomp.ml ustorage.ml 
Log Message:
Allowing the null string.


Index: ucasemap.ml
===================================================================
RCS file: /cvsroot/camomile/camomile/public/ucasemap.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ucasemap.ml	31 May 2002 11:01:01 -0000	1.4
--- ucasemap.ml	18 Jun 2002 05:13:33 -0000	1.5
***************
*** 181,184 ****
--- 181,185 ----
  and output_with_upper s output =
    let case1 u = output#put (to_upper1 u) in
+   if s#len = 0 then () else
    let cur = s#first in
    try while true do
***************
*** 200,203 ****
--- 201,205 ----
    let lower1 u = output#put (to_lower1 u) in
    let title1 u = output#put (to_title1 u) in
+   if s#len = 0 then () else
    let cur = s#first in
    try while true do

Index: ucomp.ml
===================================================================
RCS file: /cvsroot/camomile/camomile/public/ucomp.ml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ucomp.ml	24 May 2002 11:42:54 -0000	1.10
--- ucomp.ml	18 Jun 2002 05:13:33 -0000	1.11
***************
*** 24,28 ****
  type key = int array
  
! let compact_key keys = pack keys
  
  let tbl : collater = Unidata.read_data "allkeys"
--- 24,31 ----
  type key = int array
  
! let compact_key keys = 
!   match keys with
!     [] -> Array.make 0 0
!   | keys -> pack keys
  
  let tbl : collater = Unidata.read_data "allkeys"

Index: ustorage.ml
===================================================================
RCS file: /cvsroot/camomile/camomile/public/ustorage.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ustorage.ml	2 Jun 2002 08:35:27 -0000	1.3
--- ustorage.ml	18 Jun 2002 05:13:33 -0000	1.4
***************
*** 21,37 ****
  
  let iter op s =
    let cur = s#first in
!   try while true do
!     let u = cur#get in op u; cur#incr();
!   done with Out_of_range -> ()
  
  let eq s1 s2 =
    let len = s1#len in
    if len <> s2#len then false else
    let cur1 = s1#first in
    let cur2 = s2#first in
!   let rec comp () =
!     if (Uchar.uint_code cur1#get) <> (Uchar.uint_code cur2#get) then () else
!     cur1#incr(); cur2#incr(); comp ()
!   in
!   try comp (); false with Out_of_range -> true
--- 21,45 ----
  
  let iter op s =
+   let len = s#len in
+   if len = 0 then () else
    let cur = s#first in
!   let rec loop i =
!     let u = cur#get in op u;
!     if i < len then begin cur#incr (); loop (i + 1) end else ()
!   in
!   loop 1
  
  let eq s1 s2 =
    let len = s1#len in
    if len <> s2#len then false else
+   if len = 0 then true else
    let cur1 = s1#first in
    let cur2 = s2#first in
!   let rec comp i =
!     if (Uchar.uint_code cur1#get) <> (Uchar.uint_code cur2#get) then 
!       false 
!     else if i < len then begin
!       cur1#incr(); cur2#incr(); comp (i + 1) end
!     else true
!   in comp 1
!