types.ml 44.8 KB
Newer Older
1
open Ident
2

3 4 5 6 7 8 9 10 11 12
(*
To be sure not to use generic comparison ...
*)
let (=) : int -> int -> bool = (==)
let (<) : int -> int -> bool = (<)
let (<=) : int -> int -> bool = (<=)
let (<>) : int -> int -> bool = (<>)
let compare = 1


13 14 15 16 17 18
module HashedString = 
struct 
  type t = string 
  let hash = Hashtbl.hash
  let equal = (=)
end
19 20


21 22 23 24
type const = 
  | Integer of Intervals.v
  | Atom of Atoms.v
  | Char of Chars.v
25

26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
let compare_const c1 c2 =
  match (c1,c2) with
    | Integer x, Integer y -> Intervals.vcompare x y
    | Integer _, _ -> -1
    | _, Integer _ -> 1
    | Atom x, Atom y -> Atoms.vcompare x y
    | Atom _, _ -> -1
    | _, Atom _ -> 1
    | Char x, Char y -> Chars.vcompare x y

let hash_const = function
  | Integer x -> Intervals.vhash x
  | Atom x -> Atoms.vhash x
  | Char x -> Chars.vhash x

41 42
let equal_const c1 c2 = compare_const c1 c2 = 0

43 44
type pair_kind = [ `Normal | `XML ]

45 46 47 48
type 'a node0 = { id : int; mutable descr : 'a }

module NodePair = struct
  type 'a t = 'a node0 * 'a node0
49 50 51
  let dump ppf (x,y) =
    Format.fprintf ppf "(%i,%i)" x.id y.id
  let compare (y1,x1) (y2,x2) =
52 53 54 55 56 57 58
    if x1.id < x2.id then -1
    else if x1.id > x2.id then 1
    else y1.id - y2.id
  let equal (x1,y1) (x2,y2) = (x1==x2) && (y1==y2)
  let hash (x,y) = x.id + 17 * y.id
end 

59 60 61
module RecArg = struct
  type 'a t = bool * 'a node0 label_map
  
62 63
  let dump ppf (o,r) = ()

64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
  let rec compare_rec r1 r2 =
    if r1 == r2 then 0
    else match (r1,r2) with
      | (l1,x1)::r1,(l2,x2)::r2 ->
	  if ((l1:int) < l2) then -1 
	  else if (l1 > l2) then 1 
	  else if x1.id < x2.id then -1
	  else if x1.id > x2.id then 1
	  else compare_rec r1 r2
      | ([],_) -> -1
      | _ -> 1

  let compare (o1,r1) (o2,r2) =
    if o1 && not o2 then -1 
    else if o2 && not o1 then 1
    else compare_rec (LabelMap.get r1) (LabelMap.get r2)

  let rec equal_rec r1 r2 =
    (r1 == r2) ||
    match (r1,r2) with
      | (l1,x1)::r1,(l2,x2)::r2 ->
	  (x1.id == x2.id) && (l1 == l2) && (equal_rec r1 r2)
      | _ -> false

  let equal (o1,r1) (o2,r2) =
    (o1 == o2) && (equal_rec (LabelMap.get r1) (LabelMap.get r2))

  let rec hash_rec accu = function
    | (l,x)::rem -> hash_rec (257 * accu + 17 * l + x.id) rem
    | [] -> accu + 5
      
  let hash (o,r) = hash_rec (if o then 2 else 1) (LabelMap.get r)
end

98 99
module BoolPair = Bool.Make(NodePair)
module BoolRec = Bool.Make(RecArg)
100

101
type descr = {
102
  atoms : Atoms.t;
103 104
  ints  : Intervals.t;
  chars : Chars.t;
105 106 107
  times : descr BoolPair.t;
  xml   : descr BoolPair.t;
  arrow : descr BoolPair.t;
108
  record: descr BoolRec.t;
109
  absent: bool
110
} and node = descr node0
111

112
	       
113
let empty = { 
114 115 116
  times = BoolPair.empty; 
  xml   = BoolPair.empty; 
  arrow = BoolPair.empty; 
117
  record= BoolRec.empty;
118 119 120
  ints  = Intervals.empty;
  atoms = Atoms.empty;
  chars = Chars.empty;
121
  absent= false;
122 123 124
}
	      
let any =  {
125 126 127
  times = BoolPair.full; 
  xml   = BoolPair.full; 
  arrow = BoolPair.full; 
128
  record= BoolRec.full; 
129 130 131
  ints  = Intervals.any;
  atoms = Atoms.any;
  chars = Chars.any;
132
  absent= false;
133 134 135 136
}
	     
	     
let interval i = { empty with ints = i }
137 138 139
let times x y = { empty with times = BoolPair.atom (x,y) }
let xml x y = { empty with xml = BoolPair.atom (x,y) }
let arrow x y = { empty with arrow = BoolPair.atom (x,y) }
140
let record label t = 
141 142 143
  { empty with record = BoolRec.atom (true,LabelMap.singleton label t) }
