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

4
let count = ref 0
5
6
7
8
9
		
let () =
  Stats.register Stats.Summary
    (fun ppf -> Format.fprintf ppf "Allocated type nodes:%i@\n" !count)

Jérôme Maloberti's avatar
Jérôme Maloberti committed
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

Jérôme Maloberti's avatar
Jérôme Maloberti committed
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
type service_params =
  | TProd of service_params * service_params
  | TOption of service_params 
  | TList of string * service_params
  | TSet of service_params
  | TSum of service_params * service_params
  | TString of string
  | TInt of string
  | TInt32 of string
  | TInt64 of string
  | TFloat of string 
  | TBool of string
  | TFile of string
      (* | TUserType of string * (string -> 'a) * ('a -> string) *)
  | TCoord of string 
  | TCoordv of service_params * string
  | TESuffix of string 
  | TESuffixs of string
      (*  | TESuffixu of (string * (string -> 'a) * ('a -> string)) *)
  | TSuffix of (bool * service_params)
  | TUnit 
  | TAny
  | TConst of string;;

52
53
54
module Const = struct
  type t = const

55
56
  let check _ = ()
  let dump ppf _ = Format.fprintf ppf "<Types.Const.t>"
57
58

  let rec compare c1 c2 = match (c1,c2) with
59
    | Integer x, Integer y -> Intervals.V.compare x y
60
61
    | Integer _, _ -> -1
    | _, Integer _ -> 1
62
    | Atom x, Atom y -> Atoms.V.compare x y
63
64
    | Atom _, _ -> -1
    | _, Atom _ -> 1
65
    | Char x, Char y -> Chars.V.compare x y
66
67
68
    | Char _, _ -> -1
    | _, Char _ -> 1
    | Pair (x1,x2), Pair (y1,y2) ->
69
70
	let c = compare x1 y1 in
	if c <> 0 then c else compare x2 y2
71
72
73
    | Pair (_,_), _ -> -1
    | _, Pair (_,_) -> 1
    | Xml (x1,x2), Xml (y1,y2) ->
74
75
	let c = compare x1 y1 in
	if c <> 0 then c else compare x2 y2
76
77
78
    | Xml (_,_), _ -> -1
    | _, Xml (_,_) -> 1
    | Record x, Record y ->
79
	LabelMap.compare compare x y
80
81
82
83
84
85
86
    | 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 *)
87
88
89
90
91
92
93
94
95
96
	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
97
      (* Note: improve hash for String *)
98

99
100
  let equal c1 c2 = compare c1 c2 = 0
end
101

102
103
module Abstract =
struct
104
  module T = Custom.String
105
106
107
108
109
110
111
112
113
114
  type abs = T.t

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

  include SortedList.FiniteCofinite(T)

  let print = function
115
    | Finite l -> List.map (fun x ppf -> Format.fprintf ppf "!%s" x) l
116
117
118
119
120
    | Cofinite l ->       
	[ fun ppf ->
	  Format.fprintf ppf "@[Abstract";
	  List.iter (fun x -> Format.fprintf ppf " \\@ !%s" x) l;
	  Format.fprintf ppf "@]" ]
121

122
123
124
125
126
127
  let contains_sample s t = match s,t with
    | None, Cofinite _ -> true
    | None, Finite _ -> false
    | Some s, t -> contains s t
    

128
129
130
end


131
132
type pair_kind = [ `Normal | `XML ]

133
134
module rec Descr : 
sig
135
  type s = {
136
137
138
139
140
141
142
    atoms : Atoms.t;
    ints  : Intervals.t;
    chars : Chars.t;
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
143
    abstract: Abstract.t;
144
145
    absent: bool
  }
146
  include Custom.T with type t = s
147
  val empty: t
148
149
end =
struct
150
  type s = {
151
152
153
154
155
156
157
    atoms : Atoms.t;
    ints  : Intervals.t;
    chars : Chars.t;
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
158
    abstract: Abstract.t;
159
160
    absent: bool
  }
161
  type t = s
162

163
164
165
166
167
168
169
170
171
  let print_lst ppf =
    List.iter (fun f -> f ppf; Format.fprintf ppf " |")

  let dump ppf d =
    Format.fprintf ppf "<types atoms(%a) times(%a) record(%a) xml(%a)>"
      print_lst (Atoms.print d.atoms)
      BoolPair.dump d.times
      BoolRec.dump d.record
      BoolPair.dump d.xml
172

