A bunch of scheme' -> racket' conversions.

I think that there are no user-visible changes from these changes.
This commit is contained in:
Eli Barzilay 2012-04-19 13:06:10 -04:00
parent 6f215759ae
commit 2b76d9e5b0
95 changed files with 230 additions and 242 deletions

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require launcher compiler/embed)
(provide post-installer)

View File

@ -1,3 +1,3 @@
(module main scheme/base
(module main racket/base
(require "mred.rkt")
(provide (all-from-out "mred.rkt")))

View File

@ -1,4 +1,4 @@
#lang scheme/signature
#lang racket/signature
add-color<%>
add-editor-keymap-functions

View File

@ -1,6 +1,6 @@
#lang scheme/base
#lang racket/base
;; This module is for use by scheme/gui/dynamic.
;; This module is for use by racket/gui/dynamic.
;; It is required by mred/mred so that it gets carried
;; along when mred/mred is attached to a new namespace.

View File

@ -15,7 +15,7 @@
;; The `atomically' form is ok for that if no exceptions will
;; be raised. Otherwise, use the more heavyweight `as-entry'.
;;
;; * The scheme/gui classes have internal-consistency requirements.
;; * The racket/gui classes have internal-consistency requirements.
;; When the user creates an object or calls a method, or when the
;; system invokes a callback, many steps may be required to
;; initialize or reset fields to maintain invariants. To ensure that

View File

@ -3,7 +3,7 @@
define-namespace-anchor
namespace-anchor->empty-namespace
make-base-empty-namespace)
scheme/class
racket/class
racket/draw racket/snip
file/resource
mzlib/etc

View File