let record' (x : bool * node Ident.label_map) =
  { empty with record = BoolRec.atom x }
144 145 146 147 148 149
let atom a = { empty with atoms = a }
let char c = { empty with chars = c }
let constant = function
  | Integer i -> interval (Intervals.atom i)
  | Atom a -> atom (Atoms.atom a)
  | Char c -> char (Chars.atom c)
150
      
151 152
let cup x y = 
  if x == y then x else {
153 154 155
    times = BoolPair.cup x.times y.times;
    xml   = BoolPair.cup x.xml y.xml;
    arrow = BoolPair.cup x.arrow y.arrow;
156
    record= BoolRec.cup x.record y.record;
157 158 159
    ints  = Intervals.cup x.ints  y.ints;
    atoms = Atoms.cup x.atoms y.atoms;
    chars = Chars.cup x.chars y.chars;
160
    absent= x.absent || y.absent;
161 162 163 164
  }
    
let cap x y = 
  if x == y then x else {
165 166
    times = BoolPair.cap x.times y.times;
    xml   = BoolPair.cap x.xml y.xml;
167
    record= BoolRec.cap x.record y.record;
168
    arrow = BoolPair.cap x.arrow y.arrow;
169 170 171
    ints  = Intervals.cap x.ints  y.ints;
    atoms = Atoms.cap x.atoms y.atoms;
    chars = Chars.cap x.chars y.chars;
172
    absent= x.absent && y.absent;
173 174 175 176
  }
    
let diff x y = 
  if x == y then empty else {
177 178 179
    times = BoolPair.diff x.times y.times;
    xml   = BoolPair.diff x.xml y.xml;
    arrow = BoolPair.diff x.arrow y.arrow;
180
    record= BoolRec.diff x.record y.record;
181 182 183
    ints  = Intervals.diff x.ints  y.ints;
    atoms = Atoms.diff x.atoms y.atoms;
    chars = Chars.diff x.chars y.chars;
184
    absent= x.absent && not y.absent;
185 186
  }
    
187

188
let equal_descr a b =
189 190 191
  (Atoms.equal a.atoms b.atoms) &&
  (Chars.equal a.chars b.chars) &&
  (Intervals.equal a.ints  b.ints) &&
192 193 194
  (BoolPair.equal a.times b.times) &&
  (BoolPair.equal a.xml b.xml) &&
  (BoolPair.equal a.arrow b.arrow) &&
195
  (BoolRec.equal a.record b.record) &&
196
  (a.absent == b.absent)
197 198

let compare_descr a b =
199 200
  if a == b then 0 
  else let c = Atoms.compare a.atoms b.atoms in if c <> 0 then c
201 202
  else let c = Chars.compare a.chars b.chars in if c <> 0 then c
  else let c = Intervals.compare a.ints b.ints in if c <> 0 then c
203 204 205
  else let c = BoolPair.compare a.times b.times in if c <> 0 then c
  else let c = BoolPair.compare a.xml b.xml in if c <> 0 then c
  else let c = BoolPair.compare a.arrow b.arrow in if c <> 0 then c
206
  else let c = BoolRec.compare a.record b.record in if c <> 0 then c
207 208
  else if a.absent && not b.absent then -1
  else if b.absent && not a.absent then 1
209 210
  else 0

211
let hash_descr a =
212 213 214
  let accu = Chars.hash 1 a.chars in
  let accu = Intervals.hash accu a.ints in
  let accu = Atoms.hash accu a.atoms in
215 216 217
  let accu = 17 * accu + BoolPair.hash a.times in
  let accu = 17 * accu + BoolPair.hash a.xml in
  let accu = 17 * accu + BoolPair.hash a.arrow in
218
  let accu = 17 * accu + BoolRec.hash a.record in
219
  let accu = if a.absent then accu+5 else accu in
220
  accu
221

222 223 224 225 226 227 228 229
(* TODO: optimize disjoint check for boolean combinations *)
let trivially_disjoint a b =
  (Chars.disjoint a.chars b.chars) &&
  (Intervals.disjoint a.ints b.ints) &&
  (Atoms.disjoint a.atoms b.atoms) &&
  (BoolPair.trivially_disjoint a.times b.times) &&
  (BoolPair.trivially_disjoint a.xml b.xml) &&
  (BoolPair.trivially_disjoint a.arrow b.arrow) &&
230 231
  (BoolRec.trivially_disjoint a.record b.record) &&
  (not (a.absent && b.absent))
232

233

234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251
module Descr =
struct 
  type t = descr
  let hash = hash_descr
  let equal = equal_descr
  let compare = compare_descr
