[Camomile-commits] camomile/public udebug.ml,1.3,1.4 ustring.ml,1.4,1.5 ustring.mli,1.4,1.5 utext.ml,1.5,1.6 utext.mli,1.5,1.6 umisc.ml,1.1,NONE umisc.mli,1.1,NONE

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

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

Modified Files:
	udebug.ml ustring.ml ustring.mli utext.ml utext.mli 
Removed Files:
	umisc.ml umisc.mli 
Log Message:
escaped and unescaped are withdrawn.


Index: udebug.ml
===================================================================
RCS file: /cvsroot/camomile/camomile/public/udebug.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** udebug.ml	31 May 2002 11:01:01 -0000	1.3
--- udebug.ml	2 Jun 2002 08:39:05 -0000	1.4
***************
*** 3,14 ****
  
  open Helpers
  
! let ascii = Char_encoding.of_name "ASCII"
  
! let string_of s = Char_encoding.encode ascii (Umisc.escaped s)
  
  let printer_ustorage f s =
!   Format.fprintf f "\"%s\"" (string_of s)
  
  let printer_uchar f u =
!   Format.fprintf f "'%s'" (string_of (new Singleton.obj_of u))
--- 3,72 ----
  
  open Helpers
+ open Ucategory
  
! let backslash = Char.code '\\'
! let sq = Char.code '\''
! let dq = Char.code '"'
! let lf = Char.code '\n'
! let cr = Char.code '\r'
! let tab = Char.code '\t'
! let backspace = Char.code '\b'
  
! let bb = new Latin1.obj_of "\\\\"
! let bdq = new Latin1.obj_of "\\\""
! let bsq = new Latin1.obj_of "\\'"
! 
! let print_char n =
!   let n2 = n land 0xffff in
!   let n1 = n lsr 16 in
!   if n1 = 0 then 
!     Printf.sprintf "\\u%04X" n2
!   else
!     Printf.sprintf "\\v%04X%04X" n1 n2
! 
! let escaped s =
!   let buf = Buffer.create (s#len) in
!   let proc u =
!     let n = Uchar.uint_code u in
!     if n > 0x7f || n < 0 then
!       Buffer.add_string buf (print_char n)
!     else match (Char.chr n) with
!       '\\' -> Buffer.add_string buf "\\\\"
!     | '"' -> Buffer.add_string buf "\\\""
!     | '\n' -> Buffer.add_string buf "\\n"
!     | '\r' -> Buffer.add_string buf "\\r"
!     | '\t' -> Buffer.add_string buf "\\t"
!     | '\b' -> Buffer.add_string buf "\\b"
!     | c ->
! 	if get u = Cc then
! 	  Buffer.add_string buf (print_char n)
! 	else
! 	  Buffer.add_char buf c
!   in
!   Ustorage.iter proc s;
!   Buffer.contents buf
! 
! let escaped_char u =
!   let n = Uchar.uint_code u in
!   if n > 0x7f || n < 0 then
!     print_char n
!   else
!     match (Char.chr n) with
!       '\\' -> "\\\\"
!     |	'\'' -> "\\'"
!     |	'\n' -> "\\n"
!     |	'\r' -> "\\r"
!     |	'\t' -> "\\t"
!     |	'\b' -> "\\b"
!     |	c -> 
! 	if get u = Cc then
! 	  print_char n
! 	else
! 	  String.make 1 c
  
  let printer_ustorage f s =
!   Format.fprintf f "\"%s\"" (escaped s)
  
  let printer_uchar f u =
!   Format.fprintf f "'%s'" (escaped_char u)
! 

Index: ustring.ml
===================================================================
RCS file: /cvsroot/camomile/camomile/public/ustring.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ustring.ml	31 May 2002 11:01:01 -0000	1.4
--- ustring.ml	2 Jun 2002 08:39:05 -0000	1.5
***************
*** 49,56 ****
         (List.map (fun s -> (s#unsafe_ucs4 ())) l))
  
- let escaped s = new t (Umisc.escaped s)
- 
- let unescaped s = new t (Umisc.unescaped s)
- 
  let uppercase s =
    new t (Ucasemap.uppercase s)
--- 49,52 ----

Index: ustring.mli
===================================================================
RCS file: /cvsroot/camomile/camomile/public/ustring.mli,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ustring.mli	31 May 2002 11:01:01 -0000	1.4
--- ustring.mli	2 Jun 2002 08:39:05 -0000	1.5
***************
*** 59,73 ****
  val concat : t -> t list -> t
  
- (* All control characters, non-ascii characters and backslash 
-  * are escaped as
-  * \ -> \\
-  * <16-bits unicode> -> \u<4-digits hexadecimal>
-  * <21-bits unicode> -> \v<8-digits hexadecimal>
-  *)
- val escaped : t -> t
- 
- (* Reverse of escaped *)
- val unescaped : t -> t
- 
  (* Case mappings *)
  val uppercase : t -> t
--- 59,62 ----

Index: utext.ml
===================================================================
RCS file: /cvsroot/camomile/camomile/public/utext.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** utext.ml	31 May 2002 11:01:01 -0000	1.5
--- utext.ml	2 Jun 2002 08:39:05 -0000	1.6
***************
*** 30,37 ****
         (List.map (fun s -> (s#unsafe_ucs4 ())) l))
  
- let escaped s = new t (Umisc.escaped s)
- 
- let unescaped s = new t (Umisc.unescaped s)
- 
  let uppercase s =
    new t (Ucasemap.uppercase s)
--- 30,33 ----

Index: utext.mli
===================================================================
RCS file: /cvsroot/camomile/camomile/public/utext.mli,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** utext.mli	31 May 2002 11:01:01 -0000	1.5
--- utext.mli	2 Jun 2002 08:39:05 -0000	1.6
***************
*** 46,60 ****
  val concat : t -> t list -> t
  
- (* All control characters, non-ascii characters and backslash 
-  * are escaped as
-  * \ -> \\
-  * <16-bits unicode> -> \u<4-digits hexadecimal>
-  * <21-bits unicode> -> \v<8-digits hexadecimal>
-  *)
- val escaped : t -> t
- 
- (* Reverse of escaped *)
- val unescaped : t -> t
- 
  (* Case mappings *)
  val uppercase : t -> t
--- 46,49 ----

--- umisc.ml DELETED ---

--- umisc.mli DELETED ---