Commit 3a1e73e5 authored by Kim Nguyễn's avatar Kim Nguyễn

Migrate to the new type substitution API (1/3).

parent 496c41bd
......@@ -64,6 +64,7 @@ sig
val mapi: (Elem.t -> 'a -> 'b) -> 'a map -> 'b map
val constant: 'a -> t -> 'a map
val num: int -> t -> int map
val init : (Elem.t -> 'a) -> t -> 'a map
val map_to_list: ('a -> 'b) -> 'a map -> 'b list
val mapi_to_list: (Elem.t -> 'a -> 'b) -> 'a map -> 'b list
val assoc: Elem.t -> 'a map -> 'a
......@@ -97,9 +98,9 @@ module Make(X : Custom.T) = struct
let hash l = hash 1 l
let rec compare l1 l2 =
if l1 == l2 then 0
if l1 == l2 then 0
else match (l1,l2) with
| x1::l1, x2::l2 ->
| x1::l1, x2::l2 ->
let c = Elem.compare x1 x2 in if c <> 0 then c
else compare l1 l2
| [],_ -> -1
......@@ -115,7 +116,7 @@ module Make(X : Custom.T) = struct
external get: t -> Elem.t list = "%identity"
let singleton x = [ x ]
let pick = function x::_ -> Some x | _ -> None
let pick = function x::_ -> Some x | _ -> None
let choose = function x::_ -> x | _ -> raise Not_found
let length = List.length
......@@ -125,13 +126,13 @@ module Make(X : Custom.T) = struct
let rec disjoint l1 l2 =
if l1 == l2 then l1 == [] else
match (l1,l2) with
| (t1::q1, t2::q2) ->
| (t1::q1, t2::q2) ->
let c = Elem.compare t1 t2 in
if c < 0 then disjoint q1 l2
else if c > 0 then disjoint l1 q2
else false
| _ -> true
let rec cup l1 l2 =
if l1 == l2 then l1 else
match (l1,l2) with
......@@ -144,7 +145,7 @@ module Make(X : Custom.T) = struct
| (l1,[]) -> l1
let add x l = cup [x] l
let rec split l1 l2 =
match (l1,l2) with
| (t1::q1, t2::q2) ->
......@@ -153,8 +154,8 @@ module Make(X : Custom.T) = struct
else if c < 0 then let (l1,i,l2) = split q1 l2 in (t1::l1,i,l2)
else let (l1,i,l2) = split l1 q2 in (l1,i,t2::l2)
| _ -> (l1,[],l2)
let rec diff l1 l2 =
if l1 == l2 then [] else
match (l1,l2) with
......@@ -177,7 +178,7 @@ module Make(X : Custom.T) = struct
else cap l1 q2
| _ -> []
let rec subset l1 l2 =
(l1 == l2) ||
match (l1,l2) with
......@@ -196,8 +197,8 @@ module Make(X : Custom.T) = struct
else if c < 0 then false
else subset l1 q2
| [],_ -> true | _ -> false
let from_list l =
let from_list l =
let rec initlist = function
| [] -> []
| e::rest -> [e] :: initlist rest in
......@@ -209,14 +210,14 @@ module Make(X : Custom.T) = struct
| [l] -> l
| llist -> mergeall (merge2 llist) in
mergeall (initlist l)
let map f l =
from_list (List.map f l)
let rec mem l x =
match l with
| [] -> false
| t::q ->
| t::q ->
let c = Elem.compare x t in
(c = 0) || ((c > 0) && (mem q x))
......@@ -247,7 +248,7 @@ module Make(X : Custom.T) = struct
let rec assoc_remove_aux v r = function
| ((x,y) as a)::l ->
let c = Elem.compare x v in
if c = 0 then (r := Some y; l)
if c = 0 then (r := Some y; l)
else if c < 0 then a :: (assoc_remove_aux v r l)
else raise Not_found
| [] -> raise Not_found
......@@ -323,7 +324,7 @@ module Make(X : Custom.T) = struct
let rec mem x l =
match l with
| [] -> false
| (t,_)::q ->
| (t,_)::q ->
let c = Elem.compare x t in
(c = 0) || ((c > 0) && (mem x q))
......@@ -345,7 +346,7 @@ module Make(X : Custom.T) = struct
else restrict l1 q2
| _ -> []
let from_list f l =
let from_list f l =
let rec initlist = function
| [] -> []
| e::rest -> [e] :: initlist rest in
......@@ -358,7 +359,7 @@ module Make(X : Custom.T) = struct
| llist -> mergeall (merge2 llist) in
mergeall (initlist l)
let from_list_disj l =
let from_list_disj l =
let rec initlist = function
| [] -> []
| e::rest -> [e] :: initlist rest in
......@@ -374,7 +375,7 @@ module Make(X : Custom.T) = struct
let rec map_from_slist f = function
| x::l -> (x,f x)::(map_from_slist f l)
| [] -> []
let rec collide f l1 l2 =
match (l1,l2) with
| (_,y1)::l1, (_,y2)::l2 -> f y1 y2; collide f l1 l2
......@@ -406,6 +407,10 @@ module Make(X : Custom.T) = struct
let rec num i = function [] -> [] | h::t -> (h,i)::(num (i+1) t)
let rec init f = function
[] -> []
| x :: l -> (x, f x) :: (init f l)
let rec map_to_list f = function
| (x,y)::l -> (f y)::(map_to_list f l)
| [] -> []
......@@ -413,7 +418,7 @@ module Make(X : Custom.T) = struct
let rec assoc v = function
| (x,y)::l ->
let c = Elem.compare x v in
if c = 0 then y
if c = 0 then y
else if c < 0 then assoc v l
else raise Not_found
| [] -> raise Not_found
......@@ -426,7 +431,7 @@ module Make(X : Custom.T) = struct
| [] -> assert false
let rec compare f l1 l2 =
if l1 == l2 then 0
if l1 == l2 then 0
else match (l1,l2) with
| (x1,y1)::l1, (x2,y2)::l2 ->
let c = Elem.compare x1 x2 in if c <> 0 then c
......@@ -448,13 +453,13 @@ module Make(X : Custom.T) = struct
let rec check f = function
| (x,a)::((y,b)::_ as tl) ->
| (x,a)::((y,b)::_ as tl) ->
Elem.check x; f a;
assert (Elem.compare x y < 0); check f tl
| [x,a] -> Elem.check x; f a
| _ -> ()
end (* Map *)
end (* Map *)
module MakeMap(Y : Custom.T) = struct
......@@ -464,10 +469,10 @@ module Make(X : Custom.T) = struct
in types.ml... *)
let hash x = Map.hash Y.hash x
let compare x y = Map.compare Y.compare x y
let equal x y = Map.equal Y.equal x y
let equal x y = Map.equal Y.equal x y
let check l = Map.check Y.check l
let dump ppf l =
let dump ppf l =
List.iter (fun (x,y) ->
Format.fprintf ppf "(%a->%a)" Elem.dump x Y.dump y) l
......@@ -507,7 +512,7 @@ module FiniteCofinite(X : Custom.T) = struct
let compare l1 l2 =
match (l1,l2) with
| Finite l1, Finite l2
| Finite l1, Finite l2
| Cofinite l1, Cofinite l2 -> SList.compare l1 l2
| Finite _, Cofinite _ -> -1
| _ -> 1
......@@ -555,11 +560,11 @@ module FiniteCofinite(X : Custom.T) = struct
let neg = function
| Finite s -> Cofinite s
| Cofinite s -> Finite s
let contains x = function
| Finite s -> SList.mem s x
| Cofinite s -> not (SList.mem s x)
let disjoint s t =
match (s,t) with
| (Finite s, Finite t) -> SList.disjoint s t
......@@ -581,79 +586,79 @@ struct
let sample = function
| Cofinite _ -> None
| Finite l -> (match T.get l with
| Finite l -> (match T.get l with
| [] -> raise Not_found
| (x,y)::_ -> Some (x, SymbolSet.sample y))
let get = function
| Finite l -> `Finite (T.get l)
| Cofinite l -> `Cofinite (T.get l)
let check = function
| Finite l | Cofinite l -> TMap.check l
let dump ppf = function
| Finite s -> Format.fprintf ppf "Finite[%a]" TMap.dump s
| Cofinite s -> Format.fprintf ppf "Cofinite[%a]" TMap.dump s
let empty = Finite T.empty
let any = Cofinite T.empty
let any_in_ns ns = Finite (T.singleton ns SymbolSet.any)
let finite l =
let l =
T.filter
let l =
T.filter
(fun _ x -> match x with SymbolSet.Finite [] -> false | _ -> true)
l in
Finite l
let cofinite l =
let l =
T.filter
let l =
T.filter
(fun _ x -> match x with SymbolSet.Finite [] -> false | _ -> true)
l in
Cofinite l
let atom (ns,x) = Finite (T.singleton ns (SymbolSet.atom x))
let cup s t =
match (s,t) with
| (Finite s, Finite t) -> finite (T.merge SymbolSet.cup s t)
| (Finite s, Cofinite t) -> cofinite (T.sub SymbolSet.diff t s)
| (Cofinite s, Finite t) -> cofinite (T.sub SymbolSet.diff s t)
| (Cofinite s, Cofinite t) -> cofinite (T.cap SymbolSet.cap s t)
let cap s t =
match (s,t) with
| (Finite s, Finite t) -> finite (T.cap SymbolSet.cap s t)
| (Finite s, Cofinite t) -> finite (T.sub SymbolSet.diff s t)
| (Cofinite s, Finite t) -> finite (T.sub SymbolSet.diff t s)
| (Cofinite s, Cofinite t) -> cofinite (T.merge SymbolSet.cup s t)
let diff s t =
match (s,t) with
| (Finite s, Cofinite t) -> finite (T.cap SymbolSet.cap s t)
| (Finite s, Finite t) -> finite (T.sub SymbolSet.diff s t)
| (Cofinite s, Cofinite t) -> finite (T.sub SymbolSet.diff t s)
| (Cofinite s, Finite t) -> cofinite (T.merge SymbolSet.cup s t)
let is_empty = function
| Finite l -> T.is_empty l
| _ -> false
| _ -> false
let hash = function
| Finite l -> 1 + 17 * (TMap.hash l)
| Cofinite l -> 2 + 17 * (TMap.hash l)
let compare l1 l2 =
match (l1,l2) with
| Finite l1, Finite l2
| Finite l1, Finite l2
| Cofinite l1, Cofinite l2 -> TMap.compare l1 l2
| Finite _, Cofinite _ -> -1
| _ -> 1
let equal t1 t2 =
let equal t1 t2 =
compare t1 t2 = 0
let symbol_set ns = function
......@@ -663,12 +668,12 @@ struct
(try SymbolSet.neg (T.assoc ns s) with Not_found -> SymbolSet.any)
let contains (ns,x) = function
| Finite s ->
| Finite s ->
(try SymbolSet.contains x (T.assoc ns s) with Not_found -> false)
| Cofinite s ->
| Cofinite s ->
(try not (SymbolSet.contains x (T.assoc ns s)) with Not_found -> true)
let disjoint s t =
let disjoint s t =
is_empty (cap t s) (* TODO: OPT *)
end
......@@ -64,6 +64,7 @@ sig
val mapi: (Elem.t -> 'a -> 'b) -> 'a map -> 'b map
val constant: 'a -> t -> 'a map
val num: int -> t -> int map
val init : (Elem.t -> 'a) -> t -> 'a map
val map_to_list: ('a -> 'b) -> 'a map -> 'b list
val mapi_to_list: (Elem.t -> 'a -> 'b) -> 'a map -> 'b list
val assoc: Elem.t -> 'a map -> 'a
......@@ -103,7 +104,7 @@ module FiniteCofinite(X : Custom.T) : FiniteCofinite with type elem = X.t
module FiniteCofiniteMap(X : Custom.T)(SymbolSet : FiniteCofinite) :
sig
include Custom.T
val empty: t
val any: t
val any_in_ns: X.t -> t
......@@ -117,7 +118,7 @@ sig
val contains: X.t * SymbolSet.elem -> t -> bool
val disjoint: t -> t -> bool
val get: t -> [ `Finite of (X.t * SymbolSet.t) list
val get: t -> [ `Finite of (X.t * SymbolSet.t) list
| `Cofinite of (X.t * SymbolSet.t) list ]
val sample: t -> (X.t * SymbolSet.elem option) option
......
......@@ -2636,7 +2636,9 @@ module Positive = struct
|`Xml of v * v
|`Record of bool * (bool * Ns.Label.t * v) list
]
and v = { mutable def : rhs; mutable node : node option; }
and v = { mutable def : rhs; mutable node : node option;
mutable descr : Descr.t option;
}
module MemoHash = Hashtbl.Make( struct
type t = v
......@@ -2697,7 +2699,7 @@ module Positive = struct
n
(* We shadow the corresponding definitions in the outer module *)
let forward () = { def = `Cup []; node = None; }
let forward () = { def = `Cup []; node = None; descr = None}
let def v d = v.def <- d
let cons d = let v = forward () in def v d; v
let ty d = cons (`Type d)
......@@ -2762,6 +2764,7 @@ module Positive = struct
and decompose_type t =
try DescrHash.find memo t
with Not_found ->
let res =
if no_var t then ty t
else
match check_var t with
......@@ -2781,6 +2784,7 @@ module Positive = struct
@@ decompose_kind Abstract.any abstract (BoolAbstracts.get t.abstract) []
in
node_t.def <- (cup descr_t).def; node_t
in res.descr <- Some t; res
in
decompose_type t
......@@ -2977,6 +2981,128 @@ module Positive = struct
end
module Substitution =
struct
module Map = Var.Set.Map
type t = Descr.t Map.map
type order = int Map.map
let identity = Map.empty
let add v t m =
if is_var t && Var.(equal v (Set.choose (all_vars t))) then m
else Map.add v t m
let of_list l =
List.fold_left (fun acc (v, t) -> add v t acc) identity l
module Memo = Hashtbl.Make
(struct
type subst = t
type t = Descr.t * subst
let equal ((t1, l1) as k1) ((t2, l2) as k2) =
k1 == k2
|| ((t1 == t2 || Descr.equal t1 t2)
&& (l1 == l2 || Map.equal Descr.equal l1 l2))
let hash (t, l) =
(Descr.hash t + 31 * Map.hash Descr.hash l) land 0x3fff_ffff
end)
let global_memo = Memo.create 17
let rec app_subst ?(after = (fun x -> x)) ?(do_var= fun x -> Positive.ty x) t subst =
let open Positive in
if subst == identity then descr (solve t) else
let memo = MemoHash.create 17 in
let todo = ref [] in
let rec aux v =
let found, update, v =
match v.descr with
| None -> false, None, v
| Some d ->
let vars = all_vars d in
if Var.Set.is_empty vars then true, None, ty d
else
let subst' = Map.restrict subst vars in
let key = (d, subst') in
try
let d = Memo.find global_memo key in
true, None , ty d
with
Not_found ->
false, Some (key), v
in
if found then v else
let res =
try MemoHash.find memo v
with Not_found ->
match v.def with
|`Variable d ->
let res =
(try
do_var (Map.assoc d subst)
with Not_found -> { forward () with def = v.def })
in
MemoHash.add memo v res; res
| x ->
let node_v = forward () in
let () = MemoHash.add memo v node_v in
let res =
match x with
| `Type _ -> x
| `Cup vl -> `Cup (List.map (fun v -> aux v) vl)
| `Cap vl -> `Cap (List.map (fun v -> aux v) vl)
| `Times (v1,v2) -> `Times (aux v1, aux v2)
| `Arrow (v1,v2) -> `Arrow (aux v1, aux v2)
| `Xml (v1,v2) -> `Xml (aux v1, aux v2)
| `Record (b, flst) ->
`Record (b, List.map (fun (b,l,v) -> (b,l,aux v)) flst)
| `Neg v -> `Neg (aux v)
| `Variable _ -> assert false
in
node_v.def <- res;
node_v
in
let () =
match update with
None -> ()
| Some key -> todo := (key, res) :: !todo
in
res
in
let res = aux t in
let res = after res in
let tres = descr (solve res) in
List.iter (fun ((d, subst) as key, res) ->
match res.node with
Some t -> begin
try
let (cu, name, al) =
DescrMap.find d !Print.named
in
let nal = List.map (fun (v,t) -> v,app_subst ~do_var ~after (Positive.decompose t) subst) al
in
Print.register_global (cu, name, nal) d
with Not_found -> () end;
Memo.add global_memo key (descr t)
| _ -> () ) !todo;
tres
let full t l =
if no_var t then t else
app_subst (Positive.decompose t) (of_list l)
let single t s = full t [s]
let freshen delta t =
if no_var t then t else
let vars = Var.Set.diff (all_vars t) delta in
let subst = Map.init (fun v -> var (Var.fresh v)) vars in
app_subst (Positive.decompose t) subst
(*descr (apply_subst2 t subst) *)
end
module Tallying = struct
type constr =
......@@ -3517,12 +3643,12 @@ module Tallying = struct
(* Format.printf "X = %a %a %a\n" Var.pp alpha Print.print x dump t; *)
let es =
CS.E.fold (fun beta s acc ->
CS.E.add beta (Positive.substitute s (alpha,x)) acc
CS.E.add beta (Substitution.single s (alpha,x)) acc
) e1 CS.E.empty
in
(* Format.printf "es = %a\n" CS.print_e es; *)
let sigma = aux ((CS.E.add alpha x sol)) es in
let talpha = CS.E.fold (fun v sub acc -> Positive.substitute acc (v,sub)) sigma x in
let talpha = CS.E.fold (fun v sub acc -> Substitution.single acc (v,sub)) sigma x in
CS.E.add alpha talpha sigma
end
in
......@@ -3557,7 +3683,7 @@ module Tallying = struct
(CS.ES.elements el)
(* apply sigma to t *)
let (>>) t si = CS.E.fold (fun v sub acc -> Positive.substitute acc (v,sub)) si t
let (>>) t si = CS.E.fold (fun v sub acc -> Substitution.single acc (v,sub)) si t
type symsubst = I | S of CS.sigma | A of (symsubst * symsubst)
......@@ -3655,7 +3781,7 @@ let squaresubtype delta s t =
try
let ss =
if i = 0 then s
else (cap (Positive.substitute_free delta s) (get ai (i-1)))
else (cap (Substitution.freshen delta s) (get ai (i-1)))
in
set ai i ss;
tallying i;
......@@ -3704,8 +3830,8 @@ let apply_raw delta s t =
(* Format.printf "Starting expansion %i @\n@." i; *)
let (ss,tt) =
if i = 0 then (s,t) else
((cap (Positive.substitute_free delta s) (get ai (i-1))),
(cap (Positive.substitute_free delta t) (get aj (i-1))))
((cap (Substitution.freshen delta s) (get ai (i-1))),
(cap (Substitution.freshen delta t) (get aj (i-1))))
in
set ai i ss;
set aj i tt;
......
......@@ -156,11 +156,18 @@ module Positive : sig
val solve: v -> Node.t
val substitute : t -> (Var.var * t) -> t
val substitute_list : t -> (Var.var * t) list -> t
(*val substitute_list : t -> (Var.var * t) list -> t *)
val solve_rectype : t -> Var.var -> t
val substitute_free : Var.Set.t -> t -> t
(* val substitute_free : Var.Set.t -> t -> t *)
val clean_type : Var.Set.t -> t -> t
end
module Substitution : sig
val full : t -> (Var.var * t) list -> t
val single : t -> (Var.var * t) -> t
val freshen : Var.Set.t -> t -> t
end
(** Normalization **)
......
......@@ -548,7 +548,7 @@ module IType = struct
(Printf.sprintf "Wrong number of parameters for parametric type %s" (U.to_string id));
| Error s -> raise_loc_generic loc s
in
mk_type (Types.Positive.substitute_list t l)
mk_type (Types.Substitution.full t l)
with Not_found ->
assert (rest == []);
if args != [] then
......@@ -623,7 +623,7 @@ module IType = struct
in
let sub_list = List.map (fun (v,vt) -> v, Types.var vt) vars_mapping in
let t_rhs =
Types.Positive.substitute_list t_rhs sub_list
Types.Substitution.full t_rhs sub_list
in
let nargs = List.map2 (fun (_, v) (_, vt) -> v, vt) vars_mapping sub_list
in
......@@ -1140,8 +1140,8 @@ and type_check' loc env ed constr precise = match ed with
(fun v ->
let open Types in
match v with
| Val t -> Val (Positive.substitute_free env.delta t)
| EVal (a,b,t) -> EVal (a,b,Positive.substitute_free env.delta t)
| Val t -> Val (Substitution.freshen env.delta t)
| EVal (a,b,t) -> EVal (a,b,Substitution.freshen env.delta t)
| x -> x)
env.ids }
in
......@@ -1217,7 +1217,7 @@ and type_check' loc env ed constr precise = match ed with
| Apply (e1,e2) ->
let t1 = type_check env e1 Types.Arrow.any true in
let t1arrow = Types.Arrow.get t1 in
let t1 = Types.Positive.substitute_free env.delta t1 in
let t1 = Types.Substitution.freshen env.delta t1 in
(* t [_delta 0 -> 1 *)
begin try
ignore(Types.Tallying.tallying env.delta [(t1,Types.Arrow.any)])
......@@ -1227,7 +1227,7 @@ and type_check' loc env ed constr precise = match ed with
let dom = Types.Arrow.domain(t1arrow) in
let t2 = type_check env e2 Types.any true in
let t2 = Types.Positive.substitute_free env.delta t2 in
let t2 = Types.Substitution.freshen env.delta t2 in
let (sl,res) =
if not (Types.no_var dom) ||
not (Types.no_var t2) then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment