errata fixes for Beta 5

stuarthalloway · stuarthalloway · commit 584b9e1ea8ec · 2009-01-12T17:51:06.000-05:00
diff --git a/examples/exploring.clj b/examples/exploring.clj
@@ -115,7 +115,7 @@
 ; END:greet-author-2
 
 ; START:ellipsize
-(use '[clojure.contrib.str-utils :only (re-split)]) 
+(use '[clojure.contrib.str-utils :only (re-split str-join)]) 
 (defn ellipsize [words]
   (let [[w1 w2 w3] (re-split #"\s" words)]
     (str-join " " [w1 w2 w3 "..."])))
diff --git a/examples/interop.clj b/examples/interop.clj
@@ -53,7 +53,7 @@
 (def print-element-handler
      (proxy [DefaultHandler] [] 
        (startElement            
-	[uri, local, qname, atts] 
+	[uri local qname atts] 
 	(println (format "Saw element: %s" qname)))))
 ; END:print-element-handler
 
diff --git a/examples/sequences.clj b/examples/sequences.clj
@@ -38,7 +38,6 @@
 (def languages #{"java" "c" "d" "clojure"})
 (def letters #{"a" "b" "c" "d" "e"})
 (def beverages #{"java" "chai" "pop"})
-(def inventors {"java" "gosling", "clojure" "hickey", "ruby" "matz"})
 ; END: sets
 
 (defdemo demo-mutable-re
diff --git a/examples/utils.clj b/examples/utils.clj
@@ -2,20 +2,12 @@
     (:use [clojure.contrib.duck-streams :only (spit)])
     (:import [java.io BufferedReader InputStreamReader]))
 	  
-(defn make-process [p] (.. Runtime getRuntime (exec (str p))))
-
 (require 'clojure.contrib.test-is)
 (defmacro re-test [test-sym]
   `(do
      (require :reload-all '~test-sym)
      (clojure.contrib.test-is/run-tests '~test-sym)))
   
-(defn exec [cmdline]
- (let [r (BufferedReader.
-	  (InputStreamReader.
-	   (.getInputStream (make-process cmdline))))]
-   (dorun (map println (line-seq r)))))
-
 (defn classloader-seq 
   ([] (classloader-seq (clojure.lang.RT/baseLoader)))
   ([cl] 
diff --git a/lancet/snippets.clj b/lancet/snippets.clj
@@ -5,6 +5,6 @@
 (defn set-property! [inst prop value]
   (let [pd (property-descriptor inst prop)]   
     (throw-if (nil? pd) (str "No such property " prop)) 
-    (.invoke (. pd getWriteMethod) inst (into-array [value])))) ; <label id="sequences.lancet.value"/> 
+    (.invoke (.getWriteMethod pd) inst (into-array [value])))) ; <label id="sequences.lancet.value"/> 
 ; END: set-property!
 
diff --git a/lancet/step_1_repl.clj b/lancet/step_1_repl.clj
@@ -1,5 +1,4 @@
-(ns lancet.step-1-repl
-    (:use clojure.contrib.except))
+(ns lancet.step-1-repl)
 
 ; START: ant-project
 (def
@@ -25,6 +24,7 @@
 ; END: instantiate-task
 
 ; START: safe-instantiate-task
+(use '[clojure.contrib.except :only (throw-if)])
 (defn safe-instantiate-task [project name]
   (let [task (.createTask project name)]
     (throw-if (nil? task) 
diff --git a/lancet/step_2_complete.clj b/lancet/step_2_complete.clj
@@ -24,7 +24,7 @@
 (defn set-property! [inst prop value]
   (let [pd (property-descriptor inst prop)]   
     (throw-if (nil? pd) (str "No such property " prop)) 
-    (.invoke (. pd getWriteMethod) inst (into-array [value])))) 
+    (.invoke (.getWriteMethod pd) inst (into-array [value])))) 
 
 (defn set-properties! [inst prop-map]
   (doseq [[k v] prop-map] (set-property! inst (name k) v))) 
diff --git a/lancet/step_2_repl.clj b/lancet/step_2_repl.clj
@@ -27,7 +27,7 @@
 (defn set-property! [inst prop value]
   (let [pd (property-descriptor inst prop)]   ; <label id="sequences.lancet.let"/> 
     (throw-if (nil? pd) (str "No such property " prop)) ; <label id="sequences.lancet.throw-if"/> 
-    (.invoke (. pd getWriteMethod) inst (into-array [value])))) ; <label id="sequences.lancet.into-array"/> 
+    (.invoke (.getWriteMethod pd) inst (into-array [value])))) ; <label id="sequences.lancet.into-array"/> 
 ; END: set-property!
 
 ; START: set-properties!
diff --git a/lancet/step_4_complete.clj b/lancet/step_4_complete.clj
@@ -3,15 +3,15 @@
 	lancet.step-2-complete lancet.step-3-complete))
 
 (defmacro has-run? [f]
-  `((:has-run (meta (var ~f)))))
+  `((:has-run-fn (meta (var ~f)))))
 
 (defmacro reset [f]
   `((:reset-fn (meta (var ~f)))))
 
 (defmacro deftarget [sym doc & forms]
-  (let [has-run (gensym "hr-") reset-fn (gensym "rf-")]
-    `(let [[~has-run ~reset-fn once-fn#] (runonce (fn [] ~@forms))]
-       (def ~(with-meta sym {:doc doc :has-run has-run :reset-fn reset-fn}) 
+  (let [has-run-fn (gensym "hr-") reset-fn (gensym "rf-")]
+    `(let [[~has-run-fn ~reset-fn once-fn#] (runonce (fn [] ~@forms))]
+       (def ~(with-meta sym {:doc doc :has-run-fn has-run-fn :reset-fn reset-fn}) 
 	    once-fn#))))
 
 (defmacro define-ant-task [clj-name ant-name]
@@ -20,14 +20,11 @@
        (.execute task#)
        task#)))
 
-(defn task-names [] (map symbol (seq (.. ant-project getTaskDefinitions keySet))))
+(defn task-names [] (map symbol (sort (.. ant-project getTaskDefinitions keySet))))
 
 (defn safe-ant-name [n]
   (if (ns-resolve 'clojure.core n) (symbol (str "ant-" n)) n))
 
-(defmacro define-all-ant-tasks []
-  `(do ~@(map (fn [n] `(define-ant-task ~n ~n)) (task-names))))
-
 (defmacro define-all-ant-tasks []
   `(do ~@(map (fn [n] `(define-ant-task ~(safe-ant-name n) ~n)) (task-names))))
 
diff --git a/lancet/step_4_repl.clj b/lancet/step_4_repl.clj
@@ -3,14 +3,14 @@
 
 ; START: has-run-fn
 (defn has-run? [v]
-  ((:has-run (meta v))))
+  ((:has-run-fn (meta v))))
 ; END: has-run-fn
 
 (def has-run-fn has-run?)
 
 ; START: has-run-macro
 (defmacro has-run? [f]
-  `((:has-run (meta (var ~f)))))
+  `((:has-run-fn (meta (var ~f)))))
 ; END: has-run-macro
 
 ; START: reset
@@ -20,9 +20,11 @@
 
 ; START: deftarget
 (defmacro deftarget [sym doc & forms]
-  (let [has-run (gensym "hr-") reset-fn (gensym "rf-")]
-    `(let [[~has-run ~reset-fn once-fn#] (runonce (fn [] ~@forms))]
-       (def ~(with-meta sym {:doc doc :has-run has-run :reset-fn reset-fn}) 
+  (let [has-run-fn (gensym "hr-") reset-fn (gensym "rf-")]
+    `(let [[~has-run-fn ~reset-fn once-fn#] (runonce (fn [] ~@forms))]
+       (def ~(with-meta 
+	      sym 
+	      {:doc doc :has-run-fn has-run-fn :reset-fn reset-fn}) 
 	    once-fn#))))
 ; END: deftarget
 
@@ -36,7 +38,7 @@
 
 ; START: task-names
 (defn task-names [] 
-  (map symbol (seq (.. ant-project getTaskDefinitions keySet))))
+  (map symbol (sort (.. ant-project getTaskDefinitions keySet))))
 ; END: task-names
 
 ; START: safe-ant-name
diff --git a/lancet/step_5_complete.clj b/lancet/step_5_complete.clj
@@ -37,7 +37,7 @@
 (defn set-property! [inst prop value]
   (let [pd (property-descriptor inst prop)]
     (throw-if (nil? pd) (str "No such property " prop))
-    (let [write-method (. pd getWriteMethod)
+    (let [write-method (.getWriteMethod pd)
 	  dest-class (get-property-class write-method)]
       (.invoke write-method inst (into-array [(coerce dest-class value)])))))
 
diff --git a/lancet/step_5_repl.clj b/lancet/step_5_repl.clj
@@ -48,7 +48,7 @@
 (defn set-property! [inst prop value]
   (let [pd (property-descriptor inst prop)]
     (throw-if (nil? pd) (str "No such property " prop))
-    (let [write-method (. pd getWriteMethod)
+    (let [write-method (.getWriteMethod pd)
 	  dest-class (get-property-class write-method)]
       (.invoke write-method inst (into-array [(coerce dest-class value)])))))
 ; END: set-property
diff --git a/lancet/test/step_4_complete.clj b/lancet/test/step_4_complete.clj
@@ -5,18 +5,17 @@
 ;; Predicates
 
 (deftest test-has-run?
-  (def #^{:has-run (fn [] :bang)} fn#)
+  (def #^{:has-run-fn (fn [] :bang)} fn#)
   (is (= :bang (has-run? fn#))))
 
 (deftest test-reset
   (def #^{:reset-fn (fn [] :zap)} fn#)
   (is (= :zap (reset fn#))))
 
 (deftest test-task-names
-  (let [some-names #{'echo 'mkdir}]
-    (is (= 
-	 (intersection (into #{} (task-names)) some-names) 
-	 some-names))))
+  (is (=
+       (take 6 (task-names))
+       '(ant antcall antstructure apply apt available))))
 
 (deftest test-safe-ant-name
   (is (= (safe-ant-name 'echo) 'echo))
diff --git a/lancet/test/step_4_repl.clj b/lancet/test/step_4_repl.clj
@@ -5,22 +5,22 @@
 ;; Predicates
 
 (deftest test-has-run-fn
-  (let [x (with-meta [] {:has-run (fn [] :boo)})]
+  (let [x (with-meta [] {:has-run-fn (fn [] :boo)})]
     (is (= :boo (has-run-fn x)))))
 
 (deftest test-has-run?
-  (def #^{:has-run (fn [] :bang)} fn#)
+  (def #^{:has-run-fn (fn [] :bang)} fn#)
   (is (= :bang (has-run? fn#))))
 
 (deftest test-reset
   (def #^{:reset-fn (fn [] :zap)} fn#)
   (is (= :zap (reset fn#))))
 
 (deftest test-task-names
-  (let [some-names #{'echo 'mkdir}]
-    (is (=
-	 (intersection (into #{} (task-names)) some-names) 
-	 some-names))))
+  (is (=
+       (take 6 (task-names))
+       '(ant antcall antstructure apply apt available))))
+
 
 (deftest test-safe-ant-name
   (is (= (safe-ant-name 'echo) 'echo))