173
174
175
176
177
178
179
180
  let empty = { 
    times = BoolPair.empty; 
    xml   = BoolPair.empty; 
    arrow = BoolPair.empty; 
    record= BoolRec.empty;
    ints  = Intervals.empty;
    atoms = Atoms.empty;
    chars = Chars.empty;
181
    abstract = Abstract.empty;
182
183
184
    absent= false;
  }

185
  let equal a b =
186
187
188
189
190
191
192
193
    (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) &&
194
      (Abstract.equal a.abstract b.abstract) &&
195
196
      (a.absent == b.absent)
    )
197
198
199
200
201
202
203
204
205
206

  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
207
    else let c = Abstract.compare a.abstract b.abstract in if c <> 0 then c
208
209
210
    else if a.absent && not b.absent then -1
    else if b.absent && not a.absent then 1
    else 0
211
      
212
  let hash a =
213
214
215
216
217
218
219
220
221
222
    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 = 17 * accu + Abstract.hash a.abstract in
    let accu = if a.absent then accu+5 else accu in
    accu
223

224
225
226
227
228
229
230
231
  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;
232
    Abstract.check a.abstract;
233
234
235
    ()


236
237
238
end
and Node :
sig
239
  type t = { id : int; cu: Compunit.t; mutable descr : Descr.t }
240
241
242
243
244
  val dump: Format.formatter -> t -> unit
  val check: t -> unit
  val equal: t -> t -> bool
  val hash: t -> int
  val compare:t -> t -> int
245
  val mk: int -> Descr.t -> t
246
end =
247

248
struct
249
  type t = { id : int; cu: Compunit.t; mutable descr : Descr.t }
250
  let check n = ()
251
  let dump ppf n = Format.fprintf ppf "X%i" n.id
252
  let hash x = x.id + Compunit.hash x.cu
253
  let compare x y = 
254
255
256
    let c = x.id - y.id in if c = 0 then Compunit.compare x.cu y.cu else c
  let equal x y = x==y || (x.id == y.id && (Compunit.equal x.cu y.cu))
  let mk id d = { id = id; cu = Compunit.current (); descr = d }
257
258
end

259
(* It is also possible to use Boolean instead of Bool here;
260
   need to analyze when each one is more efficient *)
261
and BoolPair : Bool.S with type elem = Node.t * Node.t = 
262
(*Bool.Simplify*)(Bool.Make)(Custom.Pair(Node)(Node))
263
264

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

267
268
module DescrHash = Hashtbl.Make(Descr)
module DescrMap = Map.Make(Descr)
269
270
module DescrSet = Set.Make(Descr)
module DescrSList = SortedList.Make(Descr)
271

272
273
274
type descr = Descr.t
type node = Node.t
include Descr
275

276
277
let forward_print = ref (fun _ _ -> assert false)

278
279
280
281
let make () = 
  incr count; 
  Node.mk !count empty

282
283
284
(*
let hash_cons = DescrHash.create 17000  

285
286
287
let define n d = 
  DescrHash.add hash_cons d n; 
  n.Node.descr <- d
288

289
290
291
292
let cons d = 
  try DescrHash.find hash_cons d 
  with Not_found ->
    incr count; 
293
    let n = Node.mk !count d in
294
    DescrHash.add hash_cons d n; n  
295
296
297
298
299
300
301
302
303
*)

let define n d = 
  n.Node.descr <- d

let cons d = 
  incr count; 
  Node.mk !count d

304

305
let any =  {
306
307
308
  times = BoolPair.full; 
  xml   = BoolPair.full; 
  arrow = BoolPair.full; 
309
  record= BoolRec.full; 
310
311
312
  ints  = Intervals.any;
  atoms = Atoms.any;
  chars = Chars.any;
313
  abstract = Abstract.any;
314
  absent= false;
315
}
316

317

318
let non_constructed =
319
320
  { any with  
      times = empty.times; xml = empty.xml; record = empty.record }
321
     
322
let non_constructed_or_absent = 
323
  { non_constructed with absent = true }
324
	     
325
326
327
328
let interval i = { empty with ints = i }
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) }
329
let record label t = 
330
  { empty with 
331
      record = BoolRec.atom (true,LabelMap.singleton label t) }
332
let record_fields (x : bool * node Ident.label_map) =
333
334
335
336
  { empty with record = BoolRec.atom x }
let atom a = { empty with atoms = a }
let char c = { empty with chars = c }
let abstract a = { empty with abstract = a }
337
338

