From fa8a981a95ce72052b797758c17b18e695d1570a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 6 May 2008 15:29:58 +0000
Subject: [PATCH] framework minor repairs (after tests)

svn: r9690

original commit: a7aadea865727c968dac695d2f3f9987738e55b7
---
 collects/framework/{sig.ss => framework-sig.ss}   | 0
 collects/framework/{unit.ss => framework-unit.ss} | 0
 collects/framework/main.ss                        | 4 ++--
 collects/scribblings/framework/framework.scrbl    | 4 ++--
 collects/tests/framework/framework-test           | 2 +-
 collects/tests/framework/load.ss                  | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename collects/framework/{sig.ss => framework-sig.ss} (100%)
 rename collects/framework/{unit.ss => framework-unit.ss} (100%)

diff --git a/collects/framework/sig.ss b/collects/framework/framework-sig.ss
similarity index 100%
rename from collects/framework/sig.ss
rename to collects/framework/framework-sig.ss
diff --git a/collects/framework/unit.ss b/collects/framework/framework-unit.ss
similarity index 100%
rename from collects/framework/unit.ss
rename to collects/framework/framework-unit.ss
diff --git a/collects/framework/main.ss b/collects/framework/main.ss
index 24e46802..e1aef644 100644
--- a/collects/framework/main.ss
+++ b/collects/framework/main.ss
@@ -3,7 +3,7 @@
 
 (require (lib "mred-unit.ss" "mred")
          (lib "mred-sig.ss" "mred")
-         framework/unit
+         framework/framework-unit
          framework/private/sig
          (for-syntax scheme/base)
          scribble/srcdoc)
@@ -36,7 +36,7 @@
  (prefix editor: framework:editor-class^)
  (prefix pasteboard: framework:pasteboard-class^)
  (prefix text: framework:text-class^)
- (prefix color: framework:color-class^)
+ (prefix color: framework:color^)
  (prefix color-prefs: framework:color-prefs-class^)
  (prefix comment-box: framework:comment-box-class^)
  (prefix finder: framework:finder-class^)
diff --git a/collects/scribblings/framework/framework.scrbl b/collects/scribblings/framework/framework.scrbl
index 1f7becac..6ea1df5d 100644
--- a/collects/scribblings/framework/framework.scrbl
+++ b/collects/scribblings/framework/framework.scrbl
@@ -24,7 +24,7 @@ program on top of the @scheme[scheme/gui] library.
   This library provides all of the definitions and syntax
   described in this manual.
 }
-@item{@scheme[(require framework/sig)]
+@item{@scheme[(require framework/framework-sig)]
   
   This library provides the signature definitions:
   @scheme[framework^], and
@@ -36,7 +36,7 @@ program on top of the @scheme[scheme/gui] library.
   signature contains all of the classes defined in this
   manual.
 }
-@item{@scheme[(require framework/unit)]
+@item{@scheme[(require framework/framework-unit)]
 
   This library provides one
   @scheme[unit/sig]: @scheme[framework@]. It exports the signature
diff --git a/collects/tests/framework/framework-test b/collects/tests/framework/framework-test
index 7d7496a3..aaed0f71 100755
--- a/collects/tests/framework/framework-test
+++ b/collects/tests/framework/framework-test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec mred -qu main.ss "$@"
+exec mred main.ss "$@"
diff --git a/collects/tests/framework/load.ss b/collects/tests/framework/load.ss
index 13782cc5..3f9f0517 100644
--- a/collects/tests/framework/load.ss
+++ b/collects/tests/framework/load.ss
@@ -9,7 +9,7 @@
      void?
      `(let ([mred-name ((current-module-name-resolver) 'mred #f #f)]
             [orig-namespace (current-namespace)])
-        (parameterize ([current-namespace (make-namespace)])
+        (parameterize ([current-namespace (make-base-namespace)])
           (namespace-attach-module orig-namespace mred-name)
           (eval '(require (lib ,file "framework")))
           (with-handlers ([(lambda (x) #t)
@@ -38,8 +38,8 @@
    ;; these extra evals let me submit multiple, independent top-level
    ;; expressions in the newly created namespace.
    '(begin (eval '(require mzlib/unit))
-           (eval '(require-for-syntax mzscheme))
-           (eval '(require-for-syntax mzlib/unit-exptime))
+           (eval '(require (for-syntax scheme/base)))
+           (eval '(require (for-syntax scheme/unit-exptime)))
            (eval '(define-syntax (signature->symbols stx)
                     (syntax-case stx ()
                       [(_ sig)