made Var a Symbol in a Namespace

2 files changed, 6 insertions, 6 deletions

diff --git a/src/cli/runtime/Namespace.cs b/src/cli/runtime/Namespace.cs
index 3dd6eb9a..d4b15078 100644
--- a/src/cli/runtime/Namespace.cs
+++ b/src/cli/runtime/Namespace.cs
@@ -25,7 +25,7 @@ public class Namespace
 static public HybridDictionary table = new HybridDictionary();
 
 /**
- * String->Symbol
+ * Symbol->Var
  */

 public HybridDictionary vars = new HybridDictionary();

 public String name;
@@ -53,11 +53,11 @@ static public Namespace findOrCreate(String name)
 		}
 	}

 

-static public Var internVar(String ns, String var)

+static public Var intern(String ns, String name)

     {

-        return findOrCreate(ns).internVar(var);

+        return findOrCreate(ns).intern(Symbol.intern(name));

     }

 

-public Var internVar(String name)
	{
	lock(vars)
		{
		Var var = (Var) vars[name];
		if(var == null)
			vars.Add(name,var = new Var(name, this));
		return var;
		}
	}

+public Var intern(Symbol sym)
	{
	lock(vars)
		{
		Var var = (Var) vars[sym];
		if(var == null)
			vars.Add(sym,var = new Var(sym, this));
		return var;
		}
	}

 }
 }
diff --git a/src/cli/runtime/Var.cs b/src/cli/runtime/Var.cs
index 46f96654..2e4f666c 100644
--- a/src/cli/runtime/Var.cs
+++ b/src/cli/runtime/Var.cs
@@ -12,9 +12,9 @@ using System;
 

 namespace org.clojure.runtime

 {

-public class Var :  Indexer

+public class Var :  AFn

     {

-public String name;
public Namespace ns;
public Cons binding;
public IFn fn;  //todo, bind to throw stub?
public IFn setfn;

internal Var(String name, Namespace ns)
	{
	this.ns = ns;
	this.name = name;
	}

public String toString()
	{
	if(ns == null)
		return "#:" + name;
	return ns.name + ":" + name;
	}

public Var bind(Object val)
	{
	if(binding == null)
		binding = new Cons(val,null);
	else
		binding.first = val;

+public readonly Symbol sym;
public Namespace ns;
public Cons binding;
public IFn fn;  //todo, bind to throw stub?
public IFn setfn;

internal Var(Symbol sym, Namespace ns)
	{
	if(sym.GetType() != typeof(Symbol))
	    throw new ArgumentException("Only simple symbols can be vars");
	this.ns = ns;
	this.sym = sym;
	}

public String toString()
	{
	if(ns == null)
		return "#:" + sym;
	return ns.name + ":" + sym;
	}

public Var bind(Object val)
	{
	if(binding == null)
		binding = new Cons(val,null);
	else
		binding.first = val;

 

     if (val is IFn)

         this.fn = (IFn)val;