diff options
| author | Pierre Weis <Pierre.Weis@inria.fr> | 2007-04-16 11:06:51 +0000 |
|---|---|---|
| committer | Pierre Weis <Pierre.Weis@inria.fr> | 2007-04-16 11:06:51 +0000 |
| commit | 8c9e42862c7f32a0d51a5493589d32acf70ce4cd (patch) | |
| tree | d55de9f4fa5777c45452e760e767fecabe0395f0 /stdlib/string.ml | |
| parent | 95295f121e312c2f9af6765c98837f0723d53550 (diff) | |
| download | ocaml-8c9e42862c7f32a0d51a5493589d32acf70ce4cd.tar.gz | |
The functions that escape characters ([escaped]) now handle characters
consistently with the compiler's lexer (PR#4220).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8189 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib/string.ml')
| -rw-r--r-- | stdlib/string.ml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/stdlib/string.ml b/stdlib/string.ml index dc1e6418d1..652bdd7057 100644 --- a/stdlib/string.ml +++ b/stdlib/string.ml @@ -87,8 +87,8 @@ let escaped s = for i = 0 to length s - 1 do n := !n + (match unsafe_get s i with - '"' | '\\' | '\n' | '\t' -> 2 - | c -> if is_printable c then 1 else 4) + | '"' | '\\' | '\n' | '\t' | '\r' | '\b' -> 2 + | c -> if is_printable c then 1 else 4) done; if !n = length s then s else begin let s' = create !n in @@ -96,12 +96,16 @@ let escaped s = for i = 0 to length s - 1 do begin match unsafe_get s i with - ('"' | '\\') as c -> + | ('"' | '\\') as c -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n c | '\n' -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 'n' | '\t' -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 't' + | '\r' -> + unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 'r' + | '\b' -> + unsafe_set s' !n '\\'; incr n; unsafe_set s' !n 'b' | c -> if is_printable c then unsafe_set s' !n c @@ -174,4 +178,4 @@ let contains s c = contains_from s 0 c;; type t = string -let compare (x: t) (y: t) = Pervasives.compare x y +let compare = Pervasives.compare |