From fd569e49c4a11f133410b846ecd091dec138416d Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 14 Jul 2008 08:15:55 +0000 Subject: [PATCH] Improved requires and a bit more. svn: r10757 --- collects/planet/private/define-config.ss | 5 +++-- collects/planet/private/planet-shared.ss | 10 +++++----- collects/planet/util.ss | 6 ------ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/collects/planet/private/define-config.ss b/collects/planet/private/define-config.ss index a583ca2b8d..32217210da 100644 --- a/collects/planet/private/define-config.ss +++ b/collects/planet/private/define-config.ss @@ -1,11 +1,12 @@ -(module define-config mzscheme +(module define-config scheme/base + (require (for-syntax scheme/base)) (provide define-parameters) (define-syntax (define-parameters stx) (syntax-case stx () [(_ (name val) ...) - (andmap identifier? (syntax-e #'(name ...))) + (andmap identifier? (syntax->list #'(name ...))) #'(begin (provide name ...) (define name (make-parameter val)) ...)]))) diff --git a/collects/planet/private/planet-shared.ss b/collects/planet/private/planet-shared.ss index e730883635..7964e706e3 100644 --- a/collects/planet/private/planet-shared.ss +++ b/collects/planet/private/planet-shared.ss @@ -5,10 +5,10 @@ Various common pieces of code that both the client and server need to access |# #lang scheme/base - (require (only-in mzlib/file path-only) - mzlib/port - setup/getinfo - (prefix-in srfi1: srfi/1) + (require setup/getinfo + scheme/path + scheme/port + scheme/list "../config.ss" "data.ss") @@ -199,7 +199,7 @@ Various common pieces of code that both the client and server need to access ;; also updates auxiliary datastructures that might have dangling pointers to ;; the removed links (define (filter-link-table! f on-delete) - (let-values ([(in-links out-links) (srfi1:partition f (get-hard-link-table))]) + (let-values ([(in-links out-links) (partition f (get-hard-link-table))]) (for-each on-delete out-links) (save-hard-link-table in-links))) diff --git a/collects/planet/util.ss b/collects/planet/util.ss index 575af22d70..92c024bf7d 100644 --- a/collects/planet/util.ss +++ b/collects/planet/util.ss @@ -10,13 +10,7 @@ net/url xml/xml - mzlib/file - mzlib/list - mzlib/etc - - scheme/contract scheme/port - scheme/path setup/pack setup/plt-single-installer