Merge branch 'master' into stable for 0.19

Makefile

@@ -1,46 +1,41 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9a60866e2fa295c5e33a3fe33b8f3a32)
+# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
 
-SETUP = ./setup.exe
+SETUP = ocaml setup.ml
 
-build: setup.data $(SETUP)
+build: setup.data
 	$(SETUP) -build $(BUILDFLAGS)
 
-doc: setup.data $(SETUP) build
+doc: setup.data build
 	$(SETUP) -doc $(DOCFLAGS)
 
-test: setup.data $(SETUP) build
+test: setup.data build
 	$(SETUP) -test $(TESTFLAGS)
 
-all: $(SETUP)
+all:
 	$(SETUP) -all $(ALLFLAGS)
 
-install: setup.data $(SETUP)
+install: setup.data
 	$(SETUP) -install $(INSTALLFLAGS)
 
-uninstall: setup.data $(SETUP)
+uninstall: setup.data
 	$(SETUP) -uninstall $(UNINSTALLFLAGS)
 
-reinstall: setup.data $(SETUP)
+reinstall: setup.data
 	$(SETUP) -reinstall $(REINSTALLFLAGS)
 
-clean: $(SETUP)
+clean:
 	$(SETUP) -clean $(CLEANFLAGS)
 
-distclean: $(SETUP)
+distclean:
 	$(SETUP) -distclean $(DISTCLEANFLAGS)
-	$(RM) $(SETUP)
 
-setup.data: $(SETUP)
+setup.data:
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
-configure: $(SETUP)
+configure:
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
-setup.exe: setup.ml
-	ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun $< || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun $< || true
-	$(RM) setup.cmi setup.cmo setup.cmx setup.o
-
 .PHONY: build doc test all install uninstall reinstall clean distclean configure
 
 # OASIS_STOP

_oasis

@@ -8,7 +8,7 @@ LicenseFile: LICENSE
 Plugins:     META (0.3), DevFiles (0.3)
 OCamlVersion: >= 4.00.1
 BuildTools:  ocamlbuild
-AlphaFeatures: compiled_setup_ml, ocamlbuild_more_args
+AlphaFeatures: ocamlbuild_more_args
 
 XOCamlbuildExtraArgs: "-j 0"
 

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 1681c391580688c2463b8457d464cf03)
+# DO NOT EDIT (digest: b6feb825fcf5f052598fa7164e7f8398)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -73,6 +73,7 @@ true: annot, bin_annot
 <benchs/run_benchs.{native,byte}>: package(bytes)
 <benchs/run_benchs.{native,byte}>: package(gen)
 <benchs/run_benchs.{native,byte}>: package(hamt)
+<benchs/run_benchs.{native,byte}>: package(qcheck)
 <benchs/run_benchs.{native,byte}>: package(result)
 <benchs/run_benchs.{native,byte}>: package(sequence)
 <benchs/run_benchs.{native,byte}>: package(threads)
