types.ml 50.1 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
20
21
module CompUnit = struct   
  include Pool.Make(Utf8)
  module Tbl = Inttbl
22
      
23
  let pervasives = mk (U.mk "Pervasives") 
24
  let current = ref dummy_min
25
      
26
  let close_serialize_ref = ref (fun () -> assert false)
27
      
28
  let depend = Inttbl.create ()
29
      
30
  let serialize t cu =
31
    if (cu != pervasives) && (cu != !current) then Inttbl.add depend cu ();
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
    serialize t cu

  let close_serialize () =
    !close_serialize_ref ();
    let deps = Inttbl.fold depend (fun cu () l -> cu :: l) [] in
    Inttbl.clear depend;
    deps


  let stack = ref []
		
  let enter i = stack := !current :: !stack; current := i
		  
  let leave () =
    match !stack with
      | hd::tl -> current := hd; stack := tl
      | _ -> assert false


  let () = enter pervasives
end	  


55
type const = 
56
  | Integer of Intervals.V.t
57
  | Atom of Atoms.V.t 
58
  | Char of Chars.V.t
59
60
61
62
  | Pair of const * const
  | Xml of const * const
  | Record of const label_map
  | String of U.uindex * U.uindex * U.t * const
63

64
65
66
module Const = struct
  type t = const

67
68
69
70
71
72
73
74
75
76
77
  let rec check = function
    | Integer i -> Intervals.V.check i
    | Atom i -> Atoms.V.check i
    | Char i -> Chars.V.check i
    | Pair (x,y) | Xml (x,y) -> check x; check y
    | Record l -> LabelMap.iter check l
    | String (i,j,s,q) -> U.check s; check q

  let dump ppf _ =
    Format.fprintf ppf "<Types.Const.t>"

78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
  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 ->
	  Atom (Atoms.V.deserialize s)
110
111
      | 2 ->
	  Char (Chars.V.deserialize s)
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
      | 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
130
    | Integer x, Integer y -> Intervals.V.compare x y
131
132
    | Integer _, _ -> -1
    | _, Integer _ -> 1
133
    | Atom x, Atom y -> Atoms.V.compare x y
134
135
    | Atom _, _ -> -1
    | _, Atom _ -> 1
136
    | Char x, Char y -> Chars.V.compare x y
137
138
139
    | Char _, _ -> -1
    | _, Char _ -> 1
    | Pair (x1,x2), Pair (y1,y2) ->
140
141
	let c = compare x1 y1 in
	if c <> 0 then c else compare x2 y2
142
143
144
    | Pair (_,_), _ -> -1
    | _, Pair (_,_) -> 1
    | Xml (x1,x2), Xml (y1,y2) ->
145
146
	let c = compare x1 y1 in
	if c <> 0 then c else compare x2 y2
147
148
149
    | Xml (_,_), _ -> -1
    | _, Xml (_,_) -> 1
    | Record x, Record y ->
150
	LabelMap.compare compare x y
151
152
153
154
155
156
157
    | 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 *)
158
159
160
161
162
163
164
165
166
167
	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
168
      (* Note: improve hash for String *)
169

170
171
  let equal c1 c2 = compare c1 c2 = 0
end
172

173
174
module Abstract =
struct
175
  module T = Custom.String
176
177
178
179
180
181
182
183
184
185
186
187
  type abs = T.t

  module V =
  struct
    type t = abs * Obj.t
  end

  include SortedList.FiniteCofinite(T)

  let print = function
    | Finite [] -> [ ]
    | Cofinite [] -> [ fun ppf -> Format.fprintf ppf "Abstract" ]
188
189
    | Finite l -> List.map (fun x ppf -> Format.fprintf ppf "!%s" x) l
    | Cofinite _ -> assert false
190
191
192
193

end


194
195
type pair_kind = [ `Normal | `XML ]

196

