types.ml 87 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

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

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

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

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

  include SortedList.FiniteCofinite(T)

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

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

132
module BoolAtoms : BoolVar.S with 
133
  type s = Atoms.t = BoolVar.Make(Atoms)
134
module BoolIntervals : BoolVar.S with 
135
  type s = Intervals.t = BoolVar.Make(Intervals)
136
module BoolChars : BoolVar.S with 
137
  type s = Chars.t = BoolVar.Make(Chars)
138

139 140
type tlvs =  { s : Var.Set.t ; b : bool }

141 142
module rec Descr : 
sig
143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
  (* each kind is represented as a union of itersection of types 
   * the type is a union of all kinds
   *
   * we add a new field that contains only variables.
   * Inv : 
     * if the bdd of ANY kind is composed only of variables,
       the we move it in vars:
     * From a bdd we move all variables to vars: that belong to
     * to a path in the bdd that contains only variables and end in
     * true
     * A bdd never contains a path that ends in 1 and contains only variables
     *
     * (t1 v a ) ^ ( t2 v b )
     * we need to distribute variables for the intersection
     * (t1 ^ t2) v (t1 ^ b) v (t2 ^ a) v (a ^ b)
     * before we were doing only t1 ^ t2
   *)
160
  type s = {
161 162 163
    atoms : BoolAtoms.t;
    ints  : BoolIntervals.t;
    chars : BoolChars.t;
164 165 166 167
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
168
    abstract: Abstract.t;
169 170 171
    (* this is used in record to flag the fact that the type of a label is
     * absent . It is used for optional arguments in functions as ?Int
     * is the union of Int ^ undef where undef is a type with absent : true *)
172 173 174 175
    absent: bool;
    (* maintains the list of all toplevel type variables in s
     * and a flag that is true if s contains only variables, false otherwise *)
    toplvars : tlvs
176
  }
177
  include Custom.T with type t = s
178
  val empty: t
179 180
end =
struct
181
  type s = {
182 183 184
    atoms : BoolAtoms.t;
    ints  : BoolIntervals.t;
    chars : BoolChars.t;
185 186 187 188
    times : BoolPair.t;
    xml   : BoolPair.t;
    arrow : BoolPair.t;
    record: BoolRec.t;
189
    abstract: Abstract.t;
190 191
    absent: bool;
    toplvars : tlvs
192
  }
193
  type t = s
194

195 196 197 198
  let print_lst ppf =
    List.iter (fun f -> f ppf; Format.fprintf ppf " |")

  let dump ppf d =
199
    Format.fprintf ppf "<types atoms(%a) ints(%a) chars(%a) times(%a) arrow(%a) record(%a) xml(%a) abstract(%a) absent(%b)>"
200
      BoolAtoms.dump d.atoms
201 202
      BoolIntervals.dump d.ints
      BoolChars.dump d.chars
203
      BoolPair.dump d.times
204
      BoolPair.dump d.arrow
205 206
      BoolRec.dump d.record
      BoolPair.dump d.xml
207 208
      Abstract.dump d.abstract
      d.absent
209

210 211 212 213 214
  let empty = { 
    times = BoolPair.empty; 
    xml   = BoolPair.empty; 
    arrow = BoolPair.empty; 
    record= BoolRec.empty;
215 216 217
    ints  = BoolIntervals.empty;
    atoms = BoolAtoms.empty;
    chars = BoolChars.empty;
218
    abstract = Abstract.empty;
219
    absent= false;
220
    toplvars = { s = Var.Set.empty ; b = true }
221 222
  }

223 224 225 226 227 228 229 230 231 232 233
  let check a =
    BoolChars.check a.chars;
    BoolIntervals.check a.ints;
    BoolAtoms.check a.atoms;
    BoolPair.check a.times;
    BoolPair.check a.xml;
    BoolPair.check a.arrow;
    BoolRec.check a.record;
    Abstract.check a.abstract;
    ()

234
  let equal a b =
