Remove/replace some dependencies on scheme-lib

This commit is contained in:
Asumu Takikawa 2013-11-26 23:51:03 -05:00
parent 09920bd8ce
commit dfe51373dd
20 changed files with 30 additions and 36 deletions

View File

@ -2,8 +2,7 @@
(define collection 'multi) (define collection 'multi)
(define build-deps '("scheme-lib" (define build-deps '("gui-doc"
"gui-doc"
"pict-doc" "pict-doc"
"at-exp-lib" "at-exp-lib"
"base" "base"

View File

@ -1,12 +1,12 @@
#readerscribble/reader #readerscribble/reader
(module blurbs scheme/base (module blurbs racket/base
(require scribble/struct (require scribble/struct
scribble/manual scribble/manual
scribble/scheme scribble/scheme
scribble/decode scribble/decode
(for-label racket/draw (for-label racket/draw
scheme/base) racket/base)
(for-syntax scheme/base)) (for-syntax racket/base))
(provide (all-defined-out)) (provide (all-defined-out))

View File

@ -2,7 +2,6 @@
(define collection 'multi) (define collection 'multi)
(define deps '("base" (define deps '("base"
"scheme-lib"
"rackunit-lib")) "rackunit-lib"))
(define pkg-desc "Testing framework") (define pkg-desc "Testing framework")

View File

@ -1,7 +1,7 @@
#lang racket/base #lang racket/base
(require scheme/match scheme/list scheme/string rackunit/log (require racket/match racket/list racket/string rackunit/log
(for-syntax scheme/base scheme/match)) (for-syntax racket/base racket/match))
(define-syntax (safe stx) (define-syntax (safe stx)
(syntax-case stx () (syntax-case stx ()

View File

@ -2,7 +2,7 @@
@(require scribble/manual @(require scribble/manual
scribble/bnf scribble/bnf
(for-label scheme (for-label racket
errortrace errortrace
errortrace/errortrace-lib errortrace/errortrace-lib
errortrace/stacktrace)) errortrace/stacktrace))

View File

@ -1,7 +1,6 @@
#lang info #lang info
(define collection 'multi) (define collection 'multi)
(define build-deps '("scheme-lib" (define build-deps '("racket-doc"
"racket-doc"
"base" "base"
"errortrace-lib" "errortrace-lib"
"scribble-lib")) "scribble-lib"))

View File

@ -13,5 +13,4 @@
"net-lib" "net-lib"
"racket-test" "racket-test"
"rackunit-lib" "rackunit-lib"
"scheme-lib"
"web-server-lib")) "web-server-lib"))

View File

@ -1,4 +1,4 @@
#lang scheme #lang racket
(require net/cgi (only-in net/uri-codec current-alist-separator-mode) (require net/cgi (only-in net/uri-codec current-alist-separator-mode)
tests/eli-tester) tests/eli-tester)

View File

@ -1,4 +1,4 @@
#lang scheme #lang racket
(require net/cookie tests/eli-tester) (require net/cookie tests/eli-tester)
;; cookie tests --- JBM, 2006-12-01 ;; cookie tests --- JBM, 2006-12-01

View File

