suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish the cm move: change all requires, leave stub files in mzlib

Browse Source 
svn: r11314
This commit is contained in:
Eli Barzilay 2008-08-19 00:22:57 +00:00
parent 2a2977d804
commit da3b476e80
12 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
collects/compiler/cm-accomplice.ss
View File

@ -1,19 +1,16 @@
(module cm-accomplice mzscheme
(provide register-external-file)
(define (register-external-file f)
(unless (and (path? f)
(complete-path? f))
(raise-type-error 'register-external-file "complete path" f))
(let ([param (lambda () void)])
;; Load the code in a separate thread, so that the dynamic
;; extent of this one (likely a phase-sensitive macro expansion)
;; doesn't pollute the load:
(thread-wait
(thread (lambda ()
(set! param
(dynamic-require 'compiler/private/cm-ctime
'current-external-file-registrar)))))
((param) f))))
#lang scheme/base
(provide register-external-file)
(define (register-external-file f)
(unless (and (path? f) (complete-path? f))
(raise-type-error 'register-external-file "complete path" f))
(let ([param (lambda () void)])
;; Load the code in a separate thread, so that the dynamic
;; extent of this one (likely a phase-sensitive macro expansion)
;; doesn't pollute the load:
(thread-wait
(thread (lambda ()
(set! param
(dynamic-require 'compiler/private/cm-ctime
'current-external-file-registrar)))))
((param) f)))

2
collects/compiler/compiler-unit.ss
View File

@ -22,7 +22,7 @@
scheme/file
mzlib/compile ; gets compile-file
mzlib/cm
compiler/cm
setup/getinfo
setup/main-collects)

4
collects/compiler/main.ss
View File

@ -462,8 +462,8 @@
(zo-parse in))))))))))]
[(make-zo)
(let ([n (make-base-empty-namespace)]
[mc (dynamic-require 'mzlib/cm 'managed-compile-zo)]
[cnh (dynamic-require 'mzlib/cm 'manager-compile-notify-handler)]
[mc (dynamic-require 'compiler/cm 'managed-compile-zo)]
[cnh (dynamic-require 'compiler/cm 'manager-compile-notify-handler)]
[did-one? #f])
(parameterize ([current-namespace n]
[cnh (lambda (p)

8
collects/drscheme/drscheme.ss
View File

@ -18,8 +18,8 @@
[use-compiled-file-paths '()])
(values
(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)))])
(dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
(dynamic-require 'compiler/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))
@ -36,8 +36,8 @@
manager-trace-handler)
(parameterize ([current-namespace (make-namespace)])
(values
(dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
(dynamic-require 'mzlib/cm 'manager-trace-handler)))])
(dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
(dynamic-require 'compiler/cm 'manager-trace-handler)))])
(current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
(when cm-trace?
(printf "PLTDRCM: enabling CM tracing\n")

4
collects/framework/splash.ss
View File

@ -127,8 +127,8 @@
(getenv "PLTDRDEBUG"))
(parameterize ([current-namespace (make-namespace)])
(values
(dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
(dynamic-require 'mzlib/cm 'manager-trace-handler)))
(dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
(dynamic-require 'compiler/cm 'manager-trace-handler)))
(values #f #f))])
(current-load

2
collects/mrlib/include-bitmap.ss
View File

@ -4,7 +4,7 @@
mzlib/file
setup/main-collects)
(require-for-syntax syntax/path-spec
mzlib/cm-accomplice
compiler/cm-accomplice
setup/main-collects)
(provide include-bitmap

4
collects/mzlib/cm-accomplice.ss Normal file
View File

@ -0,0 +1,4 @@
#lang scheme/base
(require compiler/cm-accomplice)
(provide (all-from-out compiler/cm-accomplice))

4
collects/mzlib/cm.ss Normal file
View File

@ -0,0 +1,4 @@
#lang scheme/base
(require compiler/cm)
(provide (all-from-out compiler/cm))

2
collects/scheme/include.ss
View File

@ -4,7 +4,7 @@
syntax/stx
syntax/path-spec
mzlib/private/increader
mzlib/cm-accomplice))
compiler/cm-accomplice))
(provide include
include-at/relative-to

4
collects/setup/main.ss
View File

@ -110,10 +110,10 @@
(lambda () (loop #t)))))])
;; Here's the main dynamic load of "cm.ss":
(let ([mk
(dynamic-require 'mzlib/cm
(dynamic-require 'compiler/cm
'make-compilation-manager-load/use-compiled-handler)]
[trust-zos
(dynamic-require 'mzlib/cm 'trust-existing-zos)])
(dynamic-require 'compiler/cm 'trust-existing-zos)])
;; Return the two extracted functions:
(lambda () (values mk trust-zos)))))))))])
(when (on? 'trust-existing-zos values)

2
collects/setup/setup-go.ss
View File

@ -6,7 +6,7 @@
"option-sig.ss"
"setup-unit.ss"
"option-unit.ss"
mzlib/cm)
compiler/cm)
(define-values/invoke-unit/infer setup:option@)

2
collects/setup/setup-unit.ss
View File

@ -4,13 +4,13 @@
#lang scheme/base
(require scheme/unit
mzlib/cm
scheme/path
scheme/file
scheme/port
scheme/match
scheme/system
scheme/list
compiler/cm
planet/planet-archives
planet/private/planet-shared