From bd0befffb80c3086e3b451456cec24f3a12ac1f0 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Fri, 13 May 2016 17:44:45 +0200
Subject: Dyn: simplify API introducing an Easy submodule

Now the casual Dyn user does not need to be a GADT guru
---
 library/libobject.ml | 13 +------------
 library/summary.ml   | 13 +------------
 2 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'library')

diff --git a/library/libobject.ml b/library/libobject.ml
index bbbb134df2..c566840e4b 100644
--- a/library/libobject.ml
+++ b/library/libobject.ml
@@ -78,20 +78,9 @@ let object_tag (Dyn.Dyn (t, _)) = Dyn.repr t
 let cache_tab =
   (Hashtbl.create 17 : (string,dynamic_object_declaration) Hashtbl.t)
 
-let make_dyn (type a) (tag : a Dyn.tag) =
-  let infun x = Dyn.Dyn (tag, x) in
-  let outfun : (Dyn.t -> a) = fun dyn ->
-    let Dyn.Dyn (t, x) = dyn in
-    match Dyn.eq t tag with
-    | None -> assert false
-    | Some Refl -> x
-  in
-  (infun, outfun)
-
 let declare_object_full odecl =
   let na = odecl.object_name in
-  let tag = Dyn.create na in
-  let (infun, outfun) = make_dyn tag in
+  let (infun, outfun) = Dyn.Easy.make_dyn na in
   let cacher (oname,lobj) = odecl.cache_function (oname,outfun lobj)
   and loader i (oname,lobj) = odecl.load_function i (oname,outfun lobj)
   and opener i (oname,lobj) = odecl.open_function i (oname,outfun lobj)
diff --git a/library/summary.ml b/library/summary.ml
index 19e7e5fd93..edea7dbe50 100644
--- a/library/summary.ml
+++ b/library/summary.ml
@@ -22,19 +22,8 @@ let summaries = ref Int.Map.empty
 
 let mangle id = id ^ "-SUMMARY"
 
-let make_dyn (type a) (tag : a Dyn.tag) =
-  let infun x = Dyn.Dyn (tag, x) in
-  let outfun : (Dyn.t -> a) = fun dyn ->
-    let Dyn.Dyn (t, x) = dyn in
-    match Dyn.eq t tag with
-    | None -> assert false
-    | Some Refl -> x
-  in
-  (infun, outfun)
-
 let internal_declare_summary hash sumname sdecl =
-  let tag = Dyn.create (mangle sumname) in
-  let (infun, outfun) = make_dyn tag in
+  let (infun, outfun) = Dyn.Easy.make_dyn (mangle sumname) in
   let dyn_freeze b = infun (sdecl.freeze_function b)
   and dyn_unfreeze sum = sdecl.unfreeze_function (outfun sum)
   and dyn_init = sdecl.init_function in
-- 
cgit v1.2.3