disable --output; move :expansion to compiler

xkxx · xkxx · commit 6abfcd4e3f23 · 2014-05-07T16:26:03.000-07:00
diff --git a/src/compiler.wisp b/src/compiler.wisp
@@ -2,9 +2,9 @@
   (:require [wisp.analyzer :refer [analyze]]
             [wisp.reader :refer [read* read push-back-reader]]
             [wisp.string :refer [replace]]
-            [wisp.sequence :refer [map conj cons vec first rest empty? count]]
+            [wisp.sequence :refer [map reduce conj cons vec first rest empty? count]]
             [wisp.runtime :refer [error?]]
-            [wisp.ast :refer [name]]
+            [wisp.ast :refer [pr-str name]]
 
             [wisp.backend.escodegen.generator :refer [generate]
                                               :rename {generate generate-js}]
@@ -82,9 +82,15 @@
                                                (:ast ast))))
                     (catch error {:error error})))
 
+         expansion (if (identical? :expansion (:print options))
+                     (reduce (fn [result item]
+                                  (str result (pr-str (.-form item)) "\n"))
+                                  "" (.-ast ast)))
+
          result {:source-uri source-uri
                  :ast (:ast ast)
-                 :forms (:forms forms)}]
+                 :forms (:forms forms)
+                 :expansion expansion}]
      (conj options output result))))
 
 (defn evaluate
diff --git a/src/wisp.wisp b/src/wisp.wisp
@@ -39,9 +39,7 @@
         output (compile source options)
         content (cond
                   (= channel :code) (:code output)
-                  (= channel :expansion) (reduce (fn [result item]
-                                               (str result (pr-str (.-form item)) "\n"))
-                                             "" (.-ast output))
+                  (= channel :expansion) (:expansion output)
                   :else (JSON.stringify (get output channel) 2 2))]
     (if (and (:output options) (:source-uri options) content)
       (writeFileSync (path.join (.-output options) ;; `join` relies on `path`
@@ -83,7 +81,7 @@
       (.option "-c, --compile"       "Compile to JavaScript and save as .js files")
       (.option "-i, --interactive"   "Run an interactive wisp REPL")
       (.option "--debug, --print <type>"    "Print debug information. Possible values are `expansion`,`forms`, `ast` and `js-ast`")
-      (.option "-o, --output <dir>"  "Output to specified directory")
+      ;(.option "-o, --output <dir>"  "Output to specified directory")
       (.option "--no-map"            "Disable source map generation")
       (.parse process.argv))
     (set! (aget options "no-map") (not (aget options "map"))) ;; commander auto translates to camelCase