end
module DescrHash = Hashtbl.Make(Descr)
module DescrMap = Map.Make(Descr)

module Descr1 =
struct 
  type 'a t = descr
  let hash = hash_descr
  let equal = equal_descr
  let compare = compare_descr
end
module DescrSList = SortedList.Make(Descr1)
252

253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271
let hash_cons = DescrHash.create 17000

let count = ref 0
let make () = incr count; { id = !count; descr = empty }
let define n d = 
(*  DescrHash.add hash_cons d n; *)
  n.descr <- d
let cons d = 
  (* try DescrHash.find hash_cons d with Not_found ->
  incr count; let n = { id = !count; descr = d } in
  DescrHash.add hash_cons d n; n *)
  incr count; { id = !count; descr = d }
let descr n = n.descr
let internalize n = n
let id n = n.id




272 273
let print_descr = ref (fun _ _  -> assert false)

274 275
let neg x = diff any x

276 277
let any_node = cons any

278
module LabelS = Set.Make(LabelPool)
279 280 281

let get_record r =
  let labs accu (_,r) = 
282 283
    List.fold_left 
      (fun accu (l,_) -> LabelS.add l accu) accu (LabelMap.get r) in
284
  let extend descrs labs (o,r) =
285 286 287 288 289
    let rec aux i labs r =
      match labs with
	| [] -> ()
	| l1::labs ->
	    match r with
290
	      | (l2,x)::r when l1 == l2 -> 
291 292 293
		  descrs.(i) <- cap descrs.(i) (descr x);
		  aux (i+1) labs r
	      | r ->
294
		  if not o then descrs.(i) <- 
295
		    cap descrs.(i) { empty with absent = true }; (* TODO:OPT *)
296 297
		  aux (i+1) labs r
    in
298
    aux 0 labs (LabelMap.get r);
299 300 301 302
    o
  in
  let line (p,n) =
    let labels = 
303 304
      List.fold_left labs (List.fold_left labs LabelS.empty p) n in
    let labels = LabelS.elements labels in
305
    let nlab = List.length labels in
306
    let mk () = Array.create nlab { any with absent = true } in
307 308 309 310 311 312 313 314 315 316 317 318 319 320 321

    let pos = mk () in
    let opos = List.fold_left 
		 (fun accu x -> 
		    (extend pos labels x) && accu)
		 true p in
    let p = (opos, pos) in

    let n = List.map (fun x ->
			let neg = mk () in
			let o = extend neg labels x in
			(o,neg)
		     ) n in
    (labels,p,n)
  in
322
  List.map line (BoolRec.get r)
323
   
324

325

326 327 328 329 330 331 332 333 334 335 336 337


(* Subtyping algorithm *)

let diff_t d t = diff d (descr t)
let cap_t d t = cap d (descr t)
let cup_t d t = cup d (descr t)
let cap_product l =
  List.fold_left 
    (fun (d1,d2) (t1,t2) -> (cap_t d1 t1, cap_t d2 t2))
    (any,any)
    l
338 339 340 341 342
let cup_product l =
  List.fold_left 
    (fun (d1,d2) (t1,t2) -> (cup_t d1 t1, cup_t d2 t2))
    (empty,empty)
    l
343

344 345 346
let rec exists max f =
  (max > 0) && (f (max - 1) || exists (max - 1) f)

347
let trivially_empty d = equal_descr d empty
348

349
exception NotEmpty
350

351 352 353 354 355 356 357 358 359 360 361 362 363 364 365
type slot = { mutable status : status; 
	       mutable notify : notify;
	       mutable active : bool }
and status = Empty | NEmpty | Maybe
and notify = Nothing | Do of slot * (slot -> unit) * notify

let memo = DescrHash.create 33000

let marks = ref [] 
let slot_empty = { status = Empty; active = false; notify = Nothing }
let slot_not_empty = { status = NEmpty; active = false; notify = Nothing }

let rec notify = function
  | Nothing -> ()
  | Do (n,f,rem) -> 
366
      if n.status == Maybe then (try f n with NotEmpty -> ());
367 368 369 370 371 372 373 374 375 376
      notify rem

let rec iter_s s f = function
  | [] -> ()
  | arg::rem -> f arg s; iter_s s f rem


let set s =
  s.status <- NEmpty;
  notify s.notify;
377
  s.notify <- Nothing; 
378 379
  raise NotEmpty

380
let count_slot = ref 0
381 382 383 384 385 386 387 388 389
let rec big_conj f l n =
  match l with
    | [] -> set n
    | [arg] -> f arg n
    | arg::rem ->
	let s = { status = Maybe; active = false; notify = Do (n,(big_conj f rem), Nothing) } in
	try 
	  f arg s;
	  if s.active then n.active <- true
390
	with NotEmpty -> if n.status == NEmpty then raise NotEmpty
391 392

