0001-require-paths.patch (28530B)
1 From 94bde34cbebf152ced6156b0bcb4fa7bd12421a3 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 | 7 +-- 8 racket/collects/racket/private/stxcase.rkt | 12 ++--- 9 racket/collects/racket/private/stxloc.rkt | 2 +- 10 racket/collects/racket/private/template.rkt | 49 +++++++++++-------- 11 racket/collects/racket/private/with-stx.rkt | 4 +- 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 | 1 + 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 racket/collects/syntax/parse/private/lib.rkt | 2 +- 24 .../collects/syntax/parse/private/litconv.rkt | 10 ++-- 25 racket/collects/syntax/parse/private/opt.rkt | 6 +-- 26 .../collects/syntax/parse/private/parse.rkt | 18 +++---- 27 racket/collects/syntax/parse/private/rep.rkt | 14 +++--- 28 .../syntax/parse/private/residual.rkt | 6 +-- 29 .../syntax/parse/private/runtime-progress.rkt | 2 +- 30 .../syntax/parse/private/runtime-reflect.rkt | 30 +++++++++--- 31 .../syntax/parse/private/runtime-report.rkt | 6 +-- 32 .../collects/syntax/parse/private/runtime.rkt | 4 +- 33 racket/collects/syntax/parse/private/sc.rkt | 4 +- 34 27 files changed, 126 insertions(+), 97 deletions(-) 35 create mode 100644 racket/collects/syntax/parse/experimental/private/substitute.rkt 36 37 diff --git racket/collects/racket/private/stxcase-scheme.rkt racket/collects/racket/private/stxcase-scheme.rkt 38 index b966f0b28a..935b406819 100644 39 --- racket/collects/racket/private/stxcase-scheme.rkt 40 +++ racket/collects/racket/private/stxcase-scheme.rkt 41 @@ -4,8 +4,8 @@ 42 ;; check-duplicate-identifier, and assembles everything we have so far 43 44 (module stxcase-scheme '#%kernel 45 - (#%require "define-et-al.rkt" "qq-and-or.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" 46 - (for-syntax '#%kernel "define-et-al.rkt" "stx.rkt" "stxcase.rkt" 47 + (#%require racket/private/define-et-al racket/private/qq-and-or racket/private/stx "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" 48 + (for-syntax '#%kernel racket/private/define-et-al racket/private/stx "stxcase.rkt" 49 "stxloc.rkt")) 50 51 (-define (check-duplicate-identifier names) 52 @@ -68,7 +68,8 @@ 53 (syntax-arm stx #f #t) 54 (raise-argument-error 'syntax-protect "syntax?" stx))) 55 56 - (#%provide syntax datum (all-from "with-stx.rkt") (all-from "stxloc.rkt") 57 + (#%provide syntax datum (all-from "with-stx.rkt") 58 + (all-from "stxloc.rkt") 59 check-duplicate-identifier syntax-protect 60 syntax-rules syntax-id-rules 61 (for-syntax syntax-pattern-variable?))) 62 diff --git racket/collects/racket/private/stxcase.rkt racket/collects/racket/private/stxcase.rkt 63 index fb8e10c36d..2ac2ec85a6 100644 64 --- racket/collects/racket/private/stxcase.rkt 65 +++ racket/collects/racket/private/stxcase.rkt 66 @@ -2,10 +2,10 @@ 67 ;; syntax-case and syntax 68 69 (module stxcase '#%kernel 70 - (#%require "stx.rkt" "define-et-al.rkt" "qq-and-or.rkt" "cond.rkt" '#%paramz '#%unsafe 71 - "ellipses.rkt" 72 - (for-syntax "stx.rkt" "define-et-al.rkt" "qq-and-or.rkt" "cond.rkt" 73 - "gen-temp.rkt" "sc.rkt" '#%kernel)) 74 + (#%require racket/private/stx racket/private/define-et-al racket/private/qq-and-or racket/private/cond '#%paramz '#%unsafe 75 + racket/private/ellipses 76 + (for-syntax racket/private/stx racket/private/define-et-al racket/private/qq-and-or racket/private/cond 77 + racket/private/gen-temp racket/private/sc '#%kernel)) 78 79 (-define interp-match 80 (lambda (pat e literals immediate=?) 81 @@ -379,6 +379,6 @@ 82 m))))]))) 83 x))))))) 84 85 - (#%require "template.rkt") 86 - (#%provide (all-from "ellipses.rkt") syntax-case** syntax syntax/loc datum 87 + (#%require racket/private/template) 88 + (#%provide (all-from racket/private/ellipses) syntax-case** syntax syntax/loc datum 89 (for-syntax syntax-pattern-variable?))) 90 diff --git racket/collects/racket/private/stxloc.rkt racket/collects/racket/private/stxloc.rkt 91 index 68c9358532..cbcfd7544c 100644 92 --- racket/collects/racket/private/stxloc.rkt 93 +++ racket/collects/racket/private/stxloc.rkt 94 @@ -3,7 +3,7 @@ 95 ;; syntax/loc 96 97 (module stxloc '#%kernel 98 - (#%require "stxcase.rkt" "define-et-al.rkt" 99 + (#%require "stxcase.rkt" racket/private/define-et-al 100 (for-syntax '#%kernel "stxcase.rkt")) 101 102 (begin-for-syntax 103 diff --git racket/collects/racket/private/template.rkt racket/collects/racket/private/template.rkt 104 index 3d55876197..3ea2adf0c0 100644 105 --- racket/collects/racket/private/template.rkt 106 +++ racket/collects/racket/private/template.rkt 107 @@ -1,25 +1,25 @@ 108 (module template '#%kernel 109 -(#%require "stx.rkt" "define-et-al.rkt" "qq-and-or.rkt" "cond.rkt" "performance-hint.rkt" 110 - (rename "define-et-al.rkt" define -define) 111 - (rename "define-et-al.rkt" define-syntax -define-syntax) 112 - "ellipses.rkt" 113 - (for-syntax "stx.rkt" "define-et-al.rkt" "qq-and-or.rkt" "cond.rkt" 114 - (rename "define-et-al.rkt" define -define) 115 - (rename "define-et-al.rkt" define-syntax -define-syntax) 116 - #;"member.rkt" "sc.rkt" '#%kernel)) 117 +(#%require racket/private/stx racket/private/define-et-al racket/private/qq-and-or racket/private/cond racket/private/performance-hint 118 + (rename racket/private/define-et-al define -define) 119 + (rename racket/private/define-et-al define-syntax -define-syntax) 120 + racket/private/ellipses 121 + (for-syntax racket/private/stx racket/private/define-et-al racket/private/qq-and-or racket/private/cond 122 + (rename racket/private/define-et-al define -define) 123 + (rename racket/private/define-et-al define-syntax -define-syntax) 124 + #;"member.rkt" racket/private/sc '#%kernel)) 125 (#%provide syntax 126 syntax/loc 127 datum 128 ~? ~@ 129 ~@! signal-absent-pvar 130 - (protect 131 - (for-syntax attribute-mapping 132 - attribute-mapping? 133 - attribute-mapping-name 134 - attribute-mapping-var 135 - attribute-mapping-depth 136 - attribute-mapping-check 137 - metafunction metafunction?))) 138 + (for-syntax attribute-mapping 139 + attribute-mapping? 140 + attribute-mapping-name 141 + attribute-mapping-var 142 + attribute-mapping-depth 143 + attribute-mapping-check 144 + (protect metafunction 145 + metafunction?))) 146 147 ;; ============================================================ 148 ;; Syntax of templates 149 @@ -87,7 +87,14 @@ 150 ;; (struct attribute-mapping (var name depth check) ...) 151 ;; check : #f (trusted) or Id, ref to Checker 152 ;; Checker = ( Any d:Nat b:Boolean Syntax/#f -> (Listof^d (if b Syntax Any)) ) 153 - (define-values (struct:attribute-mapping attribute-mapping attribute-mapping? 154 + (#%require (for-template (only racket/private/template 155 + attribute-mapping 156 + attribute-mapping? 157 + attribute-mapping-var 158 + attribute-mapping-name 159 + attribute-mapping-depth 160 + attribute-mapping-check))) 161 + #;(define-values (struct:attribute-mapping attribute-mapping attribute-mapping? 162 attribute-mapping-ref _attribute-mapping-set!) 163 (make-struct-type 'attribute-mapping #f 4 0 #f null (current-inspector) 164 (lambda (self stx) 165 @@ -106,10 +113,10 @@ 166 (quote-syntax ,source-name))) 167 (datum->syntax here-stx code stx)) 168 (attribute-mapping-var self))))) 169 - (define (attribute-mapping-var a) (attribute-mapping-ref a 0)) 170 - (define (attribute-mapping-name a) (attribute-mapping-ref a 1)) 171 - (define (attribute-mapping-depth a) (attribute-mapping-ref a 2)) 172 - (define (attribute-mapping-check a) (attribute-mapping-ref a 3)) 173 + #;(define (attribute-mapping-var a) (attribute-mapping-ref a 0)) 174 + #;(define (attribute-mapping-name a) (attribute-mapping-ref a 1)) 175 + #;(define (attribute-mapping-depth a) (attribute-mapping-ref a 2)) 176 + #;(define (attribute-mapping-check a) (attribute-mapping-ref a 3)) 177 178 ;; (struct metafunction (var)) 179 (define-values (struct:metafunction metafunction metafunction? metafunction-ref _mf-set!) 180 diff --git racket/collects/racket/private/with-stx.rkt racket/collects/racket/private/with-stx.rkt 181 index 55dada073f..4ff32acf5f 100644 182 --- racket/collects/racket/private/with-stx.rkt 183 +++ racket/collects/racket/private/with-stx.rkt 184 @@ -2,9 +2,9 @@ 185 ;; with-syntax, generate-temporaries 186 187 (module with-stx '#%kernel 188 - (#%require "stx.rkt" "define-et-al.rkt" "qq-and-or.rkt" "cond.rkt" "stxcase.rkt" 189 + (#%require racket/private/stx racket/private/define-et-al racket/private/qq-and-or racket/private/cond "stxcase.rkt" 190 (for-syntax '#%kernel "stxcase.rkt" "stxloc.rkt" 191 - "gen-temp.rkt" "sc.rkt" "qq-and-or.rkt" "cond.rkt")) 192 + racket/private/gen-temp racket/private/sc racket/private/qq-and-or racket/private/cond)) 193 194 (-define (with-syntax-fail stx) 195 (raise-syntax-error 196 diff --git racket/collects/racket/syntax.rkt racket/collects/racket/syntax.rkt 197 index 506bebd851..4aee14d23d 100644 198 --- racket/collects/racket/syntax.rkt 199 +++ racket/collects/racket/syntax.rkt 200 @@ -1,5 +1,6 @@ 201 #lang racket/base 202 -(require (for-syntax racket/base 203 +(require (only-in "stxloc.rkt" syntax-case) 204 + (for-syntax racket/base 205 racket/private/sc)) 206 (provide define/with-syntax 207 208 diff --git racket/collects/syntax/parse.rkt racket/collects/syntax/parse.rkt 209 index 6e81621a07..643de4ddda 100644 210 --- racket/collects/syntax/parse.rkt 211 +++ racket/collects/syntax/parse.rkt 212 @@ -24,7 +24,8 @@ 213 [syntax-local-syntax-parse-pattern-introduce 214 (-> syntax? syntax?)])) 215 216 - (define pattern-expander 217 + (require (only-in (for-template syntax/parse) pattern-expander)) 218 + #;(define pattern-expander 219 (let () 220 (struct pattern-expander (proc) #:transparent 221 #:omit-define-syntaxes 222 diff --git racket/collects/syntax/parse/debug.rkt racket/collects/syntax/parse/debug.rkt 223 index a092ab6263..c62849b212 100644 224 --- racket/collects/syntax/parse/debug.rkt 225 +++ racket/collects/syntax/parse/debug.rkt 226 @@ -2,20 +2,20 @@ 227 (require (for-syntax racket/base 228 syntax/stx 229 racket/syntax 230 - "private/rep-data.rkt" 231 + syntax/parse/private/rep-data 232 "private/rep.rkt" 233 - "private/kws.rkt") 234 + syntax/parse/private/kws) 235 racket/list 236 racket/pretty 237 "../parse.rkt" 238 - (except-in syntax/parse/private/residual 239 + (except-in stxparse-info/parse/private/residual 240 prop:syntax-class 241 prop:pattern-expander 242 syntax-local-syntax-parse-pattern-introduce) 243 "private/runtime.rkt" 244 "private/runtime-progress.rkt" 245 "private/runtime-report.rkt" 246 - "private/kws.rkt") 247 + syntax/parse/private/kws) 248 249 ;; No lazy loading for this module's dependencies. 250 251 diff --git racket/collects/syntax/parse/define.rkt racket/collects/syntax/parse/define.rkt 252 index 5e97c24e9b..7e8eebc772 100644 253 --- racket/collects/syntax/parse/define.rkt 254 +++ racket/collects/syntax/parse/define.rkt 255 @@ -1,11 +1,11 @@ 256 #lang racket/base 257 (require (for-syntax racket/base 258 - syntax/parse 259 + stxparse-info/parse 260 "private/sc.rkt")) 261 (provide define-syntax-parse-rule 262 define-syntax-parser 263 (rename-out [define-syntax-parse-rule define-simple-macro]) 264 - (for-syntax (all-from-out syntax/parse))) 265 + (for-syntax (all-from-out stxparse-info/parse))) 266 267 (define-syntax (define-syntax-parse-rule stx) 268 (syntax-parse stx 269 diff --git racket/collects/syntax/parse/experimental/contract.rkt racket/collects/syntax/parse/experimental/contract.rkt 270 index 022e590958..b0f932b3ff 100644 271 --- racket/collects/syntax/parse/experimental/contract.rkt 272 +++ racket/collects/syntax/parse/experimental/contract.rkt 273 @@ -1,8 +1,8 @@ 274 #lang racket/base 275 -(require syntax/parse/pre 276 +(require stxparse-info/parse/pre 277 "provide.rkt" 278 syntax/contract 279 - (only-in syntax/parse/private/residual ;; keep abs. path 280 + (only-in stxparse-info/parse/private/residual ;; keep abs. path 281 this-context-syntax 282 this-role) 283 racket/contract/base) 284 diff --git racket/collects/syntax/parse/experimental/eh.rkt racket/collects/syntax/parse/experimental/eh.rkt 285 index 305080721f..f8e1b09302 100644 286 --- racket/collects/syntax/parse/experimental/eh.rkt 287 +++ racket/collects/syntax/parse/experimental/eh.rkt 288 @@ -1,5 +1,5 @@ 289 #lang racket/base 290 (require "../private/sc.rkt" 291 - "../private/keywords.rkt") 292 + syntax/parse/private/keywords) 293 (provide ~eh-var 294 define-eh-alternative-set) 295 diff --git racket/collects/syntax/parse/experimental/private/substitute.rkt racket/collects/syntax/parse/experimental/private/substitute.rkt 296 new file mode 100644 297 index 0000000000..7bc35af1c4 298 --- /dev/null 299 +++ racket/collects/syntax/parse/experimental/private/substitute.rkt 300 @@ -0,0 +1 @@ 301 +#lang racket/base 302 diff --git racket/collects/syntax/parse/experimental/provide.rkt racket/collects/syntax/parse/experimental/provide.rkt 303 index 86a3b6fd88..173d81e428 100644 304 --- racket/collects/syntax/parse/experimental/provide.rkt 305 +++ racket/collects/syntax/parse/experimental/provide.rkt 306 @@ -4,10 +4,10 @@ 307 syntax/location 308 (for-syntax racket/base 309 racket/syntax 310 - "../private/minimatch.rkt" 311 - syntax/parse/pre 312 + syntax/parse/private/minimatch 313 + stxparse-info/parse/pre 314 syntax/parse/private/residual-ct ;; keep abs. path 315 - "../private/kws.rkt" 316 + syntax/parse/private/kws 317 syntax/contract)) 318 (provide provide-syntax-class/contract 319 syntax-class/c 320 diff --git racket/collects/syntax/parse/experimental/reflect.rkt racket/collects/syntax/parse/experimental/reflect.rkt 321 index 7e4daa3e5a..8f18781e9a 100644 322 --- racket/collects/syntax/parse/experimental/reflect.rkt 323 +++ racket/collects/syntax/parse/experimental/reflect.rkt 324 @@ -5,10 +5,10 @@ 325 syntax/parse/private/residual-ct) ;; keep abs.path 326 racket/contract/base 327 racket/contract/combinator 328 - "../private/minimatch.rkt" 329 - "../private/keywords.rkt" 330 + syntax/parse/private/minimatch 331 + syntax/parse/private/keywords 332 "../private/runtime-reflect.rkt" 333 - "../private/kws.rkt") 334 + syntax/parse/private/kws) 335 (begin-for-syntax 336 (lazy-require 337 [syntax/parse/private/rep-data ;; keep abs. path 338 diff --git racket/collects/syntax/parse/experimental/specialize.rkt racket/collects/syntax/parse/experimental/specialize.rkt 339 index e32b077825..ad569c1cb0 100644 340 --- racket/collects/syntax/parse/experimental/specialize.rkt 341 +++ racket/collects/syntax/parse/experimental/specialize.rkt 342 @@ -1,8 +1,8 @@ 343 #lang racket/base 344 (require (for-syntax racket/base 345 racket/syntax 346 - "../private/kws.rkt" 347 - "../private/rep-data.rkt" 348 + syntax/parse/private/kws 349 + syntax/parse/private/rep-data 350 "../private/rep.rkt") 351 "../private/runtime.rkt") 352 (provide define-syntax-class/specialize) 353 diff --git racket/collects/syntax/parse/experimental/splicing.rkt racket/collects/syntax/parse/experimental/splicing.rkt 354 index 510b2a7361..56abbd5cd2 100644 355 --- racket/collects/syntax/parse/experimental/splicing.rkt 356 +++ racket/collects/syntax/parse/experimental/splicing.rkt 357 @@ -1,9 +1,9 @@ 358 #lang racket/base 359 (require (for-syntax racket/base 360 - syntax/parse 361 + stxparse-info/parse 362 racket/lazy-require 363 - "../private/kws.rkt") 364 - syntax/parse/private/residual) ;; keep abs. path 365 + syntax/parse/private/kws) 366 + stxparse-info/parse/private/residual) ;; keep abs. path 367 (provide define-primitive-splicing-syntax-class) 368 369 (begin-for-syntax 370 diff --git racket/collects/syntax/parse/private/lib.rkt racket/collects/syntax/parse/private/lib.rkt 371 index 5eaa74c946..01e110c45b 100644 372 --- racket/collects/syntax/parse/private/lib.rkt 373 +++ racket/collects/syntax/parse/private/lib.rkt 374 @@ -1,6 +1,6 @@ 375 #lang racket/base 376 (require "sc.rkt" 377 - "keywords.rkt" 378 + syntax/parse/private/keywords 379 (only-in "residual.rkt" state-cons!) 380 (for-syntax syntax/parse/private/residual-ct) 381 (for-syntax racket/base)) 382 diff --git racket/collects/syntax/parse/private/litconv.rkt racket/collects/syntax/parse/private/litconv.rkt 383 index 772930c301..9e25611d96 100644 384 --- racket/collects/syntax/parse/private/litconv.rkt 385 +++ racket/collects/syntax/parse/private/litconv.rkt 386 @@ -3,14 +3,14 @@ 387 racket/lazy-require 388 "sc.rkt" 389 "lib.rkt" 390 - "kws.rkt" 391 + syntax/parse/private/kws 392 racket/syntax) 393 syntax/parse/private/residual-ct ;; keep abs. path 394 - syntax/parse/private/residual) ;; keep abs. path 395 + stxparse-info/parse/private/residual) ;; keep abs. path 396 (begin-for-syntax 397 (lazy-require 398 [syntax/private/keyword (options-select-value parse-keyword-options)] 399 - [syntax/parse/private/rep ;; keep abs. path 400 + [stxparse-info/parse/private/rep ;; keep abs. path 401 (parse-kw-formals 402 check-conventions-rules 403 check-datum-literals-list 404 @@ -18,7 +18,7 @@ 405 ;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require) 406 ;; Without this, dependencies don't get collected. 407 (require racket/runtime-path racket/syntax (for-meta 2 '#%kernel)) 408 -(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep) 409 +(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep) 410 411 (provide define-conventions 412 define-literal-set 413 @@ -215,7 +215,7 @@ change between when define-literal-set is compiled and the comparison 414 involving L. For example: 415 416 (module M racket 417 - (require syntax/parse) 418 + (require stxparse-info/parse) 419 (define-literal-set LS (lambda)) 420 (require (only-in some-other-lang lambda)) 421 .... LS ....) 422 diff --git racket/collects/syntax/parse/private/opt.rkt racket/collects/syntax/parse/private/opt.rkt 423 index 0e7af8e5a8..12714d6be1 100644 424 --- racket/collects/syntax/parse/private/opt.rkt 425 +++ racket/collects/syntax/parse/private/opt.rkt 426 @@ -2,9 +2,9 @@ 427 (require racket/syntax 428 racket/pretty 429 syntax/parse/private/residual-ct ;; keep abs. path 430 - "minimatch.rkt" 431 - "rep-patterns.rkt" 432 - "kws.rkt") 433 + syntax/parse/private/minimatch 434 + syntax/parse/private/rep-patterns 435 + syntax/parse/private/kws) 436 (provide (struct-out pk1) 437 (rename-out [optimize-matrix0 optimize-matrix])) 438 439 diff --git racket/collects/syntax/parse/private/parse.rkt racket/collects/syntax/parse/private/parse.rkt 440 index 609d0a48b4..e14cc3aea9 100644 441 --- racket/collects/syntax/parse/private/parse.rkt 442 +++ racket/collects/syntax/parse/private/parse.rkt 443 @@ -4,22 +4,22 @@ 444 syntax/private/id-table 445 syntax/keyword 446 racket/syntax 447 - "minimatch.rkt" 448 - "datum-to-expr.rkt" 449 - "rep-attrs.rkt" 450 - "rep-data.rkt" 451 - "rep-patterns.rkt" 452 + syntax/parse/private/minimatch 453 + syntax/parse/private/datum-to-expr 454 + syntax/parse/private/rep-attrs 455 + syntax/parse/private/rep-data 456 + syntax/parse/private/rep-patterns 457 "rep.rkt" 458 - "kws.rkt" 459 + syntax/parse/private/kws 460 "opt.rkt" 461 "txlift.rkt") 462 - "keywords.rkt" 463 + syntax/parse/private/keywords 464 racket/syntax 465 racket/stxparam 466 syntax/stx 467 - syntax/parse/private/residual ;; keep abs. path 468 + stxparse-info/parse/private/residual ;; keep abs. path 469 "runtime.rkt" 470 - syntax/parse/private/runtime-reflect) ;; keep abs. path 471 + stxparse-info/parse/private/runtime-reflect) ;; keep abs. path 472 473 ;; ============================================================ 474 475 diff --git racket/collects/syntax/parse/private/rep.rkt racket/collects/syntax/parse/private/rep.rkt 476 index f7beb5f75c..6003b733ba 100644 477 --- racket/collects/syntax/parse/private/rep.rkt 478 +++ racket/collects/syntax/parse/private/rep.rkt 479 @@ -1,12 +1,12 @@ 480 #lang racket/base 481 (require (for-template racket/base 482 syntax/parse/private/keywords 483 - syntax/parse/private/residual ;; keep abs. path 484 - syntax/parse/private/runtime) 485 + stxparse-info/parse/private/residual ;; keep abs. path 486 + stxparse-info/parse/private/runtime) 487 racket/list 488 racket/contract/base 489 "make.rkt" 490 - "minimatch.rkt" 491 + syntax/parse/private/minimatch 492 syntax/apply-transformer 493 syntax/private/id-table 494 syntax/stx 495 @@ -14,11 +14,11 @@ 496 racket/syntax 497 racket/struct 498 "txlift.rkt" 499 - "rep-attrs.rkt" 500 - "rep-data.rkt" 501 - "rep-patterns.rkt" 502 + syntax/parse/private/rep-attrs 503 + syntax/parse/private/rep-data 504 + syntax/parse/private/rep-patterns 505 syntax/parse/private/residual-ct ;; keep abs. path 506 - "kws.rkt") 507 + syntax/parse/private/kws) 508 509 ;; Error reporting 510 ;; All entry points should have explicit, mandatory #:context arg 511 diff --git racket/collects/syntax/parse/private/residual.rkt racket/collects/syntax/parse/private/residual.rkt 512 index 1b2e3e38ed..88a5911810 100644 513 --- racket/collects/syntax/parse/private/residual.rkt 514 +++ racket/collects/syntax/parse/private/residual.rkt 515 @@ -7,10 +7,10 @@ 516 ;; ============================================================ 517 ;; Compile-time 518 519 -(require (for-syntax racket/private/sc "residual-ct.rkt")) 520 -(provide (for-syntax (all-from-out "residual-ct.rkt"))) 521 +(require (for-syntax racket/private/sc syntax/parse/private/residual-ct)) 522 +(provide (for-syntax (all-from-out syntax/parse/private/residual-ct))) 523 524 -(require racket/private/template) 525 +(require "../../case/template.rkt") 526 (provide (for-syntax attribute-mapping attribute-mapping?)) 527 528 ;; ============================================================ 529 diff --git racket/collects/syntax/parse/private/runtime-progress.rkt racket/collects/syntax/parse/private/runtime-progress.rkt 530 index 4065357c76..ad894d2c70 100644 531 --- racket/collects/syntax/parse/private/runtime-progress.rkt 532 +++ racket/collects/syntax/parse/private/runtime-progress.rkt 533 @@ -1,6 +1,6 @@ 534 #lang racket/base 535 (require racket/list 536 - "minimatch.rkt") 537 + syntax/parse/private/minimatch) 538 (provide ps-empty 539 ps-add-car 540 ps-add-cdr 541 diff --git racket/collects/syntax/parse/private/runtime-reflect.rkt racket/collects/syntax/parse/private/runtime-reflect.rkt 542 index e3bc47a4c5..59125cf0ac 100644 543 --- racket/collects/syntax/parse/private/runtime-reflect.rkt 544 +++ racket/collects/syntax/parse/private/runtime-reflect.rkt 545 @@ -1,7 +1,7 @@ 546 #lang racket/base 547 (require "residual.rkt" 548 - (only-in "residual-ct.rkt" attr-name attr-depth) 549 - "kws.rkt") 550 + (only-in syntax/parse/private/residual-ct attr-name attr-depth) 551 + syntax/parse/private/kws) 552 (provide reflect-parser 553 (struct-out reified) 554 (struct-out reified-syntax-class) 555 @@ -11,10 +11,28 @@ 556 A Reified is 557 (reified symbol ParserFunction nat (listof (list symbol nat))) 558 |# 559 -(define-struct reified-base (name) #:transparent) 560 -(define-struct (reified reified-base) (parser arity signature)) 561 -(define-struct (reified-syntax-class reified) ()) 562 -(define-struct (reified-splicing-syntax-class reified) ()) 563 +(require (only-in syntax/parse/private/runtime-reflect 564 + reified 565 + reified? 566 + reified-parser 567 + reified-arity 568 + reified-signature 569 + make-reified 570 + struct:reified 571 + 572 + reified-syntax-class 573 + reified-syntax-class? 574 + make-reified-syntax-class 575 + struct:reified-syntax-class 576 + 577 + reified-splicing-syntax-class 578 + reified-splicing-syntax-class? 579 + make-reified-splicing-syntax-class 580 + struct:reified-splicing-syntax-class)) 581 +#;(define-struct reified-base (name) #:transparent) 582 +#;(define-struct (reified reified-base) (parser arity signature)) 583 +#;(define-struct (reified-syntax-class reified) ()) 584 +#;(define-struct (reified-splicing-syntax-class reified) ()) 585 586 (define (reflect-parser obj e-arity e-attrs splicing?) 587 ;; e-arity represents single call; min and max are same 588 diff --git racket/collects/syntax/parse/private/runtime-report.rkt racket/collects/syntax/parse/private/runtime-report.rkt 589 index 59733c4cd2..a1d09e11ad 100644 590 --- racket/collects/syntax/parse/private/runtime-report.rkt 591 +++ racket/collects/syntax/parse/private/runtime-report.rkt 592 @@ -4,9 +4,9 @@ 593 syntax/stx 594 racket/struct 595 syntax/srcloc 596 - "minimatch.rkt" 597 - syntax/parse/private/residual 598 - "kws.rkt") 599 + syntax/parse/private/minimatch 600 + stxparse-info/parse/private/residual 601 + syntax/parse/private/kws) 602 (provide call-current-failure-handler 603 current-failure-handler 604 invert-failure 605 diff --git racket/collects/syntax/parse/private/runtime.rkt racket/collects/syntax/parse/private/runtime.rkt 606 index d100d2c564..41b321499e 100644 607 --- racket/collects/syntax/parse/private/runtime.rkt 608 +++ racket/collects/syntax/parse/private/runtime.rkt 609 @@ -1,13 +1,13 @@ 610 #lang racket/base 611 (require racket/stxparam 612 - syntax/parse/private/residual ;; keep abs. path 613 + stxparse-info/parse/private/residual ;; keep abs. path 614 (for-syntax racket/base 615 racket/list 616 syntax/kerncase 617 syntax/strip-context 618 racket/private/sc 619 racket/syntax 620 - "rep-data.rkt")) 621 + syntax/parse/private/rep-data)) 622 623 (provide with 624 fail-handler 625 diff --git racket/collects/syntax/parse/private/sc.rkt racket/collects/syntax/parse/private/sc.rkt 626 index 27b069059d..d4e5ff695a 100644 627 --- racket/collects/syntax/parse/private/sc.rkt 628 +++ racket/collects/syntax/parse/private/sc.rkt 629 @@ -1,6 +1,6 @@ 630 #lang racket/base 631 (require racket/lazy-require 632 - "keywords.rkt" 633 + syntax/parse/private/keywords 634 "residual.rkt") 635 636 (lazy-require-syntax 637 @@ -21,7 +21,7 @@ 638 syntax-parser 639 define/syntax-parse 640 641 - (except-out (all-from-out "keywords.rkt") 642 + (except-out (all-from-out syntax/parse/private/keywords) 643 ~reflect 644 ~splicing-reflect 645 ~eh-var) 646 -- 647 2.30.0 648