commit ff46da2b58c971a5773bc3a8c9fbdd598efaf22d Author: Aaron Craelius Date: Thu Jul 10 15:57:02 2014 -0400 First commit. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..18bd849 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +/target +/classes +/checkouts +pom.xml +pom.xml.asc +*.jar +*.class +/.lein-* +/.nrepl-port +\#*\# +*~ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..786edf6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,214 @@ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and +documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from +a Contributor if it was added to the Program by such Contributor itself or +anyone acting on such Contributor's behalf. Contributions do not include +additions to the Program which: (i) are separate modules of software +distributed in conjunction with the Program under their own license +agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of the +Contribution and the Program if, at the time the Contribution is added by the +Contributor, such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to any +other combinations which include the Contribution. No hardware per se is +licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses +to its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility +to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered +by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within +the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if any, in a manner that reasonably allows subsequent Recipients to identify +the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a +manner which does not create potential liability for other Contributors. +Therefore, if a Contributor includes the Program in a commercial product +offering, such Contributor ("Commercial Contributor") hereby agrees to defend +and indemnify every other Contributor ("Indemnified Contributor") against any +losses, damages and costs (collectively "Losses") arising from claims, +lawsuits and other legal actions brought by a third party against the +Indemnified Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program in +a commercial product offering. The obligations in this section do not apply +to any claims or Losses relating to any actual or alleged intellectual +property infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor tocontrol, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim +at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON +AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER +EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR +CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A +PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all risks +associated with its exercise of rights under this Agreement , including but +not limited to the risks and costs of program errors, compliance with +applicable laws, damage to or loss of data, programs or equipment, and +unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and +does not cure such failure in a reasonable period of time after becoming +aware of such noncompliance. If all Recipient's rights under this Agreement +terminate, Recipient agrees to cease use and distribution of the Program as +soon as reasonably practicable. However, Recipient's obligations under this +Agreement and any licenses granted by Recipient relating to the Program shall +continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this +Agreement, whether expressly, by implication, estoppel or otherwise. All +rights in the Program not expressly granted under this Agreement are +reserved. + +This Agreement is governed by the laws of the State of Washington and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. diff --git a/README.md b/README.md new file mode 100644 index 0000000..806d24d --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +# freactive + +A Clojure library designed to ... well, that part is up to you. + +## Usage + +FIXME + +## License + +Copyright © 2014 FIXME + +Distributed under the Eclipse Public License either version 1.0 or (at +your option) any later version. diff --git a/project.clj b/project.clj new file mode 100644 index 0000000..bafad51 --- /dev/null +++ b/project.clj @@ -0,0 +1,8 @@ +(defproject freactive "0.1.0-SNAPSHOT" + :description "FIXME: write description" + :url "http://example.com/FIXME" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[org.clojure/clojure "1.6.0"]] + :source-paths ["src/clojure"] + :java-source-paths ["src/java"]) diff --git a/src/clojure/freactive/core.clj b/src/clojure/freactive/core.clj new file mode 100644 index 0000000..03942a0 --- /dev/null +++ b/src/clojure/freactive/core.clj @@ -0,0 +1,167 @@ +(ns freactive.core + (:refer-clojure + :exclude [atom agent ref swap! reset! compare-and-set!]) + (:import [clojure.lang.ReactiveAtom]) + (:require + [clojure.set] + [clojure.data])) + +;; Copying clojure.core atom stuff here so that we can use my ReactiveAtom class. + +(defn atom + "Creates and returns an Atom with an initial value of x and zero or +more options (in any order): + +:meta metadata-map + +:validator validate-fn + +If metadata-map is supplied, it will become the metadata on the +atom. validate-fn must be nil or a side-effect-free fn of one +argument, which will be passed the intended new state on any state +change. If the new state is unacceptable, the validate-fn should +return false or throw an exception." + {:added "1.0" + :static true} + ([x] (new clojure.lang.ReactiveAtom x)) + ([x & options] (#'clojure.core/setup-reference (atom x) options))) + +(defn swap! + "Atomically swaps the value of atom to be: +(apply f current-value-of-atom args). Note that f may be called +multiple times, and thus should be free of side effects. Returns +the value that was swapped in." + {:added "1.0" + :static true} + ([^clojure.lang.ReactiveAtom atom f] (.swap atom f)) + ([^clojure.lang.ReactiveAtom atom f x] (.swap atom f x)) + ([^clojure.lang.ReactiveAtom atom f x y] (.swap atom f x y)) + ([^clojure.lang.ReactiveAtom atom f x y & args] (.swap atom f x y args))) + +(defn compare-and-set! + "Atomically sets the value of atom to newval if and only if the +current value of the atom is identical to oldval. Returns true if +set happened, else false" + {:added "1.0" + :static true} + [^clojure.lang.ReactiveAtom atom oldval newval] (.compareAndSet atom oldval newval)) + +(defn reset! + "Sets the value of atom to newval without regard for the +current value. Returns newval." + {:added "1.0" + :static true} + [^clojure.lang.ReactiveAtom atom newval] (.reset atom newval)) + +(def ^:dynamic *deps* nil) +(def ^:dynamic *register-dep* (constantly nil)) + +;; (defrecord Reactive [dirty value f deps sully-fn] +;; clojure.lang.IDeref +;; (deref [this] +;; (*register-dep* this) +;; (if-not @dirty +;; @value +;; (let [simple (:simple (meta f))] +;; (if (and simple @deps) +;; (binding [*register-dep* (constantly nil)] +;; (clojure.core/reset! value (f)) +;; (clojure.core/reset! dirty false) +;; @value) +;; (binding [*deps* #{} +;; *register-dep* (fn [x] (set! *deps* (conj *deps* x)))] +;; (clojure.core/reset! value (f)) +;; (clojure.core/reset! dirty false) +;; (let [removed (clojure.set/difference @deps *deps*) +;; added (clojure.set/difference *deps* @deps)] +;; (doseq [r removed] +;; (remove-watch r sully-fn)) +;; (doseq [a added] +;; (add-watch a sully-fn sully-fn)) +;; (clojure.core/reset! deps *deps*)) +;; @value)))))) + +(defrecord ReactiveState [dirty value f deps sully-fn]) + +(defprotocol IReactive + (recompute! [this]) + (rebind! [this f])) + +(defrecord Reactive [data] + IReactive + (recompute! [this] (swap! data assoc :dirty true)) + (rebind! [this f] (swap! data merge {:dirty true :f f :deps nil})) + clojure.lang.IDeref + (deref [this] + (*register-dep* this) + (let [^ReactiveState {:keys [dirty value]} @data] + (if-not dirty + value + (:value + (clojure.core/swap! + data + (fn recompute-fn [^ReactiveState {:keys [dirty value f deps sully-fn] :as state}] + (if-not dirty + state + (let [simple (:simple (meta f))] + (if (and simple deps) + (binding [*register-dep* (constantly nil)] + (merge state {:value (f) :dirty false})) + (binding [*deps* #{} + *register-dep* (fn [x] (set! *deps* (conj *deps* x)))] + (let [new-value (f)] + (let [removed (clojure.set/difference deps *deps*) + added (clojure.set/difference *deps* deps)] + (doseq [r removed] + (remove-watch r sully-fn)) + (doseq [a added] + (add-watch a sully-fn sully-fn)) + (merge state {:value new-value :dirty false :deps *deps*})))))))))))))) + +(defmethod print-method Reactive [o ^java.io.Writer w] + (#'clojure.core/print-sequential (format "#<%s@%x%s: " + (.getSimpleName (class o)) + (System/identityHashCode o) + "") + #'clojure.core/pr-on, "", ">", (list @o), w)) + +;; (defn reactive [f] +;; (let [dirty (clojure.core/atom true)] +;; (Reactive. dirty (clojure.core/atom nil) f (clojure.core/atom nil) (fn [& _] (clojure.core/reset! dirty true))))) + +(defn reactive [f] + (let [data (clojure.core/atom nil)] + (clojure.core/reset! + data + (ReactiveState. true nil f nil + (fn sully-fn [& _] + (clojure.core/swap! + data + (fn do-sully [^ReactiveState state] (assoc state :dirty true)))))) + (Reactive. data))) + +(defn simple [f] (with-meta f (merge (meta f) {:simple true}))) + +(defn test1 [] + (let [prev (apply hash-set (repeatedly 3 #(rand-int 7))) + cur (apply hash-set (repeatedly 3 #(rand-int 7)))] + (clojure.data/diff prev cur))) + +(defn test2 [] + (let [prev (apply hash-set (repeatedly 3 #(rand-int 7))) + cur (apply hash-set (repeatedly 3 #(rand-int 7)))] + (clojure.set/difference prev cur) + (clojure.set/difference cur prev))) + + +(defn test3 [] + (let [a (atom 0) + b (atom 0) + c (reactive (fn [] (+ @a @b)))] + (time + (dotimes [i 100000] + (swap! a inc) + (swap! b inc) + @c)))) + +(test3) diff --git a/src/java/clojure/lang/ReactiveAtom.java b/src/java/clojure/lang/ReactiveAtom.java new file mode 100644 index 0000000..e96098c --- /dev/null +++ b/src/java/clojure/lang/ReactiveAtom.java @@ -0,0 +1,113 @@ +/** + * Copyright (c) Rich Hickey. All rights reserved. + * The use and distribution terms for this software are covered by the + * Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) + * which can be found in the file epl-v10.html at the root of this distribution. + * By using this software in any fashion, you are agreeing to be bound by + * the terms of this license. + * You must not remove this notice, or any other, from this software. + **/ + +/* rich Jan 1, 2009 */ + +/* modified from clojure.lang.Java on Jul 10, 2014 by aaronc + I implemented this in clojure.lang because it is hard to + subclass ARef because validate has package protection +*/ + +package clojure.lang; + +import java.util.concurrent.atomic.AtomicReference; + +final public class ReactiveAtom extends ARef{ + +final AtomicReference state; + +final static Var registerDep = Var.intern(Namespace.findOrCreate(Symbol.intern("freactive.core")), Symbol.intern("*register-dep*"), null, false).setDynamic(); + +public ReactiveAtom(Object state){ + this.state = new AtomicReference(state); +} + +public ReactiveAtom(Object state, IPersistentMap meta){ + super(meta); + this.state = new AtomicReference(state); +} + +public Object deref(){ + registerDep.invoke(this); + return state.get(); +} + +public Object swap(IFn f) { + for(; ;) + { + Object v = deref(); + Object newv = f.invoke(v); + validate(newv); + if(state.compareAndSet(v, newv)) + { + notifyWatches(v, newv); + return newv; + } + } +} + +public Object swap(IFn f, Object arg) { + for(; ;) + { + Object v = deref(); + Object newv = f.invoke(v, arg); + validate(newv); + if(state.compareAndSet(v, newv)) + { + notifyWatches(v, newv); + return newv; + } + } +} + +public Object swap(IFn f, Object arg1, Object arg2) { + for(; ;) + { + Object v = deref(); + Object newv = f.invoke(v, arg1, arg2); + validate(newv); + if(state.compareAndSet(v, newv)) + { + notifyWatches(v, newv); + return newv; + } + } +} + +public Object swap(IFn f, Object x, Object y, ISeq args) { + for(; ;) + { + Object v = deref(); + Object newv = f.applyTo(RT.listStar(v, x, y, args)); + validate(newv); + if(state.compareAndSet(v, newv)) + { + notifyWatches(v, newv); + return newv; + } + } +} + +public boolean compareAndSet(Object oldv, Object newv){ + validate(newv); + boolean ret = state.compareAndSet(oldv, newv); + if(ret) + notifyWatches(oldv, newv); + return ret; +} + +public Object reset(Object newval){ + Object oldval = state.get(); + validate(newval); + state.set(newval); + notifyWatches(oldval, newval); + return newval; +} +} diff --git a/test/freactive/core_test.clj b/test/freactive/core_test.clj new file mode 100644 index 0000000..3f4ccc6 --- /dev/null +++ b/test/freactive/core_test.clj @@ -0,0 +1,7 @@ +(ns freactive.core-test + (:require [clojure.test :refer :all] + [freactive.core :refer :all])) + +(deftest a-test + (testing "FIXME, I fail." + (is (= 0 1))))