@@ -84,6 +85,7 @@ true: annot, bin_annot
 <benchs/run_benchs.{native,byte}>: use_containers_thread
 <benchs/*.ml{,i,y}>: package(benchmark)
 <benchs/*.ml{,i,y}>: package(gen)
+<benchs/*.ml{,i,y}>: package(qcheck)
 <benchs/*.ml{,i,y}>: package(threads)
 <benchs/*.ml{,i,y}>: use_containers_advanced
 <benchs/*.ml{,i,y}>: use_containers_iter
@@ -94,11 +96,11 @@ true: annot, bin_annot
 <benchs/run_bench_hash.{native,byte}>: package(result)
 <benchs/run_bench_hash.{native,byte}>: use_containers
 # Executable run_qtest
-<qtest/run_qtest.{native,byte}>: package(QTest2Lib)
 <qtest/run_qtest.{native,byte}>: package(bigarray)
 <qtest/run_qtest.{native,byte}>: package(bytes)
 <qtest/run_qtest.{native,byte}>: package(gen)
 <qtest/run_qtest.{native,byte}>: package(oUnit)
+<qtest/run_qtest.{native,byte}>: package(qcheck)
 <qtest/run_qtest.{native,byte}>: package(result)
 <qtest/run_qtest.{native,byte}>: package(sequence)
 <qtest/run_qtest.{native,byte}>: package(threads)
@@ -113,11 +115,11 @@ true: annot, bin_annot
 <qtest/run_qtest.{native,byte}>: use_containers_string
 <qtest/run_qtest.{native,byte}>: use_containers_thread
 <qtest/run_qtest.{native,byte}>: use_containers_unix
-<qtest/*.ml{,i,y}>: package(QTest2Lib)
 <qtest/*.ml{,i,y}>: package(bigarray)
 <qtest/*.ml{,i,y}>: package(bytes)
 <qtest/*.ml{,i,y}>: package(gen)
 <qtest/*.ml{,i,y}>: package(oUnit)
+<qtest/*.ml{,i,y}>: package(qcheck)
 <qtest/*.ml{,i,y}>: package(result)
 <qtest/*.ml{,i,y}>: package(sequence)
 <qtest/*.ml{,i,y}>: package(threads)

advanced/containers_advanced.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 0f1ca0e2b031ae1710e26abf02cca256)
+Containers_advanced
+# OASIS_STOP

advanced/containers_advanced.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 0f1ca0e2b031ae1710e26abf02cca256)
+Containers_advanced
+# OASIS_STOP

advanced/containers_advanced.mlpack

@@ -0,0 +1,7 @@
+# OASIS_START
+# DO NOT EDIT (digest: 5a399cd532edb84596f3034081578694)
+CCLinq
+CCBatch
+CCCat
+CCMonadIO
+# OASIS_STOP

configure

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # OASIS_START
-# DO NOT EDIT (digest: 6f7b8221311e800a7093dc3b793f67ca)
+# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
 set -e
 
 FST=true
@@ -23,5 +23,5 @@ for i in "$@"; do
   esac
 done
 
-make configure CONFIGUREFLAGS="$*"
+ocaml setup.ml -configure "$@"
 # OASIS_STOP

containers.odocl

@@ -0,0 +1,80 @@
+# OASIS_START
+# DO NOT EDIT (digest: b2fa90a283cbf634dc8de2f37468b64b)
+src/core/CCVector
+src/core/CCPrint
+src/core/CCError
+src/core/CCHeap
+src/core/CCList
+src/core/CCOpt
+src/core/CCPair
+src/core/CCFun
+src/core/CCHash
+src/core/CCInt
+src/core/CCBool
+src/core/CCFloat
+src/core/CCArray
+src/core/CCRef
+src/core/CCSet
+src/core/CCOrd
+src/core/CCRandom
+src/core/CCString
+src/core/CCHashtbl
+src/core/CCMap
+src/core/CCFormat
+src/core/CCIO
+src/core/CCInt64
+src/core/CCChar
+src/core/CCResult
+src/core/Containers
+src/iter/CCKTree
+src/iter/CCKList
+src/iter/CCLazy_list
+src/data/CCMultiMap
+src/data/CCMultiSet
+src/data/CCTrie
+src/data/CCFlatHashtbl
+src/data/CCCache
+src/data/CCPersistentHashtbl
+src/data/CCDeque
+src/data/CCFQueue
+src/data/CCBV
+src/data/CCMixtbl
+src/data/CCMixmap
+src/data/CCRingBuffer
+src/data/CCIntMap
+src/data/CCPersistentArray
+src/data/CCMixset
+src/data/CCHashconsedSet
+src/data/CCGraph
+src/data/CCHashSet
+src/data/CCBitField
+src/data/CCHashTrie
+src/data/CCBloom
+src/data/CCWBTree
+src/data/CCRAL
+src/data/CCAllocCache
+src/data/CCImmutArray
+src/data/CCHet
+src/string/Containers_string
+src/string/CCKMP
+src/string/CCLevenshtein
+src/string/CCApp_parse
+src/string/CCParse
+src/bigarray/CCBigstring
+src/bigarray/CCArray1
+src/threads/CCPool
+src/threads/CCLock
+src/threads/CCSemaphore
+src/threads/CCThread
+src/threads/CCBlockingQueue
+src/threads/CCTimer
+src/advanced/Containers_advanced
+src/advanced/CCLinq
+src/advanced/CCBatch
+src/advanced/CCCat
+src/advanced/CCMonadIO
+src/io/Containers_io_is_deprecated
+src/unix/CCUnix
+src/sexp/CCSexp
+src/sexp/CCSexpM
+# OASIS_STOP

containers_advanced.odocl

@@ -0,0 +1,7 @@
+# OASIS_START
+# DO NOT EDIT (digest: c39cb4de2de5f975c95c1e05f9661ea6)
+advanced/CCLinq
+advanced/CCBatch
+advanced/CCCat
+advanced/CCMonadIO
+# OASIS_STOP

containers_lwt.odocl

@@ -0,0 +1,6 @@
+# OASIS_START
+# DO NOT EDIT (digest: e7bd30038718864173f30ddcb755f758)
+lwt/Behavior
+lwt/Lwt_automaton
+lwt/Lwt_actor
+# OASIS_STOP

containers_misc.odocl

@@ -0,0 +1,34 @@
+# OASIS_START
+# DO NOT EDIT (digest: df85a5182175d1029216007c66a27aa4)
+misc/FHashtbl
+misc/FlatHashtbl
+misc/Hashset
+misc/Heap
+misc/LazyGraph
+misc/PersistentGraph
+misc/PHashtbl
+misc/SkipList
+misc/SplayTree
+misc/SplayMap
+misc/Univ
+misc/Bij
+misc/PiCalculus
+misc/RAL
+misc/UnionFind
+misc/SmallSet
+misc/AbsSet
+misc/CSM
+misc/TTree
+misc/PrintBox
+misc/HGraph
+misc/Automaton
+misc/Conv
+misc/Bidir
+misc/Iteratee
+misc/BTree
+misc/Ty
+misc/Cause
+misc/AVL
+misc/ParseReact
+misc/Mixtbl
+# OASIS_STOP

containers_string.odocl

@@ -0,0 +1,5 @@
+# OASIS_START
+# DO NOT EDIT (digest: fae37ce560d3fa23ae92d95d4ecca210)
+string/KMP
+string/Levenshtein
+# OASIS_STOP

core/META

@@ -0,0 +1,87 @@
+# OASIS_START
+# DO NOT EDIT (digest: 29eba35d8937ec2340c27a97da9180a6)
+version = "0.6.1"
+description = "A modular standard library focused on data structures."
+requires = "bytes"
+archive(byte) = "containers.cma"
+archive(byte, plugin) = "containers.cma"
+archive(native) = "containers.cmxa"
+archive(native, plugin) = "containers.cmxs"
+exists_if = "containers.cma"
+package "thread" (
+ version = "0.6.1"
+ description = "A modular standard library focused on data structures."
+ requires = "containers threads"
+ archive(byte) = "containers_thread.cma"
+ archive(byte, plugin) = "containers_thread.cma"
+ archive(native) = "containers_thread.cmxa"
+ archive(native, plugin) = "containers_thread.cmxs"
+ exists_if = "containers_thread.cma"
+)
+
+package "string" (
+ version = "0.6.1"
+ description = "A modular standard library focused on data structures."
+ archive(byte) = "containers_string.cma"
+ archive(byte, plugin) = "containers_string.cma"
+ archive(native) = "containers_string.cmxa"
+ archive(native, plugin) = "containers_string.cmxs"
+ exists_if = "containers_string.cma"
+)
+
+package "pervasives" (
+ version = "0.6.1"
+ description = "A modular standard library focused on data structures."
+ requires = "containers"
+ archive(byte) = "containers_pervasives.cma"
+ archive(byte, plugin) = "containers_pervasives.cma"
+ archive(native) = "containers_pervasives.cmxa"
+ archive(native, plugin) = "containers_pervasives.cmxs"
+ exists_if = "containers_pervasives.cma"
+)
+
+package "misc" (
+ version = "0.6.1"
+ description = "A modular standard library focused on data structures."
+ requires = "unix containers"
+ archive(byte) = "containers_misc.cma"
+ archive(byte, plugin) = "containers_misc.cma"
+ archive(native) = "containers_misc.cmxa"
+ archive(native, plugin) = "containers_misc.cmxs"
+ exists_if = "containers_misc.cma"
+)
+
+package "lwt" (
+ version = "0.6.1"
+ description = "A modular standard library focused on data structures."
+ requires = "containers lwt lwt.unix containers.misc"
+ archive(byte) = "containers_lwt.cma"
+ archive(byte, plugin) = "containers_lwt.cma"
+ archive(native) = "containers_lwt.cmxa"
+ archive(native, plugin) = "containers_lwt.cmxs"
+ exists_if = "containers_lwt.cma"
+)
+
+package "cgi" (
+ version = "0.6.1"
+ description = "A modular standard library focused on data structures."
+ requires = "containers CamlGI"
+ archive(byte) = "containers_cgi.cma"
+ archive(byte, plugin) = "containers_cgi.cma"
+ archive(native) = "containers_cgi.cmxa"
+ archive(native, plugin) = "containers_cgi.cmxs"
+ exists_if = "containers_cgi.cma"
+)
+
+package "advanced" (
+ version = "0.6.1"
+ description = "A modular standard library focused on data structures."
+ requires = "containers"
+ archive(byte) = "containers_advanced.cma"
+ archive(byte, plugin) = "containers_advanced.cma"
+ archive(native) = "containers_advanced.cmxa"
+ archive(native, plugin) = "containers_advanced.cmxs"
+ exists_if = "containers_advanced.cma"
+)
+# OASIS_STOP
+

core/containers.mldylib

@@ -0,0 +1,37 @@
+# OASIS_START
+# DO NOT EDIT (digest: 8d84707fdc7358bdadca9b7202118243)
+CCVector
+CCDeque
+CCGen
+Gen_intf
+CCSequence
+CCFQueue
+CCMultiMap
+CCMultiSet
+CCBV
+CCPrint
+CCPersistentHashtbl
+CCError
+CCHeap
+CCList
+CCOpt
+CCPair
+CCFun
+CCHash
+CCKList
+CCInt
+CCBool
+CCFloat
+CCArray
+CCOrd
+CCIO
+CCRandom
+CCKTree
+CCTrie
+CCString
+CCHashtbl
+CCFlatHashtbl
+CCSexp
+CCMap
+CCCache
+# OASIS_STOP

core/containers.mllib

@@ -0,0 +1,37 @@
+# OASIS_START
+# DO NOT EDIT (digest: 8d84707fdc7358bdadca9b7202118243)
+CCVector
+CCDeque
+CCGen
+Gen_intf
+CCSequence
+CCFQueue
+CCMultiMap
+CCMultiSet
+CCBV
+CCPrint
+CCPersistentHashtbl
+CCError
+CCHeap
+CCList
+CCOpt
+CCPair
+CCFun
+CCHash
+CCKList
+CCInt
+CCBool
+CCFloat
+CCArray
+CCOrd
+CCIO
+CCRandom
+CCKTree
+CCTrie
+CCString
+CCHashtbl
+CCFlatHashtbl
+CCSexp
+CCMap
+CCCache
+# OASIS_STOP

lwt/containers_lwt.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: bc144ef7b5b54947fab9662a822f9179)
+Containers_lwt
+# OASIS_STOP

lwt/containers_lwt.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: bc144ef7b5b54947fab9662a822f9179)
+Containers_lwt
+# OASIS_STOP

lwt/containers_lwt.mlpack

@@ -0,0 +1,6 @@
+# OASIS_START
+# DO NOT EDIT (digest: 0522ffe492b9796ab336d55b925afe68)
+Behavior
+Lwt_automaton
+Lwt_actor
+# OASIS_STOP

misc/containers_misc.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 2df0608accd158542ebcb00720cfe599)
+Containers_misc
+# OASIS_STOP

misc/containers_misc.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 2df0608accd158542ebcb00720cfe599)
+Containers_misc
+# OASIS_STOP

misc/containers_misc.mlpack

@@ -0,0 +1,34 @@
+# OASIS_START
+# DO NOT EDIT (digest: 5f2c8615af923cd3ff229b6d10c55bc8)
+FHashtbl
+FlatHashtbl
+Hashset
+Heap
+LazyGraph
+PersistentGraph
+PHashtbl
+SkipList
+SplayTree
+SplayMap
+Univ
+Bij
+PiCalculus
+RAL
+UnionFind
+SmallSet
+AbsSet
+CSM
+TTree
+PrintBox
+HGraph
+Automaton
+Conv
+Bidir
+Iteratee
+BTree
+Ty
+Cause
+AVL
+ParseReact
+Mixtbl
+# OASIS_STOP

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: b119194f5742ac2f3cdceac9a223dda7) *)
+(* DO NOT EDIT (digest: 9ba607f1a3e839f1c1e8ea449ddfab16) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -29,6 +29,166 @@ module OASISGettext = struct
 
 end
 
+module OASISString = struct
+(* # 22 "src/oasis/OASISString.ml" *)
+
+
+  (** Various string utilities.
+
+      Mostly inspired by extlib and batteries ExtString and BatString libraries.
+
+      @author Sylvain Le Gall
+    *)
+
+
+  let nsplitf str f =
+    if str = "" then
+      []
+    else
+      let buf = Buffer.create 13 in
+      let lst = ref [] in
+      let push () =
+        lst := Buffer.contents buf :: !lst;
+        Buffer.clear buf
+      in
+      let str_len = String.length str in
+        for i = 0 to str_len - 1 do
+          if f str.[i] then
+            push ()
+          else
+            Buffer.add_char buf str.[i]
+        done;
+        push ();
+        List.rev !lst
+
+
+  (** [nsplit c s] Split the string [s] at char [c]. It doesn't include the
+      separator.
+    *)
+  let nsplit str c =
+    nsplitf str ((=) c)
+
+
+  let find ~what ?(offset=0) str =
+    let what_idx = ref 0 in
+    let str_idx = ref offset in
+      while !str_idx < String.length str &&
+            !what_idx < String.length what do
+        if str.[!str_idx] = what.[!what_idx] then
+          incr what_idx
+        else
+          what_idx := 0;
+        incr str_idx
+      done;
+      if !what_idx <> String.length what then
+        raise Not_found
+      else
+        !str_idx - !what_idx
+
+
+  let sub_start str len =
+    let str_len = String.length str in
+    if len >= str_len then
+      ""
+    else
+      String.sub str len (str_len - len)
+
+
+  let sub_end ?(offset=0) str len =
+    let str_len = String.length str in
+    if len >= str_len then
+      ""
+    else
+      String.sub str 0 (str_len - len)
+
+
+  let starts_with ~what ?(offset=0) str =
+    let what_idx = ref 0 in
+    let str_idx = ref offset in
+    let ok = ref true in
+      while !ok &&
+            !str_idx < String.length str &&
+            !what_idx < String.length what do
+        if str.[!str_idx] = what.[!what_idx] then
+          incr what_idx
+        else
+          ok := false;
+        incr str_idx
+      done;
+      if !what_idx = String.length what then
+        true
+      else
+        false
+
+
+  let strip_starts_with ~what str =
+    if starts_with ~what str then
+      sub_start str (String.length what)
+    else
+      raise Not_found
+
+
+  let ends_with ~what ?(offset=0) str =
+    let what_idx = ref ((String.length what) - 1) in
+    let str_idx = ref ((String.length str) - 1) in
+    let ok = ref true in
+      while !ok &&
+            offset <= !str_idx &&
+            0 <= !what_idx do
+        if str.[!str_idx] = what.[!what_idx] then
+          decr what_idx
+        else
+          ok := false;
+        decr str_idx
+      done;
+      if !what_idx = -1 then
+        true
+      else
+        false
+
+
+  let strip_ends_with ~what str =
+    if ends_with ~what str then
+      sub_end str (String.length what)
+    else
+      raise Not_found
+
+
+  let replace_chars f s =
+    let buf = Buffer.create (String.length s) in
+    String.iter (fun c -> Buffer.add_char buf (f c)) s;
+    Buffer.contents buf
+
+  let lowercase_ascii =
+    replace_chars
+      (fun c ->
+         if (c >= 'A' && c <= 'Z') then
+           Char.chr (Char.code c + 32)
+         else
+           c)
+
+  let uncapitalize_ascii s =
+    if s <> "" then
+      (lowercase_ascii (String.sub s 0 1)) ^ (String.sub s 1 ((String.length s) - 1))
+    else
+      s
+
+  let uppercase_ascii =
+    replace_chars
+      (fun c ->
+         if (c >= 'a' && c <= 'z') then
+           Char.chr (Char.code c - 32)
+         else
+           c)
+
+  let capitalize_ascii s =
+    if s <> "" then
+      (uppercase_ascii (String.sub s 0 1)) ^ (String.sub s 1 ((String.length s) - 1))
+    else
+      s
+
+end
+
 module OASISExpr = struct
 (* # 22 "src/oasis/OASISExpr.ml" *)
 
@@ -129,7 +289,7 @@ module OASISExpr = struct
 end
 
 
-# 132 "myocamlbuild.ml"
+# 292 "myocamlbuild.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -234,7 +394,7 @@ module BaseEnvLight = struct
 end
 
 
-# 237 "myocamlbuild.ml"
+# 397 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
@@ -516,7 +676,7 @@ module MyOCamlbuildBase = struct
                  | nm, [], intf_modules ->
                      ocaml_lib nm;
                      let cmis =
-                       List.map (fun m -> (String.uncapitalize m) ^ ".cmi")
+                       List.map (fun m -> (OASISString.uncapitalize_ascii m) ^ ".cmi")
                                 intf_modules in
                      dep ["ocaml"; "link"; "library"; "file:"^nm^".cma"] cmis
                  | nm, dir :: tl, intf_modules ->
@@ -529,7 +689,7 @@ module MyOCamlbuildBase = struct
                             ["compile"; "infer_interface"; "doc"])
                        tl;
                      let cmis =
-                       List.map (fun m -> dir^"/"^(String.uncapitalize m)^".cmi")
+                       List.map (fun m -> dir^"/"^(OASISString.uncapitalize_ascii m)^".cmi")
                                 intf_modules in
                      dep ["ocaml"; "link"; "library"; "file:"^dir^"/"^nm^".cma"]
                          cmis)
@@ -603,7 +763,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 606 "myocamlbuild.ml"
+# 766 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -669,12 +829,11 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 673 "myocamlbuild.ml"
+# 833 "myocamlbuild.ml"
 (* OASIS_STOP *)
+let doc_intro = "doc/intro.txt" ;;
 
-let doc_intro = "doc/intro.txt"
-
-open Ocamlbuild_plugin;;
+Ocamlbuild_plugin.dispatch dispatch_default;;
 
 dispatch
   (MyOCamlbuildBase.dispatch_combine [
@@ -724,3 +883,4 @@ dispatch
     end;
     dispatch_default
   ])
+

opam

@@ -1,6 +1,6 @@
 opam-version: "1.2"
 name: "containers"
-version: "dev"
+version: "0.19"
 author: "Simon Cruanes"
 maintainer: "simon.cruanes@inria.fr"
 build: [
@@ -26,13 +26,18 @@ remove: [
 ]
 depends: [
     "ocamlfind" {build}
-    "oasis" {build}
     "base-bytes"
     "result"
     "cppo" {build}
     "ocamlbuild" {build}
 ]
-depopts: [ "sequence" "base-bigarray" "base-unix" "base-threads" "qtest" { test } ]
+depopts: [
+  "sequence"
+  "base-bigarray"
+  "base-unix"
+  "base-threads"
+  "qtest" { test }
+]
 conflicts: [
   "sequence" { < "0.5" }
   "qtest" { < "2.2" }
@@ -44,3 +49,9 @@ doc: "http://cedeela.fr/~simon/software/containers/"
 available: [ocaml-version >= "4.00.0"]
 dev-repo: "https://github.com/c-cube/ocaml-containers.git"
 bug-reports: "https://github.com/c-cube/ocaml-containers/issues/"
+post-messages: [
+"Small release with mostly bugfixes, and a few improvements of some
+already existing modules.
+
+changelog: https://github.com/c-cube/ocaml-containers/blob/0.19/CHANGELOG.adoc"
+]

pervasives/containers_pervasives.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: ea286cccf88f4c81c7b4627216807d4e)
+CCPervasives
+# OASIS_STOP

pervasives/containers_pervasives.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: ea286cccf88f4c81c7b4627216807d4e)
+CCPervasives
+# OASIS_STOP

src/advanced/containers_advanced.mldylib

@@ -0,0 +1,8 @@
+# OASIS_START
+# DO NOT EDIT (digest: b0f5a3a0b7428f165d73d9e621998219)
+Containers_advanced
+CCLinq
+CCBatch
+CCCat
+CCMonadIO
+# OASIS_STOP

src/advanced/containers_advanced.mllib

@@ -0,0 +1,8 @@
+# OASIS_START
+# DO NOT EDIT (digest: b0f5a3a0b7428f165d73d9e621998219)
+Containers_advanced
+CCLinq
+CCBatch
+CCCat
+CCMonadIO
+# OASIS_STOP

src/bigarray/containers_bigarray.mldylib

@@ -0,0 +1,5 @@
+# OASIS_START
+# DO NOT EDIT (digest: 4901abd33a2dfcf115ddeffb93e1186e)
+CCBigstring
+CCArray1
+# OASIS_STOP

src/bigarray/containers_bigarray.mllib

@@ -0,0 +1,5 @@
+# OASIS_START
+# DO NOT EDIT (digest: 4901abd33a2dfcf115ddeffb93e1186e)
+CCBigstring
+CCArray1
+# OASIS_STOP

src/core/META

@@ -0,0 +1,121 @@
+# OASIS_START
+# DO NOT EDIT (digest: 56ec39bd73892c447789e2116b0f000e)
+version = "0.19"
+description = "A modular standard library focused on data structures."
+requires = "bytes result"
+archive(byte) = "containers.cma"
+archive(byte, plugin) = "containers.cma"
+archive(native) = "containers.cmxa"
+archive(native, plugin) = "containers.cmxs"
+exists_if = "containers.cma"
+package "unix" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "bytes unix"
+ archive(byte) = "containers_unix.cma"
+ archive(byte, plugin) = "containers_unix.cma"
+ archive(native) = "containers_unix.cmxa"
+ archive(native, plugin) = "containers_unix.cmxs"
+ exists_if = "containers_unix.cma"
+)
+
+package "top" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires =
+ "compiler-libs.common containers containers.data containers.bigarray containers.string containers.unix containers.sexp containers.iter"
+ archive(byte) = "containers_top.cma"
+ archive(byte, plugin) = "containers_top.cma"
+ archive(native) = "containers_top.cmxa"
+ archive(native, plugin) = "containers_top.cmxs"
+ exists_if = "containers_top.cma"
+)
+
+package "thread" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "containers threads"
+ archive(byte) = "containers_thread.cma"
+ archive(byte, plugin) = "containers_thread.cma"
+ archive(native) = "containers_thread.cmxa"
+ archive(native, plugin) = "containers_thread.cmxs"
+ exists_if = "containers_thread.cma"
+)
+
+package "string" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "bytes"
+ archive(byte) = "containers_string.cma"
+ archive(byte, plugin) = "containers_string.cma"
+ archive(native) = "containers_string.cmxa"
+ archive(native, plugin) = "containers_string.cmxs"
+ exists_if = "containers_string.cma"
+)
+
+package "sexp" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "bytes"
+ archive(byte) = "containers_sexp.cma"
+ archive(byte, plugin) = "containers_sexp.cma"
+ archive(native) = "containers_sexp.cmxa"
+ archive(native, plugin) = "containers_sexp.cmxs"
+ exists_if = "containers_sexp.cma"
+)
+
+package "iter" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ archive(byte) = "containers_iter.cma"
+ archive(byte, plugin) = "containers_iter.cma"
+ archive(native) = "containers_iter.cmxa"
+ archive(native, plugin) = "containers_iter.cmxs"
+ exists_if = "containers_iter.cma"
+)
+
+package "io" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "bytes"
+ archive(byte) = "containers_io.cma"
+ archive(byte, plugin) = "containers_io.cma"
+ archive(native) = "containers_io.cmxa"
+ archive(native, plugin) = "containers_io.cmxs"
+ exists_if = "containers_io.cma"
+)
+
+package "data" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "bytes"
+ archive(byte) = "containers_data.cma"
+ archive(byte, plugin) = "containers_data.cma"
+ archive(native) = "containers_data.cmxa"
+ archive(native, plugin) = "containers_data.cmxs"
+ exists_if = "containers_data.cma"
+)
+
+package "bigarray" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "containers bigarray bytes"
+ archive(byte) = "containers_bigarray.cma"
+ archive(byte, plugin) = "containers_bigarray.cma"
+ archive(native) = "containers_bigarray.cmxa"
+ archive(native, plugin) = "containers_bigarray.cmxs"
+ exists_if = "containers_bigarray.cma"
+)
+
+package "advanced" (
+ version = "0.19"
+ description = "A modular standard library focused on data structures."
+ requires = "containers sequence"
+ archive(byte) = "containers_advanced.cma"
+ archive(byte, plugin) = "containers_advanced.cma"
+ archive(native) = "containers_advanced.cmxa"
+ archive(native, plugin) = "containers_advanced.cmxs"
+ exists_if = "containers_advanced.cma"
+)
+# OASIS_STOP
+

src/core/containers.mldylib

@@ -0,0 +1,29 @@
+# OASIS_START
+# DO NOT EDIT (digest: bf6db1e8114e0b3136182bb22642e863)
+CCVector
+CCPrint
+CCError
+CCHeap
+CCList
+CCOpt
+CCPair
+CCFun
+CCHash
+CCInt
+CCBool
+CCFloat
+CCArray
+CCRef
+CCSet
+CCOrd
+CCRandom
+CCString
+CCHashtbl
+CCMap
+CCFormat
+CCIO
+CCInt64
+CCChar
+CCResult
+Containers
+# OASIS_STOP

src/core/containers.mllib

@@ -0,0 +1,29 @@
+# OASIS_START
+# DO NOT EDIT (digest: bf6db1e8114e0b3136182bb22642e863)
+CCVector
+CCPrint
+CCError
+CCHeap
+CCList
+CCOpt
+CCPair
+CCFun
+CCHash
+CCInt
+CCBool
+CCFloat
+CCArray
+CCRef
+CCSet
+CCOrd
+CCRandom
+CCString
+CCHashtbl
+CCMap
+CCFormat
+CCIO
+CCInt64
+CCChar
+CCResult
+Containers
+# OASIS_STOP

src/data/containers_data.mldylib

@@ -0,0 +1,29 @@
+# OASIS_START
+# DO NOT EDIT (digest: dd0c9f2f982ba538c549f23a4800cb92)
+CCMultiMap
+CCMultiSet
+CCTrie
+CCFlatHashtbl
+CCCache
+CCPersistentHashtbl
+CCDeque
+CCFQueue
+CCBV
+CCMixtbl
+CCMixmap
+CCRingBuffer
+CCIntMap
+CCPersistentArray
+CCMixset
+CCHashconsedSet
+CCGraph
+CCHashSet
+CCBitField
+CCHashTrie
+CCBloom
+CCWBTree
+CCRAL
+CCAllocCache
+CCImmutArray
+CCHet
+# OASIS_STOP

src/data/containers_data.mllib

@@ -0,0 +1,29 @@
+# OASIS_START
+# DO NOT EDIT (digest: dd0c9f2f982ba538c549f23a4800cb92)
+CCMultiMap
+CCMultiSet
+CCTrie
+CCFlatHashtbl
+CCCache
+CCPersistentHashtbl
+CCDeque
+CCFQueue
+CCBV
+CCMixtbl
+CCMixmap
+CCRingBuffer
+CCIntMap
+CCPersistentArray
+CCMixset
+CCHashconsedSet
+CCGraph
+CCHashSet
+CCBitField
+CCHashTrie
+CCBloom
+CCWBTree
+CCRAL
+CCAllocCache
+CCImmutArray
+CCHet
+# OASIS_STOP

src/io/containers_io.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 9573c9c3109b1d53a61739444853a7b2)
+Containers_io_is_deprecated
+# OASIS_STOP

src/io/containers_io.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 9573c9c3109b1d53a61739444853a7b2)
+Containers_io_is_deprecated
+# OASIS_STOP

src/iter/containers_iter.mldylib

@@ -0,0 +1,6 @@
+# OASIS_START
+# DO NOT EDIT (digest: 158a5d6029014525d6b1b1c6dc6c848a)
+CCKTree
+CCKList
+CCLazy_list
+# OASIS_STOP

src/iter/containers_iter.mllib

@@ -0,0 +1,6 @@
+# OASIS_START
+# DO NOT EDIT (digest: 158a5d6029014525d6b1b1c6dc6c848a)
+CCKTree
+CCKList
+CCLazy_list
+# OASIS_STOP

src/lwt/containers_lwt.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: bc144ef7b5b54947fab9662a822f9179)
+Containers_lwt
+# OASIS_STOP

src/lwt/containers_lwt.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: bc144ef7b5b54947fab9662a822f9179)
+Containers_lwt
+# OASIS_STOP

src/lwt/containers_lwt.mlpack

@@ -0,0 +1,7 @@
+# OASIS_START
+# DO NOT EDIT (digest: 41ca039f453c9bf865bafe93b638ae8a)
+Lwt_automaton
+Lwt_actor
+Lwt_klist
+Lwt_pipe
+# OASIS_STOP

src/misc/containers_misc.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 2df0608accd158542ebcb00720cfe599)
+Containers_misc
+# OASIS_STOP

src/misc/containers_misc.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 2df0608accd158542ebcb00720cfe599)
+Containers_misc
+# OASIS_STOP

src/misc/containers_misc.mlpack

@@ -0,0 +1,18 @@
+# OASIS_START
+# DO NOT EDIT (digest: a0730df368ed19a3b181d80ccf7985b6)
+AbsSet
+Automaton
+Bij
+CSM
+Hashset
+LazyGraph
+PHashtbl
+PrintBox
+RAL
+RoseTree
+SmallSet
+UnionFind
+Univ
+Puf
+Backtrack
+# OASIS_STOP

src/pervasives/containers_pervasives.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: ea286cccf88f4c81c7b4627216807d4e)
+CCPervasives
+# OASIS_STOP

src/pervasives/containers_pervasives.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: ea286cccf88f4c81c7b4627216807d4e)
+CCPervasives
+# OASIS_STOP

src/sexp/containers_sexp.mldylib

@@ -0,0 +1,5 @@
+# OASIS_START
+# DO NOT EDIT (digest: 3a36b0ae70bf5e8f3f11d6a4f5f7d948)
+CCSexp
+CCSexpM
+# OASIS_STOP

src/sexp/containers_sexp.mllib

@@ -0,0 +1,5 @@
+# OASIS_START
+# DO NOT EDIT (digest: 3a36b0ae70bf5e8f3f11d6a4f5f7d948)
+CCSexp
+CCSexpM
+# OASIS_STOP

src/string/containers_string.mldylib

@@ -0,0 +1,8 @@
+# OASIS_START
+# DO NOT EDIT (digest: b0d9848489c9eaabded92f7c9fec3073)
+Containers_string
+CCKMP
+CCLevenshtein
+CCApp_parse
+CCParse
+# OASIS_STOP

src/string/containers_string.mllib

@@ -0,0 +1,8 @@
+# OASIS_START
+# DO NOT EDIT (digest: b0d9848489c9eaabded92f7c9fec3073)
+Containers_string
+CCKMP
+CCLevenshtein
+CCApp_parse
+CCParse
+# OASIS_STOP

src/threads/containers_thread.mldylib

@@ -0,0 +1,9 @@
+# OASIS_START
+# DO NOT EDIT (digest: 5cf3cd134d141ea5acafb464c2b3e927)
+CCPool
+CCLock
+CCSemaphore
+CCThread
+CCBlockingQueue
+CCTimer
+# OASIS_STOP

src/threads/containers_thread.mllib

@@ -0,0 +1,9 @@
+# OASIS_START
+# DO NOT EDIT (digest: 5cf3cd134d141ea5acafb464c2b3e927)
+CCPool
+CCLock
+CCSemaphore
+CCThread
+CCBlockingQueue
+CCTimer
+# OASIS_STOP

src/top/containers_top.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 06c9d81e0a532aa96d3f60ef4ed7045d)
+Containers_top
+# OASIS_STOP

src/top/containers_top.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 06c9d81e0a532aa96d3f60ef4ed7045d)
+Containers_top
+# OASIS_STOP

src/unix/containers_unix.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: cc54fa6ddd5d32bdf577cb187f4cf07c)
+CCUnix
+# OASIS_STOP

src/unix/containers_unix.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: cc54fa6ddd5d32bdf577cb187f4cf07c)
+CCUnix
+# OASIS_STOP

string/containers_string.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: c89cc456e050edff914368d7fbea4eca)
+Containers_string
+# OASIS_STOP

string/containers_string.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: c89cc456e050edff914368d7fbea4eca)
+Containers_string
+# OASIS_STOP

string/containers_string.mlpack

@@ -0,0 +1,5 @@
+# OASIS_START
+# DO NOT EDIT (digest: eed887f169b0c8e02f98f97c676f846c)
+KMP
+Levenshtein
+# OASIS_STOP

threads/containers_thread.mldylib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: ede75f11c3857d71e591f7b889f4d09d)
+CCFuture
+# OASIS_STOP

threads/containers_thread.mllib

@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: ede75f11c3857d71e591f7b889f4d09d)
+CCFuture
+# OASIS_STOP