Skip to content

Commit e0a137f

Browse files
committed
Adapt R7RS test suite to match LispKit's implementation (of optional features).
1 parent 65fb7d6 commit e0a137f

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

Sources/LispKit/Resources/Tests/R7RS.scm

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@
778778
(test #f (infinite? 3))
779779
(test #t (infinite? +inf.0))
780780
(test #f (infinite? +nan.0))
781-
(test #t (infinite? 3.0+inf.0i))
781+
#;(test #t (infinite? 3.0+inf.0i)) ;; INTENDED
782782

783783
(test #t (nan? +nan.0))
784784
(test #f (nan? 32))
@@ -2322,9 +2322,9 @@
23222322
(test-numeric-syntax "+InF.0" +inf.0 "+inf.0" "+Inf.0")
23232323
(test-numeric-syntax "-inf.0" -inf.0 "-inf.0" "-Inf.0")
23242324
(test-numeric-syntax "-iNF.0" -inf.0 "-inf.0" "-Inf.0")
2325-
(test-numeric-syntax "#i+nan.0" +nan.0 "+nan.0" "+NaN.0")
2326-
(test-numeric-syntax "#i+inf.0" +inf.0 "+inf.0" "+Inf.0")
2327-
(test-numeric-syntax "#i-inf.0" -inf.0 "-inf.0" "-Inf.0")
2325+
#;(test-numeric-syntax "#i+nan.0" +nan.0 "+nan.0" "+NaN.0") ;; INTENDED
2326+
#;(test-numeric-syntax "#i+inf.0" +inf.0 "+inf.0" "+Inf.0") ;; INTENDED
2327+
#;(test-numeric-syntax "#i-inf.0" -inf.0 "-inf.0" "-Inf.0") ;; INTENDED
23282328
;; Exact ratios
23292329
(test-numeric-syntax "1/2" (/ 1 2))
23302330
(test-numeric-syntax "#e1/2" (/ 1 2) "1/2")
@@ -2334,11 +2334,11 @@
23342334
(test-numeric-syntax "#e0/10" 0 "0")
23352335
(test-numeric-syntax "#i3/2" (/ 3.0 2.0) "1.5")
23362336
;; Exact complex
2337-
(test-numeric-syntax "1+2i" (make-rectangular 1 2))
2338-
(test-numeric-syntax "1+2I" (make-rectangular 1 2) "1+2i")
2339-
(test-numeric-syntax "1-2i" (make-rectangular 1 -2))
2340-
(test-numeric-syntax "-1+2i" (make-rectangular -1 2))
2341-
(test-numeric-syntax "-1-2i" (make-rectangular -1 -2))
2337+
(test-numeric-syntax "1+2i" (make-rectangular 1 2) "1.0+2.0i")
2338+
(test-numeric-syntax "1+2I" (make-rectangular 1 2) "1+2i" "1.0+2.0i")
2339+
(test-numeric-syntax "1-2i" (make-rectangular 1 -2) "1.0-2.0i")
2340+
(test-numeric-syntax "-1+2i" (make-rectangular -1 2) "-1.0+2.0i")
2341+
(test-numeric-syntax "-1-2i" (make-rectangular -1 -2) "-1.0-2.0i")
23422342
(test-numeric-syntax "+i" (make-rectangular 0 1) "+i" "+1i" "0+i" "0+1i" "0.0+1.0i")
23432343
(test-numeric-syntax "0+i" (make-rectangular 0 1) "+i" "+1i" "0+i" "0+1i" "0.0+1.0i")
23442344
(test-numeric-syntax "0+1i" (make-rectangular 0 1) "+i" "+1i" "0+i" "0+1i" "0.0+1.0i")
@@ -2362,11 +2362,11 @@
23622362
#;(test-numeric-syntax "0.5+3/4i" (make-rectangular 0.5 (/ 3 4))
23632363
"0.5+0.75i" ".5+.75i" "0.5+3/4i" ".5+3/4i" "500.0e-3+750.0e-3i") ;; INTENDED
23642364
;; Complex NaN, Inf (rectangular notation)
2365-
(test-numeric-syntax "+nan.0+nan.0i" (make-rectangular +nan.0 +nan.0) "+NaN.0+NaN.0i")
2366-
(test-numeric-syntax "+inf.0+inf.0i" (make-rectangular +inf.0 +inf.0) "+Inf.0+Inf.0i")
2367-
(test-numeric-syntax "-inf.0+inf.0i" (make-rectangular -inf.0 +inf.0) "-Inf.0+Inf.0i")
2368-
(test-numeric-syntax "-inf.0-inf.0i" (make-rectangular -inf.0 -inf.0) "-Inf.0-Inf.0i")
2369-
(test-numeric-syntax "+inf.0-inf.0i" (make-rectangular +inf.0 -inf.0) "+Inf.0-Inf.0i")
2365+
#;(test-numeric-syntax "+nan.0+nan.0i" (make-rectangular +nan.0 +nan.0) "+NaN.0+NaN.0i") ;; INTENDED
2366+
#;(test-numeric-syntax "+inf.0+inf.0i" (make-rectangular +inf.0 +inf.0) "+Inf.0+Inf.0i") ;; INTENDED
2367+
#;(test-numeric-syntax "-inf.0+inf.0i" (make-rectangular -inf.0 +inf.0) "-Inf.0+Inf.0i") ;; INTENDED
2368+
#;(test-numeric-syntax "-inf.0-inf.0i" (make-rectangular -inf.0 -inf.0) "-Inf.0-Inf.0i") ;; INTENDED
2369+
#;(test-numeric-syntax "+inf.0-inf.0i" (make-rectangular +inf.0 -inf.0) "+Inf.0-Inf.0i") ;; INTENDED
23702370
;; Complex numbers (polar notation)
23712371
;; Need to account for imprecision in write output.
23722372
;;(test-numeric-syntax "1@2" -0.416146836547142+0.909297426825682i
@@ -2405,7 +2405,7 @@
24052405
;; Complex numbers with prefixes
24062406
;;(test-numeric-syntax "#x10+11i" (make-rectangular 16 17) "16+17i")
24072407
(test-numeric-syntax "#d1.0+1.0i" (make-rectangular 1.0 1.0) "1.0+1.0i" "1.+1.i")
2408-
(test-numeric-syntax "#d10+11i" (make-rectangular 10.0 11.0) "10+11i") ;; INTENDED (was 10 11)
2408+
(test-numeric-syntax "#d10+11i" (make-rectangular 10.0 11.0) "10+11i" "10.0+11.0i")
24092409
;;(test-numeric-syntax "#o10+11i" (make-rectangular 8 9) "8+9i" "8.0+11.0i")
24102410
;;(test-numeric-syntax "#b10+11i" (make-rectangular 2 3) "2+3i" "2.0+11.0i")
24112411
;;(test-numeric-syntax "#e1.0+1.0i" (make-rectangular 1 1) "1+1i" "1+i")

0 commit comments

Comments
 (0)