fix make-gui-namespace from scheme/gui/base and racket/gui/base

so that the namespace starts with scheme/base or racket/base
 respectively

original commit: 1712dfb7f5710bbfba14ca537ec4317bc6afaaaa
This commit is contained in:
Matthew Flatt 2010-06-07 20:04:29 -04:00
parent 95831127bd
commit ac3e0b848b
5 changed files with 70 additions and 21 deletions

View File

@ -1,5 +1,5 @@
(module mred mzscheme (module mred mzscheme
(require (only scheme/base (require (only racket/base
define-namespace-anchor define-namespace-anchor
namespace-anchor->empty-namespace namespace-anchor->empty-namespace
make-base-empty-namespace) make-base-empty-namespace)
@ -57,6 +57,9 @@
(wx:set-dialogs get-file put-file get-ps-setup-from-user message-box) (wx:set-dialogs get-file put-file get-ps-setup-from-user message-box)
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; These functions are re-implemented in scheme/gui/base
;; and racket/gui/base to attach those names, instead of
;; just 'mred.
(define-namespace-anchor anchor) (define-namespace-anchor anchor)
@ -75,6 +78,8 @@
(namespace-require 'scheme/class)) (namespace-require 'scheme/class))
ns)) ns))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (make-eventspace) (define (make-eventspace)
(parameterize ([wx:the-snip-class-list (wx:make-the-snip-class-list)] (parameterize ([wx:the-snip-class-list (wx:make-the-snip-class-list)]
[wx:the-editor-data-class-list (wx:make-the-editor-data-class-list)]) [wx:the-editor-data-class-list (wx:make-the-editor-data-class-list)])

View File

@ -1,4 +1,25 @@
#lang scheme/base #lang racket/base
(require (except-in mred
make-gui-namespace
make-gui-empty-namespace))
(require mred) (provide (all-from-out mred)
(provide (all-from-out mred)) make-gui-namespace
make-gui-empty-namespace)
(define-namespace-anchor anchor)
(define (make-gui-empty-namespace)
(let ([ns (make-base-empty-namespace)])
(namespace-attach-module (namespace-anchor->empty-namespace anchor)
'racket/gui/base
ns)
ns))
(define (make-gui-namespace)
(let ([ns (make-gui-empty-namespace)])
(parameterize ([current-namespace ns])
(namespace-require 'racket/base)
(namespace-require 'racket/gui/base)
(namespace-require 'racket/class))
ns))

View File

@ -1,2 +1,25 @@
#lang scheme/private/provider #lang scheme/base
racket/gui/base (require (except-in mred
make-gui-namespace
make-gui-empty-namespace))
(provide (all-from-out mred)
make-gui-namespace
make-gui-empty-namespace)
(define-namespace-anchor anchor)
(define (make-gui-empty-namespace)
(let ([ns (make-base-empty-namespace)])
(namespace-attach-module (namespace-anchor->empty-namespace anchor)
'scheme/gui/base
ns)
ns))
(define (make-gui-namespace)
(let ([ns (make-gui-empty-namespace)])
(parameterize ([current-namespace ns])
(namespace-require 'scheme/base)
(namespace-require 'scheme/gui/base)
(namespace-require 'scheme/class))
ns))

View File

@ -1,24 +1,24 @@
(module common scheme/base (module common racket/base
(require scribble/manual (require scribble/manual
scribble/basic scribble/basic
scheme/class racket/class
scheme/contract racket/contract
"blurbs.ss" "blurbs.ss"
(only-in "../reference/mz.ss" AllUnix exnraise)) (only-in "../reference/mz.ss" AllUnix exnraise))
(provide (all-from-out scribble/manual) (provide (all-from-out scribble/manual)
(all-from-out scribble/basic) (all-from-out scribble/basic)
(all-from-out scheme/class) (all-from-out racket/class)
(all-from-out scheme/contract) (all-from-out racket/contract)
(all-from-out "blurbs.ss") (all-from-out "blurbs.ss")
(all-from-out "../reference/mz.ss")) (all-from-out "../reference/mz.ss"))
(require (for-label scheme/gui/base (require (for-label racket/gui/base
scheme/class racket/class
scheme/contract racket/contract
scheme/base)) racket/base))
(provide (for-label (all-from-out scheme/gui/base) (provide (for-label (all-from-out racket/gui/base)
(all-from-out scheme/class) (all-from-out racket/class)
(all-from-out scheme/contract) (all-from-out racket/contract)
(all-from-out scheme/base)))) (all-from-out racket/base))))

View File

@ -267,12 +267,12 @@ Strips shortcut ampersands from @racket[label], removes parenthesized
@defproc[(make-gui-empty-namespace) namespace?]{ @defproc[(make-gui-empty-namespace) namespace?]{
Like @racket[make-base-empty-namespace], but with Like @racket[make-base-empty-namespace], but with
@racket[racket/class] and @racketmodname[racket/gui/base] also @racketmodname[racket/class] and @racketmodname[racket/gui/base] also
attached to the result namespace.} attached to the result namespace.}
@defproc[(make-gui-namespace) namespace?]{ @defproc[(make-gui-namespace) namespace?]{
Like @racket[make-base-namespace], but with @racket[racket/class] and Like @racket[make-base-namespace], but with @racketmodname[racket/class] and
@racketmodname[racket/gui/base] also required into the top-level @racketmodname[racket/gui/base] also required into the top-level
environment of the result namespace.} environment of the result namespace.}