fix relto delay in colalpse-module-path
svn: r12383
This commit is contained in:
parent
874937eaed
commit
54a8fe3143
|
@ -259,6 +259,10 @@ Use syntax/modcollapse instead.
|
||||||
[else #f]))
|
[else #f]))
|
||||||
|
|
||||||
(define (collapse-module-path-index mpi relto-mp)
|
(define (collapse-module-path-index mpi relto-mp)
|
||||||
|
(define (force-relto relto-mp)
|
||||||
|
(if (procedure? relto-mp)
|
||||||
|
(relto-mp)
|
||||||
|
relto-mp))
|
||||||
(let-values ([(path base) (module-path-index-split mpi)])
|
(let-values ([(path base) (module-path-index-split mpi)])
|
||||||
(if path
|
(if path
|
||||||
(collapse-module-path
|
(collapse-module-path
|
||||||
|
@ -271,11 +275,9 @@ Use syntax/modcollapse instead.
|
||||||
(let ([n (resolved-module-path-name base)])
|
(let ([n (resolved-module-path-name base)])
|
||||||
(if (path? n)
|
(if (path? n)
|
||||||
n
|
n
|
||||||
relto-mp))]
|
(force-relto relto-mp)))]
|
||||||
[else relto-mp])))
|
[else (force-relto relto-mp)])))
|
||||||
(if (procedure? relto-mp)
|
(force-relto relto-mp))))
|
||||||
(relto-mp)
|
|
||||||
relto-mp))))
|
|
||||||
|
|
||||||
(provide collapse-module-path
|
(provide collapse-module-path
|
||||||
collapse-module-path-index)
|
collapse-module-path-index)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user