From 4604dc7024d392ebb0c3a9abae9c1df56b8c57eb Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 20 Feb 2008 14:17:37 +0000
Subject: [PATCH] 3.99.0.13: generalize require and provide to work with
 arbitrary phases

svn: r8742

original commit: ba63bd6f954b4b1ce09225f4b55dbe7c3a93a46b
---
 collects/mzlib/cm.ss              | 4 ++--
 collects/mzlib/match.ss           | 1 -
 collects/scheme/private/old-rp.ss | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/collects/mzlib/cm.ss b/collects/mzlib/cm.ss
index 931ce71..64df036 100644
--- a/collects/mzlib/cm.ss
+++ b/collects/mzlib/cm.ss
@@ -25,11 +25,11 @@
       (x (apply max x))))
   
   (define (get-deps code path)
-    (let-values ([(imports fs-imports ft-imports fl-imports) (module-compiled-imports code)])
+    (let-values ([(imports) (apply append (map cdr (module-compiled-imports code)))])
       (map path->bytes
            (let ([l (map (lambda (x)
                            (resolve-module-path-index x path))
-                         (append imports fs-imports ft-imports fl-imports))])
+                         imports)])
              ;; Filter symbols:
              (let loop ([l l])
                (cond
diff --git a/collects/mzlib/match.ss b/collects/mzlib/match.ss
index 8d99336..1cbc47d 100644
--- a/collects/mzlib/match.ss
+++ b/collects/mzlib/match.ss
@@ -133,7 +133,6 @@
 	    "private/match/match-error.ss"
 	    "private/match/test-no-order.ss")
   
-  
   (define-syntax match-definer
     (syntax-rules ()
       [(match-definer name clauses ...)
diff --git a/collects/scheme/private/old-rp.ss b/collects/scheme/private/old-rp.ss
index cd0e672..2634ece 100644
--- a/collects/scheme/private/old-rp.ss
+++ b/collects/scheme/private/old-rp.ss
@@ -38,13 +38,13 @@
                   (if for-stx
                       (with-syntax ([for for-stx])
                         (syntax/loc stx
-                          (#%require (for elem ...))))
+                          (#%require (for-meta for (just-meta 0 elem ...)))))
                       (syntax/loc stx
                         (#%require elem ...)))])))])
       (values (mk #f)
-              (mk #'for-syntax)
-              (mk #'for-template)
-              (mk #'for-label))))
+              (mk #'1)
+              (mk #'-1)
+              (mk #'#f))))
 
   (define-syntaxes (provide provide-for-syntax provide-for-label)
     (let ([mk