@ -1,4 +1,4 @@
#lang scheme #lang racket
(require net/base64 net/qp tests/eli-tester) (require net/base64 net/qp tests/eli-tester)
(define tricky-strings (define tricky-strings
@ -83,7 +83,7 @@
#| #|
Use this to compare base64 encode/decode against the unix utilities Use this to compare base64 encode/decode against the unix utilities
(require net/base64 scheme/system) (require net/base64 racket/system)
(define (base64-encode* bstr) (define (base64-encode* bstr)
(let ([o (open-output-bytes)]) (let ([o (open-output-bytes)])
(parameterize ([current-output-port o] (parameterize ([current-output-port o]

View File

@ -1,4 +1,4 @@
#lang scheme #lang racket
(require net/head tests/eli-tester) (require net/head tests/eli-tester)
;; a few tests of head.rkt -- JBC, 2006-07-31 ;; a few tests of head.rkt -- JBC, 2006-07-31

View File

@ -1,4 +1,4 @@
#lang scheme #lang racket
(require net/uri-codec tests/eli-tester) (require net/uri-codec tests/eli-tester)
(provide tests) (provide tests)

View File

@ -1,4 +1,4 @@
(module reader scheme/base (module reader racket/base
(require syntax/module-reader (require syntax/module-reader
(only-in scribble/reader make-at-readtable)) (only-in scribble/reader make-at-readtable))

View File

@ -1,8 +1,7 @@
#lang info #lang info
(define collection 'multi) (define collection 'multi)
(define deps '("scheme-lib" (define deps '("base"))
"base"))
(define pkg-desc "Libraries for @-expressions") (define pkg-desc "Libraries for @-expressions")

View File

@ -1,9 +1,9 @@
#lang scheme/base #lang racket/base
(require (prefix-in scribble: scribble/reader) (require (prefix-in scribble: scribble/reader)
(rename-in syntax/module-reader (rename-in syntax/module-reader
[#%module-begin #%reader-module-begin])) [#%module-begin #%reader-module-begin]))
(provide (rename-out [module-begin #%module-begin]) (provide (rename-out [module-begin #%module-begin])
(except-out (all-from-out scheme/base) (except-out (all-from-out racket/base)
#%module-begin) #%module-begin)
scribble-base-info scribble-base-info
scribble-base-reader-info scribble-base-reader-info

View File

@ -1,7 +1,7 @@
;; ============================================================================ ;; ============================================================================
;; Implements the @-reader macro for embedding text in Scheme code. ;; Implements the @-reader macro for embedding text in Racket code.
#lang scheme/base #lang racket/base
(require syntax/readerr) (require syntax/readerr)
@ -391,7 +391,7 @@
(cond [(not xs) xs] (cond [(not xs) xs]
[(or (null? xs) (not (null? (cdr xs)))) [(or (null? xs) (not (null? (cdr xs))))
(read-error line col pos (read-error line col pos
"a ~a|...| form in Scheme mode must have ~a" "a ~a|...| form in Racket mode must have ~a"
ch:command ch:command
"exactly one escaped expression")] "exactly one escaped expression")]
[else (car xs)])) [else (car xs)]))
@ -478,7 +478,7 @@
stx ; no cmd part => just a parenthesized expression stx ; no cmd part => just a parenthesized expression
cmd ; no datums/lines => simple expression (no parens) cmd ; no datums/lines => simple expression (no parens)
;; impossible: either we saw []s or {}s, or we read a ;; impossible: either we saw []s or {}s, or we read a
;; scheme expression ;; racket expression
(internal-error 'dispatcher))] (internal-error 'dispatcher))]
[(stx) (let ([ds (and datums (length datums))] [(stx) (let ([ds (and datums (length datums))]
[ls (and lines (length lines))]) [ls (and lines (length lines))])
@ -552,7 +552,7 @@
(define at-rt (define at-rt
(make-readtable readtable command-char 'non-terminating-macro dispatcher)) (make-readtable readtable command-char 'non-terminating-macro dispatcher))
(define cmd-rt (define cmd-rt
;; similar to plain Scheme (scribble, actually), but with `@' as usual and ;; similar to plain Racket (scribble, actually), but with `@' as usual and
;; and `|' as a terminating macro characters (otherwise it behaves the ;; and `|' as a terminating macro characters (otherwise it behaves the
;; same; the only difference is that `a|b|c' is three symbols) ;; same; the only difference is that `a|b|c' is three symbols)
(make-readtable readtable (make-readtable readtable

View File

@ -10,5 +10,4 @@
(define build-deps '("racket-doc" (define build-deps '("racket-doc"
"rackunit-gui" "rackunit-gui"
"rackunit-lib" "rackunit-lib"
"scheme-lib"
"scribble-lib")) "scribble-lib"))

View File

@ -1,11 +1,11 @@
#lang scheme/base #lang racket/base
(require (require
scribble/eval scribble/eval
scribble/manual scribble/manual
(for-label scheme/base (for-label racket/base
scheme/contract racket/contract
rackunit rackunit
rackunit/text-ui rackunit/text-ui
rackunit/gui)) rackunit/gui))
@ -13,8 +13,8 @@
(provide (provide
(all-from-out scribble/eval (all-from-out scribble/eval
scribble/manual) scribble/manual)
(for-label (all-from-out scheme/base (for-label (all-from-out racket/base
scheme/contract racket/contract
rackunit rackunit
rackunit/text-ui rackunit/text-ui
rackunit/gui))) rackunit/gui)))

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(require rackunit (require rackunit
"file.rkt") "file.rkt")

View File

@ -1,4 +1,4 @@
#lang scheme/base #lang racket/base
(define (my-+ a b) (define (my-+ a b)
(if (zero? a) (if (zero? a)