Woops, tests pass now.

Author: LeifAndersen

private/compiler.rkt

@@ -64,4 +64,3 @@
 ;(current-variable-printer debug-variable-printer)
 ;(current-module-binding-printer module-binding-printer)
 ;(require nanopass/base)
-

private/passes.rkt

@@ -216,20 +216,22 @@
       (not (equal? p not-projected))))
   (RawRequireSpec : raw-require-spec (e [project not-projected]) -> raw-require-spec ()
                   [,raw-module-path
-                   `(for-meta 0 ,(if (equal? project 0)
+                   `(for-meta 0 ,(if (or (not (projected? project))
+                                         (equal? project 0))
                                      (PhaselessReqSpec raw-module-path project)
                                      null) ...)]
                   [(just-meta ,phase-level ,raw-require-spec)
                    (RawRequireSpec raw-require-spec phase-level)]
                   [(for-meta ,phase-level ,phaseless-req-spec)
-                   `(for-meta ,phase-level ,(if (equal? project phase-level)
+                   `(for-meta ,phase-level ,(if (or (not (projected? project))
+                                                    (equal? project phase-level))
                                                 (PhaselessReqSpec phaseless-req-spec project)
                                                 null) ...)])
   (PhaselessReqSpec : phaseless-req-spec (e [project not-projected]) -> * ()
                     [,raw-module-path
                      (if (projected? project)
                          (list) ;; TODO
-                         raw-module-path)]
+                         (list raw-module-path))]
                     [(only ,raw-module-path ,v ...)
                      (list)] ;; TODO
                     [(all-except ,raw-module-path ,v* ...)
@@ -240,9 +242,12 @@
                      (list)]) ;; TODO
   (RawProvideSpec : raw-provide-spec (e [protected? #f]) -> raw-provide-spec ()
                   [,phaseless-prov-spec
-                   `(for-meta* 0 ,(PhaselessProvSpec phaseless-prov-spec protected?) ...)]
+                   `(for-meta*
+                     0 ,(PhaselessProvSpec phaseless-prov-spec protected?) ...)]
                   [(for-meta* ,phase-level ,phaseless-prov-spec)
-                   `(for-meta* ,phase-level ,(PhaselessProvSpec phaseless-prov-spec protected?))]
+                   `(for-meta*
+                     ,phase-level
+                     ,(PhaselessProvSpec phaseless-prov-spec protected?) ...)]
                   [(protect ,[raw-provide-spec #t -> raw-provide-spec])
                    raw-provide-spec])
  (PhaselessProvSpec : phaseless-prov-spec (e [protected? #f]) -> * ()

private/tests.rkt

@@ -365,12 +365,12 @@
           ((#%plain-app (primitive void)) (#%plain-app (primitive void)))
           () ()))
       (check-compiler-equal?
-       (current-compile #'(module foo racket/base
+       (current-compile #'(module foo racket
                             (#%plain-module-begin
                              (begin-for-syntax
                                (define x 5)
                                (#%provide x)))))
-       `(module foo racket/base
+       `(module foo racket
           ((for-meta* 1 ,x))
           ()
           ((begin-for-syntax
@@ -382,7 +382,7 @@
                            (#%plain-module-begin
                             (#%require racket/match)
                             (display (+ 1 2)))))
-      `(module test racket
+      `(module test racket/base
          ()
          (racket/match)
          ((#%plain-app (primitive void))
@@ -469,9 +469,9 @@
                             rest))
        `(begin*
           (#%require (for-meta 0 racket/list))
-          ,(make-variable rest)))
+          ,(make-variable 'rest)))
       (check-compiler-equal?
-       (current-compile #'(module test racket/base
+       (current-compile #'(module test racket
                             (#%plain-module-begin
                              (#%require racket/match)
                              (display (+ 1 2)))))