diff options
| author | Rich Hickey <richhickey@gmail.com> | 2007-12-03 19:01:23 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2007-12-03 19:01:23 +0000 |
| commit | dacf426c70b836581ab6a505e6ae45355582122f (patch) | |
| tree | 2c093f339884ed6295dd2a79de7078da600dcbdb /src | |
| parent | b84042c0bc9901954864335dd1bee007e8bcdcc1 (diff) | |
interim checkin
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot.clj | 2 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/Agent.java | 2 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/IRef.java (renamed from src/jvm/clojure/lang/Ref.java) | 2 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/TRef.java | 2 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/Var.java | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/boot.clj b/src/boot.clj index 8c6a529a..01be8e60 100644 --- a/src/boot.clj +++ b/src/boot.clj @@ -368,7 +368,7 @@ (defn tref [x] (new clojure.lang.TRef x)) -(defn deref [#^clojure.lang.Ref ref] +(defn deref [#^clojure.lang.IRef ref] (. ref (get))) (defn commute [#^clojure.lang.TRef ref fun & args] diff --git a/src/jvm/clojure/lang/Agent.java b/src/jvm/clojure/lang/Agent.java index f886de62..bbabb701 100644 --- a/src/jvm/clojure/lang/Agent.java +++ b/src/jvm/clojure/lang/Agent.java @@ -17,7 +17,7 @@ import java.util.LinkedList; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -public class Agent implements Ref{ +public class Agent implements IRef{ volatile Object state; final Queue q = new LinkedList(); boolean busy = false; diff --git a/src/jvm/clojure/lang/Ref.java b/src/jvm/clojure/lang/IRef.java index 55397a0a..efb1d0b7 100644 --- a/src/jvm/clojure/lang/Ref.java +++ b/src/jvm/clojure/lang/IRef.java @@ -12,7 +12,7 @@ package clojure.lang; -public interface Ref{ +public interface IRef{ Object get() throws Exception; diff --git a/src/jvm/clojure/lang/TRef.java b/src/jvm/clojure/lang/TRef.java index 9619fd78..af1d0b1d 100644 --- a/src/jvm/clojure/lang/TRef.java +++ b/src/jvm/clojure/lang/TRef.java @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.UUID; -public class TRef implements IFn, Comparable<TRef>, Ref{ +public class TRef implements IFn, Comparable<TRef>, IRef{ public int compareTo(TRef o){ return uuid.compareTo(o.uuid); diff --git a/src/jvm/clojure/lang/Var.java b/src/jvm/clojure/lang/Var.java index feb2fd95..0e0c5615 100644 --- a/src/jvm/clojure/lang/Var.java +++ b/src/jvm/clojure/lang/Var.java @@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -public final class Var implements IFn, Ref{ +public final class Var implements IFn, IRef{ static class Frame{ //Var->Box |