summaryrefslogtreecommitdiff
path: root/src/jvm
diff options
context:
space:
mode:
Diffstat (limited to 'src/jvm')
-rw-r--r--src/jvm/clojure/lang/ASeq.java34
-rw-r--r--src/jvm/clojure/lang/ArraySeq.java2
-rw-r--r--src/jvm/clojure/lang/Cons.java2
-rw-r--r--src/jvm/clojure/lang/FnSeq.java12
-rw-r--r--src/jvm/clojure/lang/IPersistentCollection.java2
-rw-r--r--src/jvm/clojure/lang/IPersistentList.java20
-rw-r--r--src/jvm/clojure/lang/ISeq.java6
-rw-r--r--src/jvm/clojure/lang/IteratorSeq.java2
-rw-r--r--src/jvm/clojure/lang/MapEntry.java4
-rw-r--r--src/jvm/clojure/lang/PersistentArray.java2
-rw-r--r--src/jvm/clojure/lang/PersistentArrayMap.java2
-rw-r--r--src/jvm/clojure/lang/PersistentHashtableMap.java12
-rw-r--r--src/jvm/clojure/lang/PersistentListMap.java8
-rw-r--r--src/jvm/clojure/lang/PersistentTreeMap.java12
-rw-r--r--src/jvm/clojure/lang/RT.java10
15 files changed, 99 insertions, 31 deletions
diff --git a/src/jvm/clojure/lang/ASeq.java b/src/jvm/clojure/lang/ASeq.java
new file mode 100644
index 00000000..272b6e5e
--- /dev/null
+++ b/src/jvm/clojure/lang/ASeq.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Rich Hickey. All rights reserved.
+ * The use and distribution terms for this software are covered by the
+ * Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ * which can be found in the file CPL.TXT at the root of this distribution.
+ * By using this software in any fashion, you are agreeing to be bound by
+ * the terms of this license.
+ * You must not remove this notice, or any other, from this software.
+ **/
+
+package clojure.lang;
+
+public abstract class ASeq implements ISeq{
+
+public Object peek() {
+ return first();
+}
+
+public IPersistentList pop() {
+ return rest();
+}
+
+public int count() {
+ return 1 + RT.count(rest());
+}
+
+public ISeq seq() {
+ return this;
+}
+
+public IPersistentCollection cons(Object o) {
+ return new Cons(o, this);
+}
+}
diff --git a/src/jvm/clojure/lang/ArraySeq.java b/src/jvm/clojure/lang/ArraySeq.java
index 24783727..191e5f80 100644
--- a/src/jvm/clojure/lang/ArraySeq.java
+++ b/src/jvm/clojure/lang/ArraySeq.java
@@ -12,7 +12,7 @@
package clojure.lang;
-public class ArraySeq implements IndexedSeq{
+public class ArraySeq extends ASeq implements IndexedSeq{
final Object[] array;
final int i;
ISeq _rest;
diff --git a/src/jvm/clojure/lang/Cons.java b/src/jvm/clojure/lang/Cons.java
index a69b4bcf..65cae175 100644
--- a/src/jvm/clojure/lang/Cons.java
+++ b/src/jvm/clojure/lang/Cons.java
@@ -12,7 +12,7 @@
package clojure.lang;
-public class Cons implements ISeq {
+public class Cons extends ASeq {
private final Object _first;
private final ISeq _rest;
diff --git a/src/jvm/clojure/lang/FnSeq.java b/src/jvm/clojure/lang/FnSeq.java
index 6f59a437..476145c0 100644
--- a/src/jvm/clojure/lang/FnSeq.java
+++ b/src/jvm/clojure/lang/FnSeq.java
@@ -10,7 +10,7 @@
package clojure.lang;
-public class FnSeq implements ISeq{
+public class FnSeq extends ASeq{
Object _first;
IFn restFn;
@@ -26,13 +26,19 @@ public Object first() {
return _first;
}
-public ISeq rest() throws Exception {
+public ISeq rest() {
if(_rest != this)
return _rest;
synchronized(this){
if(_rest == this)
{
- _rest = (ISeq) restFn.invoke();
+ try{
+ _rest = (ISeq) restFn.invoke();
+ }
+ catch(Exception ex)
+ {
+ throw new Error(ex.toString());
+ }
restFn = null;
}
return _rest;
diff --git a/src/jvm/clojure/lang/IPersistentCollection.java b/src/jvm/clojure/lang/IPersistentCollection.java
index cd4593df..77e32738 100644
--- a/src/jvm/clojure/lang/IPersistentCollection.java
+++ b/src/jvm/clojure/lang/IPersistentCollection.java
@@ -15,7 +15,7 @@ public interface IPersistentCollection {
int count();
-ISeq seq() throws Exception;
+ISeq seq();
IPersistentCollection cons(Object o);
}
diff --git a/src/jvm/clojure/lang/IPersistentList.java b/src/jvm/clojure/lang/IPersistentList.java
new file mode 100644
index 00000000..5a54485e
--- /dev/null
+++ b/src/jvm/clojure/lang/IPersistentList.java
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Rich Hickey. All rights reserved.
+ * The use and distribution terms for this software are covered by the
+ * Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ * which can be found in the file CPL.TXT at the root of this distribution.
+ * By using this software in any fashion, you are agreeing to be bound by
+ * the terms of this license.
+ * You must not remove this notice, or any other, from this software.
+ */
+
+package clojure.lang;
+
+
+public interface IPersistentList extends IPersistentCollection, Sequential {
+
+ Object peek();
+
+ IPersistentList pop();
+
+}
diff --git a/src/jvm/clojure/lang/ISeq.java b/src/jvm/clojure/lang/ISeq.java
index 30b561eb..ff6e325f 100644
--- a/src/jvm/clojure/lang/ISeq.java
+++ b/src/jvm/clojure/lang/ISeq.java
@@ -16,9 +16,9 @@ package clojure.lang;
* ISeqs are immutable values, i.e. neither first(), nor rest() changes
* or invalidates the ISeq
*/
-public interface ISeq {
+public interface ISeq extends IPersistentList{
-Object first() throws Exception;
+Object first() ;
-ISeq rest() throws Exception;
+ISeq rest() ;
}
diff --git a/src/jvm/clojure/lang/IteratorSeq.java b/src/jvm/clojure/lang/IteratorSeq.java
index e7147f03..dc266279 100644
--- a/src/jvm/clojure/lang/IteratorSeq.java
+++ b/src/jvm/clojure/lang/IteratorSeq.java
@@ -12,7 +12,7 @@ package clojure.lang;
import java.util.Iterator;
-public class IteratorSeq implements ISeq{
+public class IteratorSeq extends ASeq{
Iterator iter;
volatile Object val;
volatile ISeq _rest;
diff --git a/src/jvm/clojure/lang/MapEntry.java b/src/jvm/clojure/lang/MapEntry.java
index 55aaf1df..702b2937 100644
--- a/src/jvm/clojure/lang/MapEntry.java
+++ b/src/jvm/clojure/lang/MapEntry.java
@@ -94,11 +94,11 @@ static class Iter implements Iterator{
}
-public ISeq seq() throws Exception {
+public ISeq seq() {
return new Seq(this);
}
-static class Seq implements ISeq{
+static class Seq extends ASeq{
MapEntry e;
public Seq(MapEntry e) {
diff --git a/src/jvm/clojure/lang/PersistentArray.java b/src/jvm/clojure/lang/PersistentArray.java
index e0673e8e..a0112abf 100644
--- a/src/jvm/clojure/lang/PersistentArray.java
+++ b/src/jvm/clojure/lang/PersistentArray.java
@@ -127,7 +127,7 @@ static class EntryLink extends Entry{
}
}
-static class Seq implements IndexedSeq{
+static class Seq extends ASeq implements IndexedSeq{
final PersistentArray p;
final int i;
diff --git a/src/jvm/clojure/lang/PersistentArrayMap.java b/src/jvm/clojure/lang/PersistentArrayMap.java
index 50343926..ee539ba4 100644
--- a/src/jvm/clojure/lang/PersistentArrayMap.java
+++ b/src/jvm/clojure/lang/PersistentArrayMap.java
@@ -179,7 +179,7 @@ public ISeq seq() {
return null;
}
-static class Seq implements ISeq, IMapEntry{
+static class Seq extends ASeq implements IMapEntry{
final Object[] array;
final int i;
diff --git a/src/jvm/clojure/lang/PersistentHashtableMap.java b/src/jvm/clojure/lang/PersistentHashtableMap.java
index 7ddf7e76..a701156b 100644
--- a/src/jvm/clojure/lang/PersistentHashtableMap.java
+++ b/src/jvm/clojure/lang/PersistentHashtableMap.java
@@ -162,21 +162,21 @@ public Iterator iterator() {
return new Iter(array);
}
-public ISeq seq() throws Exception {
+public ISeq seq() {
return Seq.create(array);
}
-static class Seq implements ISeq{
+static class Seq extends ASeq{
PersistentArray buckets;
int b;
ISeq e;
- static public Seq create(PersistentArray buckets) throws Exception {
+ static public Seq create(PersistentArray buckets) {
return next(buckets, -1, null);
}
- static Seq next(PersistentArray buckets, int b, ISeq e) throws Exception {
+ static Seq next(PersistentArray buckets, int b, ISeq e) {
if(e != null && e.rest() != null)
return new Seq(buckets,b,e.rest());
for(b = b+1;b<buckets.length();b++)
@@ -194,11 +194,11 @@ static class Seq implements ISeq{
this.e = e;
}
- public Object first() throws Exception {
+ public Object first() {
return e.first();
}
- public ISeq rest() throws Exception {
+ public ISeq rest() {
return next(buckets,b,e);
}
}
diff --git a/src/jvm/clojure/lang/PersistentListMap.java b/src/jvm/clojure/lang/PersistentListMap.java
index 5d00fd21..175e10d8 100644
--- a/src/jvm/clojure/lang/PersistentListMap.java
+++ b/src/jvm/clojure/lang/PersistentListMap.java
@@ -47,6 +47,14 @@ PersistentListMap next(){
return this;
}
+public Object peek() {
+ return first();
+}
+
+public IPersistentList pop() {
+ return rest();
+}
+
public int count(){
return 0;
}
diff --git a/src/jvm/clojure/lang/PersistentTreeMap.java b/src/jvm/clojure/lang/PersistentTreeMap.java
index f32ca7f7..5f07ac80 100644
--- a/src/jvm/clojure/lang/PersistentTreeMap.java
+++ b/src/jvm/clojure/lang/PersistentTreeMap.java
@@ -82,7 +82,7 @@ public PersistentTreeMap without(Object key){
return new PersistentTreeMap(comp, t.blacken(), _count - 1,_meta);
}
-public ISeq seq() throws Exception {
+public ISeq seq() {
if(_count > 0)
return Seq.create(tree, true);
return null;
@@ -616,7 +616,7 @@ static class RedBranchVal extends RedBranch{
}
-static public class Seq implements ISeq{
+static public class Seq extends ASeq{
final ISeq stack;
final boolean asc;
@@ -625,11 +625,11 @@ static public class Seq implements ISeq{
this.asc = asc;
}
- static Seq create(Node t, boolean asc) throws Exception {
+ static Seq create(Node t, boolean asc) {
return new Seq(push(t, null, asc),asc);
}
- static ISeq push(Node t, ISeq stack, boolean asc) throws Exception {
+ static ISeq push(Node t, ISeq stack, boolean asc) {
while(t != null)
{
stack = RT.cons(t,stack);
@@ -638,11 +638,11 @@ static public class Seq implements ISeq{
return stack;
}
- public Object first() throws Exception {
+ public Object first() {
return stack.first();
}
- public ISeq rest() throws Exception {
+ public ISeq rest() {
Node t = (Node)stack.first();
ISeq nextstack = push(asc ? t.right() : t.left(), stack.rest(), asc);
if(nextstack != null)
diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 08daaf15..4d3a8c75 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -68,7 +68,7 @@ static public boolean equal(Object k1,Object k2){
// ?Boolean.TRUE:null;
// }
-static public ISeq seq(Object coll) throws Exception {
+static public ISeq seq(Object coll) {
if(coll == null || coll instanceof ISeq)
return (ISeq) coll;
else if(coll instanceof IPersistentCollection)
@@ -78,7 +78,7 @@ static public ISeq seq(Object coll) throws Exception {
else if(coll instanceof Object[])
return ArraySeq.create((Object[]) coll);
else
- throw new IllegalArgumentException("Don't know how to create ISeq from arg");
+ throw new IllegalAccessError("Don't know how to create ISeq from arg");
}
static public Iter iter(Object coll)
@@ -193,15 +193,15 @@ static public double doubleCast(Object x)
/******************************************* list support ********************************/
-static public Cons cons(Object x, Object y) throws Exception {
+static public Cons cons(Object x, Object y) {
return new Cons(x, seq(y));
}
-static public Object first(Object x) throws Exception {
+static public Object first(Object x) {
return seq(x).first();
}
-static public ISeq rest(Object x) throws Exception {
+static public ISeq rest(Object x) {
return seq(x).rest();
}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-07-19 19:33:05 +0000