# HG changeset patch # User orbitz NA # Date 1494438528 0 # Wed May 10 17:48:48 2017 +0000 # Node ID 154953d826791b9078c093b9e59d01f2b897735c # Parent e3e6fc7e9523c93aeb8118fce80a08020c9251f2 # Parent fea6830d11fc1c5fad62ce4ebfc083bfaf342277 Merged in undo-4.02.3-support (pull request #4) Undo 4.02.3 support diff --git a/hll.conf b/hll.conf --- a/hll.conf +++ b/hll.conf @@ -13,5 +13,7 @@ build_deps = ["merlin-of-pds"] +available = "ocaml-version >= \"4.03\"" + [deps_map] -ppx_deriving = ["ppx_deriving.show", "ppx_deriving.eq"] \ No newline at end of file +ppx_deriving = ["ppx_deriving.show", "ppx_deriving.eq"] diff --git a/pds.conf b/pds.conf --- a/pds.conf +++ b/pds.conf @@ -7,7 +7,7 @@ [src.snabela] install = true extra_ocamldep_opts = "-package sedlex" -deps = [ "result", "process", "containers", "sedlex", "ppx_deriving", "ppx_deriving.show", "ppx_deriving.eq" ] +deps = [ "process", "containers", "sedlex", "ppx_deriving", "ppx_deriving.show", "ppx_deriving.eq" ] [src.snabela_cli] install = true diff --git a/src/snabela/snabela.ml b/src/snabela/snabela.ml --- a/src/snabela/snabela.ml +++ b/src/snabela/snabela.ml @@ -1,5 +1,3 @@ -open Result - module Kv = struct module Map = CCMap.Make(String) diff --git a/src/snabela/snabela.mli b/src/snabela/snabela.mli --- a/src/snabela/snabela.mli +++ b/src/snabela/snabela.mli @@ -6,8 +6,6 @@ Convenience function are provided for constructing a value of type [t] as well as pretty printing. *) -open Result - module Kv : sig module Map : CCMap.S with type key = string diff --git a/src/snabela/snabela_lexer.ml b/src/snabela/snabela_lexer.ml --- a/src/snabela/snabela_lexer.ml +++ b/src/snabela/snabela_lexer.ml @@ -1,5 +1,3 @@ -open Result - module Token = struct type token = | Escaped_at diff --git a/src/snabela_cli/snabela_cli.ml b/src/snabela_cli/snabela_cli.ml --- a/src/snabela_cli/snabela_cli.ml +++ b/src/snabela_cli/snabela_cli.ml @@ -1,5 +1,3 @@ -open Result - module SMap = CCMap.Make(String) module Cmdline = struct