197
198
199
200
201
202
module rec Descr : 
sig
(*
  Want to write:
    type s = { ... }
    include Custom.T with type t = s
203
  but a  bug (?) in OCaml 3.07 makes it impossible
204
205
*)
  type t = {
206
    mutable hash: int;
207
208
209
210
211
212
213
    atoms : Atoms.t;
    ints  : Intervals.t;
    chars : Chars.t;
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
214
    abstract: Abstract.t;
215
216
    absent: bool
  }
217
  val empty: t
218
219
220
221
222
223
224
225
226
227
  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 = {
228
    mutable hash: int;
229
230
231
232
233
234
235
    atoms : Atoms.t;
    ints  : Intervals.t;
    chars : Chars.t;
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
236
    abstract: Abstract.t;
237
238
    absent: bool
  }
239

240
241
242
  let dump ppf _ =
    Format.fprintf ppf "<Types.Descr.t>"

243
244
245
246
247
248
249
250
251
  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;
252
    abstract = Abstract.empty;
253
254
255
    absent= false;
  }

256
  let equal a b =
257
258
259
260
261
262
263
264
    (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) &&
265
      (Abstract.equal a.abstract b.abstract) &&
266
267
      (a.absent == b.absent)
    )
268
269
270
271
272
273
274
275
276
277

  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
278
    else let c = Abstract.compare a.abstract b.abstract in if c <> 0 then c
279
280
281
    else if a.absent && not b.absent then -1
    else if b.absent && not a.absent then 1
    else 0
282
      
283
  let hash a =
284
285
286
287
288
289
290
291
    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
292
      let accu = 17 * accu + Abstract.hash a.abstract in
293
294
295
296
      let accu = if a.absent then accu+5 else accu in
      a.hash <- accu;
      accu
    )
297

298
299
300
301
302
303
304
305
  let check a =
    Chars.check a.chars;
    Intervals.check a.ints;
    Atoms.check a.atoms;
    BoolPair.check a.times;
    BoolPair.check a.xml;
    BoolPair.check a.arrow;
    BoolRec.check a.record;
306
    Abstract.check a.abstract;
307
308
309
    ()


310
311
312
313
314
315
316
317
  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;
318
    Abstract.serialize t a.abstract;
319
320
321
322
323
324
325
326
327
328
    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
329
    let abstract = Abstract.deserialize t in
330
    let absent = Serialize.Get.bool t in
331
    let d = { hash=0; 
332
      chars = chars; ints = ints; atoms = atoms; times = times; xml = xml;
333
      arrow = arrow; record = record; abstract = abstract; absent = absent } in
334
335
    check d;
    d
336
337
   
    
338
339
340
end
and Node :
sig
341
  type t = { id : int; comp_unit: CompUnit.t; mutable descr : Descr.t }
342
343
344
345
346
347
348
  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
349
  val mk: int -> Descr.t -> t
350
end =
351

352
struct
353
  type t = { id : int; comp_unit : CompUnit.t; mutable descr : Descr.t }
354
355
  let check n = ()
  let dump ppf n = failwith "Types.Node.dump"
356
357
358
359
  let hash x = x.id + 17 * x.comp_unit
  let compare x y = 
    let c = x.id - y.id in
    if c = 0 then x.comp_unit - y.comp_unit else c
360
  let equal x y = x == y
361

362
363
364
365
366
367
368
369
  let serialize_memo = Inttbl.create ()
  let counter_serialize = ref 0

  let () =
    CompUnit.close_serialize_ref := 
    (fun () ->
       Inttbl.clear serialize_memo;
       counter_serialize := 0)
370

371
  let serialize t n = 
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
    if n.comp_unit == !CompUnit.current then (
      Serialize.Put.bool t true;
      try 
	let i = Inttbl.find serialize_memo n.id in
	Serialize.Put.int t i
      with Not_found ->
	let i = !counter_serialize in
	incr counter_serialize;
	Inttbl.add serialize_memo n.id i;
	Serialize.Put.int t i;
	Descr.serialize t n.descr
    ) else (
      Serialize.Put.bool t false;
      CompUnit.serialize t n.comp_unit;
      Serialize.Put.int t n.id
387
    )
