Skip to content

Fix update and update-in for higher arities #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeroenvandijk wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix update and update-in for higher arities #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions convex-core/src/main/cvx/convex/core/core.cvx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@
([m k f x]
(assoc m k (f (get m k) x)))
([m k f x & more]
(assoc m k (apply f (get m k) more))))
(assoc m k (apply f (get m k) x more))))

(defn update-in
^{:doc {:description "Update a value in a nested associative data structure by applying a function."
Expand All @@ -701,8 +701,8 @@
(assoc-in m ks (f (get-in m ks))))
([m ks f x]
(assoc-in m ks (f (get-in m ks) x)))
([m k f x & more]
(assoc-in m ks (apply f (get-in m ks) more))))
([m ks f x & more]
(assoc-in m ks (apply f (get-in m ks) x more))))

(defn dissoc-in
^{:doc {:description "Dissocs from a nested associative data structure. If a nested result is empty? dissoc it as well."
Expand Down
8 changes: 8 additions & 0 deletions convex-core/src/test/java/convex/core/lang/CoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,6 +1421,10 @@ public void testUpdate() {

assertEquals(Vectors.of(1,2,3),eval("(update [1 2 3] 1 identity)"));

assertEquals(Vectors.of(0,2,0),eval("(update [0 1 0] 1 + 1)"));
assertEquals(Vectors.of(0,4,0),eval("(update [0 1 0] 1 + 1 2)"));
assertEquals(Vectors.of(0,46,0),eval("(apply update [0 1 0] 1 + [1 2 3 4 5 6 7 8 9])"));

// nil works as empty map
assertEquals(Maps.of(2,Sets.of(2,3)),eval("(update nil 2 union #{2,3})"));

Expand All @@ -1444,6 +1448,10 @@ public void testUpdateIn() {

assertEquals(Vectors.of(1,2,3),eval("(update-in [1 2 3] [1] identity)"));

assertEquals(Vectors.of(0,2,0),eval("(update-in [0 1 0] [1] + 1)"));
assertEquals(Vectors.of(0,4,0),eval("(update-in [0 1 0] [1] + 1 2)"));
assertEquals(Vectors.of(0,46,0),eval("(apply update-in [0 1 0] [1] + [1 2 3 4 5 6 7 8 9])"));

// nil works as empty map
assertEquals(Maps.of(2,Sets.of(2,3)),eval("(update-in nil [2] union #{2,3})"));

Expand Down