let get_abstract t = t.abstract
339
      
340
341
let cup x y = 
  if x == y then x else {
342
343
344
    times = BoolPair.cup x.times y.times;
    xml   = BoolPair.cup x.xml y.xml;
    arrow = BoolPair.cup x.arrow y.arrow;
345
    record= BoolRec.cup x.record y.record;
346
347
348
    ints  = Intervals.cup x.ints  y.ints;
    atoms = Atoms.cup x.atoms y.atoms;
    chars = Chars.cup x.chars y.chars;
349
    abstract = Abstract.cup x.abstract y.abstract;
350
    absent= x.absent || y.absent;
351
352
353
354
  }
    
let cap x y = 
  if x == y then x else {
355
356
    times = BoolPair.cap x.times y.times;
    xml   = BoolPair.cap x.xml y.xml;
357
    record= BoolRec.cap x.record y.record;
358
    arrow = BoolPair.cap x.arrow y.arrow;
359
360
361
    ints  = Intervals.cap x.ints  y.ints;
    atoms = Atoms.cap x.atoms y.atoms;
    chars = Chars.cap x.chars y.chars;
362
    abstract = Abstract.cap x.abstract y.abstract;
363
    absent= x.absent && y.absent;
364
365
366
367
  }
    
let diff x y = 
  if x == y then empty else {
368
369
370
    times = BoolPair.diff x.times y.times;
    xml   = BoolPair.diff x.xml y.xml;
    arrow = BoolPair.diff x.arrow y.arrow;
371
    record= BoolRec.diff x.record y.record;
372
373
374
    ints  = Intervals.diff x.ints  y.ints;
    atoms = Atoms.diff x.atoms y.atoms;
    chars = Chars.diff x.chars y.chars;
375
    abstract = Abstract.diff x.abstract y.abstract;
376
    absent= x.absent && not y.absent;
377
378
  }
    
379

380

381

382
383
384
385
386
387
388
389
(* 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) &&
390
  (BoolRec.trivially_disjoint a.record b.record) &&
391
  (Abstract.disjoint a.abstract b.abstract) &&
392
  (not (a.absent && b.absent))
393

394

395

396
let descr n = n.Node.descr
397
let internalize n = n
398
let id n = n.Node.id
399
400


401
402
403
404
405
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)
406
  | Xml (x,y) -> xml (const_node x) (const_node y)
407
  | Record x -> record_fields (false ,LabelMap.map const_node x)
408
409
410
411
412
413
  | 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)
414

415
416
let neg x = diff any x

417
let any_node = cons any
418
let empty_node = cons empty
419

420
module LabelS = Set.Make(Label)
421

422
423
let any_or_absent = { any with absent = true } 
let only_absent = { empty with absent = true }
424

425
426
let get_record r =
  let labs accu (_,r) = 
427
428
    List.fold_left 
      (fun accu (l,_) -> LabelS.add l accu) accu (LabelMap.get r) in
429
  let extend descrs labs (o,r) =
430
431
432
433
434
    let rec aux i labs r =
      match labs with
	| [] -> ()
	| l1::labs ->
	    match r with
435
	      | (l2,x)::r when l1 == l2 -> 
436
437
438
		  descrs.(i) <- cap descrs.(i) (descr x);
		  aux (i+1) labs r
	      | r ->
439
440
		  if not o then 
		    descrs.(i) <- cap descrs.(i) only_absent; (* TODO:OPT *)
441
442
		  aux (i+1) labs r
    in
443
    aux 0 labs (LabelMap.get r);
444
445
446
447
    o
  in
  let line (p,n) =
    let labels = 
448
449
      List.fold_left labs (List.fold_left labs LabelS.empty p) n in
    let labels = LabelS.elements labels in
450
    let nlab = List.length labels in
451
    let mk () = Array.create nlab any_or_absent in
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466

    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
467
  List.map line (BoolRec.get r)
468
   
469

470

471
472
473
474
475
476
477


(* 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)
478
let cap_product any_left any_right l =
479
480
  List.fold_left 
    (fun (d1,d2) (t1,t2) -> (cap_t d1 t1, cap_t d2 t2))
481
    (any_left,any_right)
482
    l
483
let any_pair = { empty with times = any.times }
484

485

486
487
488
let rec exists max f =
  (max > 0) && (f (max - 1) || exists (max - 1) f)

489
exception NotEmpty
490

