Skip to content

Commit 25e31c4

Browse files
committed
Eliminate the unnecessary quoting of xtmtest-* forms
Since we've removed the double eval from xtmtest and xtmtest-compile, we can now fix all the tests to stop quoting their 'form' arguments. 'tests/all-core.xtm' is still passing.
1 parent 0d97ddd commit 25e31c4

13 files changed

+421
-421
lines changed

tests/core/adt.xtm

+94-94
Large diffs are not rendered by default.

tests/core/algebraic_data_types.xtm

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
(ADRect ADPoint{!a}* !a !a))
1515

1616
(xtmtest
17-
'(bind-func algdt_test1
17+
(bind-func algdt_test1
1818
(lambda ()
1919
(let ((p1 (ADPoint2D 11 12))
2020
(circle (ADCircle p1 5:i64))
@@ -38,14 +38,14 @@
3838
(ADRight !b))
3939

4040
(xtmtest-compile
41-
'(bind-func algdt_test2:[ADEither{i64,String*}*,i1]*
41+
(bind-func algdt_test2:[ADEither{i64,String*}*,i1]*
4242
(lambda (choice)
4343
(if choice
4444
(ADLeft 100)
4545
(ADRight '100')))))
4646

4747
(xtmtest
48-
'(bind-func algdt_test3
48+
(bind-func algdt_test3
4949
(lambda ()
5050
(let ((res (algdt_test2 #f)))
5151
(ADRight$ res (x) (println x) (println "wrong"))
@@ -176,7 +176,7 @@
176176

177177
;; list test 1
178178
(xtmtest
179-
'(bind-func algdt_test4
179+
(bind-func algdt_test4
180180
(lambda ()
181181
(let ((l1 (ADCons 1 (ADCons 2 (ADNil)))))
182182
(println 'l1 '= l1))))
@@ -185,7 +185,7 @@
185185

186186
;; list test 2
187187
(xtmtest
188-
'(bind-func algdt_test5
188+
(bind-func algdt_test5
189189
(lambda ()
190190
(let ((l1 (ADCons 1 (ADCons 2 (ADNil))))
191191
(l2 (fmap (lambda (x) (* x x)) l1)))
@@ -194,7 +194,7 @@
194194

195195
;; list test 3
196196
(xtmtest
197-
'(bind-func algdt_test6
197+
(bind-func algdt_test6
198198
(lambda ()
199199
(let ((l1 (ADCons 1 (ADCons 2 (ADNil))))
200200
(l3 (fmap (lambda (x) (ADCons x (ADCons x (ADNil)))) l1)))
@@ -227,14 +227,14 @@
227227
(Str "()"))))
228228

229229
(xtmtest-compile
230-
'(bind-func algdt_test8
230+
(bind-func algdt_test8
231231
(lambda ()
232232
(dolet ((x (adrange 1 2))
233233
(y (adrange 1 4)))
234234
(unit (ADPair x y))))))
235235

236236
(xtmtest
237-
'(bind-func algdt_test8b
237+
(bind-func algdt_test8b
238238
(lambda ()
239239
(println (algdt_test8))))
240240
(algdt_test8b))
@@ -322,7 +322,7 @@
322322

323323

324324
(xtmtest
325-
'(bind-func algdt_test9
325+
(bind-func algdt_test9
326326
(lambda ()
327327
(println (div_test (ADSome 125) (ADSome 25))
328328
(div_test 50 10)

tests/core/aot-compilation.xtm

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
;; bind-val
7878

7979
(xtmtest
80-
'(bind-func return_string_gv_with_docstring
80+
(bind-func return_string_gv_with_docstring
8181
(lambda ()
8282
string_gv_with_docstring))
8383
(string=? (cptr->string (return_string_gv_with_docstring)) "sgv")
@@ -90,7 +90,7 @@
9090
;; i8*, the string literal is the value (not the docstring)
9191

9292
(xtmtest
93-
'(bind-func return_string_gv_no_docstring
93+
(bind-func return_string_gv_no_docstring
9494
(lambda ()
9595
string_gv_no_docstring))
9696
(string=? (cptr->string (return_string_gv_no_docstring)) "sgv")
@@ -101,7 +101,7 @@
101101
#t)
102102

103103
(xtmtest
104-
'(bind-func return_string_gv_no_initval
104+
(bind-func return_string_gv_no_initval
105105
(lambda ()
106106
string_gv_no_initval))
107107
(string=? (cptr->string (return_string_gv_no_initval)) "")

0 commit comments

Comments
 (0)