yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename resolve-symbol -> require-resolve.

Browse source
This commit is contained in:
Phil Hagelberg 2012-08-21 14:51:29 -07:00
parent a4b7ded2aa
commit 3e5f3c77be
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
leiningen-core/src/leiningen/core/main.clj
View file

@ -118,8 +118,7 @@
(defn resolve-task
([task not-found]
(let [[task & pargs] (if (coll? task) task [task])]
(if-let [task-var (utils/resolve-symbol (symbol (str "leiningen." task)
task))]
(if-let [task-var (utils/require-resolve (str "leiningen." task) task)]
(with-meta
(fn [project & args] (apply task-var project (concat pargs args)))
(update-in (meta task-var) [:arglists] (drop-partial-args pargs)))

4
leiningen-core/src/leiningen/core/project.clj
View file

@ -271,7 +271,7 @@
(symbol (name ns) "project")))
(defn- load-hook [hook-ns]
(when-let [hook (try (utils/resolve-symbol (symbol (name hook-ns) "activate"))
(when-let [hook (try (utils/require-resolve (name hook-ns) "activate")
(catch Throwable e
(utils/error "problem requiring" hook-ns "hook")
(throw e)))]
@ -293,7 +293,7 @@
(concat (plugin-middleware project)
(:middleware project))))
([project middleware-name]
(if-let [middleware (utils/resolve-symbol middleware-name)]
(if-let [middleware (utils/require-resolve middleware-name)]
(middleware project)
(utils/error "cannot resolve" middleware-name "middleware"))))

17
leiningen-core/src/leiningen/core/utils.clj
View file

@ -19,12 +19,13 @@
(binding [*out* *err*]
(apply println "Error:" args)))
(defn resolve-symbol
(defn require-resolve
"Resolve a fully qualified symbol by first requiring its namespace."
[sym]
(when-let [ns (namespace sym)]
(when (ns-exists? ns)
(let [ns (symbol ns)]
(when-not (find-ns ns)
(require ns)))
(resolve sym))))
([sym]
(when-let [ns (namespace sym)]
(when (ns-exists? ns)
(let [ns (symbol ns)]
(when-not (find-ns ns)
(require ns)))
(resolve sym))))
([ns sym] (require-resolve (symbol ns sym))))