Use (require (only ... foo))' instead of (require (rename ... foo foo))'

svn: r83
This commit is contained in:
Eli Barzilay 2005-06-09 23:01:05 +00:00
parent 06b511f323
commit 20eba137c6
19 changed files with 36 additions and 40 deletions

View File

@ -9,9 +9,9 @@
(lib "string.ss")
(lib "port.ss")
(lib "url-sig.ss" "net")
(rename (lib "html.ss" "html") read-html-as-xml read-html-as-xml)
(rename (lib "html.ss" "html") read-html-comments read-html-comments)
(rename (lib "html.ss" "html") use-html-spec use-html-spec)
(only (lib "html.ss" "html") read-html-as-xml)
(only (lib "html.ss" "html") read-html-comments)
(only (lib "html.ss" "html") use-html-spec)
(all-except (lib "xml.ss" "xml") read-comments)
(lib "class.ss")
"bullet.ss"

View File

@ -190,7 +190,6 @@
(datum->syntax-object
(quote-syntax here)
(list* (quote-syntax #%plain-module-begin)
(quote-syntax
(require-for-syntax (rename mzscheme syntax-rules syntax-rules)))
(quote-syntax (require-for-syntax (only mzscheme syntax-rules)))
(cdr (syntax-e stx)))
stx))))

View File

@ -2,7 +2,7 @@
(require "data-synthesis.ss"
"distributions.ss"
(rename (lib "frtime.ss" "frtime") undefined? undefined?)
(only (lib "frtime.ss" "frtime") undefined?)
)
;;filter: ('a -> bool) * 'a list -> 'a list
@ -103,4 +103,4 @@
;"Unholy-Data Variance:" (sample-variance unholy-data)
(provide inflate-data)
)
)

View File

@ -1442,7 +1442,7 @@
(apply lift true tmp-name args))
...))]
[(as-is:unchecked module id ...)
(syntax (begin clause ... (require (rename module id id) ...)))]
(syntax (begin clause ... (require (only module id) ...)))]
[(as-is module . ids)
(with-syntax ([(fun-name ...) (syntax ids)]
[(tmp-name ...) (generate-temporaries/loc stx #'ids)])

View File

@ -24,7 +24,7 @@
;(rename mzscheme mz:or or)
;(lib "list.ss")
(lib "contract.ss")
(rename "erl.ss" tid? tid?))
(only "erl.ss" tid?))
(define-syntax cond
(syntax-rules (else =>)

View File

@ -11,9 +11,9 @@
(lib "class100.ss")
(lib "etc.ss")
"erl.ss"
(rename "frp.ss" event-receiver event-receiver)
(only "frp.ss" event-receiver)
(rename "frp.ss" frp-man man)
(rename "frp.ss" send-event send-event)
(only "frp.ss" send-event)
"graphics-sig.ss")
(provide graphics-posn-less@)

View File

@ -3,7 +3,7 @@
(require (lifted (lib "list.ss") quicksort mergesort
fifth sixth seventh eighth
last-pair empty? cons?)
(rename (lib "list.ss") empty empty))
(only (lib "list.ss") empty))
(define first car)
(define rest cdr)
@ -152,4 +152,4 @@
[(f (first l)) (cons (first l) (filter f (rest l)))]
[else (filter f (rest l))]))
(provide (all-defined) empty))
(provide (all-defined) empty))

View File

