diff --git a/collects/afm/ttf-to-glyphlist.ss b/collects/afm/ttf-to-glyphlist.ss index 729281cded..95a110d83b 100644 --- a/collects/afm/ttf-to-glyphlist.ss +++ b/collects/afm/ttf-to-glyphlist.ss @@ -4,9 +4,9 @@ ;; http://developer.apple.com/fonts/TTRefMan/RM06/Chap6.html ;; http://www.microsoft.com/typography/otspec/otff.htm - (require (lib "etc.ss") - (lib "list.ss") - (lib "cmdline.ss")) + (require mzlib/etc + mzlib/list + mzlib/cmdline) (define (read-fixed p) (integer-bytes->integer (read-bytes 4 p) #f #t)) diff --git a/collects/algol60/algol60.ss b/collects/algol60/algol60.ss index 37959a756d..4c50fca329 100644 --- a/collects/algol60/algol60.ss +++ b/collects/algol60/algol60.ss @@ -11,7 +11,7 @@ "compile.ss" ;; Compiles a simplified AST to Scheme. - (lib "file.ss")) + mzlib/file) ;; By using #'here for the context of identifiers ;; introduced by compilation, the identifiers can diff --git a/collects/algol60/cfg-parser.ss b/collects/algol60/cfg-parser.ss index f1492aeec1..a8d77eeb07 100644 --- a/collects/algol60/cfg-parser.ss +++ b/collects/algol60/cfg-parser.ss @@ -29,12 +29,12 @@ ;; tokens. (module cfg-parser mzscheme - (require (lib "yacc.ss" "parser-tools") - (lib "lex.ss" "parser-tools") - (lib "list.ss") - (lib "etc.ss")) - (require-for-syntax (lib "boundmap.ss" "syntax") - (lib "list.ss") + (require parser-tools/yacc + parser-tools/lex + mzlib/list + mzlib/etc) + (require-for-syntax syntax/boundmap + mzlib/list (lib "token-syntax.ss" "parser-tools" "private-lex")) (provide cfg-parser) diff --git a/collects/algol60/compile.ss b/collects/algol60/compile.ss index 969290e329..6847c9a319 100644 --- a/collects/algol60/compile.ss +++ b/collects/algol60/compile.ss @@ -1,7 +1,7 @@ #cs(module compile mzscheme (require "parse.ss" - (lib "match.ss") - (lib "list.ss")) + mzlib/match + mzlib/list) (provide compile-simplified) diff --git a/collects/algol60/parse.ss b/collects/algol60/parse.ss index 02538a518d..39a1995bf3 100644 --- a/collects/algol60/parse.ss +++ b/collects/algol60/parse.ss @@ -1,9 +1,9 @@ #cs(module parse mzscheme - (require (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools")) + (require parser-tools/lex + (prefix : parser-tools/lex-sre) "cfg-parser.ss" - (lib "yacc.ss" "parser-tools") - (lib "readerr.ss" "syntax") + parser-tools/yacc + syntax/readerr "prims.ss") (define-lex-abbrevs [lex:letter (:or (:/ #\a #\z) (:/ #\A #\Z))] diff --git a/collects/algol60/simplify.ss b/collects/algol60/simplify.ss index 0b782aaf55..e855485b6a 100644 --- a/collects/algol60/simplify.ss +++ b/collects/algol60/simplify.ss @@ -1,7 +1,7 @@ #cs(module simplify mzscheme (require "parse.ss" "prims.ss" - (lib "match.ss")) + mzlib/match) (provide simplify) diff --git a/collects/algol60/tool.ss b/collects/algol60/tool.ss index 676cb9a74d..ae0c0e708a 100644 --- a/collects/algol60/tool.ss +++ b/collects/algol60/tool.ss @@ -1,18 +1,18 @@ (module tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (lib "unit.ss") - (lib "class.ss") + mred + mzlib/unit + mzlib/class "parse.ss" "simplify.ss" "compile.ss" - (lib "embed.ss" "compiler") - (lib "string-constant.ss" "string-constants") + compiler/embed + string-constants (prefix bd: "bd-tool.ss")) (provide tool@) - (define base-importing-stx (dynamic-require '(lib "algol60/base.ss") + (define base-importing-stx (dynamic-require 'mzlib/algol60/base 'base-importing-stx)) (define tool@ @@ -88,8 +88,8 @@ (define/public (get-teachpack-names) null) (define/public (marshall-settings x) x) (define/public (on-execute settings run-in-user-thread) - (dynamic-require '(lib "algol60/base.ss") #f) - (let ([path ((current-module-name-resolver) '(lib "algol60/base.ss") #f #f)] + (dynamic-require 'mzlib/algol60/base #f) + (let ([path ((current-module-name-resolver) 'mzlib/algol60/base #f #f)] [n (current-namespace)]) (run-in-user-thread (lambda () @@ -115,10 +115,10 @@ base-importing-stx)]) (make-embedding-executable dst-file #f #f - '((#f (lib "algol60/base.ss"))) + '((#f mzlib/algol60/base)) null (compile - `(module m (lib "algol60/base.ss") + `(module m mzlib/algol60/base ,code)) (list "-mvqe" "(require m)")))))) (define/public (get-one-line-summary) "Algol 60 (not Scheme at all!)") diff --git a/collects/browser/browser-sig.ss b/collects/browser/browser-sig.ss index 7ca44c34af..6193f3d86e 100644 --- a/collects/browser/browser-sig.ss +++ b/collects/browser/browser-sig.ss @@ -1,5 +1,5 @@ (module browser-sig mzscheme - (require (lib "unit.ss") + (require mzlib/unit "private/sig.ss") (provide browser^) diff --git a/collects/browser/browser-unit.ss b/collects/browser/browser-unit.ss index 6fac1004c1..c278a95423 100644 --- a/collects/browser/browser-unit.ss +++ b/collects/browser/browser-unit.ss @@ -1,10 +1,10 @@ (module browser-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") (lib "plt-installer-sig.ss" "setup") - (lib "tcp-sig.ss" "net") - (lib "url-sig.ss" "net") - (lib "url-unit.ss" "net") + net/tcp-sig + net/url-sig + net/url-unit "browser-sig.ss" "private/sig.ss" "private/bullet.ss" diff --git a/collects/browser/browser.ss b/collects/browser/browser.ss index 338a9b8fee..2de0b16f76 100644 --- a/collects/browser/browser.ss +++ b/collects/browser/browser.ss @@ -1,12 +1,12 @@ (module browser mzscheme - (require (lib "unit.ss") - (lib "mred.ss" "mred") + (require mzlib/unit + mred (lib "mred-sig.ss" "mred") (lib "plt-installer-sig.ss" "setup") (lib "plt-installer.ss" "setup") - (lib "tcp-sig.ss" "net") - (lib "url-sig.ss" "net") - (lib "url.ss" "net") + net/tcp-sig + net/url-sig + net/url "browser-sig.ss" "browser-unit.ss") diff --git a/collects/browser/external.ss b/collects/browser/external.ss index 7badb3323f..c567e2d132 100644 --- a/collects/browser/external.ss +++ b/collects/browser/external.ss @@ -1,13 +1,13 @@ (module external mzscheme - (require (lib "string-constant.ss" "string-constants") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "file.ss") - (lib "list.ss") - (lib "match.ss") - (prefix raw: (lib "sendurl.ss" "net")) - (lib "url.ss" "net") - (prefix fw: (lib "framework.ss" "framework"))) + (require string-constants + mred + mzlib/class + mzlib/file + mzlib/list + mzlib/match + (prefix raw: net/sendurl) + net/url + (prefix fw: framework)) (provide send-url (rename raw:browser-preference? browser-preference?) update-browser-preference diff --git a/collects/browser/htmltext.ss b/collects/browser/htmltext.ss index 383e3df6f7..094c5c941f 100644 --- a/collects/browser/htmltext.ss +++ b/collects/browser/htmltext.ss @@ -1,14 +1,14 @@ (module htmltext mzscheme - (require (lib "unit.ss") - (lib "class.ss") + (require mzlib/unit + mzlib/class "browser-sig.ss" "private/sig.ss" "private/html.ss" "private/bullet.ss" - (lib "url.ss" "net") - (lib "url-sig.ss" "net") - (lib "mred.ss" "mred") + net/url + net/url-sig + mred (lib "mred-unit.ss" "mred") (lib "mred-sig.ss" "mred") (lib "external.ss" "browser")) diff --git a/collects/browser/private/bullet.ss b/collects/browser/private/bullet.ss index 351d8220bb..1f05c4492c 100644 --- a/collects/browser/private/bullet.ss +++ b/collects/browser/private/bullet.ss @@ -1,6 +1,6 @@ (module bullet mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide bullet-snip% get-bullet-width diff --git a/collects/browser/private/html.ss b/collects/browser/private/html.ss index 32de862cf8..fbfb897be1 100644 --- a/collects/browser/private/html.ss +++ b/collects/browser/private/html.ss @@ -3,12 +3,12 @@ (require "sig.ss" (lib "mred-sig.ss" "mred") scheme/file - (lib "port.ss") - (lib "url-sig.ss" "net") + mzlib/port + net/url-sig (only-in (lib "html.ss" "html") read-html-as-xml read-html-comments use-html-spec) (except-in (lib "xml.ss" "xml") read-comments) - (lib "class.ss") + mzlib/class "bullet.ss" "option-snip.ss" "entity-names.ss") diff --git a/collects/browser/private/hyper.ss b/collects/browser/private/hyper.ss index 68670015ff..ad26fd5506 100644 --- a/collects/browser/private/hyper.ss +++ b/collects/browser/private/hyper.ss @@ -2,10 +2,7 @@ A test case: (module tmp mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "browser.ss" "browser") - (lib "framework.ss" "framework")) + (require mzlib/class mred browser framework) (define f% (frame:status-line-mixin @@ -30,16 +27,16 @@ A test case: #lang scheme/unit -(require (lib "class.ss") +(require mzlib/class "sig.ss" scheme/path scheme/file - (lib "url-sig.ss" "net") - (lib "url-structs.ss" "net") - (lib "head.ss" "net") + net/url-sig + net/url-structs + net/head (lib "mred-sig.ss" "mred") - (lib "framework.ss" "framework") - (lib "string-constant.ss" "string-constants") + framework + string-constants (lib "plt-installer-sig.ss" "setup")) diff --git a/collects/browser/private/option-snip.ss b/collects/browser/private/option-snip.ss index 4088905064..f434cb995b 100644 --- a/collects/browser/private/option-snip.ss +++ b/collects/browser/private/option-snip.ss @@ -1,7 +1,7 @@ (module option-snip mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "string.ss")) + (require mred + mzlib/class + mzlib/string) (provide option-snip% checkbox-snip%) diff --git a/collects/browser/tool.ss b/collects/browser/tool.ss index 130cf3b603..732dc35b0c 100644 --- a/collects/browser/tool.ss +++ b/collects/browser/tool.ss @@ -1,6 +1,6 @@ (module tool mzscheme (require (lib "external.ss" "browser") - (lib "unit.ss") + mzlib/unit (lib "tool.ss" "drscheme")) (provide tool@) diff --git a/collects/combinator-parser/examples/combinator-example.ss b/collects/combinator-parser/examples/combinator-example.ss index 16cc0cf520..c685939980 100644 --- a/collects/combinator-parser/examples/combinator-example.ss +++ b/collects/combinator-parser/examples/combinator-example.ss @@ -1,8 +1,8 @@ (module combinator-example mzscheme -(require (lib "unit.ss") - (lib "lex.ss" "parser-tools") - (lib "combinator-unit.ss" "parser-tools")) +(require mzlib/unit + parser-tools/lex + parser-tools/combinator-unit) (define-unit support (import) diff --git a/collects/combinator-parser/private-combinator/combinator-parser.scm b/collects/combinator-parser/private-combinator/combinator-parser.scm index f1a8e7339e..20fae4ec94 100644 --- a/collects/combinator-parser/private-combinator/combinator-parser.scm +++ b/collects/combinator-parser/private-combinator/combinator-parser.scm @@ -1,10 +1,9 @@ (module combinator-parser lazy - (require (lib "unit.ss") - (lib "lex.ss" "parser-tools")) - + (require mzlib/unit parser-tools/lex) + (require "structs.scm" "parser-sigs.ss" "combinator.scm" "errors.scm") - + (provide combinator-parser-tools@) (define-unit main-parser@ diff --git a/collects/combinator-parser/private-combinator/combinator.scm b/collects/combinator-parser/private-combinator/combinator.scm index 0cab1fb138..bc1801dd97 100644 --- a/collects/combinator-parser/private-combinator/combinator.scm +++ b/collects/combinator-parser/private-combinator/combinator.scm @@ -1,11 +1,11 @@ (module combinator lazy - (require (lib "unit.ss") - (only (lib "etc.ss") opt-lambda)) + (require mzlib/unit + (only mzlib/etc opt-lambda)) (require "structs.scm" "parser-sigs.ss" - (lib "lex.ss" "parser-tools")) + parser-tools/lex) (provide (all-defined)) diff --git a/collects/combinator-parser/private-combinator/errors.scm b/collects/combinator-parser/private-combinator/errors.scm index 11d6b80955..92e26e318d 100644 --- a/collects/combinator-parser/private-combinator/errors.scm +++ b/collects/combinator-parser/private-combinator/errors.scm @@ -2,10 +2,10 @@ (require "structs.scm" "parser-sigs.ss") - (require (lib "force.ss" "lazy") - (lib "etc.ss") - (lib "unit.ss") - (lib "list.ss")) + (require lazy/force + mzlib/etc + mzlib/unit + mzlib/list) (provide (all-defined)) diff --git a/collects/combinator-parser/private-combinator/parser-sigs.ss b/collects/combinator-parser/private-combinator/parser-sigs.ss index 09cea5d405..7cab3e6f8e 100644 --- a/collects/combinator-parser/private-combinator/parser-sigs.ss +++ b/collects/combinator-parser/private-combinator/parser-sigs.ss @@ -1,10 +1,10 @@ (module parser-sigs mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) - (require (only (lib "etc.ss") opt-lambda)) ; Required for expansion - (require (lib "lex.ss" "parser-tools") - (lib "string.ss") (lib "list.ss")) + (require (only mzlib/etc opt-lambda)) ; Required for expansion + (require parser-tools/lex + mzlib/string mzlib/list) (provide (all-defined)) diff --git a/collects/combinator-parser/private-combinator/structs.scm b/collects/combinator-parser/private-combinator/structs.scm index 95662acbb9..3a009d9890 100644 --- a/collects/combinator-parser/private-combinator/structs.scm +++ b/collects/combinator-parser/private-combinator/structs.scm @@ -2,8 +2,8 @@ (provide (all-defined-except make-fail-type)) - (require (lib "force.ss" "lazy") - (lib "lex.ss" "parser-tools")) + (require lazy/force + parser-tools/lex) ;fail-src: (list line col pos span loc) diff --git a/collects/compiler/bundle-dist.ss b/collects/compiler/bundle-dist.ss index b0e91479c6..02a671be4f 100644 --- a/collects/compiler/bundle-dist.ss +++ b/collects/compiler/bundle-dist.ss @@ -1,10 +1,10 @@ (module bundle-dist mzscheme - (require (lib "etc.ss") - (lib "file.ss") - (lib "process.ss") - (lib "zip.ss") - (lib "tar.ss")) + (require mzlib/etc + mzlib/file + mzlib/process + mzlib/zip + mzlib/tar) (provide bundle-put-file-extension+style+filters bundle-directory) diff --git a/collects/compiler/cffi.ss b/collects/compiler/cffi.ss index 0e7a53ffaf..d18cc1cf21 100644 --- a/collects/compiler/cffi.ss +++ b/collects/compiler/cffi.ss @@ -7,9 +7,9 @@ ;; of expression. (module cffi mzscheme - (require (lib "stx.ss" "syntax")) - (require-for-syntax (lib "name.ss" "syntax") - (lib "path-spec.ss" "syntax")) + (require syntax/stx) + (require-for-syntax syntax/name + syntax/path-spec) (define-syntax c-lambda (let ([re:fname (regexp "^[a-zA-Z_0-9]+$")] diff --git a/collects/compiler/compiler.ss b/collects/compiler/compiler.ss index 22972ce9d3..2449e199df 100644 --- a/collects/compiler/compiler.ss +++ b/collects/compiler/compiler.ss @@ -1,16 +1,16 @@ (module compiler mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "sig.ss") - (require (lib "compile-sig.ss" "dynext")) - (require (lib "link-sig.ss" "dynext")) - (require (lib "file-sig.ss" "dynext")) + (require dynext/compile-sig) + (require dynext/link-sig) + (require dynext/file-sig) ;; - (require (lib "compile.ss" "dynext")) - (require (lib "link.ss" "dynext")) - (require (lib "file.ss" "dynext")) + (require dynext/compile) + (require dynext/link) + (require dynext/file) (require "option.ss") diff --git a/collects/compiler/distribute.ss b/collects/compiler/distribute.ss index a10cf3ce51..11d6339fdf 100644 --- a/collects/compiler/distribute.ss +++ b/collects/compiler/distribute.ss @@ -2,10 +2,10 @@ (module distribute scheme/base (require scheme/file scheme/path - (lib "dirs.ss" "setup") - (lib "list.ss") + setup/dirs + mzlib/list (lib "variant.ss" "setup") - (lib "filename-version.ss" "dynext") + dynext/filename-version "private/macfw.ss" "private/windlldir.ss" "private/collects-path.ss") diff --git a/collects/compiler/embed-sig.ss b/collects/compiler/embed-sig.ss index dede40321b..a5e949c9a8 100644 --- a/collects/compiler/embed-sig.ss +++ b/collects/compiler/embed-sig.ss @@ -1,6 +1,6 @@ (module embed-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide compiler:embed^) (define-signature compiler:embed^ diff --git a/collects/compiler/embed-unit.ss b/collects/compiler/embed-unit.ss index 082e275cc7..b70a4cef6f 100644 --- a/collects/compiler/embed-unit.ss +++ b/collects/compiler/embed-unit.ss @@ -435,7 +435,7 @@ module-path)]) (syntax-case (expand `(module m mzscheme (require (only ,module-path) - (lib "runtime-path.ss")) + mzlib/runtime-path) (runtime-paths ,module-path))) (quote) [(_ m mz (#%mb rfs req (quote (spec ...)))) (syntax->datum #'(spec ...))] diff --git a/collects/compiler/embed.ss b/collects/compiler/embed.ss index 0cee01092c..63acec7389 100644 --- a/collects/compiler/embed.ss +++ b/collects/compiler/embed.ss @@ -1,7 +1,7 @@ (module embed mzscheme - (require (lib "unit.ss") - (lib "contract.ss")) + (require mzlib/unit + mzlib/contract) (require "sig.ss") diff --git a/collects/compiler/main.ss b/collects/compiler/main.ss index 7a7aaf8f24..0ec0c01ba9 100644 --- a/collects/compiler/main.ss +++ b/collects/compiler/main.ss @@ -25,14 +25,14 @@ (require "compiler.ss") ;; Read argv array for arguments and input file name - (require (lib "cmdline.ss") - (lib "list.ss") - (lib "file.ss" "dynext") - (lib "compile.ss" "dynext") - (lib "link.ss" "dynext") + (require mzlib/cmdline + mzlib/list + dynext/file + dynext/compile + dynext/link (lib "pack.ss" "setup") (lib "getinfo.ss" "setup") - (lib "dirs.ss" "setup")) + setup/dirs) (define dest-dir (make-parameter #f)) (define auto-dest-dir (make-parameter #f)) @@ -408,7 +408,7 @@ ,(if (compiler:option:assume-primitives) '(void) '(namespace-require/copy 'scheme)) - (require (lib "cffi.ss" "compiler")) + (require compiler/cffi) ,@(map (lambda (s) `(load ,s)) prefixes) (void))))))) (list "file/directory/collection" "file/directory/sub-collection"))) @@ -457,9 +457,9 @@ (dest-dir)))] [(make-zo) (let ([n (make-base-empty-namespace)] - [mc (dynamic-require '(lib "mzlib/cm.ss") + [mc (dynamic-require 'mzlib/mzlib/cm 'managed-compile-zo)] - [cnh (dynamic-require '(lib "mzlib/cm.ss") + [cnh (dynamic-require 'mzlib/mzlib/cm 'manager-compile-notify-handler)] [did-one? #f]) (parameterize ([current-namespace n] @@ -518,7 +518,7 @@ [out-file (if (dest-dir) (build-path (dest-dir) out-file) out-file)]) - ((dynamic-require '(lib "xform.ss" "compiler") 'xform) + ((dynamic-require 'compiler/xform 'xform) (not (compiler:option:verbose)) file out-file @@ -555,7 +555,7 @@ #:aux (exe-aux)) (printf " [output to \"~a\"]~n" dest))] [(exe-dir) - ((dynamic-require '(lib "distribute.ss" "compiler") + ((dynamic-require 'compiler/distribute 'assemble-distribution) (exe-dir-output) source-files diff --git a/collects/compiler/option-unit.ss b/collects/compiler/option-unit.ss index ffeb9e5fb8..7ad55bc9d5 100644 --- a/collects/compiler/option-unit.ss +++ b/collects/compiler/option-unit.ss @@ -1,6 +1,6 @@ (module option-unit mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "sig.ss") diff --git a/collects/compiler/option.ss b/collects/compiler/option.ss index 0526d54390..f9f7f9cc12 100644 --- a/collects/compiler/option.ss +++ b/collects/compiler/option.ss @@ -1,6 +1,6 @@ (module option mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "sig.ss") (require "option-unit.ss") diff --git a/collects/compiler/private/analyze.ss b/collects/compiler/private/analyze.ss index cc370c8672..0e918064f2 100644 --- a/collects/compiler/private/analyze.ss +++ b/collects/compiler/private/analyze.ss @@ -39,11 +39,11 @@ ;;; ------------------------------------------------------------ (module analyze mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/anorm.ss b/collects/compiler/private/anorm.ss index ac9a101f5b..97e6bfa241 100644 --- a/collects/compiler/private/anorm.ss +++ b/collects/compiler/private/anorm.ss @@ -33,11 +33,11 @@ ;;; ------------------------------------------------------------ (module anorm mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/base.ss b/collects/compiler/private/base.ss index 0eae068e5e..53d9a8b1ad 100644 --- a/collects/compiler/private/base.ss +++ b/collects/compiler/private/base.ss @@ -1,16 +1,16 @@ (module base mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "../sig.ss") (require "sig.ss") - (require (lib "zodiac-sig.ss" "syntax") - (lib "zodiac-unit.ss" "syntax")) + (require syntax/zodiac-sig + syntax/zodiac-unit) - (require (lib "file-sig.ss" "dynext") - (lib "link-sig.ss" "dynext") - (lib "compile-sig.ss" "dynext")) + (require dynext/file-sig + dynext/link-sig + dynext/compile-sig) (require "zlayer.ss" "library.ss" diff --git a/collects/compiler/private/closure.ss b/collects/compiler/private/closure.ss index d05f1dc2df..fc885eb553 100644 --- a/collects/compiler/private/closure.ss +++ b/collects/compiler/private/closure.ss @@ -17,11 +17,11 @@ ;;; ------------------------------------------------------------ (module closure mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/const.ss b/collects/compiler/private/const.ss index 6f23a5a967..0d67649639 100644 --- a/collects/compiler/private/const.ss +++ b/collects/compiler/private/const.ss @@ -11,12 +11,12 @@ ; that is prefixed onto the beginning of the program. (module const mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax") - (lib "stx.ss" "syntax")) + (require syntax/zodiac-sig + syntax/stx) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/cstructs.ss b/collects/compiler/private/cstructs.ss index fc88e53240..07363532e5 100644 --- a/collects/compiler/private/cstructs.ss +++ b/collects/compiler/private/cstructs.ss @@ -5,11 +5,11 @@ ;; Mostly structure definitions, mostly for annotations. (module cstructs mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/driver.ss b/collects/compiler/private/driver.ss index dd935f84a4..3713677ff3 100644 --- a/collects/compiler/private/driver.ss +++ b/collects/compiler/private/driver.ss @@ -60,20 +60,20 @@ ;; the binding. (module driver mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "file.ss") - (lib "port.ss") - (lib "etc.ss") - (lib "pretty.ss") + (require mzlib/unit + mzlib/list + mzlib/file + mzlib/port + mzlib/etc + mzlib/pretty (prefix src2src: "../src2src.ss")) - (require (lib "zodiac-sig.ss" "syntax") - (lib "toplevel.ss" "syntax") - (lib "compile-sig.ss" "dynext") - (lib "link-sig.ss" "dynext") - (lib "file-sig.ss" "dynext") - (lib "dirs.ss" "setup")) + (require syntax/zodiac-sig + syntax/toplevel + dynext/compile-sig + dynext/link-sig + dynext/file-sig + setup/dirs) (require "../sig.ss" "sig.ss" @@ -262,7 +262,7 @@ (eval (or prefix ;; Need MzScheme and cffi: '(begin - (require (lib "cffi.ss" "compiler")) + (require compiler/cffi) (require-for-syntax mzscheme)))))))) ;;---------------------------------------------------------------------- @@ -428,7 +428,7 @@ (define (open-input-scheme-file path) (let ([p (let ([open (with-handlers ([exn:fail? (lambda (x) #f)]) - (dynamic-require '(lib "mred.ss" "mred") 'open-input-graphical-file))]) + (dynamic-require 'mred 'open-input-graphical-file))]) (if open ;; Handles WXME files: (open path) diff --git a/collects/compiler/private/embed.ss b/collects/compiler/private/embed.ss index 65d83ebd67..5c782341df 100644 --- a/collects/compiler/private/embed.ss +++ b/collects/compiler/private/embed.ss @@ -1,6 +1,6 @@ (module embed mzscheme - (require (lib "embed.ss" "compiler")) + (require compiler/embed) (define mzc:create-embedding-executable create-embedding-executable) (define mzc:embedding-executable-add-suffix embedding-executable-add-suffix) (provide mzc:create-embedding-executable diff --git a/collects/compiler/private/known.ss b/collects/compiler/private/known.ss index 2aaa447607..bd4b4eb526 100644 --- a/collects/compiler/private/known.ss +++ b/collects/compiler/private/known.ss @@ -21,11 +21,11 @@ ;;; ------------------------------------------------------------ (module known mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/library.ss b/collects/compiler/private/library.ss index 0db4d7fc67..73ac6dc47c 100644 --- a/collects/compiler/private/library.ss +++ b/collects/compiler/private/library.ss @@ -3,11 +3,11 @@ ;; (c) 1997-8 PLT, Rice University (module library mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") diff --git a/collects/compiler/private/lift.ss b/collects/compiler/private/lift.ss index 29fb5f1ed5..2f407c9253 100644 --- a/collects/compiler/private/lift.ss +++ b/collects/compiler/private/lift.ss @@ -21,11 +21,11 @@ ;;; ------------------------------------------------------------ (module lift mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/macfw.ss b/collects/compiler/private/macfw.ss index c391cb5a71..871b6b707c 100644 --- a/collects/compiler/private/macfw.ss +++ b/collects/compiler/private/macfw.ss @@ -1,8 +1,8 @@ (module macfw mzscheme (require "mach-o.ss" - (lib "string.ss") - (lib "process.ss")) + mzlib/string + mzlib/process) (provide update-framework-path get-current-framework-path diff --git a/collects/compiler/private/prephase.ss b/collects/compiler/private/prephase.ss index d4b51c4fae..ccfa65ffd1 100644 --- a/collects/compiler/private/prephase.ss +++ b/collects/compiler/private/prephase.ss @@ -40,9 +40,9 @@ ;;; ------------------------------------------------------------ (module prephase mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/rep.ss b/collects/compiler/private/rep.ss index 751a702ac7..529e614c4f 100644 --- a/collects/compiler/private/rep.ss +++ b/collects/compiler/private/rep.ss @@ -15,9 +15,9 @@ ;;; ------------------------------------------------------------ (module rep mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/sig.ss b/collects/compiler/private/sig.ss index ad0873f44d..b0986bab0d 100644 --- a/collects/compiler/private/sig.ss +++ b/collects/compiler/private/sig.ss @@ -1,9 +1,9 @@ (module sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "../sig.ss") - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (define for-syntax-in-env-stx #'for-syntax-in-env) (provide for-syntax-in-env-stx) diff --git a/collects/compiler/private/toplevel.ss b/collects/compiler/private/toplevel.ss index 8d35ced397..214a12c412 100644 --- a/collects/compiler/private/toplevel.ss +++ b/collects/compiler/private/toplevel.ss @@ -3,7 +3,7 @@ ;; (c) 1997-2001 PLT (module toplevel mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "sig.ss") diff --git a/collects/compiler/private/vehicle.ss b/collects/compiler/private/vehicle.ss index e8dd4f1237..a44dc96486 100644 --- a/collects/compiler/private/vehicle.ss +++ b/collects/compiler/private/vehicle.ss @@ -20,9 +20,9 @@ ;;; ------------------------------------------------------------ (module vehicle mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/vm2c.ss b/collects/compiler/private/vm2c.ss index f80b58ff7a..9c7110eaf7 100644 --- a/collects/compiler/private/vm2c.ss +++ b/collects/compiler/private/vm2c.ss @@ -3,11 +3,11 @@ ;; (c) 1997-2001 PLT (module vm2c mzscheme - (require (lib "unit.ss") - (lib "list.ss")) + (require mzlib/unit + mzlib/list) - (require (lib "zodiac-sig.ss" "syntax") - (lib "primitives.ss" "syntax")) + (require syntax/zodiac-sig + syntax/primitives) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/vmopt.ss b/collects/compiler/private/vmopt.ss index 56ae9b6fca..4a43fa2df2 100644 --- a/collects/compiler/private/vmopt.ss +++ b/collects/compiler/private/vmopt.ss @@ -8,11 +8,11 @@ (module vmopt mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/vmphase.ss b/collects/compiler/private/vmphase.ss index 6f0e1dd5bb..c8d14f53d0 100644 --- a/collects/compiler/private/vmphase.ss +++ b/collects/compiler/private/vmphase.ss @@ -10,12 +10,12 @@ ;; to macro uses (where the macros are defined in mzc.h). (module vmphase mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax") - (lib "primitives.ss" "syntax")) + (require syntax/zodiac-sig + syntax/primitives) (require "sig.ss" "../sig.ss") diff --git a/collects/compiler/private/vmscheme.ss b/collects/compiler/private/vmscheme.ss index a31749f9e5..d1c966f8b8 100644 --- a/collects/compiler/private/vmscheme.ss +++ b/collects/compiler/private/vmscheme.ss @@ -6,11 +6,11 @@ (module vmscheme mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "sig.ss") (require "../sig.ss") diff --git a/collects/compiler/private/windlldir.ss b/collects/compiler/private/windlldir.ss index 08ffb78079..927283840a 100644 --- a/collects/compiler/private/windlldir.ss +++ b/collects/compiler/private/windlldir.ss @@ -1,6 +1,6 @@ (module windlldir mzscheme - (require (lib "port.ss") + (require mzlib/port "winutf16.ss") (provide update-dll-dir diff --git a/collects/compiler/private/winicon.ss b/collects/compiler/private/winicon.ss index 255dbb2925..fb064d5c22 100644 --- a/collects/compiler/private/winicon.ss +++ b/collects/compiler/private/winicon.ss @@ -1,6 +1,6 @@ (module winicon mzscheme - (require (lib "list.ss")) + (require mzlib/list) (provide install-icon extract-icons parse-icon @@ -627,8 +627,8 @@ ;; moved somewhere else. #; (begin - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (define (bitmap%->icon bm) (let* ([w (send bm get-width)] [h (send bm get-height)] diff --git a/collects/compiler/private/xform.ss b/collects/compiler/private/xform.ss index b26dc672e0..f812091385 100644 --- a/collects/compiler/private/xform.ss +++ b/collects/compiler/private/xform.ss @@ -1,7 +1,7 @@ (module xform mzscheme - (require (lib "list.ss") - (lib "etc.ss") - (lib "process.ss")) + (require mzlib/list + mzlib/etc + mzlib/process) (provide xform) diff --git a/collects/compiler/private/zlayer.ss b/collects/compiler/private/zlayer.ss index 4c65371539..53300a9a82 100644 --- a/collects/compiler/private/zlayer.ss +++ b/collects/compiler/private/zlayer.ss @@ -3,11 +3,11 @@ ;; (c)1997-2001 PLT (module zlayer mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unit + mzlib/list + mzlib/etc) - (require (lib "zodiac-sig.ss" "syntax")) + (require syntax/zodiac-sig) (require "../sig.ss") (require "sig.ss") diff --git a/collects/compiler/sig.ss b/collects/compiler/sig.ss index b8f638779f..b9577b6fa7 100644 --- a/collects/compiler/sig.ss +++ b/collects/compiler/sig.ss @@ -1,7 +1,7 @@ (module sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide compiler:option^ compiler^ diff --git a/collects/compiler/src2src.ss b/collects/compiler/src2src.ss index 53adb4a3dc..d64e0cfdae 100644 --- a/collects/compiler/src2src.ss +++ b/collects/compiler/src2src.ss @@ -7,11 +7,11 @@ ;; specially preserved for `lambda' expressions. (module src2src scheme/base - (require (lib "class.ss") - (lib "kerncase.ss" "syntax") - (lib "primitives.ss" "syntax") - (lib "etc.ss") - (lib "list.ss")) + (require mzlib/class + syntax/kerncase + syntax/primitives + mzlib/etc + mzlib/list) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Optimizer diff --git a/collects/compiler/to-core.ss b/collects/compiler/to-core.ss index 476d1c758e..cc4b40c565 100644 --- a/collects/compiler/to-core.ss +++ b/collects/compiler/to-core.ss @@ -1,8 +1,8 @@ (module to-core mzscheme - (require (lib "kerncase.ss" "syntax") - (lib "stx.ss" "syntax") - (lib "list.ss") - (lib "boundmap.ss" "syntax")) + (require syntax/kerncase + syntax/stx + mzlib/list + syntax/boundmap) (provide top-level-to-core) diff --git a/collects/compiler/xform.ss b/collects/compiler/xform.ss index cf91a263ec..334cc44e9a 100644 --- a/collects/compiler/xform.ss +++ b/collects/compiler/xform.ss @@ -1,6 +1,6 @@ (module xform mzscheme - (require (lib "compile.ss" "dynext") + (require dynext/compile (prefix xform: "private/xform.ss")) (provide xform) diff --git a/collects/drscheme/arrow.ss b/collects/drscheme/arrow.ss index 2ea699401c..64501ef4ee 100644 --- a/collects/drscheme/arrow.ss +++ b/collects/drscheme/arrow.ss @@ -1,9 +1,9 @@ (module arrow mzscheme - (require (lib "class.ss") - (lib "list.ss") - (lib "math.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mzlib/list + mzlib/math + mred) (provide draw-arrow) diff --git a/collects/drscheme/drscheme.ss b/collects/drscheme/drscheme.ss index eda0e4cba3..fedf1a14d5 100644 --- a/collects/drscheme/drscheme.ss +++ b/collects/drscheme/drscheme.ss @@ -18,8 +18,8 @@ [use-compiled-file-paths '()]) (values (dynamic-require '(lib "zo-compile.ss" "errortrace") 'zo-compile) - (dynamic-require '(lib "cm.ss") 'make-compilation-manager-load/use-compiled-handler) - (dynamic-require '(lib "cm.ss") 'manager-trace-handler)))]) + (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler) + (dynamic-require 'mzlib/cm 'manager-trace-handler)))]) (current-compile zo-compile) (use-compiled-file-paths (list (build-path "compiled" "errortrace"))) (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler)) @@ -36,8 +36,8 @@ manager-trace-handler) (parameterize ([current-namespace (make-namespace)]) (values - (dynamic-require '(lib "cm.ss") 'make-compilation-manager-load/use-compiled-handler) - (dynamic-require '(lib "cm.ss") 'manager-trace-handler)))]) + (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler) + (dynamic-require 'mzlib/cm 'manager-trace-handler)))]) (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler)) (when cm-trace? (printf "PLTDRCM: enabling CM tracing\n") diff --git a/collects/drscheme/installer.ss b/collects/drscheme/installer.ss index 51bb297334..af8a53dfa6 100644 --- a/collects/drscheme/installer.ss +++ b/collects/drscheme/installer.ss @@ -1,7 +1,7 @@ (module installer mzscheme - (require (lib "file.ss") - (lib "etc.ss") - (lib "launcher.ss" "launcher")) + (require mzlib/file + mzlib/etc + launcher) (provide installer) (define (installer plthome) diff --git a/collects/drscheme/private/app.ss b/collects/drscheme/private/app.ss index 4825c36a76..0f2167fa73 100644 --- a/collects/drscheme/private/app.ss +++ b/collects/drscheme/private/app.ss @@ -1,11 +1,11 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "list.ss") + (require mzlib/class + mzlib/list scheme/file - (lib "string-constant.ss" "string-constants") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + string-constants + mred + framework (lib "external.ss" "browser") (lib "getinfo.ss" "setup") "drsig.ss" diff --git a/collects/drscheme/private/auto-language.ss b/collects/drscheme/private/auto-language.ss index 4c9165888e..0a5dd14407 100644 --- a/collects/drscheme/private/auto-language.ss +++ b/collects/drscheme/private/auto-language.ss @@ -1,6 +1,6 @@ (module auto-language mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide pick-new-language looks-like-module?) diff --git a/collects/drscheme/private/bindings-browser.ss b/collects/drscheme/private/bindings-browser.ss index e87c3636db..e35b62f8b0 100644 --- a/collects/drscheme/private/bindings-browser.ss +++ b/collects/drscheme/private/bindings-browser.ss @@ -8,14 +8,14 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto |# (module bindings-browser mzscheme - (require (lib "pretty.ss") - (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "match.ss") - (lib "string.ss") + (require mzlib/pretty + mzlib/list + mzlib/class + mred + mzlib/match + mzlib/string (lib "marks.ss" "stepper" "private") - (lib "contract.ss")) + mzlib/contract) (provide render-bindings/snip) diff --git a/collects/drscheme/private/debug.ss b/collects/drscheme/private/debug.ss index d378b52af0..9e2f808ad5 100644 --- a/collects/drscheme/private/debug.ss +++ b/collects/drscheme/private/debug.ss @@ -7,16 +7,16 @@ profile todo: |# (module debug mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "stacktrace.ss" "errortrace") - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "file.ss") + mzlib/class + mzlib/list + mzlib/etc + mzlib/file "drsig.ss" - (lib "framework.ss" "framework") - (lib "mred.ss" "mred") - (lib "string-constant.ss" "string-constants") + framework + mred + string-constants (lib "bday.ss" "framework" "private") "bindings-browser.ss") diff --git a/collects/drscheme/private/drscheme-normal.ss b/collects/drscheme/private/drscheme-normal.ss index b3340046e1..be42f76008 100644 --- a/collects/drscheme/private/drscheme-normal.ss +++ b/collects/drscheme/private/drscheme-normal.ss @@ -1,8 +1,8 @@ (module drscheme-normal mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "cmdline.ss") + (require mred + mzlib/class + mzlib/cmdline (lib "bday.ss" "framework" "private")) ; (current-load text-editor-load-handler) diff --git a/collects/drscheme/private/eval.ss b/collects/drscheme/private/eval.ss index 680ae0d6ca..87b5ad3f6e 100644 --- a/collects/drscheme/private/eval.ss +++ b/collects/drscheme/private/eval.ss @@ -1,18 +1,18 @@ (module eval mzscheme - (require (lib "mred.ss" "mred") - (lib "unit.ss") - (lib "port.ss") - (lib "class.ss") - (lib "toplevel.ss" "syntax") - (lib "framework.ss" "framework") + (require mred + mzlib/unit + mzlib/port + mzlib/class + syntax/toplevel + framework "drsig.ss") ;; to ensure this guy is loaded (and the snipclass installed) in the drscheme namespace & eventspace ;; these things are for effect only! (require (lib "cache-image-snip.ss" "mrlib") #; - (prefix foo (lib "matrix.ss" "htdp"))) + (prefix foo htdp/matrix)) (define op (current-output-port)) (define (oprintf . args) (apply fprintf op args)) diff --git a/collects/drscheme/private/font.ss b/collects/drscheme/private/font.ss index 0cb5979a4a..66c3b5b902 100644 --- a/collects/drscheme/private/font.ss +++ b/collects/drscheme/private/font.ss @@ -1,10 +1,10 @@ (module font mzscheme - (require (lib "unit.ss") - (lib "class.ss") + (require mzlib/unit + mzlib/class "drsig.ss" - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "string-constant.ss" "string-constants")) + mred + framework + string-constants) (define sc-smoothing-label (string-constant font-smoothing-label)) (define sc-smoothing-none (string-constant font-smoothing-none)) diff --git a/collects/drscheme/private/frame.ss b/collects/drscheme/private/frame.ss index 8652081728..2f4eff026e 100644 --- a/collects/drscheme/private/frame.ss +++ b/collects/drscheme/private/frame.ss @@ -1,15 +1,15 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "match.ss") - (lib "class.ss") - (lib "string.ss") - (lib "list.ss") + (require string-constants + mzlib/match + mzlib/class + mzlib/string + mzlib/list "drsig.ss" - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "url.ss" "net") - (lib "head.ss" "net") + mred + framework + net/url + net/head (lib "plt-installer.ss" "setup") (lib "bug-report.ss" "help") scheme/file) diff --git a/collects/drscheme/private/get-extend.ss b/collects/drscheme/private/get-extend.ss index 36eb5c38a1..23c0aa319c 100644 --- a/collects/drscheme/private/get-extend.ss +++ b/collects/drscheme/private/get-extend.ss @@ -1,9 +1,9 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "drsig.ss" - (lib "mred.ss" "mred") - (lib "etc.ss")) + mred + mzlib/etc) diff --git a/collects/drscheme/private/help-desk.ss b/collects/drscheme/private/help-desk.ss index c5da498dd6..ca4887120a 100644 --- a/collects/drscheme/private/help-desk.ss +++ b/collects/drscheme/private/help-desk.ss @@ -1,13 +1,13 @@ #lang scheme/unit -(require (lib "string-constant.ss" "string-constants") - (lib "mred.ss" "mred") +(require string-constants + mred (lib "external.ss" "browser") (lib "bug-report.ss" "help") (lib "buginfo.ss" "help" "private") - (lib "framework.ss" "framework") - (lib "class.ss") - (lib "list.ss") + framework + mzlib/class + mzlib/list (lib "search.ss" "help") "drsig.ss") diff --git a/collects/drscheme/private/init.ss b/collects/drscheme/private/init.ss index 6435f9b92c..8127337e68 100644 --- a/collects/drscheme/private/init.ss +++ b/collects/drscheme/private/init.ss @@ -1,9 +1,9 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") + (require string-constants "drsig.ss" - (lib "list.ss") - (lib "mred.ss" "mred")) + mzlib/list + mred) (import) diff --git a/collects/drscheme/private/insert-large-letters.ss b/collects/drscheme/private/insert-large-letters.ss index ae4bb93ec5..4620d7185f 100644 --- a/collects/drscheme/private/insert-large-letters.ss +++ b/collects/drscheme/private/insert-large-letters.ss @@ -1,9 +1,6 @@ #lang scheme/base -(require mred/mred - scheme/class - string-constants/string-constant - framework/framework) +(require mred scheme/class string-constants framework) (provide insert-large-letters) diff --git a/collects/drscheme/private/label-frame-mred.ss b/collects/drscheme/private/label-frame-mred.ss index ce18d2c8d6..1f890364f2 100644 --- a/collects/drscheme/private/label-frame-mred.ss +++ b/collects/drscheme/private/label-frame-mred.ss @@ -1,7 +1,7 @@ (module label-frame-mred mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) - (provide (all-from-except (lib "mred.ss" "mred") frame%) + (require mred + mzlib/class) + (provide (all-from-except mred frame%) (rename registering-frame% frame%) lookup-frame-name) diff --git a/collects/drscheme/private/language-configuration.ss b/collects/drscheme/private/language-configuration.ss index 5b90eddf6d..9bb07f2459 100644 --- a/collects/drscheme/private/language-configuration.ss +++ b/collects/drscheme/private/language-configuration.ss @@ -1,20 +1,20 @@ (module language-configuration mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "hierlist.ss" "hierlist") - (lib "class.ss") - (lib "contract.ss") - (lib "kw.ss") - (lib "string.ss") + mzlib/class + mzlib/contract + mzlib/kw + mzlib/string "drsig.ss" - (lib "string-constant.ss" "string-constants") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "list.ss") - (lib "etc.ss") - (lib "file.ss") + string-constants + mred + framework + mzlib/list + mzlib/etc + mzlib/file (lib "getinfo.ss" "setup") - (lib "toplevel.ss" "syntax")) + syntax/toplevel) (define original-output (current-output-port)) (define (printfo . args) (apply fprintf original-output args)) diff --git a/collects/drscheme/private/language.ss b/collects/drscheme/private/language.ss index bd78d64ff7..f2962a94d5 100644 --- a/collects/drscheme/private/language.ss +++ b/collects/drscheme/private/language.ss @@ -5,21 +5,21 @@ #lang scheme/unit (require "drsig.ss" - (lib "string-constant.ss" "string-constants") - (lib "pconvert.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "struct.ss") - (lib "class.ss") + string-constants + mzlib/pconvert + mzlib/pretty + mzlib/etc + mzlib/struct + mzlib/class scheme/file - (lib "list.ss") - (lib "embed.ss" "compiler") - (lib "launcher.ss" "launcher") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + mzlib/list + compiler/embed + launcher + mred + framework (lib "syntax-browser.ss" "mrlib") - (lib "distribute.ss" "compiler") - (lib "bundle-dist.ss" "compiler")) + compiler/distribute + compiler/bundle-dist) (import [prefix drscheme:debug: drscheme:debug^] [prefix drscheme:tools: drscheme:tools^] @@ -457,8 +457,8 @@ ;; simple-module-based-language-get-init-code : setting -> sexp[module] (define (simple-module-based-language-get-init-code setting) `(module mod-name mzscheme - (require (lib "pconvert.ss") - (lib "pretty.ss")) + (require mzlib/pconvert + mzlib/pretty) (provide init-code) diff --git a/collects/drscheme/private/launcher-bootstrap.ss b/collects/drscheme/private/launcher-bootstrap.ss index 1ae5262a1d..fc14c10cb9 100644 --- a/collects/drscheme/private/launcher-bootstrap.ss +++ b/collects/drscheme/private/launcher-bootstrap.ss @@ -1,6 +1,6 @@ (module launcher-bootstrap mzscheme - (require (lib "string.ss") - (lib "file.ss")) + (require mzlib/string + mzlib/file) (define argv (current-command-line-arguments)) ;; skip first six diff --git a/collects/drscheme/private/link.ss b/collects/drscheme/private/link.ss index 9638aee5f5..cc34e54e08 100644 --- a/collects/drscheme/private/link.ss +++ b/collects/drscheme/private/link.ss @@ -7,7 +7,7 @@ "debug.ss" "module-language.ss" "tools.ss" - (lib "unit.ss") + mzlib/unit "language.ss" "language-configuration.ss" "drsig.ss" diff --git a/collects/drscheme/private/main.ss b/collects/drscheme/private/main.ss index cc60fdf367..4f8f1cabf2 100644 --- a/collects/drscheme/private/main.ss +++ b/collects/drscheme/private/main.ss @@ -1,12 +1,12 @@ #lang scheme/unit -(require (lib "string-constant.ss" "string-constants") - (lib "contract.ss") +(require string-constants + mzlib/contract "drsig.ss" - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "class.ss") - (lib "list.ss") + mred + framework + mzlib/class + mzlib/list scheme/path (lib "external.ss" "browser") (lib "plt-installer.ss" "setup")) diff --git a/collects/drscheme/private/modes.ss b/collects/drscheme/private/modes.ss index ffe5e684f2..973d6275d2 100644 --- a/collects/drscheme/private/modes.ss +++ b/collects/drscheme/private/modes.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "list.ss") - (lib "framework.ss" "framework") + (require string-constants + mzlib/class + mzlib/list + framework "drsig.ss") (import) diff --git a/collects/drscheme/private/module-language.ss b/collects/drscheme/private/module-language.ss index da95128f06..839e412bac 100644 --- a/collects/drscheme/private/module-language.ss +++ b/collects/drscheme/private/module-language.ss @@ -1,15 +1,15 @@ (module module-language mzscheme (provide module-language@) - (require (lib "unit.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "embed.ss" "compiler") - (lib "launcher.ss" "launcher") - (lib "framework.ss" "framework") - (lib "string-constant.ss" "string-constants") + (require mzlib/unit + mzlib/class + mred + compiler/embed + launcher + framework + string-constants "drsig.ss" - (lib "contract.ss")) + mzlib/contract) (define op (current-output-port)) (define (oprintf . args) (apply fprintf op args)) diff --git a/collects/drscheme/private/module-overview.ss b/collects/drscheme/private/module-overview.ss index 3b54e6961e..1fb930662c 100644 --- a/collects/drscheme/private/module-overview.ss +++ b/collects/drscheme/private/module-overview.ss @@ -1,11 +1,11 @@ #lang scheme/base -(require mred/mred +(require mred scheme/class syntax/moddep syntax/toplevel framework/framework - string-constants/string-constant + string-constants mrlib/graph "drsig.ss" scheme/unit diff --git a/collects/drscheme/private/multi-file-search.ss b/collects/drscheme/private/multi-file-search.ss index 846c9a2287..2f0f4836d9 100644 --- a/collects/drscheme/private/multi-file-search.ss +++ b/collects/drscheme/private/multi-file-search.ss @@ -1,13 +1,13 @@ #lang scheme/unit - (require (lib "framework.ss" "framework") - (lib "class.ss") - (lib "mred.ss" "mred") + (require framework + mzlib/class + mred scheme/file scheme/path - (lib "thread.ss") - (lib "async-channel.ss") - (lib "string-constant.ss" "string-constants") + mzlib/thread + mzlib/async-channel + string-constants "drsig.ss") (import [prefix drscheme:frame: drscheme:frame^] diff --git a/collects/drscheme/private/number-snip.ss b/collects/drscheme/private/number-snip.ss index 405bdba80b..0cb5347273 100644 --- a/collects/drscheme/private/number-snip.ss +++ b/collects/drscheme/private/number-snip.ss @@ -1,7 +1,7 @@ (module number-snip mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "framework.ss" "framework")) + (require mred + mzlib/class + framework) (provide snip-class) (define snip-class (make-object number-snip:snip-class%)) diff --git a/collects/drscheme/private/rep.ss b/collects/drscheme/private/rep.ss index 5e05dcc505..4865520a86 100644 --- a/collects/drscheme/private/rep.ss +++ b/collects/drscheme/private/rep.ss @@ -18,17 +18,17 @@ TODO ;; user's io ports, to aid any debugging printouts. ;; (esp. useful when debugging the users's io) (module rep mzscheme - (require (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "port.ss") - (lib "unit.ss") + (require mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list + mzlib/port + mzlib/unit "drsig.ss" - (lib "string-constant.ss" "string-constants") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + string-constants + mred + framework (lib "external.ss" "browser") (lib "default-lexer.ss" "syntax-color")) diff --git a/collects/drscheme/private/stick-figures.ss b/collects/drscheme/private/stick-figures.ss index 30111b5e44..380e18e15a 100644 --- a/collects/drscheme/private/stick-figures.ss +++ b/collects/drscheme/private/stick-figures.ss @@ -1,7 +1,7 @@ (module stick-figures mzscheme - (require (lib "class.ss") - (lib "pretty.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mzlib/pretty + mred) (define head-size 40) (define small-bitmap-factor 1/2) diff --git a/collects/drscheme/private/syncheck-debug.ss b/collects/drscheme/private/syncheck-debug.ss index 7fedd3351c..364702e84a 100644 --- a/collects/drscheme/private/syncheck-debug.ss +++ b/collects/drscheme/private/syncheck-debug.ss @@ -1,8 +1,8 @@ (module syncheck-debug mzscheme - (require (lib "pretty.ss") - (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + (require mzlib/pretty + mzlib/list + mzlib/class + mred) (provide debug-origin) ;; : syntax [syntax] -> void ;; creates a frame for examining the diff --git a/collects/drscheme/private/text.ss b/collects/drscheme/private/text.ss index a6d9a56dae..196e591614 100644 --- a/collects/drscheme/private/text.ss +++ b/collects/drscheme/private/text.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "drsig.ss" - (lib "framework.ss" "framework")) + framework) (import) (export drscheme:text^) diff --git a/collects/drscheme/private/time-keystrokes.ss b/collects/drscheme/private/time-keystrokes.ss index 471e6becb9..b0d75e70c7 100644 --- a/collects/drscheme/private/time-keystrokes.ss +++ b/collects/drscheme/private/time-keystrokes.ss @@ -1,12 +1,12 @@ (module time-keystrokes mzscheme (require (lib "tool.ss" "drscheme") - (lib "list.ss") - (lib "unit.ss") - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework")) + mzlib/list + mzlib/unit + mzlib/class + mzlib/etc + mred + framework) (provide tool@) diff --git a/collects/drscheme/private/tool-contract-language.ss b/collects/drscheme/private/tool-contract-language.ss index 44834218ac..7c8486c72b 100644 --- a/collects/drscheme/private/tool-contract-language.ss +++ b/collects/drscheme/private/tool-contract-language.ss @@ -2,8 +2,8 @@ (provide (rename -#%module-begin #%module-begin) (all-from-except mzscheme #%module-begin)) - (require (lib "contract.ss")) - (require-for-syntax (lib "list.ss")) + (require mzlib/contract) + (require-for-syntax mzlib/list) (define-syntax (-#%module-begin stx) diff --git a/collects/drscheme/private/tools.ss b/collects/drscheme/private/tools.ss index 14d73b13fb..e99ef9dab8 100644 --- a/collects/drscheme/private/tools.ss +++ b/collects/drscheme/private/tools.ss @@ -1,14 +1,14 @@ #lang scheme/unit (require (lib "getinfo.ss" "setup") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") + mred + mzlib/class + mzlib/list "drsig.ss" - (lib "contract.ss") + mzlib/contract "tool-contracts.ss" - (lib "framework.ss" "framework") - (lib "string-constant.ss" "string-constants")) + framework + string-constants) (import [prefix drscheme:frame: drscheme:frame^] [prefix drscheme:unit: drscheme:unit^] diff --git a/collects/drscheme/private/unit.ss b/collects/drscheme/private/unit.ss index d983c0e894..eaff8fc04c 100644 --- a/collects/drscheme/private/unit.ss +++ b/collects/drscheme/private/unit.ss @@ -18,9 +18,9 @@ module browser threading seems wrong. scheme/path scheme/port scheme/list - (only-in (lib "etc.ss") compose) - (lib "string-constant.ss" "string-constants") - (lib "framework.ss" "framework") + (only-in mzlib/etc compose) + string-constants + framework (lib "name-message.ss" "mrlib") (lib "bitmap-label.ss" "mrlib") (lib "include-bitmap.ss" "mrlib") @@ -30,10 +30,10 @@ module browser threading seems wrong. (prefix-in drscheme:arrow: "../arrow.ss") - (lib "mred.ss" "mred") - (prefix-in mred: (lib "mred.ss" "mred")) + mred + (prefix-in mred: mred) - (lib "date.ss")) + mzlib/date) (provide unit@) diff --git a/collects/drscheme/syncheck.ss b/collects/drscheme/syncheck.ss index 373fb4e582..3b6df648f7 100644 --- a/collects/drscheme/syncheck.ss +++ b/collects/drscheme/syncheck.ss @@ -17,7 +17,7 @@ If the namespace does not, they are colored the unbound color. |# -(require string-constants/string-constant +(require string-constants scheme/unit scheme/contract scheme/class @@ -28,7 +28,7 @@ If the namespace does not, they are colored the unbound color. mrlib/bitmap-label (prefix-in drscheme:arrow: drscheme/arrow) (prefix-in fw: framework/framework) - mred/mred + mred setup/xref scribble/xref scribble/manual-struct diff --git a/collects/drscheme/tool-lib.ss b/collects/drscheme/tool-lib.ss index 4f790af4e3..0a6023be82 100644 --- a/collects/drscheme/tool-lib.ss +++ b/collects/drscheme/tool-lib.ss @@ -10,9 +10,9 @@ all of the names in the tools library, for use defining keybindings (module tool-lib mzscheme (require "private/link.ss" "private/drsig.ss" - (lib "class.ss") - (lib "unit.ss") - (lib "framework.ss" "framework") + mzlib/class + mzlib/unit + framework (lib "splash.ss" "framework")) (shutdown-splash) diff --git a/collects/dynext/compile-sig.ss b/collects/dynext/compile-sig.ss index 76b1009cf4..722b4fab43 100644 --- a/collects/dynext/compile-sig.ss +++ b/collects/dynext/compile-sig.ss @@ -1,6 +1,6 @@ (module compile-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide dynext:compile^) diff --git a/collects/dynext/compile-unit.ss b/collects/dynext/compile-unit.ss index 762d9ae3cf..aa593ec925 100644 --- a/collects/dynext/compile-unit.ss +++ b/collects/dynext/compile-unit.ss @@ -1,9 +1,9 @@ (module compile-unit mzscheme - (require (lib "unit.ss") - (lib "include.ss") - (lib "process.ss") - (lib "sendevent.ss") + (require mzlib/unit + mzlib/include + mzlib/process + mzlib/sendevent "private/dirs.ss" "private/cmdargs.ss") diff --git a/collects/dynext/compile.ss b/collects/dynext/compile.ss index 3db5acd2f4..3e3d98abad 100644 --- a/collects/dynext/compile.ss +++ b/collects/dynext/compile.ss @@ -1,6 +1,6 @@ (module compile mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "compile-sig.ss") (require "compile-unit.ss") diff --git a/collects/dynext/file-sig.ss b/collects/dynext/file-sig.ss index 26a793f310..28ae608450 100644 --- a/collects/dynext/file-sig.ss +++ b/collects/dynext/file-sig.ss @@ -1,6 +1,6 @@ (module file-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide dynext:file^) diff --git a/collects/dynext/file-unit.ss b/collects/dynext/file-unit.ss index b4e7e80400..8947a4946d 100644 --- a/collects/dynext/file-unit.ss +++ b/collects/dynext/file-unit.ss @@ -1,8 +1,8 @@ (module file-unit mzscheme - (require (lib "unit.ss") - (lib "include.ss") - (lib "string.ss")) + (require mzlib/unit + mzlib/include + mzlib/string) (require "file-sig.ss") diff --git a/collects/dynext/file.ss b/collects/dynext/file.ss index f592507e91..a53092373f 100644 --- a/collects/dynext/file.ss +++ b/collects/dynext/file.ss @@ -1,6 +1,6 @@ (module file mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "file-sig.ss") (require "file-unit.ss") diff --git a/collects/dynext/link-sig.ss b/collects/dynext/link-sig.ss index cf0f5d4191..e2ad5a4dbd 100644 --- a/collects/dynext/link-sig.ss +++ b/collects/dynext/link-sig.ss @@ -1,6 +1,6 @@ (module link-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide dynext:link^) diff --git a/collects/dynext/link-unit.ss b/collects/dynext/link-unit.ss index ece8317b84..a594be35d3 100644 --- a/collects/dynext/link-unit.ss +++ b/collects/dynext/link-unit.ss @@ -1,9 +1,9 @@ (module link-unit mzscheme - (require (lib "unit.ss") - (lib "include.ss") - (lib "process.ss") - (lib "sendevent.ss") + (require mzlib/unit + mzlib/include + mzlib/process + mzlib/sendevent "private/dirs.ss" "private/cmdargs.ss" "filename-version.ss") diff --git a/collects/dynext/link.ss b/collects/dynext/link.ss index 5c2052352c..7fcced9567 100644 --- a/collects/dynext/link.ss +++ b/collects/dynext/link.ss @@ -1,6 +1,6 @@ (module link mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "link-sig.ss") (require "link-unit.ss") diff --git a/collects/dynext/private/dirs.ss b/collects/dynext/private/dirs.ss index ad4e0bc80b..4566a9179d 100644 --- a/collects/dynext/private/dirs.ss +++ b/collects/dynext/private/dirs.ss @@ -1,6 +1,6 @@ (module dirs mzscheme - (require (lib "dirs.ss" "setup")) + (require setup/dirs) (define include-dir (find-include-dir)) (define std-library-dir (find-lib-dir)) diff --git a/collects/embedded-gui/private/aligned-pasteboard.ss b/collects/embedded-gui/private/aligned-pasteboard.ss index 3e5a3c0bc3..e2aa618c7e 100644 --- a/collects/embedded-gui/private/aligned-pasteboard.ss +++ b/collects/embedded-gui/private/aligned-pasteboard.ss @@ -9,9 +9,9 @@ (provide aligned-pasteboard%) (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc (lib "click-forwarding-editor.ss" "mrlib") "on-show-pasteboard.ss" "really-resized-pasteboard.ss" diff --git a/collects/embedded-gui/private/alignment-helpers.ss b/collects/embedded-gui/private/alignment-helpers.ss index 85b8b0db96..d290a460e7 100644 --- a/collects/embedded-gui/private/alignment-helpers.ss +++ b/collects/embedded-gui/private/alignment-helpers.ss @@ -1,10 +1,10 @@ (module alignment-helpers mzscheme (require - (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "contract.ss") + mzlib/list + mzlib/class + mred + mzlib/contract "interface.ss" "snip-lib.ss") diff --git a/collects/embedded-gui/private/alignment.ss b/collects/embedded-gui/private/alignment.ss index 439b9ad954..593b1fc64b 100644 --- a/collects/embedded-gui/private/alignment.ss +++ b/collects/embedded-gui/private/alignment.ss @@ -23,10 +23,10 @@ neck and it is the most readable solution. (module alignment mzscheme (require - (lib "match.ss") - (lib "contract.ss") - (lib "etc.ss") - (lib "list.ss")) + mzlib/match + mzlib/contract + mzlib/etc + mzlib/list) (define-struct rect (x y) (make-inspector)) (define-struct abs-rect (ondim offdim) (make-inspector)) diff --git a/collects/embedded-gui/private/button-snip.ss b/collects/embedded-gui/private/button-snip.ss index 426e90be49..66dcda3de9 100644 --- a/collects/embedded-gui/private/button-snip.ss +++ b/collects/embedded-gui/private/button-snip.ss @@ -3,9 +3,9 @@ (module button-snip mzscheme (require - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") + mred + mzlib/class + mzlib/etc "snip-wrapper.ss") (provide diff --git a/collects/embedded-gui/private/cue-text.ss b/collects/embedded-gui/private/cue-text.ss index 7712f6329f..e0b0407f34 100644 --- a/collects/embedded-gui/private/cue-text.ss +++ b/collects/embedded-gui/private/cue-text.ss @@ -9,10 +9,10 @@ (module cue-text mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "framework.ss" "framework")) + mzlib/class + mred + mzlib/etc + framework) (provide cue-text-mixin cue-text%) diff --git a/collects/embedded-gui/private/dllist.ss b/collects/embedded-gui/private/dllist.ss index 75fe98d515..52551158ab 100644 --- a/collects/embedded-gui/private/dllist.ss +++ b/collects/embedded-gui/private/dllist.ss @@ -1,10 +1,10 @@ (module dllist mzscheme (require - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "framework.ss" "framework") + mzlib/class + mzlib/list + mzlib/etc + framework "interface.ss") (provide dllist-mixin dllist% head% tail%) diff --git a/collects/embedded-gui/private/embedded-message.ss b/collects/embedded-gui/private/embedded-message.ss index 7da56c0e53..500ffc78bb 100644 --- a/collects/embedded-gui/private/embedded-message.ss +++ b/collects/embedded-gui/private/embedded-message.ss @@ -1,8 +1,8 @@ (module embedded-message mzscheme (require - (lib "mred.ss" "mred") - (lib "class.ss") + mred + mzlib/class "snip-wrapper.ss") (provide embedded-message%) diff --git a/collects/embedded-gui/private/fixed-width-label-snip.ss b/collects/embedded-gui/private/fixed-width-label-snip.ss index 14fd0be942..cb2369be32 100644 --- a/collects/embedded-gui/private/fixed-width-label-snip.ss +++ b/collects/embedded-gui/private/fixed-width-label-snip.ss @@ -1,9 +1,9 @@ (module fixed-width-label-snip mzscheme (require - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred")) + mzlib/class + mzlib/list + mred) (provide fixed-width-label-snip) diff --git a/collects/embedded-gui/private/grey-editor.ss b/collects/embedded-gui/private/grey-editor.ss index 64c0120918..e123911d5e 100644 --- a/collects/embedded-gui/private/grey-editor.ss +++ b/collects/embedded-gui/private/grey-editor.ss @@ -3,9 +3,9 @@ (provide grey-editor-snip-mixin grey-editor-mixin) (require - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "framework.ss" "framework")) + mred + mzlib/class + framework) (define *disable-color* (make-object color% 235 235 255)) diff --git a/collects/embedded-gui/private/grid-alignment.ss b/collects/embedded-gui/private/grid-alignment.ss index 44a77bfd1b..47933e3428 100644 --- a/collects/embedded-gui/private/grid-alignment.ss +++ b/collects/embedded-gui/private/grid-alignment.ss @@ -7,11 +7,11 @@ #;(module grid-alignment mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/class + mred + mzlib/etc + mzlib/list + mzlib/match (prefix a: "alignment.ss") (lib "click-forwarding-editor.ss" "mrlib") diff --git a/collects/embedded-gui/private/interface.ss b/collects/embedded-gui/private/interface.ss index 9dbf52d3d1..d8ffbd87ad 100644 --- a/collects/embedded-gui/private/interface.ss +++ b/collects/embedded-gui/private/interface.ss @@ -1,6 +1,6 @@ (module interface mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide stretchable-snip<%> alignment<%> diff --git a/collects/embedded-gui/private/lines.ss b/collects/embedded-gui/private/lines.ss index a7e82cf6d5..81fbe1a559 100644 --- a/collects/embedded-gui/private/lines.ss +++ b/collects/embedded-gui/private/lines.ss @@ -1,9 +1,9 @@ (module lines mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred "snip-wrapper.ss" "interface.ss") diff --git a/collects/embedded-gui/private/locked-pasteboard.ss b/collects/embedded-gui/private/locked-pasteboard.ss index 9c1110403d..d4d5a81205 100644 --- a/collects/embedded-gui/private/locked-pasteboard.ss +++ b/collects/embedded-gui/private/locked-pasteboard.ss @@ -5,11 +5,11 @@ (module locked-pasteboard mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "contract.ss") - (lib "framework.ss" "framework")) + mzlib/class + mred + mzlib/etc + mzlib/contract + framework) (provide/contract (locked-pasteboard-mixin mixin-contract)) diff --git a/collects/embedded-gui/private/on-show-editor.ss b/collects/embedded-gui/private/on-show-editor.ss index 08b867c6fe..1b1c0820b7 100644 --- a/collects/embedded-gui/private/on-show-editor.ss +++ b/collects/embedded-gui/private/on-show-editor.ss @@ -1,10 +1,10 @@ (module on-show-editor mzscheme (define (writeln x) (write x) (newline)) (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + mzlib/class + mzlib/etc + mred + framework "snip-lib.ss") (provide diff --git a/collects/embedded-gui/private/on-show-pasteboard.ss b/collects/embedded-gui/private/on-show-pasteboard.ss index 19d074c3c7..7af6eeaa49 100644 --- a/collects/embedded-gui/private/on-show-pasteboard.ss +++ b/collects/embedded-gui/private/on-show-pasteboard.ss @@ -1,9 +1,9 @@ (module on-show-pasteboard mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred")) + mzlib/class + mzlib/etc + mred) (provide on-show-pasteboard% diff --git a/collects/embedded-gui/private/program-editor.ss b/collects/embedded-gui/private/program-editor.ss index c2c118dc0e..7274f2ee43 100644 --- a/collects/embedded-gui/private/program-editor.ss +++ b/collects/embedded-gui/private/program-editor.ss @@ -22,10 +22,10 @@ is being reset. (module program-editor mzscheme (require - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "class.ss") - (lib "framework.ss" "framework") + mred + mzlib/etc + mzlib/class + framework "snip-lib.ss") (provide program-editor-mixin diff --git a/collects/embedded-gui/private/really-resized-pasteboard.ss b/collects/embedded-gui/private/really-resized-pasteboard.ss index 408c8fd30d..eec5a66040 100644 --- a/collects/embedded-gui/private/really-resized-pasteboard.ss +++ b/collects/embedded-gui/private/really-resized-pasteboard.ss @@ -12,9 +12,9 @@ get text deteleted from them, etc. (module really-resized-pasteboard mzscheme (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/etc + mzlib/class + mred) (provide really-resized-pasteboard-mixin diff --git a/collects/embedded-gui/private/single-line-text.ss b/collects/embedded-gui/private/single-line-text.ss index a15d939db7..4deb55018f 100644 --- a/collects/embedded-gui/private/single-line-text.ss +++ b/collects/embedded-gui/private/single-line-text.ss @@ -1,9 +1,9 @@ (module single-line-text mzscheme (require - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "class.ss")) + mred + framework + mzlib/class) (provide single-line-text-mixin) diff --git a/collects/embedded-gui/private/snip-lib.ss b/collects/embedded-gui/private/snip-lib.ss index f6cc573d8b..fa01ce8f6e 100644 --- a/collects/embedded-gui/private/snip-lib.ss +++ b/collects/embedded-gui/private/snip-lib.ss @@ -3,11 +3,11 @@ (module snip-lib mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "contract.ss") + mzlib/class + mzlib/etc + mred + mzlib/list + mzlib/contract "interface.ss") ;; a snip diff --git a/collects/embedded-gui/private/snip-wrapper.ss b/collects/embedded-gui/private/snip-wrapper.ss index 28a90c98fa..b51899f950 100644 --- a/collects/embedded-gui/private/snip-wrapper.ss +++ b/collects/embedded-gui/private/snip-wrapper.ss @@ -1,9 +1,9 @@ (module snip-wrapper mzscheme (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/etc + mzlib/class + mred "interface.ss" (prefix sl: "snip-lib.ss") "dllist.ss") diff --git a/collects/embedded-gui/private/stretchable-editor-snip.ss b/collects/embedded-gui/private/stretchable-editor-snip.ss index 313077fde3..b295f50975 100644 --- a/collects/embedded-gui/private/stretchable-editor-snip.ss +++ b/collects/embedded-gui/private/stretchable-editor-snip.ss @@ -5,9 +5,9 @@ stretchable-editor-snip-mixin) (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "interface.ss") diff --git a/collects/embedded-gui/private/suppress-modify-editor.ss b/collects/embedded-gui/private/suppress-modify-editor.ss index efa463b9ad..e0a3e7f7be 100644 --- a/collects/embedded-gui/private/suppress-modify-editor.ss +++ b/collects/embedded-gui/private/suppress-modify-editor.ss @@ -1,9 +1,9 @@ (module suppress-modify-editor mzscheme (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/etc + mzlib/class + mred) (provide suppress-modify-editor-mixin) diff --git a/collects/embedded-gui/private/tabbable-text.ss b/collects/embedded-gui/private/tabbable-text.ss index 90b2fba106..0daeb41961 100644 --- a/collects/embedded-gui/private/tabbable-text.ss +++ b/collects/embedded-gui/private/tabbable-text.ss @@ -2,12 +2,12 @@ (module tabbable-text mzscheme (require - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "framework.ss" "framework") - (lib "mred.ss" "mred") - (lib "contract.ss")) + mzlib/class + mzlib/list + mzlib/etc + framework + mred + mzlib/contract) (define tabbable-text<%> (interface () diff --git a/collects/embedded-gui/private/tests/alignment-test.ss b/collects/embedded-gui/private/tests/alignment-test.ss index a3c7f2a776..fd9426182f 100644 --- a/collects/embedded-gui/private/tests/alignment-test.ss +++ b/collects/embedded-gui/private/tests/alignment-test.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred "../verthoriz-alignment.ss" "../lines.ss" "../aligned-pasteboard.ss" diff --git a/collects/embedded-gui/private/tests/not-stetching.ss b/collects/embedded-gui/private/tests/not-stetching.ss index 5d2e744177..1763151af9 100644 --- a/collects/embedded-gui/private/tests/not-stetching.ss +++ b/collects/embedded-gui/private/tests/not-stetching.ss @@ -2,9 +2,9 @@ (require (lib "debug.ss" "mike-lib") - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred (lib "aligned-pasteboard.ss" "embedded-gui") (lib "stretchable-editor-snip.ss" "embedded-gui") (lib "verthoriz-alignment.ss" "embedded-gui")) diff --git a/collects/embedded-gui/private/tests/only-one-child.ss b/collects/embedded-gui/private/tests/only-one-child.ss index cb4734975b..444620ae78 100644 --- a/collects/embedded-gui/private/tests/only-one-child.ss +++ b/collects/embedded-gui/private/tests/only-one-child.ss @@ -1,9 +1,9 @@ (require - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mred + mzlib/class + mzlib/etc + mzlib/list + mzlib/match (prefix a: "../alignment.ss") "../alignment-helpers.ss" "../dllist.ss" diff --git a/collects/embedded-gui/private/tests/peer-stretchables.ss b/collects/embedded-gui/private/tests/peer-stretchables.ss index b76524b7eb..9683339550 100644 --- a/collects/embedded-gui/private/tests/peer-stretchables.ss +++ b/collects/embedded-gui/private/tests/peer-stretchables.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/etc + mred "../stretchable-editor-snip.ss" "../verthoriz-alignment.ss" "../aligned-pasteboard.ss") diff --git a/collects/embedded-gui/private/tests/stretching-in-alignment.ss b/collects/embedded-gui/private/tests/stretching-in-alignment.ss index 1921ee90c7..0f155a57a2 100644 --- a/collects/embedded-gui/private/tests/stretching-in-alignment.ss +++ b/collects/embedded-gui/private/tests/stretching-in-alignment.ss @@ -1,13 +1,13 @@ (module stretching-in-alignment mzscheme (require - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "class.ss") + mred + mzlib/etc + mzlib/class (lib "interface.ss" "mrlib" "private" "aligned-pasteboard") (lib "debug.ss" "mike-lib") - (lib "list.ss") - (lib "match.ss") + mzlib/list + mzlib/match (prefix a: "alignment.ss") (lib "click-forwarding-editor.ss" "mrlib") (lib "snip-lib.ss" "mrlib" "private" "aligned-pasteboard") diff --git a/collects/embedded-gui/private/tests/target-not-object.ss b/collects/embedded-gui/private/tests/target-not-object.ss index 665cf10393..1e6ddfb90f 100644 --- a/collects/embedded-gui/private/tests/target-not-object.ss +++ b/collects/embedded-gui/private/tests/target-not-object.ss @@ -1,6 +1,6 @@ (require - (lib "class.ss") - (lib "embedded-gui.ss" "embedded-gui")) + mzlib/class + embedded-gui) (let* ([pb (new aligned-pasteboard%)] [interactions (new vertical-alignment% (parent pb))]) diff --git a/collects/embedded-gui/private/tests/test-alignment.ss b/collects/embedded-gui/private/tests/test-alignment.ss index 0ba2d8ddab..cfb4679dea 100644 --- a/collects/embedded-gui/private/tests/test-alignment.ss +++ b/collects/embedded-gui/private/tests/test-alignment.ss @@ -1,7 +1,7 @@ (require - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/etc + mzlib/list + mzlib/match "../alignment.ss" "test-macro.ss") diff --git a/collects/embedded-gui/private/tests/test-case-box.ss b/collects/embedded-gui/private/tests/test-case-box.ss index c5b9c156d9..9c2979f3da 100644 --- a/collects/embedded-gui/private/tests/test-case-box.ss +++ b/collects/embedded-gui/private/tests/test-case-box.ss @@ -1,16 +1,16 @@ (require - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred") - (lib "unitsig.ss") + mzlib/class + mzlib/list + mred + mzlib/unitsig (lib "tool.ss" "drscheme") - (lib "etc.ss") - (lib "match.ss") - (lib "framework.ss" "framework") - (lib "readerr.ss" "syntax") - (lib "string-constant.ss" "string-constants") - (lib "embedded-gui.ss" "embedded-gui") - (lib "string-constant.ss" "string-constants")) + mzlib/etc + mzlib/match + framework + syntax/readerr + string-constants + embedded-gui + string-constants) (define test-case:program-editor% text%) diff --git a/collects/embedded-gui/private/tests/test-macro.ss b/collects/embedded-gui/private/tests/test-macro.ss index a03f5cf213..5bcdc31d3e 100644 --- a/collects/embedded-gui/private/tests/test-macro.ss +++ b/collects/embedded-gui/private/tests/test-macro.ss @@ -1,6 +1,6 @@ (module test-macro mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (provide test) diff --git a/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss b/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss index e2f8334d39..c86e9126fd 100644 --- a/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss +++ b/collects/embedded-gui/private/tests/test-show-feature-for-test-case.ss @@ -1,6 +1,6 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/class + mred "../aligned-pasteboard.ss" "../verthoriz-alignment.ss" "../snip-wrapper.ss" diff --git a/collects/embedded-gui/private/tests/test-show-feature.ss b/collects/embedded-gui/private/tests/test-show-feature.ss index 3d84bebc32..db6b9739cf 100644 --- a/collects/embedded-gui/private/tests/test-show-feature.ss +++ b/collects/embedded-gui/private/tests/test-show-feature.ss @@ -4,11 +4,11 @@ |# (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/class + mred + mzlib/etc + mzlib/list + mzlib/match (prefix a: "../alignment.ss") "../snip-lib.ss" diff --git a/collects/embedded-gui/private/verthoriz-alignment.ss b/collects/embedded-gui/private/verthoriz-alignment.ss index cd7f1e9488..def03e2528 100644 --- a/collects/embedded-gui/private/verthoriz-alignment.ss +++ b/collects/embedded-gui/private/verthoriz-alignment.ss @@ -1,10 +1,10 @@ (module verthoriz-alignment mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/class + mzlib/etc + mzlib/list + mzlib/match (prefix a: "alignment.ss") "interface.ss" "alignment-helpers.ss" diff --git a/collects/eopl/datatype.ss b/collects/eopl/datatype.ss index e151cb50a8..21fc21a436 100644 --- a/collects/eopl/datatype.ss +++ b/collects/eopl/datatype.ss @@ -4,7 +4,7 @@ (module datatype mzscheme - (require (lib "pconvert-prop.ss")) + (require mzlib/pconvert-prop) (require-for-syntax "private/utils.ss") (define-syntax define-datatype diff --git a/collects/eopl/eopl-tool.ss b/collects/eopl/eopl-tool.ss index ef47bf5fef..62c88ef714 100644 --- a/collects/eopl/eopl-tool.ss +++ b/collects/eopl/eopl-tool.ss @@ -9,10 +9,10 @@ wraps the load of the module.) |# (module eopl-tool mzscheme - (require (lib "unit.ss") - (lib "class.ss") + (require mzlib/unit + mzlib/class (lib "tool.ss" "drscheme") - (lib "string-constant.ss" "string-constants")) + string-constants) (provide tool@) diff --git a/collects/eopl/eopl.ss b/collects/eopl/eopl.ss index 0f63f41d2f..1642b9b307 100644 --- a/collects/eopl/eopl.ss +++ b/collects/eopl/eopl.ss @@ -1,8 +1,8 @@ (module eopl mzscheme (require "datatype.ss" "private/sllgen.ss" - (lib "trace.ss") - (lib "pretty.ss") + mzlib/trace + mzlib/pretty (rename r5rs r5rs:define define)) (require-for-syntax "private/slldef.ss") diff --git a/collects/eopl/info.ss b/collects/eopl/info.ss index 7fa4503b89..b2d98c6735 100644 --- a/collects/eopl/info.ss +++ b/collects/eopl/info.ss @@ -1,6 +1,6 @@ #lang setup/infotab -(require string-constants/string-constant) +(require string-constants) (define name "EoPL") (define tools (list "eopl-tool.ss")) diff --git a/collects/eopl/private/sllgen.ss b/collects/eopl/private/sllgen.ss index c16dca2693..6d96923a98 100644 --- a/collects/eopl/private/sllgen.ss +++ b/collects/eopl/private/sllgen.ss @@ -6,10 +6,10 @@ ;; time. (module sllgen mzscheme - (require (lib "pretty.ss") + (require mzlib/pretty "../datatype.ss" "sllboth.ss" - (lib "etc.ss")) + mzlib/etc) (require-for-syntax "sllboth.ss" "slldef.ss") diff --git a/collects/errortrace/errortrace-lib.ss b/collects/errortrace/errortrace-lib.ss index cf38a87961..f30ada2796 100644 --- a/collects/errortrace/errortrace-lib.ss +++ b/collects/errortrace/errortrace-lib.ss @@ -5,9 +5,9 @@ (module errortrace-lib mzscheme (require "stacktrace.ss" "errortrace-key.ss" - (lib "list.ss") - (lib "unit.ss") - (lib "runtime-path.ss")) + mzlib/list + mzlib/unit + mzlib/runtime-path) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Test coverage run-time support diff --git a/collects/errortrace/stacktrace.ss b/collects/errortrace/stacktrace.ss index 51c795f48e..e8234c3cbf 100644 --- a/collects/errortrace/stacktrace.ss +++ b/collects/errortrace/stacktrace.ss @@ -1,7 +1,7 @@ (module stacktrace scheme/base - (require (lib "unit.ss" "mzlib") - (lib "kerncase.ss" "syntax") - (lib "stx.ss" "syntax") + (require mzlib/unit + syntax/kerncase + syntax/stx (for-syntax scheme/base)) ; for matching (provide stacktrace@ stacktrace^ stacktrace-imports^) diff --git a/collects/ffi/c-printf.ss b/collects/ffi/c-printf.ss index 312057e68b..f1f328a1d5 100644 --- a/collects/ffi/c-printf.ss +++ b/collects/ffi/c-printf.ss @@ -1,6 +1,6 @@ (module c-printf mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) ;; This code demonstrates how to interface `printf' which can be used with ;; different arities and types. Also, `printf' is unsafe unless this code will diff --git a/collects/ffi/crypt.ss b/collects/ffi/crypt.ss index 7614a0c067..d39c97bc39 100644 --- a/collects/ffi/crypt.ss +++ b/collects/ffi/crypt.ss @@ -1,6 +1,6 @@ (module crypt mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (define libcrypt (ffi-lib "libcrypt")) diff --git a/collects/ffi/esd.ss b/collects/ffi/esd.ss index c991a236f8..ba9a6d3632 100644 --- a/collects/ffi/esd.ss +++ b/collects/ffi/esd.ss @@ -1,6 +1,6 @@ (module esd mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (define libesd (ffi-lib "libesd")) diff --git a/collects/ffi/magick.ss b/collects/ffi/magick.ss index 1c5d51fe7c..5eac04f942 100644 --- a/collects/ffi/magick.ss +++ b/collects/ffi/magick.ss @@ -1,6 +1,6 @@ (module magick mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (define libwand (ffi-lib "libWand" "6.0.1")) diff --git a/collects/ffi/sndfile.ss b/collects/ffi/sndfile.ss index 726448c9ed..2e9cde8506 100644 --- a/collects/ffi/sndfile.ss +++ b/collects/ffi/sndfile.ss @@ -1,6 +1,6 @@ (module sndfile mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (define libsndfile (ffi-lib "libsndfile")) diff --git a/collects/ffi/tcl.ss b/collects/ffi/tcl.ss index ce49d3462c..cd405f9c89 100644 --- a/collects/ffi/tcl.ss +++ b/collects/ffi/tcl.ss @@ -1,6 +1,6 @@ (module tcl mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (define libtcl (ffi-lib "libtcl")) diff --git a/collects/ffi/xmmsctrl.ss b/collects/ffi/xmmsctrl.ss index 154342890a..f4ef4807b1 100644 --- a/collects/ffi/xmmsctrl.ss +++ b/collects/ffi/xmmsctrl.ss @@ -1,6 +1,6 @@ (module xmmsctrl mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (define libxmms (ffi-lib "libxmms")) diff --git a/collects/ffi/xosd.ss b/collects/ffi/xosd.ss index 423449d49d..77b63ff188 100644 --- a/collects/ffi/xosd.ss +++ b/collects/ffi/xosd.ss @@ -1,6 +1,6 @@ (module xosd mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (define libxosd (ffi-lib "libxosd")) diff --git a/collects/framework/collapsed-snipclass.ss b/collects/framework/collapsed-snipclass.ss index 4029fd7212..f2725335ea 100644 --- a/collects/framework/collapsed-snipclass.ss +++ b/collects/framework/collapsed-snipclass.ss @@ -1,6 +1,6 @@ (module collapsed-snipclass mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") + (require mred + mzlib/class "private/collapsed-snipclass-helpers.ss") (provide snip-class) diff --git a/collects/framework/comment-snip.ss b/collects/framework/comment-snip.ss index d0f71cde14..3a4d1d63fb 100644 --- a/collects/framework/comment-snip.ss +++ b/collects/framework/comment-snip.ss @@ -1,5 +1,5 @@ (module comment-snip mzscheme - (require (lib "framework.ss" "framework")) + (require framework) (provide (rename comment-box:snipclass snip-class))) diff --git a/collects/framework/decorated-editor-snip.ss b/collects/framework/decorated-editor-snip.ss index 21a0a1499f..fb3b11a353 100644 --- a/collects/framework/decorated-editor-snip.ss +++ b/collects/framework/decorated-editor-snip.ss @@ -4,8 +4,8 @@ decorated-editor-snipclass% decorated-editor-snip-mixin) - (require (lib "class.ss") - (lib "mred.ss" "mred") + (require mzlib/class + mred "preferences.ss") (define (decorated-editor-snip-mixin super%) diff --git a/collects/framework/framework-unit.ss b/collects/framework/framework-unit.ss index f06638d6c9..48edecc7f8 100644 --- a/collects/framework/framework-unit.ss +++ b/collects/framework/framework-unit.ss @@ -1,5 +1,5 @@ (module framework-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred")) (require "private/sig.ss" diff --git a/collects/framework/framework.ss b/collects/framework/framework.ss index d19c09363c..7ce0d4eaeb 100644 --- a/collects/framework/framework.ss +++ b/collects/framework/framework.ss @@ -1,10 +1,10 @@ (module framework mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-unit.ss" "mred") (lib "mred-sig.ss" "mred") - (lib "mred.ss" "mred") - (lib "class.ss") + mred + mzlib/class "preferences.ss" "test.ss" @@ -14,7 +14,7 @@ "framework-unit.ss" "private/sig.ss" - (lib "contract.ss")) + mzlib/contract) (provide-signature-elements (prefix application: framework:application-class^) diff --git a/collects/framework/gui-utils.ss b/collects/framework/gui-utils.ss index cec9cfa241..bf00eb0f6b 100644 --- a/collects/framework/gui-utils.ss +++ b/collects/framework/gui-utils.ss @@ -1,10 +1,10 @@ (module gui-utils mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "contract.ss") - (lib "string-constant.ss" "string-constants")) + (require mzlib/class + mred + mzlib/etc + mzlib/contract + string-constants) (define-syntax (provide/contract/docs stx) (syntax-case stx () diff --git a/collects/framework/keybinding-lang.ss b/collects/framework/keybinding-lang.ss index 88291a9d6e..ce7bf949b0 100644 --- a/collects/framework/keybinding-lang.ss +++ b/collects/framework/keybinding-lang.ss @@ -1,14 +1,14 @@ (module keybinding-lang mzscheme - (require (lib "mred.ss" "mred") - (lib "string-constant.ss" "string-constants") - (lib "framework.ss" "framework") - (lib "class.ss")) + (require mred + string-constants + framework + mzlib/class) (provide (rename kl-module-begin #%module-begin) (all-from-except mzscheme #%module-begin) - (all-from (lib "framework.ss" "framework")) - (all-from (lib "mred.ss" "mred")) - (all-from (lib "class.ss"))) + (all-from framework) + (all-from mred) + (all-from mzlib/class)) (define-syntax (kl-module-begin stx) (syntax-case stx () diff --git a/collects/framework/preferences.ss b/collects/framework/preferences.ss index 457f2d7866..7b42bc3d31 100644 --- a/collects/framework/preferences.ss +++ b/collects/framework/preferences.ss @@ -27,9 +27,9 @@ the state transitions / contracts are: |# (module preferences mzscheme - (require (lib "file.ss") - (lib "etc.ss") - (lib "contract.ss")) + (require mzlib/file + mzlib/etc + mzlib/contract) (provide exn:struct:unknown-preference) diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss index f0b3cde614..4e95bf9017 100644 --- a/collects/framework/private/autosave.ss +++ b/collects/framework/private/autosave.ss @@ -1,14 +1,14 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class scheme/file "sig.ss" "../gui-utils.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") - (lib "string-constant.ss" "string-constants")) + mzlib/list + string-constants) (import mred^ [prefix exit: framework:exit^] diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss index cd680ff01f..5f34dc7eb3 100644 --- a/collects/framework/private/canvas.ss +++ b/collects/framework/private/canvas.ss @@ -1,5 +1,5 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/collapsed-snipclass-helpers.ss b/collects/framework/private/collapsed-snipclass-helpers.ss index 313a89c283..39e2f6ba8e 100644 --- a/collects/framework/private/collapsed-snipclass-helpers.ss +++ b/collects/framework/private/collapsed-snipclass-helpers.ss @@ -1,6 +1,6 @@ (module collapsed-snipclass-helpers mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide make-sexp-snipclass%) diff --git a/collects/framework/private/color-model.ss b/collects/framework/private/color-model.ss index df0d7d4249..26db84e02d 100644 --- a/collects/framework/private/color-model.ss +++ b/collects/framework/private/color-model.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss")) + mzlib/list) (import) (export framework:color-model^) diff --git a/collects/framework/private/color-prefs.ss b/collects/framework/private/color-prefs.ss index 4d2059b1df..aa81fd584c 100644 --- a/collects/framework/private/color-prefs.ss +++ b/collects/framework/private/color-prefs.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "string-constant.ss" "string-constants") + (require mzlib/class + mzlib/etc + mred + string-constants "../preferences.ss" "sig.ss") diff --git a/collects/framework/private/color.ss b/collects/framework/private/color.ss index 6e31b5c4fe..59f7771aa1 100644 --- a/collects/framework/private/color.ss +++ b/collects/framework/private/color.ss @@ -1,12 +1,12 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "thread.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + (require mzlib/class + mzlib/thread + mred + mzlib/etc (lib "token-tree.ss" "syntax-color") (lib "paren-tree.ss" "syntax-color") (lib "default-lexer.ss" "syntax-color") - string-constants/string-constant + string-constants "../preferences.ss" "sig.ss") diff --git a/collects/framework/private/comment-box.ss b/collects/framework/private/comment-box.ss index 5cc3adc0c8..3691426fb4 100644 --- a/collects/framework/private/comment-box.ss +++ b/collects/framework/private/comment-box.ss @@ -1,13 +1,13 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + (require mzlib/class + mzlib/etc + mred "sig.ss" "../decorated-editor-snip.ss" (lib "include-bitmap.ss" "mrlib") - (lib "string-constant.ss" "string-constants")) + string-constants) (import [prefix text: framework:text^] [prefix scheme: framework:scheme^] diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss index 2a83d23915..e176bc2493 100644 --- a/collects/framework/private/editor.ss +++ b/collects/framework/private/editor.ss @@ -1,11 +1,11 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "string-constant.ss" "string-constants") + (require mzlib/class + string-constants "sig.ss" "../preferences.ss" "../gui-utils.ss" - (lib "etc.ss") + mzlib/etc (lib "mred-sig.ss" "mred") scheme/path) diff --git a/collects/framework/private/encode-decode.ss b/collects/framework/private/encode-decode.ss index e85692ee3e..ce26700075 100644 --- a/collects/framework/private/encode-decode.ss +++ b/collects/framework/private/encode-decode.ss @@ -1,9 +1,9 @@ (module encode-decode mzscheme - (require (lib "deflate.ss") - (lib "match.ss") - (lib "pretty.ss")) - (require-for-syntax (lib "inflate.ss") - (lib "string.ss")) + (require mzlib/deflate + mzlib/match + mzlib/pretty) + (require-for-syntax mzlib/inflate + mzlib/string) (provide encode-sexp decode diff --git a/collects/framework/private/exit.ss b/collects/framework/private/exit.ss index e850351e8e..6edb99c60d 100644 --- a/collects/framework/private/exit.ss +++ b/collects/framework/private/exit.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") + (require string-constants "sig.ss" "../preferences.ss" "../gui-utils.ss" diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss index c71eb1de20..8a500f9905 100644 --- a/collects/framework/private/finder.ss +++ b/collects/framework/private/finder.ss @@ -1,12 +1,12 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") + (require string-constants "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") - (lib "string.ss") + mzlib/string scheme/path - (lib "etc.ss")) + mzlib/etc) (import mred^ diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 3ee36437ac..21f1c5d2ce 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -1,15 +1,15 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "include.ss") + (require string-constants + mzlib/class + mzlib/include "sig.ss" "../preferences.ss" "../gui-utils.ss" "bday.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") + mzlib/list scheme/path - (lib "etc.ss")) + mzlib/etc) (import mred^ [prefix group: framework:group^] diff --git a/collects/framework/private/gen-standard-menus.ss b/collects/framework/private/gen-standard-menus.ss index cf10e2b4ef..f9601c83da 100644 --- a/collects/framework/private/gen-standard-menus.ss +++ b/collects/framework/private/gen-standard-menus.ss @@ -1,7 +1,7 @@ (module gen-standard-menus mzscheme - (require (lib "pretty.ss")) - (require (lib "list.ss")) + (require mzlib/pretty) + (require mzlib/list) (require "standard-menus-items.ss") ;; build-before-super-item-clause : an-item -> (listof clause) diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index 61e103702e..1e973de2e3 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -1,12 +1,12 @@ #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "class.ss") + (require string-constants + mzlib/class "sig.ss" "../preferences.ss" "../gui-utils.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") + mzlib/list scheme/path) (import mred^ diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss index 08382d1746..2bac5c8fec 100644 --- a/collects/framework/private/handler.ss +++ b/collects/framework/private/handler.ss @@ -1,14 +1,14 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "list.ss") + (require mzlib/class + mzlib/list (lib "hierlist.ss" "hierlist") "sig.ss" "../preferences.ss" "../gui-utils.ss" (lib "mred-sig.ss" "mred") scheme/path - (lib "string-constant.ss" "string-constants")) + string-constants) (import mred^ diff --git a/collects/framework/private/icon.ss b/collects/framework/private/icon.ss index 058d8685ee..198cd85365 100644 --- a/collects/framework/private/icon.ss +++ b/collects/framework/private/icon.ss @@ -1,7 +1,7 @@ #lang scheme/unit (require (for-syntax scheme/base) scheme/promise - (lib "class.ss") + mzlib/class (lib "include-bitmap.ss" "mrlib") "bday.ss" "sig.ss" diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss index 41a9147651..37931480a2 100644 --- a/collects/framework/private/keymap.ss +++ b/collects/framework/private/keymap.ss @@ -1,11 +1,11 @@ #lang scheme/unit -(require (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "list.ss") +(require string-constants + mzlib/class + mzlib/list (lib "mred-sig.ss" "mred") - (lib "match.ss") + mzlib/match "../preferences.ss" "tex-table.ss" "sig.ss") diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss index 4eb80fc278..8f0513281b 100644 --- a/collects/framework/private/main.ss +++ b/collects/framework/private/main.ss @@ -1,5 +1,5 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss index 7e6d1ed086..eae60a294a 100644 --- a/collects/framework/private/menu.ss +++ b/collects/framework/private/menu.ss @@ -1,5 +1,5 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" "../preferences.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/mode.ss b/collects/framework/private/mode.ss index 389ec4790f..6f70d7907c 100644 --- a/collects/framework/private/mode.ss +++ b/collects/framework/private/mode.ss @@ -1,6 +1,6 @@ #lang scheme/unit - (require (lib "surrogate.ss") - (lib "class.ss") + (require mzlib/surrogate + mzlib/class "sig.ss") (import) diff --git a/collects/framework/private/number-snip.ss b/collects/framework/private/number-snip.ss index 9b8a8ead00..58e403ab9c 100644 --- a/collects/framework/private/number-snip.ss +++ b/collects/framework/private/number-snip.ss @@ -3,9 +3,9 @@ (require "sig.ss" (lib "mred-sig.ss" "mred") - (lib "class.ss") + mzlib/class "../preferences.ss" - (lib "string-constant.ss" "string-constants")) + string-constants) (import mred^) (export (rename framework:number-snip^ diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index 674fa32de6..15511244f5 100644 --- a/collects/framework/private/panel.ss +++ b/collects/framework/private/panel.ss @@ -1,10 +1,10 @@ #lang scheme/unit - (require (lib "class.ss") + (require mzlib/class "sig.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") - (lib "etc.ss")) + mzlib/list + mzlib/etc) (import [prefix icon: framework:icon^] mred^) diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index 2c65d98227..f265d6037c 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -28,14 +28,14 @@ the state transitions / contracts are: #lang scheme/unit - (require (lib "string-constant.ss" "string-constants") - (lib "class.ss") + (require string-constants + mzlib/class scheme/file "sig.ss" "../gui-utils.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss")) + mzlib/list) (import mred^ [prefix exit: framework:exit^] diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index 6e5f6f9f7c..cbc53e853b 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -3,12 +3,12 @@ #lang scheme/unit (require "collapsed-snipclass-helpers.ss" - (lib "string-constant.ss" "string-constants") - (lib "class.ss") + string-constants + mzlib/class "sig.ss" (lib "mred-sig.ss" "mred") - (lib "list.ss") - (lib "etc.ss") + mzlib/list + mzlib/etc (lib "scheme-lexer.ss" "syntax-color") "../gui-utils.ss" "../preferences.ss") diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index df78474184..200b5c4919 100644 --- a/collects/framework/private/text.ss +++ b/collects/framework/private/text.ss @@ -6,20 +6,20 @@ WARNING: printf is rebound in the body of the unit to always |# #lang scheme/unit -(require (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "match.ss") +(require string-constants + mzlib/class + mzlib/match scheme/path "sig.ss" "../gui-utils.ss" "../preferences.ss" (lib "mred-sig.ss" "mred") (lib "interactive-value-port.ss" "mrlib") - (lib "list.ss") - (lib "etc.ss") - (lib "dirs.ss" "setup") - (lib "string.ss") - (prefix-in srfi1: (lib "1.ss" "srfi"))) + mzlib/list + mzlib/etc + setup/dirs + mzlib/string + (prefix-in srfi1: srfi/1)) (require setup/xref scribble/xref scribble/struct diff --git a/collects/framework/private/version.ss b/collects/framework/private/version.ss index 5c156bc604..ba68f9b7df 100644 --- a/collects/framework/private/version.ss +++ b/collects/framework/private/version.ss @@ -2,8 +2,8 @@ (require "sig.ss" (lib "mred-sig.ss" "mred") - (lib "string.ss") - (lib "list.ss")) + mzlib/string + mzlib/list) (import) (export (rename framework:version^ [-version version])) diff --git a/collects/framework/splash.ss b/collects/framework/splash.ss index 1adf976bc0..27dfd7badb 100644 --- a/collects/framework/splash.ss +++ b/collects/framework/splash.ss @@ -1,8 +1,8 @@ (module splash mzscheme - (require (lib "class.ss") - (lib "file.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mzlib/file + mred) (provide get-splash-bitmap set-splash-bitmap @@ -127,8 +127,8 @@ (getenv "PLTDRDEBUG")) (parameterize ([current-namespace (make-namespace)]) (values - (dynamic-require '(lib "cm.ss") 'make-compilation-manager-load/use-compiled-handler) - (dynamic-require '(lib "cm.ss") 'manager-trace-handler))) + (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler) + (dynamic-require 'mzlib/cm 'manager-trace-handler))) (values #f #f))]) (current-load diff --git a/collects/framework/test.ss b/collects/framework/test.ss index 12904cf5d4..87ac58832a 100644 --- a/collects/framework/test.ss +++ b/collects/framework/test.ss @@ -1,9 +1,9 @@ (module test mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "contract.ss")) + (require mred + mzlib/class + mzlib/etc + mzlib/contract) (define-syntax (provide/contract/docs stx) (syntax-case stx () diff --git a/collects/frtime/animation.ss b/collects/frtime/animation.ss index 8a45b50cab..059c93e9e2 100644 --- a/collects/frtime/animation.ss +++ b/collects/frtime/animation.ss @@ -2,15 +2,15 @@ (require (all-except "graphics.ss" make-posn posn-x posn-y make-rgb) (lifted "graphics.ss" posn-x posn-y make-posn make-rgb) - (lib "match.ss") - (as-is:unchecked (lib "lang-ext.ss" "frtime") lift) - (lib "class.ss") - (lib "list.ss" "frtime") - (lib "etc.ss" "frtime") - (lib "math.ss" "frtime") + mzlib/match + (as-is:unchecked frtime/lang-ext lift) + mzlib/class + frtime/list + frtime/etc + frtime/math (rename mzscheme mz:define-struct define-struct)) - (require-for-syntax (lib "etc.ss")) + (require-for-syntax mzlib/etc) (open-graphics) diff --git a/collects/frtime/base-gm.ss b/collects/frtime/base-gm.ss index 8d05420e3a..32e43ef8b5 100644 --- a/collects/frtime/base-gm.ss +++ b/collects/frtime/base-gm.ss @@ -1,5 +1,5 @@ (module base-gm mzscheme - (require (lib "list.ss") + (require mzlib/list (lib "etc.ss")) (provide assert diff --git a/collects/frtime/demos/analog-clock.ss b/collects/frtime/demos/analog-clock.ss index 7215c4d3d9..5bc0369be8 100644 --- a/collects/frtime/demos/analog-clock.ss +++ b/collects/frtime/demos/analog-clock.ss @@ -7,8 +7,8 @@ ;; Require the animation library, the gui library, and the library ;; containing the build-list function. -(require (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime")) +(require frtime/animation + frtime/gui) (define clock-radius (make-slider "Clock Size" 40 200 100)) diff --git a/collects/frtime/demos/ball-on-string.ss b/collects/frtime/demos/ball-on-string.ss index a6190b5aac..0cfad89625 100644 --- a/collects/frtime/demos/ball-on-string.ss +++ b/collects/frtime/demos/ball-on-string.ss @@ -1,4 +1,4 @@ -(require (lib "animation.ss" "frtime")) +(require frtime/animation) (define-values (pos vel) (letrec ([pos (posn-integral vel)] diff --git a/collects/frtime/demos/calculator.ss b/collects/frtime/demos/calculator.ss index 641930a19a..3ba00fa534 100644 --- a/collects/frtime/demos/calculator.ss +++ b/collects/frtime/demos/calculator.ss @@ -1,4 +1,4 @@ -(require (lib "gui.ss" "frtime")) +(require frtime/gui) (define op-names (list "+" "-" "*" "/")) (define ops (list + - * /)) diff --git a/collects/frtime/demos/circles.ss b/collects/frtime/demos/circles.ss index 6be89f4188..a4a2a3f37c 100644 --- a/collects/frtime/demos/circles.ss +++ b/collects/frtime/demos/circles.ss @@ -1,6 +1,6 @@ -(require (lib "animation.ss" "frtime") - (lib "etc.ss" "frtime") - (lib "gui.ss" "frtime")) +(require frtime/animation + frtime/etc + frtime/gui) (define radius (make-slider "Radius" 100 200 150)) (define speed (* .02 (make-slider "Speed" 0 10 5))) diff --git a/collects/frtime/demos/delay-mouse.ss b/collects/frtime/demos/delay-mouse.ss index 9478ac296d..5f42da1298 100644 --- a/collects/frtime/demos/delay-mouse.ss +++ b/collects/frtime/demos/delay-mouse.ss @@ -1,4 +1,4 @@ -(require (lib "animation.ss" "frtime")) +(require frtime/animation) ; the mouse position delayed (display-shapes diff --git a/collects/frtime/demos/growing-points.ss b/collects/frtime/demos/growing-points.ss index 0d2ba8d199..c132c3ef45 100644 --- a/collects/frtime/demos/growing-points.ss +++ b/collects/frtime/demos/growing-points.ss @@ -8,9 +8,9 @@ ;; Require the animation library, the gui library, and the library ;; containing the build-list function. -(require (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime") - (lib "etc.ss" "frtime")) +(require frtime/animation + frtime/gui + frtime/etc) ;; distance : number number number number -> number ;; Returns the distance between (x1, y1) and (x2, y2). diff --git a/collects/frtime/demos/gui/aux-mixin-macros.ss b/collects/frtime/demos/gui/aux-mixin-macros.ss index fa0a56e439..9503e53beb 100644 --- a/collects/frtime/demos/gui/aux-mixin-macros.ss +++ b/collects/frtime/demos/gui/aux-mixin-macros.ss @@ -1,6 +1,6 @@ (module aux-mixin-macros frtime (require "mixin-macros.ss") - (require (lib "class.ss")) + (require mzlib/class) ;; consider taking out setter diff --git a/collects/frtime/demos/gui/demo/bindec.ss b/collects/frtime/demos/gui/demo/bindec.ss index a205651d93..1e41333358 100644 --- a/collects/frtime/demos/gui/demo/bindec.ss +++ b/collects/frtime/demos/gui/demo/bindec.ss @@ -1,5 +1,5 @@ (require "../simple.ss") -(require (rename (lib "mred.ss" "mred") horizontal-panel% horizontal-panel%)) +(require (rename mred horizontal-panel% horizontal-panel%)) ; just change this to change the range of the binary/decimal converter (define SIZE 10) diff --git a/collects/frtime/demos/gui/demo/instr.ss b/collects/frtime/demos/gui/demo/instr.ss index 4a76d507a3..5a962a0c0b 100644 --- a/collects/frtime/demos/gui/demo/instr.ss +++ b/collects/frtime/demos/gui/demo/instr.ss @@ -1,7 +1,7 @@ (require (lib "mixin-macros.ss" "frtime" "demos" "gui")) (require (lib "aux-mixin-macros.ss" "frtime" "demos" "gui")) ;require the macros -(require (lib "class.ss")) ; require class utilities -(require (lib "mred.ss" "mred")) ; require base mred library +(require mzlib/class) ; require class utilities +(require mred) ; require base mred library ;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/frtime/demos/gui/fred.ss b/collects/frtime/demos/gui/fred.ss index da0919a390..3d1bb85573 100644 --- a/collects/frtime/demos/gui/fred.ss +++ b/collects/frtime/demos/gui/fred.ss @@ -1,10 +1,10 @@ (module fred frtime (require "mixin-macros.ss" "aux-mixin-macros.ss" - (lib "class.ss") - (lib "string.ss") - (all-except (lib "mred.ss" "mred") send-event) - (lib "framework.ss" "framework")) + mzlib/class + mzlib/string + (all-except mred send-event) + framework) @@ -269,7 +269,7 @@ (provide (all-defined) - (all-from (lib "class.ss")) + (all-from mzlib/class) (all-from "mixin-macros.ss") (all-from "aux-mixin-macros.ss"))) diff --git a/collects/frtime/demos/gui/mixin-macros.ss b/collects/frtime/demos/gui/mixin-macros.ss index 5b44ffc9dc..389b9e42c4 100644 --- a/collects/frtime/demos/gui/mixin-macros.ss +++ b/collects/frtime/demos/gui/mixin-macros.ss @@ -1,5 +1,5 @@ (module mixin-macros frtime - (require (lib "class.ss")) + (require mzlib/class) (define-syntax events->callbacks diff --git a/collects/frtime/demos/gui/mod-mrpanel.ss b/collects/frtime/demos/gui/mod-mrpanel.ss index bc0362acb1..99c67a45d9 100644 --- a/collects/frtime/demos/gui/mod-mrpanel.ss +++ b/collects/frtime/demos/gui/mod-mrpanel.ss @@ -1,6 +1,6 @@ (module mod-mrpanel mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: (lib "kernel.ss" "mred" "private")) (lib "lock.ss" "mred" "private") (lib "const.ss" "mred" "private") diff --git a/collects/frtime/demos/gui/mod-wx-panel.ss b/collects/frtime/demos/gui/mod-wx-panel.ss index 70e438d2bb..2d1ff279d6 100644 --- a/collects/frtime/demos/gui/mod-wx-panel.ss +++ b/collects/frtime/demos/gui/mod-wx-panel.ss @@ -1,7 +1,7 @@ (module mod-wx-panel mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: (lib "kernel.ss" "mred" "private")) (lib "lock.ss" "mred" "private") (lib "const.ss" "mred" "private") diff --git a/collects/frtime/demos/gui/simple.ss b/collects/frtime/demos/gui/simple.ss index a0abdb5648..fe8a8a60d6 100644 --- a/collects/frtime/demos/gui/simple.ss +++ b/collects/frtime/demos/gui/simple.ss @@ -1,8 +1,8 @@ (module simple frtime (require "fred.ss" - (lib "class.ss") - (rename (lib "mred.ss" "mred") frame% frame%)) + mzlib/class + (rename mred frame% frame%)) (define widget (lambda (x) x)) (define value-b (lambda (x) (send x get-value-b))) @@ -50,7 +50,7 @@ (provide (all-defined) (all-from "fred.ss") - (all-from (lib "class.ss")))) + (all-from mzlib/class))) diff --git a/collects/frtime/demos/mirror-lens.ss b/collects/frtime/demos/mirror-lens.ss index 838d55ac30..155cef8cfa 100644 --- a/collects/frtime/demos/mirror-lens.ss +++ b/collects/frtime/demos/mirror-lens.ss @@ -1,5 +1,5 @@ -(require (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime")) +(require frtime/animation + frtime/gui) ;; Written by Evan Perillo ;; never run two display-envs at the same time or the images will overlap and not look nice diff --git a/collects/frtime/demos/mouse.ss b/collects/frtime/demos/mouse.ss index 0b870befe0..a349b150e3 100644 --- a/collects/frtime/demos/mouse.ss +++ b/collects/frtime/demos/mouse.ss @@ -1,4 +1,4 @@ -(require (lib "animation.ss" "frtime")) +(require frtime/animation) (display-shapes (list diff --git a/collects/frtime/demos/needles.ss b/collects/frtime/demos/needles.ss index 432ce8571b..a83412f50f 100644 --- a/collects/frtime/demos/needles.ss +++ b/collects/frtime/demos/needles.ss @@ -8,9 +8,9 @@ ;; Require the animation library and the library ;; containing the build-list function. -(require (lib "animation.ss" "frtime") - (lib "etc.ss" "frtime") - (lib "gui.ss" "frtime")) +(require frtime/animation + frtime/etc + frtime/gui) ;; How many needles on one side of the grid of needles (define GRID-SIZE (make-slider "Grid size:" 1 10 8)) diff --git a/collects/frtime/demos/orbit-mouse.ss b/collects/frtime/demos/orbit-mouse.ss index cd829a4324..b236dd9ab1 100644 --- a/collects/frtime/demos/orbit-mouse.ss +++ b/collects/frtime/demos/orbit-mouse.ss @@ -1,5 +1,5 @@ -(require (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime")) +(require frtime/animation + frtime/gui) (define radius (make-slider "Radius" 25 200 100)) (define speed (* .1 (make-slider "Speed" -15 15 6))) diff --git a/collects/frtime/demos/piston.ss b/collects/frtime/demos/piston.ss index 57fb8aa5ee..a51f25b309 100644 --- a/collects/frtime/demos/piston.ss +++ b/collects/frtime/demos/piston.ss @@ -1,7 +1,7 @@ (require - (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime") - (lib "math.ss" "frtime")) + frtime/animation + frtime/gui + frtime/math) (define radius (make-slider "Radius" 30 50 30)) (define crank (make-slider "Crank length" 150 200 150)) diff --git a/collects/frtime/demos/pizza.ss b/collects/frtime/demos/pizza.ss index d2952a9a56..9a05a305cb 100644 --- a/collects/frtime/demos/pizza.ss +++ b/collects/frtime/demos/pizza.ss @@ -1,4 +1,4 @@ -(require (lib "gui.ss" "frtime")) +(require frtime/gui) (define kinds (list "New York" "Chicago" "California" "Hawaii")) (define sizes (list "small" "medium" "large" "Texas")) diff --git a/collects/frtime/demos/pong.ss b/collects/frtime/demos/pong.ss index 150de09e69..0699edb559 100644 --- a/collects/frtime/demos/pong.ss +++ b/collects/frtime/demos/pong.ss @@ -1,7 +1,7 @@ (require - (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime") - (all-except (lib "match.ss") match)) + frtime/animation + frtime/gui + (all-except mzlib/match match)) (define paddle-radius (make-slider "Paddle radius" 10 30 20)) (define key-control-speed (* 0.01 (make-slider "Key control speed" 1 50 25))) diff --git a/collects/frtime/demos/push-pull-ball.ss b/collects/frtime/demos/push-pull-ball.ss index 16a87f5463..c5e7d7609f 100644 --- a/collects/frtime/demos/push-pull-ball.ss +++ b/collects/frtime/demos/push-pull-ball.ss @@ -1,5 +1,5 @@ -(require (lib "etc.ss" "frtime") - (lib "animation.ss" "frtime")) +(require frtime/etc + frtime/animation) (define radius (new-cell 20)) diff --git a/collects/frtime/demos/rotation.ss b/collects/frtime/demos/rotation.ss index f79cdccd99..e06d58febd 100644 --- a/collects/frtime/demos/rotation.ss +++ b/collects/frtime/demos/rotation.ss @@ -1,6 +1,6 @@ (require - (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime")) + frtime/animation + frtime/gui) (define radius (make-slider "Radius" 50 150 100)) (define speed (* .01 (make-slider "Speed" -75 75 50))) diff --git a/collects/frtime/demos/spreadsheet/data-synthesis.ss b/collects/frtime/demos/spreadsheet/data-synthesis.ss index f5c69e8e63..3648601b13 100644 --- a/collects/frtime/demos/spreadsheet/data-synthesis.ss +++ b/collects/frtime/demos/spreadsheet/data-synthesis.ss @@ -1,7 +1,7 @@ -(module data-synthesis (lib "frtime.ss" "frtime") +(module data-synthesis frtime/frtime (require "distributions.ss" - (lib "math.ss") + mzlib/math ) ;; num list -> num diff --git a/collects/frtime/demos/spreadsheet/distributions.ss b/collects/frtime/demos/spreadsheet/distributions.ss index c4b98ecead..8e11948237 100644 --- a/collects/frtime/demos/spreadsheet/distributions.ss +++ b/collects/frtime/demos/spreadsheet/distributions.ss @@ -1,6 +1,6 @@ (module distributions mzscheme - (require (lib "math.ss") + (require mzlib/math ) (define RANDOM-GRAIN (sub1 (expt 2 31))) diff --git a/collects/frtime/demos/spreadsheet/preprocessor2.ss b/collects/frtime/demos/spreadsheet/preprocessor2.ss index 93404b76e5..c3a2a39fc3 100644 --- a/collects/frtime/demos/spreadsheet/preprocessor2.ss +++ b/collects/frtime/demos/spreadsheet/preprocessor2.ss @@ -1,7 +1,7 @@ (module preprocessor2 mzscheme - (require (lib "string.ss") - (lib "etc.ss") + (require mzlib/string + mzlib/etc ) (define (drop l n) diff --git a/collects/frtime/demos/spreadsheet/quotes.ss b/collects/frtime/demos/spreadsheet/quotes.ss index 6f56e30ece..670bd079e8 100644 --- a/collects/frtime/demos/spreadsheet/quotes.ss +++ b/collects/frtime/demos/spreadsheet/quotes.ss @@ -1,6 +1,6 @@ (module quotes mzscheme - (require (lib "url.ss" "net")) - (require (lib "list.ss")) + (require net/url) + (require mzlib/list) (provide no-quote? stock-quote no-quote-reason) diff --git a/collects/frtime/demos/spreadsheet/spread.ss b/collects/frtime/demos/spreadsheet/spread.ss index bbb413063f..7f9c3f9757 100644 --- a/collects/frtime/demos/spreadsheet/spread.ss +++ b/collects/frtime/demos/spreadsheet/spread.ss @@ -1,17 +1,17 @@ -(module spread (lib "frtime-big.ss" "frtime") +(module spread frtime/frtime-big - (require (lib "class.ss") - (all-except (lib "mred.ss" "mred") send-event) + (require mzlib/class + (all-except mred send-event) (rename mzscheme mz:define-struct define-struct) "preprocessor2.ss" (lifted "ss-funcs.ss" inflate-data) "quotes.ss" - (as-is:unchecked (lib "match.ss") match-lambda) - (as-is:unchecked (lib "frp-core.ss" "frtime") signal-value + (as-is:unchecked mzlib/match match-lambda) + (as-is:unchecked frtime/frp-core signal-value proc->signal) - (lib "framework.ss" "framework") - (as-is:unchecked (lib "string.ss") expr->string) - (as-is:unchecked (lib "etc.ss") build-vector) + framework + (as-is:unchecked mzlib/string expr->string) + (as-is:unchecked mzlib/etc build-vector) ;(lifted mzscheme regexp-match) (as-is:unchecked mzscheme make-hash-table hash-table-put! hash-table-get hash-table-remove! let*-values vector-set! make-string diff --git a/collects/frtime/demos/spreadsheet/ss-canvas.ss b/collects/frtime/demos/spreadsheet/ss-canvas.ss index 3583dceebe..8ddaf9f875 100644 --- a/collects/frtime/demos/spreadsheet/ss-canvas.ss +++ b/collects/frtime/demos/spreadsheet/ss-canvas.ss @@ -1,14 +1,14 @@ -(module ss-canvas (lib "frtime.ss" "frtime") +(module ss-canvas frtime/frtime (require - (lib "class.ss") - (lib "list.ss" "frtime") + mzlib/class + frtime/list - (all-except (lib "mred.ss" "mred") send-event) + (all-except mred send-event) (lib "mixin-macros.ss" "frtime" "demos" "gui") ) - (require (rename (lib "frp-core.ss" "frtime") super-lift super-lift)) + (require (rename frtime/frp-core super-lift super-lift)) diff --git a/collects/frtime/demos/spreadsheet/ss-database.ss b/collects/frtime/demos/spreadsheet/ss-database.ss index 5aacd4eade..5a1408e61f 100644 --- a/collects/frtime/demos/spreadsheet/ss-database.ss +++ b/collects/frtime/demos/spreadsheet/ss-database.ss @@ -1,8 +1,8 @@ -(module ss-database (lib "frtime-big.ss" "frtime") - (require (rename (lib "frp-core.ss" "frtime") current-custs current-custs)) - (require (rename (lib "frp-core.ss" "frtime") do-in-manager do-in-manager)) +(module ss-database frtime/frtime-big + (require (rename frtime/frp-core current-custs current-custs)) + (require (rename frtime/frp-core do-in-manager do-in-manager)) (require (as-is:unchecked mzscheme make-hash-table hash-table-get hash-table-put!)) - ;(require (lib "string.ss")) + ;(require mzlib/string) (define-struct rcvXbeh (rcv beh)) diff --git a/collects/frtime/demos/spreadsheet/ss-funcs.ss b/collects/frtime/demos/spreadsheet/ss-funcs.ss index 50a000d05a..c65714343b 100644 --- a/collects/frtime/demos/spreadsheet/ss-funcs.ss +++ b/collects/frtime/demos/spreadsheet/ss-funcs.ss @@ -2,7 +2,7 @@ (require "data-synthesis.ss" "distributions.ss" - (only (lib "frtime.ss" "frtime") undefined?) + (only frtime/frtime undefined?) ) ;;filter: ('a -> bool) * 'a list -> 'a list diff --git a/collects/frtime/demos/tile-game.ss b/collects/frtime/demos/tile-game.ss index b8c25282cf..dba328764b 100644 --- a/collects/frtime/demos/tile-game.ss +++ b/collects/frtime/demos/tile-game.ss @@ -1,8 +1,8 @@ ;; tile game by Dave Tucker -(require (lib "animation.ss" "frtime") - (lib "gui.ss" "frtime") - (lib "class.ss")) +(require frtime/animation + frtime/gui + mzlib/class) (define-struct tile (row col num color)) (define-struct state (tiles blank-row blank-col)) diff --git a/collects/frtime/demos/ufo.ss b/collects/frtime/demos/ufo.ss index f4436f371d..ea41de8358 100644 --- a/collects/frtime/demos/ufo.ss +++ b/collects/frtime/demos/ufo.ss @@ -1,4 +1,4 @@ -(require (lib "animation.ss" "frtime")) +(require frtime/animation) (define ufo-x (modulo diff --git a/collects/frtime/doc.txt b/collects/frtime/doc.txt index ce9f7201f9..01aed0b078 100644 --- a/collects/frtime/doc.txt +++ b/collects/frtime/doc.txt @@ -12,7 +12,7 @@ used. To interact with FrTime, set the language level to FrTime. You can also make FrTime the language for a module: -(module (lib "frtime.ss" "frtime") +(module frtime/frtime ) For the animation library and demo programs, set the language level diff --git a/collects/frtime/erl.ss b/collects/frtime/erl.ss index 1fd94e59f1..7c8f8a4865 100644 --- a/collects/frtime/erl.ss +++ b/collects/frtime/erl.ss @@ -1,9 +1,9 @@ (module erl mzscheme - (require (lib "list.ss") - (lib "thread.ss") - (lib "etc.ss") - (lib "dns.ss" "net") + (require mzlib/list + mzlib/thread + mzlib/etc + net/dns "mymatch.ss") (define (with-semaphore s thunk) diff --git a/collects/frtime/etc.ss b/collects/frtime/etc.ss index 1bbb60fc0b..2ba40cd31e 100644 --- a/collects/frtime/etc.ss +++ b/collects/frtime/etc.ss @@ -1,10 +1,10 @@ (module etc "frtime.ss" (require (lib "main-collects.ss" "setup")) - (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 (lib "main-collects.ss" "setup") (lib "stxset.ss" "mzlib" "private")) diff --git a/collects/frtime/frp-core.ss b/collects/frtime/frp-core.ss index 2680f20316..f981e88186 100644 --- a/collects/frtime/frp-core.ss +++ b/collects/frtime/frp-core.ss @@ -1,8 +1,8 @@ (module frp-core mzscheme - (require (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + (require mzlib/etc + mzlib/list + mzlib/match "erl.ss" "heap.ss") diff --git a/collects/frtime/frp-snip.ss b/collects/frtime/frp-snip.ss index e1972fd792..04d5ea053f 100644 --- a/collects/frtime/frp-snip.ss +++ b/collects/frtime/frp-snip.ss @@ -1,17 +1,17 @@ (module frp-snip mzscheme - (require (lib "class.ss") - (lib "string.ss") - (lib "list.ss") - (lib "port.ss") + (require mzlib/class + mzlib/string + mzlib/list + mzlib/port ;; FRP requires - (lib "frp-core.ss" "frtime") - (all-except (lib "lang-ext.ss" "frtime") undefined?) - (only (lib "mzscheme-core.ss" "frtime") any-nested-reactivity? raise-reactivity) + frtime/frp-core + (all-except frtime/lang-ext undefined?) + (only frtime/mzscheme-core any-nested-reactivity? raise-reactivity) ;; MrEd require - (all-except (lib "mred.ss" "mred") send-event)) + (all-except mred send-event)) (define drs-eventspace #f) diff --git a/collects/frtime/frtime-lang-only.ss b/collects/frtime/frtime-lang-only.ss index a05cdcaf50..f2e4515898 100644 --- a/collects/frtime/frtime-lang-only.ss +++ b/collects/frtime/frtime-lang-only.ss @@ -1,7 +1,7 @@ (module frtime-lang-only "mzscheme-utils.ss" - (require (lib "lang-ext.ss" "frtime")) - (require (lib "ft-qq.ss" "frtime")) - (require (as-is:unchecked (lib "frp-core.ss" "frtime") + (require frtime/lang-ext) + (require frtime/ft-qq) + (require (as-is:unchecked frtime/frp-core event-set? signal-value)) (define (value-nowable? x) @@ -14,9 +14,9 @@ (pred v)))) - ;(provide-for-syntax (rename (lib "mzscheme-utils.ss" "frtime") syntax->list syntax->list)) + ;(provide-for-syntax (rename frtime/mzscheme-utils syntax->list syntax->list)) (provide value-nowable? behaviorof (all-from "mzscheme-utils.ss") - (all-from-except (lib "lang-ext.ss" "frtime") lift) - (all-from (lib "ft-qq.ss" "frtime")))) + (all-from-except frtime/lang-ext lift) + (all-from frtime/ft-qq))) diff --git a/collects/frtime/frtime-opt-lang.ss b/collects/frtime/frtime-opt-lang.ss index 8fe2dbb840..e5534f5330 100644 --- a/collects/frtime/frtime-opt-lang.ss +++ b/collects/frtime/frtime-opt-lang.ss @@ -2,8 +2,8 @@ ;; as well as their lowered equivalents. It doesn't know how to perform ;; optimization, though -- that is left to the frtime-opt module. (module frtime-opt-lang mzscheme - (require (prefix frtime: (lib "frtime.ss" "frtime"))) - (require-for-syntax (lib "lowered-equivs.ss" "frtime")) + (require (prefix frtime: frtime/frtime)) + (require-for-syntax frtime/lowered-equivs) ;; Export a function that is just a lifted version of a standard ;; function (with the same name). @@ -12,7 +12,7 @@ (syntax-case stx () [(_ MOD FUNC) (let ([lowered-equiv-id (make-lowered-equiv-id #'FUNC)]) - #`(begin (require (rename (lib "frtime-big.ss" "frtime") lifted-func FUNC)) + #`(begin (require (rename frtime/frtime-big lifted-func FUNC)) (provide (rename lifted-func FUNC)) (require (rename MOD #,lowered-equiv-id FUNC)) (provide #,lowered-equiv-id)))] @@ -24,7 +24,7 @@ (syntax-case stx () [(_ FUNC) (let ([lowered-equiv-id (make-lowered-equiv-id #'FUNC)]) - #`(begin (require (only (lib "frtime-big.ss" "frtime") FUNC)) + #`(begin (require (only frtime/frtime-big FUNC)) ;; note: the definition is necessary here because otherwise the lowered ;; equiv doesn't become part of the module's namespace, and there's ;; no way to find the list of identifiers exported by a module other @@ -40,7 +40,7 @@ (define-syntax provide/no-equiv (syntax-rules () [(_ FUNC) - (begin (require (rename (lib "frtime-big.ss" "frtime") func FUNC)) + (begin (require (rename frtime/frtime-big func FUNC)) (provide (rename func FUNC)))] [(_ FUNC FUNCS ...) (begin (provide/no-equiv FUNC) @@ -128,7 +128,7 @@ eval procedure-arity regexp-match void system-type ) - (provide/lifted (lib "1.ss" "srfi") + (provide/lifted srfi/1 first second) ;; things that serve as their own lowered equivalent diff --git a/collects/frtime/frtime-opt.ss b/collects/frtime/frtime-opt.ss index 827de885fa..fec797e104 100644 --- a/collects/frtime/frtime-opt.ss +++ b/collects/frtime/frtime-opt.ss @@ -8,14 +8,14 @@ (provide (rename my-module-begin #%module-begin) #%app #%top #%datum optimize-expr optimize-module dont-optimize) - (require-for-syntax (lib "lowered-equivs.ss" "frtime")) - (require-for-syntax (only (lib "1.ss" "srfi") lset-union lset-difference every)) - (require-for-syntax (lib "list.ss")) - (require (only (lib "frp-core.ss" "frtime") super-lift undefined undefined?)) - (require (rename (lib "lang-ext.ss" "frtime") frtime:lift lift) - (rename (lib "mzscheme-core.ss" "frtime") frtime:if if) - (only (lib "mzscheme-core.ss" "frtime") frp:copy-list)) -; (require (lib "unit.ss") (lib "unitsig.ss")) + (require-for-syntax frtime/lowered-equivs) + (require-for-syntax (only srfi/1 lset-union lset-difference every)) + (require-for-syntax mzlib/list) + (require (only frtime/frp-core super-lift undefined undefined?)) + (require (rename frtime/lang-ext frtime:lift lift) + (rename frtime/mzscheme-core frtime:if if) + (only frtime/mzscheme-core frp:copy-list)) +; (require mzlib/unit mzlib/unitsig) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Helper functions @@ -81,7 +81,7 @@ ;; The variables are projected before evaluating the expression, ;; and the result is then injected into the dataflow graph as a ;; single node. - (require (only (lib "frp-core.ss" "frtime") proc->signal value-now)) + (require (only frtime/frp-core proc->signal value-now)) (define-syntax (dip stx) (syntax-case stx (begin) ;; special case: don't dip lone identifiers @@ -113,7 +113,7 @@ (syntax-case stx () [(_ FORMS ...) (let* (;; get a list of all the symbols provided by the frtime-opt-lang module - [lang-symbols (all-provided-ids #'(lib "frtime-opt-lang.ss" "frtime") stx)] + [lang-symbols (all-provided-ids #'frtime/frtime-opt-lang stx)] ;; convert those symbols into an equiv-map by pairing up functions ;; with their lowered equivalents [lang-equiv-map (symbol-list-to-equiv-map lang-symbols)] @@ -122,7 +122,7 @@ [equiv-map-stx (equiv-map-to-stx lang-equiv-map)]) #`(#%plain-module-begin (require-for-syntax #,(so->d->so stx #`mzscheme)) - (require #,(so->d->so stx #`(lib "frtime-opt-lang.ss" "frtime"))) + (require #,(so->d->so stx #`frtime/frtime-opt-lang)) (optimize-module #,equiv-map-stx FORMS ...)))])) diff --git a/collects/frtime/frtime-tool.ss b/collects/frtime/frtime-tool.ss index d98401c7b4..765725c926 100644 --- a/collects/frtime/frtime-tool.ss +++ b/collects/frtime/frtime-tool.ss @@ -1,12 +1,12 @@ (module frtime-tool mzscheme - (require (lib "unit.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/unit + mzlib/class + mred + mzlib/etc + mzlib/list (lib "tool.ss" "drscheme") - (lib "string-constant.ss" "string-constants")) + string-constants) (provide tool@) @@ -22,7 +22,7 @@ (define/public (get-language-position) (list (string-constant experimental-languages) "FrTime")) (define/public (get-module) - '(lib "frtime-big.ss" "frtime")) + 'frtime/frtime-big) (define/public (get-one-line-summary) "Language for functional programming of event-driven systems") (define/public (get-language-url) #f) diff --git a/collects/frtime/frtime.ss b/collects/frtime/frtime.ss index fa6681dc6e..c76a6bc360 100644 --- a/collects/frtime/frtime.ss +++ b/collects/frtime/frtime.ss @@ -15,7 +15,7 @@ (pred v)))) - ;(provide-for-syntax (rename (lib "mzscheme-utils.ss" "frtime") syntax->list syntax->list)) + ;(provide-for-syntax (rename frtime/mzscheme-utils syntax->list syntax->list)) (provide value-nowable? behaviorof (all-from "mzscheme-utils.ss") diff --git a/collects/frtime/ft-qq.ss b/collects/frtime/ft-qq.ss index d77ae09e8d..aabe428d15 100644 --- a/collects/frtime/ft-qq.ss +++ b/collects/frtime/ft-qq.ss @@ -1,8 +1,8 @@ (module ft-qq "mzscheme-core.ss" (require (as-is:unchecked mzscheme define-values define-syntaxes require-for-syntax raise-type-error quote unquote unquote-splicing)) - ;(require-for-syntax (lib "frp.ss" "frtime")) - (require-for-syntax (lib "stx.ss" "syntax")) + ;(require-for-syntax frtime/frp) + (require-for-syntax syntax/stx) (define-values (frp:qq-append) diff --git a/collects/frtime/graphics-posn-less-unit.ss b/collects/frtime/graphics-posn-less-unit.ss index 572b09973d..64b93f6ca1 100644 --- a/collects/frtime/graphics-posn-less-unit.ss +++ b/collects/frtime/graphics-posn-less-unit.ss @@ -7,14 +7,14 @@ #lang scheme/unit (require (lib "mred-sig.ss" "mred") - (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") + mzlib/class + mzlib/class100 + mzlib/etc "erl.ss" ;(rename "frp-core.ss" event-receiver event-receiver) ;(rename "frp-core.ss" frp-man man) ;(rename "frp-core.ss" send-event send-event) - (lib "frp-core.ss" "frtime") + frtime/frp-core "graphics-sig.ss") (import (prefix mred: mred^) diff --git a/collects/frtime/graphics-sig.ss b/collects/frtime/graphics-sig.ss index f334c98f57..e3d8a27add 100644 --- a/collects/frtime/graphics-sig.ss +++ b/collects/frtime/graphics-sig.ss @@ -1,5 +1,5 @@ (module graphics-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide graphics^ graphics:posn-less^ graphics:posn^) diff --git a/collects/frtime/graphics-unit.ss b/collects/frtime/graphics-unit.ss index ce49065046..7e0aa72271 100644 --- a/collects/frtime/graphics-unit.ss +++ b/collects/frtime/graphics-unit.ss @@ -1,5 +1,5 @@ (module graphics-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") "graphics-sig.ss" "graphics-posn-less-unit.ss") diff --git a/collects/frtime/graphics.ss b/collects/frtime/graphics.ss index 749013e18a..bbfd6a0f1d 100644 --- a/collects/frtime/graphics.ss +++ b/collects/frtime/graphics.ss @@ -1,7 +1,7 @@ (module graphics mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") - (lib "mred.ss" "mred") + mred "graphics-sig.ss" "graphics-unit.ss") (provide-signature-elements graphics:posn^ graphics:posn-less^) diff --git a/collects/frtime/gui.ss b/collects/frtime/gui.ss index 389ed64725..eb2865836e 100644 --- a/collects/frtime/gui.ss +++ b/collects/frtime/gui.ss @@ -1,10 +1,10 @@ (module gui "frtime.ss" (require - (all-except (lib "etc.ss") rec) - (lib "list.ss") - (lib "class.ss") - (rename (lib "frp-core.ss" "frtime") proc->signal proc->signal) - (all-except (lib "mred.ss" "mred") send-event)) + (all-except mzlib/etc rec) + mzlib/list + mzlib/class + (rename frtime/frp-core proc->signal proc->signal) + (all-except mred send-event)) (define reactive-control<%> (interface (control<%>) diff --git a/collects/frtime/heap.ss b/collects/frtime/heap.ss index fad7748c1c..58155d57ef 100644 --- a/collects/frtime/heap.ss +++ b/collects/frtime/heap.ss @@ -1,8 +1,8 @@ (module heap mzscheme - (require (lib "etc.ss") + (require mzlib/etc "base-gm.ss" - (lib "list.ss") + mzlib/list "dv.ss") diff --git a/collects/frtime/lang-ext.ss b/collects/frtime/lang-ext.ss index 1fdf2e7954..f514c0723b 100644 --- a/collects/frtime/lang-ext.ss +++ b/collects/frtime/lang-ext.ss @@ -1,9 +1,9 @@ (module lang-ext mzscheme - (require (lib "frp-core.ss" "frtime") - (lib "etc.ss") - (lib "list.ss")) + (require frtime/frp-core + mzlib/etc + mzlib/list) - (require-for-syntax (lib "list.ss")) + (require-for-syntax mzlib/list) (define nothing (void));(string->uninterned-symbol "nothing")) diff --git a/collects/frtime/list.ss b/collects/frtime/list.ss index 39467fbeb3..ad55fbb4a9 100644 --- a/collects/frtime/list.ss +++ b/collects/frtime/list.ss @@ -1,9 +1,9 @@ (module list "frtime.ss" - (require (lifted (lib "list.ss") sort + (require (lifted mzlib/list sort fifth sixth seventh eighth last-pair) - (rename (lib "list.ss") empty empty)) + (rename mzlib/list empty empty)) (define first car) (define rest cdr) diff --git a/collects/frtime/lowered-equivs.ss b/collects/frtime/lowered-equivs.ss index 6a5945af1d..731e5406f1 100644 --- a/collects/frtime/lowered-equivs.ss +++ b/collects/frtime/lowered-equivs.ss @@ -3,8 +3,8 @@ ;; as syntactic identifiers. (module lowered-equivs mzscheme (provide (all-defined)) - (require (lib "list.ss")) - (require (only (lib "1.ss" "srfi") any)) + (require mzlib/list) + (require (only srfi/1 any)) (define lowered-equiv-suffix ":lowered-equiv") diff --git a/collects/frtime/mymatch.ss b/collects/frtime/mymatch.ss index 0e819088ba..0031cc97b6 100644 --- a/collects/frtime/mymatch.ss +++ b/collects/frtime/mymatch.ss @@ -98,8 +98,8 @@ (module mymatch mzscheme (require-for-syntax "private/mkmatch.ss" - (lib "stx.ss" "syntax") - (lib "struct.ss" "syntax")) + syntax/stx + syntax/struct) (provide match-fail diff --git a/collects/frtime/mzscheme-core.ss b/collects/frtime/mzscheme-core.ss index 1b14c0d08b..d25de428f2 100644 --- a/collects/frtime/mzscheme-core.ss +++ b/collects/frtime/mzscheme-core.ss @@ -1,12 +1,12 @@ (module mzscheme-core mzscheme ;(require (all-except mzscheme provide module if require letrec null?) - ;(lib "list.ss")) - (require-for-syntax (lib "struct.ss" "frtime") (lib "list.ss")) - (require (lib "list.ss") - (lib "frp-core.ss" "frtime") - (only (lib "vector-lib.ss" "srfi" "43") vector-any) - (only (lib "lang-ext.ss" "frtime") lift new-cell switch ==> changes) - (only (lib "etc.ss") build-vector rec build-list opt-lambda identity)) + ;mzlib/list) + (require-for-syntax frtime/struct mzlib/list) + (require mzlib/list + frtime/frp-core + (only srfi/43/vector-lib vector-any) + (only frtime/lang-ext lift new-cell switch ==> changes) + (only mzlib/etc build-vector rec build-list opt-lambda identity)) ;;;;;;;;;;;;;;;;;;;;;;;; ;; Fundamental Macros ;; diff --git a/collects/frtime/mzscheme-utils.ss b/collects/frtime/mzscheme-utils.ss index edaba7279d..9df4744059 100644 --- a/collects/frtime/mzscheme-utils.ss +++ b/collects/frtime/mzscheme-utils.ss @@ -42,8 +42,8 @@ (rename "frp-core.ss" behavior? behavior?) (rename "lang-ext.ss" undefined undefined) (rename "lang-ext.ss" undefined? undefined?) - (lib "class.ss")) - (require (lib "list.ss")) + mzlib/class) + (require mzlib/list) (define-syntax (lifted-send stx) (syntax-case stx () diff --git a/collects/frtime/struct.ss b/collects/frtime/struct.ss index 7cf8a2498b..f1fff3ca22 100644 --- a/collects/frtime/struct.ss +++ b/collects/frtime/struct.ss @@ -1,7 +1,7 @@ (module struct mzscheme - (require (lib "etc.ss") - (lib "stx.ss" "syntax") + (require mzlib/etc + syntax/stx (lib "struct-info.ss" "scheme")) (require-for-template mzscheme) diff --git a/collects/games/cards/card-class.ss b/collects/games/cards/card-class.ss index 3963313a6c..526642bd1f 100644 --- a/collects/games/cards/card-class.ss +++ b/collects/games/cards/card-class.ss @@ -1,8 +1,8 @@ (module card-class mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (prefix mred:(lib "mred.ss" "mred")) + (require mzlib/class + mzlib/class100 + (prefix mred: mred) "snipclass.ss" "region.ss") diff --git a/collects/games/cards/classes.ss b/collects/games/cards/classes.ss index c65ab0475d..99cdf4ea3c 100644 --- a/collects/games/cards/classes.ss +++ b/collects/games/cards/classes.ss @@ -1,15 +1,15 @@ (module classes mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (prefix mred: (lib "mred.ss" "mred")) - (lib "list.ss") - (lib "etc.ss") + (require mzlib/class + mzlib/class100 + (prefix mred: mred) + mzlib/list + mzlib/etc (prefix util: "utils.ss") "constants.ss" "make-cards.ss" "region.ss" - (lib "string-constant.ss" "string-constants") + string-constants "../show-help.ss") (provide pasteboard% diff --git a/collects/games/cards/constants.ss b/collects/games/cards/constants.ss index 1b0ade1d83..41c63e64cc 100644 --- a/collects/games/cards/constants.ss +++ b/collects/games/cards/constants.ss @@ -1,7 +1,7 @@ (module constants mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mred) (provide ANIMATION-STEPS ANIMATION-TIME diff --git a/collects/games/cards/make-cards.ss b/collects/games/cards/make-cards.ss index d90d735b34..51f76c8fdd 100644 --- a/collects/games/cards/make-cards.ss +++ b/collects/games/cards/make-cards.ss @@ -1,7 +1,7 @@ (module make-cards mzscheme - (require (lib "class.ss") - (prefix mred: (lib "mred.ss" "mred")) + (require mzlib/class + (prefix mred: mred) (prefix card-class: "card-class.ss")) (provide back deck-of-cards make-card) diff --git a/collects/games/cards/snipclass.ss b/collects/games/cards/snipclass.ss index ea87de1e63..f66a281170 100644 --- a/collects/games/cards/snipclass.ss +++ b/collects/games/cards/snipclass.ss @@ -1,7 +1,7 @@ (module snipclass mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide sc) (define sc (make-object snip-class%)) diff --git a/collects/games/checkers/checkers.ss b/collects/games/checkers/checkers.ss index 05838410a6..65b81a2e8a 100644 --- a/collects/games/checkers/checkers.ss +++ b/collects/games/checkers/checkers.ss @@ -1,14 +1,14 @@ #lang mzscheme (require (lib "gl-board.ss" "games" "gl-board-game") - (lib "class.ss") - (lib "math.ss") - (lib "mred.ss" "mred") - (lib "unit.ss") - (lib "gl-vectors.ss" "sgl") - (prefix gl- (lib "sgl.ss" "sgl")) - (lib "gl.ss" "sgl") - (lib "array.ss" "srfi" "25") + mzlib/class + mzlib/math + mred + mzlib/unit + sgl/gl-vectors + sgl + sgl/gl + srfi/25/array (lib "include-bitmap.ss" "mrlib") "honu-bitmaps.ss") (provide game@) diff --git a/collects/games/checkers/honu-bitmaps.ss b/collects/games/checkers/honu-bitmaps.ss index b685419618..7ea085653c 100644 --- a/collects/games/checkers/honu-bitmaps.ss +++ b/collects/games/checkers/honu-bitmaps.ss @@ -1,8 +1,8 @@ (module honu-bitmaps mzscheme - (require (lib "math.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "class.ss")) + (require mzlib/math + mzlib/etc + mred + mzlib/class) (provide honu-bitmap honu-down-bitmap honu-rotation honu-down-rotation) diff --git a/collects/games/doors/doors.ss b/collects/games/doors/doors.ss index 8bae7e61bc..f5c96101e5 100644 --- a/collects/games/doors/doors.ss +++ b/collects/games/doors/doors.ss @@ -1,12 +1,12 @@ (module doors mzscheme (require (lib "gl-board.ss" "games" "gl-board-game") - (lib "gl-vectors.ss" "sgl") - (prefix gl- (lib "sgl.ss" "sgl")) + sgl/gl-vectors + sgl (lib "bitmap.ss" "sgl") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "etc.ss") - (lib "class.ss")) + mred + mzlib/list + mzlib/etc + mzlib/class) (provide door-game% player-data diff --git a/collects/games/doors/graph.ss b/collects/games/doors/graph.ss index f7ff0545c2..9418e9ca92 100644 --- a/collects/games/doors/graph.ss +++ b/collects/games/doors/graph.ss @@ -1,6 +1,6 @@ (module graph mzscheme - (require (lib "class.ss") + (require mzlib/class "private/utils.ss") (require-for-syntax "private/utils.ss") diff --git a/collects/games/doors/utils.ss b/collects/games/doors/utils.ss index 4211f166cb..ed0042a4c4 100644 --- a/collects/games/doors/utils.ss +++ b/collects/games/doors/utils.ss @@ -1,12 +1,12 @@ (module utils mzscheme - (require (lib "gl-vectors.ss" "sgl") - (prefix gl- (lib "sgl.ss" "sgl")) - (lib "math.ss") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "etc.ss") - (lib "class.ss") - (lib "kw.ss") + (require sgl/gl-vectors + sgl + mzlib/math + mred + mzlib/list + mzlib/etc + mzlib/class + mzlib/kw "doors.ss") (provide door-bm diff --git a/collects/games/gcalc/gcalc.ss b/collects/games/gcalc/gcalc.ss index 32bac3afd1..dc1fdb0803 100644 --- a/collects/games/gcalc/gcalc.ss +++ b/collects/games/gcalc/gcalc.ss @@ -5,8 +5,7 @@ #lang mzscheme -(require (lib "class.ss") (lib "mred.ss" "mred") (lib "etc.ss") - "../show-help.ss" (lib "unit.ss")) +(require mzlib/class mred mzlib/etc "../show-help.ss" mzlib/unit) (provide game@) (define customs '()) diff --git a/collects/games/gl-board-game/gl-board.ss b/collects/games/gl-board-game/gl-board.ss index 92db59fae8..05aba051b8 100644 --- a/collects/games/gl-board-game/gl-board.ss +++ b/collects/games/gl-board-game/gl-board.ss @@ -1,10 +1,10 @@ (module gl-board mzscheme - (require (prefix gl- (lib "sgl.ss" "sgl")) - (lib "gl.ss" "sgl") - (lib "gl-vectors.ss" "sgl") - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred")) + (require sgl + sgl/gl + sgl/gl-vectors + mzlib/class + mzlib/list + mred) (provide gl-board%) diff --git a/collects/games/gobblet/check.ss b/collects/games/gobblet/check.ss index 7629c88941..7c266409eb 100644 --- a/collects/games/gobblet/check.ss +++ b/collects/games/gobblet/check.ss @@ -5,9 +5,9 @@ ;; form). (module check mzscheme - (require (lib "unitsig.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/unitsig + mzlib/etc + mzlib/list "sig.ss" "model.ss" "explore.ss" diff --git a/collects/games/gobblet/explore.ss b/collects/games/gobblet/explore.ss index 3a7823cef7..4d312e682b 100644 --- a/collects/games/gobblet/explore.ss +++ b/collects/games/gobblet/explore.ss @@ -3,9 +3,9 @@ ;; See `make-search' for the main entry point. (module explore mzscheme - (require (lib "unitsig.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/unitsig + mzlib/etc + mzlib/list "sig.ss" "test.ss") diff --git a/collects/games/gobblet/gobblet.ss b/collects/games/gobblet/gobblet.ss index e0de9a72f6..012b6e8b97 100644 --- a/collects/games/gobblet/gobblet.ss +++ b/collects/games/gobblet/gobblet.ss @@ -1,8 +1,8 @@ #lang mzscheme -(require (lib "unitsig.ss") - (only (lib "unit.ss") unit import export) - (lib "file.ss") - (lib "mred.ss" "mred") +(require mzlib/unitsig + (only mzlib/unit unit import export) + mzlib/file + mred "sig.ss" "model.ss" "gui.ss" diff --git a/collects/games/gobblet/gui.ss b/collects/games/gobblet/gui.ss index 060a26fb14..55568148ba 100644 --- a/collects/games/gobblet/gui.ss +++ b/collects/games/gobblet/gui.ss @@ -1,11 +1,11 @@ (module gui mzscheme (require (lib "gl-board.ss" "games" "gl-board-game") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "file.ss") - (lib "gl-vectors.ss" "sgl") - (prefix gl- (lib "sgl.ss" "sgl")) - (lib "unitsig.ss") + mzlib/class + mred + mzlib/file + sgl/gl-vectors + sgl + mzlib/unitsig "sig.ss") (provide gui-unit) diff --git a/collects/games/gobblet/heuristics.ss b/collects/games/gobblet/heuristics.ss index d5e8aad1bc..c5f7bd3c9c 100644 --- a/collects/games/gobblet/heuristics.ss +++ b/collects/games/gobblet/heuristics.ss @@ -3,9 +3,9 @@ ;; explorer. (module heuristics mzscheme - (require (lib "unitsig.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/unitsig + mzlib/etc + mzlib/list "sig.ss" "plays-3x3.ss") diff --git a/collects/games/gobblet/model.ss b/collects/games/gobblet/model.ss index b56c9f9d63..19f9858295 100644 --- a/collects/games/gobblet/model.ss +++ b/collects/games/gobblet/model.ss @@ -1,6 +1,6 @@ (module model mzscheme (require "sig.ss" - (lib "unitsig.ss")) + mzlib/unitsig) (provide model-unit) diff --git a/collects/games/gobblet/robot.ss b/collects/games/gobblet/robot.ss index a22655f9bc..d8f87f8230 100644 --- a/collects/games/gobblet/robot.ss +++ b/collects/games/gobblet/robot.ss @@ -2,9 +2,9 @@ ;; Plays automatic games, often useful when learning is enabled in explore.ss (module robot mzscheme - (require (lib "unitsig.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/unitsig + mzlib/etc + mzlib/list "sig.ss" "model.ss" "explore.ss" diff --git a/collects/games/gobblet/sig.ss b/collects/games/gobblet/sig.ss index 965eb2987f..6a8832e15b 100644 --- a/collects/games/gobblet/sig.ss +++ b/collects/games/gobblet/sig.ss @@ -1,5 +1,5 @@ (module sig mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (provide config^ heuristics^ explore^ diff --git a/collects/games/gobblet/test-explore.ss b/collects/games/gobblet/test-explore.ss index 127d511b8a..774b1d1692 100644 --- a/collects/games/gobblet/test-explore.ss +++ b/collects/games/gobblet/test-explore.ss @@ -1,8 +1,8 @@ (module test-explore mzscheme - (require (lib "unitsig.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/unitsig + mzlib/etc + mzlib/list "sig.ss" "model.ss" "explore.ss" diff --git a/collects/games/gobblet/test-model.ss b/collects/games/gobblet/test-model.ss index a1858b7f37..f92f4cf2a4 100644 --- a/collects/games/gobblet/test-model.ss +++ b/collects/games/gobblet/test-model.ss @@ -2,9 +2,9 @@ ;; Some tests for the model (module test-model mzscheme - (require (lib "unitsig.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/unitsig + mzlib/etc + mzlib/list "sig.ss" "model.ss" "test.ss") diff --git a/collects/games/jewel/jewel.scm b/collects/games/jewel/jewel.scm index fdb0f04222..562042dcf3 100644 --- a/collects/games/jewel/jewel.scm +++ b/collects/games/jewel/jewel.scm @@ -3,14 +3,14 @@ (module jewel mzscheme - (require (lib "unit.ss") - (lib "string.ss") - (lib "class.ss") - (lib "file.ss") - (lib "mred.ss" "mred") - (lib "gl.ss" "sgl") - (lib "gl-vectors.ss" "sgl") - (only (lib "sgl.ss" "sgl") get-gl-version-number) + (require mzlib/unit + mzlib/string + mzlib/class + mzlib/file + mred + sgl/gl + sgl/gl-vectors + (only sgl/sgl get-gl-version-number) "shapes.scm" "array.scm" "text.scm" diff --git a/collects/games/jewel/shapes.scm b/collects/games/jewel/shapes.scm index 1171481dfd..13631dc00b 100644 --- a/collects/games/jewel/shapes.scm +++ b/collects/games/jewel/shapes.scm @@ -1,14 +1,12 @@ (module shapes mzscheme -(require (lib "gl.ss" "sgl") - (lib "gl-vectors.ss" "sgl") - (prefix gl- (lib "sgl.ss" "sgl")) -) +(require sgl/gl + sgl/gl-vectors + sgl) (provide makedots makebucky makebevelcube makecylinder makeuvsphere makediamond makepyramid makeicosahedron - makespiky makedisc -) + makespiky makedisc) (define (norm p1 p2 p3 dir) diff --git a/collects/games/jewel/text.scm b/collects/games/jewel/text.scm index 9c400875ee..fdfdc6ba1e 100644 --- a/collects/games/jewel/text.scm +++ b/collects/games/jewel/text.scm @@ -1,9 +1,9 @@ (module text mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "gl.ss" "sgl") - (lib "gl-vectors.ss" "sgl") + (require mred + mzlib/class + sgl/gl + sgl/gl-vectors ) (provide string-init string-draw) diff --git a/collects/games/lights-out/board.ss b/collects/games/lights-out/board.ss index 0c0cbfe6cd..35e82e021f 100644 --- a/collects/games/lights-out/board.ss +++ b/collects/games/lights-out/board.ss @@ -1,7 +1,7 @@ (module board mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") + (require mred + mzlib/class + mzlib/etc "boards.ss") (provide diff --git a/collects/games/lights-out/lights-out.ss b/collects/games/lights-out/lights-out.ss index a917d2886c..350afa8f0e 100644 --- a/collects/games/lights-out/lights-out.ss +++ b/collects/games/lights-out/lights-out.ss @@ -1,9 +1,9 @@ #lang mzscheme (require "board.ss" "../show-help.ss" - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "unit.ss")) + mred + mzlib/class + mzlib/unit) (provide game@ lights-out^) diff --git a/collects/games/mines/gen-tiles.ss b/collects/games/mines/gen-tiles.ss index c5996cd8ca..7cfcfbf3d9 100644 --- a/collects/games/mines/gen-tiles.ss +++ b/collects/games/mines/gen-tiles.ss @@ -1,8 +1,8 @@ (module gen-tiles mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "math.ss")) + (require mzlib/class + mred + mzlib/math) (define SIZE 24) diff --git a/collects/games/mines/mines.ss b/collects/games/mines/mines.ss index bed9c356ce..17d9203253 100644 --- a/collects/games/mines/mines.ss +++ b/collects/games/mines/mines.ss @@ -5,10 +5,10 @@ #lang mzscheme -(require (lib "etc.ss") ; defines build-vector - (lib "class.ss") - (lib "unit.ss") - (lib "mred.ss" "mred") +(require mzlib/etc ; defines build-vector + mzlib/class + mzlib/unit + mred (lib "include-bitmap.ss" "mrlib")) (provide game@) diff --git a/collects/games/paint-by-numbers/all-problems.ss b/collects/games/paint-by-numbers/all-problems.ss index 284065fbd7..bd8886b9d1 100644 --- a/collects/games/paint-by-numbers/all-problems.ss +++ b/collects/games/paint-by-numbers/all-problems.ss @@ -1,11 +1,11 @@ (module all-problems mzscheme - (require (lib "etc.ss") - (lib "list.ss") - (lib "unitsig.ss") - (lib "include.ss") + (require mzlib/etc + mzlib/list + mzlib/unitsig + mzlib/include "problem.ss") - (require-for-syntax (lib "etc.ss")) + (require-for-syntax mzlib/etc) (define-signature paint-by-numbers:all-problems^ (problemss set-names)) (define-signature paint-by-numbers:problem-set^ (problems set-name)) diff --git a/collects/games/paint-by-numbers/gui.ss b/collects/games/paint-by-numbers/gui.ss index fe97c9dcc1..615c13edae 100644 --- a/collects/games/paint-by-numbers/gui.ss +++ b/collects/games/paint-by-numbers/gui.ss @@ -36,10 +36,10 @@ paint by numbers. |# (module gui mzscheme - (require (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "etc.ss") - (lib "class.ss")) + (require mred + framework + mzlib/etc + mzlib/class) (provide paint-by-numbers-canvas% design-paint-by-numbers-canvas%) diff --git a/collects/games/paint-by-numbers/paint-by-numbers.ss b/collects/games/paint-by-numbers/paint-by-numbers.ss index 0ecf57b317..69904bdceb 100644 --- a/collects/games/paint-by-numbers/paint-by-numbers.ss +++ b/collects/games/paint-by-numbers/paint-by-numbers.ss @@ -5,12 +5,12 @@ "all-problems.ss" "problem.ss" "../show-help.ss" - (lib "framework.ss" "framework") - (lib "class.ss") - (lib "unit.ss") - (lib "pretty.ss") - (lib "list.ss") - (lib "mred.ss" "mred")) + framework + mzlib/class + mzlib/unit + mzlib/pretty + mzlib/list + mred) (provide game@) diff --git a/collects/games/paint-by-numbers/raw-problems/build-final.ss b/collects/games/paint-by-numbers/raw-problems/build-final.ss index a7d801e3af..14f8fab1ed 100644 --- a/collects/games/paint-by-numbers/raw-problems/build-final.ss +++ b/collects/games/paint-by-numbers/raw-problems/build-final.ss @@ -10,7 +10,7 @@ in ... |# -(require (lib "match.ss")) +(require mzlib/match) ;; shrink-file : string -> string (define (shrink-file filename) diff --git a/collects/games/paint-by-numbers/raw-problems/build-solution-sets.ss b/collects/games/paint-by-numbers/raw-problems/build-solution-sets.ss index 77f83b93a4..597ebfad59 100644 --- a/collects/games/paint-by-numbers/raw-problems/build-solution-sets.ss +++ b/collects/games/paint-by-numbers/raw-problems/build-solution-sets.ss @@ -20,10 +20,10 @@ The col and row type specs are in sig.ss and the solution type is: (define argv (current-command-line-arguments)) -(require (lib "etc.ss") - (lib "list.ss") - (lib "file.ss") - (lib "pretty.ss") +(require mzlib/etc + mzlib/list + mzlib/file + mzlib/pretty (prefix solve: "../solve.ss")) (if (eq? (vector) argv) diff --git a/collects/games/paint-by-numbers/solve.ss b/collects/games/paint-by-numbers/solve.ss index ccdf685713..94aa0f9bc3 100644 --- a/collects/games/paint-by-numbers/solve.ss +++ b/collects/games/paint-by-numbers/solve.ss @@ -2,9 +2,9 @@ (module solve mzscheme - (require (lib "list.ss") - (lib "etc.ss") - (lib "contract.ss")) + (require mzlib/list + mzlib/etc + mzlib/contract) (provide/contract [solve (-> (listof (listof integer?)) ; row-info (listof (listof integer?)) ; col-info diff --git a/collects/games/parcheesi/admin-gui.ss b/collects/games/parcheesi/admin-gui.ss index 90a53e4d09..49969a4840 100644 --- a/collects/games/parcheesi/admin-gui.ss +++ b/collects/games/parcheesi/admin-gui.ss @@ -15,10 +15,10 @@ corresponds to the unplayed move! that's confusing. "rules.ss" "best-players.ss" "../show-help.ss" - (lib "framework.ss" "framework") - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred")) + framework + mzlib/class + mzlib/list + mred) (provide gui-game%) diff --git a/collects/games/parcheesi/admin.ss b/collects/games/parcheesi/admin.ss index d601087bde..78d333f5d2 100644 --- a/collects/games/parcheesi/admin.ss +++ b/collects/games/parcheesi/admin.ss @@ -3,8 +3,8 @@ (require "board.ss" "moves.ss" "interfaces.ss" - (lib "class.ss") - (lib "list.ss")) + mzlib/class + mzlib/list) (provide game% game-observer<%>) diff --git a/collects/games/parcheesi/best-players.ss b/collects/games/parcheesi/best-players.ss index 1bd22043c5..0aa016cee1 100644 --- a/collects/games/parcheesi/best-players.ss +++ b/collects/games/parcheesi/best-players.ss @@ -15,10 +15,10 @@ careful charlie "moves.ss" "interfaces.ss" "test.ss" - (lib "list.ss") - (lib "etc.ss") - (lib "class.ss") - (lib "pretty.ss")) + mzlib/list + mzlib/etc + mzlib/class + mzlib/pretty) (provide random-player% agressive-player% diff --git a/collects/games/parcheesi/board.ss b/collects/games/parcheesi/board.ss index b7e7172e32..314c655502 100644 --- a/collects/games/parcheesi/board.ss +++ b/collects/games/parcheesi/board.ss @@ -1,8 +1,8 @@ (module board mzscheme - (require (lib "contract.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/contract + mzlib/list + mzlib/etc) ;; color = (symbols 'blue 'green 'red 'yellow) ;; color : color diff --git a/collects/games/parcheesi/die.ss b/collects/games/parcheesi/die.ss index 6eb37739bf..6582e33c90 100644 --- a/collects/games/parcheesi/die.ss +++ b/collects/games/parcheesi/die.ss @@ -1,6 +1,6 @@ (module die mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide die%) diff --git a/collects/games/parcheesi/gui.ss b/collects/games/parcheesi/gui.ss index 445f31f898..3156a8a979 100644 --- a/collects/games/parcheesi/gui.ss +++ b/collects/games/parcheesi/gui.ss @@ -2,10 +2,10 @@ (module gui mzscheme (require "board.ss" "moves.ss" - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss")) + mred + mzlib/class + mzlib/list + mzlib/etc) (provide show-board board-canvas% diff --git a/collects/games/parcheesi/interfaces.ss b/collects/games/parcheesi/interfaces.ss index 88a1bfb5a6..7f62c43fd5 100644 --- a/collects/games/parcheesi/interfaces.ss +++ b/collects/games/parcheesi/interfaces.ss @@ -1,5 +1,5 @@ (module interfaces mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide player<%> game<%>) diff --git a/collects/games/parcheesi/make-bitmap.ss b/collects/games/parcheesi/make-bitmap.ss index b7f898c5a0..37d21914d7 100644 --- a/collects/games/parcheesi/make-bitmap.ss +++ b/collects/games/parcheesi/make-bitmap.ss @@ -2,10 +2,10 @@ (module make-bitmap mzscheme (require "board.ss" "moves.ss" - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss")) + mred + mzlib/class + mzlib/list + mzlib/etc) (provide show-board board-canvas% diff --git a/collects/games/parcheesi/moves.ss b/collects/games/parcheesi/moves.ss index 31e2da4c0d..990d002ee1 100644 --- a/collects/games/parcheesi/moves.ss +++ b/collects/games/parcheesi/moves.ss @@ -1,7 +1,7 @@ (module moves mzscheme (require "board.ss" - (lib "contract.ss") - (lib "list.ss")) + mzlib/contract + mzlib/list) ;; a move is either: ;; - (make-enter-piece pawn) diff --git a/collects/games/parcheesi/parcheesi.ss b/collects/games/parcheesi/parcheesi.ss index 94259583ef..201f0bcee3 100644 --- a/collects/games/parcheesi/parcheesi.ss +++ b/collects/games/parcheesi/parcheesi.ss @@ -1,7 +1,7 @@ (module parcheesi mzscheme - (require (lib "unit.ss") - (lib "class.ss") + (require mzlib/unit + mzlib/class "admin-gui.ss") (provide game@) diff --git a/collects/games/parcheesi/play-game.ss b/collects/games/parcheesi/play-game.ss index dae4b21a6a..9d174768ba 100644 --- a/collects/games/parcheesi/play-game.ss +++ b/collects/games/parcheesi/play-game.ss @@ -4,9 +4,9 @@ "board.ss" "moves.ss" "die.ss" - (lib "math.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/math + mzlib/class + mred) (provide play-game) diff --git a/collects/games/parcheesi/rules.ss b/collects/games/parcheesi/rules.ss index 21b78c252e..cbbea060cf 100644 --- a/collects/games/parcheesi/rules.ss +++ b/collects/games/parcheesi/rules.ss @@ -5,10 +5,10 @@ "moves.ss" "gui.ss" - (lib "class.ss") + mzlib/class (lib "xml.ss" "xml") (lib "htmltext.ss" "browser") - (lib "mred.ss" "mred")) + mred) (define board-size 250) diff --git a/collects/games/parcheesi/test.ss b/collects/games/parcheesi/test.ss index a0d3d13835..26b11e42d5 100644 --- a/collects/games/parcheesi/test.ss +++ b/collects/games/parcheesi/test.ss @@ -1,5 +1,5 @@ (module test mzscheme - (require (lib "pretty.ss")) + (require mzlib/pretty) (provide test test-list test-err test-results) (define show-tests? #t) diff --git a/collects/games/pousse/counter.ss b/collects/games/pousse/counter.ss index cae56a706e..0f0e630415 100644 --- a/collects/games/pousse/counter.ss +++ b/collects/games/pousse/counter.ss @@ -7,7 +7,7 @@ (module counter mzscheme (require "board.ss" "utils.ss" - (lib "unitsig.ss")) + mzlib/unitsig) (provide params^ counter@) diff --git a/collects/games/pousse/pousse.ss b/collects/games/pousse/pousse.ss index 6aeb7b87f9..cadb5b95a9 100644 --- a/collects/games/pousse/pousse.ss +++ b/collects/games/pousse/pousse.ss @@ -2,10 +2,10 @@ (require "utils.ss" "board.ss" "board-size.ss" - (lib "class.ss") - (lib "class100.ss") - (all-except (lib "unit.ss") rename) ; rename collides with class100 - (lib "mred.ss" "mred") + mzlib/class + mzlib/class100 + (all-except mzlib/unit rename) ; rename collides with class100 + mred (prefix robot: "robot.ss")) (provide game@) diff --git a/collects/games/pousse/robot.ss b/collects/games/pousse/robot.ss index 467b94cbf6..db3237c2a5 100644 --- a/collects/games/pousse/robot.ss +++ b/collects/games/pousse/robot.ss @@ -2,7 +2,7 @@ (require "counter.ss" "board.ss" "utils.ss" - (lib "unitsig.ss")) + mzlib/unitsig) (provide robot) diff --git a/collects/games/same/same.ss b/collects/games/same/same.ss index baab14e0a9..777e61509d 100644 --- a/collects/games/same/same.ss +++ b/collects/games/same/same.ss @@ -1,9 +1,9 @@ (module same mzscheme - (require (lib "etc.ss") - (lib "class.ss") - (lib "unit.ss") - (lib "mred.ss" "mred") - (lib "list.ss") + (require mzlib/etc + mzlib/class + mzlib/unit + mred + mzlib/list "../show-help.ss") (provide game@) diff --git a/collects/games/show-help.ss b/collects/games/show-help.ss index 8901d4637a..0813a7ec32 100644 --- a/collects/games/show-help.ss +++ b/collects/games/show-help.ss @@ -1,7 +1,7 @@ (module show-help mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss")) + (require mzlib/class + mred + mzlib/etc) (provide show-help) diff --git a/collects/games/slidey/slidey.ss b/collects/games/slidey/slidey.ss index dd380b1139..07888d3b23 100644 --- a/collects/games/slidey/slidey.ss +++ b/collects/games/slidey/slidey.ss @@ -1,8 +1,8 @@ #lang mzscheme -(require (lib "etc.ss") - (lib "class.ss") - (lib "unit.ss") - (lib "mred.ss" "mred")) +(require mzlib/etc + mzlib/class + mzlib/unit + mred) (provide game@) diff --git a/collects/graphics/graphics-posn-less-unit.ss b/collects/graphics/graphics-posn-less-unit.ss index 756ed4a3e8..2973ff5587 100644 --- a/collects/graphics/graphics-posn-less-unit.ss +++ b/collects/graphics/graphics-posn-less-unit.ss @@ -3,12 +3,12 @@ ; Originally written by Johnathan Franklin (module graphics-posn-less-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") + mred + mzlib/class + mzlib/class100 + mzlib/etc "graphics-sig.ss") (provide graphics-posn-less@) diff --git a/collects/graphics/graphics-sig.ss b/collects/graphics/graphics-sig.ss index a3ebca5fc3..cc93256586 100644 --- a/collects/graphics/graphics-sig.ss +++ b/collects/graphics/graphics-sig.ss @@ -1,5 +1,5 @@ (module graphics-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide graphics^ graphics:posn^) diff --git a/collects/graphics/graphics-unit.ss b/collects/graphics/graphics-unit.ss index 403cf4b7b1..180237bcfd 100644 --- a/collects/graphics/graphics-unit.ss +++ b/collects/graphics/graphics-unit.ss @@ -1,5 +1,5 @@ (module graphics-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") "graphics-sig.ss" "graphics-posn-less-unit.ss") diff --git a/collects/graphics/graphics.ss b/collects/graphics/graphics.ss index a2aa763457..b3f3eb270b 100644 --- a/collects/graphics/graphics.ss +++ b/collects/graphics/graphics.ss @@ -1,5 +1,5 @@ (module graphics mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") (lib "mred-unit.ss" "mred") "graphics-sig.ss" diff --git a/collects/graphics/turtle-examples.ss b/collects/graphics/turtle-examples.ss index 430302da31..53a7f06eff 100644 --- a/collects/graphics/turtle-examples.ss +++ b/collects/graphics/turtle-examples.ss @@ -1,6 +1,6 @@ (module turtle-examples mzscheme - (require (lib "math.ss") - (lib "etc.ss") + (require mzlib/math + mzlib/etc "turtles.ss") (provide regular-poly regular-polys radial-turtles spaced-turtles spokes spyro-gyra neato graphics-bexam serp-size serp serp-nosplit diff --git a/collects/graphics/turtle-test.ss b/collects/graphics/turtle-test.ss index fe508365b6..5cc590e203 100644 --- a/collects/graphics/turtle-test.ss +++ b/collects/graphics/turtle-test.ss @@ -1,7 +1,7 @@ (module turtle-test mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "math.ss") + (require mred + mzlib/class + mzlib/math "turtle-examples.ss" "turtles.ss") diff --git a/collects/graphics/turtle-unit.ss b/collects/graphics/turtle-unit.ss index 9623eabfbe..258accc3c1 100644 --- a/collects/graphics/turtle-unit.ss +++ b/collects/graphics/turtle-unit.ss @@ -1,10 +1,10 @@ #lang scheme/unit (require (lib "mred-sig.ss" "mred") - (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") - (lib "etc.ss") + mzlib/class + mzlib/class100 + mzlib/list + mzlib/etc "turtle-sig.ss") (import [prefix mred: mred^]) diff --git a/collects/graphics/turtles.ss b/collects/graphics/turtles.ss index ab5e67cd92..ae620ab639 100644 --- a/collects/graphics/turtles.ss +++ b/collects/graphics/turtles.ss @@ -1,5 +1,5 @@ (module turtles mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") (lib "mred-unit.ss" "mred") "turtle-sig.ss" diff --git a/collects/graphics/value-turtles-examples.ss b/collects/graphics/value-turtles-examples.ss index 4ff11312a3..67291c3fba 100644 --- a/collects/graphics/value-turtles-examples.ss +++ b/collects/graphics/value-turtles-examples.ss @@ -1,7 +1,7 @@ (module value-turtles-examples mzscheme (require "value-turtles.ss" - (lib "etc.ss") - (lib "math.ss")) + mzlib/etc + mzlib/math) (provide regular-poly regular-polys radial-turtles spaced-turtles spokes spyro-gyra neato) diff --git a/collects/graphics/value-turtles-test.ss b/collects/graphics/value-turtles-test.ss index e59734fbf3..466150a90d 100644 --- a/collects/graphics/value-turtles-test.ss +++ b/collects/graphics/value-turtles-test.ss @@ -1,8 +1,8 @@ (module value-turtles-test mzscheme (require "value-turtles-examples.ss" "value-turtles.ss" - (lib "mred.ss" "mred") - (lib "class.ss")) + mred + mzlib/class) (define-syntax (test stx) (syntax-case stx () diff --git a/collects/graphics/value-turtles.ss b/collects/graphics/value-turtles.ss index d4ff80e851..0ed4c8e5d5 100644 --- a/collects/graphics/value-turtles.ss +++ b/collects/graphics/value-turtles.ss @@ -1,9 +1,9 @@ (module value-turtles mzscheme - (require (lib "math.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (all-except (lib "list.ss") merge) - (lib "struct.ss")) + (require mzlib/math + mzlib/class + mred + (all-except mzlib/list merge) + mzlib/struct) (provide turtles move draw turn turn/radians merge clean) diff --git a/collects/gui-debugger/annotator.ss b/collects/gui-debugger/annotator.ss index 6afe3bd778..943d8ddf51 100644 --- a/collects/gui-debugger/annotator.ss +++ b/collects/gui-debugger/annotator.ss @@ -1,10 +1,10 @@ (module annotator scheme/base - (require (prefix-in kernel: (lib "kerncase.ss" "syntax")) - (lib "list.ss") + (require (prefix-in kernel: syntax/kerncase) + mzlib/list (lib "marks.ss" "gui-debugger") - (lib "etc.ss") - (prefix-in srfi: (lib "search.ss" "srfi" "1")) + mzlib/etc + (prefix-in srfi: srfi/1/search) (for-syntax scheme/base) ) (provide annotate-stx annotate-for-single-stepping) diff --git a/collects/gui-debugger/debug-tool.ss b/collects/gui-debugger/debug-tool.ss index ef93437ad8..8d9075b134 100644 --- a/collects/gui-debugger/debug-tool.ss +++ b/collects/gui-debugger/debug-tool.ss @@ -1,22 +1,22 @@ (module debug-tool mzscheme - (require (lib "etc.ss") - (lib "list.ss") - (lib "string.ss") - ;(lib "math.ss") - (lib "class.ss") - (lib "unit.ss") - (lib "contract.ss") - (lib "mred.ss" "mred") - (lib "match.ss") + (require mzlib/etc + mzlib/list + mzlib/string + ;mzlib/math + mzlib/class + mzlib/unit + mzlib/contract + mred + mzlib/match (prefix drscheme:arrow: (lib "arrow.ss" "drscheme")) (lib "tool.ss" "drscheme") "marks.ss" - (lib "boundmap.ss" "syntax") + syntax/boundmap (lib "bitmap-label.ss" "mrlib") "annotator.ss" "load-sandbox.ss" - (lib "framework.ss" "framework") - (lib "string-constant.ss" "string-constants") + framework + string-constants (lib "debugger-language-interface.ss" "lang")) (provide tool@) diff --git a/collects/gui-debugger/load-sandbox.ss b/collects/gui-debugger/load-sandbox.ss index 6f7dc7f8a8..c0cb8fc628 100644 --- a/collects/gui-debugger/load-sandbox.ss +++ b/collects/gui-debugger/load-sandbox.ss @@ -1,8 +1,8 @@ (module load-sandbox mzscheme - (require (lib "moddep.ss" "syntax") - (lib "class.ss" "mzlib") - (lib "mred.ss" "mred")) + (require syntax/moddep + mzlib/class + mred) (provide eval/annotations require/annotations diff --git a/collects/gui-debugger/marks.ss b/collects/gui-debugger/marks.ss index 64b0ca0dad..1cf482464a 100644 --- a/collects/gui-debugger/marks.ss +++ b/collects/gui-debugger/marks.ss @@ -1,7 +1,7 @@ (module marks mzscheme - (require (lib "list.ss") - (lib "contract.ss") + (require mzlib/list + mzlib/contract (lib "my-macros.ss" "stepper" "private") (lib "shared.ss" "stepper" "private")) diff --git a/collects/guibuilder/base.ss b/collects/guibuilder/base.ss index 0fd047c527..e6d431989d 100644 --- a/collects/guibuilder/base.ss +++ b/collects/guibuilder/base.ss @@ -1,11 +1,11 @@ (module base mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss") (define GB:SNIP-VERSION 5) diff --git a/collects/guibuilder/canvas.ss b/collects/guibuilder/canvas.ss index 1bcfcc7e97..38401f623a 100644 --- a/collects/guibuilder/canvas.ss +++ b/collects/guibuilder/canvas.ss @@ -1,11 +1,11 @@ (module canvas mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss" "base.ss" "feature.ss") diff --git a/collects/guibuilder/feature.ss b/collects/guibuilder/feature.ss index 64ee77027e..d7fab88210 100644 --- a/collects/guibuilder/feature.ss +++ b/collects/guibuilder/feature.ss @@ -1,11 +1,11 @@ (module feature mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "base.ss" "utils.ss") diff --git a/collects/guibuilder/guibuilder.ss b/collects/guibuilder/guibuilder.ss index 8354a647ab..233ec1a953 100644 --- a/collects/guibuilder/guibuilder.ss +++ b/collects/guibuilder/guibuilder.ss @@ -1,12 +1,12 @@ (module guibuilder mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") - (prefix framework: (lib "framework.ss" "framework")) + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list + (prefix framework: framework) "utils.ss" "top-level.ss" "toolbar.ss") diff --git a/collects/guibuilder/multiple-choice.ss b/collects/guibuilder/multiple-choice.ss index 94d47003a1..29f22cca42 100644 --- a/collects/guibuilder/multiple-choice.ss +++ b/collects/guibuilder/multiple-choice.ss @@ -1,11 +1,11 @@ (module multiple-choice mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss" "base.ss" "feature.ss") diff --git a/collects/guibuilder/panel.ss b/collects/guibuilder/panel.ss index 547c5a49ba..e1be9edc83 100644 --- a/collects/guibuilder/panel.ss +++ b/collects/guibuilder/panel.ss @@ -1,11 +1,11 @@ (module panel mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss" "base.ss") diff --git a/collects/guibuilder/readable.ss b/collects/guibuilder/readable.ss index 0594806d20..80e49a41f7 100644 --- a/collects/guibuilder/readable.ss +++ b/collects/guibuilder/readable.ss @@ -1,7 +1,7 @@ (module readable mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") + (require mred + mzlib/class "top-level.ss" "toolbar.ss") diff --git a/collects/guibuilder/simple-control.ss b/collects/guibuilder/simple-control.ss index bb54e9d2eb..de81759ef2 100644 --- a/collects/guibuilder/simple-control.ss +++ b/collects/guibuilder/simple-control.ss @@ -1,11 +1,11 @@ (module simple-control mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss" "base.ss" "feature.ss") diff --git a/collects/guibuilder/slider-guage.ss b/collects/guibuilder/slider-guage.ss index fc587e54eb..e9af9b0d06 100644 --- a/collects/guibuilder/slider-guage.ss +++ b/collects/guibuilder/slider-guage.ss @@ -1,11 +1,11 @@ (module slider-guage mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss" "base.ss" "feature.ss") diff --git a/collects/guibuilder/text-field.ss b/collects/guibuilder/text-field.ss index b651423c86..0f5bd7306a 100644 --- a/collects/guibuilder/text-field.ss +++ b/collects/guibuilder/text-field.ss @@ -1,11 +1,11 @@ (module text-field mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss" "base.ss" "feature.ss") diff --git a/collects/guibuilder/tool.ss b/collects/guibuilder/tool.ss index 5d484ac449..7576f60b87 100644 --- a/collects/guibuilder/tool.ss +++ b/collects/guibuilder/tool.ss @@ -1,11 +1,11 @@ (module tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (lib "unit.ss") - (lib "class.ss") - (lib "string-constant.ss" "string-constants") - (lib "contract.ss") + mred + mzlib/unit + mzlib/class + string-constants + mzlib/contract "top-level.ss" "toolbar.ss" "readable.ss") diff --git a/collects/guibuilder/toolbar.ss b/collects/guibuilder/toolbar.ss index 7073699ff1..11cb8c5bc2 100644 --- a/collects/guibuilder/toolbar.ss +++ b/collects/guibuilder/toolbar.ss @@ -1,11 +1,11 @@ (module toolbar mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list "utils.ss") ;; These modules implement snips for the various diff --git a/collects/guibuilder/top-level.ss b/collects/guibuilder/top-level.ss index 3a34e10af6..0bb59fcdc6 100644 --- a/collects/guibuilder/top-level.ss +++ b/collects/guibuilder/top-level.ss @@ -1,12 +1,12 @@ (module top-level mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "file.ss") - (lib "pretty.ss") - (lib "etc.ss") - (lib "list.ss") - (prefix framework: (lib "framework.ss" "framework")) + (require (prefix mred: mred) + mzlib/class + mzlib/file + mzlib/pretty + mzlib/etc + mzlib/list + (prefix framework: framework) "utils.ss" "base.ss" "panel.ss") diff --git a/collects/guibuilder/utils.ss b/collects/guibuilder/utils.ss index c9b9c2f86e..c7e2bcc69f 100644 --- a/collects/guibuilder/utils.ss +++ b/collects/guibuilder/utils.ss @@ -1,9 +1,9 @@ (module utils mzscheme - (require (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss")) + (require (prefix mred: mred) + mzlib/class + mzlib/etc + mzlib/list) (define-syntax (private-field stx) (syntax-case stx () diff --git a/collects/handin-client/client-gui.ss b/collects/handin-client/client-gui.ss index 2f7c0dafe5..091dc5c18b 100644 --- a/collects/handin-client/client-gui.ss +++ b/collects/handin-client/client-gui.ss @@ -1,8 +1,6 @@ (module client-gui mzscheme - (require (lib "class.ss") (lib "unit.ss") (lib "file.ss") - (lib "sendurl.ss" "net") (lib "mred.ss" "mred") - (lib "bitmap-label.ss" "mrlib") - (lib "tool.ss" "drscheme") (lib "framework.ss" "framework") + (require mzlib/class mzlib/unit mzlib/file net/sendurl mred + mrlib/bitmap-label drscheme/tool framework "info.ss" "client.ss" "this-collection.ss") (provide tool@) @@ -485,7 +483,7 @@ [callback (lambda (b e) (define (launcher sym) - (dynamic-require `(lib "launcher.ss" "launcher") sym)) + (dynamic-require `launcher sym)) (let* ([exe (let-values ([(dir name dir?) (split-path diff --git a/collects/handin-client/handin-multi.ss b/collects/handin-client/handin-multi.ss index 48ea1e6f4b..7731b24ab1 100644 --- a/collects/handin-client/handin-multi.ss +++ b/collects/handin-client/handin-multi.ss @@ -1,6 +1,6 @@ (module handin-multi mzscheme - (require (lib "class.ss") (lib "list.ss") (lib "string.ss") (lib "port.ss") - (lib "mred.ss" "mred") (lib "framework.ss" "framework") + (require mzlib/class mzlib/list mzlib/string mzlib/port + mred framework (lib "external.ss" "browser") "info.ss" "client-gui.ss" "this-collection.ss") diff --git a/collects/handin-client/updater.ss b/collects/handin-client/updater.ss index 41664e13ef..d8579f907f 100644 --- a/collects/handin-client/updater.ss +++ b/collects/handin-client/updater.ss @@ -1,7 +1,7 @@ (module updater mzscheme - (require (lib "file.ss") (lib "port.ss") (lib "url.ss" "net") - (lib "plt-installer.ss" "setup") (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + (require mzlib/file mzlib/port net/url + (lib "plt-installer.ss" "setup") mred + framework "info.ss" "this-collection.ss") (define name (#%info-lookup 'name)) (define web-address (#%info-lookup 'web-address)) diff --git a/collects/handin-server/checker.ss b/collects/handin-server/checker.ss index ed2abeec08..53810df2c5 100644 --- a/collects/handin-server/checker.ss +++ b/collects/handin-server/checker.ss @@ -1,7 +1,6 @@ #lang mzscheme -(require "utils.ss" (lib "file.ss") (lib "list.ss") (lib "class.ss") - (lib "mred.ss" "mred")) +(require "utils.ss" mzlib/file mzlib/list mzlib/class mred) (provide (all-from-except mzscheme #%module-begin) (all-from "utils.ss")) @@ -93,7 +92,7 @@ ;; * snip->text is used earlier in the process, where comment-box text is still ;; available -(require (lib "framework.ss" "framework")) ; for drscheme snips, used below +(require framework) ; for drscheme snips, used below ;; input-port->text-input-port : input-port (any -> any) -> input-port ;; the `filter' function is applied to special values; the filter result is diff --git a/collects/handin-server/private/config.ss b/collects/handin-server/private/config.ss index 4f619fee88..e90432ad26 100644 --- a/collects/handin-server/private/config.ss +++ b/collects/handin-server/private/config.ss @@ -1,5 +1,5 @@ (module config mzscheme - (require (lib "file.ss") (lib "list.ss")) + (require mzlib/file mzlib/list) ;; This module should be invoked when we're in the server directory (provide server-dir) diff --git a/collects/handin-server/private/lock.ss b/collects/handin-server/private/lock.ss index ce890b49ac..870cbb5bbc 100644 --- a/collects/handin-server/private/lock.ss +++ b/collects/handin-server/private/lock.ss @@ -1,5 +1,5 @@ (module lock mzscheme - (require (lib "list.ss")) + (require mzlib/list) (provide wait-for-lock) diff --git a/collects/handin-server/private/logger.ss b/collects/handin-server/private/logger.ss index 3ca5c4ac1e..4ef14de3e2 100644 --- a/collects/handin-server/private/logger.ss +++ b/collects/handin-server/private/logger.ss @@ -1,5 +1,5 @@ (module logger mzscheme - (require "config.ss" (lib "date.ss") (lib "port.ss")) + (require "config.ss" mzlib/date mzlib/port) (provide current-session) (define current-session (make-parameter #f)) diff --git a/collects/handin-server/private/md5.ss b/collects/handin-server/private/md5.ss index faf4f4fae6..3471326533 100644 --- a/collects/handin-server/private/md5.ss +++ b/collects/handin-server/private/md5.ss @@ -1,5 +1,5 @@ (module md5 mzscheme - (require (prefix mz: (lib "md5.ss"))) + (require (prefix mz: mzlib/md5)) (define (md5 s) (bytes->string/latin-1 (mz:md5 (string->bytes/utf-8 s)))) (provide md5)) diff --git a/collects/handin-server/private/reloadable.ss b/collects/handin-server/private/reloadable.ss index 8722473241..ff8be9f1aa 100644 --- a/collects/handin-server/private/reloadable.ss +++ b/collects/handin-server/private/reloadable.ss @@ -1,6 +1,6 @@ (module reloadable mzscheme - (require (lib "moddep.ss" "syntax") "logger.ss") + (require syntax/moddep "logger.ss") (provide reload-module) (define (reload-module modspec path) diff --git a/collects/handin-server/scribblings/handin-server.scrbl b/collects/handin-server/scribblings/handin-server.scrbl index 579ee4c1ee..753b7d4fca 100644 --- a/collects/handin-server/scribblings/handin-server.scrbl +++ b/collects/handin-server/scribblings/handin-server.scrbl @@ -11,8 +11,8 @@ !defined !procedure !procedure* !integer !integer* check: !test !all-covered) - handin-server/scribblings/hook-dummy) - (for-label mred/mred)) + handin-server/scribblings/hook-dummy + mred)) @(define (comment . args) "") @@ -384,7 +384,7 @@ This directory contains the following files and sub-directories: @schememod[ mzscheme (provide hook) - (require (lib "sendmail.ss" "net")) + (require net/sendmail) (define (hook what session alist) (when (memq what '(user-create user-change)) (send-mail-message @@ -1087,7 +1087,7 @@ code.} pop-up a message telling the student about it: @schemeblock[ - (require (lib "sendmail.ss" "net")) + (require net/sendmail) (post: (define info (format "hw.scm: ~a ~a" diff --git a/collects/handin-server/status-web-root/servlets/status.ss b/collects/handin-server/status-web-root/servlets/status.ss index fd5125727c..baa5ce0abe 100644 --- a/collects/handin-server/status-web-root/servlets/status.ss +++ b/collects/handin-server/status-web-root/servlets/status.ss @@ -1,16 +1,16 @@ (module status mzscheme - (require (lib "file.ss") - (lib "list.ss") - (lib "string.ss") - (lib "date.ss") - (lib "servlet.ss" "web-server") - (lib "servlet-structs.ss" "web-server" "servlet") - (lib "timeouts.ss" "web-server" "managers") - (lib "uri-codec.ss" "net") - (lib "md5.ss" "handin-server" "private") - (lib "logger.ss" "handin-server" "private") - (lib "config.ss" "handin-server" "private") - (lib "hooker.ss" "handin-server" "private")) + (require mzlib/file + mzlib/list + mzlib/string + mzlib/date + web-server/servlet + web-server/servlet/servlet-structs + web-server/managers/timeouts.ss + net/uri-codec + handin-server/private/md5 + handin-server/privatelogger + handin-server/privateconfig + handin-server/privatehooker) (define get-user-data (let ([users-file (build-path server-dir "users.ss")]) diff --git a/collects/handin-server/utils.ss b/collects/handin-server/utils.ss index a1ad740dfe..a8d5cf7715 100644 --- a/collects/handin-server/utils.ss +++ b/collects/handin-server/utils.ss @@ -1,10 +1,10 @@ (module utils mzscheme - (require (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + (require mzlib/list + mzlib/class + mred (lib "posn.ss" "lang") - (prefix pc: (lib "pconvert.ss")) - (lib "pretty.ss") + (prefix pc: mzlib/pconvert) + mzlib/pretty (only "main.ss" timeout-control) "private/run-status.ss" "private/config.ss" diff --git a/collects/help/bug-report.ss b/collects/help/bug-report.ss index eb9f76af26..cb28d22247 100644 --- a/collects/help/bug-report.ss +++ b/collects/help/bug-report.ss @@ -1,16 +1,16 @@ (module bug-report mzscheme - (require (lib "string-constant.ss" "string-constants") - (lib "head.ss" "net") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "url.ss" "net") - (lib "uri-codec.ss" "net") + (require string-constants + net/head + mred + framework + mzlib/class + mzlib/etc + mzlib/list + net/url + net/uri-codec (lib "htmltext.ss" "browser") - (lib "dirs.ss" "setup") + setup/dirs "private/buginfo.ss") (provide help-desk:report-bug) diff --git a/collects/hierlist/hierlist-unit.ss b/collects/hierlist/hierlist-unit.ss index a0f5392204..c045b9c12f 100644 --- a/collects/hierlist/hierlist-unit.ss +++ b/collects/hierlist/hierlist-unit.ss @@ -1,14 +1,14 @@ (module hierlist-unit mzscheme - (require (all-except (lib "unit.ss") rename) - (lib "class.ss") - (lib "class100.ss") + (require (all-except mzlib/unit rename) + mzlib/class + mzlib/class100 (lib "mred-sig.ss" "mred") (lib "include-bitmap.ss" "mrlib") "hierlist-sig.ss") - (require (rename (lib "list.ss") sort* sort) - (lib "etc.ss")) + (require (rename mzlib/list sort* sort) + mzlib/etc) (define turn-up (include-bitmap "../icons/turn-up.png" 'png)) (define turn-down (include-bitmap "../icons/turn-down.png" 'png)) diff --git a/collects/hierlist/hierlist.ss b/collects/hierlist/hierlist.ss index 0c802ed5fc..065f11d0f8 100644 --- a/collects/hierlist/hierlist.ss +++ b/collects/hierlist/hierlist.ss @@ -1,6 +1,6 @@ (module hierlist mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") (lib "mred-unit.ss" "mred")) diff --git a/collects/honu-module/honu-module.ss b/collects/honu-module/honu-module.ss index fd30b4793d..50b5fa6a28 100644 --- a/collects/honu-module/honu-module.ss +++ b/collects/honu-module/honu-module.ss @@ -1,10 +1,10 @@ (module honu-module "private/mzscheme.ss" - (require-for-syntax (lib "stx.ss" "syntax") + (require-for-syntax syntax/stx "private/ops.ss" "private/util.ss" - (lib "kerncase.ss" "syntax") - (lib "name.ss" "syntax") + syntax/kerncase + syntax/name "private/contexts.ss") (begin-for-syntax @@ -1268,7 +1268,7 @@ (define-syntax (honu-type-info stx) (raise-syntax-error #f "shouldn't appear unquoted!" stx)) - (require-for-syntax (lib "context.ss" "syntax")) + (require-for-syntax syntax/context) (define-syntax (honu-block stx) ;; A block can have mixed exprs and defns. Wrap expressions with ;; `(define-values () ... (values))' as needed, and add a (void) @@ -1387,7 +1387,7 @@ ;; -------------------------------------------------------- ;; Defining a new transformer or new type - (require-for-syntax (lib "define.ss" "syntax")) + (require-for-syntax syntax/define) (define-syntax (define-honu-syntax stx) (let-values ([(id rhs) (normalize-definition stx #'lambda #f)]) (with-syntax ([id id] diff --git a/collects/honu-module/private/util.ss b/collects/honu-module/private/util.ss index 6c5e05012e..78d1d64ca5 100644 --- a/collects/honu-module/private/util.ss +++ b/collects/honu-module/private/util.ss @@ -3,7 +3,7 @@ (provide delim-identifier=? extract-until) - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (define (delim-identifier=? a b) (eq? (syntax-e a) (syntax-e b))) diff --git a/collects/htdch/draw/Canvas-native-methods.ss b/collects/htdch/draw/Canvas-native-methods.ss index 178071e1a3..164a67511f 100644 --- a/collects/htdch/draw/Canvas-native-methods.ss +++ b/collects/htdch/draw/Canvas-native-methods.ss @@ -1,6 +1,6 @@ #cs (module Canvas-native-methods mzscheme - (require (lib "support.scm" "htdch" "draw") (lib "unit.ss")) + (require (lib "support.scm" "htdch" "draw") mzlib/unit) (define void-or-true #t) (define (imperative w@t+1 w@t) w@t+1) diff --git a/collects/htdch/draw/World-native-methods.ss b/collects/htdch/draw/World-native-methods.ss index 67599c5ad4..bce09a119a 100644 --- a/collects/htdch/draw/World-native-methods.ss +++ b/collects/htdch/draw/World-native-methods.ss @@ -1,6 +1,6 @@ #cs (module World-native-methods mzscheme - (require (lib "support.scm" "htdch" "draw") (lib "unit.ss")) + (require (lib "support.scm" "htdch" "draw") mzlib/unit) (provide endOfTime-java.lang.String-native endOfWorld-java.lang.String-native bigBangO-double-native) diff --git a/collects/htdch/draw/support.scm b/collects/htdch/draw/support.scm index a2cc705975..4041c5a065 100644 --- a/collects/htdch/draw/support.scm +++ b/collects/htdch/draw/support.scm @@ -1,13 +1,13 @@ #cs (module support mzscheme - (require (lib "draw.ss" "htdp") - (lib "posn.ss" "lang") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "unit.ss") - (lib "String.ss" "profj" "libs" "java" "lang") - (lib "Throwable.ss" "profj" "libs""java""lang") - (lib "RuntimeException.ss" "profj" "libs" "java" "lang")) + (require htdp/draw + lang/posn + mzlib/class + mred + mzlib/unit + profj/libs/java/lang/String + profj/libs/java/lang/Throwable + profj/libs/java/lang/RuntimeException) (provide world-native@ world-native^ canvas-native@ canvas-native^ support^) @@ -64,8 +64,8 @@ (exn-message e)))))) (begin (begin body ...) void-or-true))])) - (define Posn-x-get (dynamic-require '(lib "Posn.ss" "htdch" "geometry") 'Posn-x-get)) - (define Posn-y-get (dynamic-require '(lib "Posn.ss" "htdch" "geometry") 'Posn-y-get)) + (define Posn-x-get (dynamic-require 'htdch/geometry/Posn 'Posn-x-get)) + (define Posn-y-get (dynamic-require 'htdch/geometry/Posn 'Posn-y-get)) (define (build-posn posnO) (make-posn (Posn-x-get posnO) (Posn-y-get posnO))) (define (color->symbol colorO) (string->symbol (to-lower-case (send colorO my-name)))) diff --git a/collects/htdch/graphics/rename.ss b/collects/htdch/graphics/rename.ss index 49c2c4694d..4951fdd5fc 100644 --- a/collects/htdch/graphics/rename.ss +++ b/collects/htdch/graphics/rename.ss @@ -1,8 +1,8 @@ (module rename mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "image.ss" "htdp") + (require mzlib/class + mred + htdp/image (lib "imageeq.ss" "lang" "private" )) (provide to-symbol new-object call-back-canvas% overlay-x-y diff --git a/collects/htdch/idraw/Canvas-native-methods.ss b/collects/htdch/idraw/Canvas-native-methods.ss index f80171e62d..ac326845e0 100644 --- a/collects/htdch/idraw/Canvas-native-methods.ss +++ b/collects/htdch/idraw/Canvas-native-methods.ss @@ -1,6 +1,6 @@ #cs (module Canvas-native-methods mzscheme - (require (lib "support.scm" "htdch" "draw") (lib "unit.ss")) + (require (lib "support.scm" "htdch" "draw") mzlib/unit) (define void-or-true (void)) (define (imperative w@t+1 w@t) w@t+1) diff --git a/collects/htdch/idraw/World-native-methods.ss b/collects/htdch/idraw/World-native-methods.ss index 7481af79af..f313033e30 100644 --- a/collects/htdch/idraw/World-native-methods.ss +++ b/collects/htdch/idraw/World-native-methods.ss @@ -1,6 +1,6 @@ #cs (module World-native-methods mzscheme - (require (lib "support.scm" "htdch" "draw") (lib "unit.ss")) + (require (lib "support.scm" "htdch" "draw") mzlib/unit) (provide endOfTime-java.lang.String-native endOfWorld-java.lang.String-native bigBangO-double-native) diff --git a/collects/htdp/HtDPv0/ping-play-unit.ss b/collects/htdp/HtDPv0/ping-play-unit.ss index 81167a550d..d77c5f4934 100644 --- a/collects/htdp/HtDPv0/ping-play-unit.ss +++ b/collects/htdp/HtDPv0/ping-play-unit.ss @@ -1,7 +1,7 @@ #cs(module ping-play-unit mzscheme (require "pingp-sig.ss" (lib "posn.ss" "lang") - (lib "unitsig.ss")) + mzlib/unitsig) (provide ping-play-U) (define ping-play-U diff --git a/collects/htdp/HtDPv0/pingp-play.ss b/collects/htdp/HtDPv0/pingp-play.ss index 530debc0d3..043b7ed444 100644 --- a/collects/htdp/HtDPv0/pingp-play.ss +++ b/collects/htdp/HtDPv0/pingp-play.ss @@ -2,7 +2,7 @@ (require "pingp-sig.ss" "pingp.ss" - (lib "unitsig.ss") + mzlib/unitsig "ping-play-unit.ss") (provide pingp-play@) diff --git a/collects/htdp/HtDPv0/pingp-sig.ss b/collects/htdp/HtDPv0/pingp-sig.ss index 42793c4090..e57eaf3401 100644 --- a/collects/htdp/HtDPv0/pingp-sig.ss +++ b/collects/htdp/HtDPv0/pingp-sig.ss @@ -1,6 +1,6 @@ #cs(module pingp-sig mzscheme (require "draw-sig.ss" - (lib "unitsig.ss")) + mzlib/unitsig) (provide pingpS ping-protS-core ping-protS-extr diff --git a/collects/htdp/HtDPv0/pingp.ss b/collects/htdp/HtDPv0/pingp.ss index 1329429b0b..bc95d18b2a 100644 --- a/collects/htdp/HtDPv0/pingp.ss +++ b/collects/htdp/HtDPv0/pingp.ss @@ -2,7 +2,7 @@ (require "error.ss" "pingp-sig.ss" "big-draw.ss" - (lib "unitsig.ss") + mzlib/unitsig (lib "posn.ss" "lang")) (provide pingpU) diff --git a/collects/htdp/HtDPv0/protect-play-unit.ss b/collects/htdp/HtDPv0/protect-play-unit.ss index 072e0b749a..fcfebde022 100644 --- a/collects/htdp/HtDPv0/protect-play-unit.ss +++ b/collects/htdp/HtDPv0/protect-play-unit.ss @@ -1,8 +1,8 @@ #cs(module protect-play-unit mzscheme (provide protect-play-U) - (require (lib "unitsig.ss") + (require mzlib/unitsig "pingp-sig.ss" - (lib "list.ss") + mzlib/list (lib "posn.ss" "lang")) (define protect-play-U diff --git a/collects/htdp/HtDPv0/protect-play.ss b/collects/htdp/HtDPv0/protect-play.ss index bf35c4d0b5..da38f15895 100644 --- a/collects/htdp/HtDPv0/protect-play.ss +++ b/collects/htdp/HtDPv0/protect-play.ss @@ -3,7 +3,7 @@ "protect-play-unit.ss" "ping-play-unit.ss" "pingp.ss" - (lib "unitsig.ss")) + mzlib/unitsig) (provide protect-play@) (define protect-play@ diff --git a/collects/htdp/HtDPv0/rectangle.ss b/collects/htdp/HtDPv0/rectangle.ss index 3e853defbf..ff04bee4e1 100644 --- a/collects/htdp/HtDPv0/rectangle.ss +++ b/collects/htdp/HtDPv0/rectangle.ss @@ -1,9 +1,9 @@ (module rectangle mzscheme - (require (lib "error.ss" "htdp") - (lib "draw-sig.ss" "htdp") - (lib "big-draw.ss" "htdp") - (lib "unitsig.ss") - (lib "list.ss") + (require htdp/error + htdp/draw-sig + htdp/big-draw + mzlib/unitsig + mzlib/list (lib "posn.ss" "lang")) (provide show) diff --git a/collects/htdp/Test/convert.ss b/collects/htdp/Test/convert.ss index 480825686b..91ce2fd576 100644 --- a/collects/htdp/Test/convert.ss +++ b/collects/htdp/Test/convert.ss @@ -1,6 +1,6 @@ ;; test errors by hand in GUI (load "tester.ss") -(require (lib "convert.ss" "htdp")) +(require htdp/convert) ;; f2c : num -> num ;; to convert a Fahrenheit temperature into a Celsius temperature diff --git a/collects/htdp/Test/dir.ss b/collects/htdp/Test/dir.ss index 3817b846e0..5f1c4aa32e 100644 --- a/collects/htdp/Test/dir.ss +++ b/collects/htdp/Test/dir.ss @@ -16,7 +16,7 @@ (map (lambda (x) (format "in Test, not in Teachpacks: ~s" x)) (filter (lambda (x) (not (member x teachps-files))) current-files))) -(require (lib "testing.ss" "htdp")) +(require htdp/testing) (check-expect (make-file 'a 1 2) (make-file 'a 1 2)) diff --git a/collects/htdp/Test/matrix-test.ss b/collects/htdp/Test/matrix-test.ss index 25e04aeafb..f15d167493 100644 --- a/collects/htdp/Test/matrix-test.ss +++ b/collects/htdp/Test/matrix-test.ss @@ -1,9 +1,9 @@ ;; The first three lines of this file were inserted by DrScheme. They record metadata ;; about the language level of this file in a form that our tools can easily process. #reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname matrix-test) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ()))) -; (require (lib "matrix-invisible.ss" "htdp")) -(require (lib "matrix.ss" "htdp")) -(require (lib "testing.ss" "htdp")) +; (require htdp/matrix-invisible) +(require htdp/matrix) +(require htdp/testing) (define r1 '((a00 a01 a02) (a10 a11 a12))) diff --git a/collects/htdp/Test/world-add-line.ss b/collects/htdp/Test/world-add-line.ss index ee2c2bc2d2..85482a6f25 100644 --- a/collects/htdp/Test/world-add-line.ss +++ b/collects/htdp/Test/world-add-line.ss @@ -1,4 +1,4 @@ -(require (lib "world.ss" "htdp")) +(require htdp/world) (define plain (empty-scene 100 100)) diff --git a/collects/htdp/Test/world-mouse.ss b/collects/htdp/Test/world-mouse.ss index 47971df8cb..f3ee327211 100644 --- a/collects/htdp/Test/world-mouse.ss +++ b/collects/htdp/Test/world-mouse.ss @@ -1,4 +1,4 @@ -(require (lib "world.ss" "htdp")) +(require htdp/world) (with-handlers ((exn? (lambda (x) #t))) (place-image (circle 3 'solid 'red) 1.2 3.14 (empty-scene 100 100))) diff --git a/collects/htdp/arrow-gui.ss b/collects/htdp/arrow-gui.ss index e6a1b520e9..97cba9c7c8 100644 --- a/collects/htdp/arrow-gui.ss +++ b/collects/htdp/arrow-gui.ss @@ -1,10 +1,10 @@ #cs(module arrow-gui mzscheme - (require (lib "error.ss" "htdp") - (lib "big-draw.ss" "htdp") - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + (require htdp/error + htdp/big-draw + mzlib/etc + mzlib/class + mred (lib "prim.ss" "lang")) (provide diff --git a/collects/htdp/arrow.ss b/collects/htdp/arrow.ss index 2a854df88a..a2eb5ece6d 100644 --- a/collects/htdp/arrow.ss +++ b/collects/htdp/arrow.ss @@ -1,10 +1,10 @@ #cs(module arrow mzscheme - (require (lib "error.ss" "htdp") - (lib "big-draw.ss" "htdp") - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + (require htdp/error + htdp/big-draw + mzlib/etc + mzlib/class + mred (lib "prim.ss" "lang")) (provide diff --git a/collects/htdp/big-draw.ss b/collects/htdp/big-draw.ss index 5f87d3f411..87adc6f90a 100644 --- a/collects/htdp/big-draw.ss +++ b/collects/htdp/big-draw.ss @@ -2,16 +2,16 @@ (module big-draw mzscheme (require "error.ss" "draw-sig.ss" - (lib "etc.ss") - (lib "posn.ss" "lang") - (lib "prim.ss" "lang") - (lib "unit.ss") - (prefix mred: (lib "mred.ss" "mred")) - (lib "class.ss") - (lib "mred-sig.ss" "mred") - (lib "mred-unit.ss" "mred") - (lib "graphics-sig.ss" "graphics") - (lib "graphics-posn-less-unit.ss" "graphics")) + mzlib/etc + lang/posn + lang/prim + mzlib/unit + (prefix mred: mred) + mzlib/class + mred/mred-sig + mred/mred-unit + graphics/graphics-sig + graphics/graphics-posn-less-unit) (define-unit-from-context p@ graphics:posn^) (define-compound-unit/infer g@ (import) (export graphics^) diff --git a/collects/htdp/convert.ss b/collects/htdp/convert.ss index 363204cfce..93d60381e3 100644 --- a/collects/htdp/convert.ss +++ b/collects/htdp/convert.ss @@ -1,7 +1,7 @@ #lang scheme/gui ;(module convert mzscheme - (require (lib "etc.ss") + (require mzlib/etc htdp/error lang/prim) diff --git a/collects/htdp/dir.ss b/collects/htdp/dir.ss index beb56c4e98..0ead86c7e8 100644 --- a/collects/htdp/dir.ss +++ b/collects/htdp/dir.ss @@ -1,6 +1,6 @@ #lang scheme -(require (lib "error.ss" "htdp") +(require htdp/error (lib "prim.ss" "lang")) (provide diff --git a/collects/htdp/docs.ss b/collects/htdp/docs.ss index 48cafb1e63..e20760ca21 100644 --- a/collects/htdp/docs.ss +++ b/collects/htdp/docs.ss @@ -1,6 +1,6 @@ #cs(module docs mzscheme - (require (lib "error.ss" "htdp") - (lib "list.ss") + (require htdp/error + mzlib/list (lib "prim.ss" "lang")) (provide diff --git a/collects/htdp/draw-sig.ss b/collects/htdp/draw-sig.ss index e99a975731..3ad5807b3c 100644 --- a/collects/htdp/draw-sig.ss +++ b/collects/htdp/draw-sig.ss @@ -1,6 +1,6 @@ #cs(module draw-sig mzscheme (provide core-draw^ draw^) - (require (lib "unit.ss")) + (require mzlib/unit) ;; xxx-solid-rect cannot be called xxx-solid-rectangle because that ;; interferes with the existing xxx-solid-rectangle name in our unit diff --git a/collects/htdp/draw.ss b/collects/htdp/draw.ss index b05ac349e7..8116d00d65 100644 --- a/collects/htdp/draw.ss +++ b/collects/htdp/draw.ss @@ -1,7 +1,7 @@ #cs(module draw mzscheme - (require (lib "big-draw.ss" "htdp") - (lib "draw-sig.ss" "htdp") - (lib "unit.ss")) + (require htdp/big-draw + htdp/draw-sig + mzlib/unit) (define-syntax (draw s) (syntax-case s (produce) diff --git a/collects/htdp/elevator.ss b/collects/htdp/elevator.ss index 336d93afeb..5d6b20d6d5 100644 --- a/collects/htdp/elevator.ss +++ b/collects/htdp/elevator.ss @@ -1,9 +1,9 @@ (module elevator mzscheme - (require (lib "big-draw.ss" "htdp") - (lib "error.ss" "htdp") + (require htdp/big-draw + htdp/error (lib "posn.ss" "lang") - (lib "etc.ss") - (lib "mred.ss" "mred") + mzlib/etc + mred (lib "prim.ss" "lang")) ;; Implementation: diff --git a/collects/htdp/error.ss b/collects/htdp/error.ss index 8ec79454e8..2bf03fc1e6 100644 --- a/collects/htdp/error.ss +++ b/collects/htdp/error.ss @@ -1,7 +1,7 @@ #lang mzscheme -(require (lib "etc.ss") - (lib "list.ss")) +(require mzlib/etc + mzlib/list) ;; -------------------------------------------------------------------------- (provide check-arg check-arity check-proc check-result check-list-list diff --git a/collects/htdp/graphing.ss b/collects/htdp/graphing.ss index 51dd430b0e..9bb3f722b6 100644 --- a/collects/htdp/graphing.ss +++ b/collects/htdp/graphing.ss @@ -1,8 +1,8 @@ (module graphing mzscheme - (require (lib "error.ss" "htdp") - (lib "unit.ss") - (lib "draw-sig.ss" "htdp") - (lib "big-draw.ss" "htdp") + (require htdp/error + mzlib/unit + htdp/draw-sig + htdp/big-draw (lib "posn.ss" "lang") (lib "prim.ss" "lang")) diff --git a/collects/htdp/guess-gui.ss b/collects/htdp/guess-gui.ss index c0af5448a4..b7a78d6575 100644 --- a/collects/htdp/guess-gui.ss +++ b/collects/htdp/guess-gui.ss @@ -1,9 +1,9 @@ #cs(module guess-gui mzscheme - (require (lib "error.ss" "htdp") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss") + (require htdp/error + mred + mzlib/class + mzlib/list + mzlib/etc (lib "prim.ss" "lang")) (provide diff --git a/collects/htdp/guess.ss b/collects/htdp/guess.ss index 6069b16f1d..c41b3647de 100644 --- a/collects/htdp/guess.ss +++ b/collects/htdp/guess.ss @@ -1,10 +1,10 @@ -#cs#cs(module guess mzscheme - (require (lib "error.ss" "htdp") - (lib "unitsig.ss") - (lib "etc.ss") - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred") +#cs(module guess mzscheme + (require htdp/error + mzlib/unitsig + mzlib/etc + mzlib/class + mzlib/list + mred (lib "prim.ss" "lang")) (provide diff --git a/collects/htdp/gui.ss b/collects/htdp/gui.ss index 10fa8178a9..91e08ed1fc 100644 --- a/collects/htdp/gui.ss +++ b/collects/htdp/gui.ss @@ -7,11 +7,11 @@ #cs (module gui mzscheme - (require (lib "error.ss" "htdp") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss") + (require htdp/error + mred + mzlib/class + mzlib/list + mzlib/etc (lib "prim.ss" "lang")) (provide-primitives diff --git a/collects/htdp/hangman-world-play.ss b/collects/htdp/hangman-world-play.ss index 3489e99a76..35921912dd 100644 --- a/collects/htdp/hangman-world-play.ss +++ b/collects/htdp/hangman-world-play.ss @@ -1,7 +1,7 @@ (module hangman-world-play mzscheme (require "hangman-world.ss" - (lib "world.ss" "htdp") - (lib "etc.ss")) + htdp/world + mzlib/etc) #| ------------------------------------------------------------------------ add-next-part : diff --git a/collects/htdp/hangman-world.ss b/collects/htdp/hangman-world.ss index ef61f8579c..9f433b3f1a 100644 --- a/collects/htdp/hangman-world.ss +++ b/collects/htdp/hangman-world.ss @@ -7,12 +7,12 @@ #cs (module hangman-world mzscheme - (require (lib "world.ss" "htdp") - (lib "error.ss" "htdp") + (require htdp/world + htdp/error (lib "prim.ss" "lang") - (lib "contract.ss") - (lib "etc.ss") - (lib "list.ss")) + mzlib/contract + mzlib/etc + mzlib/list) (define (letter? s) (and (symbol? s) (pair? (member s LETTERS)))) (define LETTERS '(a b c d e f g h i j k l m o p q r s t u v w x y z _)) diff --git a/collects/htdp/hangman.ss b/collects/htdp/hangman.ss index 28d660e117..ef59b9cfb3 100644 --- a/collects/htdp/hangman.ss +++ b/collects/htdp/hangman.ss @@ -2,11 +2,11 @@ (require "error.ss" "draw-sig.ss" "big-draw.ss" - (lib "class.ss") - (lib "unit.ss") - (lib "etc.ss") + mzlib/class + mzlib/unit + mzlib/etc (lib "prim.ss" "lang") - (lib "mred.ss" "mred")) + mred) (provide hangman diff --git a/collects/htdp/image.ss b/collects/htdp/image.ss index e359524035..a101404e91 100644 --- a/collects/htdp/image.ss +++ b/collects/htdp/image.ss @@ -7,10 +7,10 @@ plt/collects/tests/mzscheme/image-test.ss (module image mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") + (require mred + mzlib/class (lib "cache-image-snip.ss" "mrlib") - (lib "math.ss") + mzlib/math (lib "posn.ss" "lang") (lib "imageeq.ss" "lang" "private") "error.ss") diff --git a/collects/htdp/lkup-gui.ss b/collects/htdp/lkup-gui.ss index 020b006b04..5dc5292619 100644 --- a/collects/htdp/lkup-gui.ss +++ b/collects/htdp/lkup-gui.ss @@ -1,8 +1,8 @@ #cs(module lkup-gui mzscheme - (require (lib "error.ss" "htdp") - (lib "class.ss") + (require htdp/error + mzlib/class (lib "prim.ss" "lang") - (lib "mred.ss" "mred")) + mred) (provide control view connect) diff --git a/collects/htdp/master.ss b/collects/htdp/master.ss index 395b8b3cbc..a46f1c5b0e 100644 --- a/collects/htdp/master.ss +++ b/collects/htdp/master.ss @@ -2,11 +2,11 @@ (provide master) (require "error.ss" - (lib "class.ss") - (lib "class100.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/class100 + mred (lib "prim.ss" "lang") - (lib "etc.ss")) + mzlib/etc) (define-higher-order-primitive master master/proc (compare-guess)) diff --git a/collects/htdp/matrix-invisible.ss b/collects/htdp/matrix-invisible.ss index 74f1657635..ececf59eaa 100644 --- a/collects/htdp/matrix-invisible.ss +++ b/collects/htdp/matrix-invisible.ss @@ -1,8 +1,8 @@ #lang scheme -(require (lib "matrix-sig.ss" "htdp") - (lib "matrix-render-sig.ss" "htdp") - (lib "matrix-unit.ss" "htdp")) +(require htdp/matrix-sig + htdp/matrix-render-sig + htdp/matrix-unit) (define render@ (unit (import) diff --git a/collects/htdp/matrix-unit.ss b/collects/htdp/matrix-unit.ss index 200df2ec34..d20d813fde 100644 --- a/collects/htdp/matrix-unit.ss +++ b/collects/htdp/matrix-unit.ss @@ -1,13 +1,13 @@ #lang scheme/unit -(require (lib "matrix-sig.ss" "htdp") - (lib "matrix-render-sig.ss" "htdp") +(require htdp/matrix-sig + htdp/matrix-render-sig (lib "matrix-snip.ss" "mrlib") - (lib "error.ss" "htdp") + htdp/error (lib "posn.ss" "lang") - (lib "class.ss") - (lib "pconvert.ss") - (lib "pretty.ss")) + mzlib/class + mzlib/pconvert + mzlib/pretty) (import matrix-render^) (export matrix^) diff --git a/collects/htdp/matrix.ss b/collects/htdp/matrix.ss index 0391cb99d2..fd435fb93a 100644 --- a/collects/htdp/matrix.ss +++ b/collects/htdp/matrix.ss @@ -2,14 +2,14 @@ ;; 4. integrate with snips -(require (lib "matrix-sig.ss" "htdp") - (lib "matrix-render-sig.ss" "htdp") - (lib "matrix-unit.ss" "htdp") +(require htdp/matrix-sig + htdp/matrix-render-sig + htdp/matrix-unit (lib "matrix-snip.ss" "mrlib")) -(require (lib "class.ss") - (lib "string.ss") - (lib "mred.ss" "mred") +(require mzlib/class + mzlib/string + mred (lib "matrix-snip.ss" "mrlib")) ;; --------------------------------------------------------------------------- diff --git a/collects/htdp/servlet.ss b/collects/htdp/servlet.ss index 92abf71231..720b8aff45 100644 --- a/collects/htdp/servlet.ss +++ b/collects/htdp/servlet.ss @@ -1,10 +1,10 @@ ; Author: Paul Graunke #cs(module servlet mzscheme - (require (lib "servlet-env.ss" "web-server") - (lib "error.ss" "htdp") + (require web-server/servlet-env + htdp/error (lib "xml.ss" "xml") - (lib "etc.ss")) - (provide (all-from (lib "servlet-env.ss" "web-server")) + mzlib/etc) + (provide (all-from web-server/servlet-env) (rename wrapped-build-suspender build-suspender)) ; build-suspender : (listof html) (listof html) [(listof (cons sym str))] [(listof (cons sym str))] -> str -> response diff --git a/collects/htdp/servlet2.ss b/collects/htdp/servlet2.ss index 1b74f19bb7..c684180f2a 100644 --- a/collects/htdp/servlet2.ss +++ b/collects/htdp/servlet2.ss @@ -2,11 +2,11 @@ #| TODO ----------------------------------------------------------------------- buttons: multiple points of returns: continuation functions |# - (require (lib "servlet-env.ss" "web-server") - (lib "error.ss" "htdp") - (lib "list.ss") - (lib "etc.ss")) - (provide (all-from (lib "servlet-env.ss" "web-server")) + (require web-server/servlet-env + htdp/error + mzlib/list + mzlib/etc) + (provide (all-from web-server/servlet-env) single-query ; FormElement -> Answer diff --git a/collects/htdp/testing.ss b/collects/htdp/testing.ss index 9065540432..5e734fe90d 100644 --- a/collects/htdp/testing.ss +++ b/collects/htdp/testing.ss @@ -1,11 +1,11 @@ (module testing mzscheme (require (lib "teachprims.ss" "lang" "private") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "pretty.ss") - (lib "pconvert.ss") - (lib "class.ss")) + mred + framework + mzlib/pretty + mzlib/pconvert + mzlib/class) (require-for-syntax (lib "shared.ss" "stepper" "private")) diff --git a/collects/htdp/world.ss b/collects/htdp/world.ss index 29f218694f..d4b79ffe27 100644 --- a/collects/htdp/world.ss +++ b/collects/htdp/world.ss @@ -39,20 +39,20 @@ Matthew ;; Fri Dec 9 21:39:03 EST 2005: remoevd (update ... produce ...); added on-redraw ;; Thu Dec 1 17:03:03 EST 2005: fixed place-image; all coordinates okay now (module world mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "error.ss" "htdp") - (lib "image.ss" "htdp") - (only (lib "htdp-beginner.ss" "lang") image?) - (lib "cache-image-snip.ss" "mrlib") - (lib "prim.ss" "lang")) + (require mzlib/class + mzlib/etc + mred + htdp/error + htdp/image + (only lang/htdp-beginner image?) + mrlib/cache-image-snip + lang/prim) - (require (lib "gif.ss" "mrlib")) - (require (lib "runtime-path.ss")) + (require mrlib/gif) + (require mzlib/runtime-path) - (require (lib "bitmap-label.ss" "mrlib") - (lib "string-constant.ss" "string-constants")) + (require mrlib/bitmap-label + string-constants) ;; --- provide --------------------------------------------------------------- @@ -75,7 +75,7 @@ Matthew ;; image manipulation functions: ;; ============================= - (provide (all-from (lib "image.ss" "htdp"))) + (provide (all-from htdp/image)) (provide ;; Scene is Image with pinhole in origin diff --git a/collects/html/dtd.ss b/collects/html/dtd.ss index 1cf7e74103..5f0d587857 100644 --- a/collects/html/dtd.ss +++ b/collects/html/dtd.ss @@ -1,8 +1,8 @@ ; copyright by Paul Graunke June 2000 AD (module dtd mzscheme (require "dtd-ast.ss" "entity-expander.ss" - (lib "list.ss") - (lib "string.ss")) + mzlib/list + mzlib/string) (provide read-sgml-dtd summarize-dtd) diff --git a/collects/html/generate-code.ss b/collects/html/generate-code.ss index b1e4751b45..c02931687f 100644 --- a/collects/html/generate-code.ss +++ b/collects/html/generate-code.ss @@ -1,8 +1,8 @@ ; copyright by Paul Graunke June 2000 AD -(require (lib "pretty.ss") - (lib "date.ss") - (lib "list.ss") - (lib "etc.ss")) +(require mzlib/pretty + mzlib/date + mzlib/list + mzlib/etc) ; date-string : -> String (define (date-string) (date->string (seconds->date (current-seconds)) 'seconds-please)) diff --git a/collects/html/html-sig.ss b/collects/html/html-sig.ss index d1a4f2e8ed..d0b57a7e23 100644 --- a/collects/html/html-sig.ss +++ b/collects/html/html-sig.ss @@ -1,7 +1,7 @@ ;; copyright by Paul Graunke June 2000 AD (module html-sig mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (define-signature html-structs^ ((struct html-element (attributes)) (struct html-full (content)) (struct html ()) (struct div ()) (struct center ()) (struct blockquote ()) (struct ins ()) (struct del ()) (struct dd ()) (struct li ()) (struct th ()) (struct td ()) (struct iframe ()) (struct noframes ()) (struct noscript ()) (struct style ()) (struct script ()) (struct basefont ()) (struct br ()) (struct area ()) (struct link ()) (struct img ()) (struct param ()) (struct hr ()) (struct input ()) (struct col ()) (struct isindex ()) (struct base ()) (struct meta ()) (struct option ()) (struct textarea ()) (struct title ()) (struct head ()) (struct tr ()) (struct colgroup ()) (struct thead ()) (struct tfoot ()) (struct tbody ()) (struct tt ()) (struct i ()) (struct b ()) (struct u ()) (struct s ()) (struct strike ()) (struct big ()) (struct small ()) (struct em ()) (struct strong ()) (struct dfn ()) (struct code ()) (struct samp ()) (struct kbd ()) (struct var ()) (struct cite ()) (struct abbr ()) (struct acronym ()) (struct sub ()) (struct sup ()) (struct span ()) (struct bdo ()) (struct font ()) (struct p ()) (struct h1 ()) (struct h2 ()) (struct h3 ()) (struct h4 ()) (struct h5 ()) (struct h6 ()) (struct q ()) (struct dt ()) (struct legend ()) (struct caption ()) (struct table ()) (struct button ()) (struct fieldset ()) (struct optgroup ()) (struct select ()) (struct label ()) (struct form ()) (struct ol ()) (struct ul ()) (struct dir ()) (struct menu ()) (struct dl ()) (struct pre ()) (struct object ()) (struct applet ()) (struct -map ()) (struct a ()) (struct address ()) (struct body ()))) diff --git a/collects/html/html-unit.ss b/collects/html/html-unit.ss index bb14136536..7ff3333ad2 100644 --- a/collects/html/html-unit.ss +++ b/collects/html/html-unit.ss @@ -1,11 +1,11 @@ ;; copyright by Paul Graunke June 2000 AD (module html-unit mzscheme - (require (lib "unitsig.ss") - (lib "file.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "include.ss") + (require mzlib/unitsig + mzlib/file + mzlib/list + mzlib/etc + mzlib/include "html-sig.ss" "sgml-reader-sig.ss" (lib "xml-sig.ss" "xml")) diff --git a/collects/html/html.ss b/collects/html/html.ss index 82a5461c60..1802205d59 100644 --- a/collects/html/html.ss +++ b/collects/html/html.ss @@ -1,7 +1,7 @@ ;; copyright by Paul Graunke June 2000 AD (module html mzscheme - (require (lib "unitsig.ss") + (require mzlib/unitsig "html-sig.ss" "html-unit.ss" "sgml-reader-sig.ss" diff --git a/collects/html/sgml-reader-sig.ss b/collects/html/sgml-reader-sig.ss index 2628518cd8..9ac150c2ac 100644 --- a/collects/html/sgml-reader-sig.ss +++ b/collects/html/sgml-reader-sig.ss @@ -1,7 +1,7 @@ ;; copyright by Paul Graunke June 2000 AD (module sgml-reader-sig mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (define-signature sgml-reader^ (read-comments trim-whitespace gen-may-contain gen-read-sgml)) diff --git a/collects/html/sgml-reader-unit.ss b/collects/html/sgml-reader-unit.ss index 25e4ebfc6d..0ad98fa64c 100644 --- a/collects/html/sgml-reader-unit.ss +++ b/collects/html/sgml-reader-unit.ss @@ -3,9 +3,9 @@ ;; It needs to be abstracted back in. (module sgml-reader-unit mzscheme - (require (lib "unitsig.ss") - (lib "list.ss") - (lib "string.ss") + (require mzlib/unitsig + mzlib/list + mzlib/string "sgml-reader-sig.ss" (lib "sig.ss" "xml" "private")) diff --git a/collects/lang/debugger-language-interface.ss b/collects/lang/debugger-language-interface.ss index e3d9776fbb..9485bd687b 100644 --- a/collects/lang/debugger-language-interface.ss +++ b/collects/lang/debugger-language-interface.ss @@ -1,6 +1,6 @@ (module debugger-language-interface mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide debugger-language<%>) (define debugger-language<%> diff --git a/collects/lang/error.ss b/collects/lang/error.ss index f5f2cb9117..63a9ab265b 100644 --- a/collects/lang/error.ss +++ b/collects/lang/error.ss @@ -1,5 +1,5 @@ (module error mzscheme - (require (lib "etc.ss") (lib "list.ss")) + (require mzlib/etc mzlib/list) ;; -------------------------------------------------------------------------- (provide check-arg diff --git a/collects/lang/htdp-langs.ss b/collects/lang/htdp-langs.ss index f10e0d0ca3..8370fc58c6 100644 --- a/collects/lang/htdp-langs.ss +++ b/collects/lang/htdp-langs.ss @@ -7,27 +7,27 @@ |# (module htdp-langs mzscheme - (require (lib "string-constant.ss" "string-constants") - (lib "framework.ss" "framework") + (require string-constants + framework (prefix et: (lib "stacktrace.ss" "errortrace")) (prefix tr: (lib "stacktrace.ss" "trace")) - (lib "pretty.ss") - (prefix pc: (lib "pconvert.ss")) - (lib "file.ss") - (lib "unit.ss") - (lib "class.ss") - (lib "list.ss") - (lib "struct.ss") - (lib "compile.ss") - (lib "struct.ss") + mzlib/pretty + (prefix pc: mzlib/pconvert) + mzlib/file + mzlib/unit + mzlib/class + mzlib/list + mzlib/struct + mzlib/compile + mzlib/struct (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") + mred (lib "bday.ss" "framework" "private") - (lib "moddep.ss" "syntax") + syntax/moddep (lib "cache-image-snip.ss" "mrlib") - (lib "embed.ss" "compiler") + compiler/embed (lib "wxme.ss" "wxme") - (lib "dirs.ss" "setup") + setup/dirs ;; this module is shared between the drscheme's namespace (so loaded here) ;; and the user's namespace in the teaching languages diff --git a/collects/lang/htdp-reader.ss b/collects/lang/htdp-reader.ss index 0c844810a3..eca905f09f 100644 --- a/collects/lang/htdp-reader.ss +++ b/collects/lang/htdp-reader.ss @@ -1,5 +1,5 @@ (module htdp-reader mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (provide make-read-syntax make-read) diff --git a/collects/lang/info.ss b/collects/lang/info.ss index e585065856..b57188de00 100644 --- a/collects/lang/info.ss +++ b/collects/lang/info.ss @@ -1,6 +1,6 @@ #lang setup/infotab -(require string-constants/string-constant) +(require string-constants) (define name "HtDP Languages") (define tools (list "htdp-langs.ss")) diff --git a/collects/lang/plt-mred.ss b/collects/lang/plt-mred.ss index 29fd48f2c8..1658d637e0 100644 --- a/collects/lang/plt-mred.ss +++ b/collects/lang/plt-mred.ss @@ -1,6 +1,6 @@ (module plt-mred mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (define argv (current-command-line-arguments)) (define program (find-system-path 'exec-file)) @@ -8,5 +8,5 @@ (provide argv program (all-from mzscheme) - (all-from (lib "class.ss")) - (all-from (lib "mred.ss" "mred")))) + (all-from mzlib/class) + (all-from mred))) diff --git a/collects/lang/plt-pretty-big-text.ss b/collects/lang/plt-pretty-big-text.ss index 7bc1a7a976..0057d8c5fb 100644 --- a/collects/lang/plt-pretty-big-text.ss +++ b/collects/lang/plt-pretty-big-text.ss @@ -1,32 +1,32 @@ (module plt-pretty-big-text mzscheme - (require (lib "etc.ss") - (lib "file.ss") - (lib "list.ss") - (lib "class.ss") - (lib "unit.ss") - (lib "include.ss") - (lib "defmacro.ss") - (lib "pretty.ss") - (lib "string.ss") - (lib "thread.ss") - (lib "math.ss") - (lib "match.ss") - (lib "shared.ss") + (require mzlib/etc + mzlib/file + mzlib/list + mzlib/class + mzlib/unit + mzlib/include + mzlib/defmacro + mzlib/pretty + mzlib/string + mzlib/thread + mzlib/math + mzlib/match + mzlib/shared "posn.ss") (provide (all-from mzscheme) - (all-from (lib "etc.ss")) - (all-from (lib "file.ss")) - (all-from (lib "list.ss")) - (all-from (lib "class.ss")) - (all-from (lib "unit.ss")) - (all-from (lib "include.ss")) - (all-from (lib "defmacro.ss")) - (all-from (lib "pretty.ss")) - (all-from (lib "string.ss")) - (all-from (lib "thread.ss")) - (all-from (lib "math.ss")) - (all-from (lib "match.ss")) - (all-from (lib "shared.ss")) + (all-from mzlib/etc) + (all-from mzlib/file) + (all-from mzlib/list) + (all-from mzlib/class) + (all-from mzlib/unit) + (all-from mzlib/include) + (all-from mzlib/defmacro) + (all-from mzlib/pretty) + (all-from mzlib/string) + (all-from mzlib/thread) + (all-from mzlib/math) + (all-from mzlib/match) + (all-from mzlib/shared) (all-from "posn.ss"))) diff --git a/collects/lang/plt-pretty-big.ss b/collects/lang/plt-pretty-big.ss index 2add0e679c..2191491c7a 100644 --- a/collects/lang/plt-pretty-big.ss +++ b/collects/lang/plt-pretty-big.ss @@ -1,9 +1,9 @@ (module plt-pretty-big "plt-pretty-big-text.ss" - (require (lib "mred.ss" "mred") + (require mred "private/imageeq.ss") (provide (all-from "plt-pretty-big-text.ss") - (all-from (lib "mred.ss" "mred")) + (all-from mred) (all-from "private/imageeq.ss"))) diff --git a/collects/lang/private/beginner-funs.ss b/collects/lang/private/beginner-funs.ss index 762de76abd..0a527d0de6 100644 --- a/collects/lang/private/beginner-funs.ss +++ b/collects/lang/private/beginner-funs.ss @@ -1,9 +1,6 @@ (module beginner-funs mzscheme - (require (lib "etc.ss") - (lib "list.ss") - (lib "math.ss") - (lib "docprovide.ss" "syntax")) + (require mzlib/etc mzlib/list mzlib/math syntax/docprovide) ;; Implements the procedures: (require "teachprims.ss" diff --git a/collects/lang/private/contracts/advanced-contracts.ss b/collects/lang/private/contracts/advanced-contracts.ss index e1c02921cd..0c6a9d1665 100644 --- a/collects/lang/private/contracts/advanced-contracts.ss +++ b/collects/lang/private/contracts/advanced-contracts.ss @@ -1,6 +1,6 @@ (module advanced-contracts mzscheme (require "contracts-helpers.ss") - (require (lib "list.ss")) + (require mzlib/list) (provide void-contract) diff --git a/collects/lang/private/contracts/beginner-contracts.ss b/collects/lang/private/contracts/beginner-contracts.ss index 24be9e5225..abd50a5c9b 100644 --- a/collects/lang/private/contracts/beginner-contracts.ss +++ b/collects/lang/private/contracts/beginner-contracts.ss @@ -3,7 +3,7 @@ (require "contracts-helpers.ss" (lib "posn.ss" "lang") (lib "teach.ss" "lang" "private") - (lib "list.ss")) + mzlib/list) (provide (all-defined)) diff --git a/collects/lang/private/contracts/contracts-helpers.ss b/collects/lang/private/contracts/contracts-helpers.ss index 9561a58adc..ac15211eca 100644 --- a/collects/lang/private/contracts/contracts-helpers.ss +++ b/collects/lang/private/contracts/contracts-helpers.ss @@ -1,7 +1,7 @@ (module contracts-helpers mzscheme (require "hilighters.ss") - (require (lib "etc.ss")) + (require mzlib/etc) (provide (all-defined)) diff --git a/collects/lang/private/contracts/contracts-module-begin.ss b/collects/lang/private/contracts/contracts-module-begin.ss index d04486d7bf..980532cb40 100644 --- a/collects/lang/private/contracts/contracts-module-begin.ss +++ b/collects/lang/private/contracts/contracts-module-begin.ss @@ -2,8 +2,8 @@ (require "contracts.ss") - (require-for-syntax (lib "list.ss") - (lib "boundmap.ss" "syntax")) + (require-for-syntax mzlib/list + syntax/boundmap) (provide beginner-module-begin intermediate-module-begin advanced-module-begin) diff --git a/collects/lang/private/contracts/intermediate-contracts.ss b/collects/lang/private/contracts/intermediate-contracts.ss index c8f5305d60..1dab4ed242 100644 --- a/collects/lang/private/contracts/intermediate-contracts.ss +++ b/collects/lang/private/contracts/intermediate-contracts.ss @@ -2,9 +2,9 @@ (require "hilighters.ss" "contracts-helpers.ss" - (lib "etc.ss")) + mzlib/etc) - (require (lib "list.ss")) + (require mzlib/list) (provide vector-contract listof-contract diff --git a/collects/lang/private/imageeq.ss b/collects/lang/private/imageeq.ss index 2410ec55b2..984998864c 100644 --- a/collects/lang/private/imageeq.ss +++ b/collects/lang/private/imageeq.ss @@ -1,7 +1,7 @@ (module imageeq mzscheme - (require (lib "mred.ss" "mred") + (require mred (lib "cache-image-snip.ss" "mrlib") - (lib "class.ss")) + mzlib/class) (provide image? image=? coerce-to-cache-image-snip diff --git a/collects/lang/private/teach.ss b/collects/lang/private/teach.ss index 6959f808c7..383868fc5f 100644 --- a/collects/lang/private/teach.ss +++ b/collects/lang/private/teach.ss @@ -34,17 +34,17 @@ ;; error. (module teach mzscheme - (require (lib "etc.ss") - (lib "list.ss") - (lib "math.ss") + (require mzlib/etc + mzlib/list + mzlib/math "set-result.ss") (require-for-syntax "teachhelp.ss" "teach-shared.ss" - (lib "kerncase.ss" "syntax") - (lib "stx.ss" "syntax") - (lib "struct.ss" "syntax") - (lib "context.ss" "syntax") - (lib "include.ss") + syntax/kerncase + syntax/stx + syntax/struct + syntax/context + mzlib/include (lib "shared.ss" "stepper" "private")) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/lang/private/teachprims.ss b/collects/lang/private/teachprims.ss index a825228f09..47d2de4b3c 100644 --- a/collects/lang/private/teachprims.ss +++ b/collects/lang/private/teachprims.ss @@ -11,8 +11,8 @@ namespace. (module teachprims mzscheme (require "../imageeq.ss" - (lib "list.ss") - (lib "etc.ss")) + mzlib/list + mzlib/etc) (define-syntax (define-teach stx) (syntax-case stx () diff --git a/collects/lang/stepper-language-interface.ss b/collects/lang/stepper-language-interface.ss index 85b2c63ded..be5ee49348 100644 --- a/collects/lang/stepper-language-interface.ss +++ b/collects/lang/stepper-language-interface.ss @@ -1,6 +1,6 @@ (module stepper-language-interface mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide stepper-language<%>) (define stepper-language<%> diff --git a/collects/launcher/launcher-unit.ss b/collects/launcher/launcher-unit.ss index b0c361ce74..dc760acc9a 100644 --- a/collects/launcher/launcher-unit.ss +++ b/collects/launcher/launcher-unit.ss @@ -4,8 +4,8 @@ (require scheme/path scheme/file - (lib "embed.ss" "compiler") - (lib "dirs.ss" "setup") + compiler/embed + setup/dirs (lib "variant.ss" "setup") "launcher-sig.ss" diff --git a/collects/launcher/launcher.ss b/collects/launcher/launcher.ss index fa8c066426..d680aef150 100644 --- a/collects/launcher/launcher.ss +++ b/collects/launcher/launcher.ss @@ -1,6 +1,6 @@ (module launcher mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "launcher-sig.ss" "launcher-unit.ss") diff --git a/collects/lazy/info.ss b/collects/lazy/info.ss index 00fe75c481..751bde785e 100644 --- a/collects/lazy/info.ss +++ b/collects/lazy/info.ss @@ -1,6 +1,6 @@ #lang setup/infotab -(require string-constants/string-constant) +(require string-constants) (define name "Lazy Scheme") (define scribblings '(("lazy.scrbl"))) (define drscheme-language-modules '(("lazy.ss" "lazy"))) diff --git a/collects/lazy/lazy.ss b/collects/lazy/lazy.ss index 9b106c2c79..2e0e1b3019 100644 --- a/collects/lazy/lazy.ss +++ b/collects/lazy/lazy.ss @@ -563,7 +563,7 @@ r)) ;; -------------------------------------------------------------------------- - ;; (lib "list.ss") functionality + ;; mzlib/list functionality (define* (rest x) (~cdr x)) (define* (first x) (~car x)) @@ -578,7 +578,7 @@ (define* empty null) (define* (empty? x) (null? (! x))) - (require (rename (lib "list.ss") !last-pair last-pair)) + (require (rename mzlib/list !last-pair last-pair)) (define* (last-pair list) (!last-pair (!list list))) (define (do-remove name item list =) @@ -641,15 +641,15 @@ (if (! (!*app pred x)) (cons x xs) xs))] [else (error 'filter "not a proper list: ~e" list)])))) - (require (rename (lib "list.ss") !sort sort)) + (require (rename mzlib/list !sort sort)) (define* (sort list less?) (let ([less? (! less?)]) (!sort (!list list) (lambda (x y) (! (!*app less? x y)))))) ;; -------------------------------------------------------------------------- - ;; (lib "etc.ss") functionality + ;; mzlib/etc functionality - (require (only (lib "etc.ss") boolean=? symbol=?)) + (require (only mzlib/etc boolean=? symbol=?)) (define* true #t) (define* false #f) diff --git a/collects/macro-debugger/syntax-browser/syntax-snip.ss b/collects/macro-debugger/syntax-browser/syntax-snip.ss index 69e700df34..dcc59c2ae7 100644 --- a/collects/macro-debugger/syntax-browser/syntax-snip.ss +++ b/collects/macro-debugger/syntax-browser/syntax-snip.ss @@ -1,11 +1,11 @@ (module syntax-snip mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "match.ss") - (lib "list.ss") - (lib "string.ss") + (require mzlib/class + mred + framework + mzlib/match + mzlib/list + mzlib/string "interfaces.ss" "display.ss" "controller.ss" diff --git a/collects/macro-debugger/syntax-browser/widget.ss b/collects/macro-debugger/syntax-browser/widget.ss index 990706530b..0ea7d7697c 100644 --- a/collects/macro-debugger/syntax-browser/widget.ss +++ b/collects/macro-debugger/syntax-browser/widget.ss @@ -1,7 +1,7 @@ #lang mzscheme (require scheme/class - mred/mred + mred framework/framework scheme/list scheme/match diff --git a/collects/macro-debugger/tool.ss b/collects/macro-debugger/tool.ss index 543273929d..d8a60ee17a 100644 --- a/collects/macro-debugger/tool.ss +++ b/collects/macro-debugger/tool.ss @@ -8,7 +8,7 @@ framework/framework drscheme/tool mrlib/bitmap-label - string-constants/string-constant + string-constants "model/trace.ss" "model/deriv.ss" "model/deriv-util.ss" diff --git a/collects/macro-debugger/view/browse-deriv.ss b/collects/macro-debugger/view/browse-deriv.ss index 776b59e9c9..5b272565c7 100644 --- a/collects/macro-debugger/view/browse-deriv.ss +++ b/collects/macro-debugger/view/browse-deriv.ss @@ -1,10 +1,10 @@ (module browse-deriv mzscheme - (require (lib "class.ss") - (lib "plt-match.ss") - (lib "unit.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + (require mzlib/class + mzlib/plt-match + mzlib/unit + mred + framework (lib "hierlist.ss" "hierlist")) (require "../model/deriv.ss") (provide (all-defined)) diff --git a/collects/macro-debugger/view/show-deriv.ss b/collects/macro-debugger/view/show-deriv.ss index f6c2326195..23e5754568 100644 --- a/collects/macro-debugger/view/show-deriv.ss +++ b/collects/macro-debugger/view/show-deriv.ss @@ -1,11 +1,11 @@ (module deriv-show mzscheme - (require (lib "mrpict.ss" "texpict") - (lib "utils.ss" "texpict") - (lib "match.ss") - (lib "pretty.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + (require texpict/mrpict + texpict/utils + mzlib/match + mzlib/pretty + mzlib/class + mred) (require "../model/deriv.ss") (define code-size 12) diff --git a/collects/macro-debugger/view/warning.ss b/collects/macro-debugger/view/warning.ss index 86a125ed7b..19bd030e83 100644 --- a/collects/macro-debugger/view/warning.ss +++ b/collects/macro-debugger/view/warning.ss @@ -1,8 +1,8 @@ (module warning mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework")) + (require mzlib/class + mred + framework) (provide warnings% stepper-warnings%) diff --git a/collects/make/collection-sig.ss b/collects/make/collection-sig.ss index c2ccb48ac3..05e96cf805 100644 --- a/collects/make/collection-sig.ss +++ b/collects/make/collection-sig.ss @@ -1,6 +1,6 @@ (module collection-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide make:collection^) diff --git a/collects/make/collection-unit.ss b/collects/make/collection-unit.ss index dbe72ce128..9828889215 100644 --- a/collects/make/collection-unit.ss +++ b/collects/make/collection-unit.ss @@ -1,14 +1,14 @@ (module collection-unit mzscheme - (require (lib "unit.ss") - (lib "list.ss") - (lib "file.ss")) + (require mzlib/unit + mzlib/list + mzlib/file) (require "collection-sig.ss") (require "make-sig.ss") - (require (lib "sig.ss" "compiler") - (lib "file-sig.ss" "dynext")) + (require compiler/sig + dynext/file-sig) (provide make:collection@) diff --git a/collects/make/collection.ss b/collects/make/collection.ss index 3c0fbb7957..5716940a56 100644 --- a/collects/make/collection.ss +++ b/collects/make/collection.ss @@ -1,12 +1,12 @@ (module collection mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) - (require (lib "file-sig.ss" "dynext") - (lib "file.ss" "dynext") - (lib "sig.ss" "compiler") - (lib "compiler.ss" "compiler") - (lib "option.ss" "compiler")) + (require dynext/file-sig + dynext/file + compiler/sig + compiler/compiler + compiler/option) (require "make-sig.ss" "make.ss" diff --git a/collects/make/make.ss b/collects/make/make.ss index 194dc60213..d832388d1a 100644 --- a/collects/make/make.ss +++ b/collects/make/make.ss @@ -1,6 +1,6 @@ (module make mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "make-sig.ss" "make-unit.ss") diff --git a/collects/make/setup-extension.ss b/collects/make/setup-extension.ss index a915666119..2c51563776 100644 --- a/collects/make/setup-extension.ss +++ b/collects/make/setup-extension.ss @@ -1,15 +1,15 @@ (module setup-extension mzscheme - (require (lib "make.ss" "make") - (lib "link.ss" "dynext") - (lib "compile.ss" "dynext") - (lib "file.ss" "dynext") - (lib "file.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "launcher.ss" "launcher") - (lib "xform.ss" "compiler") - (lib "dirs.ss" "setup")) + (require make + dynext/link + dynext/compile + dynext/file + mzlib/file + mzlib/list + mzlib/etc + launcher + compiler/xform + setup/dirs) (provide pre-install with-new-flags) diff --git a/collects/mred/edit-main.ss b/collects/mred/edit-main.ss index 2abb1f22e6..c9280aae2b 100644 --- a/collects/mred/edit-main.ss +++ b/collects/mred/edit-main.ss @@ -3,7 +3,7 @@ (module edit-main mzscheme (require "edit.ss" - (lib "cmdline.ss")) + mzlib/cmdline) (command-line "Edit" diff --git a/collects/mred/edit.ss b/collects/mred/edit.ss index 01ad9763df..334798e588 100644 --- a/collects/mred/edit.ss +++ b/collects/mred/edit.ss @@ -3,9 +3,9 @@ ;; and new-pasteboard-frame (module edit mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss")) + (require mzlib/class + mred + mzlib/etc) (provide new-text-frame new-pasteboard-frame diff --git a/collects/mred/lang/main.ss b/collects/mred/lang/main.ss index cb188c8115..e59173cc42 100644 --- a/collects/mred/lang/main.ss +++ b/collects/mred/lang/main.ss @@ -1,6 +1,6 @@ (module main mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mred) (provide (all-from mzscheme) - (all-from (lib "class.ss")) - (all-from (lib "mred.ss" "mred")))) + (all-from mzlib/class) + (all-from mred))) diff --git a/collects/mred/mred-unit.ss b/collects/mred/mred-unit.ss index b5d8217d5f..bb689e2103 100644 --- a/collects/mred/mred-unit.ss +++ b/collects/mred/mred-unit.ss @@ -1,5 +1,5 @@ (module mred-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit "mred-sig.ss" "mred.ss") (provide standard-mred@) diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss index 9f9bbeebe6..35514947fc 100644 --- a/collects/mred/mred.ss +++ b/collects/mred/mred.ss @@ -4,7 +4,7 @@ namespace-anchor->empty-namespace make-base-empty-namespace) scheme/class - (lib "etc.ss") + mzlib/etc (prefix wx: "private/kernel.ss") "private/wxtop.ss" "private/app.ss" @@ -47,7 +47,7 @@ (define (make-gui-empty-namespace) (let ([ns (make-base-empty-namespace)]) (namespace-attach-module (namespace-anchor->empty-namespace anchor) - 'mred/mred + 'mred ns) ns)) @@ -55,7 +55,7 @@ (let ([ns (make-gui-empty-namespace)]) (parameterize ([current-namespace ns]) (namespace-require 'scheme/base) - (namespace-require 'mred/mred) + (namespace-require 'mred) (namespace-require 'scheme/class)) ns)) diff --git a/collects/mred/private/afm.ss b/collects/mred/private/afm.ss index 48a1b84fb6..47a1eaaba8 100644 --- a/collects/mred/private/afm.ss +++ b/collects/mred/private/afm.ss @@ -1,6 +1,6 @@ (module afm mzscheme - (require (lib "file.ss") - (lib "list.ss")) + (require mzlib/file + mzlib/list) (provide (protect afm-draw-text afm-get-text-extent diff --git a/collects/mred/private/app.ss b/collects/mred/private/app.ss index 74e6e7df05..ac3eaaa063 100644 --- a/collects/mred/private/app.ss +++ b/collects/mred/private/app.ss @@ -1,5 +1,5 @@ (module app mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/check.ss b/collects/mred/private/check.ss index 67771b7b74..9872d3550e 100644 --- a/collects/mred/private/check.ss +++ b/collects/mred/private/check.ss @@ -1,5 +1,5 @@ (module check mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "wx.ss" "const.ss") diff --git a/collects/mred/private/const.ss b/collects/mred/private/const.ss index d19fee2138..7964d97a33 100644 --- a/collects/mred/private/const.ss +++ b/collects/mred/private/const.ss @@ -1,6 +1,6 @@ (module const mzscheme - (require (lib "class.ss") - (lib "file.ss") + (require mzlib/class + mzlib/file (prefix wx: "kernel.ss")) (provide (protect (all-defined))) diff --git a/collects/mred/private/editor.ss b/collects/mred/private/editor.ss index 0812ed8710..0689ab7810 100644 --- a/collects/mred/private/editor.ss +++ b/collects/mred/private/editor.ss @@ -1,9 +1,9 @@ (module editor mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "file.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/list + mzlib/file (prefix wx: "kernel.ss") "seqcontract.ss" "lock.ss" diff --git a/collects/mred/private/filedialog.ss b/collects/mred/private/filedialog.ss index 25a4efc12b..8b2e422968 100644 --- a/collects/mred/private/filedialog.ss +++ b/collects/mred/private/filedialog.ss @@ -1,7 +1,7 @@ (module filedialog mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "wx.ss" diff --git a/collects/mred/private/fontdialog.ss b/collects/mred/private/fontdialog.ss index 15d46aa292..2b600d87aa 100644 --- a/collects/mred/private/fontdialog.ss +++ b/collects/mred/private/fontdialog.ss @@ -1,7 +1,7 @@ (module fontdialog mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "wx.ss" diff --git a/collects/mred/private/gdi.ss b/collects/mred/private/gdi.ss index e254651939..be4426a36e 100644 --- a/collects/mred/private/gdi.ss +++ b/collects/mred/private/gdi.ss @@ -1,7 +1,7 @@ (module gdi mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "check.ss" diff --git a/collects/mred/private/helper.ss b/collects/mred/private/helper.ss index b938d13892..8f7ad66548 100644 --- a/collects/mred/private/helper.ss +++ b/collects/mred/private/helper.ss @@ -1,5 +1,5 @@ (module helper mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "lock.ss") diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss index c6807f4d7d..3c47597209 100644 --- a/collects/mred/private/kernel.ss +++ b/collects/mred/private/kernel.ss @@ -3,7 +3,7 @@ ;; kernel.ss is generated by a target in /mred/wxs/Makefile. (module kernel mzscheme - (require (all-except (lib "class.ss") object%)) + (require (all-except mzlib/class object%)) ;; Pull pieces out of #%mred-kernel dynamically, so that ;; the library compiles with setup-plt in mzscheme. diff --git a/collects/mred/private/kw.ss b/collects/mred/private/kw.ss index e0831d241d..17b7e27a38 100644 --- a/collects/mred/private/kw.ss +++ b/collects/mred/private/kw.ss @@ -1,5 +1,5 @@ (module kw mzscheme - (require (lib "class100.ss")) + (require mzlib/class100) (provide (protect define-keywords class100*/kw)) diff --git a/collects/mred/private/messagebox.ss b/collects/mred/private/messagebox.ss index 4b08a7cab6..21c871440a 100644 --- a/collects/mred/private/messagebox.ss +++ b/collects/mred/private/messagebox.ss @@ -1,8 +1,8 @@ (module messagebox mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "string.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/string (prefix wx: "kernel.ss") "const.ss" "check.ss" diff --git a/collects/mred/private/misc.ss b/collects/mred/private/misc.ss index f1d959c778..62f71937ac 100644 --- a/collects/mred/private/misc.ss +++ b/collects/mred/private/misc.ss @@ -1,7 +1,7 @@ (module misc mzscheme - (require (lib "class.ss") - (lib "file.ss") - (lib "process.ss") + (require mzlib/class + mzlib/file + mzlib/process (prefix wx: "kernel.ss")) (provide file-creator-and-type diff --git a/collects/mred/private/moredialogs.ss b/collects/mred/private/moredialogs.ss index 9603828994..1dc8b881e5 100644 --- a/collects/mred/private/moredialogs.ss +++ b/collects/mred/private/moredialogs.ss @@ -1,7 +1,7 @@ (module moredialogs mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrcanvas.ss b/collects/mred/private/mrcanvas.ss index b7ca060547..0d339c66f2 100644 --- a/collects/mred/private/mrcanvas.ss +++ b/collects/mred/private/mrcanvas.ss @@ -1,7 +1,7 @@ (module mrcanvas mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrcontainer.ss b/collects/mred/private/mrcontainer.ss index 21f38ce65e..44d584c29e 100644 --- a/collects/mred/private/mrcontainer.ss +++ b/collects/mred/private/mrcontainer.ss @@ -1,7 +1,7 @@ (module mrcontainer mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/mrgroupbox.ss b/collects/mred/private/mrgroupbox.ss index f556dc0a4c..622ac0577c 100644 --- a/collects/mred/private/mrgroupbox.ss +++ b/collects/mred/private/mrgroupbox.ss @@ -1,6 +1,6 @@ (module mrgroupbox mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mritem.ss b/collects/mred/private/mritem.ss index 3e05e328ea..b2f5f3f240 100644 --- a/collects/mred/private/mritem.ss +++ b/collects/mred/private/mritem.ss @@ -1,7 +1,7 @@ (module mritem mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrmenu.ss b/collects/mred/private/mrmenu.ss index bf531e122b..4b079b4852 100644 --- a/collects/mred/private/mrmenu.ss +++ b/collects/mred/private/mrmenu.ss @@ -1,7 +1,7 @@ (module mrmenu mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrmenuintf.ss b/collects/mred/private/mrmenuintf.ss index e4c4d4003c..4dc17d5cc1 100644 --- a/collects/mred/private/mrmenuintf.ss +++ b/collects/mred/private/mrmenuintf.ss @@ -1,5 +1,5 @@ (module mrmenuintf mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide menu-item<%> labelled-menu-item<%> diff --git a/collects/mred/private/mrpanel.ss b/collects/mred/private/mrpanel.ss index f557e882f5..0de38cead1 100644 --- a/collects/mred/private/mrpanel.ss +++ b/collects/mred/private/mrpanel.ss @@ -1,6 +1,6 @@ (module mrpanel mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrpopup.ss b/collects/mred/private/mrpopup.ss index dfa3d2ffbf..b9b7f77e28 100644 --- a/collects/mred/private/mrpopup.ss +++ b/collects/mred/private/mrpopup.ss @@ -1,7 +1,7 @@ (module mrpopup mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrtabgroup.ss b/collects/mred/private/mrtabgroup.ss index 2483e1418b..692ac4d6a4 100644 --- a/collects/mred/private/mrtabgroup.ss +++ b/collects/mred/private/mrtabgroup.ss @@ -1,6 +1,6 @@ (module mrtabgroup mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrtextfield.ss b/collects/mred/private/mrtextfield.ss index 56c500dc33..179b9b460b 100644 --- a/collects/mred/private/mrtextfield.ss +++ b/collects/mred/private/mrtextfield.ss @@ -1,7 +1,7 @@ (module mrtextfield mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/mrtop.ss b/collects/mred/private/mrtop.ss index 9b3fe5c61c..ef591530fb 100644 --- a/collects/mred/private/mrtop.ss +++ b/collects/mred/private/mrtop.ss @@ -1,8 +1,8 @@ (module mrtop mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/mrwindow.ss b/collects/mred/private/mrwindow.ss index 63b466d957..6572640e30 100644 --- a/collects/mred/private/mrwindow.ss +++ b/collects/mred/private/mrwindow.ss @@ -1,6 +1,6 @@ (module mrwindow mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/path-dialog.ss b/collects/mred/private/path-dialog.ss index 4c5d5957fb..9b7c73e567 100644 --- a/collects/mred/private/path-dialog.ss +++ b/collects/mred/private/path-dialog.ss @@ -1,5 +1,5 @@ (module path-dialog mzscheme - (require (lib "class.ss") (lib "list.ss") (lib "string.ss") (lib "file.ss") + (require mzlib/class mzlib/list mzlib/string mzlib/file (prefix wx: "kernel.ss") "helper.ss" "mrtop.ss" "mritem.ss" "mrpanel.ss" "mrtextfield.ss" "messagebox.ss" "mrmenu.ss") diff --git a/collects/mred/private/repl.ss b/collects/mred/private/repl.ss index 96aaea9ebd..d01f8bab0f 100644 --- a/collects/mred/private/repl.ss +++ b/collects/mred/private/repl.ss @@ -1,6 +1,6 @@ (module repl mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "editor.ss" "app.ss" diff --git a/collects/mred/private/seqcontract.ss b/collects/mred/private/seqcontract.ss index 7dde1ab506..c16fd39c57 100644 --- a/collects/mred/private/seqcontract.ss +++ b/collects/mred/private/seqcontract.ss @@ -1,9 +1,9 @@ (module seqcontract mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide (protect es-contract-mixin lock-contract-mixin)) - (require-for-syntax (lib "stx.ss" "syntax") - (lib "boundmap.ss" "syntax")) + (require-for-syntax syntax/stx + syntax/boundmap) (define-syntax (sequence-contract-mixin stx) (syntax-case stx (state-machine) diff --git a/collects/mred/private/snipfile.ss b/collects/mred/private/snipfile.ss index d5558d139c..95399bb96e 100644 --- a/collects/mred/private/snipfile.ss +++ b/collects/mred/private/snipfile.ss @@ -1,8 +1,8 @@ (module snipfile mzscheme - (require (lib "class.ss") - (lib "etc.ss") - (lib "port.ss") - (lib "moddep.ss" "syntax") + (require mzlib/class + mzlib/etc + mzlib/port + syntax/moddep (prefix wx: "kernel.ss") "check.ss" "editor.ss") diff --git a/collects/mred/private/wx.ss b/collects/mred/private/wx.ss index dda7ef3fd3..992d201f0b 100644 --- a/collects/mred/private/wx.ss +++ b/collects/mred/private/wx.ss @@ -1,6 +1,6 @@ (module wx mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss") diff --git a/collects/mred/private/wxcanvas.ss b/collects/mred/private/wxcanvas.ss index 16e549bc24..67889f1357 100644 --- a/collects/mred/private/wxcanvas.ss +++ b/collects/mred/private/wxcanvas.ss @@ -1,6 +1,6 @@ (module wxcanvas mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxcontainer.ss b/collects/mred/private/wxcontainer.ss index bb823a26ea..29efe525bb 100644 --- a/collects/mred/private/wxcontainer.ss +++ b/collects/mred/private/wxcontainer.ss @@ -1,7 +1,7 @@ (module wxcontainer mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxgroupbox.ss b/collects/mred/private/wxgroupbox.ss index 2162754bd1..b6b8863a94 100644 --- a/collects/mred/private/wxgroupbox.ss +++ b/collects/mred/private/wxgroupbox.ss @@ -1,5 +1,5 @@ (module wxgroupbox mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "lock.ss" "wx.ss" diff --git a/collects/mred/private/wxitem.ss b/collects/mred/private/wxitem.ss index afa41d91cf..fe6497cb95 100644 --- a/collects/mred/private/wxitem.ss +++ b/collects/mred/private/wxitem.ss @@ -1,8 +1,8 @@ (module wxitem mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "file.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/file (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxmenu.ss b/collects/mred/private/wxmenu.ss index 975a53149f..91c34e9a9f 100644 --- a/collects/mred/private/wxmenu.ss +++ b/collects/mred/private/wxmenu.ss @@ -1,7 +1,7 @@ (module wxmenu mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/wxpanel.ss b/collects/mred/private/wxpanel.ss index 5b4349ca6f..2eaa512baa 100644 --- a/collects/mred/private/wxpanel.ss +++ b/collects/mred/private/wxpanel.ss @@ -1,7 +1,7 @@ (module wxpanel mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/wxtabgroup.ss b/collects/mred/private/wxtabgroup.ss index 93c3d6463f..3eaea0737d 100644 --- a/collects/mred/private/wxtabgroup.ss +++ b/collects/mred/private/wxtabgroup.ss @@ -1,5 +1,5 @@ (module wxtabgroup mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix wx: "kernel.ss") "lock.ss" "wx.ss" diff --git a/collects/mred/private/wxtextfield.ss b/collects/mred/private/wxtextfield.ss index 3f5af68ac6..6bce6bfa97 100644 --- a/collects/mred/private/wxtextfield.ss +++ b/collects/mred/private/wxtextfield.ss @@ -1,6 +1,6 @@ (module wxtextfield mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "const.ss" diff --git a/collects/mred/private/wxtop.ss b/collects/mred/private/wxtop.ss index 2427d11f7b..c0a2c54aeb 100644 --- a/collects/mred/private/wxtop.ss +++ b/collects/mred/private/wxtop.ss @@ -1,8 +1,8 @@ (module wxtop mzscheme - (require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss") - (lib "list.ss") + (require mzlib/class + mzlib/class100 + mzlib/etc + mzlib/list (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/private/wxwindow.ss b/collects/mred/private/wxwindow.ss index 88e5ed75ab..a05e0c471e 100644 --- a/collects/mred/private/wxwindow.ss +++ b/collects/mred/private/wxwindow.ss @@ -1,6 +1,6 @@ (module wxwindow mzscheme - (require (lib "class.ss") - (lib "class100.ss") + (require mzlib/class + mzlib/class100 (prefix wx: "kernel.ss") "lock.ss" "helper.ss" diff --git a/collects/mred/script-installer.ss b/collects/mred/script-installer.ss index b038cb23c4..f684b176da 100644 --- a/collects/mred/script-installer.ss +++ b/collects/mred/script-installer.ss @@ -2,7 +2,7 @@ ;; under OS X (module script-installer mzscheme (provide post-installer) - (require (lib "launcher.ss" "launcher")) + (require launcher) (define post-installer (lambda (path) diff --git a/collects/mrflow/assoc-set-hash.ss b/collects/mrflow/assoc-set-hash.ss index ea7d4b0898..47305d0e37 100644 --- a/collects/mrflow/assoc-set-hash.ss +++ b/collects/mrflow/assoc-set-hash.ss @@ -10,7 +10,7 @@ (module assoc-set-hash (lib "mrflow.ss" "mrflow") (require - (lib "etc.ss") ; for opt-lambda + mzlib/etc ; for opt-lambda "assoc-set-exn.ss" ; no prefix so we can re-provide (prefix cst: "constants.ss") ) diff --git a/collects/mrflow/assoc-set-list.ss b/collects/mrflow/assoc-set-list.ss index f71c5b510a..0e0efe4929 100644 --- a/collects/mrflow/assoc-set-list.ss +++ b/collects/mrflow/assoc-set-list.ss @@ -12,8 +12,8 @@ (module assoc-set-list (lib "mrflow.ss" "mrflow") (require - (lib "list.ss") ; for foldr - (lib "etc.ss") ; for opt-lambda + mzlib/list ; for foldr + mzlib/etc ; for opt-lambda "assoc-set-exn.ss" ; no prefix so we can re-provide ) diff --git a/collects/mrflow/constraints-gen-and-prop.ss b/collects/mrflow/constraints-gen-and-prop.ss index ef05ebe9a8..0361f216e1 100644 --- a/collects/mrflow/constraints-gen-and-prop.ss +++ b/collects/mrflow/constraints-gen-and-prop.ss @@ -4,11 +4,11 @@ ; (define-type edge (label label label -> boolean)) (module constraints-gen-and-prop (lib "mrflow.ss" "mrflow") - (require (prefix kern: (lib "kerncase.ss" "syntax")) - (prefix list: (lib "list.ss")) - (prefix etc: (lib "etc.ss")) + (require (prefix kern: syntax/kerncase) + (prefix list: mzlib/list) + (prefix etc: mzlib/etc) - (lib "match.ss") + mzlib/match "labels.ss" "types.ss" @@ -4649,7 +4649,7 @@ ;(printf "H: ~a~nP: ~a~n~n" type foo) pretty-string)) - ; (require (prefix string: (lib "string.ss"))) + ; (require (prefix string: mzlib/string)) ; (define (ppp-type type delta-flow) ; (cond ; [(type-empty? type) "_"] diff --git a/collects/mrflow/dfa.ss b/collects/mrflow/dfa.ss index 85481e56d1..73e8d9ca09 100644 --- a/collects/mrflow/dfa.ss +++ b/collects/mrflow/dfa.ss @@ -1,8 +1,8 @@ (module dfa (lib "mrflow.ss" "mrflow") - (require (lib "match.ss") - (lib "pretty.ss") - (lib "etc.ss") - (prefix list: (lib "list.ss")) + (require mzlib/match + mzlib/pretty + mzlib/etc + (prefix list: mzlib/list) (prefix cst: "constants.ss") "set-hash.ss" @@ -10,7 +10,7 @@ "util.ss" "env.ss" - (lib "class.ss")) + mzlib/class) (provide (struct dfa (stnum->state)) diff --git a/collects/mrflow/gui.ss b/collects/mrflow/gui.ss index 7304f136a5..499b9562cf 100644 --- a/collects/mrflow/gui.ss +++ b/collects/mrflow/gui.ss @@ -3,12 +3,12 @@ (require (lib "tool.ss" "drscheme") - (lib "unit.ss") - (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (prefix fw: (lib "framework.ss" "framework")) - (prefix strcst: (lib "string-constant.ss" "string-constants")) + mzlib/unit + mzlib/list + mzlib/class + mred + (prefix fw: framework) + (prefix strcst: string-constants) (prefix bit: (lib "bitmap-label.ss" "mrlib")) (prefix cst: "constants.ss") diff --git a/collects/mrflow/hashcons.ss b/collects/mrflow/hashcons.ss index 56e3991e90..d2257a3273 100644 --- a/collects/mrflow/hashcons.ss +++ b/collects/mrflow/hashcons.ss @@ -1,9 +1,9 @@ (module hashcons (lib "mrflow.ss" "mrflow") - (require (prefix list: (lib "list.ss")) - (lib "match.ss") - (lib "pretty.ss") - (lib "etc.ss") - (prefix string: (lib "string.ss")) + (require (prefix list: mzlib/list) + mzlib/match + mzlib/pretty + mzlib/etc + (prefix string: mzlib/string) (prefix cst: "constants.ss") "dfa.ss" diff --git a/collects/mrflow/mrflow.ss b/collects/mrflow/mrflow.ss index 4a9658b01e..27433c3a5a 100644 --- a/collects/mrflow/mrflow.ss +++ b/collects/mrflow/mrflow.ss @@ -1,13 +1,13 @@ (module mrflow mzscheme - (require (lib "pretty.ss") - (lib "contract.ss") - (lib "mred.ss" "mred")) + (require mzlib/pretty + mzlib/contract + mred) (provide (all-from mzscheme) ;(all-from-except mzscheme vector-ref) ;(rename dbg-vector-ref vector-ref) - (all-from-except (lib "contract.ss") provide/contract define/contract) + (all-from-except mzlib/contract provide/contract define/contract) ; one or the other provide/contract define/contract ;(rename dbg-provide/contract provide/contract)(rename dbg-define-contract define/contract) diff --git a/collects/mrflow/set-hash.ss b/collects/mrflow/set-hash.ss index b0cff6d25b..499e4bc12b 100644 --- a/collects/mrflow/set-hash.ss +++ b/collects/mrflow/set-hash.ss @@ -10,7 +10,7 @@ (module set-hash (lib "mrflow.ss" "mrflow") (require - (lib "etc.ss") ; for opt-lambda + mzlib/etc ; for opt-lambda "set-exn.ss" ; no prefix so we can re-provide ) diff --git a/collects/mrflow/set-list.ss b/collects/mrflow/set-list.ss index 20ed1f22b6..2d21cf0294 100644 --- a/collects/mrflow/set-list.ss +++ b/collects/mrflow/set-list.ss @@ -12,8 +12,8 @@ (module set-list (lib "mrflow.ss" "mrflow") (require - (lib "list.ss") ; for foldr - (lib "etc.ss") ; for opt-lambda + mzlib/list ; for foldr + mzlib/etc ; for opt-lambda "set-exn.ss" ; no prefix so we can re-provide ) diff --git a/collects/mrflow/snips-and-arrows-model.ss b/collects/mrflow/snips-and-arrows-model.ss index 9e8732d0f9..ad3064c61d 100644 --- a/collects/mrflow/snips-and-arrows-model.ss +++ b/collects/mrflow/snips-and-arrows-model.ss @@ -14,7 +14,7 @@ (module snips-and-arrows-model (lib "mrflow.ss" "mrflow") (require - (prefix lst: (lib "list.ss")) + (prefix lst: mzlib/list) (prefix cst: "constants.ss") ;"set-list.ss" diff --git a/collects/mrflow/snips-and-arrows-view.ss b/collects/mrflow/snips-and-arrows-view.ss index 5e6e6d12f9..93248a9060 100644 --- a/collects/mrflow/snips-and-arrows-view.ss +++ b/collects/mrflow/snips-and-arrows-view.ss @@ -1,11 +1,11 @@ (module snips-and-arrows-view (lib "mrflow.ss" "mrflow") (require - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/class + mred (prefix arrow: (lib "arrow.ss" "drscheme")) - (only (lib "list.ss") sort) - (prefix strcst: (lib "string-constant.ss" "string-constants")) + (only mzlib/list sort) + (prefix strcst: string-constants) (prefix cst: "constants.ss") (prefix saam: "snips-and-arrows-model.ss") diff --git a/collects/mrflow/snips-and-arrows.ss b/collects/mrflow/snips-and-arrows.ss index 47e905e999..23c4c3f78c 100644 --- a/collects/mrflow/snips-and-arrows.ss +++ b/collects/mrflow/snips-and-arrows.ss @@ -2,10 +2,10 @@ (module snips-and-arrows (lib "mrflow.ss" "mrflow") (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (prefix strcst: (lib "string-constant.ss" "string-constants")) + mzlib/etc + mzlib/class + mred + (prefix strcst: string-constants) (prefix cst: "constants.ss") (prefix saav: "snips-and-arrows-view.ss") diff --git a/collects/mrflow/trie.ss b/collects/mrflow/trie.ss index ed9573c098..8f15c2787b 100644 --- a/collects/mrflow/trie.ss +++ b/collects/mrflow/trie.ss @@ -1,6 +1,6 @@ (module trie (lib "mrflow.ss" "mrflow") - (require (prefix list: (lib "list.ss")) + (require (prefix list: mzlib/list) (prefix cst: "constants.ss") "dfa.ss" diff --git a/collects/mrflow/types.ss b/collects/mrflow/types.ss index 5f4e191d91..fe718e1484 100644 --- a/collects/mrflow/types.ss +++ b/collects/mrflow/types.ss @@ -40,8 +40,8 @@ ;; Printing ;; - (require (lib "match.ss") - (prefix string: (lib "string.ss")) + (require mzlib/match + (prefix string: mzlib/string) "util.ss" "labels.ss") diff --git a/collects/mrflow/util.ss b/collects/mrflow/util.ss index 7f76a2458e..cb7a4c5415 100644 --- a/collects/mrflow/util.ss +++ b/collects/mrflow/util.ss @@ -1,8 +1,8 @@ (module util (lib "mrflow.ss" "mrflow") - (require (prefix list: (lib "list.ss")) - (lib "pretty.ss") - (lib "class.ss") + (require (prefix list: mzlib/list) + mzlib/pretty + mzlib/class (prefix cst: "constants.ss")) (provide (all-defined)) diff --git a/collects/mrlib/bitmap-label.ss b/collects/mrlib/bitmap-label.ss index 5e23180d31..1d6a988de2 100644 --- a/collects/mrlib/bitmap-label.ss +++ b/collects/mrlib/bitmap-label.ss @@ -1,8 +1,8 @@ (module bitmap-label mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "contract.ss")) + (require mred + mzlib/class + mzlib/etc + mzlib/contract) (provide/contract [make-bitmap-label (opt-> diff --git a/collects/mrlib/cache-image-snip.ss b/collects/mrlib/cache-image-snip.ss index 19e9bbb6d5..683505bae2 100644 --- a/collects/mrlib/cache-image-snip.ss +++ b/collects/mrlib/cache-image-snip.ss @@ -1,9 +1,9 @@ (module cache-image-snip mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "string.ss") - (lib "contract.ss") - (lib "list.ss")) + (require mred + mzlib/class + mzlib/string + mzlib/contract + mzlib/list) (provide cache-image-snip% cache-image-snip-class% diff --git a/collects/mrlib/click-forwarding-editor.ss b/collects/mrlib/click-forwarding-editor.ss index eaedaa8783..5e9afe5064 100644 --- a/collects/mrlib/click-forwarding-editor.ss +++ b/collects/mrlib/click-forwarding-editor.ss @@ -1,10 +1,10 @@ (module click-forwarding-editor mzscheme (require - (lib "class.ss") - (lib "contract.ss") - (lib "etc.ss") - (lib "mred.ss" "mred")) + mzlib/class + mzlib/contract + mzlib/etc + mred) (provide/contract (click-forwarding-editor-mixin mixin-contract)) diff --git a/collects/mrlib/gif.ss b/collects/mrlib/gif.ss index 19bad3e77a..6a05e77d2c 100644 --- a/collects/mrlib/gif.ss +++ b/collects/mrlib/gif.ss @@ -1,12 +1,12 @@ (module gif mzscheme - (require (lib "class.ss") - (lib "file.ss") - (lib "mred.ss" "mred") - (lib "gifwrite.ss" "net") - (lib "contract.ss") - (lib "kw.ss") - (lib "etc.ss")) + (require mzlib/class + mzlib/file + mred + net/gifwrite + mzlib/contract + mzlib/kw + mzlib/etc) (provide write-gif write-animated-gif) diff --git a/collects/mrlib/graph.ss b/collects/mrlib/graph.ss index dd1013b68f..2ed73337c4 100644 --- a/collects/mrlib/graph.ss +++ b/collects/mrlib/graph.ss @@ -1,10 +1,10 @@ (module graph mzscheme - (require (lib "class.ss") - (lib "list.ss") - (lib "math.ss") - (lib "mred.ss" "mred") - (lib "contract.ss")) + (require mzlib/class + mzlib/list + mzlib/math + mred + mzlib/contract) (provide graph-snip<%> graph-snip-mixin diff --git a/collects/mrlib/include-bitmap.ss b/collects/mrlib/include-bitmap.ss index 3fb2ea4b77..c4f23ac96d 100644 --- a/collects/mrlib/include-bitmap.ss +++ b/collects/mrlib/include-bitmap.ss @@ -1,10 +1,10 @@ (module include-bitmap mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "file.ss") + (require mred + mzlib/class + mzlib/file (lib "main-collects.ss" "setup")) - (require-for-syntax (lib "path-spec.ss" "syntax") - (lib "cm-accomplice.ss") + (require-for-syntax syntax/path-spec + mzlib/cm-accomplice (lib "main-collects.ss" "setup")) (provide include-bitmap diff --git a/collects/mrlib/interactive-value-port.ss b/collects/mrlib/interactive-value-port.ss index 9c76fedc9a..bb8eb9501c 100644 --- a/collects/mrlib/interactive-value-port.ss +++ b/collects/mrlib/interactive-value-port.ss @@ -1,8 +1,8 @@ (module interactive-value-port mzscheme - (require (lib "pretty.ss") - (lib "mred.ss" "mred") - (lib "class.ss") + (require mzlib/pretty + mred + mzlib/class "syntax-browser.ss") (provide set-interactive-display-handler set-interactive-write-handler diff --git a/collects/mrlib/matrix-snip.ss b/collects/mrlib/matrix-snip.ss index 310a7d083a..d42762145a 100644 --- a/collects/mrlib/matrix-snip.ss +++ b/collects/mrlib/matrix-snip.ss @@ -1,7 +1,7 @@ #lang scheme -(require (lib "class.ss") - (lib "string.ss") +(require mzlib/class + mzlib/string (lib "cache-image-snip.ss" "mrlib")) (provide visible-matrix% diff --git a/collects/mrlib/plot.ss b/collects/mrlib/plot.ss index 379c6c4268..ad3a192851 100644 --- a/collects/mrlib/plot.ss +++ b/collects/mrlib/plot.ss @@ -1,7 +1,7 @@ (module plot mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "contract.ss")) + (require mred + mzlib/class + mzlib/contract) (define-struct data-set (points connected? pen min-x max-x min-y max-y)) diff --git a/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss b/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss index e813d4f31a..f043cef906 100644 --- a/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss +++ b/collects/mrlib/private/aligned-pasteboard/aligned-editor-container.ss @@ -1,10 +1,10 @@ (module aligned-editor-container mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list "snip-lib.ss" "interface.ss" "constants.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/alignment.ss b/collects/mrlib/private/aligned-pasteboard/alignment.ss index 3861ea5ed9..1e5b78f5fc 100644 --- a/collects/mrlib/private/aligned-pasteboard/alignment.ss +++ b/collects/mrlib/private/aligned-pasteboard/alignment.ss @@ -23,10 +23,10 @@ neck and it is the most readable solution. (module alignment mzscheme (require - (lib "match.ss") - (lib "contract.ss") - (lib "etc.ss") - (lib "list.ss")) + mzlib/match + mzlib/contract + mzlib/etc + mzlib/list) (define-struct rect (x y)) (define-struct abs-rect (ondim offdim)) diff --git a/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss index f27ab4daba..37b74e60b5 100644 --- a/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss +++ b/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.ss @@ -1,12 +1,12 @@ (module geometry-managed-pasteboard mzscheme (require - (lib "class.ss") - (lib "contract.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "match.ss") - (lib "mred.ss" "mred") + mzlib/class + mzlib/contract + mzlib/list + mzlib/etc + mzlib/match + mred "aligned-editor-container.ss" "interface.ss" "alignment.ss" diff --git a/collects/mrlib/private/aligned-pasteboard/interface.ss b/collects/mrlib/private/aligned-pasteboard/interface.ss index c783ad351d..b4de7aea9e 100644 --- a/collects/mrlib/private/aligned-pasteboard/interface.ss +++ b/collects/mrlib/private/aligned-pasteboard/interface.ss @@ -1,8 +1,8 @@ (module interface mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (provide aligned-pasteboard<%> diff --git a/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss index 365aa7340d..3d10d682e6 100644 --- a/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss +++ b/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss @@ -5,10 +5,10 @@ (module locked-pasteboard mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "contract.ss")) + mzlib/class + mred + mzlib/etc + mzlib/contract) (provide/contract (locked-pasteboard-mixin mixin-contract)) diff --git a/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss b/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss index 0083779483..50d1ddfcb9 100644 --- a/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.ss @@ -1,10 +1,10 @@ (module pasteboard-lib mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "contract.ss") - (lib "etc.ss") + mzlib/class + mred + mzlib/contract + mzlib/etc "interface.ss" "snip-lib.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/snip-lib.ss b/collects/mrlib/private/aligned-pasteboard/snip-lib.ss index 266a0a6304..2a5fd19c9d 100644 --- a/collects/mrlib/private/aligned-pasteboard/snip-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/snip-lib.ss @@ -1,11 +1,11 @@ (module snip-lib mzscheme (require - (lib "class.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "contract.ss") + mzlib/class + mzlib/etc + mred + mzlib/list + mzlib/contract "interface.ss") ;; a snip diff --git a/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss b/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss index 06bfccf1f5..2e609383db 100644 --- a/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss +++ b/collects/mrlib/private/aligned-pasteboard/stretchable-editor-snip.ss @@ -5,9 +5,9 @@ stretchable-editor-snip-mixin) (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "snip-lib.ss" "interface.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/actual-bigger.ss b/collects/mrlib/private/aligned-pasteboard/tests/actual-bigger.ss index 8c53b228b5..e18c72b122 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/actual-bigger.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/actual-bigger.ss @@ -1,8 +1,8 @@ (require - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mzlib/list + mred + mzlib/etc "../aligned-editor-container.ss" "../aligned-pasteboard.ss" "../snip-lib.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/debug.ss b/collects/mrlib/private/aligned-pasteboard/tests/debug.ss index d13734ea9f..192327a12e 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/debug.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/debug.ss @@ -1,6 +1,6 @@ (module debug mzscheme (require - (lib "class.ss")) + mzlib/class) (provide debug-snip diff --git a/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss b/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss index 84ac771cdd..9541d965d5 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/example-min.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "../aligned-pasteboard.ss" "../aligned-editor-container.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/example.ss b/collects/mrlib/private/aligned-pasteboard/tests/example.ss index d9fe843e5d..9bff981638 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/example.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/example.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "../aligned-pasteboard.ss" "../aligned-editor-container.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss b/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss index a30f7b9c3c..93af93eb1f 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/more-tests.ss @@ -1,9 +1,9 @@ ;; some more advanced aligned-pasteboard tests take from the test-case-boxes (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "../aligned-editor-container.ss" "../aligned-pasteboard.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/snip-dumper.ss b/collects/mrlib/private/aligned-pasteboard/tests/snip-dumper.ss index 8fdd8f68e4..00d3b40bce 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/snip-dumper.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/snip-dumper.ss @@ -1,8 +1,8 @@ (module snip-dumper mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (provide dump-children diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss index bd68233e65..d08e056b82 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test-alignment.ss @@ -1,7 +1,7 @@ (require - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/etc + mzlib/list + mzlib/match "../alignment.ss" "test-macro.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss index ef99509f1e..ce54b64af0 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.ss @@ -1,8 +1,8 @@ (require - (lib "etc.ss") - (lib "class.ss") + mzlib/etc + mzlib/class "test-macro.ss" - (lib "mred.ss" "mred") + mred "../pasteboard-lib.ss" "../aligned-pasteboard.ss" "../aligned-editor-container.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss index 0eb51b2ca8..1d1e7944d9 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test-snip-lib.ss @@ -1,7 +1,7 @@ (require - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/etc + mzlib/class + mred "../snip-lib.ss" "../aligned-pasteboard.ss" "../aligned-editor-container.ss" diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test.ss b/collects/mrlib/private/aligned-pasteboard/tests/test.ss index 168701cfa8..43cb2c61fd 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test.ss @@ -1,8 +1,8 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list "../aligned-pasteboard.ss" "../aligned-editor-container.ss" "snip-dumper.ss") diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test2.ss b/collects/mrlib/private/aligned-pasteboard/tests/test2.ss index 6d81df05b0..10151a474a 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test2.ss +++ b/collects/mrlib/private/aligned-pasteboard/tests/test2.ss @@ -1,8 +1,8 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list "../aligned-pasteboard.ss" "../aligned-editor-container.ss" "snip-dumper.ss") diff --git a/collects/mrlib/syntax-browser.ss b/collects/mrlib/syntax-browser.ss index 7f6bdf9325..6cfc5f2fc8 100644 --- a/collects/mrlib/syntax-browser.ss +++ b/collects/mrlib/syntax-browser.ss @@ -7,12 +7,12 @@ needed to really make this work: |# (module syntax-browser scheme/base - (require (lib "pretty.ss") - (lib "list.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "match.ss") - (lib "string.ss") + (require mzlib/pretty + mzlib/list + mzlib/class + mred + mzlib/match + mzlib/string "include-bitmap.ss") (define orig-output-port (current-output-port)) diff --git a/collects/mrlib/tab-choice.ss b/collects/mrlib/tab-choice.ss index 3c90bd48fa..32ed376147 100644 --- a/collects/mrlib/tab-choice.ss +++ b/collects/mrlib/tab-choice.ss @@ -5,9 +5,9 @@ ;; -- The copy in framework should be removed -- (module tab-choice mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "list.ss")) + (require mzlib/class + mred + mzlib/list) (provide auto-tab-panel% single<%> single-mixin) diff --git a/collects/mrlib/text-string-style-desc.ss b/collects/mrlib/text-string-style-desc.ss index a1929ef62c..d8c1afe5ca 100644 --- a/collects/mrlib/text-string-style-desc.ss +++ b/collects/mrlib/text-string-style-desc.ss @@ -1,8 +1,8 @@ (module text-string-style-desc mzscheme (provide get-string/style-desc) - (require (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "class.ss")) + (require mred + mzlib/etc + mzlib/class) ;; get-string/style-desc : text -> (listof str/ann) (define get-string/style-desc diff --git a/collects/mysterx/doc.txt b/collects/mysterx/doc.txt index a745659f7f..a51c69f0fc 100644 --- a/collects/mysterx/doc.txt +++ b/collects/mysterx/doc.txt @@ -37,8 +37,8 @@ _MysterX_ setup program (as an executable) in your distribution: (module setup mzscheme - (require (lib "runtime-path.ss") - (lib "process.ss")) + (require mzlib/runtime-path + mzlib/process) ;; Ensure that DLLs are included with the distibution: (define-runtime-path myspage-dll '(so "myspage")) @@ -71,7 +71,7 @@ _MysterX_ Because some MysterX code relies on the PLT Scheme class system, you will likely need to run - (require (lib "class.ss")) + (require mzlib/class) Using the xml collection ------------------------ diff --git a/collects/mysterx/installer.ss b/collects/mysterx/installer.ss index dc8dca8354..e1b816d4ff 100644 --- a/collects/mysterx/installer.ss +++ b/collects/mysterx/installer.ss @@ -1,6 +1,6 @@ (module installer mzscheme - (require (lib "process.ss") - (lib "dirs.ss" "setup")) + (require mzlib/process + setup/dirs) (provide post-installer) (define (post-installer plt-home) (define (make-dll-path . more) diff --git a/collects/mysterx/mxdemo.ss b/collects/mysterx/mxdemo.ss index a462bd23de..b25d0811c6 100644 --- a/collects/mysterx/mxdemo.ss +++ b/collects/mysterx/mxdemo.ss @@ -7,11 +7,11 @@ (module mxdemo mzscheme - (require (lib "class.ss")) - (require (lib "mysterx.ss" "mysterx")) + (require mzlib/class) + (require mysterx) - (require (lib "runtime-path.ss") - (lib "process.ss")) + (require mzlib/runtime-path + mzlib/process) ;; Ensure that DLLs are included with the distibution: (define-runtime-path myspage-dll '(so "myspage")) diff --git a/collects/mysterx/mysterx.ss b/collects/mysterx/mysterx.ss index bfa373df46..4403486daa 100644 --- a/collects/mysterx/mysterx.ss +++ b/collects/mysterx/mysterx.ss @@ -12,12 +12,12 @@ ; mzlib - (require (prefix mzlib: (lib "list.ss"))) - (require (lib "string.ss")) - (require (lib "class.ss")) - (require (lib "url.ss" "net")) - (require (lib "etc.ss")) - (require (lib "thread.ss")) + (require (prefix mzlib: mzlib/list)) + (require mzlib/string) + (require mzlib/class) + (require net/url) + (require mzlib/etc) + (require mzlib/thread) ; exports diff --git a/collects/mysterx/private/filter.ss b/collects/mysterx/private/filter.ss index ee5b5408cb..6adb56c8b1 100644 --- a/collects/mysterx/private/filter.ss +++ b/collects/mysterx/private/filter.ss @@ -1,7 +1,7 @@ ;;; filter.ss (module filter mzscheme - (require (lib "string.ss")) + (require mzlib/string) (require "properties.ss") (require "util.ss") diff --git a/collects/mysterx/private/properties.ss b/collects/mysterx/private/properties.ss index 6b5dfcd6d1..d67e931518 100644 --- a/collects/mysterx/private/properties.ss +++ b/collects/mysterx/private/properties.ss @@ -1,7 +1,7 @@ ;; properties.ss (module properties mzscheme - (require (lib "list.ss")) + (require mzlib/list) (provide *css-units* diff --git a/collects/mysterx/private/style.ss b/collects/mysterx/private/style.ss index ca2c0db6aa..d4a3e9bb95 100644 --- a/collects/mysterx/private/style.ss +++ b/collects/mysterx/private/style.ss @@ -1,7 +1,7 @@ ;;; style.ss (module style mzscheme - (require (lib "string.ss")) + (require mzlib/string) (require "util.ss") (require "properties.ss") diff --git a/collects/mysterx/private/util.ss b/collects/mysterx/private/util.ss index 6cc2b3d97f..cf8f316f8d 100644 --- a/collects/mysterx/private/util.ss +++ b/collects/mysterx/private/util.ss @@ -1,8 +1,8 @@ ;;; util.ss -- utility procedures for MysterX (module util mzscheme - (require (lib "unitsig.ss")) - (require (lib "list.ss")) + (require mzlib/unitsig) + (require mzlib/list) (provide fold-strings-with-spaces diff --git a/collects/mzcom/installer.ss b/collects/mzcom/installer.ss index 7cba51ebbb..95f8477bab 100644 --- a/collects/mzcom/installer.ss +++ b/collects/mzcom/installer.ss @@ -1,6 +1,6 @@ (module installer mzscheme - (require (lib "process.ss") - (lib "dirs.ss" "setup")) + (require mzlib/process + setup/dirs) (provide post-installer) (define (post-installer plt-home) (let ([exe "MzCOM.exe"]) diff --git a/collects/mzlib/a-unit.ss b/collects/mzlib/a-unit.ss index c44610f168..3e00402cfc 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 0c6bfa57c0..77456231f5 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/class100.ss b/collects/mzlib/class100.ss index 76b51abb62..937d871c51 100644 --- a/collects/mzlib/class100.ss +++ b/collects/mzlib/class100.ss @@ -2,7 +2,7 @@ (module class100 mzscheme (require "class.ss") - (require-for-syntax (lib "stx.ss" "syntax")) + (require-for-syntax syntax/stx) (define-syntax super-init (make-rename-transformer #'super-make-object)) diff --git a/collects/mzlib/cm.ss b/collects/mzlib/cm.ss index 64df0367ed..7c13201eb9 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 d85ab51368..9097021bd3 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/compile.ss b/collects/mzlib/compile.ss index a8b1ef1d5f..45e24bab81 100644 --- a/collects/mzlib/compile.ss +++ b/collects/mzlib/compile.ss @@ -4,7 +4,7 @@ "port.ss") (provide compile-file) - ;; (require (lib "src2src.ss" "compiler")) + ;; (require compiler/src2src) (define compile-file (case-lambda diff --git a/collects/mzlib/defmacro.ss b/collects/mzlib/defmacro.ss index 39beab0bad..f0e750985f 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 d35966249b..dc74cee026 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 03812f0829..d11fef01fe 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 d760b43bf6..d86dee9d00 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 d2a74be24d..ac7bcce4fd 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 2dcb72dd1a..0da06bd03b 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 1c2585c6b4..1594229cd1 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 2660dc6a3a..dc2a9acbd5 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 cf40900fe1..bb6b362447 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/dmhelp.ss b/collects/mzlib/private/dmhelp.ss index b72b55a72b..c0e0b89230 100644 --- a/collects/mzlib/private/dmhelp.ss +++ b/collects/mzlib/private/dmhelp.ss @@ -1,6 +1,6 @@ (module dmhelp mzscheme - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (provide dm-syntax->datum dm-subst) diff --git a/collects/mzlib/private/match/coupling-and-binding.scm b/collects/mzlib/private/match/coupling-and-binding.scm index 7fb1c9f687..48df1d6da1 100644 --- a/collects/mzlib/private/match/coupling-and-binding.scm +++ b/collects/mzlib/private/match/coupling-and-binding.scm @@ -6,8 +6,8 @@ (require "test-structure.scm" "match-helper.ss" - (lib "pretty.ss") - (lib "list.ss")) + mzlib/pretty + mzlib/list) (require-for-template mzscheme) @@ -179,7 +179,7 @@ let-bound ;; initial-let bindings )))) ;; fail-func - (require (lib "trace.ss")) + (require mzlib/trace) ;(trace meta-couple) ;(trace couple-tests) ) \ No newline at end of file diff --git a/collects/mzlib/private/match/ddk-handlers.ss b/collects/mzlib/private/match/ddk-handlers.ss index aee79706f7..41945eb3dd 100644 --- a/collects/mzlib/private/match/ddk-handlers.ss +++ b/collects/mzlib/private/match/ddk-handlers.ss @@ -7,9 +7,9 @@ "coupling-and-binding.scm" "render-helpers.ss" "render-sigs.ss" - (lib "stx.ss" "syntax") - (lib "unit.ss") - (lib "trace.ss")) + syntax/stx + mzlib/unit + mzlib/trace) (require-for-template mzscheme "test-no-order.ss") diff --git a/collects/mzlib/private/match/define-struct.scm b/collects/mzlib/private/match/define-struct.scm index cf62a45f43..55c7adfbe3 100644 --- a/collects/mzlib/private/match/define-struct.scm +++ b/collects/mzlib/private/match/define-struct.scm @@ -92,7 +92,7 @@ #| (require struct) -(require (lib "pretty.ss")) +(require mzlib/pretty) (print-struct #t) (define-syntax go diff --git a/collects/mzlib/private/match/gen-match.ss b/collects/mzlib/private/match/gen-match.ss index a1ec48e096..a12b1a04e9 100644 --- a/collects/mzlib/private/match/gen-match.ss +++ b/collects/mzlib/private/match/gen-match.ss @@ -2,8 +2,8 @@ (provide gen-match) - (require (lib "etc.ss") - (lib "stx.ss" "syntax") + (require mzlib/etc + syntax/stx "match-helper.ss" "match-error.ss" "coupling-and-binding.scm" @@ -17,7 +17,7 @@ "convert-pat.ss") (require-for-template mzscheme - (lib "etc.ss") + mzlib/etc "match-error.ss") ;; mark-patlist : listof[x] -> listof[(cons x #f)] diff --git a/collects/mzlib/private/match/getbindings.ss b/collects/mzlib/private/match/getbindings.ss index 0d996998ca..334015a2cf 100644 --- a/collects/mzlib/private/match/getbindings.ss +++ b/collects/mzlib/private/match/getbindings.ss @@ -5,7 +5,7 @@ "update-binding-counts.scm" "render-helpers.ss" "render-sigs.ss" - (lib "unit.ss")) + mzlib/unit) (require-for-template mzscheme) diff --git a/collects/mzlib/private/match/getter-setter.scm b/collects/mzlib/private/match/getter-setter.scm index dd884143dd..591730b5fd 100644 --- a/collects/mzlib/private/match/getter-setter.scm +++ b/collects/mzlib/private/match/getter-setter.scm @@ -5,7 +5,7 @@ (require "coupling-and-binding.scm" "match-helper.ss" "match-error.ss" - (lib "stx.ss" "syntax")) + syntax/stx) (require-for-template mzscheme "match-error.ss") diff --git a/collects/mzlib/private/match/match-error.ss b/collects/mzlib/private/match/match-error.ss index 546245364c..5c05e4a30b 100644 --- a/collects/mzlib/private/match/match-error.ss +++ b/collects/mzlib/private/match/match-error.ss @@ -1,7 +1,7 @@ (module match-error mzscheme (provide (all-defined)) - (require (lib "pregexp.ss")) + (require mzlib/pregexp) (define-struct (exn:misc:match exn:fail) (value)) diff --git a/collects/mzlib/private/match/match-helper.ss b/collects/mzlib/private/match/match-helper.ss index 76cda39780..2f6c23e3c6 100644 --- a/collects/mzlib/private/match/match-helper.ss +++ b/collects/mzlib/private/match/match-helper.ss @@ -3,10 +3,10 @@ (provide (all-defined) (all-from "syntax-utils.ss")) - (require (lib "struct.ss" "syntax") + (require syntax/struct "syntax-utils.ss" "match-error.ss" - (lib "list.ss")) + mzlib/list) (require-for-template mzscheme) diff --git a/collects/mzlib/private/match/match-internal-func.ss b/collects/mzlib/private/match/match-internal-func.ss index dd3d0795e9..277351d65b 100644 --- a/collects/mzlib/private/match/match-internal-func.ss +++ b/collects/mzlib/private/match/match-internal-func.ss @@ -6,8 +6,8 @@ "match-helper.ss" "match-error.ss") - (require (lib "etc.ss") - (lib "list.ss") + (require mzlib/etc + mzlib/list "match-expander.ss" "match-error.ss") diff --git a/collects/mzlib/private/match/parse-quasi.scm b/collects/mzlib/private/match/parse-quasi.scm index 2bae2443f3..a09a12b014 100644 --- a/collects/mzlib/private/match/parse-quasi.scm +++ b/collects/mzlib/private/match/parse-quasi.scm @@ -3,8 +3,8 @@ (provide (all-defined)) (require "match-error.ss" "match-helper.ss" - (lib "etc.ss") - (lib "stx.ss" "syntax")) + mzlib/etc + syntax/stx) (require-for-template mzscheme "match-error.ss") diff --git a/collects/mzlib/private/match/render-helpers.ss b/collects/mzlib/private/match/render-helpers.ss index d55a44071a..801e4bee6b 100644 --- a/collects/mzlib/private/match/render-helpers.ss +++ b/collects/mzlib/private/match/render-helpers.ss @@ -8,11 +8,11 @@ "getter-setter.scm" "parse-quasi.scm" "test-structure.scm" - (lib "etc.ss") - (lib "trace.ss")) + mzlib/etc + mzlib/trace) (require-for-template mzscheme - (lib "list.ss") + mzlib/list "match-error.ss") (provide (all-from "emit-assm.scm") diff --git a/collects/mzlib/private/match/render-sigs.ss b/collects/mzlib/private/match/render-sigs.ss index a75552deeb..b02063ded1 100644 --- a/collects/mzlib/private/match/render-sigs.ss +++ b/collects/mzlib/private/match/render-sigs.ss @@ -1,5 +1,5 @@ (module render-sigs mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide (all-defined)) diff --git a/collects/mzlib/private/match/render-test-list-impl.ss b/collects/mzlib/private/match/render-test-list-impl.ss index 4d4aef049f..a08476d666 100644 --- a/collects/mzlib/private/match/render-test-list-impl.ss +++ b/collects/mzlib/private/match/render-test-list-impl.ss @@ -1,6 +1,6 @@ (module render-test-list-impl mzscheme - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (require "match-error.ss" "match-helper.ss" @@ -13,7 +13,7 @@ "render-helpers.ss") (require "render-sigs.ss" - (lib "unit.ss")) + mzlib/unit) (require-for-syntax "match-helper.ss" "match-expander-struct.ss" diff --git a/collects/mzlib/private/match/render-test-list.scm b/collects/mzlib/private/match/render-test-list.scm index 0d964424ee..1cff997a42 100644 --- a/collects/mzlib/private/match/render-test-list.scm +++ b/collects/mzlib/private/match/render-test-list.scm @@ -7,7 +7,7 @@ "render-test-list-impl.ss" "getbindings.ss" "ddk-handlers.ss" - (lib "unit.ss")) + mzlib/unit) (define-compound-unit/infer rtl@ (import) diff --git a/collects/mzlib/private/match/simplify-patterns.ss b/collects/mzlib/private/match/simplify-patterns.ss index e9efd81517..e2037c94da 100644 --- a/collects/mzlib/private/match/simplify-patterns.ss +++ b/collects/mzlib/private/match/simplify-patterns.ss @@ -1,6 +1,6 @@ (module simplify-patterns mzscheme - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (require scheme/list) diff --git a/collects/mzlib/private/match/struct-helper.scm b/collects/mzlib/private/match/struct-helper.scm index 41cd346a38..6455147743 100644 --- a/collects/mzlib/private/match/struct-helper.scm +++ b/collects/mzlib/private/match/struct-helper.scm @@ -1,5 +1,5 @@ (module struct-helper mzscheme - (require (lib "list.ss")) + (require mzlib/list) (require-for-template mzscheme) (provide (all-defined)) diff --git a/collects/mzlib/private/match/test-no-order.ss b/collects/mzlib/private/match/test-no-order.ss index e404a3275b..f55f18b575 100644 --- a/collects/mzlib/private/match/test-no-order.ss +++ b/collects/mzlib/private/match/test-no-order.ss @@ -1,5 +1,5 @@ (module test-no-order mzscheme - (require (lib "list.ss")) + (require mzlib/list) (provide match:test-no-order) diff --git a/collects/mzlib/private/match/update-binding-counts.scm b/collects/mzlib/private/match/update-binding-counts.scm index f3e73678eb..e59525759d 100644 --- a/collects/mzlib/private/match/update-binding-counts.scm +++ b/collects/mzlib/private/match/update-binding-counts.scm @@ -3,7 +3,7 @@ (provide update-binding-counts update-binding-count) (require "test-structure.scm") - (require (lib "etc.ss")) + (require mzlib/etc) ;;!(function update-binding-count diff --git a/collects/mzlib/private/match/update-counts.scm b/collects/mzlib/private/match/update-counts.scm index 82f39d71e3..0c7a862920 100644 --- a/collects/mzlib/private/match/update-counts.scm +++ b/collects/mzlib/private/match/update-counts.scm @@ -6,8 +6,8 @@ (require "test-structure.scm" "match-helper.ss" - (lib "etc.ss") - (lib "list.ss")) + mzlib/etc + mzlib/list) ;;!(function test-filter ;; (form (test-filter test-list) -> test-list) diff --git a/collects/mzlib/private/package-helper.ss b/collects/mzlib/private/package-helper.ss index 94747d7bdd..ceed08ddfc 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/sandbox-coverage.ss b/collects/mzlib/private/sandbox-coverage.ss index a19009d1ae..3043555190 100644 --- a/collects/mzlib/private/sandbox-coverage.ss +++ b/collects/mzlib/private/sandbox-coverage.ss @@ -1,7 +1,7 @@ ;; This file is is used in the context of sandboxed code, it uses the ;; stacktrace interface from errortrace to find uncovered expressions. (module sandbox-coverage mzscheme - (require (lib "stacktrace.ss" "errortrace") (lib "unit.ss") (lib "list.ss")) + (require (lib "stacktrace.ss" "errortrace") mzlib/unit mzlib/list) ;; Test coverage run-time support (define test-coverage-enabled (make-parameter #t)) diff --git a/collects/mzlib/private/sigutil.ss b/collects/mzlib/private/sigutil.ss index 3eff120312..f80ebfacba 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 3eb7391d9b..b0699a0ce2 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 cbaf90896e..e4b8610674 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/private/unit-compiletime.ss b/collects/mzlib/private/unit-compiletime.ss index 469517c3df..e5c970993c 100644 --- a/collects/mzlib/private/unit-compiletime.ss +++ b/collects/mzlib/private/unit-compiletime.ss @@ -1,7 +1,7 @@ (module unit-compiletime mzscheme - (require-for-syntax (lib "struct.ss" "syntax")) - (require (lib "boundmap.ss" "syntax") - (lib "list.ss") + (require-for-syntax syntax/struct) + (require syntax/boundmap + mzlib/list "unit-runtime.ss" "unit-syntax.ss") (require-for-template mzscheme diff --git a/collects/mzlib/private/unit-syntax.ss b/collects/mzlib/private/unit-syntax.ss index d2b62d5259..c87b57f09e 100644 --- a/collects/mzlib/private/unit-syntax.ss +++ b/collects/mzlib/private/unit-syntax.ss @@ -1,5 +1,5 @@ (module unit-syntax mzscheme - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (require-for-template "unit-keywords.ss") (provide (all-defined)) diff --git a/collects/mzlib/process.ss b/collects/mzlib/process.ss index 7a12c88c1f..21d246b83a 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 ab7e9c9457..795f2c3c57 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 e1120f24ce..582d1fd7f7 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 545e6deea0..78582d2b64 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 b19934cdf3..23a03c9ab8 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 16aca250c3..23f8a907e0 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 d690e33f6b..b91cfefbc8 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 f9ca994193..11b5779ec7 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 aee21d2e02..ff1d6347c6 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 2da5d74acc..9952cebe62 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 c6fc7bb343..aa01405726 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 95c4f5e13a..3398291d45 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 5b1d36384c..204cccacef 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/mzscheme/examples/curses-demo.ss b/collects/mzscheme/examples/curses-demo.ss index 1056e4cc11..b307c18c56 100644 --- a/collects/mzscheme/examples/curses-demo.ss +++ b/collects/mzscheme/examples/curses-demo.ss @@ -4,7 +4,7 @@ ; To get append-extension-suffix, which adds .so or .ddl as ; approrpiate for the current platform: -(require (lib "file.ss" "dynext")) +(require dynext/file) ; Load the curses extension (load-extension (append-extension-suffix "curses")) diff --git a/collects/mzscheme/examples/msgbox.ss b/collects/mzscheme/examples/msgbox.ss index d4342e46b7..18caceac61 100644 --- a/collects/mzscheme/examples/msgbox.ss +++ b/collects/mzscheme/examples/msgbox.ss @@ -3,7 +3,7 @@ ;; so that MessageBox() is linked in. (module msgbox mzscheme - (require (lib "cffi.ss" "compiler")) + (require compiler/cffi) ;; c-declare is really file-specific, and ;; not module-specific diff --git a/collects/mzscheme/examples/tree-finish.ss b/collects/mzscheme/examples/tree-finish.ss index 95bf1341a2..cfe55b3be7 100644 --- a/collects/mzscheme/examples/tree-finish.ss +++ b/collects/mzscheme/examples/tree-finish.ss @@ -1,7 +1,7 @@ ;; Assumes that tree.so has been loaded -(require (lib "class.ss")) +(require mzlib/class) (define tree% (let ([method-names '(get-leaves diff --git a/collects/net/base64.ss b/collects/net/base64.ss index 28799dda22..10ee7d6cff 100644 --- a/collects/net/base64.ss +++ b/collects/net/base64.ss @@ -1,5 +1,5 @@ (module base64 mzscheme - (require (lib "unit.ss") + (require mzlib/unit "base64-sig.ss" "base64-unit.ss") diff --git a/collects/net/cgi-unit.ss b/collects/net/cgi-unit.ss index 38ca9a0a2e..2bbe23cae9 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/cgi.ss b/collects/net/cgi.ss index 4a05ec4ce7..1dca70b60a 100644 --- a/collects/net/cgi.ss +++ b/collects/net/cgi.ss @@ -1,5 +1,5 @@ (module cgi mzscheme - (require (lib "unit.ss") "cgi-sig.ss" "cgi-unit.ss") + (require mzlib/unit "cgi-sig.ss" "cgi-unit.ss") (define-values/invoke-unit/infer cgi@) diff --git a/collects/net/cookie-unit.ss b/collects/net/cookie-unit.ss index 1011f58c70..4ebbf56386 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/cookie.ss b/collects/net/cookie.ss index da57a19217..6b900fe299 100644 --- a/collects/net/cookie.ss +++ b/collects/net/cookie.ss @@ -1,5 +1,5 @@ (module cookie mzscheme - (require (lib "unit.ss") "cookie-sig.ss" "cookie-unit.ss") + (require mzlib/unit "cookie-sig.ss" "cookie-unit.ss") (provide-signature-elements cookie^) diff --git a/collects/net/dns-unit.ss b/collects/net/dns-unit.ss index 4476f1dfda..667c56f179 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/dns.ss b/collects/net/dns.ss index 9fc1cafd9d..2169f09f93 100644 --- a/collects/net/dns.ss +++ b/collects/net/dns.ss @@ -1,5 +1,5 @@ (module dns mzscheme - (require (lib "unit.ss") "dns-sig.ss" "dns-unit.ss") + (require mzlib/unit "dns-sig.ss" "dns-unit.ss") (define-values/invoke-unit/infer dns@) diff --git a/collects/net/doc.txt b/collects/net/doc.txt index 1491d5747e..b51fb8d0ec 100644 --- a/collects/net/doc.txt +++ b/collects/net/doc.txt @@ -15,7 +15,7 @@ following _Internet_ (quasi-)protocols: _URL_ posting, _web clients_, _WWW_ ========================================================================== -To load directly: (require (lib "url.ss" "net")) +To load directly: (require net/url) Module files: _url.ss_ - provides the procedures documented below _url-unit.ss_ - provides unit url@ _url-sig.ss_ - provides signature url^ @@ -247,7 +247,7 @@ _web documents_ EXAMPLE -------------------------------------------------------------- - (require (lib "url.ss" "net")) + (require net/url) (define url:cs (string->url "http://www.cs.rice.edu/")) (define (test url) (call/input-url url get-pure-port display-pure-port)) @@ -267,7 +267,7 @@ _URL viewing_ To load a module for accessing a Web _browser_ either (require (lib "external.ss" "browser")) or - (require (lib "sendurl.ss" "net")) + (require net/sendurl) The version in "browser" will prompt the user for a browser preference if not already set. The version in "sendurl.ss" lacks this capability, @@ -306,7 +306,7 @@ These modules define one main function: _CGI_ backends, _WWW_ ========================================================================== -To load directly: (require (lib "cgi.ss" "net")) +To load directly: (require net/cgi) Module files: _cgi.ss_ - provides the procedures documented below _cgi-unit.ss_ - provides unit cgi@ _cgi-sig.ss_ - provides signature cgi^ @@ -435,7 +435,7 @@ PROCEDURES ----------------------------------------------------------- _sending mail_, _sendmail_ ========================================================================== -To load directly: (require (lib "sendmail.ss" "net")) +To load directly: (require net/sendmail) Module files: _sendmail.ss_ - provides the procedures documented below _sendmail-unit.ss_ - provides unit sendmail@ _sendmail-sig.ss_ - provides signature sendmail^ @@ -491,7 +491,7 @@ PROCEDURES ----------------------------------------------------------- _sending mail_, _SMTP_ ========================================================================== -To load directly: (require (lib "smtp.ss" "net")) +To load directly: (require net/smtp) Module files: _smtp.ss_ - provides the procedures documented below _smtp-unit.ss_ - provides unit smtp@ _smtp-sig.ss_ - provides signature smtp^ @@ -584,7 +584,7 @@ PROCEDURES ----------------------------------------------------------- _NNTP_, _newsgroups_ ========================================================================== -To load directly: (require (lib "nntp.ss" "net")) +To load directly: (require net/nntp) Module files: _nntp.ss_ - provides the procedures documented below _nntp-unit.ss_ - provides unit nntp@ _nntp-sig.ss_ - provides signature nntp^ @@ -731,7 +731,7 @@ PROCEDURES ----------------------------------------------------------- _POP-3_, _reading mail_ ========================================================================== -To load directly: (require (lib "pop3.ss" "net")) +To load directly: (require net/pop3) Module files: _pop3.ss_ - provides the procedures documented below _pop3-unit.ss_ - provides unit pop3@ _pop3-sig.ss_ - provides signature pop3^ @@ -879,7 +879,7 @@ PROCEDURES ----------------------------------------------------------- EXAMPLE -------------------------------------------------------------- - > (require (lib "pop3.ss" "net")) + > (require net/pop3) > (define c (connect-to-server "cs.rice.edu")) > (authenticate/plain-text "scheme" "********" c) > (get-mailbox-status c) @@ -910,7 +910,7 @@ EXAMPLE -------------------------------------------------------------- _IMAP_, _reading mail_ ========================================================================== -To load directly: (require (lib "imap.ss" "net")) +To load directly: (require net/imap) Module files: _imap.ss_ - provides the procedures documented below _imap-unit.ss_ - provides unit imap@ _imap-sig.ss_ - provides signature imap^ @@ -1285,7 +1285,7 @@ PROCEDURES ----------------------------------------------------------- _mime headers_, _mail headers_, _http headers_ ========================================================================== -To load directly: (require (lib "head.ss" "net")) +To load directly: (require net/head) Module files: _head.ss_ - provides the procedures documented below _head-unit.ss_ - provides unit head@ _head-sig.ss_ - provides signature head^ @@ -1436,7 +1436,7 @@ PROCEDURES ----------------------------------------------------------- _DNS_, _domain name service_ ========================================================================== -To load directly: (require (lib "dns.ss" "net")) +To load directly: (require net/dns) Module files: _dns.ss_ - provides the procedures documented below _dns-unit.ss_ - provides unit dns@ _dns-sig.ss_ - provides signature dns^ @@ -1482,7 +1482,7 @@ PROCEDURES ----------------------------------------------------------- _MIME support__ ========================================================================== -To load directly: (require (lib "mime.ss" "net")) +To load directly: (require net/mime) Module files: _mime.ss_ - provides the procedures documented below _mime-unit.ss_ - provides unit mime@ imports base64^ from "base64-sig.ss" @@ -1794,7 +1794,7 @@ struct entity _Base 64 Encoding_, _base64_ ========================================================================== -To load directly: (require (lib "base64.ss" "net")) +To load directly: (require net/base64) Module files: _base64.ss_ - provides the procedures documented below _base64-unit.ss_ - provides unit base64@ _base64-sig.ss_ - provides signature base64^ @@ -1836,7 +1836,7 @@ PROCEDURES ----------------------------------------------------------- _Quoted Printable Encoding_, _qp__ ========================================================================== -To load directly: (require (lib "qp.ss" "net")) +To load directly: (require net/qp) Module files: _qp.ss_ - provides the procedures documented below _qp-unit.ss_ - provides unit qp@ _qp-sig.ss_ - provides signature qp^ @@ -1903,7 +1903,7 @@ PROCEDURES ----------------------------------------------------------- _FTP client_ ========================================================================== -To load directly: (require (lib "ftp.ss" "net")) +To load directly: (require net/ftp) Module files: _ftp.ss_ - provides the procedures documented below _ftp-unit.ss_ - provides unit ftp@ _ftp-sig.ss_ - provides signature ftp^ @@ -2044,7 +2044,7 @@ PROCEDURES ----------------------------------------------------------- _cookies_, HTTP _State Management_ ========================================================================== -To load directly: (require (lib "cookie.ss" "net")) +To load directly: (require net/cookie) Module files: _cookie.ss_ - provides the procedures documented below _cookie-unit.ss_ - provides unit cookie@ _cookie-sig.ss_ - provides signature cookie^ @@ -2183,7 +2183,7 @@ won't have a cookie set then first arrive at your site. _URL encoding_, _URL decoding_, _application/x-www-form-urlencoded_ ========================================================================== -To load directly: (require (lib "uri-codec.ss" "net")) +To load directly: (require net/uri-codec) Module files: _uri-codec.ss_ - provides the procedures documented below _uri-codec-unit.ss_ - provides unit uri-codec@ _uri-codec-sig.ss_ - provides signature uri-codec^ @@ -2310,7 +2310,7 @@ PROCEDURES ----------------------------------------------------------- _GIF_ writing, _animated GIF_ writing ========================================================================== -To load directly: (require (lib "gifwrite.ss" "net")) +To load directly: (require net/gifwrite) ABSTRACT ------------------------------------------------------------- diff --git a/collects/net/ftp.ss b/collects/net/ftp.ss index a878adeee7..9685165d27 100644 --- a/collects/net/ftp.ss +++ b/collects/net/ftp.ss @@ -1,5 +1,5 @@ (module ftp mzscheme - (require (lib "unit.ss") "ftp-sig.ss" "ftp-unit.ss") + (require mzlib/unit "ftp-sig.ss" "ftp-unit.ss") (define-values/invoke-unit/infer ftp@) diff --git a/collects/net/gifwrite.ss b/collects/net/gifwrite.ss index 35f608bbb0..37d8c6e99d 100644 --- a/collects/net/gifwrite.ss +++ b/collects/net/gifwrite.ss @@ -15,7 +15,7 @@ |# (module gifwrite mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define LZ_MAX_CODE 4095) diff --git a/collects/net/head-unit.ss b/collects/net/head-unit.ss index de8aea31ee..67c43484bc 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/head.ss b/collects/net/head.ss index b50bfa52aa..41687311cf 100644 --- a/collects/net/head.ss +++ b/collects/net/head.ss @@ -1,5 +1,5 @@ (module head mzscheme - (require (lib "unit.ss") "head-sig.ss" "head-unit.ss") + (require mzlib/unit "head-sig.ss" "head-unit.ss") (define-values/invoke-unit/infer head@) diff --git a/collects/net/imap.ss b/collects/net/imap.ss index 9a1559fae6..8881a8ab49 100644 --- a/collects/net/imap.ss +++ b/collects/net/imap.ss @@ -1,5 +1,5 @@ (module imap mzscheme - (require (lib "unit.ss") (lib "contract.ss") "imap-sig.ss" "imap-unit.ss") + (require mzlib/unit mzlib/contract "imap-sig.ss" "imap-unit.ss") (define-values/invoke-unit/infer imap@) diff --git a/collects/net/mime-unit.ss b/collects/net/mime-unit.ss index 557b126c25..6fe62d9ae4 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/mime-util.ss b/collects/net/mime-util.ss index 5f315e4d87..2bdb219b68 100644 --- a/collects/net/mime-util.ss +++ b/collects/net/mime-util.ss @@ -27,7 +27,7 @@ ;; Commentary: (module mime-util mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (provide string-tokenizer trim-all-spaces diff --git a/collects/net/mime.ss b/collects/net/mime.ss index 2c207dd4bd..68a75cbdc5 100644 --- a/collects/net/mime.ss +++ b/collects/net/mime.ss @@ -27,7 +27,7 @@ ;; Commentary: (module mime mzscheme - (require (lib "unit.ss") + (require mzlib/unit "mime-sig.ss" "mime-unit.ss" "qp-sig.ss" diff --git a/collects/net/nntp.ss b/collects/net/nntp.ss index 35baae98cc..7162cc0cc4 100644 --- a/collects/net/nntp.ss +++ b/collects/net/nntp.ss @@ -1,5 +1,5 @@ (module nntp mzscheme - (require (lib "unit.ss") "nntp-sig.ss" "nntp-unit.ss") + (require mzlib/unit "nntp-sig.ss" "nntp-unit.ss") (define-values/invoke-unit/infer nntp@) diff --git a/collects/net/pop3.ss b/collects/net/pop3.ss index d60a40d1af..e327b256a3 100644 --- a/collects/net/pop3.ss +++ b/collects/net/pop3.ss @@ -1,5 +1,5 @@ (module pop3 mzscheme - (require (lib "unit.ss") "pop3-sig.ss" "pop3-unit.ss") + (require mzlib/unit "pop3-sig.ss" "pop3-unit.ss") (define-values/invoke-unit/infer pop3@) diff --git a/collects/net/private/rbtree.ss b/collects/net/private/rbtree.ss index 982d21ff0a..b37f4a0561 100644 --- a/collects/net/private/rbtree.ss +++ b/collects/net/private/rbtree.ss @@ -284,7 +284,7 @@ Tests: (require rbtree) -(require (lib "pretty.ss")) +(require mzlib/pretty) (print-struct #t) (define t (new-tree)) diff --git a/collects/net/qp-unit.ss b/collects/net/qp-unit.ss index 8d557bc0f8..fdacd4a8a0 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/qp.ss b/collects/net/qp.ss index db4f0c17aa..346aef1b94 100644 --- a/collects/net/qp.ss +++ b/collects/net/qp.ss @@ -27,7 +27,7 @@ ;; Commentary: (module qp mzscheme - (require (lib "unit.ss") "qp-sig.ss" "qp-unit.ss") + (require mzlib/unit "qp-sig.ss" "qp-unit.ss") (define-values/invoke-unit/infer qp@) diff --git a/collects/net/sendmail-unit.ss b/collects/net/sendmail-unit.ss index df17e9fbe8..e01ff9a400 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/sendmail.ss b/collects/net/sendmail.ss index 25b6844098..19387b7a98 100644 --- a/collects/net/sendmail.ss +++ b/collects/net/sendmail.ss @@ -1,5 +1,5 @@ (module sendmail mzscheme - (require (lib "unit.ss") "sendmail-sig.ss" "sendmail-unit.ss") + (require mzlib/unit "sendmail-sig.ss" "sendmail-unit.ss") (define-values/invoke-unit/infer sendmail@) diff --git a/collects/net/smtp.ss b/collects/net/smtp.ss index 72fa6b1ff0..8aa43caa13 100644 --- a/collects/net/smtp.ss +++ b/collects/net/smtp.ss @@ -1,5 +1,5 @@ (module smtp mzscheme - (require (lib "unit.ss") "smtp-sig.ss" "smtp-unit.ss") + (require mzlib/unit "smtp-sig.ss" "smtp-unit.ss") (define-values/invoke-unit/infer smtp@) diff --git a/collects/net/ssl-tcp-unit.ss b/collects/net/ssl-tcp-unit.ss index b50b35b58a..bd31d15d15 100644 --- a/collects/net/ssl-tcp-unit.ss +++ b/collects/net/ssl-tcp-unit.ss @@ -1,9 +1,9 @@ (module ssl-tcp-unit mzscheme (provide make-ssl-tcp@) - (require (lib "unit.ss") + (require mzlib/unit "tcp-sig.ss" (lib "mzssl.ss" "openssl") - (lib "etc.ss")) + mzlib/etc) (define (make-ssl-tcp@ server-cert-file server-key-file server-root-cert-files server-suggest-auth-file diff --git a/collects/net/tcp-redirect.ss b/collects/net/tcp-redirect.ss index 717aa60e1c..eb7327f03c 100644 --- a/collects/net/tcp-redirect.ss +++ b/collects/net/tcp-redirect.ss @@ -1,9 +1,9 @@ (module tcp-redirect mzscheme (provide tcp-redirect) - (require (lib "unit.ss") - (lib "async-channel.ss") - (lib "etc.ss") + (require mzlib/unit + mzlib/async-channel + mzlib/etc "tcp-sig.ss") (define raw:tcp-abandon-port tcp-abandon-port) diff --git a/collects/net/tcp-unit.ss b/collects/net/tcp-unit.ss index ff6f6ffbd8..de87f4f8cb 100644 --- a/collects/net/tcp-unit.ss +++ b/collects/net/tcp-unit.ss @@ -1,6 +1,6 @@ (module tcp-unit mzscheme (provide tcp@) - (require (lib "unit.ss") "tcp-sig.ss") + (require mzlib/unit "tcp-sig.ss") (define-unit-from-context tcp@ tcp^)) diff --git a/collects/net/unihead.ss b/collects/net/unihead.ss index df8579b24c..581e295a36 100644 --- a/collects/net/unihead.ss +++ b/collects/net/unihead.ss @@ -1,7 +1,7 @@ (module unihead mzscheme - (require (lib "base64.ss" "net") - (lib "qp.ss" "net") - (lib "string.ss")) + (require net/base64 + net/qp + mzlib/string) (provide encode-for-header decode-for-header diff --git a/collects/net/uri-codec-unit.ss b/collects/net/uri-codec-unit.ss index d11fb12a8b..88441c85d7 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/uri-codec.ss b/collects/net/uri-codec.ss index 02e751b20f..69f4d869ec 100644 --- a/collects/net/uri-codec.ss +++ b/collects/net/uri-codec.ss @@ -1,5 +1,5 @@ (module uri-codec mzscheme - (require (lib "unit.ss") "uri-codec-sig.ss" "uri-codec-unit.ss") + (require mzlib/unit "uri-codec-sig.ss" "uri-codec-unit.ss") (provide-signature-elements uri-codec^) diff --git a/collects/net/url-structs.ss b/collects/net/url-structs.ss index 7e65e00122..9625ee10b1 100644 --- a/collects/net/url-structs.ss +++ b/collects/net/url-structs.ss @@ -1,6 +1,6 @@ (module url-structs mzscheme - (require (lib "contract.ss") - (lib "serialize.ss")) + (require mzlib/contract + mzlib/serialize) (define-serializable-struct url (scheme user host port path-absolute? path query fragment)) (define-serializable-struct path/param (path param)) diff --git a/collects/net/url-unit.ss b/collects/net/url-unit.ss index 1cce7d3a36..c185a1b736 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/net/url.ss b/collects/net/url.ss index 1d7c39ebcb..c0aa5325c5 100644 --- a/collects/net/url.ss +++ b/collects/net/url.ss @@ -1,6 +1,6 @@ (module url mzscheme - (require (lib "unit.ss") - (lib "contract.ss") + (require mzlib/unit + mzlib/contract "url-structs.ss" "url-sig.ss" "url-unit.ss" diff --git a/collects/openssl/mzssl.ss b/collects/openssl/mzssl.ss index 5cc5abecb9..ed26baa801 100644 --- a/collects/openssl/mzssl.ss +++ b/collects/openssl/mzssl.ss @@ -14,10 +14,10 @@ ;; opposite must be completed, first. (module mzssl mzscheme - (require (lib "foreign.ss") - (lib "port.ss") - (lib "kw.ss") - (lib "runtime-path.ss")) + (require mzlib/foreign + mzlib/port + mzlib/kw + mzlib/runtime-path) (provide ssl-available? ssl-load-fail-reason diff --git a/collects/parser-tools/examples/calc.ss b/collects/parser-tools/examples/calc.ss index 3ddd5ebc66..0f067e7480 100644 --- a/collects/parser-tools/examples/calc.ss +++ b/collects/parser-tools/examples/calc.ss @@ -2,9 +2,9 @@ ;; Import the parser and lexer generators. -(require (lib "yacc.ss" "parser-tools") - (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools"))) +(require parser-tools/yacc + parser-tools/lex + (prefix : parser-tools/lex-sre)) (define-tokens value-tokens (NUM VAR FNCT)) (define-empty-tokens op-tokens (newline = OP CP + - * / ^ EOF NEG)) diff --git a/collects/parser-tools/examples/example-parser.ss b/collects/parser-tools/examples/example-parser.ss index f9505b3cc8..fb96e380fc 100644 --- a/collects/parser-tools/examples/example-parser.ss +++ b/collects/parser-tools/examples/example-parser.ss @@ -1,8 +1,8 @@ (module example-parser mzscheme - (require (lib "lex.ss" "parser-tools") - (lib "yacc.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools")) - (lib "list.ss" "srfi" "1")) + (require parser-tools/lex + parser-tools/yacc + (prefix : parser-tools/lex-sre) + srfi/1/list) (provide malgol-lexer malgol-parser) diff --git a/collects/parser-tools/examples/read.ss b/collects/parser-tools/examples/read.ss index 68838a1a5e..13ef1f42bf 100644 --- a/collects/parser-tools/examples/read.ss +++ b/collects/parser-tools/examples/read.ss @@ -4,10 +4,10 @@ (module read mzscheme - (require (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools")) - (lib "yacc.ss" "parser-tools") - (lib "readerr.ss" "syntax")) + (require parser-tools/lex + (prefix : parser-tools/lex-sre) + parser-tools/yacc + syntax/readerr) (define-tokens data (DATUM)) (define-empty-tokens delim (OP CP HASHOP QUOTE QUASIQUOTE UNQUOTE UNQUOTE-SPLICING DOT EOF)) diff --git a/collects/parser-tools/lex-plt-v200.ss b/collects/parser-tools/lex-plt-v200.ss index 939c51a4ad..34b8d165d3 100644 --- a/collects/parser-tools/lex-plt-v200.ss +++ b/collects/parser-tools/lex-plt-v200.ss @@ -1,6 +1,6 @@ (module lex-plt-v200 mzscheme - (require (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools"))) + (require parser-tools/lex + (prefix : parser-tools/lex-sre)) (provide epsilon ~ diff --git a/collects/parser-tools/lex-sre.ss b/collects/parser-tools/lex-sre.ss index 9c6a6a7ba1..28be898791 100644 --- a/collects/parser-tools/lex-sre.ss +++ b/collects/parser-tools/lex-sre.ss @@ -1,5 +1,5 @@ (module lex-sre mzscheme - (require (lib "lex.ss" "parser-tools")) + (require parser-tools/lex) (provide (rename sre-* *) (rename sre-+ +) diff --git a/collects/parser-tools/lex.ss b/collects/parser-tools/lex.ss index 5edc407012..4aceb59429 100644 --- a/collects/parser-tools/lex.ss +++ b/collects/parser-tools/lex.ss @@ -3,17 +3,17 @@ ;; Provides the syntax used to create lexers and the functions needed to ;; create and use the buffer that the lexer reads from. See docs. - (require-for-syntax (lib "list.ss") - (lib "stx.ss" "syntax") - (lib "define.ss" "syntax") - (lib "boundmap.ss" "syntax") + (require-for-syntax mzlib/list + syntax/stx + syntax/define + syntax/boundmap "private-lex/util.ss" "private-lex/actions.ss" "private-lex/front.ss" "private-lex/unicode-chars.ss") - (require (lib "stxparam.ss") - (lib "readerr.ss" "syntax") + (require mzlib/stxparam + syntax/readerr "private-lex/token.ss") (provide lexer lexer-src-pos define-lex-abbrev define-lex-abbrevs define-lex-trans diff --git a/collects/parser-tools/private-lex/actions.ss b/collects/parser-tools/private-lex/actions.ss index 172e8dc1b0..10330a899d 100644 --- a/collects/parser-tools/private-lex/actions.ss +++ b/collects/parser-tools/private-lex/actions.ss @@ -1,6 +1,6 @@ (module actions mzscheme (provide (all-defined)) - (require (lib "stx.ss" "syntax")) + (require syntax/stx) ;; get-special-action: (syntax-object list) syntax-object syntax-object -> syntax-object ;; Returns the first action from a rule of the form ((which-special) action) diff --git a/collects/parser-tools/private-lex/deriv.ss b/collects/parser-tools/private-lex/deriv.ss index 334100d536..808d9fd351 100644 --- a/collects/parser-tools/private-lex/deriv.ss +++ b/collects/parser-tools/private-lex/deriv.ss @@ -1,7 +1,7 @@ (module deriv mzscheme - (require (lib "list.ss") - (prefix is: (lib "integer-set.ss")) + (require mzlib/list + (prefix is: mzlib/integer-set) "re.ss" "util.ss") diff --git a/collects/parser-tools/private-lex/front.ss b/collects/parser-tools/private-lex/front.ss index 5a35fa3a46..e6bf96eccb 100644 --- a/collects/parser-tools/private-lex/front.ss +++ b/collects/parser-tools/private-lex/front.ss @@ -1,7 +1,7 @@ (module front mzscheme - (require (prefix is: (lib "integer-set.ss")) - (lib "list.ss") - (lib "stx.ss" "syntax") + (require (prefix is: mzlib/integer-set) + mzlib/list + syntax/stx "util.ss" "stx.ss" "re.ss" diff --git a/collects/parser-tools/private-lex/re.ss b/collects/parser-tools/private-lex/re.ss index 2da8e3dc51..2400933ccb 100644 --- a/collects/parser-tools/private-lex/re.ss +++ b/collects/parser-tools/private-lex/re.ss @@ -1,7 +1,7 @@ (module re mzscheme - (require (lib "match.ss") - (lib "list.ss") - (prefix is: (lib "integer-set.ss")) + (require mzlib/match + mzlib/list + (prefix is: mzlib/integer-set) "util.ss") (provide ->re build-epsilon build-zero build-char-set build-concat diff --git a/collects/parser-tools/private-lex/stx.ss b/collects/parser-tools/private-lex/stx.ss index e1211aa999..4ae757594b 100644 --- a/collects/parser-tools/private-lex/stx.ss +++ b/collects/parser-tools/private-lex/stx.ss @@ -1,5 +1,5 @@ (module stx mzscheme - (require (lib "boundmap.ss" "syntax") + (require syntax/boundmap "util.ss") (provide parse) diff --git a/collects/parser-tools/private-lex/util.ss b/collects/parser-tools/private-lex/util.ss index 045e2ad5b9..d63f03a5a6 100644 --- a/collects/parser-tools/private-lex/util.ss +++ b/collects/parser-tools/private-lex/util.ss @@ -1,5 +1,5 @@ (module util mzscheme - (require (lib "list.ss")) + (require mzlib/list) (provide (all-defined)) diff --git a/collects/parser-tools/private-yacc/grammar.ss b/collects/parser-tools/private-yacc/grammar.ss index a5b14369b8..dd71a88fbd 100644 --- a/collects/parser-tools/private-yacc/grammar.ss +++ b/collects/parser-tools/private-yacc/grammar.ss @@ -3,10 +3,10 @@ (module grammar mzscheme - (require (lib "class.ss") - (lib "list.ss") + (require mzlib/class + mzlib/list "yacc-helper.ss" - (lib "contract.ss")) + mzlib/contract) ;; Each production has a unique index 0 <= index <= number of productions (define-struct prod (lhs rhs index prec action) (make-inspector)) diff --git a/collects/parser-tools/private-yacc/input-file-parser.ss b/collects/parser-tools/private-yacc/input-file-parser.ss index 456c8359e7..c8508f6cdc 100644 --- a/collects/parser-tools/private-yacc/input-file-parser.ss +++ b/collects/parser-tools/private-yacc/input-file-parser.ss @@ -6,8 +6,8 @@ (require "yacc-helper.ss" "../private-lex/token-syntax.ss" "grammar.ss" - (lib "class.ss") - (lib "contract.ss")) + mzlib/class + mzlib/contract) (require-for-template mzscheme) diff --git a/collects/parser-tools/private-yacc/lalr.ss b/collects/parser-tools/private-yacc/lalr.ss index d37c6d5ba4..33df94e98b 100644 --- a/collects/parser-tools/private-yacc/lalr.ss +++ b/collects/parser-tools/private-yacc/lalr.ss @@ -4,8 +4,8 @@ (require "lr0.ss" "grammar.ss" - (lib "list.ss") - (lib "class.ss")) + mzlib/list + mzlib/class) (provide compute-LA) diff --git a/collects/parser-tools/private-yacc/lr0.ss b/collects/parser-tools/private-yacc/lr0.ss index 07f82f6ce4..0242beef7c 100644 --- a/collects/parser-tools/private-yacc/lr0.ss +++ b/collects/parser-tools/private-yacc/lr0.ss @@ -4,8 +4,8 @@ (require "grammar.ss" "graph.ss" - (lib "list.ss") - (lib "class.ss")) + mzlib/list + mzlib/class) (provide build-lr0-automaton lr0% (struct trans-key (st gs)) trans-key-list-remove-dups diff --git a/collects/parser-tools/private-yacc/parser-builder.ss b/collects/parser-tools/private-yacc/parser-builder.ss index 467fa048e1..3830b67c40 100644 --- a/collects/parser-tools/private-yacc/parser-builder.ss +++ b/collects/parser-tools/private-yacc/parser-builder.ss @@ -3,8 +3,8 @@ (require "input-file-parser.ss" "grammar.ss" "table.ss" - (lib "class.ss") - (lib "contract.ss")) + mzlib/class + mzlib/contract) (require-for-template mzscheme) (provide/contract @@ -69,7 +69,7 @@ #`(when #f (let ((bind void) ... (tmp void) ...) (void bound ... ... term-group ... start ... end ... prec ...)))))) - (require (lib "list.ss") "parser-actions.ss") + (require mzlib/list "parser-actions.ss") (define (build-parser filename src-pos suppress input-terms start end assocs prods) (let* ((grammar (parse-input input-terms start end assocs prods src-pos)) (table (build-table grammar filename suppress)) diff --git a/collects/parser-tools/private-yacc/table.ss b/collects/parser-tools/private-yacc/table.ss index be96a2abf9..9493b65ba3 100644 --- a/collects/parser-tools/private-yacc/table.ss +++ b/collects/parser-tools/private-yacc/table.ss @@ -6,9 +6,9 @@ "lr0.ss" "lalr.ss" "parser-actions.ss" - (lib "contract.ss") - (lib "list.ss") - (lib "class.ss")) + mzlib/contract + mzlib/list + mzlib/class) (provide/contract (build-table ((is-a?/c grammar%) string? any/c . -> . diff --git a/collects/parser-tools/private-yacc/yacc-helper.ss b/collects/parser-tools/private-yacc/yacc-helper.ss index 4ffc0073f6..2d66fd47ee 100644 --- a/collects/parser-tools/private-yacc/yacc-helper.ss +++ b/collects/parser-tools/private-yacc/yacc-helper.ss @@ -1,6 +1,6 @@ (module yacc-helper mzscheme - (require (lib "list.ss") + (require mzlib/list "../private-lex/token-syntax.ss") ;; General helper routines diff --git a/collects/parser-tools/yacc-to-scheme.ss b/collects/parser-tools/yacc-to-scheme.ss index 36dc7acc21..e854fca773 100644 --- a/collects/parser-tools/yacc-to-scheme.ss +++ b/collects/parser-tools/yacc-to-scheme.ss @@ -1,9 +1,9 @@ (module yacc-to-scheme mzscheme - (require (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools")) - (lib "yacc.ss" "parser-tools") - (lib "readerr.ss" "syntax") - (lib "list.ss")) + (require parser-tools/lex + (prefix : parser-tools/lex-sre) + parser-tools/yacc + syntax/readerr + mzlib/list) (provide trans) (define match-double-string diff --git a/collects/parser-tools/yacc.ss b/collects/parser-tools/yacc.ss index 2929054602..5803c7c842 100644 --- a/collects/parser-tools/yacc.ss +++ b/collects/parser-tools/yacc.ss @@ -6,9 +6,9 @@ "private-yacc/parser-actions.ss") (require "private-lex/token.ss" "private-yacc/parser-actions.ss" - (lib "etc.ss") - (lib "pretty.ss") - (lib "readerr.ss" "syntax")) + mzlib/etc + mzlib/pretty + syntax/readerr) (provide parser) diff --git a/collects/planet/planet-archives.ss b/collects/planet/planet-archives.ss index edb8450aab..dd8480a3cd 100644 --- a/collects/planet/planet-archives.ss +++ b/collects/planet/planet-archives.ss @@ -1,6 +1,6 @@ (module planet-archives mzscheme (require "private/planet-shared.ss" - (lib "file.ss") + mzlib/file "config.ss" "cachepath.ss") diff --git a/collects/planet/planet.ss b/collects/planet/planet.ss index 86208211b0..ffcb943d46 100644 --- a/collects/planet/planet.ss +++ b/collects/planet/planet.ss @@ -9,12 +9,12 @@ PLANNED FEATURES: that if it's a tool it won't start w/ DrScheme, etc) 4. Examine and alter linkage table |# - (require (lib "cmdline.ss") - (lib "string.ss") - (lib "file.ss") - (only (lib "list.ss") sort) - (lib "url.ss" "net") - (lib "match.ss") + (require mzlib/cmdline + mzlib/string + mzlib/file + (only mzlib/list sort) + net/url + mzlib/match "config.ss" "private/planet-shared.ss" diff --git a/collects/planet/private/linkage.ss b/collects/planet/private/linkage.ss index 43674ba045..5df525e6ee 100644 --- a/collects/planet/private/linkage.ss +++ b/collects/planet/private/linkage.ss @@ -2,8 +2,8 @@ (require "planet-shared.ss" "../config.ss" - (lib "file.ss") - (lib "match.ss")) + mzlib/file + mzlib/match) (provide get/linkage get-linkage diff --git a/collects/planet/private/planet-shared.ss b/collects/planet/private/planet-shared.ss index 4b634bf12b..74cc6b4eae 100644 --- a/collects/planet/private/planet-shared.ss +++ b/collects/planet/private/planet-shared.ss @@ -6,12 +6,12 @@ Various common pieces of code that both the client and server need to access (module planet-shared mzscheme - (require (lib "list.ss") - (lib "etc.ss") - (lib "port.ss") - (lib "file.ss") + (require mzlib/list + mzlib/etc + mzlib/port + mzlib/file (lib "getinfo.ss" "setup") - (prefix srfi1: (lib "1.ss" "srfi")) + (prefix srfi1: srfi/1) "../config.ss") (provide (all-defined)) diff --git a/collects/planet/resolver.ss b/collects/planet/resolver.ss index cc6418c293..aef762227d 100644 --- a/collects/planet/resolver.ss +++ b/collects/planet/resolver.ss @@ -144,16 +144,16 @@ an appropriate subdirectory. ||# (module resolver mzscheme - (require (lib "match.ss") - (lib "file.ss") - (lib "port.ss") - (lib "list.ss") + (require mzlib/match + mzlib/file + mzlib/port + mzlib/list - (lib "date.ss") + mzlib/date - (lib "url.ss" "net") - (lib "head.ss" "net") - (lib "struct.ss") + net/url + net/head + mzlib/struct "config.ss" "private/planet-shared.ss" @@ -668,7 +668,7 @@ an appropriate subdirectory. ;; ------------------------------------------------------------ ;; HTTP VERSION OF THE PROTOCOL - ;; pkg->servlet-args : FULL-PKG-SPEC -> environment[from (lib "url.ss" "net")] + ;; pkg->servlet-args : FULL-PKG-SPEC -> environment[from net/url] ;; gets the appropriate query arguments to request the given package from the ;; PLaneT HTTP download servlet (define (pkg->servlet-args pkg) @@ -680,7 +680,7 @@ an appropriate subdirectory. (min-hi . ,(get pkg-spec-minor-hi)) (path . ,(get pkg-spec-path))))) - ;; get-http-response-code : header[from (lib "head.ss" "net")] -> string + ;; get-http-response-code : header[from net/head] -> string ;; gets the HTTP response code in the given header (define (get-http-response-code header) (let ((parsed (regexp-match #rx"^HTTP/[^ ]* ([^ ]*)" header))) diff --git a/collects/planet/util.ss b/collects/planet/util.ss index 744ae3c27d..5b69e906ae 100644 --- a/collects/planet/util.ss +++ b/collects/planet/util.ss @@ -6,16 +6,16 @@ "private/planet-shared.ss" "private/linkage.ss" "resolver.ss" - (lib "url.ss" "net") + net/url (lib "xml.ss" "xml") - (lib "contract.ss") - (lib "file.ss") - (lib "list.ss") + mzlib/contract + mzlib/file + mzlib/list (lib "pack.ss" "setup") (lib "plt-single-installer.ss" "setup") (lib "getinfo.ss" "setup") (lib "unpack.ss" "setup") - (lib "etc.ss")) + mzlib/etc) #| The util collection provides a number of useful functions for interacting with the PLaneT system. |# diff --git a/collects/plot/demos/demo-10.ss b/collects/plot/demos/demo-10.ss index 774e4c7970..768e02ad30 100644 --- a/collects/plot/demos/demo-10.ss +++ b/collects/plot/demos/demo-10.ss @@ -1,7 +1,6 @@ -(require (lib "plot.ss" "plot")) +(require plot) -(require (lib "class.ss") - (lib "plot-extend.ss" "plot")) +(require mzlib/class plot/plot-extend) ; (number -> number) mumbo-jumbo -> 2d-renderer (define-plot-type dashed-line fun 2dview (x-min x-max) ((samples 100) (segments 20) (color 'red) (width 1)) diff --git a/collects/plot/demos/demo-2.ss b/collects/plot/demos/demo-2.ss index d06c2edeb3..1b21937e1c 100644 --- a/collects/plot/demos/demo-2.ss +++ b/collects/plot/demos/demo-2.ss @@ -1,4 +1,3 @@ -(require (lib "plot.ss" "plot")) +(require plot) -(plot - (line identity (color 'red))) \ No newline at end of file +(plot (line identity (color 'red))) \ No newline at end of file diff --git a/collects/plot/demos/demo-3.ss b/collects/plot/demos/demo-3.ss index d59954e6c1..768ec20c86 100644 --- a/collects/plot/demos/demo-3.ss +++ b/collects/plot/demos/demo-3.ss @@ -1,3 +1,3 @@ -(require (lib "plot.ss" "plot")) +(require plot) (plot (line (lambda (x) (sin x)) (color 'red))) \ No newline at end of file diff --git a/collects/plot/demos/demo-4.ss b/collects/plot/demos/demo-4.ss index 60b632ee2d..e97fede885 100644 --- a/collects/plot/demos/demo-4.ss +++ b/collects/plot/demos/demo-4.ss @@ -1,4 +1,4 @@ -(require (lib "plot.ss" "plot")) +(require plot) (plot (vector-field (gradient (lambda (x y) (* (sin x) (cos y)))) (samples 25)) diff --git a/collects/plot/demos/demo-5.ss b/collects/plot/demos/demo-5.ss index 6061c5e92f..48752bd449 100644 --- a/collects/plot/demos/demo-5.ss +++ b/collects/plot/demos/demo-5.ss @@ -1,4 +1,4 @@ -(require (lib "plot.ss" "plot")) +(require plot) (define (trig x y) (* (sin x) (sin y))) diff --git a/collects/plot/demos/demo-6.ss b/collects/plot/demos/demo-6.ss index ef311fe43a..b3ad1e0827 100644 --- a/collects/plot/demos/demo-6.ss +++ b/collects/plot/demos/demo-6.ss @@ -1,4 +1,4 @@ -(require (lib "plot.ss" "plot")) +(require plot) (define (trig x y) (* (sin x) (sin y))) diff --git a/collects/plot/demos/demo-7.ss b/collects/plot/demos/demo-7.ss index f26c1d3a57..4c19a7a42d 100644 --- a/collects/plot/demos/demo-7.ss +++ b/collects/plot/demos/demo-7.ss @@ -1,4 +1,4 @@ -(require (lib "plot.ss" "plot")) +(require plot) (define (trig x y) (* (sin x) (sin y))) diff --git a/collects/plot/demos/demo-8.ss b/collects/plot/demos/demo-8.ss index a7f650c4d9..120fa236e5 100644 --- a/collects/plot/demos/demo-8.ss +++ b/collects/plot/demos/demo-8.ss @@ -1,4 +1,4 @@ -(require (lib "plot.ss" "plot")) +(require plot) (define (trig x y) (* (sin x) (sin y))) diff --git a/collects/plot/demos/fit-demo-1.ss b/collects/plot/demos/fit-demo-1.ss index 1128b246d7..01a947fd5a 100644 --- a/collects/plot/demos/fit-demo-1.ss +++ b/collects/plot/demos/fit-demo-1.ss @@ -1,4 +1,4 @@ -(require (lib "plot.ss" "plot")) +(require plot) (define x-vals (build-list 15 (lambda (x) x) )) (define errors (build-list 15 (lambda (x) 1))) diff --git a/collects/plot/demos/fit-demo-2.ss b/collects/plot/demos/fit-demo-2.ss index 3a6b5a95f6..5de26f2043 100644 --- a/collects/plot/demos/fit-demo-2.ss +++ b/collects/plot/demos/fit-demo-2.ss @@ -42,7 +42,7 @@ (37.7 -19.8 3.5))) ; first column is time data, second is result, third is error. to parse them out... -(require (lib "math.ss")) +(require mzlib/math) (define times (map car raw-data)) @@ -53,7 +53,7 @@ (define experemental-data (map list->vector raw-data)) -(require (lib "plot.ss" "plot")) +(require plot) (plot (mix (points experemental-data (symbol 'circle)) (error-bars experemental-data)) diff --git a/collects/plot/doc.txt b/collects/plot/doc.txt index 1afe5ca67f..2bf290e09e 100644 --- a/collects/plot/doc.txt +++ b/collects/plot/doc.txt @@ -113,8 +113,8 @@ PLoT collection: Quick Start could do the following: ; Load the required modules -(require (lib "class.ss") - (lib "etc.ss") +(require mzlib/class + mzlib/etc (lib "plot-extend.ss" "plot")) diff --git a/collects/plot/fit-low-level.ss b/collects/plot/fit-low-level.ss index e3f0f025f1..6d55629914 100644 --- a/collects/plot/fit-low-level.ss +++ b/collects/plot/fit-low-level.ss @@ -1,5 +1,5 @@ (module fit-low-level mzscheme - (require (lib "foreign.ss") (lib "runtime-path.ss")) + (require mzlib/foreign mzlib/runtime-path) (unsafe!) (define-runtime-path libfit-path diff --git a/collects/plot/fit.ss b/collects/plot/fit.ss index 54efd7e670..a3b388a7a1 100644 --- a/collects/plot/fit.ss +++ b/collects/plot/fit.ss @@ -1,6 +1,6 @@ (module fit mzscheme - (require (lib "math.ss" "plot")) - (require (lib "fit-low-level.ss" "plot")) + (require plot/math) + (require plot/fit-low-level) ; a structure contain a the results of a curve-fit (define-struct fit-result ( @@ -49,10 +49,6 @@ (caddr result) (lambda args (apply function(append args (car result))))))))) - (provide fit-int (struct fit-result (rms - variance - names - final-params - std-error - std-error-percent - function)))) + (provide fit-int + (struct fit-result (rms variance names final-params + std-error std-error-percent function)))) diff --git a/collects/plot/math.ss b/collects/plot/math.ss index 75b48857dd..ed4e94ee32 100644 --- a/collects/plot/math.ss +++ b/collects/plot/math.ss @@ -2,10 +2,7 @@ ; Usefull mathy functions for plots - (require - (lib "list.ss") - (lib "etc.ss") - (lib "math.ss")) + (require mzlib/list mzlib/etc mzlib/math) ; using vectors for n-dimentional points diff --git a/collects/plot/plot-extend.ss b/collects/plot/plot-extend.ss index 6a1fce920c..d538eeeadc 100644 --- a/collects/plot/plot-extend.ss +++ b/collects/plot/plot-extend.ss @@ -1,12 +1,6 @@ (module plot-extend mzscheme - (require - (lib "class.ss") - (lib "view.ss" "plot") - (lib "renderer-helpers.ss" "plot") - ) - - - + (require mzlib/class plot/view plot/renderer-helpers) + (define-syntax (define-plot-type stx) (define (join-identifier prefix ident) (datum->syntax-object @@ -113,6 +107,6 @@ body))))))])))])) (provide define-plot-type - (all-from (lib "view.ss" "plot")) - (all-from (lib "renderer-helpers.ss" "plot")))) + (all-from plot/view) + (all-from plot/renderer-helpers))) diff --git a/collects/plot/plplot.ss b/collects/plot/plplot.ss index 87997790c2..109a76a536 100644 --- a/collects/plot/plplot.ss +++ b/collects/plot/plplot.ss @@ -1,6 +1,6 @@ (module plplot mzscheme -(require (lib "etc.ss") (lib "list.ss") (lib "foreign.ss") (lib "runtime-path.ss")) +(require mzlib/etc mzlib/list mzlib/foreign mzlib/runtime-path) (unsafe!) (define-runtime-path plplot-path diff --git a/collects/plot/pre-installer.ss b/collects/plot/pre-installer.ss index 191dc95302..5c72f45747 100644 --- a/collects/plot/pre-installer.ss +++ b/collects/plot/pre-installer.ss @@ -1,7 +1,6 @@ (module pre-installer mzscheme - (require (lib "etc.ss") (lib "file.ss") (lib "list.ss") - (lib "file.ss" "dynext") (lib "link.ss" "dynext") - (lib "compile.ss" "dynext")) + (require mzlib/etc mzlib/file mzlib/list + dynext/file dynext/link dynext/compile) (define top-dir (this-expression-source-directory)) (define src-dir (build-path top-dir "src")) diff --git a/collects/plot/renderer-helpers.ss b/collects/plot/renderer-helpers.ss index 76419d8659..d224484710 100644 --- a/collects/plot/renderer-helpers.ss +++ b/collects/plot/renderer-helpers.ss @@ -3,10 +3,7 @@ ; Contains the helpers for the plot-renderers package ; usefull for building your own renderers - (require - (lib "list.ss") - (lib "math.ss") - (lib "math.ss" "plot")) + (require mzlib/list mzlib/math plot/math) ; sample-size: number number number -> number (define (sample-size samples x-min x-max) @@ -56,8 +53,6 @@ (provide (all-defined)) - (require - (lib "class.ss") - (lib "etc.ss")) + (require mzlib/class mzlib/etc) ) diff --git a/collects/plot/renderers.ss b/collects/plot/renderers.ss index ffadf2a3c7..f5b8c51942 100644 --- a/collects/plot/renderers.ss +++ b/collects/plot/renderers.ss @@ -1,9 +1,5 @@ (module renderers mzscheme - (require - (lib "math.ss" "plot") - (lib "renderer-helpers.ss" "plot") - (lib "class.ss") - (lib "plot-extend.ss" "plot")) + (require plot/math plot/renderer-helpers mzlib/class plot/plot-extend) ;line : (number -> number) [number] [symbol] [number] -> (2dplotview -> nothing) (define-plot-type line diff --git a/collects/plot/view.ss b/collects/plot/view.ss index d0f4479bfa..be361efd42 100644 --- a/collects/plot/view.ss +++ b/collects/plot/view.ss @@ -1,16 +1,8 @@ (module view mzscheme - (require - (lib "plplot.ss" "plot") - (lib "math.ss" "plot") - (lib "class.ss") - (lib "file.ss") - (lib "mred.ss" "mred") - (lib "math.ss") - ;(lib "4.ss" "srfi") - ) + (require plot/plplot plot/math mzlib/class mzlib/file mred mzlib/math) ;; including suggested fix from Doug Williams - + ; macro for creating a field in a class with a getter and a setter (define-syntax (fields-with-accessors stx) (define (join-identifier prefix ident) diff --git a/collects/preprocessor/mzpp-run.ss b/collects/preprocessor/mzpp-run.ss index df56c9771a..7362152a5f 100644 --- a/collects/preprocessor/mzpp-run.ss +++ b/collects/preprocessor/mzpp-run.ss @@ -1,9 +1,6 @@ (module mzpp-run mzscheme -(require (lib "mzpp.ss" "preprocessor") - (lib "pp-run.ss" "preprocessor") - (lib "cmdline.ss") - (lib "process.ss")) +(require preprocessor/mzpp preprocessor/pp-run mzlib/cmdline mzlib/process) (let ([output #f] [run-cmd #f]) (command-line diff --git a/collects/preprocessor/mzpp.ss b/collects/preprocessor/mzpp.ss index bb1857e842..0d36fc840d 100644 --- a/collects/preprocessor/mzpp.ss +++ b/collects/preprocessor/mzpp.ss @@ -1,7 +1,7 @@ (module mzpp mzscheme -(require (lib "pp-utils.ss" "preprocessor")) -(provide (all-from (lib "pp-utils.ss" "preprocessor"))) +(require preprocessor/pp-utils) +(provide (all-from preprocessor/pp-utils)) (provide beg-mark end-mark skip-to no-spaces? debug?) (define beg-mark (make-parameter "<<")) @@ -170,7 +170,7 @@ (provide preprocess) (define (preprocess . files) (read-case-sensitive #t) - (namespace-require '(lib "mzpp.ss" "preprocessor")) + (namespace-require 'preprocessor/mzpp) (do-evals) (run files)) diff --git a/collects/preprocessor/mztext-run.ss b/collects/preprocessor/mztext-run.ss index bc1a0494e7..07d9e20d15 100644 --- a/collects/preprocessor/mztext-run.ss +++ b/collects/preprocessor/mztext-run.ss @@ -1,8 +1,6 @@ (module mztext-run mzscheme -(require (lib "mztext.ss" "preprocessor") - (lib "pp-run.ss" "preprocessor") - (lib "cmdline.ss")) +(require preprocessor/mztext preprocessor/pp-run mzlib/cmdline) (let ([output #f] [run-cmd #f]) (command-line diff --git a/collects/preprocessor/mztext.ss b/collects/preprocessor/mztext.ss index 473a6f6c79..4dc7aa05f0 100644 --- a/collects/preprocessor/mztext.ss +++ b/collects/preprocessor/mztext.ss @@ -1,7 +1,7 @@ (module mztext mzscheme -(require (lib "string.ss") (lib "port.ss") (lib "pp-utils.ss" "preprocessor")) -(provide (all-from (lib "pp-utils.ss" "preprocessor"))) +(require mzlib/string mzlib/port preprocessor/pp-utils) +(provide (all-from preprocessor/pp-utils)) ;;============================================================================= ;; Composite port @@ -308,7 +308,7 @@ (define (initialize) (read-case-sensitive #t) (unless (command-marker) (command-marker "@")) - (namespace-require '(lib "mztext.ss" "preprocessor")) + (namespace-require 'preprocessor/mztext) (do-evals)) (define (run) diff --git a/collects/preprocessor/pp-run.ss b/collects/preprocessor/pp-run.ss index e353f321c7..3708e89945 100644 --- a/collects/preprocessor/pp-run.ss +++ b/collects/preprocessor/pp-run.ss @@ -1,6 +1,6 @@ (module pp-run mzscheme -(require (lib "process.ss")) +(require mzlib/process) (provide more-help) (define (more-help name top-line) diff --git a/collects/profj/build-info.ss b/collects/profj/build-info.ss index 5a62da8b19..e43ec60bf5 100644 --- a/collects/profj/build-info.ss +++ b/collects/profj/build-info.ss @@ -1,6 +1,6 @@ (module build-info mzscheme - (require (lib "class.ss") (lib "file.ss") (lib "list.ss") + (require mzlib/class mzlib/file mzlib/list "ast.ss" "types.ss" "error-messaging.ss" "parameters.ss" "restrictions.ss" "parser.ss" "profj-pref.ss") @@ -452,7 +452,7 @@ (directory-list (build-path (dir-path-path base-dir) "compiled"))))))) (lang-classes (get-classes lang-dir)) (test-classes (when (testcase-ext?) (get-classes test-dir))) - (array (datum->syntax-object #f `(lib "array.ss" "profj" "libs" "java" "lang") #f)) + (array (datum->syntax-object #f `(lib "array.ss" "profj/libs/java/lang") #f)) (add (lambda (path classes dir array?) diff --git a/collects/profj/check.ss b/collects/profj/check.ss index fdbd189f15..76f8d91852 100644 --- a/collects/profj/check.ss +++ b/collects/profj/check.ss @@ -7,8 +7,8 @@ "restrictions.ss" "profj-pref.ss" "build-info.ss" - (lib "class.ss") (lib "list.ss") (lib "file.ss") - (prefix srfi: (lib "1.ss" "srfi")) (lib "string.ss")) + mzlib/class mzlib/list mzlib/file + (prefix srfi: srfi/1) mzlib/string) (provide check-defs check-interactions-types) ;symbol-remove-last: symbol->symbol diff --git a/collects/profj/comb-parsers/java-signatures.scm b/collects/profj/comb-parsers/java-signatures.scm index 6879d023fd..a8396dba84 100644 --- a/collects/profj/comb-parsers/java-signatures.scm +++ b/collects/profj/comb-parsers/java-signatures.scm @@ -1,10 +1,10 @@ (module java-signatures mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) - (require (lib "lex.ss" "parser-tools") + (require parser-tools/lex (lib "combinator-unit.ss" "combinator-parser") - (lib "string.ss")) + mzlib/string) (provide (all-defined)) diff --git a/collects/profj/comb-parsers/parser-units.scm b/collects/profj/comb-parsers/parser-units.scm index 65ad10310d..2426062504 100644 --- a/collects/profj/comb-parsers/parser-units.scm +++ b/collects/profj/comb-parsers/parser-units.scm @@ -1,11 +1,11 @@ (module parser-units lazy - (require (lib "unit.ss")) + (require mzlib/unit) - (require (lib "lex.ss" "parser-tools") + (require parser-tools/lex (lib "combinator-unit.ss" "combinator-parser") "java-signatures.scm" - (lib "string.ss")) + mzlib/string) (define-signature language-forms^ (program statement expression field interact)) ;value-type method-type)) diff --git a/collects/profj/comb-parsers/parsers.scm b/collects/profj/comb-parsers/parsers.scm index 3aeb8140b5..ada00d235e 100644 --- a/collects/profj/comb-parsers/parsers.scm +++ b/collects/profj/comb-parsers/parsers.scm @@ -2,9 +2,9 @@ (require "parser-units.scm" (only (lib "force.ss" "lazy") !!!) (only (lib "combinator-unit.ss" "combinator-parser") err^) - (lib "unit.ss") - #;(lib "lex.ss" "parser-tools") - #;(prefix re: (lib "lex-sre.ss" "parser-tools"))) + mzlib/unit + #;parser-tools/lex + #;(prefix re: parser-tools/lex-sre)) (provide parse-beginner parse-intermediate parse-intermediate+access parse-advanced parse-beginner-interact parse-intermediate-interact parse-advanced-interact) diff --git a/collects/profj/compile.ss b/collects/profj/compile.ss index 8c56d30000..8440158ef2 100644 --- a/collects/profj/compile.ss +++ b/collects/profj/compile.ss @@ -1,8 +1,8 @@ (module compile mzscheme (require "parameters.ss" "ast.ss" "types.ss" "parser.ss" "build-info.ss" "check.ss" "to-scheme.ss" "profj-pref.ss") - (require (lib "list.ss") - (lib "file.ss") - (lib "class.ss")) + (require mzlib/list + mzlib/file + mzlib/class) (provide compile-java compile-interactions compile-files compile-ast compile-interactions-ast compilation-unit-code compilation-unit-contains set-compilation-unit-code! diff --git a/collects/profj/display-java.ss b/collects/profj/display-java.ss index 8bd2ad32c1..ff62be53da 100644 --- a/collects/profj/display-java.ss +++ b/collects/profj/display-java.ss @@ -1,12 +1,12 @@ (module display-java mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "Object.ss" "profj" "libs" "java" "lang") - (lib "String.ss" "profj" "libs" "java" "lang") - (lib "Throwable.ss" "profj" "libs" "java" "lang") - (lib "array.ss" "profj" "libs" "java" "lang")) + (require mzlib/class + mred + framework + profj/libs/java/lang/Object + profj/libs/java/lang/String + profj/libs/java/lang/Throwable + profj/libs/java/lang/array) (provide format-java-value make-format-style make-java-snip) diff --git a/collects/profj/info.ss b/collects/profj/info.ss index 9360155eae..b6ec5099f1 100644 --- a/collects/profj/info.ss +++ b/collects/profj/info.ss @@ -1,6 +1,6 @@ #lang setup/infotab -(require string-constants/string-constant) +(require string-constants) (define name "ProfessorJ") (define tools (list (list "tool.ss") (list "test-tool.ss"))) (define tool-names '("ProfessorJ" "ProfessorJ Testing")) diff --git a/collects/profj/libs/java/io/Serializable.ss b/collects/profj/libs/java/io/Serializable.ss index 2312d4c007..126a5a2f98 100644 --- a/collects/profj/libs/java/io/Serializable.ss +++ b/collects/profj/libs/java/io/Serializable.ss @@ -1,6 +1,6 @@ #cs (module Serializable mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide (all-defined)) diff --git a/collects/profj/libs/java/lang/Comparable.ss b/collects/profj/libs/java/lang/Comparable.ss index d50cc78cbd..ef8ae5d1f8 100644 --- a/collects/profj/libs/java/lang/Comparable.ss +++ b/collects/profj/libs/java/lang/Comparable.ss @@ -1,5 +1,5 @@ #cs (module Comparable mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide (all-defined)) (define Comparable (interface () compareTo-java.lang.Object))) diff --git a/collects/profj/libs/java/lang/Double-native-methods.ss b/collects/profj/libs/java/lang/Double-native-methods.ss index 753ad3fb1e..eaf25fe614 100644 --- a/collects/profj/libs/java/lang/Double-native-methods.ss +++ b/collects/profj/libs/java/lang/Double-native-methods.ss @@ -1,7 +1,7 @@ #cs (module Double-native-methods mzscheme - (require (lib "class.ss")) + (require mzlib/class) (require "Throwable.ss" "String.ss" "NumberFormatException.ss" "NullPointerException.ss" "RuntimeException.ss") diff --git a/collects/profj/libs/java/lang/Math-native-methods.ss b/collects/profj/libs/java/lang/Math-native-methods.ss index 572b74cfc7..dc592be185 100644 --- a/collects/profj/libs/java/lang/Math-native-methods.ss +++ b/collects/profj/libs/java/lang/Math-native-methods.ss @@ -1,6 +1,6 @@ #cs (module Math-native-methods mzscheme - (require (lib "math.ss")) + (require mzlib/math) (define-syntax (define/provide stx) (syntax-case stx () diff --git a/collects/profj/libs/java/lang/Object-composite.ss b/collects/profj/libs/java/lang/Object-composite.ss index cc81b5cdcb..ce9c498d7b 100644 --- a/collects/profj/libs/java/lang/Object-composite.ss +++ b/collects/profj/libs/java/lang/Object-composite.ss @@ -1,7 +1,7 @@ (module Object-composite mzscheme - (require (lib "class.ss") - (prefix c: (lib "contract.ss")) + (require mzlib/class + (prefix c: mzlib/contract) (lib "errortrace-lib.ss" "errortrace") (lib "Comparable.ss" "profj" "libs" "java" "lang") (lib "Serializable.ss" "profj" "libs" "java" "io")) diff --git a/collects/profj/libs/java/lang/compile-lang.ss b/collects/profj/libs/java/lang/compile-lang.ss index 7c1d06af4d..3820728e28 100644 --- a/collects/profj/libs/java/lang/compile-lang.ss +++ b/collects/profj/libs/java/lang/compile-lang.ss @@ -1,9 +1,9 @@ #cs (module compile-lang mzscheme (require (lib "compile.ss" "profj") - (lib "list.ss") - (lib "file.ss") - (lib "pretty.ss")) + mzlib/list + mzlib/file + mzlib/pretty) (provide compile-exceptions make-compilation-path) diff --git a/collects/profj/libs/java/runtime.scm b/collects/profj/libs/java/runtime.scm index c6a1131cda..1f9d0527b5 100644 --- a/collects/profj/libs/java/runtime.scm +++ b/collects/profj/libs/java/runtime.scm @@ -6,11 +6,11 @@ (module runtime mzscheme - (require (lib "class.ss") - (lib "list.ss") - (lib "Object.ss" "profj" "libs" "java" "lang") - (lib "String.ss" "profj" "libs" "java" "lang") - (lib "Throwable.ss" "profj" "libs" "java" "lang") + (require mzlib/class + mzlib/list + profj/libs/java/lang/Object + profj/libs/java/lang/String + profj/libs/java/lang/Throwable (lib "ArithmeticException.ss" "profj" "libs" "java" "lang") (lib "ClassCastException.ss" "profj" "libs" "java" "lang") (lib "NullPointerException.ss" "profj" "libs" "java" "lang") diff --git a/collects/profj/parameters.ss b/collects/profj/parameters.ss index fe85c55578..4904d35be3 100644 --- a/collects/profj/parameters.ss +++ b/collects/profj/parameters.ss @@ -1,6 +1,6 @@ (module parameters mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide (all-defined)) diff --git a/collects/profj/parser.ss b/collects/profj/parser.ss index a021879440..3f801f16f3 100644 --- a/collects/profj/parser.ss +++ b/collects/profj/parser.ss @@ -12,8 +12,8 @@ "ast.ss" "parameters.ss") - (require (all-except (lib "lex.ss" "parser-tools") input-port) - (lib "readerr.ss" "syntax") + (require (all-except parser-tools/lex input-port) + syntax/readerr (lib "force.ss" "lazy")) (provide parse parse-interactions parse-expression parse-type parse-name lex-stream) diff --git a/collects/profj/parsers/advanced-parser.ss b/collects/profj/parsers/advanced-parser.ss index 4b41d041f2..12d9813ac3 100644 --- a/collects/profj/parsers/advanced-parser.ss +++ b/collects/profj/parsers/advanced-parser.ss @@ -5,9 +5,9 @@ "../ast.ss" "../parameters.ss") - (require (lib "yacc.ss" "parser-tools") - (all-except (lib "lex.ss" "parser-tools") input-port) - (lib "readerr.ss" "syntax")) + (require parser-tools/yacc + (all-except parser-tools/lex input-port) + syntax/readerr) ;(require (lib "build-grammar.ss" "tester")) diff --git a/collects/profj/parsers/beginner-parser.ss b/collects/profj/parsers/beginner-parser.ss index 23b3ec14b7..9698794890 100644 --- a/collects/profj/parsers/beginner-parser.ss +++ b/collects/profj/parsers/beginner-parser.ss @@ -5,10 +5,10 @@ "../ast.ss" "../parameters.ss") - (require (lib "yacc.ss" "parser-tools") - (all-except (lib "lex.ss" "parser-tools") input-port) - (lib "readerr.ss" "syntax") - (prefix class: (lib "class.ss"))) + (require parser-tools/yacc + (all-except parser-tools/lex input-port) + syntax/readerr + (prefix class: mzlib/class)) ;(require (lib "build-grammar.ss" "tester")) diff --git a/collects/profj/parsers/full-parser.ss b/collects/profj/parsers/full-parser.ss index 69d8528a4b..75858fcbfb 100644 --- a/collects/profj/parsers/full-parser.ss +++ b/collects/profj/parsers/full-parser.ss @@ -5,9 +5,9 @@ "../ast.ss" "../parameters.ss") - (require (lib "yacc.ss" "parser-tools") - (all-except (lib "lex.ss" "parser-tools") input-port) - (lib "readerr.ss" "syntax")) + (require parser-tools/yacc + (all-except parser-tools/lex input-port) + syntax/readerr) (provide parse-full parse-full-interactions parse-full-expression parse-full-type) diff --git a/collects/profj/parsers/general-parsing.ss b/collects/profj/parsers/general-parsing.ss index 0e02ea0557..cef8abedda 100644 --- a/collects/profj/parsers/general-parsing.ss +++ b/collects/profj/parsers/general-parsing.ss @@ -1,10 +1,10 @@ #cs (module general-parsing mzscheme - (require (all-except (lib "lex.ss" "parser-tools") input-port) - (lib "string.ss") - (prefix class: (lib "class.ss")) - (lib "list.ss")) + (require (all-except parser-tools/lex input-port) + mzlib/string + (prefix class: mzlib/class) + mzlib/list) (require "../ast.ss" "../parameters.ss" "lexer.ss") (provide (all-defined)) diff --git a/collects/profj/parsers/intermediate-access-parser.ss b/collects/profj/parsers/intermediate-access-parser.ss index c014d34d71..20dc2faa7b 100644 --- a/collects/profj/parsers/intermediate-access-parser.ss +++ b/collects/profj/parsers/intermediate-access-parser.ss @@ -5,9 +5,9 @@ "../ast.ss" "../parameters.ss") - (require (lib "yacc.ss" "parser-tools") - (all-except (lib "lex.ss" "parser-tools") input-port) - (lib "readerr.ss" "syntax")) + (require parser-tools/yacc + (all-except parser-tools/lex input-port) + syntax/readerr) (require-for-syntax "lexer.ss") ;(require (lib "build-grammar.ss" "tester")) diff --git a/collects/profj/parsers/intermediate-parser.ss b/collects/profj/parsers/intermediate-parser.ss index c77ad05628..6276cc2e6b 100644 --- a/collects/profj/parsers/intermediate-parser.ss +++ b/collects/profj/parsers/intermediate-parser.ss @@ -5,9 +5,9 @@ "../ast.ss" "../parameters.ss") - (require (lib "yacc.ss" "parser-tools") - (all-except (lib "lex.ss" "parser-tools") input-port) - (lib "readerr.ss" "syntax")) + (require parser-tools/yacc + (all-except parser-tools/lex input-port) + syntax/readerr) (require-for-syntax "lexer.ss") ;(require (lib "build-grammar.ss" "tester")) diff --git a/collects/profj/parsers/lexer.ss b/collects/profj/parsers/lexer.ss index 62ee26eef6..64e477d652 100644 --- a/collects/profj/parsers/lexer.ss +++ b/collects/profj/parsers/lexer.ss @@ -4,14 +4,14 @@ ;; chapter 3. ;; Lacks all Unicode support - (require (lib "class.ss") - (lib "lex.ss" "parser-tools") - (prefix re: (lib "lex-sre.ss" "parser-tools")) + (require mzlib/class + parser-tools/lex + (prefix re: parser-tools/lex-sre) (lib "parameters.ss" "profj")) (define (image-snip%) (if (mred?) - (dynamic-require '(lib "mred.ss" "mred") 'image-snip%) + (dynamic-require 'mred 'image-snip%) (class object% (super-instantiate ())))) (provide (all-defined-except image-snip%)) diff --git a/collects/profj/parsers/parse-error.ss b/collects/profj/parsers/parse-error.ss index e27fe6aba2..1d0d3bf000 100644 --- a/collects/profj/parsers/parse-error.ss +++ b/collects/profj/parsers/parse-error.ss @@ -2,9 +2,9 @@ (require "lexer.ss" "general-parsing.ss" "../parameters.ss" - (lib "etc.ss") - (lib "readerr.ss" "syntax") - (all-except (lib "lex.ss" "parser-tools") input-port)) + mzlib/etc + syntax/readerr + (all-except parser-tools/lex input-port)) (provide find-beginner-error find-beginner-error-interactions find-beginner-error-expression find-beginner-error-type diff --git a/collects/profj/profj-pref.ss b/collects/profj/profj-pref.ss index 130508bad1..6b5f46b677 100644 --- a/collects/profj/profj-pref.ss +++ b/collects/profj/profj-pref.ss @@ -1,7 +1,7 @@ (module profj-pref mzscheme - (require (lib "file.ss") - (lib "list.ss")) + (require mzlib/file + mzlib/list) (provide reset-classpath add-to-classpath get-classpath) diff --git a/collects/profj/profj-testing.ss b/collects/profj/profj-testing.ss index c32a7439af..88d1cb4861 100644 --- a/collects/profj/profj-testing.ss +++ b/collects/profj/profj-testing.ss @@ -3,7 +3,7 @@ (require (lib "compile.ss" "profj") (lib "parameters.ss" "profj") (lib "display-java.ss" "profj") - (lib "class.ss")) + mzlib/class) (define report-expected-error-messages (make-parameter #t)) @@ -95,9 +95,9 @@ (format "Test ~a: Exception raised for ~a : ~a" msg ent (exn-message exn)) (interaction-msgs))))))]) (let ((new-val (eval `(begin - (require (lib "class.ss") + (require mzlib/class (prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java")) - (prefix c: (lib "contract.ss"))) + (prefix c: mzlib/contract)) ,(compile-interactions st st type-recs level))))) (when (eq? val 'error) (missed-expected-errors (add1 (missed-expected-errors))) @@ -143,7 +143,7 @@ (eval-modules (compile-java 'port 'port level #f def-st def-st type-recs)) (let ((vals (map (lambda (ex-val) (let ((st (open-input-string ex-val))) - (eval `(begin (require (lib "class.ss") + (eval `(begin (require mzlib/class (prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java"))) ,(compile-interactions st st type-recs level))))) val))) @@ -178,7 +178,7 @@ (lambda (exn) (list 'interact #f (exn-message exn)))]) (let* ((get-val (lambda (v-st v-pe) - (eval `(begin (require (lib "class.ss")) + (eval `(begin (require mzlib/class) (require (prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java"))) ,(compile-interactions v-st v-st type-recs level))))) (i-st (open-input-string interact)) diff --git a/collects/profj/tester.scm b/collects/profj/tester.scm index 23031bf625..f9b9ff2473 100644 --- a/collects/profj/tester.scm +++ b/collects/profj/tester.scm @@ -1,14 +1,14 @@ (module tester mzscheme - (require (lib "mred.ss" "mred") + (require mred (lib "tool.ss" "drscheme") - (prefix u: (lib "unit.ss")) - (lib "framework.ss" "framework") - (lib "string-constant.ss" "string-constants") - (lib "class.ss") - (lib "list.ss") - (lib "file.ss") - (lib "etc.ss")) + (prefix u: mzlib/unit) + framework + string-constants + mzlib/class + mzlib/list + mzlib/file + mzlib/etc) (require "ast.ss" "display-java.ss" "parameters.ss") diff --git a/collects/profj/to-scheme.ss b/collects/profj/to-scheme.ss index 6cb42dff5d..fb46a743a3 100644 --- a/collects/profj/to-scheme.ss +++ b/collects/profj/to-scheme.ss @@ -4,9 +4,9 @@ "name-utils.scm" "graph-scc.ss" "parameters.ss" - (lib "class.ss") - (lib "list.ss") - (lib "etc.ss")) + mzlib/class + mzlib/list + mzlib/etc) (provide translate-program translate-interactions (struct compilation-unit (contains code locations depends))) @@ -388,9 +388,9 @@ (reqs (filter-reqs group-reqs defs type-recs))) (values (if (> (length translated-defs) 1) (cons (make-syntax #f `(module ,(module-name) mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java")) - (prefix c: (lib "contract.ss")) + (prefix c: mzlib/contract) ,@(remove-dup-syntax (translate-require reqs type-recs))) ,@(map car translated-defs)) #f) @@ -400,9 +400,9 @@ (symbol->string (module-name)) "")) mzscheme - (require (lib "class.ss") + (require mzlib/class (prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java")) - (prefix c: (lib "contract.ss")) + (prefix c: mzlib/contract) ,@(remove-dup-syntax (translate-require (map (lambda (r) (list (def-file (car defs)) r)) (def-uses (car defs))) diff --git a/collects/profj/tool.ss b/collects/profj/tool.ss index 1d7faef30c..2865bd7ec9 100644 --- a/collects/profj/tool.ss +++ b/collects/profj/tool.ss @@ -1,15 +1,16 @@ (module tool scheme/base - (require (lib "tool.ss" "drscheme") (lib "contract.ss") - (lib "mred.ss" "mred") (lib "framework.ss" "framework") - (lib "errortrace-lib.ss" "errortrace") - (prefix-in u: (lib "unit.ss")) + (require drscheme/tool mzlib/contract + mred framework + errortrace/errortrace-lib + (prefix-in u: mzlib/unit) scheme/file - (lib "include-bitmap.ss" "mrlib") (lib "etc.ss") - (lib "class.ss") - (lib "string-constant.ss" "string-constants") - (lib "Object.ss" "profj" "libs" "java" "lang") (lib "array.ss" "profj" "libs" "java" "lang") - (lib "String.ss" "profj" "libs" "java" "lang")) - (require "compile.ss" "parameters.ss" "parsers/lexer.ss" "parser.ss" + mrlib/include-bitmap + mzlib/etc + mzlib/class + string-constants + profj/libs/java/lang/Object profj/libs/java/lang/array + profj/libs/java/lang/String) + (require "compile.ss" "parameters.ss" "parsers/lexer.ss" "parser.ss" (except-in "ast.ss" for) "tester.scm" "display-java.ss") @@ -744,11 +745,11 @@ (if (syntax? s) (namespace-syntax-introduce s) s)) (define/public (on-execute settings run-in-user-thread) - (dynamic-require '(lib "Object.ss" "profj" "libs" "java" "lang") #f) - (let ([obj-path ((current-module-name-resolver) '(lib "Object.ss" "profj" "libs" "java" "lang") #f #f)] - [string-path ((current-module-name-resolver) '(lib "String.ss" "profj" "libs" "java" "lang") #f #f)] - [class-path ((current-module-name-resolver) '(lib "class.ss") #f #f)] - [mred-path ((current-module-name-resolver) '(lib "mred.ss" "mred") #f #f)] + (dynamic-require 'profj/libs/java/lang/Object #f) + (let ([obj-path ((current-module-name-resolver) 'profj/libs/java/lang/Object #f #f)] + [string-path ((current-module-name-resolver) 'profj/libs/java/lang/String #f #f)] + [class-path ((current-module-name-resolver) 'mzlib/class #f #f)] + [mred-path ((current-module-name-resolver) 'mred #f #f)] [n (current-namespace)] [e (current-eventspace)]) (test-ext? (profj-settings-allow-check? settings)) @@ -850,7 +851,7 @@ (namespace-require class-path) (namespace-require mred-path) (namespace-require '(prefix javaRuntime: (lib "runtime.scm" "profj" "libs" "java"))) - (namespace-require '(prefix c: (lib "contract.ss"))) + (namespace-require '(prefix c: mzlib/contract)) )))))) #;(define/public (render-value value settings port); port-write) diff --git a/collects/profj/types.ss b/collects/profj/types.ss index 97d6f41173..ff97855b06 100644 --- a/collects/profj/types.ss +++ b/collects/profj/types.ss @@ -1,11 +1,11 @@ (module types mzscheme (require - (only (lib "1.ss" "srfi") lset-intersection) - (lib "etc.ss") - (lib "pretty.ss") - (lib "list.ss") - (lib "class.ss") + (only srfi/1 lset-intersection) + mzlib/etc + mzlib/pretty + mzlib/list + mzlib/class "ast.ss") (provide (all-defined-except number-assign-conversions remove-dups meth-member? diff --git a/collects/profjWizard/assoc-list.scm b/collects/profjWizard/assoc-list.scm index 058c305761..947e4ab557 100644 --- a/collects/profjWizard/assoc-list.scm +++ b/collects/profjWizard/assoc-list.scm @@ -1,6 +1,6 @@ (module assoc-list mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide assoc%) diff --git a/collects/profjWizard/aux-class.scm b/collects/profjWizard/aux-class.scm index c21cea7979..d4393f5146 100644 --- a/collects/profjWizard/aux-class.scm +++ b/collects/profjWizard/aux-class.scm @@ -1,8 +1,8 @@ (module aux-class mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide - (all-from (lib "class.ss")) + (all-from mzlib/class) define/abstract ; (define/abstract ) :: ) diff --git a/collects/profjWizard/aux-contract.scm b/collects/profjWizard/aux-contract.scm index 255a2fc774..1bc52801c7 100644 --- a/collects/profjWizard/aux-contract.scm +++ b/collects/profjWizard/aux-contract.scm @@ -1,7 +1,7 @@ (module aux-contract mzscheme (require-for-syntax (file "aux-syntax.scm")) - (require (lib "contract.ss")) + (require mzlib/contract) (provide define-as-contract ;; diff --git a/collects/profjWizard/aux-syntax.scm b/collects/profjWizard/aux-syntax.scm index 7f8638cf43..c4c1bb52cc 100644 --- a/collects/profjWizard/aux-syntax.scm +++ b/collects/profjWizard/aux-syntax.scm @@ -6,7 +6,7 @@ cap-id ; Identifier -> Identifier ) - (require (lib "string.ss")) + (require mzlib/string) (define (prefix-id-suffix prefix e suffix) (datum->syntax-object diff --git a/collects/profjWizard/class.scm b/collects/profjWizard/class.scm index 54ac7cdc14..5af0d3ccb4 100644 --- a/collects/profjWizard/class.scm +++ b/collects/profjWizard/class.scm @@ -1,10 +1,10 @@ (module class mzscheme (require "data-defs.scm" - (lib "contract.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "string.ss" "srfi" "13") - (only (lib "1.ss" "srfi") zip)) + mzlib/contract + mzlib/etc + mzlib/list + srfi/13/string + (only srfi/1 zip)) ;; ------------------------------------------------------------------------ (provide/contract diff --git a/collects/profjWizard/data-defs.scm b/collects/profjWizard/data-defs.scm index 1f960e5358..cc8bfc229f 100644 --- a/collects/profjWizard/data-defs.scm +++ b/collects/profjWizard/data-defs.scm @@ -22,7 +22,7 @@ #cs (module data-defs mzscheme - (require (lib "string-constant.ss" "string-constants")) + (require string-constants) ;; Those languages for which methods that satisfy an interface ;; don't have to be decorated with public --- @@ -50,7 +50,7 @@ (define datat1 (make-dt "ATree" methods (list vc1 vc2) "a tree for ints")) (require "aux-contract.scm") - (require (lib "contract.ss")) + (require mzlib/contract) (provide Class ;; flat-contract diff --git a/collects/profjWizard/data-defs0.scm b/collects/profjWizard/data-defs0.scm index 72267a5356..24f5fbf068 100644 --- a/collects/profjWizard/data-defs0.scm +++ b/collects/profjWizard/data-defs0.scm @@ -31,7 +31,7 @@ (require "aux-contract.scm") - (require (lib "contract.ss")) + (require mzlib/contract) (provide Class ;; flat-contract diff --git a/collects/profjWizard/draw-txt.ss b/collects/profjWizard/draw-txt.ss index c1c801f6ea..abb2e8dd42 100644 --- a/collects/profjWizard/draw-txt.ss +++ b/collects/profjWizard/draw-txt.ss @@ -2,9 +2,9 @@ (module draw-txt mzscheme (require "data-defs.scm" "class.scm" - (lib "etc.ss") - (lib "list.ss") - (lib "contract.ss")) + mzlib/etc + mzlib/list + mzlib/contract) (provide/contract [dt-draw (Union . -> . string?)] diff --git a/collects/profjWizard/draw-txt0.ss b/collects/profjWizard/draw-txt0.ss index c75b2b1c58..ff798a87b2 100644 --- a/collects/profjWizard/draw-txt0.ss +++ b/collects/profjWizard/draw-txt0.ss @@ -5,8 +5,8 @@ |# (module draw-txt mzscheme - (require (lib "etc.ss") - (lib "list.ss")) + (require mzlib/etc + mzlib/list) ;; Class (Listof Classes) -> (Listof String) (define (class-union-to-strings utype variants) diff --git a/collects/profjWizard/tool.ss b/collects/profjWizard/tool.ss index a961e73ab7..3cc0ee92c1 100644 --- a/collects/profjWizard/tool.ss +++ b/collects/profjWizard/tool.ss @@ -6,13 +6,13 @@ "data-defs.scm" (lib "tool.ss" "drscheme") (only (lib "drsig.ss" "drscheme" "private") drscheme:language-configuration^) - (lib "framework.ss" "framework") - (lib "mred.ss" "mred") - (lib "unit.ss") - (lib "etc.ss") - (lib "class.ss") - (lib "string-constant.ss" "string-constants") - (lib "contract.ss")) + framework + mred + mzlib/unit + mzlib/etc + mzlib/class + string-constants + mzlib/contract) (provide tool@) diff --git a/collects/profjWizard/union.ss b/collects/profjWizard/union.ss index 81145422df..a2d83aaa06 100644 --- a/collects/profjWizard/union.ss +++ b/collects/profjWizard/union.ss @@ -2,9 +2,9 @@ (module union mzscheme (require "data-defs.scm" "class.scm" - (lib "contract.ss") - (lib "etc.ss") - (lib "list.ss")) + mzlib/contract + mzlib/etc + mzlib/list) (provide/contract diff --git a/collects/profjWizard/view.scm b/collects/profjWizard/view.scm index 3af143255f..55ac2c11fa 100644 --- a/collects/profjWizard/view.scm +++ b/collects/profjWizard/view.scm @@ -1,16 +1,16 @@ -(module view mzscheme - +(module view mzscheme + (require "assoc-list.scm" "aux-class.scm" "data-defs.scm" "class.scm" "union.ss" - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "string.ss" "srfi" "13") - (lib "contract.ss")) + mred + mzlib/class + mzlib/etc + mzlib/list + srfi/13/string + mzlib/contract) (provide/contract [get-class-info (opt->* () [Language] [boolean? (union false/c (list/c Class boolean? boolean?))])] diff --git a/collects/profjWizard/view0.scm b/collects/profjWizard/view0.scm index 381fe16484..bc9cf7f4db 100644 --- a/collects/profjWizard/view0.scm +++ b/collects/profjWizard/view0.scm @@ -1,10 +1,10 @@ #cs(module wizard mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "list.ss") - (lib "string.ss" "srfi" "13") - (lib "contract.ss")) + (require mred + mzlib/class + mzlib/etc + mzlib/list + srfi/13/string + mzlib/contract) (require (file "assoc-list.scm") (file "data-defs.scm")) diff --git a/collects/readline/mzrl.ss b/collects/readline/mzrl.ss index 20e9dc8d6b..542f5e7f19 100644 --- a/collects/readline/mzrl.ss +++ b/collects/readline/mzrl.ss @@ -1,6 +1,6 @@ (module mzrl mzscheme -(require (lib "foreign.ss")) (unsafe!) +(require mzlib/foreign) (unsafe!) (provide readline readline-bytes add-history add-history-bytes set-completion-function!) diff --git a/collects/readline/pread.ss b/collects/readline/pread.ss index a9e4ffb0f5..b372f90672 100644 --- a/collects/readline/pread.ss +++ b/collects/readline/pread.ss @@ -1,6 +1,5 @@ (module pread mzscheme - (require (lib "readline.ss" "readline") (lib "file.ss") - (lib "list.ss") (lib "string.ss")) + (require readline/readline mzlib/file mzlib/list mzlib/string) ;; -------------------------------------------------------------------------- ;; Configuration diff --git a/collects/repos-time-stamp/time-stamp.ss b/collects/repos-time-stamp/time-stamp.ss index c88a65f240..43e1fd8af6 100644 --- a/collects/repos-time-stamp/time-stamp.ss +++ b/collects/repos-time-stamp/time-stamp.ss @@ -1,8 +1,8 @@ (module time-stamp mzscheme (require (lib "tool.ss" "drscheme") - (lib "unit.ss") - (lib "framework.ss" "framework")) + mzlib/unit + framework) (require "stamp.ss") diff --git a/collects/scheme/gui/dynamic.ss b/collects/scheme/gui/dynamic.ss index fd895694d3..a107929f6e 100644 --- a/collects/scheme/gui/dynamic.ss +++ b/collects/scheme/gui/dynamic.ss @@ -12,4 +12,4 @@ (define (gui-dynamic-require sym) (parameterize ([current-namespace (namespace-anchor->empty-namespace anchor)]) - (dynamic-require 'mred/mred sym))) + (dynamic-require 'mred sym))) diff --git a/collects/scheme/private/class-events.ss b/collects/scheme/private/class-events.ss index f08011d97e..b70a7f1041 100644 --- a/collects/scheme/private/class-events.ss +++ b/collects/scheme/private/class-events.ss @@ -1,8 +1,8 @@ (module class-events mzscheme - (require-for-syntax (lib "stxparam.ss")) - (require (lib "stxparam.ss")) + (require-for-syntax mzlib/stxparam) + (require mzlib/stxparam) (provide current-class-event-handler define-traced diff --git a/collects/scheme/private/class-internal.ss b/collects/scheme/private/class-internal.ss index 2885f37f1f..1902655045 100644 --- a/collects/scheme/private/class-internal.ss +++ b/collects/scheme/private/class-internal.ss @@ -1,18 +1,18 @@ (module class-internal scheme/base (require (for-syntax scheme/base) - (lib "list.ss") - (lib "etc.ss") - (lib "stxparam.ss") + mzlib/list + mzlib/etc + mzlib/stxparam "class-events.ss" "serialize-structs.ss" - (for-syntax (lib "kerncase.ss" "syntax") - (lib "stx.ss" "syntax") - (lib "name.ss" "syntax") - (lib "context.ss" "syntax") - (lib "define.ss" "syntax") + (for-syntax syntax/kerncase + syntax/stx + syntax/name + syntax/context + syntax/define (lib "boundmap.ss" "syntax" "private") - (lib "stxparam.ss") + mzlib/stxparam "classidmap.ss")) (define insp (current-inspector)) ; for all opaque structures diff --git a/collects/scheme/private/classidmap.ss b/collects/scheme/private/classidmap.ss index 553fb97fea..8358797c7d 100644 --- a/collects/scheme/private/classidmap.ss +++ b/collects/scheme/private/classidmap.ss @@ -1,6 +1,6 @@ (module classidmap mzscheme - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (require-for-template mzscheme "class-events.ss") (define-values (struct:s!t make-s!t s!t? s!t-ref s!t-set!) diff --git a/collects/scheme/private/contract-ds.ss b/collects/scheme/private/contract-ds.ss index 87ca1cf48f..01b4930c09 100644 --- a/collects/scheme/private/contract-ds.ss +++ b/collects/scheme/private/contract-ds.ss @@ -20,12 +20,12 @@ it around flattened out. (require "contract-guts.ss" "contract-opt.ss" "contract-ds-helpers.ss" - (lib "etc.ss")) + mzlib/etc) (require (for-syntax scheme/base) (for-syntax "contract-ds-helpers.ss") (for-syntax "contract-helpers.ss") (for-syntax "contract-opt-guts.ss") - (for-syntax (lib "etc.ss"))) + (for-syntax mzlib/etc)) (provide define-contract-struct diff --git a/collects/scheme/private/contract-opt.ss b/collects/scheme/private/contract-opt.ss index 61005aa25a..d24c1d5e87 100644 --- a/collects/scheme/private/contract-opt.ss +++ b/collects/scheme/private/contract-opt.ss @@ -1,10 +1,10 @@ #lang scheme/base (require "contract-guts.ss" scheme/stxparam - (lib "etc.ss")) + mzlib/etc) (require (for-syntax scheme/base) (for-syntax "contract-opt-guts.ss") - (for-syntax (lib "etc.ss")) + (for-syntax mzlib/etc) (for-syntax scheme/stxparam)) (provide opt/c define-opt/c define/opter opt-stronger-vars-ref) diff --git a/collects/scheme/trait.ss b/collects/scheme/trait.ss index c31d10f189..a06a62f744 100644 --- a/collects/scheme/trait.ss +++ b/collects/scheme/trait.ss @@ -1,11 +1,11 @@ (module trait mzscheme - (require (lib "class.ss") - (lib "list.ss") - (lib "struct.ss")) - (require-for-syntax (lib "list.ss") - (lib "stx.ss" "syntax") - (lib "boundmap.ss" "syntax") - (lib "kerncase.ss" "syntax") + (require mzlib/class + mzlib/list + mzlib/struct) + (require-for-syntax mzlib/list + syntax/stx + syntax/boundmap + syntax/kerncase ;; This should be part of a public expand-time API ;; exported by the class system: (only "private/classidmap.ss" diff --git a/collects/scribble/bnf.ss b/collects/scribble/bnf.ss index ecfcd69947..70d4613999 100644 --- a/collects/scribble/bnf.ss +++ b/collects/scribble/bnf.ss @@ -2,8 +2,8 @@ (module bnf mzscheme (require "struct.ss" "decode.ss" - (lib "kw.ss") - (lib "class.ss")) + mzlib/kw + mzlib/class) (provide BNF nonterm diff --git a/collects/scribble/decode.ss b/collects/scribble/decode.ss index 0ba7112524..3e073bcc61 100644 --- a/collects/scribble/decode.ss +++ b/collects/scribble/decode.ss @@ -2,8 +2,8 @@ (module decode mzscheme (require "struct.ss" "decode-struct.ss" - (lib "contract.ss") - (lib "class.ss")) + mzlib/contract + mzlib/class) (provide decode decode-part diff --git a/collects/scribble/defreader.ss b/collects/scribble/defreader.ss index 2332be627e..7577e55263 100644 --- a/collects/scribble/defreader.ss +++ b/collects/scribble/defreader.ss @@ -1,7 +1,7 @@ (module defreader mzscheme (require (prefix scribble: "reader.ss") - (lib "kw.ss")) + mzlib/kw) (provide (rename *read read) (rename *read-syntax read-syntax)) diff --git a/collects/scribble/reader.ss b/collects/scribble/reader.ss index 7d9320e584..04f55fd82e 100644 --- a/collects/scribble/reader.ss +++ b/collects/scribble/reader.ss @@ -3,7 +3,7 @@ (module reader scheme/base - (require (lib "string.ss") (lib "readerr.ss" "syntax")) + (require mzlib/string syntax/readerr) ;; -------------------------------------------------------------------------- ;; utilities for syntax specifications below diff --git a/collects/scribble/run.ss b/collects/scribble/run.ss index b64cdff056..fe0215a971 100644 --- a/collects/scribble/run.ss +++ b/collects/scribble/run.ss @@ -2,9 +2,9 @@ (module run mzscheme (require "struct.ss" "base-render.ss" - (lib "cmdline.ss") - (lib "class.ss") - (lib "file.ss") + mzlib/cmdline + mzlib/class + mzlib/file (prefix text: "text-render.ss") (prefix html: "html-render.ss") (prefix latex: "latex-render.ss")) diff --git a/collects/scribble/test-reader.ss b/collects/scribble/test-reader.ss index 4c1660cb71..5009c7175d 100755 --- a/collects/scribble/test-reader.ss +++ b/collects/scribble/test-reader.ss @@ -3,7 +3,7 @@ exec mzscheme -r "$0" "$@" |# -(require (lib "string.ss")) +(require mzlib/string) #reader(lib "reader.ss" "scribble") (define tests diff --git a/collects/scribble/text-render.ss b/collects/scribble/text-render.ss index c1fc35f5ce..d11cf47bf0 100644 --- a/collects/scribble/text-render.ss +++ b/collects/scribble/text-render.ss @@ -1,7 +1,7 @@ (module text-render mzscheme (require "struct.ss" - (lib "class.ss")) + mzlib/class) (provide render-mixin) (define (render-mixin %) diff --git a/collects/scribblings/gui/draw-overview.scrbl b/collects/scribblings/gui/draw-overview.scrbl index 9c29129e71..a176a0cbb2 100644 --- a/collects/scribblings/gui/draw-overview.scrbl +++ b/collects/scribblings/gui/draw-overview.scrbl @@ -163,7 +163,7 @@ More complex shapes are typically best implemented with @(begin #readerscribble/comment-reader [schemeblock -(require (lib "math.ss")) ; for @scheme[pi] +(require mzlib/math) ; for @scheme[pi] ;; Construct paths for a 630 x 630 logo diff --git a/collects/scribblings/gui/gui.scrbl b/collects/scribblings/gui/gui.scrbl index 716310d558..57ee3cba49 100644 --- a/collects/scribblings/gui/gui.scrbl +++ b/collects/scribblings/gui/gui.scrbl @@ -3,7 +3,7 @@ @title{@bold{GUI}: PLT Graphics Toolkit} -@declare-exporting[scheme/gui/base scheme/gui #:use-sources (mred/mred)] +@declare-exporting[scheme/gui/base scheme/gui #:use-sources (mred)] This reference manual describes the GUI toolbox that is part of PLT Scheme and whose core is implemented by the MrEd executable. diff --git a/collects/scribblings/guide/contracts-intro.scrbl b/collects/scribblings/guide/contracts-intro.scrbl index a1663e8616..588a19abac 100644 --- a/collects/scribblings/guide/contracts-intro.scrbl +++ b/collects/scribblings/guide/contracts-intro.scrbl @@ -96,7 +96,7 @@ discussion is elided. Here's the expansion of the requiring module, just to give an idea: (module m mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (provide/contract [x x-ctc])) (module n mzscheme (require m) (define (f) ... x ...)) @@ -125,7 +125,7 @@ Of course, this breaks assignment to the provided variable. ;; Language: Pretty Big (module a mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (provide/contract [amount positive?]) diff --git a/collects/scribblings/quick/exn.ss b/collects/scribblings/quick/exn.ss index b6ee8a7be4..0489465706 100644 --- a/collects/scribblings/quick/exn.ss +++ b/collects/scribblings/quick/exn.ss @@ -1,6 +1,6 @@ (module exn mzscheme - (require (lib "serialize.ss")) + (require mzlib/serialize) (define-serializable-struct mr-exn (message)) diff --git a/collects/scribblings/quick/mreval.ss b/collects/scribblings/quick/mreval.ss index 310bda7e58..615f8e8acb 100644 --- a/collects/scribblings/quick/mreval.ss +++ b/collects/scribblings/quick/mreval.ss @@ -3,10 +3,10 @@ (require (lib "eval.ss" "scribble") (lib "struct.ss" "scribble") (lib "scheme.ss" "scribble") - (lib "class.ss") - (lib "file.ss") - (lib "runtime-path.ss") - (lib "serialize.ss") + mzlib/class + mzlib/file + mzlib/runtime-path + mzlib/serialize (lib "exn.ss" "scribblings" "quick")) (define-syntax define-mr diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl index 48a8224122..921c7fbc34 100644 --- a/collects/scribblings/reference/contracts.scrbl +++ b/collects/scribblings/reference/contracts.scrbl @@ -544,7 +544,7 @@ As an example, consider the following module: #readerscribble/comment-reader [schemeblock (module product mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define-contract-struct kons (hd tl)) diff --git a/collects/scribblings/reference/prog-steps.ss b/collects/scribblings/reference/prog-steps.ss index 9a8bd9c2a1..43ad6ce3b4 100644 --- a/collects/scribblings/reference/prog-steps.ss +++ b/collects/scribblings/reference/prog-steps.ss @@ -4,9 +4,9 @@ (lib "decode.ss" "scribble") (lib "manual.ss" "scribble") (lib "scheme.ss" "scribble") - (lib "kw.ss") - (lib "class.ss") - (lib "for.ss")) + mzlib/kw + mzlib/class + mzlib/for) (provide prog-steps prog-steps/cont diff --git a/collects/scribblings/reference/readtables.scrbl b/collects/scribblings/reference/readtables.scrbl index f489aa50a3..5264ce79e8 100644 --- a/collects/scribblings/reference/readtables.scrbl +++ b/collects/scribblings/reference/readtables.scrbl @@ -197,7 +197,7 @@ character and the @scheme[#f] readtable.} #readerscribble/comment-reader [examples ;; Provides @scheme[raise-read-error] and @scheme[raise-read-eof-error] -(require (lib "readerr.ss" "syntax")) +(require syntax/readerr) (define (skip-whitespace port) ;; Skips whitespace characters, sensitive to the current diff --git a/collects/scribblings/setup-plt/info.scrbl b/collects/scribblings/setup-plt/info.scrbl index 78beb7ccf7..978c182596 100644 --- a/collects/scribblings/setup-plt/info.scrbl +++ b/collects/scribblings/setup-plt/info.scrbl @@ -1,7 +1,7 @@ #lang scribble/doc @(require scribble/manual (for-label scheme - string-constants/string-constant + string-constants setup/getinfo)) @title[#:tag "info.ss"]{@filepath{info.ss} File Format} diff --git a/collects/scribblings/tools/tools.scrbl b/collects/scribblings/tools/tools.scrbl index 7a99f0c839..f4658dbc04 100644 --- a/collects/scribblings/tools/tools.scrbl +++ b/collects/scribblings/tools/tools.scrbl @@ -163,8 +163,8 @@ then the same collection would be expected to contain a @schemeblock[ (module tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (lib "unit.ss")) + mred + mzlib/unit) (provide tool@) @@ -261,7 +261,7 @@ As an example, the @italic{Essentials of Programming Languages} language specification's @File{info.ss} looks like this: @schememod[ setup/infotab -(require string-constants/string-constant) +(require string-constants) (define name "EoPL Support") (define drscheme-language-modules (list "eopl-lang.ss")) diff --git a/collects/setup/dirs.ss b/collects/setup/dirs.ss index 41dd207c1a..3556531932 100644 --- a/collects/setup/dirs.ss +++ b/collects/setup/dirs.ss @@ -1,5 +1,5 @@ (module dirs mzscheme - (require (prefix config: (lib "config.ss" "config")) + (require (prefix config: config) (lib "winutf16.ss" "compiler" "private") (lib "mach-o.ss" "compiler" "private")) diff --git a/collects/setup/infotab.ss b/collects/setup/infotab.ss index 5bdf871b6f..85fdb269ac 100644 --- a/collects/setup/infotab.ss +++ b/collects/setup/infotab.ss @@ -51,7 +51,8 @@ (syntax-case stx () [(_ lib) (member (syntax-object->datum #'lib) '((lib "string-constant.ss" "string-constants") - string-constants/string-constant)) + string-constants/string-constant + string-constants)) (syntax/loc stx (require lib))])) (provide (rename info-module-begin #%module-begin) diff --git a/collects/setup/option-sig.ss b/collects/setup/option-sig.ss index 1285a76453..0bbdfe9b19 100644 --- a/collects/setup/option-sig.ss +++ b/collects/setup/option-sig.ss @@ -1,6 +1,6 @@ (module option-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide setup-option^) diff --git a/collects/setup/option-unit.ss b/collects/setup/option-unit.ss index 52d3a4eb66..66a6a1f715 100644 --- a/collects/setup/option-unit.ss +++ b/collects/setup/option-unit.ss @@ -1,6 +1,6 @@ (module option-unit mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "option-sig.ss") diff --git a/collects/setup/plt-installer-sig.ss b/collects/setup/plt-installer-sig.ss index d209ae6c92..70dca6a5ad 100644 --- a/collects/setup/plt-installer-sig.ss +++ b/collects/setup/plt-installer-sig.ss @@ -1,5 +1,5 @@ (module plt-installer-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide setup:plt-installer^) (define-signature setup:plt-installer^ (run-installer diff --git a/collects/setup/plt-installer-unit.ss b/collects/setup/plt-installer-unit.ss index f4b32c23b9..aa70a53715 100644 --- a/collects/setup/plt-installer-unit.ss +++ b/collects/setup/plt-installer-unit.ss @@ -1,12 +1,12 @@ (module plt-installer-unit mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred") - (lib "class.ss") - (lib "etc.ss") + mzlib/class + mzlib/etc "plt-installer-sig.ss" (prefix single: "plt-single-installer.ss") - (lib "string-constant.ss" "string-constants")) + string-constants) (provide plt-installer@) (define-unit plt-installer@ diff --git a/collects/setup/plt-installer.ss b/collects/setup/plt-installer.ss index 8200e6e4a7..a488734a7a 100644 --- a/collects/setup/plt-installer.ss +++ b/collects/setup/plt-installer.ss @@ -1,5 +1,5 @@ (module plt-installer mzscheme - (require (lib "unit.ss") + (require mzlib/unit "plt-installer-sig.ss" "plt-installer-unit.ss" (lib "mred-unit.ss" "mred") diff --git a/collects/setup/plt-single-installer.ss b/collects/setup/plt-single-installer.ss index 7fdca86011..4ceb4ad7d5 100644 --- a/collects/setup/plt-single-installer.ss +++ b/collects/setup/plt-single-installer.ss @@ -1,6 +1,6 @@ (module plt-single-installer mzscheme - (require (lib "unit.ss") - (lib "etc.ss") + (require mzlib/unit + mzlib/etc ;; All the rest are to get the imports for setup@: "option-sig.ss" @@ -8,11 +8,11 @@ "option-unit.ss" (lib "launcher-sig.ss" "launcher") (lib "launcher-unit.ss" "launcher") - (lib "dynext-sig.ss" "dynext") - (lib "dynext-unit.ss" "dynext") - (lib "sig.ss" "compiler") - (lib "option-unit.ss" "compiler") - (lib "compiler-unit.ss" "compiler")) + dynext/dynext-sig + dynext/dynext-unit + compiler/sig + compiler/option-unit + compiler/compiler-unit) (provide run-single-installer install-planet-package clean-planet-package) diff --git a/collects/setup/setup-go.ss b/collects/setup/setup-go.ss index 41fe5e01f3..a4752521b7 100644 --- a/collects/setup/setup-go.ss +++ b/collects/setup/setup-go.ss @@ -1,12 +1,12 @@ (module setup-go mzscheme (require "setup-cmdline.ss" - (lib "unit.ss") + mzlib/unit "option-sig.ss" "setup-unit.ss" "option-unit.ss" - (lib "cm.ss")) + mzlib/cm) (define-values/invoke-unit/infer setup:option@) @@ -49,12 +49,12 @@ (require (lib "launcher-sig.ss" "launcher") (lib "launcher-unit.ss" "launcher") - (lib "dynext-sig.ss" "dynext") - (lib "dynext-unit.ss" "dynext")) + dynext/dynext-sig + dynext/dynext-unit) - (require (lib "sig.ss" "compiler") - (lib "option-unit.ss" "compiler") - (lib "compiler-unit.ss" "compiler")) + (require compiler/sig + compiler/option-unit + compiler/compiler-unit) (invoke-unit (compound-unit/infer diff --git a/collects/setup/unpack.ss b/collects/setup/unpack.ss index beb15a6777..4980f828ae 100644 --- a/collects/setup/unpack.ss +++ b/collects/setup/unpack.ss @@ -1,11 +1,11 @@ (module unpack mzscheme - (require (lib "etc.ss") - (lib "inflate.ss") - (lib "file.ss") - (lib "list.ss") - (lib "base64.ss" "net") + (require mzlib/etc + mzlib/inflate + mzlib/file + mzlib/list + net/base64 (lib "getinfo.ss" "setup") "dirs.ss") diff --git a/collects/setup/variant.ss b/collects/setup/variant.ss index f5ab1a5935..1743466ff7 100644 --- a/collects/setup/variant.ss +++ b/collects/setup/variant.ss @@ -1,7 +1,7 @@ (module variant mzscheme - (require (prefix config: (lib "config.ss" "config")) - (lib "dirs.ss" "setup")) + (require (prefix config: config) + setup/dirs) (provide variant-suffix) diff --git a/collects/setup/winvers-change.ss b/collects/setup/winvers-change.ss index 98ced7ec13..ea39639fd1 100644 --- a/collects/setup/winvers-change.ss +++ b/collects/setup/winvers-change.ss @@ -26,7 +26,7 @@ #"__head_~a_lib\0" #"__~a_lib_iname\0"))) - (require (lib "filename-version.ss" "dynext")) + (require dynext/filename-version) (define version-bytes (string->bytes/utf-8 filename-version-part)) (define (binary-file? filename) diff --git a/collects/setup/winvers.ss b/collects/setup/winvers.ss index cef19f9900..4d0a2285a7 100644 --- a/collects/setup/winvers.ss +++ b/collects/setup/winvers.ss @@ -1,7 +1,7 @@ ;; This is a wrapper around `winvers-change.ss' to patch binary files with the ;; current version number. (module winvers mzscheme - (require (lib "file.ss") + (require mzlib/file "main-collects.ss" "dirs.ss") diff --git a/collects/sgl/bitmap.ss b/collects/sgl/bitmap.ss index df5ea7b4b8..df30f6da9e 100644 --- a/collects/sgl/bitmap.ss +++ b/collects/sgl/bitmap.ss @@ -1,11 +1,11 @@ (module bitmap mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "gl-vectors.ss" "sgl") - (prefix gl- (lib "sgl.ss" "sgl")) - (lib "gl.ss" "sgl") - (lib "kw.ss")) + (require mred + mzlib/class + sgl/gl-vectors + sgl + sgl/gl + mzlib/kw) (provide bitmap->gl-list) diff --git a/collects/sgl/doc.txt b/collects/sgl/doc.txt index fec9974d29..330bf30aba 100644 --- a/collects/sgl/doc.txt +++ b/collects/sgl/doc.txt @@ -32,7 +32,7 @@ crash. _gl.ss_ -Use the gl.ss module by adding (require (lib "gl.ss" "sgl")) to your program. +Use the gl.ss module by adding (require sgl/gl) to your program. The gl.ss module provides a direct interface to the system's GL library closely following the conventions of the C-language GL API. It provides a binding for each #defined constant (these start with GL_) and for the @@ -153,8 +153,8 @@ results of glSelectBuffer in a Scheme-friendly format. Notational Example: -(require (lib "gl.ss" "sgl") - (lib "gl-vectors.ss" "sgl")) +(require sgl/gl + sgl/gl-vectors) (glBegin GL_TRIANGLES) (glVertex3i 1 2 3) (glVertex4fv (gl-float-vector 1 2 3 4)) @@ -171,7 +171,7 @@ _gl-vectors.ss_ The gl-vectors module supports GL programming with cvectors. In this document, and in the error messages, a gl-vector is just a cvector, from (lib "foreign.ss"), and a gl--vector is a cvector with an appropriate type. -Use this module by adding (require (lib "gl-vectors.ss" "sgl")) to your +Use this module by adding (require sgl/gl-vectors) to your program. I suggest using this module instead of using the cvector function directly because these functions are specialized to handling the GL typedefs correctly. @@ -248,8 +248,7 @@ not yet have counterparts in the sgl.ss module. See the list of functions below. Notational Example: -(require (prefix gl- (lib "sgl.ss" "sgl")) - (lib "gl-vectors.ss" "sgl")) +(require sgl sgl/gl-vectors) (gl-begin 'triangles) (gl-vertex 1 2 3) (gl-vertex-v (gl-float-vector 1 2 3 4)) diff --git a/collects/sgl/examples/alpha.ss b/collects/sgl/examples/alpha.ss index 907b9792a8..e54e385d8c 100644 --- a/collects/sgl/examples/alpha.ss +++ b/collects/sgl/examples/alpha.ss @@ -2,9 +2,9 @@ (module alpha mzscheme ;; Standard requires (require - (lib "mred.ss" "mred") - (lib "gl.ss" "sgl") - (lib "gl-vectors.ss" "sgl") + mred + sgl/gl + sgl/gl-vectors "gl-frame.ss") ;; texture diff --git a/collects/sgl/examples/gears.ss b/collects/sgl/examples/gears.ss index c5660d28e9..53c94bcdd3 100644 --- a/collects/sgl/examples/gears.ss +++ b/collects/sgl/examples/gears.ss @@ -33,13 +33,13 @@ (module gears mzscheme -(require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "math.ss") - (prefix gl- (lib "sgl.ss" "sgl")) - (lib "gl-vectors.ss" "sgl")) - - +(require mred + mzlib/class + mzlib/math + sgl + sgl/gl-vectors) + + (define controls? #t) (define gears-canvas% diff --git a/collects/sgl/examples/gl-frame.ss b/collects/sgl/examples/gl-frame.ss index eb858706df..5a829ca467 100644 --- a/collects/sgl/examples/gl-frame.ss +++ b/collects/sgl/examples/gl-frame.ss @@ -1,8 +1,8 @@ ;; By Brendan Burns, with modifications by Scott Owens (module gl-frame (lib "plt-pretty-big.ss" "lang") - (require (lib "gl.ss" "sgl") - (lib "gl-vectors.ss" "sgl")) + (require sgl/gl + sgl/gl-vectors) (provide set-gl-draw-fn set-gl-init-fn init-textures diff --git a/collects/sgl/gl-types.ss b/collects/sgl/gl-types.ss index d05262a6c9..108d9668c2 100644 --- a/collects/sgl/gl-types.ss +++ b/collects/sgl/gl-types.ss @@ -1,5 +1,5 @@ (module gl-types mzscheme - (require (lib "foreign.ss") + (require mzlib/foreign "gl-info.ss") (provide (all-defined-except get-unsigned-type get-signed-type make-gl-vector-type)) diff --git a/collects/sgl/gl-vectors.ss b/collects/sgl/gl-vectors.ss index 69bdf516c8..6cafa7a307 100644 --- a/collects/sgl/gl-vectors.ss +++ b/collects/sgl/gl-vectors.ss @@ -1,5 +1,5 @@ (module gl-vectors mzscheme - (require (lib "foreign.ss") + (require mzlib/foreign "gl-types.ss") (define-syntax gl-vector-binop diff --git a/collects/sgl/gl.ss b/collects/sgl/gl.ss index 59f9227ca1..de859755c4 100644 --- a/collects/sgl/gl.ss +++ b/collects/sgl/gl.ss @@ -1,5 +1,5 @@ (module gl mzscheme - (require (lib "foreign.ss") + (require mzlib/foreign "gl-types.ss" "gl-vectors.ss") diff --git a/collects/sgl/make-gl-info.ss b/collects/sgl/make-gl-info.ss index 352101892a..a4307bfa05 100644 --- a/collects/sgl/make-gl-info.ss +++ b/collects/sgl/make-gl-info.ss @@ -1,11 +1,11 @@ (module make-gl-info mzscheme - (require (prefix dynext: (lib "compile.ss" "dynext")) - (lib "file.ss" "dynext") - (prefix dynext: (lib "link.ss" "dynext")) - (lib "file.ss") - (lib "dirs.ss" "setup") - (lib "launcher.ss" "launcher") - (lib "string.ss" "srfi" "13")) + (require (prefix dynext: dynext/compile) + dynext/file + (prefix dynext: dynext/link) + mzlib/file + setup/dirs + launcher + srfi/13/string) (provide make-gl-info) diff --git a/collects/sgl/makefile.ss b/collects/sgl/makefile.ss index e74970e9df..e609175b57 100644 --- a/collects/sgl/makefile.ss +++ b/collects/sgl/makefile.ss @@ -1,6 +1,6 @@ (module makefile mzscheme - (require (lib "make.ss" "make") - (lib "dirs.ss" "setup") + (require make + setup/dirs "make-gl-info.ss") (provide pre-installer) diff --git a/collects/sgl/sgl.ss b/collects/sgl/sgl.ss index 3901a4474e..2c9114574b 100644 --- a/collects/sgl/sgl.ss +++ b/collects/sgl/sgl.ss @@ -13,7 +13,7 @@ ;; Lesser General Public License for more details. (module sgl mzscheme - (require (lib "etc.ss") + (require mzlib/etc "gl-vectors.ss" "gl.ss") diff --git a/collects/sirmail/folderr.ss b/collects/sirmail/folderr.ss index 8cba727eb4..efa885b98e 100644 --- a/collects/sirmail/folderr.ss +++ b/collects/sirmail/folderr.ss @@ -1,17 +1,17 @@ (module folderr mzscheme - (require (lib "unit.ss") - (lib "class.ss") - (lib "framework.ss" "framework") + (require mzlib/unit + mzlib/class + framework (lib "mred-sig.ss" "mred")) - (require (lib "list.ss") - (lib "etc.ss")) + (require mzlib/list + mzlib/etc) (require "sirmails.ss" "pref.ss") - (require (lib "imap-sig.ss" "net")) + (require net/imap-sig) (require (lib "hierlist-sig.ss" "hierlist")) diff --git a/collects/sirmail/optionr.ss b/collects/sirmail/optionr.ss index 7dc8e66e7d..3125d2e6d6 100644 --- a/collects/sirmail/optionr.ss +++ b/collects/sirmail/optionr.ss @@ -1,11 +1,11 @@ (module optionr mzscheme - (require (lib "unit.ss") - (lib "string.ss")) + (require mzlib/unit + mzlib/string) - (require (lib "imap-sig.ss" "net") + (require net/imap-sig (lib "mred-sig.ss" "mred") - (lib "framework.ss" "framework")) + framework) (require "sirmails.ss" "pref.ss") diff --git a/collects/sirmail/pref.ss b/collects/sirmail/pref.ss index d9d92bfc3f..5151619c35 100644 --- a/collects/sirmail/pref.ss +++ b/collects/sirmail/pref.ss @@ -1,12 +1,12 @@ (module pref mzscheme - (require (lib "class.ss") - (lib "framework.ss" "framework") - (lib "mred.ss" "mred") - (lib "list.ss") - (lib "string.ss") - (lib "etc.ss") - (lib "head.ss" "net")) + (require mzlib/class + framework + mred + mzlib/list + mzlib/string + mzlib/etc + net/head) ;; IMPORTANT! All preferences operations outside this ;; file should go through the following exports. diff --git a/collects/sirmail/readr.ss b/collects/sirmail/readr.ss index 16e4243646..4ea5fc4357 100644 --- a/collects/sirmail/readr.ss +++ b/collects/sirmail/readr.ss @@ -11,33 +11,33 @@ ;; (module readr mzscheme - (require (lib "unit.ss") - (lib "class.ss") - (lib "file.ss") + (require mzlib/unit + mzlib/class + mzlib/file (lib "mred-sig.ss" "mred") - (lib "framework.ss" "framework") - (lib "process.ss")) + framework + mzlib/process) - (require (lib "string.ss") - (lib "list.ss") - (lib "thread.ss") + (require mzlib/string + mzlib/list + mzlib/thread "spell.ss") (require "sirmails.ss") (require "pref.ss") - (require (lib "imap-sig.ss" "net") - (lib "smtp-sig.ss" "net") - (lib "head-sig.ss" "net") - (lib "base64-sig.ss" "net") - (lib "mime-sig.ss" "net") - (lib "qp-sig.ss" "net") + (require net/imap-sig + net/smtp-sig + net/head-sig + net/base64-sig + net/mime-sig + net/qp-sig (lib "htmltext.ss" "browser")) (require (lib "hierlist-sig.ss" "hierlist")) - (require (lib "sendurl.ss" "net")) + (require net/sendurl) (require (lib "mzssl.ss" "openssl")) diff --git a/collects/sirmail/recover.ss b/collects/sirmail/recover.ss index e9629681f2..87e0d6fde1 100644 --- a/collects/sirmail/recover.ss +++ b/collects/sirmail/recover.ss @@ -1,6 +1,5 @@ -(require (lib "list.ss") - (lib "head.ss" "net")) +(require mzlib/list net/head) (define msgs (sort (filter (lambda (x) (regexp-match #rx"^[0-9]*$" (path->string x))) (directory-list)) diff --git a/collects/sirmail/sendr.ss b/collects/sirmail/sendr.ss index ea9380500a..97e835cc2b 100644 --- a/collects/sirmail/sendr.ss +++ b/collects/sirmail/sendr.ss @@ -7,21 +7,21 @@ scheme/unit scheme/class (lib "mred-sig.ss" "mred") - (lib "framework.ss" "framework")) + framework) (require scheme/file - (lib "process.ss") + mzlib/process (lib "mzssl.ss" "openssl")) (require "sirmails.ss" "pref.ss" "spell.ss") - (require (lib "imap-sig.ss" "net") - (lib "smtp-sig.ss" "net") - (lib "head-sig.ss" "net") - (lib "base64-sig.ss" "net") - (lib "qp-sig.ss" "net")) + (require net/imap-sig + net/smtp-sig + net/head-sig + net/base64-sig + net/qp-sig) (require (lib "hierlist-sig.ss" "hierlist")) diff --git a/collects/sirmail/sirmail.ss b/collects/sirmail/sirmail.ss index f50c90eb42..1c6815e058 100644 --- a/collects/sirmail/sirmail.ss +++ b/collects/sirmail/sirmail.ss @@ -2,29 +2,29 @@ ;; (with a mail composer, too) (module sirmail mzscheme - (require (lib "unit.ss") - (lib "class.ss") + (require mzlib/unit + mzlib/class (lib "mred-sig.ss" "mred") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (lib "list.ss")) + mred + framework + mzlib/list) (require "sirmails.ss" "pref.ss" "sirmailr.ss") - (require (lib "imap-sig.ss" "net") - (lib "smtp-sig.ss" "net") - (lib "head-sig.ss" "net") - (lib "base64-sig.ss" "net") - (lib "mime-sig.ss" "net") - (lib "qp-sig.ss" "net") - (lib "imap.ss" "net") - (lib "smtp.ss" "net") - (lib "head.ss" "net") - (lib "base64.ss" "net") - (lib "mime.ss" "net") - (lib "qp.ss" "net")) + (require net/imap-sig + net/smtp-sig + net/head-sig + net/base64-sig + net/mime-sig + net/qp-sig + net/imap + net/smtp + net/head + net/base64 + net/mime + net/qp) (require (lib "hierlist-sig.ss" "hierlist") (lib "hierlist.ss" "hierlist")) diff --git a/collects/sirmail/sirmailr.ss b/collects/sirmail/sirmailr.ss index c0fe762086..97317aeb18 100644 --- a/collects/sirmail/sirmailr.ss +++ b/collects/sirmail/sirmailr.ss @@ -1,16 +1,16 @@ (module sirmailr mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "mred-sig.ss" "mred")) (require "sirmails.ss") - (require (lib "imap-sig.ss" "net") - (lib "smtp-sig.ss" "net") - (lib "head-sig.ss" "net") - (lib "base64-sig.ss" "net") - (lib "mime-sig.ss" "net") - (lib "qp-sig.ss" "net")) + (require net/imap-sig + net/smtp-sig + net/head-sig + net/base64-sig + net/mime-sig + net/qp-sig) (require (lib "hierlist-sig.ss" "hierlist")) diff --git a/collects/sirmail/sirmails.ss b/collects/sirmail/sirmails.ss index 851075510f..12519bbf74 100644 --- a/collects/sirmail/sirmails.ss +++ b/collects/sirmail/sirmails.ss @@ -1,6 +1,6 @@ (module sirmails mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide sirmail:exit^ sirmail:environment^) diff --git a/collects/sirmail/spell.ss b/collects/sirmail/spell.ss index e98918ceba..f1ce0ce133 100644 --- a/collects/sirmail/spell.ss +++ b/collects/sirmail/spell.ss @@ -1,13 +1,13 @@ (module spell mzscheme - (require (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools")) - (lib "class.ss") - (lib "string.ss") - (lib "list.ss") - (lib "framework.ss" "framework") - (lib "contract.ss") - (lib "file.ss") - (lib "process.ss")) + (require parser-tools/lex + (prefix : parser-tools/lex-sre) + mzlib/class + mzlib/string + mzlib/list + framework + mzlib/contract + mzlib/file + mzlib/process) (provide/contract [activate-spelling ((is-a?/c color:text<%>) . -> . void?)] [word-count (-> number?)]) diff --git a/collects/sirmail/utilr.ss b/collects/sirmail/utilr.ss index 0a586d136f..751e582afa 100644 --- a/collects/sirmail/utilr.ss +++ b/collects/sirmail/utilr.ss @@ -1,13 +1,13 @@ (module utilr mzscheme - (require (lib "unit.ss") - (lib "class.ss") + (require mzlib/unit + mzlib/class (lib "mred-sig.ss" "mred") - (lib "qp-sig.ss" "net") - (lib "base64-sig.ss" "net") - (prefix unihead: (lib "unihead.ss" "net")) - (lib "etc.ss") - (lib "string.ss")) + net/qp-sig + net/base64-sig + (prefix unihead: net/unihead) + mzlib/etc + mzlib/string) (require "sirmails.ss") diff --git a/collects/skipper/debug-tool.ss b/collects/skipper/debug-tool.ss index 6f83637a6f..f6ecd10bc0 100644 --- a/collects/skipper/debug-tool.ss +++ b/collects/skipper/debug-tool.ss @@ -1,21 +1,21 @@ (module debug-tool mzscheme - (require (lib "etc.ss") - (lib "list.ss") - (lib "string.ss") - (prefix srfi: (lib "search.ss" "srfi" "1")) - ;(lib "math.ss") - (lib "class.ss") - (lib "unit.ss") - ;(lib "contract.ss") - (lib "mred.ss" "mred") + (require mzlib/etc + mzlib/list + mzlib/string + (prefix srfi: srfi/1/search) + ;mzlib/math + mzlib/class + mzlib/unit + ;mzlib/contract + mred (prefix drscheme:arrow: (lib "arrow.ss" "drscheme")) (lib "tool.ss" "drscheme") (lib "marks.ss" "skipper") - (lib "boundmap.ss" "syntax") - (prefix kernel: (lib "kerncase.ss" "syntax")) + syntax/boundmap + (prefix kernel: syntax/kerncase) (lib "bitmap-label.ss" "mrlib") - ;(lib "framework.ss" "framework") - #;(lib "string-constant.ss" "string-constants")) + ;framework + #;string-constants) (provide tool@) diff --git a/collects/skipper/marks.ss b/collects/skipper/marks.ss index fad79ac639..9d3c9707d2 100644 --- a/collects/skipper/marks.ss +++ b/collects/skipper/marks.ss @@ -1,7 +1,7 @@ (module marks mzscheme - (require (lib "list.ss") - (lib "contract.ss") + (require mzlib/list + mzlib/contract (lib "my-macros.ss" "stepper" "private") (lib "shared.ss" "stepper" "private")) diff --git a/collects/slatex/slatex-wrapper.ss b/collects/slatex/slatex-wrapper.ss index e3e3a21c86..a484989606 100644 --- a/collects/slatex/slatex-wrapper.ss +++ b/collects/slatex/slatex-wrapper.ss @@ -1,8 +1,8 @@ (module slatex-wrapper mzscheme - (require (lib "file.ss") - (lib "process.ss") - (lib "sendevent.ss") + (require mzlib/file + mzlib/process + mzlib/sendevent "slatex.ss") (provide slatex latex pdf-slatex pdf-latex slatex/no-latex diff --git a/collects/slideshow/cmdline.ss b/collects/slideshow/cmdline.ss index d3782b2a8d..da668dcf93 100644 --- a/collects/slideshow/cmdline.ss +++ b/collects/slideshow/cmdline.ss @@ -1,15 +1,15 @@ (module cmdline mzscheme - (require (lib "class.ss") - (lib "unit.ss") - (lib "file.ss") - (lib "etc.ss") - (lib "contract.ss") - (lib "mred.ss" "mred") - (lib "cmdline.ss") - (lib "mrpict.ss" "texpict") - (lib "utils.ss" "texpict") - (lib "math.ss") + (require mzlib/class + mzlib/unit + mzlib/file + mzlib/etc + mzlib/contract + mred + mzlib/cmdline + texpict/mrpict + texpict/utils + mzlib/math "sig.ss" (prefix start: "start-param.ss")) diff --git a/collects/slideshow/code.ss b/collects/slideshow/code.ss index b5d7c4bdad..ee5d289669 100644 --- a/collects/slideshow/code.ss +++ b/collects/slideshow/code.ss @@ -1,9 +1,9 @@ (module code "slideshow.ss" (require (lib "code.ss" "texpict") - (lib "unit.ss")) - (require-for-syntax (lib "to-string.ss" "syntax") - (lib "list.ss")) + mzlib/unit) + (require-for-syntax syntax/to-string + mzlib/list) (define current-code-line-sep (make-parameter line-sep)) diff --git a/collects/slideshow/core.ss b/collects/slideshow/core.ss index 618b6db80f..e815fb1ce5 100644 --- a/collects/slideshow/core.ss +++ b/collects/slideshow/core.ss @@ -3,7 +3,7 @@ (require scheme/class scheme/unit scheme/file - mred/mred + mred texpict/mrpict texpict/utils scheme/math diff --git a/collects/slideshow/doc.txt b/collects/slideshow/doc.txt index 6d11d5e750..ea67399294 100644 --- a/collects/slideshow/doc.txt +++ b/collects/slideshow/doc.txt @@ -55,7 +55,7 @@ program. For constructing slide images, Slideshow builds on the "texpict" collection's utilities for constructing images. More specifically, -all of the functions provided by `(lib "mrpict.ss" "texpict")' +all of the functions provided by `texpict/mrpict' are available for creating images. In addition to the "mrpict.ss" functions, Slideshow provides functions @@ -75,8 +75,8 @@ The _slideshow.ss_ module acts as a language that includes: - the Slideshow function for creating slides (defined here) - all of MzScheme - - (lib "mrpict.ss" "texpict") - - (lib "utils.ss" "texpict") + - texpict/mrpict + - texpict/utils The _slide.ss_ module is like "slideshow.ss", but it does not re-provide MzScheme. Thus, "slide.ss" is a non-language version of @@ -98,7 +98,7 @@ The main Slideshow function is `slide/title', which adds a slide to the presentation with a given title and content. For example, the Hello World presentation can be defined by the following module: - (module hello-world (lib "slideshow.ss" "slideshow") + (module hello-world slideshow/slideshow (slide/title "How to Say Hello" (t "Hello World!"))) @@ -128,7 +128,7 @@ pict that will be centered on the slide. The picts are stacked vertically and top-aligned, with `gap-size' separation between each pict. - (module hello-world (lib "slideshow.ss" "slideshow") + (module hello-world slideshow/slideshow (slide/title "How to Say Hello" (t "Hello World!") @@ -137,7 +137,7 @@ pict. The `slide/title/center' form centers the stacked picts vertically instead of putting them at the top of the slide: - (module hello-world (lib "slideshow.ss" "slideshow") + (module hello-world slideshow/slideshow (slide/title/center "How to Say Hello" (t "Hello World!") @@ -147,7 +147,7 @@ Various functions format paragraphs and generate bulleted items for lists. For example, `page-item' creates a bulleted paragraph that spaces the width of the slide: - (module hello-world (lib "slideshow.ss" "slideshow") + (module hello-world slideshow/slideshow (slide/title "How to Say Hello" (page-item "If you want to create an example, you" @@ -165,7 +165,7 @@ Staging Slides The `slide/title' function creates a slide as a side effect. It can be put inside a function to abstract over a slide: - (module hello-world (lib "slideshow.ss" "slideshow") + (module hello-world slideshow/slideshow (define (make-slide-n n) (slide/title "How to Generalize Slides" @@ -204,7 +204,7 @@ title is usually a pict, but there are a few other possibilities: Here's an example to illustrate how 'next and 'alts work: - (module multi-step (lib "slideshow.ss" "slideshow") + (module multi-step slideshow/slideshow (slide/title "Example" (page-item "First step") diff --git a/collects/slideshow/examples/interlocking-components.scm b/collects/slideshow/examples/interlocking-components.scm index 0a9d149e5d..ced6610bd0 100644 --- a/collects/slideshow/examples/interlocking-components.scm +++ b/collects/slideshow/examples/interlocking-components.scm @@ -1,7 +1,7 @@ -(module interlocking-components (lib "run.ss" "slideshow") - (require (lib "class.ss") - (lib "mred.ss" "mred")) +(module interlocking-components slideshow/run + (require mzlib/class + mred) (define-struct posn (x y) (make-inspector)) diff --git a/collects/slideshow/param.ss b/collects/slideshow/param.ss index 3ba1356d6a..2c3b9d320f 100644 --- a/collects/slideshow/param.ss +++ b/collects/slideshow/param.ss @@ -1,6 +1,6 @@ (module param mzscheme - (require (lib "unit.ss") + (require mzlib/unit "sig.ss" "cmdline.ss" "viewer.ss") diff --git a/collects/slideshow/pict-snipclass.ss b/collects/slideshow/pict-snipclass.ss index b92a8b8314..2048ef8619 100644 --- a/collects/slideshow/pict-snipclass.ss +++ b/collects/slideshow/pict-snipclass.ss @@ -1,6 +1,6 @@ (module pict-snipclass mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mred) (provide snip-class) (require "private/pict-box-lib.ss") diff --git a/collects/slideshow/private/image-snipr.ss b/collects/slideshow/private/image-snipr.ss index 862378f257..12e5c8a7c0 100644 --- a/collects/slideshow/private/image-snipr.ss +++ b/collects/slideshow/private/image-snipr.ss @@ -1,6 +1,6 @@ (module image-snipr mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide snipclass image-snip/r%) diff --git a/collects/slideshow/private/pict-box-lib.ss b/collects/slideshow/private/pict-box-lib.ss index 42aa86529d..21d67bcde2 100644 --- a/collects/slideshow/private/pict-box-lib.ss +++ b/collects/slideshow/private/pict-box-lib.ss @@ -1,7 +1,7 @@ (module pict-box-lib mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "mrpict.ss" "texpict") + (require mred + mzlib/class + texpict/mrpict "image-snipr.ss") (provide get-snp/poss diff --git a/collects/slideshow/private/utils.ss b/collects/slideshow/private/utils.ss index 9e5f0b4ce6..713825cdea 100644 --- a/collects/slideshow/private/utils.ss +++ b/collects/slideshow/private/utils.ss @@ -1,7 +1,7 @@ (module utils mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss")) + (require mred + mzlib/class) (provide make-bitmap define-accessor diff --git a/collects/slideshow/sig.ss b/collects/slideshow/sig.ss index 19defbc9b5..b88e079152 100644 --- a/collects/slideshow/sig.ss +++ b/collects/slideshow/sig.ss @@ -1,6 +1,6 @@ (module sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide config^ viewer^ core^ cmdline^) diff --git a/collects/slideshow/slide.ss b/collects/slideshow/slide.ss index 104c003171..8d182c5448 100644 --- a/collects/slideshow/slide.ss +++ b/collects/slideshow/slide.ss @@ -1,9 +1,9 @@ (module slide mzscheme - (require (lib "unit.ss") - (lib "contract.ss") - (lib "mrpict.ss" "texpict") - (lib "utils.ss" "texpict") + (require mzlib/unit + mzlib/contract + texpict/mrpict + texpict/utils "sig.ss" "core.ss" "private/utils.ss" @@ -122,5 +122,5 @@ [apply-slide-inset (sinset? pict? . -> . pict?)]) ;; Things not at all in the core unit: - (provide (all-from (lib "mrpict.ss" "texpict")) - (all-from (lib "utils.ss" "texpict")))) + (provide (all-from texpict/mrpict) + (all-from texpict/utils))) diff --git a/collects/slideshow/slideshow.ss b/collects/slideshow/slideshow.ss index 9903553e7c..dac5db8c7b 100644 --- a/collects/slideshow/slideshow.ss +++ b/collects/slideshow/slideshow.ss @@ -1,6 +1,6 @@ (module slideshow mzscheme - (require (lib "slide.ss" "slideshow")) - (provide (all-from (lib "slide.ss" "slideshow")) + (require slideshow/slide) + (provide (all-from slideshow/slide) (all-from mzscheme))) diff --git a/collects/slideshow/start.ss b/collects/slideshow/start.ss index a56778ff3d..e4c0082102 100644 --- a/collects/slideshow/start.ss +++ b/collects/slideshow/start.ss @@ -2,8 +2,8 @@ (module start "slideshow.ss" (require "start-param.ss" (lib "config.ss" "planet") - (lib "mred.ss" "mred") - (lib "class.ss")) + mred + mzlib/class) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Path utilities diff --git a/collects/slideshow/step.ss b/collects/slideshow/step.ss index 003e2dbfe6..2f2ca6d2cd 100644 --- a/collects/slideshow/step.ss +++ b/collects/slideshow/step.ss @@ -1,7 +1,7 @@ -(module step (lib "slideshow.ss" "slideshow") - (require (lib "list.ss") - (lib "etc.ss")) +(module step slideshow/slideshow + (require mzlib/list + mzlib/etc) (provide with-steps with-steps~) diff --git a/collects/slideshow/tool.ss b/collects/slideshow/tool.ss index ae020489df..07adebe5a3 100644 --- a/collects/slideshow/tool.ss +++ b/collects/slideshow/tool.ss @@ -23,15 +23,15 @@ pict snip : (module tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "unit.ss") - (lib "contract.ss") - (lib "string-constant.ss" "string-constants") - (lib "framework.ss" "framework") - (lib "mrpict.ss" "texpict") + mred + mzlib/class + mzlib/unit + mzlib/contract + string-constants + framework + texpict/mrpict (lib "pict-value-snip.ss" "texpict") - (lib "list.ss") + mzlib/list "private/pict-box-lib.ss" "private/image-snipr.ss") diff --git a/collects/slideshow/viewer.ss b/collects/slideshow/viewer.ss index 8a3c17eb26..6b272ca301 100644 --- a/collects/slideshow/viewer.ss +++ b/collects/slideshow/viewer.ss @@ -7,8 +7,8 @@ scheme/path scheme/file mred - (lib "mrpict.ss" "texpict") - (lib "utils.ss" "texpict") + texpict/mrpict + texpict/utils scheme/math (lib "include-bitmap.ss" "mrlib") "sig.ss" diff --git a/collects/srfi/1.ss b/collects/srfi/1.ss index b068706fef..83a260bcb6 100644 --- a/collects/srfi/1.ss +++ b/collects/srfi/1.ss @@ -1,9 +1,9 @@ ;; module loader for SRFI-1 (module |1| mzscheme - (require (lib "list.ss" "srfi" "1")) + (require srfi/1/list) - (provide (all-from-except (lib "list.ss" "srfi" "1") + (provide (all-from-except srfi/1/list s:map s:for-each s:member s:assoc) diff --git a/collects/srfi/1/alist.ss b/collects/srfi/1/alist.ss index 1620cee39f..adda2d8ae6 100644 --- a/collects/srfi/1/alist.ss +++ b/collects/srfi/1/alist.ss @@ -35,8 +35,8 @@ (module alist mzscheme - (require (lib "etc.ss" "mzlib") - (lib "optional.ss" "srfi") + (require mzlib/etc + srfi/optional (only "search.ss" find) "filter.ss" (rename "fold.ss" s:map map)) diff --git a/collects/srfi/1/cons.ss b/collects/srfi/1/cons.ss index ab80af66c0..595daf1435 100644 --- a/collects/srfi/1/cons.ss +++ b/collects/srfi/1/cons.ss @@ -35,8 +35,8 @@ (module cons mzscheme - (require (lib "etc.ss" "mzlib") - (lib "optional.ss" "srfi") + (require mzlib/etc + srfi/optional "selector.ss") (provide xcons diff --git a/collects/srfi/1/delete.ss b/collects/srfi/1/delete.ss index e8b4614bb7..0eeadc907e 100644 --- a/collects/srfi/1/delete.ss +++ b/collects/srfi/1/delete.ss @@ -36,8 +36,8 @@ (module delete mzscheme - (require (lib "etc.ss" "mzlib") - (lib "optional.ss" "srfi") + (require mzlib/etc + srfi/optional "predicate.ss" "filter.ss") diff --git a/collects/srfi/1/filter.ss b/collects/srfi/1/filter.ss index ad8b955bc8..0df1d178b7 100644 --- a/collects/srfi/1/filter.ss +++ b/collects/srfi/1/filter.ss @@ -35,10 +35,10 @@ (module filter mzscheme - (require (lib "etc.ss" "mzlib") - (lib "optional.ss" "srfi") + (require mzlib/etc + srfi/optional "predicate.ss") - (require (lib "receive.ss" "srfi" "8")) + (require srfi/8/receive) (provide filter partition diff --git a/collects/srfi/1/fold.ss b/collects/srfi/1/fold.ss index 2f3e1f95da..b743942452 100644 --- a/collects/srfi/1/fold.ss +++ b/collects/srfi/1/fold.ss @@ -35,11 +35,11 @@ (module fold mzscheme - (require (lib "optional.ss" "srfi") + (require srfi/optional "predicate.ss" "selector.ss" "util.ss") - (require (lib "receive.ss" "srfi" "8")) + (require srfi/8/receive) (provide (rename my-map map) (rename my-for-each for-each) diff --git a/collects/srfi/1/list.ss b/collects/srfi/1/list.ss index 26859a9bd3..bd0913fce5 100644 --- a/collects/srfi/1/list.ss +++ b/collects/srfi/1/list.ss @@ -214,7 +214,7 @@ (module list mzscheme - (require (lib "optional.ss" "srfi")) + (require srfi/optional) (require "cons.ss" "selector.ss" diff --git a/collects/srfi/1/lset.ss b/collects/srfi/1/lset.ss index 14e017094d..5449f29ebe 100644 --- a/collects/srfi/1/lset.ss +++ b/collects/srfi/1/lset.ss @@ -35,14 +35,14 @@ (module lset mzscheme - (require (lib "optional.ss" "srfi") + (require srfi/optional (all-except "search.ss" member) (all-except "fold.ss" map for-each) (rename "search.ss" s:member member) "delete.ss" "predicate.ss" "filter.ss") - (require (lib "receive.ss" "srfi" "8")) + (require srfi/8/receive) (provide lset<= lset= diff --git a/collects/srfi/1/misc.ss b/collects/srfi/1/misc.ss index 7d4f925808..5b0d9cf47e 100644 --- a/collects/srfi/1/misc.ss +++ b/collects/srfi/1/misc.ss @@ -35,13 +35,13 @@ (module misc mzscheme - (require (lib "optional.ss" "srfi") + (require srfi/optional "predicate.ss" "selector.ss" "util.ss" (only "fold.ss" reduce-right) (rename "fold.ss" srfi-1:map map)) - (require (lib "receive.ss" "srfi" "8")) + (require srfi/8/receive) (provide length+ concatenate diff --git a/collects/srfi/1/predicate.ss b/collects/srfi/1/predicate.ss index fe48813e14..dc58692c68 100644 --- a/collects/srfi/1/predicate.ss +++ b/collects/srfi/1/predicate.ss @@ -36,7 +36,7 @@ (module predicate mzscheme - (require (lib "optional.ss" "srfi")) + (require srfi/optional) (provide pair? null? diff --git a/collects/srfi/1/search.ss b/collects/srfi/1/search.ss index 568d6c62dd..1803758787 100644 --- a/collects/srfi/1/search.ss +++ b/collects/srfi/1/search.ss @@ -35,11 +35,11 @@ (module search mzscheme - (require (lib "etc.ss" "mzlib") - (lib "optional.ss" "srfi") + (require mzlib/etc + srfi/optional "predicate.ss" "util.ss") - (require (lib "receive.ss" "srfi" "8")) + (require srfi/8/receive) (provide (rename my-member member) find diff --git a/collects/srfi/1/selector.ss b/collects/srfi/1/selector.ss index f772775a69..346782fc51 100644 --- a/collects/srfi/1/selector.ss +++ b/collects/srfi/1/selector.ss @@ -35,8 +35,8 @@ (module selector mzscheme - (require (lib "optional.ss" "srfi")) - (require (lib "receive.ss" "srfi" "8")) + (require srfi/optional) + (require srfi/8/receive) (provide first second diff --git a/collects/srfi/1/util.ss b/collects/srfi/1/util.ss index 1e1a490037..acdf57dd55 100644 --- a/collects/srfi/1/util.ss +++ b/collects/srfi/1/util.ss @@ -35,10 +35,10 @@ (module util mzscheme - (require (lib "optional.ss" "srfi") + (require srfi/optional "predicate.ss" "selector.ss") - (require (lib "receive.ss" "srfi" "8")) + (require srfi/8/receive) (provide %cdrs %cars+ diff --git a/collects/srfi/13.ss b/collects/srfi/13.ss index 5b4c3161e0..5af94ccb8d 100644 --- a/collects/srfi/13.ss +++ b/collects/srfi/13.ss @@ -1,7 +1,7 @@ ;; module loader for SRFI-13 (module |13| mzscheme - (require (lib "string.ss" "srfi" "13")) - (provide (all-from-except (lib "string.ss" "srfi" "13") + (require srfi/13/string) + (provide (all-from-except srfi/13/string s:string-upcase s:string-downcase s:string-titlecase) (rename s:string-upcase string-upcase) (rename s:string-downcase string-downcase) diff --git a/collects/srfi/13/string.ss b/collects/srfi/13/string.ss index 3c35eb319b..8ad3a2d880 100644 --- a/collects/srfi/13/string.ss +++ b/collects/srfi/13/string.ss @@ -84,10 +84,10 @@ #lang mzscheme -(require (lib "optional.ss" "srfi") - (lib "receive.ss" "srfi" "8") - (lib "char-set.ss" "srfi" "14") - (lib "etc.ss") ; for opt-lambda (instead of let-optionals*) +(require srfi/optional + srfi/8/receive + srfi/14/char-set + mzlib/etc ; for opt-lambda (instead of let-optionals*) ) (provide ;; String procedures: diff --git a/collects/srfi/14.ss b/collects/srfi/14.ss index 6f028aa0fc..500254e17f 100644 --- a/collects/srfi/14.ss +++ b/collects/srfi/14.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-14 (module |14| mzscheme - (require (lib "char-set.ss" "srfi" "14")) - (provide (all-from (lib "char-set.ss" "srfi" "14")))) + (require srfi/14/char-set) + (provide (all-from srfi/14/char-set))) diff --git a/collects/srfi/14/char-set.ss b/collects/srfi/14/char-set.ss index eb9663ccd0..b5fd04d254 100644 --- a/collects/srfi/14/char-set.ss +++ b/collects/srfi/14/char-set.ss @@ -5,9 +5,9 @@ ;; the code and tests are a lot better than they would be. (module char-set mzscheme - (require (lib "integer-set.ss") - (all-except (lib "contract.ss") union) - (rename (lib "contract.ss") union/c union)) + (require mzlib/integer-set + (all-except mzlib/contract union) + (rename mzlib/contract union/c union)) ;; Data defn ---------------------------------------- diff --git a/collects/srfi/17.ss b/collects/srfi/17.ss index cb3997c278..569b21a9b3 100644 --- a/collects/srfi/17.ss +++ b/collects/srfi/17.ss @@ -1,6 +1,6 @@ ;; module loader for SRFI-17 (module |17| mzscheme - (require (all-except (lib "set.ss" "srfi" "17") set!) - (rename (lib "set.ss" "srfi" "17") my-set! set!)) - (provide (all-from-except (lib "set.ss" "srfi" "17") my-set!) + (require (all-except srfi/17/set set!) + (rename srfi/17/set my-set! set!)) + (provide (all-from-except srfi/17/set my-set!) (rename my-set! set!))) diff --git a/collects/srfi/19.ss b/collects/srfi/19.ss index 5f5bd5d7bf..8e3c4b73ce 100644 --- a/collects/srfi/19.ss +++ b/collects/srfi/19.ss @@ -1,7 +1,7 @@ ;; module loader for SRFI-19 (module |19| mzscheme - (require (lib "time.ss" "srfi" "19")) - (provide (all-from-except (lib "time.ss" "srfi" "19") + (require srfi/19/time) + (provide (all-from-except srfi/19/time make-srfi:date srfi:date? srfi:date-second srfi:date-minute diff --git a/collects/srfi/19/time.ss b/collects/srfi/19/time.ss index 4afeeaec80..f939095cb5 100644 --- a/collects/srfi/19/time.ss +++ b/collects/srfi/19/time.ss @@ -59,9 +59,9 @@ ;; internal. (module time mzscheme - (require (lib "receive.ss" "srfi" "8") - (lib "29.ss" "srfi") - (lib "optional.ss" "srfi")) + (require srfi/8/receive + srfi/29 + srfi/optional) (provide time-tai time-utc time-monotonic time-thread time-process time-duration time-gc current-date current-julian-day current-modified-julian-day current-time time-resolution ;; Time object and accessors diff --git a/collects/srfi/2.ss b/collects/srfi/2.ss index 8aa73e67a6..71046144b6 100644 --- a/collects/srfi/2.ss +++ b/collects/srfi/2.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-2 (module |2| mzscheme - (require (lib "and-let.ss" "srfi" "2")) - (provide (all-from (lib "and-let.ss" "srfi" "2")))) + (require srfi/2/and-let) + (provide (all-from srfi/2/and-let))) diff --git a/collects/srfi/25.ss b/collects/srfi/25.ss index 5ffbd8eaa1..b09958eb77 100644 --- a/collects/srfi/25.ss +++ b/collects/srfi/25.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-25 (module |25| mzscheme - (require (lib "array.ss" "srfi" "25")) - (provide (all-from (lib "array.ss" "srfi" "25")))) + (require srfi/25/array) + (provide (all-from srfi/25/array))) diff --git a/collects/srfi/25/array.ss b/collects/srfi/25/array.ss index 78c179a6a7..95a2d916fd 100644 --- a/collects/srfi/25/array.ss +++ b/collects/srfi/25/array.ss @@ -56,7 +56,7 @@ (module array mzscheme - (require (lib "9.ss" "srfi");; record-types + (require srfi/9;; record-types ) (provide array? make-array shape array array-rank array-start array-end array-ref array-set! share-array @@ -77,7 +77,7 @@ (shp array:shape)) ;; Using SRFI-25 ctor based index representation - (require (lib "include.ss")) + (require mzlib/include) (include "ix-ctor.scm") (include "op-ctor.scm") diff --git a/collects/srfi/26.ss b/collects/srfi/26.ss index 97d9d7c630..fce5a80055 100644 --- a/collects/srfi/26.ss +++ b/collects/srfi/26.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-26 (module |26| mzscheme - (require (lib "cut.ss" "srfi" "26")) - (provide (all-from (lib "cut.ss" "srfi" "26")))) + (require srfi/26/cut) + (provide (all-from srfi/26/cut))) diff --git a/collects/srfi/27.ss b/collects/srfi/27.ss index c5797f831c..c8e2d8e9de 100644 --- a/collects/srfi/27.ss +++ b/collects/srfi/27.ss @@ -1,3 +1,3 @@ (module |27| mzscheme - (require (lib "random-bits.ss" "srfi" "27")) - (provide (all-from (lib "random-bits.ss" "srfi" "27")))) + (require srfi/27/random-bits) + (provide (all-from srfi/27/random-bits))) diff --git a/collects/srfi/27/random-bits-examples.ss b/collects/srfi/27/random-bits-examples.ss index be00b2ff85..910df52760 100644 --- a/collects/srfi/27/random-bits-examples.ss +++ b/collects/srfi/27/random-bits-examples.ss @@ -1,5 +1,5 @@ (module random-bits-examples mzscheme - (require (lib "random-bits.ss" "srfi" "27")) + (require srfi/27/random-bits) (define ascii->char integer->char) diff --git a/collects/srfi/29.ss b/collects/srfi/29.ss index e9443f42a8..1467d6746c 100644 --- a/collects/srfi/29.ss +++ b/collects/srfi/29.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-29 (module |29| mzscheme - (require (lib "localization.ss" "srfi" "29")) - (provide (all-from (lib "localization.ss" "srfi" "29")))) + (require srfi/29/localization) + (provide (all-from srfi/29/localization))) diff --git a/collects/srfi/29/localization.ss b/collects/srfi/29/localization.ss index c19753911d..4312486682 100644 --- a/collects/srfi/29/localization.ss +++ b/collects/srfi/29/localization.ss @@ -1,10 +1,10 @@ (module localization mzscheme - (require (lib "contract.ss") - (lib "file.ss") - (lib "runtime-path.ss") - (lib "string.ss") - (lib "modread.ss" "syntax")) + (require mzlib/contract + mzlib/file + mzlib/runtime-path + mzlib/string + syntax/modread) (provide/contract (current-language (parameter/c symbol?)) (current-country (parameter/c symbol?)) diff --git a/collects/srfi/31.ss b/collects/srfi/31.ss index 3700996bd0..1b7486b8cc 100644 --- a/collects/srfi/31.ss +++ b/collects/srfi/31.ss @@ -1,4 +1,4 @@ ;; SRFI 31: A special form rec for recursive evaluation (module |31| mzscheme - (require (lib "rec.ss" "srfi" "31")) + (require srfi/31/rec) (provide rec)) diff --git a/collects/srfi/31/rec.ss b/collects/srfi/31/rec.ss index 4ab352ca0d..46abb60f9e 100644 --- a/collects/srfi/31/rec.ss +++ b/collects/srfi/31/rec.ss @@ -1,5 +1,3 @@ (module rec mzscheme (provide rec) - (require (lib "etc.ss"))) - - + (require mzlib/etc)) diff --git a/collects/srfi/32.ss b/collects/srfi/32.ss index c475a70e0d..0f959324fe 100644 --- a/collects/srfi/32.ss +++ b/collects/srfi/32.ss @@ -1,3 +1,3 @@ (module |32| mzscheme - (require (lib "sort.scm" "srfi" "32")) - (provide (all-from (lib "sort.scm" "srfi" "32")))) \ No newline at end of file + (require (lib "srfi/32/sort.scm")) + (provide (all-from (lib "srfi/32/sort.scm")))) \ No newline at end of file diff --git a/collects/srfi/32/test.scm b/collects/srfi/32/test.scm index d7cc8c895f..ef4d53527b 100644 --- a/collects/srfi/32/test.scm +++ b/collects/srfi/32/test.scm @@ -1,6 +1,6 @@ (require "sort.scm" "vector-util.scm" - (lib "27.ss" "srfi")) + srfi/27) (define insert-sort! ; http://www.math.grin.edu/~stone/events/scheme-workshop/insertion.html diff --git a/collects/srfi/34.ss b/collects/srfi/34.ss index 5b79d5a1d3..092f97adb0 100644 --- a/collects/srfi/34.ss +++ b/collects/srfi/34.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-34 (module |34| mzscheme - (require (lib "exception.ss" "srfi" "34")) - (provide (all-from (lib "exception.ss" "srfi" "34")))) + (require srfi/34/exception) + (provide (all-from srfi/34/exception))) diff --git a/collects/srfi/35.ss b/collects/srfi/35.ss index 5b11274805..0e3545fe88 100644 --- a/collects/srfi/35.ss +++ b/collects/srfi/35.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-35 (module |35| mzscheme - (require (lib "condition.ss" "srfi" "35")) - (provide (all-from (lib "condition.ss" "srfi" "35")))) + (require srfi/35/condition) + (provide (all-from srfi/35/condition))) diff --git a/collects/srfi/35/condition.ss b/collects/srfi/35/condition.ss index 0437d9efab..55e8b9c976 100644 --- a/collects/srfi/35/condition.ss +++ b/collects/srfi/35/condition.ss @@ -1,7 +1,7 @@ (module condition mzscheme - (require (lib "list.ss" "srfi" "1") - (lib "9.ss" "srfi")) + (require srfi/1/list + srfi/9) (provide make-condition-type condition-type? diff --git a/collects/srfi/4.ss b/collects/srfi/4.ss index 0aae4bb60f..f59a8accfe 100644 --- a/collects/srfi/4.ss +++ b/collects/srfi/4.ss @@ -1,3 +1,3 @@ (module |4| mzscheme - (require (lib "foreign.ss")) + (require mzlib/foreign) (provide-srfi-4)) diff --git a/collects/srfi/40.ss b/collects/srfi/40.ss index c7ee0c9c8c..a42b39b53a 100644 --- a/collects/srfi/40.ss +++ b/collects/srfi/40.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-40 (module |40| mzscheme - (require (lib "stream.ss" "srfi" "40")) - (provide (all-from (lib "stream.ss" "srfi" "40")))) + (require srfi/40/stream) + (provide (all-from srfi/40/stream))) diff --git a/collects/srfi/42.ss b/collects/srfi/42.ss index 64d73d3a0a..e560acdd65 100644 --- a/collects/srfi/42.ss +++ b/collects/srfi/42.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-42 (module |42| mzscheme - (require (lib "comprehensions.ss" "srfi" "42")) - (provide (all-from (lib "comprehensions.ss" "srfi" "42")))) + (require srfi/42/comprehensions) + (provide (all-from srfi/42/comprehensions))) diff --git a/collects/srfi/42/comprehensions.ss b/collects/srfi/42/comprehensions.ss index 1618a7c297..7deebef5ae 100644 --- a/collects/srfi/42/comprehensions.ss +++ b/collects/srfi/42/comprehensions.ss @@ -2,12 +2,12 @@ ; sebastian_egner@yahoo.com, 26-Dec-2007, PLT 371. ; + bugs found by sunnan and jens axel soegaard fixed ; Sebastian.Egner@philips.com, 15-May-2003, PLT 204. -; For running demos: (require (lib "examples.ss" "srfi" "42")) +; For running demos: (require srfi/42/examples) ; For anything else: http://srfi.schemers.org/srfi-42/ (module |comprehensions| mzscheme - (require (lib "23.ss" "srfi")) + (require srfi/23) (provide do-ec list-ec append-ec string-ec string-append-ec vector-ec @@ -27,13 +27,13 @@ ; as expected when the exported macro is used outside. ; As a fix, Matthew Flatt suggested to use syntax-case* ; with equivalence predicate module-or-top-identifier=? as -; require-for-syntax'ed by (lib "stx.ss" "syntax"). To limit +; require-for-syntax'ed by syntax/stx. To limit ; the amount of modification to the SRFI 42 code below, we ; replace define-syntax by the new define-syntax-globally ; which constructs the proper code. The new transformer ; must be used for all exported macros recognizing `not'. - (require-for-syntax (lib "stx.ss" "syntax")) + (require-for-syntax syntax/stx) (define-syntax define-syntax-globally (syntax-rules (syntax-rules) diff --git a/collects/srfi/42/examples-42.ss b/collects/srfi/42/examples-42.ss index 6e85af87e6..10747df0ac 100644 --- a/collects/srfi/42/examples-42.ss +++ b/collects/srfi/42/examples-42.ss @@ -2,12 +2,12 @@ ; sebastian_egner@yahoo.com, 26-Dec-2007, PLT 371. ; + check fix for bugs found by sunnan and jens axel soegaard ; Sebastian.Egner@philips.com, 7-July-2003, PLT 204. -; For running the demos: (require (lib "examples-42.ss" "srfi" "42")) +; For running the demos: (require srfi/42/examples-42) ; For anything else: http://srfi.schemers.org/srfi-42/ (module |examples-42| mzscheme - (require (lib "42.ss" "srfi")) + (require srfi/42) (define (my-open-output-file filename) (open-output-file filename 'replace 'text) ) @@ -40,7 +40,7 @@ ; (load "examples.scm") ; ; Running the examples in PLT/DrScheme (version 204): -; (require (lib "42-examples.ss" "srfi")) +; (require srfi/42-examples) ; ; Running the examples in SCM (version 5d7): ; (require 'macro) (require 'record) diff --git a/collects/srfi/43.ss b/collects/srfi/43.ss index 82e545e82f..c3417581da 100644 --- a/collects/srfi/43.ss +++ b/collects/srfi/43.ss @@ -1,7 +1,7 @@ ;; module loader for SRFI-43 (module |43| mzscheme - (require (lib "vector-lib.ss" "srfi" "43")) - (provide (all-from-except (lib "vector-lib.ss" "srfi" "43") + (require srfi/43/vector-lib) + (provide (all-from-except srfi/43/vector-lib s:vector-fill! s:vector->list) (rename s:vector-fill! vector-fill!) diff --git a/collects/srfi/43/vector-lib.ss b/collects/srfi/43/vector-lib.ss index 80ae603ca9..77cb84529f 100644 --- a/collects/srfi/43/vector-lib.ss +++ b/collects/srfi/43/vector-lib.ss @@ -2,9 +2,9 @@ (module vector-lib mzscheme - (require (lib "receive.ss" "srfi" "8") - (lib "etc.ss") - (lib "contract.ss")) + (require srfi/8/receive + mzlib/etc + mzlib/contract) (define mutable-vector/c (and/c vector? (not/c immutable?))) diff --git a/collects/srfi/45.ss b/collects/srfi/45.ss index b02b990840..5fd37902db 100644 --- a/collects/srfi/45.ss +++ b/collects/srfi/45.ss @@ -1,7 +1,7 @@ ;; module loader for SRFI-45 (module |45| mzscheme - (require (lib "lazy.ss" "srfi" "45")) - (provide (all-from-except (lib "lazy.ss" "srfi" "45") + (require srfi/45/lazy) + (provide (all-from-except srfi/45/lazy s:delay s:force srfi-45-promise?) diff --git a/collects/srfi/48.ss b/collects/srfi/48.ss index a0dbc7fd48..c49bd4ea41 100644 --- a/collects/srfi/48.ss +++ b/collects/srfi/48.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-48 (module |48| mzscheme - (require (lib "format.ss" "srfi" "48")) + (require srfi/48/format) (provide (rename s:format format))) diff --git a/collects/srfi/48/format.ss b/collects/srfi/48/format.ss index a66820bac4..65a617ac5a 100644 --- a/collects/srfi/48/format.ss +++ b/collects/srfi/48/format.ss @@ -3,7 +3,7 @@ ; 28-May-2005 (module format mzscheme - (require (lib "pretty.ss")) + (require mzlib/pretty) (provide s:format) diff --git a/collects/srfi/5.ss b/collects/srfi/5.ss index eb0bd18e3f..55cbdfc28d 100644 --- a/collects/srfi/5.ss +++ b/collects/srfi/5.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-5 (module |5| mzscheme - (require (rename (lib "let.ss" "srfi" "5") my-let let)) + (require (rename srfi/5/let my-let let)) (provide (rename my-let let))) diff --git a/collects/srfi/54.ss b/collects/srfi/54.ss index 56675b7e30..52cde20aaf 100644 --- a/collects/srfi/54.ss +++ b/collects/srfi/54.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-54 (module |54| mzscheme - (require (lib "cat.ss" "srfi" "54")) - (provide (all-from (lib "cat.ss" "srfi" "54")))) + (require srfi/54/cat) + (provide (all-from srfi/54/cat))) diff --git a/collects/srfi/54/cat.ss b/collects/srfi/54/cat.ss index 4f9c453d40..c302b3bf39 100644 --- a/collects/srfi/54/cat.ss +++ b/collects/srfi/54/cat.ss @@ -3,7 +3,7 @@ (provide cat) - (require (only (lib "string.ss") expr->string)) + (require (only mzlib/string expr->string)) (define (take-both-end str take) (let ((left (car take))) diff --git a/collects/srfi/57.ss b/collects/srfi/57.ss index 75250244f8..791dae5a5f 100644 --- a/collects/srfi/57.ss +++ b/collects/srfi/57.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-57 (module |57| mzscheme - (require (lib "records.ss" "srfi" "57")) - (provide (all-from (lib "records.ss" "srfi" "57")))) + (require srfi/57/records) + (provide (all-from srfi/57/records))) diff --git a/collects/srfi/57/records.ss b/collects/srfi/57/records.ss index 902ce94d07..58199e4c83 100644 --- a/collects/srfi/57/records.ss +++ b/collects/srfi/57/records.ss @@ -10,8 +10,8 @@ record-compose show) - (require (prefix s9: (lib "9.ss" "srfi"))) - (require-for-syntax (prefix s1: (lib "1.ss" "srfi"))) + (require (prefix s9: srfi/9)) + (require-for-syntax (prefix s1: srfi/1)) (require-for-syntax "registry.ss") diff --git a/collects/srfi/57/registry.ss b/collects/srfi/57/registry.ss index ddec262dcd..5461216f0b 100644 --- a/collects/srfi/57/registry.ss +++ b/collects/srfi/57/registry.ss @@ -11,7 +11,7 @@ lookup-copier lookup-predicate) - (require (prefix s1: (lib "1.ss" "srfi"))) + (require (prefix s1: srfi/1)) (define reg '()) diff --git a/collects/srfi/59.ss b/collects/srfi/59.ss index 36d7cf2e4b..48342e41dd 100644 --- a/collects/srfi/59.ss +++ b/collects/srfi/59.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-59 (module |59| mzscheme - (require (lib "vicinity.ss" "srfi" "59")) - (provide (all-from (lib "vicinity.ss" "srfi" "59")))) + (require srfi/59/vicinity) + (provide (all-from srfi/59/vicinity))) diff --git a/collects/srfi/60.ss b/collects/srfi/60.ss index e619b7d496..e0260d7d31 100644 --- a/collects/srfi/60.ss +++ b/collects/srfi/60.ss @@ -1,5 +1,5 @@ (module |60| mzscheme - (require (lib "60.ss" "srfi" "60")) - (provide (all-from (lib "60.ss" "srfi" "60"))) + (require srfi/60/60) + (provide (all-from srfi/60/60)) ) \ No newline at end of file diff --git a/collects/srfi/61.ss b/collects/srfi/61.ss index 7200d2eafd..e71d68fb7c 100644 --- a/collects/srfi/61.ss +++ b/collects/srfi/61.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-61 (module |61| mzscheme - (require (lib "cond.ss" "srfi" "61")) + (require srfi/61/cond) (provide (rename srfi:cond cond))) \ No newline at end of file diff --git a/collects/srfi/63.ss b/collects/srfi/63.ss index 565bb9221a..fff75e8341 100644 --- a/collects/srfi/63.ss +++ b/collects/srfi/63.ss @@ -1,4 +1,4 @@ (module |63| mzscheme - (require (lib "63.ss" "srfi" "63")) - (provide (all-from-except (lib "63.ss" "srfi" "63") s:equal?) + (require srfi/63/63) + (provide (all-from-except srfi/63/63 s:equal?) (rename s:equal? equal?))) \ No newline at end of file diff --git a/collects/srfi/63/63.ss b/collects/srfi/63/63.ss index 8daeb24583..4df3f83a81 100644 --- a/collects/srfi/63/63.ss +++ b/collects/srfi/63/63.ss @@ -9,8 +9,8 @@ (module |63| mzscheme - (require (lib "4.ss" "srfi") - (lib "contract.ss")) + (require srfi/4 + mzlib/contract) (define-syntax make-cvector (syntax-rules () diff --git a/collects/srfi/64.ss b/collects/srfi/64.ss index b51658c58d..35ee219667 100644 --- a/collects/srfi/64.ss +++ b/collects/srfi/64.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-64 (module |64| mzscheme - (require (lib "testing.ss" "srfi" "64")) - (provide (all-from (lib "testing.ss" "srfi" "64")))) + (require srfi/64/testing) + (provide (all-from srfi/64/testing))) diff --git a/collects/srfi/64/testing.ss b/collects/srfi/64/testing.ss index 280a744f14..af9d29eb89 100644 --- a/collects/srfi/64/testing.ss +++ b/collects/srfi/64/testing.ss @@ -22,7 +22,7 @@ (module testing mzscheme - (require (lib "9.ss" "srfi")) + (require srfi/9) ;; List of exported names (provide diff --git a/collects/srfi/66.ss b/collects/srfi/66.ss index c3cc76f75d..4de8eb62c3 100644 --- a/collects/srfi/66.ss +++ b/collects/srfi/66.ss @@ -1,3 +1,3 @@ (module |66| mzscheme - (require (lib "66.ss" "srfi" "66")) - (provide (all-from (lib "66.ss" "srfi" "66")))) \ No newline at end of file + (require srfi/66/66) + (provide (all-from srfi/66/66))) \ No newline at end of file diff --git a/collects/srfi/67.ss b/collects/srfi/67.ss index 51966719c6..d166f6c963 100644 --- a/collects/srfi/67.ss +++ b/collects/srfi/67.ss @@ -1,3 +1,3 @@ (module |67| mzscheme - (require (lib "compare.ss" "srfi" "67")) - (provide (all-from (lib "compare.ss" "srfi" "67")))) \ No newline at end of file + (require srfi/67/compare) + (provide (all-from srfi/67/compare))) \ No newline at end of file diff --git a/collects/srfi/67/compare.ss b/collects/srfi/67/compare.ss index d2b2dc4c9a..fa3d6a4eaf 100644 --- a/collects/srfi/67/compare.ss +++ b/collects/srfi/67/compare.ss @@ -1,6 +1,6 @@ (module compare mzscheme - (require (lib "include.ss") - (lib "27.ss" "srfi")) + (require mzlib/include + srfi/27) (include "compare-reference.scm") diff --git a/collects/srfi/69.ss b/collects/srfi/69.ss index 7cd9cf07b2..652a2945c1 100644 --- a/collects/srfi/69.ss +++ b/collects/srfi/69.ss @@ -1,7 +1,7 @@ ;; module loader for SRFI-69 (module |69| mzscheme - (require (lib "hash.ss" "srfi" "69")) - (provide (all-from-except (lib "hash.ss" "srfi" "69") + (require srfi/69/hash) + (provide (all-from-except srfi/69/hash s:make-hash-table s:hash-table? s:hash-table-copy) diff --git a/collects/srfi/69/hash.ss b/collects/srfi/69/hash.ss index c827868fa1..a5f56c2286 100644 --- a/collects/srfi/69/hash.ss +++ b/collects/srfi/69/hash.ss @@ -5,7 +5,7 @@ (module hash mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (provide (rename my-make-hash-table s:make-hash-table) (rename my-hash-table? s:hash-table?) diff --git a/collects/srfi/7.ss b/collects/srfi/7.ss index 9a3e2fdb5d..631f0561e7 100644 --- a/collects/srfi/7.ss +++ b/collects/srfi/7.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-7 (module |7| mzscheme - (require (lib "program.ss" "srfi" "7")) - (provide (all-from (lib "program.ss" "srfi" "7")))) + (require srfi/7/program) + (provide (all-from srfi/7/program))) diff --git a/collects/srfi/7/program.ss b/collects/srfi/7/program.ss index 451a92f0f9..289fe099f5 100644 --- a/collects/srfi/7/program.ss +++ b/collects/srfi/7/program.ss @@ -3,9 +3,9 @@ ;;; based on MJ Ray's code for SRFI 0 (module program mzscheme - (require-for-syntax (lib "stx.ss" "syntax") - (lib "features.ss" "srfi")) - (require (lib "include.ss")) + (require-for-syntax syntax/stx + srfi/features) + (require mzlib/include) (provide program) (define-syntax require-feature diff --git a/collects/srfi/71.ss b/collects/srfi/71.ss index 24c31bd4f6..85889e50ef 100644 --- a/collects/srfi/71.ss +++ b/collects/srfi/71.ss @@ -1,7 +1,7 @@ ;; module loader for SRFI-71 (module |71| mzscheme - (require (lib "letvalues.ss" "srfi" "71")) - (provide (all-from-except (lib "letvalues.ss" "srfi" "71") + (require srfi/71/letvalues) + (provide (all-from-except srfi/71/letvalues let let* letrec diff --git a/collects/srfi/74.ss b/collects/srfi/74.ss index 65a03fbcbd..11cc323a92 100644 --- a/collects/srfi/74.ss +++ b/collects/srfi/74.ss @@ -1,3 +1,3 @@ (module |74| mzscheme - (require (lib "74.ss" "srfi" "74")) - (provide (all-from (lib "74.ss" "srfi" "74")))) \ No newline at end of file + (require srfi/74/74) + (provide (all-from srfi/74/74))) \ No newline at end of file diff --git a/collects/srfi/74/74.ss b/collects/srfi/74/74.ss index 1809d08d0e..726e0c29a3 100644 --- a/collects/srfi/74/74.ss +++ b/collects/srfi/74/74.ss @@ -1,8 +1,8 @@ (module |74| mzscheme - (require (lib "include.ss") - (lib "26.ss" "srfi") - (lib "60.ss" "srfi") - (lib "66.ss" "srfi")) + (require mzlib/include + srfi/26 + srfi/60 + srfi/66) (provide endianness blob? diff --git a/collects/srfi/78.ss b/collects/srfi/78.ss index da0347d214..1b564546bc 100644 --- a/collects/srfi/78.ss +++ b/collects/srfi/78.ss @@ -1,3 +1,3 @@ (module |78| mzscheme - (require (lib "check.ss" "srfi" "78")) - (provide (all-from (lib "check.ss" "srfi" "78")))) \ No newline at end of file + (require srfi/78/check) + (provide (all-from srfi/78/check))) \ No newline at end of file diff --git a/collects/srfi/78/check-reference.scm b/collects/srfi/78/check-reference.scm index 8d6e5e6708..95c1e1ff83 100644 --- a/collects/srfi/78/check-reference.scm +++ b/collects/srfi/78/check-reference.scm @@ -36,7 +36,7 @@ ; -- portability -- -; PLT: (require (lib "23.ss" "srfi") (lib "42.ss" "srfi")) +; PLT: (require srfi/23 srfi/42) ; Scheme48: ,open srfi-23 srfi-42 ; -- utilities -- @@ -49,7 +49,7 @@ ; because the pretty printers usually output a trailing ; newline. -; PLT: (require (lib "pretty.ss")) (define check:write pretty-print) +; PLT: (require mzlib/pretty) (define check:write pretty-print) ; Scheme48: ,open pp (define check:write p) ; -- mode -- diff --git a/collects/srfi/78/check.ss b/collects/srfi/78/check.ss index 8ad0a43961..1752f5dc1a 100644 --- a/collects/srfi/78/check.ss +++ b/collects/srfi/78/check.ss @@ -1,8 +1,8 @@ (module check mzscheme - (require (lib "include.ss") - (lib "23.ss" "srfi") - (lib "42.ss" "srfi") - (lib "pretty.ss")) + (require mzlib/include + srfi/23 + srfi/42 + mzlib/pretty) (include "check-reference.scm") diff --git a/collects/srfi/78/examples-78.scm b/collects/srfi/78/examples-78.scm index fc873cd0af..7e3275781d 100644 --- a/collects/srfi/78/examples-78.scm +++ b/collects/srfi/78/examples-78.scm @@ -34,11 +34,11 @@ ; -- portability -- ; PLT: -; (require (lib "23.ss" "srfi") (lib "42.ss" "srfi")) (load "check.scm") +; (require srfi/23 srfi/42) (load "check.scm") ; (load "examples.scm") -(require (lib "78.ss" "srfi") - (lib "42.ss" "srfi")) +(require srfi/78 + srfi/42) ; Scheme48: ; ,open srfi-23 srfi-42 diff --git a/collects/srfi/8.ss b/collects/srfi/8.ss index 1840e78022..8ac7cd40f9 100644 --- a/collects/srfi/8.ss +++ b/collects/srfi/8.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-8 (module |8| mzscheme - (require (lib "receive.ss" "srfi" "8")) - (provide (all-from (lib "receive.ss" "srfi" "8")))) + (require srfi/8/receive) + (provide (all-from srfi/8/receive))) diff --git a/collects/srfi/86.ss b/collects/srfi/86.ss index e8a015dbb6..e7356ed4a5 100644 --- a/collects/srfi/86.ss +++ b/collects/srfi/86.ss @@ -1,4 +1,4 @@ (module |86| mzscheme - (require (lib "86.ss" "srfi" "86")) - (provide (all-from (lib "86.ss" "srfi" "86"))) + (require srfi/86/86) + (provide (all-from srfi/86/86)) ) \ No newline at end of file diff --git a/collects/srfi/87.ss b/collects/srfi/87.ss index a30be07233..d04c61e38f 100644 --- a/collects/srfi/87.ss +++ b/collects/srfi/87.ss @@ -1,3 +1,3 @@ (module |87| mzscheme - (require (lib "case.ss" "srfi" "87")) + (require srfi/87/case) (provide (rename srfi:case case))) \ No newline at end of file diff --git a/collects/srfi/9.ss b/collects/srfi/9.ss index a956092f08..faf8ad8fc2 100644 --- a/collects/srfi/9.ss +++ b/collects/srfi/9.ss @@ -1,4 +1,4 @@ ;; module loader for SRFI-9 (module |9| mzscheme - (require (lib "record.ss" "srfi" "9")) - (provide (all-from (lib "record.ss" "srfi" "9")))) + (require srfi/9/record) + (provide (all-from srfi/9/record))) diff --git a/collects/srfi/doc.txt b/collects/srfi/doc.txt index b1fb36795b..5d06491fdc 100644 --- a/collects/srfi/doc.txt +++ b/collects/srfi/doc.txt @@ -17,12 +17,12 @@ please see the note below. To load a SRFI, use the following form: - (require (lib "N.ss" "srfi")) + (require srfi/N) if you know the number of the SRFI you want to load. This is the preferred method, or this one: - (require (lib "NAME.ss" "srfi" "N")) + (require srfi/N/NAME) if you know the `informative name' of the SRFI. @@ -32,11 +32,11 @@ name we assigned to the main file in which the SRFI is defined. For instance, to load SRFI-34 you have to do either one of: - (require (lib "34.ss" "srfi")) + (require srfi/34) or, - (require (lib "exception.ss" "srfi" "34")) + (require srfi/34/exception) NOTE on SRFIs with name conflicts --------------------------------- @@ -53,7 +53,7 @@ problematic exports to avoid these conflicts. For SRFI 1, this library is called list.ss, and should be required like this: - (require (lib "list.ss" "srfi" "1")) + (require srfi/1/list) which supplies the colliding names with a prefix of 's:' (e.g. "s:map", "s:reverse!") and is therefore suitable for @@ -62,7 +62,7 @@ requires in a module. For SRFI 19, this library is called time.ss, and should be required like this: - (require (lib "time.ss" "srfi" "19")) + (require srfi/19/time) which supplies the colliding names with a prefix of 'srfi:' (e.g. "srfi:date?", "srfi:date-second") and is therefore diff --git a/collects/srpersist/private/sigs.ss b/collects/srpersist/private/sigs.ss index 535f9e3c1e..ddfb1077bc 100644 --- a/collects/srpersist/private/sigs.ss +++ b/collects/srpersist/private/sigs.ss @@ -2,7 +2,7 @@ (module sigs mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (provide srpersist:odbc^) diff --git a/collects/srpersist/srpersist.ss b/collects/srpersist/srpersist.ss index c565509b9a..6326e27d65 100644 --- a/collects/srpersist/srpersist.ss +++ b/collects/srpersist/srpersist.ss @@ -1,5 +1,5 @@ (module srpersist mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (require (lib "sigs.ss" "srpersist" "private")) (require (lib "srpmain.ss" "srpersist" "private")) (provide-signature-elements srpersist:odbc^)) diff --git a/collects/stepper/break.ss b/collects/stepper/break.ss index 826dc66381..8800aff026 100644 --- a/collects/stepper/break.ss +++ b/collects/stepper/break.ss @@ -1,6 +1,6 @@ (module break mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (provide current-breakpoint-handler) diff --git a/collects/stepper/debugger-sig.ss b/collects/stepper/debugger-sig.ss index 32213bcc46..806c4cd2bd 100644 --- a/collects/stepper/debugger-sig.ss +++ b/collects/stepper/debugger-sig.ss @@ -1,5 +1,5 @@ (module debugger-sig mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (provide debugger-model^ debugger-vc^) diff --git a/collects/stepper/debugger-tool.ss b/collects/stepper/debugger-tool.ss index 6b44eb1e71..9a459ddb8d 100644 --- a/collects/stepper/debugger-tool.ss +++ b/collects/stepper/debugger-tool.ss @@ -1,11 +1,11 @@ (module debugger-tool mzscheme - (require (lib "contract.ss") + (require mzlib/contract (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (prefix frame: (lib "framework.ss" "framework")) - (lib "unitsig.ss") - (lib "class.ss") - (lib "list.ss") + mred + (prefix frame: framework) + mzlib/unitsig + mzlib/class + mzlib/list (lib "bitmap-label.ss" "mrlib") "debugger-sig.ss" "private/debugger-vc.ss" diff --git a/collects/stepper/private/annotate.ss b/collects/stepper/private/annotate.ss index 765aa3f02f..fb0c7057d4 100644 --- a/collects/stepper/private/annotate.ss +++ b/collects/stepper/private/annotate.ss @@ -1,9 +1,9 @@ #lang scheme/base -(require (prefix-in kernel: (lib "kerncase.ss" "syntax")) - (lib "contract.ss") - (lib "list.ss") - (lib "etc.ss") +(require (prefix-in kernel: syntax/kerncase) + mzlib/contract + mzlib/list + mzlib/etc scheme/match "marks.ss" "shared.ss" diff --git a/collects/stepper/private/debugger-annotate.ss b/collects/stepper/private/debugger-annotate.ss index 96dd05163d..a2b5ae239a 100644 --- a/collects/stepper/private/debugger-annotate.ss +++ b/collects/stepper/private/debugger-annotate.ss @@ -1,9 +1,9 @@ (module debugger-annotate scheme/base - (require (prefix-in kernel: (lib "kerncase.ss" "syntax")) + (require (prefix-in kernel: syntax/kerncase) "shared.ss" "marks.ss" - (lib "contract.ss")) + mzlib/contract) (define count 0) diff --git a/collects/stepper/private/debugger-bindings.ss b/collects/stepper/private/debugger-bindings.ss index 6f798cd409..b5d55cbdbc 100644 --- a/collects/stepper/private/debugger-bindings.ss +++ b/collects/stepper/private/debugger-bindings.ss @@ -2,11 +2,11 @@ ; REPL by getting & setting values in the top-level environment (module debugger-bindings mzscheme - (require (lib "contract.ss") + (require mzlib/contract "marks.ss" - (lib "etc.ss") - (lib "list.ss") - (prefix kernel: (lib "kerncase.ss" "syntax"))) + mzlib/etc + mzlib/list + (prefix kernel: syntax/kerncase)) (provide/contract [set-event-num! (-> number? void?)] [bt (-> void?)] diff --git a/collects/stepper/private/debugger-model.ss b/collects/stepper/private/debugger-model.ss index 51acd080e6..d274760acb 100644 --- a/collects/stepper/private/debugger-model.ss +++ b/collects/stepper/private/debugger-model.ss @@ -1,8 +1,8 @@ (module debugger-model mzscheme - (require (lib "unitsig.ss") - (lib "contract.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") + (require mzlib/unitsig + mzlib/contract + mzlib/etc + mred (lib "debugger-sig.ss" "stepper") "my-macros.ss" "debugger-annotate.ss" diff --git a/collects/stepper/private/debugger-vc.ss b/collects/stepper/private/debugger-vc.ss index 169f7aabe8..d6c50834c8 100644 --- a/collects/stepper/private/debugger-vc.ss +++ b/collects/stepper/private/debugger-vc.ss @@ -1,9 +1,9 @@ (module debugger-vc mzscheme - (require (lib "unitsig.ss") + (require mzlib/unitsig (lib "debugger-sig.ss" "stepper") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "framework.ss" "framework") + mred + mzlib/class + framework "marks.ss" "debugger-bindings.ss") diff --git a/collects/stepper/private/display-break-stuff.ss b/collects/stepper/private/display-break-stuff.ss index a83928cb6f..55952b2720 100644 --- a/collects/stepper/private/display-break-stuff.ss +++ b/collects/stepper/private/display-break-stuff.ss @@ -1,6 +1,6 @@ (module display-break-stuff mzscheme - (require (lib "mred.ss" "mred") (lib "class.ss") "marks.ss") + (require mred mzlib/class "marks.ss") (provide display-break-stuff) diff --git a/collects/stepper/private/lifting.ss b/collects/stepper/private/lifting.ss index f46a0757af..b87c5c7140 100644 --- a/collects/stepper/private/lifting.ss +++ b/collects/stepper/private/lifting.ss @@ -1,8 +1,8 @@ (module lifting scheme/base - (require (lib "etc.ss") - (lib "contract.ss") - (prefix-in kernel: (lib "kerncase.ss" "syntax")) - (lib "match.ss") + (require mzlib/etc + mzlib/contract + (prefix-in kernel: syntax/kerncase) + mzlib/match "testing-shared.ss" "shared.ss" "my-macros.ss" diff --git a/collects/stepper/private/macro-unwind.ss b/collects/stepper/private/macro-unwind.ss index 61bbdc332f..ecee85f13f 100644 --- a/collects/stepper/private/macro-unwind.ss +++ b/collects/stepper/private/macro-unwind.ss @@ -1,7 +1,7 @@ (module macro-unwind scheme/base - (require (prefix-in kernel: (lib "kerncase.ss" "syntax")) - (lib "etc.ss") - (lib "contract.ss") + (require (prefix-in kernel: syntax/kerncase) + mzlib/etc + mzlib/contract "model-settings.ss" "shared.ss" (for-syntax scheme/base)) diff --git a/collects/stepper/private/marks.ss b/collects/stepper/private/marks.ss index 591fe6f752..a0504162cf 100644 --- a/collects/stepper/private/marks.ss +++ b/collects/stepper/private/marks.ss @@ -1,7 +1,7 @@ (module marks mzscheme - (require (lib "list.ss") - (lib "contract.ss") + (require mzlib/list + mzlib/contract "my-macros.ss" "shared.ss") diff --git a/collects/stepper/private/model-settings.ss b/collects/stepper/private/model-settings.ss index 8b582c1058..dd0a5c4524 100644 --- a/collects/stepper/private/model-settings.ss +++ b/collects/stepper/private/model-settings.ss @@ -1,6 +1,6 @@ (module model-settings mzscheme - (require (lib "contract.ss") - (lib "pconvert.ss")) + (require mzlib/contract + mzlib/pconvert) ; there are two separate reasons to use units here, but it's just too painful. ; reason 1) the drscheme:language procedures are linked at runtime into the diff --git a/collects/stepper/private/model.ss b/collects/stepper/private/model.ss index 42dcfba66f..3ce34ac1e8 100644 --- a/collects/stepper/private/model.ss +++ b/collects/stepper/private/model.ss @@ -37,10 +37,10 @@ (module model mzscheme - (require (lib "contract.ss") - (lib "etc.ss") - (lib "match.ss") - (lib "class.ss") + (require mzlib/contract + mzlib/etc + mzlib/match + mzlib/class (prefix a: "annotate.ss") (prefix r: "reconstruct.ss") "shared.ss" diff --git a/collects/stepper/private/mred-extensions.ss b/collects/stepper/private/mred-extensions.ss index ab4b2212d7..84ac02bb0f 100644 --- a/collects/stepper/private/mred-extensions.ss +++ b/collects/stepper/private/mred-extensions.ss @@ -1,11 +1,11 @@ (module mred-extensions mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (prefix f: (lib "framework.ss" "framework")) - (lib "pretty.ss") + (require mzlib/class + mred + (prefix f: framework) + mzlib/pretty "testing-shared.ss" "shared.ss" - (lib "string-constant.ss" "string-constants") + string-constants (lib "bitmap-label.ss" "mrlib")) (provide diff --git a/collects/stepper/private/my-macros.ss b/collects/stepper/private/my-macros.ss index 7bd1eccdf4..ce6bb1af04 100644 --- a/collects/stepper/private/my-macros.ss +++ b/collects/stepper/private/my-macros.ss @@ -1,6 +1,6 @@ (module my-macros mzscheme - (require-for-syntax (lib "list.ss")) + (require-for-syntax mzlib/list) ;;;;;;;;;; ;; diff --git a/collects/stepper/private/reconstruct.ss b/collects/stepper/private/reconstruct.ss index 1814d881cd..2d08fd2a3c 100644 --- a/collects/stepper/private/reconstruct.ss +++ b/collects/stepper/private/reconstruct.ss @@ -4,10 +4,10 @@ ; or have a value in some mark somewhere (or both). (module reconstruct scheme/base - (require (prefix-in kernel: (lib "kerncase.ss" "syntax")) - (lib "list.ss") - (lib "etc.ss") - (lib "contract.ss") + (require (prefix-in kernel: syntax/kerncase) + mzlib/list + mzlib/etc + mzlib/contract "marks.ss" "model-settings.ss" "shared.ss" diff --git a/collects/stepper/private/shared.ss b/collects/stepper/private/shared.ss index 0a85bc0a6b..19a996c9a3 100644 --- a/collects/stepper/private/shared.ss +++ b/collects/stepper/private/shared.ss @@ -1,12 +1,12 @@ (module shared mzscheme (require "my-macros.ss" - (lib "contract.ss") - (lib "list.ss") - (lib "etc.ss") - (lib "match.ss") - (lib "26.ss" "srfi") - (lib "class.ss")) + mzlib/contract + mzlib/list + mzlib/etc + mzlib/match + srfi/26 + mzlib/class) ; CONTRACTS diff --git a/collects/stepper/private/testing-shared.ss b/collects/stepper/private/testing-shared.ss index 1709704de7..fb873f7fe9 100644 --- a/collects/stepper/private/testing-shared.ss +++ b/collects/stepper/private/testing-shared.ss @@ -1,8 +1,8 @@ (module testing-shared mzscheme - (require (lib "contract.ss") + (require mzlib/contract "shared.ss" - (lib "kerncase.ss" "syntax") - (lib "file.ss")) + syntax/kerncase + mzlib/file) (provide/contract [build-stx-with-highlight ((or/c (listof any/c) string?) ; input with one or more '(hilite ...) tags . -> . diff --git a/collects/stepper/private/vertical-separator-snip.ss b/collects/stepper/private/vertical-separator-snip.ss index 08c44d7e21..c63147f0af 100644 --- a/collects/stepper/private/vertical-separator-snip.ss +++ b/collects/stepper/private/vertical-separator-snip.ss @@ -1,6 +1,6 @@ (module vertical-separator-snip mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") + (require mred + mzlib/class "mred-extensions.ss") (provide snip-class) diff --git a/collects/stepper/private/xml-box.ss b/collects/stepper/private/xml-box.ss index 5f12f23fb7..d58d493f04 100644 --- a/collects/stepper/private/xml-box.ss +++ b/collects/stepper/private/xml-box.ss @@ -1,7 +1,7 @@ (module xml-box scheme/base - (require (lib "contract.ss") + (require mzlib/contract "shared.ss" - (prefix-in kernel: (lib "kerncase.ss" "syntax"))) + (prefix-in kernel: syntax/kerncase)) (provide/contract [rewrite-xml-box (syntax? ; stx to rewrite (syntax? . -> . syntax?) ; rewriter for non-xml-box subcomponents diff --git a/collects/stepper/private/xml-snip-helpers.ss b/collects/stepper/private/xml-snip-helpers.ss index d2f81c187c..65c78ecf1e 100644 --- a/collects/stepper/private/xml-snip-helpers.ss +++ b/collects/stepper/private/xml-snip-helpers.ss @@ -1,10 +1,10 @@ (module xml-snip-helpers mzscheme (require (lib "xml.ss" "xml") - (lib "readerr.ss" "syntax") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") + syntax/readerr + mred + mzlib/class + mzlib/list "shared.ss") (provide xml-read-special diff --git a/collects/stepper/stepper+xml-tool.ss b/collects/stepper/stepper+xml-tool.ss index b626083b55..8006015310 100644 --- a/collects/stepper/stepper+xml-tool.ss +++ b/collects/stepper/stepper+xml-tool.ss @@ -1,5 +1,5 @@ (module stepper+xml-tool mzscheme - (require (lib "unit.ss") + (require mzlib/unit (lib "tool.ss" "drscheme") "stepper-tool.ss" "xml-tool.ss") diff --git a/collects/stepper/stepper-tool.ss b/collects/stepper/stepper-tool.ss index 3eab08efac..3dd7207ec2 100644 --- a/collects/stepper/stepper-tool.ss +++ b/collects/stepper/stepper-tool.ss @@ -1,15 +1,15 @@ (module stepper-tool mzscheme - (require (lib "contract.ss") + (require mzlib/contract (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (lib "pconvert.ss") - (lib "string-constant.ss" "string-constants") - (lib "async-channel.ss") - (prefix frame: (lib "framework.ss" "framework")) - (lib "unit.ss") - (lib "class.ss") - (lib "list.ss") + mred + mzlib/pconvert + string-constants + mzlib/async-channel + (prefix frame: framework) + mzlib/unit + mzlib/class + mzlib/list (prefix model: "private/model.ss") "private/my-macros.ss" (prefix x: "private/mred-extensions.ss") diff --git a/collects/stepper/xml-tool.ss b/collects/stepper/xml-tool.ss index 642cccee67..9a91e0371a 100644 --- a/collects/stepper/xml-tool.ss +++ b/collects/stepper/xml-tool.ss @@ -2,14 +2,14 @@ (module xml-tool mzscheme (require "private/xml-snip-helpers.ss" "xml-sig.ss" - (lib "unit.ss") - (lib "contract.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + mzlib/unit + mzlib/contract + mzlib/class + mred + framework (lib "tool.ss" "drscheme") (lib "xml.ss" "xml") - (lib "string-constant.ss" "string-constants")) + string-constants) (provide xml-tool@) diff --git a/collects/string-constants/string-constant.ss b/collects/string-constants/string-constant.ss index 3e1106233b..5c69848206 100644 --- a/collects/string-constants/string-constant.ss +++ b/collects/string-constants/string-constant.ss @@ -1,7 +1,7 @@ (module string-constant mzscheme - (require-for-syntax (lib "etc.ss") - (lib "list.ss") + (require-for-syntax mzlib/etc + mzlib/list (prefix english: "english-string-constants.ss") (prefix spanish: "spanish-string-constants.ss") (prefix german: "german-string-constants.ss") @@ -13,8 +13,8 @@ (prefix traditional-chinese: "traditional-chinese-string-constants.ss") (prefix simplified-chinese: "simplified-chinese-string-constants.ss")) - (require (lib "file.ss") - (lib "etc.ss") + (require mzlib/file + mzlib/etc "private/only-once.ss") (provide string-constant string-constants this-language all-languages set-language-pref) diff --git a/collects/swindle/tool.ss b/collects/swindle/tool.ss index df19e68c7a..6d6ec62e5f 100644 --- a/collects/swindle/tool.ss +++ b/collects/swindle/tool.ss @@ -7,9 +7,9 @@ drscheme/tool mzlib/class mzlib/list - mred/mred + mred net/sendurl - string-constants/string-constant) + string-constants) (provide tool@) (define tool@ diff --git a/collects/syntax-color/default-lexer.ss b/collects/syntax-color/default-lexer.ss index 0921604f2f..f432bcdd13 100644 --- a/collects/syntax-color/default-lexer.ss +++ b/collects/syntax-color/default-lexer.ss @@ -1,6 +1,6 @@ (module default-lexer mzscheme - (require (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools"))) + (require parser-tools/lex + (prefix : parser-tools/lex-sre)) (provide default-lexer) diff --git a/collects/syntax-color/paren-tree.ss b/collects/syntax-color/paren-tree.ss index ae56f9468f..fdb6b112b0 100644 --- a/collects/syntax-color/paren-tree.ss +++ b/collects/syntax-color/paren-tree.ss @@ -1,5 +1,5 @@ (module paren-tree mzscheme - (require (lib "class.ss") + (require mzlib/class "token-tree.ss") (provide paren-tree%) diff --git a/collects/syntax-color/scheme-lexer.ss b/collects/syntax-color/scheme-lexer.ss index 956bf4a4ef..37ee274633 100644 --- a/collects/syntax-color/scheme-lexer.ss +++ b/collects/syntax-color/scheme-lexer.ss @@ -1,7 +1,7 @@ (module scheme-lexer mzscheme - (require (lib "lex.ss" "parser-tools") - (prefix : (lib "lex-sre.ss" "parser-tools"))) + (require parser-tools/lex + (prefix : parser-tools/lex-sre)) (provide scheme-lexer) diff --git a/collects/syntax-color/token-tree.ss b/collects/syntax-color/token-tree.ss index 84ea80cfec..344ce671b5 100644 --- a/collects/syntax-color/token-tree.ss +++ b/collects/syntax-color/token-tree.ss @@ -1,5 +1,5 @@ (module token-tree mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide token-tree% insert-first! insert-last! insert-last-spec! node? node-token-length node-token-data node-left-subtree-length node-left node-right) diff --git a/collects/syntax/boundmap.ss b/collects/syntax/boundmap.ss index 971e09c04a..6a130be982 100644 --- a/collects/syntax/boundmap.ss +++ b/collects/syntax/boundmap.ss @@ -1,6 +1,6 @@ (module boundmap mzscheme - (require (lib "contract.ss") + (require mzlib/contract "private/boundmap.ss") (define-syntax provide/contract* diff --git a/collects/syntax/modcode.ss b/collects/syntax/modcode.ss index 5accba40d0..e0e60e00c7 100644 --- a/collects/syntax/modcode.ss +++ b/collects/syntax/modcode.ss @@ -1,7 +1,7 @@ (module modcode scheme/base - (require (lib "port.ss") - (lib "contract.ss") + (require mzlib/port + mzlib/contract "modread.ss") (provide moddep-current-open-input-file diff --git a/collects/syntax/modcollapse.ss b/collects/syntax/modcollapse.ss index 2b0fe6f8d1..241718865d 100644 --- a/collects/syntax/modcollapse.ss +++ b/collects/syntax/modcollapse.ss @@ -1,7 +1,7 @@ (module modcollapse mzscheme - (require (lib "list.ss") - (lib "contract.ss") + (require mzlib/list + mzlib/contract "private/modhelp.ss") (define (collapse-module-path s relto-mp) diff --git a/collects/syntax/modread.ss b/collects/syntax/modread.ss index 038fa7efff..6aea8577f7 100644 --- a/collects/syntax/modread.ss +++ b/collects/syntax/modread.ss @@ -1,5 +1,5 @@ (module modread mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (provide with-module-reading-parameterization) (provide/contract diff --git a/collects/syntax/modresolve.ss b/collects/syntax/modresolve.ss index a44089a682..82b33e979d 100644 --- a/collects/syntax/modresolve.ss +++ b/collects/syntax/modresolve.ss @@ -1,7 +1,7 @@ (module modresolve mzscheme - (require (lib "list.ss") - (lib "contract.ss") + (require mzlib/list + mzlib/contract "private/modhelp.ss") (define (force-relto relto dir?) diff --git a/collects/syntax/private/boundmap.ss b/collects/syntax/private/boundmap.ss index ec64a1e76b..4886eb005a 100644 --- a/collects/syntax/private/boundmap.ss +++ b/collects/syntax/private/boundmap.ss @@ -1,6 +1,6 @@ (module boundmap mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (define-syntax (make-mapping-code stx) (syntax-case stx () diff --git a/collects/syntax/private/modhelp.ss b/collects/syntax/private/modhelp.ss index ad25621f00..8e0f274626 100644 --- a/collects/syntax/private/modhelp.ss +++ b/collects/syntax/private/modhelp.ss @@ -1,6 +1,6 @@ (module modhelp mzscheme - (require (lib "string.ss")) + (require mzlib/string) (provide explode-relpath-string module-path-v? diff --git a/collects/syntax/struct.ss b/collects/syntax/struct.ss index 07eb7afbe2..0066f50028 100644 --- a/collects/syntax/struct.ss +++ b/collects/syntax/struct.ss @@ -1,8 +1,8 @@ (module struct scheme/base (require (for-syntax scheme/base) - (lib "etc.ss") - (lib "contract.ss") + mzlib/etc + mzlib/contract "stx.ss" (lib "struct-info.ss" "scheme")) (require (for-template mzscheme)) diff --git a/collects/syntax/to-string.ss b/collects/syntax/to-string.ss index 5b8ad1bd03..55e3090b4d 100644 --- a/collects/syntax/to-string.ss +++ b/collects/syntax/to-string.ss @@ -1,8 +1,8 @@ (module to-string mzscheme - (require (lib "contract.ss") - (lib "stx.ss" "syntax")) + (require mzlib/contract + syntax/stx) - (require (lib "list.ss")) + (require mzlib/list) (define (syntax->string c) (let* ([s (open-output-string)] diff --git a/collects/syntax/trusted-xforms.ss b/collects/syntax/trusted-xforms.ss index 47491004a2..18b70ad8bc 100644 --- a/collects/syntax/trusted-xforms.ss +++ b/collects/syntax/trusted-xforms.ss @@ -1,2 +1,2 @@ (module trusted-xforms mzscheme - (require (lib "class.ss"))) + (require mzlib/class)) diff --git a/collects/syntax/zodiac.ss b/collects/syntax/zodiac.ss index b23a1571f0..12369862f4 100644 --- a/collects/syntax/zodiac.ss +++ b/collects/syntax/zodiac.ss @@ -1,6 +1,6 @@ (module zodiac mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "zodiac-sig.ss") (require "zodiac-unit.ss") diff --git a/collects/teachpack/htdp/arrow-gui.ss b/collects/teachpack/htdp/arrow-gui.ss index 567592115b..1c40e37965 100644 --- a/collects/teachpack/htdp/arrow-gui.ss +++ b/collects/teachpack/htdp/arrow-gui.ss @@ -1,3 +1,3 @@ #cs(module arrow-gui mzscheme - (require (lib "arrow-gui.ss" "htdp")) - (provide (all-from (lib "arrow-gui.ss" "htdp")))) + (require htdp/arrow-gui) + (provide (all-from htdp/arrow-gui))) diff --git a/collects/teachpack/htdp/arrow.ss b/collects/teachpack/htdp/arrow.ss index 1d76fe99b4..1eab296882 100644 --- a/collects/teachpack/htdp/arrow.ss +++ b/collects/teachpack/htdp/arrow.ss @@ -1,3 +1,3 @@ #cs(module arrow mzscheme - (require (lib "arrow.ss" "htdp")) - (provide (all-from (lib "arrow.ss" "htdp")))) + (require htdp/arrow) + (provide (all-from htdp/arrow))) diff --git a/collects/teachpack/htdp/dir.ss b/collects/teachpack/htdp/dir.ss index 6805ac04bb..2dd01be54c 100644 --- a/collects/teachpack/htdp/dir.ss +++ b/collects/teachpack/htdp/dir.ss @@ -1,5 +1,5 @@ #cs(module dir mzscheme - (require (all-except (lib "dir.ss" "htdp") file-size) - (rename (lib "dir.ss" "htdp") file--size file-size)) + (require (all-except htdp/dir file-size) + (rename htdp/dir file--size file-size)) (provide (rename file--size file-size) - (all-from-except (lib "dir.ss" "htdp") file--size))) + (all-from-except htdp/dir file--size))) diff --git a/collects/teachpack/htdp/docs.ss b/collects/teachpack/htdp/docs.ss index 74e7de4b65..90d337f7b4 100644 --- a/collects/teachpack/htdp/docs.ss +++ b/collects/teachpack/htdp/docs.ss @@ -1,3 +1,3 @@ #cs(module docs mzscheme - (require (lib "docs.ss" "htdp")) - (provide (all-from (lib "docs.ss" "htdp")))) + (require htdp/docs) + (provide (all-from htdp/docs))) diff --git a/collects/teachpack/htdp/draw.ss b/collects/teachpack/htdp/draw.ss index ae61fad1b2..332516c0cf 100644 --- a/collects/teachpack/htdp/draw.ss +++ b/collects/teachpack/htdp/draw.ss @@ -1,3 +1,3 @@ #cs(module draw mzscheme - (require (lib "draw.ss" "htdp")) - (provide (all-from (lib "draw.ss" "htdp")))) + (require htdp/draw) + (provide (all-from htdp/draw))) diff --git a/collects/teachpack/htdp/elevator.ss b/collects/teachpack/htdp/elevator.ss index 938d8855c8..cfa84005c8 100644 --- a/collects/teachpack/htdp/elevator.ss +++ b/collects/teachpack/htdp/elevator.ss @@ -1,3 +1,3 @@ #cs(module elevator mzscheme - (require (lib "elevator.ss" "htdp")) - (provide (all-from (lib "elevator.ss" "htdp")))) + (require htdp/elevator) + (provide (all-from htdp/elevator))) diff --git a/collects/teachpack/htdp/graphing.ss b/collects/teachpack/htdp/graphing.ss index 4299fc7c7f..a089e85fea 100644 --- a/collects/teachpack/htdp/graphing.ss +++ b/collects/teachpack/htdp/graphing.ss @@ -1,3 +1,3 @@ #cs(module graphing mzscheme - (require (lib "graphing.ss" "htdp")) - (provide (all-from (lib "graphing.ss" "htdp")))) + (require htdp/graphing) + (provide (all-from htdp/graphing))) diff --git a/collects/teachpack/htdp/guess-gui.ss b/collects/teachpack/htdp/guess-gui.ss index 309018fb6d..f640a330bf 100644 --- a/collects/teachpack/htdp/guess-gui.ss +++ b/collects/teachpack/htdp/guess-gui.ss @@ -1,3 +1,3 @@ #cs(module guess-gui mzscheme - (require (lib "guess-gui.ss" "htdp")) - (provide (all-from (lib "guess-gui.ss" "htdp")))) + (require htdp/guess-gui) + (provide (all-from htdp/guess-gui))) diff --git a/collects/teachpack/htdp/guess.ss b/collects/teachpack/htdp/guess.ss index 6eab82d0b4..f9e7eeab09 100644 --- a/collects/teachpack/htdp/guess.ss +++ b/collects/teachpack/htdp/guess.ss @@ -1,3 +1,3 @@ #cs(module guess mzscheme - (require (lib "guess.ss" "htdp")) - (provide (all-from (lib "guess.ss" "htdp")))) + (require htdp/guess) + (provide (all-from htdp/guess))) diff --git a/collects/teachpack/htdp/gui.ss b/collects/teachpack/htdp/gui.ss index ee0ec16de0..4243105307 100644 --- a/collects/teachpack/htdp/gui.ss +++ b/collects/teachpack/htdp/gui.ss @@ -1,3 +1,3 @@ #cs(module gui mzscheme - (require (lib "gui.ss" "htdp")) - (provide (all-from (lib "gui.ss" "htdp")))) + (require htdp/gui) + (provide (all-from htdp/gui))) diff --git a/collects/teachpack/htdp/hangman.ss b/collects/teachpack/htdp/hangman.ss index ea9c241901..5c7a1152e8 100644 --- a/collects/teachpack/htdp/hangman.ss +++ b/collects/teachpack/htdp/hangman.ss @@ -1,3 +1,3 @@ #cs(module hangman mzscheme - (provide (all-from (lib "hangman.ss" "htdp"))) - (require (lib "hangman.ss" "htdp"))) + (provide (all-from htdp/hangman)) + (require htdp/hangman)) diff --git a/collects/teachpack/htdp/image.ss b/collects/teachpack/htdp/image.ss index 2ff7ce06eb..20795c06a7 100644 --- a/collects/teachpack/htdp/image.ss +++ b/collects/teachpack/htdp/image.ss @@ -4,7 +4,7 @@ ;; reporting in the teaching languages. (module image mzscheme - (require (lib "image.ss" "htdp") + (require htdp/image (lib "prim.ss" "lang")) diff --git a/collects/teachpack/htdp/lkup-gui.ss b/collects/teachpack/htdp/lkup-gui.ss index dbebeb3cc2..8750cb48b8 100644 --- a/collects/teachpack/htdp/lkup-gui.ss +++ b/collects/teachpack/htdp/lkup-gui.ss @@ -1,3 +1,3 @@ #cs(module lkup-gui mzscheme - (require (lib "lkup-gui.ss" "htdp")) - (provide (all-from (lib "lkup-gui.ss" "htdp")))) + (require htdp/lkup-gui) + (provide (all-from htdp/lkup-gui))) diff --git a/collects/teachpack/htdp/master.ss b/collects/teachpack/htdp/master.ss index 17327a6e52..94a3794737 100644 --- a/collects/teachpack/htdp/master.ss +++ b/collects/teachpack/htdp/master.ss @@ -1,3 +1,3 @@ #cs(module master mzscheme - (require (lib "master.ss" "htdp")) - (provide (all-from (lib "master.ss" "htdp")))) + (require htdp/master) + (provide (all-from htdp/master))) diff --git a/collects/teachpack/htdp/servlet.ss b/collects/teachpack/htdp/servlet.ss index f59a628257..cafb93e107 100644 --- a/collects/teachpack/htdp/servlet.ss +++ b/collects/teachpack/htdp/servlet.ss @@ -1,3 +1,3 @@ #cs(module servlet mzscheme - (require (lib "servlet.ss" "htdp")) - (provide (all-from (lib "servlet.ss" "htdp")))) + (require htdp/servlet) + (provide (all-from htdp/servlet))) diff --git a/collects/teachpack/htdp/servlet2.ss b/collects/teachpack/htdp/servlet2.ss index 183d316c9e..a2b52f62f9 100644 --- a/collects/teachpack/htdp/servlet2.ss +++ b/collects/teachpack/htdp/servlet2.ss @@ -1,3 +1,3 @@ #cs(module servlet2 mzscheme - (require (lib "servlet2.ss" "htdp")) - (provide (all-from (lib "servlet2.ss" "htdp")))) + (require htdp/servlet2) + (provide (all-from htdp/servlet2))) diff --git a/collects/teachpack/htdp/show-queen.ss b/collects/teachpack/htdp/show-queen.ss index f0f41d23cc..b0c4f8396a 100644 --- a/collects/teachpack/htdp/show-queen.ss +++ b/collects/teachpack/htdp/show-queen.ss @@ -1,3 +1,3 @@ (module show-queen mzscheme - (require (lib "show-queen.ss" "htdp")) - (provide (all-from (lib "show-queen.ss" "htdp")))) + (require htdp/show-queen) + (provide (all-from htdp/show-queen))) diff --git a/collects/teachpack/htdp/world.ss b/collects/teachpack/htdp/world.ss index 24b884ecc9..27940447fa 100644 --- a/collects/teachpack/htdp/world.ss +++ b/collects/teachpack/htdp/world.ss @@ -1,3 +1,3 @@ #cs(module world mzscheme - (provide (all-from (lib "world.ss" "htdp"))) - (require (lib "world.ss" "htdp"))) + (provide (all-from htdp/world)) + (require htdp/world)) diff --git a/collects/teachpack/turtles.ss b/collects/teachpack/turtles.ss index 30f8a222ea..4d54d9144e 100644 --- a/collects/teachpack/turtles.ss +++ b/collects/teachpack/turtles.ss @@ -1,3 +1,3 @@ (module turtles mzscheme - (require (lib "turtles.ss" "graphics")) - (provide (all-from (lib "turtles.ss" "graphics")))) + (require graphics/turtles) + (provide (all-from graphics/turtles))) diff --git a/collects/teachpack/value-turtles.ss b/collects/teachpack/value-turtles.ss index 4fb56a9275..e7e66bd8f5 100644 --- a/collects/teachpack/value-turtles.ss +++ b/collects/teachpack/value-turtles.ss @@ -1,3 +1,3 @@ (module value-turtles mzscheme - (require (lib "value-turtles.ss" "graphics")) - (provide (all-from (lib "value-turtles.ss" "graphics")))) + (require graphics/value-turtles) + (provide (all-from graphics/value-turtles))) diff --git a/collects/test-box-recovery/tool.ss b/collects/test-box-recovery/tool.ss index b42064cb88..2df5c05988 100644 --- a/collects/test-box-recovery/tool.ss +++ b/collects/test-box-recovery/tool.ss @@ -1,10 +1,10 @@ (module tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "unit.ss") - (lib "framework.ss" "framework")) + mred + mzlib/class + mzlib/unit + framework) (provide tool@) diff --git a/collects/tests/aligned-pasteboard/debug.ss b/collects/tests/aligned-pasteboard/debug.ss index d13734ea9f..192327a12e 100644 --- a/collects/tests/aligned-pasteboard/debug.ss +++ b/collects/tests/aligned-pasteboard/debug.ss @@ -1,6 +1,6 @@ (module debug mzscheme (require - (lib "class.ss")) + mzlib/class) (provide debug-snip diff --git a/collects/tests/aligned-pasteboard/example.ss b/collects/tests/aligned-pasteboard/example.ss index d9fe843e5d..9bff981638 100644 --- a/collects/tests/aligned-pasteboard/example.ss +++ b/collects/tests/aligned-pasteboard/example.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc "../aligned-pasteboard.ss" "../aligned-editor-container.ss") diff --git a/collects/tests/aligned-pasteboard/old-bugs/big-min.ss b/collects/tests/aligned-pasteboard/old-bugs/big-min.ss index abd08f35b5..49b6a301bc 100644 --- a/collects/tests/aligned-pasteboard/old-bugs/big-min.ss +++ b/collects/tests/aligned-pasteboard/old-bugs/big-min.ss @@ -1,7 +1,7 @@ (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") + mzlib/class + mred + mzlib/etc (lib "aligned-pasteboard.ss" "mrlib")) (define frame (instantiate frame% () (label "big-min") (width 400) (height 500))) diff --git a/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss b/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss index aa7fc2cff1..3d4ff21f05 100644 --- a/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss +++ b/collects/tests/aligned-pasteboard/old-bugs/missing-min.ss @@ -1,9 +1,9 @@ (require - (lib "class.ss") - (lib "etc.ss") + mzlib/class + mzlib/etc (lib "aligned-pasteboard.ss" "mrlib") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (define f (instantiate frame% () (label "test") (width 400) (height 500))) (define pb1 (instantiate vertical-pasteboard% ())) diff --git a/collects/tests/aligned-pasteboard/snip-dumper.ss b/collects/tests/aligned-pasteboard/snip-dumper.ss index 8fdd8f68e4..00d3b40bce 100644 --- a/collects/tests/aligned-pasteboard/snip-dumper.ss +++ b/collects/tests/aligned-pasteboard/snip-dumper.ss @@ -1,8 +1,8 @@ (module snip-dumper mzscheme (require - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (provide dump-children diff --git a/collects/tests/aligned-pasteboard/test-alignment.ss b/collects/tests/aligned-pasteboard/test-alignment.ss index 21802a60a8..a1d555ce04 100644 --- a/collects/tests/aligned-pasteboard/test-alignment.ss +++ b/collects/tests/aligned-pasteboard/test-alignment.ss @@ -1,8 +1,8 @@ (require "utils.ss" - (lib "etc.ss") - (lib "list.ss") - (lib "match.ss") + mzlib/etc + mzlib/list + mzlib/match (lib "private/aligned-pasteboard/alignment.ss" "mrlib")) ;; los-equal? ((listof rect?) (listof rect?) . -> . boolean?) diff --git a/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss b/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss index d6fd14e834..4c472c36b8 100644 --- a/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss +++ b/collects/tests/aligned-pasteboard/test-pasteboard-lib.ss @@ -1,8 +1,8 @@ (require "utils.ss" - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/etc + mzlib/class + mred (lib "private/aligned-pasteboard/pasteboard-lib.ss" "mrlib") (lib "aligned-pasteboard.ss" "mrlib")) diff --git a/collects/tests/aligned-pasteboard/test-snip-lib.ss b/collects/tests/aligned-pasteboard/test-snip-lib.ss index f8c0f9a074..0b59e236dd 100644 --- a/collects/tests/aligned-pasteboard/test-snip-lib.ss +++ b/collects/tests/aligned-pasteboard/test-snip-lib.ss @@ -1,8 +1,8 @@ (require "utils.ss" - (lib "etc.ss") - (lib "class.ss") - (lib "mred.ss" "mred") + mzlib/etc + mzlib/class + mred (lib "private/aligned-pasteboard/snip-lib.ss" "mrlib") (lib "private/aligned-pasteboard/aligned-pasteboard.ss" "mrlib") (lib "private/aligned-pasteboard/aligned-editor-container.ss" "mrlib")) diff --git a/collects/tests/aligned-pasteboard/test.ss b/collects/tests/aligned-pasteboard/test.ss index 621cd3c806..932d3cb4c9 100644 --- a/collects/tests/aligned-pasteboard/test.ss +++ b/collects/tests/aligned-pasteboard/test.ss @@ -1,10 +1,10 @@ ;;note: turns out these tests are window manager specific (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list (lib "aligned-pasteboard.ss" "mrlib") "snip-dumper.ss") diff --git a/collects/tests/aligned-pasteboard/test2.ss b/collects/tests/aligned-pasteboard/test2.ss index 21992a2c87..23ddcceae2 100644 --- a/collects/tests/aligned-pasteboard/test2.ss +++ b/collects/tests/aligned-pasteboard/test2.ss @@ -1,10 +1,10 @@ ;;note: turns out these tests are window manager specific (require - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss") + mzlib/class + mred + mzlib/etc + mzlib/list (lib "aligned-pasteboard.ss" "mrlib") "snip-dumper.ss") diff --git a/collects/tests/drscheme/drscheme-test-util.ss b/collects/tests/drscheme/drscheme-test-util.ss index dc64e2e583..53645eb8e6 100644 --- a/collects/tests/drscheme/drscheme-test-util.ss +++ b/collects/tests/drscheme/drscheme-test-util.ss @@ -5,15 +5,15 @@ ;;; Authors: Robby Findler, Paul Steckler (module drscheme-test-util mzscheme - (require (prefix fw: (lib "framework.ss" "framework")) + (require (prefix fw: framework) (lib "hierlist.ss" "hierlist") - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "list.ss") - (lib "contract.ss") - (lib "etc.ss") + mred + mzlib/class + mzlib/list + mzlib/contract + mzlib/etc (lib "gui.ss" "tests" "utils") - (lib "contract.ss")) + mzlib/contract) (provide/contract [use-get/put-dialog ((-> any) path? . -> . void?)]) diff --git a/collects/tests/drscheme/io.ss b/collects/tests/drscheme/io.ss index 03ef785834..09a4ad99ec 100644 --- a/collects/tests/drscheme/io.ss +++ b/collects/tests/drscheme/io.ss @@ -13,13 +13,13 @@ add this test: (module io mzscheme (require "drscheme-test-util.ss" (lib "gui.ss" "tests" "utils") - (lib "class.ss") - (lib "list.ss") - (lib "pretty.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + mzlib/class + mzlib/list + mzlib/pretty + mred + framework (lib "text-string-style-desc.ss" "mrlib") - (prefix fw: (lib "framework.ss" "framework"))) + (prefix fw: framework)) (provide run-test) diff --git a/collects/tests/drscheme/language-test.ss b/collects/tests/drscheme/language-test.ss index 644c725e79..501483c64d 100644 --- a/collects/tests/drscheme/language-test.ss +++ b/collects/tests/drscheme/language-test.ss @@ -14,11 +14,11 @@ the settings above should match r5rs (module language-test mzscheme (require "drscheme-test-util.ss" (lib "gui.ss" "tests" "utils") - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (prefix fw: (lib "framework.ss" "framework"))) + mzlib/class + mzlib/list + mred + framework + (prefix fw: framework)) (provide run-test) diff --git a/collects/tests/drscheme/module-lang-test.ss b/collects/tests/drscheme/module-lang-test.ss index 38760f136d..2eea7c156f 100644 --- a/collects/tests/drscheme/module-lang-test.ss +++ b/collects/tests/drscheme/module-lang-test.ss @@ -1,11 +1,11 @@ (module module-lang-test mzscheme (require "drscheme-test-util.ss" - (lib "class.ss") - (lib "file.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (prefix fw: (lib "framework.ss" "framework"))) + mzlib/class + mzlib/file + mzlib/etc + mred + framework + (prefix fw: framework)) (provide run-test) diff --git a/collects/tests/drscheme/repl-test.ss b/collects/tests/drscheme/repl-test.ss index 3988b13ffe..1cae80b4b2 100644 --- a/collects/tests/drscheme/repl-test.ss +++ b/collects/tests/drscheme/repl-test.ss @@ -1,11 +1,11 @@ (module repl-test mzscheme (require "drscheme-test-util.ss" - (lib "class.ss") - (lib "file.ss") - (lib "string.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework")) + mzlib/class + mzlib/file + mzlib/string + mred + framework) (provide run-test) @@ -677,7 +677,7 @@ void) (make-test (to-strings - '(require (lib "utils.ss" "texpict")) + '(require texpict/utils) '(let () (current-namespace (make-namespace)) (namespace-set-variable-value! 'd (disk 3))) @@ -692,10 +692,10 @@ void) (make-test (to-strings '(let ([on (current-namespace)] - [n ((current-module-name-resolver) '(lib "mred.ss" "mred") #f #f)]) + [n ((current-module-name-resolver) 'mred #f #f)]) (current-namespace (make-namespace)) (namespace-attach-module on n)) - '(require (lib "utils.ss" "texpict")) + '(require texpict/utils) '(disk 3)) "{image}" "{image}" diff --git a/collects/tests/drscheme/run-tests.ss b/collects/tests/drscheme/run-tests.ss index 2a5ff4e584..7a43570ba1 100644 --- a/collects/tests/drscheme/run-tests.ss +++ b/collects/tests/drscheme/run-tests.ss @@ -1,9 +1,9 @@ ;; load this file as a tool to run the test suites (module run-tests mzscheme - (require (lib "class.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework")) + (require mzlib/class + mred + framework) (provide ask-test-suite) diff --git a/collects/tests/drscheme/sample-solutions-one-window.ss b/collects/tests/drscheme/sample-solutions-one-window.ss index d4a9aadac0..132547f17e 100644 --- a/collects/tests/drscheme/sample-solutions-one-window.ss +++ b/collects/tests/drscheme/sample-solutions-one-window.ss @@ -2,12 +2,12 @@ (module sample-solutions-one-window mzscheme (require "drscheme-test-util.ss" (lib "gui.ss" "tests" "utils") - (lib "class.ss") - (lib "list.ss") - (lib "file.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (prefix fw: (lib "framework.ss" "framework"))) + mzlib/class + mzlib/list + mzlib/file + mred + framework + (prefix fw: framework)) (provide run-test) diff --git a/collects/tests/drscheme/sample-solutions-testsuite-tp.scm b/collects/tests/drscheme/sample-solutions-testsuite-tp.scm index 6a105d6b79..2085e1b959 100644 --- a/collects/tests/drscheme/sample-solutions-testsuite-tp.scm +++ b/collects/tests/drscheme/sample-solutions-testsuite-tp.scm @@ -1,6 +1,6 @@ (module sample-solutions-testsuite-tp mzscheme (provide require-library) - (require (lib "include.ss")) + (require mzlib/include) (define-syntax require-library (let ([cache null]) diff --git a/collects/tests/drscheme/stepper-test.ss b/collects/tests/drscheme/stepper-test.ss index 5c2b78299d..a770ea648f 100644 --- a/collects/tests/drscheme/stepper-test.ss +++ b/collects/tests/drscheme/stepper-test.ss @@ -1,11 +1,11 @@ (module stepper-test mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") + (require mred + mzlib/class "drscheme-test-util.ss" (lib "gui.ss" "tests" "utils") - (lib "framework.ss" "framework") - (lib "pretty.ss")) + framework + mzlib/pretty) (provide run-test) diff --git a/collects/tests/drscheme/syncheck-test.ss b/collects/tests/drscheme/syncheck-test.ss index ff73f96d62..a3a72dd085 100644 --- a/collects/tests/drscheme/syncheck-test.ss +++ b/collects/tests/drscheme/syncheck-test.ss @@ -3,12 +3,12 @@ (require "drscheme-test-util.ss" (lib "gui.ss" "tests" "utils") - (lib "etc.ss") - (lib "class.ss") - (lib "list.ss") - (lib "file.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + mzlib/etc + mzlib/class + mzlib/list + mzlib/file + mred + framework (lib "text-string-style-desc.ss" "mrlib")) (provide run-test) diff --git a/collects/tests/drscheme/teachpack.ss b/collects/tests/drscheme/teachpack.ss index 4f7cc08237..57acf4d788 100644 --- a/collects/tests/drscheme/teachpack.ss +++ b/collects/tests/drscheme/teachpack.ss @@ -1,11 +1,11 @@ (module teachpack mzscheme (require "drscheme-test-util.ss" - (lib "class.ss") - (lib "file.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") - (prefix fw: (lib "framework.ss" "framework"))) + mzlib/class + mzlib/file + mred + framework + (prefix fw: framework)) (provide run-test) diff --git a/collects/tests/drscheme/tool.ss b/collects/tests/drscheme/tool.ss index 83e61ff87e..d35f6d0180 100644 --- a/collects/tests/drscheme/tool.ss +++ b/collects/tests/drscheme/tool.ss @@ -2,11 +2,11 @@ (module tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "list.ss") - (lib "unit.ss") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework")) + mzlib/list + mzlib/unit + mzlib/class + mred + framework) (provide tool@) diff --git a/collects/tests/framework/framework-test-engine.ss b/collects/tests/framework/framework-test-engine.ss index c09732f0a8..ea5da91c5b 100644 --- a/collects/tests/framework/framework-test-engine.ss +++ b/collects/tests/framework/framework-test-engine.ss @@ -1,7 +1,7 @@ (module framework-test-engine mzscheme - (require (lib "pconvert.ss") - (lib "mred.ss" "mred") + (require mzlib/pconvert + mred "debug.ss") (define errs null) diff --git a/collects/tests/framework/keys.ss b/collects/tests/framework/keys.ss index c388709448..f71dab6484 100644 --- a/collects/tests/framework/keys.ss +++ b/collects/tests/framework/keys.ss @@ -1,6 +1,6 @@ (module keys mzscheme (require "test-suite-utils.ss") - (require (lib "include.ss")) + (require mzlib/include) (test 'keymap:aug-keymap%/get-table diff --git a/collects/tests/framework/load.ss b/collects/tests/framework/load.ss index 9a972a4088..13782cc52f 100644 --- a/collects/tests/framework/load.ss +++ b/collects/tests/framework/load.ss @@ -7,12 +7,10 @@ (test (string->symbol file) void? - `(let ([mred-name - ((current-module-name-resolver) '(lib "mred.ss" "mred") #f #f)] + `(let ([mred-name ((current-module-name-resolver) 'mred #f #f)] [orig-namespace (current-namespace)]) (parameterize ([current-namespace (make-namespace)]) - (namespace-attach-module - orig-namespace mred-name) + (namespace-attach-module orig-namespace mred-name) (eval '(require (lib ,file "framework"))) (with-handlers ([(lambda (x) #t) (lambda (x) @@ -26,7 +24,7 @@ (test/load "gui-utils.ss" 'gui-utils:next-untitled-name) (test/load "test.ss" 'test:run-interval) (test/load "splash.ss" 'start-splash) - (test/load "framework-sig.ss" '(begin (eval '(require (lib "unit.ss"))) + (test/load "framework-sig.ss" '(begin (eval '(require mzlib/unit)) (eval '(define-signature dummy-signature^ ((open framework^)))))) (test/load "framework-unit.ss" 'framework@) (test/load "framework.ss" '(list test:button-push @@ -34,14 +32,14 @@ frame:basic-mixin)) ;; ensures that all of the names in the signature are provided - ;; by (require (lib "framework.ss" "framework")) + ;; by (require framework) (test/load "framework.ss" ;; these extra evals let me submit multiple, independent top-level ;; expressions in the newly created namespace. - '(begin (eval '(require (lib "unit.ss"))) + '(begin (eval '(require mzlib/unit)) (eval '(require-for-syntax mzscheme)) - (eval '(require-for-syntax (lib "unit-exptime.ss"))) + (eval '(require-for-syntax mzlib/unit-exptime)) (eval '(define-syntax (signature->symbols stx) (syntax-case stx () [(_ sig) diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss index 485d81fc4b..90831f74e0 100644 --- a/collects/tests/framework/main.ss +++ b/collects/tests/framework/main.ss @@ -1,8 +1,8 @@ (module main mzscheme - (require (lib "launcher.ss" "launcher") - (lib "cmdline.ss") - (lib "list.ss") - (lib "unitsig.ss") + (require launcher + mzlib/cmdline + mzlib/list + mzlib/unitsig "debug.ss" "test-suite-utils.ss") diff --git a/collects/tests/framework/prefs.ss b/collects/tests/framework/prefs.ss index f45bc97d36..52980d16eb 100644 --- a/collects/tests/framework/prefs.ss +++ b/collects/tests/framework/prefs.ss @@ -1,7 +1,7 @@ (module prefs mzscheme (require "test-suite-utils.ss" - (lib "etc.ss") - (lib "list.ss")) + mzlib/etc + mzlib/list) (define ((check-eq? x) y) (eq? x y)) (define pref-sym 'plt:not-a-real-preference) diff --git a/collects/tests/framework/test-suite-utils.ss b/collects/tests/framework/test-suite-utils.ss index 4b17c70226..8f65d4cce1 100644 --- a/collects/tests/framework/test-suite-utils.ss +++ b/collects/tests/framework/test-suite-utils.ss @@ -1,9 +1,9 @@ (module test-suite-utils mzscheme - (require (lib "launcher.ss" "launcher") - (lib "pretty.ss") - (lib "list.ss") - (lib "process.ss") + (require launcher + mzlib/pretty + mzlib/list + mzlib/process "debug.ss") (provide @@ -110,8 +110,8 @@ (set! out-port out)) (when load-framework-automatically? (queue-sexp-to-mred - '(begin (eval '(require (lib "framework.ss" "framework"))) - (eval '(require (lib "gui.ss" "tests" "utils"))))))) + '(begin (eval '(require framework)) + (eval '(require tests/utils/gui)))))) (define load-framework-automatically (case-lambda diff --git a/collects/tests/mred/dc.ss b/collects/tests/mred/dc.ss index 8463ba1b12..217f14e3a1 100644 --- a/collects/tests/mred/dc.ss +++ b/collects/tests/mred/dc.ss @@ -75,7 +75,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Get-pixel, set-pixel, get-argb-pixels, etc. -(require (lib "etc.ss")) +(require mzlib/etc) (define (pixel-tests b&w?) (begin-with-definitions diff --git a/collects/tests/mred/item.ss b/collects/tests/mred/item.ss index 4abeaf78fb..cfe7a5f74c 100644 --- a/collects/tests/mred/item.ss +++ b/collects/tests/mred/item.ss @@ -1,9 +1,9 @@ #lang scheme/gui -(require (lib "class.ss") - (lib "class100.ss") - (lib "etc.ss")) +(require mzlib/class + mzlib/class100 + mzlib/etc) (define my-txt #f) (define my-lb #f) diff --git a/collects/tests/mred/mem.ss b/collects/tests/mred/mem.ss index 7b25821c66..4d0f8150d4 100644 --- a/collects/tests/mred/mem.ss +++ b/collects/tests/mred/mem.ss @@ -1,7 +1,7 @@ ; run with mred -u -- -f mem.ss -(require (lib "class100.ss")) +(require mzlib/class100) (define source-dir (current-load-relative-directory)) diff --git a/collects/tests/mred/png.ss b/collects/tests/mred/png.ss index f232e6d49d..aa48ac47dc 100644 --- a/collects/tests/mred/png.ss +++ b/collects/tests/mred/png.ss @@ -1,4 +1,4 @@ -(require (lib "list.ss")) +(require mzlib/list) (define png-suite (build-path (or (current-load-relative-directory) (current-directory)) diff --git a/collects/tests/mred/random.ss b/collects/tests/mred/random.ss index 8afe28c406..9460e44319 100644 --- a/collects/tests/mred/random.ss +++ b/collects/tests/mred/random.ss @@ -1,9 +1,9 @@ ; (require-library "errortrace.ss" "errortrace") -(require (lib "list.ss") - (lib "etc.ss") - (lib "class100.ss") - (lib "defmacro.ss")) +(require mzlib/list + mzlib/etc + mzlib/class100 + mzlib/defmacro) (define example-list% (class100 object% (-name-in -parents [-filter (lambda (x) (not (void? x)))]) @@ -1085,7 +1085,7 @@ [expect-n (list* 'mred@ 'mred^ (append (get-all (let ([n (make-base-namespace)]) (parameterize ([current-namespace n]) - (namespace-require '(lib "class.ss"))) + (namespace-require 'mzlib/class)) n)) in-top-level))] [actual-n (get-all (make-gui-namespace))]) diff --git a/collects/tests/mred/showkey.ss b/collects/tests/mred/showkey.ss index aa69528d18..3c7eb7a33c 100644 --- a/collects/tests/mred/showkey.ss +++ b/collects/tests/mred/showkey.ss @@ -1,6 +1,6 @@ -(require (lib "etc.ss") - (lib "class100.ss")) +(require mzlib/etc + mzlib/class100) (let () (define iter 0) diff --git a/collects/tests/mred/sixlib.ss b/collects/tests/mred/sixlib.ss index 5521d71ea1..0e9be824c5 100644 --- a/collects/tests/mred/sixlib.ss +++ b/collects/tests/mred/sixlib.ss @@ -1,7 +1,7 @@ ;; load the graphics -(require (lib "graphics.ss" "graphics") - (lib "etc.ss") - (lib "file.ss")) +(require graphics/graphics + mzlib/etc + mzlib/file) (open-graphics) (define (struct-test) diff --git a/collects/tests/mred/testing.ss b/collects/tests/mred/testing.ss index 18a7f411c4..d5e562273a 100644 --- a/collects/tests/mred/testing.ss +++ b/collects/tests/mred/testing.ss @@ -1,7 +1,7 @@ ;; MrEd automatic testing basic functions and macros -(require (lib "class.ss")) +(require mzlib/class) (define SECTION #t) diff --git a/collects/tests/mred/text-scale.ss b/collects/tests/mred/text-scale.ss index bf5451cc53..7681b167bc 100644 --- a/collects/tests/mred/text-scale.ss +++ b/collects/tests/mred/text-scale.ss @@ -1,5 +1,5 @@ -(require (lib "math.ss")) +(require mzlib/math) (define measure-after? #f) (define rotate? #f) diff --git a/collects/tests/mysterx/dhtmltests.ss b/collects/tests/mysterx/dhtmltests.ss index df91f308ce..6fa741b017 100644 --- a/collects/tests/mysterx/dhtmltests.ss +++ b/collects/tests/mysterx/dhtmltests.ss @@ -1,6 +1,6 @@ ;;; dhtmltests.ss -- DHTML tests for MysterX -(require (lib "class.ss")) +(require mzlib/class) ; set inspector so structures can be compared (define insp (current-inspector)) diff --git a/collects/tests/mysterx/mystests.ss b/collects/tests/mysterx/mystests.ss index b1bea7cdd0..a024fd1617 100644 --- a/collects/tests/mysterx/mystests.ss +++ b/collects/tests/mysterx/mystests.ss @@ -1,6 +1,6 @@ ;;; mystests.ss -- test suite for MysterX -(require (lib "class.ss")) +(require mzlib/class) (require (lib "mysterx.ss" "mysterx")) (define errors? #f) diff --git a/collects/tests/mzscheme/advanced.ss b/collects/tests/mzscheme/advanced.ss index 58a2eaee7c..c1b7d4e7d3 100644 --- a/collects/tests/mzscheme/advanced.ss +++ b/collects/tests/mzscheme/advanced.ss @@ -8,7 +8,7 @@ (define no-extra-if-tests? #t) ;; Check export names: -(require (lib "docprovide.ss" "syntax")) +(require syntax/docprovide) (let ([docs (lookup-documentation '(lib "htdp-advanced.ss" "lang") 'procedures)]) (for-each (lambda (row) diff --git a/collects/tests/mzscheme/awk.ss b/collects/tests/mzscheme/awk.ss index 4403a51def..047dd91e48 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/beg-adv.ss b/collects/tests/mzscheme/beg-adv.ss index 517e8aa74d..f4227001e2 100644 --- a/collects/tests/mzscheme/beg-adv.ss +++ b/collects/tests/mzscheme/beg-adv.ss @@ -218,7 +218,7 @@ (htdp-teachpack-pop) ;; Check require -(htdp-top (require (lib "unit.ss" "mzlib"))) +(htdp-top (require mzlib/unit)) (htdp-test #f unit? 12) (htdp-top-pop 1) diff --git a/collects/tests/mzscheme/benchmarks/common/auto.ss b/collects/tests/mzscheme/benchmarks/common/auto.ss index a288fd0def..d07a49dc18 100755 --- a/collects/tests/mzscheme/benchmarks/common/auto.ss +++ b/collects/tests/mzscheme/benchmarks/common/auto.ss @@ -5,13 +5,13 @@ exec mzscheme -qu "$0" ${1+"$@"} (module auto scheme/base (require (for-syntax scheme/base) - (lib "process.ss") + mzlib/process "cmdline.ss" - (lib "list.ss") - (lib "compile.ss") - (lib "inflate.ss") - (lib "date.ss") - (lib "file.ss" "dynext") + mzlib/list + mzlib/compile + mzlib/inflate + mzlib/date + dynext/file syntax/toplevel) ;; Implementaton-specific control functions ------------------------------ diff --git a/collects/tests/mzscheme/benchmarks/common/cmdline.ss b/collects/tests/mzscheme/benchmarks/common/cmdline.ss index 4281717d50..cb58173cce 100644 --- a/collects/tests/mzscheme/benchmarks/common/cmdline.ss +++ b/collects/tests/mzscheme/benchmarks/common/cmdline.ss @@ -1,12 +1,12 @@ (module cmdline mzscheme - (require (lib "process.ss") - (lib "cmdline.ss") - (lib "list.ss") - (lib "compile.ss") - (lib "inflate.ss") - (lib "date.ss") - (lib "file.ss" "dynext")) + (require mzlib/process + mzlib/cmdline + mzlib/list + mzlib/compile + mzlib/inflate + mzlib/date + dynext/file) (provide process-command-line rprintf) diff --git a/collects/tests/mzscheme/benchmarks/common/mk-bigloo.ss b/collects/tests/mzscheme/benchmarks/common/mk-bigloo.ss index b097151c6a..1ae3523c47 100644 --- a/collects/tests/mzscheme/benchmarks/common/mk-bigloo.ss +++ b/collects/tests/mzscheme/benchmarks/common/mk-bigloo.ss @@ -1,5 +1,5 @@ -(require (lib "process.ss")) +(require mzlib/process) (define name (vector-ref (current-command-line-arguments) 0)) diff --git a/collects/tests/mzscheme/benchmarks/common/tabulate.ss b/collects/tests/mzscheme/benchmarks/common/tabulate.ss index b3e82a545e..dd00e9cf4d 100755 --- a/collects/tests/mzscheme/benchmarks/common/tabulate.ss +++ b/collects/tests/mzscheme/benchmarks/common/tabulate.ss @@ -4,9 +4,9 @@ exec mzscheme -qu "$0" ${1+"$@"} |# (module tabulate mzscheme - (require (lib "list.ss") + (require mzlib/list (lib "xml.ss" "xml") - (lib "cmdline.ss")) + mzlib/cmdline) (define base-link-filename (make-parameter #f)) (define full-page-mode (make-parameter #f)) diff --git a/collects/tests/mzscheme/benchmarks/common/wrap.ss b/collects/tests/mzscheme/benchmarks/common/wrap.ss index 71f0530c99..c55b417049 100644 --- a/collects/tests/mzscheme/benchmarks/common/wrap.ss +++ b/collects/tests/mzscheme/benchmarks/common/wrap.ss @@ -1,7 +1,7 @@ (module wrap mzscheme (provide (rename module-begin #%module-begin)) - (require (lib "include.ss")) + (require mzlib/include) (define-syntax (module-begin stx) (let ([name (syntax-property stx 'enclosing-module-name)]) #`(#%plain-module-begin diff --git a/collects/tests/mzscheme/benchmarks/rx/auto.ss b/collects/tests/mzscheme/benchmarks/rx/auto.ss index c8b9e08262..69f04f747e 100755 --- a/collects/tests/mzscheme/benchmarks/rx/auto.ss +++ b/collects/tests/mzscheme/benchmarks/rx/auto.ss @@ -4,10 +4,10 @@ exec mzscheme -qu "$0" ${1+"$@"} |# (module auto mzscheme - (require (lib "process.ss") - (lib "port.ss") - (lib "list.ss") - (lib "date.ss") + (require mzlib/process + mzlib/port + mzlib/list + mzlib/date "../common/cmdline.ss") ;; Needed for rxmzold, comment out otherwise: diff --git a/collects/tests/mzscheme/benchmarks/rx/pcre.ss b/collects/tests/mzscheme/benchmarks/rx/pcre.ss index 46d1019f82..daa8e4115f 100644 --- a/collects/tests/mzscheme/benchmarks/rx/pcre.ss +++ b/collects/tests/mzscheme/benchmarks/rx/pcre.ss @@ -1,6 +1,6 @@ (module pcre mzscheme - (require (lib "foreign.ss")) + (require mzlib/foreign) (unsafe!) (provide pcregexp diff --git a/collects/tests/mzscheme/benchmarks/shootout/heapsort.ss b/collects/tests/mzscheme/benchmarks/shootout/heapsort.ss index d21b570629..539f69e6d3 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/heapsort.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/heapsort.ss @@ -6,8 +6,8 @@ ;; Updated by Brent Fulgham to provide proper output formatting (module heapsort mzscheme - (require (only (lib "13.ss" "srfi") string-index string-pad-right) - (only (lib "string.ss") real->decimal-string)) + (require (only srfi/13 string-index string-pad-right) + (only mzlib/string real->decimal-string)) (define IM 139968) (define IA 3877) diff --git a/collects/tests/mzscheme/benchmarks/shootout/k-nucleotide.ss b/collects/tests/mzscheme/benchmarks/shootout/k-nucleotide.ss index ce423b3e25..6bc46924ee 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/k-nucleotide.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/k-nucleotide.ss @@ -2,9 +2,9 @@ ;; http://shootout.alioth.debian.org/ (module k-nucleotide mzscheme - (require (lib "list.ss") - (lib "string.ss") - (only (lib "13.ss" "srfi") string-pad-right)) + (require mzlib/list + mzlib/string + (only srfi/13 string-pad-right)) (define (all-counts len dna) (let ([table (make-hash-table)] diff --git a/collects/tests/mzscheme/benchmarks/shootout/moments.ss b/collects/tests/mzscheme/benchmarks/shootout/moments.ss index 4bcd562351..6f886935f5 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/moments.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/moments.ss @@ -1,8 +1,8 @@ ; Moments.scm (module moments mzscheme - (require (only (lib "list.ss") sort) - (only (lib "string.ss") real->decimal-string)) + (require (only mzlib/list sort) + (only mzlib/string real->decimal-string)) (define (to-str n) (real->decimal-string n 6)) diff --git a/collects/tests/mzscheme/benchmarks/shootout/nbody.ss b/collects/tests/mzscheme/benchmarks/shootout/nbody.ss index 1326d7985b..5666408f0f 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/nbody.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/nbody.ss @@ -16,7 +16,7 @@ Correct output N = 1000 is -0.169087605 |# (module nbody mzscheme - (require (only (lib "string.ss") real->decimal-string)) + (require (only mzlib/string real->decimal-string)) ;; ------------------------------ ;; define planetary masses, initial positions & velocity diff --git a/collects/tests/mzscheme/benchmarks/shootout/nestedloop.ss b/collects/tests/mzscheme/benchmarks/shootout/nestedloop.ss index e972c5911a..1555030068 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/nestedloop.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/nestedloop.ss @@ -1,5 +1,5 @@ (module nestedloop mzscheme - (require (lib "defmacro.ss")) + (require mzlib/defmacro) (define-macro (nest n expr) (if (> n 0) diff --git a/collects/tests/mzscheme/benchmarks/shootout/nsieve.ss b/collects/tests/mzscheme/benchmarks/shootout/nsieve.ss index d41208b70c..0938babf1a 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/nsieve.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/nsieve.ss @@ -8,7 +8,7 @@ ;; Converted to MzScheme by Brent Fulgham (module nsieve mzscheme - (require (only (lib "13.ss" "srfi") string-index string-pad)) + (require (only srfi/13 string-index string-pad)) (define (nsieve m) (let ((a (make-vector m #t))) diff --git a/collects/tests/mzscheme/benchmarks/shootout/partialsums.ss b/collects/tests/mzscheme/benchmarks/shootout/partialsums.ss index 80464539e6..eda96a534f 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/partialsums.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/partialsums.ss @@ -12,7 +12,7 @@ ;; its time GCing; it runs 1.5 times as fast in mzscheme3m. (module partialsums mzscheme - (require (only (lib "string.ss") real->decimal-string)) + (require (only mzlib/string real->decimal-string)) (let ((n (exact->inexact (string->number diff --git a/collects/tests/mzscheme/benchmarks/shootout/random.ss b/collects/tests/mzscheme/benchmarks/shootout/random.ss index df05ffa976..9d729247eb 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/random.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/random.ss @@ -4,7 +4,7 @@ ;;; Modified for proper string output by Brent Fulgham (module random mzscheme - (require (only (lib "string.ss") real->decimal-string)) + (require (only mzlib/string real->decimal-string)) (define IM 139968) (define IA 3877) diff --git a/collects/tests/mzscheme/benchmarks/shootout/recursive.ss b/collects/tests/mzscheme/benchmarks/shootout/recursive.ss index 75018a31b1..1e3f04cf49 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/recursive.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/recursive.ss @@ -9,7 +9,7 @@ ;; --------------------------------------------------------------------- (module recursive mzscheme - (require (only (lib "string.ss") real->decimal-string)) + (require (only mzlib/string real->decimal-string)) ;; ------------------------------- diff --git a/collects/tests/mzscheme/benchmarks/shootout/regexpdna.ss b/collects/tests/mzscheme/benchmarks/shootout/regexpdna.ss index c7a33fd965..1d5f6e220f 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/regexpdna.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/regexpdna.ss @@ -12,7 +12,7 @@ (module regexpdna mzscheme - (require (lib "port.ss")) + (require mzlib/port) ;; ------------------------------- diff --git a/collects/tests/mzscheme/benchmarks/shootout/spectralnorm.ss b/collects/tests/mzscheme/benchmarks/shootout/spectralnorm.ss index 40a714f69b..78dadcbbd0 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/spectralnorm.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/spectralnorm.ss @@ -5,7 +5,7 @@ ;; contributed by Isaac Gouy (module spectralnorm mzscheme - (require (lib "string.ss")) + (require mzlib/string) (define (Approximate n) (let ([u (make-vector n 1.0)] diff --git a/collects/tests/mzscheme/benchmarks/shootout/wordfreq.ss b/collects/tests/mzscheme/benchmarks/shootout/wordfreq.ss index 277c6316f3..2f9cb71e23 100644 --- a/collects/tests/mzscheme/benchmarks/shootout/wordfreq.ss +++ b/collects/tests/mzscheme/benchmarks/shootout/wordfreq.ss @@ -5,7 +5,7 @@ ; Re-written by Matthew Flatt with some inspriation from the Python example (module wordfreq mzscheme - (require (lib "list.ss")) + (require mzlib/list) (define t (make-hash-table 'equal)) diff --git a/collects/tests/mzscheme/boundmap-test.ss b/collects/tests/mzscheme/boundmap-test.ss index 1129158cbf..08e6895b6f 100644 --- a/collects/tests/mzscheme/boundmap-test.ss +++ b/collects/tests/mzscheme/boundmap-test.ss @@ -1,6 +1,6 @@ (load-relative "loadtest.ss") -(require (lib "boundmap.ss" "syntax")) +(require syntax/boundmap) (Section 'boundmap) diff --git a/collects/tests/mzscheme/cache-image-snip-test.ss b/collects/tests/mzscheme/cache-image-snip-test.ss index 833a68f0b7..63bc50a6f5 100644 --- a/collects/tests/mzscheme/cache-image-snip-test.ss +++ b/collects/tests/mzscheme/cache-image-snip-test.ss @@ -1,7 +1,7 @@ (load-relative "loadtest.ss") (require (lib "cache-image-snip.ss" "mrlib") - (lib "unit.ss")) + mzlib/unit) (invoke-unit (unit diff --git a/collects/tests/mzscheme/char-set.ss b/collects/tests/mzscheme/char-set.ss index 87008e752d..1c45b69c99 100644 --- a/collects/tests/mzscheme/char-set.ss +++ b/collects/tests/mzscheme/char-set.ss @@ -3,7 +3,7 @@ (Section 'char-set/srfi-14) -(require (lib "char-set.ss" "srfi" "14")) +(require srfi/14/char-set) ;; NOTE: tests assume that ! functions are actually functional diff --git a/collects/tests/mzscheme/chez-module.ss b/collects/tests/mzscheme/chez-module.ss index 88d2673250..67cc4f4fd8 100644 --- a/collects/tests/mzscheme/chez-module.ss +++ b/collects/tests/mzscheme/chez-module.ss @@ -3,7 +3,7 @@ ;; printouts. (module helpers mzscheme - (require (lib "package.ss")) + (require mzlib/package) (provide identifier-syntax with-implicit (rename package module) diff --git a/collects/tests/mzscheme/cmdline.ss b/collects/tests/mzscheme/cmdline.ss index 94a8e3fcff..c804f5bad4 100644 --- a/collects/tests/mzscheme/cmdline.ss +++ b/collects/tests/mzscheme/cmdline.ss @@ -3,7 +3,7 @@ (Section 'command-line) -(require (lib "cmdline.ss")) +(require mzlib/cmdline) (define (r-append opt . rest) (append opt (list (list->vector rest)))) diff --git a/collects/tests/mzscheme/compat.ss b/collects/tests/mzscheme/compat.ss index 9b51c3027d..11c4cb5ff0 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 78e18a4dcf..767baf0f0f 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/contract-opt-tests.ss b/collects/tests/mzscheme/contract-opt-tests.ss index 921442c957..b7397ac6c4 100644 --- a/collects/tests/mzscheme/contract-opt-tests.ss +++ b/collects/tests/mzscheme/contract-opt-tests.ss @@ -1,5 +1,5 @@ (module contract-opt-tests mzscheme - (require (lib "contract.ss") + (require mzlib/contract (planet "test.ss" ("schematics" "schemeunit.plt" 2 1))) (define (exn:fail:contract-violation? exn) diff --git a/collects/tests/mzscheme/contract-test.ss b/collects/tests/mzscheme/contract-test.ss index a0cbc14b77..89df7ef054 100644 --- a/collects/tests/mzscheme/contract-test.ss +++ b/collects/tests/mzscheme/contract-test.ss @@ -3646,7 +3646,7 @@ '(begin (eval '(module d-c-s-match1 scheme/base (require scheme/contract - (lib "match.ss")) + mzlib/match) (define-contract-struct foo (bar baz)) @@ -3660,7 +3660,7 @@ '(begin (eval '(module d-c-s-match2 scheme/base (require scheme/contract - (lib "match.ss")) + mzlib/match) (define-contract-struct foo (bar baz)) @@ -5227,7 +5227,7 @@ so that propagation occurs. (define-struct s (a b) #:inspector (make-inspector)) (provide/contract (struct s ((a number?) (b number?)))))) (eval '(module pc10-n scheme/base - (require (lib "struct.ss") + (require mzlib/struct 'pc10-m) (print-struct #t) (copy-struct s @@ -5258,7 +5258,7 @@ so that propagation occurs. (define-struct s (a b) #:inspector (make-inspector)) (provide/contract (struct s ((a number?) (b number?)))))) (eval '(module pc11b-n scheme/base - (require (lib "struct.ss") + (require mzlib/struct m) (print-struct #t) (copy-struct s @@ -5309,7 +5309,7 @@ so that propagation occurs. ([flags (listof string?)] [type type?]))))) (eval '(module pc14-test2 scheme/base - (require (lib "plt-match.ss")) + (require mzlib/plt-match) (require 'pc14-test1) (match (make-type:ptr '() (make-type '())) [(struct type:ptr (flags type)) #f]))) @@ -5407,7 +5407,7 @@ so that propagation occurs. 'provide/contract20 '(eval '(module tmp scheme/base (require scheme/contract - (lib "unit.ss")) + mzlib/unit) (define-struct s (a b)) diff --git a/collects/tests/mzscheme/control.ss b/collects/tests/mzscheme/control.ss index ea178485e8..2826487b38 100644 --- a/collects/tests/mzscheme/control.ss +++ b/collects/tests/mzscheme/control.ss @@ -8,8 +8,8 @@ (Section 'control) -(require (lib "control.ss") - (only-in (lib "etc.ss") rec)) +(require mzlib/control + (only-in mzlib/etc rec)) ;----------------------------------------------------------------------- diff --git a/collects/tests/mzscheme/date.ss b/collects/tests/mzscheme/date.ss index e210dd3525..dbaeee9385 100644 --- a/collects/tests/mzscheme/date.ss +++ b/collects/tests/mzscheme/date.ss @@ -3,7 +3,7 @@ (Section 'date) -(require (lib "date.ss")) +(require mzlib/date) (define (test-find s m h d mo y) (let* ([secs (find-seconds s m h d mo y)] diff --git a/collects/tests/mzscheme/embed-me2.ss b/collects/tests/mzscheme/embed-me2.ss index f0216b0381..53abb21299 100644 --- a/collects/tests/mzscheme/embed-me2.ss +++ b/collects/tests/mzscheme/embed-me2.ss @@ -1,6 +1,6 @@ (module embed-me2 mzscheme (require "embed-me1.ss" - (lib "etc.ss")) + mzlib/etc) (with-output-to-file "stdout" (lambda () (printf "This is 2: ~a~n" true)) 'append)) diff --git a/collects/tests/mzscheme/embed-me3.ss b/collects/tests/mzscheme/embed-me3.ss index a68cf78d4a..247292131a 100644 --- a/collects/tests/mzscheme/embed-me3.ss +++ b/collects/tests/mzscheme/embed-me3.ss @@ -1,5 +1,5 @@ (module embed-me3 mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (with-output-to-file "stdout" (lambda () (printf "3 is here, too? ~a\n" true)) diff --git a/collects/tests/mzscheme/embed-me5.ss b/collects/tests/mzscheme/embed-me5.ss index aaf471f21f..23c1fbe875 100644 --- a/collects/tests/mzscheme/embed-me5.ss +++ b/collects/tests/mzscheme/embed-me5.ss @@ -1,5 +1,5 @@ (module embed-me5 mzscheme - (require (lib "mred.ss" "mred")) + (require mred) (with-output-to-file "stdout" (lambda () (printf "This is 5: ~s\n" button%)) 'append)) diff --git a/collects/tests/mzscheme/embed-me7.ss b/collects/tests/mzscheme/embed-me7.ss index 48942b7ad8..1fcb1d9374 100644 --- a/collects/tests/mzscheme/embed-me7.ss +++ b/collects/tests/mzscheme/embed-me7.ss @@ -1,7 +1,7 @@ (module embed-me7 mzscheme - (require (lib "plot.ss" "plot") - (lib "mred.ss" "mred") - (lib "class.ss")) + (require plot + mred + mzlib/class) (define img (plot (line (lambda (x) x)))) diff --git a/collects/tests/mzscheme/embed.ss b/collects/tests/mzscheme/embed.ss index 191d4baffd..a86b85b7ab 100644 --- a/collects/tests/mzscheme/embed.ss +++ b/collects/tests/mzscheme/embed.ss @@ -3,10 +3,10 @@ (Section 'embed) -(require (lib "embed.ss" "compiler") - (lib "file.ss") - (lib "process.ss") - (lib "distribute.ss" "compiler")) +(require compiler/embed + mzlib/file + mzlib/process + compiler/distribute) (define (mk-dest-bin mred?) (case (system-type) @@ -220,8 +220,8 @@ (try-exe mr-dest "This is 5: #\n" #t)) ;; Try the mzc interface: -(require (lib "dirs.ss" "setup") - (lib "file.ss")) +(require setup/dirs + mzlib/file) (define mzc (build-path (find-console-bin-dir) (if (eq? 'windows (system-type)) "mzc.exe" "mzc"))) @@ -283,7 +283,7 @@ (mzc-tests #t) |# -(require (lib "file.ss" "dynext")) +(require dynext/file) (define (extension-test mred?) (parameterize ([current-directory (find-system-path 'temp-dir)]) diff --git a/collects/tests/mzscheme/etc.ss b/collects/tests/mzscheme/etc.ss index 2b07572505..123ba85cc7 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/expand.ss b/collects/tests/mzscheme/expand.ss index f850a8704c..bf13945fdb 100644 --- a/collects/tests/mzscheme/expand.ss +++ b/collects/tests/mzscheme/expand.ss @@ -1,5 +1,5 @@ -(require (lib "toplevel.ss" "syntax")) +(require syntax/toplevel) (load-relative "loadtest.ss") diff --git a/collects/tests/mzscheme/filelib.ss b/collects/tests/mzscheme/filelib.ss index 0c2cb4287a..b3c35102ff 100644 --- a/collects/tests/mzscheme/filelib.ss +++ b/collects/tests/mzscheme/filelib.ss @@ -3,9 +3,9 @@ (Section 'file) -(require (lib "file.ss") - (lib "process.ss") - (lib "list.ss")) +(require mzlib/file + mzlib/process + mzlib/list) (parameterize ([current-directory (current-load-relative-directory)]) (let ([rel (find-files values)] diff --git a/collects/tests/mzscheme/for.ss b/collects/tests/mzscheme/for.ss index ee328ccb2b..3992af232b 100644 --- a/collects/tests/mzscheme/for.ss +++ b/collects/tests/mzscheme/for.ss @@ -1,7 +1,7 @@ (load-relative "loadtest.ss") -(require (lib "for.ss")) +(require mzlib/for) (Section 'generator) diff --git a/collects/tests/mzscheme/foreign-test.ss b/collects/tests/mzscheme/foreign-test.ss index 55a4fb0657..e141bbd5b9 100644 --- a/collects/tests/mzscheme/foreign-test.ss +++ b/collects/tests/mzscheme/foreign-test.ss @@ -3,7 +3,7 @@ (Section 'foreign) -(require (lib "foreign.ss")) +(require mzlib/foreign) (unsafe!) (let ([big/little (if (system-big-endian?) (lambda (x y) x) (lambda (x y) y))] @@ -36,7 +36,7 @@ ";" vc "/atlmfc/lib" ";" vc "/PlatformSDK/lib")))) -(require (lib "compile.ss" "dynext") (lib "link.ss" "dynext") (lib "etc.ss")) +(require dynext/compile dynext/link mzlib/etc) (let ([c (build-path (this-expression-source-directory) "foreign-test.c")] [o (build-path (current-directory) "foreign-test.o")] [so (build-path (current-directory) diff --git a/collects/tests/mzscheme/function.ss b/collects/tests/mzscheme/function.ss index fd34dac4db..d9776b8c7c 100644 --- a/collects/tests/mzscheme/function.ss +++ b/collects/tests/mzscheme/function.ss @@ -3,8 +3,8 @@ (Section 'function) -(require (lib "list.ss")) -(require (lib "etc.ss")) +(require mzlib/list) +(require mzlib/etc) (test (list 1 2 3 4) foldl cons '() (list 4 3 2 1)) (test (list 1 2 3 4) foldr cons '() (list 1 2 3 4)) diff --git a/collects/tests/mzscheme/gzip.ss b/collects/tests/mzscheme/gzip.ss index 895a709aa6..e40ea2a22e 100644 --- a/collects/tests/mzscheme/gzip.ss +++ b/collects/tests/mzscheme/gzip.ss @@ -1,6 +1,6 @@ -(require (lib "deflate.ss") - (lib "inflate.ss")) +(require mzlib/deflate + mzlib/inflate) (for-each (lambda (f) (when (file-exists? f) @@ -33,8 +33,8 @@ ;; Uses (unix) `gzip' program from your path. ;; Run this in a directory with lots of files to use as tests -(require (lib "deflate.ss") - (lib "process.ss")) +(require mzlib/deflate + mzlib/process) (define (check-file/fastest p in) (let ([s1 (make-string 5000)] diff --git a/collects/tests/mzscheme/head.ss b/collects/tests/mzscheme/head.ss index 1c53506dd8..ab487cff7a 100644 --- a/collects/tests/mzscheme/head.ss +++ b/collects/tests/mzscheme/head.ss @@ -6,7 +6,7 @@ ;; url.ss tests ;; -(require (lib "head.ss" "net")) +(require net/head) (for-each (lambda (addr) diff --git a/collects/tests/mzscheme/htdp-image.ss b/collects/tests/mzscheme/htdp-image.ss index f64f4b8fdc..16eca06fff 100644 --- a/collects/tests/mzscheme/htdp-image.ss +++ b/collects/tests/mzscheme/htdp-image.ss @@ -2,9 +2,9 @@ (load-relative "loadtest.ss") (require (lib "image.ss" "teachpack" "htdp") - (lib "error.ss" "htdp") + htdp/error (lib "posn.ss" "lang") - (lib "list.ss") + mzlib/list (lib "imageeq.ss" "lang")) (define-values (image-snip1 image-snip2) diff --git a/collects/tests/mzscheme/imap.ss b/collects/tests/mzscheme/imap.ss index 10831cfcac..4d30a63b20 100644 --- a/collects/tests/mzscheme/imap.ss +++ b/collects/tests/mzscheme/imap.ss @@ -11,8 +11,8 @@ (Section 'imap) (require (lib "mzssl.ss" "openssl") - (lib "imap.ss" "net") - (lib "etc.ss")) + net/imap + mzlib/etc) (define (test-connect) (let ([c (ssl-make-client-context)]) diff --git a/collects/tests/mzscheme/intermediate-lambda.ss b/collects/tests/mzscheme/intermediate-lambda.ss index 367ef33ceb..bd56ec6022 100644 --- a/collects/tests/mzscheme/intermediate-lambda.ss +++ b/collects/tests/mzscheme/intermediate-lambda.ss @@ -8,7 +8,7 @@ (define no-extra-if-tests? #t) ;; Check export names: -(require (lib "docprovide.ss" "syntax")) +(require syntax/docprovide) (let ([docs (lookup-documentation '(lib "htdp-intermediate-lambda.ss" "lang") 'procedures)]) (for-each (lambda (row) diff --git a/collects/tests/mzscheme/intermediate.ss b/collects/tests/mzscheme/intermediate.ss index d9c1337cf5..3852078d82 100644 --- a/collects/tests/mzscheme/intermediate.ss +++ b/collects/tests/mzscheme/intermediate.ss @@ -8,7 +8,7 @@ (define no-extra-if-tests? #t) ;; Check export names: -(require (lib "docprovide.ss" "syntax")) +(require syntax/docprovide) (let ([docs (lookup-documentation '(lib "htdp-intermediate.ss" "lang") 'procedures)]) (for-each (lambda (row) diff --git a/collects/tests/mzscheme/iobuf.ss b/collects/tests/mzscheme/iobuf.ss index fab7fff75d..da635f6d66 100644 --- a/collects/tests/mzscheme/iobuf.ss +++ b/collects/tests/mzscheme/iobuf.ss @@ -4,7 +4,7 @@ (when (file-exists? "tmp-pipe") (delete-file "tmp-pipe")) -(require (lib "process.ss")) +(require mzlib/process) (system "mknod tmp-pipe p") (define i1 (open-input-file "tmp-pipe")) diff --git a/collects/tests/mzscheme/kw.ss b/collects/tests/mzscheme/kw.ss index 8057fb5f9a..e0b8b8e6ae 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 bf01afe12c..91a0bf0d36 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/makeflat.ss b/collects/tests/mzscheme/makeflat.ss index 65c1a39a0b..6b091c40c3 100644 --- a/collects/tests/mzscheme/makeflat.ss +++ b/collects/tests/mzscheme/makeflat.ss @@ -20,7 +20,7 @@ ""))]) (namespace-variable-value 'flat-number)) -(require (lib "pretty.ss")) +(require mzlib/pretty) (define line-count 0) (define file-count 0) diff --git a/collects/tests/mzscheme/match/match-performance.ss b/collects/tests/mzscheme/match/match-performance.ss index 43a86c24b6..3c4ae4aa3e 100644 --- a/collects/tests/mzscheme/match/match-performance.ss +++ b/collects/tests/mzscheme/match/match-performance.ss @@ -1,10 +1,10 @@ (load-relative "../loadtest.ss") (Section 'match-performance) -(require (lib "pretty.ss")) -(require-for-syntax (lib "pretty.ss")) -(require (lib "include.ss")) -(require (lib "plt-match.ss")) +(require mzlib/pretty) +(require-for-syntax mzlib/pretty) +(require mzlib/include) +(require mzlib/plt-match) (include "match-compile-perf.scm") (include "drom-algol-structs.scm") diff --git a/collects/tests/mzscheme/match/match-test.ss b/collects/tests/mzscheme/match/match-test.ss index 659d3b16c3..88690fe055 100644 --- a/collects/tests/mzscheme/match/match-test.ss +++ b/collects/tests/mzscheme/match/match-test.ss @@ -1,6 +1,6 @@ (load-relative "../loadtest.ss") (Section 'match) -(require (lib "match.ss")) +(require mzlib/match) ;(require "../match.ss") (define-syntax test-mac diff --git a/collects/tests/mzscheme/match/plt-match-test.ss b/collects/tests/mzscheme/match/plt-match-test.ss index fcc951b7c6..d5d386cfbd 100644 --- a/collects/tests/mzscheme/match/plt-match-test.ss +++ b/collects/tests/mzscheme/match/plt-match-test.ss @@ -2,10 +2,10 @@ (Section 'plt-match) -(require (lib "plt-match.ss")) +(require mzlib/plt-match) ;(require "../plt-match.ss") -(require (lib "list.ss")) -(require (lib "pregexp.ss")) +(require mzlib/list) +(require mzlib/pregexp) (define-syntax test-mac (syntax-rules () diff --git a/collects/tests/mzscheme/match/rand-list-perf.ss b/collects/tests/mzscheme/match/rand-list-perf.ss index bb8da07154..1a19e587f6 100644 --- a/collects/tests/mzscheme/match/rand-list-perf.ss +++ b/collects/tests/mzscheme/match/rand-list-perf.ss @@ -1,11 +1,11 @@ (load-relative "../loadtest.ss") (Section 'match-performance) -(require (lib "pretty.ss")) -(require-for-syntax (lib "pretty.ss")) -(require (lib "include.ss")) -(require (lib "plt-match.ss")) -(require (lib "list.ss")) +(require mzlib/pretty) +(require-for-syntax mzlib/pretty) +(require mzlib/include) +(require mzlib/plt-match) +(require mzlib/list) (include "match-compile-perf.scm") diff --git a/collects/tests/mzscheme/match/rand-vec-perf.ss b/collects/tests/mzscheme/match/rand-vec-perf.ss index b159eeff6f..221e2769d7 100644 --- a/collects/tests/mzscheme/match/rand-vec-perf.ss +++ b/collects/tests/mzscheme/match/rand-vec-perf.ss @@ -1,10 +1,10 @@ (load-relative "../loadtest.ss") (Section 'match-performance) -(require (lib "pretty.ss")) -(require-for-syntax (lib "pretty.ss")) -(require (lib "include.ss")) -(require (lib "plt-match.ss")) +(require mzlib/pretty) +(require-for-syntax mzlib/pretty) +(require mzlib/include) +(require mzlib/plt-match) (include "match-compile-perf.scm") diff --git a/collects/tests/mzscheme/match/short-rand-list.scm b/collects/tests/mzscheme/match/short-rand-list.scm index 99cf66e4b3..221363496b 100644 --- a/collects/tests/mzscheme/match/short-rand-list.scm +++ b/collects/tests/mzscheme/match/short-rand-list.scm @@ -1,10 +1,10 @@ (load-relative "../loadtest.ss") (Section 'match-performance) -(require (lib "pretty.ss")) -(require-for-syntax (lib "pretty.ss")) -(require (lib "include.ss")) -(require (lib "plt-match.ss")) +(require mzlib/pretty) +(require-for-syntax mzlib/pretty) +(require mzlib/include) +(require mzlib/plt-match) (include "match-compile-perf.scm") diff --git a/collects/tests/mzscheme/md5.ss b/collects/tests/mzscheme/md5.ss index 24966b774b..bde5be60f0 100644 --- a/collects/tests/mzscheme/md5.ss +++ b/collects/tests/mzscheme/md5.ss @@ -3,7 +3,7 @@ (Section 'md5) -(require (lib "md5.ss")) +(require mzlib/md5) (test #"d41d8cd98f00b204e9800998ecf8427e" md5 #"") (test #"0cc175b9c0f1b6a831c399e269772661" md5 #"a") diff --git a/collects/tests/mzscheme/moddep.ss b/collects/tests/mzscheme/moddep.ss index a08a52761d..dc35d5ef03 100644 --- a/collects/tests/mzscheme/moddep.ss +++ b/collects/tests/mzscheme/moddep.ss @@ -4,7 +4,7 @@ (Section 'moddep) -(require (lib "moddep.ss" "syntax")) +(require syntax/moddep) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; resolve-module-path[-index] diff --git a/collects/tests/mzscheme/net.ss b/collects/tests/mzscheme/net.ss index 9ddbdc13e6..6bec67a8a8 100644 --- a/collects/tests/mzscheme/net.ss +++ b/collects/tests/mzscheme/net.ss @@ -8,10 +8,10 @@ ;; url.ss tests ;; -(require (lib "url.ss" "net") - (lib "uri-codec.ss" "net") - (lib "string.ss") - (lib "url-unit.ss" "net") ; to get set-url:os-type! +(require net/url + net/uri-codec + mzlib/string + net/url-unit ; to get set-url:os-type! ) (test "%Pq" uri-decode "%Pq") @@ -466,7 +466,7 @@ ;; a few tests of head.ss -- JBC, 2006-07-31 ;; -(require (lib "head.ss" "net")) +(require net/head) (test (void) validate-header "From: me@here.net\r\n\r\n") (test (void) validate-header #"From: me@here.net\r\n\r\n") @@ -541,7 +541,7 @@ ;; ;; cookie tests --- JBM, 2006-12-01 -(require (lib "cookie.ss" "net")) +(require net/cookie) ;; cookie-test : (cookie -> cookie) string -> test (define (cookie-test fn expected) @@ -615,9 +615,9 @@ ;; other net tests ;; -(require (lib "base64.ss" "net") - (lib "qp.ss" "net") - (lib "port.ss")) +(require net/base64 + net/qp + mzlib/port) (define tricky-strings (let ([dir (collection-path "tests" "mzscheme")]) diff --git a/collects/tests/mzscheme/object-old.ss b/collects/tests/mzscheme/object-old.ss index 350fc31520..bd51ab960f 100644 --- a/collects/tests/mzscheme/object-old.ss +++ b/collects/tests/mzscheme/object-old.ss @@ -3,7 +3,7 @@ (load-relative "loadtest.ss") -(require (lib "class.ss")) +(require mzlib/class) (Section 'object) diff --git a/collects/tests/mzscheme/object.ss b/collects/tests/mzscheme/object.ss index 82c8a657ea..840abe6685 100644 --- a/collects/tests/mzscheme/object.ss +++ b/collects/tests/mzscheme/object.ss @@ -1129,7 +1129,7 @@ (define class-cert-%%-client (gensym 'class-cert-%%-client)) (teval `(module ,class-cert-%%-init mzscheme - (require (lib "class.ss")) + (require mzlib/class) (define-syntax (init-private stx) (syntax-case stx () [(_ name value) @@ -1143,7 +1143,7 @@ ;; Shouldn't fail with a cert erorr: (teval `(module ,class-cert-%%-client mzscheme - (require (lib "class.ss") + (require mzlib/class ',class-cert-%%-init) (define cert-error% (class object% diff --git a/collects/tests/mzscheme/pack.ss b/collects/tests/mzscheme/pack.ss index a96aee0215..3c7402778b 100644 --- a/collects/tests/mzscheme/pack.ss +++ b/collects/tests/mzscheme/pack.ss @@ -8,9 +8,9 @@ (require (lib "pack.ss" "setup") (lib "unpack.ss" "setup") - (lib "process.ss") - (lib "dirs.ss" "setup") - (lib "file.ss")) + mzlib/process + setup/dirs + mzlib/file) ;; Test via mzc interface diff --git a/collects/tests/mzscheme/package-gen.ss b/collects/tests/mzscheme/package-gen.ss index fa90fd253b..2e0c56c684 100644 --- a/collects/tests/mzscheme/package-gen.ss +++ b/collects/tests/mzscheme/package-gen.ss @@ -1,7 +1,7 @@ -(require (lib "package.ss") - (lib "pretty.ss") - (lib "toplevel.ss" "syntax")) +(require mzlib/package + mzlib/pretty + syntax/toplevel) (define (check x) (unless (equal? x 'this-is-right) diff --git a/collects/tests/mzscheme/package.ss b/collects/tests/mzscheme/package.ss index 3d5aec179f..db30b1f1ed 100644 --- a/collects/tests/mzscheme/package.ss +++ b/collects/tests/mzscheme/package.ss @@ -1,6 +1,6 @@ (load-relative "loadtest.ss") -(require (lib "package.ss")) +(require mzlib/package) (Section 'packages) diff --git a/collects/tests/mzscheme/pconvert.ss b/collects/tests/mzscheme/pconvert.ss index 2e970bb8e6..9c0b718baf 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/pretty.ss b/collects/tests/mzscheme/pretty.ss index 78da880035..a99c3a2c5a 100644 --- a/collects/tests/mzscheme/pretty.ss +++ b/collects/tests/mzscheme/pretty.ss @@ -12,7 +12,7 @@ (Section 'pretty) -(require (lib "pretty.ss")) +(require mzlib/pretty) (define (pprec-print pprec port write?) (define (print-one n port) diff --git a/collects/tests/mzscheme/restart.ss b/collects/tests/mzscheme/restart.ss index 266daa5aa6..a49cdc6533 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/sandbox.ss b/collects/tests/mzscheme/sandbox.ss index 5b2723fe4e..ca4cb16f1b 100644 --- a/collects/tests/mzscheme/sandbox.ss +++ b/collects/tests/mzscheme/sandbox.ss @@ -3,7 +3,7 @@ (Section 'sandbox) -(require (lib "sandbox.ss")) +(require mzlib/sandbox) (let ([ev void]) (define (run thunk) diff --git a/collects/tests/mzscheme/serialize.ss b/collects/tests/mzscheme/serialize.ss index ed0a3eb591..385b5e4a42 100644 --- a/collects/tests/mzscheme/serialize.ss +++ b/collects/tests/mzscheme/serialize.ss @@ -4,7 +4,7 @@ (Section 'serialization) -(require (lib "serialize.ss")) +(require mzlib/serialize) ;; ---------------------------------------- @@ -265,7 +265,7 @@ ;; ---------------------------------------- (module ser-mod mzscheme - (require (lib "serialize.ss")) + (require mzlib/serialize) (provide ser-mod-test) (define-serializable-struct foo (a b)) @@ -279,7 +279,7 @@ ;; ---------------------------------------- ;; Classes -(require (lib "class.ss")) +(require mzlib/class) (define-serializable-class s:c% object% (init-field [one 0]) diff --git a/collects/tests/mzscheme/shared.ss b/collects/tests/mzscheme/shared.ss index 64bb774132..145bc7fa62 100644 --- a/collects/tests/mzscheme/shared.ss +++ b/collects/tests/mzscheme/shared.ss @@ -3,7 +3,7 @@ (Section 'shared) -(require (lib "shared.ss")) +(require mzlib/shared) (require (only-in mzscheme define-struct)) (load-relative "shared-tests.ss") diff --git a/collects/tests/mzscheme/srfi.ss b/collects/tests/mzscheme/srfi.ss index f396684f1d..b42c891869 100644 --- a/collects/tests/mzscheme/srfi.ss +++ b/collects/tests/mzscheme/srfi.ss @@ -8,54 +8,54 @@ ;; We just require all the SRFIs and hope nothing bombs. ;; Keep an eye out for error messages! -(require (lib "1.ss" "srfi")) -(require (lib "list.ss" "srfi" "1")) -(require (lib "and-let.ss" "srfi" "2")) -(require (lib "4.ss" "srfi")) -(require (lib "let.ss" "srfi" "5")) -(require (lib "6.ss" "srfi")) -(require (lib "program.ss" "srfi" "7")) -(require (lib "receive.ss" "srfi" "8")) -(require (lib "record.ss" "srfi" "9")) -(require (lib "11.ss" "srfi")) -(require (lib "string.ss" "srfi" "13")) -(require (lib "char-set.ss" "srfi" "14")) -(require (lib "16.ss" "srfi")) -(require (lib "set.ss" "srfi" "17")) -(require (lib "18.ss" "srfi")) -(require (lib "time.ss" "srfi" "19")) -(require (lib "23.ss" "srfi")) -(require (lib "array.ss" "srfi" "25")) -(require (lib "cut.ss" "srfi" "26")) -(require (lib "random-bits.ss" "srfi" "27")) -(require (lib "28.ss" "srfi")) -(require (lib "localization.ss" "srfi" "29")) -(require (lib "30.ss" "srfi")) -(require (lib "rec.ss" "srfi" "31")) -(require (lib "sort.scm" "srfi" "32")) -(require (lib "exception.ss" "srfi" "34")) -(require (lib "35.ss" "srfi")) -(require (lib "condition.ss" "srfi" "35")) -(require (lib "38.ss" "srfi")) -(require (lib "39.ss" "srfi")) -(require (lib "stream.ss" "srfi" "40")) -(require (lib "comprehensions.ss" "srfi" "42")) -(require (lib "vector-lib.ss" "srfi" "43")) -(require (lib "lazy.ss" "srfi" "45")) -(require (lib "format.ss" "srfi" "48")) -(require (lib "cat.ss" "srfi" "54")) -(require (lib "records.ss" "srfi" "57")) -(require (lib "vicinity.ss" "srfi" "59")) -(require (lib "60.ss" "srfi" "60")) -(require (lib "61.ss" "srfi")) -(require (lib "63.ss" "srfi")) -(require (lib "64.ss" "srfi")) -(require (lib "testing.ss" "srfi" "64")) -(require (lib "66.ss" "srfi" "66")) -(require (lib "compare.ss" "srfi" "67")) -(require (lib "hash.ss" "srfi" "69")) -(require (lib "letvalues.ss" "srfi" "71")) -(require (lib "74.ss" "srfi" "74")) -(require (lib "check.ss" "srfi" "78")) -(require (lib "86.ss" "srfi")) -(require (lib "case.ss" "srfi" "87")) +(require srfi/1) +(require srfi/1/list) +(require srfi/2/and-let) +(require srfi/4) +(require srfi/5/let) +(require srfi/6) +(require srfi/7/program) +(require srfi/8/receive) +(require srfi/9/record) +(require srfi/11) +(require srfi/13/string) +(require srfi/14/char-set) +(require srfi/16) +(require srfi/17/set) +(require srfi/18) +(require srfi/19/time) +(require srfi/23) +(require srfi/25/array) +(require srfi/26/cut) +(require srfi/27/random-bits) +(require srfi/28) +(require srfi/29/localization) +(require srfi/30) +(require srfi/31/rec) +(require (lib "srfi/32/sort.scm")) +(require srfi/34/exception) +(require srfi/35) +(require srfi/35/condition) +(require srfi/38) +(require srfi/39) +(require srfi/40/stream) +(require srfi/42/comprehensions) +(require srfi/43/vector-lib) +(require srfi/45/lazy) +(require srfi/48/format) +(require srfi/54/cat) +(require srfi/57/records) +(require srfi/59/vicinity) +(require srfi/60/60) +(require srfi/61) +(require srfi/63) +(require srfi/64) +(require srfi/64/testing) +(require srfi/66/66) +(require srfi/67/compare) +(require srfi/69/hash) +(require srfi/71/letvalues) +(require srfi/74/74) +(require srfi/78/check) +(require srfi/86) +(require srfi/87/case) diff --git a/collects/tests/mzscheme/string.ss b/collects/tests/mzscheme/string.ss index e14b885d7c..2f50a0af9a 100644 --- a/collects/tests/mzscheme/string.ss +++ b/collects/tests/mzscheme/string.ss @@ -3,7 +3,7 @@ (Section 'mzlib-string) -(require (lib "string.ss")) +(require mzlib/string) (let ([s1 (string-copy "Hello!")]) (string-lowercase! s1) diff --git a/collects/tests/mzscheme/structlib.ss b/collects/tests/mzscheme/structlib.ss index 29192b056b..0a8ae1a494 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/subprocess.ss b/collects/tests/mzscheme/subprocess.ss index ccd5c216b2..432becf5f0 100644 --- a/collects/tests/mzscheme/subprocess.ss +++ b/collects/tests/mzscheme/subprocess.ss @@ -1,7 +1,7 @@ (load-relative "testing.ss") -(require (lib "process.ss")) +(require mzlib/process) (Section 'subprocess) diff --git a/collects/tests/mzscheme/threadlib.ss b/collects/tests/mzscheme/threadlib.ss index 27b80695a1..b44ba6e877 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)) diff --git a/collects/tests/mzscheme/trait.ss b/collects/tests/mzscheme/trait.ss index 7f50300069..74cd51d5df 100644 --- a/collects/tests/mzscheme/trait.ss +++ b/collects/tests/mzscheme/trait.ss @@ -1,8 +1,8 @@ (load-relative "loadtest.ss") -(require (lib "class.ss") - (lib "trait.ss")) +(require mzlib/class + mzlib/trait) (Section 'trait) diff --git a/collects/tests/mzscheme/ttt/ttt.ss b/collects/tests/mzscheme/ttt/ttt.ss index 178e078aba..3e09bf0387 100644 --- a/collects/tests/mzscheme/ttt/ttt.ss +++ b/collects/tests/mzscheme/ttt/ttt.ss @@ -1,5 +1,5 @@ -(require (lib "etc.ss") (lib "compat.ss")) +(require mzlib/etc mzlib/compat) (load-relative "listlib.ss") (load-relative "veclib.ss") (load-relative "tic-func.ss") diff --git a/collects/tests/mzscheme/uni-norm.ss b/collects/tests/mzscheme/uni-norm.ss index d654489bf0..e94186aa87 100644 --- a/collects/tests/mzscheme/uni-norm.ss +++ b/collects/tests/mzscheme/uni-norm.ss @@ -1,7 +1,7 @@ -(require (lib "string.ss") - (only-in (lib "url.ss" "net") get-pure-port string->url) - (only-in (lib "port.ss") copy-port)) +(require mzlib/string + (only-in net/url get-pure-port string->url) + (only-in mzlib/port copy-port)) (load-relative "loadtest.ss") diff --git a/collects/tests/mzscheme/ztest.ss b/collects/tests/mzscheme/ztest.ss index 6d7bfb6a56..39f22c9ab2 100644 --- a/collects/tests/mzscheme/ztest.ss +++ b/collects/tests/mzscheme/ztest.ss @@ -1,7 +1,7 @@ ;; rudimentary test harness for complex math routines in ;; zmath.ss -(require (lib "zmath.ss")) +(require mzlib/zmath) (define ztest (lambda (z) diff --git a/collects/tests/plai/datatype-test.ss b/collects/tests/plai/datatype-test.ss index 196ff2d27f..dfcc4bf68b 100644 --- a/collects/tests/plai/datatype-test.ss +++ b/collects/tests/plai/datatype-test.ss @@ -1,7 +1,7 @@ (module datatype-test mzscheme (require (lib "datatype.ss" "plai") (lib "test-harness.ss" "plai") - (lib "contract.ss")) + mzlib/contract) (print-tests 'stop) diff --git a/collects/tests/plot/run-tests.ss b/collects/tests/plot/run-tests.ss index 69949ef401..ca1da9a7c5 100755 --- a/collects/tests/plot/run-tests.ss +++ b/collects/tests/plot/run-tests.ss @@ -4,9 +4,9 @@ exec mred -u "$0" "$@" |# (module run-tests mzscheme -(require (lib "plot.ss" "plot") - (lib "md5.ss") - (lib "pretty.ss")) +(require plot + mzlib/md5 + mzlib/pretty) ;; thisi should be big enough to read thse files @@ -78,9 +78,9 @@ exec mred -u "$0" "$@" (x-min -3.5) (x-max 3.5) (y-min -3.5) (y-max 3.5) (z-min -1.0) (z-max 1.5) (bgcolor '(0 0 0)) (fgcolor '(255 0 0))) "3d-mesh") -(require (lib "class.ss") +(require mzlib/class (lib "plot-extend.ss" "plot") - (lib "etc.ss")) + mzlib/etc) ; (number -> number) mumbo-jumbo -> 2d-renderer diff --git a/collects/tests/profj/advanced-tests.ss b/collects/tests/profj/advanced-tests.ss index 335a7eb07b..45908919b1 100644 --- a/collects/tests/profj/advanced-tests.ss +++ b/collects/tests/profj/advanced-tests.ss @@ -1,6 +1,6 @@ (module advanced-tests mzscheme (require "profj-testing.ss") - (require (lib "String.ss" "profj" "libs" "java" "lang")) + (require profj/libs/java/lang/String) (prepare-for-tests "Advanced") diff --git a/collects/tests/profj/beginner-tests.ss b/collects/tests/profj/beginner-tests.ss index bb075c7186..dde86152c0 100644 --- a/collects/tests/profj/beginner-tests.ss +++ b/collects/tests/profj/beginner-tests.ss @@ -1,8 +1,8 @@ (module beginner-tests mzscheme (require "profj-testing.ss") - (require (lib "class.ss") - (lib "Object.ss" "profj" "libs" "java" "lang") - (lib "String.ss" "profj" "libs" "java" "lang")) + (require mzlib/class + profj/libs/java/lang/Object + profj/libs/java/lang/String) (prepare-for-tests "Beginner") diff --git a/collects/tests/srfi/1/alist-test.ss b/collects/tests/srfi/1/alist-test.ss index c61a2518c3..8d9f6c4d7c 100644 --- a/collects/tests/srfi/1/alist-test.ss +++ b/collects/tests/srfi/1/alist-test.ss @@ -35,8 +35,8 @@ (module alist-test mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (all-except (lib "alist.ss" "srfi" "1") assoc) - (rename (lib "alist.ss" "srfi" "1") s:assoc assoc)) + (all-except srfi/1/alist assoc) + (rename srfi/1/alist s:assoc assoc)) (provide alist-tests) diff --git a/collects/tests/srfi/1/cons-test.ss b/collects/tests/srfi/1/cons-test.ss index f5e72d7298..9c1cbfa584 100644 --- a/collects/tests/srfi/1/cons-test.ss +++ b/collects/tests/srfi/1/cons-test.ss @@ -36,7 +36,7 @@ mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "cons.ss" "srfi" "1")) + srfi/1/cons) (provide cons-tests) diff --git a/collects/tests/srfi/1/delete-test.ss b/collects/tests/srfi/1/delete-test.ss index b108ede334..50626c76be 100644 --- a/collects/tests/srfi/1/delete-test.ss +++ b/collects/tests/srfi/1/delete-test.ss @@ -36,7 +36,7 @@ mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (all-except (lib "delete.ss" "srfi" "1") member)) + (all-except srfi/1/delete member)) (provide delete-tests) diff --git a/collects/tests/srfi/1/filter-test.ss b/collects/tests/srfi/1/filter-test.ss index 22aee4f383..ee8926e5e0 100644 --- a/collects/tests/srfi/1/filter-test.ss +++ b/collects/tests/srfi/1/filter-test.ss @@ -36,7 +36,7 @@ mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (all-except (lib "filter.ss" "srfi" "1") member)) + (all-except srfi/1/filter member)) (provide filter-tests) diff --git a/collects/tests/srfi/1/fold-test.ss b/collects/tests/srfi/1/fold-test.ss index 102f4c4d94..da11ce5d2f 100644 --- a/collects/tests/srfi/1/fold-test.ss +++ b/collects/tests/srfi/1/fold-test.ss @@ -37,9 +37,9 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (all-except (lib "fold.ss" "srfi" "1") map for-each) - (rename (lib "fold.ss" "srfi" "1") s:map map) - (rename (lib "fold.ss" "srfi" "1") s:for-each for-each)) + (all-except srfi/1/fold map for-each) + (rename srfi/1/fold s:map map) + (rename srfi/1/fold s:for-each for-each)) (provide fold-tests) diff --git a/collects/tests/srfi/1/lset-test.ss b/collects/tests/srfi/1/lset-test.ss index c676fbfc85..761a2edf0e 100644 --- a/collects/tests/srfi/1/lset-test.ss +++ b/collects/tests/srfi/1/lset-test.ss @@ -36,7 +36,7 @@ mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "lset.ss" "srfi" "1")) + srfi/1/lset) (provide lset-tests) diff --git a/collects/tests/srfi/1/misc-test.ss b/collects/tests/srfi/1/misc-test.ss index c5012fd430..ab98c16ff5 100644 --- a/collects/tests/srfi/1/misc-test.ss +++ b/collects/tests/srfi/1/misc-test.ss @@ -37,9 +37,9 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (all-except (lib "misc.ss" "srfi" "1") append! reverse!) - (rename (lib "misc.ss" "srfi" "1") s:append! append!) - (rename (lib "misc.ss" "srfi" "1") s:reverse! reverse!)) + (all-except srfi/1/misc append! reverse!) + (rename srfi/1/misc s:append! append!) + (rename srfi/1/misc s:reverse! reverse!)) (provide misc-tests) diff --git a/collects/tests/srfi/1/predicate-test.ss b/collects/tests/srfi/1/predicate-test.ss index b58b530e0f..f7d787cedb 100644 --- a/collects/tests/srfi/1/predicate-test.ss +++ b/collects/tests/srfi/1/predicate-test.ss @@ -37,8 +37,8 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "predicate.ss" "srfi" "1") - (lib "cons.ss" "srfi" "1")) + srfi/1/predicate + srfi/1/cons) (provide predicate-tests) diff --git a/collects/tests/srfi/1/search-test.ss b/collects/tests/srfi/1/search-test.ss index b3a28f7be0..15b7f2a98f 100644 --- a/collects/tests/srfi/1/search-test.ss +++ b/collects/tests/srfi/1/search-test.ss @@ -36,7 +36,7 @@ mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (all-except (lib "search.ss" "srfi" "1") member)) + (all-except srfi/1/search member)) (provide search-tests) diff --git a/collects/tests/srfi/1/selector-test.ss b/collects/tests/srfi/1/selector-test.ss index 478ae95606..196777d8c2 100644 --- a/collects/tests/srfi/1/selector-test.ss +++ b/collects/tests/srfi/1/selector-test.ss @@ -36,7 +36,7 @@ mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "selector.ss" "srfi" "1")) + srfi/1/selector) (provide selector-tests) diff --git a/collects/tests/srfi/13/string-test.ss b/collects/tests/srfi/13/string-test.ss index a764ff6311..a9247c435f 100644 --- a/collects/tests/srfi/13/string-test.ss +++ b/collects/tests/srfi/13/string-test.ss @@ -28,8 +28,8 @@ (module string-test mzscheme ;; Noel's Test Framework: (get your copy @ schematics.sourceforge.net) (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "string.ss" "srfi" "13") - (lib "char-set.ss" "srfi" "14") + srfi/13/string + srfi/14/char-set ) (provide string-tests) diff --git a/collects/tests/srfi/14/char-set-test.ss b/collects/tests/srfi/14/char-set-test.ss index dbd3993e37..f370a3a2bb 100644 --- a/collects/tests/srfi/14/char-set-test.ss +++ b/collects/tests/srfi/14/char-set-test.ss @@ -28,7 +28,7 @@ (module char-set-test mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "char-set.ss" "srfi" "14") + srfi/14/char-set ) (provide char-set-tests) diff --git a/collects/tests/srfi/2/and-let-test.ss b/collects/tests/srfi/2/and-let-test.ss index 7e8092e872..a57c677e0a 100644 --- a/collects/tests/srfi/2/and-let-test.ss +++ b/collects/tests/srfi/2/and-let-test.ss @@ -27,7 +27,7 @@ (module and-let-test mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "and-let.ss" "srfi" "2")) + srfi/2/and-let) (provide and-let*-tests) (define and-let*-tests diff --git a/collects/tests/srfi/26/cut-test.ss b/collects/tests/srfi/26/cut-test.ss index 7f62fd0e30..7ba979ecda 100644 --- a/collects/tests/srfi/26/cut-test.ss +++ b/collects/tests/srfi/26/cut-test.ss @@ -25,7 +25,7 @@ (module cut-test mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "cut.ss" "srfi" "26")) + srfi/26/cut) (provide cut-tests) diff --git a/collects/tests/srfi/40/all-srfi-40-tests.ss b/collects/tests/srfi/40/all-srfi-40-tests.ss index 832e0c1359..c42b8a29b1 100644 --- a/collects/tests/srfi/40/all-srfi-40-tests.ss +++ b/collects/tests/srfi/40/all-srfi-40-tests.ss @@ -1,7 +1,7 @@ (module all-srfi-40-tests mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "40.ss" "srfi")) + srfi/40) (provide all-srfi-40-tests) (define from0 diff --git a/collects/tests/srfi/43/constructor-tests.ss b/collects/tests/srfi/43/constructor-tests.ss index c471114b71..38c7c18b44 100644 --- a/collects/tests/srfi/43/constructor-tests.ss +++ b/collects/tests/srfi/43/constructor-tests.ss @@ -1,7 +1,7 @@ (module constructor-tests mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) - (require (lib "vector-lib.ss" "srfi" "43")) + (require srfi/43/vector-lib) (provide constructor-tests) diff --git a/collects/tests/srfi/43/conversion-tests.ss b/collects/tests/srfi/43/conversion-tests.ss index e5499e2f56..d4c6c4ba8a 100644 --- a/collects/tests/srfi/43/conversion-tests.ss +++ b/collects/tests/srfi/43/conversion-tests.ss @@ -1,7 +1,7 @@ (module conversion-tests mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) - (require (lib "vector-lib.ss" "srfi" "43")) + (require srfi/43/vector-lib) (provide conversion-tests) diff --git a/collects/tests/srfi/43/iteration-tests.ss b/collects/tests/srfi/43/iteration-tests.ss index cd87bdc7cf..f2c6617d36 100644 --- a/collects/tests/srfi/43/iteration-tests.ss +++ b/collects/tests/srfi/43/iteration-tests.ss @@ -1,7 +1,7 @@ (module iteration-tests mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) - (require (lib "vector-lib.ss" "srfi" "43")) + (require srfi/43/vector-lib) (provide iteration-tests) diff --git a/collects/tests/srfi/43/mutator-tests.ss b/collects/tests/srfi/43/mutator-tests.ss index 7a4de166fc..84f18ef5f8 100644 --- a/collects/tests/srfi/43/mutator-tests.ss +++ b/collects/tests/srfi/43/mutator-tests.ss @@ -1,7 +1,7 @@ (module mutator-tests mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) - (require (lib "vector-lib.ss" "srfi" "43")) + (require srfi/43/vector-lib) (provide mutator-tests) diff --git a/collects/tests/srfi/43/predicate-tests.ss b/collects/tests/srfi/43/predicate-tests.ss index 6219d59792..5b0da7be4f 100644 --- a/collects/tests/srfi/43/predicate-tests.ss +++ b/collects/tests/srfi/43/predicate-tests.ss @@ -1,7 +1,7 @@ (module predicate-tests mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) - (require (lib "vector-lib.ss" "srfi" "43")) + (require srfi/43/vector-lib) (provide predicate-tests) diff --git a/collects/tests/srfi/43/searching-tests.ss b/collects/tests/srfi/43/searching-tests.ss index ff6a2968b0..da730ed6e4 100644 --- a/collects/tests/srfi/43/searching-tests.ss +++ b/collects/tests/srfi/43/searching-tests.ss @@ -1,7 +1,7 @@ (module searching-tests mzscheme (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) - (require (lib "vector-lib.ss" "srfi" "43")) + (require srfi/43/vector-lib) (provide searching-tests) diff --git a/collects/tests/srfi/69/hash-tests.ss b/collects/tests/srfi/69/hash-tests.ss index e02cc88710..6f8ee18a3b 100644 --- a/collects/tests/srfi/69/hash-tests.ss +++ b/collects/tests/srfi/69/hash-tests.ss @@ -2,8 +2,8 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))) - (require (lib "list.ss" "srfi" "1") - (prefix h: (lib "69.ss" "srfi"))) + (require srfi/1/list + (prefix h: srfi/69)) (provide hash-tests) diff --git a/collects/tests/srfi/load-srfis.ss b/collects/tests/srfi/load-srfis.ss index 491da5f362..34d2d19fd0 100644 --- a/collects/tests/srfi/load-srfis.ss +++ b/collects/tests/srfi/load-srfis.ss @@ -3,81 +3,81 @@ ;;; might not be up-to-date, so check before you run it! -(require (lib "1.ss" "srfi")) -(require (lib "2.ss" "srfi")) -(require (lib "4.ss" "srfi")) -(require (lib "5.ss" "srfi")) -(require (lib "7.ss" "srfi")) -(require (lib "8.ss" "srfi")) -(require (lib "9.ss" "srfi")) -(require (lib "13.ss" "srfi")) -(require (lib "14.ss" "srfi")) -(require (lib "17.ss" "srfi")) -(require (lib "19.ss" "srfi")) -(require (lib "25.ss" "srfi")) -(require (lib "26.ss" "srfi")) -(require (lib "27.ss" "srfi")) -(require (lib "29.ss" "srfi")) -(require (lib "31.ss" "srfi")) -(require (lib "32.ss" "srfi")) -(require (lib "34.ss" "srfi")) -(require (lib "35.ss" "srfi")) -(require (lib "35.ss" "srfi")) -(require (lib "40.ss" "srfi")) -(require (lib "42.ss" "srfi")) -(require (lib "43.ss" "srfi")) -(require (lib "45.ss" "srfi")) -(require (lib "48.ss" "srfi")) -(require (lib "54.ss" "srfi")) -(require (lib "57.ss" "srfi")) -(require (lib "59.ss" "srfi")) -(require (lib "60.ss" "srfi")) -(require (lib "61.ss" "srfi")) -(require (lib "63.ss" "srfi")) -(require (lib "64.ss" "srfi")) -(require (lib "66.ss" "srfi")) -(require (lib "67.ss" "srfi")) -(require (lib "69.ss" "srfi")) -(require (lib "71.ss" "srfi")) -(require (lib "74.ss" "srfi")) -(require (lib "78.ss" "srfi")) -(require (lib "86.ss" "srfi")) -(require (lib "87.ss" "srfi")) +(require srfi/1) +(require srfi/2) +(require srfi/4) +(require srfi/5) +(require srfi/7) +(require srfi/8) +(require srfi/9) +(require srfi/13) +(require srfi/14) +(require srfi/17) +(require srfi/19) +(require srfi/25) +(require srfi/26) +(require srfi/27) +(require srfi/29) +(require srfi/31) +(require srfi/32) +(require srfi/34) +(require srfi/35) +(require srfi/35) +(require srfi/40) +(require srfi/42) +(require srfi/43) +(require srfi/45) +(require srfi/48) +(require srfi/54) +(require srfi/57) +(require srfi/59) +(require srfi/60) +(require srfi/61) +(require srfi/63) +(require srfi/64) +(require srfi/66) +(require srfi/67) +(require srfi/69) +(require srfi/71) +(require srfi/74) +(require srfi/78) +(require srfi/86) +(require srfi/87) -(require (lib "list.ss" "srfi" "1")) -(require (lib "and-let.ss" "srfi" "2")) -(require (lib "let.ss" "srfi" "5")) -(require (lib "program.ss" "srfi" "7")) -(require (lib "receive.ss" "srfi" "8")) -(require (lib "record.ss" "srfi" "9")) -(require (lib "string.ss" "srfi" "13")) -(require (lib "char-set.ss" "srfi" "14")) -(require (lib "set.ss" "srfi" "17")) -(require (lib "time.ss" "srfi" "19")) -(require (lib "array.ss" "srfi" "25")) -(require (lib "cut.ss" "srfi" "26")) -(require (lib "random-bits.ss" "srfi" "27")) -(require (lib "localization.ss" "srfi" "29")) -(require (lib "rec.ss" "srfi" "31")) -(require (lib "sort.scm" "srfi" "32")) -(require (lib "exception.ss" "srfi" "34")) -(require (lib "condition.ss" "srfi" "35")) -(require (lib "stream.ss" "srfi" "40")) -(require (lib "comprehensions.ss" "srfi" "42")) -(require (lib "vector-lib.ss" "srfi" "43")) -(require (lib "lazy.ss" "srfi" "45")) -(require (lib "format.ss" "srfi" "48")) -(require (lib "records.ss" "srfi" "57")) -(require (lib "vicinity.ss" "srfi" "59")) -(require (lib "60.ss" "srfi" "60")) -(require (lib "cond.ss" "srfi" "61")) -(require (lib "63.ss" "srfi" "63")) -(require (lib "testing.ss" "srfi" "64")) -(require (lib "66.ss" "srfi" "66")) -(require (lib "compare.ss" "srfi" "67")) -(require (lib "hash.ss" "srfi" "69")) -(require (lib "letvalues.ss" "srfi" "71")) -(require (lib "74.ss" "srfi" "74")) -(require (lib "check.ss" "srfi" "78")) -(require (lib "86.ss" "srfi" "86")) -(require (lib "case.ss" "srfi" "87")) \ No newline at end of file +(require srfi/1/list) +(require srfi/2/and-let) +(require srfi/5/let) +(require srfi/7/program) +(require srfi/8/receive) +(require srfi/9/record) +(require srfi/13/string) +(require srfi/14/char-set) +(require srfi/17/set) +(require srfi/19/time) +(require srfi/25/array) +(require srfi/26/cut) +(require srfi/27/random-bits) +(require srfi/29/localization) +(require srfi/31/rec) +(require (lib "srfi/32/sort.scm")) +(require srfi/34/exception) +(require srfi/35/condition) +(require srfi/40/stream) +(require srfi/42/comprehensions) +(require srfi/43/vector-lib) +(require srfi/45/lazy) +(require srfi/48/format) +(require srfi/57/records) +(require srfi/59/vicinity) +(require srfi/60/60) +(require srfi/61/cond) +(require srfi/63/63) +(require srfi/64/testing) +(require srfi/66/66) +(require srfi/67/compare) +(require srfi/69/hash) +(require srfi/71/letvalues) +(require srfi/74/74) +(require srfi/78/check) +(require srfi/86/86) +(require srfi/87/case) \ No newline at end of file diff --git a/collects/tests/srpersist/srptests.ss b/collects/tests/srpersist/srptests.ss index 82540c0ee5..090890a2dc 100644 --- a/collects/tests/srpersist/srptests.ss +++ b/collects/tests/srpersist/srptests.ss @@ -9,7 +9,7 @@ ;; so we don't do comparisons against expected results ;; basically, looking for segfaults and garbage values -(require (lib "srpersist.ss" "srpersist")) +(require srpersist) (define c-types '(sql-c-char diff --git a/collects/tests/stepper/annotate-test.ss b/collects/tests/stepper/annotate-test.ss index 83f22baac8..37fa14708e 100644 --- a/collects/tests/stepper/annotate-test.ss +++ b/collects/tests/stepper/annotate-test.ss @@ -1,5 +1,5 @@ (require (prefix annotate: (lib "annotate.ss" "stepper" "private"))) -(require (prefix kernel: (lib "kerncase.ss" "syntax"))) +(require (prefix kernel: syntax/kerncase)) (require (lib "syncheck-debug.ss" "drscheme" "private")) (require (lib "marks.ss" "stepper" "private")) (require "tests-common.ss") diff --git a/collects/tests/stepper/reconstruct-test.ss b/collects/tests/stepper/reconstruct-test.ss index 66c8abea92..cb9cae464e 100644 --- a/collects/tests/stepper/reconstruct-test.ss +++ b/collects/tests/stepper/reconstruct-test.ss @@ -1,13 +1,13 @@ (require (prefix annotate: (lib "annotate.ss" "stepper" "private")) - (prefix kernel: (lib "kerncase.ss" "syntax")) + (prefix kernel: syntax/kerncase) (prefix reconstruct: (lib "reconstruct.ss" "stepper" "private")) (lib "shared.ss" "stepper" "private") (lib "highlight-placeholder.ss" "stepper" "private") (lib "my-macros.ss" "stepper" "private") (lib "model-settings.ss" "stepper" "private") (lib "marks.ss" "stepper" "private") - (lib "class.ss") - (lib "etc.ss") + mzlib/class + mzlib/etc "tests-common.ss") (load "/Users/clements/plt/tests/mzscheme/testing.ss") @@ -529,17 +529,17 @@ ;; ;;;;;;;;;;;;; -(require (lib "mred.ss" "mred")) +(require mred) (define tp-namespace (let ([ns (current-namespace)] - [mred-name ((current-module-name-resolver) '(lib "mred.ss" "mred") #f #f)] + [mred-name ((current-module-name-resolver) 'mred #f #f)] [new-namespace (make-namespace 'empty)]) (parameterize ([current-namespace new-namespace]) (namespace-attach-module ns 'mzscheme) (namespace-attach-module ns mred-name) - (namespace-require '(lib "htdp-beginner.ss" "lang")) - (namespace-require '(lib "guess.ss" "htdp")) + (namespace-require 'lang/htdp-beginner) + (namespace-require 'htdp/guess) new-namespace))) (reconstruct:set-render-settings! fake-beginner-render-settings) diff --git a/collects/tests/stepper/tests-common.ss b/collects/tests/stepper/tests-common.ss index 38fdd079ea..f9dfad58a3 100644 --- a/collects/tests/stepper/tests-common.ss +++ b/collects/tests/stepper/tests-common.ss @@ -1,7 +1,7 @@ (module tests-common mzscheme (require (lib "private/annotate.ss" "stepper") - (lib "contract.ss") + mzlib/contract (lib "shared.ss" "stepper" "private")) (provide/contract (reset-namespaces (-> void?)) diff --git a/collects/tests/stepper/through-tests.ss b/collects/tests/stepper/through-tests.ss index a5611f3aa2..aee18ba101 100755 --- a/collects/tests/stepper/through-tests.ss +++ b/collects/tests/stepper/through-tests.ss @@ -13,12 +13,12 @@ stepper/private/model-settings tests/utils/sexp-diff lang/run-teaching-program - (only-in (lib "13.ss" "srfi") string-contains) + (only-in srfi/13 string-contains) ;; for xml testing: - ;; (lib "class.ss") + ;; mzlib/class ;; (all-except (lib "xml-snipclass.ss" "xml") snip-class) ;; (all-except (lib "scheme-snipclass.ss" "xml") snip-class) - ;; (lib "mred.ss" "mred") + ;; mred #;(file "/Users/clements/clements/scheme-scraps/eli-debug.ss") ) @@ -1340,7 +1340,7 @@ ; ; as you can see, many teachpack tests work only in mred: - ;; (require (lib "mred.ss" "mred")) + ;; (require mred) (define test-teachpack-sequence (lambda (teachpack-specs expr-string expected-results) @@ -1354,7 +1354,7 @@ (t1 check-expect (test-teachpack-sequence - `((lib "testing.ss" "htdp")) + `(htdp/testing) "(check-expect (+ 3 4) (+ 8 9)) (+ 4 5)" `((before-after ((check-expect (+ 3 4) (hilite (+ 8 9)))) ((check-expect (+ 3 4) (hilite 17)))) @@ -1365,7 +1365,7 @@ (t1 check-within (test-teachpack-sequence - `((lib "testing.ss" "htdp")) + `(htdp/testing) "(check-within (+ 3 4) (+ 8 10) (+ 10 90)) (+ 4 5)" `((before-after ((check-within (+ 3 4) (hilite (+ 8 10)) (+ 10 90))) ((check-within (+ 3 4) (hilite 18) (+ 10 90)))) @@ -1378,7 +1378,7 @@ (t1 check-error (test-teachpack-sequence - `((lib "testing.ss" "htdp")) + `(htdp/testing) "(check-error (+ (+ 3 4) (rest empty)) (string-append \"b\" \"ogus\")) (+ 4 5)" `((before-after ((check-error (+ (+ 3 4) (rest empty)) (hilite (string-append "b" "ogus")))) ((check-error (+ (+ 3 4) (rest empty)) (hilite "bogus")))) @@ -1400,7 +1400,7 @@ #; (t1 teachpack-drawing (test-teachpack-sequence - `((lib "draw.ss" "htdp")) + `(htdp/draw) "(define (draw-limb i) (cond [(= i 1) (draw-solid-line (make-posn 20 20) (make-posn 20 100) 'blue)] [(= i 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)])) @@ -1463,7 +1463,7 @@ #; (t1 teachpack-web-interaction (test-teachpack-sequence - `((lib "servlet2.ss" "htdp")) + `(htdp/servlet2) "(define (adder go) (inform (number->string (+ (single-query (make-number \"enter 10\")) (single-query (make-number \"enter 20\")))))) (adder true)" `((before-after-finished ((define (adder go) (inform (number->string (+ (single-query (make-number "enter 10")) (single-query (make-number "enter 20"))))))) ((hilite (adder true))) diff --git a/collects/tests/syntax-color/paren-tree.ss b/collects/tests/syntax-color/paren-tree.ss index c86b80fb85..a18ae9e2f8 100644 --- a/collects/tests/syntax-color/paren-tree.ss +++ b/collects/tests/syntax-color/paren-tree.ss @@ -1,5 +1,5 @@ (load-relative "../mzscheme/loadtest.ss") -(require (lib "class.ss") +(require mzlib/class (lib "paren-tree.ss" "syntax-color")) (define t (new paren-tree% (matches '((|(| |)|) diff --git a/collects/tests/syntax-color/token-tree.ss b/collects/tests/syntax-color/token-tree.ss index 00878a7be7..1e0657ea68 100644 --- a/collects/tests/syntax-color/token-tree.ss +++ b/collects/tests/syntax-color/token-tree.ss @@ -1,5 +1,5 @@ (load-relative "../mzscheme/loadtest.ss") -(require (lib "class.ss") +(require mzlib/class (lib "token-tree.ss" "syntax-color")) (define t (new token-tree% (length 1) (data 'a))) diff --git a/collects/tests/units/multi-mod-sigs.ss b/collects/tests/units/multi-mod-sigs.ss index 147804e495..96b0abee84 100644 --- a/collects/tests/units/multi-mod-sigs.ss +++ b/collects/tests/units/multi-mod-sigs.ss @@ -1,19 +1,19 @@ (module test1 mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide s1) (define-signature s1 ((define-values (a) (+ 1 b)) b))) (module test2 mzscheme - (require (lib "unit.ss") test1) + (require mzlib/unit test1) (provide s2) (define-signature s2 extends s1 ((define-values (c) (list b a d)) d))) (module test3 mzscheme - (require (lib "unit.ss") test1 test2) + (require mzlib/unit test1 test2) (provide (all-defined)) (define-unit u1 (import s1) (export) (list a b)) @@ -27,7 +27,7 @@ (module test4 mzscheme - (require (lib "unit.ss") test1 test2 test3) + (require mzlib/unit test1 test2 test3) (require "test-harness.ss") (test '(101 100) (invoke-unit diff --git a/collects/tests/units/test-cert.ss b/collects/tests/units/test-cert.ss index 8c36734e10..1c9184042c 100644 --- a/collects/tests/units/test-cert.ss +++ b/collects/tests/units/test-cert.ss @@ -1,5 +1,5 @@ (module test mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide s) @@ -12,7 +12,7 @@ (syntax-rules () ((_) (x a))))))) (module test2 mzscheme - (require (lib "unit.ss") + (require mzlib/unit test) (define-unit u1 (import) (export s) (define a 1)) @@ -28,7 +28,7 @@ (require test2) (module test3 mzscheme - (require (lib "unit.ss") + (require mzlib/unit test) (define-unit u1 (import) (export s) (define a 1)) diff --git a/collects/tests/units/test-exptime.ss b/collects/tests/units/test-exptime.ss index 7366519bfb..94d508d62f 100644 --- a/collects/tests/units/test-exptime.ss +++ b/collects/tests/units/test-exptime.ss @@ -1,7 +1,7 @@ -(require-for-syntax (lib "unit-exptime.ss")) +(require-for-syntax mzlib/unit-exptime) (require "test-harness.ss" ;unit - (lib "unit.ss")) + mzlib/unit) (define-signature one^ (one-a one-b)) (define-signature two^ (two-a diff --git a/collects/tests/units/test-harness.ss b/collects/tests/units/test-harness.ss index 3ea4bcefdc..18c5413179 100644 --- a/collects/tests/units/test-harness.ss +++ b/collects/tests/units/test-harness.ss @@ -1,5 +1,5 @@ (module test-harness mzscheme - (require (lib "stx.ss" "syntax")) + (require syntax/stx) (provide (all-defined)) diff --git a/collects/tests/units/test-unit.ss b/collects/tests/units/test-unit.ss index 1e933d3a87..0c63eaaa9a 100644 --- a/collects/tests/units/test-unit.ss +++ b/collects/tests/units/test-unit.ss @@ -2,7 +2,7 @@ (lib "unit-syntax.ss" "mzlib" "private")) (require "test-harness.ss" ;unit - (lib "unit.ss")) + mzlib/unit) (define-syntax (lookup-sig-mac stx) (parameterize ((error-syntax stx)) @@ -1153,7 +1153,7 @@ (test-syntax-error "struct: bad omission" (define-signature x ((struct n () x)))) -(require (lib "plt-match.ss")) +(require mzlib/plt-match) (let () (define-signature sig ((struct s (x y)))) (test 3 diff --git a/collects/tests/utils/gui.ss b/collects/tests/utils/gui.ss index e78883f646..a01943ddc4 100644 --- a/collects/tests/utils/gui.ss +++ b/collects/tests/utils/gui.ss @@ -1,7 +1,7 @@ (module gui mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss")) + (require mred + mzlib/class + mzlib/etc) (provide find-labelled-window whitespace-string=?) ;; whitespace-string=? : string string -> boolean diff --git a/collects/tests/web-server/build-plt.ss b/collects/tests/web-server/build-plt.ss index d0589acc71..17a916c534 100644 --- a/collects/tests/web-server/build-plt.ss +++ b/collects/tests/web-server/build-plt.ss @@ -1,6 +1,6 @@ (module build-plt mzscheme (require (lib "pack.ss" "setup") - (lib "date.ss") + mzlib/date "suite.ss") (define web-root (build-path "collects" "web-server" "default-web-root")) diff --git a/collects/tests/web-server/my-url.ss b/collects/tests/web-server/my-url.ss index 7b9f0c5511..1d28c76bdc 100644 --- a/collects/tests/web-server/my-url.ss +++ b/collects/tests/web-server/my-url.ss @@ -1,11 +1,11 @@ (module my-url mzscheme - (require (all-except (lib "url.ss" "net") purify-port)) + (require (all-except net/url purify-port)) (provide purify-port (struct mime-header (name value))) ;(provide (all-from-except url purify-port)) - ;(provide (all-from-except (lib "url.ss" "net") purify-port)) + ;(provide (all-from-except net/url purify-port)) ; the -except is not needed, since purify-port was not imported. - (provide (all-from (lib "url.ss" "net"))) + (provide (all-from net/url)) ; mime-header = (make-mime-header str str) (define-struct mime-header (name value)) diff --git a/collects/tests/web-server/scheme-units/assertions.ss b/collects/tests/web-server/scheme-units/assertions.ss index 863dbb74b0..603075f486 100644 --- a/collects/tests/web-server/scheme-units/assertions.ss +++ b/collects/tests/web-server/scheme-units/assertions.ss @@ -4,9 +4,9 @@ (require (lib "test.ss" "schemeunit") (lib "web-server.ss" "web-server") (lib "configuration.ss" "web-server") - (lib "url.ss" "net") - (lib "head.ss" "net") - (lib "contract.ss")) + net/url + net/head + mzlib/contract) (provide assert-serve assert-serve/string assert-status-number assert-with-server) (provide/contract diff --git a/collects/tests/web-server/scheme-units/test-authentication.ss b/collects/tests/web-server/scheme-units/test-authentication.ss index 1f07256b3d..a73c60dfd6 100644 --- a/collects/tests/web-server/scheme-units/test-authentication.ss +++ b/collects/tests/web-server/scheme-units/test-authentication.ss @@ -1,11 +1,11 @@ ;; Mike Burns, July 28th, 2004, netgeek@speakeasy.net ;; Test serving files that require authentication. (module test-authentication mzscheme - (require (lib "contract.ss") + (require mzlib/contract (lib "test.ss" "schemeunit") - (lib "url.ss" "net") - (lib "head.ss" "net") - (lib "base64.ss" "net") + net/url + net/head + net/base64 "assertions.ss" ) diff --git a/collects/tests/web-server/scheme-units/test-errors.ss b/collects/tests/web-server/scheme-units/test-errors.ss index 38b02af6d3..15ca97f44e 100644 --- a/collects/tests/web-server/scheme-units/test-errors.ss +++ b/collects/tests/web-server/scheme-units/test-errors.ss @@ -2,7 +2,7 @@ ;; Test the error messages for both headers and content. (module test-errors mzscheme (require (lib "test.ss" "schemeunit") - (lib "url.ss" "net") + net/url "assertions.ss" ) diff --git a/collects/tests/web-server/scheme-units/test-serve-static-html.ss b/collects/tests/web-server/scheme-units/test-serve-static-html.ss index 9aa1de9c23..3d4024d0d6 100644 --- a/collects/tests/web-server/scheme-units/test-serve-static-html.ss +++ b/collects/tests/web-server/scheme-units/test-serve-static-html.ss @@ -2,7 +2,7 @@ ;; Test whether a static, HTML file can be sent correctly. (module test-serve-static-html mzscheme (require (lib "test.ss" "schemeunit") - (lib "contract.ss") + mzlib/contract "assertions.ss" ) diff --git a/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss b/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss index cd750d64d1..111052c2b9 100644 --- a/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss +++ b/collects/tests/web-server/scheme-units/test-serve-static-jpeg.ss @@ -1,7 +1,7 @@ ;; Mike Burns, July 28th, 2004, netgeek@speakeasy.net ;; Test serving JPEGs. This also tests PR #6302. (module test-serve-static-jpeg mzscheme - (require (lib "contract.ss") + (require mzlib/contract (lib "test.ss" "schemeunit") "assertions.ss") diff --git a/collects/tests/web-server/scheme-units/test-servlets.ss b/collects/tests/web-server/scheme-units/test-servlets.ss index b6c58accd9..5879a63c87 100644 --- a/collects/tests/web-server/scheme-units/test-servlets.ss +++ b/collects/tests/web-server/scheme-units/test-servlets.ss @@ -6,7 +6,7 @@ ;; - Various MIME formats ;; - URL paths (module test-servlets mzscheme - (require (lib "contract.ss") + (require mzlib/contract (lib "test.ss" "schemeunit") "assertions.ss" ) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test1-incremental.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test1-incremental.ss index e74fe22ae1..cca3deda03 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test1-incremental.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test1-incremental.ss @@ -1,7 +1,7 @@ ;; Incremental servlet with no arguments on the URL, in text/html, no URL ;; path. (module test1-incremental mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test1.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test1.ss index a72a6bc9b1..4f0ae4257f 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test1.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test1.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet with no arguments on the URL, in text/html, no URL ;; path. (module test1 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss index 2f567945c3..4c2915a2a7 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental-unitsig.ss @@ -1,6 +1,6 @@ ;; Incremental servlet with no arguments on the URL, in text/html, with URL ;; path. -(require (lib "unitsig.ss") +(require mzlib/unitsig (lib "servlet-sig.ss" "web-server") ) (unit/sig () diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental.ss index ce8fc6c163..19f832d2ea 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2-incremental.ss @@ -1,7 +1,7 @@ ;; Incremental servlet with no arguments on the URL, in text/html, with URL ;; path. (module test2-incremental mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2.ss index ee1ea3042d..c37cd5906b 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test2.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test2.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet with no arguments on the URL, in text/html, with URL ;; path. (module test2 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test3.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test3.ss index 7742c7f477..92d973b767 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test3.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test3.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet with no arguments on the URL, in text/plain, no URL ;; path. (module test3 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test4.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test4.ss index 8700274b7c..c8beca1c40 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test4.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test4.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet with arguments on the URL, in text/html, no URL ;; path. (module test4 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test5.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test5.ss index a2a4313647..ce197baa40 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test5.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test5.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet with arguments on the URL, in text/html, with URL ;; path. (module test5 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test6.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test6.ss index 398135a6ad..057507492f 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test6.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test6.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet with arguments on the URL, in text/plain, no URL ;; path. (module test6 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test7.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test7.ss index e94f6cbbcc..fcb51a041f 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test7.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test7.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet no arguments on the URL, in text/plain, with URL ;; path. (module test7 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-root/servlets/test8.ss b/collects/tests/web-server/scheme-units/test-web-root/servlets/test8.ss index 63a25efb6a..4b69b9c4c6 100644 --- a/collects/tests/web-server/scheme-units/test-web-root/servlets/test8.ss +++ b/collects/tests/web-server/scheme-units/test-web-root/servlets/test8.ss @@ -1,7 +1,7 @@ ;; Non-incremental servlet with arguments on the URL, in text/plain, with URL ;; path. (module test8 mzscheme - (require (lib "servlet.ss" "web-server") + (require web-server/servlet ) (provide start timeout interface-version) diff --git a/collects/tests/web-server/scheme-units/test-web-server-process.ss b/collects/tests/web-server/scheme-units/test-web-server-process.ss index 5253bc9b20..87a3063fb3 100644 --- a/collects/tests/web-server/scheme-units/test-web-server-process.ss +++ b/collects/tests/web-server/scheme-units/test-web-server-process.ss @@ -3,7 +3,7 @@ ;; Not sure if this is needed, but it was in Paul's. (module test-web-server-process mzscheme (require (lib "test.ss" "schemeunit") - (lib "process.ss")) + mzlib/process) (provide test-web-server-process) diff --git a/collects/tests/web-server/scheme-units/test-web-server.ss b/collects/tests/web-server/scheme-units/test-web-server.ss index 02449b36fc..1e8c543d42 100644 --- a/collects/tests/web-server/scheme-units/test-web-server.ss +++ b/collects/tests/web-server/scheme-units/test-web-server.ss @@ -4,7 +4,7 @@ (require (lib "web-server.ss" "web-server") (lib "configuration.ss" "web-server") (lib "test.ss" "schemeunit") - (lib "etc.ss")) + mzlib/etc) (provide test-web-server) diff --git a/collects/tests/web-server/sclient.ss b/collects/tests/web-server/sclient.ss index 6666c3cec0..dd529738be 100644 --- a/collects/tests/web-server/sclient.ss +++ b/collects/tests/web-server/sclient.ss @@ -3,7 +3,7 @@ ; by gaurav, peter, and gang. ; The TCP/IP stuff isn't as finely controlled, so it's my fault if it stinks. (module sclient mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) ; old-state = 'nothing | 'waiting | 'reading | 'writing diff --git a/collects/tests/web-server/servlets/color2.ss b/collects/tests/web-server/servlets/color2.ss index 5fe859b91d..cf0aae31f5 100644 --- a/collects/tests/web-server/servlets/color2.ss +++ b/collects/tests/web-server/servlets/color2.ss @@ -1,7 +1,7 @@ ; needs first defined (i.e. use a teaching langauge) ; needs the servlet.ss teachpack -(require (lib "etc.ss")) +(require mzlib/etc) ; : sym -> str ; to input an opinion about a color diff --git a/collects/tests/web-server/suite.ss b/collects/tests/web-server/suite.ss index 2428c3f246..a644d9fcb3 100644 --- a/collects/tests/web-server/suite.ss +++ b/collects/tests/web-server/suite.ss @@ -10,10 +10,10 @@ (module suite mzscheme (provide broken? broken?/remote start-server files-broken? authentication-broken? normal-servlets-broken? errors-broken?) - (require (lib "process.ss") - (lib "etc.ss") + (require mzlib/process + mzlib/etc "my-url.ss" - (lib "base64.ss" "net") + net/base64 (lib "xml.ss" "xml") (lib "channel.ss" "web-server")) diff --git a/collects/tests/web-server/web-hammer.ss b/collects/tests/web-server/web-hammer.ss index 8529e93b20..f54823e36d 100644 --- a/collects/tests/web-server/web-hammer.ss +++ b/collects/tests/web-server/web-hammer.ss @@ -1,7 +1,7 @@ (module web-hammer mzscheme - (require (lib "url.ss" "net")) + (require net/url) (provide server-performance) - (provide (all-from (lib "url.ss" "net"))) + (provide (all-from net/url)) (define BUFFER-SIZE 8192) diff --git a/collects/tests/web-server/web-root/servlets/tests/bad-return.ss b/collects/tests/web-server/web-root/servlets/tests/bad-return.ss index 19080d0ef0..f0ef799885 100644 --- a/collects/tests/web-server/web-root/servlets/tests/bad-return.ss +++ b/collects/tests/web-server/web-root/servlets/tests/bad-return.ss @@ -1,4 +1,4 @@ -(require (lib "unitsig.ss")) +(require mzlib/unitsig) (require (lib "servlet-sig.ss" "web-server")) (unit/sig () (import servlet^) diff --git a/collects/tests/web-server/web-root/servlets/tests/broken.ss b/collects/tests/web-server/web-root/servlets/tests/broken.ss index f162ee3ada..1514823489 100644 --- a/collects/tests/web-server/web-root/servlets/tests/broken.ss +++ b/collects/tests/web-server/web-root/servlets/tests/broken.ss @@ -1,4 +1,4 @@ -(require (lib "unitsig.ss")) +(require mzlib/unitsig) (require (lib "servlet-sig.ss" "web-server")) (unit/sig () (import servlet^) diff --git a/collects/tests/web-server/web-root/servlets/tests/cut-module.ss b/collects/tests/web-server/web-root/servlets/tests/cut-module.ss index 1ba3fac298..0f1940f48c 100644 --- a/collects/tests/web-server/web-root/servlets/tests/cut-module.ss +++ b/collects/tests/web-server/web-root/servlets/tests/cut-module.ss @@ -1,7 +1,7 @@ ; purpose: to test send/suspend, send/forward, send/back, and send/finish (module cut-module mzscheme (provide interface-version timeout start) - (require (lib "servlet.ss" "web-server") + (require web-server/servlet (lib "servlet-sig.ss" "web-server")) (define interface-version 'v1) diff --git a/collects/tests/web-server/web-root/servlets/tests/incremental.ss b/collects/tests/web-server/web-root/servlets/tests/incremental.ss index d01748f4bf..cf20aaf801 100644 --- a/collects/tests/web-server/web-root/servlets/tests/incremental.ss +++ b/collects/tests/web-server/web-root/servlets/tests/incremental.ss @@ -1,5 +1,5 @@ (require (lib "servlet-sig.ss" "web-server") - (lib "unitsig.ss")) + mzlib/unitsig) (unit/sig () (import servlet^) diff --git a/collects/tests/web-server/web-root/servlets/tests/mime.ss b/collects/tests/web-server/web-root/servlets/tests/mime.ss index 8c14f5c57e..7c75886d30 100644 --- a/collects/tests/web-server/web-root/servlets/tests/mime.ss +++ b/collects/tests/web-server/web-root/servlets/tests/mime.ss @@ -1,4 +1,4 @@ -(require (lib "unitsig.ss")) +(require mzlib/unitsig) (require (lib "servlet-sig.ss" "web-server")) (unit/sig () (import servlet^) diff --git a/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss b/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss index 0c782285a5..d8c3f294cb 100644 --- a/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss +++ b/collects/tests/web-server/web-root/servlets/tests/module-suspended-init.ss @@ -1,6 +1,6 @@ (module module-suspended-init mzscheme (provide interface-version timeout start) - (require (lib "servlet.ss" "web-server") + (require web-server/servlet (lib "servlet-sig.ss" "web-server")) (define interface-version 'v1) diff --git a/collects/tests/web-server/web-root/servlets/tests/size.ss b/collects/tests/web-server/web-root/servlets/tests/size.ss index 174feec2db..10e954febc 100644 --- a/collects/tests/web-server/web-root/servlets/tests/size.ss +++ b/collects/tests/web-server/web-root/servlets/tests/size.ss @@ -1,4 +1,4 @@ -(require (lib "unitsig.ss")) +(require mzlib/unitsig) (require (lib "servlet-sig.ss" "web-server")) (let* ([line-size 80] diff --git a/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss b/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss index 5518774a0a..4c1bd78a95 100644 --- a/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss +++ b/collects/tests/web-server/web-root/servlets/tests/suspended-module.ss @@ -1,6 +1,6 @@ (module suspended-module mzscheme (provide interface-version timeout start) - (require (lib "servlet.ss" "web-server") + (require web-server/servlet (lib "servlet-sig.ss" "web-server")) (define interface-version 'v1) diff --git a/collects/tests/web-server/web-root/servlets/tests/test.ss b/collects/tests/web-server/web-root/servlets/tests/test.ss index 63e5674d51..d2482239d9 100644 --- a/collects/tests/web-server/web-root/servlets/tests/test.ss +++ b/collects/tests/web-server/web-root/servlets/tests/test.ss @@ -1,4 +1,4 @@ -(require (lib "unitsig.ss")) +(require mzlib/unitsig) (require (lib "servlet-sig.ss" "web-server")) (let ([count 0]) (unit/sig () diff --git a/collects/tests/web-server/web-root/servlets/tests/url.ss b/collects/tests/web-server/web-root/servlets/tests/url.ss index c2de118b06..f4c03155a7 100644 --- a/collects/tests/web-server/web-root/servlets/tests/url.ss +++ b/collects/tests/web-server/web-root/servlets/tests/url.ss @@ -1,6 +1,6 @@ -(require (lib "unitsig.ss") +(require mzlib/unitsig (lib "servlet-sig.ss" "web-server") - (lib "url.ss" "net")) + net/url) (let ([count 0]) (unit/sig () (import servlet^) diff --git a/collects/tex2page/start.ss b/collects/tex2page/start.ss index d00167cb7b..ec897c5767 100644 --- a/collects/tex2page/start.ss +++ b/collects/tex2page/start.ss @@ -1,6 +1,6 @@ (module start mzscheme (require "tex2page.ss" - (lib "cmdline.ss")) + mzlib/cmdline) (command-line "tex2page" diff --git a/collects/tex2page/tex2page-aux.ss b/collects/tex2page/tex2page-aux.ss index c3af75d08c..10452869e3 100644 --- a/collects/tex2page/tex2page-aux.ss +++ b/collects/tex2page/tex2page-aux.ss @@ -2,8 +2,8 @@ ;(c) Dorai Sitaram, 1997-2002 (module tex2page-aux mzscheme - (require (lib "process.ss")) - (require (lib "date.ss")) + (require mzlib/process) + (require mzlib/date) (provide (all-defined-except )) (define make-table diff --git a/collects/tex2page/tex2page.ss b/collects/tex2page/tex2page.ss index af8c796202..f17051a792 100644 --- a/collects/tex2page/tex2page.ss +++ b/collects/tex2page/tex2page.ss @@ -1,5 +1,5 @@ (module tex2page mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (provide tex2page) (define tex2page diff --git a/collects/texpict/balloon.ss b/collects/texpict/balloon.ss index aaf8b55dc0..d099f4b7f3 100644 --- a/collects/texpict/balloon.ss +++ b/collects/texpict/balloon.ss @@ -1,10 +1,10 @@ (module balloon mzscheme (require "mrpict.ss" "utils.ss" - (lib "mred.ss" "mred") - (lib "class.ss") - (lib "etc.ss") - (lib "math.ss")) + mred + mzlib/class + mzlib/etc + mzlib/math) (provide wrap-balloon pip-wrap-balloon place-balloon diff --git a/collects/texpict/code.ss b/collects/texpict/code.ss index 287d3e8300..32b3cd94e3 100644 --- a/collects/texpict/code.ss +++ b/collects/texpict/code.ss @@ -1,9 +1,9 @@ (module code mzscheme (require "mrpict.ss" - (lib "class.ss") - (lib "list.ss") - (lib "mred.ss" "mred") - (lib "unit.ss")) + mzlib/class + mzlib/list + mred + mzlib/unit) (provide define-code code^ code-params^ code@) diff --git a/collects/texpict/doc.txt b/collects/texpict/doc.txt index c5e89edca5..2c3f38f7c8 100644 --- a/collects/texpict/doc.txt +++ b/collects/texpict/doc.txt @@ -81,7 +81,7 @@ and a bitmap-dc% will work fine for bitmap-dc% or canvas% output. The `draw-pict' function takes a picture, a device context ;; Example of producing PostScript output - (require (lib "mrpict.ss" "texpict")) + (require texpict/mrpict) ;; Create PS context (define ps-dc (make-object post-script-dc%)) @@ -944,7 +944,7 @@ _slideshow-run.ss_ and _slideshow.ss_ ------------------------------------------------------------ The "slideshow-run.ss" and "slideshow.ss" modules simply re-export -`(lib "run.ss" "slideshow")' and `(lib "slideshow.ss" "slideshow")' +`slideshow/run' and `slideshow/slideshow' for backward compatibility. See the "slideshow" collection for more details. diff --git a/collects/texpict/face-demo.ss b/collects/texpict/face-demo.ss index 4e7d5017e7..e1e9adca1b 100644 --- a/collects/texpict/face-demo.ss +++ b/collects/texpict/face-demo.ss @@ -1,8 +1,8 @@ (module face-demo mzscheme - (require (lib "mred.ss" "mred") - (lib "class.ss") - (lib "utils.ss" "texpict") - (lib "mrpict.ss" "texpict") + (require mred + mzlib/class + texpict/utils + texpict/mrpict "face.ss") (define f (new frame% (label "frame"))) diff --git a/collects/texpict/face.ss b/collects/texpict/face.ss index 3d9206b39c..8ece5b64e5 100644 --- a/collects/texpict/face.ss +++ b/collects/texpict/face.ss @@ -1,11 +1,11 @@ (module face mzscheme - (require (lib "mred.ss" "mred") - (lib "mrpict.ss" "texpict") - (lib "utils.ss" "texpict") - (lib "class.ss") - (lib "math.ss") - (lib "etc.ss") - (lib "kw.ss")) + (require mred + texpict/mrpict + texpict/utils + mzlib/class + mzlib/math + mzlib/etc + mzlib/kw) (provide face face* default-face-color) diff --git a/collects/texpict/flash.ss b/collects/texpict/flash.ss index c5ee4b2814..d86771d678 100644 --- a/collects/texpict/flash.ss +++ b/collects/texpict/flash.ss @@ -1,10 +1,10 @@ (module flash mzscheme (require "mrpict.ss" - (lib "math.ss") - (lib "etc.ss") - (lib "mred.ss" "mred") - (lib "class.ss")) + mzlib/math + mzlib/etc + mred + mzlib/class) (provide filled-flash outline-flash) diff --git a/collects/texpict/mrpict-sig.ss b/collects/texpict/mrpict-sig.ss index cef448b74f..8684d95074 100644 --- a/collects/texpict/mrpict-sig.ss +++ b/collects/texpict/mrpict-sig.ss @@ -1,6 +1,6 @@ (module mrpict-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "private/common-sig.ss") (require "private/mrpict-sig.ss") diff --git a/collects/texpict/mrpict-unit.ss b/collects/texpict/mrpict-unit.ss index 331efdddca..0c254e90b1 100644 --- a/collects/texpict/mrpict-unit.ss +++ b/collects/texpict/mrpict-unit.ss @@ -1,6 +1,6 @@ (module mrpict-unit mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require (lib "mred-sig.ss" "mred")) diff --git a/collects/texpict/mrpict.ss b/collects/texpict/mrpict.ss index 3cc40e0b64..4eb84a0669 100644 --- a/collects/texpict/mrpict.ss +++ b/collects/texpict/mrpict.ss @@ -1,9 +1,9 @@ (module mrpict mzscheme - (require (lib "unit.ss") - (lib "contract.ss") - (lib "class.ss") - (lib "mred.ss" "mred")) + (require mzlib/unit + mzlib/contract + mzlib/class + mred) (require (lib "mred-sig.ss" "mred") (lib "mred-unit.ss" "mred")) diff --git a/collects/texpict/pict-value-snip.ss b/collects/texpict/pict-value-snip.ss index 5cbe612171..fe394edea4 100644 --- a/collects/texpict/pict-value-snip.ss +++ b/collects/texpict/pict-value-snip.ss @@ -10,12 +10,12 @@ the user has to move the mouse first. |# (module pict-value-snip mzscheme - (require (lib "mrpict.ss" "texpict") - (lib "utils.ss" "texpict") - (lib "class.ss") - (lib "mred.ss" "mred") - (lib "etc.ss") - (lib "list.ss")) + (require texpict/mrpict + texpict/utils + mzlib/class + mred + mzlib/etc + mzlib/list) (provide pict-value-snip%) diff --git a/collects/texpict/private/common-unit.ss b/collects/texpict/private/common-unit.ss index 2b9aac8713..f0ef465281 100644 --- a/collects/texpict/private/common-unit.ss +++ b/collects/texpict/private/common-unit.ss @@ -1,7 +1,7 @@ #lang scheme/unit - (require (lib "etc.ss")) + (require mzlib/etc) (require "common-sig.ss") diff --git a/collects/texpict/private/mrpict-extra.ss b/collects/texpict/private/mrpict-extra.ss index 2a88996f5a..f11586833c 100644 --- a/collects/texpict/private/mrpict-extra.ss +++ b/collects/texpict/private/mrpict-extra.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "class.ss") - (lib "etc.ss")) + (require mzlib/class + mzlib/etc) (require (lib "mred-sig.ss" "mred")) diff --git a/collects/texpict/private/mrpict-sig.ss b/collects/texpict/private/mrpict-sig.ss index 851211200d..7daa65d884 100644 --- a/collects/texpict/private/mrpict-sig.ss +++ b/collects/texpict/private/mrpict-sig.ss @@ -1,6 +1,6 @@ (module mrpict-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide mrpict-extra^) (define-signature mrpict-extra^ diff --git a/collects/texpict/private/texpict-extra.ss b/collects/texpict/private/texpict-extra.ss index ecad2484c2..5555d0e4df 100644 --- a/collects/texpict/private/texpict-extra.ss +++ b/collects/texpict/private/texpict-extra.ss @@ -1,8 +1,8 @@ #lang scheme/unit - (require (lib "etc.ss") - (lib "list.ss")) + (require mzlib/etc + mzlib/list) (require "texpict-sig.ss" "common-sig.ss") diff --git a/collects/texpict/private/texpict-sig.ss b/collects/texpict/private/texpict-sig.ss index ec794bdbdc..b43f6fcf02 100644 --- a/collects/texpict/private/texpict-sig.ss +++ b/collects/texpict/private/texpict-sig.ss @@ -1,6 +1,6 @@ (module texpict-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (provide texpict-extra^) (define-signature texpict-extra^ diff --git a/collects/texpict/slideshow-run.ss b/collects/texpict/slideshow-run.ss index f55c550991..8e8acb0edd 100644 --- a/collects/texpict/slideshow-run.ss +++ b/collects/texpict/slideshow-run.ss @@ -1,6 +1,6 @@ (module slideshow-run "slideshow.ss" - (require (prefix slideshow: (lib "run.ss" "slideshow"))) + (require (prefix slideshow: slideshow/run)) (provide (all-from-except "slideshow.ss" #%module-begin) (rename slideshow:#%module-begin #%module-begin))) diff --git a/collects/texpict/slideshow.ss b/collects/texpict/slideshow.ss index 019edd695c..4db725cb82 100644 --- a/collects/texpict/slideshow.ss +++ b/collects/texpict/slideshow.ss @@ -1,3 +1,3 @@ -(module slideshow (lib "slideshow.ss" "slideshow") - (provide (all-from (lib "slideshow.ss" "slideshow")))) +(module slideshow slideshow/slideshow + (provide (all-from slideshow/slideshow))) diff --git a/collects/texpict/symbol.ss b/collects/texpict/symbol.ss index 56a6bf502a..a4baeae7e7 100644 --- a/collects/texpict/symbol.ss +++ b/collects/texpict/symbol.ss @@ -1,4 +1,4 @@ -(module symbol (lib "slideshow.ss" "slideshow") +(module symbol slideshow/slideshow (provide symbol sym:in sym:rightarrow sym:leftarrow sym:infinity sym:times diff --git a/collects/texpict/texpict-sig.ss b/collects/texpict/texpict-sig.ss index 3c167f0aa3..4b25386521 100644 --- a/collects/texpict/texpict-sig.ss +++ b/collects/texpict/texpict-sig.ss @@ -1,6 +1,6 @@ (module texpict-sig mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "private/common-sig.ss") (require "private/texpict-sig.ss") diff --git a/collects/texpict/texpict-unit.ss b/collects/texpict/texpict-unit.ss index 4011711d09..72e6f670f5 100644 --- a/collects/texpict/texpict-unit.ss +++ b/collects/texpict/texpict-unit.ss @@ -1,6 +1,6 @@ (module texpict-unit mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "private/texpict-sig.ss" "private/common-sig.ss" diff --git a/collects/texpict/texpict.ss b/collects/texpict/texpict.ss index 675401d1d7..24a5827985 100644 --- a/collects/texpict/texpict.ss +++ b/collects/texpict/texpict.ss @@ -1,6 +1,6 @@ (module texpict mzscheme - (require (lib "unit.ss")) + (require mzlib/unit) (require "texpict-sig.ss" "texpict-unit.ss") diff --git a/collects/texpict/utils.ss b/collects/texpict/utils.ss index aad28cec33..213147ce06 100644 --- a/collects/texpict/utils.ss +++ b/collects/texpict/utils.ss @@ -1,10 +1,10 @@ (module utils mzscheme - (require (lib "class.ss") - (lib "math.ss") - (lib "etc.ss") - (lib "contract.ss") - (lib "mred.ss" "mred")) + (require mzlib/class + mzlib/math + mzlib/etc + mzlib/contract + mred) (require "mrpict.ss") diff --git a/collects/trace/calltrace-lib.ss b/collects/trace/calltrace-lib.ss index c5c8dd7796..c3299b8c30 100644 --- a/collects/trace/calltrace-lib.ss +++ b/collects/trace/calltrace-lib.ss @@ -4,9 +4,9 @@ (module calltrace-lib mzscheme (require "stacktrace.ss" - (lib "list.ss") - (lib "etc.ss") - (lib "unit.ss")) + mzlib/list + mzlib/etc + mzlib/unit) diff --git a/collects/trace/stacktrace.ss b/collects/trace/stacktrace.ss index fbb4c8c932..33558c9e09 100644 --- a/collects/trace/stacktrace.ss +++ b/collects/trace/stacktrace.ss @@ -1,8 +1,8 @@ (module stacktrace scheme/base - (require (lib "unit.ss") - (lib "kerncase.ss" "syntax") - (lib "stx.ss" "syntax")) + (require mzlib/unit + syntax/kerncase + syntax/stx) (provide stacktrace@ stacktrace^ stacktrace-imports^) diff --git a/collects/version/check.ss b/collects/version/check.ss index 55d089e76e..4ada621ee2 100644 --- a/collects/version/check.ss +++ b/collects/version/check.ss @@ -5,7 +5,7 @@ ;; This file is invoked from the installer, without using zo files -- so ;; using net/url.ss is extremely slow. Instead, do things directly. - ;; (require (lib "url.ss" "net")) + ;; (require net/url) ;; (define (url->port url) ;; (get-pure-port (string->url url))) (define (url->port url) diff --git a/collects/version/tool.ss b/collects/version/tool.ss index 2bacc53659..d69e69d270 100644 --- a/collects/version/tool.ss +++ b/collects/version/tool.ss @@ -1,13 +1,13 @@ (module tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "unit.ss") - (lib "framework.ss" "framework") - (lib "mred.ss" "mred") - (lib "class.ss") + mzlib/unit + framework + mred + mzlib/class "patchlevel.ss" "check.ss" (lib "external.ss" "browser") - (lib "string-constant.ss" "string-constants")) + string-constants) (define download-url "http://download.plt-scheme.org/") diff --git a/collects/waterworld/waterworld.ss b/collects/waterworld/waterworld.ss index 9f9ecb9880..28fd126a99 100644 --- a/collects/waterworld/waterworld.ss +++ b/collects/waterworld/waterworld.ss @@ -1,9 +1,9 @@ (module waterworld mzscheme - (require (lib "class.ss")) - (require (lib "file.ss")) - (require (lib "list.ss")) - (require (lib "etc.ss")) - (require (lib "mred.ss" "mred")) + (require mzlib/class) + (require mzlib/file) + (require mzlib/list) + (require mzlib/etc) + (require mred) (require (lib "external.ss" "browser")) (define *progname* "WaterWorld") diff --git a/collects/web-server/bench/bench.ss b/collects/web-server/bench/bench.ss index d8d1a0a0f0..c342d179e7 100644 --- a/collects/web-server/bench/bench.ss +++ b/collects/web-server/bench/bench.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require #;(lib "file.ss") - (lib "list.ss") - (lib "process.ss") +(require #;mzlib/file + mzlib/list + mzlib/process (lib "web-server.ss" "web-server") (prefix-in files: (lib "dispatch-files.ss" "web-server" "dispatchers")) (planet "csv.ss" ("neil" "csv.plt" 1 1))) diff --git a/collects/web-server/configuration/configuration-table-structs.ss b/collects/web-server/configuration/configuration-table-structs.ss index 2a3a21c18f..cacc153f3b 100644 --- a/collects/web-server/configuration/configuration-table-structs.ss +++ b/collects/web-server/configuration/configuration-table-structs.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "url.ss" "net")) +(require mzlib/contract + net/url) (require "../private/response-structs.ss" "../private/request-structs.ss" "../private/util.ss") diff --git a/collects/web-server/configuration/configuration-table.ss b/collects/web-server/configuration/configuration-table.ss index 12cfd7a941..7aeb2a69fa 100644 --- a/collects/web-server/configuration/configuration-table.ss +++ b/collects/web-server/configuration/configuration-table.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "list.ss") - (lib "pretty.ss")) +(require mzlib/contract + mzlib/list + mzlib/pretty) (require "configuration-table-structs.ss" "../servlet/bindings.ss") (provide/contract diff --git a/collects/web-server/configuration/namespace.ss b/collects/web-server/configuration/namespace.ss index 4593e3cb21..36de040104 100644 --- a/collects/web-server/configuration/namespace.ss +++ b/collects/web-server/configuration/namespace.ss @@ -1,10 +1,8 @@ #lang scheme/base -(require (lib "list.ss") +(require mzlib/list scheme/contract) -(define default-to-be-copied-module-specs - '(mzscheme - (lib "mred.ss" "mred"))) +(define default-to-be-copied-module-specs '(mzscheme mred)) (define (make-make-servlet-namespace #:to-be-copied-module-specs [to-be-copied-module-specs empty]) diff --git a/collects/web-server/configuration/responders.ss b/collects/web-server/configuration/responders.ss index bc6b3c9195..9f022601ea 100644 --- a/collects/web-server/configuration/responders.ss +++ b/collects/web-server/configuration/responders.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "list.ss") - (lib "url.ss" "net")) +(require mzlib/contract + mzlib/list + net/url) (require "../private/response-structs.ss" "../private/request-structs.ss") diff --git a/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss b/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss index 2e968a0ab6..f83dfc144a 100644 --- a/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss +++ b/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/add.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server")) +(require web-server/servlet) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/count.ss b/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/count.ss index 1860a6dd4b..a9e4e06733 100644 --- a/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/count.ss +++ b/collects/web-server/default-web-root/htdocs/Defaults/documentation/examples/count.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "date.ss")) +(require mzlib/date) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss b/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss index 1bb595266f..7c6db3c37e 100644 --- a/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss +++ b/collects/web-server/default-web-root/htdocs/lang-servlets/add01.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (lib "request-structs.ss" "web-server" "private") - (lib "url.ss" "net")) + net/url) (provide start) (define (start req) diff --git a/collects/web-server/default-web-root/htdocs/lang-servlets/quiz-lib.ss b/collects/web-server/default-web-root/htdocs/lang-servlets/quiz-lib.ss index 35d18c5a6d..6782a8795d 100644 --- a/collects/web-server/default-web-root/htdocs/lang-servlets/quiz-lib.ss +++ b/collects/web-server/default-web-root/htdocs/lang-servlets/quiz-lib.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "serialize.ss") - (lib "url.ss" "net")) +(require mzlib/serialize + net/url) (provide (struct-out mc-question) make-cue-page quiz) diff --git a/collects/web-server/default-web-root/servlets/configure.ss b/collects/web-server/default-web-root/servlets/configure.ss index 8ab0bd7676..fb1e073baf 100644 --- a/collects/web-server/default-web-root/servlets/configure.ss +++ b/collects/web-server/default-web-root/servlets/configure.ss @@ -3,5 +3,5 @@ ; The servlet accepts requests only from the *same machine* as the Web server ; for security purposes. #lang scheme/base -(require (lib "configure.ss" "web-server" "private")) -(provide (all-from-out (lib "configure.ss" "web-server" "private"))) \ No newline at end of file +(require web-server/private/configure) +(provide (all-from-out web-server/private/configure)) \ No newline at end of file diff --git a/collects/web-server/default-web-root/servlets/examples/add-ssd.ss b/collects/web-server/default-web-root/servlets/examples/add-ssd.ss index 662c627523..7214929179 100644 --- a/collects/web-server/default-web-root/servlets/examples/add-ssd.ss +++ b/collects/web-server/default-web-root/servlets/examples/add-ssd.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server")) +(require web-server/servlet) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/servlets/examples/add-v2.ss b/collects/web-server/default-web-root/servlets/examples/add-v2.ss index 73f6833e39..8f53cdb427 100644 --- a/collects/web-server/default-web-root/servlets/examples/add-v2.ss +++ b/collects/web-server/default-web-root/servlets/examples/add-v2.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server") +(require web-server/servlet (lib "timeouts.ss" "web-server" "managers")) (provide (all-defined-out)) (define interface-version 'v2) diff --git a/collects/web-server/default-web-root/servlets/examples/add.ss b/collects/web-server/default-web-root/servlets/examples/add.ss index a3570a98f4..6c5493e568 100644 --- a/collects/web-server/default-web-root/servlets/examples/add.ss +++ b/collects/web-server/default-web-root/servlets/examples/add.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server")) +(require web-server/servlet) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/servlets/examples/adjust.ss b/collects/web-server/default-web-root/servlets/examples/adjust.ss index 480a7dfe17..f3713b8f67 100644 --- a/collects/web-server/default-web-root/servlets/examples/adjust.ss +++ b/collects/web-server/default-web-root/servlets/examples/adjust.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server")) +(require web-server/servlet) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/servlets/examples/clear.ss b/collects/web-server/default-web-root/servlets/examples/clear.ss index 59edc6300a..e77eadf147 100644 --- a/collects/web-server/default-web-root/servlets/examples/clear.ss +++ b/collects/web-server/default-web-root/servlets/examples/clear.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server")) +(require web-server/servlet) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/servlets/examples/count.ss b/collects/web-server/default-web-root/servlets/examples/count.ss index b30f97fabc..860184f337 100644 --- a/collects/web-server/default-web-root/servlets/examples/count.ss +++ b/collects/web-server/default-web-root/servlets/examples/count.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "date.ss")) +(require mzlib/date) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/servlets/examples/cut.ss b/collects/web-server/default-web-root/servlets/examples/cut.ss index 29bd3fef0e..5f23a139bf 100644 --- a/collects/web-server/default-web-root/servlets/examples/cut.ss +++ b/collects/web-server/default-web-root/servlets/examples/cut.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server")) +(require web-server/servlet) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/servlets/examples/dir.ss b/collects/web-server/default-web-root/servlets/examples/dir.ss index 0a2cbadfb2..c936b3c8dd 100644 --- a/collects/web-server/default-web-root/servlets/examples/dir.ss +++ b/collects/web-server/default-web-root/servlets/examples/dir.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server")) +(require web-server/servlet) (provide (all-defined-out)) (define interface-version 'v1) (define timeout +inf.0) diff --git a/collects/web-server/default-web-root/servlets/examples/quiz.ss b/collects/web-server/default-web-root/servlets/examples/quiz.ss index e691ba0682..46eae574e3 100644 --- a/collects/web-server/default-web-root/servlets/examples/quiz.ss +++ b/collects/web-server/default-web-root/servlets/examples/quiz.ss @@ -18,9 +18,9 @@ "default-web-root" "servlets" "examples" "english-measure-questions.ss")) (define *questions-per-quiz* 5) -(require (lib "servlet.ss" "web-server") - (lib "list.ss") - (lib "etc.ss")) +(require web-server/servlet + mzlib/list + mzlib/etc) (provide (all-defined-out)) (define interface-version 'v1) diff --git a/collects/web-server/dispatchers/dispatch-files.ss b/collects/web-server/dispatchers/dispatch-files.ss index 86df0044d3..2284c8248d 100644 --- a/collects/web-server/dispatchers/dispatch-files.ss +++ b/collects/web-server/dispatchers/dispatch-files.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "url.ss" "net") - (lib "plt-match.ss") - (lib "pregexp.ss") +(require net/url + mzlib/plt-match + mzlib/pregexp scheme/contract) (require "dispatch.ss" diff --git a/collects/web-server/dispatchers/dispatch-filter.ss b/collects/web-server/dispatchers/dispatch-filter.ss index 657f7de0e2..e573be5861 100644 --- a/collects/web-server/dispatchers/dispatch-filter.ss +++ b/collects/web-server/dispatchers/dispatch-filter.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "url.ss" "net")) +(require mzlib/contract + net/url) (require "dispatch.ss" "../private/request-structs.ss" "../private/util.ss") diff --git a/collects/web-server/dispatchers/dispatch-host.ss b/collects/web-server/dispatchers/dispatch-host.ss index b54fd36f21..4bb1029ebc 100644 --- a/collects/web-server/dispatchers/dispatch-host.ss +++ b/collects/web-server/dispatchers/dispatch-host.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "plt-match.ss") - (lib "url.ss" "net") +(require mzlib/contract + mzlib/plt-match + net/url "../private/request-structs.ss" "../private/util.ss" "dispatch.ss") diff --git a/collects/web-server/dispatchers/dispatch-lang.ss b/collects/web-server/dispatchers/dispatch-lang.ss index 3ef8ebf6e1..56bcd6663d 100644 --- a/collects/web-server/dispatchers/dispatch-lang.ss +++ b/collects/web-server/dispatchers/dispatch-lang.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "list.ss") +(require mzlib/list scheme/contract (lib "session.ss" "web-server" "private") (only-in "../lang/web.ss" @@ -8,7 +8,7 @@ "../private/request-structs.ss" "../private/response-structs.ss" "dispatch.ss" - (lib "url.ss" "net") + net/url "../private/web-server-structs.ss" "../private/util.ss" "../private/response.ss" diff --git a/collects/web-server/dispatchers/dispatch-lift.ss b/collects/web-server/dispatchers/dispatch-lift.ss index 73a2c224b8..0e5322b2ce 100644 --- a/collects/web-server/dispatchers/dispatch-lift.ss +++ b/collects/web-server/dispatchers/dispatch-lift.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "dispatch.ss" "../private/response.ss" "../private/request-structs.ss" diff --git a/collects/web-server/dispatchers/dispatch-log.ss b/collects/web-server/dispatchers/dispatch-log.ss index 7cbee83116..bd4e4e0ca4 100644 --- a/collects/web-server/dispatchers/dispatch-log.ss +++ b/collects/web-server/dispatchers/dispatch-log.ss @@ -1,9 +1,9 @@ #lang scheme/base -(require (lib "url.ss" "net") - (prefix-in srfi-date: (lib "19.ss" "srfi")) - (lib "date.ss") - (lib "async-channel.ss") - (lib "plt-match.ss") +(require net/url + (prefix-in srfi-date: srfi/19) + mzlib/date + mzlib/async-channel + mzlib/plt-match scheme/contract) (require "dispatch.ss" "../private/request-structs.ss") diff --git a/collects/web-server/dispatchers/dispatch-passwords.ss b/collects/web-server/dispatchers/dispatch-passwords.ss index 89e7785793..fbb2f4a0d3 100644 --- a/collects/web-server/dispatchers/dispatch-passwords.ss +++ b/collects/web-server/dispatchers/dispatch-passwords.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "list.ss") - (lib "url.ss" "net") +(require mzlib/list + net/url scheme/contract) (require "dispatch.ss" "../private/util.ss" diff --git a/collects/web-server/dispatchers/dispatch-pathprocedure.ss b/collects/web-server/dispatchers/dispatch-pathprocedure.ss index d555c34010..38a21f4575 100644 --- a/collects/web-server/dispatchers/dispatch-pathprocedure.ss +++ b/collects/web-server/dispatchers/dispatch-pathprocedure.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "url.ss" "net")) +(require mzlib/contract + net/url) (require "dispatch.ss" "../private/util.ss" "../private/response.ss" diff --git a/collects/web-server/dispatchers/dispatch-sequencer.ss b/collects/web-server/dispatchers/dispatch-sequencer.ss index a612db43e5..96a6036e00 100644 --- a/collects/web-server/dispatchers/dispatch-sequencer.ss +++ b/collects/web-server/dispatchers/dispatch-sequencer.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "list.ss") - (lib "contract.ss")) +(require mzlib/list + mzlib/contract) (require "dispatch.ss") (provide/contract [interface-version dispatcher-interface-version?]) diff --git a/collects/web-server/dispatchers/dispatch-servlets.ss b/collects/web-server/dispatchers/dispatch-servlets.ss index ca8c15fecd..36a5199e23 100644 --- a/collects/web-server/dispatchers/dispatch-servlets.ss +++ b/collects/web-server/dispatchers/dispatch-servlets.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "plt-match.ss") +(require mzlib/plt-match scheme/contract) (require "dispatch.ss" "../private/web-server-structs.ss" @@ -9,7 +9,7 @@ "../private/response-structs.ss" "../servlet/web-cells.ss" "../servlet/web.ss" - (lib "url.ss" "net") + net/url "../dispatchers/filesystem-map.ss" "../configuration/responders.ss" "../configuration/namespace.ss" @@ -158,7 +158,7 @@ (define (load-servlet/path a-path) (parameterize ([current-namespace (make-servlet-namespace #:additional-specs - '((lib "servlet.ss" "web-server") + '(web-server/servlet (lib "servlet.ss" "web-server" "private") (lib "web.ss" "web-server" "servlet") (lib "web-cells.ss" "web-server" "servlet")))] diff --git a/collects/web-server/dispatchers/dispatch-stat.ss b/collects/web-server/dispatchers/dispatch-stat.ss index 4727a036d1..a119edd85e 100644 --- a/collects/web-server/dispatchers/dispatch-stat.ss +++ b/collects/web-server/dispatchers/dispatch-stat.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "dispatch.ss" "../private/web-server-structs.ss" "../private/connection-manager.ss") diff --git a/collects/web-server/dispatchers/dispatch-timeout.ss b/collects/web-server/dispatchers/dispatch-timeout.ss index b4ab108d1c..6cdbe9cf88 100644 --- a/collects/web-server/dispatchers/dispatch-timeout.ss +++ b/collects/web-server/dispatchers/dispatch-timeout.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "dispatch.ss" "../private/connection-manager.ss") (provide/contract diff --git a/collects/web-server/dispatchers/dispatch.ss b/collects/web-server/dispatchers/dispatch.ss index 79913593f2..628b3c721c 100644 --- a/collects/web-server/dispatchers/dispatch.ss +++ b/collects/web-server/dispatchers/dispatch.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "../private/connection-manager.ss" "../private/request-structs.ss") diff --git a/collects/web-server/dispatchers/filesystem-map.ss b/collects/web-server/dispatchers/filesystem-map.ss index c4cf580fbb..f6f7523bd3 100644 --- a/collects/web-server/dispatchers/filesystem-map.ss +++ b/collects/web-server/dispatchers/filesystem-map.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "url.ss" "net") - (lib "list.ss") - (lib "contract.ss")) +(require net/url + mzlib/list + mzlib/contract) (require "../private/util.ss") (define url-path? ((url?) . ->* . (path? (listof path-element?)))) diff --git a/collects/web-server/gui.ss b/collects/web-server/gui.ss index 79632430be..bf1e8dea26 100644 --- a/collects/web-server/gui.ss +++ b/collects/web-server/gui.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "class.ss") - (lib "mred.ss" "mred")) +(require mzlib/class + mred) (require "private/launch.ss") (define shutdown (serve)) diff --git a/collects/web-server/lang.ss b/collects/web-server/lang.ss index 049d1b1ff9..cf914819b9 100644 --- a/collects/web-server/lang.ss +++ b/collects/web-server/lang.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (for-syntax scheme/base) - (for-syntax (lib "etc.ss")) - (for-syntax (lib "list.ss")) + (for-syntax mzlib/etc) + (for-syntax mzlib/list) (for-syntax "lang/labels.ss") (for-syntax "lang/util.ss") (for-syntax "lang/elim-letrec.ss") diff --git a/collects/web-server/lang/abort-resume.ss b/collects/web-server/lang/abort-resume.ss index 6af79283ce..c6a03311ea 100644 --- a/collects/web-server/lang/abort-resume.ss +++ b/collects/web-server/lang/abort-resume.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "list.ss") - (lib "plt-match.ss") - (lib "serialize.ss") +(require mzlib/list + mzlib/plt-match + mzlib/serialize "../private/define-closure.ss" "../lang/web-cells.ss") (provide diff --git a/collects/web-server/lang/anormal.ss b/collects/web-server/lang/anormal.ss index 2a65c03302..1f9fd1cb1b 100644 --- a/collects/web-server/lang/anormal.ss +++ b/collects/web-server/lang/anormal.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (for-template scheme/base) - (lib "kerncase.ss" "syntax") - (lib "list.ss") - (lib "plt-match.ss") + syntax/kerncase + mzlib/list + mzlib/plt-match "util.ss") (provide make-anormal-term) diff --git a/collects/web-server/lang/defun.ss b/collects/web-server/lang/defun.ss index 0a50360283..c6717c8d73 100644 --- a/collects/web-server/lang/defun.ss +++ b/collects/web-server/lang/defun.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (for-template scheme/base) - (lib "kerncase.ss" "syntax") - (lib "list.ss") - (lib "plt-match.ss") + syntax/kerncase + mzlib/list + mzlib/plt-match "util.ss" "freevars.ss" "../private/closure.ss") diff --git a/collects/web-server/lang/elim-callcc.ss b/collects/web-server/lang/elim-callcc.ss index 8541f35826..4c96d1e5c7 100644 --- a/collects/web-server/lang/elim-callcc.ss +++ b/collects/web-server/lang/elim-callcc.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (for-template scheme/base) - (lib "kerncase.ss" "syntax") + syntax/kerncase "../lang/abort-resume.ss" (for-template "../lang/abort-resume.ss") "util.ss") diff --git a/collects/web-server/lang/elim-letrec.ss b/collects/web-server/lang/elim-letrec.ss index fd3a3f7c5f..bc0c7d24a7 100644 --- a/collects/web-server/lang/elim-letrec.ss +++ b/collects/web-server/lang/elim-letrec.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (for-template scheme/base) - (lib "kerncase.ss" "syntax") - (lib "etc.ss") - (lib "list.ss") + syntax/kerncase + mzlib/etc + mzlib/list (for-template "../lang/abort-resume.ss") "util.ss") (provide (all-defined-out)) diff --git a/collects/web-server/lang/file-box.ss b/collects/web-server/lang/file-box.ss index 7fe93bc3b7..474512674d 100644 --- a/collects/web-server/lang/file-box.ss +++ b/collects/web-server/lang/file-box.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "serialize.ss") - (lib "contract.ss")) +(require mzlib/serialize + mzlib/contract) (define-serializable-struct internal-file-box (path)) (define file-box? internal-file-box?) diff --git a/collects/web-server/lang/freevars.ss b/collects/web-server/lang/freevars.ss index 44562172c5..0897b3ffe5 100644 --- a/collects/web-server/lang/freevars.ss +++ b/collects/web-server/lang/freevars.ss @@ -1,10 +1,10 @@ #lang scheme/base (require (for-template scheme/base) - (lib "kerncase.ss" "syntax") - (lib "list.ss") - (lib "toplevel.ss" "syntax") - (lib "plt-match.ss") - (lib "stx.ss" "syntax") + syntax/kerncase + mzlib/list + syntax/toplevel + mzlib/plt-match + syntax/stx "util.ss") (provide free-vars) diff --git a/collects/web-server/lang/labels.ss b/collects/web-server/lang/labels.ss index 79c6bca0be..d782081968 100644 --- a/collects/web-server/lang/labels.ss +++ b/collects/web-server/lang/labels.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "md5.ss")) +(require mzlib/md5) (provide make-labeling) ;; REQUIREMENT: The label code must be non-numeric. diff --git a/collects/web-server/lang/lang-api.ss b/collects/web-server/lang/lang-api.ss index e55aa1335b..d1cdfc86e5 100644 --- a/collects/web-server/lang/lang-api.ss +++ b/collects/web-server/lang/lang-api.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "url.ss" "net") +(require net/url "../private/request-structs.ss" "../private/response-structs.ss" "../servlet/helpers.ss" @@ -10,7 +10,7 @@ "file-box.ss" "web-extras.ss") (provide (except-out (all-from-out scheme/base) #%module-begin) - (all-from-out (lib "url.ss" "net")) + (all-from-out net/url) (all-from-out "../private/request-structs.ss") (all-from-out "../private/response-structs.ss") (all-from-out "../servlet/helpers.ss") diff --git a/collects/web-server/lang/stuff-url.ss b/collects/web-server/lang/stuff-url.ss index 288a75dc82..107206b104 100644 --- a/collects/web-server/lang/stuff-url.ss +++ b/collects/web-server/lang/stuff-url.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "url.ss" "net") - (lib "serialize.ss") +(require mzlib/contract + net/url + mzlib/serialize "../private/util.ss" "../private/url-param.ss" "../private/mod-map.ss") @@ -16,7 +16,7 @@ [unstuff-url (url? . -> . serializable?)]) ; XXX Abstract this -(require (lib "md5.ss")) +(require mzlib/md5) (define (md5-store str) (define hash (md5 (string->bytes/utf-8 str))) (with-output-to-file diff --git a/collects/web-server/lang/util.ss b/collects/web-server/lang/util.ss index 0cf03dbaea..561c0d5469 100644 --- a/collects/web-server/lang/util.ss +++ b/collects/web-server/lang/util.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (for-template scheme/base) - (lib "kerncase.ss" "syntax") - (lib "pretty.ss") - (lib "list.ss")) + syntax/kerncase + mzlib/pretty + mzlib/list) (provide (except-out (all-defined-out) template)) (define transformer? (make-parameter #f)) diff --git a/collects/web-server/lang/web-cells.ss b/collects/web-server/lang/web-cells.ss index bb7539bd06..335416cbcf 100644 --- a/collects/web-server/lang/web-cells.ss +++ b/collects/web-server/lang/web-cells.ss @@ -1,8 +1,8 @@ #lang scheme/base -(require (lib "serialize.ss") - (lib "list.ss") - (lib "plt-match.ss") - (lib "contract.ss") +(require mzlib/serialize + mzlib/list + mzlib/plt-match + mzlib/contract "../private/closure.ss") ;; Implementation: Have a distinguished frame variable that is read and captured by send/suspend, ;; installed on invocations of continuations by the server (and NOT from other continuation invocations) diff --git a/collects/web-server/lang/web-extras.ss b/collects/web-server/lang/web-extras.ss index c08ef5829d..43ba94db98 100644 --- a/collects/web-server/lang/web-extras.ss +++ b/collects/web-server/lang/web-extras.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "url.ss" "net") +(require net/url (for-template "web.ss") "web.ss" "../servlet/helpers.ss") diff --git a/collects/web-server/lang/web-param.ss b/collects/web-server/lang/web-param.ss index 6ff9acbc7d..5e24251933 100644 --- a/collects/web-server/lang/web-param.ss +++ b/collects/web-server/lang/web-param.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (for-syntax scheme/base) "../private/closure.ss" - (lib "list.ss")) + mzlib/list) ; XXX Add contract (provide make-web-parameter diff --git a/collects/web-server/lang/web.ss b/collects/web-server/lang/web.ss index 8e7e2a0445..1f75f948af 100644 --- a/collects/web-server/lang/web.ss +++ b/collects/web-server/lang/web.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "serialize.ss") - (lib "plt-match.ss") - (lib "url.ss" "net") +(require mzlib/serialize + mzlib/plt-match + net/url "../private/request-structs.ss" "abort-resume.ss" "../private/session.ss" diff --git a/collects/web-server/managers/lru.ss b/collects/web-server/managers/lru.ss index 1a99b9e6d3..12334e0843 100644 --- a/collects/web-server/managers/lru.ss +++ b/collects/web-server/managers/lru.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "plt-match.ss") - (lib "contract.ss")) +(require mzlib/plt-match + mzlib/contract) (require "manager.ss" "../servlet/servlet-structs.ss") (provide/contract diff --git a/collects/web-server/managers/manager.ss b/collects/web-server/managers/manager.ss index 3737fba182..be9ca060e6 100644 --- a/collects/web-server/managers/manager.ss +++ b/collects/web-server/managers/manager.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "../servlet/servlet-structs.ss") (define-struct manager (create-instance diff --git a/collects/web-server/managers/none.ss b/collects/web-server/managers/none.ss index 5b6312f8c0..a2c0d54040 100644 --- a/collects/web-server/managers/none.ss +++ b/collects/web-server/managers/none.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "manager.ss") (require "../servlet/servlet-structs.ss") (provide/contract diff --git a/collects/web-server/managers/timeouts.ss b/collects/web-server/managers/timeouts.ss index df6660a778..70ed479580 100644 --- a/collects/web-server/managers/timeouts.ss +++ b/collects/web-server/managers/timeouts.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "plt-match.ss") - (lib "contract.ss")) +(require mzlib/plt-match + mzlib/contract) (require "manager.ss") (require "../private/timer.ss" "../servlet/servlet-structs.ss") diff --git a/collects/web-server/private/cache-table.ss b/collects/web-server/private/cache-table.ss index e80b4bc031..11ac48cfb0 100644 --- a/collects/web-server/private/cache-table.ss +++ b/collects/web-server/private/cache-table.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (define-struct cache-table (hash semaphore) #:mutable) diff --git a/collects/web-server/private/closure.ss b/collects/web-server/private/closure.ss index 48c33a03fa..61d95f49c9 100644 --- a/collects/web-server/private/closure.ss +++ b/collects/web-server/private/closure.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (for-template scheme/base) - (for-template (lib "serialize.ss")) - (lib "list.ss") - (lib "serialize.ss")) + (for-template mzlib/serialize) + mzlib/list + mzlib/serialize) (provide make-closure-definition-syntax closure->deserialize-name) diff --git a/collects/web-server/private/configure.ss b/collects/web-server/private/configure.ss index 471592788c..1ac88e8c81 100644 --- a/collects/web-server/private/configure.ss +++ b/collects/web-server/private/configure.ss @@ -1,13 +1,13 @@ #lang scheme/base -(require (lib "servlet.ss" "web-server") - (lib "url.ss" "net") - (lib "etc.ss") - (lib "list.ss") - (lib "pretty.ss") - (only-in (lib "file.ss") +(require web-server/servlet + net/url + mzlib/etc + mzlib/list + mzlib/pretty + (only-in mzlib/file make-directory*) (lib "configuration-table-structs.ss" "web-server" "configuration") - (lib "configuration-table.ss" "web-server" "configuration") + web-server/configuration/configuration-table (lib "util.ss" "web-server" "private")) (provide interface-version timeout diff --git a/collects/web-server/private/connection-manager.ss b/collects/web-server/private/connection-manager.ss index 6c48408d47..d23c562f5d 100644 --- a/collects/web-server/private/connection-manager.ss +++ b/collects/web-server/private/connection-manager.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss") +(require mzlib/contract "timer.ss") (define-struct connection (id timer i-port o-port custodian close?) diff --git a/collects/web-server/private/dispatch-server-sig.ss b/collects/web-server/private/dispatch-server-sig.ss index 4575410b80..6b3bd5bb01 100644 --- a/collects/web-server/private/dispatch-server-sig.ss +++ b/collects/web-server/private/dispatch-server-sig.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "unit.ss")) +(require mzlib/unit) (define-signature dispatch-server^ (serve diff --git a/collects/web-server/private/dispatch-server-unit.ss b/collects/web-server/private/dispatch-server-unit.ss index 352039cc92..eaf513df94 100644 --- a/collects/web-server/private/dispatch-server-unit.ss +++ b/collects/web-server/private/dispatch-server-unit.ss @@ -1,8 +1,8 @@ #lang scheme/unit -(require (lib "tcp-sig.ss" "net") - (lib "thread.ss") - (lib "contract.ss") - (lib "kw.ss")) +(require net/tcp-sig + mzlib/thread + mzlib/contract + mzlib/kw) (require "web-server-structs.ss" "connection-manager.ss" "dispatch-server-sig.ss") diff --git a/collects/web-server/private/launch.ss b/collects/web-server/private/launch.ss index f6b2501c62..8d8fa0dcf0 100644 --- a/collects/web-server/private/launch.ss +++ b/collects/web-server/private/launch.ss @@ -1,9 +1,9 @@ #lang scheme/base (require scheme/tcp - (lib "cmdline.ss") - (lib "pregexp.ss") - (lib "unit.ss") - (lib "tcp-sig.ss" "net")) + mzlib/cmdline + mzlib/pregexp + mzlib/unit + net/tcp-sig) (require "../configuration/configuration-table.ss" "../web-config-unit.ss" "../web-config-sig.ss" diff --git a/collects/web-server/private/mime-types.ss b/collects/web-server/private/mime-types.ss index 147a72b997..5bedb38a78 100644 --- a/collects/web-server/private/mime-types.ss +++ b/collects/web-server/private/mime-types.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "plt-match.ss") - (lib "string.ss")) +(require mzlib/contract + mzlib/plt-match + mzlib/string) (require "util.ss" "response-structs.ss") (provide/contract diff --git a/collects/web-server/private/mod-map.ss b/collects/web-server/private/mod-map.ss index 7b7065e20d..08268583ed 100644 --- a/collects/web-server/private/mod-map.ss +++ b/collects/web-server/private/mod-map.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "list.ss") - (lib "plt-match.ss")) +(require mzlib/list + mzlib/plt-match) (provide compress-serial decompress-serial) diff --git a/collects/web-server/private/request-structs.ss b/collects/web-server/private/request-structs.ss index 8baab169a2..dac7c35186 100644 --- a/collects/web-server/private/request-structs.ss +++ b/collects/web-server/private/request-structs.ss @@ -1,8 +1,8 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "serialize.ss") - (lib "plt-match.ss") - (lib "url.ss" "net")) +(require mzlib/contract + mzlib/serialize + mzlib/plt-match + net/url) (define (bytes-ci=? b0 b1) (string-ci=? (bytes->string/utf-8 b0) diff --git a/collects/web-server/private/request.ss b/collects/web-server/private/request.ss index c9b6a09694..9a8c83b6d3 100644 --- a/collects/web-server/private/request.ss +++ b/collects/web-server/private/request.ss @@ -1,9 +1,9 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "plt-match.ss") - (lib "url.ss" "net") - (lib "list.ss") - (lib "uri-codec.ss" "net")) +(require mzlib/contract + mzlib/plt-match + net/url + mzlib/list + net/uri-codec) (require "util.ss" "connection-manager.ss" "../private/request-structs.ss") diff --git a/collects/web-server/private/response-structs.ss b/collects/web-server/private/response-structs.ss index c06d291377..7009c798e0 100644 --- a/collects/web-server/private/response-structs.ss +++ b/collects/web-server/private/response-structs.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss") +(require mzlib/contract (lib "xml.ss" "xml") "request-structs.ss") diff --git a/collects/web-server/private/response.ss b/collects/web-server/private/response.ss index 590f5a7112..61f0bef946 100644 --- a/collects/web-server/private/response.ss +++ b/collects/web-server/private/response.ss @@ -1,11 +1,11 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "md5.ss") - (lib "port.ss") - (lib "list.ss") - (lib "plt-match.ss") - (only-in (lib "list.ss" "srfi" "1") fold filter-map) - (only-in (lib "string.ss" "srfi" "13") string-join) +(require mzlib/contract + mzlib/md5 + mzlib/port + mzlib/list + mzlib/plt-match + (only-in srfi/1/list fold filter-map) + (only-in srfi/13/string string-join) (lib "xml.ss" "xml") "connection-manager.ss" "../private/request-structs.ss" diff --git a/collects/web-server/private/servlet.ss b/collects/web-server/private/servlet.ss index c55579ea5d..1fc98c09bc 100644 --- a/collects/web-server/private/servlet.ss +++ b/collects/web-server/private/servlet.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "../managers/manager.ss" "../private/request-structs.ss" "../private/response-structs.ss") diff --git a/collects/web-server/private/session.ss b/collects/web-server/private/session.ss index 30eceac722..e9a802e34a 100644 --- a/collects/web-server/private/session.ss +++ b/collects/web-server/private/session.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "list.ss") - (lib "url.ss" "net") +(require mzlib/contract + mzlib/list + net/url "response-structs.ss" "request-structs.ss") diff --git a/collects/web-server/private/timer.ss b/collects/web-server/private/timer.ss index 2da16ab1f6..a1336bd5a5 100644 --- a/collects/web-server/private/timer.ss +++ b/collects/web-server/private/timer.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "list.ss") - (lib "contract.ss") - (lib "async-channel.ss")) +(require mzlib/list + mzlib/contract + mzlib/async-channel) (define-struct timer (evt expire-seconds action) #:mutable) diff --git a/collects/web-server/private/url-param.ss b/collects/web-server/private/url-param.ss index 8f3090b81c..cb8bd274f2 100644 --- a/collects/web-server/private/url-param.ss +++ b/collects/web-server/private/url-param.ss @@ -1,8 +1,8 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "url.ss" "net") - (lib "plt-match.ss") - (lib "list.ss") +(require mzlib/contract + net/url + mzlib/plt-match + mzlib/list "util.ss") ; XXX Use instead of embed-ids (provide/contract diff --git a/collects/web-server/private/util.ss b/collects/web-server/private/util.ss index 4c31e67ee8..7aa33796d2 100644 --- a/collects/web-server/private/util.ss +++ b/collects/web-server/private/util.ss @@ -1,11 +1,11 @@ #lang scheme/base -(require (lib "list.ss") - (lib "plt-match.ss") - (lib "contract.ss") - (lib "serialize.ss") - (lib "pretty.ss") +(require mzlib/list + mzlib/plt-match + mzlib/contract + mzlib/serialize + mzlib/pretty (lib "xml.ss" "xml") - (lib "url.ss" "net")) + net/url) (define path-element? (or/c string? path? (symbols 'up 'same))) diff --git a/collects/web-server/private/web-server-structs.ss b/collects/web-server/private/web-server-structs.ss index 88fcd5fb9b..83b3cf6a40 100644 --- a/collects/web-server/private/web-server-structs.ss +++ b/collects/web-server/private/web-server-structs.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (define current-server-custodian (make-parameter #f)) (provide current-server-custodian) ; parameter diff --git a/collects/web-server/private/xexpr-extras.ss b/collects/web-server/private/xexpr-extras.ss index f96ad734b2..625fced609 100644 --- a/collects/web-server/private/xexpr-extras.ss +++ b/collects/web-server/private/xexpr-extras.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "url.ss" "net") - (lib "plt-match.ss")) +(require net/url + mzlib/plt-match) (provide xexpr+extras->xexpr) (define xexpr+extras->xexpr diff --git a/collects/web-server/run.ss b/collects/web-server/run.ss index d06dd4d858..d6d9e888a9 100644 --- a/collects/web-server/run.ss +++ b/collects/web-server/run.ss @@ -1,7 +1,7 @@ #lang scheme/base ; This file is intended to be copied and/or modified and used as a template. -(require (lib "cmdline.ss") - (only-in (lib "file.ss") +(require mzlib/cmdline + (only-in mzlib/file normalize-path) (lib "web-server.ss" "web-server") (lib "responders.ss" "web-server" "configuration") diff --git a/collects/web-server/scribblings/configuration.scrbl b/collects/web-server/scribblings/configuration.scrbl index 324128b87d..94b8fdf07b 100644 --- a/collects/web-server/scribblings/configuration.scrbl +++ b/collects/web-server/scribblings/configuration.scrbl @@ -170,7 +170,7 @@ of @filepath{dispatchers/dispatch-servlets.ss} and @filepath{dispatchers/dispatc namespace?)]{ This function creates a function that when called will construct a new @scheme[namespace] that has all the modules from @scheme[to-be-copied-module-specs] and @scheme[additional-specs], as well -as @scheme[mzscheme] and @scheme[(lib "mred.ss" "mred")], provided they are already attached +as @scheme[mzscheme] and @scheme[mred], provided they are already attached to the @scheme[(current-namespace)] of the call-site. Example: diff --git a/collects/web-server/scribblings/lang.scrbl b/collects/web-server/scribblings/lang.scrbl index 9c32644016..fe1fb4bb93 100644 --- a/collects/web-server/scribblings/lang.scrbl +++ b/collects/web-server/scribblings/lang.scrbl @@ -96,7 +96,7 @@ We thank Greg Pettyjohn for his initial implementation of this algorithm. @; ------------------------------------------------------------ @section[#:tag "reprovided"]{Reprovided API} -The APIs from @scheme[(lib "url.ss" "net")], @secref["request-structs.ss"], +The APIs from @scheme[net/url], @secref["request-structs.ss"], @secref["response-structs.ss"], and @secref["helpers.ss"] are reprovided by the Web language API. diff --git a/collects/web-server/scribblings/servlet-env.scrbl b/collects/web-server/scribblings/servlet-env.scrbl index 1dfcd0fa96..4f19f1ad5d 100644 --- a/collects/web-server/scribblings/servlet-env.scrbl +++ b/collects/web-server/scribblings/servlet-env.scrbl @@ -15,7 +15,7 @@ as well as the following: @defthing[send-url (parameter/c ([url string?] [separate-window? boolean?] . -> . void))]{ Should open @scheme[url]. In another window if @scheme[separate-window?] is true. - By default this is from @scheme[(lib "sendurl.ss" "net")]. + By default this is from @scheme[net/sendurl]. } @defform*[[(on-web servlet-expr) diff --git a/collects/web-server/servlet-env.ss b/collects/web-server/servlet-env.ss index cf8b09d06c..766075beca 100644 --- a/collects/web-server/servlet-env.ss +++ b/collects/web-server/servlet-env.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (prefix-in net: (lib "sendurl.ss" "net")) +(require (prefix-in net: net/sendurl) (for-syntax scheme/base) - (lib "list.ss")) + mzlib/list) (require "web-server.ss" "configuration/configuration-table.ss" "private/util.ss" diff --git a/collects/web-server/servlet/basic-auth.ss b/collects/web-server/servlet/basic-auth.ss index 0abedcde72..d0dccf6359 100644 --- a/collects/web-server/servlet/basic-auth.ss +++ b/collects/web-server/servlet/basic-auth.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "contract.ss") - (lib "plt-match.ss") - (lib "base64.ss" "net")) +(require mzlib/contract + mzlib/plt-match + net/base64) (require "../private/request-structs.ss") (define (extract-user-pass headers) diff --git a/collects/web-server/servlet/bindings.ss b/collects/web-server/servlet/bindings.ss index ac7ad40550..88d8b8b59f 100644 --- a/collects/web-server/servlet/bindings.ss +++ b/collects/web-server/servlet/bindings.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "list.ss") - (lib "contract.ss") - (lib "plt-match.ss")) +(require mzlib/list + mzlib/contract + mzlib/plt-match) (require "../private/util.ss" "../private/request-structs.ss") diff --git a/collects/web-server/servlet/servlet-structs.ss b/collects/web-server/servlet/servlet-structs.ss index 2101746294..18ca20e265 100644 --- a/collects/web-server/servlet/servlet-structs.ss +++ b/collects/web-server/servlet/servlet-structs.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "contract.ss")) +(require mzlib/contract) (require "../private/request-structs.ss" "../private/response-structs.ss") diff --git a/collects/web-server/servlet/servlet-url.ss b/collects/web-server/servlet/servlet-url.ss index 08a891d7e6..27ab4cc0e1 100644 --- a/collects/web-server/servlet/servlet-url.ss +++ b/collects/web-server/servlet/servlet-url.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require (lib "list.ss") - (lib "contract.ss") - (lib "url.ss" "net")) +(require mzlib/list + mzlib/contract + net/url) (require "../private/request-structs.ss" "../private/util.ss") diff --git a/collects/web-server/servlet/web-cells.ss b/collects/web-server/servlet/web-cells.ss index a66adfb14c..9ba45748b7 100644 --- a/collects/web-server/servlet/web-cells.ss +++ b/collects/web-server/servlet/web-cells.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "struct.ss") - (lib "contract.ss")) +(require mzlib/struct + mzlib/contract) (define-struct (exn:fail:frame:top exn) ()) (define (exn:fail:frame:top-raise) diff --git a/collects/web-server/servlet/web.ss b/collects/web-server/servlet/web.ss index 6dc836d539..b6bc771b3a 100644 --- a/collects/web-server/servlet/web.ss +++ b/collects/web-server/servlet/web.ss @@ -1,9 +1,9 @@ #lang scheme/base -(require (lib "url.ss" "net") - (lib "list.ss") - (lib "plt-match.ss") - (lib "contract.ss") - (lib "etc.ss")) +(require net/url + mzlib/list + mzlib/plt-match + mzlib/contract + mzlib/etc) (require "../managers/manager.ss" "../private/util.ss" "../private/servlet.ss" diff --git a/collects/web-server/tests/configuration/configuration-table-test.ss b/collects/web-server/tests/configuration/configuration-table-test.ss index 5e2b9e35d1..7bee45df41 100644 --- a/collects/web-server/tests/configuration/configuration-table-test.ss +++ b/collects/web-server/tests/configuration/configuration-table-test.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (only-in (lib "file.ss") + (only-in mzlib/file make-temporary-file) - (lib "configuration-table.ss" "web-server" "configuration")) + web-server/configuration/configuration-table) (provide configuration-table-tests) (define configuration-table-tests diff --git a/collects/web-server/tests/dispatchers/dispatch-files-test.ss b/collects/web-server/tests/dispatchers/dispatch-files-test.ss index cfee86353a..bb35f8bb3e 100644 --- a/collects/web-server/tests/dispatchers/dispatch-files-test.ss +++ b/collects/web-server/tests/dispatchers/dispatch-files-test.ss @@ -1,10 +1,10 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (only-in (lib "file.ss") + (only-in mzlib/file file-name-from-path make-temporary-file) - (lib "url.ss" "net") - (lib "list.ss") + net/url + mzlib/list (lib "xml.ss" "xml") (lib "request-structs.ss" "web-server" "private") (lib "util.ss" "web-server" "private") diff --git a/collects/web-server/tests/dispatchers/dispatch-lang-test.ss b/collects/web-server/tests/dispatchers/dispatch-lang-test.ss index e87d46b3d4..b27bd4419c 100644 --- a/collects/web-server/tests/dispatchers/dispatch-lang-test.ss +++ b/collects/web-server/tests/dispatchers/dispatch-lang-test.ss @@ -2,8 +2,8 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) ; XXX Replace with real (lib "sxml.ss" "web-server/tests/tmp/sxml") - (lib "etc.ss") - (lib "list.ss") + mzlib/etc + mzlib/list (lib "dispatch.ss" "web-server" "dispatchers") (lib "request-structs.ss" "web-server" "private") (lib "namespace.ss" "web-server" "configuration") diff --git a/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss b/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss index 18ccdb37a3..b1a1aa7e72 100644 --- a/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss +++ b/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss @@ -1,11 +1,11 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) (planet "util.ss" ("schematics" "schemeunit.plt" 2)) - (only-in (lib "file.ss") + (only-in mzlib/file make-temporary-file) - (lib "url.ss" "net") - (lib "list.ss") - (lib "serialize.ss") + net/url + mzlib/list + mzlib/serialize (lib "request-structs.ss" "web-server" "private") (lib "dispatch.ss" "web-server" "dispatchers") (prefix-in passwords: (lib "dispatch-passwords.ss" "web-server" "dispatchers")) diff --git a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss index 6a4f4c2020..7e88486918 100644 --- a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss +++ b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss @@ -2,8 +2,8 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) ; XXX Replace with real (lib "sxml.ss" "web-server/tests/tmp/sxml") - (lib "etc.ss") - (lib "list.ss") + mzlib/etc + mzlib/list (lib "request-structs.ss" "web-server" "private") (lib "cache-table.ss" "web-server" "private") (lib "web-server-structs.ss" "web-server" "private") diff --git a/collects/web-server/tests/dispatchers/filesystem-map-test.ss b/collects/web-server/tests/dispatchers/filesystem-map-test.ss index 2754edbe4c..d8a700c0e2 100644 --- a/collects/web-server/tests/dispatchers/filesystem-map-test.ss +++ b/collects/web-server/tests/dispatchers/filesystem-map-test.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "url.ss" "net") + net/url (lib "util.ss" "web-server" "private") (lib "filesystem-map.ss" "web-server" "dispatchers")) (provide filesystem-map-tests) diff --git a/collects/web-server/tests/lang-test.ss b/collects/web-server/tests/lang-test.ss index 326dfda8ff..423213f7b8 100644 --- a/collects/web-server/tests/lang-test.ss +++ b/collects/web-server/tests/lang-test.ss @@ -509,7 +509,7 @@ (lambda () (make-module-eval (module data (lib "lang.ss" "web-server") - (require (lib "contract.ss")) + (require mzlib/contract) (define x 1) (provide/contract @@ -522,7 +522,7 @@ (lambda () (make-module-eval (module data (lib "lang.ss" "web-server") - (require (lib "contract.ss")) + (require mzlib/contract) (define-struct posn (x y) #:mutable) (provide/contract diff --git a/collects/web-server/tests/lang/defun-test.ss b/collects/web-server/tests/lang/defun-test.ss index af86123652..9fbe82e5a6 100644 --- a/collects/web-server/tests/lang/defun-test.ss +++ b/collects/web-server/tests/lang/defun-test.ss @@ -19,7 +19,7 @@ #;(test-not-exn "define-struct" (lambda () (vwrap (defun (expand (syntax (define-struct posn (x y)))))))) (test-not-exn "quote-syntax" (lambda () (vwrap (defun (expand (syntax #'provide/contract-id-set-a-date-day!)))))) #;(test-not-exn "provide/contract" (lambda () (vwrap (defun (expand (syntax (module t mzscheme - (require (lib "contract.ss")) + (require mzlib/contract) (define x 1) (provide/contract [x integer?])))))))) diff --git a/collects/web-server/tests/lang/file-box-test.ss b/collects/web-server/tests/lang/file-box-test.ss index 86eb1c7bd3..1ca3d32dd2 100644 --- a/collects/web-server/tests/lang/file-box-test.ss +++ b/collects/web-server/tests/lang/file-box-test.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) (lib "file-box.ss" "web-server" "lang") - (only-in (lib "file.ss") make-temporary-file)) + (only-in mzlib/file make-temporary-file)) (provide file-box-tests) (define file-box-tests diff --git a/collects/web-server/tests/lang/stuff-url-test.ss b/collects/web-server/tests/lang/stuff-url-test.ss index 809d76b989..543272c0c7 100644 --- a/collects/web-server/tests/lang/stuff-url-test.ss +++ b/collects/web-server/tests/lang/stuff-url-test.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (lib "stuff-url.ss" "web-server" "lang") (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "url.ss" "net") - (lib "serialize.ss") + net/url + mzlib/serialize "../util.ss") (provide stuff-url-tests) diff --git a/collects/web-server/tests/private/define-closure-test.ss b/collects/web-server/tests/private/define-closure-test.ss index f5a07973dd..4a03c7c241 100644 --- a/collects/web-server/tests/private/define-closure-test.ss +++ b/collects/web-server/tests/private/define-closure-test.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "serialize.ss") - (lib "match.ss") + mzlib/serialize + mzlib/match (lib "define-closure.ss" "web-server" "private")) (provide define-closure-tests) diff --git a/collects/web-server/tests/private/mime-types-test.ss b/collects/web-server/tests/private/mime-types-test.ss index 373f98a613..447a9db4a3 100644 --- a/collects/web-server/tests/private/mime-types-test.ss +++ b/collects/web-server/tests/private/mime-types-test.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (only-in (lib "file.ss") make-temporary-file) + (only-in mzlib/file make-temporary-file) (lib "mime-types.ss" "web-server" "private") (lib "response-structs.ss" "web-server" "private")) (provide mime-types-tests) diff --git a/collects/web-server/tests/private/mod-map-test.ss b/collects/web-server/tests/private/mod-map-test.ss index 7b9cf8f9bc..39ea5e10fa 100644 --- a/collects/web-server/tests/private/mod-map-test.ss +++ b/collects/web-server/tests/private/mod-map-test.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) (lib "mod-map.ss" "web-server" "private") - (lib "serialize.ss") + mzlib/serialize "../util.ss") (provide mod-map-tests) diff --git a/collects/web-server/tests/private/response-test.ss b/collects/web-server/tests/private/response-test.ss index 102136c924..4ea06c6e27 100644 --- a/collects/web-server/tests/private/response-test.ss +++ b/collects/web-server/tests/private/response-test.ss @@ -2,7 +2,7 @@ (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) (planet "util.ss" ("schematics" "schemeunit.plt" 2)) (lib "xml.ss" "xml") - (only-in (lib "file.ss") + (only-in mzlib/file make-temporary-file) (lib "response.ss" "web-server" "private") (lib "request-structs.ss" "web-server" "private") diff --git a/collects/web-server/tests/private/session-test.ss b/collects/web-server/tests/private/session-test.ss index 55a017bbaf..3eec68ab50 100644 --- a/collects/web-server/tests/private/session-test.ss +++ b/collects/web-server/tests/private/session-test.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "list.ss") - (lib "url.ss" "net") + mzlib/list + net/url (lib "session.ss" "web-server" "private")) (provide session-tests) diff --git a/collects/web-server/tests/private/url-param-test.ss b/collects/web-server/tests/private/url-param-test.ss index e5fb1a3485..70581b2c47 100644 --- a/collects/web-server/tests/private/url-param-test.ss +++ b/collects/web-server/tests/private/url-param-test.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "url.ss" "net") + net/url (lib "url-param.ss" "web-server" "private")) (provide url-param-tests) diff --git a/collects/web-server/tests/private/util-test.ss b/collects/web-server/tests/private/util-test.ss index 3c3a108d08..d9b48d230f 100644 --- a/collects/web-server/tests/private/util-test.ss +++ b/collects/web-server/tests/private/util-test.ss @@ -1,8 +1,8 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "url.ss" "net") + net/url (lib "xml.ss" "xml") - (lib "contract.ss") + mzlib/contract (lib "util.ss" "web-server" "private")) (provide util-tests) diff --git a/collects/web-server/tests/servlet-env-test.ss b/collects/web-server/tests/servlet-env-test.ss index f5025b9585..dd4e9cc591 100644 --- a/collects/web-server/tests/servlet-env-test.ss +++ b/collects/web-server/tests/servlet-env-test.ss @@ -3,11 +3,11 @@ #;(only (planet "ssax.ss" ("lizorkin" "ssax.plt" 1 3)) ssax:xml->sxml) #;(planet "sxml.ss" ("lizorkin" "sxml.plt" 1 4)) - (lib "etc.ss") - (lib "list.ss") - (lib "pretty.ss") - (lib "url.ss" "net") - (lib "servlet-env.ss" "web-server")) + mzlib/etc + mzlib/list + mzlib/pretty + net/url + web-server/servlet-env) (provide servlet-env-tests) #;(define (call u bs) diff --git a/collects/web-server/tests/servlet/bindings-test.ss b/collects/web-server/tests/servlet/bindings-test.ss index 47e929f641..273efd9896 100644 --- a/collects/web-server/tests/servlet/bindings-test.ss +++ b/collects/web-server/tests/servlet/bindings-test.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "list.ss") - (lib "url.ss" "net") + mzlib/list + net/url (lib "request-structs.ss" "web-server" "private") (lib "bindings.ss" "web-server" "servlet")) (provide bindings-tests) diff --git a/collects/web-server/tests/servlet/servlet-url-test.ss b/collects/web-server/tests/servlet/servlet-url-test.ss index 5bb24a0ce3..56f0cb0441 100644 --- a/collects/web-server/tests/servlet/servlet-url-test.ss +++ b/collects/web-server/tests/servlet/servlet-url-test.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "list.ss") - (lib "url.ss" "net") + mzlib/list + net/url (lib "servlet-url.ss" "web-server" "servlet") (lib "request-structs.ss" "web-server" "private")) (provide servlet-url-tests) diff --git a/collects/web-server/tests/servlet/web-test.ss b/collects/web-server/tests/servlet/web-test.ss index 4f92dc17e2..b8a137321f 100644 --- a/collects/web-server/tests/servlet/web-test.ss +++ b/collects/web-server/tests/servlet/web-test.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)) - (lib "url.ss" "net") + net/url (lib "web.ss" "web-server" "servlet")) (provide web-tests) diff --git a/collects/web-server/tests/tmp/ssax/common.ss b/collects/web-server/tests/tmp/ssax/common.ss index ea7ba6d048..a61a6bfba0 100644 --- a/collects/web-server/tests/tmp/ssax/common.ss +++ b/collects/web-server/tests/tmp/ssax/common.ss @@ -4,9 +4,9 @@ ;; For PLT Schemes v.200 (require - (lib "defmacro.ss") - (lib "string.ss") - (rename (lib "pretty.ss") pp pretty-print)) + mzlib/defmacro + mzlib/string + (rename mzlib/pretty pp pretty-print)) (define (command-line) (cons "plt" (vector->list (current-command-line-arguments) diff --git a/collects/web-server/tests/tmp/ssax/http.ss b/collects/web-server/tests/tmp/ssax/http.ss index 1007a188ef..3c0100522d 100644 --- a/collects/web-server/tests/tmp/ssax/http.ss +++ b/collects/web-server/tests/tmp/ssax/http.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module http mzscheme -(require (lib "defmacro.ss")) +(require mzlib/defmacro) (require "common.ss") (require "myenv.ss") (require "mime.ss") diff --git a/collects/web-server/tests/tmp/ssax/input-parse.ss b/collects/web-server/tests/tmp/ssax/input-parse.ss index 52145ee921..9a7130d237 100644 --- a/collects/web-server/tests/tmp/ssax/input-parse.ss +++ b/collects/web-server/tests/tmp/ssax/input-parse.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module input-parse mzscheme -(require (lib "defmacro.ss")) +(require mzlib/defmacro) (require "common.ss") (require "myenv.ss") (require "parse-error.ss") diff --git a/collects/web-server/tests/tmp/ssax/myenv.ss b/collects/web-server/tests/tmp/ssax/myenv.ss index 7bb7eff698..4839c8a024 100644 --- a/collects/web-server/tests/tmp/ssax/myenv.ss +++ b/collects/web-server/tests/tmp/ssax/myenv.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module myenv mzscheme -(require (lib "defmacro.ss")) +(require mzlib/defmacro) ;; $Id: myenv.ss,v 1.14 2002/03/28 22:23:06 nwv Exp $ ;; $Source: /home/nwv/cvsroot/projects/ssax-plt/myenv.ss,v $ diff --git a/collects/web-server/tests/tmp/ssax/srfi-12.ss b/collects/web-server/tests/tmp/ssax/srfi-12.ss index 3cb9f7c164..946e103dad 100644 --- a/collects/web-server/tests/tmp/ssax/srfi-12.ss +++ b/collects/web-server/tests/tmp/ssax/srfi-12.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module srfi-12 mzscheme -(require (lib "defmacro.ss")) +(require mzlib/defmacro) (require "myenv.ss") ;************************************************************************ diff --git a/collects/web-server/tests/tmp/ssax/ssax-code.ss b/collects/web-server/tests/tmp/ssax/ssax-code.ss index 83015ab4ac..2abca3ce14 100644 --- a/collects/web-server/tests/tmp/ssax/ssax-code.ss +++ b/collects/web-server/tests/tmp/ssax/ssax-code.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module ssax-code mzscheme -(require (lib "defmacro.ss")) +(require mzlib/defmacro) (require "common.ss") (require "myenv.ss") (require (lib "string.ss" "srfi/13")) diff --git a/collects/web-server/tests/tmp/ssax/sxpathlib.ss b/collects/web-server/tests/tmp/ssax/sxpathlib.ss index 32dfdee778..1f54b16b14 100644 --- a/collects/web-server/tests/tmp/ssax/sxpathlib.ss +++ b/collects/web-server/tests/tmp/ssax/sxpathlib.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module sxpathlib mzscheme -(require (rename (lib "pretty.ss") pp pretty-print)) +(require (rename mzlib/pretty pp pretty-print)) (require "common.ss") (require "myenv.ss") (require (lib "string.ss" "srfi/13")) diff --git a/collects/web-server/tests/tmp/sxml/libmisc.ss b/collects/web-server/tests/tmp/sxml/libmisc.ss index bf3af2efdb..982b9556f2 100644 --- a/collects/web-server/tests/tmp/sxml/libmisc.ss +++ b/collects/web-server/tests/tmp/sxml/libmisc.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module libmisc mzscheme -(require (rename (lib "pretty.ss") pp pretty-print)) +(require (rename mzlib/pretty pp pretty-print)) (require (lib "string.ss" "srfi/13")) (require (lib "ssax.ss" "web-server/tests/tmp/ssax")) diff --git a/collects/web-server/tests/tmp/sxml/stx-engine.ss b/collects/web-server/tests/tmp/sxml/stx-engine.ss index ee096a1541..1b4167eb9d 100644 --- a/collects/web-server/tests/tmp/sxml/stx-engine.ss +++ b/collects/web-server/tests/tmp/sxml/stx-engine.ss @@ -1,7 +1,7 @@ ; Module header is generated automatically #cs(module stx-engine mzscheme -(require (lib "defmacro.ss")) -(require (rename (lib "pretty.ss") pp pretty-print)) +(require mzlib/defmacro) +(require (rename mzlib/pretty pp pretty-print)) (require (lib "string.ss" "srfi/13")) (require "sxml-tools.ss") (require "sxpathlib.ss") diff --git a/collects/web-server/tests/tmp/sxml/sxml-tools.ss b/collects/web-server/tests/tmp/sxml/sxml-tools.ss index 634cd40394..328e1230e9 100644 --- a/collects/web-server/tests/tmp/sxml/sxml-tools.ss +++ b/collects/web-server/tests/tmp/sxml/sxml-tools.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module sxml-tools mzscheme -(require (lib "defmacro.ss")) +(require mzlib/defmacro) (require (lib "string.ss" "srfi/13")) (require (lib "ssax.ss" "web-server/tests/tmp/ssax")) (require "sxpathlib.ss") diff --git a/collects/web-server/tests/tmp/sxml/sxpathlib.ss b/collects/web-server/tests/tmp/sxml/sxpathlib.ss index 57307ba40b..9877463f91 100644 --- a/collects/web-server/tests/tmp/sxml/sxpathlib.ss +++ b/collects/web-server/tests/tmp/sxml/sxpathlib.ss @@ -1,6 +1,6 @@ ; Module header is generated automatically #cs(module sxpathlib mzscheme -(require (rename (lib "pretty.ss") pp pretty-print)) +(require (rename mzlib/pretty pp pretty-print)) (require (lib "string.ss" "srfi/13")) (require (lib "ssax.ss" "web-server/tests/tmp/ssax")) diff --git a/collects/web-server/tests/util.ss b/collects/web-server/tests/util.ss index a0370c7974..1313dff249 100644 --- a/collects/web-server/tests/util.ss +++ b/collects/web-server/tests/util.ss @@ -6,9 +6,9 @@ ssax:xml->sxml) (lib "request-structs.ss" "web-server" "private") (lib "web-server-structs.ss" "web-server" "private") - (lib "url.ss" "net") - (lib "pretty.ss") - (lib "list.ss") + net/url + mzlib/pretty + mzlib/list (lib "timer.ss" "web-server" "private")) (provide make-module-eval make-eval/mod-path diff --git a/collects/web-server/web-config-unit.ss b/collects/web-server/web-config-unit.ss index 1d31346efb..2e683a50e9 100644 --- a/collects/web-server/web-config-unit.ss +++ b/collects/web-server/web-config-unit.ss @@ -1,5 +1,5 @@ #lang scheme/base -(require (lib "unit.ss") +(require mzlib/unit scheme/contract) (require "private/util.ss" "private/cache-table.ss" diff --git a/collects/web-server/web-server-unit.ss b/collects/web-server/web-server-unit.ss index afb1446c2d..6e4bea7259 100644 --- a/collects/web-server/web-server-unit.ss +++ b/collects/web-server/web-server-unit.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require (lib "tcp-sig.ss" "net") - (lib "unit.ss")) +(require net/tcp-sig + mzlib/unit) (require "web-server-sig.ss" "web-config-sig.ss" "private/dispatch-server-unit.ss" diff --git a/collects/web-server/web-server.ss b/collects/web-server/web-server.ss index 8c1b1f2824..aa9d4a6501 100644 --- a/collects/web-server/web-server.ss +++ b/collects/web-server/web-server.ss @@ -1,8 +1,8 @@ #lang scheme/base -(require (lib "plt-match.ss") - (lib "tcp-sig.ss" "net") - (prefix-in raw: (lib "tcp-unit.ss" "net")) - (lib "unit.ss") +(require mzlib/plt-match + net/tcp-sig + (prefix-in raw: net/tcp-unit) + mzlib/unit scheme/contract "dispatchers/dispatch.ss" "private/dispatch-server-sig.ss" diff --git a/collects/wxme/cache-image.ss b/collects/wxme/cache-image.ss index 9b78f02f04..7e2dbefcee 100644 --- a/collects/wxme/cache-image.ss +++ b/collects/wxme/cache-image.ss @@ -1,6 +1,6 @@ (module cache-image mzscheme - (require (lib "class.ss") + (require mzlib/class "wxme.ss") (provide reader diff --git a/collects/wxme/comment.ss b/collects/wxme/comment.ss index e51a9c23df..a3eb5cf044 100644 --- a/collects/wxme/comment.ss +++ b/collects/wxme/comment.ss @@ -1,7 +1,7 @@ (module comment mzscheme - (require (lib "class.ss") - (lib "string.ss") + (require mzlib/class + mzlib/string "wxme.ss" "private/readable-editor.ss") diff --git a/collects/wxme/editor.ss b/collects/wxme/editor.ss index 9222c74865..6c88a7684a 100644 --- a/collects/wxme/editor.ss +++ b/collects/wxme/editor.ss @@ -1,6 +1,6 @@ (module editor mzscheme - (require (lib "class.ss") + (require mzlib/class "private/class-help.ss") (provide editor%) diff --git a/collects/wxme/image.ss b/collects/wxme/image.ss index 65a3d62ece..27915207b2 100644 --- a/collects/wxme/image.ss +++ b/collects/wxme/image.ss @@ -1,6 +1,6 @@ (module image mzscheme - (require (lib "class.ss") + (require mzlib/class "private/class-help.ss") (provide image%) diff --git a/collects/wxme/number.ss b/collects/wxme/number.ss index 6aa72cdc65..1307c9d522 100644 --- a/collects/wxme/number.ss +++ b/collects/wxme/number.ss @@ -1,6 +1,6 @@ (module number mzscheme - (require (lib "class.ss") + (require mzlib/class "wxme.ss") (provide reader) diff --git a/collects/wxme/private/class-help.ss b/collects/wxme/private/class-help.ss index aef80bb406..c2cba0bba8 100644 --- a/collects/wxme/private/class-help.ss +++ b/collects/wxme/private/class-help.ss @@ -1,6 +1,6 @@ (module class-help mzscheme - (require (lib "class.ss")) + (require mzlib/class) (provide init-accessible) diff --git a/collects/wxme/private/readable-editor.ss b/collects/wxme/private/readable-editor.ss index 203cd5a70f..5317725b99 100644 --- a/collects/wxme/private/readable-editor.ss +++ b/collects/wxme/private/readable-editor.ss @@ -1,7 +1,7 @@ (module readable-editor mzscheme - (require (lib "class.ss") - (lib "struct.ss") + (require mzlib/class + mzlib/struct "../wxme.ss" "../editor.ss") diff --git a/collects/wxme/scheme.ss b/collects/wxme/scheme.ss index 681d88c061..6e98661f5e 100644 --- a/collects/wxme/scheme.ss +++ b/collects/wxme/scheme.ss @@ -1,6 +1,6 @@ (module scheme mzscheme - (require (lib "class.ss") + (require mzlib/class "wxme.ss" "editor.ss" "private/readable-editor.ss") diff --git a/collects/wxme/test-case.ss b/collects/wxme/test-case.ss index 1618aa8759..aa2d642aab 100644 --- a/collects/wxme/test-case.ss +++ b/collects/wxme/test-case.ss @@ -1,6 +1,6 @@ (module test-case mzscheme - (require (lib "class.ss") + (require mzlib/class "wxme.ss" "private/class-help.ss") diff --git a/collects/wxme/text.ss b/collects/wxme/text.ss index 988e054e9a..9ea03e439c 100644 --- a/collects/wxme/text.ss +++ b/collects/wxme/text.ss @@ -1,6 +1,6 @@ (module text mzscheme - (require (lib "class.ss") + (require mzlib/class "wxme.ss" "editor.ss" "private/readable-editor.ss") diff --git a/collects/wxme/wxme.ss b/collects/wxme/wxme.ss index cf1b88074d..7ba77c2481 100644 --- a/collects/wxme/wxme.ss +++ b/collects/wxme/wxme.ss @@ -1,11 +1,11 @@ (module wxme mzscheme - (require (lib "port.ss") - (lib "string.ss") - (lib "kw.ss") - (lib "class.ss") - (lib "contract.ss") - (lib "list.ss") + (require mzlib/port + mzlib/string + mzlib/kw + mzlib/class + mzlib/contract + mzlib/list "image.ss" "editor.ss" "private/compat.ss") @@ -666,8 +666,8 @@ (dynamic-require '#%mred-kernel #f) #t) ;; GUI mode, since MrEd is available: - (let ([text% (dynamic-require '(lib "mred.ss" "mred") 'text%)] - [open-input-text-editor (dynamic-require '(lib "mred.ss" "mred") 'open-input-text-editor)]) + (let ([text% (dynamic-require 'mred 'text%)] + [open-input-text-editor (dynamic-require 'mred 'open-input-text-editor)]) (let ([t (new text%)]) (send t insert-port port 'standard) (open-input-text-editor t 0 'end values (object-name port) #t))) diff --git a/collects/wxme/xml.ss b/collects/wxme/xml.ss index bd4cf4f223..f68df07938 100644 --- a/collects/wxme/xml.ss +++ b/collects/wxme/xml.ss @@ -1,8 +1,8 @@ (module xml mzscheme - (require (lib "class.ss") + (require mzlib/class (lib "xml.ss" "xml") - (lib "list.ss") + mzlib/list "wxme.ss" "editor.ss" "private/readable-editor.ss") diff --git a/collects/xelda/private/parser.ss b/collects/xelda/private/parser.ss index 0ce8713cb8..f1d4163367 100644 --- a/collects/xelda/private/parser.ss +++ b/collects/xelda/private/parser.ss @@ -1,9 +1,9 @@ (module parser mzscheme - (require (lib "string.ss")) - (require (lib "yacc.ss" "parser-tools")) - (require (lib "lex.ss" "parser-tools")) - (require (lib "list.ss")) + (require mzlib/string) + (require parser-tools/yacc) + (require parser-tools/lex) + (require mzlib/list) (require "xl-util.ss") (require "formula.ss") diff --git a/collects/xelda/private/xelda-checker.ss b/collects/xelda/private/xelda-checker.ss index 2f00a8b504..3857894d4d 100644 --- a/collects/xelda/private/xelda-checker.ss +++ b/collects/xelda/private/xelda-checker.ss @@ -1,7 +1,7 @@ (module xelda-checker mzscheme - (require (lib "class.ss")) - (require (lib "list.ss")) - (require (lib "match.ss")) + (require mzlib/class) + (require mzlib/list) + (require mzlib/match) (require "xl-util.ss") (require "formula.ss") diff --git a/collects/xelda/private/xelda-com.ss b/collects/xelda/private/xelda-com.ss index 2205117457..0924fad01c 100644 --- a/collects/xelda/private/xelda-com.ss +++ b/collects/xelda/private/xelda-com.ss @@ -1,8 +1,8 @@ (module xelda-com mzscheme (require (lib "mysterx.ss" "mysterx")) - (require (lib "list.ss")) - (require (lib "class.ss")) + (require mzlib/list) + (require mzlib/class) (require "xl-util.ss") diff --git a/collects/xelda/private/xelda-lib.ss b/collects/xelda/private/xelda-lib.ss index 3b40516e27..b6b2de4330 100644 --- a/collects/xelda/private/xelda-lib.ss +++ b/collects/xelda/private/xelda-lib.ss @@ -1,6 +1,6 @@ (module xelda-lib mzscheme - (require (lib "list.ss")) + (require mzlib/list) (provide average diff --git a/collects/xelda/private/xl-util.ss b/collects/xelda/private/xl-util.ss index 198cf39e53..ea25e9aff8 100644 --- a/collects/xelda/private/xl-util.ss +++ b/collects/xelda/private/xl-util.ss @@ -1,5 +1,5 @@ (module xl-util mzscheme - (require (lib "list.ss")) + (require mzlib/list) (provide cell-alpha->number diff --git a/collects/xelda/xelda.ss b/collects/xelda/xelda.ss index 1b43d04cf2..d63dbaa189 100644 --- a/collects/xelda/xelda.ss +++ b/collects/xelda/xelda.ss @@ -1,7 +1,7 @@ (module xelda mzscheme - (require (lib "class.ss")) - (require (lib "list.ss")) - (require (lib "mred.ss" "mred")) + (require mzlib/class) + (require mzlib/list) + (require mred) (require "private/xelda-com.ss") (require "private/xelda-checker.ss") diff --git a/collects/xml/plist.ss b/collects/xml/plist.ss index 6ca62ce0f8..07d2920b3a 100644 --- a/collects/xml/plist.ss +++ b/collects/xml/plist.ss @@ -1,7 +1,7 @@ (module plist mzscheme (require "xml.ss" - (lib "contract.ss")) + mzlib/contract) ; a dict is (list 'dict assoc-pair ...) ; an assoc-pair is (list 'assoc-pair key value) diff --git a/collects/xml/private/reader.ss b/collects/xml/private/reader.ss index 2d72135fb3..0c0d940242 100644 --- a/collects/xml/private/reader.ss +++ b/collects/xml/private/reader.ss @@ -1,7 +1,7 @@ (module reader mzscheme - (require (lib "unitsig.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unitsig + mzlib/list + mzlib/etc) (require "sig.ss") diff --git a/collects/xml/private/sig.ss b/collects/xml/private/sig.ss index 88decd4533..9abd1387d7 100644 --- a/collects/xml/private/sig.ss +++ b/collects/xml/private/sig.ss @@ -1,6 +1,6 @@ (module sig mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (define-signature xml-structs^ ((struct location (line char offset)) diff --git a/collects/xml/private/space.ss b/collects/xml/private/space.ss index 88d18671f2..dc7444623a 100644 --- a/collects/xml/private/space.ss +++ b/collects/xml/private/space.ss @@ -1,7 +1,7 @@ (module space mzscheme - (require (lib "unitsig.ss") - (lib "list.ss")) + (require mzlib/unitsig + mzlib/list) (require "sig.ss") diff --git a/collects/xml/private/structures.ss b/collects/xml/private/structures.ss index c4874c6798..e2bb74bd55 100644 --- a/collects/xml/private/structures.ss +++ b/collects/xml/private/structures.ss @@ -1,6 +1,6 @@ (module structures mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (require "sig.ss") diff --git a/collects/xml/private/syntax.ss b/collects/xml/private/syntax.ss index 5908c8af25..222833f99f 100644 --- a/collects/xml/private/syntax.ss +++ b/collects/xml/private/syntax.ss @@ -1,6 +1,6 @@ (module syntax mzscheme (provide syntax-structs@) - (require (lib "unitsig.ss") + (require mzlib/unitsig "sig.ss") ; to make error-raising functions named like structure mutators diff --git a/collects/xml/private/writer.ss b/collects/xml/private/writer.ss index 7c7c345fbf..549a1191d4 100644 --- a/collects/xml/private/writer.ss +++ b/collects/xml/private/writer.ss @@ -1,9 +1,9 @@ (module writer mzscheme - (require (lib "unitsig.ss") - (lib "list.ss") - (lib "string.ss") - (lib "etc.ss")) + (require mzlib/unitsig + mzlib/list + mzlib/string + mzlib/etc) (require "sig.ss") diff --git a/collects/xml/private/xexpr.ss b/collects/xml/private/xexpr.ss index f8ad9122aa..6ecf5c158a 100644 --- a/collects/xml/private/xexpr.ss +++ b/collects/xml/private/xexpr.ss @@ -1,8 +1,8 @@ (module xexpr mzscheme - (require (lib "unitsig.ss") - (lib "list.ss") - (lib "etc.ss")) + (require mzlib/unitsig + mzlib/list + mzlib/etc) (require "sig.ss") diff --git a/collects/xml/scheme-snipclass.ss b/collects/xml/scheme-snipclass.ss index b40e6dbfef..0b370f4753 100644 --- a/collects/xml/scheme-snipclass.ss +++ b/collects/xml/scheme-snipclass.ss @@ -1,7 +1,7 @@ (module scheme-snipclass mzscheme (require (lib "xml-snip-helpers.ss" "stepper" "private") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (provide snip-class scheme-snip%) diff --git a/collects/xml/text-box-tool.ss b/collects/xml/text-box-tool.ss index 7ba2a3edc2..7bb80e1dd8 100644 --- a/collects/xml/text-box-tool.ss +++ b/collects/xml/text-box-tool.ss @@ -1,12 +1,12 @@ (module text-box-tool mzscheme (require (lib "tool.ss" "drscheme") - (lib "mred.ss" "mred") - (lib "framework.ss" "framework") + mred + framework "text-snipclass.ss" - (lib "unit.ss") - (lib "class.ss") - (lib "contract.ss") - (lib "string-constant.ss" "string-constants") + mzlib/unit + mzlib/class + mzlib/contract + string-constants (lib "include-bitmap.ss" "mrlib")) (provide tool@) diff --git a/collects/xml/text-snipclass.ss b/collects/xml/text-snipclass.ss index 0a7498fa3f..345cb077c1 100644 --- a/collects/xml/text-snipclass.ss +++ b/collects/xml/text-snipclass.ss @@ -1,7 +1,7 @@ (module text-snipclass mzscheme - (require (lib "framework.ss" "framework") - (lib "class.ss") - (lib "mred.ss" "mred")) + (require framework + mzlib/class + mred) (provide text-box% (rename snipclass snip-class)) diff --git a/collects/xml/xml-sig.ss b/collects/xml/xml-sig.ss index 8e00d94ae3..8f6bb02f96 100644 --- a/collects/xml/xml-sig.ss +++ b/collects/xml/xml-sig.ss @@ -1,6 +1,6 @@ (module xml-sig mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (require "private/sig.ss") diff --git a/collects/xml/xml-snipclass.ss b/collects/xml/xml-snipclass.ss index 55fd0ee2ce..cbed5deaab 100644 --- a/collects/xml/xml-snipclass.ss +++ b/collects/xml/xml-snipclass.ss @@ -1,7 +1,7 @@ (module xml-snipclass mzscheme (require (lib "xml-snip-helpers.ss" "stepper" "private") - (lib "class.ss") - (lib "mred.ss" "mred")) + mzlib/class + mred) (provide snip-class xml-snip%) diff --git a/collects/xml/xml-unit.ss b/collects/xml/xml-unit.ss index 858cc40fd3..d378e2d1cc 100644 --- a/collects/xml/xml-unit.ss +++ b/collects/xml/xml-unit.ss @@ -1,6 +1,6 @@ (module xml-unit mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (require "xml-sig.ss" "private/sig.ss" "private/structures.ss" diff --git a/collects/xml/xml.ss b/collects/xml/xml.ss index d758f2de77..5fb75ccfd0 100644 --- a/collects/xml/xml.ss +++ b/collects/xml/xml.ss @@ -1,6 +1,6 @@ (module xml mzscheme - (require (lib "unitsig.ss")) + (require mzlib/unitsig) (require "xml-sig.ss" "xml-unit.ss") diff --git a/doc/release-notes/mzscheme/rename-super-fixup.ss b/doc/release-notes/mzscheme/rename-super-fixup.ss index 99bcd9fc73..bb03f31c6e 100644 --- a/doc/release-notes/mzscheme/rename-super-fixup.ss +++ b/doc/release-notes/mzscheme/rename-super-fixup.ss @@ -16,8 +16,8 @@ ;; with the converted code (unless .bak already exists, in which ;; case it is left as-is). -(require (lib "list.ss") - (lib "stx.ss" "syntax")) +(require mzlib/list + syntax/stx) ;; returns a list of syntax for `rename' clauses ;; the order in the list matches the textual order in the source diff --git a/src/mac/osx_appl.ss b/src/mac/osx_appl.ss index f8089d5490..558e6a3043 100644 --- a/src/mac/osx_appl.ss +++ b/src/mac/osx_appl.ss @@ -11,8 +11,8 @@ (module osx_appl mzscheme (require (lib "plist.ss" "xml") - (lib "process.ss") - (lib "file.ss")) + mzlib/process + mzlib/file) (define rez-path (or (getenv "REZ") "/Developer/Tools/Rez")) diff --git a/src/mred/wxs/khead.ss b/src/mred/wxs/khead.ss index e550d01fa8..b4b48a92c7 100644 --- a/src/mred/wxs/khead.ss +++ b/src/mred/wxs/khead.ss @@ -3,7 +3,7 @@ ;; kernel.ss is generated by a target in /mred/wxs/Makefile. (module kernel mzscheme - (require (all-except (lib "class.ss") object%)) + (require (all-except mzlib/class object%)) ;; Pull pieces out of #%mred-kernel dynamically, so that ;; the library compiles with setup-plt in mzscheme. diff --git a/src/mzscheme/gc/upgrade.ss b/src/mzscheme/gc/upgrade.ss index 808af7b65a..9246374288 100644 --- a/src/mzscheme/gc/upgrade.ss +++ b/src/mzscheme/gc/upgrade.ss @@ -3,8 +3,8 @@ (define new-dir "~/Desktop/gc6.7") (define really-svn? #t) -(require (lib "file.ss") - (lib "process.ss")) +(require mzlib/file + mzlib/process) (define old (make-hash-table 'equal)) (define new (make-hash-table 'equal)) diff --git a/src/mzscheme/gc2/xform-mod.ss b/src/mzscheme/gc2/xform-mod.ss index 5e12029cd3..3ecab6ef45 100644 --- a/src/mzscheme/gc2/xform-mod.ss +++ b/src/mzscheme/gc2/xform-mod.ss @@ -1,6 +1,6 @@ (module xform-mod mzscheme (require (lib "xform.ss" "compiler" "private") - (lib "cmdline.ss")) + mzlib/cmdline) (define precompiling-header? (getenv "XFORM_PRECOMP")) (define precompiled-header (getenv "XFORM_USE_PRECOMP")) diff --git a/src/mzscheme/src/mk-uchar.ss b/src/mzscheme/src/mk-uchar.ss index 4316355772..931e3243f6 100644 --- a/src/mzscheme/src/mk-uchar.ss +++ b/src/mzscheme/src/mk-uchar.ss @@ -11,7 +11,7 @@ ;; in the "Unicode" directory. The file schuchar.inc will be ;; overwritten. -(require (lib "list.ss")) +(require mzlib/list) (require mzscheme) (define mark-cats '("Mn" "Mc" "Me")) diff --git a/src/worksp/gc2/make.ss b/src/worksp/gc2/make.ss index 865cb903b1..975855a526 100644 --- a/src/worksp/gc2/make.ss +++ b/src/worksp/gc2/make.ss @@ -3,8 +3,8 @@ (use-compiled-file-paths null) -(require (lib "restart.ss") - (lib "process.ss")) +(require mzlib/restart + mzlib/process) (define (system- s) (fprintf (current-error-port) "~a~n" s) diff --git a/src/worksp/libmysterx/xform.ss b/src/worksp/libmysterx/xform.ss index 09df589198..c059c70f83 100644 --- a/src/worksp/libmysterx/xform.ss +++ b/src/worksp/libmysterx/xform.ss @@ -3,7 +3,7 @@ (use-compiled-file-paths null) -(require (lib "restart.ss")) +(require mzlib/restart) (define cpp-flags "/D _CRT_SECURE_NO_DEPRECATE /D WIN32") (define includes diff --git a/src/worksp/mzcom/xform.ss b/src/worksp/mzcom/xform.ss index 422d5ee11a..d595984435 100644 --- a/src/worksp/mzcom/xform.ss +++ b/src/worksp/mzcom/xform.ss @@ -2,7 +2,7 @@ (use-compiled-file-paths null) -(require (lib "restart.ss")) +(require mzlib/restart) (define cpp-flags "/D _CRT_SECURE_NO_DEPRECATE /D WIN32") (define includes "/I ../../mzscheme/include /I . /I .. /I ../../mzcom")