got rid of PersistentListMap

4 files changed, 18 insertions, 380 deletions

diff --git a/src/cli/runtime/PersistentHashtableMap.cs b/src/cli/runtime/PersistentHashtableMap.cs
index 76dd01f1..a14bcc2a 100644
--- a/src/cli/runtime/PersistentHashtableMap.cs
+++ b/src/cli/runtime/PersistentHashtableMap.cs
@@ -114,7 +114,7 @@ PersistentArray doPut(int i,Object key,Object val,PersistentArray array){
             return array;

         }

     else

-	    newEntries = createListMap(key, val);

+	    newEntries = createEntryMap(key, val);

 		//newEntries = createArrayMap(new Object[]{key, val});

 

 	return (PersistentArray)array.assocN(i, newEntries);

@@ -128,7 +128,7 @@ PersistentArray doAdd(int i,Object key,Object val,PersistentArray array) {
         newEntries = entries.assocEx(key, val);

         }

     else

-	    newEntries = createListMap(key, val);

+	    newEntries = createEntryMap(key, val);

 

 	return (PersistentArray)array.assocN(i, newEntries);

 }

@@ -224,7 +224,7 @@ class Seq : ASeq{
 internal class Iter : IEnumerator{

 	PersistentArray buckets;

 	int b;

-	Object e;

+	ISeq e;

 

 	internal Iter(PersistentArray buckets){

         this.buckets = buckets;

@@ -235,10 +235,10 @@ internal class Iter : IEnumerator{
         e = null;

         for(b = b+1;b<buckets.length();b++)

             {

-            Object a =  buckets.nth(b);

-            if(a != null && a != PersistentListMap.EMPTY)

+			IPersistentCollection a = (IPersistentCollection)buckets.nth(b);

+            if(a != null && a.seq() != null)

                 {

-                e = a;

+                e = a.seq();

                 break;

                 }

             }

@@ -248,12 +248,12 @@ internal class Iter : IEnumerator{
 

 public object Current

 	{

-	get { return e; }

+	get { return e.first(); }

 	}

 

 public bool MoveNext()

 	{

-	if (e == null || (e = ((PersistentListMap)e).next()) == PersistentListMap.EMPTY)

+	if (e == null || (e = e.rest()) == null)

 		nextBucket();

 	return e != null;

 	}

@@ -271,7 +271,7 @@ IPersistentMap entriesFor(Object key){
 }

 

 static int bucketFor(Object key, PersistentArray array) {

-    return (key.GetHashCode() & 0x7fffffff) % array.length();

+    return (RT.hash(key) & 0x7fffffff) % array.length();

 }

 

 virtual internal IPersistentMap create(int capacity) {

@@ -293,8 +293,9 @@ virtual internal IPersistentMap create(int i, PersistentArray newArray, int grow
 	}

 

 

-virtual internal IPersistentMap createListMap(Object key, Object val){

-	return PersistentListMap.create(key,val);

+virtual internal IPersistentMap createEntryMap(Object key, Object val){

+	return new MapEntry(key, val);

+//return PersistentListMap.create(key, val);

 }

 

 }

diff --git a/src/cli/runtime/PersistentListMap.cs b/src/cli/runtime/PersistentListMap.cs
deleted file mode 100644
index e632a67a..00000000
--- a/src/cli/runtime/PersistentListMap.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-/**

- *   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.

- **/

-

-/* rich Jun 6, 2006 */

-

-using System;

-using System.Collections;

-
-namespace clojure.lang

-{

-/**

- * Implementation of persistent map on a linked list

-

- * Note that instances of this class are constant values

- * i.e. add/remove etc return new values

- *

- * Lookups/changes are linear, so only appropriate for _very_small_ maps

- * PersistentArrayMap is generally faster, but this class avoids the double allocation,

- * and so is better/faster as a bucket for hash tables

- *

- * null keys and values are ok, but you won't be able to distinguish a null value via get - use contains/find

- */

-public class PersistentListMap : APersistentMap, IMapEntry

-{

-

-static public PersistentListMap EMPTY = new PersistentListMap();

-

-static public PersistentListMap create(Object key, Object val){

-	return new Tail(key, val,null);

-}

- 

-	

-public virtual Object key(){

-	return null;

-}

-

-public virtual Object val(){

-	return null;

-}

-

-internal virtual PersistentListMap next(){

-    return this;

-    }

-

-public Object peek()

-	{

-	return first();

-	}

-

-public IPersistentList pop()

-	{

-	return rest();

-	}

-	

-override public  int count(){

-	return 0;

-}

-

-override public  bool contains(Object key){

-	return false;

-}

-

-override public  IMapEntry find(Object key){

-	return null;

-}

-

-override public  IPersistentMap assocEx(Object key, Object val){

-	return (IPersistentMap)assoc(key, val);

-}

-

-override public  Associative assoc(Object key, Object val){

-	return new Tail(key, val, _meta);

-}

-

-override public  IPersistentMap without(Object key){

-	return this;

-}

-

-override public  Object get(Object key){

-	return null;

-}

-

-virtual public Object first()

-	{

-	return null;

-	}

-

-virtual public ISeq rest()

-	{

-	return null;

-	}

-

-override  public ISeq seq()

-	{

-	return null;

-	}

-

-

-internal class Iter : IEnumerator{

-	PersistentListMap e;

-	bool first = true;

-

-	internal Iter(PersistentListMap e)

-	{

-	this.e = e;

-	}

-

-#region IEnumerator Members

-

-public object Current

-	{

-	get { return e; }

-	}

-

-public bool MoveNext()

-	{

-	if(first)

-		first = false;

-	else

-		e = e.next();

-	return e.count() > 0;

-	}

-

-public void Reset()

-	{

-	throw new Exception("The method or operation is not implemented.");

-	}

-

-#endregion

-	}

-

-override public IEnumerator GetEnumerator(){

-	return new Iter(this);

-}

-

-internal class Tail : PersistentListMap {

-	readonly Object _key;

-	readonly Object _val;

-

-	internal Tail(Object key,Object val,IPersistentMap meta){

-		this._key = key;

-		this._val = val;

-		this._meta = meta;

-		}

-

-    override internal PersistentListMap next(){

-        return EMPTY;

-    }

-

-	override public int count()

-		{

-		return 1;

-	}

-

-	override public Object get(Object key)

-		{

-		if(equalKey(key,_key))

-			return _val;

-		return null;

-	}

-

-	override public Object key()

-		{

-		return _key;

-	}

-

-	override public Object val()

-		{

-		return _val;

-	}

-

-	override public bool contains(Object key)

-		{

-		return equalKey(key,_key);

-	}

-

-	override public IMapEntry find(Object key)

-		{

-		if(equalKey(key,_key))

-			return this;

-		return null;

-	}

-

-	override public IPersistentMap assocEx(Object key, Object val)

-		{

-		if (equalKey(key, _key))

-			{

-			throw new Exception("Key already present");

-			}

-		return new Link(key, val, this,_meta);

-		}

-

-	override public Associative assoc(Object key, Object val)

-		{

-		if(equalKey(key,_key))  //replace

-			{

-			if(val == _val)

-				return this;

-			return new Tail(key,val,_meta);

-			}

-		return new Link(key,val,this,_meta);

-	}

-

-	override public IPersistentMap without(Object key){

-		if(equalKey(key,_key))

-			{

-			if(_meta == null)

-				return EMPTY;

-			return (IPersistentMap)EMPTY.withMeta(_meta);

-			}

-		return this;

-	}

-

-	class Seq : ASeq{

-	     Tail t;

-

-	    public Seq(Tail t) {

-		     this.t = t;

-			}	

-		override public Object first()

-		{

-		return t;

-		}

-

-		override public ISeq rest()

-		{

-		return null;

-		}

-	}

-	override public ISeq seq()

-	{

-	return new Seq(this);

-	}

-}

-

-internal class Link : PersistentListMap {

-	readonly Object _key;

-	readonly Object _val;

-	readonly PersistentListMap _rest;

-	readonly int _count;

-

-	internal Link(Object key,Object val,PersistentListMap next,IPersistentMap meta){

-		this._key = key;

-		this._val = val;

-		this._rest = next;

-		this._meta = meta;

-		this._count = 1 + next.count();

-		}

-

-	override public Object key(){

-		return _key;

-	}

-

-	override public Object val(){

-		return _val;

-	}

-

-	override internal PersistentListMap next(){

-        return _rest;

-        }

-

-	override public int count(){

-		return _count;

-	}

-

-	override public bool contains(Object key){

-		return find(key) != null;

-	}

-

-	override public IMapEntry find(Object key){

-		if(equalKey(key,_key))

-			return this;

-		return _rest.find(key);

-	}

-

-	override public IPersistentMap assocEx(Object key, Object val)

-		{

-		IMapEntry e = find(key);

-		if(e != null)

-			{

-			throw new Exception("Key already present");

-			}

-		return new Link(key,val,this,_meta);

-	}

-	

-	override public Associative assoc(Object key, Object val)

-		{

-		IMapEntry e = find(key);

-		if(e != null)

-			{

-			if(e.val() == val)

-				return this;

-			return create(_key,_val,without(key));

-			}

-		return new Link(key,val,this,_meta);

-	}

-

-	override public IPersistentMap without(Object key)

-		{

-		if(equalKey(key,_key))

-			{

-			if(_rest._meta == _meta)

-				return _rest;

-			return (IPersistentMap)_rest.withMeta(_meta);

-			}

-		PersistentListMap r = (PersistentListMap)_rest.without(key);

-		if(r == _rest)  //not there

-			return this;

-		return create(_key,_val,r);

-	}

-

-	override public Object get(Object key){

-		IMapEntry e = find(key);

-		if(e != null)

-			return e.val();

-		return null;

-	}

-

-	class Seq : ASeq{

-        Link lnk;

-

-        public Seq(Link lnk) {

-            this.lnk = lnk;

-        }

-

-        override public Object first() {

-         return lnk;

-        }

-

-        override public ISeq rest() {

-            return lnk._rest.seq();

-        }

-	}

-

-	override public ISeq seq()

-	{

-	return new Seq(this);

-	}

-	

-	PersistentListMap create(Object k, Object v, IPersistentMap r)

-		{

-		if(r.count() == 0)

-			return new Tail(k,v,_meta);

-		return new Link(k, v, (PersistentListMap)r,_meta);

-	}

-

-}

-

-bool equalKey(Object k1,Object k2){

-    if(k1 == null)

-        return k2 == null;

-    return k1.Equals(k2);

-}

-}

-

-}

diff --git a/src/cli/runtime/PersistentQueue.cs b/src/cli/runtime/PersistentQueue.cs
index 14d7c2f8..78635448 100644
--- a/src/cli/runtime/PersistentQueue.cs
+++ b/src/cli/runtime/PersistentQueue.cs
@@ -140,7 +140,7 @@ class Seq : ASeq {
     }

 }

 

-//*

+/*

 public static void Main(String[] args) {

     if (args.Length != 1)

         {

diff --git a/src/cli/runtime/PersistentTreeMap.cs b/src/cli/runtime/PersistentTreeMap.cs
index 77be3e9f..743cb06d 100644
--- a/src/cli/runtime/PersistentTreeMap.cs
+++ b/src/cli/runtime/PersistentTreeMap.cs
@@ -789,7 +789,7 @@ public void Reset()
 #endregion

     }
 
-    /*

+    //*

 	[STAThread]
 static public void Main(String[] args){
 	if(args.Length != 1)

@@ -804,9 +804,9 @@ static public void Main(String[] args){
     Array.Reverse(ints);
 	Console.WriteLine("Building set");

 	//IPersistentMap set = new PersistentTree();

-	IPersistentMap set = new PersistentArrayMap();

+	//IPersistentMap set = new PersistentArrayMap();

 	//IPersistentMap set = new PersistentListMap();

-	//IPersistentMap set = new PersistentHashtableMap(1001);

+	IPersistentMap set = new PersistentHashtableMap(1001);

 	//IPersistentMap set = new PersistentHybridMap(1001);
     //for(int i = 0; i < ints.Length; i++)
     //    {
@@ -817,7 +817,7 @@ static public void Main(String[] args){
 	for (int i = 0; i < ints.Length; i++)
 		{
 		Object anInt = ints[i];
-		set = set.put(anInt, anInt);
+		set = (IPersistentMap) set.assoc(anInt, anInt);
 		}

 

 	foreach(IMapEntry e in set)
@@ -831,7 +831,7 @@ static public void Main(String[] args){
 	for(int i = 0; i < ints.Length/2; i++)
 		{
 		Object anInt = ints[i];
-		set = set.remove(anInt);
+		set = set.without(anInt);
 		}

 

 	Console.WriteLine("Time: " + (DateTime.Now - start));