388
      
389

390
391
392
393
  let deserialize_memo = Inttbl.create ()

  let find_tbl id =
    try Inttbl.find deserialize_memo id
394
    with Not_found ->
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
      let tbl = Inttbl.create () in
      Inttbl.add deserialize_memo id tbl;
      tbl

  let mk id d =
    let n = { id = id; comp_unit = !CompUnit.current; descr = d } in
    if !CompUnit.current == CompUnit.pervasives then
      Inttbl.add (find_tbl CompUnit.pervasives) n.id n;
    n

  let deserialize t = 
    if Serialize.Get.bool t then
      let i = Serialize.Get.int t in
      let tbl = find_tbl !CompUnit.current in
      try Inttbl.find tbl i
      with Not_found ->
	let n = { id = i; comp_unit = !CompUnit.current;
		  descr = Descr.empty } in
	Inttbl.add tbl i n;
	n.descr <- Descr.deserialize t;
	n
    else
      let cu = CompUnit.deserialize t in
      let i = Serialize.Get.int t in
      try Inttbl.find (Inttbl.find deserialize_memo cu) i 
      with Not_found -> assert false

422
423
end

424
(* It is also possible to use Boolean instead of Bool here;
425
   need to analyze when each one is more efficient *)
426
427
428
429
430
431
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)))

432
433
434
435
module DescrHash = Hashtbl.Make(Descr)
module DescrMap = Map.Make(Descr)
module DescrSet = Set.Make(Descr)
module DescrSList = SortedList.Make(Descr)
436

437
438
439
type descr = Descr.t
type node = Node.t
include Descr
440
441
442

let hash_cons = DescrHash.create 17000  

443
444
445
446
447
448
449
450
451
452
let count = State.ref "Types.count" 0
		
let () =
  Stats.register Stats.Summary
    (fun ppf -> Format.fprintf ppf "Allocated type nodes:%i@\n" !count)
      
let make () = 
  incr count; 
  Node.mk !count empty

453
454
455
456
457
458
459
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; 
460
    let n = Node.mk !count d in
461
462
    DescrHash.add hash_cons d n; n  

463
let any =  {
464
  hash = 0;
465
466
467
  times = BoolPair.full; 
  xml   = BoolPair.full; 
  arrow = BoolPair.full; 
468
  record= BoolRec.full; 
469
470
471
  ints  = Intervals.any;
  atoms = Atoms.any;
  chars = Chars.any;
472
  abstract = Abstract.any;
473
  absent= false;
474
}
475

476

477
let non_constructed =
478
479
480
  { any with  
      hash = 0;
      times = empty.times; xml = empty.xml; record = empty.record }
481
     
482
	     
483
484
485
486
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) }
487
let record label t = 
488
489
  { empty with hash = 0; 
      record = BoolRec.atom (true,LabelMap.singleton label t) }
490
let record' (x : bool * node Ident.label_map) =
491
492
493
  { 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 }
494
495
496
let abstract a = { empty with hash = 0; abstract = a }

let get_abstract t = t.abstract
497
      
498
499
let cup x y = 
  if x == y then x else {
500
    hash = 0;
501
502
503
    times = BoolPair.cup x.times y.times;
    xml   = BoolPair.cup x.xml y.xml;
    arrow = BoolPair.cup x.arrow y.arrow;
504
    record= BoolRec.cup x.record y.record;
505
506
507
    ints  = Intervals.cup x.ints  y.ints;
    atoms = Atoms.cup x.atoms y.atoms;
    chars = Chars.cup x.chars y.chars;
508
    abstract = Abstract.cup x.abstract y.abstract;
509
    absent= x.absent || y.absent;
510
511
512
513
  }
    