@ -5,7 +5,7 @@
racket/snip/private/prefs
"helper.rkt" "mrtop.rkt" "mritem.rkt" "mrpanel.rkt"
"mrtextfield.rkt" "messagebox.rkt" "mrmenu.rkt"
(only scheme/base compose))
(only racket/base compose1))
(provide path-dialog%)
(define last-visted-directory #f)
@ -46,9 +46,9 @@
(lambda (p . more)
(apply simplify-path (expand-path* p) more))))
(define directory-exists*? (compose directory-exists? expand-path*))
(define file-exists*? (compose file-exists? expand-path*))
(define absolute-path*? (compose absolute-path? expand-path*))
(define directory-exists*? (compose1 directory-exists? expand-path*))
(define file-exists*? (compose1 file-exists? expand-path*))
(define absolute-path*? (compose1 absolute-path? expand-path*))
(define (build-path* dir path)
(cond [(absolute-path*? path) (if (string? path) (string->path path) path)]

View File

@ -1,3 +1,3 @@
#lang scheme/base
#lang racket/base
(require racket/draw/private/syntax)
(provide (all-from-out racket/draw/private/syntax))

View File

@ -1,7 +1,7 @@
#lang racket/base
(require ffi/unsafe/objc
ffi/unsafe
scheme/class
racket/class
"pool.rkt"
"utils.rkt"
"const.rkt"

View File

@ -2,7 +2,7 @@
(require ffi/unsafe/objc
ffi/unsafe
racket/class
(only-in scheme/list take drop)
(only-in racket/list take drop)
"../../syntax.rkt"
"../../lock.rkt"
"item.rkt"

View File

@ -2,7 +2,7 @@
(require racket/class
ffi/unsafe
ffi/unsafe/objc
(only-in scheme/list drop take)
(only-in racket/list drop take)
"../common/event.rkt"
"../../syntax.rkt"
"../../lock.rkt"

View File

@ -1,6 +1,6 @@
#lang racket/base
(require ffi/unsafe
scheme/class
racket/class
"utils.rkt"
"types.rkt"
"const.rkt"

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(provide (all-defined-out))

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(define-syntax-rule (decl id set-id)
(begin

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"../syntax.rkt"
"private.rkt"
racket/snip/private/private

View File

@ -1,6 +1,6 @@
#lang scheme/base
(require scheme/class
scheme/file
#lang racket/base
(require racket/class
racket/file
"../syntax.rkt"
"editor.rkt"
"editor-admin.rkt"

View File

@ -1,7 +1,7 @@
#lang racket/base
(require scheme/class
scheme/file file/convertible
(require racket/class
racket/file file/convertible
"../syntax.rkt"
"private.rkt"
racket/snip/private/snip-flags

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"../syntax.rkt"
"private.rkt"
racket/snip/private/private

View File

@ -1,7 +1,7 @@
#lang scheme/base
(require scheme/class
(for-syntax scheme/base)
scheme/file
#lang racket/base
(require racket/class
(for-syntax racket/base)
racket/file
racket/port
"../syntax.rkt"
"private.rkt"

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"../syntax.rkt"
"wx.rkt")

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"../syntax.rkt"
"const.rkt"
racket/snip/private/snip

View File

@ -1,7 +1,7 @@
#lang scheme/base
(require scheme/class
scheme/port
scheme/file
#lang racket/base
(require racket/class
racket/port
racket/file
"../syntax.rkt"
"const.rkt"
"private.rkt"

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class)
#lang racket/base
(require racket/class)
(provide (all-defined-out))

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"../syntax.rkt"
racket/snip/private/snip
racket/snip/private/snip-admin

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"../syntax.rkt"
"private.rkt"
racket/snip/private/private

View File

@ -1,8 +1,8 @@
#lang scheme/base
(require scheme/class
scheme/port
scheme/file
(for-syntax scheme/base)
#lang racket/base
(require racket/class
racket/port
racket/file
(for-syntax racket/base)
"../syntax.rkt"
"const.rkt"
"mline.rkt"

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"private.rkt"
racket/snip/private/private
racket/snip/private/snip

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"../syntax.rkt"
"cycle.rkt")

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require "../kernel.rkt" racket/draw/private/font-syms)
(define the-clipboard (get-the-clipboard))

View File

@ -6,7 +6,7 @@
(case-lambda [(strs) (apply bytes-append strs)] ; optimize common case
[(str . strss) (apply bytes-append (apply list* str strss))]))
(require (only-in scheme/list add-between))
(require (only-in racket/list add-between))
(define (bytes-join strs sep)
(cond [(not (and (list? strs) (andmap bytes? strs)))

View File

@ -4,9 +4,9 @@
"prop.rkt"
"misc.rkt"
racket/private/class-internal
scheme/stxparam)
racket/stxparam)
(require (for-syntax scheme/base))
(require (for-syntax racket/base))
(provide mixin-contract
make-mixin-contract

View File

@ -1,6 +1,6 @@
#lang racket/base
(require (for-syntax scheme/base))
(require (for-syntax racket/base))
(provide rand
rand-seed

View File

@ -1,4 +1,3 @@
(module date scheme/base
(module date racket/base
(require mzlib/date)
(provide (all-from-out mzlib/date)))

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
ffi/unsafe
ffi/unsafe/atomic
"../unsafe/cairo.rkt"

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"syntax.rkt")
(provide color%

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class)
#lang racket/base
(require racket/class)
(provide dc<%>)

View File

@ -1,16 +1,14 @@
#lang scheme/base
#lang racket/base
(require "syntax.rkt"
scheme/math
scheme/class
racket/math
racket/class
"../unsafe/cairo.rkt"
"fmod.rkt"
"point.rkt"
"transform.rkt"
"font.rkt"
(only-in scheme/base
[append s:append]
[reverse s:reverse]))
(only-in racket/base [append r:append] [reverse r:reverse]))
(provide dc-path%
(protect-out do-path
@ -46,12 +44,12 @@
(define/private (flatten-open!)
(unless (null? rev-open-points)
(set! open-points (s:append open-points (s:reverse rev-open-points)))
(set! open-points (r:append open-points (r:reverse rev-open-points)))
(set! rev-open-points null)))
(define/private (flatten-closed!)
(unless (null? rev-closed-points)
(set! closed-points (s:append closed-points (s:reverse rev-closed-points)))
(set! closed-points (r:append closed-points (r:reverse rev-closed-points)))
(set! rev-closed-points null)))
(define/public (get-closed-points) (flatten-closed!) closed-points)
@ -112,8 +110,8 @@
(define/public (append path)
(flatten-closed!)
(flatten-open!)
(set! closed-points (s:append closed-points (send path get-closed-points)))
(set! open-points (s:append open-points (send path get-open-points))))
(set! closed-points (r:append closed-points (send path get-closed-points)))
(set! open-points (r:append open-points (send path get-open-points))))
(def/public (reset)
(set! open-points null)
@ -131,8 +129,8 @@
(vector (vector-ref p 2) (vector-ref p 3)
(vector-ref p 0) (vector-ref p 1))))
l))])
(set! open-points (rev-one (s:reverse open-points)))
(set! closed-points (map rev-one (map s:reverse closed-points)))))
(set! open-points (rev-one (r:reverse open-points)))
(set! closed-points (map rev-one (map r:reverse closed-points)))))
(def/public (close)
(flatten-open!)
@ -291,7 +289,7 @@
pts))
(loop (+ start angle)
(- delta angle)))))))))
(for ([v (in-list (if ccw? (s:reverse pts) pts))])
(for ([v (in-list (if ccw? (r:reverse pts) pts))])
(if (or (pair? open-points)
(pair? rev-open-points))
(do-line-to (vector-ref v 0) (vector-ref v 1))

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require "syntax.rkt"
ffi/unsafe/atomic

View File

@ -1,7 +1,6 @@
#lang scheme/base
(require (for-syntax scheme/base)
scheme/foreign)
(unsafe!)
#lang racket/base
(require (for-syntax racket/base)
ffi/unsafe)
(provide define-definer
define-private-definer

View File

@ -1,7 +1,5 @@
#lang scheme/base
(require scheme/foreign)
(unsafe!)
#lang racket/base
(require ffi/unsafe)
(provide fmod)
(define fmod (get-ffi-obj 'fmod #f (_fun _double _double -> _double)))

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(provide family-symbol? style-symbol? weight-symbol?
smoothing-symbol? hinting-symbol?)

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
ffi/unsafe/atomic
"syntax.rkt"
"../unsafe/pango.rkt"

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"syntax.rkt")
(provide gl-config%)

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(provide with-holding)
@ -11,4 +11,3 @@
;; Ensure no inline:
(define done-with #f)
(set! done-with void)

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe
racket/runtime-path
ffi/winapi

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class)
#lang racket/base
(require racket/class)
(provide (protect-out (all-defined-out)))

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
ffi/unsafe/atomic
"color.rkt"
"syntax.rkt"

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
"syntax.rkt")
(provide point% point-x point-y

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
ffi/unsafe/atomic
"syntax.rkt"
"local.rkt"

View File

@ -1,7 +1,7 @@
#lang scheme/base
(require scheme/class
scheme/stxparam
(for-syntax scheme/base))
#lang racket/base
(require racket/class
racket/stxparam
(for-syntax racket/base))
(provide defclass defclass*
def/public def/pubment def/public-final def/override def/override-final define/top case-args

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe
ffi/unsafe/define
ffi/unsafe/alloc
@ -28,4 +28,3 @@
(ffi-lib "libcairo-2.dll")])
(provide (protect-out cairo-lib))

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe
ffi/unsafe/define
ffi/unsafe/alloc

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe
ffi/unsafe/define
"../private/libs.rkt")

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe
ffi/unsafe/define
ffi/unsafe/alloc

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe
ffi/unsafe/define
ffi/unsafe/alloc

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe
ffi/unsafe/define
ffi/unsafe/alloc

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require '#%flfxnum
"private/vector-wraps.rkt"

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require ffi/unsafe)
(provide gui-available?

View File

@ -1,4 +1,3 @@
(module init scheme/gui
(require scheme/init)

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require launcher)
(provide post-installer)

View File

@ -317,7 +317,7 @@
[(f l1 l2) (apply append (map f l1 l2))]
[(f l . ls) (apply append (apply map f l ls))]))
;; this is an exact copy of `filter' in scheme/private/list, with the
;; this is an exact copy of `filter' in racket/private/list, with the
;; `if' branches swapped.
(define (filter-not f list)
(unless (and (procedure? f)

View File

@ -1,5 +1,6 @@
#lang scheme/base
(require (for-syntax scheme/base)
#lang racket/base
(require (for-syntax racket/base)
"private/local.rkt")
(provide local)

View File

@ -1,12 +1,12 @@
#lang scheme/base
#lang racket/base
(require (for-template scheme/base "runtime.rkt" scheme/stxparam racket/unsafe/ops)
(require (for-template racket/base "runtime.rkt" racket/stxparam racket/unsafe/ops)
syntax/boundmap
syntax/stx
"patterns.rkt"
"split-rows.rkt"
"reorder.rkt"
scheme/stxparam
racket/stxparam
scheme/nest
racket/syntax)

View File

@ -1,6 +1,6 @@
#lang scheme/base
#lang racket/base
(require (for-syntax scheme/base
(require (for-syntax racket/base
racket/syntax
(only-in racket/list append* remove-duplicates)
unstable/sequence

View File

@ -1,8 +1,8 @@
#lang scheme/base
#lang racket/base
(require "patterns.rkt" "compiler.rkt"
syntax/stx scheme/nest syntax/parse
(for-template scheme/base (only-in "runtime.rkt" match:error)))
(for-template racket/base (only-in "runtime.rkt" match:error)))
(provide go go/one)

View File

@ -1,6 +1,6 @@
#lang scheme/base
#lang racket/base
(require (for-syntax scheme/base
(require (for-syntax racket/base
"patterns.rkt"))
(provide define-match-expander)

View File

@ -1,8 +1,8 @@
#lang scheme/base
#lang racket/base
(require (for-template scheme/base)
(require (for-template racket/base)
syntax/boundmap
scheme/struct-info
racket/struct-info
;macro-debugger/emit
"patterns.rkt")
@ -181,7 +181,7 @@
'match "invalid number for ..k pattern"
s*)]))))))
;; parse-literal : scheme-val -> pat option
;; parse-literal : racket-val -> pat option
;; is v is a literal, return a pattern matching it
;; otherwise, return #f
(define (parse-literal v)

View File

@ -1,6 +1,6 @@
#lang scheme/base
#lang racket/base
(require (for-template scheme/base)
(require (for-template racket/base)
"patterns.rkt"
"parse-helper.rkt")

View File

@ -1,11 +1,11 @@
#lang scheme/base
#lang racket/base
(require scheme/struct-info
(require racket/struct-info
"patterns.rkt"
"parse-helper.rkt"
"parse-quasi.rkt"
(for-template (only-in "runtime.rkt" matchable?)
scheme/base))
racket/base))
(provide parse)

View File

@ -79,7 +79,7 @@
(define-struct (GSeq Pat) (headss mins maxs onces? tail mutable?) #:transparent)
;; match with equal?
;; v is a quotable scheme value
;; v is a quotable racket value
(define-struct (Exact Pat) (v) #:transparent)
;; pats is a Listof Pat

View File

@ -1,7 +1,7 @@
#lang scheme/base
#lang racket/base
(require "patterns.rkt"
(for-syntax scheme/base))
(for-syntax racket/base))
(provide reorder-columns)

View File

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

View File

@ -3,7 +3,7 @@
;; math.rkt: some extra math routines
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
#lang scheme/base
#lang racket/base
(provide pi
sqr
sgn conjugate
@ -62,7 +62,7 @@
#|
;; Timing tests below provided by Jos Koot for the order-of-magnitude function
#lang scheme
#lang racket
;;; Tests and timings of order-of-magnitude

View File

@ -1,6 +1,6 @@
#lang scheme/base
#lang racket/base
(require (for-syntax scheme/base)
(require (for-syntax racket/base)
"performance-hint.rkt")
(provide mmap

View File

@ -1,6 +1,6 @@
#lang scheme/base
(require (for-syntax scheme/base
scheme/list
#lang racket/base
(require (for-syntax racket/base
racket/list
syntax/kerncase
syntax/boundmap
syntax/define

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(provide find-relative-path
explode-path

View File

@ -26,7 +26,7 @@
;;--------------------------------------------------------------------
(provide provide-public-names
;; needed for Typed Scheme
;; needed for Typed Racket
(protect-out do-make-object find-method/who))
(define-syntax-rule (provide-public-names)
(provide class class* class/derived
@ -318,8 +318,8 @@
(append
(kernel-form-identifier-list)
(list
(quote-syntax #%app) ; scheme/base app, as opposed to #%plain-app
(quote-syntax lambda) ; scheme/base lambda, as opposed to #%plain-lambda
(quote-syntax #%app) ; racket/base app, as opposed to #%plain-app
(quote-syntax lambda) ; racket/base lambda, as opposed to #%plain-lambda
(quote-syntax -init)
(quote-syntax -init-rest)
(quote-syntax -field)
@ -4892,4 +4892,3 @@
(struct-out exn:fail:object)
make-primitive-class
class/c ->m ->*m ->dm case->m object/c instanceof/c)

View File

@ -1,8 +1,8 @@
#lang racket/base
(require syntax/stx
(for-syntax scheme/base)
(for-template scheme/base "class-events.rkt"))
(for-syntax racket/base)
(for-template racket/base "class-events.rkt"))
(define insp (variable-reference->module-declaration-inspector
(#%variable-reference)))

View File

@ -1,5 +1,4 @@
;; A sane "core" for finishing up the "scheme/base" library
;; A sane "core" for finishing up the "racket/base" library
(module pre-base '#%kernel
(#%require (for-syntax '#%kernel))

View File

@ -19,7 +19,7 @@ code.
Note that there is no error checking on the arguments -- the `sort' function
that this module provide is then wrapped up by a keyworded version in
"scheme/private/list.rkt", and that's what everybody sees. The wrapper is
"racket/private/list.rkt", and that's what everybody sees. The wrapper is
doing these checks.
|#

View File

@ -1,6 +1,6 @@
#lang scheme/base
#lang racket/base
(require (for-syntax scheme/base scheme/provide-transform scheme/list
(require (for-syntax racket/base racket/provide-transform racket/list
(only-in racket/syntax syntax-local-eval)))
(provide matching-identifiers-out)

View File

@ -1,9 +1,8 @@
#lang scheme/base
#lang racket/base
(provide define-require-syntax)
(require (for-syntax racket/base
"require-transform.rkt"))
(require (for-syntax racket/base "require-transform.rkt"))
(define-for-syntax orig-insp (variable-reference->module-declaration-inspector
(#%variable-reference)))

View File

@ -1,6 +1,6 @@
#lang scheme/base
#lang racket/base
(require (for-syntax scheme/base scheme/require-transform scheme/list
(require (for-syntax racket/base racket/require-transform racket/list
(only-in racket/syntax syntax-local-eval))
"require-syntax.rkt")

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require mzlib/shared)
(provide shared)

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class)
#lang racket/base
(require racket/class)
(provide (all-defined-out))

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require scheme/class
#lang racket/base
(require racket/class
racket/draw/private/syntax
"snip.rkt")

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require (for-syntax scheme/base))
#lang racket/base
(require (for-syntax racket/base))
(provide (all-defined-out))

View File

@ -1,6 +1,6 @@
#lang scheme/base
(require scheme/class
scheme/file file/convertible
#lang racket/base
(require racket/class
racket/file file/convertible
"snip-flags.rkt"
"load-one.rkt"
"style.rkt"

View File

@ -1,7 +1,7 @@
#lang scheme/base
(require scheme/class
scheme/file
(for-syntax scheme/base)
#lang racket/base
(require racket/class
racket/file
(for-syntax racket/base)
racket/draw
racket/draw/private/syntax
racket/draw/private/font-syms

View File

@ -1,5 +1,5 @@
#lang scheme/base
(require (for-syntax scheme/base
#lang racket/base
(require (for-syntax racket/base
syntax/kerncase
racket/syntax)
"private/stxparam.rkt"

View File

@ -10,7 +10,7 @@
[(s1 s2 s3 s4 strs) (apply string-append s1 s2 s3 s4 strs)]
[(str . strss) (apply apply string-append str strss)]))
(require (only-in scheme/list add-between))
(require (only-in racket/list add-between))
(define (string-join strs sep)
(cond [(not (and (list? strs) (andmap string? strs)))

View File

@ -1,7 +1,7 @@
#lang scheme/base
#lang racket/base
(require scheme/class
(for-syntax scheme/base))
(require racket/class
(for-syntax racket/base))
(provide surrogate)

View File

@ -1,4 +1,3 @@
(module system scheme/base
(module system racket/base
(require mzlib/process)
(provide (all-from-out mzlib/process)))

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require mzlib/unit-exptime)
(provide (all-from-out mzlib/unit-exptime))

View File

@ -1,4 +1,4 @@
#lang scheme/base
#lang racket/base
(require '#%unsafe
'#%flfxnum)