0001-require-paths.patch (27487B)
1 From 2a8ee17ac795be472b75d807315476e81bf07a51 Mon Sep 17 00:00:00 2001 2 From: Suzanne Soy <ligo@suzanne.soy> 3 Date: Tue, 2 Mar 2021 21:19:51 +0000 4 Subject: [PATCH 1/2] require paths 5 6 --- 7 .../racket/private/stxcase-scheme.rkt | 9 ++++-- 8 racket/collects/racket/private/stxcase.rkt | 10 +++---- 9 racket/collects/racket/private/stxloc.rkt | 4 +-- 10 racket/collects/racket/private/template.rkt | 1 + 11 racket/collects/racket/private/with-stx.rkt | 7 +++-- 12 racket/collects/racket/syntax.rkt | 3 +- 13 racket/collects/syntax/parse.rkt | 3 +- 14 racket/collects/syntax/parse/debug.rkt | 8 ++--- 15 racket/collects/syntax/parse/define.rkt | 4 +-- 16 .../syntax/parse/experimental/contract.rkt | 4 +-- 17 .../collects/syntax/parse/experimental/eh.rkt | 2 +- 18 .../parse/experimental/private/substitute.rkt | 10 +++++++ 19 .../syntax/parse/experimental/provide.rkt | 6 ++-- 20 .../syntax/parse/experimental/reflect.rkt | 6 ++-- 21 .../syntax/parse/experimental/specialize.rkt | 4 +-- 22 .../syntax/parse/experimental/splicing.rkt | 6 ++-- 23 .../syntax/parse/experimental/template.rkt | 5 ++-- 24 racket/collects/syntax/parse/private/lib.rkt | 2 +- 25 .../collects/syntax/parse/private/litconv.rkt | 10 +++---- 26 racket/collects/syntax/parse/private/opt.rkt | 6 ++-- 27 .../collects/syntax/parse/private/parse.rkt | 18 +++++------ 28 racket/collects/syntax/parse/private/rep.rkt | 14 ++++----- 29 .../syntax/parse/private/residual.rkt | 9 +++++- 30 .../syntax/parse/private/runtime-progress.rkt | 2 +- 31 .../syntax/parse/private/runtime-reflect.rkt | 30 +++++++++++++++---- 32 .../syntax/parse/private/runtime-report.rkt | 6 ++-- 33 .../collects/syntax/parse/private/runtime.rkt | 4 +-- 34 racket/collects/syntax/parse/private/sc.rkt | 10 +++---- 35 28 files changed, 123 insertions(+), 80 deletions(-) 36 create mode 100644 racket/collects/racket/private/template.rkt 37 38 diff --git a/racket/collects/racket/private/stxcase-scheme.rkt b/racket/collects/racket/private/stxcase-scheme.rkt 39 index 9f1a21abbb..5436c0691f 100644 40 --- a/racket/collects/racket/private/stxcase-scheme.rkt 41 +++ b/racket/collects/racket/private/stxcase-scheme.rkt 42 @@ -4,8 +4,10 @@ 43 ;; check-duplicate-identifier, and assembles everything we have so far 44 45 (module stxcase-scheme '#%kernel 46 - (#%require "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" 47 - (for-syntax '#%kernel "small-scheme.rkt" "stx.rkt" "stxcase.rkt" 48 + (#%require racket/private/small-scheme racket/private/stx "stxcase.rkt" 49 + "with-stx.rkt" racket/private/stxloc 50 + (for-syntax '#%kernel racket/private/small-scheme 51 + racket/private/stx "stxcase.rkt" 52 "stxloc.rkt")) 53 54 (-define (check-duplicate-identifier names) 55 @@ -68,7 +70,8 @@ 56 (syntax-arm stx #f #t) 57 (raise-argument-error 'syntax-protect "syntax?" stx))) 58 59 - (#%provide syntax datum (all-from "with-stx.rkt") (all-from "stxloc.rkt") 60 + (#%provide syntax datum (all-from "with-stx.rkt") 61 + (all-from racket/private/stxloc) 62 check-duplicate-identifier syntax-protect 63 syntax-rules syntax-id-rules 64 (for-syntax syntax-pattern-variable?))) 65 diff --git a/racket/collects/racket/private/stxcase.rkt b/racket/collects/racket/private/stxcase.rkt 66 index cc3b2ec158..ccc501593e 100644 67 --- a/racket/collects/racket/private/stxcase.rkt 68 +++ b/racket/collects/racket/private/stxcase.rkt 69 @@ -2,10 +2,10 @@ 70 ;; syntax-case and syntax 71 72 (module stxcase '#%kernel 73 - (#%require "stx.rkt" "small-scheme.rkt" '#%paramz '#%unsafe 74 - "ellipses.rkt" 75 - (for-syntax "stx.rkt" "small-scheme.rkt" 76 - "member.rkt" "sc.rkt" '#%kernel)) 77 + (#%require racket/private/stx racket/private/small-scheme '#%paramz '#%unsafe 78 + racket/private/ellipses 79 + (for-syntax racket/private/stx racket/private/small-scheme 80 + racket/private/member racket/private/sc '#%kernel)) 81 82 (-define (datum->syntax/shape orig datum) 83 (if (syntax? datum) 84 @@ -600,5 +600,5 @@ 85 (-define-syntax syntax (lambda (stx) (gen-template stx #f))) 86 (-define-syntax datum (lambda (stx) (gen-template stx #t))) 87 88 - (#%provide (all-from "ellipses.rkt") syntax-case** syntax datum 89 + (#%provide (all-from racket/private/ellipses) syntax-case** syntax datum 90 (for-syntax syntax-pattern-variable?))) 91 diff --git a/racket/collects/racket/private/stxloc.rkt b/racket/collects/racket/private/stxloc.rkt 92 index 0e0082a699..6444aa14b4 100644 93 --- a/racket/collects/racket/private/stxloc.rkt 94 +++ b/racket/collects/racket/private/stxloc.rkt 95 @@ -3,8 +3,8 @@ 96 ;; syntax/loc 97 98 (module stxloc '#%kernel 99 - (#%require "qq-and-or.rkt" "stxcase.rkt" "define-et-al.rkt" 100 - (for-syntax '#%kernel "stxcase.rkt" "sc.rkt")) 101 + (#%require racket/private/qq-and-or "stxcase.rkt" racket/private/define-et-al 102 + (for-syntax '#%kernel "stxcase.rkt" racket/private/sc)) 103 104 (begin-for-syntax 105 (define-values (transform-to-syntax-case**) 106 diff --git a/racket/collects/racket/private/template.rkt b/racket/collects/racket/private/template.rkt 107 new file mode 100644 108 index 0000000000..7bc35af1c4 109 --- /dev/null 110 +++ b/racket/collects/racket/private/template.rkt 111 @@ -0,0 +1 @@ 112 +#lang racket/base 113 diff --git a/racket/collects/racket/private/with-stx.rkt b/racket/collects/racket/private/with-stx.rkt 114 index 64ea885bb4..9dfa54682c 100644 115 --- a/racket/collects/racket/private/with-stx.rkt 116 +++ b/racket/collects/racket/private/with-stx.rkt 117 @@ -2,9 +2,10 @@ 118 ;; with-syntax, generate-temporaries 119 120 (module with-stx '#%kernel 121 - (#%require "stx.rkt" "small-scheme.rkt" "stxcase.rkt" 122 - (for-syntax '#%kernel "stx.rkt" "stxcase.rkt" "stxloc.rkt" 123 - "sc.rkt" "qq-and-or.rkt" "cond.rkt")) 124 + (#%require racket/private/stx racket/private/small-scheme "stxcase.rkt" 125 + (for-syntax '#%kernel racket/private/stx "stxcase.rkt" 126 + racket/private/stxloc racket/private/sc 127 + racket/private/qq-and-or racket/private/cond)) 128 129 (-define (with-syntax-fail stx) 130 (raise-syntax-error 131 diff --git a/racket/collects/racket/syntax.rkt b/racket/collects/racket/syntax.rkt 132 index af8c5c6412..99782d0216 100644 133 --- a/racket/collects/racket/syntax.rkt 134 +++ b/racket/collects/racket/syntax.rkt 135 @@ -1,5 +1,6 @@ 136 #lang racket/base 137 -(require (for-syntax racket/base 138 +(require (only-in "stxloc.rkt" syntax-case) 139 + (for-syntax racket/base 140 racket/private/sc)) 141 (provide define/with-syntax 142 143 diff --git a/racket/collects/syntax/parse.rkt b/racket/collects/syntax/parse.rkt 144 index 6d72774e29..6712f0fae0 100644 145 --- a/racket/collects/syntax/parse.rkt 146 +++ b/racket/collects/syntax/parse.rkt 147 @@ -22,7 +22,8 @@ 148 [syntax-local-syntax-parse-pattern-introduce 149 (-> syntax? syntax?)])) 150 151 - (define pattern-expander 152 + (require (only-in (for-template syntax/parse) pattern-expander)) 153 + #;(define pattern-expander 154 (let () 155 (struct pattern-expander (proc) #:transparent 156 #:omit-define-syntaxes 157 diff --git a/racket/collects/syntax/parse/debug.rkt b/racket/collects/syntax/parse/debug.rkt 158 index a816fd4c6e..efb87b914b 100644 159 --- a/racket/collects/syntax/parse/debug.rkt 160 +++ b/racket/collects/syntax/parse/debug.rkt 161 @@ -2,18 +2,18 @@ 162 (require (for-syntax racket/base 163 syntax/stx 164 racket/syntax 165 - "private/rep-data.rkt" 166 + syntax/parse/private/rep-data 167 "private/rep.rkt" 168 - "private/kws.rkt") 169 + syntax/parse/private/kws) 170 racket/list 171 racket/pretty 172 "../parse.rkt" 173 - (except-in syntax/parse/private/residual 174 + (except-in stxparse-info/parse/private/residual 175 prop:pattern-expander syntax-local-syntax-parse-pattern-introduce) 176 "private/runtime.rkt" 177 "private/runtime-progress.rkt" 178 "private/runtime-report.rkt" 179 - "private/kws.rkt") 180 + syntax/parse/private/kws) 181 182 ;; No lazy loading for this module's dependencies. 183 184 diff --git a/racket/collects/syntax/parse/define.rkt b/racket/collects/syntax/parse/define.rkt 185 index 97c201000b..28e51486fd 100644 186 --- a/racket/collects/syntax/parse/define.rkt 187 +++ b/racket/collects/syntax/parse/define.rkt 188 @@ -1,10 +1,10 @@ 189 #lang racket/base 190 (require (for-syntax racket/base 191 - syntax/parse 192 + stxparse-info/parse 193 "private/sc.rkt")) 194 (provide define-simple-macro 195 define-syntax-parser 196 - (for-syntax (all-from-out syntax/parse))) 197 + (for-syntax (all-from-out stxparse-info/parse))) 198 199 (define-syntax (define-simple-macro stx) 200 (syntax-parse stx 201 diff --git a/racket/collects/syntax/parse/experimental/contract.rkt b/racket/collects/syntax/parse/experimental/contract.rkt 202 index b4dbec4107..5d5144b1a8 100644 203 --- a/racket/collects/syntax/parse/experimental/contract.rkt 204 +++ b/racket/collects/syntax/parse/experimental/contract.rkt 205 @@ -1,8 +1,8 @@ 206 #lang racket/base 207 -(require syntax/parse/pre 208 +(require stxparse-info/parse/pre 209 "provide.rkt" 210 syntax/contract 211 - (only-in syntax/parse/private/residual ;; keep abs. path 212 + (only-in stxparse-info/parse/private/residual ;; keep abs. path 213 this-context-syntax 214 this-role) 215 racket/contract/base) 216 diff --git a/racket/collects/syntax/parse/experimental/eh.rkt b/racket/collects/syntax/parse/experimental/eh.rkt 217 index 305080721f..f8e1b09302 100644 218 --- a/racket/collects/syntax/parse/experimental/eh.rkt 219 +++ b/racket/collects/syntax/parse/experimental/eh.rkt 220 @@ -1,5 +1,5 @@ 221 #lang racket/base 222 (require "../private/sc.rkt" 223 - "../private/keywords.rkt") 224 + syntax/parse/private/keywords) 225 (provide ~eh-var 226 define-eh-alternative-set) 227 diff --git a/racket/collects/syntax/parse/experimental/private/substitute.rkt b/racket/collects/syntax/parse/experimental/private/substitute.rkt 228 index 20cb5726ba..2e11d58694 100644 229 --- a/racket/collects/syntax/parse/experimental/private/substitute.rkt 230 +++ b/racket/collects/syntax/parse/experimental/private/substitute.rkt 231 @@ -58,6 +58,16 @@ An VarRef is one of 232 233 ;; Used to indicate absent pvar in template; ?? catches 234 ;; Note: not an exn, don't need continuation marks 235 +#;(require (only-in rackunit require/expose)) 236 +#;(require/expose syntax/parse/experimental/private/substitute 237 + (absent-pvar 238 + absent-pvar? 239 + absent-pvar-ctx 240 + absent-pvar-v 241 + absent-pvar-wanted-list?)) 242 +;; this struct is only used in this file, and is not exported, so I guess it's 243 +;; ok to not steal the struct from syntax/parse/experimental/private/substitute 244 +;; Furthermore, the require/expose above does not work reliably. 245 (struct absent-pvar (ctx v wanted-list?)) 246 247 ;; ============================================================ 248 diff --git a/racket/collects/syntax/parse/experimental/provide.rkt b/racket/collects/syntax/parse/experimental/provide.rkt 249 index 8e5f234b2e..280a73d78a 100644 250 --- a/racket/collects/syntax/parse/experimental/provide.rkt 251 +++ b/racket/collects/syntax/parse/experimental/provide.rkt 252 @@ -4,10 +4,10 @@ 253 syntax/location 254 (for-syntax racket/base 255 racket/syntax 256 - "../private/minimatch.rkt" 257 - syntax/parse/pre 258 + syntax/parse/private/minimatch 259 + stxparse-info/parse/pre 260 syntax/parse/private/residual-ct ;; keep abs. path 261 - "../private/kws.rkt" 262 + syntax/parse/private/kws 263 syntax/contract)) 264 (provide provide-syntax-class/contract 265 syntax-class/c 266 diff --git a/racket/collects/syntax/parse/experimental/reflect.rkt b/racket/collects/syntax/parse/experimental/reflect.rkt 267 index b92f53ecfd..460d96478d 100644 268 --- a/racket/collects/syntax/parse/experimental/reflect.rkt 269 +++ b/racket/collects/syntax/parse/experimental/reflect.rkt 270 @@ -5,10 +5,10 @@ 271 syntax/parse/private/residual-ct) ;; keep abs.path 272 racket/contract/base 273 racket/contract/combinator 274 - "../private/minimatch.rkt" 275 - "../private/keywords.rkt" 276 + syntax/parse/private/minimatch 277 + syntax/parse/private/keywords 278 "../private/runtime-reflect.rkt" 279 - "../private/kws.rkt") 280 + syntax/parse/private/kws) 281 (begin-for-syntax 282 (lazy-require 283 [syntax/parse/private/rep-data ;; keep abs. path 284 diff --git a/racket/collects/syntax/parse/experimental/specialize.rkt b/racket/collects/syntax/parse/experimental/specialize.rkt 285 index 636e18b480..72f1e6c4e2 100644 286 --- a/racket/collects/syntax/parse/experimental/specialize.rkt 287 +++ b/racket/collects/syntax/parse/experimental/specialize.rkt 288 @@ -1,8 +1,8 @@ 289 #lang racket/base 290 (require (for-syntax racket/base 291 racket/syntax 292 - "../private/kws.rkt" 293 - "../private/rep-data.rkt" 294 + syntax/parse/private/kws 295 + syntax/parse/private/rep-data 296 "../private/rep.rkt") 297 "../private/runtime.rkt") 298 (provide define-syntax-class/specialize) 299 diff --git a/racket/collects/syntax/parse/experimental/splicing.rkt b/racket/collects/syntax/parse/experimental/splicing.rkt 300 index f9105c1f24..e0694aaec4 100644 301 --- a/racket/collects/syntax/parse/experimental/splicing.rkt 302 +++ b/racket/collects/syntax/parse/experimental/splicing.rkt 303 @@ -1,9 +1,9 @@ 304 #lang racket/base 305 (require (for-syntax racket/base 306 - syntax/parse 307 + stxparse-info/parse 308 racket/lazy-require 309 - "../private/kws.rkt") 310 - syntax/parse/private/residual) ;; keep abs. path 311 + syntax/parse/private/kws) 312 + stxparse-info/parse/private/residual) ;; keep abs. path 313 (provide define-primitive-splicing-syntax-class) 314 315 (begin-for-syntax 316 diff --git a/racket/collects/syntax/parse/experimental/template.rkt b/racket/collects/syntax/parse/experimental/template.rkt 317 index 926e5ab3fb..aaaa599602 100644 318 --- a/racket/collects/syntax/parse/experimental/template.rkt 319 +++ b/racket/collects/syntax/parse/experimental/template.rkt 320 @@ -4,8 +4,9 @@ 321 racket/syntax 322 syntax/parse/private/minimatch 323 racket/private/stx ;; syntax/stx 324 - racket/private/sc) 325 - syntax/parse/private/residual 326 + racket/private/sc 327 + racket/struct) 328 + stxparse-info/parse/private/residual 329 "private/substitute.rkt") 330 (provide template 331 template/loc 332 diff --git a/racket/collects/syntax/parse/private/lib.rkt b/racket/collects/syntax/parse/private/lib.rkt 333 index f330be95d8..647e201547 100644 334 --- a/racket/collects/syntax/parse/private/lib.rkt 335 +++ b/racket/collects/syntax/parse/private/lib.rkt 336 @@ -1,6 +1,6 @@ 337 #lang racket/base 338 (require "sc.rkt" 339 - "keywords.rkt" 340 + syntax/parse/private/keywords 341 (for-syntax racket/base)) 342 343 (provide identifier 344 diff --git a/racket/collects/syntax/parse/private/litconv.rkt b/racket/collects/syntax/parse/private/litconv.rkt 345 index 9197505856..559791f131 100644 346 --- a/racket/collects/syntax/parse/private/litconv.rkt 347 +++ b/racket/collects/syntax/parse/private/litconv.rkt 348 @@ -3,14 +3,14 @@ 349 racket/lazy-require 350 "sc.rkt" 351 "lib.rkt" 352 - "kws.rkt" 353 + syntax/parse/private/kws 354 racket/syntax) 355 syntax/parse/private/residual-ct ;; keep abs. path 356 - syntax/parse/private/residual) ;; keep abs. path 357 + stxparse-info/parse/private/residual) ;; keep abs. path 358 (begin-for-syntax 359 (lazy-require 360 [syntax/private/keyword (options-select-value parse-keyword-options)] 361 - [syntax/parse/private/rep ;; keep abs. path 362 + [stxparse-info/parse/private/rep ;; keep abs. path 363 (parse-kw-formals 364 check-conventions-rules 365 check-datum-literals-list 366 @@ -18,7 +18,7 @@ 367 ;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require) 368 ;; Without this, dependencies don't get collected. 369 (require racket/runtime-path racket/syntax (for-meta 2 '#%kernel)) 370 -(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep) 371 +(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep) 372 373 (provide define-conventions 374 define-literal-set 375 @@ -215,7 +215,7 @@ change between when define-literal-set is compiled and the comparison 376 involving L. For example: 377 378 (module M racket 379 - (require syntax/parse) 380 + (require stxparse-info/parse) 381 (define-literal-set LS (lambda)) 382 (require (only-in some-other-lang lambda)) 383 .... LS ....) 384 diff --git a/racket/collects/syntax/parse/private/opt.rkt b/racket/collects/syntax/parse/private/opt.rkt 385 index 0dc2460107..0c047882e7 100644 386 --- a/racket/collects/syntax/parse/private/opt.rkt 387 +++ b/racket/collects/syntax/parse/private/opt.rkt 388 @@ -2,9 +2,9 @@ 389 (require racket/syntax 390 racket/pretty 391 syntax/parse/private/residual-ct ;; keep abs. path 392 - "minimatch.rkt" 393 - "rep-patterns.rkt" 394 - "kws.rkt") 395 + syntax/parse/private/minimatch 396 + syntax/parse/private/rep-patterns 397 + syntax/parse/private/kws) 398 (provide (struct-out pk1) 399 (rename-out [optimize-matrix0 optimize-matrix])) 400 401 diff --git a/racket/collects/syntax/parse/private/parse.rkt b/racket/collects/syntax/parse/private/parse.rkt 402 index db71140242..9e1652c87f 100644 403 --- a/racket/collects/syntax/parse/private/parse.rkt 404 +++ b/racket/collects/syntax/parse/private/parse.rkt 405 @@ -4,21 +4,21 @@ 406 syntax/private/id-table 407 syntax/keyword 408 racket/syntax 409 - "minimatch.rkt" 410 - "rep-attrs.rkt" 411 - "rep-data.rkt" 412 - "rep-patterns.rkt" 413 + syntax/parse/private/minimatch 414 + syntax/parse/private/rep-attrs 415 + syntax/parse/private/rep-data 416 + syntax/parse/private/rep-patterns 417 "rep.rkt" 418 - "kws.rkt" 419 + syntax/parse/private/kws 420 "opt.rkt" 421 "txlift.rkt") 422 - "keywords.rkt" 423 + syntax/parse/private/keywords 424 racket/syntax 425 racket/stxparam 426 syntax/stx 427 - syntax/parse/private/residual ;; keep abs. path 428 - syntax/parse/private/runtime ;; keep abs.path 429 - syntax/parse/private/runtime-reflect) ;; keep abs. path 430 + stxparse-info/parse/private/residual ;; keep abs. path 431 + stxparse-info/parse/private/runtime ;; keep abs.path 432 + stxparse-info/parse/private/runtime-reflect) ;; keep abs. path 433 434 ;; ============================================================ 435 436 diff --git a/racket/collects/syntax/parse/private/rep.rkt b/racket/collects/syntax/parse/private/rep.rkt 437 index cc32c0459f..9327159037 100644 438 --- a/racket/collects/syntax/parse/private/rep.rkt 439 +++ b/racket/collects/syntax/parse/private/rep.rkt 440 @@ -1,23 +1,23 @@ 441 #lang racket/base 442 (require (for-template racket/base 443 syntax/parse/private/keywords 444 - syntax/parse/private/residual ;; keep abs. path 445 - syntax/parse/private/runtime) 446 + stxparse-info/parse/private/residual ;; keep abs. path 447 + stxparse-info/parse/private/runtime) 448 racket/list 449 racket/contract/base 450 "make.rkt" 451 - "minimatch.rkt" 452 + syntax/parse/private/minimatch 453 syntax/private/id-table 454 syntax/stx 455 syntax/keyword 456 racket/syntax 457 racket/struct 458 "txlift.rkt" 459 - "rep-attrs.rkt" 460 - "rep-data.rkt" 461 - "rep-patterns.rkt" 462 + syntax/parse/private/rep-attrs 463 + syntax/parse/private/rep-data 464 + syntax/parse/private/rep-patterns 465 syntax/parse/private/residual-ct ;; keep abs. path 466 - "kws.rkt") 467 + syntax/parse/private/kws) 468 469 ;; Error reporting 470 ;; All entry points should have explicit, mandatory #:context arg 471 diff --git a/racket/collects/syntax/parse/private/residual.rkt b/racket/collects/syntax/parse/private/residual.rkt 472 index baea0658a0..d53cfb4661 100644 473 --- a/racket/collects/syntax/parse/private/residual.rkt 474 +++ b/racket/collects/syntax/parse/private/residual.rkt 475 @@ -21,7 +21,14 @@ 476 attribute-mapping-depth 477 attribute-mapping-syntax?) 478 479 - (define-struct attribute-mapping (var name depth syntax?) 480 + (require (only-in (for-template syntax/parse/private/residual) 481 + make-attribute-mapping 482 + attribute-mapping? 483 + attribute-mapping-var 484 + attribute-mapping-name 485 + attribute-mapping-depth 486 + attribute-mapping-syntax?)) 487 + #;(define-struct attribute-mapping (var name depth syntax?) 488 #:omit-define-syntaxes 489 #:property prop:procedure 490 (lambda (self stx) 491 diff --git a/racket/collects/syntax/parse/private/runtime-progress.rkt b/racket/collects/syntax/parse/private/runtime-progress.rkt 492 index ba8eebcb18..f76f154314 100644 493 --- a/racket/collects/syntax/parse/private/runtime-progress.rkt 494 +++ b/racket/collects/syntax/parse/private/runtime-progress.rkt 495 @@ -1,6 +1,6 @@ 496 #lang racket/base 497 (require racket/list 498 - "minimatch.rkt") 499 + syntax/parse/private/minimatch) 500 (provide ps-empty 501 ps-add-car 502 ps-add-cdr 503 diff --git a/racket/collects/syntax/parse/private/runtime-reflect.rkt b/racket/collects/syntax/parse/private/runtime-reflect.rkt 504 index 63dc1bb996..04d87f0f78 100644 505 --- a/racket/collects/syntax/parse/private/runtime-reflect.rkt 506 +++ b/racket/collects/syntax/parse/private/runtime-reflect.rkt 507 @@ -1,8 +1,8 @@ 508 #lang racket/base 509 -(require syntax/parse/private/residual ;; keep abs. path 510 +(require stxparse-info/parse/private/residual ;; keep abs. path 511 (only-in syntax/parse/private/residual-ct ;; keep abs. path 512 attr-name attr-depth) 513 - "kws.rkt") 514 + syntax/parse/private/kws) 515 (provide reflect-parser 516 (struct-out reified) 517 (struct-out reified-syntax-class) 518 @@ -12,10 +12,28 @@ 519 A Reified is 520 (reified symbol ParserFunction nat (listof (list symbol nat))) 521 |# 522 -(define-struct reified-base (name) #:transparent) 523 -(define-struct (reified reified-base) (parser arity signature)) 524 -(define-struct (reified-syntax-class reified) ()) 525 -(define-struct (reified-splicing-syntax-class reified) ()) 526 +(require (only-in syntax/parse/private/runtime-reflect 527 + reified 528 + reified? 529 + reified-parser 530 + reified-arity 531 + reified-signature 532 + make-reified 533 + struct:reified 534 + 535 + reified-syntax-class 536 + reified-syntax-class? 537 + make-reified-syntax-class 538 + struct:reified-syntax-class 539 + 540 + reified-splicing-syntax-class 541 + reified-splicing-syntax-class? 542 + make-reified-splicing-syntax-class 543 + struct:reified-splicing-syntax-class)) 544 +#;(define-struct reified-base (name) #:transparent) 545 +#;(define-struct (reified reified-base) (parser arity signature)) 546 +#;(define-struct (reified-syntax-class reified) ()) 547 +#;(define-struct (reified-splicing-syntax-class reified) ()) 548 549 (define (reflect-parser obj e-arity e-attrs splicing?) 550 ;; e-arity represents single call; min and max are same 551 diff --git a/racket/collects/syntax/parse/private/runtime-report.rkt b/racket/collects/syntax/parse/private/runtime-report.rkt 552 index 8029e9f6aa..87429aee29 100644 553 --- a/racket/collects/syntax/parse/private/runtime-report.rkt 554 +++ b/racket/collects/syntax/parse/private/runtime-report.rkt 555 @@ -4,9 +4,9 @@ 556 syntax/stx 557 racket/struct 558 syntax/srcloc 559 - "minimatch.rkt" 560 - syntax/parse/private/residual 561 - "kws.rkt") 562 + syntax/parse/private/minimatch 563 + stxparse-info/parse/private/residual 564 + syntax/parse/private/kws) 565 (provide call-current-failure-handler 566 current-failure-handler 567 invert-failure 568 diff --git a/racket/collects/syntax/parse/private/runtime.rkt b/racket/collects/syntax/parse/private/runtime.rkt 569 index c4a1ce9570..98764b189c 100644 570 --- a/racket/collects/syntax/parse/private/runtime.rkt 571 +++ b/racket/collects/syntax/parse/private/runtime.rkt 572 @@ -1,13 +1,13 @@ 573 #lang racket/base 574 (require racket/stxparam 575 - syntax/parse/private/residual ;; keep abs. path 576 + stxparse-info/parse/private/residual ;; keep abs. path 577 (for-syntax racket/base 578 racket/list 579 syntax/kerncase 580 syntax/strip-context 581 racket/private/sc 582 racket/syntax 583 - "rep-data.rkt")) 584 + syntax/parse/private/rep-data)) 585 586 (provide with 587 fail-handler 588 diff --git a/racket/collects/syntax/parse/private/sc.rkt b/racket/collects/syntax/parse/private/sc.rkt 589 index fc8abf7907..dc6bdda811 100644 590 --- a/racket/collects/syntax/parse/private/sc.rkt 591 +++ b/racket/collects/syntax/parse/private/sc.rkt 592 @@ -1,12 +1,12 @@ 593 #lang racket/base 594 (require (for-syntax racket/base 595 racket/lazy-require) 596 - "keywords.rkt") 597 + syntax/parse/private/keywords) 598 599 ;; keep and keep as abs. path -- lazy-loaded macros produce references to this 600 ;; must be required via *absolute module path* from any disappearing module 601 ;; (so for consistency etc, require absolutely from all modules) 602 -(require syntax/parse/private/residual 603 +(require stxparse-info/parse/private/residual 604 racket/syntax 605 racket/stxparam 606 syntax/stx) 607 @@ -16,7 +16,7 @@ 608 ;; load macro transformers lazily via identifier 609 ;; This module path must also be absolute (not sure why, 610 ;; but it definitely breaks on relative module path). 611 - [syntax/parse/private/parse-aux 612 + [stxparse-info/parse/private/parse-aux 613 (id:define-syntax-class 614 id:define-splicing-syntax-class 615 id:define-integrable-syntax-class 616 @@ -29,7 +29,7 @@ 617 ;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require) 618 ;; Without this, dependencies don't get collected. 619 (require racket/runtime-path (for-meta 2 '#%kernel)) 620 -(define-runtime-module-path-index _unused_ 'syntax/parse/private/parse-aux) 621 +(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/parse-aux) 622 623 (provide define-syntax-class 624 define-splicing-syntax-class 625 @@ -38,7 +38,7 @@ 626 syntax-parser 627 define/syntax-parse 628 629 - (except-out (all-from-out "keywords.rkt") 630 + (except-out (all-from-out syntax/parse/private/keywords) 631 ~reflect 632 ~splicing-reflect 633 ~eh-var) 634 -- 635 2.30.0 636