From 2b76d9e5b03ea97b8de155d2dda63e64256a3212 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Thu, 19 Apr 2012 13:06:10 -0400 Subject: [PATCH] A bunch of `scheme' -> `racket' conversions. I think that there are no user-visible changes from these changes. --- collects/mred/installer.rkt | 2 +- collects/mred/main.rkt | 2 +- collects/mred/mred-sig.rkt | 2 +- collects/mred/private/dynamic.rkt | 4 +- collects/mred/private/lock.rkt | 2 +- collects/mred/private/mred.rkt | 2 +- collects/mred/private/path-dialog.rkt | 10 ++--- collects/mred/private/syntax.rkt | 2 +- collects/mred/private/wx/cocoa/frame.rkt | 2 +- collects/mred/private/wx/cocoa/list-box.rkt | 2 +- collects/mred/private/wx/cocoa/menu.rkt | 2 +- collects/mred/private/wx/win32/menu-item.rkt | 2 +- collects/mred/private/wxme/const.rkt | 2 +- collects/mred/private/wxme/cycle.rkt | 2 +- collects/mred/private/wxme/editor-admin.rkt | 4 +- collects/mred/private/wxme/editor-canvas.rkt | 6 +-- collects/mred/private/wxme/editor-data.rkt | 4 +- collects/mred/private/wxme/editor-snip.rkt | 4 +- collects/mred/private/wxme/editor.rkt | 8 ++-- collects/mred/private/wxme/keymap.rkt | 4 +- collects/mred/private/wxme/mline.rkt | 4 +- collects/mred/private/wxme/pasteboard.rkt | 8 ++-- collects/mred/private/wxme/private.rkt | 4 +- .../mred/private/wxme/standard-snip-admin.rkt | 4 +- collects/mred/private/wxme/stream.rkt | 4 +- collects/mred/private/wxme/text.rkt | 10 ++--- collects/mred/private/wxme/undo.rkt | 4 +- collects/mred/private/wxme/wordbreak.rkt | 4 +- collects/mred/private/wxme/wx.rkt | 2 +- collects/racket/bytes.rkt | 2 +- collects/racket/contract/private/object.rkt | 8 ++-- collects/racket/contract/private/rand.rkt | 2 +- collects/racket/date.rkt | 3 +- collects/racket/draw/private/brush.rkt | 4 +- collects/racket/draw/private/color.rkt | 4 +- collects/racket/draw/private/dc-intf.rkt | 4 +- collects/racket/draw/private/dc-path.rkt | 24 +++++------ collects/racket/draw/private/dc.rkt | 2 +- collects/racket/draw/private/define.rkt | 7 ++-- collects/racket/draw/private/fmod.rkt | 6 +-- collects/racket/draw/private/font-syms.rkt | 2 +- collects/racket/draw/private/font.rkt | 4 +- collects/racket/draw/private/gl-config.rkt | 6 +-- collects/racket/draw/private/hold.rkt | 3 +- collects/racket/draw/private/libs.rkt | 10 ++--- collects/racket/draw/private/local.rkt | 4 +- collects/racket/draw/private/pen.rkt | 4 +- collects/racket/draw/private/point.rkt | 4 +- collects/racket/draw/private/region.rkt | 4 +- collects/racket/draw/private/syntax.rkt | 8 ++-- collects/racket/draw/unsafe/cairo-lib.rkt | 9 ++--- collects/racket/draw/unsafe/cairo.rkt | 2 +- collects/racket/draw/unsafe/glib.rkt | 18 ++++----- collects/racket/draw/unsafe/jpeg.rkt | 2 +- collects/racket/draw/unsafe/pango.rkt | 18 ++++----- collects/racket/draw/unsafe/png.rkt | 40 +++++++++---------- collects/racket/fixnum.rkt | 2 +- collects/racket/gui/dynamic.rkt | 2 +- collects/racket/gui/init.rkt | 1 - collects/racket/gui/installer.rkt | 2 +- collects/racket/list.rkt | 2 +- collects/racket/local.rkt | 5 ++- collects/racket/match/compiler.rkt | 6 +-- collects/racket/match/define-forms.rkt | 4 +- collects/racket/match/gen-match.rkt | 4 +- collects/racket/match/match-expander.rkt | 4 +- collects/racket/match/parse-helper.rkt | 8 ++-- collects/racket/match/parse-quasi.rkt | 4 +- collects/racket/match/parse.rkt | 6 +-- collects/racket/match/patterns.rkt | 2 +- collects/racket/match/reorder.rkt | 4 +- collects/racket/match/split-rows.rkt | 2 +- collects/racket/math.rkt | 4 +- collects/racket/mpair.rkt | 4 +- collects/racket/package.rkt | 6 +-- collects/racket/path.rkt | 2 +- collects/racket/private/class-internal.rkt | 11 +++-- collects/racket/private/classidmap.rkt | 4 +- collects/racket/private/pre-base.rkt | 3 +- collects/racket/private/sort.rkt | 2 +- collects/racket/provide.rkt | 4 +- collects/racket/require-syntax.rkt | 5 +-- collects/racket/require.rkt | 4 +- collects/racket/shared.rkt | 2 +- collects/racket/snip/private/private.rkt | 4 +- collects/racket/snip/private/snip-admin.rkt | 4 +- collects/racket/snip/private/snip-flags.rkt | 4 +- collects/racket/snip/private/snip.rkt | 6 +-- collects/racket/snip/private/style.rkt | 10 ++--- collects/racket/splicing.rkt | 4 +- collects/racket/string.rkt | 2 +- collects/racket/surrogate.rkt | 6 +-- collects/racket/system.rkt | 3 +- collects/racket/unit-exptime.rkt | 2 +- collects/racket/unsafe/ops.rkt | 2 +- 95 files changed, 230 insertions(+), 242 deletions(-) diff --git a/collects/mred/installer.rkt b/collects/mred/installer.rkt index f6119fe3e4..893e58fbeb 100644 --- a/collects/mred/installer.rkt +++ b/collects/mred/installer.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require launcher compiler/embed) (provide post-installer) diff --git a/collects/mred/main.rkt b/collects/mred/main.rkt index e184600892..ccbbdfa738 100644 --- a/collects/mred/main.rkt +++ b/collects/mred/main.rkt @@ -1,3 +1,3 @@ -(module main scheme/base +(module main racket/base (require "mred.rkt") (provide (all-from-out "mred.rkt"))) diff --git a/collects/mred/mred-sig.rkt b/collects/mred/mred-sig.rkt index f3bb5b34c0..bc49ba6e45 100644 --- a/collects/mred/mred-sig.rkt +++ b/collects/mred/mred-sig.rkt @@ -1,4 +1,4 @@ -#lang scheme/signature +#lang racket/signature add-color<%> add-editor-keymap-functions diff --git a/collects/mred/private/dynamic.rkt b/collects/mred/private/dynamic.rkt index 0fd5c23fef..8909430336 100644 --- a/collects/mred/private/dynamic.rkt +++ b/collects/mred/private/dynamic.rkt @@ -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. diff --git a/collects/mred/private/lock.rkt b/collects/mred/private/lock.rkt index 7d50f669ba..60f49b871c 100644 --- a/collects/mred/private/lock.rkt +++ b/collects/mred/private/lock.rkt @@ -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 diff --git a/collects/mred/private/mred.rkt b/collects/mred/private/mred.rkt index 050e8bb5d4..87e4af7388 100644 --- a/collects/mred/private/mred.rkt +++ b/collects/mred/private/mred.rkt @@ -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 diff --git a/collects/mred/private/path-dialog.rkt b/collects/mred/private/path-dialog.rkt index 1ccbe561fe..4e16e856e8 100644 --- a/collects/mred/private/path-dialog.rkt +++ b/collects/mred/private/path-dialog.rkt @@ -1,11 +1,11 @@ (module path-dialog mzscheme (require mzlib/class mzlib/list mzlib/string mzlib/file (prefix wx: "kernel.rkt") - (prefix wx: racket/snip/private/style) + (prefix wx: racket/snip/private/style) 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)] diff --git a/collects/mred/private/syntax.rkt b/collects/mred/private/syntax.rkt index 431e1a26c3..b7b478001f 100644 --- a/collects/mred/private/syntax.rkt +++ b/collects/mred/private/syntax.rkt @@ -1,3 +1,3 @@ -#lang scheme/base +#lang racket/base (require racket/draw/private/syntax) (provide (all-from-out racket/draw/private/syntax)) diff --git a/collects/mred/private/wx/cocoa/frame.rkt b/collects/mred/private/wx/cocoa/frame.rkt index f16baaf030..aecae01209 100644 --- a/collects/mred/private/wx/cocoa/frame.rkt +++ b/collects/mred/private/wx/cocoa/frame.rkt @@ -1,7 +1,7 @@ #lang racket/base (require ffi/unsafe/objc ffi/unsafe - scheme/class + racket/class "pool.rkt" "utils.rkt" "const.rkt" diff --git a/collects/mred/private/wx/cocoa/list-box.rkt b/collects/mred/private/wx/cocoa/list-box.rkt index e45b2e08aa..19e6524e6a 100644 --- a/collects/mred/private/wx/cocoa/list-box.rkt +++ b/collects/mred/private/wx/cocoa/list-box.rkt @@ -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" diff --git a/collects/mred/private/wx/cocoa/menu.rkt b/collects/mred/private/wx/cocoa/menu.rkt index 0162bc21c8..e4145a32b8 100644 --- a/collects/mred/private/wx/cocoa/menu.rkt +++ b/collects/mred/private/wx/cocoa/menu.rkt @@ -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" diff --git a/collects/mred/private/wx/win32/menu-item.rkt b/collects/mred/private/wx/win32/menu-item.rkt index 1f0bcd7882..e57fbd4b60 100644 --- a/collects/mred/private/wx/win32/menu-item.rkt +++ b/collects/mred/private/wx/win32/menu-item.rkt @@ -1,6 +1,6 @@ #lang racket/base (require ffi/unsafe - scheme/class + racket/class "utils.rkt" "types.rkt" "const.rkt" diff --git a/collects/mred/private/wxme/const.rkt b/collects/mred/private/wxme/const.rkt index 37c0eb4aa5..cc9dfe1ab0 100644 --- a/collects/mred/private/wxme/const.rkt +++ b/collects/mred/private/wxme/const.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide (all-defined-out)) diff --git a/collects/mred/private/wxme/cycle.rkt b/collects/mred/private/wxme/cycle.rkt index e55be69c6b..0823028435 100644 --- a/collects/mred/private/wxme/cycle.rkt +++ b/collects/mred/private/wxme/cycle.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (define-syntax-rule (decl id set-id) (begin diff --git a/collects/mred/private/wxme/editor-admin.rkt b/collects/mred/private/wxme/editor-admin.rkt index 20d0fe0744..8d3267d1b6 100644 --- a/collects/mred/private/wxme/editor-admin.rkt +++ b/collects/mred/private/wxme/editor-admin.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "../syntax.rkt" "private.rkt" racket/snip/private/private diff --git a/collects/mred/private/wxme/editor-canvas.rkt b/collects/mred/private/wxme/editor-canvas.rkt index d2cf51f087..e281bb47a9 100644 --- a/collects/mred/private/wxme/editor-canvas.rkt +++ b/collects/mred/private/wxme/editor-canvas.rkt @@ -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" diff --git a/collects/mred/private/wxme/editor-data.rkt b/collects/mred/private/wxme/editor-data.rkt index f8905be612..1d07db510c 100644 --- a/collects/mred/private/wxme/editor-data.rkt +++ b/collects/mred/private/wxme/editor-data.rkt @@ -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 diff --git a/collects/mred/private/wxme/editor-snip.rkt b/collects/mred/private/wxme/editor-snip.rkt index e539b59cbf..d29442be9c 100644 --- a/collects/mred/private/wxme/editor-snip.rkt +++ b/collects/mred/private/wxme/editor-snip.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "../syntax.rkt" "private.rkt" racket/snip/private/private diff --git a/collects/mred/private/wxme/editor.rkt b/collects/mred/private/wxme/editor.rkt index edb1c657bb..a6c485ed22 100644 --- a/collects/mred/private/wxme/editor.rkt +++ b/collects/mred/private/wxme/editor.rkt @@ -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" diff --git a/collects/mred/private/wxme/keymap.rkt b/collects/mred/private/wxme/keymap.rkt index 505420285c..cb68fb1621 100644 --- a/collects/mred/private/wxme/keymap.rkt +++ b/collects/mred/private/wxme/keymap.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "../syntax.rkt" "wx.rkt") diff --git a/collects/mred/private/wxme/mline.rkt b/collects/mred/private/wxme/mline.rkt index d2b9c8d3d7..cda3166d39 100644 --- a/collects/mred/private/wxme/mline.rkt +++ b/collects/mred/private/wxme/mline.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "../syntax.rkt" "const.rkt" racket/snip/private/snip diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt index 7320720de3..69e6eae498 100644 --- a/collects/mred/private/wxme/pasteboard.rkt +++ b/collects/mred/private/wxme/pasteboard.rkt @@ -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" diff --git a/collects/mred/private/wxme/private.rkt b/collects/mred/private/wxme/private.rkt index 8e77adb87b..fdd9f7e30b 100644 --- a/collects/mred/private/wxme/private.rkt +++ b/collects/mred/private/wxme/private.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class) +#lang racket/base +(require racket/class) (provide (all-defined-out)) diff --git a/collects/mred/private/wxme/standard-snip-admin.rkt b/collects/mred/private/wxme/standard-snip-admin.rkt index 0f2bb3147b..5f6be7d10e 100644 --- a/collects/mred/private/wxme/standard-snip-admin.rkt +++ b/collects/mred/private/wxme/standard-snip-admin.rkt @@ -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 diff --git a/collects/mred/private/wxme/stream.rkt b/collects/mred/private/wxme/stream.rkt index dbb32cbe9d..bb1882608b 100644 --- a/collects/mred/private/wxme/stream.rkt +++ b/collects/mred/private/wxme/stream.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "../syntax.rkt" "private.rkt" racket/snip/private/private diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt index f9da2b8f86..73cbfdd414 100644 --- a/collects/mred/private/wxme/text.rkt +++ b/collects/mred/private/wxme/text.rkt @@ -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" diff --git a/collects/mred/private/wxme/undo.rkt b/collects/mred/private/wxme/undo.rkt index a304d4ca36..cddc0cc2bf 100644 --- a/collects/mred/private/wxme/undo.rkt +++ b/collects/mred/private/wxme/undo.rkt @@ -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 diff --git a/collects/mred/private/wxme/wordbreak.rkt b/collects/mred/private/wxme/wordbreak.rkt index bc156d16a1..b56f02c41a 100644 --- a/collects/mred/private/wxme/wordbreak.rkt +++ b/collects/mred/private/wxme/wordbreak.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "../syntax.rkt" "cycle.rkt") diff --git a/collects/mred/private/wxme/wx.rkt b/collects/mred/private/wxme/wx.rkt index e8a845abef..ebe2544585 100644 --- a/collects/mred/private/wxme/wx.rkt +++ b/collects/mred/private/wxme/wx.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../kernel.rkt" racket/draw/private/font-syms) (define the-clipboard (get-the-clipboard)) diff --git a/collects/racket/bytes.rkt b/collects/racket/bytes.rkt index f10219127a..19aaa4ee6b 100644 --- a/collects/racket/bytes.rkt +++ b/collects/racket/bytes.rkt @@ -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))) diff --git a/collects/racket/contract/private/object.rkt b/collects/racket/contract/private/object.rkt index 924676ef2d..2b92f624f6 100644 --- a/collects/racket/contract/private/object.rkt +++ b/collects/racket/contract/private/object.rkt @@ -4,14 +4,14 @@ "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 - is-a?/c - subclass?/c + is-a?/c + subclass?/c implementation?/c object-contract) diff --git a/collects/racket/contract/private/rand.rkt b/collects/racket/contract/private/rand.rkt index 20046ceace..b852cf762e 100644 --- a/collects/racket/contract/private/rand.rkt +++ b/collects/racket/contract/private/rand.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require (for-syntax scheme/base)) +(require (for-syntax racket/base)) (provide rand rand-seed diff --git a/collects/racket/date.rkt b/collects/racket/date.rkt index 63599f508f..53e336af93 100644 --- a/collects/racket/date.rkt +++ b/collects/racket/date.rkt @@ -1,4 +1,3 @@ - -(module date scheme/base +(module date racket/base (require mzlib/date) (provide (all-from-out mzlib/date))) diff --git a/collects/racket/draw/private/brush.rkt b/collects/racket/draw/private/brush.rkt index f33da0452c..ff8b6013ba 100644 --- a/collects/racket/draw/private/brush.rkt +++ b/collects/racket/draw/private/brush.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class ffi/unsafe ffi/unsafe/atomic "../unsafe/cairo.rkt" diff --git a/collects/racket/draw/private/color.rkt b/collects/racket/draw/private/color.rkt index cb44086cfc..a55f78b54e 100644 --- a/collects/racket/draw/private/color.rkt +++ b/collects/racket/draw/private/color.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "syntax.rkt") (provide color% diff --git a/collects/racket/draw/private/dc-intf.rkt b/collects/racket/draw/private/dc-intf.rkt index b5d7f4fd8f..0f053c9cf0 100644 --- a/collects/racket/draw/private/dc-intf.rkt +++ b/collects/racket/draw/private/dc-intf.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class) +#lang racket/base +(require racket/class) (provide dc<%>) diff --git a/collects/racket/draw/private/dc-path.rkt b/collects/racket/draw/private/dc-path.rkt index 21a30d8419..902fc1c9db 100644 --- a/collects/racket/draw/private/dc-path.rkt +++ b/collects/racket/draw/private/dc-path.rkt @@ -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)) diff --git a/collects/racket/draw/private/dc.rkt b/collects/racket/draw/private/dc.rkt index fa643960d8..524b07e774 100644 --- a/collects/racket/draw/private/dc.rkt +++ b/collects/racket/draw/private/dc.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "syntax.rkt" ffi/unsafe/atomic diff --git a/collects/racket/draw/private/define.rkt b/collects/racket/draw/private/define.rkt index 19c12b72ed..ea6b4303ae 100644 --- a/collects/racket/draw/private/define.rkt +++ b/collects/racket/draw/private/define.rkt @@ -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 diff --git a/collects/racket/draw/private/fmod.rkt b/collects/racket/draw/private/fmod.rkt index 27418a6cd0..526b2b1d30 100644 --- a/collects/racket/draw/private/fmod.rkt +++ b/collects/racket/draw/private/fmod.rkt @@ -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))) diff --git a/collects/racket/draw/private/font-syms.rkt b/collects/racket/draw/private/font-syms.rkt index d954f4b602..75c5e86b12 100644 --- a/collects/racket/draw/private/font-syms.rkt +++ b/collects/racket/draw/private/font-syms.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide family-symbol? style-symbol? weight-symbol? smoothing-symbol? hinting-symbol?) diff --git a/collects/racket/draw/private/font.rkt b/collects/racket/draw/private/font.rkt index 024fc49f0a..cdac4d14d6 100644 --- a/collects/racket/draw/private/font.rkt +++ b/collects/racket/draw/private/font.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class ffi/unsafe/atomic "syntax.rkt" "../unsafe/pango.rkt" diff --git a/collects/racket/draw/private/gl-config.rkt b/collects/racket/draw/private/gl-config.rkt index 4c0ef26d85..85e7a8055b 100644 --- a/collects/racket/draw/private/gl-config.rkt +++ b/collects/racket/draw/private/gl-config.rkt @@ -1,6 +1,6 @@ -#lang scheme/base -(require scheme/class - "syntax.rkt") +#lang racket/base +(require racket/class + "syntax.rkt") (provide gl-config%) diff --git a/collects/racket/draw/private/hold.rkt b/collects/racket/draw/private/hold.rkt index 4904af6548..22094d3a10 100644 --- a/collects/racket/draw/private/hold.rkt +++ b/collects/racket/draw/private/hold.rkt @@ -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) - diff --git a/collects/racket/draw/private/libs.rkt b/collects/racket/draw/private/libs.rkt index 967f20ebe3..6e34659ba6 100644 --- a/collects/racket/draw/private/libs.rkt +++ b/collects/racket/draw/private/libs.rkt @@ -1,13 +1,13 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe racket/runtime-path - ffi/winapi + ffi/winapi (for-syntax racket/base - ffi/winapi)) + ffi/winapi)) (provide define-runtime-lib - win64? - (for-syntax win64?)) + win64? + (for-syntax win64?)) (define-syntax define-runtime-lib ;; the ids macosx unix windows don't appear to be bound here, but I added win32 and win64 anyways diff --git a/collects/racket/draw/private/local.rkt b/collects/racket/draw/private/local.rkt index d1cdd0aa9b..0807f263d8 100644 --- a/collects/racket/draw/private/local.rkt +++ b/collects/racket/draw/private/local.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class) +#lang racket/base +(require racket/class) (provide (protect-out (all-defined-out))) diff --git a/collects/racket/draw/private/pen.rkt b/collects/racket/draw/private/pen.rkt index 5a4271bc1d..24c6102eff 100644 --- a/collects/racket/draw/private/pen.rkt +++ b/collects/racket/draw/private/pen.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class ffi/unsafe/atomic "color.rkt" "syntax.rkt" diff --git a/collects/racket/draw/private/point.rkt b/collects/racket/draw/private/point.rkt index 1cf6de2c63..6e8cdda1d8 100644 --- a/collects/racket/draw/private/point.rkt +++ b/collects/racket/draw/private/point.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class "syntax.rkt") (provide point% point-x point-y diff --git a/collects/racket/draw/private/region.rkt b/collects/racket/draw/private/region.rkt index b78f840806..e253143af6 100644 --- a/collects/racket/draw/private/region.rkt +++ b/collects/racket/draw/private/region.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class ffi/unsafe/atomic "syntax.rkt" "local.rkt" diff --git a/collects/racket/draw/private/syntax.rkt b/collects/racket/draw/private/syntax.rkt index a5c9d55e93..703dc0750c 100644 --- a/collects/racket/draw/private/syntax.rkt +++ b/collects/racket/draw/private/syntax.rkt @@ -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 diff --git a/collects/racket/draw/unsafe/cairo-lib.rkt b/collects/racket/draw/unsafe/cairo-lib.rkt index d390f04dc7..8ec7908617 100644 --- a/collects/racket/draw/unsafe/cairo-lib.rkt +++ b/collects/racket/draw/unsafe/cairo-lib.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc @@ -7,18 +7,18 @@ (define-runtime-lib cairo-lib [(unix) (ffi-lib "libcairo" '("2" ""))] - [(macosx) + [(macosx) (ffi-lib "libpixman-1.0.dylib") (ffi-lib "libpng15.15.dylib") (ffi-lib "libcairo.2.dylib")] - [(win32) + [(win32) (ffi-lib "zlib1.dll") (ffi-lib "libpng14-14.dll") (ffi-lib "libexpat-1.dll") (ffi-lib "freetype6.dll") (ffi-lib "libfontconfig-1.dll") (ffi-lib "libcairo-2.dll")] - [(win64) + [(win64) (ffi-lib "zlib1.dll") (ffi-lib "libintl-8.dll") (ffi-lib "libpng14-14.dll") @@ -28,4 +28,3 @@ (ffi-lib "libcairo-2.dll")]) (provide (protect-out cairo-lib)) - diff --git a/collects/racket/draw/unsafe/cairo.rkt b/collects/racket/draw/unsafe/cairo.rkt index 17659bca84..361ea6ca36 100644 --- a/collects/racket/draw/unsafe/cairo.rkt +++ b/collects/racket/draw/unsafe/cairo.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc diff --git a/collects/racket/draw/unsafe/glib.rkt b/collects/racket/draw/unsafe/glib.rkt index 9cca963386..cf18b7797e 100644 --- a/collects/racket/draw/unsafe/glib.rkt +++ b/collects/racket/draw/unsafe/glib.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe ffi/unsafe/define "../private/libs.rkt") @@ -8,27 +8,27 @@ define-gmodule define-gobj)) -(define-runtime-lib glib-lib +(define-runtime-lib glib-lib [(unix) (ffi-lib "libglib-2.0" '("0" ""))] - [(macosx) + [(macosx) (ffi-lib "libintl.8.dylib") (ffi-lib "libglib-2.0.0.dylib")] [(windows) (ffi-lib "libglib-2.0-0.dll")]) -(define-runtime-lib gmodule-lib +(define-runtime-lib gmodule-lib [(unix) (ffi-lib "libgmodule-2.0" '("0" ""))] - [(macosx) + [(macosx) (ffi-lib "libgthread-2.0.0.dylib") (ffi-lib "libgmodule-2.0.0.dylib")] - [(win32) + [(win32) (ffi-lib "libgmodule-2.0-0.dll")] - [(win64) + [(win64) (ffi-lib "libgthread-2.0-0.dll") (ffi-lib "libgmodule-2.0-0.dll")]) -(define-runtime-lib gobj-lib +(define-runtime-lib gobj-lib [(unix) (ffi-lib "libgobject-2.0" '("0" ""))] - [(macosx) + [(macosx) (ffi-lib "libffi.5.dylib") (ffi-lib "libgobject-2.0.0.dylib")] [(windows) (ffi-lib "libgobject-2.0-0.dll")]) diff --git a/collects/racket/draw/unsafe/jpeg.rkt b/collects/racket/draw/unsafe/jpeg.rkt index 45b1fe8d01..2a9991e7be 100644 --- a/collects/racket/draw/unsafe/jpeg.rkt +++ b/collects/racket/draw/unsafe/jpeg.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc diff --git a/collects/racket/draw/unsafe/pango.rkt b/collects/racket/draw/unsafe/pango.rkt index ef8694aa0e..2873b4f9ac 100644 --- a/collects/racket/draw/unsafe/pango.rkt +++ b/collects/racket/draw/unsafe/pango.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc @@ -7,29 +7,29 @@ "../private/utils.rkt" "../private/libs.rkt") -(define-runtime-lib pango-lib +(define-runtime-lib pango-lib [(unix) (ffi-lib "libpango-1.0" '("0" ""))] [(macosx) (ffi-lib "libpango-1.0.0.dylib")] [(windows) (ffi-lib "libpango-1.0-0.dll")]) -(define-runtime-lib pangowin32-lib +(define-runtime-lib pangowin32-lib [(unix) #f] [(macosx)] - [(windows) + [(windows) (ffi-lib "libpangowin32-1.0-0.dll")]) -(define-runtime-lib pangocairo-lib +(define-runtime-lib pangocairo-lib [(unix) (ffi-lib "libpangocairo-1.0" '("0" ""))] [(macosx) (ffi-lib "libpangocairo-1.0.0.dylib")] - [(win32) + [(win32) (ffi-lib "libpangowin32-1.0-0.dll") (ffi-lib "libexpat-1.dll") (ffi-lib "freetype6.dll") (ffi-lib "libfontconfig-1.dll") (ffi-lib "libpangoft2-1.0-0.dll") (ffi-lib "libpangocairo-1.0-0.dll")] - [(win64) + [(win64) (ffi-lib "libintl-8.dll") (ffi-lib "libpangowin32-1.0-0.dll") (ffi-lib "libexpat-1.dll") @@ -287,9 +287,9 @@ (g_free faces)))) (define-pango pango_font_face_get_face_name (_pfun PangoFontFace -> _string)) -(define-pango pango_font_description_free (_pfun PangoFontDescription -> _void) +(define-pango pango_font_description_free (_pfun PangoFontDescription -> _void) #:wrap (deallocator)) -(define-pango pango_font_description_new (_pfun -> PangoFontDescription) +(define-pango pango_font_description_new (_pfun -> PangoFontDescription) #:wrap (allocator pango_font_description_free)) (define-pango pango_font_description_from_string (_pfun _string -> PangoFontDescription) #:wrap (allocator pango_font_description_free)) diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt index 726176028d..54bf3bf58c 100644 --- a/collects/racket/draw/unsafe/png.rkt +++ b/collects/racket/draw/unsafe/png.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc @@ -6,15 +6,15 @@ "../private/utils.rkt" "../private/libs.rkt") -(define-runtime-lib png-lib - [(unix) +(define-runtime-lib png-lib + [(unix) ;; Most Linux distros supply "libpng12", while other Unix ;; variants often have just "libpng": (with-handlers ([exn:fail:filesystem? (lambda (exn) (ffi-lib "libpng"))]) (ffi-lib "libpng12" '("0" "")))] [(macosx) (ffi-lib "libpng15.15.dylib")] - [(windows) + [(windows) (ffi-lib "zlib1.dll") (ffi-lib "libpng14-14.dll")]) @@ -27,7 +27,7 @@ ;; assume that other versions are also ok (define PNG_LIBPNG_VER_STRING (string->bytes/latin-1 (let ([v (png_access_version_number)]) - (format "~s.~s" + (format "~s.~s" (quotient v 10000) (quotient (remainder v 10000) 100))))) @@ -43,8 +43,8 @@ [gray _uint16])) (define-png png_create_read_struct - (_fun _bytes - _pointer + (_fun _bytes + _pointer (_fun _png_structp _string -> _void) (_fun _png_structp _string -> _void) -> _png_structp)) @@ -65,8 +65,8 @@ -> _void))) (define-png png_create_write_struct - (_fun _bytes - _pointer + (_fun _bytes + _pointer (_fun _png_structp _string -> _void) (_fun _png_structp _string -> _void) -> _png_structp)) @@ -100,10 +100,10 @@ (compression-type : (_ptr o _int)) (filter-type : (_ptr o _int)) -> _void - -> (values w h depth - color-type - interlace-type - compression-type + -> (values w h depth + color-type + interlace-type + compression-type filter-type))) (define-png png_set_IHDR (_fun _png_structp @@ -141,7 +141,7 @@ (define-png png_get_valid (_fun _png_structp _png_infop _uint32 -> _uint32)) (define-png png_get_bKGD (_fun _png_structp _png_infop (p : (_ptr o _png_color_16-pointer/null)) -> (r : _bool) -> (and r p))) (define-png png_set_background (_fun _png_structp _png_color_16-pointer _int _int _double* -> _bool)) -(define-png png_get_gAMA (_fun _png_structp _png_infop (g : (_ptr o _double)) +(define-png png_get_gAMA (_fun _png_structp _png_infop (g : (_ptr o _double)) -> (ok? : _bool) -> (and ok? g))) (define-png png_set_gamma (_fun _png_structp _double* _double* -> _void)) @@ -214,7 +214,7 @@ [ib (make-cell in)]) (png_set_read_fn png ib read-png-bytes) (png_read_info png info) - (let-values ([(w h depth color-type + (let-values ([(w h depth color-type interlace-type compression-type filter-type) (png_get_IHDR png info)]) (let* ([tRNS? (positive? (png_get_valid png info PNG_INFO_tRNS))] @@ -252,9 +252,9 @@ [else (let ([c (png_get_bKGD png info)]) (when c (memcpy bg c (ctype-sizeof _png_color_16))))]) - (png_set_background png bg + (png_set_background png bg (if bg-rgb - PNG_BACKGROUND_GAMMA_SCREEN + PNG_BACKGROUND_GAMMA_SCREEN PNG_BACKGROUND_GAMMA_FILE) 0 1.0))) (let ([gamma (png_get_gAMA png info)]) @@ -307,12 +307,12 @@ (scheme_make_sized_byte_string p row-bytes 1)))))) (define (destroy-png-reader reader) - (when (reader-png reader) - (png_destroy_read_struct2 (reader-png reader) + (when (reader-png reader) + (png_destroy_read_struct2 (reader-png reader) (reader-info reader)) (free-cell (reader-ib reader)) (set-reader-png! reader #f))) - + ;; ---------------------------------------- ;; Writing diff --git a/collects/racket/fixnum.rkt b/collects/racket/fixnum.rkt index 8969fba4ed..39bd61e3df 100644 --- a/collects/racket/fixnum.rkt +++ b/collects/racket/fixnum.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require '#%flfxnum "private/vector-wraps.rkt" diff --git a/collects/racket/gui/dynamic.rkt b/collects/racket/gui/dynamic.rkt index a1fe175f5f..11564e64b5 100644 --- a/collects/racket/gui/dynamic.rkt +++ b/collects/racket/gui/dynamic.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require ffi/unsafe) (provide gui-available? diff --git a/collects/racket/gui/init.rkt b/collects/racket/gui/init.rkt index ec82d6425c..1afce33164 100644 --- a/collects/racket/gui/init.rkt +++ b/collects/racket/gui/init.rkt @@ -1,4 +1,3 @@ - (module init scheme/gui (require scheme/init) diff --git a/collects/racket/gui/installer.rkt b/collects/racket/gui/installer.rkt index 47b69a008b..4c6a60986d 100644 --- a/collects/racket/gui/installer.rkt +++ b/collects/racket/gui/installer.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require launcher) (provide post-installer) diff --git a/collects/racket/list.rkt b/collects/racket/list.rkt index e1d6b7e81a..bb4b00a5f9 100644 --- a/collects/racket/list.rkt +++ b/collects/racket/list.rkt @@ -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) diff --git a/collects/racket/local.rkt b/collects/racket/local.rkt index 5c8fabfed7..11d8bf9e96 100644 --- a/collects/racket/local.rkt +++ b/collects/racket/local.rkt @@ -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) diff --git a/collects/racket/match/compiler.rkt b/collects/racket/match/compiler.rkt index 0c54406f20..767d67134e 100644 --- a/collects/racket/match/compiler.rkt +++ b/collects/racket/match/compiler.rkt @@ -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) diff --git a/collects/racket/match/define-forms.rkt b/collects/racket/match/define-forms.rkt index 085e8dd929..0cdbd0c7b7 100644 --- a/collects/racket/match/define-forms.rkt +++ b/collects/racket/match/define-forms.rkt @@ -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 diff --git a/collects/racket/match/gen-match.rkt b/collects/racket/match/gen-match.rkt index 18c2d770cc..4d4c4364f9 100644 --- a/collects/racket/match/gen-match.rkt +++ b/collects/racket/match/gen-match.rkt @@ -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) diff --git a/collects/racket/match/match-expander.rkt b/collects/racket/match/match-expander.rkt index 2080b392b2..4cfee9aafc 100644 --- a/collects/racket/match/match-expander.rkt +++ b/collects/racket/match/match-expander.rkt @@ -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) diff --git a/collects/racket/match/parse-helper.rkt b/collects/racket/match/parse-helper.rkt index 2d8e5d1436..98596e5db5 100644 --- a/collects/racket/match/parse-helper.rkt +++ b/collects/racket/match/parse-helper.rkt @@ -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) diff --git a/collects/racket/match/parse-quasi.rkt b/collects/racket/match/parse-quasi.rkt index 4b41dd8d23..8248a94e64 100644 --- a/collects/racket/match/parse-quasi.rkt +++ b/collects/racket/match/parse-quasi.rkt @@ -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") diff --git a/collects/racket/match/parse.rkt b/collects/racket/match/parse.rkt index 541870229f..04737ba8b2 100644 --- a/collects/racket/match/parse.rkt +++ b/collects/racket/match/parse.rkt @@ -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) diff --git a/collects/racket/match/patterns.rkt b/collects/racket/match/patterns.rkt index 2bd95e22e1..d259986f1a 100644 --- a/collects/racket/match/patterns.rkt +++ b/collects/racket/match/patterns.rkt @@ -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 diff --git a/collects/racket/match/reorder.rkt b/collects/racket/match/reorder.rkt index 9f94f9a3a3..d1da55d703 100644 --- a/collects/racket/match/reorder.rkt +++ b/collects/racket/match/reorder.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require "patterns.rkt" - (for-syntax scheme/base)) + (for-syntax racket/base)) (provide reorder-columns) diff --git a/collects/racket/match/split-rows.rkt b/collects/racket/match/split-rows.rkt index 0499d20ea9..45bafc258c 100644 --- a/collects/racket/match/split-rows.rkt +++ b/collects/racket/match/split-rows.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "patterns.rkt") diff --git a/collects/racket/math.rkt b/collects/racket/math.rkt index 5aa72bd4a3..aeb1354a81 100644 --- a/collects/racket/math.rkt +++ b/collects/racket/math.rkt @@ -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 diff --git a/collects/racket/mpair.rkt b/collects/racket/mpair.rkt index 6ef864b649..ca65b457dd 100644 --- a/collects/racket/mpair.rkt +++ b/collects/racket/mpair.rkt @@ -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 diff --git a/collects/racket/package.rkt b/collects/racket/package.rkt index e5f41e6243..a29c50b525 100644 --- a/collects/racket/package.rkt +++ b/collects/racket/package.rkt @@ -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 diff --git a/collects/racket/path.rkt b/collects/racket/path.rkt index b31b6c4442..8a5c200666 100644 --- a/collects/racket/path.rkt +++ b/collects/racket/path.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide find-relative-path explode-path diff --git a/collects/racket/private/class-internal.rkt b/collects/racket/private/class-internal.rkt index 30574cc114..df14645752 100644 --- a/collects/racket/private/class-internal.rkt +++ b/collects/racket/private/class-internal.rkt @@ -25,8 +25,8 @@ ;; spec for external interface ;;-------------------------------------------------------------------- -(provide provide-public-names - ;; needed for Typed Scheme +(provide provide-public-names + ;; needed for Typed Racket (protect-out do-make-object find-method/who)) (define-syntax-rule (provide-public-names) (provide class class* class/derived @@ -317,9 +317,9 @@ (let* ([stop-forms (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 + (list + (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) - diff --git a/collects/racket/private/classidmap.rkt b/collects/racket/private/classidmap.rkt index 7c55e1e7f8..5f38c49725 100644 --- a/collects/racket/private/classidmap.rkt +++ b/collects/racket/private/classidmap.rkt @@ -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))) diff --git a/collects/racket/private/pre-base.rkt b/collects/racket/private/pre-base.rkt index e2baf0ca15..59da173128 100644 --- a/collects/racket/private/pre-base.rkt +++ b/collects/racket/private/pre-base.rkt @@ -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)) diff --git a/collects/racket/private/sort.rkt b/collects/racket/private/sort.rkt index 48457bf1d1..73abf9620e 100644 --- a/collects/racket/private/sort.rkt +++ b/collects/racket/private/sort.rkt @@ -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. |# diff --git a/collects/racket/provide.rkt b/collects/racket/provide.rkt index ecfe364337..109e5b19b5 100644 --- a/collects/racket/provide.rkt +++ b/collects/racket/provide.rkt @@ -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) diff --git a/collects/racket/require-syntax.rkt b/collects/racket/require-syntax.rkt index 34d3d8732a..87f9759a7c 100644 --- a/collects/racket/require-syntax.rkt +++ b/collects/racket/require-syntax.rkt @@ -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))) diff --git a/collects/racket/require.rkt b/collects/racket/require.rkt index 51d8f51c63..77e4c96bc4 100644 --- a/collects/racket/require.rkt +++ b/collects/racket/require.rkt @@ -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") diff --git a/collects/racket/shared.rkt b/collects/racket/shared.rkt index 2e9994faa2..853e479b94 100644 --- a/collects/racket/shared.rkt +++ b/collects/racket/shared.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require mzlib/shared) (provide shared) diff --git a/collects/racket/snip/private/private.rkt b/collects/racket/snip/private/private.rkt index ba6b5338d8..761c12e12d 100644 --- a/collects/racket/snip/private/private.rkt +++ b/collects/racket/snip/private/private.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class) +#lang racket/base +(require racket/class) (provide (all-defined-out)) diff --git a/collects/racket/snip/private/snip-admin.rkt b/collects/racket/snip/private/snip-admin.rkt index 64a33f0fcd..c16fe88e2a 100644 --- a/collects/racket/snip/private/snip-admin.rkt +++ b/collects/racket/snip/private/snip-admin.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/class +#lang racket/base +(require racket/class racket/draw/private/syntax "snip.rkt") diff --git a/collects/racket/snip/private/snip-flags.rkt b/collects/racket/snip/private/snip-flags.rkt index 86adcea738..ac0de3526d 100644 --- a/collects/racket/snip/private/snip-flags.rkt +++ b/collects/racket/snip/private/snip-flags.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require (for-syntax scheme/base)) +#lang racket/base +(require (for-syntax racket/base)) (provide (all-defined-out)) diff --git a/collects/racket/snip/private/snip.rkt b/collects/racket/snip/private/snip.rkt index 2f497208d3..7994c1b1dd 100644 --- a/collects/racket/snip/private/snip.rkt +++ b/collects/racket/snip/private/snip.rkt @@ -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" diff --git a/collects/racket/snip/private/style.rkt b/collects/racket/snip/private/style.rkt index a650c35aa6..ab4f214c8e 100644 --- a/collects/racket/snip/private/style.rkt +++ b/collects/racket/snip/private/style.rkt @@ -1,10 +1,10 @@ -#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 + racket/draw/private/font-syms racket/snip/private/private "prefs.rkt") diff --git a/collects/racket/splicing.rkt b/collects/racket/splicing.rkt index 90a5ff827b..2168b49d7f 100644 --- a/collects/racket/splicing.rkt +++ b/collects/racket/splicing.rkt @@ -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" diff --git a/collects/racket/string.rkt b/collects/racket/string.rkt index a98f8c97ec..9e90fb3ee1 100644 --- a/collects/racket/string.rkt +++ b/collects/racket/string.rkt @@ -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))) diff --git a/collects/racket/surrogate.rkt b/collects/racket/surrogate.rkt index 86d45626ee..c458c8c24d 100644 --- a/collects/racket/surrogate.rkt +++ b/collects/racket/surrogate.rkt @@ -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) diff --git a/collects/racket/system.rkt b/collects/racket/system.rkt index 8922da1925..1dcc88c73f 100644 --- a/collects/racket/system.rkt +++ b/collects/racket/system.rkt @@ -1,4 +1,3 @@ - -(module system scheme/base +(module system racket/base (require mzlib/process) (provide (all-from-out mzlib/process))) diff --git a/collects/racket/unit-exptime.rkt b/collects/racket/unit-exptime.rkt index e7a34fa4bb..45f290e5a0 100644 --- a/collects/racket/unit-exptime.rkt +++ b/collects/racket/unit-exptime.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require mzlib/unit-exptime) (provide (all-from-out mzlib/unit-exptime)) diff --git a/collects/racket/unsafe/ops.rkt b/collects/racket/unsafe/ops.rkt index e67acd1f3d..a084ccf8a6 100644 --- a/collects/racket/unsafe/ops.rkt +++ b/collects/racket/unsafe/ops.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require '#%unsafe '#%flfxnum)