File tree Expand file tree Collapse file tree 7 files changed +58
-4
lines changed Expand file tree Collapse file tree 7 files changed +58
-4
lines changed Original file line number Diff line number Diff line change 50
50
<dependency >
51
51
<groupId >org.clojure</groupId >
52
52
<artifactId >tools.reader</artifactId >
53
- <version >1.0.3 </version >
53
+ <version >1.0.5 </version >
54
54
</dependency >
55
55
<dependency >
56
56
<groupId >org.clojure</groupId >
Original file line number Diff line number Diff line change 10
10
:test-paths [" src/test/clojure" " src/test/cljs" " src/test/self" " src/test/cljs_cp" ]
11
11
:dependencies [[org.clojure/clojure " 1.8.0" ]
12
12
[org.clojure/data.json " 0.2.6" ]
13
- [org.clojure/tools.reader " 1.0.3 " ]
13
+ [org.clojure/tools.reader " 1.0.5 " ]
14
14
[org.clojure/test.check " 0.10.0-alpha2" :scope " test" ]
15
15
[com.cognitect/transit-clj " 0.8.300" ]
16
16
[org.clojure/google-closure-library " 0.0-20170519-fa0499ef" ]
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ DJSON_RELEASE="0.2.6"
10
10
TRANSIT_RELEASE=" 0.8.300"
11
11
GCLOSURE_LIB_RELEASE=" 0.0-20160609-f42b4a24"
12
12
RHINO_RELEASE=" 1_7R5"
13
- TREADER_RELEASE=" 1.0.3 "
13
+ TREADER_RELEASE=" 1.0.5 "
14
14
TEST_CHECK_RELEASE=" 0.10.0-alpha2"
15
15
16
16
# check dependencies
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ if [ "$CLOJURESCRIPT_HOME" = "" ]; then
5
5
fi
6
6
7
7
CLJSC_CP=' '
8
- for next in lib/* : src/main/clojure: src/main/cljs: test/cljs; do
8
+ for next in lib/* : src/main/clojure: src/main/cljs: src/ test/cljs; do
9
9
CLJSC_CP=$CLJSC_CP$CLOJURESCRIPT_HOME ' /' $next
10
10
done
11
11
Original file line number Diff line number Diff line change
1
+ (ns cljs.macro-test.cljs2261 )
2
+
3
+ (defmacro cake []
4
+ `(X.))
Original file line number Diff line number Diff line change
1
+ (ns cljs.macro-test.cljs2261 )
2
+
3
+ (defrecord X [])
Original file line number Diff line number Diff line change 1129
1129
(is (some? (re-find #"foo\. core\. global\$ module\$ calculator = goog.global.Calculator;\s null;" source)))
1130
1130
(inc! l)))))))
1131
1131
1132
+ (deftest test-cljs-2261
1133
+ (async done
1134
+ (let [st (cljs/empty-state )
1135
+ l (latch 2 done)]
1136
+ (cljs/eval st '(ns bar.core2261a
1137
+ (:require [foo.core2261a :refer-macros [cake]]))
1138
+ {:ns 'cljs.user
1139
+ :eval node-eval
1140
+ :context :expr
1141
+ :load (fn [{:keys [macros]} cb]
1142
+ (if macros
1143
+ (cb {:lang :clj
1144
+ :source " (ns foo.core2261a) (defmacro cake [] `(->X))" })
1145
+ (cb {:lang :clj
1146
+ :source " (ns foo.core2261a) (defrecord X [])" })))}
1147
+ (fn [{:keys [error]}]
1148
+ (is (nil? error))
1149
+ (cljs/eval-str st " (pr-str (cake))" nil
1150
+ {:ns 'bar.core2261a
1151
+ :eval node-eval
1152
+ :context :expr }
1153
+ (fn [{:keys [error value]}]
1154
+ (is (nil? error))
1155
+ (is (= " #foo.core2261a.X{}" value))
1156
+ (inc! l)))))
1157
+ (cljs/eval st '(ns bar.core2261b
1158
+ (:require [foo.core2261b :refer-macros [cake]]))
1159
+ {:ns 'cljs.user
1160
+ :eval node-eval
1161
+ :context :expr
1162
+ :load (fn [{:keys [macros]} cb]
1163
+ (if macros
1164
+ (cb {:lang :clj
1165
+ :source " (ns foo.core2261b) (defmacro cake [] `(X.))" })
1166
+ (cb {:lang :clj
1167
+ :source " (ns foo.core2261b) (defrecord X [])" })))}
1168
+ (fn [{:keys [error]}]
1169
+ (is (nil? error))
1170
+ (cljs/eval-str st " (pr-str (cake))" nil
1171
+ {:ns 'bar.core2261b
1172
+ :eval node-eval
1173
+ :context :expr }
1174
+ (fn [{:keys [error value]}]
1175
+ (is (nil? error))
1176
+ (is (= " #foo.core2261b.X{}" value))
1177
+ (inc! l))))))))
1178
+
1132
1179
(defn -main [& args]
1133
1180
(run-tests ))
1134
1181
You can’t perform that action at this time.
0 commit comments