let rec guard a f n =
393 394
  match slot a with
    | { status = Empty } -> ()
395
    | { status = Maybe } as s -> n.active <- true; s.notify <- Do (n,f,s.notify)
396
    | { status = NEmpty } -> f n
397 398 399 400

and slot d =
  if not ((Intervals.is_empty d.ints) && 
	  (Atoms.is_empty d.atoms) &&
401 402
	  (Chars.is_empty d.chars) &&
	  (not d.absent)) then slot_not_empty 
403 404
  else try DescrHash.find memo d
  with Not_found ->
405 406
    (*    incr count_slot;
    Printf.eprintf "%i;" !count_slot; *)
407
(*    Format.fprintf Format.std_formatter "Empty:%a@\n" !print_descr d; *)
408 409 410
    let s = { status = Maybe; active = false; notify = Nothing } in
    DescrHash.add memo d s;
    (try
411 412 413 414 415
(*       Format.fprintf Format.std_formatter "check_times_bool:@[%a@]@\n"
	 BoolPair.dump d.times;  *)
(*       check_times_bool any any d.times s; *)
       iter_s s check_times (BoolPair.get d.times);  
       iter_s s check_times (BoolPair.get d.xml); 
416
       iter_s s check_arrow (BoolPair.get d.arrow);
417 418 419 420 421 422 423
       iter_s s check_record (get_record d.record);
       if s.active then marks := s :: !marks else s.status <- Empty;
     with
	 NotEmpty -> ());
    s

and check_times (left,right) s =
424
(*  Printf.eprintf "[%i]" (List.length right);
425
  flush stderr;  *)
426 427
  let rec aux accu1 accu2 right s = match right with
    | (t1,t2)::right ->
428 429 430
	let t1 = descr t1 and t2 = descr t2 in
	if trivially_disjoint accu1 t1 || 
	   trivially_disjoint accu2 t2 then (
431 432
	     aux accu1 accu2 right s )
	else (
433 434 435 436 437 438 439 440 441
          let accu1' = diff accu1 t1 in 
	  guard accu1' (aux accu1' accu2 right) s;

          let accu2' = diff accu2 t2 in 
	    guard accu2' (aux accu1 accu2' right) s  
(*	  let accu1 = cap accu1 t1 in (* TODO: approximation of cap ... *)
          let accu2' = diff accu2 t2 in 
	  guard accu1 (guard accu2' (aux accu1 accu2' right)) s *)

442
	)
443 444
    | [] -> set s
  in
445 446 447
  let (accu1,accu2) = cap_product left in
(*  if List.length right > 6 then (
    Printf.eprintf "HEURISTIC\n"; flush stderr; 
448 449 450 451
    let (n1,n2) = cup_product right in
    let n1 = diff accu1 n1 and n2 = diff accu2 n2 in
    guard n1 set s;
    guard n2 set s;
452 453
    Printf.eprintf "HEURISTIC failed\n"; flush stderr; 
  );  *)
454
  guard accu1 (guard accu2 (aux accu1 accu2 right)) s
455

456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482

