1 files changed, 12 insertions, 3 deletions
diff --git a/src/cli/runtime/Accessor.cs b/src/cli/runtime/Accessor.cs
index cf341d95..2a26ce32 100644
--- a/src/cli/runtime/Accessor.cs
+++ b/src/cli/runtime/Accessor.cs
@@ -12,8 +12,17 @@ using System;
 
 namespace org.clojure.runtime
 {
-public class Accessor :Indexer
+public class Accessor :Symbol, IFn
     {
-    public  String name;
-    public Namespace ns;
-internal Accessor(String name, Namespace ns)
-	{
-	this.ns = ns;
-	this.name = name;
-	}
-public String toString()
-	{
-	if(ns == null)
-		return "#:." + name;
-	return ns.name + ":." + name;
-	}
-/**
- *  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
- * @throws Exception
- */
-override public Object invoke(ThreadLocalData tld, Object obj) //throws Exception
-	{
-    return Reflector.invokeInstanceMember(name, obj);
-	}
-/**
- *  Indexer implements IFn for attr access
- *  This two arg version is the setter
- * @param tld
- * @param obj - must be AMap
- * @param val
- * @return val
- * @throws Exception
- */
-override public Object invoke(ThreadLocalData tld, Object obj, Object val) //throws Exception
-	{
-	return Reflector.invokeInstanceMember(name,obj,val);
-	}
-override public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3) //throws Exception
-	{
-	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3);
-	}
-override public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4) //throws Exception
-	{
-	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3,arg4);
-	}
-override public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5)
-		//throws Exception
-	{
-	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3,arg4,arg5);
-	}
-override public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Cons args)
-		//throws Exception
-	{
-	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3,arg4,arg5,args);
-	}
-    }
+
+internal Accessor(String name) :base(name)
+	{
+	}
+
+public Object invoke(ThreadLocalData tld) /*throws Exception*/ {
+    return AFn.throwArity();
+    }
+/**
+ *  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
+ * @throws Exception
+ */
+ public Object invoke(ThreadLocalData tld, Object obj) //throws Exception
+	{
+    return Reflector.invokeInstanceMember(name, obj);
+	}
+/**
+ *  Indexer implements IFn for attr access
+ *  This two arg version is the setter
+ * @param tld
+ * @param obj - must be AMap
+ * @param val
+ * @return val
+ * @throws Exception
+ */
+ public Object invoke(ThreadLocalData tld, Object obj, Object val) //throws Exception
+	{
+	return Reflector.invokeInstanceMember(name,obj,val);
+	}
+ public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3) //throws Exception
+	{
+	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3);
+	}
+ public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4) //throws Exception
+	{
+	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3,arg4);
+	}
+ public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5)
+		//throws Exception
+	{
+	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3,arg4,arg5);
+	}
+ public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Cons args)
+		//throws Exception
+	{
+	return Reflector.invokeInstanceMember(name,arg1,arg2,arg3,arg4,arg5,args);
+	}
+
+public Object applyTo(ThreadLocalData tld, Cons arglist) /*throws Exception*/ {
+    return AFn.applyToHelper(this, tld, arglist);
+    }
+	
+    }
 }