merge ryan's changes

svn: r13773

original commit: 99f678e1baee83c045c0c215fb3d522773f19980

collects/typed-scheme/private/parse-type.ss

@@ -251,7 +251,7 @@
   (pattern (case-lambda f:fun-ty/one ...)
            #:with t (make-Function (syntax->datum #'(f.arr ...))))
   
-  (pattern (t:Class (pos-args:type ...) ([fname:id fty:type ((rest:boolean) #:opt) ...*] ...) ([mname:id mty:type] ...))
+  (pattern (t:Class (pos-args:type ...) ([fname:id fty:type (~or (rest:boolean) #:opt) ...] ...) ([mname:id mty:type] ...))
            #:with t
            (make-Class
             (syntax->datum #'(pos-args.t ...))

collects/typed-scheme/private/prims.ss

@@ -66,7 +66,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
   (syntax-parse stx
     [(_ lib [nm:opt-rename ty] ...)
      #'(begin (require/typed nm ty lib) ...)]
-    [(_ nm:opt-rename ty lib ([#:struct-maker parent] #:opt) ...*)
+    [(_ nm:opt-rename ty lib (~or [#:struct-maker parent] #:opt) ...)
      (with-syntax ([cnt* (generate-temporary #'nm.nm)]
 		   [sm (if #'parent
                            #'(#:struct-maker parent)
@@ -87,7 +87,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
   (define-syntax-class name-exists-kw
     (pattern #:name-exists))
   (syntax-parse stx
-    [(_ ty:id pred:id lib ([ne:name-exists-kw] #:opt) ...*)
+    [(_ ty:id pred:id lib (~or [ne:name-exists-kw] #:opt) ...)
      (register-type-name #'ty (make-Opaque #'pred (syntax-local-certifier)))
      (quasisyntax/loc stx
        (begin 

collects/typed-scheme/private/type-abbrev.ss

@@ -82,7 +82,7 @@
 
 (define-syntax (->key stx)
   (syntax-parse stx
-                [(_ ty:expr ... ((k:keyword kty:expr opt:boolean)) ...* rng)
+                [(_ ty:expr ... (~or (k:keyword kty:expr opt:boolean)) ... rng)
                  #'(make-Function
                     (list
                      (make-arr* (list ty ...)