let cap x y = 
  if x == y then x else {
514
    hash = 0;
515
516
    times = BoolPair.cap x.times y.times;
    xml   = BoolPair.cap x.xml y.xml;
517
    record= BoolRec.cap x.record y.record;
518
    arrow = BoolPair.cap x.arrow y.arrow;
519
520
521
    ints  = Intervals.cap x.ints  y.ints;
    atoms = Atoms.cap x.atoms y.atoms;
    chars = Chars.cap x.chars y.chars;
522
    abstract = Abstract.cap x.abstract y.abstract;
523
    absent= x.absent && y.absent;
524
525
526
527
  }
    
let diff x y = 
  if x == y then empty else {
528
    hash = 0;
529
530
531
    times = BoolPair.diff x.times y.times;
    xml   = BoolPair.diff x.xml y.xml;
    arrow = BoolPair.diff x.arrow y.arrow;
532
    record= BoolRec.diff x.record y.record;
533
534
535
    ints  = Intervals.diff x.ints  y.ints;
    atoms = Atoms.diff x.atoms y.atoms;
    chars = Chars.diff x.chars y.chars;
536
    abstract = Abstract.diff x.abstract y.abstract;
537
    absent= x.absent && not y.absent;
538
539
  }
    
540

541

542

543
544
545
546
547
548
549
550
(* 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) &&
551
  (BoolRec.trivially_disjoint a.record b.record) &&
552
  (Abstract.disjoint a.abstract b.abstract) &&
553
  (not (a.absent && b.absent))
554

555

556

557
let descr n = n.Node.descr
558
let internalize n = n
559
let id n = n.Node.id
560
561


562
563
564
565
566
567
568
569
570
571
572
573
574
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)
575

576
577
let neg x = diff any x

578
579
let any_node = cons any

580
module LabelS = Set.Make(LabelPool)
581

582
583
584
let any_or_absent = { any with hash=0; absent = true } 
let only_absent = { empty with hash=0; absent = true }

585
586
let get_record r =
  let labs accu (_,r) = 
587
588
    List.fold_left 
      (fun accu (l,_) -> LabelS.add l accu) accu (LabelMap.get r) in
589
  let extend descrs labs (o,r) =
590
591
592
593
594
    let rec aux i labs r =
      match labs with
	| [] -> ()
	| l1::labs ->
	    match r with
595
	      | (l2,x)::r when l1 == l2 -> 
596
597
598
		  descrs.(i) <- cap descrs.(i) (descr x);
		  aux (i+1) labs r
	      | r ->
599
600
		  if not o then 
		    descrs.(i) <- cap descrs.(i) only_absent; (* TODO:OPT *)
601
602
		  aux (i+1) labs r
    in
603
    aux 0 labs (LabelMap.get r);
604
605
606
607
    o
  in
  let line (p,n) =
    let labels = 
608
609
      List.fold_left labs (List.fold_left labs LabelS.empty p) n in
    let labels = LabelS.elements labels in
610
    let nlab = List.length labels in
611
    let mk () = Array.create nlab any_or_absent in
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626

    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
627
  List.map line (BoolRec.get r)
628
   
629

630

631
632
633
634
635
636
637


(* 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)
638
let cap_product any_left any_right l =
639
640
  List.fold_left 
    (fun (d1,d2) (t1,t2) -> (cap_t d1 t1, cap_t d2 t2))
641
    (any_left,any_right)
642
    l
643
let any_pair = { empty with hash = 0; times = any.times }
644

645

646
647
648
let rec exists max f =
  (max > 0) && (f (max - 1) || exists (max - 1) f)

649
exception NotEmpty
650

651
652
653
654
655
656
657
658
659
660
661
662
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) -> 
663
      if n.status == Maybe then (try f n with NotEmpty -> ());
664
665
666
667
668
669
670
671
672
673
      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;
674
  s.notify <- Nothing; 
675
676
677
678
679
680
681
  raise NotEmpty

let rec big_conj f l n =
  match l with
    | [] -> set n
    | [arg] -> f arg n
    | arg::rem ->
682
683
684
	let s = 
	  { status = Maybe; active = false; 
	    notify = Do (n,(big_conj f rem), Nothing) } in
685
686
687
	try 
	  f arg s;
	  if s.active then n.active <- true