@ -1,5 +1,5 @@
(module honu-module mzscheme
(require (rename "dynamic.ss" #%dynamic-honu-module-begin #%dynamic-honu-module-begin))
(require (only "dynamic.ss" #%dynamic-honu-module-begin))
(define-syntax (honu-module-begin stx)
(syntax-case stx (dynamic)

View File

@ -75,7 +75,7 @@
;; For quasiquote and shared:
(require (rename "teachprims.ss" the-cons advanced-cons))
(require (rename "teachprims.ss" cyclic-list? cyclic-list?))
(require (only "teachprims.ss" cyclic-list?))
;; Referenced to ensure that evaluating `lambda' always
;; produces a new closure (instead of using a closure

View File

@ -92,6 +92,6 @@
(list 'require-for-syntax
(datum->syntax-object
stx
'(rename mzscheme syntax-rules syntax-rules)))
'(only mzscheme syntax-rules)))
(cdr (syntax-e stx)))
stx))))

View File

@ -37,7 +37,7 @@
(require (lib "etc.ss" "mzlib")
(lib "optional.ss" "srfi")
(rename "search.ss" find find)
(only "search.ss" find)
"filter.ss"
(rename "fold.ss" s:map map))
@ -72,4 +72,4 @@
)
;;; alist.ss ends here
;;; alist.ss ends here

View File

@ -39,7 +39,7 @@
"predicate.ss"
"selector.ss"
"util.ss"
(rename "fold.ss" reduce-right reduce-right)
(only "fold.ss" reduce-right)
(rename "fold.ss" srfi-1:map map))
(require (lib "receive.ss" "srfi" "8"))
@ -195,4 +195,4 @@
(lp tail lis)))))
)
;;; misc.ss ends here
;;; misc.ss ends here

View File

@ -10,8 +10,7 @@
exn:ssax?
exn:ssax-port)
(require (rename (lib "13.ss" "srfi")
string-concatenate-reverse string-concatenate-reverse))
(require (only (lib "13.ss" "srfi") string-concatenate-reverse))
(require "define-opt.ss")
(require "ascii.ss")
@ -33,4 +32,4 @@
port)))
(require (lib "include.ss"))
(include "input-parse.scm"))
(include "input-parse.scm"))

View File

@ -9,9 +9,8 @@
string-split
make-char-quotator)
(require (rename (lib "13.ss" "srfi") string-index-right string-index-right)
(rename (lib "13.ss" "srfi") string-contains string-contains)
(rename (lib "13.ss" "srfi") string-null? string-null?))
(require (only (lib "13.ss" "srfi")
string-index-right string-contains string-null?))
(require (lib "23.ss" "srfi"))
(require "crementing.ss")
@ -19,4 +18,4 @@
(include "util.scm"))

View File

@ -21,13 +21,12 @@
ssax:xml->sxml
ssax:warn-parameter)
(require (rename (lib "1.ss" "srfi") cons* cons*))
(require (rename (lib "13.ss" "srfi") string-null? string-null?)
(rename (lib "13.ss" "srfi") string-index string-index)
(rename (lib "13.ss" "srfi")
string-concatenate/shared string-concatenate/shared)
(rename (lib "13.ss" "srfi")
string-concatenate-reverse/shared string-concatenate-reverse/shared))
(require (only (lib "1.ss" "srfi") cons*))
(require (only (lib "13.ss" "srfi")
string-null?
string-index
string-concatenate/shared
string-concatenate-reverse/shared))
(require "crementing.ss")
(require "input-parse.ss")

View File

@ -24,7 +24,7 @@
"text-syntax-object.ss"
"print-to-text.ss"
"test-case.ss"
(rename (lib "teachprims.ss" "lang" "private") beginner-equal? beginner-equal?))
(only (lib "teachprims.ss" "lang" "private") beginner-equal?))
(define-signature test-case-box^ (test-case-box% phase1 phase2))
(define test-case-box@

View File

@ -7,8 +7,8 @@
(lib "list.ss")
(lib "pretty.ss")
(lib "file.ss")
(rename (lib "configuration.ss" "web-server")
default-configuration-table-path default-configuration-table-path)
(only (lib "configuration.ss" "web-server")
default-configuration-table-path)
(lib "configuration-table-structs.ss" "web-server")
(lib "parse-table.ss" "web-server")
(all-except (lib "util.ss" "web-server") translate-escapes))

View File

@ -2,7 +2,7 @@
;; needed to write servlets. It is based on the *old* version of "servlet-sig.ss"
(module min-servlet mzscheme
(require (lib "xml.ss" "xml")
(rename "util.ss" translate-escapes translate-escapes))
(only "util.ss" translate-escapes))
(provide response?
(struct response/full (code message seconds mime extras body))
(struct response/incremental ())

View File

@ -3575,7 +3575,7 @@
(parameterize ([current-namespace n])
(namespace-attach-module orig '#%r5rs)
(namespace-require '#%r5rs)
(namespace-transformer-require '(rename mzscheme syntax-rules syntax-rules))
(namespace-transformer-require '(only mzscheme syntax-rules))
(unless stx-only?
(for-each
(lambda (n)
@ -3730,7 +3730,7 @@
;;----------------------------------------------------------------------
;; init namespace
(require (rename mzscheme namespace-require/copy namespace-require/copy))
(require (only mzscheme namespace-require/copy))
(begin
(namespace-require/copy 'mzscheme)