make sure Java files respect Reduced

halgari · stuarthalloway · commit 3e4bf71f455a · 2014-10-07T13:10:04.000-04:00
deref reduced vals

Signed-off-by: Stuart Halloway &lt;stu@cognitect.com&gt;
diff --git a/src/jvm/clojure/lang/APersistentVector.java b/src/jvm/clojure/lang/APersistentVector.java
@@ -469,15 +469,19 @@ public APersistentVector.Seq withMeta(IPersistentMap meta){
 
 	public Object reduce(IFn f) {
 		Object ret = v.nth(i);
-		for(int x = i + 1; x < v.count(); x++)
-			ret = f.invoke(ret, v.nth(x));
+		for(int x = i + 1; x < v.count(); x++) {
+            ret = f.invoke(ret, v.nth(x));
+            if (RT.isReduced(ret)) return ((IDeref)ret).deref();
+        }
 		return ret;
 	}
 
 	public Object reduce(IFn f, Object start) {
 		Object ret = f.invoke(start, v.nth(i));
-		for(int x = i + 1; x < v.count(); x++)
-			ret = f.invoke(ret, v.nth(x));
+		for(int x = i + 1; x < v.count(); x++) {
+            if (RT.isReduced(ret)) return ((IDeref)ret).deref();
+            ret = f.invoke(ret, v.nth(x));
+        }
 		return ret;
 	}
     }
diff --git a/src/jvm/clojure/lang/PersistentList.java b/src/jvm/clojure/lang/PersistentList.java
@@ -113,15 +113,19 @@ public PersistentList withMeta(IPersistentMap meta){
 
 public Object reduce(IFn f) {
 	Object ret = first();
-	for(ISeq s = next(); s != null; s = s.next())
-		ret = f.invoke(ret, s.first());
+	for(ISeq s = next(); s != null; s = s.next()) {
+        ret = f.invoke(ret, s.first());
+        if (RT.isReduced(ret)) return ((IDeref)ret).deref();;
+    }
 	return ret;
 }
 
 public Object reduce(IFn f, Object start) {
 	Object ret = f.invoke(start, first());
-	for(ISeq s = next(); s != null; s = s.next())
-		ret = f.invoke(ret, s.first());
+	for(ISeq s = next(); s != null; s = s.next()) {
+        if (RT.isReduced(ret)) return ((IDeref)ret).deref();
+        ret = f.invoke(ret, s.first());
+    }
 	return ret;
 }
 