688
	with NotEmpty -> if n.status == NEmpty then raise NotEmpty
689

690
691
let guard a f n =
  match a with
692
    | { status = Empty } -> ()
693
694
695
    | { status = Maybe } as s -> 
	n.active <- true; 
	s.notify <- Do (n,f,s.notify)
696
    | { status = NEmpty } -> f n
697

698
699
700
701
702
703
704
705
706
707
708
709
710

(* 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) &&
711
	  (Abstract.is_empty d.abstract) &&
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
	  (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) 

797
798
(* TODO: need to invesigate when ClearEmpty is a good thing... *)

799
800
801
802
let memo = DescrHash.create 33000
let marks = ref [] 

let rec slot d =
803
804
  if not ((Intervals.is_empty d.ints) && 
	  (Atoms.is_empty d.atoms) &&
805
	  (Chars.is_empty d.chars) &&
806
	  (Abstract.is_empty d.abstract) &&
807
	  (not d.absent)) then slot_not_empty 
808
809
810
811
812
  else try DescrHash.find memo d
  with Not_found ->
    let s = { status = Maybe; active = false; notify = Nothing } in
    DescrHash.add memo d s;
    (try
813
       iter_s s check_times (BoolPair.get d.times);  
814
       iter_s s check_xml (BoolPair.get d.xml); 
815
       iter_s s check_arrow (BoolPair.get d.arrow);
816
817
818
819
820
821
822
823
824
       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 ->
825
826
827
	let t1 = descr t1 and t2 = descr t2 in
	if trivially_disjoint accu1 t1 || 
	   trivially_disjoint accu2 t2 then (
828
829
	     aux accu1 accu2 right s )
	else (
830
          let accu1' = diff accu1 t1 in 
831
	  guard (slot accu1') (aux accu1' accu2 right) s;
832
833

          let accu2' = diff accu2 t2 in 
834
	  guard (slot accu2') (aux accu1 accu2' right) s  
835
	)
836
837
    | [] -> set s
  in
838
  let (accu1,accu2) = cap_product any any left in
839
  guard (slot accu1) (guard (slot accu2) (aux accu1 accu2 right)) s
840
841
842
843
844

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
845
	if clearly_disjoint accu1 t1 || 
846
847
848
849
	   trivially_disjoint accu2 t2 then (
	     aux accu1 accu2 right s )
	else (
          let accu1' = diff accu1 t1 in 
850
	  guard (slot accu1') (aux accu1' accu2 right) s;
851
852

          let accu2' = diff accu2 t2 in 
853
	  guard (slot accu2') (aux accu1 accu2' right) s  
854
855
856
857
	)
    | [] -> set s
  in
  let (accu1,accu2) = cap_product any any_pair left in
858
  guard (slot accu1) (guard (slot accu2) (aux accu1 accu2 right)) s
859

860
861
862
863
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 ->
864
          let accu1' = diff_t accu1 t1 in 
865
	  guard (slot accu1') (aux accu1' accu2 left) s;
866
867

          let accu2' = cap_t  accu2 t2 in 
868
	  guard (slot accu2') (aux accu1 accu2' left) s
869
870
871
      | [] -> set s
    in
    let accu1 = descr s1 in
872
    guard (slot accu1) (aux accu1 (neg (descr s2)) left) s
873
874
  in
  big_conj single_right right s
875

876
and check_record (labels,(oleft,left),rights) s =
877
878
  let rec aux rights s = match rights with
    | [] -> set s
879
    | (oright,right)::rights ->
880
	let next =
881
	  (oleft && (not oright)) ||
882
	  exists (Array.length left)
883
	    (fun i -> trivially_disjoint left.(i) right.(i))
884
885
886
887
888
889
	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
890
891
	    guard (slot di) (fun s ->
			left.(i) <- di;
892
893
894
			aux rights s;
			left.(i) <- back;
		     ) s
895
(* TODO: are side effects correct ? *)
896
897
898
899
900
	  done
  in
  let rec start i s =
    if (i < 0) then aux rights s
    else
901
      guard (slot left.(i)) (start (i - 1)) s
902
903
904
905
  in
  start (Array.length left - 1) s


906
(*
907
let timer_subtype = Stats.Timer.create "Types.is_empty"
908
*)
909

910
let is_empty d =
911
(*  Stats.Timer.start timer_subtype;*)
912
913
  let s = slot d in
  List.iter 
914
915
    (fun s' -> 
       if s'.status == Maybe then s'.status <- Empty; s'.notify <- Nothing) 
916
917
    !marks;
  marks := [];
918
(*  Stats.Timer.stop timer_subtype *)
919
    (s.status == Empty)
920

921
(*
922
let is_empty d =
923
924
925
926
927
928
929
(*  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
*)  
930
931
932
933
934
935
936
937
938
939
940
941
942

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
943
944
      | `Normal -> { d with hash = 0; times = empty.times }
      | `XML -> { d with hash = 0; xml = empty.xml }
945
946
947
948
949

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

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

950
951
952
953
  let normal_aux = function
    | ([] | [ _ ]) as d -> d
    | d ->

954
955
956
957
958
959
960
    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*) 
961
(*	    if equal_descr d1 t1 then r := (d1,cup d2 t2) else*)
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
	      
	      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)

986
*)
987
  let get_aux any_right d =