235
    (a == b) || (
236 237 238
      (BoolAtoms.equal a.atoms b.atoms) &&
      (BoolChars.equal a.chars b.chars) &&
      (BoolIntervals.equal a.ints  b.ints) &&
239 240 241 242
      (BoolPair.equal a.times b.times) &&
      (BoolPair.equal a.xml b.xml) &&
      (BoolPair.equal a.arrow b.arrow) &&
      (BoolRec.equal a.record b.record) &&
243
      (Abstract.equal a.abstract b.abstract) &&
244 245
      (a.absent == b.absent)
    )
246 247 248

  let compare a b =
    if a == b then 0 
249 250 251
    else let c = BoolAtoms.compare a.atoms b.atoms in if c <> 0 then c
    else let c = BoolChars.compare a.chars b.chars in if c <> 0 then c
    else let c = BoolIntervals.compare a.ints b.ints in if c <> 0 then c
252 253 254 255
    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
256
    else let c = Abstract.compare a.abstract b.abstract in if c <> 0 then c
257 258 259
    else if a.absent && not b.absent then -1
    else if b.absent && not a.absent then 1
    else 0
260
      
261
  let hash a =
262 263 264
    let accu = BoolChars.hash a.chars in
    let accu = 17 * accu + BoolIntervals.hash a.ints in
    let accu = 17 * accu + BoolAtoms.hash a.atoms in
265 266 267 268 269 270 271
    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
272

273 274 275
end
and Node :
sig
276
  type t = { id : int; cu: Compunit.t; mutable descr : Descr.t }
277 278 279 280 281
  val dump: Format.formatter -> t -> unit
  val check: t -> unit
  val equal: t -> t -> bool
  val hash: t -> int
  val compare:t -> t -> int
282
  val mk: int -> Descr.t -> t
283
end =
284

285
struct
286
  type t = { id : int; cu: Compunit.t; mutable descr : Descr.t }
287
  let check n = ()
288
  let dump ppf n = Format.fprintf ppf "X%i" n.id
289
  let hash x = x.id + Compunit.hash x.cu
290
  let compare x y = 
291 292 293
    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 }
294 295
end

296 297
and Pair : Bool.S with type elem = (Node.t * Node.t) =
  Bool.Make(Custom.Pair(Node)(Node))
298 299
and BoolPair : BoolVar.S with 
  type s = Pair.t = BoolVar.Make(Pair)
300

301 302 303 304 305
(* bool = true means that the record is open that is, that
 * the labels that are not in the domain of the map are
 * equal to "any" *)
and Rec : Bool.S with type elem = bool * Node.t Ident.label_map =
  Bool.Make(Custom.Pair(Custom.Bool)(LabelSet.MakeMap(Node)))
306 307
and BoolRec : BoolVar.S with
  type s = Rec.t = BoolVar.Make(Rec)
308

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

314 315 316
type descr = Descr.t
type node = Node.t
include Descr
317

318 319
let forward_print = ref (fun _ _ -> assert false)

320 321 322 323
let make () = 
  incr count; 
  Node.mk !count empty

324 325 326 327 328 329 330
let define n d = 
  n.Node.descr <- d

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

331 332 333
(* two representation possible. either all fields (except vars) are full, OR
 * the field vars is full.
 *)
334
let any =  {
335 336 337
  times = BoolPair.full; 
  xml   = BoolPair.full; 
  arrow = BoolPair.full; 
338
  record= BoolRec.full; 
339 340 341
  ints  = BoolIntervals.full;
  atoms = BoolAtoms.full;
  chars = BoolChars.full;
342
  abstract = Abstract.any;
343
  absent= false;
344
  toplvars = { s = Var.Set.empty ; b = true }
345
}
346 347

let non_constructed =
348 349
  { any with  
      times = empty.times; xml = empty.xml; record = empty.record }
350
     
351
let non_constructed_or_absent = 
352
  { non_constructed with absent = true }
353 354

