luciano/specter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
specter/pb
Pietro F. Menna 3b3bace828 Testing
2015-06-24 14:28:33 -04:00

797 lines
25 KiB
Text
Raw Blame History

diff --git a/project.clj b/project.clj
index 13c1e4d..de6ff30 100644
--- a/project.clj
+++ b/project.clj
@@ -1,10 +1,10 @@
(def VERSION (.trim (slurp "VERSION")))
(defproject com.rpl/specter VERSION
- :dependencies [[org.clojure/clojure "1.6.0"]
+ :dependencies [[org.clojure/clojure "1.7.0-RC2"]
]
:jvm-opts ["-XX:-OmitStackTraceInFastThrow"] ; this prevents JVM from doing optimizations which can remove stack traces from NPE and other exceptions
- :source-paths ["src/clj"]
+ :source-paths ["src"]
:test-paths ["test/clj"]
:profiles {:dev {:dependencies
[[org.clojure/test.check "0.5.9"]]}
diff --git a/src/clj/com/rpl/specter.clj b/src/clj/com/rpl/specter.clj
deleted file mode 100644
index f117e99..0000000
--- a/src/clj/com/rpl/specter.clj
+++ /dev/null
@@ -1,205 +0,0 @@
-(ns com.rpl.specter
- (:use [com.rpl.specter impl protocols])
- )
-
-;;TODO: can make usage of vals much more efficient by determining during composition how many vals
-;;there are going to be. this should make it much easier to allocate space for vals without doing concats
-;;all over the place. The apply to the vals + structure can also be avoided since the number of vals is known
-;;beforehand
-(defn comp-paths [& paths]
- (comp-paths* (vec paths)))
-
-;; Selector functions
-
-(def ^{:doc "Version of select that takes in a selector pre-compiled with comp-paths"}
- compiled-select compiled-select*)
-
-(defn select
- "Navigates to and returns a sequence of all the elements specified by the selector."
- [selector structure]
- (compiled-select (comp-unoptimal selector)
- structure))
-
-(defn compiled-select-one
- "Version of select-one that takes in a selector pre-compiled with comp-paths"
- [selector structure]
- (let [res (compiled-select selector structure)]
- (when (> (count res) 1)
- (throw-illegal "More than one element found for params: " selector structure))
- (first res)
- ))
-
-(defn select-one
- "Like select, but returns either one element or nil. Throws exception if multiple elements found"
- [selector structure]
- (compiled-select-one (comp-unoptimal selector) structure))
-
-(defn compiled-select-one!
- "Version of select-one! that takes in a selector pre-compiled with comp-paths"
- [selector structure]
- (let [res (compiled-select-one selector structure)]
- (when (nil? res) (throw-illegal "No elements found for params: " selector structure))
- res
- ))
-
-(defn select-one!
- "Returns exactly one element, throws exception if zero or multiple elements found"
- [selector structure]
- (compiled-select-one! (comp-unoptimal selector) structure))
-
-(defn compiled-select-first
- "Version of select-first that takes in a selector pre-compiled with comp-paths"
- [selector structure]
- (first (compiled-select selector structure)))
-
-(defn select-first
- "Returns first element found. Not any more efficient than select, just a convenience"
- [selector structure]
- (compiled-select-first (comp-unoptimal selector) structure))
-
-;; Transformfunctions
-
-
-(def ^{:doc "Version of transform that takes in a selector pre-compiled with comp-paths"}
- compiled-transform compiled-transform*)
-
-(defn transform
- "Navigates to each value specified by the selector and replaces it by the result of running
- the transform-fn on it"
- [selector transform-fn structure]
- (compiled-transform (comp-unoptimal selector) transform-fn structure))
-
-(defn compiled-setval
- "Version of setval that takes in a selector pre-compiled with comp-paths"
- [selector val structure]
- (compiled-transform selector (fn [_] val) structure))
-
-(defn setval
- "Navigates to each value specified by the selector and replaces it by val"
- [selector val structure]
- (compiled-setval (comp-unoptimal selector) val structure))
-
-(defn compiled-replace-in
- "Version of replace-in that takes in a selector pre-compiled with comp-paths"
- [selector transform-fn structure & {:keys [merge-fn] :or {merge-fn concat}}]
- (let [state (mutable-cell nil)]
- [(compiled-transform selector
- (fn [e]
- (let [res (transform-fn e)]
- (if res
- (let [[ret user-ret] res]
- (->> user-ret
- (merge-fn (get-cell state))
- (set-cell! state))
- ret)
- e
- )))
- structure)
- (get-cell state)]
- ))
-
-(defn replace-in
- "Similar to transform, except returns a pair of [transformd-structure sequence-of-user-ret].
- The transform-fn in this case is expected to return [ret user-ret]. ret is
- what's used to transform the data structure, while user-ret will be added to the user-ret sequence
- in the final return. replace-in is useful for situations where you need to know the specific values
- of what was transformd in the data structure."
- [selector transform-fn structure & {:keys [merge-fn] :or {merge-fn concat}}]
- (compiled-replace-in (comp-unoptimal selector) transform-fn structure :merge-fn merge-fn))
-
-;; Built-in pathing and context operations
-
-(def ALL (->AllStructurePath))
-
-(def VAL (->ValCollect))
-
-(def LAST (->LastStructurePath))
-
-(def FIRST (->FirstStructurePath))
-
-(defn srange-dynamic [start-fn end-fn] (->SRangePath start-fn end-fn))
-
-(defn srange [start end] (srange-dynamic (fn [_] start) (fn [_] end)))
-
-(def START (srange 0 0))
-
-(def END (srange-dynamic count count))
-
-(defn walker [afn] (->WalkerStructurePath afn))
-
-(defn codewalker [afn] (->CodeWalkerStructurePath afn))
-
-(defn filterer [& path] (->FilterStructurePath (comp-paths* path)))
-
-(defn keypath [akey] (->KeyPath akey))
-
-(defn view [afn] (->ViewPath afn))
-
-(defmacro viewfn [& args]
- `(view (fn ~@args)))
-
-(defn selected?
- "Filters the current value based on whether a selector finds anything.
- e.g. (selected? :vals ALL even?) keeps the current element only if an
- even number exists for the :vals key"
- [& selectors]
- (let [s (comp-paths* selectors)]
- (fn [structure]
- (->> structure
- (select s)
- empty?
- not))))
-
-(extend-type clojure.lang.Keyword
- StructurePath
- (select* [kw structure next-fn]
- (next-fn (get structure kw)))
- (transform* [kw structure next-fn]
- (assoc structure kw (next-fn (get structure kw)))
- ))
-
-(extend-type clojure.lang.AFn
- StructurePath
- (select* [afn structure next-fn]
- (if (afn structure)
- (next-fn structure)))
- (transform* [afn structure next-fn]
- (if (afn structure)
- (next-fn structure)
- structure)))
-
-(defn collect [& selector]
- (->SelectCollector select (comp-paths* selector)))
-
-(defn collect-one [& selector]
- (->SelectCollector select-one (comp-paths* selector)))
-
-(defn putval
- "Adds an external value to the collected vals. Useful when additional arguments
- are required to the transform function that would otherwise require partial
- application or a wrapper function.
-
- e.g., incrementing val at path [:a :b] by 3:
- (transform [:a :b (putval 3)] + some-map)"
- [val]
- (->PutValCollector val))
-
-(defn cond-path
- "Takes in alternating cond-path selector cond-path selector...
- Tests the structure if selecting with cond-path returns anything.
- If so, it uses the following selector for this portion of the navigation.
- Otherwise, it tries the next cond-path. If nothing matches, then the structure
- is not selected."
- [& conds]
- (->> conds
- (partition 2)
- (map (fn [[c p]] [(comp-paths* c) (comp-paths* p)]))
- doall
- ->ConditionalPath
- ))
-
-(defn if-path
- "Like cond-path, but with if semantics."
- ([cond-fn if-path] (cond-path cond-fn if-path))
- ([cond-fn if-path else-path]
- (cond-path cond-fn if-path nil else-path)))
diff --git a/src/clj/com/rpl/specter/impl.clj b/src/clj/com/rpl/specter/impl.clj
deleted file mode 100644
index 6b864a5..0000000
--- a/src/clj/com/rpl/specter/impl.clj
+++ /dev/null
@@ -1,521 +0,0 @@
-(ns com.rpl.specter.impl
- (:use [com.rpl.specter protocols])
- (:require [clojure.walk :as walk]
- [clojure.core.reducers :as r])
- )
-
-(defmacro throw* [etype & args]
- `(throw (new ~etype (pr-str ~@args))))
-
-(defmacro throw-illegal [& args]
- `(throw* IllegalArgumentException ~@args))
-
-(defn benchmark [iters afn]
- (time
- (dotimes [_ iters]
- (afn))))
-
-(deftype ExecutorFunctions [type select-executor transform-executor])
-
-(def StructureValsPathExecutor
- (->ExecutorFunctions
- :svalspath
- (fn [selector structure]
- (selector [] structure
- (fn [vals structure]
- (if-not (empty? vals) [(conj vals structure)] [structure]))))
- (fn [transformer transform-fn structure]
- (transformer [] structure
- (fn [vals structure]
- (if (empty? vals)
- (transform-fn structure)
- (apply transform-fn (conj vals structure))))))
- ))
-
-(def StructurePathExecutor
- (->ExecutorFunctions
- :spath
- (fn [selector structure]
- (selector structure (fn [structure] [structure])))
- (fn [transformer transform-fn structure]
- (transformer structure transform-fn))
- ))
-
-(deftype TransformFunctions [executors selector transformer])
-
-
-(defprotocol CoerceTransformFunctions
- (coerce-path [this]))
-
-(defn no-prot-error-str [obj]
- (str "Protocol implementation cannot be found for object.
- Extending Specter protocols should not be done inline in a deftype definition
- because that prevents Specter from finding the protocol implementations for
- optimized performance. Instead, you should extend the protocols via an
- explicit extend-protocol call. \n" obj))
-
-(defn find-protocol-impl! [prot obj]
- (let [ret (find-protocol-impl prot obj)]
- (if (= ret obj)
- (throw-illegal (no-prot-error-str obj))
- ret
- )))
-
-(defn coerce-structure-vals-path [this]
- (let [pimpl (find-protocol-impl! StructureValsPath this)
- selector (:select-full* pimpl)
- transformer (:transform-full* pimpl)]
- (->TransformFunctions
- StructureValsPathExecutor
- (fn [vals structure next-fn]
- (selector this vals structure next-fn))
- (fn [vals structure next-fn]
- (transformer this vals structure next-fn)))
- ))
-
-(defn coerce-collector [this]
- (let [cfn (->> this
- (find-protocol-impl! Collector)
- :collect-val
- )
- afn (fn [vals structure next-fn]
- (next-fn (conj vals (cfn this structure)) structure)
- )]
- (->TransformFunctions StructureValsPathExecutor afn afn)))
-
-
-(defn structure-path-impl [this]
- (if (fn? this)
- ;;TODO: this isn't kosher, it uses knowledge of internals of protocols
- (-> StructurePath :impls (get clojure.lang.AFn))
- (find-protocol-impl! StructurePath this)))
-
-(defn coerce-structure-path [this]
- (let [pimpl (structure-path-impl this)
- selector (:select* pimpl)
- transformer (:transform* pimpl)]
- (->TransformFunctions
- StructurePathExecutor
- (fn [structure next-fn]
- (selector this structure next-fn))
- (fn [structure next-fn]
- (transformer this structure next-fn))
- )))
-
-(defn coerce-structure-path-direct [this]
- (let [pimpl (structure-path-impl this)
- selector (:select* pimpl)
- transformer (:transform* pimpl)]
- (->TransformFunctions
- StructureValsPathExecutor
- (fn [vals structure next-fn]
- (selector this structure (fn [structure] (next-fn vals structure))))
- (fn [vals structure next-fn]
- (transformer this structure (fn [structure] (next-fn vals structure))))
- )))
-
-(defn obj-extends? [prot obj]
- (->> obj (find-protocol-impl prot) nil? not))
-
-(defn structure-path? [obj]
- (or (fn? obj) (obj-extends? StructurePath obj)))
-
-(extend-protocol CoerceTransformFunctions
- nil ; needs its own path because it doesn't count as an Object
- (coerce-path [this]
- (coerce-structure-path nil))
-
- TransformFunctions
- (coerce-path [this]
- this)
-
- java.util.List
- (coerce-path [this]
- (comp-paths* this))
-
- Object
- (coerce-path [this]
- (cond (structure-path? this) (coerce-structure-path this)
- (obj-extends? Collector this) (coerce-collector this)
- (obj-extends? StructureValsPath this) (coerce-structure-vals-path this)
- :else (throw-illegal (no-prot-error-str this))
- )))
-
-
-(defn extype [^TransformFunctions f]
- (let [^ExecutorFunctions exs (.executors f)]
- (.type exs)
- ))
-
-(defn- combine-same-types [[^TransformFunctions f & _ :as all]]
- (if (empty? all)
- (coerce-path nil)
- (let [^ExecutorFunctions exs (.executors f)
-
- t (.type exs)
-
- combiner
- (if (= t :svalspath)
- (fn [curr next]
- (fn [vals structure next-fn]
- (curr vals structure
- (fn [vals-next structure-next]
- (next vals-next structure-next next-fn)
- ))))
- (fn [curr next]
- (fn [structure next-fn]
- (curr structure (fn [structure] (next structure next-fn)))))
- )]
-
- (reduce (fn [^TransformFunctions curr ^TransformFunctions next]
- (->TransformFunctions
- exs
- (combiner (.selector curr) (.selector next))
- (combiner (.transformer curr) (.transformer next))
- ))
- all))))
-
-(defn coerce-structure-vals [^TransformFunctions tfns]
- (if (= (extype tfns) :svalspath)
- tfns
- (let [selector (.selector tfns)
- transformer (.transformer tfns)]
- (->TransformFunctions
- StructureValsPathExecutor
- (fn [vals structure next-fn]
- (selector structure (fn [structure] (next-fn vals structure))))
- (fn [vals structure next-fn]
- (transformer structure (fn [structure] (next-fn vals structure))))
- ))))
-
-(extend-protocol StructureValsPathComposer
- nil
- (comp-paths* [sp]
- (coerce-path sp))
- Object
- (comp-paths* [sp]
- (coerce-path sp))
- java.util.List
- (comp-paths* [structure-paths]
- (let [combined (->> structure-paths
- (map coerce-path)
- (partition-by extype)
- (map combine-same-types)
- )]
- (if (= 1 (count combined))
- (first combined)
- (->> combined
- (map coerce-structure-vals)
- combine-same-types)
- ))))
-
-(defn coerce-structure-vals-direct [this]
- (cond (structure-path? this) (coerce-structure-path-direct this)
- (obj-extends? Collector this) (coerce-collector this)
- (obj-extends? StructureValsPath this) (coerce-structure-vals-path this)
- (instance? TransformFunctions this) (coerce-structure-vals this)
- :else (throw-illegal (no-prot-error-str this))
- ))
-
-;;this composes paths together much faster than comp-paths* but the resulting composition
-;;won't execute as fast. Useful for when select/transform are used without pre-compiled paths
-;;(where cost of compiling dominates execution time)
-(defn comp-unoptimal [sp]
- (if (instance? java.util.List sp)
- (->> sp
- (map coerce-structure-vals-direct)
- combine-same-types)
- (coerce-path sp)))
-
-;; cell implementation idea taken from prismatic schema library
-(definterface PMutableCell
- (get_cell ^Object [])
- (set_cell [^Object x]))
-
-(deftype MutableCell [^:volatile-mutable ^Object q]
- PMutableCell
- (get_cell [this] q)
- (set_cell [this x] (set! q x)))
-
-(defn mutable-cell ^PMutableCell
- ([] (mutable-cell nil))
- ([init] (MutableCell. init)))
-
-(defn set-cell! [^PMutableCell cell val]
- (.set_cell cell val))
-
-(defn get-cell [^PMutableCell cell]
- (.get_cell cell))
-
-(defn update-cell! [cell afn]
- (let [ret (afn (get-cell cell))]
- (set-cell! cell ret)
- ret))
-
-(defn- append [coll elem]
- (-> coll vec (conj elem)))
-
-(defprotocol SetExtremes
- (set-first [s val])
- (set-last [s val]))
-
-(defn- set-first-list [l v]
- (cons v (rest l)))
-
-(defn- set-last-list [l v]
- (append (butlast l) v))
-
-(extend-protocol SetExtremes
- clojure.lang.PersistentVector
- (set-first [v val]
- (assoc v 0 val))
- (set-last [v val]
- (assoc v (-> v count dec) val))
- Object
- (set-first [l val]
- (set-first-list l val))
- (set-last [l val]
- (set-last-list l val)
- ))
-
-(defn- walk-until [pred on-match-fn structure]
- (if (pred structure)
- (on-match-fn structure)
- (walk/walk (partial walk-until pred on-match-fn) identity structure)
- ))
-
-(defn- fn-invocation? [f]
- (or (instance? clojure.lang.Cons f)
- (instance? clojure.lang.LazySeq f)
- (list? f)))
-
-(defn- codewalk-until [pred on-match-fn structure]
- (if (pred structure)
- (on-match-fn structure)
- (let [ret (walk/walk (partial codewalk-until pred on-match-fn) identity structure)]
- (if (and (fn-invocation? structure) (fn-invocation? ret))
- (with-meta ret (meta structure))
- ret
- ))))
-
-(defn- conj-all! [cell elems]
- (set-cell! cell (concat (get-cell cell) elems)))
-
-(defn compiled-select*
- [^com.rpl.specter.impl.TransformFunctions tfns structure]
- (let [^com.rpl.specter.impl.ExecutorFunctions ex (.executors tfns)]
- ((.select-executor ex) (.selector tfns) structure)
- ))
-
-(defn compiled-transform*
- [^com.rpl.specter.impl.TransformFunctions tfns transform-fn structure]
- (let [^com.rpl.specter.impl.ExecutorFunctions ex (.executors tfns)]
- ((.transform-executor ex) (.transformer tfns) transform-fn structure)
- ))
-
-(defn selected?*
- [compiled-path structure]
- (->> structure
- (compiled-select* compiled-path)
- empty?
- not))
-
-;; returns vector of all results
-(defn- walk-select [pred continue-fn structure]
- (let [ret (mutable-cell [])
- walker (fn this [structure]
- (if (pred structure)
- (conj-all! ret (continue-fn structure))
- (walk/walk this identity structure))
- )]
- (walker structure)
- (get-cell ret)
- ))
-
-(defn- filter+ancestry [path aseq]
- (let [aseq (vec aseq)]
- (reduce (fn [[s m :as orig] i]
- (let [e (get aseq i)
- pos (count s)]
- (if (selected?* path e)
- [(conj s e) (assoc m pos i)]
- orig
- )))
- [[] {}]
- (range (count aseq))
- )))
-
-(defn key-select [akey structure next-fn]
- (next-fn (get structure akey)))
-
-(defn key-transform [akey structure next-fn]
- (assoc structure akey (next-fn (get structure akey))
- ))
-
-(deftype AllStructurePath [])
-
-(extend-protocol StructurePath
- AllStructurePath
- (select* [this structure next-fn]
- (into [] (r/mapcat next-fn structure)))
- (transform* [this structure next-fn]
- (let [empty-structure (empty structure)]
- (if (list? empty-structure)
- ;; this is done to maintain order, otherwise lists get reversed
- (doall (map next-fn structure))
- (->> structure (r/map next-fn) (into empty-structure))
- ))))
-
-(deftype ValCollect [])
-
-(extend-protocol Collector
- ValCollect
- (collect-val [this structure]
- structure))
-
-(deftype LastStructurePath [])
-
-(extend-protocol StructurePath
- LastStructurePath
- (select* [this structure next-fn]
- (next-fn (last structure)))
- (transform* [this structure next-fn]
- (set-last structure (next-fn (last structure)))))
-
-(deftype FirstStructurePath [])
-
-(extend-protocol StructurePath
- FirstStructurePath
- (select* [this structure next-fn]
- (next-fn (first structure)))
- (transform* [this structure next-fn]
- (set-first structure (next-fn (first structure)))))
-
-(deftype WalkerStructurePath [afn])
-
-(extend-protocol StructurePath
- WalkerStructurePath
- (select* [^WalkerStructurePath this structure next-fn]
- (walk-select (.afn this) next-fn structure))
- (transform* [^WalkerStructurePath this structure next-fn]
- (walk-until (.afn this) next-fn structure)))
-
-(deftype CodeWalkerStructurePath [afn])
-
-(extend-protocol StructurePath
- CodeWalkerStructurePath
- (select* [^CodeWalkerStructurePath this structure next-fn]
- (walk-select (.afn this) next-fn structure))
- (transform* [^CodeWalkerStructurePath this structure next-fn]
- (codewalk-until (.afn this) next-fn structure)))
-
-
-(deftype FilterStructurePath [path])
-
-(extend-protocol StructurePath
- FilterStructurePath
- (select* [^FilterStructurePath this structure next-fn]
- (->> structure (filter #(selected?* (.path this) %)) doall next-fn))
- (transform* [^FilterStructurePath this structure next-fn]
- (let [[filtered ancestry] (filter+ancestry (.path this) structure)
- ;; the vec is necessary so that we can get by index later
- ;; (can't get by index for cons'd lists)
- next (vec (next-fn filtered))]
- (reduce (fn [curr [newi oldi]]
- (assoc curr oldi (get next newi)))
- (vec structure)
- ancestry))))
-
-(deftype KeyPath [akey])
-
-(extend-protocol StructurePath
- KeyPath
- (select* [^KeyPath this structure next-fn]
- (key-select (.akey this) structure next-fn))
- (transform* [^KeyPath this structure next-fn]
- (key-transform (.akey this) structure next-fn)
- ))
-
-(deftype SelectCollector [sel-fn selector])
-
-(extend-protocol Collector
- SelectCollector
- (collect-val [^SelectCollector this structure]
- ((.sel-fn this) (.selector this) structure)))
-
-(deftype SRangePath [start-fn end-fn])
-
-(extend-protocol StructurePath
- SRangePath
- (select* [^SRangePath this structure next-fn]
- (let [start ((.start-fn this) structure)
- end ((.end-fn this) structure)]
- (next-fn (-> structure vec (subvec start end)))
- ))
- (transform* [^SRangePath this structure next-fn]
- (let [start ((.start-fn this) structure)
- end ((.end-fn this) structure)
- structurev (vec structure)
- newpart (next-fn (-> structurev (subvec start end)))
- res (concat (subvec structurev 0 start)
- newpart
- (subvec structurev end (count structure)))]
- (if (vector? structure)
- (vec res)
- res
- ))))
-
-(deftype ViewPath [view-fn])
-
-(extend-protocol StructurePath
- ViewPath
- (select* [^ViewPath this structure next-fn]
- (->> structure ((.view-fn this)) next-fn))
- (transform* [^ViewPath this structure next-fn]
- (->> structure ((.view-fn this)) next-fn)
- ))
-
-(deftype PutValCollector [val])
-
-(extend-protocol Collector
- PutValCollector
- (collect-val [^PutValCollector this structure]
- (.val this)
- ))
-
-
-(extend-protocol StructurePath
- nil
- (select* [this structure next-fn]
- (next-fn structure))
- (transform* [this structure next-fn]
- (next-fn structure)
- ))
-
-
-(deftype ConditionalPath [cond-pairs])
-
-(defn- retrieve-selector [cond-pairs structure]
- (->> cond-pairs
- (drop-while (fn [[c-selector _]]
- (->> structure
- (compiled-select* c-selector)
- empty?)))
- first
- second
- ))
-
-;;TODO: test nothing matches case
-(extend-protocol StructurePath
- ConditionalPath
- (select* [this structure next-fn]
- (if-let [selector (retrieve-selector (.cond-pairs this) structure)]
- (->> (compiled-select* selector structure)
- (mapcat next-fn)
- doall)))
- (transform* [this structure next-fn]
- (if-let [selector (retrieve-selector (.cond-pairs this) structure)]
- (compiled-transform* selector next-fn structure)
- structure
- )))
-
diff --git a/src/clj/com/rpl/specter/protocols.clj b/src/clj/com/rpl/specter/protocols.clj
deleted file mode 100644
index a87cc8a..0000000
--- a/src/clj/com/rpl/specter/protocols.clj
+++ /dev/null
@@ -1,15 +0,0 @@
-(ns com.rpl.specter.protocols)
-
-(defprotocol StructureValsPath
- (select-full* [this vals structure next-fn])
- (transform-full* [this vals structure next-fn]))
-
-(defprotocol StructurePath
- (select* [this structure next-fn])
- (transform* [this structure next-fn]))
-
-(defprotocol Collector
- (collect-val [this structure]))
-
-(defprotocol StructureValsPathComposer
- (comp-paths* [paths]))
diff --git a/test/clj/com/rpl/specter/core_test.clj b/test/clj/com/rpl/specter/core_test.clj
index 5e94f01..0fc9f54 100644
--- a/test/clj/com/rpl/specter/core_test.clj
+++ b/test/clj/com/rpl/specter/core_test.clj
@@ -185,7 +185,7 @@
(for-all+
[v (gen/vector gen/int)
v2 (gen/vector gen/int)]
- (let [b (setval START v2 v)
+ (let [b (setval BEGINNING v2 v)
e (setval END v2 v)]
(and (= b (concat v2 v))
(= e (concat v v2)))
@@ -217,7 +217,6 @@
[i gen/int
afn (gen/elements [inc dec])]
(= (first (select (view afn) i))
- (first (select (viewfn [i] (afn i)) i))
(afn i)
(transform (view afn) identity i)
)))
Reference in a new issue View git blame Copy permalink