From 3707310250ce2bdc6a0c31d8a3f8dd15bff639d7 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Thu, 25 Aug 2011 13:41:09 -0400 Subject: [PATCH] Properly parse `Values' in types. Closes PR 11145. --- collects/typed-scheme/private/parse-type.rkt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/collects/typed-scheme/private/parse-type.rkt b/collects/typed-scheme/private/parse-type.rkt index 9838ca77ca..1c07f6b81f 100644 --- a/collects/typed-scheme/private/parse-type.rkt +++ b/collects/typed-scheme/private/parse-type.rkt @@ -421,8 +421,8 @@ (define (parse-values-type stx) (parameterize ([current-orig-stx stx]) - (syntax-parse stx #:literals (values t:All) - [((~and kw values) tys ... dty :ddd/bound) + (syntax-parse stx #:literals (values t:Values t:All) + [((~and kw (~or t:Values values)) tys ... dty :ddd/bound) (add-disappeared-use #'kw) (let ([var (syntax-e #'bound)]) (unless (bound-index? var) @@ -433,14 +433,14 @@ (extend-tvars (list var) (parse-type #'dty)) var))] - [((~and kw values) tys ... dty _:ddd) + [((~and kw (~or t:Values values)) tys ... dty _:ddd) (add-disappeared-use #'kw) (let ([var (infer-index stx)]) (make-ValuesDots (map parse-type (syntax->list #'(tys ...))) (extend-tvars (list var) (parse-type #'dty)) var))] - [((~and kw values) tys ...) + [((~and kw (~or t:Values values)) tys ...) (add-disappeared-use #'kw) (-values (map parse-type (syntax->list #'(tys ...))))] [t