(* Descr.t type constructors *)	     
355
let times x y = { empty with times = BoolPair.atom (`Atm (Pair.atom (x,y))); toplvars = {empty.toplvars with b = false } }
356 357
let xml x y = { empty with xml = BoolPair.atom (`Atm (Pair.atom (x,y))) }
let arrow x y = { empty with arrow = BoolPair.atom (`Atm (Pair.atom (x,y))) }
358
let record label t = 
359
  { empty with 
360
      record = BoolRec.atom (`Atm (Rec.atom (true,LabelMap.singleton label t))) }
361
let record_fields x =
362
  { empty with record = BoolRec.atom (`Atm (Rec.atom x)) }
363
let atom a = { empty with atoms = BoolAtoms.atom (`Atm a) }
364
let var a =  {
365
  (* Atm = Any ^ a *)
366 367 368 369 370 371 372
  times = BoolPair.vars a;
  xml   = BoolPair.vars a; 
  arrow = BoolPair.vars a; 
  record= BoolRec.vars a; 
  ints  = BoolIntervals.vars a;
  atoms = BoolAtoms.vars a;
  chars = BoolChars.vars a;
373
  abstract = Abstract.empty;
374
  absent= false;
375
  toplvars = { s = Var.Set.singleton a; b = true }
376 377
}

378 379
let char c = { empty with chars = BoolChars.atom (`Atm c) }
let interval i = { empty with ints = BoolIntervals.atom (`Atm i) }
380
let abstract a = { empty with abstract = a }
381 382

let get_abstract t = t.abstract
383 384 385 386

(* union is component wise + a pass to extract variables
 * Var = ( t1.Var v t2.Var ) v ( extracted variables )
 *)
387 388
let cup x y = 
  if x == y then x else {
389 390 391
    times = BoolPair.cup x.times y.times;
    xml   = BoolPair.cup x.xml y.xml;
    arrow = BoolPair.cup x.arrow y.arrow;
392
    record= BoolRec.cup x.record y.record;
393 394 395
    ints  = BoolIntervals.cup x.ints  y.ints;
    atoms = BoolAtoms.cup x.atoms y.atoms;
    chars = BoolChars.cup x.chars y.chars;
396
    abstract = Abstract.cup x.abstract y.abstract;
397
    absent= x.absent || y.absent;
398
    toplvars = { s = Var.Set.union x.toplvars.s y.toplvars.s; b = x.toplvars.b && y.toplvars.b }
399
  }
400 401 402

(* intersection 
 *)
403 404
let cap x y = 
  if x == y then x else {
405
    ints  = BoolIntervals.cap x.ints y.ints;
406 407
    times = BoolPair.cap x.times y.times;
    xml   = BoolPair.cap x.xml y.xml;
408
    record= BoolRec.cap x.record y.record;
409
    arrow = BoolPair.cap x.arrow y.arrow;
410 411
    atoms = BoolAtoms.cap x.atoms y.atoms;
    chars = BoolChars.cap x.chars y.chars;
412
    abstract = Abstract.cap x.abstract y.abstract;
413
    absent= x.absent && y.absent;
414
    toplvars = { s = Var.Set.inter x.toplvars.s y.toplvars.s; b = x.toplvars.b && y.toplvars.b }
415
  }
416 417 418 419 420 421 422 423 424

