From 32c5e3c9d249385a55233b83e77014420787d44a Mon Sep 17 00:00:00 2001
From: Ryan Culpepper <ryanc@racket-lang.org>
Date: Mon, 12 Dec 2011 17:39:18 -0700
Subject: [PATCH] avoid resolving module-path-index (current-directory may not
 be set right)

---
 collects/unstable/wrapc.rkt | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/collects/unstable/wrapc.rkt b/collects/unstable/wrapc.rkt
index 4407da72f8..523cc7898b 100644
--- a/collects/unstable/wrapc.rkt
+++ b/collects/unstable/wrapc.rkt
@@ -4,6 +4,7 @@
                        racket/contract/base
                        syntax/location)
          syntax/srcloc
+         syntax/modcollapse
          racket/syntax)
 
 (provide/contract
@@ -71,17 +72,20 @@
          (if (syntax? ctx)
              (get-source-expr (extract-source ctx) #f)
              (get-source-expr 'unknown #f))]
-        [else
-         (let ([source-string
-                (cond [(string? source) source]
-                      [(syntax? source) (source-location->string source)]
-                      [(module-path-index? source)
-                       ;; FIXME: share with syntax/location ??
-                       (let ([name (resolved-module-path-name
-                                    (module-path-index-resolve source))])
-                         (cond [(path? name) (format "(file ~s)" (path->string name))]
-                               [(symbol? name) (format "(quote ~s)" name)]))])])
-           #`(quote #,source-string))]))
+        [(string? source) #`(quote #,source)]
+        [(syntax? source) #`(quote #,(source-location->string source))]
+        [(module-path-index? source)
+         ;; FIXME: extend collapse-module-path-index to accept #f, return rel mod path
+         (let* ([here (current-load-relative-directory)]
+                [collapsed
+                 (collapse-module-path-index source (or here (build-path 'same)))])
+           (cond [(and (path? collapsed) here)
+                  #`(quote #,(path->string collapsed))]
+                 [(path? collapsed)
+                  (let-values ([(rel base) (module-path-index-split source)])
+                    #`(quote #,rel))]
+                 [else
+                  #`(quote #,(format "~s" collapsed))]))]))
 
 (define (extract-source stx)
   (let ([id (syntax-case stx ()