diff options
| author | Rich Hickey <richhickey@gmail.com> | 2007-09-05 15:56:49 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2007-09-05 15:56:49 +0000 |
| commit | fc05db1783036d621215de9c297500c2d349b33e (patch) | |
| tree | be0afc407c68185c0aa9b0a673c81aa81be61192 /src | |
| parent | 5c6f9df565814bf01b1886639ee10dd6c296f08c (diff) | |
made Delay an IFn
Diffstat (limited to 'src')
| -rw-r--r-- | src/jvm/clojure/lang/Delay.java | 4 | ||||
| -rw-r--r-- | src/jvm/clojure/lang/FnSeq.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jvm/clojure/lang/Delay.java b/src/jvm/clojure/lang/Delay.java index 474e0c9a..3698417b 100644 --- a/src/jvm/clojure/lang/Delay.java +++ b/src/jvm/clojure/lang/Delay.java @@ -12,7 +12,7 @@ package clojure.lang; -public class Delay{ +public class Delay extends AFn{ public volatile Object val; IFn fn; @@ -22,7 +22,7 @@ public Delay(IFn fn){ this.val = this; } -public Object force() throws Exception{ +public Object invoke() throws Exception{ if(val == this) { synchronized(this) diff --git a/src/jvm/clojure/lang/FnSeq.java b/src/jvm/clojure/lang/FnSeq.java index e38cc01f..48211217 100644 --- a/src/jvm/clojure/lang/FnSeq.java +++ b/src/jvm/clojure/lang/FnSeq.java @@ -33,7 +33,7 @@ public Object first(){ public ISeq rest(){
try
{
- return (ISeq) _rest.force();
+ return (ISeq) _rest.invoke();
}
catch(Exception e)
{
|