Fix namespace issues with compile-time expand.

Fix error reporting.

svn: r9576
This commit is contained in:
Sam Tobin-Hochstadt 2008-05-01 22:52:39 +00:00
parent 245a658fec
commit f410bcf3a2
3 changed files with 4 additions and 3 deletions

View File

@ -412,12 +412,12 @@
string-constants/string-constant]
;; make-promise
[(cadr (syntax->list (expand #'(delay 3))))
[(cadr (syntax->list (expand '(delay 3))))
(-poly (a) (-> (-> a) (-Promise a)))
scheme/promise]
;; qq-append
[(cadr (syntax->list (expand #'`(,@'() 1))))
[(cadr (syntax->list (expand '`(,@'() 1))))
(-poly (a b)
(cl->*
(-> (-lst a) (-val '()) (-lst a))

View File

@ -303,7 +303,7 @@
(match-let ([(list (tc-result: ts) ...) (map (lambda (f) (outer-loop
(ret f e1 e2) argtypes arg-thn-effs arg-els-effs args)) fs)])
(ret (apply Un ts)))]
[(tc-result: f-ty _ _) (tc-error #:return (ret (Un)) "Cannot apply expression of type ~a, since it is not a function type" f-ty)]))))
[(tc-result: f-ty _ _) (tc-error/expr #:return (ret (Un)) "Cannot apply expression of type ~a, since it is not a function type" f-ty)]))))
;(trace tc/funapp)

View File

@ -204,6 +204,7 @@
ns)
ns)])
(parameterize ([current-namespace new-ns])
(namespace-require 'scheme/base)
(namespace-require 'extra-mods) ...
e))
ty)]))