From 725a98ea6133fe7741ac1ada32d53f7978bfede0 Mon Sep 17 00:00:00 2001
From: Sébastien Dailly <sebastien@chimrod.com>
Date: Fri, 20 Apr 2018 20:27:29 +0200
Subject: Update dependencies

---
 Makefile             | 5 +++--
 opam                 | 2 +-
 src/catalog.ml       | 8 ++++----
 src/odf/odfLoader.ml | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 347d7d5..4adbf07 100755
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
-PACKAGES=dynlink,curses,camlzip,xmlm,text,str,menhirLib,zarith,base
+OCAMLBUILD ?= ocamlbuild
+PACKAGES=dynlink,curses,camlzip,xmlm,text,str,menhirLib,zarith,base,string_dict
 PATHS=src,src/odf,src/tree,src/expressions
 TARGET=licht
 OCB=ocamlbuild -pkgs $(PACKAGES) $(STUB_OPTIONS) $(MENHIR) -Is $(PATHS) 
@@ -21,7 +22,7 @@ stub:
 	$(MAKE) -C stub LIB=$(LIB)
 
 deps:
-	opam install ocamlfind ocamlbuild curses camlzip xmlm ounit text menhir zarith base
+	opam install ocamlbuild curses camlzip xmlm ounit text menhir zarith string_dict
 
 byte: stub
 	$(OCB) main.byte
diff --git a/opam b/opam
index 264016e..c8d8408 100755
--- a/opam
+++ b/opam
@@ -26,6 +26,6 @@ depends: [
   "xmlm"
   "text"
   "zarith" { >= "1.5" }
-  "base"
+  "string_dict"
 ]
 available: [ ocaml-version >= "4.06.0" ]
diff --git a/src/catalog.ml b/src/catalog.ml
index bba13d6..71f953f 100755
--- a/src/catalog.ml
+++ b/src/catalog.ml
@@ -155,7 +155,7 @@ module Make(Data:DATA_SIG) = struct
      Each name is binded with another map with contains the function for each
      signature.
    *)
-  type t = Functions.t Base.String_dict.t
+  type t = Functions.t String_dict.t
   type catalog_builder = Functions.t Catalog.t
 
   let empty = Catalog.empty
@@ -192,15 +192,15 @@ module Make(Data:DATA_SIG) = struct
   let find_function:
   type a. t -> string -> a t_function sig_typ -> a t_function =
   begin fun t name signature ->
-       Base.String_dict.find_exn t (String.uppercase_ascii name)
+       String_dict.find_exn t (String.uppercase_ascii name)
     |> Functions.find signature
   end
 
   let compile t =
-    (* Use efficient Base.String_dict.
+    (* Use efficient String_dict.
        The requirement to have a unique key is garantee by the Map structure.
     *)
-    Base.String_dict.of_alist_exn (Catalog.bindings t)
+    String_dict.of_alist_exn (Catalog.bindings t)
 
 
   type result =
diff --git a/src/odf/odfLoader.ml b/src/odf/odfLoader.ml
index 06eba38..4abe49f 100755
--- a/src/odf/odfLoader.ml
+++ b/src/odf/odfLoader.ml
@@ -129,14 +129,14 @@ let load catalog source = begin
   let sheet = Sheet.create catalog in
   let cache = Hashtbl.create 10 in
 
-  let table = Base.String_dict.of_alist_exn [
+  let table = String_dict.of_alist_exn [
     ((NS.text ^ "p"), build_p);
     ((NS.table ^ "table-cell"), build_cell cache);
     ((NS.table ^ "table-row"), build_row sheet (ref 1))
   ] in
 
   let el (((ns, name), attributes):Xmlm.tag) childs = begin
-    match Base.String_dict.find table (ns ^ name) with
+    match String_dict.find table (ns ^ name) with
     | Some f -> f attributes childs
     | None -> Unit
   end in
-- 
cgit v1.2.3