From ec1e13a2862e147c978b7fe9d6cdcc936bee1717 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Wed, 19 Nov 2008 22:50:54 +0000 Subject: [PATCH] Refactor require/typed/provide and dt into new private dir. svn: r12517 original commit: 66b9b932ef7d5b5eec53731ec7f196ba4d6b263f --- collects/typed/framework/framework.ss | 3 ++- collects/typed/mred/mred.ss | 10 +--------- collects/typed/private/utils.ss | 11 +++++++++++ 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 collects/typed/private/utils.ss diff --git a/collects/typed/framework/framework.ss b/collects/typed/framework/framework.ss index fab2f91d..513cfa1d 100644 --- a/collects/typed/framework/framework.ss +++ b/collects/typed/framework/framework.ss @@ -1,6 +1,7 @@ #lang typed-scheme -(require (only-in typed/mred/mred dt require/typed/provide Font%)) +(require typed/private/utils + (only-in typed/mred/mred Font%)) (dt Style-List% (Class () () diff --git a/collects/typed/mred/mred.ss b/collects/typed/mred/mred.ss index 03f60efb..80984c28 100644 --- a/collects/typed/mred/mred.ss +++ b/collects/typed/mred/mred.ss @@ -1,14 +1,6 @@ #lang typed-scheme -(define-syntax-rule (dt nm t) - (begin (define-type-alias nm t) (provide nm))) - -(define-syntax-rule (require/typed/provide lib [nm t] ...) - (begin - (require/typed lib [nm t] ...) - (provide nm ...))) - -(provide dt require/typed/provide) +(require typed/private/utils) (dt Bitmap% (Class (Number Number Boolean) () diff --git a/collects/typed/private/utils.ss b/collects/typed/private/utils.ss new file mode 100644 index 00000000..c1fdbea7 --- /dev/null +++ b/collects/typed/private/utils.ss @@ -0,0 +1,11 @@ +#lang typed-scheme + +(define-syntax-rule (dt nm t) + (begin (define-type-alias nm t) (provide nm))) + +(define-syntax-rule (require/typed/provide lib [nm t] ...) + (begin + (require/typed lib [nm t] ...) + (provide nm ...))) + +(provide dt require/typed/provide)