diff options
author | Rich Hickey <richhickey@gmail.com> | 2008-01-22 14:30:53 +0000 |
---|---|---|
committer | Rich Hickey <richhickey@gmail.com> | 2008-01-22 14:30:53 +0000 |
commit | dca114e71248ddd7a172e38ff6dc9956db09c6cf (patch) | |
tree | 9d64dd60b04182fc60554b0fa530d1a606963dc7 | |
parent | 345aff14826f375f9809bd8a6b36b6b8b9927100 (diff) |
renamed table() to getns()
-rw-r--r-- | clojure.iml | 3 | ||||
-rw-r--r-- | src/jvm/clojure/lang/Var.java | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/clojure.iml b/clojure.iml index 71c2e404..ce7869b6 100644 --- a/clojure.iml +++ b/clojure.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> +<module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="BuildJarSettings"> <containerInfo> <containerElement type="module" name="clojure"> @@ -11,7 +11,6 @@ <setting name="buildJar" value="true" /> <setting name="mainClass" value="clojure.lang.Compiler" /> </component> - <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/classes" /> <exclude-output /> diff --git a/src/jvm/clojure/lang/Var.java b/src/jvm/clojure/lang/Var.java index 36ebd915..c905460f 100644 --- a/src/jvm/clojure/lang/Var.java +++ b/src/jvm/clojure/lang/Var.java @@ -60,7 +60,7 @@ public static Var intern(Symbol sym, Object root){ } public static Var intern(Symbol sym, Object root, boolean replaceRoot){ - ConcurrentHashMap<Symbol, Var> table = table(sym); + ConcurrentHashMap<Symbol, Var> table = getns(sym); Var dvout = table.get(sym); boolean present = dvout != null; @@ -83,7 +83,7 @@ public String toString(){ } public static Var intern(Symbol sym){ - ConcurrentHashMap<Symbol, Var> table = table(sym); + ConcurrentHashMap<Symbol, Var> table = getns(sym); Var dvout = table.get(sym); if(dvout != null) return dvout; @@ -95,14 +95,14 @@ public static Var intern(Symbol sym){ } public static void unintern(Symbol sym){ - table(sym).remove(sym); + getns(sym).remove(sym); } public static Var find(Symbol sym){ - return table(sym).get(sym); + return getns(sym).get(sym); } -static ConcurrentHashMap<Symbol, Var> table(Symbol sym){ +static ConcurrentHashMap<Symbol, Var> getns(Symbol sym){ String name = sym.ns; if(name == null) throw new IllegalArgumentException("Var names must have namespace"); |