clojure
diff --git a/‎src/jvm/clojure/lang/APersistentVector.java‎
Lines changed: 17 additions & 10 deletions b/‎src/jvm/clojure/lang/APersistentVector.java‎
Lines changed: 17 additions & 10 deletions
diff --git a/‎src/jvm/clojure/lang/ASeq.java‎
Lines changed: 10 additions & 9 deletions b/‎src/jvm/clojure/lang/ASeq.java‎
Lines changed: 10 additions & 9 deletions
@@ -405,18 +405,25 @@ else if(count() > v.count())
 	return 0;
 }
 
-public IStream stream() throws Exception {
-    final AtomicInteger ai = new AtomicInteger(0);
-    return new IStream(){
-        public Object next() throws Exception {
-            int i = ai.getAndIncrement();
-            if(i < count())
-                return nth(i);
-            return RT.eos();
-        }
-    };
+public Stream stream() throws Exception {
+    return new Stream(new Src(this));
 }
 
+    static class Src extends AFn{
+        final IPersistentVector v;
+        int i = 0;
+
+        Src(IPersistentVector v) {
+            this.v = v;
+        }
+
+        public Object invoke() throws Exception {
+            if (i < v.count())
+                return v.nth(i++);
+            return RT.EOS;
+        }
+    }
+
     static class Seq extends ASeq implements IndexedSeq, IReduce{
 	//todo - something more efficient
 	final IPersistentVector v;
 
@@ -204,25 +204,26 @@ public Iterator iterator(){
 
 
 
-public IStream stream() throws Exception {
-    return new Stream(this);
+public Stream stream() throws Exception {
+    return new Stream(new Src(this));
 }
 
-    static class Stream implements IStream{
+static class Src extends AFn{
     ISeq s;
 
-    public Stream(ISeq s) {
+    public Src(ISeq s) {
         this.s = s;
     }
 
-    synchronized public Object next() throws Exception {
-        if(s != null)
+	public Object invoke() throws Exception {
+		ISeq sq = RT.seq(s);
+        if(sq != null)
             {
-            Object ret = s.first();
-            s = s.next();
+            Object ret = sq.first();
+            s = sq.more();
             return ret;
             }
-        return RT.eos();
+        return RT.EOS;
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -204,25 +204,26 @@ public Iterator iterator(){`
`204`	`204`
`205`	`205`
`206`	`206`
`207`		`-public IStream stream() throws Exception {`
`208`		`- return new Stream(this);`
	`207`	`+public Stream stream() throws Exception {`
	`208`	`+ return new Stream(new Src(this));`
`209`	`209`	`}`
`210`	`210`
`211`		`- static class Stream implements IStream{`
	`211`	`+static class Src extends AFn{`
`212`	`212`	`ISeq s;`
`213`	`213`
`214`		`- public Stream(ISeq s) {`
	`214`	`+ public Src(ISeq s) {`
`215`	`215`	`this.s = s;`
`216`	`216`	`}`
`217`	`217`
`218`		`- synchronized public Object next() throws Exception {`
`219`		`- if(s != null)`
	`218`	`+ public Object invoke() throws Exception {`
	`219`	`+ ISeq sq = RT.seq(s);`
	`220`	`+ if(sq != null)`
`220`	`221`	`{`
`221`		`- Object ret = s.first();`
`222`		`- s = s.next();`
	`222`	`+ Object ret = sq.first();`
	`223`	`+ s = sq.more();`
`223`	`224`	`return ret;`
`224`	`225`	`}`
`225`		`- return RT.eos();`
	`226`	`+ return RT.EOS;`
`226`	`227`	`}`
`227`	`228`	`}`
`228`	`229`