renamed AMap to Obj

11 files changed, 15 insertions, 15 deletions

diff --git a/src/cli/runtime/AFn.cs b/src/cli/runtime/AFn.cs
index 193f4387..ceaec67d 100644
--- a/src/cli/runtime/AFn.cs
+++ b/src/cli/runtime/AFn.cs
@@ -15,7 +15,7 @@ using System;
 namespace org.clojure.runtime

 {
 
-public class AFn : AMap , IFn

+public class AFn : Obj , IFn

 							  {
 
 virtual public Object invoke(ThreadLocalData tld) /*throws Exception*/
diff --git a/src/cli/runtime/Cons.cs b/src/cli/runtime/Cons.cs
index 02e20202..e097aafb 100644
--- a/src/cli/runtime/Cons.cs
+++ b/src/cli/runtime/Cons.cs
@@ -15,7 +15,7 @@ using System;
 namespace org.clojure.runtime

 {
 
-public class Cons : AMap,Iter

+public class Cons : Obj,Iter

 				  {
 
 public readonly Object first;
diff --git a/src/cli/runtime/Keyword.cs b/src/cli/runtime/Keyword.cs
index 2250d097..f0c6a150 100644
--- a/src/cli/runtime/Keyword.cs
+++ b/src/cli/runtime/Keyword.cs
@@ -24,7 +24,7 @@ internal Keyword(String name):base(name)
	{
	}

public Object invoke(ThreadLocal
 }
/**
 *  Indexer implements IFn for attr access
 *  This single arg version is the getter
 * @param tld
 * @param obj - must be AMap
 * @return the value of the attr or nil if not found
 */
public Object invoke(ThreadLocalData tld, Object obj) /*throws Exception*/
	{

     if (obj == null)

         return null;

-    return ((AMap)obj).get(this);
	}

/**
 *  Indexer implements IFn for attr access
 *  This two arg version is the setter
 * @param tld
 * @param obj - must be AMap
 * @param val
 * @return val

 */
public Object invoke(ThreadLocalData tld, Object obj, Object val) /*throws Exception*/
	{
	return ((AMap)obj).put(this,val);
	}
+    return ((Obj)obj).get(this);
	}

/**
 *  Indexer implements IFn for attr access
 *  This two arg version is the setter
 * @param tld
 * @param obj - must be AMap
 * @param val
 * @return val

 */
public Object invoke(ThreadLocalData tld, Object obj, Object val) /*throws Exception*/
	{
	return ((Obj)obj).put(this,val);
	}
 
 public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3) /*throws Exception*/

 	{

diff --git a/src/cli/runtime/AMap.cs b/src/cli/runtime/Obj.cs
index a34e1560..7058ebe3 100644
--- a/src/cli/runtime/AMap.cs
+++ b/src/cli/runtime/Obj.cs
@@ -16,7 +16,7 @@ using System.Collections.Specialized;
 namespace org.clojure.runtime

 {
 
-public class AMap

+public class Obj

 {
 
 HybridDictionary attrs;
diff --git a/src/cli/runtime/Symbol.cs b/src/cli/runtime/Symbol.cs
index af7465f7..9b976153 100644
--- a/src/cli/runtime/Symbol.cs
+++ b/src/cli/runtime/Symbol.cs
@@ -15,7 +15,7 @@ using System.Collections;
 
 namespace org.clojure.runtime

 {
-public class Symbol : AMap, IComparable{

+public class Symbol : Obj, IComparable{

 

 static public readonly Hashtable table = new Hashtable(1001);

 static public readonly Hashtable hashes = new Hashtable(1001);
diff --git a/src/org/clojure/runtime/AFn.java b/src/org/clojure/runtime/AFn.java
index c483a466..323fe732 100644
--- a/src/org/clojure/runtime/AFn.java
+++ b/src/org/clojure/runtime/AFn.java
@@ -12,7 +12,7 @@
 
 package org.clojure.runtime;
 
-public class AFn extends AMap implements IFn{
+public class AFn extends Obj implements IFn{
 
 public Object invoke(ThreadLocalData tld) throws Exception
 	{
diff --git a/src/org/clojure/runtime/Accessor.java b/src/org/clojure/runtime/Accessor.java
index c4d47c2d..5883e3db 100644
--- a/src/org/clojure/runtime/Accessor.java
+++ b/src/org/clojure/runtime/Accessor.java
@@ -28,7 +28,7 @@ public Object invoke(ThreadLocalData tld) throws Exception {
  *  Indexer implements IFn for attr access
  *  This single arg version is the getter
  * @param tld
- * @param obj - must be AMap
+ * @param obj - must be Obj
  * @return the value of the attr or nil if not found
  * @throws Exception
  */
@@ -42,7 +42,7 @@ public Object invoke(ThreadLocalData tld, Object obj) throws Exception
  *  Indexer implements IFn for attr access
  *  This two arg version is the setter
  * @param tld
- * @param obj - must be AMap
+ * @param obj - must be Obj
  * @param val
  * @return val
  * @throws Exception
diff --git a/src/org/clojure/runtime/Cons.java b/src/org/clojure/runtime/Cons.java
index 23278b6b..a869b322 100644
--- a/src/org/clojure/runtime/Cons.java
+++ b/src/org/clojure/runtime/Cons.java
@@ -12,7 +12,7 @@
 
 package org.clojure.runtime;
 
-public class Cons extends AMap implements Iter{
+public class Cons extends Obj implements Iter{
 
 public final Object first;
 public final Cons rest;
diff --git a/src/org/clojure/runtime/Keyword.java b/src/org/clojure/runtime/Keyword.java
index ed1d4191..8eaf7049 100644
--- a/src/org/clojure/runtime/Keyword.java
+++ b/src/org/clojure/runtime/Keyword.java
@@ -36,7 +36,7 @@ public Object invoke(ThreadLocalData tld) throws Exception {
  *  Indexer implements IFn for attr access
  *  This single arg version is the getter
  * @param tld
- * @param obj - must be AMap
+ * @param obj - must be Obj
  * @return the value of the attr or nil if not found
  * @throws Exception
  */
@@ -44,21 +44,21 @@ public Object invoke(ThreadLocalData tld, Object obj) throws Exception
     {
     if (obj == null)
         return null;
-    return ((AMap)obj).get(this);
+    return ((Obj)obj).get(this);
     }
 
 /**
  *  Indexer implements IFn for attr access
  *  This two arg version is the setter
  * @param tld
- * @param obj - must be AMap
+ * @param obj - must be Obj
  * @param val
  * @return val
  * @throws Exception
  */
 public Object invoke(ThreadLocalData tld, Object obj, Object val) throws Exception
 	{
-	return ((AMap)obj).put(this,val);
+	return ((Obj)obj).put(this,val);
 	}
 
 public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3) throws Exception
diff --git a/src/org/clojure/runtime/AMap.java b/src/org/clojure/runtime/Obj.java
index 132d9ed8..c96e70da 100644
--- a/src/org/clojure/runtime/AMap.java
+++ b/src/org/clojure/runtime/Obj.java
@@ -14,7 +14,7 @@ package org.clojure.runtime;
 
 import java.util.IdentityHashMap;
 
-public class AMap{
+public class Obj {
 
 IdentityHashMap attrs;
 public static final int INITIAL_SIZE = 7;
diff --git a/src/org/clojure/runtime/Symbol.java b/src/org/clojure/runtime/Symbol.java
index 5d5b3a54..269becfa 100644
--- a/src/org/clojure/runtime/Symbol.java
+++ b/src/org/clojure/runtime/Symbol.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Random;
 
-public class Symbol extends AMap implements Comparable{
+public class Symbol extends Obj implements Comparable{
 
 final public static HashMap table = new HashMap();
 final public static HashSet hashes = new HashSet();