From b60ab1f57d6d63442453b780ddb25e6967966752 Mon Sep 17 00:00:00 2001 From: kaosko Date: Wed, 14 Nov 2018 10:36:22 -0800 Subject: [PATCH 1/3] update data.avl maps to return MapEntries instead of 2-elem vectors to comply with clj 1.9 and cljs 1.9.293 and later. Change groupId --- pom.xml | 3 ++- src/main/cljs/clojure/data/avl.cljs | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 5fda439..3a26f80 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + com.github.kaosko data.avl 0.0.19-SNAPSHOT data.avl @@ -35,7 +36,7 @@ - 1.5.1 + 1.9.0 true diff --git a/src/main/cljs/clojure/data/avl.cljs b/src/main/cljs/clojure/data/avl.cljs index f5bb3ee..2fe8512 100644 --- a/src/main/cljs/clojure/data/avl.cljs +++ b/src/main/cljs/clojure/data/avl.cljs @@ -611,7 +611,7 @@ (cond (zero? c) [(.getLeft node) - [(.getKey node) (.getVal node)] + (MapEntry. (.getKey node) (.getVal node) nil) (.getRight node)] (neg? c) @@ -697,7 +697,7 @@ (avl-map-reduce (.getLeft node) f init))] (if (reduced? init) init - (let [init (f init [(.getKey node) (.getVal node)])] + (let [init (f init (MapEntry. (.getKey node) (.getVal node) nil))] (if (reduced? init) init (if (nil? (.getRight node)) @@ -714,7 +714,7 @@ (if (nil? (.getRight node)) init (avl-map-reduce (.getRight node) f init)) - (let [init (f init [(.getKey node) (.getVal node)])] + (let [init (f init (MapEntry. (.getKey node) (.getVal node) nil))] (if (reduced? init) init (if (nil? (.getRight node)) @@ -768,7 +768,7 @@ ISeq (-first [this] (let [node (peek stack)] - [(.-key node) (.-val node)])) + (MapEntry. (.-key node) (.-val node) nil))) (-rest [this] (let [node (first stack) @@ -828,7 +828,7 @@ (nearest [this test k] (if-let [node (lookup-nearest comp tree test k)] - [(.getKey node) (.getVal node)])) + (MapEntry. (.getKey node) (.getVal node) nil))) IHash (-hash [this] @@ -849,12 +849,12 @@ IIndexed (-nth [this i] (if-let [n (select tree i)] - [(.getKey n) (.getVal n)] + (MapEntry. (.getKey n) (.getVal n) nil) (throw (ex-info "nth index out of bounds in AVL tree" {})))) (-nth [this i not-found] (if-let [n (select tree i)] - [(.getKey n) (.getVal n)] + (MapEntry. (.getKey n) (.getVal n) nil) not-found)) ICollection @@ -884,9 +884,9 @@ (-reduce [this f] (case cnt 0 (f) - 1 [(.getKey tree) (.getVal tree)] + 1 (MapEntry. (.getKey tree) (.getVal tree) nil) (let [n0 (select tree 0) - init (avl-map-reduce-skip tree f [(.getKey n0) (.getVal n0)] n0)] + init (avl-map-reduce-skip tree f (MapEntry. (.getKey n0) (.getVal n0) nil) n0)] (if (reduced? init) (-deref init) init)))) @@ -1210,7 +1210,7 @@ AVLSet (-pr-writer [this writer opts] (pr-sequential-writer writer pr-writer "#{" " " "}" opts this))) - + (defn sorted-map "keyval => key val Returns a new AVL map with supplied mappings." From 5283b94bbab3aabbd1dce1cc117ca23f3a8bfe80 Mon Sep 17 00:00:00 2001 From: kaosko Date: Wed, 14 Nov 2018 10:42:43 -0800 Subject: [PATCH 2/3] Update to release version 0.0.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a26f80..b418ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.github.kaosko data.avl - 0.0.19-SNAPSHOT + 0.0.19 data.avl Persistent sorted maps and sets with log-time rank queries From 7931d54cbb2a47098e55044689cffd06af886913 Mon Sep 17 00:00:00 2001 From: kaosko Date: Wed, 14 Nov 2018 10:43:15 -0800 Subject: [PATCH 3/3] Update to new dev version 0.0.20-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b418ccb..01b6216 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.github.kaosko data.avl - 0.0.19 + 0.0.20-SNAPSHOT data.avl Persistent sorted maps and sets with log-time rank queries