diff options
author | Rich Hickey <richhickey@gmail.com> | 2008-04-02 12:55:34 +0000 |
---|---|---|
committer | Rich Hickey <richhickey@gmail.com> | 2008-04-02 12:55:34 +0000 |
commit | 5cafae0d97585d06fc2508baa524c0e82ab2179c (patch) | |
tree | 02ff464e44849601efe203138729662f88d098f3 /src/jvm/clojure | |
parent | cf71a664aa513b3e4b232b0d3cccf1b3e2b88c4f (diff) |
fixed internal reduce
Diffstat (limited to 'src/jvm/clojure')
-rw-r--r-- | src/jvm/clojure/lang/APersistentVector.java | 4 | ||||
-rw-r--r-- | src/jvm/clojure/lang/ArraySeq.java | 4 | ||||
-rw-r--r-- | src/jvm/clojure/lang/Numbers.java | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/jvm/clojure/lang/APersistentVector.java b/src/jvm/clojure/lang/APersistentVector.java index e6da23b9..28bc856e 100644 --- a/src/jvm/clojure/lang/APersistentVector.java +++ b/src/jvm/clojure/lang/APersistentVector.java @@ -272,14 +272,14 @@ static class Seq extends ASeq implements IndexedSeq{ public Object reduce(IFn f) throws Exception{ Object ret = v.nth(i); for(int x = i + 1; x < v.count(); x++) - ret = f.invoke(ret, x); + ret = f.invoke(ret, v.nth(x)); return ret; } public Object reduce(IFn f, Object start) throws Exception{ Object ret = f.invoke(start, v.nth(i)); for(int x = i + 1; x < v.count(); x++) - ret = f.invoke(ret, x); + ret = f.invoke(ret, v.nth(x)); return ret; } } diff --git a/src/jvm/clojure/lang/ArraySeq.java b/src/jvm/clojure/lang/ArraySeq.java index 9c19127d..ec89eb45 100644 --- a/src/jvm/clojure/lang/ArraySeq.java +++ b/src/jvm/clojure/lang/ArraySeq.java @@ -71,14 +71,14 @@ public ArraySeq withMeta(IPersistentMap meta){ public Object reduce(IFn f) throws Exception{ Object ret = array[i]; for(int x = i+1;x < array.length;x++) - ret = f.invoke(ret, x); + ret = f.invoke(ret, array[x]); return ret; } public Object reduce(IFn f, Object start) throws Exception{ Object ret = f.invoke(start,array[i]); for(int x = i+1;x < array.length;x++) - ret = f.invoke(ret, x); + ret = f.invoke(ret, array[x]); return ret; } } diff --git a/src/jvm/clojure/lang/Numbers.java b/src/jvm/clojure/lang/Numbers.java index b8bf2f1a..6cc12ad2 100644 --- a/src/jvm/clojure/lang/Numbers.java +++ b/src/jvm/clojure/lang/Numbers.java @@ -190,7 +190,7 @@ static Ops bigintOps = new Ops(){ } }; -/* +//* static Ops ops(Object x, Object y){ Class xc = x.getClass(); Class yc = y.getClass(); |