From 86659a3ad36e35f3e83178e35445a1e95ae8c9d5 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Thu, 1 May 2008 22:52:39 +0000 Subject: [PATCH] Fix namespace issues with compile-time expand. Fix error reporting. svn: r9576 original commit: f410bcf3a288f9c41b836495d12f8867060802ec --- collects/typed-scheme/private/base-env.ss | 4 ++-- collects/typed-scheme/private/type-effect-convenience.ss | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/collects/typed-scheme/private/base-env.ss b/collects/typed-scheme/private/base-env.ss index 3a73645b..c5742d5e 100644 --- a/collects/typed-scheme/private/base-env.ss +++ b/collects/typed-scheme/private/base-env.ss @@ -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)) diff --git a/collects/typed-scheme/private/type-effect-convenience.ss b/collects/typed-scheme/private/type-effect-convenience.ss index 1746342b..9b7e4b97 100644 --- a/collects/typed-scheme/private/type-effect-convenience.ss +++ b/collects/typed-scheme/private/type-effect-convenience.ss @@ -204,6 +204,7 @@ ns) ns)]) (parameterize ([current-namespace new-ns]) + (namespace-require 'scheme/base) (namespace-require 'extra-mods) ... e)) ty)]))