491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
module Witness = struct

  module NodeSet = Set.Make(Node)

  type witness =
    | WInt of Intervals.V.t
    | WAtom of Atoms.sample
    | WChar of Chars.V.t
    | WAbsent
    | WAbstract of Abstract.elem option

    | WPair of witness * witness * witness_slot
    | WXml of witness * witness * witness_slot
    | WRecord of witness label_map * bool * witness_slot
	(* Invariant: WAbsent cannot actually appear *)

    | WFun of (witness * witness option) list * witness_slot
  and witness_slot = 
      { mutable wnodes_in: NodeSet.t;
	mutable wnodes_out: NodeSet.t;
	mutable wuid: int }

  module WHash = Hashtbl.Make(
    struct
      type t = witness
      let hash_small = function
	| WInt i -> 17 * Intervals.V.hash i
	| WChar c -> 1 + 17 * Chars.V.hash c
	| WAtom None -> 2
	| WAtom (Some (ns,None)) -> 3 + 17 * Ns.Uri.hash ns
	| WAtom (Some (_,Some t)) -> 4 + 17 * Ns.Label.hash t
	| WAbsent -> 5
	| WAbstract None -> 6
	| WAbstract (Some t) -> 7 + 17 * Abstract.T.hash t
	| WPair (_,_,s) 
	| WXml (_,_,s)
	| WRecord (_,_,s)
	| WFun (_,s) -> 8 + 17 * s.wuid
      let hash = function
	| WPair (p1,p2,_) -> 257 * hash_small p1 + 65537 * hash_small p2
	| WXml (p1,p2,_) -> 1 + 257 * hash_small p1 + 65537 * hash_small p2
	| WRecord (r,o,_) -> 
	    (if o then 2 else 3) + 257 * LabelMap.hash hash_small r
	| WFun (f,_) ->
	    4 + 257 *
	      (Hashtbl.hash 
		 (List.map 
		    (function (x,None) -> 17 * hash_small x
		       | (x,Some y) -> 
			   1 + 17 * hash_small x + 257 * hash_small y)
		    f)
	      )
	| _ -> assert false

      let equal_small w1 w2 = match w1,w2 with
	| WInt i1, WInt i2 -> Intervals.V.equal i1 i2
	| WChar c1, WChar c2 -> Chars.V.equal c1 c2
	| WAtom None, WAtom None -> true
	| WAtom (Some (ns1,None)), WAtom (Some (ns2,None)) ->
	    Ns.Uri.equal ns1 ns2
	| WAtom (Some (_,Some t1)), WAtom (Some (_,Some t2)) ->
	    Ns.Label.equal t1 t2
	| WAbsent, WAbsent -> true
	| WAbstract None, WAbstract None -> false
	| WAbstract (Some t1), WAbstract (Some t2) -> Abstract.T.equal t1 t2
	| _ -> w1 == w2

      let equal w1 w2 = match w1,w2 with
	| WPair (p1,q1,_), WPair (p2,q2,_) 
560
	| WXml (p1,q1,_), WXml (p2,q2,_) -> 
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
	    equal_small p1 p2 && equal_small q1 q2
	| WRecord (r1,o1,_), WRecord (r2,o2,_) ->
	    o1 == o2 && (LabelMap.equal equal_small r1 r2)
	| WFun (f1,_), WFun (f2,_) ->
	    List.length f1 = List.length f2 &&
		List.for_all2
		(fun (x1,y1) (x2,y2) ->
		   equal_small x1 x2 && (match y1,y2 with
					   | Some y1, Some y2 -> 
					       equal_small y1 y2
					   | None, None -> true
					   | _ -> false)
		) f1 f2
	| _ -> false
    end)

  let wmemo = WHash.create 1024
  let wuid = ref 0
  let wslot () = { wuid = !wuid; wnodes_in = NodeSet.empty; 
		   wnodes_out = NodeSet.empty }


