@@ -34,23 +34,23 @@ variable #expecteds.f create expecteds.f[] 32 floats allot
3434: (different$) { r* e* a* 's '@ '. }
3535 r* @ if ." Expected " 0 r* @ -do e* i 1- 's ^ + '@ ^ '. ^ 1 -loop ." , got " 0 r* @ -do a* i 1- 's ^ + '@ ^ '. ^ 1 -loop cr then ;
3636
37- : different$ #expecteds expecteds[] actuals[] ['] cells ['] @ ['] . (different$) ;
38- : fdifferent $ #expecteds.f expecteds.f[] actuals.f[] ['] floats ['] f@ ['] f. (different$) ;
37+ : different$ #expecteds expecteds[] actuals[] ['] cells ['] @ ['] . (different$) ;
38+ : different.f $ #expecteds.f expecteds.f[] actuals.f[] ['] floats ['] f@ ['] f. (different$) ;
3939
40- : (nresults $) { #e #a s* s# }
40+ : (#results $) { #e #a s* s# }
4141 #e #a - if
4242 ." Wrong number of " s* s# type ." results, expected " #e .
4343 ." , got " #a dup 0< if negate ." a " . s* s# type ." stack underflow" else . then cr
4444 then ;
4545
46- : nresults$ #expecteds @ #actuals @ s" cell " (nresults $) ;
47- : fnresults $ #expecteds.f @ #actuals.f @ s" float " (nresults $) ;
46+ : #results$ #expecteds @ #actuals @ s" cell " (#results $) ;
47+ : #results.f $ #expecteds.f @ #actuals.f @ s" float " (#results $) ;
4848
49- variable ^passed ' passed$ ^passed !
50- variable ^different ' different$ ^different !
51- variable ^fdifferent ' fdifferent $ ^fdifferent !
52- variable ^nresults ' nresults $ ^nresults !
53- variable ^fnresults ' fnresults $ ^fnresults !
49+ variable ^passed ' passed$ ^passed !
50+ variable ^different ' different$ ^different !
51+ variable ^different.f ' different.f $ ^different.f !
52+ variable ^#results ' #results $ ^#results !
53+ variable ^#results.f ' #results.f $ ^#results.f !
5454
5555: <{ depth start-depth ! fdepth start-fdepth ! ;
5656
@@ -84,13 +84,13 @@ variable #passed variable #failed variable #results
8484
8585: }>
8686 #passed 0! #failed 0! #results 0! \ user code has already finished running here
87- depth start-depth @ - dup #expecteds ! #actuals @ cell expecteds[] actuals[] ['] compare compare-results \ compare cell stack
87+ depth start-depth @ - dup #expecteds ! #actuals @ cell expecteds[] actuals[] ['] compare compare-results \ compare cells
8888 restore-stack
89- fdepth start-fdepth @ - dup #expecteds.f ! #actuals.f @ float expecteds.f[] actuals.f[] ['] compare.f compare-results \ compare float stack
89+ fdepth start-fdepth @ - dup #expecteds.f ! #actuals.f @ float expecteds.f[] actuals.f[] ['] compare.f compare-results \ compare floats
9090 restore-fstack
9191 \ pass test results to framework
9292 #results @ #failed @ + if failed#
93- #results @ if ^nresults @^ ^fnresults @^ else #failed @ if ^different @^ ^fdifferent @^ then then
93+ #results @ if ^#results @^ ^#results.f @^ else #failed @ if ^different @^ ^different.f @^ then then
9494 else #passed @ 2 = if passed# ^passed @^ then then ;
9595
96963037000493 constant #m \ prime number < sqrt (2^63-1)
0 commit comments