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