summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cli/runtime/PersistentHashtableIdentityMap.cs2
-rw-r--r--src/cli/runtime/PersistentHashtableMap.cs2
-rw-r--r--src/cli/runtime/PersistentListIdentityMap.cs12
-rw-r--r--src/cli/runtime/PersistentListMap.cs12
-rw-r--r--src/org/clojure/runtime/PersistentHashtableIdentityMap.java2
-rw-r--r--src/org/clojure/runtime/PersistentHashtableMap.java2
-rw-r--r--src/org/clojure/runtime/PersistentListIdentityMap.java12
-rw-r--r--src/org/clojure/runtime/PersistentListMap.java12
8 files changed, 28 insertions, 28 deletions
diff --git a/src/cli/runtime/PersistentHashtableIdentityMap.cs b/src/cli/runtime/PersistentHashtableIdentityMap.cs
index 1fb191bf..13880273 100644
--- a/src/cli/runtime/PersistentHashtableIdentityMap.cs
+++ b/src/cli/runtime/PersistentHashtableIdentityMap.cs
@@ -70,7 +70,7 @@ internal class Iter2 : IEnumerator
public bool MoveNext()
{
- if (e == null || (e = ((PersistentListIdentityMap)e).rest()) == PersistentListIdentityMap.EMPTY)
+ if (e == null || (e = ((PersistentListIdentityMap)e).next()) == PersistentListIdentityMap.EMPTY)
nextBucket();
return e != null;
}
diff --git a/src/cli/runtime/PersistentHashtableMap.cs b/src/cli/runtime/PersistentHashtableMap.cs
index cb4e2f1a..e00cd565 100644
--- a/src/cli/runtime/PersistentHashtableMap.cs
+++ b/src/cli/runtime/PersistentHashtableMap.cs
@@ -185,7 +185,7 @@ public object Current
public bool MoveNext()
{
- if (e == null || (e = ((PersistentListMap)e).rest()) == PersistentListMap.EMPTY)
+ if (e == null || (e = ((PersistentListMap)e).next()) == PersistentListMap.EMPTY)
nextBucket();
return e != null;
}
diff --git a/src/cli/runtime/PersistentListIdentityMap.cs b/src/cli/runtime/PersistentListIdentityMap.cs
index 8ec09759..17f0794a 100644
--- a/src/cli/runtime/PersistentListIdentityMap.cs
+++ b/src/cli/runtime/PersistentListIdentityMap.cs
@@ -51,7 +51,7 @@ namespace org.clojure.runtime
return null;
}
- internal virtual PersistentListIdentityMap rest()
+ internal virtual PersistentListIdentityMap next()
{
return this;
}
@@ -118,7 +118,7 @@ namespace org.clojure.runtime
if (first)
first = false;
else
- e = e.rest();
+ e = e.next();
return e != EMPTY;
}
@@ -146,7 +146,7 @@ namespace org.clojure.runtime
this._val = val;
}
- override internal PersistentListIdentityMap rest()
+ override internal PersistentListIdentityMap next()
{
return EMPTY;
}
@@ -215,11 +215,11 @@ namespace org.clojure.runtime
readonly Object _val;
readonly PersistentListIdentityMap _rest;
- internal Link(Object key, Object val, PersistentListIdentityMap rest)
+ internal Link(Object key, Object val, PersistentListIdentityMap next)
{
this._key = key;
this._val = val;
- this._rest = rest;
+ this._rest = next;
}
override public Object key()
@@ -232,7 +232,7 @@ namespace org.clojure.runtime
return _val;
}
- override internal PersistentListIdentityMap rest()
+ override internal PersistentListIdentityMap next()
{
return _rest;
}
diff --git a/src/cli/runtime/PersistentListMap.cs b/src/cli/runtime/PersistentListMap.cs
index f6d19717..fa7b3874 100644
--- a/src/cli/runtime/PersistentListMap.cs
+++ b/src/cli/runtime/PersistentListMap.cs
@@ -44,7 +44,7 @@ public virtual Object val(){
return null;
}
-internal virtual PersistentListMap rest(){
+internal virtual PersistentListMap next(){
return this;
}
@@ -101,7 +101,7 @@ public bool MoveNext()
if(first)
first = false;
else
- e = e.rest();
+ e = e.next();
return e != EMPTY;
}
@@ -126,7 +126,7 @@ internal class Tail : PersistentListMap {
this._val = val;
}
- override internal PersistentListMap rest(){
+ override internal PersistentListMap next(){
return EMPTY;
}
@@ -192,10 +192,10 @@ internal class Link : PersistentListMap {
readonly Object _val;
readonly PersistentListMap _rest;
- internal Link(Object key,Object val,PersistentListMap rest){
+ internal Link(Object key,Object val,PersistentListMap next){
this._key = key;
this._val = val;
- this._rest = rest;
+ this._rest = next;
}
override public Object key(){
@@ -206,7 +206,7 @@ internal class Link : PersistentListMap {
return _val;
}
- override internal PersistentListMap rest(){
+ override internal PersistentListMap next(){
return _rest;
}
diff --git a/src/org/clojure/runtime/PersistentHashtableIdentityMap.java b/src/org/clojure/runtime/PersistentHashtableIdentityMap.java
index 4cf7ebe9..01b1f19d 100644
--- a/src/org/clojure/runtime/PersistentHashtableIdentityMap.java
+++ b/src/org/clojure/runtime/PersistentHashtableIdentityMap.java
@@ -66,7 +66,7 @@ static class Iter implements Iterator{
public Object next() {
PersistentListIdentityMap ret = e;
- e = e.rest();
+ e = e.next();
if(e == PersistentListIdentityMap.EMPTY)
nextBucket();
return ret;
diff --git a/src/org/clojure/runtime/PersistentHashtableMap.java b/src/org/clojure/runtime/PersistentHashtableMap.java
index 78632662..2ffa7b6c 100644
--- a/src/org/clojure/runtime/PersistentHashtableMap.java
+++ b/src/org/clojure/runtime/PersistentHashtableMap.java
@@ -176,7 +176,7 @@ static class Iter implements Iterator{
public Object next() {
PersistentListMap ret = e;
- e = e.rest();
+ e = e.next();
if(e == PersistentListMap.EMPTY)
nextBucket();
return ret;
diff --git a/src/org/clojure/runtime/PersistentListIdentityMap.java b/src/org/clojure/runtime/PersistentListIdentityMap.java
index 74031c75..7aa982b9 100644
--- a/src/org/clojure/runtime/PersistentListIdentityMap.java
+++ b/src/org/clojure/runtime/PersistentListIdentityMap.java
@@ -45,7 +45,7 @@ public Object val(){
return null;
}
-PersistentListIdentityMap rest(){
+PersistentListIdentityMap next(){
return this;
}
@@ -95,7 +95,7 @@ static class Iter implements Iterator{
public Object next(){
PersistentListIdentityMap ret = e;
- e = e.rest();
+ e = e.next();
return ret;
}
@@ -117,7 +117,7 @@ static class Tail extends PersistentListIdentityMap {
this._val = val;
}
- PersistentListIdentityMap rest(){
+ PersistentListIdentityMap next(){
return EMPTY;
}
@@ -175,10 +175,10 @@ static class Link extends PersistentListIdentityMap {
final Object _val;
final PersistentListIdentityMap _rest;
- Link(Object key,Object val,PersistentListIdentityMap rest){
+ Link(Object key,Object val,PersistentListIdentityMap next){
this._key = key;
this._val = val;
- this._rest = rest;
+ this._rest = next;
}
public Object key(){
@@ -189,7 +189,7 @@ static class Link extends PersistentListIdentityMap {
return _val;
}
- PersistentListIdentityMap rest(){
+ PersistentListIdentityMap next(){
return _rest;
}
diff --git a/src/org/clojure/runtime/PersistentListMap.java b/src/org/clojure/runtime/PersistentListMap.java
index e6f929f9..942d98cc 100644
--- a/src/org/clojure/runtime/PersistentListMap.java
+++ b/src/org/clojure/runtime/PersistentListMap.java
@@ -43,7 +43,7 @@ public Object val(){
return null;
}
-PersistentListMap rest(){
+PersistentListMap next(){
return this;
}
@@ -93,7 +93,7 @@ static class Iter implements Iterator{
public Object next(){
PersistentListMap ret = e;
- e = e.rest();
+ e = e.next();
return ret;
}
@@ -115,7 +115,7 @@ static class Tail extends PersistentListMap {
this._val = val;
}
- PersistentListMap rest(){
+ PersistentListMap next(){
return EMPTY;
}
@@ -173,10 +173,10 @@ static class Link extends PersistentListMap {
final Object _val;
final PersistentListMap _rest;
- Link(Object key,Object val,PersistentListMap rest){
+ Link(Object key,Object val,PersistentListMap next){
this._key = key;
this._val = val;
- this._rest = rest;
+ this._rest = next;
}
public Object key(){
@@ -187,7 +187,7 @@ static class Link extends PersistentListMap {
return _val;
}
- PersistentListMap rest(){
+ PersistentListMap next(){
return _rest;
}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-07-18 15:55:33 +0000