bump to tools.reader 0.10.0-apha3

add executable comments to cljs.js and add supporting files

Author: swannodette

pom.template.xml

@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.clojure</groupId>
             <artifactId>tools.reader</artifactId>
-            <version>0.9.2</version>
+            <version>0.10.0-alpha3</version>
         </dependency>
     </dependencies>
 

project.clj

@@ -10,7 +10,7 @@
   :test-paths ["src/test/clojure" "src/test/cljs"]
   :dependencies [[org.clojure/clojure "1.7.0"]
                  [org.clojure/data.json "0.2.6"]
-                 [org.clojure/tools.reader "0.9.2"]
+                 [org.clojure/tools.reader "0.10.0-alpha3"]
                  [org.clojure/google-closure-library "0.0-20150505-021ed5b3"]
                  [com.google.javascript/closure-compiler "v20150609"]
                  [org.mozilla/rhino "1.7R5"]]

script/bootstrap

@@ -7,7 +7,7 @@ CLOSURE_RELEASE="20150609"
 DJSON_RELEASE="0.2.6"
 GCLOSURE_LIB_RELEASE="0.0-20150505-021ed5b3"
 RHINO_RELEASE="1_7R5"
-TREADER_RELEASE="0.9.2"
+TREADER_RELEASE="0.10.0-alpha3"
 
 # check dependencies
 curl -V >/dev/null  || { echo "cURL is missing, or not on your system path."; exit 1; }

src/main/cljs/cljs/js.cljs

@@ -731,4 +731,127 @@
       :*load-macros*  (or (:load-macros opts) true)
       :*load-fn*      (or (:load opts) *load-fn*)
       :*eval-fn*      (or (:eval opts) *eval-fn*)}
-     source name opts cb)))
+     source name opts cb)))
+
+(comment
+  (ns cljs.js.test
+    (:require [cljs.js :as cljs]))
+
+  (def vm (js/require "vm"))
+  (def fs (js/require "fs"))
+  (def st (cljs/empty-state))
+
+  (defn node-eval [{:keys [name source]}]
+    (.runInThisContext vm source (str (munge name) ".js")))
+
+  (def libs
+    {'bootstrap-test.core :cljs
+     'bootstrap-test.macros :clj})
+
+  (defn node-load [{:keys [name macros]} cb]
+    (if (contains? libs name)
+      (let [path (str "src/test/" (cljs/ns->relpath name)
+                   "." (cljs.core/name (get libs name)))]
+        (.readFile fs path "utf-8"
+          (fn [err src]
+            (cb (if-not err
+                  {:lang :clj :source src}
+                  (.error js/console err))))))
+      (cb nil)))
+
+  (cljs/eval st '(defn foo [a b] (+ a b))
+    {:eval cljs/js-eval}
+    (fn [res]
+      (println res)))
+
+  (cljs/compile st "(defprotocol IFoo (foo [this]))"
+    (fn [js-source]
+      (println "Source:")
+      (println js-source)))
+
+  (cljs/eval-str st
+    "(defn foo [a b] (+ a b))
+     (defn bar [c d] (+ c d))"
+    nil
+    {:eval cljs/js-eval}
+    (fn [res]
+      (println res)))
+
+  (cljs/eval-str st "1"
+    nil
+    {:eval cljs/js-eval
+     :context :expr}
+    (fn [res]
+      (println res)))
+
+  (cljs/eval-str st "(def x 1)"
+    nil
+    {:eval cljs/js-eval
+     :context :expr
+     :def-emits-var true}
+    (fn [res]
+      (println res)))
+
+  (cljs/eval st '(ns foo.bar)
+    {:eval cljs/js-eval}
+    (fn [res]
+      (println res)))
+
+  (cljs/compile st "(defn foo\n[a b]\n(+ a b))" 'cljs.foo
+    {:verbose true :source-map true}
+    (fn [js-source]
+      (println "Source:")
+      (println js-source)))
+
+  (cljs/eval-str st
+    "(ns foo.bar (:require [bootstrap-test.core]))\n(bootstrap-test.core/foo 3 4)"
+    'foo.bar
+    {:verbose true
+     :source-map true
+     :eval node-eval
+     :load node-load}
+    (fn [ret]
+      (println ret)))
+
+  (cljs/eval-str st
+    "(ns foo.bar (:require-macros [bootstrap-test.macros :refer [foo]]))\n(foo 4 4)"
+    'foo.bar
+    {:verbose true
+     :source-map true
+     :eval node-eval
+     :load node-load}
+    (fn [{:keys [error] :as res}]
+      (if error
+        (do
+          (println error)
+          (println (.. error -cause -stack)))
+        (println res))))
+
+  (cljs/eval-str st
+    "(ns foo.bar)\n(first [1 2 3])"
+    'foo.bar
+    {:verbose true
+     :source-map true
+     :eval node-eval
+     :load node-load}
+    (fn [{:keys [error] :as res}]
+      (if error
+        (do
+          (println error)
+          (println (.. error -cause -stack)))
+        (println res))))
+
+  (cljs/eval-str st
+    "(ns foo.bar)\n(map inc [1 2 3])"
+    'foo.bar
+    {:verbose true
+     :source-map true
+     :eval node-eval
+     :load node-load}
+    (fn [{:keys [error] :as res}]
+      (if error
+        (do
+          (println error)
+          (println (.. error -cause -stack)))
+        (println res))))
+  )

src/test/bootstrap_test/core.cljs

@@ -0,0 +1,4 @@
+(ns bootstrap-test.core)
+
+(defn foo [c d]
+  (* c d))

src/test/bootstrap_test/macros.clj

@@ -0,0 +1,4 @@
+(ns bootstrap-test.macros)
+
+(defmacro foo [a b]
+  `(* ~a ~b))