summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRich Hickey <richhickey@gmail.com>2007-12-29 17:03:18 +0000
committerRich Hickey <richhickey@gmail.com>2007-12-29 17:03:18 +0000
commit8f80ceb0ec19a59250e356b593215accf732c5fa (patch)
treee1901daa301c12855589f5517de681127d457543 /src
parentf11854a83725c9b000be03228461606f949ce526 (diff)
switched try-finally uses to try
Diffstat (limited to 'src')
-rw-r--r--src/boot.clj25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/boot.clj b/src/boot.clj
index 3b09044d..c6d7f1ac 100644
--- a/src/boot.clj
+++ b/src/boot.clj
@@ -379,9 +379,11 @@
(defmacro locking [x & body]
`(let [lockee# ~x]
- (try-finally
- (do (monitor-enter lockee#) ~@body)
- (monitor-exit lockee#))))
+ (try
+ (monitor-enter lockee#)
+ ~@body
+ (finally
+ (monitor-exit lockee#)))))
(defmacro ..
([x form] `(. ~x ~form))
@@ -414,11 +416,11 @@
(recur (conj (conj ret `(the-var ~(first vvs))) (second vvs))
(rest (rest vvs)))
(seq ret))))]
- `(try-finally
- (do
- (. clojure.lang.Var (pushThreadBindings (hash-map ~@(var-ize bindings))))
- ~@body)
- (. clojure.lang.Var (popThreadBindings)))))
+ `(try
+ (. clojure.lang.Var (pushThreadBindings (hash-map ~@(var-ize bindings))))
+ ~@body
+ (finally
+ (. clojure.lang.Var (popThreadBindings))))))
(defn find-var [sym]
(. clojure.lang.Var (find sym)))
@@ -761,9 +763,10 @@
(defmacro with-open [rdr init & body]
`(let [~rdr ~init]
- (try-finally
- (do ~@body)
- (. ~rdr (close)))))
+ (try
+ ~@body
+ (finally
+ (. ~rdr (close))))))
(defmacro doto [x & members]
(let [gx (gensym)]