From 4a7edafcb7e73d6a09bd5a0e06d0bd69606e29f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Suzanne=20Dup=C3=A9ron?= <ligo@suzanne.soy>
Date: Thu, 9 Apr 2020 14:26:43 +0200
Subject: [PATCH] Dunification of the Red-Black_Trees library

---
 ligo.opam                                  |  2 ++
 vendors/Red-Black_Trees/.gitignore         |  1 +
 vendors/Red-Black_Trees/RedBlackTrees.ml   |  3 +++
 vendors/Red-Black_Trees/RedBlackTrees.opam | 18 ++++++++++++++++++
 vendors/Red-Black_Trees/dune               |  6 ++++++
 vendors/Red-Black_Trees/dune-project       |  2 ++
 vendors/UnionFind/UnionFind.opam           |  2 +-
 vendors/UnionFind/dune-project             |  3 ++-
 8 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 vendors/Red-Black_Trees/.gitignore
 create mode 100644 vendors/Red-Black_Trees/RedBlackTrees.ml
 create mode 100644 vendors/Red-Black_Trees/RedBlackTrees.opam
 create mode 100644 vendors/Red-Black_Trees/dune
 create mode 100644 vendors/Red-Black_Trees/dune-project

diff --git a/ligo.opam b/ligo.opam
index f3815edc8..17160be27 100644
--- a/ligo.opam
+++ b/ligo.opam
@@ -23,6 +23,8 @@ depends: [
   "getopt"
   "terminal_size"
   "pprint"
+  "UnionFind"
+  "RedBlackTrees"
   # work around upstream in-place update
   "ocaml-migrate-parsetree" { = "1.4.0" }
 ]
diff --git a/vendors/Red-Black_Trees/.gitignore b/vendors/Red-Black_Trees/.gitignore
new file mode 100644
index 000000000..5ea62dee4
--- /dev/null
+++ b/vendors/Red-Black_Trees/.gitignore
@@ -0,0 +1 @@
+/RedBlackTrees.install
diff --git a/vendors/Red-Black_Trees/RedBlackTrees.ml b/vendors/Red-Black_Trees/RedBlackTrees.ml
new file mode 100644
index 000000000..d2397f017
--- /dev/null
+++ b/vendors/Red-Black_Trees/RedBlackTrees.ml
@@ -0,0 +1,3 @@
+module PolyMap = PolyMap
+module PolySet = PolySet
+module RedBlack = RedBlack
diff --git a/vendors/Red-Black_Trees/RedBlackTrees.opam b/vendors/Red-Black_Trees/RedBlackTrees.opam
new file mode 100644
index 000000000..59648c973
--- /dev/null
+++ b/vendors/Red-Black_Trees/RedBlackTrees.opam
@@ -0,0 +1,18 @@
+opam-version : "2.0"
+version      : "1.0"
+maintainer   : "rinderknecht@free.fr"
+authors      : [ "Christian Rinderknecht" ]
+homepage     : "https://gitlab.com/rinderknecht/Red-Black_Trees"
+bug-reports  : "https://gitlab.com/rinderknecht/Red-Black_Trees/issues"
+dev-repo     : "git+https://gitlab.com/rinderknecht/Red-Black_Trees.git"
+license      : "MIT"
+
+depends      : [ "dune" ]
+
+build        : [
+                [ "dune" "build" "-p" name "-j" jobs ]
+               ]
+
+url {
+  src: "https://gitlab.com/rinderknecht/Red-Black_Trees/-/archive/98b11312810d979ee1b0dacee6900228574e41e7/Red-Black_Trees.tar.gz"
+}
diff --git a/vendors/Red-Black_Trees/dune b/vendors/Red-Black_Trees/dune
new file mode 100644
index 000000000..bb831c2cf
--- /dev/null
+++ b/vendors/Red-Black_Trees/dune
@@ -0,0 +1,6 @@
+(library
+  (name RedBlackTrees)
+  (public_name RedBlackTrees)
+  (wrapped false)
+  (modules PolyMap PolySet RedBlack RedBlackTrees) ; PolyMapMain PolySetMain RedBlackMain
+)
diff --git a/vendors/Red-Black_Trees/dune-project b/vendors/Red-Black_Trees/dune-project
new file mode 100644
index 000000000..83dc4db1b
--- /dev/null
+++ b/vendors/Red-Black_Trees/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.11)
+(name RedBlackTrees)
diff --git a/vendors/UnionFind/UnionFind.opam b/vendors/UnionFind/UnionFind.opam
index dc48cd6c1..59df8f647 100644
--- a/vendors/UnionFind/UnionFind.opam
+++ b/vendors/UnionFind/UnionFind.opam
@@ -9,7 +9,7 @@ bug-reports  : "https://github.com/rinderknecht/UnionFind/issues"
 dev-repo     : "git+https://github.com/rinderknecht/UnionFind.git"
 license      : "MIT"
 
-depends      : [ "dune" ]
+depends      : [ "dune" "RedBlackTrees" ]
 
 build        : [
                 [ "sh" "-c" "printf 'let version = \"%s\"' \"$(git describe --always --dirty --abbrev=0)\" > Version.ml" ]
diff --git a/vendors/UnionFind/dune-project b/vendors/UnionFind/dune-project
index 43a1282a9..45e423e15 100644
--- a/vendors/UnionFind/dune-project
+++ b/vendors/UnionFind/dune-project
@@ -1 +1,2 @@
-(lang dune 1.7)
+(lang dune 1.11)
+(name UnionFind)