From 8512606ee4558cc66cdc3bdb9f07ffe92a646b40 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 27 Jul 2005 20:58:43 +0000 Subject: [PATCH] r6rs repl clean-up svn: r469 --- collects/r6rs/private/uri.ss | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/collects/r6rs/private/uri.ss b/collects/r6rs/private/uri.ss index b3b589694a..8a5543727d 100644 --- a/collects/r6rs/private/uri.ss +++ b/collects/r6rs/private/uri.ss @@ -42,8 +42,19 @@ (apply collection-path (cdr p)))]) (path->string (build-path collpath (path-replace-suffix (car p) #""))))))] - [else (string->symbol s)]))) - + [else (string->symbol + (string-append "," + (path->string + (apply build-path + (simplify-path + (expand-path + ;; Don't use (current-load-relative-directory) + (current-directory))) + (filter + (lambda (x) + (not (string=? x ""))) + (regexp-split #rx"/" s))))))]))) + (define (uri->module-path s) (let ([p (uri->scheme-path s)]) (cond @@ -54,4 +65,4 @@ (apply collection-path (cdr p))) `(lib ,@p) (uri->symbol s))] - [else (string->symbol s)])))) + [else s]))))