From b92dbc8079b7caf231cd11f35f56a3f1014f0c76 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 24 Jun 2011 18:09:47 -0400 Subject: [PATCH] Fix rackunit types to be `Any', not `Void'. original commit: 19a7a370335413c280646cbc0653aa111f09879b --- .../tests/typed-scheme/succeed/rackunit.rkt | 3 ++ collects/typed/rackunit/main.rkt | 38 +++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/collects/tests/typed-scheme/succeed/rackunit.rkt b/collects/tests/typed-scheme/succeed/rackunit.rkt index 8f41a82a..936b6b59 100644 --- a/collects/tests/typed-scheme/succeed/rackunit.rkt +++ b/collects/tests/typed-scheme/succeed/rackunit.rkt @@ -2,6 +2,7 @@ (require typed/rackunit) (: my-+ : Integer Integer -> Integer) + (define (my-+ a b) (if (zero? a) b @@ -13,6 +14,8 @@ b (my-* (sub1 a) (my-+ b b)))) +(check-equal? (my-+ 1 1) 2 "Simple addition") + (test-begin (check-equal? (my-+ 1 1) 2 "Simple addition") (check-equal? (my-* 2 2) 4 "Simple multiplication")) diff --git a/collects/typed/rackunit/main.rkt b/collects/typed/rackunit/main.rkt index 851ebb4b..9eca7cac 100644 --- a/collects/typed/rackunit/main.rkt +++ b/collects/typed/rackunit/main.rkt @@ -5,8 +5,8 @@ (define-type check-ish-ty (case-lambda - (Any Any -> Void) - (Any Any String -> Void))) + (Any Any -> Any) + (Any Any String -> Any))) (define-type (Predicate A) (A -> Boolean)) (define-type (Thunk A) (-> A)) @@ -22,40 +22,40 @@ [check-pred (All (A) (case-lambda - ((A -> Any) A -> Void) - ((A -> Any) A String -> Void)))] + ((A -> Any) A -> Any) + ((A -> Any) A String -> Any)))] [check-= (case-lambda - (Real Real Real -> Void) - (Real Real Real String -> Void))] + (Real Real Real -> Any) + (Real Real Real String -> Any))] [check-true (case-lambda - (Any -> Void) - (Any String -> Void))] + (Any -> Any) + (Any String -> Any))] [check-false (case-lambda - (Any -> Void) - (Any String -> Void))] + (Any -> Any) + (Any String -> Any))] [check-not-false (case-lambda - (Any -> Void) - (Any String -> Void))] + (Any -> Any) + (Any String -> Any))] [check-exn (case-lambda - ((U (Predicate Any) Regexp) (Thunk Any) -> Void) - ((U (Predicate Any) Regexp) (Thunk Any) String -> Void))] + ((U (Predicate Any) Regexp) (Thunk Any) -> Any) + ((U (Predicate Any) Regexp) (Thunk Any) String -> Any))] [check-not-exn (case-lambda - ((Thunk Any) -> Void) - ((Thunk Any) String -> Void))] + ((Thunk Any) -> Any) + ((Thunk Any) String -> Any))] [check-regexp-match - (Regexp String -> Void)] + (Regexp String -> Any)] [check (All (A B) (case-lambda - ((A B -> Any) A B -> Void) - ((A B -> Any) A B String -> Void)))] + ((A B -> Any) A B -> Any) + ((A B -> Any) A B String -> Any)))] [fail (case-lambda