* Newlines at EOFs

* Another big chunk of v4-require-isms
* Allow `#lang framework/keybinding-lang' for keybinding files
* Move hierlist sources into "mrlib/hierlist", leave stub behind

svn: r10689
This commit is contained in:
Eli Barzilay 2008-07-09 07:18:06 +00:00
parent 1b525f60cc
commit 7d50e61c7f
445 changed files with 788 additions and 808 deletions

View File

@ -1,5 +1,5 @@
(module bd-tool mzscheme
(require (lib "encode-decode.ss" "framework" "private"))
(require framework/private/encode-decode)
(decode 05c1dd6edc460c06d057f9226301b2e86c5c23690103a9835c
e53a0f50602852d2ecce8f324379adb7ef3924b6a60aeaf6fb
48dd403909a6d24daf634c984a379d189493609a731ce33ac6

View File

@ -35,7 +35,7 @@
mzlib/etc)
(require-for-syntax syntax/boundmap
mzlib/list
(lib "token-syntax.ss" "parser-tools" "private-lex"))
parser-tools/private-lex/token-syntax)
(provide cfg-parser)

View File

@ -1,5 +1,5 @@
(module tool mzscheme
(require (lib "tool.ss" "drscheme")
(require drscheme/tool
mred
mzlib/unit
mzlib/class

View File

@ -1,7 +1,7 @@
(module browser-unit mzscheme
(require mzlib/unit
(lib "mred-sig.ss" "mred")
(lib "plt-installer-sig.ss" "setup")
mred/mred-sig
setup/plt-installer-sig
net/tcp-sig
net/url-sig
net/url-unit

View File

@ -1,9 +1,9 @@
(module browser mzscheme
(require mzlib/unit
mred
(lib "mred-sig.ss" "mred")
(lib "plt-installer-sig.ss" "setup")
(lib "plt-installer.ss" "setup")
mred/mred-sig
setup/plt-installer-sig
setup/plt-installer
net/tcp-sig
net/url-sig
net/url

View File

@ -9,9 +9,9 @@
net/url
net/url-sig
mred
(lib "mred-unit.ss" "mred")
(lib "mred-sig.ss" "mred")
(lib "external.ss" "browser"))
mred/mred-unit
mred/mred-sig
browser/external)
(define-unit-from-context url@ url^)

View File

@ -1,13 +1,12 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
scheme/file
mzlib/port
net/url-sig
(only-in (lib "html.ss" "html")
read-html-as-xml read-html-comments use-html-spec)
(except-in (lib "xml.ss" "xml") read-comments)
(only-in html read-html-as-xml read-html-comments use-html-spec)
(except-in xml/xml read-comments)
mzlib/class
"bullet.ss"
"option-snip.ss"

View File

@ -34,10 +34,10 @@ A test case:
net/url-sig
net/url-structs
net/head
(lib "mred-sig.ss" "mred")
mred/mred-sig
framework
string-constants
(lib "plt-installer-sig.ss" "setup"))
setup/plt-installer-sig)
(import html^

View File

@ -1,7 +1,7 @@
(module tool mzscheme
(require (lib "external.ss" "browser")
(require browser/external
mzlib/unit
(lib "tool.ss" "drscheme"))
drscheme/tool)
(provide tool@)
;; to add a preference pannel to drscheme that sets the browser preference

View File

@ -1,8 +1,8 @@
(module parser-sigs scheme
(require (only-in (lib "etc.ss") opt-lambda)) ; Required for expansion
(require (lib "lex.ss" "parser-tools")
(lib "string.ss"))
(require (only-in mzlib/etc opt-lambda)) ; Required for expansion
(require parser-tools/lex
mzlib/string)
(provide (all-defined-out))

View File

@ -4,7 +4,7 @@
scheme/path
setup/dirs
mzlib/list
(lib "variant.ss" "setup")
setup/variant
dynext/filename-version
"private/macfw.ss"
"private/windlldir.ss"

View File

@ -30,8 +30,8 @@
dynext/compile
dynext/link
scheme/pretty
(lib "pack.ss" "setup")
(lib "getinfo.ss" "setup")
setup/pack
setup/getinfo
setup/dirs)
(define dest-dir (make-parameter #f))
@ -511,11 +511,11 @@
(unless (= 1 (length source-files))
(error 'mzc "expected a single module source file to embed; given: ~e"
source-files))
(let ([dest ((dynamic-require '(lib "embed.ss" "compiler" "private")
(let ([dest ((dynamic-require 'compiler/private/embed
'mzc:embedding-executable-add-suffix)
(exe-output)
(eq? mode 'gui-exe))])
((dynamic-require '(lib "embed.ss" "compiler" "private")
((dynamic-require 'compiler/private/embed
'mzc:create-embedding-executable)
dest
#:mred? (eq? mode 'gui-exe)
@ -542,7 +542,7 @@
(let ([dest (mods-output)])
(let-values ([(in out) (make-pipe)])
(parameterize ([current-output-port out])
((dynamic-require '(lib "embed.ss" "compiler") 'write-module-bundle)
((dynamic-require 'compiler/embed 'write-module-bundle)
#:modules
(append (map (lambda (l) `(#f (file ,l))) source-files)
(map (lambda (l) `(#t (lib ,l))) (exe-embedded-libraries)))))

View File

@ -17,13 +17,13 @@
(parameterize ([current-namespace (make-namespace)]
[use-compiled-file-paths '()])
(values
(dynamic-require '(lib "zo-compile.ss" "errortrace") 'zo-compile)
(dynamic-require 'errortrace/zo-compile 'zo-compile)
(dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
(dynamic-require 'mzlib/cm 'manager-trace-handler)))])
(current-compile zo-compile)
(use-compiled-file-paths (list (build-path "compiled" "errortrace")))
(current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
(error-display-handler (dynamic-require '(lib "errortrace-lib.ss" "errortrace")
(error-display-handler (dynamic-require 'errortrace/errortrace-lib
'errortrace-error-display-handler))
(when cm-trace?
(printf "PLTDRDEBUG: enabling CM tracing\n")

View File

@ -6,8 +6,8 @@
string-constants
mred
framework
(lib "external.ss" "browser")
(lib "getinfo.ss" "setup")
browser/external
setup/getinfo
"drsig.ss"
"../acks.ss")

View File

@ -14,7 +14,7 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
mred
mzlib/match
mzlib/string
(lib "marks.ss" "stepper" "private")
stepper/private/marks
mzlib/contract)
(provide render-bindings/snip)

View File

@ -2012,5 +2012,4 @@ profile todo:
(super-instantiate ())))
(define-values/invoke-unit/infer stacktrace@))

View File

@ -78,8 +78,8 @@
(set! key-codes (take key-codes longest-magic-string))))
(let ([set-splash-bitmap
(dynamic-require '(lib "splash.ss" "framework") 'set-splash-bitmap)])
((dynamic-require '(lib "splash.ss" "framework") 'set-splash-char-observer)
(dynamic-require 'framework/splash 'set-splash-bitmap)])
((dynamic-require 'framework/splash 'set-splash-char-observer)
(λ (evt)
(let ([ch (send evt get-key-code)])
(when (char? ch)
@ -137,7 +137,7 @@
[(< angle 0) (normalize-angle (+ angle (* 2 pi)))]
[else (normalize-angle (- angle (* 2 pi)))]))
(define splash-canvas ((dynamic-require '(lib "splash.ss" "framework") 'get-splash-canvas)))
(define splash-canvas ((dynamic-require 'framework/splash 'get-splash-canvas)))
(define (draw-single-step dc offset)
(send bdc draw-bitmap eli 0 0)
(draw-single-loop omega-str bdc offset (/ main-size 2) (/ main-size 2) 120 32 outer-color)
@ -184,7 +184,7 @@
(define (eli-event evt)
(cond
[(send evt leaving?)
((dynamic-require '(lib "splash.ss" "framework") 'set-splash-paint-callback) orig-paint)
((dynamic-require 'framework/splash 'set-splash-paint-callback) orig-paint)
(when gc-b
(unregister-collecting-blit splash-canvas))
(send splash-canvas refresh)
@ -192,7 +192,7 @@
(kill-thread draw-thread)
(set! draw-thread #f))]
[(send evt entering?)
((dynamic-require '(lib "splash.ss" "framework") 'set-splash-paint-callback) eli-paint)
((dynamic-require 'framework/splash 'set-splash-paint-callback) eli-paint)
(when gc-b
(register-collecting-blit splash-canvas
(floor (- (/ main-size 2)
@ -206,7 +206,7 @@
(unless draw-thread
(start-thread))]))
(define splash-eventspace ((dynamic-require '(lib "splash.ss" "framework") 'get-splash-eventspace)))
(define splash-eventspace ((dynamic-require 'framework/splash 'get-splash-eventspace)))
(define draw-next-state
(let ([o 0])
(lambda ()
@ -231,13 +231,13 @@
(draw-next-state)
(sleep .01)
(loop))))))
(define orig-paint ((dynamic-require '(lib "splash.ss" "framework") 'get-splash-paint-callback)))
(define orig-paint ((dynamic-require 'framework/splash 'get-splash-paint-callback)))
(draw-next-state)
((dynamic-require '(lib "splash.ss" "framework") 'set-splash-event-callback) eli-event)
((dynamic-require 'framework/splash 'set-splash-event-callback) eli-event)
(send splash-canvas refresh)))
((dynamic-require '(lib "splash.ss" "framework") 'start-splash)
((dynamic-require 'framework/splash 'start-splash)
(build-path (collection-path "icons")
(cond
[texas-independence-day?
@ -267,8 +267,8 @@
(label "Break All Threads")
(callback
(λ (x y)
((dynamic-require '(lib "key.ss" "drscheme" "private") 'break-threads))))
((dynamic-require 'drscheme/private/key 'break-threads))))
(parent f))])
(send f show #t)))))
(dynamic-require '(lib "tool-lib.ss" "drscheme") #f))
(dynamic-require 'drscheme/tool-lib #f))

View File

@ -10,7 +10,7 @@
;; to ensure this guy is loaded (and the snipclass installed) in the drscheme namespace & eventspace
;; these things are for effect only!
(require (lib "cache-image-snip.ss" "mrlib")
(require mrlib/cache-image-snip
#;
(prefix foo htdp/matrix))

View File

@ -10,8 +10,8 @@
framework
net/url
net/head
(lib "plt-installer.ss" "setup")
(lib "bug-report.ss" "help")
setup/plt-installer
help/bug-report
scheme/file)
(import [prefix drscheme:unit: drscheme:unit^]

View File

@ -1,7 +1,7 @@
(module language-configuration mzscheme
(require mzlib/unit
(lib "hierlist.ss" "hierlist")
mrlib/hierlist
mzlib/class
mzlib/contract
mzlib/kw
@ -14,7 +14,7 @@
mzlib/list
mzlib/etc
mzlib/file
(lib "getinfo.ss" "setup")
setup/getinfo
syntax/toplevel)
(define original-output (current-output-port))

View File

@ -17,7 +17,7 @@
launcher
mred
framework
(lib "syntax-browser.ss" "mrlib")
mrlib/syntax-browser
compiler/distribute
compiler/bundle-dist
"rep.ss")
@ -464,7 +464,7 @@
(print-convert value))]))
,(if (memq (simple-settings-annotations setting) '(debug debug/profile test-coverage))
`(require (lib "errortrace.ss" "errortrace"))
`(require errortrace)
`(void))
(define (init-code)

View File

@ -8,8 +8,8 @@
mzlib/class
mzlib/list
scheme/path
(lib "external.ss" "browser")
(lib "plt-installer.ss" "setup"))
browser/external
setup/plt-installer)
(import [prefix drscheme:app: drscheme:app^]
[prefix drscheme:unit: drscheme:unit^]

View File

@ -1,6 +1,6 @@
(module time-keystrokes mzscheme
(require (lib "tool.ss" "drscheme")
(require drscheme/tool
mzlib/list
mzlib/unit
mzlib/class

View File

@ -1,7 +1,7 @@
#lang scheme/unit
(require (lib "getinfo.ss" "setup")
(require setup/getinfo
mred
scheme/class
scheme/list
@ -350,9 +350,9 @@
(unless (and (is-a? bitmap bitmap%)
(send bitmap ok?))
(k #f))
(let ([splash-eventspace ((dynamic-require '(lib "framework/splash.ss") 'get-splash-eventspace))]
[splash-bitmap ((dynamic-require '(lib "framework/splash.ss") 'get-splash-bitmap))]
[splash-canvas ((dynamic-require '(lib "framework/splash.ss") 'get-splash-canvas))])
(let ([splash-eventspace ((dynamic-require 'framework/splash 'get-splash-eventspace))]
[splash-bitmap ((dynamic-require 'framework/splash 'get-splash-bitmap))]
[splash-canvas ((dynamic-require 'framework/splash 'get-splash-canvas))])
(unless (and (eventspace? splash-eventspace)
(is-a? splash-bitmap bitmap%)
@ -387,7 +387,7 @@
(send bdc set-bitmap #f)
(set! bitmap new-b)))
((dynamic-require '(lib "framework/splash.ss") 'add-splash-icon)
((dynamic-require 'framework/splash 'add-splash-icon)
bitmap tool-bitmap-x translated-tool-bitmap-y)
(set! tool-bitmap-x (+ tool-bitmap-x tool-bitmap-size tool-bitmap-gap))
(when ((+ tool-bitmap-x tool-bitmap-gap tool-bitmap-size) . > . (send splash-bitmap get-width))

View File

@ -21,9 +21,9 @@ module browser threading seems wrong.
(only-in mzlib/etc compose)
string-constants
framework
(lib "name-message.ss" "mrlib")
(lib "bitmap-label.ss" "mrlib")
(lib "include-bitmap.ss" "mrlib")
mrlib/name-message
mrlib/bitmap-label
mrlib/include-bitmap
"drsig.ss"
"auto-language.ss"
"insert-large-letters.ss"
@ -3592,9 +3592,9 @@ module browser threading seems wrong.
(set! newest-frame this)
(send definitions-canvas focus)))
(define running-bitmap (include-bitmap (lib "b-run.png" "icons")))
(define waiting-bitmap (include-bitmap (lib "b-wait.png" "icons")))
(define waiting2-bitmap (include-bitmap (lib "b-wait2.png" "icons")))
(define running-bitmap (include-bitmap (lib "icons/b-run.png")))
(define waiting-bitmap (include-bitmap (lib "icons/b-wait.png")))
(define waiting2-bitmap (include-bitmap (lib "icons/b-wait2.png")))
(define running/waiting-bitmaps (list running-bitmap waiting-bitmap waiting2-bitmap))
(define running-canvas%
(class canvas%

View File

@ -74,11 +74,7 @@ all of the names in the tools library, for use defining keybindings
created empty namespace. This namespace has the following modules
copied (with @scheme[namespace-attach-module])
from DrScheme's original namespace:
@itemize{
@item{ @scheme['mzscheme]
}@item{ @scheme['(lib "mred.ss" "mred")]
}}
@itemize{@item{@scheme['mzscheme]}@item{@scheme['mred]}}
}@item{
@scheme[read-curly-brace-as-paren]
is @scheme[#t],

View File

@ -12,7 +12,7 @@
mzlib/class
mred
mzlib/etc
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"on-show-pasteboard.ss"
"really-resized-pasteboard.ss"
"interface.ss"

View File

@ -205,8 +205,8 @@
;; tests
#|
(require
(lib "locked-pasteboard.ss" "mrlib" "private" "aligned-pasteboard")
(lib "click-forwarding-editor.ss" "mrlib"))
mrlib/private/aligned-pasteboard/locked-pasteboard
mrlib/click-forwarding-editor)
(define (test)
(define f (new frame% (label "test") (width 200) (height 200)))

View File

@ -13,7 +13,7 @@
mzlib/list
mzlib/match
(prefix a: "alignment.ss")
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"on-show-pasteboard.ss"
"really-resized-pasteboard.ss"

View File

@ -1,13 +1,13 @@
(module not-stetching mzscheme
(require
(lib "debug.ss" "mike-lib")
mike-lib/debug
mzlib/class
mzlib/etc
mred
(lib "aligned-pasteboard.ss" "embedded-gui")
(lib "stretchable-editor-snip.ss" "embedded-gui")
(lib "verthoriz-alignment.ss" "embedded-gui"))
embedded-gui/aligned-pasteboard
embedded-gui/stretchable-editor-snip
embedded-gui/verthoriz-alignment)
(define traced-ses%
#;(override/trace stretchable-editor-snip%

View File

@ -7,7 +7,7 @@
(prefix a: "../alignment.ss")
"../alignment-helpers.ss"
"../dllist.ss"
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"../on-show-pasteboard.ss"
"../really-resized-pasteboard.ss"
"../interface.ss"

View File

@ -4,15 +4,15 @@
mred
mzlib/etc
mzlib/class
(lib "interface.ss" "mrlib" "private" "aligned-pasteboard")
(lib "debug.ss" "mike-lib")
mrlib/private/aligned-pasteboard/interface
mike-lib/debug
mzlib/list
mzlib/match
(prefix a: "alignment.ss")
(lib "click-forwarding-editor.ss" "mrlib")
(lib "snip-lib.ss" "mrlib" "private" "aligned-pasteboard")
(lib "aligned-pasteboard.ss" "embedded-gui")
(lib "stretchable-editor-snip.ss" "embedded-gui"))
mrlib/click-forwarding-editor
mrlib/private/aligned-pasteboard/snip-lib
embedded-gui/aligned-pasteboard
embedded-gui/stretchable-editor-snip)
(define f (new frame% (label "f") (width 400) (height 400)))
(define e (new text%))

View File

@ -3,7 +3,7 @@
mzlib/list
mred
mzlib/unitsig
(lib "tool.ss" "drscheme")
drscheme/tool
mzlib/etc
mzlib/match
framework

View File

@ -14,7 +14,7 @@
"../snip-lib.ss"
"../interface.ss"
"../alignment-helpers.ss"
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"../on-show-pasteboard.ss"
"../really-resized-pasteboard.ss"
"../interface.ss"
@ -23,7 +23,7 @@
"../verthoriz-alignment.ss"
"../suppress-modify-editor.ss")
(require (lib "print-debug.ss" "mike-lib"))
(require mike-lib/print-debug)
(define aligned-pasteboard%
(class (click-forwarding-editor-mixin

View File

@ -1,5 +1,5 @@
(require (lib "aligned-pasteboard.ss" "embedded-gui")
(lib "debug.ss" "mike-lib"))
(require embedded-gui/aligned-pasteboard
mike-lib/debug)
(define f (new frame% (label "f") (width 100) (height 100)))
(define e (new text%))

View File

@ -11,7 +11,7 @@ wraps the load of the module.)
(module eopl-tool mzscheme
(require mzlib/unit
mzlib/class
(lib "tool.ss" "drscheme")
drscheme/tool
string-constants)
(provide tool@)
@ -28,7 +28,7 @@ wraps the load of the module.)
(list (string-constant teaching-languages)
"Essentials of Programming Languages (2nd ed.)"))
(define/public (get-module)
'(lib "eopl.ss" "eopl"))
'(lib "eopl/eopl.ss"))
(define/public (get-one-line-summary)
"Based on the Friedman, Wand, and Haynes text")
(define/public (get-language-url)

View File

@ -1,7 +1,5 @@
(module errortrace-key-syntax mzscheme
(require (lib "errortrace-key.ss" "errortrace"))
(require-for-syntax (lib "errortrace-key.ss" "errortrace"))
(require errortrace/errortrace-key)
(require-for-syntax errortrace/errortrace-key)
(define errortrace-key-syntax #'errortrace-key)
(provide errortrace-key-syntax))

View File

@ -327,10 +327,9 @@
#,(syntax-recertify
#`(#%plain-module-begin
#,((make-syntax-introducer)
#'(#%require (lib "errortrace-key.ss" "errortrace")))
#'(#%require errortrace/errortrace-key))
#,((make-syntax-introducer)
#'(#%require (for-syntax
(lib "errortrace-key.ss" "errortrace"))))
#'(#%require (for-syntax errortrace/errortrace-key)))
body ...)
(list-ref (syntax->list top-e) 3)
orig-inspector

View File

@ -4,7 +4,7 @@
(require ffi/sndfile)
;; (require (lib "swindle.ss" "swindle"))
;; (require swindle)
(define (add-half x y)
(/ (+ x (* y 0.5)) 1.5))

View File

@ -1,7 +1,7 @@
#lang scheme/base
(require mzlib/unit
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(require "private/sig.ss"
"private/number-snip.ss"

View File

@ -1,8 +1,8 @@
#reader scribble/reader
#lang scheme/gui
(require (lib "mred-unit.ss" "mred")
(lib "mred-sig.ss" "mred")
(require mred/mred-unit
mred/mred-sig
framework/framework-unit
framework/private/sig
(for-syntax scheme/base)

View File

@ -6,7 +6,7 @@
"sig.ss"
"../gui-utils.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
string-constants)

View File

@ -1,4 +1,4 @@
(module bday mzscheme (require (lib "encode-decode.ss" "framework" "private"))
(module bday mzscheme (require framework/private/encode-decode)
(decode
\5d8f4
\10ec22010

View File

@ -2,7 +2,7 @@
(require mzlib/class
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^
[prefix frame: framework:frame^]

View File

@ -1,7 +1,7 @@
#lang scheme/unit
(require mzlib/class
"sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list)
(import)

View File

@ -6,7 +6,7 @@
mred
"sig.ss"
"../decorated-editor-snip.ss"
(lib "include-bitmap.ss" "mrlib")
mrlib/include-bitmap
string-constants)
(import [prefix text: framework:text^]
@ -25,7 +25,7 @@
(send snipclass set-classname (format "~s" '(lib "comment-snip.ss" "framework")))
(send (get-the-snip-class-list) add snipclass)
(define bm (include-bitmap (lib "semicolon.gif" "icons")))
(define bm (include-bitmap (lib "icons/semicolon.gif")))
(define (editor-keymap-mixin %)
(class %

View File

@ -6,7 +6,7 @@
"../preferences.ss"
"../gui-utils.ss"
mzlib/etc
(lib "mred-sig.ss" "mred")
mred/mred-sig
scheme/path)
(import mred^

View File

@ -21,7 +21,7 @@
(λ (oport)
(let ([chopped (chop-up (encode-sexp `(begin ,@bodies)))])
(fprintf oport "(module ~a mzscheme\n" m)
(fprintf oport " (require (lib \"encode-decode.ss\" \"framework\" \"private\"))\n")
(fprintf oport " (require framework/private/encode-decode)\n")
(fprintf oport " (decode ~a" (car chopped))
(for-each (lambda (chopped)
(fprintf oport "\n ~a" chopped))

View File

@ -4,7 +4,7 @@
"sig.ss"
"../preferences.ss"
"../gui-utils.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^)
(export (rename framework:exit^

View File

@ -3,7 +3,7 @@
(require string-constants
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/string
scheme/path
mzlib/etc)

View File

@ -6,7 +6,7 @@
"../preferences.ss"
"../gui-utils.ss"
"bday.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
scheme/path
mzlib/etc)

View File

@ -5,7 +5,7 @@
"sig.ss"
"../preferences.ss"
"../gui-utils.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
scheme/path)

View File

@ -2,15 +2,14 @@
(require mzlib/class
mzlib/list
(lib "hierlist.ss" "hierlist")
mrlib/hierlist
"sig.ss"
"../preferences.ss"
"../gui-utils.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
scheme/path
string-constants)
(import mred^
[prefix finder: framework:finder^]
[prefix group: framework:group^]

View File

@ -2,28 +2,28 @@
(require (for-syntax scheme/base)
scheme/promise
mzlib/class
(lib "include-bitmap.ss" "mrlib")
mrlib/include-bitmap
"bday.ss"
"sig.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^)
(export framework:icon^)
(define eof-bitmap (delay (include-bitmap (lib "eof.gif" "icons"))))
(define eof-bitmap (delay (include-bitmap (lib "icons/eof.gif"))))
(define (get-eof-bitmap) (force eof-bitmap))
(define anchor-bitmap (delay (include-bitmap (lib "anchor.gif" "icons"))))
(define anchor-bitmap (delay (include-bitmap (lib "icons/anchor.gif"))))
(define (get-anchor-bitmap) (force anchor-bitmap))
(define lock-bitmap (delay (include-bitmap (lib "lock.gif" "icons"))))
(define lock-bitmap (delay (include-bitmap (lib "icons/lock.gif"))))
(define (get-lock-bitmap) (force lock-bitmap))
(define unlock-bitmap (delay (include-bitmap (lib "unlock.gif" "icons"))))
(define unlock-bitmap (delay (include-bitmap (lib "icons/unlock.gif"))))
(define (get-unlock-bitmap) (force unlock-bitmap))
(define autowrap-bitmap (delay (include-bitmap (lib "return.xbm" "icons"))))
(define autowrap-bitmap (delay (include-bitmap (lib "icons/return.xbm"))))
(define (get-autowrap-bitmap) (force autowrap-bitmap))
(define paren-highlight-bitmap (delay (include-bitmap (lib "paren.xbm" "icons"))))
(define paren-highlight-bitmap (delay (include-bitmap (lib "icons/paren.xbm"))))
(define (get-paren-highlight-bitmap) (force paren-highlight-bitmap))
(define-syntax (make-get-cursor stx)
@ -46,8 +46,8 @@
(define get-up/down-cursor (make-get-cursor "up-down-cursor.xbm" "up-down-mask.xbm" 'size-n/s))
(define get-left/right-cursor (make-get-cursor "left-right-cursor.xbm" "left-right-mask.xbm" 'size-e/w))
(define mrf-on-bitmap (delay (include-bitmap (lib "mrf.png" "icons"))))
(define gc-on-bitmap (delay (include-bitmap (lib "recycle.png" "icons"))))
(define mrf-on-bitmap (delay (include-bitmap (lib "icons/mrf.png"))))
(define gc-on-bitmap (delay (include-bitmap (lib "icons/recycle.png"))))
(define (make-off-bitmap onb)
(let* ([bitmap (make-object bitmap%

View File

@ -4,7 +4,7 @@
(require string-constants
mzlib/class
mzlib/list
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/match
"../preferences.ss"
"tex-table.ss"
@ -30,7 +30,10 @@
[sexp (and (file-exists? path)
(call-with-input-file path read))])
(match sexp
[`(module ,name (lib "keybinding-lang.ss" "framework") ,@(x ...))
[`(module ,name ,(or `(lib "keybinding-lang.ss" "framework")
`(lib "framework/keybinding-lang.ss")
`framework/keybinding-lang)
,@(x ...))
(let ([km (dynamic-require spec '#%keymap)])
(hash-set! user-keybindings-files spec km)
(send global chain-to-keymap km #t))]

View File

@ -2,7 +2,7 @@
(require mzlib/class
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^
[prefix preferences: framework:preferences^]

View File

@ -13,4 +13,3 @@
" ("
(symbol->string 'events)
" events)"))]))

View File

@ -2,7 +2,7 @@
(require mzlib/class
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^)
(export framework:menu^)

View File

@ -2,7 +2,7 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/class
"../preferences.ss"
string-constants)

View File

@ -2,7 +2,7 @@
#lang scheme/unit
(require mzlib/class
"sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
mzlib/etc)

View File

@ -1,6 +1,5 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred"))
(require "sig.ss" mred/mred-sig)
(import mred^
[prefix editor: framework:editor^])

View File

@ -1,6 +1,5 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred"))
(require "sig.ss" mred/mred-sig)
(import)
(export framework:path-utils^)

View File

@ -34,7 +34,7 @@ the state transitions / contracts are:
"sig.ss"
"../gui-utils.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list)
(import mred^

View File

@ -13,8 +13,8 @@ WARNING: printf is rebound in the body of the unit to always
"sig.ss"
"../gui-utils.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
(lib "interactive-value-port.ss" "mrlib")
mred/mred-sig
mrlib/interactive-value-port
mzlib/list
mzlib/etc
setup/dirs

View File

@ -1,7 +1,7 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/string
mzlib/list)
(import)

View File

@ -1,6 +1,6 @@
(module base-gm mzscheme
(require mzlib/list
(lib "etc.ss"))
mzlib/etc)
(provide assert
print-each

View File

@ -1,12 +1,12 @@
(module etc frtime/frtime-lang-only
(require (lib "main-collects.ss" "setup"))
(require setup/main-collects)
(require-for-syntax syntax/kerncase
syntax/stx
syntax/name
syntax/context
(lib "main-collects.ss" "setup")
(lib "stxset.ss" "mzlib" "private"))
setup/main-collects
mzlib/private/stxset)
(provide true false
boolean=? symbol=?

View File

@ -6,7 +6,7 @@
"erl.ss"
"heap.ss")
(require-for-syntax (lib "struct-info.ss" "scheme"))
(require-for-syntax scheme/struct-info)

View File

@ -5,7 +5,7 @@
mred
mzlib/etc
mzlib/list
(lib "tool.ss" "drscheme")
drscheme/tool
string-constants)
(provide tool@)

View File

@ -6,7 +6,7 @@
#lang scheme/unit
(require (lib "mred-sig.ss" "mred")
(require mred/mred-sig
mzlib/class
mzlib/class100
mzlib/etc

View File

@ -1,6 +1,6 @@
(module graphics-unit mzscheme
(require mzlib/unit
(lib "mred-sig.ss" "mred")
mred/mred-sig
"graphics-sig.ss"
"graphics-posn-less-unit.ss")
(provide graphics@)

View File

@ -1,6 +1,6 @@
(module graphics mzscheme
(require mzlib/unit
(lib "mred-sig.ss" "mred")
mred/mred-sig
mred
"graphics-sig.ss"
"graphics-unit.ss")

View File

@ -3,7 +3,7 @@
MACROS
-------
To get the basic macros:
(require (lib "mixin-macros.ss" "frtime" "demos" "gui"))
(require frtime/demos/gui/mixin-macros)
> (events->callbacks field-name update-call)
Generates a mixin for allowing an event stream to drive

View File

@ -1,18 +1,18 @@
(module mod-mrpanel mzscheme
(require mzlib/class
mzlib/class100
(prefix wx: (lib "kernel.ss" "mred" "private"))
(lib "lock.ss" "mred" "private")
(lib "const.ss" "mred" "private")
(lib "check.ss" "mred" "private")
(lib "helper.ss" "mred" "private")
(lib "wx.ss" "mred" "private")
(lib "kw.ss" "mred" "private")
(prefix wx: mred/private/kernel)
mred/private/lock
mred/private/const
mred/private/check
mred/private/helper
mred/private/wx
mred/private/kw
"mod-wx-panel.ss"
(lib "mrwindow.ss" "mred" "private")
(lib "mrcontainer.ss" "mred" "private")
(lib "mrtabgroup.ss" "mred" "private")
(lib "mrgroupbox.ss" "mred" "private"))
mred/private/mrwindow
mred/private/mrcontainer
mred/private/mrtabgroup
mred/private/mrgroupbox)
(provide #|pane%
vertical-pane%

View File

@ -2,15 +2,15 @@
(require mzlib/class
mzlib/class100
mzlib/list
(prefix wx: (lib "kernel.ss" "mred" "private"))
(lib "lock.ss" "mred" "private")
(lib "const.ss" "mred" "private")
(lib "helper.ss" "mred" "private")
(lib "check.ss" "mred" "private")
(lib "wx.ss" "mred" "private")
(lib "wxwindow.ss" "mred" "private")
(lib "wxitem.ss" "mred" "private")
(lib "wxcontainer.ss" "mred" "private"))
(prefix wx: mred/private/kernel)
mred/private/lock
mred/private/const
mred/private/helper
mred/private/check
mred/private/wx
mred/private/wxwindow
mred/private/wxitem
mred/private/wxcontainer)
(provide (protect wx-panel%
wx-vertical-panel%

View File

@ -2,7 +2,7 @@
(module struct mzscheme
(require mzlib/etc
syntax/stx
(lib "struct-info.ss" "scheme"))
scheme/struct-info)
(require-for-template mzscheme)
(provide build-struct-names

View File

@ -1,6 +1,6 @@
#lang mzscheme
(require (lib "gl-board.ss" "games" "gl-board-game")
(require games/gl-board-game/gl-board
mzlib/class
mzlib/math
mred
@ -9,7 +9,7 @@
sgl
sgl/gl
srfi/25/array
(lib "include-bitmap.ss" "mrlib")
mrlib/include-bitmap
"honu-bitmaps.ss")
(provide game@)

View File

@ -1,8 +1,8 @@
(module doors mzscheme
(require (lib "gl-board.ss" "games" "gl-board-game")
(require games/gl-board-game/gl-board
sgl/gl-vectors
sgl
(lib "bitmap.ss" "sgl")
sgl/bitmap
mred
mzlib/list
mzlib/etc

View File

@ -1,5 +1,5 @@
(module gui mzscheme
(require (lib "gl-board.ss" "games" "gl-board-game")
(require games/gl-board-game/gl-board
mzlib/class
mred
mzlib/file

View File

@ -9,7 +9,7 @@
mzlib/class
mzlib/unit
mred
(lib "include-bitmap.ss" "mrlib"))
mrlib/include-bitmap)
(provide game@)

View File

@ -700,7 +700,7 @@ another new board representation (vector of loc's)
(cdr ents))])))
#;
(require (lib "xml.ss" "xml")
(require xml
"parse.ss")
#;
(define (dump-out-candidates candidates)

View File

@ -6,8 +6,8 @@
"gui.ss"
mzlib/class
(lib "xml.ss" "xml")
(lib "htmltext.ss" "browser")
xml
browser/htmltext
mred)
(define board-size 250)

View File

@ -4,7 +4,7 @@
(module graphics-posn-less-unit mzscheme
(require mzlib/unit
(lib "mred-sig.ss" "mred")
mred/mred-sig
mred
mzlib/class
mzlib/class100

View File

@ -1,6 +1,6 @@
(module graphics-unit mzscheme
(require mzlib/unit
(lib "mred-sig.ss" "mred")
mred/mred-sig
"graphics-sig.ss"
"graphics-posn-less-unit.ss")
(provide graphics@)

View File

@ -1,7 +1,7 @@
(module graphics mzscheme
(require mzlib/unit
(lib "mred-sig.ss" "mred")
(lib "mred-unit.ss" "mred")
mred/mred-sig
mred/mred-unit
"graphics-sig.ss"
"graphics-unit.ss")
(provide-signature-elements graphics^ graphics:posn^)

View File

@ -1,6 +1,6 @@
#lang scheme/unit
(require (lib "mred-sig.ss" "mred")
(require mred/mred-sig
mzlib/class
mzlib/class100
mzlib/list

View File

@ -1,7 +1,7 @@
(module turtles mzscheme
(require mzlib/unit
(lib "mred-sig.ss" "mred")
(lib "mred-unit.ss" "mred")
mred/mred-sig
mred/mred-unit
"turtle-sig.ss"
"turtle-unit.ss")

View File

@ -1,7 +1,7 @@
(module annotator scheme/base
(require (prefix-in kernel: syntax/kerncase)
(lib "marks.ss" "gui-debugger")
gui-debugger/marks
mzlib/etc
(prefix-in srfi: srfi/1/search)
(for-syntax scheme/base)

View File

@ -6,7 +6,7 @@
mzlib/contract
mred
mzlib/match
(lib "tool.ss" "drscheme")
drscheme/tool
"marks.ss"
mrlib/switchable-button
mrlib/bitmap-label
@ -14,7 +14,7 @@
"load-sandbox.ss"
framework
string-constants
(lib "debugger-language-interface.ss" "lang"))
lang/debugger-language-interface)
(provide tool@)

View File

@ -3,8 +3,8 @@
(require mzlib/list
mzlib/contract
(prefix-in mz: mzscheme)
(lib "my-macros.ss" "stepper" "private")
(lib "shared.ss" "stepper" "private"))
stepper/private/my-macros
stepper/private/shared)
(define-struct full-mark-struct (module-name source label bindings values))

View File

@ -6,7 +6,7 @@ from the "Special" menu.
Though less recommended, you can also run
(require (lib ".ss" "guibuilder"))
(require guibuilder/guibuilder)
to get a stand-alone builder. Save your files with the extension
".gui" to ensure that they can be re-loaded later.

View File

@ -1,6 +1,6 @@
(module tool mzscheme
(require (lib "tool.ss" "drscheme")
(require drscheme/tool
mred
mzlib/unit
mzlib/class

View File

@ -1,5 +1,5 @@
(module client mzscheme
(require (lib "mzssl.ss" "openssl") "this-collection.ss")
(require openssl/mzssl "this-collection.ss")
(provide handin-connect
handin-disconnect

View File

@ -1,7 +1,7 @@
(module handin-multi mzscheme
(require mzlib/class mzlib/list mzlib/string mzlib/port
mred framework
(lib "external.ss" "browser")
browser/external
"info.ss" "client-gui.ss" "this-collection.ss")
(define handin-name (#%info-lookup 'name))

View File

@ -1,7 +1,5 @@
(module updater mzscheme
(require mzlib/file mzlib/port net/url
(lib "plt-installer.ss" "setup") mred
framework
(require mzlib/file mzlib/port net/url setup/plt-installer mred framework
"info.ss" "this-collection.ss")
(define name (#%info-lookup 'name))
(define web-address (#%info-lookup 'web-address))

View File

@ -429,7 +429,7 @@
(let ([c #f] [sema (make-semaphore 1)])
;; use only when needed so it doesn't blow up on non-unix platforms
(lambda (passwd salt)
(unless c (set! c (dynamic-require '(lib "crypt.ss" "ffi") 'crypt)))
(unless c (set! c (dynamic-require 'ffi/crypt 'crypt)))
;; crypt is not reentrant
(call-with-semaphore sema
(lambda () (bytes->string/utf-8 (c passwd salt)))))))

View File

@ -2,7 +2,7 @@
(require mzlib/list
mzlib/class
mred
(lib "posn.ss" "lang")
lang/posn
(prefix pc: mzlib/pconvert)
mzlib/pretty
(only "main.ss" timeout-control)

View File

@ -9,7 +9,7 @@
mzlib/list
net/url
net/uri-codec
(lib "htmltext.ss" "browser")
browser/htmltext
setup/dirs
"private/buginfo.ss")

View File

@ -1,4 +1,6 @@
#lang scheme/base
;; This is a stub for legacy code
(require mrlib/hierlist)
(provide (all-from-out mrlib/hierlist))

View File

@ -1,5 +1,5 @@
(module installer mzscheme
(require (lib "compile.ss" "profj"))
(require profj/compile)
(provide installer)
(define (mprintf . a)

Some files were not shown because too many files have changed in this diff Show More