988
989
    let accu = ref [] in
    let line (left,right) =
990
      let (d1,d2) = cap_product any any_right left in
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
      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
1006
    List.iter line (BoolPair.get d);
1007
    !accu
1008
1009
1010
(* Maybe, can improve this function with:
     (t,s) \ (t1,s1) = (t&t',s\s') | (t\t',s),
   don't call normal_aux *)
1011

1012

1013
1014
  let get ?(kind=`Normal) d = 
    match kind with
1015
1016
      | `Normal -> get_aux any d.times
      | `XML -> get_aux any_pair d.xml
1017
1018
1019

  let pi1 = List.fold_left (fun acc (t1,_) -> cup acc t1) empty
  let pi2 = List.fold_left (fun acc (_,t2) -> cup acc t2) empty
1020
1021
1022
1023
  let pi2_restricted restr = 
    List.fold_left (fun acc (t1,t2) -> 
		      if is_empty (cap t1 restr) then acc
		      else cup acc t2) empty
1024
1025

  let restrict_1 rects pi1 =
1026
1027
    let aux acc (t1,t2) = 
      let t1 = cap t1 pi1 in if is_empty t1 then acc else (t1,t2)::acc in
1028
1029
1030
1031
    List.fold_left aux [] rects
  
  type normal = t

1032
  module Memo = Map.Make(BoolPair)
1033

1034
1035
  (* TODO: try with an hashtable *)
  (* Also, avoid lookup for simple products (t1,t2) *)
1036
  let memo = ref Memo.empty
1037
  let normal_times d = 
1038
1039
1040
    try Memo.find d !memo 
    with
	Not_found ->
1041
	  let gd = get_aux any d in
1042
	  let n = normal_aux gd in
1043
1044
(* Could optimize this call to normal_aux because one already
   know that each line is normalized ... *)
1045
1046
	  memo := Memo.add d n !memo;
	  n
1047

1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
  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


1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
  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 []
	 

1074
1075
1076
1077
1078
1079
1080
  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

1081
1082
  let any = { empty with hash = 0; times = any.times }
  and any_xml = { empty with hash = 0; xml = any.xml }
1083
  let is_empty d = d == []
1084
end
1085

1086
module Record = 
1087
struct
1088
1089
  let has_record d = not (is_empty { empty with hash= 0; record = d.record })
  let or_absent d = { d with hash = 0; absent = true }
1090
1091
1092
  let any_or_absent = or_absent any
  let has_absent d = d.absent

1093
  let only_absent = {empty with hash = 0; absent = true}
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
  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
1107
    let any = { empty with hash = 0; record = any.record }