suzanne.soy/compatibility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new require specs in many places

Browse Source 
svn: r8774

original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f
This commit is contained in:
Eli Barzilay 2008-02-23 09:42:03 +00:00
parent ce59444e81
commit 0cc6039906
49 changed files with 127 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collects/mzlib/a-unit.ss
View File

@ -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)

2
collects/mzlib/awk.ss
View File

@ -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)

6
collects/mzlib/cm.ss
View File

@ -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

2
collects/mzlib/cml.ss
View File

@ -1,6 +1,6 @@
(module cml mzscheme
(require (lib "contract.ss"))
(require mzlib/contract)
(define (spawn thunk)
(thread/suspend-to-kill thunk))

2
collects/mzlib/defmacro.ss
View File

@ -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

6
collects/mzlib/etc.ss
View File

@ -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")

4
collects/mzlib/foreign.ss
View File

@ -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

4
collects/mzlib/include.ss
View File

@ -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

4
collects/mzlib/integer-set.ss
View File

@ -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 ()

2
collects/mzlib/kw.ss
View File

@ -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

5
collects/mzlib/os.ss
View File

@ -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"))))

6
collects/mzlib/port.ss
View File

@ -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)

4
collects/mzlib/pregexp.ss
View File

@ -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

4
collects/mzlib/private/package-helper.ss
View File

@ -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

6
collects/mzlib/private/sigutil.ss
View File

@ -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")

2
collects/mzlib/private/structure-helper.ss
View File

@ -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))

4
collects/mzlib/private/stxset.ss
View File

@ -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)

2
collects/mzlib/process.ss
View File

@ -9,7 +9,7 @@
system/exit-code
system*/exit-code)
(require (lib "port.ss"))
(require mzlib/port)
;; Helpers: ----------------------------------------

6
collects/mzlib/runtime-path.ss
View File

@ -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

12
collects/mzlib/sandbox.ss
View File

@ -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))

12
collects/mzlib/serialize.ss
View File

@ -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

4
collects/mzlib/struct.ss
View File

@ -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

2
collects/mzlib/surrogate.ss
View File

@ -1,5 +1,5 @@
(module surrogate mzscheme
(require (lib "class.ss"))
(require mzlib/class)
(provide surrogate)

2
collects/mzlib/tar.ss
View File

@ -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)

2
collects/mzlib/transcr.ss
View File

@ -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))

16
collects/mzlib/unit.ss
View File

@ -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))

8
collects/mzlib/unit200.ss
View File

@ -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")

4
collects/mzlib/unitsig.ss
View File

@ -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)))

2
collects/mzlib/unitsig200.ss
View File

@ -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))

2
collects/mzlib/zip.ss
View File

@ -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

2
collects/net/cgi-unit.ss
View File

@ -1,6 +1,6 @@
#lang scheme/unit
(require (lib "etc.ss")
(require mzlib/etc
"cgi-sig.ss"
"uri-codec.ss")

8
collects/net/cookie-unit.ss
View File

@ -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)

2
collects/net/dns-unit.ss
View File

@ -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)

2
collects/net/head-unit.ss
View File

@ -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^)

6
collects/net/mime-unit.ss
View File

@ -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^)

2
collects/net/qp-unit.ss
View File

@ -29,7 +29,7 @@
#lang scheme/unit
(require "qp-sig.ss"
(lib "etc.ss"))
mzlib/etc)
(import)
(export qp^)

2
collects/net/sendmail-unit.ss
View File

@ -1,6 +1,6 @@
#lang scheme/unit
(require (lib "process.ss") "sendmail-sig.ss")
(require mzlib/process "sendmail-sig.ss")
(import)
(export sendmail^)

8
collects/net/uri-codec-unit.ss
View File

@ -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)

12
collects/net/url-unit.ss
View File

@ -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"

2
collects/tests/mzscheme/awk.ss
View File

@ -3,7 +3,7 @@
(Section 'awk)
(require (lib "awk.ss"))
(require mzlib/awk)
(define-syntax (test-awk stx)
(syntax-case stx ()

2
collects/tests/mzscheme/compat.ss
View File

@ -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))

54
collects/tests/mzscheme/contract-mzlib-test.ss
View File

@ -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))

2
collects/tests/mzscheme/etc.ss
View File

@ -3,7 +3,7 @@
(Section 'etc)
(require (lib "etc.ss"))
(require mzlib/etc)
(let ()
(begin-with-definitions

2
collects/tests/mzscheme/kw.ss
View File

@ -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)])]

2
collects/tests/mzscheme/macrolib.ss
View File

@ -3,7 +3,7 @@
(Section 'macrolib)
(require (lib "etc.ss"))
(require mzlib/etc)
(let ([u (letrec ([x x]) x)])
(let ([l1

6
collects/tests/mzscheme/pconvert.ss
View File

@ -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)

2
collects/tests/mzscheme/restart.ss
View File

@ -1,7 +1,7 @@
(load-relative "loadtest.ss")
(require (lib "restart.ss"))
(require mzlib/restart)
(Section 'restart)

2
collects/tests/mzscheme/structlib.ss
View File

@ -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)])

2
collects/tests/mzscheme/threadlib.ss
View File

@ -3,7 +3,7 @@
(Section 'threadlib)
(require (lib "thread.ss"))
(require mzlib/thread)
(define sema (make-semaphore))
(define sema2 (make-semaphore))