583
584
585
586
  let () =
    Stats.register Stats.Summary
      (fun ppf -> Format.fprintf ppf "Allocated witnesses:%i@\n" !wuid)

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

  let rec print_witness ppf = function
    | WInt i ->
	Format.fprintf ppf "%a" Intervals.V.print i
    | WChar c ->
	Format.fprintf ppf "%a" Chars.V.print c
    | WAtom None ->
	Format.fprintf ppf "`#:#"
    | WAtom (Some (ns,None)) ->
	Format.fprintf ppf "`%a" Ns.InternalPrinter.print_any_ns ns
    | WAtom (Some (_,Some t)) ->
	Format.fprintf ppf "`%a" Ns.Label.print_attr t
    | WPair (w1,w2,_) -> 
	Format.fprintf ppf "(%a,%a)" print_witness w1 print_witness w2
    | WXml (w1,w2,_) -> 
	Format.fprintf ppf "XML(%a,%a)" print_witness w1 print_witness w2
    | WRecord (ws,o,_) ->
	Format.fprintf ppf "{";
	LabelMap.iteri
	  (fun l w -> Format.fprintf ppf " %a=%a" 
	     Label.print_attr l print_witness w)
	  ws;
	if o then Format.fprintf ppf " ..";
	Format.fprintf ppf " }"
    | WFun (f,_) ->
	Format.fprintf ppf "FUN{";
	List.iter (fun (x,y) ->
		     Format.fprintf ppf " %a->" print_witness x;
		     match y with
		       | None -> Format.fprintf ppf "#"
		       | Some y -> print_witness ppf y) f;
	Format.fprintf ppf " }"
    | WAbstract None ->
	Format.fprintf ppf "Abstract(..)"
    | WAbstract (Some s) ->
	Format.fprintf ppf "Abstract(%s)" s
    | WAbsent ->
	Format.fprintf ppf "Absent"
	  
626
627
628
629
630
631
632
633
634
635
636
637
638
639
  let wmk w =  (* incr wuid; w *)  (* hash-consing disabled *)
    try WHash.find wmemo w
    with Not_found -> 
      incr wuid; 
      WHash.add wmemo w w;
(*      Format.fprintf Format.std_formatter "W:%a@." 
	print_witness w; *)
      w

  let wpair p1 p2 = wmk (WPair (p1,p2, wslot()))
  let wxml p1 p2 = wmk (WXml (p1,p2, wslot()))
  let wrecord r o = wmk (WRecord (r,o, wslot()))
  let wfun f = wmk (WFun (f, wslot()))

640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
  let bool_pair f =
    BoolPair.compute 
      ~empty:false ~full:true 
      ~cup:(||) ~cap:(&&) ~diff:(fun x y -> x && not y) 
      ~atom:f

  let bool_rec f =
    BoolRec.compute 
      ~empty:false ~full:true 
      ~cup:(||) ~cap:(&&) ~diff:(fun x y -> x && not y) 
      ~atom:f

  let rec node_has n = function
    | WXml (_,_,s) | WPair (_,_,s) | WFun (_,s) | WRecord (_,_,s) as w ->
	if NodeSet.mem n s.wnodes_in then true
	else if NodeSet.mem n s.wnodes_out then false
	else (let r = type_has (descr n) w in
	      if r then s.wnodes_in <- NodeSet.add n s.wnodes_in
	      else s.wnodes_out <- NodeSet.add n s.wnodes_out;
	      r)
    | w -> type_has (descr n) w

  and type_has t = function
    | WInt i -> Intervals.contains i t.ints
    | WChar c -> Chars.contains c t.chars
    | WAtom a -> Atoms.contains_sample a t.atoms
    | WPair (w1,w2,_) -> 
	bool_pair 
	  (fun (n1,n2) -> node_has n1 w1 && node_has n2 w2) 
	  t.times
    | WXml (w1,w2,_) ->
	bool_pair 
	  (fun (n1,n2) -> node_has n1 w1 && node_has n2 w2)
	  t.xml
    | WFun (f,_) ->
	bool_pair 
	  (fun (n1,n2) ->
	     List.for_all
	       (fun (x,y) ->
		  not (node_has n1 x) ||
		    (match y with None -> false
		       | Some y -> node_has n2 y))
	       f) 
	  t.arrow
    | WRecord (f,o,_) ->
	bool_rec 
	  (fun (o',f') ->
	     ((not o) || o') && (
	       let checked = ref 0 in
	       try 
		 LabelMap.iteri 
		   (fun l n ->
		      let w = 
			try let w = LabelMap.assoc l f in incr checked; w
			with Not_found -> WAbsent in
		      if not (node_has n w) then raise Exit
		   ) f'; 
		 o' || (LabelMap.length f == !checked)
		   (* All the remaining fields cannot be WAbsent
		      because of an invariant. Otherwise, we must
		      check that all are WAbsent here. *)
	       with Exit -> false))
	  t.record
    | WAbsent -> t.absent
    | WAbstract a -> Abstract.contains_sample a t.abstract
end



709

710
711
712
type slot = { mutable status : status; 
	       mutable notify : notify;
	       mutable active : bool }
