Compare commits
37 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
9a615ff22c | ||
|
|
67e8680602 | ||
|
|
05ae730896 | ||
|
|
a91aaaa34a | ||
|
|
efeefdfacd | ||
|
|
a64209d582 | ||
|
|
d0d6fdf581 | ||
|
|
e8225f0e58 | ||
|
|
a379893598 | ||
|
|
efaf35558a | ||
|
|
083376f904 | ||
|
|
de48f24d70 | ||
|
|
c54a46c686 | ||
|
|
2e002c1270 | ||
|
|
789881b3ad | ||
|
|
edd7429281 | ||
|
|
e222ba2a6c | ||
|
|
40add561b6 | ||
|
|
123af0937e | ||
|
|
6e7d772755 | ||
|
|
134beac2a7 | ||
|
|
86f8412ee4 | ||
|
|
28ef42152a | ||
|
|
ffe8130bf0 | ||
|
|
9c7f6fb65e | ||
|
|
029a33427f | ||
|
|
925e2e91d6 | ||
|
|
29ee91d01e | ||
|
|
b7ff05bf54 | ||
|
|
ae24856ec3 | ||
|
|
23f4e1a370 | ||
|
|
e38a2561d8 | ||
|
|
fe1deb5195 | ||
|
|
7790213b16 | ||
|
|
8764a4b2b6 | ||
|
|
c65b31181a | ||
|
|
f13b5db08a |
18 changed files with 492 additions and 229 deletions
37
.github/workflows/ci.yml
vendored
Normal file
37
.github/workflows/ci.yml
vendored
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
name: CI
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch_depth: 0
|
||||
|
||||
- name: Setup Babashka
|
||||
uses: turtlequeue/setup-babashka@v1.3.0
|
||||
with:
|
||||
babashka-version: 0.7.8
|
||||
|
||||
- name: Prepare java
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: '8'
|
||||
|
||||
- name: Install clojure tools
|
||||
uses: DeLaGuardo/setup-clojure@4.0
|
||||
with:
|
||||
lein: 2.9.1
|
||||
|
||||
- name: Run clj tests
|
||||
run: bb test:clj
|
||||
|
||||
- name: Run cljs tests
|
||||
run: bb test:cljs
|
||||
|
||||
- name: Run babashka tests
|
||||
run: bb test:bb
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -11,3 +11,5 @@ pom.xml.asc
|
|||
.lein-failures
|
||||
.cljs_node_repl
|
||||
out/
|
||||
.cpcache
|
||||
.cache
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
language: clojure
|
||||
lein: 2.7.1
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.m2
|
||||
script:
|
||||
- lein test
|
||||
- lein doo node test-build once
|
||||
14
CHANGES.md
14
CHANGES.md
|
|
@ -1,4 +1,16 @@
|
|||
## 1.1.2
|
||||
## 1.1.4
|
||||
|
||||
* Add arglist metadata to navs (thanks @phronmophobic)
|
||||
* Improve before-index performance by 150x on lists and 5x on vectors (thanks @jeff303)
|
||||
* Bug fix: BEFORE-ELEM, AFTER-ELEM, FIRST, LAST, BEGINNING, and END on subvecs now produce vector type in cljs
|
||||
* Add compatibility with [babashka](https://babashka.org/)
|
||||
|
||||
## 1.1.3 - 2019-10-13
|
||||
|
||||
* Better AOT behavior: path functions for inline caching and protpath extensions no longer write eval'd class files. You can force path functions to not override `*compile-files*` by binding `com.rpl.specter.impl/*path-compile-files*` to `true`.
|
||||
* Bug fix: fix throw-illegal in cljs
|
||||
|
||||
## 1.1.2 - 2018-11-01
|
||||
|
||||
* Eliminate reflection warning
|
||||
* Bug fix: Fix inline compiler symbol handling so class references can be used as constants within paths
|
||||
|
|
|
|||
9
CONTRIBUTING.md
Normal file
9
CONTRIBUTING.md
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
# Contributing
|
||||
|
||||
We welcome external contributions to this project. For ideas for new functionality, we recommend first opening an issue so we can discuss whether it makes sense for the project.
|
||||
|
||||
## Contribution process
|
||||
|
||||
1. Open a pull request. If possible, please include thorough tests of the new code.
|
||||
2. If you have not already signed a contributor agreement, we will request that you sign one. We use Adobe Sign for this so it's very quick and easy. Note that we cannot look at your pull request until a contributor agreement is signed.
|
||||
3. We will then review your pull request and possibly ask for changes.
|
||||
15
DEVELOPER.md
15
DEVELOPER.md
|
|
@ -1,7 +1,7 @@
|
|||
# Running Clojure tests
|
||||
|
||||
```
|
||||
lein cleantest
|
||||
lein do clean, test
|
||||
```
|
||||
|
||||
# Running ClojureScript tests
|
||||
|
|
@ -10,3 +10,16 @@ lein cleantest
|
|||
lein javac
|
||||
lein doo node test-build once
|
||||
```
|
||||
|
||||
# Running benchmarks
|
||||
## All benchmarks
|
||||
```
|
||||
scripts/run-benchmarks
|
||||
```
|
||||
## Individual benchmark(s)
|
||||
Specify the benchmark names as command line args. They will likely each need quoted because they contain spaces.
|
||||
Order is ignored.
|
||||
```
|
||||
scripts/run-benchmarks "prepend to a vector" "filter a sequence"
|
||||
```
|
||||
|
||||
|
|
|
|||
44
README.md
44
README.md
|
|
@ -1,10 +1,10 @@
|
|||
# Specter [](http://travis-ci.org/nathanmarz/specter)
|
||||
# Specter
|
||||
|
||||
Specter rejects Clojure's restrictive approach to immutable data structure manipulation, instead exposing an elegant API to allow any sort of manipulation imaginable. Specter especially excels at querying and transforming nested and recursive data, important use cases that are very complex to handle with vanilla Clojure.
|
||||
|
||||
Specter has an extremely simple core, just a single abstraction called "navigator". Queries and transforms are done by composing navigators into a "path" precisely targeting what you want to retrieve or change. Navigators can be composed with any other navigators, allowing sophisticated manipulations to be expressed very concisely.
|
||||
|
||||
In addition, Specter has performance rivaling hand-optimized code (see [this benchmark](https://gist.github.com/nathanmarz/b7c612b417647db80b9eaab618ff8d83)). Clojure's only comparable built-in operations are `get-in` and `update-in`, and the Specter equivalents are 30% and 85% faster respectively (while being just as concise). Under the hood, Specter uses [advanced dynamic techniques](https://github.com/nathanmarz/specter/wiki/Specter's-inline-caching-implementation) to strip away the overhead of composition.
|
||||
In addition, Specter has performance rivaling hand-optimized code (see [this benchmark](https://gist.github.com/nathanmarz/b7c612b417647db80b9eaab618ff8d83)). Clojure's only comparable built-in operations are `get-in` and `update-in`, and the Specter equivalents are 30% and 85% faster respectively (while being just as concise). Under the hood, Specter uses [advanced dynamic techniques](https://github.com/redplanetlabs/specter/wiki/Specter's-inline-caching-implementation) to strip away the overhead of composition.
|
||||
|
||||
There are some key differences between the Clojure approach to data manipulation and the Specter approach. Unlike Clojure, Specter always uses the most efficient method possible to implement an operation for a datatype (e.g. `last` vs. `LAST`). Clojure intentionally leaves out many operations, such as prepending to a vector or inserting into the middle of a sequence. Specter has navigators that cover these use cases (`BEFORE-ELEM` and `before-index`) and many more. Finally, Specter transforms always target precise parts of a data structure, leaving everything else the same. For instance, `ALL` targets every value within a sequence, and the resulting transform is always the same type as the input (e.g. a vector stays a vector, a sorted map stays a sorted map).
|
||||
|
||||
|
|
@ -84,23 +84,23 @@ The latest release version of Specter is hosted on [Clojars](https://clojars.org
|
|||
- Presentation about Specter: [Specter: Powerful and Simple Data Structure Manipulation](https://www.youtube.com/watch?v=VTCy_DkAJGk)
|
||||
- Note that this presentation was given before Specter's inline compilation/caching system was developed. You no longer need to do anything special to get near-optimal performance.
|
||||
- Screencast on Specter: [Understanding Specter](https://www.youtube.com/watch?v=rh5J4vacG98)
|
||||
- List of navigators with examples: [This wiki page](https://github.com/nathanmarz/specter/wiki/List-of-Navigators) provides a more comprehensive overview than the API docs about the behavior of specific navigators and includes many examples.
|
||||
- Core operations and defining new navigators: [This wiki page](https://github.com/nathanmarz/specter/wiki/List-of-Macros) provides a more comprehensive overview than the API docs of the core select/transform/etc. operations and the operations for defining new navigators.
|
||||
- [This wiki page](https://github.com/nathanmarz/specter/wiki/Using-Specter-Recursively) explains how to do precise and efficient recursive navigation with Specter.
|
||||
- [This wiki page](https://github.com/nathanmarz/specter/wiki/Using-Specter-With-Zippers) provides a comprehensive overview of how to use Specter's zipper navigators. Zippers are a much slower navigation method but can perform certain tasks that are not possible with Specter's regular navigators. Note that zippers are rarely needed.
|
||||
- [Cheat Sheet](https://github.com/nathanmarz/specter/wiki/Cheat-Sheet)
|
||||
- [API docs](http://nathanmarz.github.io/specter/)
|
||||
- Performance guide: [This post](https://github.com/nathanmarz/specter/wiki/Specter's-inline-caching-implementation) provides an overview of how Specter achieves its performance.
|
||||
- List of navigators with examples: [This wiki page](https://github.com/redplanetlabs/specter/wiki/List-of-Navigators) provides a more comprehensive overview than the API docs about the behavior of specific navigators and includes many examples.
|
||||
- Core operations and defining new navigators: [This wiki page](https://github.com/redplanetlabs/specter/wiki/List-of-Macros) provides a more comprehensive overview than the API docs of the core select/transform/etc. operations and the operations for defining new navigators.
|
||||
- [This wiki page](https://github.com/redplanetlabs/specter/wiki/Using-Specter-Recursively) explains how to do precise and efficient recursive navigation with Specter.
|
||||
- [This wiki page](https://github.com/redplanetlabs/specter/wiki/Using-Specter-With-Zippers) provides a comprehensive overview of how to use Specter's zipper navigators. Zippers are a much slower navigation method but can perform certain tasks that are not possible with Specter's regular navigators. Note that zippers are rarely needed.
|
||||
- [Cheat Sheet](https://github.com/redplanetlabs/specter/wiki/Cheat-Sheet)
|
||||
- [API docs](http://redplanetlabs.github.io/specter/)
|
||||
- Performance guide: [This post](https://github.com/redplanetlabs/specter/wiki/Specter's-inline-caching-implementation) provides an overview of how Specter achieves its performance.
|
||||
|
||||
Specter's API is contained in these files:
|
||||
|
||||
- [specter.cljc](https://github.com/nathanmarz/specter/blob/master/src/clj/com/rpl/specter.cljc): This contains the built-in navigators and the definition of the core operations.
|
||||
- [transients.cljc](https://github.com/nathanmarz/specter/blob/master/src/clj/com/rpl/specter/transients.cljc): This contains navigators for transient collections.
|
||||
- [zipper.cljc](https://github.com/nathanmarz/specter/blob/master/src/clj/com/rpl/specter/zipper.cljc): This integrates zipper-based navigation into Specter.
|
||||
- [specter.cljc](https://github.com/redplanetlabs/specter/blob/master/src/clj/com/rpl/specter.cljc): This contains the built-in navigators and the definition of the core operations.
|
||||
- [transients.cljc](https://github.com/redplanetlabs/specter/blob/master/src/clj/com/rpl/specter/transients.cljc): This contains navigators for transient collections.
|
||||
- [zipper.cljc](https://github.com/redplanetlabs/specter/blob/master/src/clj/com/rpl/specter/zipper.cljc): This integrates zipper-based navigation into Specter.
|
||||
|
||||
# Questions?
|
||||
|
||||
You can ask questions about Specter by [opening an issue](https://github.com/nathanmarz/specter/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Aquestion+) on Github.
|
||||
You can ask questions about Specter by [opening an issue](https://github.com/redplanetlabs/specter/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Aquestion+) on Github.
|
||||
|
||||
You can also find help in the #specter channel on [Clojurians](http://clojurians.net/).
|
||||
|
||||
|
|
@ -322,6 +322,22 @@ Specter supports ClojureScript! However, some of the differences between Clojure
|
|||
# Future work
|
||||
- Integrate Specter with other kinds of data structures, such as graphs. Desired navigations include: reduction in topological order, navigate to outgoing/incoming nodes, to a subgraph (with metadata indicating how to attach external edges on transformation), to node attributes, to node values, to specific nodes.
|
||||
|
||||
# clj-kondo
|
||||
|
||||
When using Specter in a project with [clj-kondo](https://github.com/clj-kondo/clj-kondo), a lot of the vars will be considered unresolved because internally Specter defines them with macros. The following configuration snippet will resolve these issues if you include it in your `.clj-kondo/config.edn` file.
|
||||
|
||||
```clojure
|
||||
{:lint-as {com.rpl.specter/defcollector clojure.core/defn
|
||||
com.rpl.specter/defdynamicnav clojure.core/defn
|
||||
com.rpl.specter/defmacroalias clojure.core/def
|
||||
com.rpl.specter/defnav clojure.core/defn
|
||||
com.rpl.specter/defrichnav clojure.core/defn}}
|
||||
```
|
||||
|
||||
# Babashka
|
||||
|
||||
This library is compatible with [babashka](https://babashka.org/) as of specter 1.1.4 and babashka 0.7.8.
|
||||
|
||||
# License
|
||||
|
||||
Copyright 2015-2018 Red Planet Labs, Inc. Specter is licensed under Apache License v2.0.
|
||||
Copyright 2015-2020 Red Planet Labs, Inc. Specter is licensed under Apache License v2.0.
|
||||
|
|
|
|||
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
|||
1.1.2
|
||||
1.1.5-SNAPSHOT
|
||||
|
|
|
|||
19
bb.edn
Normal file
19
bb.edn
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{:paths ["src/clj"]
|
||||
:tasks
|
||||
{test:clj {:doc "Run clj tests with leiningen"
|
||||
:task (shell "lein test")}
|
||||
|
||||
test:cljs {:doc "Run cljs tests with leiningen"
|
||||
:task (shell "lein doo node test-build once")}
|
||||
|
||||
test:bb {:doc "Run bb tests"
|
||||
:extra-paths ["test"]
|
||||
:extra-deps {org.clojure/test.check {:mvn/version "0.9.0"}
|
||||
io.github.cognitect-labs/test-runner
|
||||
{:git/tag "v0.5.0" :git/sha "b3fd0d2"}
|
||||
org.clojure/tools.namespace {:git/url "https://github.com/babashka/tools.namespace"
|
||||
:git/sha "3625153ee66dfcec2ba600851b5b2cbdab8fae6c"}}
|
||||
:requires ([cognitect.test-runner :as tr])
|
||||
:task (apply tr/-main
|
||||
"-d" "test"
|
||||
*command-line-args*)}}}
|
||||
11
project.clj
11
project.clj
|
|
@ -9,7 +9,7 @@
|
|||
:test-paths ["test", "target/test-classes"]
|
||||
:auto-clean false
|
||||
:dependencies [[riddley "0.1.12"]]
|
||||
:plugins [[lein-codox "0.9.5"]
|
||||
:plugins [[lein-codox "0.10.7"]
|
||||
[lein-doo "0.1.7"]]
|
||||
:codox {:source-paths ["target/classes" "src/clj"]
|
||||
:namespaces [com.rpl.specter
|
||||
|
|
@ -31,8 +31,13 @@
|
|||
:profiles {:dev {:dependencies
|
||||
[[org.clojure/test.check "0.9.0"]
|
||||
[org.clojure/clojure "1.9.0"]
|
||||
[org.clojure/clojurescript "1.10.126"]]}
|
||||
|
||||
[org.clojure/clojurescript "1.10.439"]]}
|
||||
:bench {:dependencies [[org.clojure/clojure "1.9.0"]
|
||||
[criterium "0.4.4"]]}
|
||||
:test {:dependencies [[org.clojure/clojure "1.7.0"]]}}
|
||||
|
||||
:deploy-repositories
|
||||
[["clojars" {:url "https://repo.clojars.org"
|
||||
:sign-releases false}]]
|
||||
|
||||
:aliases {"deploy" ["do" "clean," "deploy" "clojars"]})
|
||||
|
|
|
|||
|
|
@ -2,57 +2,31 @@
|
|||
(:use [com.rpl.specter]
|
||||
[com.rpl.specter.transients])
|
||||
(:require [clojure.walk :as walk]
|
||||
[com.rpl.specter.impl :as i]))
|
||||
|
||||
|
||||
;; run via `lein repl` with `(load-file "scripts/benchmarks.clj")`
|
||||
|
||||
|
||||
(defn pretty-float5 [anum]
|
||||
(format "%.5g" anum))
|
||||
[com.rpl.specter.impl :as i]
|
||||
[criterium.core :as bench]))
|
||||
|
||||
(defn pretty-float3 [anum]
|
||||
(format "%.3g" anum))
|
||||
|
||||
(defn time-ms [amt afn]
|
||||
(let [start (System/nanoTime)
|
||||
_ (dotimes [_ amt] (afn))
|
||||
end (System/nanoTime)]
|
||||
(/ (- end start) 1000000.0)))
|
||||
(defn mean [a-fn]
|
||||
(-> a-fn (bench/benchmark* {}) :mean first (* 1000000)))
|
||||
|
||||
|
||||
(defn avg [numbers]
|
||||
(/ (reduce + numbers)
|
||||
(count numbers)
|
||||
1.0))
|
||||
|
||||
(defn average-time-ms [iters amt-per-iter afn]
|
||||
(avg
|
||||
;; treat 1st run as warmup
|
||||
(next
|
||||
(for [i (range (inc iters))]
|
||||
(time-ms amt-per-iter afn)))))
|
||||
|
||||
(defn compare-benchmark [amt-per-iter afn-map]
|
||||
(System/runFinalization)
|
||||
(System/gc)
|
||||
(let [results (transform MAP-VALS
|
||||
(fn [afn]
|
||||
(average-time-ms 8 amt-per-iter afn))
|
||||
afn-map)
|
||||
(defn compare-benchmark [afn-map]
|
||||
(let [results (transform MAP-VALS mean afn-map)
|
||||
[[_ best-time] & _ :as sorted] (sort-by last results)]
|
||||
|
||||
(println "\nAvg(ms)\t\tvs best\t\tCode")
|
||||
(println "\nMean(us)\tvs best\t\tCode")
|
||||
(doseq [[k t] sorted]
|
||||
(println (pretty-float5 t) "\t\t" (pretty-float3 (/ t best-time 1.0)) "\t\t" k))))
|
||||
(println (pretty-float3 t) "\t\t" (pretty-float3 (/ t best-time 1.0)) "\t\t" k))))
|
||||
|
||||
|
||||
(defmacro run-benchmark [name amt-per-iter & exprs]
|
||||
(let [afn-map (->> exprs shuffle (map (fn [e] [`(quote ~e) `(fn [] ~e)])) (into {}))]
|
||||
`(do
|
||||
(println "Benchmark:" ~name (str "(" ~amt-per-iter " iterations)"))
|
||||
(compare-benchmark ~amt-per-iter ~afn-map)
|
||||
(println "\n********************************\n"))))
|
||||
(defmacro run-benchmark [name & exprs]
|
||||
(let [only-benchmarks (set (filter some? *command-line-args*))
|
||||
all-benchmarks? (empty? only-benchmarks)]
|
||||
(if (or all-benchmarks? (contains? only-benchmarks name))
|
||||
(let [afn-map (->> exprs shuffle (map (fn [e] [`(quote ~e) `(fn [] ~e)])) (into {}))]
|
||||
`(do
|
||||
(println "Benchmark:" ~name)
|
||||
(compare-benchmark ~afn-map)
|
||||
(println "\n********************************\n"))))))
|
||||
|
||||
(defn specter-dynamic-nested-get [data a b c]
|
||||
(select-any (keypath a b c) data))
|
||||
|
|
@ -69,7 +43,7 @@
|
|||
|
||||
(let [data {:a {:b {:c 1}}}
|
||||
p (comp-paths :a :b :c)]
|
||||
(run-benchmark "get value in nested map" 2500000
|
||||
(run-benchmark "get value in nested map"
|
||||
(select-any [:a :b :c] data)
|
||||
(select-any (keypath :a :b :c) data)
|
||||
(select-one [:a :b :c] data)
|
||||
|
|
@ -86,7 +60,7 @@
|
|||
|
||||
|
||||
(let [data {:a {:b {:c 1}}}]
|
||||
(run-benchmark "set value in nested map" 2500000
|
||||
(run-benchmark "set value in nested map"
|
||||
(assoc-in data [:a :b :c] 1)
|
||||
(setval [:a :b :c] 1 data)))
|
||||
|
||||
|
|
@ -103,7 +77,7 @@
|
|||
(my-update m3 :c afn))))))
|
||||
|
||||
(let [data {:a {:b {:c 1}}}]
|
||||
(run-benchmark "update value in nested map" 500000
|
||||
(run-benchmark "update value in nested map"
|
||||
(update-in data [:a :b :c] inc)
|
||||
(transform [:a :b :c] inc data)
|
||||
(manual-transform data inc)))
|
||||
|
|
@ -135,14 +109,14 @@
|
|||
|
||||
|
||||
(let [data '(1 2 3 4 5)]
|
||||
(run-benchmark "transform values of a list" 500000
|
||||
(run-benchmark "transform values of a list"
|
||||
(transform ALL inc data)
|
||||
(doall (sequence (map inc) data))
|
||||
(reverse (into '() (map inc) data))
|
||||
))
|
||||
|
||||
(let [data {:a 1 :b 2 :c 3 :d 4}]
|
||||
(run-benchmark "transform values of a small map" 500000
|
||||
(run-benchmark "transform values of a small map"
|
||||
(into {} (for [[k v] data] [k (inc v)]))
|
||||
(reduce-kv (fn [m k v] (assoc m k (inc v))) {} data)
|
||||
(persistent! (reduce-kv (fn [m k v] (assoc! m k (inc v))) (transient {}) data))
|
||||
|
|
@ -158,7 +132,7 @@
|
|||
|
||||
|
||||
(let [data (->> (for [i (range 1000)] [i i]) (into {}))]
|
||||
(run-benchmark "transform values of large map" 600
|
||||
(run-benchmark "transform values of large map"
|
||||
(into {} (for [[k v] data] [k (inc v)]))
|
||||
(reduce-kv (fn [m k v] (assoc m k (inc v))) {} data)
|
||||
(persistent! (reduce-kv (fn [m k v] (assoc! m k (inc v))) (transient {}) data))
|
||||
|
|
@ -174,7 +148,7 @@
|
|||
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9 10]]
|
||||
(run-benchmark "first value of a size 10 vector" 10000000
|
||||
(run-benchmark "first value of a size 10 vector"
|
||||
(first data)
|
||||
(select-any ALL data)
|
||||
(select-any FIRST data)
|
||||
|
|
@ -182,7 +156,7 @@
|
|||
))
|
||||
|
||||
(let [data [1 2 3 4 5]]
|
||||
(run-benchmark "map a function over a vector" 1000000
|
||||
(run-benchmark "map a function over a vector"
|
||||
(vec (map inc data))
|
||||
(mapv inc data)
|
||||
(transform ALL inc data)
|
||||
|
|
@ -190,7 +164,7 @@
|
|||
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9 10]]
|
||||
(run-benchmark "filter a sequence" 500000
|
||||
(run-benchmark "filter a sequence"
|
||||
(doall (filter even? data))
|
||||
(filterv even? data)
|
||||
(select [ALL even?] data)
|
||||
|
|
@ -200,7 +174,7 @@
|
|||
|
||||
(let [data [{:a 2 :b 2} {:a 1} {:a 4} {:a 6}]
|
||||
xf (comp (map :a) (filter even?))]
|
||||
(run-benchmark "even :a values from sequence of maps" 500000
|
||||
(run-benchmark "even :a values from sequence of maps"
|
||||
(select [ALL :a even?] data)
|
||||
(->> data (mapv :a) (filter even?) doall)
|
||||
(into [] (comp (map :a) (filter even?)) data)
|
||||
|
|
@ -209,14 +183,13 @@
|
|||
|
||||
(let [v (vec (range 1000))]
|
||||
(run-benchmark "Append to a large vector"
|
||||
2000000
|
||||
(setval END [1] v)
|
||||
(setval AFTER-ELEM 1 v)
|
||||
(reduce conj v [1])
|
||||
(conj v 1)))
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9 10]]
|
||||
(run-benchmark "prepend to a vector" 1000000
|
||||
(run-benchmark "prepend to a vector"
|
||||
(vec (cons 0 data))
|
||||
(setval BEFORE-ELEM 0 data)
|
||||
(into [0] data)
|
||||
|
|
@ -244,7 +217,6 @@
|
|||
|
||||
(let [data [1 2 [[3]] [4 6 [7 [8]] 10]]]
|
||||
(run-benchmark "update every value in a tree (represented with vectors)"
|
||||
50000
|
||||
(walk/postwalk (fn [e] (if (and (number? e) (even? e)) (inc e) e)) data)
|
||||
(transform [(walker number?) even?] inc data)
|
||||
(transform [TreeValues even?] inc data)
|
||||
|
|
@ -254,7 +226,6 @@
|
|||
|
||||
(let [toappend (range 1000)]
|
||||
(run-benchmark "transient comparison: building up vectors"
|
||||
8000
|
||||
(reduce (fn [v i] (conj v i)) [] toappend)
|
||||
(reduce (fn [v i] (conj! v i)) (transient []) toappend)
|
||||
(setval END toappend [])
|
||||
|
|
@ -262,7 +233,6 @@
|
|||
|
||||
(let [toappend (range 1000)]
|
||||
(run-benchmark "transient comparison: building up vectors one at a time"
|
||||
7000
|
||||
(reduce (fn [v i] (conj v i)) [] toappend)
|
||||
(reduce (fn [v i] (conj! v i)) (transient []) toappend)
|
||||
(reduce (fn [v i] (setval END [i] v)) [] toappend)
|
||||
|
|
@ -273,7 +243,6 @@
|
|||
tdata (transient data)
|
||||
tdata2 (transient data)]
|
||||
(run-benchmark "transient comparison: assoc'ing in vectors"
|
||||
2500000
|
||||
(assoc data 600 0)
|
||||
(assoc! tdata 600 0)
|
||||
(setval (keypath 600) 0 data)
|
||||
|
|
@ -284,7 +253,6 @@
|
|||
tdata (transient data)
|
||||
tdata2 (transient data)]
|
||||
(run-benchmark "transient comparison: assoc'ing in maps"
|
||||
1500000
|
||||
(assoc data 600 0)
|
||||
(assoc! tdata 600 0)
|
||||
(setval (keypath 600) 0 data)
|
||||
|
|
@ -298,31 +266,27 @@
|
|||
[k (rand)]))
|
||||
tdata (transient data)]
|
||||
(run-benchmark "transient comparison: submap"
|
||||
150000
|
||||
(transform (submap [600 700]) modify-submap data)
|
||||
(transform (submap! [600 700]) modify-submap tdata)))
|
||||
|
||||
(let [data {:x 1}
|
||||
meta-map {:my :metadata}]
|
||||
(run-benchmark "set metadata"
|
||||
1500000
|
||||
(with-meta data meta-map)
|
||||
(setval META meta-map data)))
|
||||
|
||||
(let [data (with-meta {:x 1} {:my :metadata})]
|
||||
(run-benchmark "get metadata"
|
||||
15000000
|
||||
(meta data)
|
||||
(select-any META data)))
|
||||
|
||||
(let [data (with-meta {:x 1} {:my :metadata})]
|
||||
(run-benchmark "vary metadata"
|
||||
800000
|
||||
(vary-meta data assoc :y 2)
|
||||
(setval [META :y] 2 data)))
|
||||
|
||||
(let [data (range 1000)]
|
||||
(run-benchmark "Traverse into a set" 5000
|
||||
(run-benchmark "Traverse into a set"
|
||||
(set data)
|
||||
(set (select ALL data))
|
||||
(into #{} (traverse ALL data))
|
||||
|
|
@ -334,18 +298,18 @@
|
|||
(defn mult-10 [v] (* 10 v))
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9]]
|
||||
(run-benchmark "multi-transform vs. consecutive transforms, one shared nav" 300000
|
||||
(run-benchmark "multi-transform vs. consecutive transforms, one shared nav"
|
||||
(->> data (transform [ALL even?] mult-10) (transform [ALL odd?] dec))
|
||||
(multi-transform [ALL (multi-path [even? (terminal mult-10)] [odd? (terminal dec)])] data)))
|
||||
|
||||
|
||||
(let [data [[1 2 3 4 :a] [5] [6 7 :b 8 9] [10 11 12 13]]]
|
||||
(run-benchmark "multi-transform vs. consecutive transforms, three shared navs" 150000
|
||||
(run-benchmark "multi-transform vs. consecutive transforms, three shared navs"
|
||||
(->> data (transform [ALL ALL number? even?] mult-10) (transform [ALL ALL number? odd?] dec))
|
||||
(multi-transform [ALL ALL number? (multi-path [even? (terminal mult-10)] [odd? (terminal dec)])] data)))
|
||||
|
||||
(let [data {:a 1 :b 2 :c 3 :d 4}]
|
||||
(run-benchmark "namespace qualify keys of a small map" 1000000
|
||||
(run-benchmark "namespace qualify keys of a small map"
|
||||
(into {}
|
||||
(map (fn [[k v]] [(keyword (str *ns*) (name k)) v]))
|
||||
data)
|
||||
|
|
@ -355,7 +319,7 @@
|
|||
|
||||
|
||||
(let [data (->> (for [i (range 1000)] [(keyword (str i)) i]) (into {}))]
|
||||
(run-benchmark "namespace qualify keys of a large map" 1200
|
||||
(run-benchmark "namespace qualify keys of a large map"
|
||||
(into {}
|
||||
(map (fn [[k v]] [(keyword (str *ns*) (name k)) v]))
|
||||
data)
|
||||
|
|
@ -370,7 +334,24 @@
|
|||
(i/walk-until afn next-fn structure)))
|
||||
|
||||
(let [data {:a [1 2 {:c '(3 4) :d {:e [1 2 3] 7 8 9 10}}]}]
|
||||
(run-benchmark "walker vs. clojure.walk version" 150000
|
||||
(run-benchmark "walker vs. clojure.walk version"
|
||||
(transform (walker number?) inc data)
|
||||
(transform (walker-old number?) inc data)
|
||||
))
|
||||
|
||||
(let [size 1000
|
||||
middle-idx (/ size 2)
|
||||
v -1
|
||||
rng (range size)
|
||||
data-vec (vec rng)
|
||||
data-lst (apply list rng)]
|
||||
(run-benchmark "before-index vs. srange in middle (vector)"
|
||||
(setval (before-index middle-idx) v data-vec)
|
||||
(setval (srange middle-idx middle-idx) [v] data-vec))
|
||||
(run-benchmark "before-index vs. srange in middle (list)"
|
||||
(setval (before-index middle-idx) v data-lst)
|
||||
(setval (srange middle-idx middle-idx) [v] data-lst))
|
||||
(run-benchmark "before-index at 0 vs. srange vs. cons (list)"
|
||||
(setval (before-index 0) v data-lst)
|
||||
(setval (srange 0 0) [v] data-lst)
|
||||
(cons v data-lst)))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
`lein javac`
|
||||
java -server -XX:MaxPermSize=128m -XX:MaxInlineSize=100 -cp `lein classpath` clojure.main scripts/benchmarks.clj
|
||||
lein javac
|
||||
lein version
|
||||
echo
|
||||
lein show-profiles bench
|
||||
echo
|
||||
java -server -XX:MaxInlineSize=100 -cp "$(lein with-profile bench classpath)" clojure.main scripts/benchmarks.clj "$@"
|
||||
|
|
|
|||
|
|
@ -115,7 +115,32 @@
|
|||
(providepath ~self-sym ~path)
|
||||
~self-sym)))))
|
||||
|
||||
;; copied from tools.macro to avoid the dependency
|
||||
;; copied from clojure.core
|
||||
(def
|
||||
^{:private true}
|
||||
sigs
|
||||
(fn [fdecl]
|
||||
(let [asig
|
||||
(fn [fdecl]
|
||||
(let [arglist (first fdecl)
|
||||
;; elide implicit macro args
|
||||
arglist (if (= '&form (first arglist))
|
||||
(subvec arglist 2 (count arglist))
|
||||
arglist)
|
||||
body (next fdecl)]
|
||||
(if (map? (first body))
|
||||
(if (next body)
|
||||
(with-meta arglist (conj (if (meta arglist) (meta arglist) {}) (first body)))
|
||||
arglist)
|
||||
arglist)))]
|
||||
(if (seq? (first fdecl))
|
||||
(loop [ret [] fdecls fdecl]
|
||||
(if fdecls
|
||||
(recur (conj ret (asig (first fdecls))) (next fdecls))
|
||||
(seq ret)))
|
||||
(list (asig fdecl))))))
|
||||
|
||||
;; partially copied from clojure.core/defn
|
||||
(defn- name-with-attributes
|
||||
"To be used in macro definitions.
|
||||
Handles optional docstrings and attribute maps for a name to be defined
|
||||
|
|
@ -126,20 +151,31 @@
|
|||
macro argument list. The return value is a vector containing the name
|
||||
with its extended metadata map and the list of unprocessed macro
|
||||
arguments."
|
||||
[name macro-args]
|
||||
(let [[docstring macro-args] (if (string? (first macro-args))
|
||||
[(first macro-args) (next macro-args)]
|
||||
[nil macro-args])
|
||||
[attr macro-args] (if (map? (first macro-args))
|
||||
[(first macro-args) (next macro-args)]
|
||||
[{} macro-args])
|
||||
attr (if docstring
|
||||
(assoc attr :doc docstring)
|
||||
attr)
|
||||
attr (if (meta name)
|
||||
(conj (meta name) attr)
|
||||
attr)]
|
||||
[(with-meta name attr) macro-args]))
|
||||
[name fdecl]
|
||||
(let [m (if (string? (first fdecl))
|
||||
{:doc (first fdecl)}
|
||||
{})
|
||||
|
||||
fdecl (if (string? (first fdecl))
|
||||
(next fdecl)
|
||||
fdecl)
|
||||
m (if (map? (first fdecl))
|
||||
(conj m (first fdecl))
|
||||
m)
|
||||
fdecl (if (map? (first fdecl))
|
||||
(next fdecl)
|
||||
fdecl)
|
||||
fdecl (if (vector? (first fdecl))
|
||||
(list fdecl)
|
||||
fdecl)
|
||||
m (if (map? (last fdecl))
|
||||
(conj m (last fdecl))
|
||||
m)
|
||||
fdecl (if (map? (last fdecl))
|
||||
(butlast fdecl)
|
||||
fdecl)
|
||||
m (conj {:arglists (list 'quote (sigs fdecl))} m)]
|
||||
[(with-meta name m) fdecl]))
|
||||
|
||||
(defmacro dynamicnav [& args]
|
||||
`(vary-meta (wrap-dynamic-nav (fn ~@args)) assoc :dynamicnav true))
|
||||
|
|
@ -456,7 +492,8 @@
|
|||
params (-> protpath-prot :sigs first last :arglists first)]
|
||||
(doseq [[atype path-code] extensions]
|
||||
(extend atype protpath-prot
|
||||
{m (eval `(fn ~params (path ~path-code)))}))))
|
||||
{m (binding [*compile-files* false]
|
||||
(eval `(fn ~params (path ~path-code))))}))))
|
||||
|
||||
(defmacro extend-protocolpath
|
||||
"Used in conjunction with `defprotocolpath`. See [[defprotocolpath]]."
|
||||
|
|
@ -973,11 +1010,10 @@
|
|||
NONE)
|
||||
(transform* [this vals structure next-fn]
|
||||
(let [v (next-fn vals NONE)]
|
||||
(if (identical? NONE v)
|
||||
structure
|
||||
;; TODO: make a more efficient impl
|
||||
(setval (srange index index) [v] structure)
|
||||
))))
|
||||
(if
|
||||
(identical? NONE v)
|
||||
structure
|
||||
(n/insert-before-idx structure index v)))))
|
||||
|
||||
(defrichnav
|
||||
^{:doc "Navigates to the index of the sequence if within 0 and size. Transforms move element
|
||||
|
|
@ -1272,7 +1308,7 @@
|
|||
ns (namespace structure)]
|
||||
(cond (keyword? structure) (keyword ns new-name)
|
||||
(symbol? structure) (symbol ns new-name)
|
||||
:else (i/throw-illegal "NAME can only be used on symbols or keywords - " structure)
|
||||
:else (throw (ex-info "NAME can only be used on symbols or keywords" {:structure structure}))
|
||||
))))
|
||||
|
||||
(defnav ^{:doc "Navigates to the namespace portion of the keyword or symbol"}
|
||||
|
|
@ -1285,7 +1321,8 @@
|
|||
new-ns (next-fn (namespace structure))]
|
||||
(cond (keyword? structure) (keyword new-ns name)
|
||||
(symbol? structure) (symbol new-ns name)
|
||||
:else (i/throw-illegal "NAMESPACE can only be used on symbols or keywords - " structure)
|
||||
:else (throw (ex-info "NAMESPACE can only be used on symbols or keywords"
|
||||
{:structure structure}))
|
||||
))))
|
||||
|
||||
(defdynamicnav
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
(ns com.rpl.specter.impl
|
||||
#?(:cljs (:require-macros
|
||||
[com.rpl.specter.util-macros
|
||||
:refer [doseqres mk-comp-navs mk-late-fn mk-late-fn-records]]))
|
||||
:refer [doseqres mk-comp-navs mk-late-fn mk-late-fn-records]]
|
||||
))
|
||||
;; workaround for cljs bug that emits warnings for vars named the same as a
|
||||
;; private var in cljs.core (in this case `NONE`, added as private var to
|
||||
;; cljs.core with 1.9.562)
|
||||
|
|
@ -14,10 +15,11 @@
|
|||
#?(:clj [clojure.pprint :as pp])
|
||||
[clojure.string :as s]
|
||||
[clojure.walk :as walk]
|
||||
#?(:clj [riddley.walk :as riddley]))
|
||||
|
||||
#?(:clj (:import [com.rpl.specter Util MutableCell])))
|
||||
#?(:bb [clojure.walk :as riddley]
|
||||
:clj [riddley.walk :as riddley]))
|
||||
|
||||
#?@(:bb []
|
||||
:clj [(:import [com.rpl.specter Util MutableCell])]))
|
||||
|
||||
(def NONE ::NONE)
|
||||
|
||||
|
|
@ -49,21 +51,6 @@
|
|||
([a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 & r] v)))
|
||||
|
||||
|
||||
#?(:clj
|
||||
(defmacro throw* [etype & args]
|
||||
`(throw (new ~etype (smart-str ~@args)))))
|
||||
|
||||
#?(
|
||||
:clj
|
||||
(defmacro throw-illegal [& args]
|
||||
`(throw* IllegalArgumentException ~@args))
|
||||
|
||||
|
||||
:cljs
|
||||
(defn throw-illegal [& args]
|
||||
(throw (js/Error. (apply str args)))))
|
||||
|
||||
|
||||
;; need to get the expansion function like this so that
|
||||
;; this code compiles in a clojure environment where cljs.analyzer
|
||||
;; namespace does not exist
|
||||
|
|
@ -85,7 +72,7 @@
|
|||
|
||||
:cljs
|
||||
(defn clj-macroexpand-all [form]
|
||||
(throw-illegal "not implemented")))
|
||||
(throw (ex-info "not implemented" {}))))
|
||||
|
||||
|
||||
#?(
|
||||
|
|
@ -94,9 +81,11 @@
|
|||
|
||||
:cljs
|
||||
(defn intern* [ns name val]
|
||||
(throw-illegal "intern not supported in ClojureScript")))
|
||||
(throw (ex-info "intern not supported in ClojureScript" {}))))
|
||||
|
||||
#?(
|
||||
#?(:bb
|
||||
(defmacro fast-object-array [i]
|
||||
`(object-array ~i))
|
||||
:clj
|
||||
(defmacro fast-object-array [i]
|
||||
`(com.rpl.specter.Util/makeObjectArray ~i)))
|
||||
|
|
@ -115,7 +104,8 @@
|
|||
(if (= platform :cljs)
|
||||
`(p/select* ~this ~@args)
|
||||
`(let [~hinted ~this]
|
||||
(.select* ~hinted ~@args)))))
|
||||
(#?(:bb p/select*
|
||||
:clj .select*) ~hinted ~@args)))))
|
||||
:cljs
|
||||
(defn exec-select* [this vals structure next-fn]
|
||||
(p/select* ^not-native this vals structure next-fn)))
|
||||
|
|
@ -129,7 +119,8 @@
|
|||
(if (= platform :cljs)
|
||||
`(p/transform* ~this ~@args)
|
||||
`(let [~hinted ~this]
|
||||
(.transform* ~hinted ~@args)))))
|
||||
(#?(:bb p/transform*
|
||||
:clj .transform*) ~hinted ~@args)))))
|
||||
|
||||
:cljs
|
||||
(defn exec-transform* [this vals structure next-fn]
|
||||
|
|
@ -148,7 +139,9 @@
|
|||
(defn- coerce-object [this]
|
||||
(cond (rich-nav? this) this
|
||||
(satisfies? p/ImplicitNav this) (p/implicit-nav this)
|
||||
:else (throw-illegal "Not a navigator: " this " " (pr-str (type this)))))
|
||||
:else (throw (ex-info "Not a navigator"
|
||||
{:this this
|
||||
:type-str (pr-str (type this))}))))
|
||||
|
||||
|
||||
(defprotocol CoercePath
|
||||
|
|
@ -226,13 +219,19 @@
|
|||
(set_cell [cell x])))
|
||||
|
||||
|
||||
#?(:cljs
|
||||
#?(:bb
|
||||
(defrecord MutableCell [x])
|
||||
:cljs
|
||||
(deftype MutableCell [^:volatile-mutable q]
|
||||
PMutableCell
|
||||
(set_cell [this x] (set! q x))))
|
||||
|
||||
|
||||
#?(
|
||||
#?(:bb
|
||||
(defn mutable-cell
|
||||
([] (mutable-cell nil))
|
||||
([v] (MutableCell. (volatile! v))))
|
||||
|
||||
:clj
|
||||
(defn mutable-cell
|
||||
([] (mutable-cell nil))
|
||||
|
|
@ -244,7 +243,10 @@
|
|||
([init] (MutableCell. init))))
|
||||
|
||||
|
||||
#?(
|
||||
#?(:bb
|
||||
(defn set-cell! [^MutableCell c v]
|
||||
(vreset! (:x c) v))
|
||||
|
||||
:clj
|
||||
(defn set-cell! [^MutableCell c v]
|
||||
(.set c v))
|
||||
|
|
@ -254,7 +256,10 @@
|
|||
(set_cell cell val)))
|
||||
|
||||
|
||||
#?(
|
||||
#?(:bb
|
||||
(defn get-cell [^MutableCell c]
|
||||
@(:x c))
|
||||
|
||||
:clj
|
||||
(defn get-cell [^MutableCell c]
|
||||
(.get c))
|
||||
|
|
@ -302,8 +307,10 @@
|
|||
(defn do-compiled-traverse* [apath structure]
|
||||
(reify #?(:clj clojure.lang.IReduce :cljs cljs.core/IReduce)
|
||||
(#?(:clj reduce :cljs -reduce)
|
||||
[this afn]
|
||||
(#?(:clj .reduce :cljs -reduce) this afn (afn)))
|
||||
[this afn]
|
||||
#?(:bb (reduce afn (afn) this)
|
||||
:default
|
||||
(#?(:clj .reduce :cljs -reduce) this afn (afn))))
|
||||
(#?(:clj reduce :cljs -reduce)
|
||||
[this afn start]
|
||||
(let [cell (mutable-cell start)]
|
||||
|
|
@ -320,6 +327,9 @@
|
|||
))))
|
||||
|
||||
#?(
|
||||
:bb
|
||||
(defn- call-reduce-interface [^clojure.lang.IReduce traverser afn start]
|
||||
(reduce afn start traverser))
|
||||
:clj
|
||||
(defn- call-reduce-interface [^clojure.lang.IReduce traverser afn start]
|
||||
(.reduce traverser afn start)
|
||||
|
|
@ -334,8 +344,10 @@
|
|||
(let [traverser (do-compiled-traverse* apath structure)]
|
||||
(reify #?(:clj clojure.lang.IReduce :cljs cljs.core/IReduce)
|
||||
(#?(:clj reduce :cljs -reduce)
|
||||
[this afn]
|
||||
(#?(:clj .reduce :cljs -reduce) this afn (afn)))
|
||||
[this afn]
|
||||
#?(:bb (reduce afn (afn) this)
|
||||
:default
|
||||
(#?(:clj .reduce :cljs -reduce) this afn (afn))))
|
||||
(#?(:clj reduce :cljs -reduce)
|
||||
[this afn start]
|
||||
(let [res (call-reduce-interface traverser afn start)]
|
||||
|
|
@ -372,7 +384,8 @@
|
|||
(let [curr (get-cell res)]
|
||||
(if (identical? curr NONE)
|
||||
(set-cell! res structure)
|
||||
(throw-illegal "More than one element found in structure: " structure))))]
|
||||
(throw (ex-info "More than one element found in structure"
|
||||
{:structure structure})))))]
|
||||
|
||||
(compiled-traverse* path result-fn structure)
|
||||
(let [ret (get-cell res)]
|
||||
|
|
@ -387,11 +400,12 @@
|
|||
(let [curr (get-cell res)]
|
||||
(if (identical? curr NONE)
|
||||
(set-cell! res structure)
|
||||
(throw-illegal "More than one element found in structure: " structure))))]
|
||||
(throw (ex-info "More than one element found in structure"
|
||||
{:structure structure})))))]
|
||||
(compiled-traverse* path result-fn structure)
|
||||
(let [ret (get-cell res)]
|
||||
(if (identical? NONE ret)
|
||||
(throw-illegal "Found no elements for select-one! on " structure))
|
||||
(throw (ex-info "Found no elements for select-one!" {:structure structure})))
|
||||
ret)))
|
||||
|
||||
|
||||
|
|
@ -809,7 +823,8 @@
|
|||
(defn dynamic-val-code [code possible-params]
|
||||
(let [[i] (keep-indexed (fn [i v] (if (= v code) i)) possible-params)]
|
||||
(if (nil? i)
|
||||
(throw-illegal "Could not find " code " in possible params " possible-params))
|
||||
(throw (ex-info "Could not find code in possible params"
|
||||
{:code code :possible-params possible-params})))
|
||||
(maybe-direct-nav
|
||||
(->LocalParam i)
|
||||
(direct-nav? code)))))
|
||||
|
|
@ -904,6 +919,8 @@
|
|||
(if (fn? e) (re-find #" .*" (pr-str e)) e))
|
||||
o)))
|
||||
|
||||
(def ^:dynamic *path-compile-files* false)
|
||||
|
||||
#?(:clj
|
||||
(defn mk-dynamic-path-maker [resolved-code ns-str used-locals-list possible-param]
|
||||
(let [code `(fn [~@used-locals-list] ~resolved-code)
|
||||
|
|
@ -912,7 +929,11 @@
|
|||
(println "Produced code:")
|
||||
(pp/pprint code)
|
||||
(println))
|
||||
(binding [*ns* ns] (eval+ code))))
|
||||
(binding [*ns* ns
|
||||
*compile-files* (if *path-compile-files*
|
||||
*compile-files*
|
||||
false)]
|
||||
(eval+ code))))
|
||||
|
||||
:cljs
|
||||
(defn mk-dynamic-path-maker [resolved-code ns-str used-locals-list possible-params]
|
||||
|
|
@ -975,9 +996,9 @@
|
|||
|
||||
|
||||
(defn- multi-transform-error-fn [& nav]
|
||||
(throw-illegal
|
||||
"All navigation in multi-transform must end in 'terminal' "
|
||||
"navigators. Instead navigated to: " nav))
|
||||
(throw
|
||||
(ex-info "All navigation in multi-transform must end in 'terminal' navigators"
|
||||
{:nav nav})))
|
||||
|
||||
(defn compiled-multi-transform* [path structure]
|
||||
(compiled-transform* path multi-transform-error-fn structure))
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
(defn- determine-params-impls [impls]
|
||||
(let [grouped (->> impls (map (fn [[n & body]] [n body])) (into {}))]
|
||||
(if-not (= #{'select* 'transform*} (-> grouped keys set))
|
||||
(i/throw-illegal "defnav must implement select* and transform*, instead got "
|
||||
(keys grouped)))
|
||||
(throw (ex-info "defnav must implement select* and transform*"
|
||||
{:methods (keys grouped)})))
|
||||
grouped))
|
||||
|
||||
|
||||
|
|
@ -39,11 +39,16 @@
|
|||
(let [helpers (for [[mname [_ & mparams] & mbody] impls]
|
||||
`(defn ~(helper-name name mname) [~@params ~@mparams] ~@mbody))
|
||||
decls (for [[mname & _] impls]
|
||||
`(declare ~(helper-name name mname)))]
|
||||
`(declare ~(helper-name name mname)))
|
||||
name-with-meta (vary-meta name
|
||||
assoc :arglists (list 'quote (list params)))]
|
||||
`(do
|
||||
~@decls
|
||||
~@helpers
|
||||
(def ~name (nav ~params ~@impls)))))
|
||||
(def ~name-with-meta (nav ~params ~@impls)))))
|
||||
|
||||
(defmacro defrichnav [name params & impls]
|
||||
`(def ~name (richnav ~params ~@impls)))
|
||||
(let [name-with-meta (vary-meta name
|
||||
assoc :arglists (list 'quote (list params)))]
|
||||
`(def ~name-with-meta
|
||||
(richnav ~params ~@impls))))
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@
|
|||
#?(:clj (:use [com.rpl.specter.macros :only [defnav defrichnav]]
|
||||
[com.rpl.specter.util-macros :only [doseqres]]))
|
||||
(:require [com.rpl.specter.impl :as i]
|
||||
#?(:clj [clojure.core.reducers :as r])))
|
||||
#?@(:bb []
|
||||
:clj [[clojure.core.reducers :as r]])))
|
||||
|
||||
|
||||
(defn not-selected?*
|
||||
|
|
@ -94,6 +95,13 @@
|
|||
(comp (map next-fn)
|
||||
(filter not-NONE?))
|
||||
structure))
|
||||
|
||||
#?(:clj String :cljs string)
|
||||
(all-transform [structure next-fn]
|
||||
(apply str (into []
|
||||
(comp (map next-fn)
|
||||
(filter not-NONE?))
|
||||
structure)))
|
||||
|
||||
#?(:clj clojure.lang.PersistentHashSet :cljs cljs.core/PersistentHashSet)
|
||||
(all-transform [structure next-fn]
|
||||
|
|
@ -103,7 +111,10 @@
|
|||
structure))
|
||||
|
||||
#?(:clj clojure.lang.PersistentArrayMap)
|
||||
#?(:clj
|
||||
#?(:bb
|
||||
(all-transform [structure next-fn]
|
||||
(non-transient-map-all-transform structure next-fn {}))
|
||||
:clj
|
||||
(all-transform [structure next-fn]
|
||||
(let [k-it (.keyIterator structure)
|
||||
v-it (.valIterator structure)
|
||||
|
|
@ -185,10 +196,13 @@
|
|||
|
||||
|
||||
:else
|
||||
(->> structure
|
||||
(r/map next-fn)
|
||||
(r/filter not-NONE?)
|
||||
(into empty-structure))))))
|
||||
#?(:bb (into empty-structure
|
||||
(comp (map next-fn) (filter not-NONE?))
|
||||
structure)
|
||||
:clj (->> structure
|
||||
(r/map next-fn)
|
||||
(r/filter not-NONE?)
|
||||
(into empty-structure)))))))
|
||||
|
||||
|
||||
#?(:cljs default)
|
||||
|
|
@ -255,7 +269,10 @@
|
|||
|
||||
|
||||
#?(:clj clojure.lang.PersistentArrayMap)
|
||||
#?(:clj
|
||||
#?(:bb
|
||||
(map-vals-transform [structure next-fn]
|
||||
(map-vals-non-transient-transform structure {} next-fn))
|
||||
:clj
|
||||
(map-vals-transform [structure next-fn]
|
||||
(let [k-it (.keyIterator structure)
|
||||
v-it (.valIterator structure)
|
||||
|
|
@ -282,7 +299,10 @@
|
|||
array
|
||||
)]
|
||||
(clojure.lang.PersistentArrayMap. array)))))
|
||||
#?(:clj
|
||||
#?(:bb
|
||||
(map-keys-transform [structure next-fn]
|
||||
(map-keys-non-transient-transform structure {} next-fn))
|
||||
:clj
|
||||
(map-keys-transform [structure next-fn]
|
||||
(let [k-it (.keyIterator structure)
|
||||
v-it (.valIterator structure)
|
||||
|
|
@ -449,6 +469,24 @@
|
|||
(prepend-one [structure elem]
|
||||
(into [elem] structure))
|
||||
|
||||
#?(:cljs cljs.core/Subvec)
|
||||
#?(:cljs
|
||||
(append-all [structure elements]
|
||||
(reduce conj structure elements)))
|
||||
#?(:cljs
|
||||
(prepend-all [structure elements]
|
||||
(let [ret (transient [])]
|
||||
(as-> ret <>
|
||||
(reduce conj! <> elements)
|
||||
(reduce conj! <> structure)
|
||||
(persistent! <>)))))
|
||||
#?(:cljs
|
||||
(append-one [structure elem]
|
||||
(conj structure elem)))
|
||||
#?(:cljs
|
||||
(prepend-one [structure elem]
|
||||
(into [elem] structure)))
|
||||
|
||||
|
||||
#?(:clj Object :cljs default)
|
||||
(append-all [structure elements]
|
||||
|
|
@ -474,6 +512,9 @@
|
|||
(defprotocol FastEmpty
|
||||
(fast-empty? [s]))
|
||||
|
||||
(defprotocol InsertBeforeIndex
|
||||
(insert-before-idx [aseq idx val]))
|
||||
|
||||
(defnav PosNavigator [getter updater]
|
||||
(select* [this structure next-fn]
|
||||
(if-not (fast-empty? structure)
|
||||
|
|
@ -484,6 +525,17 @@
|
|||
structure
|
||||
(updater structure next-fn))))
|
||||
|
||||
#?(:bb
|
||||
(defn vec-count [v]
|
||||
(count v))
|
||||
|
||||
:clj
|
||||
(defn vec-count [^clojure.lang.IPersistentVector v]
|
||||
(.length v))
|
||||
|
||||
:cljs
|
||||
(defn vec-count [v]
|
||||
(count v)))
|
||||
|
||||
(defn- update-first-list [l afn]
|
||||
(let [newf (afn (first l))
|
||||
|
|
@ -499,17 +551,39 @@
|
|||
(if (nil? bl) '() bl)
|
||||
(concat bl [lastl]))))
|
||||
|
||||
#?(
|
||||
:clj
|
||||
(defn vec-count [^clojure.lang.IPersistentVector v]
|
||||
(.length v))
|
||||
(defn- update-first-vector [v afn]
|
||||
(let [val (nth v 0)
|
||||
newv (afn val)]
|
||||
(if (identical? i/NONE newv)
|
||||
(subvec v 1)
|
||||
(assoc v 0 newv)
|
||||
)))
|
||||
|
||||
:cljs
|
||||
(defn vec-count [v]
|
||||
(count v)))
|
||||
(defn- update-last-vector [v afn]
|
||||
;; type-hinting vec-count to ^int caused weird errors with case
|
||||
(let [c (int (vec-count v))]
|
||||
(case c
|
||||
1 (let [[e] v
|
||||
newe (afn e)]
|
||||
(if (identical? i/NONE newe)
|
||||
[]
|
||||
[newe]))
|
||||
2 (let [[e1 e2] v
|
||||
newe (afn e2)]
|
||||
(if (identical? i/NONE newe)
|
||||
[e1]
|
||||
[e1 newe]))
|
||||
(let [i (dec c)
|
||||
newe (afn (nth v i))]
|
||||
(if (identical? i/NONE newe)
|
||||
(pop v)
|
||||
(assoc v i newe))))))
|
||||
|
||||
|
||||
#?(
|
||||
#?(:bb
|
||||
(defn transient-vec-count [v]
|
||||
(count v))
|
||||
|
||||
:clj
|
||||
(defn transient-vec-count [^clojure.lang.ITransientVector v]
|
||||
(.count v))
|
||||
|
|
@ -522,32 +596,18 @@
|
|||
(extend-protocol UpdateExtremes
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(update-first [v afn]
|
||||
(let [val (nth v 0)
|
||||
newv (afn val)]
|
||||
(if (identical? i/NONE newv)
|
||||
(subvec v 1)
|
||||
(assoc v 0 newv)
|
||||
)))
|
||||
(update-first-vector v afn))
|
||||
|
||||
(update-last [v afn]
|
||||
;; type-hinting vec-count to ^int caused weird errors with case
|
||||
(let [c (int (vec-count v))]
|
||||
(case c
|
||||
1 (let [[e] v
|
||||
newe (afn e)]
|
||||
(if (identical? i/NONE newe)
|
||||
[]
|
||||
[newe]))
|
||||
2 (let [[e1 e2] v
|
||||
newe (afn e2)]
|
||||
(if (identical? i/NONE newe)
|
||||
[e1]
|
||||
[e1 newe]))
|
||||
(let [i (dec c)
|
||||
newe (afn (nth v i))]
|
||||
(if (identical? i/NONE newe)
|
||||
(pop v)
|
||||
(assoc v i newe))))))
|
||||
(update-last-vector v afn))
|
||||
|
||||
#?(:cljs cljs.core/Subvec)
|
||||
#?(:cljs
|
||||
(update-first [v afn]
|
||||
(update-first-vector v afn)))
|
||||
#?(:cljs
|
||||
(update-last [v afn]
|
||||
(update-last-vector v afn)))
|
||||
|
||||
#?(:clj String :cljs string)
|
||||
(update-first [s afn]
|
||||
|
|
@ -691,3 +751,36 @@
|
|||
((:end-fn end-fn) structure start)
|
||||
(end-fn structure)
|
||||
))
|
||||
|
||||
(defn- insert-before-index-list [lst idx val]
|
||||
;; an implementation that is most efficient for list style structures
|
||||
(let [[front back] (split-at idx lst)]
|
||||
(concat front (cons val back))))
|
||||
|
||||
(extend-protocol InsertBeforeIndex
|
||||
nil
|
||||
(insert-before-idx [_ idx val]
|
||||
(if (= 0 idx)
|
||||
(list val)
|
||||
(throw (ex-info "For a nil structure, can only insert before index 0"
|
||||
{:insertion-index idx}))))
|
||||
|
||||
#?(:clj java.lang.String :cljs string)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(apply str (insert-before-index-list aseq idx val)))
|
||||
|
||||
#?(:clj clojure.lang.LazySeq :cljs cljs.core/LazySeq)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(insert-before-index-list aseq idx val))
|
||||
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(let [front (subvec aseq 0 idx)
|
||||
back (subvec aseq idx)]
|
||||
(into (conj front val) back)))
|
||||
|
||||
#?(:clj clojure.lang.IPersistentList :cljs cljs.core/List)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(cond (= idx 0)
|
||||
(cons val aseq)
|
||||
:else (insert-before-index-list aseq idx val))))
|
||||
|
|
|
|||
|
|
@ -65,4 +65,4 @@
|
|||
`(defn ~'late-fn [~f ~args]
|
||||
(case (count ~args)
|
||||
~@(apply concat cases)
|
||||
(com.rpl.specter.impl/throw-illegal "Cannot have late function with more than 18 args")))))
|
||||
(throw (ex-info "Cannot have late function with more than 18 args" {}))))))
|
||||
|
|
|
|||
|
|
@ -1320,9 +1320,13 @@
|
|||
(deftest traversed-test
|
||||
(is (= 10 (select-any (s/traversed s/ALL +) [1 2 3 4]))))
|
||||
|
||||
(defn- predand= [pred ret v]
|
||||
(and (pred ret)
|
||||
(= ret v)))
|
||||
(defn- predand= [pred v1 v2]
|
||||
(and (pred v1)
|
||||
(pred v2)
|
||||
(= v1 v2)))
|
||||
|
||||
(defn listlike? [v]
|
||||
(or (list? v) (seq? v)))
|
||||
|
||||
(deftest nthpath-test
|
||||
(is (predand= vector? [1 2 -3 4] (transform (s/nthpath 2) - [1 2 3 4])))
|
||||
|
|
@ -1334,7 +1338,7 @@
|
|||
|
||||
(deftest remove-with-NONE-test
|
||||
(is (predand= vector? [1 2 3] (setval [s/ALL nil?] s/NONE [1 2 nil 3 nil])))
|
||||
(is (predand= list? '(1 2 3) (setval [s/ALL nil?] s/NONE '(1 2 nil 3 nil))))
|
||||
(is (predand= listlike? '(1 2 3) (setval [s/ALL nil?] s/NONE '(1 2 nil 3 nil))))
|
||||
(is (= {:b 2} (setval :a s/NONE {:a 1 :b 2})))
|
||||
(is (= {:b 2} (setval (s/must :a) s/NONE {:a 1 :b 2})))
|
||||
(is (predand= vector? [1 3] (setval (s/keypath 1) s/NONE [1 2 3])))
|
||||
|
|
@ -1436,6 +1440,15 @@
|
|||
(is (= "abq" (setval s/LAST "q" "abc")))
|
||||
)
|
||||
|
||||
(defn whitespace? [char]
|
||||
(re-matches #"\s" (str char)))
|
||||
|
||||
(deftest string-transform-test
|
||||
(is (= "123" (transform s/ALL identity "123")))
|
||||
(is (= "123" (transform [s/ALL whitespace?] s/NONE "1 2 3")))
|
||||
#?(:clj (is (= "123" (setval [s/ALL #(Character/isWhitespace %)] s/NONE "1 2 3"))))
|
||||
#?(:clj (is (= "123" (transform [(s/filterer #(Character/isWhitespace %))] s/NONE "1 2 3")))))
|
||||
|
||||
(deftest regex-navigation-test
|
||||
;; also test regexes as implicit navs
|
||||
(is (= (select #"t" "test") ["t" "t"]))
|
||||
|
|
@ -1454,11 +1467,11 @@
|
|||
|
||||
(deftest single-value-none-navigators-test
|
||||
(is (predand= vector? [1 2 3] (setval s/AFTER-ELEM 3 [1 2])))
|
||||
(is (predand= list? '(1 2 3) (setval s/AFTER-ELEM 3 '(1 2))))
|
||||
(is (predand= list? '(1) (setval s/AFTER-ELEM 1 nil)))
|
||||
(is (predand= listlike? '(1 2 3) (setval s/AFTER-ELEM 3 '(1 2))))
|
||||
(is (predand= listlike? '(1) (setval s/AFTER-ELEM 1 nil)))
|
||||
(is (predand= vector? [3 1 2] (setval s/BEFORE-ELEM 3 [1 2])))
|
||||
(is (predand= list? '(3 1 2) (setval s/BEFORE-ELEM 3 '(1 2))))
|
||||
(is (predand= list? '(1) (setval s/BEFORE-ELEM 1 nil)))
|
||||
(is (predand= listlike? '(3 1 2) (setval s/BEFORE-ELEM 3 '(1 2))))
|
||||
(is (predand= listlike? '(1) (setval s/BEFORE-ELEM 1 nil)))
|
||||
(is (= #{1 2 3} (setval s/NONE-ELEM 3 #{1 2})))
|
||||
(is (= #{1} (setval s/NONE-ELEM 1 nil)))
|
||||
)
|
||||
|
|
@ -1502,7 +1515,7 @@
|
|||
[l (limit-size 10 (gen/not-empty (gen/list gen/int)))]
|
||||
(let [newl (setval s/FIRST s/NONE l)]
|
||||
(and (= newl (rest l))
|
||||
(list? newl)
|
||||
(listlike? newl)
|
||||
))))
|
||||
|
||||
(defspec remove-last-vector
|
||||
|
|
@ -1609,14 +1622,18 @@
|
|||
|
||||
(deftest before-index-test
|
||||
(let [data [1 2 3]
|
||||
datal '(1 2 3)]
|
||||
datal '(1 2 3)
|
||||
data-str "abcdef"]
|
||||
(is (predand= vector? [:a 1 2 3] (setval (s/before-index 0) :a data)))
|
||||
(is (predand= vector? [1 2 3] (setval (s/before-index 1) s/NONE data)))
|
||||
(is (predand= vector? [1 :a 2 3] (setval (s/before-index 1) :a data)))
|
||||
(is (predand= vector? [1 2 3 :a] (setval (s/before-index 3) :a data)))
|
||||
(is (predand= list? '(:a 1 2 3) (setval (s/before-index 0) :a datal)))
|
||||
(is (predand= list? '(1 :a 2 3) (setval (s/before-index 1) :a datal)))
|
||||
(is (predand= list? '(1 2 3 :a) (setval (s/before-index 3) :a datal)))
|
||||
; ensure inserting at index 0 in nil structure works, as in previous impl
|
||||
(is (predand= listlike? '(:a) (setval (s/before-index 0) :a nil)))
|
||||
(is (predand= listlike? '(:a 1 2 3) (setval (s/before-index 0) :a datal)))
|
||||
(is (predand= listlike? '(1 :a 2 3) (setval (s/before-index 1) :a datal)))
|
||||
(is (predand= listlike? '(1 2 3 :a) (setval (s/before-index 3) :a datal)))
|
||||
(is (predand= string? "abcxdef" (setval (s/before-index 3) (char \x) data-str)))
|
||||
))
|
||||
|
||||
(deftest index-nav-test
|
||||
|
|
@ -1629,12 +1646,12 @@
|
|||
(is (predand= vector? [1 2 4 5 6 3] (setval (s/index-nav 2) 5 data)))
|
||||
(is (predand= vector? [6 1 2 3 4 5] (setval (s/index-nav 5) 0 data)))
|
||||
|
||||
(is (predand= list? '(3 1 2 4 5 6) (setval (s/index-nav 2) 0 datal)))
|
||||
(is (predand= list? '(1 3 2 4 5 6) (setval (s/index-nav 2) 1 datal)))
|
||||
(is (predand= list? '(1 2 3 4 5 6) (setval (s/index-nav 2) 2 datal)))
|
||||
(is (predand= list? '(1 2 4 5 3 6) (setval (s/index-nav 2) 4 datal)))
|
||||
(is (predand= list? '(1 2 4 5 6 3) (setval (s/index-nav 2) 5 datal)))
|
||||
(is (predand= list? '(6 1 2 3 4 5) (setval (s/index-nav 5) 0 datal)))
|
||||
(is (predand= listlike? '(3 1 2 4 5 6) (setval (s/index-nav 2) 0 datal)))
|
||||
(is (predand= listlike? '(1 3 2 4 5 6) (setval (s/index-nav 2) 1 datal)))
|
||||
(is (predand= listlike? '(1 2 3 4 5 6) (setval (s/index-nav 2) 2 datal)))
|
||||
(is (predand= listlike? '(1 2 4 5 3 6) (setval (s/index-nav 2) 4 datal)))
|
||||
(is (predand= listlike? '(1 2 4 5 6 3) (setval (s/index-nav 2) 5 datal)))
|
||||
(is (predand= listlike? '(6 1 2 3 4 5) (setval (s/index-nav 5) 0 datal)))
|
||||
))
|
||||
|
||||
(deftest indexed-vals-test
|
||||
|
|
|
|||
Loading…
Reference in a new issue