suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up lambda formal handling so that if we get too many or too few formals

Browse Source 
for the appropriate type, we associate the correct types with the formals
we do have.  If we have more formals than types, then a rest-arg function
will have the extra formals as the type of the rest-arg, else we will just
make them bottom.
This commit is contained in:
Stevie Strickland 2008-06-18 13:39:58 -04:00
parent 4010a39c2d
commit 17937f5451
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
collects/typed-scheme/private/tc-lambda-unit.ss
View File

@ -41,13 +41,28 @@
[(args* ...)
(if (ormap (lambda (e) (not (type-annotation e))) (syntax->list #'(args* ...)))
(let* ([arg-list (syntax->list #'(args* ...))])
(let ([arg-list
(if (= (length arg-list) (length arg-tys))
arg-list
(tc-error/expr
#:return (map (lambda _ (Un)) arg-tys)
"Expected function with ~a arguments, but got function with ~a arguments"
(length arg-tys) (length arg-list)))])
(let ([arg-tys
(let ([arg-len (length arg-list)]
[tys-len (length arg-tys)])
(define (expected-str tys-len rest-ty arg-len)
(format "Expected function with ~a argument~a~a, but got function with ~a argument~a"
tys-len
(if (= tys-len 1) "" "s")
(if rest-ty " and a rest arg" "")
arg-len
(if (= arg-len 1) "" "s")))
(cond
[(= arg-len tys-len)
arg-list]
[(< arg-len tys-len)
(tc-error/expr
#:return (take arg-tys arg-len)
(expected-str tys-len rest-ty arg-len))]
[(> arg-len tys-len)
(tc-error/expr
#:return (append arg-tys
(map (lambda _ (if rest-ty rest-ty (Un))) (drop arg-list tys-len)))
(expected-str tys-len rest-ty arg-len))]))])
(for-each (lambda (a) (printf/log "Lambda Var: ~a~n" (syntax-e a))) arg-list)
(with-lexical-env/extend
arg-list arg-tys