713
714
and status = Empty | NEmpty of Witness.witness | Maybe
and notify = Nothing | Do of slot * (Witness.witness -> unit) * notify
715
716

let slot_empty = { status = Empty; active = false; notify = Nothing }
717
718
let slot_nempty w = { status = NEmpty w;
		     active = false; notify = Nothing }
719

720
let rec notify w = function
721
722
  | Nothing -> ()
  | Do (n,f,rem) -> 
723
724
      if n.status == Maybe then (try f w with NotEmpty -> ());
      notify w rem
725
726
727
728
729
730

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


731
732
733
let set s w =
  s.status <- NEmpty w;
  notify w s.notify;
734
  s.notify <- Nothing; 
735
736
  raise NotEmpty

737
let rec big_conj f l n w =
738
  match l with
739
740
    | [] -> set n w
    | [arg] -> f w arg n
741
    | arg::rem ->
742
743
	let s = 
	  { status = Maybe; active = false; 
744
	    notify = Do (n,(big_conj f rem n), Nothing) } in
745
	try 
746
	  f w arg s;
747
	  if s.active then n.active <- true
748
	with NotEmpty when n.status == Empty || n.status == Maybe -> ()
749

750
let memo = DescrHash.create 8191
751
752
let marks = ref [] 

753
754
let count_subtype = Stats.Counter.create "Subtyping internal loop" 

755
756
let complex = ref 0

757
let rec slot d =
758
  incr complex;
759
  Stats.Counter.incr count_subtype; 
760
761
762
  if d.absent then slot_nempty Witness.WAbsent
  else if not (Intervals.is_empty d.ints) 
  then slot_nempty (Witness.WInt (Intervals.sample d.ints))
763
  else if not (Atoms.is_empty d.atoms) 
764
  then slot_nempty (Witness.WAtom (Atoms.sample d.atoms))
765
  else if not (Chars.is_empty d.chars) 
766
  then slot_nempty (Witness.WChar (Chars.sample d.chars))
767
  else if not (Abstract.is_empty d.abstract) 
768
  then slot_nempty (Witness.WAbstract (Abstract.sample d.abstract))
769
770
771
772
773
  else try DescrHash.find memo d
  with Not_found ->
    let s = { status = Maybe; active = false; notify = Nothing } in
    DescrHash.add memo d s;
    (try
774
       iter_s s check_times (BoolPair.get d.times);  
775
       iter_s s check_xml (BoolPair.get d.xml); 
776
       iter_s s check_arrow (BoolPair.get d.arrow);
777
778
       iter_s s check_record (get_record d.record);
       if s.active then marks := s :: !marks else s.status <- Empty;
779
     with NotEmpty -> ());
780
781
    s

782
783
784
785
786
and guard n t f = match (slot t) with
  | { status = Empty } -> ()
  | { status = Maybe } as s -> n.active <- true; s.notify <- Do (n,f,s.notify)
  | { status = NEmpty v } -> f v

787
and check_times (left,right) s =
788
789
790
791
792
793
794
795
  let rec aux w1 w2 accu1 accu2 seen = function
    (* Find a product in right which contains (w1,w2) *)
    | [] -> (* no such product: the current witness is in the difference. *)
	set s (Witness.wpair w1 w2)
    | (n1,n2) :: rest 
	when (Witness.node_has n1 w1) && (Witness.node_has n2 w2) ->
	let right = seen @ rest in
	let accu2' = diff accu2 (descr n2) in 
796
797
798
	guard s accu2' (fun w2 -> aux w1 w2 accu1 accu2' [] right);
	let accu1' = diff accu1 (descr n1) in
	guard s accu1' (fun w1 -> aux w1 w2 accu1' accu2 [] right)
799
    | k :: rest -> aux w1 w2 accu1 accu2 (k::seen) rest
800
  in
801
802
  let (t1,t2) = cap_product any any left in
  guard s t1 (fun w1 -> guard s t2 (fun w2 -> aux w1 w2 t1 t2 [] right))
803
804

and check_xml (left,right) s =
805
806
807
808
809
810
811
812
  let rec aux w1 w2 accu1 accu2 seen = function
    (* Find a product in right which contains (w1,w2) *)
    | [] -> (* no such product: the current witness is in the difference. *)
	set s (Witness.wxml w1 w2)
    | (n1,n2) :: rest 
	when (Witness.node_has n1 w1) && (Witness.node_has n2 w2) ->
	let right = seen @ rest in
	let accu2' = diff accu2 (descr n2) in 
