fix many more 3-argument calls to the module name resolver
This commit is contained in:
parent
ad15191493
commit
2f46525a7d
|
@ -87,7 +87,7 @@
|
||||||
(define/public (marshall-settings x) x)
|
(define/public (marshall-settings x) x)
|
||||||
(define/public (on-execute settings run-in-user-thread)
|
(define/public (on-execute settings run-in-user-thread)
|
||||||
(dynamic-require 'algol60/base #f)
|
(dynamic-require 'algol60/base #f)
|
||||||
(let ([path ((current-module-name-resolver) 'algol60/base #f #f)]
|
(let ([path ((current-module-name-resolver) 'algol60/base #f #f #t)]
|
||||||
[n (current-namespace)])
|
[n (current-namespace)])
|
||||||
(run-in-user-thread
|
(run-in-user-thread
|
||||||
(lambda ()
|
(lambda ()
|
||||||
|
|
|
@ -174,9 +174,9 @@
|
||||||
(define/override (on-execute settings run-in-user-thread)
|
(define/override (on-execute settings run-in-user-thread)
|
||||||
(let ([drs-namespace (current-namespace)]
|
(let ([drs-namespace (current-namespace)]
|
||||||
[scheme-test-module-name
|
[scheme-test-module-name
|
||||||
((current-module-name-resolver) '(lib "test-engine/scheme-tests.rkt") #f #f)]
|
((current-module-name-resolver) '(lib "test-engine/scheme-tests.rkt") #f #f #t)]
|
||||||
[scheme-signature-module-name
|
[scheme-signature-module-name
|
||||||
((current-module-name-resolver) '(lib "deinprogramm/signature/signature-german.rkt") #f #f)]
|
((current-module-name-resolver) '(lib "deinprogramm/signature/signature-german.rkt") #f #f #t)]
|
||||||
[tests-on? (preferences:get 'test-engine:enable?)])
|
[tests-on? (preferences:get 'test-engine:enable?)])
|
||||||
(run-in-user-thread
|
(run-in-user-thread
|
||||||
(lambda ()
|
(lambda ()
|
||||||
|
|
|
@ -802,7 +802,7 @@ This produces an ACK message
|
||||||
|
|
||||||
(mktest (to-strings
|
(mktest (to-strings
|
||||||
'(let ([on (current-namespace)]
|
'(let ([on (current-namespace)]
|
||||||
[n ((current-module-name-resolver) 'mred #f #f)])
|
[n ((current-module-name-resolver) 'mred #f #f #t)])
|
||||||
(current-namespace (make-namespace))
|
(current-namespace (make-namespace))
|
||||||
(namespace-attach-module on n))
|
(namespace-attach-module on n))
|
||||||
'(require texpict/utils)
|
'(require texpict/utils)
|
||||||
|
|
|
@ -202,7 +202,7 @@
|
||||||
(λ (spec)
|
(λ (spec)
|
||||||
(if (symbol? spec)
|
(if (symbol? spec)
|
||||||
spec
|
spec
|
||||||
((current-module-name-resolver) spec #f #f)))])
|
((current-module-name-resolver) spec #f #f #t)))])
|
||||||
(values (map get-name to-be-copied-module-specs)
|
(values (map get-name to-be-copied-module-specs)
|
||||||
(map get-name to-be-copied-gui-module-specs))))
|
(map get-name to-be-copied-gui-module-specs))))
|
||||||
|
|
||||||
|
|
|
@ -2035,7 +2035,7 @@
|
||||||
;; since check syntax no longer shares the gui libraries,
|
;; since check syntax no longer shares the gui libraries,
|
||||||
;; we always share it explicitly here
|
;; we always share it explicitly here
|
||||||
(define/override (on-execute setting run-in-user-thread)
|
(define/override (on-execute setting run-in-user-thread)
|
||||||
(let ([mred-name ((current-module-name-resolver) 'mred/mred #f #f)])
|
(let ([mred-name ((current-module-name-resolver) 'mred/mred #f #f #t)])
|
||||||
(run-in-user-thread
|
(run-in-user-thread
|
||||||
(λ ()
|
(λ ()
|
||||||
(namespace-attach-module drracket:init:system-namespace mred-name))))
|
(namespace-attach-module drracket:init:system-namespace mred-name))))
|
||||||
|
|
|
@ -455,7 +455,7 @@
|
||||||
(define (*post)
|
(define (*post)
|
||||||
(current-module-declare-name #f)
|
(current-module-declare-name #f)
|
||||||
(current-module-declare-source #f)
|
(current-module-declare-source #f)
|
||||||
(when path ((current-module-name-resolver) resolved-modpath #f))
|
(when path ((current-module-name-resolver) resolved-modpath #f #t))
|
||||||
(thread-cell-set! repl-init-thunk *init))
|
(thread-cell-set! repl-init-thunk *init))
|
||||||
(define (*error)
|
(define (*error)
|
||||||
(current-module-declare-name #f)
|
(current-module-declare-name #f)
|
||||||
|
|
|
@ -953,7 +953,7 @@
|
||||||
[(module-path-index? datum)
|
[(module-path-index? datum)
|
||||||
(module-path-index-resolve datum)]
|
(module-path-index-resolve datum)]
|
||||||
[else
|
[else
|
||||||
((current-module-name-resolver) datum #f #f)])))
|
((current-module-name-resolver) datum #f #f #t)])))
|
||||||
(define rkt-path/mod-path (and mpi (resolved-module-path-name mpi)))
|
(define rkt-path/mod-path (and mpi (resolved-module-path-name mpi)))
|
||||||
(define rkt-path/f (cond
|
(define rkt-path/f (cond
|
||||||
[(path? rkt-path/mod-path) rkt-path/mod-path]
|
[(path? rkt-path/mod-path) rkt-path/mod-path]
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
(cond
|
(cond
|
||||||
[(path? p) p]
|
[(path? p) p]
|
||||||
[else
|
[else
|
||||||
(let* ([mod-name ((current-module-name-resolver) p #f #f)]
|
(let* ([mod-name ((current-module-name-resolver) p #f #f #t)]
|
||||||
[str (symbol->string mod-name)]
|
[str (symbol->string mod-name)]
|
||||||
[pth (substring str 1 (string-length str))])
|
[pth (substring str 1 (string-length str))])
|
||||||
(let-values ([(base name _) (split-path pth)])
|
(let-values ([(base name _) (split-path pth)])
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
(test
|
(test
|
||||||
(string->symbol file)
|
(string->symbol file)
|
||||||
void?
|
void?
|
||||||
`(let ([mred-name ((current-module-name-resolver) 'mred #f #f)]
|
`(let ([mred-name ((current-module-name-resolver) 'mred #f #f #t)]
|
||||||
[orig-namespace (current-namespace)])
|
[orig-namespace (current-namespace)])
|
||||||
(parameterize ([current-namespace (make-base-namespace)])
|
(parameterize ([current-namespace (make-base-namespace)])
|
||||||
(namespace-attach-module orig-namespace mred-name)
|
(namespace-attach-module orig-namespace mred-name)
|
||||||
|
|
|
@ -130,12 +130,12 @@
|
||||||
(define/override (on-execute settings run-in-user-thread)
|
(define/override (on-execute settings run-in-user-thread)
|
||||||
(let ([drs-namespace (current-namespace)]
|
(let ([drs-namespace (current-namespace)]
|
||||||
[set-result-module-name
|
[set-result-module-name
|
||||||
((current-module-name-resolver) '(lib "lang/private/set-result.ss") #f #f)]
|
((current-module-name-resolver) '(lib "lang/private/set-result.ss") #f #f #t)]
|
||||||
[scheme-test-module-name
|
[scheme-test-module-name
|
||||||
((current-module-name-resolver) '(lib "test-engine/racket-tests.ss") #f #f)]
|
((current-module-name-resolver) '(lib "test-engine/racket-tests.ss") #f #f #t)]
|
||||||
[scheme-signature-module-name
|
[scheme-signature-module-name
|
||||||
((current-module-name-resolver)
|
((current-module-name-resolver)
|
||||||
'(lib "deinprogramm/signature/signature-english.rkt") #f #f)]
|
'(lib "deinprogramm/signature/signature-english.rkt") #f #f #t)]
|
||||||
[tests-on? (preferences:get 'test-engine:enable?)])
|
[tests-on? (preferences:get 'test-engine:enable?)])
|
||||||
(run-in-user-thread
|
(run-in-user-thread
|
||||||
(lambda ()
|
(lambda ()
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
(if (symbol? spec)
|
(if (symbol? spec)
|
||||||
spec
|
spec
|
||||||
(with-handlers ([exn:fail? (lambda _ #f)])
|
(with-handlers ([exn:fail? (lambda _ #f)])
|
||||||
((current-module-name-resolver) spec #f #f))))
|
((current-module-name-resolver) spec #f #f #t))))
|
||||||
(define to-be-copied-module-names
|
(define to-be-copied-module-names
|
||||||
(map get-name
|
(map get-name
|
||||||
(append default-to-be-copied-module-specs
|
(append default-to-be-copied-module-specs
|
||||||
|
|
Loading…
Reference in New Issue
Block a user