From a3380ea403d6ed03c821f6c747a61e4e6781d010 Mon Sep 17 00:00:00 2001 From: Sam Caldwell Date: Mon, 26 Aug 2019 11:08:30 -0400 Subject: [PATCH] fixups for package installation --- racket/info.rkt | 1 + racket/typed/core.rkt | 4 ++-- racket/typed/main.rkt | 6 +++--- racket/typed/tests/basic-bad-assertion.rkt | 7 +++++++ 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 racket/typed/tests/basic-bad-assertion.rkt diff --git a/racket/info.rkt b/racket/info.rkt index 84eba76..f6cb272 100644 --- a/racket/info.rkt +++ b/racket/info.rkt @@ -4,6 +4,7 @@ "turnstile-lib" "turnstile-example" "macrotypes-lib" + "rackunit-macrotypes-lib" "base" "data-lib" "net-lib" diff --git a/racket/typed/core.rkt b/racket/typed/core.rkt index 89fb2d6..5209d98 100644 --- a/racket/typed/core.rkt +++ b/racket/typed/core.rkt @@ -54,7 +54,7 @@ (module+ test (require rackunit) - (require turnstile/rackunit-typechecking)) + (require rackunit/turnstile)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Needed Forms @@ -1182,4 +1182,4 @@ : (Instruction Bool ⊥ ⊥) -> (syndicate:transition #f (list-))) (check-type (quit) : (Instruction ⊥ ⊥ ⊥)) - (check-type (quit (list)) : (Instruction ⊥ ⊥ ⊥))) \ No newline at end of file + (check-type (quit (list)) : (Instruction ⊥ ⊥ ⊥))) diff --git a/racket/typed/main.rkt b/racket/typed/main.rkt index 07b706f..0312ec1 100644 --- a/racket/typed/main.rkt +++ b/racket/typed/main.rkt @@ -36,7 +36,7 @@ (module+ test (require rackunit) - (require turnstile/rackunit-typechecking)) + (require rackunit/turnstile)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Types @@ -721,7 +721,7 @@ is meant to be (define-typed-syntax (λ [p s] ...) ≫ #:with (([x:id τ:type] ...) ...) (stx-map pat-bindings #'(p ...)) - [[x ≫ x- : τ :i (U) :o (U) :a (U)] ... ⊢ s ≫ s- (⇒ : τv) (⇒ :i τ1) (⇒ :o τ2) (⇒ :a τ3)] ... + [[x ≫ x- : τ] ... ⊢ s ≫ s- (⇒ : τv) (⇒ :i τ1) (⇒ :o τ2) (⇒ :a τ3)] ... ;; REALLY not sure how to handle p/p-/p.match-pattern, ;; particularly w.r.t. typed terms that appear in p.match-pattern [⊢ p ≫ _ ⇒ τ-p] ... @@ -944,4 +944,4 @@ is meant to be (syntax-parse e [(~var _ class) #'#t] [_ #'#f])) - (test-result))])) \ No newline at end of file + (test-result))])) diff --git a/racket/typed/tests/basic-bad-assertion.rkt b/racket/typed/tests/basic-bad-assertion.rkt new file mode 100644 index 0000000..a817088 --- /dev/null +++ b/racket/typed/tests/basic-bad-assertion.rkt @@ -0,0 +1,7 @@ +#lang typed/syndicate/roles + +(require rackunit/turnstile) + +(typecheck-fail (spawn (U) + (start-facet x + (assert 42))))