Merge pull request wisp-lang#97 from xkxx/master

Gozala · Gozala · commit 666e220c5eea · 2014-05-07T16:45:42.000-07:00
use commander.js for args handling; add --ast and --js-ast for debugging...
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
   },
   "dependencies": {
     "escodegen": "git://github.com/Constellation/escodegen.git#master",
-    "base64-encode": "~1.0.1"
+    "base64-encode": "~1.0.1",
+    "commander": ">=2.2.0"
   }
 }
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
@@ -4,6 +4,7 @@
   (:require [fs :refer [createReadStream]]
             [path :refer [basename dirname join resolve]]
             [module :refer [Module]]
+            [commander]
 
             [wisp.string :refer [split join upper-case replace]]
             [wisp.sequence :refer [first second last count reduce rest
@@ -15,41 +16,12 @@
             [wisp.ast :refer [pr-str name]]
             [wisp.compiler :refer [compile]]))
 
-
-(defn flag?
-  [param]
-  ;; HACK: Workaround for segfault #6691
-  (identical? (subs param 0 2) (name :--)))
-
-(defn flag->key
-  [flag]
-  (subs flag 2))
-
-;; Just mungle all the `--param value` pairs into global *env* hash.
-(defn parse-params
-  [params]
-  (loop [input params
-         output {}]
-    (if (empty? input)
-      output
-      (let [name (first input)
-            value (second input)]
-        (if (flag? name)
-          (if (or (nil? value) (flag? value))
-            (recur (rest input)
-                   (assoc output (flag->key name) true))
-            (recur (drop 2 input)
-                   (assoc output (flag->key name) value)))
-          (recur (rest input)
-                 output))))))
-
-
-
 (defn compile-stdin
   [options]
   (with-stream-content process.stdin
                        compile-string
-                       options))
+                       (conj {} options)))
+;; (conj {:source-uri options}) causes segfault for some reason
 
 (defn compile-file
   [path options]
@@ -61,11 +33,12 @@
   [source options]
   (let [channel (or (:print options) :code)
         output (compile source options)
-        content (if (= channel :code)
-                  (:code output)
-                  (JSON.stringify (get output channel) 2 2))]
-    (.write process.stdout (or content "nil"))
-    (if (:error output) (throw (:error output)))))
+        content (cond
+                  (= channel :code) (:code output)
+                  (= channel :expansion) (:expansion output)
+                  :else (JSON.stringify (get output channel) 2 2))]
+      (.write process.stdout (or content "nil"))
+    (if (:error output) (throw (.-error output)))))
 
 (defn with-stream-content
   [input resume options]
@@ -82,13 +55,31 @@
   ;; https://github.com/joyent/node/blob/master/lib/module.js#L489-493
   (Module._load (resolve path) null true))
 
+(defmacro ->
+  [& operations]
+  (reduce
+   (fn [form operation]
+     (cons (first operation)
+           (cons form (rest operation))))
+   (first operations)
+   (rest operations)))
 
 (defn main
   []
-  (let [options (parse-params (drop 2 process.argv))]
-    (cond (:run options) (run (:run options))
+  (let [options commander]
+    (-> options
+      (.usage "[options] <file ...>")
+      (.option "-r, --run"           "Compile and execute the file")
+      (.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 "--no-map"            "Disable source map generation")
+      (.parse process.argv))
+    (set! (aget options "no-map") (not (aget options "map"))) ;; commander auto translates to camelCase
+    (cond options.run (run (get options.args 0))
           (not process.stdin.isTTY) (compile-stdin options)
-          (< (count process.argv) 3) (start-repl)
-          (and (= (count process.argv) 3)
-               (not (flag? (last process.argv)))) (run (last process.argv))
-          (:compile options) (compile-file (:compile options) options))))
+          options.interactive (start-repl)
+          options.compile (compile-file (get options.args 0) options)
+          options.args (run options.args)
+          :else (start-repl)
+   )))

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`},`
`49`	`49`	`"dependencies": {`
`50`	`50`	`"escodegen": "git://github.com/Constellation/escodegen.git#master",`
`51`		`- "base64-encode": "~1.0.1"`
	`51`	`+ "base64-encode": "~1.0.1",`
	`52`	`+ "commander": ">=2.2.0"`
`52`	`53`	`}`
`53`	`54`	`}`