types.ml 46.4 KB
Newer Older
1
open Ident
2
open Encodings
3

4 5 6 7 8
(* TODO:
   - I store hash in types to avoid computing it several times.
     Does not seem to help a lot.
*)

9 10 11 12 13 14 15 16 17 18
(*
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


19
type const = 
20
  | Integer of Intervals.V.t
21
  | Atom of Atoms.V.t 
22
  | Char of Chars.V.t
23 24 25 26
  | Pair of const * const
  | Xml of const * const
  | Record of const label_map
  | String of U.uindex * U.uindex * U.t * const
27

28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
module Const = struct
  include Custom.Dummy
  type t = const

  let rec serialize s = function
    | Integer x ->
	Serialize.Put.bits 3 s 0;
	Intervals.V.serialize s x
    | Atom x ->
	Serialize.Put.bits 3 s 1;
	Atoms.V.serialize s x
    | Char x ->
	Serialize.Put.bits 3 s 2;
	Chars.V.serialize s x
    | Pair (x,y) ->
	Serialize.Put.bits 3 s 3;
	serialize s x;
	serialize s y
    | Xml (x,y) ->
	Serialize.Put.bits 3 s 4;
	serialize s x;
	serialize s y
    | Record r ->
	Serialize.Put.bits 3 s 5;
	LabelMap.serialize serialize s r
    | String (i,j,st,q) ->
	Serialize.Put.bits 3 s 6;
	U.serialize_sub s st i j;
	serialize s q

  let rec deserialize s =
    match Serialize.Get.bits 3 s with
      | 0 ->
	  Integer (Intervals.V.deserialize s)
      | 1 ->
	  Char (Chars.V.deserialize s)
      | 2 ->
	  Atom (Atoms.V.deserialize s)
      | 3 ->
	  let x = deserialize s in
	  let y = deserialize s in
	  Pair (x,y)
      | 4 ->
	  let x = deserialize s in
	  let y = deserialize s in
	  Xml (x,y)
      | 5 ->
	  Record (LabelMap.deserialize deserialize s)
      | 6 ->
	  let st = U.deserialize s in
	  let q = deserialize s in
	  String (U.start_index st, U.end_index st, st, q)
      | _ ->
	  assert false

  let rec compare c1 c2 = match (c1,c2) with
84
    | Integer x, Integer y -> Intervals.V.compare x y
85 86
    | Integer _, _ -> -1
    | _, Integer _ -> 1
87
    | Atom x, Atom y -> Atoms.V.compare x y
88 89
    | Atom _, _ -> -1
    | _, Atom _ -> 1
90
    | Char x, Char y -> Chars.V.compare x y
91 92 93
    | Char _, _ -> -1
    | _, Char _ -> 1
    | Pair (x1,x2), Pair (y1,y2) ->
94 95
	let c = compare x1 y1 in
	if c <> 0 then c else compare x2 y2
96 97 98
    | Pair (_,_), _ -> -1
    | _, Pair (_,_) -> 1
    | Xml (x1,x2), Xml (y1,y2) ->
99 100
	let c = compare x1 y1 in
	if c <> 0 then c else compare x2 y2
101 102 103
    | Xml (_,_), _ -> -1
    | _, Xml (_,_) -> 1
    | Record x, Record y ->
104
	LabelMap.compare compare x y
105 106 107 108 109 110 111
    | Record _, _ -> -1
    | _, Record _ -> 1
    | String (i1,j1,s1,r1), String (i2,j2,s2,r2) ->
	let c = Pervasives.compare i1 i2 in if c <> 0 then c 
	else let c = Pervasives.compare j1 j2 in if c <> 0 then c
	else let c = U.compare s1 s2 in if c <> 0 then c (* Should compare
							    only the substring *)
112 113 114 115 116 117 118 119 120 121
	else compare r1 r2

  let rec hash = function
    | Integer x -> 1 + 17 * (Intervals.V.hash x)
    | Atom x -> 2 + 17 * (Atoms.V.hash x)
    | Char x -> 3 + 17 * (Chars.V.hash x)
    | Pair (x,y) -> 4 + 17 * (hash x) + 257 * (hash y)
    | Xml (x,y) -> 5 + 17 * (hash x) + 257 * (hash y)
    | Record x -> 6 + 17 * (LabelMap.hash hash x)
    | String (i,j,s,r) -> 7 + 17 * (U.hash s) + 257 * hash r
122
      (* Note: improve hash for String *)
123

124 125
  let equal c1 c2 = compare c1 c2 = 0
end
126

127 128
type pair_kind = [ `Normal | `XML ]

129 130 131 132 133 134 135
let count = State.ref "Types.count" 0
		
let () =
  Stats.register Stats.Summary
    (fun ppf -> Format.fprintf ppf "Allocated type nodes:%i@\n" !count)
      

136 137 138 139 140 141 142 143 144
module rec Descr : 
sig
(*
  Want to write:
    type s = { ... }
    include Custom.T with type t = s
  but a  bug in OCaml 3.07+beta 2 makes it impossible
*)
  type t = {
145
    mutable hash: int;
146 147 148 149 150 151 152 153 154
    atoms : Atoms.t;
    ints  : Intervals.t;
    chars : Chars.t;
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
    absent: bool
  }
155
  val empty: t
156 157 158 159 160 161 162 163 164 165 166
  val dump: Format.formatter -> t -> unit
  val check: t -> unit
  val equal: t -> t -> bool
  val hash: t -> int
  val compare:t -> t -> int
  val serialize: t Serialize.Put.f
  val deserialize: t Serialize.Get.f
end =
struct
  include Custom.Dummy
  type t = {
167
    mutable hash: int;
168 169 170 171 172 173 174 175 176
    atoms : Atoms.t;
    ints  : Intervals.t;
    chars : Chars.t;
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
    absent: bool
  }
177 178 179 180 181 182 183 184 185 186 187 188 189

  let empty = { 
    hash = 0;
    times = BoolPair.empty; 
    xml   = BoolPair.empty; 
    arrow = BoolPair.empty; 
    record= BoolRec.empty;
    ints  = Intervals.empty;
    atoms = Atoms.empty;
    chars = Chars.empty;
    absent= false;
  }

190
  let equal a b =
191 192 193 194 195 196 197 198 199 200
    (a == b) || (
      (Atoms.equal a.atoms b.atoms) &&
      (Chars.equal a.chars b.chars) &&
      (Intervals.equal a.ints  b.ints) &&
      (BoolPair.equal a.times b.times) &&
      (BoolPair.equal a.xml b.xml) &&
      (BoolPair.equal a.arrow b.arrow) &&
      (BoolRec.equal a.record b.record) &&
      (a.absent == b.absent)
    )
201 202 203 204 205 206 207 208 209 210 211 212 213

  let compare a b =
    if a == b then 0 
    else let c = Atoms.compare a.atoms b.atoms in if c <> 0 then c
    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
    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
    else let c = BoolRec.compare a.record b.record in if c <> 0 then c
    else if a.absent && not b.absent then -1
    else if b.absent && not a.absent then 1
    else 0
214
      
215
  let hash a =
216 217 218 219 220 221 222 223 224 225 226 227
    if a.hash <> 0 then a.hash else (
      let accu = Chars.hash a.chars in
      let accu = 17 * accu + Intervals.hash a.ints in
      let accu = 17 * accu + Atoms.hash a.atoms in
      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
      let accu = 17 * accu + BoolRec.hash a.record in
      let accu = if a.absent then accu+5 else accu in
      a.hash <- accu;
      accu
    )
228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247

  let serialize t a =
    Chars.serialize t a.chars;
    Intervals.serialize t a.ints;
    Atoms.serialize t a.atoms;
    BoolPair.serialize t a.times;
    BoolPair.serialize t a.xml;
    BoolPair.serialize t a.arrow;
    BoolRec.serialize t a.record;
    Serialize.Put.bool t a.absent 

  let deserialize t =
    let chars = Chars.deserialize t in
    let ints = Intervals.deserialize t in
    let atoms = Atoms.deserialize t in
    let times = BoolPair.deserialize t in
    let xml = BoolPair.deserialize t in
    let arrow = BoolPair.deserialize t in
    let record = BoolRec.deserialize t in
    let absent = Serialize.Get.bool t in
248 249
    { hash=0; 
      chars = chars; ints = ints; atoms = atoms; times = times; xml = xml;
250 251 252
      arrow = arrow; record = record; absent = absent }
   
    
253 254 255
end
and Node :
sig
256

257 258 259 260 261 262 263 264 265 266 267 268 269
  type t = { id : int; mutable descr : Descr.t }
  val dump: Format.formatter -> t -> unit
  val check: t -> unit
  val equal: t -> t -> bool
  val hash: t -> int
  val compare:t -> t -> int
  val serialize: t Serialize.Put.f
  val deserialize: t Serialize.Get.f
end =
struct
  type t = { id : int; mutable descr : Descr.t }
  include Custom.Dummy
  let hash x = x.id
270
  let compare x y = x.id - y.id  (* ids are small enough ! *)
271
  let equal x y = x == y
272

273 274 275

  module SMemo = Set.Make(Custom.Int)
  let memo = Serialize.Put.mk_property (fun t -> ref SMemo.empty)
276
  let serialize t n = 
277
    let l = Serialize.Put.get_property memo t in
278
    Serialize.Put.int t n.id;
279 280 281 282
    if not (SMemo.mem n.id !l) then ( 
      l := SMemo.add n.id !l; 
      Descr.serialize t n.descr
    )
283

284 285
  module DMemo = Map.Make(Custom.Int)
  let memo = Serialize.Get.mk_property (fun t -> ref DMemo.empty)
286
  let deserialize t = 
287
    let l = Serialize.Get.get_property memo t in
288
    let id = Serialize.Get.int t in
289 290 291 292 293 294 295 296
    try DMemo.find id !l
    with Not_found ->
      (* TODO: hash-consing ? *)
      incr count; 
      let n = { id = !count; descr = Descr.empty } in
      l := DMemo.add id n !l;
      n.descr <- Descr.deserialize t;
      n
297 298
end

299
(* It is also possible to use Boolean instead of Bool here;
300
   need to analyze when each one is more efficient *)
301 302 303 304 305 306
and BoolPair : Bool.S with type elem = Node.t * Node.t = 
Bool.Make(Custom.Pair(Node)(Node))

and BoolRec : Bool.S with type elem = bool * Node.t label_map =
Bool.Make(Custom.Pair(Custom.Bool)(LabelSet.MakeMap(Node)))

307 308 309 310
module DescrHash = Hashtbl.Make(Descr)
module DescrMap = Map.Make(Descr)
module DescrSet = Set.Make(Descr)
module DescrSList = SortedList.Make(Descr)
311

312 313 314
type descr = Descr.t
type node = Node.t
include Descr
315 316 317 318 319 320 321 322 323 324 325 326 327 328

let hash_cons = DescrHash.create 17000  

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

329
let any =  {
330
  hash = 0;
331 332 333
  times = BoolPair.full; 
  xml   = BoolPair.full; 
  arrow = BoolPair.full; 
334
  record= BoolRec.full; 
335 336 337
  ints  = Intervals.any;
  atoms = Atoms.any;
  chars = Chars.any;
338
  absent= false;
339
}
340 341

let non_constructed =
342 343 344
  { any with  
      hash = 0;
      times = empty.times; xml = empty.xml; record = empty.record }
345
     
346
	     
347 348 349 350
let interval i = { empty with hash = 0; ints = i }
let times x y = { empty with hash = 0; times = BoolPair.atom (x,y) }
let xml x y = { empty with hash = 0; xml = BoolPair.atom (x,y) }
let arrow x y = { empty with hash = 0; arrow = BoolPair.atom (x,y) }
351
let record label t = 
352 353
  { empty with hash = 0; 
      record = BoolRec.atom (true,LabelMap.singleton label t) }
354
let record' (x : bool * node Ident.label_map) =
355 356 357
  { empty with hash = 0; record = BoolRec.atom x }
let atom a = { empty with hash = 0; atoms = a }
let char c = { empty with hash = 0; chars = c }
358
      
359 360
let cup x y = 
  if x == y then x else {
361
    hash = 0;
362 363 364
    times = BoolPair.cup x.times y.times;
    xml   = BoolPair.cup x.xml y.xml;
    arrow = BoolPair.cup x.arrow y.arrow;
365
    record= BoolRec.cup x.record y.record;
366 367 368
    ints  = Intervals.cup x.ints  y.ints;
    atoms = Atoms.cup x.atoms y.atoms;
    chars = Chars.cup x.chars y.chars;
369
    absent= x.absent || y.absent;
370 371 372 373
  }
    
let cap x y = 
  if x == y then x else {
374
    hash = 0;
375 376
    times = BoolPair.cap x.times y.times;
    xml   = BoolPair.cap x.xml y.xml;
377
    record= BoolRec.cap x.record y.record;
378
    arrow = BoolPair.cap x.arrow y.arrow;
379 380 381
    ints  = Intervals.cap x.ints  y.ints;
    atoms = Atoms.cap x.atoms y.atoms;
    chars = Chars.cap x.chars y.chars;
382
    absent= x.absent && y.absent;
383 384 385 386
  }
    
let diff x y = 
  if x == y then empty else {
387
    hash = 0;
388 389 390
    times = BoolPair.diff x.times y.times;
    xml   = BoolPair.diff x.xml y.xml;
    arrow = BoolPair.diff x.arrow y.arrow;
391
    record= BoolRec.diff x.record y.record;
392 393 394
    ints  = Intervals.diff x.ints  y.ints;
    atoms = Atoms.diff x.atoms y.atoms;
    chars = Chars.diff x.chars y.chars;
395
    absent= x.absent && not y.absent;
396 397
  }
    
398

399

400

401 402 403 404 405 406 407 408
(* 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) &&
409 410
  (BoolRec.trivially_disjoint a.record b.record) &&
  (not (a.absent && b.absent))
411

412

413

414
let descr n = n.Node.descr
415
let internalize n = n
416
let id n = n.Node.id
417 418


419 420 421 422 423 424 425 426 427 428 429 430 431
let rec constant = function
  | Integer i -> interval (Intervals.atom i)
  | Atom a -> atom (Atoms.atom a)
  | Char c -> char (Chars.atom c)
  | Pair (x,y) -> times (const_node x) (const_node y)
  | Xml (x,y) -> times (const_node x) (const_node y)
  | Record x -> record' (false ,LabelMap.map const_node x)
  | String (i,j,s,c) ->
      if U.equal_index i j then constant c
      else 
	let (ch,i') = U.next s i in
	constant (Pair (Char (Chars.V.mk_int ch), String (i',j,s,c)))
and const_node c = cons (constant c)
432

433 434
let neg x = diff any x

435 436
let any_node = cons any

437
module LabelS = Set.Make(LabelPool)
438

439 440 441
let any_or_absent = { any with hash=0; absent = true } 
let only_absent = { empty with hash=0; absent = true }

442 443
let get_record r =
  let labs accu (_,r) = 
444 445
    List.fold_left 
      (fun accu (l,_) -> LabelS.add l accu) accu (LabelMap.get r) in
446
  let extend descrs labs (o,r) =
447 448 449 450 451
    let rec aux i labs r =
      match labs with
	| [] -> ()
	| l1::labs ->
	    match r with
452
	      | (l2,x)::r when l1 == l2 -> 
453 454 455
		  descrs.(i) <- cap descrs.(i) (descr x);
		  aux (i+1) labs r
	      | r ->
456 457
		  if not o then 
		    descrs.(i) <- cap descrs.(i) only_absent; (* TODO:OPT *)
458 459
		  aux (i+1) labs r
    in
460
    aux 0 labs (LabelMap.get r);
461 462 463 464
    o
  in
  let line (p,n) =
    let labels = 
465 466
      List.fold_left labs (List.fold_left labs LabelS.empty p) n in
    let labels = LabelS.elements labels in
467
    let nlab = List.length labels in
468
    let mk () = Array.create nlab any_or_absent in
469 470 471 472 473 474 475 476 477 478 479 480 481 482 483

    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
484
  List.map line (BoolRec.get r)
485
   
486

487

488 489 490 491 492 493 494


(* 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)
495
let cap_product any_left any_right l =
496 497
  List.fold_left 
    (fun (d1,d2) (t1,t2) -> (cap_t d1 t1, cap_t d2 t2))
498
    (any_left,any_right)
499
    l
500
let any_pair = { empty with hash = 0; times = any.times }
501

502

503 504 505
let rec exists max f =
  (max > 0) && (f (max - 1) || exists (max - 1) f)

506
exception NotEmpty
507

508 509 510 511 512 513 514 515 516 517 518 519
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 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) -> 
520
      if n.status == Maybe then (try f n with NotEmpty -> ());
521 522 523 524 525 526 527 528 529 530
      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;
531
  s.notify <- Nothing; 
532 533 534 535 536 537 538
  raise NotEmpty

let rec big_conj f l n =
  match l with
    | [] -> set n
    | [arg] -> f arg n
    | arg::rem ->
539 540 541
	let s = 
	  { status = Maybe; active = false; 
	    notify = Do (n,(big_conj f rem), Nothing) } in
542 543 544
	try 
	  f arg s;
	  if s.active then n.active <- true
545
	with NotEmpty -> if n.status == NEmpty then raise NotEmpty
546

547 548
let guard a f n =
  match a with
549
    | { status = Empty } -> ()
550 551 552
    | { status = Maybe } as s -> 
	n.active <- true; 
	s.notify <- Do (n,f,s.notify)
553
    | { status = NEmpty } -> f n
554

555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652

(* Fast approximation *)

module ClearlyEmpty = 
struct

let memo = DescrHash.create 33000
let marks = ref [] 

let rec slot d =
  if not ((Intervals.is_empty d.ints) && 
	  (Atoms.is_empty d.atoms) &&
	  (Chars.is_empty d.chars) &&
	  (not d.absent)) then slot_not_empty 
  else try DescrHash.find memo d
  with Not_found ->
    let s = { status = Maybe; active = false; notify = Nothing } in
    DescrHash.add memo d s;
    (try
       iter_s s check_times (BoolPair.get d.times);  
       iter_s s check_xml (BoolPair.get d.xml); 
       iter_s s check_arrow (BoolPair.get d.arrow);
       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 =
  let (accu1,accu2) = cap_product any any left in
  let single_right (t1,t2) s =
    let t1 = descr t1 and t2 = descr t2 in
    if trivially_disjoint accu1 t1 || trivially_disjoint accu2 t2 then set s 
    else
      let accu1 = diff accu1 t1 in guard (slot accu1) set s;
      let accu2 = diff accu2 t2 in guard (slot accu2) set s in
  guard (slot accu1) (guard (slot accu2) (big_conj single_right right)) s

and check_xml (left,right) s =
  let (accu1,accu2) = cap_product any any_pair left in
  let single_right (t1,t2) s =
    let t1 = descr t1 and t2 = descr t2 in
    if trivially_disjoint accu1 t1 || trivially_disjoint accu2 t2 then set s 
    else
      let accu1 = diff accu1 t1 in guard (slot accu1) set s;
      let accu2 = diff accu2 t2 in guard (slot accu2) set s in
  guard (slot accu1) (guard (slot accu2) (big_conj single_right right)) s

and check_arrow (left,right) s =
  let single_right (s1,s2) s =
    let accu1 = descr s1 and accu2 = neg (descr s2) in
    let single_left (t1,t2) s =
      let accu1 = diff_t accu1 t1 in guard (slot accu1) set s;
      let accu2 = cap_t  accu2 t2 in guard (slot accu2) set s
    in
    guard (slot accu1) (big_conj single_left left) s
  in
  big_conj single_right right s

and check_record (labels,(oleft,left),rights) s =
  let rec single_right (oright,right) s = 
    let next =
      (oleft && (not oright)) ||
      exists (Array.length left)
	(fun i -> trivially_disjoint left.(i) right.(i))
    in
    if next then set s
    else
      for i = 0 to Array.length left - 1 do
	let di = diff left.(i) right.(i) in guard (slot di) set s
      done
  in
  let rec start i s =
    if (i < 0) then big_conj single_right rights s
    else guard (slot left.(i)) (start (i - 1)) s
  in
  start (Array.length left - 1) s


let is_empty d =
  let s = slot d in
  List.iter 
    (fun s' -> 
       if s'.status == Maybe then s'.status <- Empty; s'.notify <- Nothing) 
    !marks;
  marks := [];
  s.status == Empty
end

let clearly_disjoint t1 t2 =
(*
  if trivially_disjoint t1 t2 then true
  else
    if ClearlyEmpty.is_empty (cap t1 t2) then
      (Printf.eprintf "!\n"; true) else false
*)
  trivially_disjoint t1 t2 || ClearlyEmpty.is_empty (cap t1 t2) 

653 654
(* TODO: need to invesigate when ClearEmpty is a good thing... *)

655 656 657 658
let memo = DescrHash.create 33000
let marks = ref [] 

let rec slot d =
659 660
  if not ((Intervals.is_empty d.ints) && 
	  (Atoms.is_empty d.atoms) &&
661 662
	  (Chars.is_empty d.chars) &&
	  (not d.absent)) then slot_not_empty 
663 664 665 666 667
  else try DescrHash.find memo d
  with Not_found ->
    let s = { status = Maybe; active = false; notify = Nothing } in
    DescrHash.add memo d s;
    (try
668
       iter_s s check_times (BoolPair.get d.times);  
669
       iter_s s check_xml (BoolPair.get d.xml); 
670
       iter_s s check_arrow (BoolPair.get d.arrow);
671 672 673 674 675 676 677 678 679
       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 =
  let rec aux accu1 accu2 right s = match right with
    | (t1,t2)::right ->
680 681 682
	let t1 = descr t1 and t2 = descr t2 in
	if trivially_disjoint accu1 t1 || 
	   trivially_disjoint accu2 t2 then (
683 684
	     aux accu1 accu2 right s )
	else (
685
          let accu1' = diff accu1 t1 in 
686
	  guard (slot accu1') (aux accu1' accu2 right) s;
687 688

          let accu2' = diff accu2 t2 in 
689
	  guard (slot accu2') (aux accu1 accu2' right) s  
690
	)
691 692
    | [] -> set s
  in
693
  let (accu1,accu2) = cap_product any any left in
694
  guard (slot accu1) (guard (slot accu2) (aux accu1 accu2 right)) s
695 696 697 698 699

and check_xml (left,right) s =
  let rec aux accu1 accu2 right s = match right with
    | (t1,t2)::right ->
	let t1 = descr t1 and t2 = descr t2 in
700
	if clearly_disjoint accu1 t1 || 
701 702 703 704
	   trivially_disjoint accu2 t2 then (
	     aux accu1 accu2 right s )
	else (
          let accu1' = diff accu1 t1 in 
705
	  guard (slot accu1') (aux accu1' accu2 right) s;
706 707

          let accu2' = diff accu2 t2 in 
708
	  guard (slot accu2') (aux accu1 accu2' right) s  
709 710 711 712
	)
    | [] -> set s
  in
  let (accu1,accu2) = cap_product any any_pair left in
713
  guard (slot accu1) (guard (slot accu2) (aux accu1 accu2 right)) s
714

715 716 717 718
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 ->
719
          let accu1' = diff_t accu1 t1 in 
720
	  guard (slot accu1') (aux accu1' accu2 left) s;
721 722

          let accu2' = cap_t  accu2 t2 in 
723
	  guard (slot accu2') (aux accu1 accu2' left) s
724 725 726
      | [] -> set s
    in
    let accu1 = descr s1 in
727
    guard (slot accu1) (aux accu1 (neg (descr s2)) left) s
728 729
  in
  big_conj single_right right s
730

731
and check_record (labels,(oleft,left),rights) s =
732 733
  let rec aux rights s = match rights with
    | [] -> set s
734
    | (oright,right)::rights ->
735
	let next =
736
	  (oleft && (not oright)) ||
737
	  exists (Array.length left)
738
	    (fun i -> trivially_disjoint left.(i) right.(i))
739 740 741 742 743 744
	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
745 746
	    guard (slot di) (fun s ->
			left.(i) <- di;
747 748 749
			aux rights s;
			left.(i) <- back;
		     ) s
750
(* TODO: are side effects correct ? *)
751 752 753 754 755
	  done
  in
  let rec start i s =
    if (i < 0) then aux rights s
    else
756
      guard (slot left.(i)) (start (i - 1)) s
757 758 759 760
  in
  start (Array.length left - 1) s


761 762
let timer_subtype = Stats.Timer.create "Types.is_empty"

763
let is_empty d =
764
  Stats.Timer.start timer_subtype;
765 766
  let s = slot d in
  List.iter 
767 768
    (fun s' -> 
       if s'.status == Maybe then s'.status <- Empty; s'.notify <- Nothing) 
769 770
    !marks;
  marks := [];
771 772
  Stats.Timer.stop timer_subtype 
    (s.status == Empty)
773

774
(*
775
let is_empty d =
776 777 778 779 780 781 782
(*  let b1 = ClearlyEmpty.is_empty d in
  let b2 = is_empty d in
  assert (b2 || not b1);
  Printf.eprintf "b1 = %b; b2 = %b\n" b1 b2;
  b2  *)
  if ClearlyEmpty.is_empty d then (Printf.eprintf "!\n"; true) else is_empty d
*)  
783 784 785 786 787 788 789 790 791 792 793 794 795

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
796 797
      | `Normal -> { d with hash = 0; times = empty.times }
      | `XML -> { d with hash = 0; xml = empty.xml }
798 799 800 801 802

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

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

803 804 805 806
  let normal_aux = function
    | ([] | [ _ ]) as d -> d
    | d ->

807 808 809 810 811 812 813
    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*) 
814
(*	    if equal_descr d1 t1 then r := (d1,cup d2 t2) else*)
815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838
	      
	      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


(* Partitioning:

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

839
*)
840
  let get_aux any_right d =
841 842
    let accu = ref [] in
    let line (left,right) =
843
      let (d1,d2) = cap_product any any_right left in
844 845 846 847 848 849 850 851 852 853 854 855 856 857 858
      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
859
    List.iter line (BoolPair.get d);
860
    !accu
861 862 863
(* Maybe, can improve this function with:
     (t,s) \ (t1,s1) = (t&t',s\s') | (t\t',s),
   don't call normal_aux *)
864

865

866 867
  let get ?(kind=`Normal) d = 
    match kind with
868 869
      | `Normal -> get_aux any d.times
      | `XML -> get_aux any_pair d.xml
870 871 872

  let pi1 = List.fold_left (fun acc (t1,_) -> cup acc t1) empty
  let pi2 = List.fold_left (fun acc (_,t2) -> cup acc t2) empty
873 874 875 876
  let pi2_restricted restr = 
    List.fold_left (fun acc (t1,t2) -> 
		      if is_empty (cap t1 restr) then acc
		      else cup acc t2) empty
877 878

  let restrict_1 rects pi1 =
879 880
    let aux acc (t1,t2) = 
      let t1 = cap t1 pi1 in if is_empty t1 then acc else (t1,t2)::acc in
881 882 883 884
    List.fold_left aux [] rects
  
  type normal = t

885
  module Memo = Map.Make(BoolPair)
886

887 888
  (* TODO: try with an hashtable *)
  (* Also, avoid lookup for simple products (t1,t2) *)
889
  let memo = ref Memo.empty
890
  let normal_times d = 
891 892 893
    try Memo.find d !memo 
    with
	Not_found ->
894
	  let gd = get_aux any d in
895
	  let n = normal_aux gd in
896 897
(* Could optimize this call to normal_aux because one already
   know that each line is normalized ... *)
898 899
	  memo := Memo.add d n !memo;
	  n
900

901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916
  let memo_xml = ref Memo.empty
  let normal_xml d = 
    try Memo.find d !memo_xml
    with
	Not_found ->
	  let gd = get_aux any_pair d in
	  let n = normal_aux gd in
	  memo_xml := Memo.add d n !memo_xml;
	  n

  let normal ?(kind=`Normal) d =
    match kind with 
      | `Normal -> normal_times d.times 
      | `XML -> normal_xml d.xml


917 918 919 920 921 922 923 924 925 926
  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 []
	 

927 928 929 930 931 932 933
  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

934 935
  let any = { empty with hash = 0; times = any.times }
  and any_xml = { empty with hash = 0; xml = any.xml }
936
  let is_empty d = d == []
937
end
938

939
module Record = 
940
struct
941 942
  let has_record d = not (is_empty { empty with hash= 0; record = d.record })
  let or_absent d = { d with hash = 0; absent = true }
943 944 945
  let any_or_absent = or_absent any
  let has_absent d = d.absent

946
  let only_absent = {empty with hash = 0; absent = true}
947 948 949 950 951 952 953 954 955 956 957 958 959
  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
960
    let any = { empty with hash = 0; record = any.record }
961 962 963 964 965 966 967 968
    let cap = cap
    let cup = cup
    let diff = diff
    let is_empty = is_empty
    let empty = empty
  end
  module TR = Normal.Make(T)(R)

969
  let any_record = { empty with hash = 0; record = BoolRec.full }
970 971 972

  let atom o l = 
    if o && LabelMap.is_empty l then any_record else
973
    { empty with hash = 0; record = BoolRec.atom (o,l) }
974 975 976 977 978 979 980 981 982 983 984

  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
985
	    Pair (any_or_absent, { empty with hash=0; record = BoolRec.atom (o,r) })
986 987
	else
	  Pair (only_absent,
988
		{ empty with hash = 0; record = BoolRec.atom (o,r) })
989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004