(* 
 *
 * t1 // t2 = ( t1.Atm ^ - t2.Atm ^ t2.Var ) v
 *            ( t1.Var ^ t2.Var )
 *
 * Atm t1.Atm // ( t2.Atm v t2.Var )
 * Var ( t1.Var // t2.Var ) v ( extracted variables )
 *)    
425 426
let diff x y = 
  if x == y then empty else {
427 428 429
    times = BoolPair.diff x.times y.times;
    xml   = BoolPair.diff x.xml y.xml;
    arrow = BoolPair.diff x.arrow y.arrow;
430
    record= BoolRec.diff x.record y.record;
431
    ints  = BoolIntervals.diff x.ints y.ints;
432 433
    atoms = BoolAtoms.diff x.atoms y.atoms;
    chars = BoolChars.diff x.chars y.chars;
434
    abstract = Abstract.diff x.abstract y.abstract;
435
    absent= x.absent && not y.absent;
436
    toplvars = { s = Var.Set.diff x.toplvars.s y.toplvars.s; b = x.toplvars.b && y.toplvars.b }
437 438
  }
    
439 440
(* TODO: optimize disjoint check for boolean combinations *)
let trivially_disjoint a b =
441 442 443
  (BoolChars.trivially_disjoint a.chars b.chars) &&
  (BoolIntervals.trivially_disjoint a.ints b.ints) &&
  (BoolAtoms.trivially_disjoint a.atoms b.atoms) &&
444 445 446
  (BoolPair.trivially_disjoint a.times b.times) &&
  (BoolPair.trivially_disjoint a.xml b.xml) &&
  (BoolPair.trivially_disjoint a.arrow b.arrow) &&
447
  (BoolRec.trivially_disjoint a.record b.record) &&
448
  (Abstract.disjoint a.abstract b.abstract) &&
449
  (not (a.absent && b.absent))
450

451
let descr n = n.Node.descr
452
let internalize n = n
453
let id n = n.Node.id
454

455
let rec constant = function
456 457 458
  | Integer i -> interval (Intervals.atom i)
  | Atom a -> atom (Atoms.atom a)
  | Char c -> char (Chars.atom c)
459
  | Pair (x,y) -> times (const_node x) (const_node y)
460
  | Xml (x,y) -> xml (const_node x) (const_node y)
461
  | Record x -> record_fields (false ,LabelMap.map const_node x)
462 463 464 465 466 467
  | 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)
468

469 470
let neg x = diff any x

471
let any_node = cons any
472
let empty_node = cons empty
473

474
module LabelS = Set.Make(Label)
475

476 477
let any_or_absent = { any with absent = true } 
let only_absent = { empty with absent = true }
478

479 480
let get_record r =
  let labs accu (_,r) = 
481 482
    List.fold_left 
      (fun accu (l,_) -> LabelS.add l accu) accu (LabelMap.get r) in
483
  let extend descrs labs (o,r) =
484 485 486 487 488
    let rec aux i labs r =
      match labs with
	| [] -> ()
	| l1::labs ->
	    match r with
489
	      | (l2,x)::r when l1 == l2 -> 
490 491 492
		  descrs.(i) <- cap descrs.(i) (descr x);
		  aux (i+1) labs r
	      | r ->
493 494
		  if not o then 
		    descrs.(i) <- cap descrs.(i) only_absent; (* TODO:OPT *)
495 496
		  aux (i+1) labs r
    in
497
    aux 0 labs (LabelMap.get r);
498 499 500 501
    o
  in
  let line (p,n) =
    let labels = 
502 503
      List.fold_left labs (List.fold_left labs LabelS.empty p) n in
    let labels = LabelS.elements labels in
504
    let nlab = List.length labels in
505
    let mk () = Array.create nlab any_or_absent in
506 507 508 509 510 511 512 513 514 515 516 517 518 519 520

    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
521
  List.map line (Rec.get r)
522

523
(* substitute variables occurring in t accoding to the function subvar *)
524
let rec substfree_aux subvar (t,mem) =
525 526
  let module C ( X : BoolVar.S ) = 
    struct
527
      let atom_aux ?noderec subvar_aux = 
528 529
        let open X in function
          (* this subvar is acutally specialized on subatoms, subints, etc ... *)
530
          |`Var z -> subvar_aux vars (`Var z)
531 532 533 534 535 536 537
          |`Atm bdd when X.T.is_empty bdd || X.T.is_full bdd -> atom (`Atm bdd)
          |`Atm bdd ->
              begin match noderec with
              |None -> atom (`Atm bdd)
              |Some f -> f bdd (* f = subpairs ... *)
              end
          |_ -> assert false
538

539
      let subst ?noderec subvar_aux bdd = 
