New test from John, fix tests to work with new code.

svn: r12108
This commit is contained in:
Sam Tobin-Hochstadt 2008-10-23 23:34:00 +00:00
parent 101ca7ada7
commit d93505082f

View File

@ -141,6 +141,11 @@
[tc-e (let: ([x : (Un #f Number) 7]) [tc-e (let: ([x : (Un #f Number) 7])
(if x (+ x 1) 3)) (if x (+ x 1) 3))
N] N]
[tc-e (let: ([x : Number 1])
(if (and (number? x) #t)
(+ x 4)
'bc))
N]
[tc-e (let: ((x : Number 3)) (if (boolean? x) (not x) #t)) (-val #t)] [tc-e (let: ((x : Number 3)) (if (boolean? x) (not x) #t)) (-val #t)]
[tc-e (begin 3) -Integer] [tc-e (begin 3) -Integer]
[tc-e (begin #f 3) -Integer] [tc-e (begin #f 3) -Integer]
@ -173,7 +178,7 @@
[tc-e (let: ([x : Number 3]) [tc-e (let: ([x : Number 3])
(when (number? x) #t)) (when (number? x) #t))
(-val #t)] (-val #t) (list (make-True-Effect)) (list (make-True-Effect))]
[tc-e (let: ([x : Number 3]) [tc-e (let: ([x : Number 3])
(when (boolean? x) #t)) (when (boolean? x) #t))
-Void] -Void]
@ -330,8 +335,8 @@
[tc-e (let: ([x : Any 1]) [tc-e (let: ([x : Any 1])
(if (and (list? x) (not (null? x))) (if (and (list? x) (not (null? x)))
x x
(error 'foo))) 'foo))
(-pair Univ (-lst Univ))] (Un (-val 'foo) (-pair Univ (-lst Univ)))]
[tc-e (cadr (cadr (list 1 (list 1 2 3) 3))) -Integer] [tc-e (cadr (cadr (list 1 (list 1 2 3) 3))) -Integer]
@ -370,7 +375,7 @@
(if (if (number? x) (if (if (number? x)
#t #t
(boolean? x)) (boolean? x))
(if (boolean? x) 1 x) (if (boolean? x) 1 (+ 1 x))
4)) 4))
N] N]
;; these don't invoke the or rule ;; these don't invoke the or rule