aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/pp.ml
diff options
context:
space:
mode:
authorGravatar Regis-Gianas <yrg@pps.univ-paris-diderot.fr>2014-10-30 18:04:35 +0100
committerGravatar Regis-Gianas <yrg@pps.univ-paris-diderot.fr>2014-11-04 22:51:35 +0100
commit1b25d0d5e710b65fdde7707bcf4ab926f4e65a87 (patch)
treeb61d40a6c0152509c23078c76b6a0ac6597a0722 /lib/pp.ml
parent4b6720644103260620ab21e6afa89e55534478ee (diff)
lib/Pp: Cosmetics.
Diffstat (limited to 'lib/pp.ml')
-rw-r--r--lib/pp.ml42
1 files changed, 21 insertions, 21 deletions
diff --git a/lib/pp.ml b/lib/pp.ml
index f03fcab3b..f595024e0 100644
--- a/lib/pp.ml
+++ b/lib/pp.ml
@@ -16,7 +16,7 @@ module Glue : sig
I.e. if the short list is the second argument
*)
type 'a t
-
+
val atom : 'a -> 'a t
val glue : 'a t -> 'a t -> 'a t
val empty : 'a t
@@ -133,18 +133,18 @@ let utf8_length s =
match s.[!p] with
| '\000'..'\127' -> nc := 0 (* ascii char *)
| '\128'..'\191' -> nc := 0 (* cannot start with a continuation byte *)
- | '\192'..'\223' -> nc := 1 (* expect 1 continuation byte *)
- | '\224'..'\239' -> nc := 2 (* expect 2 continuation bytes *)
- | '\240'..'\247' -> nc := 3 (* expect 3 continuation bytes *)
- | '\248'..'\251' -> nc := 4 (* expect 4 continuation bytes *)
- | '\252'..'\253' -> nc := 5 (* expect 5 continuation bytes *)
- | '\254'..'\255' -> nc := 0 (* invalid byte *)
+ | '\192'..'\223' -> nc := 1 (* expect 1 continuation byte *)
+ | '\224'..'\239' -> nc := 2 (* expect 2 continuation bytes *)
+ | '\240'..'\247' -> nc := 3 (* expect 3 continuation bytes *)
+ | '\248'..'\251' -> nc := 4 (* expect 4 continuation bytes *)
+ | '\252'..'\253' -> nc := 5 (* expect 5 continuation bytes *)
+ | '\254'..'\255' -> nc := 0 (* invalid byte *)
end ;
incr p ;
while !p < len && !nc > 0 do
match s.[!p] with
- | '\128'..'\191' (* next continuation byte *) -> incr p ; decr nc
- | _ (* not a continuation byte *) -> nc := 0
+ | '\128'..'\191' (* next continuation byte *) -> incr p ; decr nc
+ | _ (* not a continuation byte *) -> nc := 0
done ;
incr cnt
done ;
@@ -173,8 +173,8 @@ let strbrk s =
let rec aux p n =
if n < String.length s then
if s.[n] = ' ' then
- if p = n then spc() :: aux (n+1) (n+1)
- else str (String.sub s p (n-p)) :: spc () :: aux (n+1) (n+1)
+ if p = n then spc() :: aux (n+1) (n+1)
+ else str (String.sub s p (n-p)) :: spc () :: aux (n+1) (n+1)
else aux p (n + 1)
else if p = n then [] else [str (String.sub s p (n-p))]
in List.fold_left (++) Glue.empty (aux 0 0)
@@ -452,16 +452,16 @@ let prlist_sep_lastsep no_empty sep lastsep elem =
|[] -> mt ()
|[e] -> elem e
|h::t -> let e = elem h in
- if no_empty && ismt e then start t else
- let rec aux = function
- |[] -> mt ()
- |h::t ->
- let e = elem h and r = aux t in
- if no_empty && ismt e then r else
- if ismt r
- then let s = lastsep () in s ++ e
- else let s = sep () in s ++ e ++ r
- in let r = aux t in e ++ r
+ if no_empty && ismt e then start t else
+ let rec aux = function
+ |[] -> mt ()
+ |h::t ->
+ let e = elem h and r = aux t in
+ if no_empty && ismt e then r else
+ if ismt r
+ then let s = lastsep () in s ++ e
+ else let s = sep () in s ++ e ++ r
+ in let r = aux t in e ++ r
in start
let prlist_strict pr l = prlist_sep_lastsep true mt mt pr l