Skip to content

Commit 760fce9

Browse files
rfindlerrfindler
committed
fix test case results
1 parent a5ff171 commit 760fce9

File tree

3 files changed

+49
-48
lines changed

3 files changed

+49
-48
lines changed

‎redex-test/redex/tests/core-layout-test.rkt‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
(reset-count)
1414

1515
(let ([content
16-
(list (make-lw 'x 15 1 35 0 #f #f)
16+
(list (make-lw 'x 15 1 35 0 #f #f #f)
1717
(make-lw (list
18-
(make-lw "(" 15 0 35 1 #f #f)
19-
(make-lw 'a 15 0 36 1 #f #f)
20-
(make-lw 'b 16 0 36 1 #f #f)
21-
(make-lw ")" 16 0 37 1 #f #f))
22-
15 1 35 3 #f #f))])
18+
(make-lw "(" 15 0 35 1 #f #f #f)
19+
(make-lw 'a 15 0 36 1 #f #f #f)
20+
(make-lw 'b 16 0 36 1 #f #f #f)
21+
(make-lw ")" 16 0 37 1 #f #f #f))
22+
15 1 35 3 #f #f #f))])
2323
(test (find-enclosing-loc-wrapper content)
2424
(build-lw content
2525
15 1 35 3)))
@@ -43,15 +43,15 @@
4343
(a b c))))))
4444
(list (make-line 0
4545
(list (make-spacer-token 0 2)
46-
(make-string-token 2 1 "(" 'roman)
47-
(make-string-token 3 1 "a" 'swiss)
48-
(make-string-token 4 1 " " 'roman)
49-
(make-string-token 5 1 "b" 'swiss)
50-
(make-string-token 6 1 " " 'roman)
51-
(make-string-token 7 1 "c" 'swiss)
52-
(make-string-token 8 1 ")" 'roman)))
46+
(make-string-token 2 1 "(" 'roman #f)
47+
(make-string-token 3 1 "a" 'swiss #f)
48+
(make-string-token 4 1 " " 'roman #f)
49+
(make-string-token 5 1 "b" 'swiss #f)
50+
(make-string-token 6 1 " " 'roman #f)
51+
(make-string-token 7 1 "c" 'swiss #f)
52+
(make-string-token 8 1 ")" 'roman #f)))
5353
(make-line 0
54-
(list (make-string-token 0 0 "" 'roman)
54+
(list (make-string-token 0 0 "" 'roman #f)
5555
(make-pict-token 0 1 'pict)
5656
(make-pict-token 1 0 'pict)))))
5757

@@ -64,13 +64,13 @@
6464
(|+1| x))))))
6565
(list (make-line 0
6666
(list (make-spacer-token 0 2)
67-
(make-string-token 2 1 "(" 'roman)
68-
(make-string-token 3 4 "+1" '(italic . roman))
69-
(make-string-token 7 1 " " 'roman)
70-
(make-string-token 8 1 "x" 'swiss)
71-
(make-string-token 9 1 ")" 'roman)))
67+
(make-string-token 2 1 "(" 'roman #f)
68+
(make-string-token 3 4 "+1" '(italic . roman) #f)
69+
(make-string-token 7 1 " " 'roman #f)
70+
(make-string-token 8 1 "x" 'swiss #f)
71+
(make-string-token 9 1 ")" 'roman #f)))
7272
(make-line 0
73-
(list (make-string-token 0 0 "" 'roman)
73+
(list (make-string-token 0 0 "" 'roman #f)
7474
(make-pict-token 0 1 'pict)
7575
(make-pict-token 1 0 'pict)))))
7676

@@ -84,16 +84,16 @@
8484
c))))))
8585
(list (make-line 1
8686
(list (make-spacer-token 0 5)
87-
(make-string-token 5 1 "c" 'swiss)
88-
(make-string-token 6 1 ")" 'roman)))
87+
(make-string-token 5 1 "c" 'swiss #f)
88+
(make-string-token 6 1 ")" 'roman #f)))
8989
(make-line 0
9090
(list (make-spacer-token 0 2)
91-
(make-string-token 2 1 "(" 'roman)
92-
(make-string-token 3 1 "a" 'swiss)
93-
(make-string-token 4 1 " " 'roman)
94-
(make-string-token 5 1 "b" 'swiss)))
91+
(make-string-token 2 1 "(" 'roman #f)
92+
(make-string-token 3 1 "a" 'swiss #f)
93+
(make-string-token 4 1 " " 'roman #f)
94+
(make-string-token 5 1 "b" 'swiss #f)))
9595
(make-line 0
96-
(list (make-string-token 0 0 "" 'roman)
96+
(list (make-string-token 0 0 "" 'roman #f)
9797
(make-pict-token 0 1 'pict)
9898
(make-pict-token 1 0 'pict)))))
9999

‎redex-test/redex/tests/lw-test.rkt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
(build-lw "#f" 0 0 0 2))
7373

7474
(test (normalize-lw (to-lw/uq ()))
75-
(make-lw (list (make-lw "(" 0 0 0 1 #t #f)
76-
(make-lw ")" 0 0 1 1 #t #f))
77-
0 0 0 2 #t #f))
75+
(make-lw (list (make-lw "(" 0 0 0 1 #t #f #f)
76+
(make-lw ")" 0 0 1 1 #t #f #f))
77+
0 0 0 2 #t #f #f))
7878

7979
(test (normalize-lw (to-lw (a)))
8080
(build-lw (list (build-lw "(" 0 0 0 1)
@@ -187,39 +187,39 @@
187187
(test (normalize-lw (to-lw ,x))
188188
(make-lw
189189
(list
190-
(make-lw "" 0 0 0 0 #f #f)
190+
(make-lw "" 0 0 0 0 #f #f #f)
191191
'spring
192-
(make-lw 'x 0 0 1 1 #t #f))
193-
0 0 0 2 #f #f))
192+
(make-lw 'x 0 0 1 1 #t #f #f))
193+
0 0 0 2 #f #f #f))
194194

195195
(test (normalize-lw (to-lw ,@x))
196196
(make-lw
197197
(list
198-
(make-lw "" 0 0 0 0 #f #f)
198+
(make-lw "" 0 0 0 0 #f #f #f)
199199
'spring
200-
(make-lw 'x 0 0 2 1 #t #f))
201-
0 0 0 3 #f #f))
200+
(make-lw 'x 0 0 2 1 #t #f #f))
201+
0 0 0 3 #f #f #f))
202202

203203
(test (normalize-lw (to-lw 'x))
204204
(make-lw
205205
(list
206-
(make-lw "'" 0 0 0 1 #f #f)
206+
(make-lw "'" 0 0 0 1 #f #f #f)
207207
'spring
208-
(make-lw 'x 0 0 1 1 #f #f))
209-
0 0 0 2 #f #f))
208+
(make-lw 'x 0 0 1 1 #f #f #f))
209+
0 0 0 2 #f #f #f))
210210

211211
(test (normalize-lw (to-lw ,(term x)))
212212
(make-lw
213213
(list
214-
(make-lw "" 0 0 0 0 #f #f)
214+
(make-lw "" 0 0 0 0 #f #f #f)
215215
'spring
216216
(make-lw
217217
(list
218-
(make-lw "" 0 0 1 0 #t #f)
218+
(make-lw "" 0 0 1 0 #t #f #f)
219219
'spring
220-
(make-lw 'x 0 0 7 1 #f #f))
221-
0 0 1 7 #t #f))
222-
0 0 0 8 #f #f))
220+
(make-lw 'x 0 0 7 1 #f #f #f))
221+
0 0 1 7 #t #f #f))
222+
0 0 0 8 #f #f #f))
223223

224224
(test (normalize-lw (to-lw (term x)))
225225
(build-lw
@@ -280,11 +280,11 @@
280280
'spring
281281
(make-lw
282282
(list
283-
(make-lw "," 0 0 1 1 #t #f)
283+
(make-lw "," 0 0 1 1 #t #f #f)
284284
'spring
285-
(make-lw 'x 0 0 2 1 #t #f))
285+
(make-lw 'x 0 0 2 1 #t #f #f))
286286
0 0 1 2
287-
#t #f))
287+
#t #f #f))
288288
0 0 0 3))
289289

290290
(test (map lw-e (lw-e (to-lw (#t #true #f #false))))

‎redex-test/redex/tests/private/lw-test-util.rkt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
(- (lw-column lw) min-column)
1515
(lw-column-span lw)
1616
(lw-unq? lw)
17-
(lw-metafunction? lw))]
17+
(lw-metafunction? lw)
18+
(lw-pict-tag lw))]
1819
[else lw]))
1920
(define (normalize/e e)
2021
(cond

0 commit comments

Comments
 (0)