fix collapse-module-path for Windows when actual paths are involed

svn: r2628
This commit is contained in:
Matthew Flatt 2006-04-06 20:13:04 +00:00
parent c4ef951137
commit 15bfa90966

View File

@ -338,15 +338,19 @@
(when (procedure? relto-mp) (when (procedure? relto-mp)
(set! relto-mp (relto-mp))) (set! relto-mp (relto-mp)))
(cond (cond
[(path-string? relto-mp) [(or (path? relto-mp)
((if (path? relto-mp) (and (string? relto-mp)
bytes->path (ormap path? elements)))
bytes->string/locale) (apply build-path
(let-values ([(base name dir?) (split-path relto-mp)])
base)
(map (lambda (x) (if (bytes? x) (bytes->path x) x))
elements))]
[(string? relto-mp)
(bytes->string/locale
(apply (apply
bytes-append bytes-append
(let ([m (regexp-match re:path-only (if (path? relto-mp) (let ([m (regexp-match re:path-only (string->bytes/locale relto-mp))])
(path->bytes relto-mp)
(string->bytes/locale relto-mp)))])
(if m (if m
(cadr m) (cadr m)
#".")) #"."))