diff --git a/racket/collects/syntax/parse/private/parse.rkt b/racket/collects/syntax/parse/private/parse.rkt index 07353e60aa..dfdc3fb2c6 100644 --- a/racket/collects/syntax/parse/private/parse.rkt +++ b/racket/collects/syntax/parse/private/parse.rkt @@ -17,7 +17,7 @@ racket/stxparam syntax/stx syntax/parse/private/residual ;; keep abs. path - syntax/parse/private/runtime ;; keep abs.path + "runtime.rkt" syntax/parse/private/runtime-reflect) ;; keep abs. path ;; ============================================================ diff --git a/racket/collects/syntax/parse/private/residual.rkt b/racket/collects/syntax/parse/private/residual.rkt index 84ef47aad2..75d942706d 100644 --- a/racket/collects/syntax/parse/private/residual.rkt +++ b/racket/collects/syntax/parse/private/residual.rkt @@ -7,9 +7,8 @@ ;; ============================================================ ;; Compile-time -(require (for-syntax racket/private/sc - syntax/parse/private/residual-ct)) -(provide (for-syntax (all-from-out syntax/parse/private/residual-ct))) +(require (for-syntax racket/private/sc "residual-ct.rkt")) +(provide (for-syntax (all-from-out "residual-ct.rkt"))) (begin-for-syntax ;; == from runtime.rkt diff --git a/racket/collects/syntax/parse/private/runtime-reflect.rkt b/racket/collects/syntax/parse/private/runtime-reflect.rkt index 333f08a9d1..e3bc47a4c5 100644 --- a/racket/collects/syntax/parse/private/runtime-reflect.rkt +++ b/racket/collects/syntax/parse/private/runtime-reflect.rkt @@ -1,7 +1,6 @@ #lang racket/base -(require syntax/parse/private/residual ;; keep abs. path - (only-in syntax/parse/private/residual-ct ;; keep abs. path - attr-name attr-depth) +(require "residual.rkt" + (only-in "residual-ct.rkt" attr-name attr-depth) "kws.rkt") (provide reflect-parser (struct-out reified) diff --git a/racket/collects/syntax/parse/private/sc.rkt b/racket/collects/syntax/parse/private/sc.rkt index 4fca6ec406..51e2ba2e1d 100644 --- a/racket/collects/syntax/parse/private/sc.rkt +++ b/racket/collects/syntax/parse/private/sc.rkt @@ -1,17 +1,10 @@ #lang racket/base (require racket/lazy-require - "keywords.rkt") - -;; keep and keep as abs. path -- lazy-loaded macros produce references to this -;; must be required via *absolute module path* from any disappearing module -;; (so for consistency etc, require absolutely from all modules) -(require syntax/parse/private/residual) + "keywords.rkt" + "residual.rkt") (lazy-require-syntax - ;; load macro transformers lazily via identifier - ;; This module path must also be absolute (not sure why, - ;; but it definitely breaks on relative module path). - [syntax/parse/private/parse + ["parse.rkt" (define-syntax-class define-splicing-syntax-class define-integrable-syntax-class