From 0cc6039906bb41af0481a62c53297b9cc9ed1f62 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sat, 23 Feb 2008 09:42:03 +0000 Subject: [PATCH] use new require specs in many places svn: r8774 original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f --- collects/mzlib/a-unit.ss | 2 +- collects/mzlib/awk.ss | 2 +- collects/mzlib/cm.ss | 6 +-- collects/mzlib/cml.ss | 2 +- collects/mzlib/defmacro.ss | 2 +- collects/mzlib/etc.ss | 6 +-- collects/mzlib/foreign.ss | 4 +- collects/mzlib/include.ss | 4 +- collects/mzlib/integer-set.ss | 4 +- collects/mzlib/kw.ss | 2 +- collects/mzlib/os.ss | 5 +- collects/mzlib/port.ss | 6 +-- collects/mzlib/pregexp.ss | 4 +- collects/mzlib/private/package-helper.ss | 4 +- collects/mzlib/private/sigutil.ss | 6 +-- collects/mzlib/private/structure-helper.ss | 2 +- collects/mzlib/private/stxset.ss | 4 +- collects/mzlib/process.ss | 2 +- collects/mzlib/runtime-path.ss | 6 +-- collects/mzlib/sandbox.ss | 12 ++--- collects/mzlib/serialize.ss | 12 ++--- collects/mzlib/struct.ss | 4 +- collects/mzlib/surrogate.ss | 2 +- collects/mzlib/tar.ss | 2 +- collects/mzlib/transcr.ss | 2 +- collects/mzlib/unit.ss | 16 +++--- collects/mzlib/unit200.ss | 8 +-- collects/mzlib/unitsig.ss | 4 +- collects/mzlib/unitsig200.ss | 2 +- collects/mzlib/zip.ss | 2 +- collects/net/cgi-unit.ss | 2 +- collects/net/cookie-unit.ss | 8 +-- collects/net/dns-unit.ss | 2 +- collects/net/head-unit.ss | 2 +- collects/net/mime-unit.ss | 6 +-- collects/net/qp-unit.ss | 2 +- collects/net/sendmail-unit.ss | 2 +- collects/net/uri-codec-unit.ss | 8 +-- collects/net/url-unit.ss | 12 ++--- collects/tests/mzscheme/awk.ss | 2 +- collects/tests/mzscheme/compat.ss | 2 +- .../tests/mzscheme/contract-mzlib-test.ss | 54 +++++++++---------- collects/tests/mzscheme/etc.ss | 2 +- collects/tests/mzscheme/kw.ss | 2 +- collects/tests/mzscheme/macrolib.ss | 2 +- collects/tests/mzscheme/pconvert.ss | 6 +-- collects/tests/mzscheme/restart.ss | 2 +- collects/tests/mzscheme/structlib.ss | 2 +- collects/tests/mzscheme/threadlib.ss | 2 +- 49 files changed, 127 insertions(+), 132 deletions(-) diff --git a/collects/mzlib/a-unit.ss b/collects/mzlib/a-unit.ss index c44610f..3e00402 100644 --- a/collects/mzlib/a-unit.ss +++ b/collects/mzlib/a-unit.ss @@ -1,6 +1,6 @@ (module a-unit mzscheme (require "unit.ss") - (require-for-syntax (lib "kerncase.ss" "syntax")) + (require-for-syntax syntax/kerncase) (provide (rename module-begin #%module-begin) (all-from-except mzscheme #%module-begin) diff --git a/collects/mzlib/awk.ss b/collects/mzlib/awk.ss index 0c6bfa5..7745623 100644 --- a/collects/mzlib/awk.ss +++ b/collects/mzlib/awk.ss @@ -1,6 +1,6 @@ (module awk mzscheme - (require-for-syntax (lib "stx.ss" "syntax")) + (require-for-syntax syntax/stx) (provide awk match:start match:end match:substring regexp-exec) diff --git a/collects/mzlib/cm.ss b/collects/mzlib/cm.ss index 64df036..7c13201 100644 --- a/collects/mzlib/cm.ss +++ b/collects/mzlib/cm.ss @@ -1,8 +1,8 @@ (module cm mzscheme - (require (lib "modcode.ss" "syntax") - (lib "modresolve.ss" "syntax") + (require syntax/modcode + syntax/modresolve (lib "main-collects.ss" "setup") - (lib "file.ss")) + mzlib/file) (provide make-compilation-manager-load/use-compiled-handler managed-compile-zo diff --git a/collects/mzlib/cml.ss b/collects/mzlib/cml.ss index d85ab51..9097021 100644 --- a/collects/mzlib/cml.ss +++ b/collects/mzlib/cml.ss @@ -1,6 +1,6 @@ (module cml mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define (spawn thunk) (thread/suspend-to-kill thunk)) diff --git a/collects/mzlib/defmacro.ss b/collects/mzlib/defmacro.ss index 39beab0..f0e7509 100644 --- a/collects/mzlib/defmacro.ss +++ b/collects/mzlib/defmacro.ss @@ -1,6 +1,6 @@ (module defmacro mzscheme - (require-for-syntax (lib "stx.ss" "syntax") + (require-for-syntax syntax/stx "private/dmhelp.ss") (provide define-macro diff --git a/collects/mzlib/etc.ss b/collects/mzlib/etc.ss index d359662..dc74cee 100644 --- a/collects/mzlib/etc.ss +++ b/collects/mzlib/etc.ss @@ -11,9 +11,9 @@ compose) "kw.ss") - (require-for-syntax (lib "kerncase.ss" "syntax") - (lib "stx.ss" "syntax") - (lib "name.ss" "syntax") + (require-for-syntax syntax/kerncase + syntax/stx + syntax/name (lib "main-collects.ss" "setup") "private/stxset.ss") diff --git a/collects/mzlib/foreign.ss b/collects/mzlib/foreign.ss index 03812f0..d11fef0 100644 --- a/collects/mzlib/foreign.ss +++ b/collects/mzlib/foreign.ss @@ -2,9 +2,9 @@ ;; Foreign Scheme interface (require '#%foreign - (lib "dirs.ss" "setup") + setup/dirs (for-syntax scheme/base - (lib "stx.ss" "syntax"))) + syntax/stx)) ;; This module is full of unsafe bindings that are not provided to requiring ;; modules. Instead, an `unsafe!' binding is provided that makes these unsafe diff --git a/collects/mzlib/include.ss b/collects/mzlib/include.ss index d760b43..d86dee9 100644 --- a/collects/mzlib/include.ss +++ b/collects/mzlib/include.ss @@ -1,9 +1,9 @@ (module include mzscheme - (require-for-syntax (lib "stx.ss" "syntax") + (require-for-syntax syntax/stx "private/increader.ss" "cm-accomplice.ss") - (require (lib "etc.ss")) + (require mzlib/etc) (define-for-syntax (resolve-path-spec fn loc stx build-path-stx) (let ([file diff --git a/collects/mzlib/integer-set.ss b/collects/mzlib/integer-set.ss index d2a74be..ac7bcce 100644 --- a/collects/mzlib/integer-set.ss +++ b/collects/mzlib/integer-set.ss @@ -1,6 +1,6 @@ (module integer-set mzscheme - (require (all-except (lib "list.ss") merge) - (lib "contract.ss")) + (require (all-except mzlib/list merge) + mzlib/contract) #;(define-syntax test-block (syntax-rules () diff --git a/collects/mzlib/kw.ss b/collects/mzlib/kw.ss index 2dcb72d..0da06bd 100644 --- a/collects/mzlib/kw.ss +++ b/collects/mzlib/kw.ss @@ -1,6 +1,6 @@ (module kw mzscheme -(require-for-syntax (lib "name.ss" "syntax")) +(require-for-syntax syntax/name) (begin-for-syntax ; -> configuration for lambda/kw ;; must appear at the end, each with exactly one variable diff --git a/collects/mzlib/os.ss b/collects/mzlib/os.ss index 1c2585c..1594229 100644 --- a/collects/mzlib/os.ss +++ b/collects/mzlib/os.ss @@ -1,7 +1,6 @@ (module os mzscheme - (require (lib "etc.ss") - (lib "foreign.ss")) (unsafe!) - + (require mzlib/etc mzlib/foreign) (unsafe!) + (define kernel32 (delay (and (eq? 'windows (system-type)) (ffi-lib "kernel32")))) diff --git a/collects/mzlib/port.ss b/collects/mzlib/port.ss index 2660dc6..dc2a9ac 100644 --- a/collects/mzlib/port.ss +++ b/collects/mzlib/port.ss @@ -1,8 +1,8 @@ (module port mzscheme - (require (lib "etc.ss") - (lib "contract.ss") - (lib "list.ss") + (require mzlib/etc + mzlib/contract + mzlib/list "private/port.ss") (define (input-port-with-progress-evts? ip) diff --git a/collects/mzlib/pregexp.ss b/collects/mzlib/pregexp.ss index cf40900..bb6b362 100644 --- a/collects/mzlib/pregexp.ss +++ b/collects/mzlib/pregexp.ss @@ -7,8 +7,8 @@ ;; this is mostly a wrapper module. (module pregexp mzscheme - (require (lib "string.ss") - (lib "kw.ss")) + (require mzlib/string + mzlib/kw) (provide pregexp pregexp-match-positions pregexp-match diff --git a/collects/mzlib/private/package-helper.ss b/collects/mzlib/private/package-helper.ss index 94747d7..ceed08d 100644 --- a/collects/mzlib/private/package-helper.ss +++ b/collects/mzlib/private/package-helper.ss @@ -1,6 +1,6 @@ (module package-helper mzscheme - (require (lib "stx.ss" "syntax") - (lib "boundmap.ss" "syntax")) + (require syntax/stx + syntax/boundmap) (provide str str? str-renames str-all-renames make-str check-defn-context diff --git a/collects/mzlib/private/sigutil.ss b/collects/mzlib/private/sigutil.ss index 3eff120..f80ebfa 100644 --- a/collects/mzlib/private/sigutil.ss +++ b/collects/mzlib/private/sigutil.ss @@ -3,9 +3,9 @@ ;; Used by unitsig.ss ;; (needs an overhaul, too) - (require (lib "stx.ss" "syntax") - (lib "struct.ss" "syntax") - (lib "context.ss" "syntax")) + (require syntax/stx + syntax/struct + syntax/context) (require "sigmatch.ss") (require "../unit200.ss") diff --git a/collects/mzlib/private/structure-helper.ss b/collects/mzlib/private/structure-helper.ss index 3eb7391..b0699a0 100644 --- a/collects/mzlib/private/structure-helper.ss +++ b/collects/mzlib/private/structure-helper.ss @@ -1,5 +1,5 @@ (module structure-helper mzscheme - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (provide str str? str-renames make-str remove-dups split open open-as-helper) (define-struct str (renames)) diff --git a/collects/mzlib/private/stxset.ss b/collects/mzlib/private/stxset.ss index cbaf908..e4b8610 100644 --- a/collects/mzlib/private/stxset.ss +++ b/collects/mzlib/private/stxset.ss @@ -1,8 +1,8 @@ (module stxset mzscheme - (require-for-syntax (lib "kerncase.ss" "syntax") - (lib "context.ss" "syntax")) + (require-for-syntax syntax/kerncase + syntax/context) (provide finish-syntax-set) diff --git a/collects/mzlib/process.ss b/collects/mzlib/process.ss index 7a12c88..21d246b 100644 --- a/collects/mzlib/process.ss +++ b/collects/mzlib/process.ss @@ -9,7 +9,7 @@ system/exit-code system*/exit-code) - (require (lib "port.ss")) + (require mzlib/port) ;; Helpers: ---------------------------------------- diff --git a/collects/mzlib/runtime-path.ss b/collects/mzlib/runtime-path.ss index ab7e9c9..795f2c3 100644 --- a/collects/mzlib/runtime-path.ss +++ b/collects/mzlib/runtime-path.ss @@ -1,8 +1,8 @@ (module runtime-path mzscheme - (require (lib "etc.ss") - (lib "modcollapse.ss" "syntax") - (lib "dirs.ss" "setup") + (require mzlib/etc + syntax/modcollapse + setup/dirs (only "private/runtime-path-table.ss" table)) (provide define-runtime-path diff --git a/collects/mzlib/sandbox.ss b/collects/mzlib/sandbox.ss index e1120f2..582d1fd 100644 --- a/collects/mzlib/sandbox.ss +++ b/collects/mzlib/sandbox.ss @@ -80,18 +80,14 @@ (cdr v))]) (thunk))] [(and gui? - (eq? (car v) (dynamic-require 'mred/mred 'make-gui-namespace))) + (eq? (car v) (dynamic-require 'mred 'make-gui-namespace))) (parameterize ([sandbox-namespace-specs ;; Simulate the old make-namespace-with-mred: (cons (lambda () (let ([ns (make-mz-namespace)] - [ns2 ((dynamic-require 'mred/mred 'make-gui-namespace))]) - (namespace-attach-module ns2 - 'mred/mred - ns) - (namespace-attach-module ns2 - 'scheme/class - ns) + [ns2 ((dynamic-require 'mred 'make-gui-namespace))]) + (namespace-attach-module ns2 'mred ns) + (namespace-attach-module ns2 'scheme/class ns) (parameterize ([current-namespace ns]) (namespace-require 'mred) (namespace-require 'scheme/class)) diff --git a/collects/mzlib/serialize.ss b/collects/mzlib/serialize.ss index 545e6de..78582d2 100644 --- a/collects/mzlib/serialize.ss +++ b/collects/mzlib/serialize.ss @@ -1,16 +1,16 @@ (module serialize mzscheme - (require-for-syntax (lib "struct.ss" "syntax")) - (require (lib "modcollapse.ss" "syntax") - (lib "etc.ss") - (lib "list.ss") + (require-for-syntax syntax/struct) + (require syntax/modcollapse + mzlib/etc + mzlib/list ;; core [de]serializer: - (lib "private/serialize.ss" "scheme")) + scheme/private/serialize) (provide define-serializable-struct define-serializable-struct/versions ;; core [de]serializer: - (all-from (lib "private/serialize.ss" "scheme"))) + (all-from scheme/private/serialize)) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; define-serializable-struct diff --git a/collects/mzlib/struct.ss b/collects/mzlib/struct.ss index b19934c..23a03c9 100644 --- a/collects/mzlib/struct.ss +++ b/collects/mzlib/struct.ss @@ -5,9 +5,9 @@ (provide copy-struct define-struct/properties make-->vector) - (require-for-syntax (lib "struct.ss" "syntax") + (require-for-syntax syntax/struct "list.ss" - (lib "stx.ss" "syntax")) + syntax/stx) ;; ------------------------------------------------------------ ;; copy-struct diff --git a/collects/mzlib/surrogate.ss b/collects/mzlib/surrogate.ss index 16aca25..23f8a90 100644 --- a/collects/mzlib/surrogate.ss +++ b/collects/mzlib/surrogate.ss @@ -1,5 +1,5 @@ (module surrogate mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide surrogate) diff --git a/collects/mzlib/tar.ss b/collects/mzlib/tar.ss index d690e33..b91cfef 100644 --- a/collects/mzlib/tar.ss +++ b/collects/mzlib/tar.ss @@ -1,5 +1,5 @@ (module tar mzscheme - (require (lib "deflate.ss") (lib "file.ss") (lib "kw.ss")) + (require mzlib/deflate mzlib/file mzlib/kw) (define tar-block-size 512) (define tar-name-length 100) diff --git a/collects/mzlib/transcr.ss b/collects/mzlib/transcr.ss index f9ca994..11b5779 100644 --- a/collects/mzlib/transcr.ss +++ b/collects/mzlib/transcr.ss @@ -1,6 +1,6 @@ (module transcr mzscheme - (require (lib "port.ss")) + (require mzlib/port) (provide (rename -transcript-on transcript-on) (rename -transcript-off transcript-off)) diff --git a/collects/mzlib/unit.ss b/collects/mzlib/unit.ss index aee21d2..ff1d634 100644 --- a/collects/mzlib/unit.ss +++ b/collects/mzlib/unit.ss @@ -1,15 +1,15 @@ (module unit mzscheme - (require-for-syntax (lib "list.ss") - (lib "boundmap.ss" "syntax") - (lib "context.ss" "syntax") - (lib "kerncase.ss" "syntax") - (lib "name.ss" "syntax") - (lib "struct.ss" "syntax") - (lib "stx.ss" "syntax") + (require-for-syntax mzlib/list + syntax/boundmap + syntax/context + syntax/kerncase + syntax/name + syntax/struct + syntax/stx "private/unit-compiletime.ss" "private/unit-syntax.ss") - (require (lib "etc.ss") + (require mzlib/etc "private/unit-keywords.ss" "private/unit-runtime.ss" (only "private/unit-compiletime.ss" apply-mac)) diff --git a/collects/mzlib/unit200.ss b/collects/mzlib/unit200.ss index 2da5d74..9952ceb 100644 --- a/collects/mzlib/unit200.ss +++ b/collects/mzlib/unit200.ss @@ -2,10 +2,10 @@ ;; Unit system (module unit200 mzscheme - (require-for-syntax (lib "kerncase.ss" "syntax") - (lib "stx.ss" "syntax") - (lib "name.ss" "syntax") - (lib "context.ss" "syntax") + (require-for-syntax syntax/kerncase + syntax/stx + syntax/name + syntax/context "list.ss" "private/unitidmap.ss") diff --git a/collects/mzlib/unitsig.ss b/collects/mzlib/unitsig.ss index c6fc7bb..aa01405 100644 --- a/collects/mzlib/unitsig.ss +++ b/collects/mzlib/unitsig.ss @@ -1,4 +1,4 @@ (module unitsig mzscheme - (require (lib "unitsig200.ss")) - (provide (all-from (lib "unitsig200.ss")))) + (require mzlib/unitsig200) + (provide (all-from mzlib/unitsig200))) diff --git a/collects/mzlib/unitsig200.ss b/collects/mzlib/unitsig200.ss index 95c4f5e..3398291 100644 --- a/collects/mzlib/unitsig200.ss +++ b/collects/mzlib/unitsig200.ss @@ -10,7 +10,7 @@ (require-for-syntax "private/sigutil.ss") (require-for-syntax "private/sigmatch.ss") - (require-for-syntax (lib "kerncase.ss" "syntax")) + (require-for-syntax syntax/kerncase) (define-struct signed-unit (unit imports exports)) diff --git a/collects/mzlib/zip.ss b/collects/mzlib/zip.ss index 5b1d363..204ccca 100644 --- a/collects/mzlib/zip.ss +++ b/collects/mzlib/zip.ss @@ -1,7 +1,7 @@ ;; A modification of Dave Herman's zip module (module zip mzscheme - (require (lib "deflate.ss") (lib "file.ss") (lib "kw.ss")) + (require mzlib/deflate mzlib/file mzlib/kw) ;; =========================================================================== ;; DATA DEFINITIONS diff --git a/collects/net/cgi-unit.ss b/collects/net/cgi-unit.ss index 38ca9a0..2bbe23c 100644 --- a/collects/net/cgi-unit.ss +++ b/collects/net/cgi-unit.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "etc.ss") + (require mzlib/etc "cgi-sig.ss" "uri-codec.ss") diff --git a/collects/net/cookie-unit.ss b/collects/net/cookie-unit.ss index 1011f58..4ebbf56 100644 --- a/collects/net/cookie-unit.ss +++ b/collects/net/cookie-unit.ss @@ -50,10 +50,10 @@ #lang scheme/unit - (require (lib "etc.ss") - (lib "list.ss") - (lib "string.ss" "srfi" "13") - (lib "char-set.ss" "srfi" "14") + (require mzlib/etc + mzlib/list + srfi/13/string + srfi/14/char-set "cookie-sig.ss") (import) diff --git a/collects/net/dns-unit.ss b/collects/net/dns-unit.ss index 4476f1d..667c56f 100644 --- a/collects/net/dns-unit.ss +++ b/collects/net/dns-unit.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "list.ss") (lib "process.ss") "dns-sig.ss" + (require mzlib/list mzlib/process "dns-sig.ss" scheme/udp) (import) diff --git a/collects/net/head-unit.ss b/collects/net/head-unit.ss index de8aea3..67c4348 100644 --- a/collects/net/head-unit.ss +++ b/collects/net/head-unit.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "date.ss") (lib "string.ss") "head-sig.ss") + (require mzlib/date mzlib/string "head-sig.ss") (import) (export head^) diff --git a/collects/net/mime-unit.ss b/collects/net/mime-unit.ss index 557b126..6fe62d9 100644 --- a/collects/net/mime-unit.ss +++ b/collects/net/mime-unit.ss @@ -34,9 +34,9 @@ "base64-sig.ss" "head-sig.ss" "mime-util.ss" - (lib "etc.ss") - (lib "string.ss") - (lib "port.ss")) + mzlib/etc + mzlib/string + mzlib/port) (import base64^ qp^ head^) (export mime^) diff --git a/collects/net/qp-unit.ss b/collects/net/qp-unit.ss index 8d557bc..fdacd4a 100644 --- a/collects/net/qp-unit.ss +++ b/collects/net/qp-unit.ss @@ -29,7 +29,7 @@ #lang scheme/unit (require "qp-sig.ss" - (lib "etc.ss")) + mzlib/etc) (import) (export qp^) diff --git a/collects/net/sendmail-unit.ss b/collects/net/sendmail-unit.ss index df17e9f..e01ff9a 100644 --- a/collects/net/sendmail-unit.ss +++ b/collects/net/sendmail-unit.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "process.ss") "sendmail-sig.ss") + (require mzlib/process "sendmail-sig.ss") (import) (export sendmail^) diff --git a/collects/net/uri-codec-unit.ss b/collects/net/uri-codec-unit.ss index d11fb12..88441c8 100644 --- a/collects/net/uri-codec-unit.ss +++ b/collects/net/uri-codec-unit.ss @@ -88,10 +88,10 @@ See more in PR8831. #lang scheme/unit -(require (lib "match.ss") - (lib "string.ss") - (lib "list.ss") - (lib "etc.ss") +(require mzlib/match + mzlib/string + mzlib/list + mzlib/etc "uri-codec-sig.ss") (import) diff --git a/collects/net/url-unit.ss b/collects/net/url-unit.ss index 1cce7d3..c185a1b 100644 --- a/collects/net/url-unit.ss +++ b/collects/net/url-unit.ss @@ -10,12 +10,12 @@ ;; "pure" = the MIME headers have been read (module url-unit mzscheme - (require (lib "file.ss") - (lib "unit.ss") - (lib "port.ss") - (lib "list.ss") - (lib "string.ss") - (lib "kw.ss") + (require mzlib/file + mzlib/unit + mzlib/port + mzlib/list + mzlib/string + mzlib/kw "url-structs.ss" "uri-codec.ss" "url-sig.ss" diff --git a/collects/tests/mzscheme/awk.ss b/collects/tests/mzscheme/awk.ss index 4403a51..047dd91 100644 --- a/collects/tests/mzscheme/awk.ss +++ b/collects/tests/mzscheme/awk.ss @@ -3,7 +3,7 @@ (Section 'awk) -(require (lib "awk.ss")) +(require mzlib/awk) (define-syntax (test-awk stx) (syntax-case stx () diff --git a/collects/tests/mzscheme/compat.ss b/collects/tests/mzscheme/compat.ss index 9b51c30..11c4cb5 100644 --- a/collects/tests/mzscheme/compat.ss +++ b/collects/tests/mzscheme/compat.ss @@ -4,7 +4,7 @@ (Section 'compat) -(require (lib "compat.ss")) +(require mzlib/compat) (define-structure (add left right) ([sum (+ left right)])) (test 9 add-sum (make-add 3 6)) diff --git a/collects/tests/mzscheme/contract-mzlib-test.ss b/collects/tests/mzscheme/contract-mzlib-test.ss index 78e18a4..767baf0 100644 --- a/collects/tests/mzscheme/contract-mzlib-test.ss +++ b/collects/tests/mzscheme/contract-mzlib-test.ss @@ -1615,7 +1615,7 @@ of the contract library does not change over time. 'define/contract7 '(let () (eval '(module contract-test-suite-define1 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define/contract x string? "a") x)) (eval '(require 'contract-test-suite-define1)))) @@ -3222,8 +3222,8 @@ of the contract library does not change over time. 'd-c-s-match1 '(begin (eval '(module d-c-s-match1 mzscheme - (require (lib "contract.ss") - (lib "match.ss")) + (require mzlib/contract + mzlib/match) (define-contract-struct foo (bar baz)) @@ -3236,8 +3236,8 @@ of the contract library does not change over time. 'd-c-s-match2 '(begin (eval '(module d-c-s-match2 mzscheme - (require (lib "contract.ss") - (lib "match.ss")) + (require mzlib/contract + mzlib/match) (define-contract-struct foo (bar baz)) @@ -3255,7 +3255,7 @@ of the contract library does not change over time. (test/pos-blame 'd-c-s1 '(begin (eval '(module d-c-s1 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-contract-struct couple (hd tl)) (contract (couple/c any/c any/c) 1 'pos 'neg))) (eval '(require 'd-c-s1)))) @@ -4037,7 +4037,7 @@ so that propagation occurs. (contract-eval '(module contract-test-suite-inferred-name1 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define contract-inferred-name-test-contract (-> integer? any)) (define (contract-inferred-name-test x) #t) (provide/contract (contract-inferred-name-test contract-inferred-name-test-contract)) @@ -4620,7 +4620,7 @@ so that propagation occurs. 'provide/contract1 '(let () (eval '(module contract-test-suite1 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define x 1) (provide/contract (x integer?)))) (eval '(require 'contract-test-suite1)) @@ -4630,7 +4630,7 @@ so that propagation occurs. 'provide/contract2 '(let () (eval '(module contract-test-suite2 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (provide/contract))) (eval '(require 'contract-test-suite2)))) @@ -4638,7 +4638,7 @@ so that propagation occurs. 'provide/contract3 '(let () (eval '(module contract-test-suite3 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define x #f) (provide/contract (x integer?)))) (eval '(require 'contract-test-suite3)) @@ -4649,7 +4649,7 @@ so that propagation occurs. 'provide/contract4 '(begin (eval '(module contract-test-suite4 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a)) (provide/contract (struct s ((a any/c)))))) (eval '(require 'contract-test-suite4)) @@ -4662,7 +4662,7 @@ so that propagation occurs. 'provide/contract4-b '(begin (eval '(module contract-test-suite4-b mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a)) (provide/contract (struct s ((a any/c)))))) (eval '(require 'contract-test-suite4-b)) @@ -4674,7 +4674,7 @@ so that propagation occurs. 'provide/contract4-c '(begin (eval '(module contract-test-suite4-c mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a b)) (provide/contract (struct s ((a any/c) (b any/c)))))) (eval '(require 'contract-test-suite4-c)) @@ -4692,7 +4692,7 @@ so that propagation occurs. 'provide/contract5 '(begin (eval '(module contract-test-suite5 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a)) (define-struct t (a)) (provide/contract (struct s ((a any/c))) @@ -4709,7 +4709,7 @@ so that propagation occurs. 'provide/contract6 '(begin (eval '(module contract-test-suite6 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a)) (provide/contract (struct s ((a any/c)))))) (eval '(require 'contract-test-suite6)) @@ -4719,13 +4719,13 @@ so that propagation occurs. 'provide/contract6b '(begin (eval '(module contract-test-suite6b mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s_ (a)) (provide/contract (struct s_ ((a any/c)))))) (eval '(require 'contract-test-suite6b)) (eval '(module contract-test-suite6b2 mzscheme (require 'contract-test-suite6b) - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct (t_ s_) (b)) (provide s_-a) (provide/contract (struct (t_ s_) ((a any/c) (b any/c)))))) @@ -4737,7 +4737,7 @@ so that propagation occurs. 'provide/contract7 '(begin (eval '(module contract-test-suite7 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a b)) (define-struct (t s) (c d)) (provide/contract @@ -4755,7 +4755,7 @@ so that propagation occurs. 'provide/contract8 '(begin (eval '(module contract-test-suite8 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct i-s (contents)) (define (w-f-s? x) #t) (provide/contract @@ -4767,7 +4767,7 @@ so that propagation occurs. 'provide/contract9 '(begin (eval '(module contract-test-suite9 mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define the-internal-name 1) (provide/contract (rename the-internal-name the-external-name integer?)) (+ the-internal-name 1))) @@ -4778,11 +4778,11 @@ so that propagation occurs. 'provide/contract10 '(begin (eval '(module pc10-m mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a b) (make-inspector)) (provide/contract (struct s ((a number?) (b number?)))))) (eval '(module pc10-n mzscheme - (require (lib "struct.ss") + (require mzlib/struct 'pc10-m) (print-struct #t) (copy-struct s @@ -4794,7 +4794,7 @@ so that propagation occurs. 'provide/contract11 '(begin (eval '(module pc11-m mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define x 1) (provide/contract [rename x y integer?] [rename x z integer?]))) @@ -4809,11 +4809,11 @@ so that propagation occurs. 'provide/contract11b '(parameterize ([current-namespace (make-namespace)]) (eval '(module pc11b-m mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct s (a b) (make-inspector)) (provide/contract (struct s ((a number?) (b number?)))))) (eval '(module pc11b-n mzscheme - (require (lib "struct.ss") + (require mzlib/struct m) (print-struct #t) (copy-struct s @@ -4864,7 +4864,7 @@ so that propagation occurs. ([flags (listof string?)] [type type?]))))) (eval '(module pc14-test2 mzscheme - (require (lib "plt-match.ss")) + (require mzlib/plt-match) (require 'pc14-test1) (match (make-type:ptr '() (make-type '())) [(struct type:ptr (flags type)) #f]))) @@ -4962,7 +4962,7 @@ so that propagation occurs. 'provide/contract20 '(eval '(module tmp mzscheme (require mzlib/contract - (lib "unit.ss")) + mzlib/unit) (define-struct s (a b)) diff --git a/collects/tests/mzscheme/etc.ss b/collects/tests/mzscheme/etc.ss index 2b07572..123ba85 100644 --- a/collects/tests/mzscheme/etc.ss +++ b/collects/tests/mzscheme/etc.ss @@ -3,7 +3,7 @@ (Section 'etc) -(require (lib "etc.ss")) +(require mzlib/etc) (let () (begin-with-definitions diff --git a/collects/tests/mzscheme/kw.ss b/collects/tests/mzscheme/kw.ss index 8057fb5..e0b8b8e 100644 --- a/collects/tests/mzscheme/kw.ss +++ b/collects/tests/mzscheme/kw.ss @@ -3,7 +3,7 @@ (Section 'kw) -(require (lib "kw.ss") +(require mzlib/kw (prefix-in mz: mzscheme)) (let-syntax ([#%datum (syntax-rules () [(_ . xs) (mz:#%datum . xs)])] diff --git a/collects/tests/mzscheme/macrolib.ss b/collects/tests/mzscheme/macrolib.ss index bf01afe..91a0bf0 100644 --- a/collects/tests/mzscheme/macrolib.ss +++ b/collects/tests/mzscheme/macrolib.ss @@ -3,7 +3,7 @@ (Section 'macrolib) -(require (lib "etc.ss")) +(require mzlib/etc) (let ([u (letrec ([x x]) x)]) (let ([l1 diff --git a/collects/tests/mzscheme/pconvert.ss b/collects/tests/mzscheme/pconvert.ss index 2e970bb..9c0b718 100644 --- a/collects/tests/mzscheme/pconvert.ss +++ b/collects/tests/mzscheme/pconvert.ss @@ -3,9 +3,9 @@ (Section 'pconvert) -(require (lib "file.ss") - (lib "class.ss") - (lib "pconvert.ss")) +(require mzlib/file + mzlib/class + mzlib/pconvert) (constructor-style-printing #t) (quasi-read-style-printing #f) diff --git a/collects/tests/mzscheme/restart.ss b/collects/tests/mzscheme/restart.ss index 266daa5..a49cdc6 100644 --- a/collects/tests/mzscheme/restart.ss +++ b/collects/tests/mzscheme/restart.ss @@ -1,7 +1,7 @@ (load-relative "loadtest.ss") -(require (lib "restart.ss")) +(require mzlib/restart) (Section 'restart) diff --git a/collects/tests/mzscheme/structlib.ss b/collects/tests/mzscheme/structlib.ss index 29192b0..0a8ae1a 100644 --- a/collects/tests/mzscheme/structlib.ss +++ b/collects/tests/mzscheme/structlib.ss @@ -3,7 +3,7 @@ (Section 'structlib) -(require (lib "struct.ss")) +(require mzlib/struct) (let* ([now (seconds->date (current-seconds))] [v (modulo (add1 (date-second now)) 60)]) diff --git a/collects/tests/mzscheme/threadlib.ss b/collects/tests/mzscheme/threadlib.ss index 27b8069..b44ba6e 100644 --- a/collects/tests/mzscheme/threadlib.ss +++ b/collects/tests/mzscheme/threadlib.ss @@ -3,7 +3,7 @@ (Section 'threadlib) -(require (lib "thread.ss")) +(require mzlib/thread) (define sema (make-semaphore)) (define sema2 (make-semaphore))