summaryrefslogtreecommitdiff
path: root/src/jvm/clojure
diff options
context:
space:
mode:
authorRich Hickey <richhickey@gmail.com>2007-09-30 23:42:42 +0000
committerRich Hickey <richhickey@gmail.com>2007-09-30 23:42:42 +0000
commita3bc99cd612e164a35e27ca6991075d55cd34d7e (patch)
tree4e10024759916caae6400c21b2f7452dd2d006e9 /src/jvm/clojure
parent4be49c5b2a179ab396e631dc533b14f7ea699c97 (diff)
def and refer conflict checking, unintern
Diffstat (limited to 'src/jvm/clojure')
-rw-r--r--src/jvm/clojure/lang/Compiler.java4
-rw-r--r--src/jvm/clojure/lang/Var.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index e7dc8419..7dbf4191 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -265,8 +265,8 @@ static class DefExpr implements Expr{
if(!v.sym.ns.equals(currentNS().name))
{
if(sym.ns == null)
- throw new Exception("Name conflict, can't def " + sym + " because " + currentNS().name +
- " namespace refers to:" + v.sym);
+ throw new Exception("Name conflict, can't def " + sym + " because namespace: " + currentNS().name +
+ " refers to:" + v.sym);
else
throw new Exception("Can't create defs outside of current ns");
}
diff --git a/src/jvm/clojure/lang/Var.java b/src/jvm/clojure/lang/Var.java
index f411b660..1a0952fb 100644
--- a/src/jvm/clojure/lang/Var.java
+++ b/src/jvm/clojure/lang/Var.java
@@ -59,7 +59,7 @@ static InheritableThreadLocal<Frame> dvals = new InheritableThreadLocal<Frame>()
Object root;
transient final AtomicInteger count;
-final Symbol sym;
+final public Symbol sym;
boolean macroFlag = false;
static ConcurrentHashMap<Symbol, Var> table = new ConcurrentHashMap<Symbol, Var>();