813
814
815
	guard s accu2' (fun w2 -> aux w1 w2 accu1 accu2' [] right);
	let accu1' = diff accu1 (descr n1) in
	guard s accu1' (fun w1 -> aux w1 w2 accu1' accu2 [] right)
816
    | k :: rest -> aux w1 w2 accu1 accu2 (k::seen) rest
817
  in
818
819
  let (t1,t2) = cap_product any any_pair left in
  guard s t1 (fun w1 -> guard s t2 (fun w2 -> aux w1 w2 t1 t2 [] right))
820

821
and check_arrow (left,right) s =
822
823
  let single_right f (s1,s2) s =
    let rec aux w1 w2 accu1 accu2 left = match left with
824
      | (t1,t2)::left ->
825
          let accu1' = diff_t accu1 t1 in 
826
	  guard s accu1' (fun w1 -> aux w1 w2 accu1' accu2 left);
827
828

          let accu2' = cap_t  accu2 t2 in 
829
	  guard s accu2' (fun w2 -> aux w1 (Some w2) accu1 accu2' left)
830
831
832
      | [] -> 
	  let f = match f with Witness.WFun (f,_) -> f | _ -> assert false in
	  set s (Witness.wfun ((w1,w2)::f))
833
834
    in
    let accu1 = descr s1 in
835
    guard s accu1 (fun w1 -> aux w1 None accu1 (neg (descr s2)) left)
836
  in
837
  big_conj single_right right s (Witness.wfun [])
838

839
and check_record (labels,(oleft,left),rights) s =
840
841
  let rec aux ws accus seen = function
    | [] ->
842
843
	let rec aux w i = function
	  | [] -> assert (i == Array.length ws); w
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
	  | l::labs -> 
	      let w = match ws.(i) with 
		| Witness.WAbsent -> w
		| wl -> LabelMap.add l wl w in
	      aux w (succ i) labs in
	set s (Witness.wrecord (aux LabelMap.empty 0 labels) oleft)
    | (false,_) :: rest when oleft -> aux ws accus seen rest
    | (_,f) :: rest 
	when not (exists (Array.length left)
		    (fun i -> not (Witness.type_has f.(i) ws.(i)))) ->
	(* TODO: a version f get_record which keeps nodes in neg records. *)
	let right = seen @ rest in
	for i = 0 to Array.length left - 1 do
	  let di = diff accus.(i) f.(i) in
	  guard s di (fun wi -> 
			let accus' = Array.copy accus in accus'.(i) <- di;
			let ws' = Array.copy ws in ws'.(i) <- wi;
			aux ws' accus' [] right);
	done
    | k :: rest -> aux ws accus (k::seen) rest
864
  in
865
  let rec start wl i =
866
    if (i < 0) then aux (Array.of_list wl) left [] rights
867
    else guard s left.(i) (fun w -> start (w::wl) (i - 1))
868
  in
869
  start [] (Array.length left - 1)
870
871


872

873
let timer_subtype = Stats.Timer.create "Types.is_empty"
874

875

876
let is_empty d =
877
  Stats.Timer.start timer_subtype;
878
879
  let s = slot d in
  List.iter 
