aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscgilardi <scgilardi@gmail.com>2008-07-03 12:38:27 +0000
committerscgilardi <scgilardi@gmail.com>2008-07-03 12:38:27 +0000
commit2491b30d482dbff74f1db3ce78bcc92b7994c1c5 (patch)
tree8d19670cd1d6cbd4ae6a6ec03406fa4d8a47198c
parent1432520e97e282a39a873e68caf8dc53085129d4 (diff)
lib.clj: remove eval-option and use eval because a symbol may refer to a let-bound local too
-rw-r--r--lib.clj12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib.clj b/lib.clj
index 12f24a3a..87745196 100644
--- a/lib.clj
+++ b/lib.clj
@@ -192,21 +192,13 @@
(load-lib sym in ns)
@*libs*))))
-(defn- eval-option
- "Evaluates an option which may be a symbol representing a var
- or a literal (including nil)"
- [option]
- (if (symbol? option)
- (deref (resolve option))
- option))
-
(defn- load-with-options
"Load a lib with options expressed as sequential keywords and
values"
[sym & options]
(let [opts (apply hash-map options)
- in (eval-option (:in opts))
- ns (eval-option (:ns opts))
+ in (eval (:in opts))
+ ns (eval (:ns opts))
reload (:reload opts)
reload-all (:reload-all opts)
require (:require opts)