diff --git a/collects/typed-racket/private/parse-type.rkt b/collects/typed-racket/private/parse-type.rkt index 840b51f1..ea30fb2f 100644 --- a/collects/typed-racket/private/parse-type.rkt +++ b/collects/typed-racket/private/parse-type.rkt @@ -26,8 +26,8 @@ [parse-type/id (syntax? c:any/c . c:-> . Type/c)] [parse-tc-results (syntax? . c:-> . tc-results/c)] [parse-tc-results/id (syntax? c:any/c . c:-> . tc-results/c)] - [parse-literal-alls (syntax? . c:-> . (values (listof identifier?) - (listof identifier?)))]) + [parse-literal-alls (syntax? . c:-> . (values (c:listof identifier?) + (c:listof identifier?)))]) (provide star ddd/bound) diff --git a/collects/typed-racket/types/tc-result.rkt b/collects/typed-racket/types/tc-result.rkt index 5e5e7da2..194cdbe6 100644 --- a/collects/typed-racket/types/tc-result.rkt +++ b/collects/typed-racket/types/tc-result.rkt @@ -5,14 +5,14 @@ (utils tc-utils) (types base-abbrev) racket/match - (contract-req)) + (prefix-in c: (contract-req))) ;; this structure represents the result of typechecking an expression (define-struct/cond-contract tc-result ([t Type/c] [f FilterSet/c] [o Object?]) #:transparent) (define-struct/cond-contract tc-results - ([ts (listof tc-result?)] [drest (or/c (cons/c Type/c symbol?) #f)]) + ([ts (c:listof tc-result?)] [drest (c:or/c (c:cons/c Type/c symbol?) #f)]) #:transparent) (define-struct/cond-contract tc-any-results () #:transparent) (define tc-any-results* (tc-any-results)) @@ -101,16 +101,16 @@ (provide/cond-contract [ret - (->i ([t (or/c Type/c (listof Type/c))]) - ([f (t) (if (list? t) - (listof FilterSet/c) - FilterSet/c)] - [o (t) (if (list? t) - (listof Object?) - Object?)] - [dty Type/c] - [dbound symbol?]) - [res tc-results/c])]) + (c:->i ([t (c:or/c Type/c (c:listof Type/c))]) + ([f (t) (if (list? t) + (c:listof FilterSet/c) + FilterSet/c)] + [o (t) (if (list? t) + (c:listof Object?) + Object?)] + [dty Type/c] + [dbound symbol?]) + [res tc-results/c])]) (define (combine-results tcs) (match tcs @@ -123,8 +123,8 @@ (rename-out (tc-any-results* tc-any-results))) (provide/cond-contract - [combine-results ((listof tc-results?) . -> . tc-results?)] - [tc-result-t (tc-result? . -> . Type/c)] - [tc-result-equal? (tc-result? tc-result? . -> . boolean?)] - [tc-results? (any/c . -> . boolean?)] - [tc-results/c flat-contract?]) + [combine-results ((c:listof tc-results?) . c:-> . tc-results?)] + [tc-result-t (tc-result? . c:-> . Type/c)] + [tc-result-equal? (tc-result? tc-result? . c:-> . boolean?)] + [tc-results? (c:any/c . c:-> . boolean?)] + [tc-results/c c:flat-contract?]) diff --git a/collects/typed-racket/utils/utils.rkt b/collects/typed-racket/utils/utils.rkt index 19f1463e..756c925f 100644 --- a/collects/typed-racket/utils/utils.rkt +++ b/collects/typed-racket/utils/utils.rkt @@ -20,7 +20,7 @@ at least theoretically. rep utils typecheck infer env private types) (define optimize? (make-parameter #t)) -(define-for-syntax enable-contracts? #f) +(define-for-syntax enable-contracts? #t) (define-syntax do-contract-req (if enable-contracts?