diff options
author | Rich Hickey <richhickey@gmail.com> | 2008-02-08 19:18:33 +0000 |
---|---|---|
committer | Rich Hickey <richhickey@gmail.com> | 2008-02-08 19:18:33 +0000 |
commit | 87a669b00ec9368b392c908516f8f7bf7131e34e (patch) | |
tree | 1836ecf4c9a41daf615d2a679ac129e0e60dc255 | |
parent | 221023b4d27e75757e3c842176872d5300d35b23 (diff) |
renamed ns-exports ns-publics
-rw-r--r-- | src/boot.clj | 12 | ||||
-rw-r--r-- | src/jvm/clojure/lang/Compiler.java | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/boot.clj b/src/boot.clj index 302d22ef..d7b8f079 100644 --- a/src/boot.clj +++ b/src/boot.clj @@ -998,7 +998,7 @@ ; (doseq sym syms ; (.. *ns* (intern sym) (setExported true)))) -(defn ns-exports [#^clojure.lang.Namespace ns] +(defn ns-publics [#^clojure.lang.Namespace ns] (filter-key val (fn [v] (and (instance? clojure.lang.Var v) (= ns (. v ns)) (. v (isPublic)))) @@ -1010,15 +1010,15 @@ (defn refer [ns-sym & filters] (let [ns (find-ns ns-sym) fs (apply hash-map filters) - nsexports (ns-exports ns) + nspublics (ns-publics ns) rename (or (:rename fs) {}) exclude (to-set (:exclude fs)) - to-do (or (:only fs) (keys nsexports))] + to-do (or (:only fs) (keys nspublics))] (doseq sym to-do (when-not (exclude sym) - (let [v (nsexports sym)] + (let [v (nspublics sym)] (when-not v - (throw (new java.lang.IllegalAccessError (strcat sym " is not exported")))) + (throw (new java.lang.IllegalAccessError (strcat sym " is not public")))) (. *ns* (refer (or (rename sym) sym) v))))))) (defn ns-refers [#^clojure.lang.Namespace ns] @@ -1274,7 +1274,7 @@ resultset-seq to-set distinct export - ns-exports ns-imports ns-map + ns-publics ns-imports ns-map identical? instance? load-file in-ns find-ns filter-key find-ns create-ns remove-ns diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java index 637c28b7..fe88756d 100644 --- a/src/jvm/clojure/lang/Compiler.java +++ b/src/jvm/clojure/lang/Compiler.java @@ -3151,7 +3151,7 @@ static public Var isMacro(Object op) throws Exception{ if(v != null && v.isMacro()) { if(v.ns != currentNS() && !v.isPublic()) - throw new IllegalAccessError("var: " + v + " is not exported"); + throw new IllegalAccessError("var: " + v + " is not public"); return v; } } @@ -3280,7 +3280,7 @@ static public Object resolveIn(Namespace n, Symbol sym) throws Exception{ if(v == null) throw new Exception("No such var: " + sym); else if(v.ns != currentNS() && !v.isPublic()) - throw new IllegalAccessError("var: " + sym + " is not exported"); + throw new IllegalAccessError("var: " + sym + " is not public"); return v; } else if(sym.name.indexOf('.') > 0 || sym.name.charAt(0) == '[') |