From b4596464ae4e70e949559b5f6a71e1dce5cd8e09 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Fri, 31 May 2013 21:08:52 -0400 Subject: [PATCH] Fix TR contracts. original commit: 404fdf00f3dd9a535497d62026687b9c4ff327f4 --- collects/typed-racket/private/parse-type.rkt | 3 +-- collects/typed-racket/typecheck/tc-lambda-unit.rkt | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/collects/typed-racket/private/parse-type.rkt b/collects/typed-racket/private/parse-type.rkt index fceb92f5..31dbc535 100644 --- a/collects/typed-racket/private/parse-type.rkt +++ b/collects/typed-racket/private/parse-type.rkt @@ -26,8 +26,7 @@ [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 (c:listof identifier?) - (c:listof identifier?)))]) + [parse-literal-alls (syntax? . c:-> . (c:listof (c:or/c (c:listof identifier?) (c:list/c (c:listof identifier?) identifier?))))]) (provide star ddd/bound) diff --git a/collects/typed-racket/typecheck/tc-lambda-unit.rkt b/collects/typed-racket/typecheck/tc-lambda-unit.rkt index 0823672f..b745c1a8 100644 --- a/collects/typed-racket/typecheck/tc-lambda-unit.rkt +++ b/collects/typed-racket/typecheck/tc-lambda-unit.rkt @@ -358,12 +358,12 @@ scoped-tvarss))) -;; tc/plambda syntax syntax-list syntax-list type -> Poly +;; tc/plambda syntax tvarss-list syntax-list syntax-list type -> Poly ;; formals and bodies must by syntax-lists (define/cond-contract (tc/plambda form tvarss-list formals bodies expected) - (syntax? syntax? syntax? (or/c tc-results/c #f) . -> . Type/c) + (syntax? (listof list?) syntax? syntax? (or/c tc-results/c #f) . -> . Type/c) (define/cond-contract (maybe-loop form formals bodies expected) - (syntax? syntax? syntax? tc-results/c . -> . Type/c) + (syntax? syntax? syntax? (or/c tc-results/c #f) . -> . Type/c) (match expected [(tc-result1: (or (Poly: _ _) (PolyDots: _ _))) (tc/plambda form (remove-poly-layer tvarss-list) formals bodies expected)]