further improvements to source locations for `require' forms

collects/racket/require-transform.rkt

@@ -24,8 +24,10 @@
                 (raise-argument-error 'make-import "identifier?" i))
               (unless (symbol? s)
                 (raise-argument-error 'make-import "symbol?" s))
-              (unless (module-path? path)
-                (raise-argument-error 'make-import "module-path?" path))
+              (unless (or (module-path? path)
+                          (and (syntax? path)
+                               (module-path? (syntax->datum path))))
+                (raise-argument-error 'make-import "(or/c module-path? module-path-syntax?)" path))
               (unless (or (not mode)
                           (exact-integer? mode))
                 (raise-argument-error 'make-import "(or/c exact-integer? #f)" mode))
@@ -292,14 +294,19 @@
                                              name
                                              stx)
                                             name
-                                            mod-path
+                                            (if (equal? (syntax->datum #'simple) mod-path)
+                                                #'simple
+                                                mod-path)
                                             mode
                                             0
                                             mode
                                             stx))
                              (cdr names))))
                     namess))
-              (list (make-import-source (datum->syntax #'simple mod-path #'simple #'simple) 0)))))]
+              (list (make-import-source (if (equal? (syntax->datum #'simple) mod-path)
+                                            #'simple
+                                            (datum->syntax #'simple mod-path #'simple))
+                                        0)))))]
         [(id . rest)
          (identifier? #'id)
          (let ([t (syntax-local-value #'id (lambda () #f))])

collects/scribblings/reference/stx-trans.scrbl

@@ -893,7 +893,10 @@ Returns @racket[#t] if @racket[v] has the
 
 @defstruct[import ([local-id identifier?]
                    [src-sym symbol?]
-                   [src-mod-path module-path?]
+                   [src-mod-path (or/c module-path? 
+                                       (and/c syntax?
+                                              (lambda (stx) 
+                                                (module-path? (syntax->datum stx)))))]
                    [mode (or/c exact-integer? #f)]
                    [req-mode (or/c exact-integer? #f)]
                    [orig-mode (or/c exact-integer? #f)]

collects/tests/racket/macro.rktl

@@ -800,8 +800,8 @@
                                (_only rl2))))
        (list #'rl1 #'rl2)]))
   
-  (test (list #f #t) map syntax-original? r/ls)
-  (test (list #f #t) map number? (map syntax-position r/ls)))
+  (test (list #t #t) map syntax-original? r/ls)
+  (test (list #t #t) map number? (map syntax-position r/ls)))
 
 
 ;; ----------------------------------------

doc/release-notes/racket/HISTORY.txt

@@ -4,6 +4,7 @@ Added reroot-path
 Added #:break and #:final clauses to for forms
 syntax/for-body: added
 racket/set: added set-first and set-rest, sets are streams
+racket/require-transformer: an import's module path can be syntax
 
 Version 5.3.0.23
 Changed make-log-receiver to accept a logger name as an