(*
and check_times_bool accu1 accu2 b s =
  match b with
    | BoolPair.True -> guard accu1 (guard accu2 set) s
    | BoolPair.False -> ()
    | BoolPair.Split (_, (t1,t2), p,i,n) ->
	check_times_bool accu1 accu2 i s;
	let t1 = descr t1 and t2 = descr t2 in
	if (trivially_disjoint accu1 t1 || trivially_disjoint accu2 t2)
	then check_times_bool accu1 accu2 n s else
	  (
	    if p <> BoolPair.False then
	      (let accu1 = cap accu1 t1 
	       and accu2 = cap accu2 t2 in
	       if not (trivially_empty accu1 || trivially_empty accu2) then
		 check_times_bool accu1 accu2 p s);
	    
	    if n <> BoolPair.False then
	      (let accu1' = diff accu1 t1 in 
	       check_times_bool accu1' accu2 n s;
               let accu2' = diff accu2 t2 in 
	       check_times_bool accu1 accu2' n s)
	  )
*)


483 484 485 486 487 488 489 490 491 492 493 494
and check_arrow (left,right) s =
  let single_right (s1,s2) s =
    let rec aux accu1 accu2 left s = match left with
      | (t1,t2)::left ->
          let accu1' = diff_t accu1 t1 in guard accu1' (aux accu1' accu2 left) s;
          let accu2' = cap_t  accu2 t2 in guard accu2' (aux accu1 accu2' left) s
      | [] -> set s
    in
    let accu1 = descr s1 in
    guard accu1 (aux accu1 (neg (descr s2)) left) s
  in
  big_conj single_right right s
495

496
and check_record (labels,(oleft,left),rights) s =
497 498
  let rec aux rights s = match rights with
    | [] -> set s
499
    | (oright,right)::rights ->
500
	let next =
501
	  (oleft && (not oright)) ||
502
	  exists (Array.length left)
503
	    (fun i -> trivially_disjoint left.(i) right.(i))
504 505 506 507 508 509
	in
	if next then aux rights s
	else
	  for i = 0 to Array.length left - 1 do
	    let back = left.(i) in
	    let di = diff back right.(i) in
510 511 512 513 514
	    guard di (fun s ->
			left.(i) <- diff back right.(i);
			aux rights s;
			left.(i) <- back;
		     ) s
515 516 517 518 519
	  done
  in
  let rec start i s =
    if (i < 0) then aux rights s
    else
520
      guard left.(i) (start (i - 1)) s
521 522 523 524 525
  in
  start (Array.length left - 1) s


let is_empty d =
526
(*  Printf.eprintf "is_empty: start\n"; flush stderr; *)
527 528
  let s = slot d in
  List.iter 
529 530
    (fun s' -> 
       if s'.status == Maybe then s'.status <- Empty; s'.notify <- Nothing) 
531 532
    !marks;
  marks := [];
533
(*  Printf.eprintf "is_empty: done\n"; flush stderr; *)
534
  s.status == Empty
535 536
  

537
module Assumptions = Set.Make(struct type t = descr let compare = compare_descr end)
538 539
let memo = ref Assumptions.empty
let cache_false = DescrHash.create 33000
540

541
let rec empty_rec d =
542
  if not (Intervals.is_empty d.ints) then false
543 544
  else if not (Atoms.is_empty d.atoms) then false
  else if not (Chars.is_empty d.chars) then false
545
  else if d.absent then false
546 547
  else if DescrHash.mem cache_false d then false 
  else if Assumptions.mem d !memo then true
548 549
  else (
    let backup = !memo in
550
    memo := Assumptions.add d backup;
551
    if 
552 553 554
      (empty_rec_times (BoolPair.get d.times)) &&
      (empty_rec_times (BoolPair.get d.xml)) &&
      (empty_rec_arrow (BoolPair.get d.arrow)) &&
555 556 557 558
      (empty_rec_record d.record) 
    then true
    else (
      memo := backup;
559
      DescrHash.add cache_false d ();
560 561 562 563 564 565 566 567 568 569
      false
    )
  )

and empty_rec_times c =
  List.for_all empty_rec_times_aux c

and empty_rec_times_aux (left,right) =
  let rec aux accu1 accu2 = function
    | (t1,t2)::right ->
570 571
	if trivially_empty (cap_t accu1 t1) || 
	   trivially_empty (cap_t accu2 t2) then
572 573 574 575 576
	  aux accu1 accu2 right
	else
          let accu1' = diff_t accu1 t1 in
          if not (empty_rec accu1') then aux accu1' accu2 right;
          let accu2' = diff_t accu2 t2 in
577
	  if not (empty_rec accu2') then aux accu1 accu2' right
578 579 580 581 582
    | [] -> raise NotEmpty
  in
  let (accu1,accu2) = cap_product left in
  (empty_rec accu1) || (empty_rec accu2) ||
    (try aux accu1 accu2 right; true with NotEmpty -> false)
583

584 585 586 587 588 589 590 591 592

and empty_rec_arrow c =
  List.for_all empty_rec_arrow_aux c

and empty_rec_arrow_aux (left,right) =
  let single_right (s1,s2) =
    let rec aux accu1 accu2 = function
      | (t1,t2)::left ->
          let accu1' = diff_t accu1 t1 in
593
          if not (empty_rec accu1') then aux accu1' accu2 left;
594
          let accu2' = cap_t accu2 t2 in
595
          if not (empty_rec accu2') then aux accu1 accu2' left
596 597 598 599 600 601 602 603
      | [] -> raise NotEmpty
    in
    let accu1 = descr s1 in
    (empty_rec accu1) ||
    (try aux accu1 (diff any (descr s2)) left; true with NotEmpty -> false)
  in
  List.exists single_right right

604
and empty_rec_record_aux (labels,(oleft,left),rights) =
605 606
  let rec aux = function
    | [] -> raise NotEmpty
607
    | (oright,right)::rights ->
608 609 610 611
	let next =
	  (oleft && (not oright)) ||
	  exists (Array.length left)
	    (fun i ->
612
	       trivially_empty (cap left.(i) right.(i)))
613 614 615 616 617 618
	in
	if next then aux rights 
	else
	  for i = 0 to Array.length left - 1 do
	    let back = left.(i) in
	    let di = diff back right.(i) in
619
	    if not (empty_rec di) then (
620 621 622 623 624 625 626
	      left.(i) <- diff back right.(i);
	      aux rights;
	      left.(i) <- back;
	    )
	  done
  in
  exists (Array.length left) 
627
    (fun i -> empty_rec left.(i))
628 629 630 631
  ||
  (try aux rights; true with NotEmpty -> false)
	    

632
and empty_rec_record c =
633
  List.for_all empty_rec_record_aux (get_record c)
634

635 636
(*
let is_empty d =
637
  empty_rec d
638
  *)
639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658

let non_empty d = 
  not (is_empty d)

let subtype d1 d2 =
  is_empty (diff d1 d2)

module Product =
struct
  type t = (descr * descr) list

  let other ?(kind=`Normal) d = 
    match kind with
      | `Normal -> { d with times = empty.times }
      | `XML -> { d with xml = empty.xml }

  let is_product ?kind d = is_empty (other ?kind d)

  let need_second = function _::_::_ -> true | _ -> false

659 660 661 662
  let normal_aux = function
    | ([] | [ _ ]) as d -> d
    | d ->

663 664 665 666 667 668 669
    let res = ref [] in

    let add (t1,t2) =
      let rec loop t1 t2 = function
	| [] -> res := (ref (t1,t2)) :: !res
	| ({contents = (d1,d2)} as r)::l ->
	    (*OPT*) 
670
(*	    if equal_descr d1 t1 then r := (d1,cup d2 t2) else*)
671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687
	      
	      let i = cap t1 d1 in
	      if is_empty i then loop t1 t2 l
	      else (
		r := (i, cup t2 d2);
		let k = diff d1 t1 in 
		if non_empty k then res := (ref (k,d2)) :: !res;
		
		let j = diff t1 d1 in 
		if non_empty j then loop j t2 l
	      )
      in
      loop t1 t2 !res
    in
    List.iter add d;
    List.map (!) !res

688
(*
689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716
This version explodes when dealing with
   Any - [ t1? t2? t3? ... tn? ]
==> need partitioning 
*)
  let get_aux d =
    let line accu (left,right) =
      let rec aux accu d1 d2 = function
	| (t1,t2)::right ->
	    let accu = 
	      let d1 = diff_t d1 t1 in
              if is_empty d1 then accu else aux accu d1 d2 right in
	    let accu =
              let d2 = diff_t d2 t2 in
              if is_empty d2 then accu else aux accu d1 d2 right in
	    accu
	| [] -> (d1,d2) :: accu
      in
      let (d1,d2) = cap_product left in
      if (is_empty d1) || (is_empty d2) then accu else aux accu d1 d2 right
    in
    List.fold_left line [] d

(* Partitioning:

(t,s) - ((t1,s1) | (t2,s2) | ... | (tn,sn))
=
(t & t1, s - s1) | ... | (t & tn, s - sn) | (t - (t1|...|tn), s)

717
*)
718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736
  let get_aux d =
    let accu = ref [] in
    let line (left,right) =
      let (d1,d2) = cap_product left in
      if (non_empty d1) && (non_empty d2) then
	let right = List.map (fun (t1,t2) -> descr t1, descr t2) right in
	let right = normal_aux right in
	let resid1 = ref d1 in
	let () = 
	  List.iter
	    (fun (t1,t2) ->
	       let t1 = cap d1 t1 in
	       if (non_empty t1) then
		 let () = resid1 := diff !resid1 t1 in
		 let t2 = diff d2 t2 in
		 if (non_empty t2) then accu := (t1,t2) :: !accu
	    ) right in
	if non_empty !resid1 then accu := (!resid1, d2) :: !accu 
    in
737
    List.iter line (BoolPair.get d);
738
    !accu
739 740 741
(* Maybe, can improve this function with:
     (t,s) \ (t1,s1) = (t&t',s\s') | (t\t',s),
   don't call normal_aux *)
742

743

744 745
  let get ?(kind=`Normal) d = 
    match kind with
746 747
      | `Normal -> get_aux d.times
      | `XML -> get_aux d.xml
748 749 750

  let pi1 = List.fold_left (fun acc (t1,_) -> cup acc t1) empty
  let pi2 = List.fold_left (fun acc (_,t2) -> cup acc t2) empty
751 752 753 754
  let pi2_restricted restr = 
    List.fold_left (fun acc (t1,t2) -> 
		      if is_empty (cap t1 restr) then acc
		      else cup acc t2) empty
755 756

  let restrict_1 rects pi1 =
757 758
    let aux acc (t1,t2) = 
      let t1 = cap t1 pi1 in if is_empty t1 then acc else (t1,t2)::acc in
759 760 761 762
    List.fold_left aux [] rects
  
  type normal = t

763
  module Memo = Map.Make(struct type t = descr BoolPair.t let compare = BoolPair.compare end)
764

765 766
  (* TODO: try with an hashtable *)
  (* Also, avoid lookup for simple products (t1,t2) *)
767 768 769 770 771 772
  let memo = ref Memo.empty
  let normal ?(kind=`Normal) d = 
    let d = match kind with `Normal -> d.times | `XML -> d.xml in
    try Memo.find d !memo 
    with
	Not_found ->
773
	  let gd = get_aux d in
774
	  let n = normal_aux gd in
775 776
(* Could optimize this call to normal_aux because one already
   know that each line is normalized ... *)
777 778
	  memo := Memo.add d n !memo;
	  n
779

780 781 782 783 784 785 786 787 788 789
  let merge_same_2 r =
    let r = 
      List.fold_left 
	(fun accu (t1,t2) ->
	   let t = try DescrMap.find t2 accu with Not_found -> empty in
	   DescrMap.add t2 (cup t t1) accu
	) DescrMap.empty r in
    DescrMap.fold (fun t2 t1 accu -> (t1,t2)::accu) r []
	 

790 791 792 793 794 795 796
  let constraint_on_2 n t1 =
    List.fold_left 
      (fun accu (d1,d2) ->
	 if is_empty (cap d1 t1) then accu else cap accu d2)
      any
      n

797 798
  let any = { empty with times = any.times }
  and any_xml = { empty with xml = any.xml }
799
  let is_empty d = d == []
800
end
801

802
module Record = 
803
struct
804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888
  let has_record d = not (is_empty { empty with record = d.record })
  let or_absent d = { d with absent = true }
  let any_or_absent = or_absent any
  let has_absent d = d.absent

  let only_absent = {empty with absent = true}
  let only_absent_node = cons only_absent

  module T = struct
    type t = descr
    let any = any_or_absent
    let cap = cap
    let cup = cup
    let diff = diff
    let is_empty = is_empty
    let empty = empty
  end
  module R = struct
    type t = descr
    let any = { empty with record = any.record }
    let cap = cap
    let cup = cup
    let diff = diff
    let is_empty = is_empty
    let empty = empty
  end
  module TR = Normal.Make(T)(R)

  let any_record = { empty with record = BoolRec.full }

  let atom o l = 
    if o && LabelMap.is_empty l then any_record else
    { empty with record = BoolRec.atom (o,l) }

  type zor = Pair of descr * descr | Any

  let aux_split d l=
    let f (o,r) =
      try
	let (lt,rem) = LabelMap.assoc_remove l r in
	Pair (descr lt, atom o rem)
      with Not_found -> 
	if o then
	  if LabelMap.is_empty r then Any else
	    Pair (any_or_absent, { empty with record = BoolRec.atom (o,r) })
	else
	  Pair (only_absent,
		{ empty with record = BoolRec.atom (o,r) })
    in
    List.fold_left 
      (fun b (p,n) ->
	 let rec aux_p accu = function
	   | x::p -> 
	       (match f x with
		  | Pair (t1,t2) -> aux_p ((t1,t2)::accu) p
		  | Any -> aux_p accu p)
	   | [] -> aux_n accu [] n
	 and aux_n p accu = function
	   | x::n -> 
	       (match f x with
		  | Pair (t1,t2) -> aux_n p ((t1,t2)::accu) n
		  | Any -> b)
	   | [] -> (p,accu) :: b in
	 aux_p [] p)
      []
      (BoolRec.get d.record)

  let split (d : descr) l =
    TR.boolean (aux_split d l)

  let split_normal d l =
    TR.boolean_normal (aux_split d l)


  let project d l =
    let t = TR.pi1 (split d l) in
    if t.absent then raise Not_found;
    t

  let project_opt d l =
    let t = TR.pi1 (split d l) in
    { t with absent = false }

  let condition d l t =
    TR.pi2_restricted t (split d l)
889

890 891 892 893 894
(* TODO: eliminate this cap ... (reord l only_absent_node) when
   not necessary. eg. {| ..... |} \ l *)

  let remove_field d l = 
    cap (TR.pi2 (split d l)) (record l only_absent_node)
895

896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978
  let first_label d =
    let min = ref LabelPool.dummy_max in
    let aux (_,r) = 
      match LabelMap.get r with
	  (l,_)::_ -> if (l:int) < !min then min := l | _ -> () in
    BoolRec.iter aux d.record;
    !min

  let empty_cases d =
    let x = BoolRec.compute
	      ~empty:0 ~full:3 ~cup:(lor) ~cap:(land)
	      ~diff:(fun a b -> a land lnot b)
	      ~atom:(function (o,r) ->
		       assert (LabelMap.get r == []);
		       if o then 3 else 1
		    )
	      d.record in
    (x land 2 <> 0, x land 1 <> 0)

  let has_empty_record d =
    BoolRec.compute
      ~empty:false ~full:true ~cup:(||) ~cap:(&&)
      ~diff:(fun a b -> a && not b)
      ~atom:(function (o,r) ->
	       List.for_all 
	         (fun (l,t) -> (descr t).absent)
	         (LabelMap.get r)
	    )
      d.record
    

(*TODO: optimize merge
   - pre-compute the sequence of labels
   - remove empty or full { l = t }
*)

  let merge d1 d2 = 
    let res = ref empty in
    let rec aux accu d1 d2 =
      let l = min (first_label d1) (first_label d2) in
      if l = LabelPool.dummy_max then
	let (some1,none1) = empty_cases d1 
	and (some2,none2) = empty_cases d2 in
	let none = none1 && none2 and some = some1 || some2 in
	let accu = LabelMap.from_list (fun _ _ -> assert false) accu in
	(* approx for the case (some && not none) ... *)
	res := cup !res (record' (some, accu))
      else
	let l1 = split d1 l and l2 = split d2 l in
	let loop (t1,d1) (t2,d2) =
	  let t = 
	    if t2.absent 
	    then cup t1 { t2 with absent = false } 
	    else t2 
	  in
	  aux ((l,cons t)::accu) d1 d2
	in
	List.iter (fun x -> List.iter (loop x) l2) l1
	  
    in
    aux [] d1 d2;
    !res

  let any = { empty with record = any.record }

  let get d =
    let rec aux r accu d =
      let l = first_label d in
      if l == LabelPool.dummy_max then
	let (o1,o2) = empty_cases d in 
	if o1 || o2 then (LabelMap.from_list_disj r,o1,o2)::accu else accu
      else
	List.fold_left 
	  (fun accu (t1,t2) -> aux ((l,t1)::r) accu t2)
	  accu
	  (split d l)
    in
    aux [] [] d
end


module Print = 
struct
979
  let print_const ppf = function
980 981 982
    | Integer i -> Intervals.print_v ppf i
    | Atom a -> Atoms.print_v ppf a
    | Char c -> Chars.print_v ppf c
983

984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004
  let nil_atom = Atoms.mk "nil"
  let nil_type = atom (Atoms.atom nil_atom)
  let (seqs_node,seqs_descr) = 
    let n = make () in
    let d = cup nil_type (times any_node n) in
    define n d;
    (n, d)

  let is_regexp t = subtype t seqs_descr
  module Decompile = Pretty.Decompile(DescrHash)

  type t = { mutable def : d list; mutable name : string option }
  and  d =
    | Name of string
    | Regexp of t Pretty.regexp
    | Atomic of (Format.formatter -> unit)
    | Pair of t * t
    | Char of Chars.v
    | Xml of [ `Tag of string | `Type of t ] * t * t
    | Record of (bool * t) label_map * bool * bool
    | Arrows of (t * t) list * (t * t) list
1005
    | Neg of t
1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017

  module DescrPairMap = 
    Map.Make(
      struct
	type t = descr * descr
	let compare (x1,y1) (x2,y2) =
	  let c = compare_descr x1 x2 in 
	  if c = 0 then compare_descr y1 y2 else c
      end)

  let named = State.ref "Types.Print.named" DescrMap.empty
  let named_xml = State.ref "Types.Print.named_xml"  DescrPairMap.empty
1018
  let register_global name d = 
1019 1020 1021 1022 1023
    if equal_descr { d with xml = BoolPair.empty } empty then 
      (let l = (*Product.merge_same_2*) (Product.get ~kind:`XML d) in
      match l with
	| [(t1,t2)] -> named_xml := DescrPairMap.add (t1,t2) name !named_xml
	| _ -> ());
1024
    named := DescrMap.add d name !named
1025

1026 1027 1028
  let memo = DescrHash.create 63
  let empty_t = { def = []; name = None }

1029 1030 1031 1032 1033
  let count_name = ref 0
  let name () =
    incr count_name;
    "X" ^ (string_of_int !count_name)

1034 1035 1036 1037
  let to_print = ref []

  let trivial_rec b = b == BoolRec.empty || (is_empty { empty with record = BoolRec.diff BoolRec.full b})

1038
  let trivial_pair b = b == BoolPair.empty || b == BoolPair.full
1039 1040

  let worth_abbrev d = 
1041 1042
    not (trivial_pair d.times && trivial_pair d.xml && 
	 trivial_pair d.arrow && trivial_rec d.record) 
1043

1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056
  let worth_complement d =
    let aux f x y = if f x y = 0 then 1 else 0 in
    let n = 
      aux Atoms.compare d.atoms any.atoms +
      aux Chars.compare d.chars any.chars +
      aux Intervals.compare d.ints any.ints +
      aux BoolPair.compare d.times any.times +
      aux BoolPair.compare d.xml any.xml +
      aux BoolPair.compare d.arrow any.arrow +
      aux BoolRec.compare d.record any.record in
    n >= 4


1057
  let rec prepare d =
1058
    try 
1059 1060 1061 1062 1063 1064
      let slot = DescrHash.find memo d  in
      if (slot.name == None) then
	(let n = name () in
	 slot.name <-