Merge branch 'master' into stable for 1.5

Author: c-cube

.merlin

@@ -18,4 +18,4 @@ PKG threads
 PKG threads.posix
 PKG lwt
 PKG qcheck
-FLG -w +a-4-44-48-60
+FLG -w +a-4-44-48-60@8

.travis.yml

@@ -0,0 +1,37 @@
+language: c
+env:
+  - OCAML_VERSION=4.01.0
+  - OCAML_VERSION=4.02.3
+  - OCAML_VERSION=4.04.2
+  - OCAML_VERSION=4.05.0
+  - OCAML_VERSION=4.05.0+flambda
+  - OCAML_VERSION=4.06.0
+addons:
+  apt:
+    sources:
+      - avsm
+    packages:
+      - opam
+# Caching may take a lot of space with so many ocaml versions
+#cache:
+#  directories:
+#    - $HOME/.opam
+before_install:
+  # Some opam boilerplate
+  - export OPAMYES=1
+  - export OPAMVERBOSE=1
+  - opam init
+  - opam switch ${OCAML_VERSION}
+  - eval `opam config env`
+install:
+  # Install dependencies
+  - opam pin add --no-action containers .
+  - opam install oasis
+  - opam install --deps-only containers
+script:
+  - ./configure --enable-unix --enable-thread --disable-tests --disable-bench
+  - make build
+  - opam install sequence qcheck qtest gen
+  - ./configure --enable-unix --enable-thread --enable-tests --enable-docs --disable-bench
+  - make test
+  - make doc

AUTHORS.adoc

@@ -23,3 +23,4 @@
 - Leonid Rozenberg (@rleonid)
 - Bikal Gurung (@bikalgurung)
 - Fabian Hemmer (copy)
+- Maciej Woś (@lostman)

CHANGELOG.adoc

@@ -1,5 +1,27 @@
 = Changelog
 
+== 1.5
+
+- have `CCList.{get,insert,set}_at_idx` work with negative indices
+- Add CCCache.add
+- missing function in `CCListLabels`
+- Allow negative indexes in CCList.remove_at_idx
+- add an optional `drop` parameter to string-splitting functions
+- add `Hash.const0` for trivial hash function that ignores its input
+- improve compatibility with the stdlib
+- Add List.count
+- Add String.is_empty
+- add missing compatibility functions: `{assoc_opt,assq_opt}`
+- backport some functions added in 4.05 in `CCList`
+- add functions from 4.05 into `CC{Map,Set}`
+- Implement `CCImmutArray.sub`
+- bugfix in `CCTrie.Make`: Remove polymorphic comparison
+
+- remove dependency on cppo
+- add travis support
+- update doc of `CCList.cartesian_product`, which returns results in unspecified order (close #154)
+- fix containers.top (closes #155)
+
 == 1.4
 
 - add `CCMap.union`

README.adoc

@@ -14,7 +14,7 @@ map/fold_right/append, and additional functions on lists).
 Alternatively, `open Containers` will bring enhanced versions of the standard
 modules into scope.
 
-image::https://ci.cedeela.fr/buildStatus/icon?job=containers[alt="Build Status", link="http://ci.cedeela.fr/job/containers/"]
+image::https://travis-ci.org/c-cube/ocaml-containers.svg?branch=master[alt="Build Status", link="https://travis-ci.org/c-cube/ocaml-containers"]
 
 toc::[]
 

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        containers
-Version:     1.4
+Version:     1.5
 Homepage:    https://github.com/c-cube/ocaml-containers
 Authors:     Simon Cruanes
 License:     BSD-2-clause

_tags

@@ -117,6 +117,7 @@ true: annot, bin_annot
 <src/threads/*.ml{,i}>: thread
 <src/core/CCVector.cmx> or <src/core/CCString.cmx>: inline(25)
 <src/data/CCFlatHashtbl.cm*> or <src/data/CCHashTrie.cm*> or <src/data/CCPersistent*>: inline(15)
-<src/**/*.ml> and not <src/misc/*.ml>: warn_A, warn(-4), warn(-44)
-true: no_alias_deps, safe_string, short_paths
+<src/core/CCMap.*> or <src/core/CCSet.*> or <src/core/CCList.*>: warn(-32)
+<src/**/*.ml> and not <src/misc/*.ml>: warn(+a-4-44-58-60@8)
+true: no_alias_deps, safe_string, short_paths, color(always)
 <src/**/*Labels.cm*>: nolabels

doc/intro.txt

@@ -16,8 +16,7 @@ CC-SA3 {{:http://en.wikipedia.org/wiki/File:Hypercube.svg} wikimedia}
 The design is mostly centered around polymorphism rather than functors. Such
 structures comprise (some modules in misc/, some other in core/):
 
-the core library, containers, now depends on
-{{:https://github.com/mjambon/cppo}cppo} and base-bytes (provided
+the core library, containers, now depends on base-bytes (provided
 by ocamlfind).
 
 {4 Core Modules (extension of the standard library)}

myocamlbuild.ml

@@ -925,40 +925,6 @@ dispatch
   (MyOCamlbuildBase.dispatch_combine [
     begin function
     | After_rules ->
-      (* replace with Ocamlbuild_cppo.dispatch when 4.00 is not supported
-         anymore *)
-      let dep_cppo = "%(name).cppo.ml" in
-      let prod1 = "%(name: <*> and not <*.cppo>).ml" in
-      let prod2 = "%(name: <**/*> and not <**/*.cppo>).ml" in
-      let f prod env _build =
-        let dep = env dep_cppo in
-        let prod = env prod in
-        let tags = tags_of_pathname prod ++ "cppo" in
-        Cmd (S[A "cppo"; T tags; S [A "-o"; P prod]; P dep ])
-      in
-      rule "cppo1" ~dep:dep_cppo ~prod:prod1 (f prod1) ;
-      rule "cppo2" ~dep:dep_cppo ~prod:prod2 (f prod2) ;
-      pflag ["cppo"] "cppo_D" (fun s -> S [A "-D"; A s]) ;
-      pflag ["cppo"] "cppo_U" (fun s -> S [A "-U"; A s]) ;
-      pflag ["cppo"] "cppo_I" (fun s ->
-        if Pathname.is_directory s then S [A "-I"; P s]
-        else S [A "-I"; P (Pathname.dirname s)]
-      ) ;
-      pdep ["cppo"] "cppo_I" (fun s ->
-        if Pathname.is_directory s then [] else [s]) ;
-      flag ["cppo"; "cppo_q"] (A "-q") ;
-      flag ["cppo"; "cppo_s"] (A "-s") ;
-      flag ["cppo"; "cppo_n"] (A "-n") ;
-      pflag ["cppo"] "cppo_x" (fun s -> S [A "-x"; A s]);
-      (* end replace *)
-
-      let major, minor = Scanf.sscanf Sys.ocaml_version "%d.%d.%d"
-        (fun major minor patchlevel -> major, minor)
-      in
-      let ocaml_major = "OCAML_MAJOR " ^ string_of_int major in
-      let ocaml_minor = "OCAML_MINOR " ^ string_of_int minor in
-
-      flag ["cppo"] & S[A"-D"; A ocaml_major; A"-D"; A ocaml_minor] ;
 
       (* Documentation index *)
       dep ["ocaml"; "doc"; "extension:html"] & [doc_intro] ;

opam

@@ -25,7 +25,6 @@ depends: [
   "ocamlfind" {build}
   "base-bytes"
   "result"
-  "cppo" {build}
   "ocamlbuild" {build}
 ]
 depopts: [