540
        let open X in
541
        let atom z = atom_aux ?noderec subvar_aux z in
542 543 544 545 546 547 548
        compute ~empty ~full:`True ~cup ~cap ~diff ~atom bdd
    end
  in
  let subpairs bdd =
    List.fold_left (fun acc (left,rigth) ->
      let deep_subst f l = 
        List.fold_left (fun acc (t1,t2) -> 
549 550
          let d1 = cons (substfree_aux subvar ((descr t1),mem)) in 
          let d2 = cons (substfree_aux subvar ((descr t2),mem)) in
551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573
          BoolPair.cap acc (f(BoolPair.atom(`Atm (Pair.atom (d1,d2)))))
        ) BoolPair.full l
      in
      let neg_atm x = BoolPair.diff BoolPair.full x in
      let pos_atm x = x in
      let acc1 = BoolPair.cap (deep_subst pos_atm left) (deep_subst neg_atm rigth) in
      BoolPair.cup acc acc1
    ) BoolPair.empty (Pair.get bdd)
  in
  let subatoms vars v = match subvar v with |`Constr s -> s.atoms |`Var z -> vars (`Var z) in
  let subints vars v = match subvar v with |`Constr s -> s.ints |`Var z -> vars (`Var z) in
  let subchars vars v = match subvar v with |`Constr s -> s.chars |`Var z -> vars (`Var z) in
  let subarrow vars v = match subvar v with |`Constr s -> s.arrow |`Var z -> vars (`Var z) in
  let subxml vars v = match subvar v with |`Constr s -> s.xml |`Var z -> vars (`Var z) in
  let subtimes vars v = match subvar v with |`Constr s -> s.times |`Var z -> vars (`Var z) in
  let subrecord vars v = match subvar v with |`Constr s -> s.record |`Var z -> vars (`Var z) in
  let tlv s =
    Var.Set.fold (fun v acc ->
      match subvar v with 
      |`Var z -> Var.Set.add (`Var z) acc
      |_ -> acc
    ) s Var.Set.empty
  in
574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592
  try DescrHash.find mem t
  with Not_found ->
    let tsub = 
      {
        atoms = (let module M = C(BoolAtoms) in M.subst) subatoms t.atoms;
        ints  = (let module M = C(BoolIntervals) in M.subst) subints t.ints;
        chars = (let module M = C(BoolChars) in M.subst) subchars t.chars;
        times = (let module M = C(BoolPair) in M.subst) ~noderec:subpairs subtimes t.times;
        xml   = (let module M = C(BoolPair) in M.subst) ~noderec:subpairs subxml t.xml;
        (* XXX record still not done . need to define ~f:subrecord *)
        record= (let module M = C(BoolRec) in M.subst) subrecord t.record;
        arrow = (let module M = C(BoolPair) in M.subst) ~noderec:subpairs subarrow t.arrow;
        abstract = t.abstract;
        absent= t.absent;
        toplvars = { t.toplvars with s = tlv (t.toplvars.s) }
      }
    in
    DescrHash.add mem t tsub;
    tsub
593 594 595 596 597 598

(* substitute in t all occurrences of v by the type s *)
let subst t (v,s) =
  let subvar (`Var v,s) (`Var z) =
    if Var.equal (`Var v) (`Var z) then `Constr s else (`Var z)
  in
599
  substfree_aux (subvar (v,s)) (t,DescrHash.create 17)
600 601 602 603 604

(* substitute in t all variables with a free variables *)
(* using a Hashtbl here hides lots of in place modifications *)
(* the hashtbl can be used to remember all substitutions *)
let substfree t =
605 606
  let subvar tbl z =
    try Hashtbl.find tbl z
607
    with Not_found -> begin
608 609 610
      let v = Var.fresh () in
      Hashtbl.add tbl z v;
      v
611 612
    end
  in
613
  substfree_aux (subvar (Hashtbl.create 17)) (t,DescrHash.create 17)
614 615

(* substitute all variables with s *)
616
let substvariance t =
617 618 619 620 621 622
  let subvar (`Var t) = 
    Format.printf "%a\n" Var.dump (`Var t);
    match Var.variance (`Var t) with
    |`Covariant -> `Constr any 
    |`ContraVariant -> `Constr empty
    |_ -> `Var t
623
  in
624
  substfree_aux subvar (t,DescrHash.create 17)
625

626 627 628 629 630
(* 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)
631
let cap_product any_left any_right l =
632 633
  List.fold_left 
    (fun (d1,d2) (t1,t2) -> (cap_t d1 t1, cap_t d2 t2))
634
    (any_left,any_right)
635
    l
636
let any_pair = { empty with times = any.times }
637

638 639 640
let rec exists max f =
  (max > 0) && (f (max - 1) || exists (max - 1) f)

641
exception NotEmpty
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 709 710 711
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,_) 
712
	| WXml (p1,q1,_), WXml (p2,q2,_) -> 
713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733
	    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 }

734 735 736 737
  let () =
    Stats.register Stats.Summary
      (fun ppf -> Format.fprintf ppf "Allocated witnesses:%i@\n" !wuid)

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
  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"
	  
776 777 778 779 780 781 782 783 784 785 786 787 788 789
  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()))

790
  let bool_pair f =
791
    Pair.compute 
792 793 794 795 796
      ~empty:false ~full:true 
      ~cup:(||) ~cap:(&&) ~diff:(fun x y -> x && not y) 
      ~atom:f

  let bool_rec f =
797
    Rec.compute 
798 799 800 801 802 803 804 805 806 807 808 809 810 811
      ~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

812 813
  (* type_has checks if a witness is contained in the union of
   * the leafs of a bdd, ignoring all variables. *)
814
  and type_has t = function
815 816 817
    | WInt i -> Intervals.contains i (BoolIntervals.leafconj t.ints)
    | WChar c -> Chars.contains c (BoolChars.leafconj t.chars)
    | WAtom a -> Atoms.contains_sample a (BoolAtoms.leafconj t.atoms)
818 819 820
    | WPair (w1,w2,_) -> 
	bool_pair 
	  (fun (n1,n2) -> node_has n1 w1 && node_has n2 w2) 
821
	  (BoolPair.leafconj t.times)
822 823 824
    | WXml (w1,w2,_) ->
	bool_pair 
	  (fun (n1,n2) -> node_has n1 w1 && node_has n2 w2)
825
	  (BoolPair.leafconj t.xml)
826 827 828 829 830 831 832 833 834
    | 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) 
835
	  (BoolPair.leafconj t.arrow)
836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853
    | 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))
854
	  (BoolRec.leafconj t.record)
855 856 857 858
    | WAbsent -> t.absent
    | WAbstract a -> Abstract.contains_sample a t.abstract
end

859 860 861
type slot = { mutable status : status; 
	       mutable notify : notify;
	       mutable active : bool }
862 863
and status = Empty | NEmpty of Witness.witness | Maybe
and notify = Nothing | Do of slot * (Witness.witness -> unit) * notify
864 865

let slot_empty = { status = Empty; active = false; notify = Nothing }
866 867
let slot_nempty w = { status = NEmpty w;
		     active = false; notify = Nothing }
868

869
let rec notify w = function
870 871
  | Nothing -> ()
  | Do (n,f,rem) -> 
872 873
      if n.status == Maybe then (try f w with NotEmpty -> ());
      notify w rem
874 875 876 877 878

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

879 880 881
let set s w =
  s.status <- NEmpty w;
  notify w s.notify;
882
  s.notify <- Nothing; 
883 884
  raise NotEmpty

885
let rec big_conj f l n w =
886
  match l with
887 888
    | [] -> set n w
    | [arg] -> f w arg n
889
    | arg::rem ->
890 891
	let s = 
	  { status = Maybe; active = false; 
892
	    notify = Do (n,(big_conj f rem n), Nothing) } in