880
881
    (fun s' -> 
       if s'.status == Maybe then s'.status <- Empty; s'.notify <- Nothing) 
882
883
    !marks;
  marks := [];
884
  Stats.Timer.stop timer_subtype
885
    (s.status == Empty)
886

887
888
889
890
let getwit t = match (slot t).status with NEmpty w -> w | _ -> assert false
  (* Assumes that is_empty has been called on t before. *)

let witness t = if is_empty t then raise Not_found else getwit t
891

892
(*
893
let is_empty d =
894
895
896
897
898
899
900
(*  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
*)  
901

902
903
904
905
906
907
908
909
910
911
912
913
914
915
(*
let is_empty d =
(*  Format.fprintf Format.std_formatter "complex=%i@."
	  !complex; *)
  if !complex = 0 then
    (let r = is_empty d in
     if !complex > 100 then
       (let c = !complex in
	Format.fprintf Format.std_formatter "is_empty (%i)@." c
	  (*Descr.dump (*!forward_print*) d*));
     complex := 0; r)
  else is_empty d
*)

916
917
918
let non_empty d = 
  not (is_empty d)

919
let disjoint d1 d2 =
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
(*  try match (DescrHash.find memo d1).status with
    | Empty -> true
    | NEmpty w when Witness.type_has d2 w -> false
    | _ -> raise Not_found
  with Not_found ->
  try match (DescrHash.find memo d2).status with
    | Empty -> true
    | NEmpty w when Witness.type_has d1 w -> false
    | _ -> raise Not_found
  with Not_found -> *)
    is_empty (cap d1 d2)

let subtype d1 d2 =
(*  try match (DescrHash.find memo d1).status with
    | Empty -> true
    | NEmpty w when not (Witness.type_has d2 w) -> false
    | _ -> raise Not_found
  with Not_found -> *)
    is_empty (diff d1 d2)
939

940
941
let equiv d1 d2 = (subtype d1 d2) && (subtype d2 d1)

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
979

module Cache = struct
(*
  let type_has_witness t w =
    Format.fprintf Format.std_formatter
      "check wit:%a@." print_witness w; 
    let r = type_has_witness t w in
    Format.fprintf Format.std_formatter "Done@."; 
    r
*)

  type 'a cache =
    | Empty
    | Type of t * 'a
    | Split of Witness.witness * 'a cache * 'a cache

  let rec find f t = function
    | Empty -> 
	let r = f t in Type (t,r), r
    | Split (w,yes,no) ->
	if Witness.type_has t w 
	then let yes,r = find f t yes in Split (w,yes,no), r
	else let no,r = find f t no in Split (w,yes,no), r
    | Type (s,rs) as c ->
	let f1 ()= 
	  let w = witness (diff t s) in 
	  let rt = f t in 
	  Split (w, Type (t,rt), c), rt
	and f2 () =
	  let w = witness (diff s t) in 
	  let rt = f t in
	  Split (w, c, Type (t,rt)), rt in

	if Random.int 2 = 0 then
	  try f1 () with Not_found -> try f2 () with Not_found -> c, rs
	else
	  try f2 () with Not_found -> try f1 () with Not_found -> c, rs

980
981
982
983
984
  let rec lookup t = function
    | Empty -> None
    | Split (w,yes,no) -> lookup t (if Witness.type_has t w then yes else no)
    | Type (s,rs) -> if equiv s t then Some rs else None

985
986
987
988
989
990
991
992
993
994
995
996
  let emp = Empty


  let rec dump_cache f ppf = function
    | Empty -> Format.fprintf ppf "Empty"
    | Type (_,s) -> Format.fprintf ppf "*%a" f s
    | Split (w,c1,c2) -> Format.fprintf ppf "?(%a,%a)"
	(*Witness.print_witness w *)(dump_cache f) c1 (dump_cache f) c2

  let memo f =
    let c = ref emp in
    fun t ->
997
998
999
       let c',r = find f t !c in
       c := c';
       r
1000
1001
1002

end

1003
1004
1005
1006
1007
1008
module Product =
struct
  type t = (descr * descr) list

  let other ?(kind=`Normal) d = 
    match kind with
1009
1010
      | `Normal -> { d with times = empty.times }
      | `XML -> { d with xml = empty.xml }
1011
1012
1013
1014
1015

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

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

1016
1017
1018
1019
  let normal_aux = function
    | ([] | [ _ ]) as d -> d
    | d ->

1020
1021
1022
1023
1024
1025
1026
    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*) 
1027
(*	    if equal_descr d1 t1 then r := (d1,cup d2 t2) else*)
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
	      
	      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)

1052
*)
1053
  let get_aux any_right d =
1054
1055
    let accu = ref [] in
    let line (left,right) =
1056
      let (d1,d2) = cap_product any any_right left in
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
      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
1072
    List.iter line (BoolPair.get d);
1073
    !accu
1074
1075
1076
(* Maybe, can improve this function with:
     (t,s) \ (t1,s1) = (t&t',s\s') | (t\t',s),
   don't call normal_aux *)
1077

1078

1079
1080
  let get ?(kind=`Normal) d = 
    match kind with
1081
1082
      | `Normal -> get_aux any d.times
      | `XML -> get_aux any_pair d.xml
1083
1084
1085

  let pi1 = List.fold_left (fun acc (t1,_) -> cup acc t1) empty
  let pi2 = List.fold_left (fun acc (_,t2) -> cup acc t2) empty
1086
1087
  let pi2_restricted restr = 
    List.fold_left (fun acc (t1,t2) -> 
1088
		      if disjoint t1 restr then acc
1089
		      else cup acc t2) empty
1090
1091

  let restrict_1 rects pi1 =