From de27be536de8017ea0bdd30a26173bdec849e7e8 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 28 Feb 2018 13:59:13 -0700 Subject: [PATCH] expander: propagate srcloc on rename-transformer expansion --- pkgs/racket-test-core/tests/racket/stx.rktl | 11 + racket/src/expander/expand/main.rkt | 13 +- racket/src/racket/src/startup.inc | 1978 ++++++++++--------- 3 files changed, 1022 insertions(+), 980 deletions(-) diff --git a/pkgs/racket-test-core/tests/racket/stx.rktl b/pkgs/racket-test-core/tests/racket/stx.rktl index 09c807253b..ee44fb98ed 100644 --- a/pkgs/racket-test-core/tests/racket/stx.rktl +++ b/pkgs/racket-test-core/tests/racket/stx.rktl @@ -2524,4 +2524,15 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(test #t + 'rename-transformer-srcloc + ;; make sure `cons` in the expansion gets the same source line as `1` + (let ([stx (expand #'(letrec-syntax ([kons (make-rename-transformer #'cons)]) + (kons 1 2)))]) + (syntax-case stx () + [(_ () (_app cons one . _)) + (equal? (syntax-line #'cons) (syntax-line #'one))]))) + +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (report-errs) diff --git a/racket/src/expander/expand/main.rkt b/racket/src/expander/expand/main.rkt index fc65321b93..c9cbe969ef 100644 --- a/racket/src/expander/expand/main.rkt +++ b/racket/src/expander/expand/main.rkt @@ -292,7 +292,9 @@ [(expand-context-just-once? ctx) exp-s] [else (expand exp-s re-ctx #:alternate-id (and (rename-transformer? t) - (syntax-track-origin (rename-transformer-target-in-context t ctx) + (syntax-track-origin (transfer-srcloc + (rename-transformer-target-in-context t ctx) + id) id id)) #:skip-log? (or (expand-context-only-immediate? ctx) @@ -742,3 +744,12 @@ (when (rename-transformer? val) (parameterize ([current-expand-context ctx]) (maybe-install-free=id! val id phase)))) + +;; Transfer the original ID's source location, if any, when expanding +;; a reference to a rename transformer +(define (transfer-srcloc new-s old-s) + (define srcloc (syntax-srcloc old-s)) + (if srcloc + (struct-copy syntax new-s + [srcloc srcloc]) + new-s)) diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index 822f060df7..039136ed33 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -38659,7 +38659,7 @@ static const char *startup_source = "(let-values(((temp110_0)" "(if(1/rename-transformer? t_49)" "(syntax-track-origin$1" -"(rename-transformer-target-in-context t_49 ctx_23)" +"(transfer-srcloc(rename-transformer-target-in-context t_49 ctx_23) id_61)" " id_61" " id_61)" " #f))" @@ -39575,6 +39575,26 @@ static const char *startup_source = "(let-values()(maybe-install-free=id! val_68 id_67 phase_108))))" "(void)))))" "(define-values" +"(transfer-srcloc)" +"(lambda(new-s_1 old-s_0)" +"(begin" +"(let-values(((srcloc_7)(syntax-srcloc old-s_0)))" +"(if srcloc_7" +"(let-values(((the-struct_68) new-s_1))" +"(if(syntax?$1 the-struct_68)" +"(let-values(((srcloc171_0) srcloc_7))" +"(syntax1.1" +"(syntax-content the-struct_68)" +"(syntax-scopes the-struct_68)" +"(syntax-shifted-multi-scopes the-struct_68)" +"(syntax-scope-propagations+tamper the-struct_68)" +"(syntax-mpi-shifts the-struct_68)" +" srcloc171_0" +"(syntax-props the-struct_68)" +"(syntax-inspector the-struct_68)))" +" (raise-argument-error 'struct-copy \"syntax?\" the-struct_68)))" +" new-s_1)))))" +"(define-values" "(stop-ids->all-stop-ids)" "(lambda(stop-ids_0 phase_40)" "(begin" @@ -39962,9 +39982,9 @@ static const char *startup_source = " ids_25" "(let-values(((temp54_1)" "(let-values(((v_189) ctx_44))" -"(let-values(((the-struct_68) v_189))" +"(let-values(((the-struct_69) v_189))" "(if(expand-context/outer?" -" the-struct_68)" +" the-struct_69)" "(let-values(((env57_0) tmp-env_0)" "((inner58_0)" "(root-expand-context/outer-inner" @@ -39972,36 +39992,36 @@ static const char *startup_source = "(expand-context/outer1.1" " inner58_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_68)" +" the-struct_69)" "(root-expand-context/outer-use-site-scopes" -" the-struct_68)" +" the-struct_69)" "(root-expand-context/outer-frame-id" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-context" -" the-struct_68)" +" the-struct_69)" " env57_0" "(expand-context/outer-post-expansion-scope-action" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-scopes" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-def-ctx-scopes" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-binding-layer" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-reference-records" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-only-immediate?" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-need-eventually-defined" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-current-introduction-scopes" -" the-struct_68)" +" the-struct_69)" "(expand-context/outer-name" -" the-struct_68)))" +" the-struct_69)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_68)))))" +" the-struct_69)))))" "((temp55_1) 'expression)" "((intdef56_0) intdef_0))" "(make-local-expand-context37.1" @@ -40402,8 +40422,8 @@ static const char *startup_source = "(unbox(expand-context-def-ctx-scopes ctx_45))" " null)))" "(let-values(((v_190) ctx_45))" -"(let-values(((the-struct_69) v_190))" -"(if(expand-context/outer? the-struct_69)" +"(let-values(((the-struct_70) v_190))" +"(if(expand-context/outer? the-struct_70)" "(let-values(((context62_0) context_9)" "((env63_0)(add-intdef-bindings(expand-context-env ctx_45) intdefs_2))" "((use-site-scopes64_0)" @@ -40489,8 +40509,8 @@ static const char *startup_source = "(let-values() ht_135)" "(if ht_135(let-values()(make-hasheqv))(let-values() #f)))))" "((inner72_0)" -"(let-values(((the-struct_70)(root-expand-context/outer-inner v_190)))" -"(if(expand-context/inner? the-struct_70)" +"(let-values(((the-struct_71)(root-expand-context/outer-inner v_190)))" +"(if(expand-context/inner? the-struct_71)" "(let-values(((to-parsed?75_0)" "(if to-parsed-ok?_0" "(expand-context-to-parsed? ctx_45)" @@ -40503,36 +40523,36 @@ static const char *startup_source = "(let-values(((or-part_287) all-stop-ids_0))" "(if or-part_287 or-part_287 null)))))" "(expand-context/inner2.1" -"(root-expand-context/inner-self-mpi the-struct_70)" -"(root-expand-context/inner-module-scopes the-struct_70)" -"(root-expand-context/inner-top-level-bind-scope the-struct_70)" -"(root-expand-context/inner-all-scopes-stx the-struct_70)" -"(root-expand-context/inner-defined-syms the-struct_70)" -"(root-expand-context/inner-counter the-struct_70)" -"(root-expand-context/inner-lift-key the-struct_70)" +"(root-expand-context/inner-self-mpi the-struct_71)" +"(root-expand-context/inner-module-scopes the-struct_71)" +"(root-expand-context/inner-top-level-bind-scope the-struct_71)" +"(root-expand-context/inner-all-scopes-stx the-struct_71)" +"(root-expand-context/inner-defined-syms the-struct_71)" +"(root-expand-context/inner-counter the-struct_71)" +"(root-expand-context/inner-lift-key the-struct_71)" " to-parsed?75_0" -"(expand-context/inner-phase the-struct_70)" -"(expand-context/inner-namespace the-struct_70)" +"(expand-context/inner-phase the-struct_71)" +"(expand-context/inner-namespace the-struct_71)" " just-once?76_0" -"(expand-context/inner-module-begin-k the-struct_70)" -"(expand-context/inner-allow-unbound? the-struct_70)" +"(expand-context/inner-module-begin-k the-struct_71)" +"(expand-context/inner-allow-unbound? the-struct_71)" " in-local-expand?77_0" " stops78_0" -"(expand-context/inner-declared-submodule-names the-struct_70)" -"(expand-context/inner-lifts the-struct_70)" -"(expand-context/inner-lift-envs the-struct_70)" -"(expand-context/inner-module-lifts the-struct_70)" -"(expand-context/inner-require-lifts the-struct_70)" -"(expand-context/inner-to-module-lifts the-struct_70)" -"(expand-context/inner-requires+provides the-struct_70)" -"(expand-context/inner-observer the-struct_70)" -"(expand-context/inner-for-serializable? the-struct_70)" +"(expand-context/inner-declared-submodule-names the-struct_71)" +"(expand-context/inner-lifts the-struct_71)" +"(expand-context/inner-lift-envs the-struct_71)" +"(expand-context/inner-module-lifts the-struct_71)" +"(expand-context/inner-require-lifts the-struct_71)" +"(expand-context/inner-to-module-lifts the-struct_71)" +"(expand-context/inner-requires+provides the-struct_71)" +"(expand-context/inner-observer the-struct_71)" +"(expand-context/inner-for-serializable? the-struct_71)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_70)))" +" the-struct_71)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_70)))))" +" the-struct_71)))))" "(expand-context/outer1.1" " inner72_0" " post-expansion-scope66_0" @@ -40542,17 +40562,17 @@ static const char *startup_source = " env63_0" " post-expansion-scope-action67_0" " scopes68_0" -"(expand-context/outer-def-ctx-scopes the-struct_69)" -"(expand-context/outer-binding-layer the-struct_69)" -"(expand-context/outer-reference-records the-struct_69)" +"(expand-context/outer-def-ctx-scopes the-struct_70)" +"(expand-context/outer-binding-layer the-struct_70)" +"(expand-context/outer-reference-records the-struct_70)" " only-immediate?69_0" " need-eventually-defined71_0" " current-introduction-scopes70_0" -"(expand-context/outer-name the-struct_69)))" +"(expand-context/outer-name the-struct_70)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_69))))))))))))))))))" +" the-struct_70))))))))))))))))))" "(define-values" "(flip-introduction-scopes)" "(lambda(s_411 ctx_46)(begin(flip-scopes s_411(expand-context-current-introduction-scopes ctx_46)))))" @@ -40834,8 +40854,8 @@ static const char *startup_source = "(let-values(((ctx_52)" "(if intdef_11" "(let-values(((v_50) current-ctx_0))" -"(let-values(((the-struct_71) v_50))" -"(if(expand-context/outer? the-struct_71)" +"(let-values(((the-struct_72) v_50))" +"(if(expand-context/outer? the-struct_72)" "(let-values(((env85_0)" "(add-intdef-bindings" "(expand-context-env current-ctx_0)" @@ -40843,24 +40863,24 @@ static const char *startup_source = "((inner86_0)(root-expand-context/outer-inner v_50)))" "(expand-context/outer1.1" " inner86_0" -"(root-expand-context/outer-post-expansion-scope the-struct_71)" -"(root-expand-context/outer-use-site-scopes the-struct_71)" -"(root-expand-context/outer-frame-id the-struct_71)" -"(expand-context/outer-context the-struct_71)" +"(root-expand-context/outer-post-expansion-scope the-struct_72)" +"(root-expand-context/outer-use-site-scopes the-struct_72)" +"(root-expand-context/outer-frame-id the-struct_72)" +"(expand-context/outer-context the-struct_72)" " env85_0" -"(expand-context/outer-post-expansion-scope-action the-struct_71)" -"(expand-context/outer-scopes the-struct_71)" -"(expand-context/outer-def-ctx-scopes the-struct_71)" -"(expand-context/outer-binding-layer the-struct_71)" -"(expand-context/outer-reference-records the-struct_71)" -"(expand-context/outer-only-immediate? the-struct_71)" -"(expand-context/outer-need-eventually-defined the-struct_71)" -"(expand-context/outer-current-introduction-scopes the-struct_71)" -"(expand-context/outer-name the-struct_71)))" +"(expand-context/outer-post-expansion-scope-action the-struct_72)" +"(expand-context/outer-scopes the-struct_72)" +"(expand-context/outer-def-ctx-scopes the-struct_72)" +"(expand-context/outer-binding-layer the-struct_72)" +"(expand-context/outer-reference-records the-struct_72)" +"(expand-context/outer-only-immediate? the-struct_72)" +"(expand-context/outer-need-eventually-defined the-struct_72)" +"(expand-context/outer-current-introduction-scopes the-struct_72)" +"(expand-context/outer-name the-struct_72)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_71))))" +" the-struct_72))))" " current-ctx_0)))" "(let-values((()" "(begin" @@ -41714,7 +41734,7 @@ static const char *startup_source = "(begin" " (if (syntax?$1 s_157) (void) (let-values () (raise-argument-error who_0 \"syntax?\" s_157)))" "(values))))" -"(let-values(((srcloc_7)(syntax-srcloc s_157)))(if srcloc_7(srcloc-accessor_0 srcloc_7) #f)))))))" +"(let-values(((srcloc_8)(syntax-srcloc s_157)))(if srcloc_8(srcloc-accessor_0 srcloc_8) #f)))))))" "(define-values(1/syntax-source)(syntax-source-accessor 'syntax-source srcloc-source))" "(define-values(1/syntax-line)(syntax-source-accessor 'syntax-line srcloc-line))" "(define-values(1/syntax-column)(syntax-source-accessor 'syntax-column srcloc-column))" @@ -41747,19 +41767,19 @@ static const char *startup_source = "(begin" "(if(srcloc? v_191)" "(let-values()" -"(let-values(((the-struct_72) empty-syntax))" -"(if(syntax?$1 the-struct_72)" +"(let-values(((the-struct_73) empty-syntax))" +"(if(syntax?$1 the-struct_73)" "(let-values(((srcloc1_2) v_191))" "(syntax1.1" -"(syntax-content the-struct_72)" -"(syntax-scopes the-struct_72)" -"(syntax-shifted-multi-scopes the-struct_72)" -"(syntax-scope-propagations+tamper the-struct_72)" -"(syntax-mpi-shifts the-struct_72)" +"(syntax-content the-struct_73)" +"(syntax-scopes the-struct_73)" +"(syntax-shifted-multi-scopes the-struct_73)" +"(syntax-scope-propagations+tamper the-struct_73)" +"(syntax-mpi-shifts the-struct_73)" " srcloc1_2" -"(syntax-props the-struct_72)" -"(syntax-inspector the-struct_72)))" -" (raise-argument-error 'struct-copy \"syntax?\" the-struct_72))))" +"(syntax-props the-struct_73)" +"(syntax-inspector the-struct_73)))" +" (raise-argument-error 'struct-copy \"syntax?\" the-struct_73))))" "(if(pair? v_191)" "(let-values()(to-srcloc-stx(list->vector v_191)))" "(if(vector? v_191)" @@ -43826,7 +43846,7 @@ static const char *startup_source = "(begin" "(log-top-lift-begin-before ctx_65 require-lifts_3 lifts_9 exp-s_6 ns_96)" "(values))))" -"(let-values(((new-s_1)" +"(let-values(((new-s_2)" "(let-values(((temp123_2)(append require-lifts_3 lifts_9))" "((temp124_2)" "(lambda(form_1)" @@ -43869,7 +43889,7 @@ static const char *startup_source = " temp123_2" " exp-s126_0" " temp127_2))))" -"(begin(log-top-begin-after ctx_65 new-s_1) new-s_1))))))))))))" +"(begin(log-top-begin-after ctx_65 new-s_2) new-s_2))))))))))))" "(define-values" "(expand-once$1)" "(let-values(((expand-once45_0)" @@ -43915,39 +43935,39 @@ static const char *startup_source = "(let-values(((the-struct_55) v_113))" "(if(expand-context/outer? the-struct_55)" "(let-values(((inner136_0)" -"(let-values(((the-struct_73)(root-expand-context/outer-inner v_113)))" -"(if(expand-context/inner? the-struct_73)" +"(let-values(((the-struct_74)(root-expand-context/outer-inner v_113)))" +"(if(expand-context/inner? the-struct_74)" "(let-values(((just-once?137_0) #t))" "(expand-context/inner2.1" -"(root-expand-context/inner-self-mpi the-struct_73)" -"(root-expand-context/inner-module-scopes the-struct_73)" -"(root-expand-context/inner-top-level-bind-scope the-struct_73)" -"(root-expand-context/inner-all-scopes-stx the-struct_73)" -"(root-expand-context/inner-defined-syms the-struct_73)" -"(root-expand-context/inner-counter the-struct_73)" -"(root-expand-context/inner-lift-key the-struct_73)" -"(expand-context/inner-to-parsed? the-struct_73)" -"(expand-context/inner-phase the-struct_73)" -"(expand-context/inner-namespace the-struct_73)" +"(root-expand-context/inner-self-mpi the-struct_74)" +"(root-expand-context/inner-module-scopes the-struct_74)" +"(root-expand-context/inner-top-level-bind-scope the-struct_74)" +"(root-expand-context/inner-all-scopes-stx the-struct_74)" +"(root-expand-context/inner-defined-syms the-struct_74)" +"(root-expand-context/inner-counter the-struct_74)" +"(root-expand-context/inner-lift-key the-struct_74)" +"(expand-context/inner-to-parsed? the-struct_74)" +"(expand-context/inner-phase the-struct_74)" +"(expand-context/inner-namespace the-struct_74)" " just-once?137_0" -"(expand-context/inner-module-begin-k the-struct_73)" -"(expand-context/inner-allow-unbound? the-struct_73)" -"(expand-context/inner-in-local-expand? the-struct_73)" -"(expand-context/inner-stops the-struct_73)" -"(expand-context/inner-declared-submodule-names the-struct_73)" -"(expand-context/inner-lifts the-struct_73)" -"(expand-context/inner-lift-envs the-struct_73)" -"(expand-context/inner-module-lifts the-struct_73)" -"(expand-context/inner-require-lifts the-struct_73)" -"(expand-context/inner-to-module-lifts the-struct_73)" -"(expand-context/inner-requires+provides the-struct_73)" -"(expand-context/inner-observer the-struct_73)" -"(expand-context/inner-for-serializable? the-struct_73)" -"(expand-context/inner-should-not-encounter-macros? the-struct_73)))" +"(expand-context/inner-module-begin-k the-struct_74)" +"(expand-context/inner-allow-unbound? the-struct_74)" +"(expand-context/inner-in-local-expand? the-struct_74)" +"(expand-context/inner-stops the-struct_74)" +"(expand-context/inner-declared-submodule-names the-struct_74)" +"(expand-context/inner-lifts the-struct_74)" +"(expand-context/inner-lift-envs the-struct_74)" +"(expand-context/inner-module-lifts the-struct_74)" +"(expand-context/inner-require-lifts the-struct_74)" +"(expand-context/inner-to-module-lifts the-struct_74)" +"(expand-context/inner-requires+provides the-struct_74)" +"(expand-context/inner-observer the-struct_74)" +"(expand-context/inner-for-serializable? the-struct_74)" +"(expand-context/inner-should-not-encounter-macros? the-struct_74)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_73)))))" +" the-struct_74)))))" "(expand-context/outer1.1" " inner136_0" "(root-expand-context/outer-post-expansion-scope the-struct_55)" @@ -44049,14 +44069,14 @@ static const char *startup_source = " 'loop" "(let-values(((tl-ctx_0)" "(let-values(((v_193) ctx_66))" -"(let-values(((the-struct_74) v_193))" -"(if(expand-context/outer? the-struct_74)" +"(let-values(((the-struct_75) v_193))" +"(if(expand-context/outer? the-struct_75)" "(let-values(((inner148_0)" -"(let-values(((the-struct_75)" +"(let-values(((the-struct_76)" "(root-expand-context/outer-inner" " v_193)))" "(if(expand-context/inner?" -" the-struct_75)" +" the-struct_76)" "(let-values(((phase149_0)" " phase_138)" "((namespace150_0)" @@ -44067,86 +44087,86 @@ static const char *startup_source = " serializable?_10))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_75)" +" the-struct_76)" "(root-expand-context/inner-module-scopes" -" the-struct_75)" +" the-struct_76)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_75)" +" the-struct_76)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_75)" +" the-struct_76)" "(root-expand-context/inner-defined-syms" -" the-struct_75)" +" the-struct_76)" "(root-expand-context/inner-counter" -" the-struct_75)" +" the-struct_76)" "(root-expand-context/inner-lift-key" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-to-parsed?" -" the-struct_75)" +" the-struct_76)" " phase149_0" " namespace150_0" " just-once?151_0" "(expand-context/inner-module-begin-k" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-allow-unbound?" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-in-local-expand?" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-stops" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-declared-submodule-names" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-lifts" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-lift-envs" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-module-lifts" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-require-lifts" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-to-module-lifts" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-requires+provides" -" the-struct_75)" +" the-struct_76)" "(expand-context/inner-observer" -" the-struct_75)" +" the-struct_76)" " for-serializable?152_0" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_75)))" +" the-struct_76)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_75)))))" +" the-struct_76)))))" "(expand-context/outer1.1" " inner148_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_74)" +" the-struct_75)" "(root-expand-context/outer-use-site-scopes" -" the-struct_74)" +" the-struct_75)" "(root-expand-context/outer-frame-id" -" the-struct_74)" +" the-struct_75)" "(expand-context/outer-context" -" the-struct_74)" -"(expand-context/outer-env the-struct_74)" +" the-struct_75)" +"(expand-context/outer-env the-struct_75)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_74)" -"(expand-context/outer-scopes the-struct_74)" +" the-struct_75)" +"(expand-context/outer-scopes the-struct_75)" "(expand-context/outer-def-ctx-scopes" -" the-struct_74)" +" the-struct_75)" "(expand-context/outer-binding-layer" -" the-struct_74)" +" the-struct_75)" "(expand-context/outer-reference-records" -" the-struct_74)" +" the-struct_75)" "(expand-context/outer-only-immediate?" -" the-struct_74)" +" the-struct_75)" "(expand-context/outer-need-eventually-defined" -" the-struct_74)" +" the-struct_75)" "(expand-context/outer-current-introduction-scopes" -" the-struct_74)" -"(expand-context/outer-name the-struct_74)))" +" the-struct_75)" +"(expand-context/outer-name the-struct_75)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_74))))))" +" the-struct_75))))))" "(let-values(((wb-s_0)(if just-once?_1 s_441 #f)))" "(let-values((()" "(begin" @@ -44173,68 +44193,68 @@ static const char *startup_source = "((def-ctx-scopes154_0)" "(box null))" "((inner155_1)" -"(let-values(((the-struct_76)" +"(let-values(((the-struct_77)" "(root-expand-context/outer-inner" " v_145)))" "(if(expand-context/inner?" -" the-struct_76)" +" the-struct_77)" "(let-values(((phase156_1)" " phase_138)" "((namespace157_1)" " ns_100))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_76)" +" the-struct_77)" "(root-expand-context/inner-module-scopes" -" the-struct_76)" +" the-struct_77)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_76)" +" the-struct_77)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_76)" +" the-struct_77)" "(root-expand-context/inner-defined-syms" -" the-struct_76)" +" the-struct_77)" "(root-expand-context/inner-counter" -" the-struct_76)" +" the-struct_77)" "(root-expand-context/inner-lift-key" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-to-parsed?" -" the-struct_76)" +" the-struct_77)" " phase156_1" " namespace157_1" "(expand-context/inner-just-once?" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-module-begin-k" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-allow-unbound?" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-in-local-expand?" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-stops" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-declared-submodule-names" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-lifts" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-lift-envs" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-module-lifts" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-require-lifts" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-to-module-lifts" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-requires+provides" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-observer" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-for-serializable?" -" the-struct_76)" +" the-struct_77)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_76)))" +" the-struct_77)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_76)))))" +" the-struct_77)))))" "(expand-context/outer1.1" " inner155_1" "(root-expand-context/outer-post-expansion-scope" @@ -44273,7 +44293,7 @@ static const char *startup_source = "(pair? require-lifts_5)))" "(if or-part_301 or-part_301(pair? lifts_11)))" "(let-values()" -"(let-values(((new-s_2)" +"(let-values(((new-s_3)" "(let-values(((temp158_0)" "(append" " require-lifts_5" @@ -44298,12 +44318,12 @@ static const char *startup_source = "(call-expand-observe" " obs_43" " 'lift-loop" -" new-s_2)))" +" new-s_3)))" "(void)))" "(if just-once?_1" -" new-s_2" +" new-s_3" "(loop_101" -" new-s_2" +" new-s_3" " phase_138" " ns_100" " as-tail?_7)))))" @@ -44459,7 +44479,7 @@ static const char *startup_source = " es_2))))))))))))" "(if wrap_2" "(let-values()" -"(let-values(((new-s_3)" +"(let-values(((new-s_4)" "(wrap_2" " begin161_0" " exp-s_8" @@ -44475,9 +44495,9 @@ static const char *startup_source = "(call-expand-observe" " obs_47" " 'return" -" new-s_3)))" +" new-s_4)))" "(void)))" -" new-s_3)))" +" new-s_4)))" "(let-values()" "(begin-loop_0 e162_0)))))))" "(if(equal? tmp_37 'begin-for-syntax)" @@ -44644,7 +44664,7 @@ static const char *startup_source = " lst_291))))))" "(if wrap_2" "(let-values()" -"(let-values(((new-s_4)" +"(let-values(((new-s_5)" "(wrap_2" " begin-for-syntax165_0" " exp-s_8" @@ -44659,9 +44679,9 @@ static const char *startup_source = "(call-expand-observe" " obs_51" " 'return" -" new-s_4)))" +" new-s_5)))" "(void)))" -" new-s_4)))" +" new-s_5)))" "(if combine_0" "(let-values() l_72)" "(let-values()" @@ -44702,80 +44722,80 @@ static const char *startup_source = "(let-values(((s170_0) s_451)" "((temp171_0)" "(let-values(((v_161) ctx_67))" -"(let-values(((the-struct_77) v_161))" -"(if(expand-context/outer? the-struct_77)" +"(let-values(((the-struct_78) v_161))" +"(if(expand-context/outer? the-struct_78)" "(let-values(((inner172_0)" -"(let-values(((the-struct_78)" +"(let-values(((the-struct_79)" "(root-expand-context/outer-inner v_161)))" -"(if(expand-context/inner? the-struct_78)" +"(if(expand-context/inner? the-struct_79)" "(let-values(((lifts173_0) lift-ctx_6)" "((module-lifts174_0) lift-ctx_6)" "((require-lifts175_0)" " require-lift-ctx_2))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_78)" +" the-struct_79)" "(root-expand-context/inner-module-scopes" -" the-struct_78)" +" the-struct_79)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_78)" +" the-struct_79)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_78)" +" the-struct_79)" "(root-expand-context/inner-defined-syms" -" the-struct_78)" -"(root-expand-context/inner-counter the-struct_78)" +" the-struct_79)" +"(root-expand-context/inner-counter the-struct_79)" "(root-expand-context/inner-lift-key" -" the-struct_78)" -"(expand-context/inner-to-parsed? the-struct_78)" -"(expand-context/inner-phase the-struct_78)" -"(expand-context/inner-namespace the-struct_78)" -"(expand-context/inner-just-once? the-struct_78)" +" the-struct_79)" +"(expand-context/inner-to-parsed? the-struct_79)" +"(expand-context/inner-phase the-struct_79)" +"(expand-context/inner-namespace the-struct_79)" +"(expand-context/inner-just-once? the-struct_79)" "(expand-context/inner-module-begin-k" -" the-struct_78)" +" the-struct_79)" "(expand-context/inner-allow-unbound?" -" the-struct_78)" +" the-struct_79)" "(expand-context/inner-in-local-expand?" -" the-struct_78)" -"(expand-context/inner-stops the-struct_78)" +" the-struct_79)" +"(expand-context/inner-stops the-struct_79)" "(expand-context/inner-declared-submodule-names" -" the-struct_78)" +" the-struct_79)" " lifts173_0" -"(expand-context/inner-lift-envs the-struct_78)" +"(expand-context/inner-lift-envs the-struct_79)" " module-lifts174_0" " require-lifts175_0" "(expand-context/inner-to-module-lifts" -" the-struct_78)" +" the-struct_79)" "(expand-context/inner-requires+provides" -" the-struct_78)" -"(expand-context/inner-observer the-struct_78)" +" the-struct_79)" +"(expand-context/inner-observer the-struct_79)" "(expand-context/inner-for-serializable?" -" the-struct_78)" +" the-struct_79)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_78)))" +" the-struct_79)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_78)))))" +" the-struct_79)))))" "(expand-context/outer1.1" " inner172_0" -"(root-expand-context/outer-post-expansion-scope the-struct_77)" -"(root-expand-context/outer-use-site-scopes the-struct_77)" -"(root-expand-context/outer-frame-id the-struct_77)" -"(expand-context/outer-context the-struct_77)" -"(expand-context/outer-env the-struct_77)" -"(expand-context/outer-post-expansion-scope-action the-struct_77)" -"(expand-context/outer-scopes the-struct_77)" -"(expand-context/outer-def-ctx-scopes the-struct_77)" -"(expand-context/outer-binding-layer the-struct_77)" -"(expand-context/outer-reference-records the-struct_77)" -"(expand-context/outer-only-immediate? the-struct_77)" -"(expand-context/outer-need-eventually-defined the-struct_77)" -"(expand-context/outer-current-introduction-scopes the-struct_77)" -"(expand-context/outer-name the-struct_77)))" +"(root-expand-context/outer-post-expansion-scope the-struct_78)" +"(root-expand-context/outer-use-site-scopes the-struct_78)" +"(root-expand-context/outer-frame-id the-struct_78)" +"(expand-context/outer-context the-struct_78)" +"(expand-context/outer-env the-struct_78)" +"(expand-context/outer-post-expansion-scope-action the-struct_78)" +"(expand-context/outer-scopes the-struct_78)" +"(expand-context/outer-def-ctx-scopes the-struct_78)" +"(expand-context/outer-binding-layer the-struct_78)" +"(expand-context/outer-reference-records the-struct_78)" +"(expand-context/outer-only-immediate? the-struct_78)" +"(expand-context/outer-need-eventually-defined the-struct_78)" +"(expand-context/outer-current-introduction-scopes the-struct_78)" +"(expand-context/outer-name the-struct_78)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_77))))))" +" the-struct_78))))))" "(expand7.1 #f #f #f #f s170_0 temp171_0))))" "(values" "(get-and-clear-require-lifts! require-lift-ctx_2)" @@ -44931,20 +44951,20 @@ static const char *startup_source = " just-rhs_0)))" "(if(lifted-parsed-begin?" " exp-rhs_3)" -"(let-values(((the-struct_79)" +"(let-values(((the-struct_80)" " exp-rhs_3))" "(if(lifted-parsed-begin?" -" the-struct_79)" +" the-struct_80)" "(let-values(((last189_0)" " dv_0))" "(lifted-parsed-begin30.1" "(lifted-parsed-begin-seq" -" the-struct_79)" +" the-struct_80)" " last189_0))" "(raise-argument-error" " 'struct-copy" " \"lifted-parsed-begin?\"" -" the-struct_79)))" +" the-struct_80)))" " dv_0)))))" " fold-var_266))))" "(values fold-var_267)))))" @@ -44961,22 +44981,22 @@ static const char *startup_source = "(let-values(((obs_52)(expand-context-observer ctx_68)))" "(if obs_52" "(let-values()" -"(let-values(((new-s_5)" +"(let-values(((new-s_6)" "(let-values(((temp190_0)(append require-lifts_7 lifts_13))" "((exp-s191_0) exp-s_11)" "((temp192_0)(namespace-phase ns_104)))" "(wrap-lifts-as-begin16.1 #f #f #f #f temp190_0 exp-s191_0 temp192_0))))" -"(begin(call-expand-observe obs_52 'lift-loop new-s_5)(log-top-begin-before ctx_68 new-s_5))))" +"(begin(call-expand-observe obs_52 'lift-loop new-s_6)(log-top-begin-before ctx_68 new-s_6))))" "(void))))))" "(define-values" "(log-top-begin-before)" -"(lambda(ctx_69 new-s_6)" +"(lambda(ctx_69 new-s_7)" "(begin" "(let-values(((obs_53)(expand-context-observer ctx_69)))" "(if obs_53" "(let-values()" "(let-values(((ok?_31 begin193_0 e194_0)" -"(let-values(((s_456) new-s_6))" +"(let-values(((s_456) new-s_7))" "(let-values(((orig-s_36) s_456))" "(let-values(((begin193_1 e194_1)" "(let-values(((s_457)(if(syntax?$1 s_456)(syntax-e$1 s_456) s_456)))" @@ -45000,21 +45020,21 @@ static const char *startup_source = " (raise-syntax-error$1 #f \"bad syntax\" orig-s_36)))))" "(values #t begin193_1 e194_1))))))" "(begin" -"(call-expand-observe obs_53 'visit new-s_6)" +"(call-expand-observe obs_53 'visit new-s_7)" "(call-expand-observe obs_53 'resolve begin193_0)" -"(call-expand-observe obs_53 'enter-prim new-s_6)" +"(call-expand-observe obs_53 'enter-prim new-s_7)" "(call-expand-observe obs_53 'prim-begin)" -"(call-expand-observe obs_53 'enter-list(1/datum->syntax #f e194_0 new-s_6)))))" +"(call-expand-observe obs_53 'enter-list(1/datum->syntax #f e194_0 new-s_7)))))" "(void))))))" "(define-values" "(log-top-begin-after)" -"(lambda(ctx_70 new-s_7)" +"(lambda(ctx_70 new-s_8)" "(begin" "(let-values(((obs_54)(expand-context-observer ctx_70)))" "(if obs_54" "(let-values()" "(let-values(((ok?_32 begin197_0 e198_0)" -"(let-values(((s_461) new-s_7))" +"(let-values(((s_461) new-s_8))" "(let-values(((orig-s_37) s_461))" "(let-values(((begin197_1 e198_1)" "(let-values(((s_462)(if(syntax?$1 s_461)(syntax-e$1 s_461) s_461)))" @@ -45042,9 +45062,9 @@ static const char *startup_source = "(let-values()" "(let-values()" "(begin" -"(call-expand-observe obs_55 'exit-list(1/datum->syntax #f e198_0 new-s_7))" -"(call-expand-observe obs_55 'exit-prim new-s_7)" -"(call-expand-observe obs_55 'return new-s_7))))" +"(call-expand-observe obs_55 'exit-list(1/datum->syntax #f e198_0 new-s_8))" +"(call-expand-observe obs_55 'exit-prim new-s_8)" +"(call-expand-observe obs_55 'return new-s_8))))" "(void)))))" "(void))))))" "(define-values" @@ -46599,7 +46619,7 @@ static const char *startup_source = " or-part_228" " (lambda (mod-path_26) (error 'read \"no `module-declare?` provided\"))))" "(let-values(((or-part_303) coerce_1))" -"(if or-part_303 or-part_303(lambda(for-syntax?_2 v_112 srcloc_8) v_112)))" +"(if or-part_303 or-part_303(lambda(for-syntax?_2 v_112 srcloc_9) v_112)))" "(let-values(((or-part_304) coerce-key_1))" "(if or-part_304 or-part_304(lambda(for-syntax?_3 v_116) v_116)))" " #f" @@ -46632,13 +46652,13 @@ static const char *startup_source = "(let-values(((keep-comment?_2) keep-comment?34_0))" "(let-values()" "(let-values(((v_211) config_0))" -"(let-values(((the-struct_80) v_211))" -"(if(read-config/outer? the-struct_80)" +"(let-values(((the-struct_81) v_211))" +"(if(read-config/outer? the-struct_81)" "(let-values(((wrap48_0) wrap_5)" "((keep-comment?49_0) keep-comment?_2)" "((inner50_1)" -"(let-values(((the-struct_81)(read-config/outer-inner v_211)))" -"(if(read-config/inner? the-struct_81)" +"(let-values(((the-struct_82)(read-config/outer-inner v_211)))" +"(if(read-config/inner? the-struct_82)" "(let-values(((for-syntax?51_0) for-syntax?_4)" "((readtable52_0) readtable_2)" "((next-readtable53_0) next-readtable_2)" @@ -46650,25 +46670,25 @@ static const char *startup_source = " readtable52_0" " next-readtable53_0" " for-syntax?51_0" -"(read-config/inner-source the-struct_81)" -"(read-config/inner-read-compiled the-struct_81)" -"(read-config/inner-dynamic-require the-struct_81)" -"(read-config/inner-module-declared? the-struct_81)" -"(read-config/inner-coerce the-struct_81)" -"(read-config/inner-coerce-key the-struct_81)" -"(read-config/inner-parameter-override the-struct_81)" -"(read-config/inner-parameter-cache the-struct_81)" +"(read-config/inner-source the-struct_82)" +"(read-config/inner-read-compiled the-struct_82)" +"(read-config/inner-dynamic-require the-struct_82)" +"(read-config/inner-module-declared? the-struct_82)" +"(read-config/inner-coerce the-struct_82)" +"(read-config/inner-coerce-key the-struct_82)" +"(read-config/inner-parameter-override the-struct_82)" +"(read-config/inner-parameter-cache the-struct_82)" " st54_0))" -" (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_81)))))" +" (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_82)))))" "(read-config/outer1.1" " inner50_1" " wrap48_0" -"(read-config/outer-line the-struct_80)" -"(read-config/outer-col the-struct_80)" -"(read-config/outer-pos the-struct_80)" -"(read-config/outer-indentations the-struct_80)" +"(read-config/outer-line the-struct_81)" +"(read-config/outer-col the-struct_81)" +"(read-config/outer-pos the-struct_81)" +"(read-config/outer-indentations the-struct_81)" " keep-comment?49_0))" -" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_80)))))))))))))))" +" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_81)))))))))))))))" "(define-values" "(port+config->srcloc)" "(lambda(in_1 config_1)" @@ -46685,55 +46705,55 @@ static const char *startup_source = "(lambda(config_2 line_2 col_1 pos_105)" "(begin" "(let-values(((v_212) config_2))" -"(let-values(((the-struct_82) v_212))" -"(if(read-config/outer? the-struct_82)" +"(let-values(((the-struct_83) v_212))" +"(if(read-config/outer? the-struct_83)" "(let-values(((line55_0) line_2)" "((col56_0) col_1)" "((pos57_0) pos_105)" "((inner58_1)(read-config/outer-inner v_212)))" "(read-config/outer1.1" " inner58_1" -"(read-config/outer-wrap the-struct_82)" +"(read-config/outer-wrap the-struct_83)" " line55_0" " col56_0" " pos57_0" -"(read-config/outer-indentations the-struct_82)" -"(read-config/outer-keep-comment? the-struct_82)))" -" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_82)))))))" +"(read-config/outer-indentations the-struct_83)" +"(read-config/outer-keep-comment? the-struct_83)))" +" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_83)))))))" "(define-values" "(disable-wrapping)" "(lambda(config_3)" "(begin" "(let-values(((v_213) config_3))" -"(let-values(((the-struct_83) v_213))" -"(if(read-config/outer? the-struct_83)" +"(let-values(((the-struct_84) v_213))" +"(if(read-config/outer? the-struct_84)" "(let-values(((wrap59_0) #f)((inner60_0)(read-config/outer-inner v_213)))" "(read-config/outer1.1" " inner60_0" " wrap59_0" -"(read-config/outer-line the-struct_83)" -"(read-config/outer-col the-struct_83)" -"(read-config/outer-pos the-struct_83)" -"(read-config/outer-indentations the-struct_83)" -"(read-config/outer-keep-comment? the-struct_83)))" -" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_83)))))))" +"(read-config/outer-line the-struct_84)" +"(read-config/outer-col the-struct_84)" +"(read-config/outer-pos the-struct_84)" +"(read-config/outer-indentations the-struct_84)" +"(read-config/outer-keep-comment? the-struct_84)))" +" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_84)))))))" "(define-values" "(keep-comment)" "(lambda(config_4)" "(begin" "(let-values(((v_146) config_4))" -"(let-values(((the-struct_84) v_146))" -"(if(read-config/outer? the-struct_84)" +"(let-values(((the-struct_85) v_146))" +"(if(read-config/outer? the-struct_85)" "(let-values(((keep-comment?61_0) #t)((inner62_0)(read-config/outer-inner v_146)))" "(read-config/outer1.1" " inner62_0" -"(read-config/outer-wrap the-struct_84)" -"(read-config/outer-line the-struct_84)" -"(read-config/outer-col the-struct_84)" -"(read-config/outer-pos the-struct_84)" -"(read-config/outer-indentations the-struct_84)" +"(read-config/outer-wrap the-struct_85)" +"(read-config/outer-line the-struct_85)" +"(read-config/outer-col the-struct_85)" +"(read-config/outer-pos the-struct_85)" +"(read-config/outer-indentations the-struct_85)" " keep-comment?61_0))" -" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_84)))))))" +" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_85)))))))" "(define-values" "(discard-comment)" "(lambda(config_5)" @@ -46742,18 +46762,18 @@ static const char *startup_source = "(let-values() config_5)" "(let-values()" "(let-values(((v_214) config_5))" -"(let-values(((the-struct_85) v_214))" -"(if(read-config/outer? the-struct_85)" +"(let-values(((the-struct_86) v_214))" +"(if(read-config/outer? the-struct_86)" "(let-values(((keep-comment?63_0) #f)((inner64_0)(read-config/outer-inner v_214)))" "(read-config/outer1.1" " inner64_0" -"(read-config/outer-wrap the-struct_85)" -"(read-config/outer-line the-struct_85)" -"(read-config/outer-col the-struct_85)" -"(read-config/outer-pos the-struct_85)" -"(read-config/outer-indentations the-struct_85)" +"(read-config/outer-wrap the-struct_86)" +"(read-config/outer-line the-struct_86)" +"(read-config/outer-col the-struct_86)" +"(read-config/outer-pos the-struct_86)" +"(read-config/outer-indentations the-struct_86)" " keep-comment?63_0))" -" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_85)))))))))" +" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_86)))))))))" "(define-values" "(next-readtable)" "(lambda(config_6)" @@ -46762,35 +46782,35 @@ static const char *startup_source = "(let-values() config_6)" "(let-values()" "(let-values(((v_215) config_6))" -"(let-values(((the-struct_86) v_215))" -"(if(read-config/outer? the-struct_86)" +"(let-values(((the-struct_87) v_215))" +"(if(read-config/outer? the-struct_87)" "(let-values(((inner65_0)" -"(let-values(((the-struct_87)(read-config/outer-inner v_215)))" -"(if(read-config/inner? the-struct_87)" +"(let-values(((the-struct_88)(read-config/outer-inner v_215)))" +"(if(read-config/inner? the-struct_88)" "(let-values(((readtable66_0)(read-config-next-readtable config_6)))" "(read-config/inner2.1" " readtable66_0" -"(read-config/inner-next-readtable the-struct_87)" -"(read-config/inner-for-syntax? the-struct_87)" -"(read-config/inner-source the-struct_87)" -"(read-config/inner-read-compiled the-struct_87)" -"(read-config/inner-dynamic-require the-struct_87)" -"(read-config/inner-module-declared? the-struct_87)" -"(read-config/inner-coerce the-struct_87)" -"(read-config/inner-coerce-key the-struct_87)" -"(read-config/inner-parameter-override the-struct_87)" -"(read-config/inner-parameter-cache the-struct_87)" -"(read-config/inner-st the-struct_87)))" -" (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_87)))))" +"(read-config/inner-next-readtable the-struct_88)" +"(read-config/inner-for-syntax? the-struct_88)" +"(read-config/inner-source the-struct_88)" +"(read-config/inner-read-compiled the-struct_88)" +"(read-config/inner-dynamic-require the-struct_88)" +"(read-config/inner-module-declared? the-struct_88)" +"(read-config/inner-coerce the-struct_88)" +"(read-config/inner-coerce-key the-struct_88)" +"(read-config/inner-parameter-override the-struct_88)" +"(read-config/inner-parameter-cache the-struct_88)" +"(read-config/inner-st the-struct_88)))" +" (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_88)))))" "(read-config/outer1.1" " inner65_0" -"(read-config/outer-wrap the-struct_86)" -"(read-config/outer-line the-struct_86)" -"(read-config/outer-col the-struct_86)" -"(read-config/outer-pos the-struct_86)" -"(read-config/outer-indentations the-struct_86)" -"(read-config/outer-keep-comment? the-struct_86)))" -" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_86)))))))))" +"(read-config/outer-wrap the-struct_87)" +"(read-config/outer-line the-struct_87)" +"(read-config/outer-col the-struct_87)" +"(read-config/outer-pos the-struct_87)" +"(read-config/outer-indentations the-struct_87)" +"(read-config/outer-keep-comment? the-struct_87)))" +" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_87)))))))))" "(define-values" "(coerce)" "(lambda(val_74 in_2 config_7)" @@ -46841,36 +46861,36 @@ static const char *startup_source = "(lambda(param_1 config_9 v_31)" "(begin" "(let-values(((v_95) config_9))" -"(let-values(((the-struct_88) v_95))" -"(if(read-config/outer? the-struct_88)" +"(let-values(((the-struct_89) v_95))" +"(if(read-config/outer? the-struct_89)" "(let-values(((inner1_0)" -"(let-values(((the-struct_89)(read-config/outer-inner v_95)))" -"(if(read-config/inner? the-struct_89)" +"(let-values(((the-struct_90)(read-config/outer-inner v_95)))" +"(if(read-config/inner? the-struct_90)" "(let-values(((parameter-override2_0)" "(hash-set(read-config-parameter-override config_9) param_1 v_31)))" "(read-config/inner2.1" -"(read-config/inner-readtable the-struct_89)" -"(read-config/inner-next-readtable the-struct_89)" -"(read-config/inner-for-syntax? the-struct_89)" -"(read-config/inner-source the-struct_89)" -"(read-config/inner-read-compiled the-struct_89)" -"(read-config/inner-dynamic-require the-struct_89)" -"(read-config/inner-module-declared? the-struct_89)" -"(read-config/inner-coerce the-struct_89)" -"(read-config/inner-coerce-key the-struct_89)" +"(read-config/inner-readtable the-struct_90)" +"(read-config/inner-next-readtable the-struct_90)" +"(read-config/inner-for-syntax? the-struct_90)" +"(read-config/inner-source the-struct_90)" +"(read-config/inner-read-compiled the-struct_90)" +"(read-config/inner-dynamic-require the-struct_90)" +"(read-config/inner-module-declared? the-struct_90)" +"(read-config/inner-coerce the-struct_90)" +"(read-config/inner-coerce-key the-struct_90)" " parameter-override2_0" -"(read-config/inner-parameter-cache the-struct_89)" -"(read-config/inner-st the-struct_89)))" -" (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_89)))))" +"(read-config/inner-parameter-cache the-struct_90)" +"(read-config/inner-st the-struct_90)))" +" (raise-argument-error 'struct-copy \"read-config/inner?\" the-struct_90)))))" "(read-config/outer1.1" " inner1_0" -"(read-config/outer-wrap the-struct_88)" -"(read-config/outer-line the-struct_88)" -"(read-config/outer-col the-struct_88)" -"(read-config/outer-pos the-struct_88)" -"(read-config/outer-indentations the-struct_88)" -"(read-config/outer-keep-comment? the-struct_88)))" -" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_88)))))))" +"(read-config/outer-wrap the-struct_89)" +"(read-config/outer-line the-struct_89)" +"(read-config/outer-col the-struct_89)" +"(read-config/outer-pos the-struct_89)" +"(read-config/outer-indentations the-struct_89)" +"(read-config/outer-keep-comment? the-struct_89)))" +" (raise-argument-error 'struct-copy \"read-config/outer?\" the-struct_89)))))))" "(define-values" "(force-parameters!)" "(lambda(config_10)" @@ -47321,7 +47341,7 @@ static const char *startup_source = "(let-values(((str_25) str9_0))" "(let-values(((args_12) new-rest_0))" " (let-values (((msg_0) (format \"~a: ~a\" who_25 (apply format str_25 args_12))))" -"(let-values(((srcloc_9)(if in_6(port+config->srcloc in_6 config_16) #f)))" +"(let-values(((srcloc_10)(if in_6(port+config->srcloc in_6 config_16) #f)))" "(raise" "((if(eof-object? due-to_0)" "(let-values() exn:fail:read:eof)" @@ -47330,11 +47350,11 @@ static const char *startup_source = "(let-values() exn:fail:read)))" "(let-values(((s_160)" "(if(error-print-source-location)" -"(if srcloc_9(srcloc->string srcloc_9) #f)" +"(if srcloc_10(srcloc->string srcloc_10) #f)" " #f)))" " (if s_160 (string-append s_160 \": \" msg_0) msg_0))" " continuation-marks_0" -"(if srcloc_9(list srcloc_9) null)))))))))))))))" +"(if srcloc_10(list srcloc_10) null)))))))))))))))" "(define-values" "(bad-syntax-error18.1)" "(lambda(due-to13_0 due-to14_0 in15_0 config16_0 str17_0)" @@ -49942,7 +49962,7 @@ static const char *startup_source = "(replace-hashes)" "(lambda(s_263 start_52 end_41)" "(begin" -"(let-values(((new-s_8)(make-string(- end_41 start_52))))" +"(let-values(((new-s_9)(make-string(- end_41 start_52))))" "(begin" "(let-values(((v*_7 start*_6 stop*_7 step*_6)" "(normalise-inputs" @@ -49973,8 +49993,8 @@ static const char *startup_source = "(begin" "(let-values()" "(if(char=? c_79 '#\\#)" -"(string-set! new-s_8 i_176 '#\\0)" -"(string-set! new-s_8 i_176 c_79)))" +"(string-set! new-s_9 i_176 '#\\0)" +"(string-set! new-s_9 i_176 c_79)))" "(values)))))" "(values)))))" "(if(not #f)(for-loop_260(unsafe-fx+ idx_6 1)(+ pos_111 1))(values))))" @@ -49983,7 +50003,7 @@ static const char *startup_source = " start*_6" " start_53)))" "(void)" -" new-s_8)))))" +" new-s_9)))))" "(define-values" "(maybe-substring)" "(lambda(s_458 start_54 end_42)" @@ -55590,12 +55610,12 @@ static const char *startup_source = " fail-thunk_0)))))" "(define-values" "(read-to-syntax)" -"(lambda(s-exp_4 srcloc_10 rep_1)" +"(lambda(s-exp_4 srcloc_11 rep_1)" "(begin" -"(let-values(((the-struct_90) empty-syntax))" -"(if(syntax?$1 the-struct_90)" +"(let-values(((the-struct_91) empty-syntax))" +"(if(syntax?$1 the-struct_91)" "(let-values(((content63_0)(datum-intern-literal s-exp_4))" -"((srcloc64_0) srcloc_10)" +"((srcloc64_0) srcloc_11)" "((props65_0)" "(let-values(((tmp_60) rep_1))" "(if(equal? tmp_60 '#\\[)" @@ -55605,14 +55625,14 @@ static const char *startup_source = "(let-values() original-props))))))" "(syntax1.1" " content63_0" -"(syntax-scopes the-struct_90)" -"(syntax-shifted-multi-scopes the-struct_90)" -"(syntax-scope-propagations+tamper the-struct_90)" -"(syntax-mpi-shifts the-struct_90)" +"(syntax-scopes the-struct_91)" +"(syntax-shifted-multi-scopes the-struct_91)" +"(syntax-scope-propagations+tamper the-struct_91)" +"(syntax-mpi-shifts the-struct_91)" " srcloc64_0" " props65_0" -"(syntax-inspector the-struct_90)))" -" (raise-argument-error 'struct-copy \"syntax?\" the-struct_90))))))" +"(syntax-inspector the-struct_91)))" +" (raise-argument-error 'struct-copy \"syntax?\" the-struct_91))))))" "(define-values(original-props)(syntax-props(syntax-property$1 empty-syntax original-property-sym #t)))" "(define-values" "(original-square-props)" @@ -55623,11 +55643,11 @@ static const char *startup_source = "(define-values(read-module-declared?)(lambda(mod-path_29)(begin(1/module-declared? mod-path_29 #t))))" "(define-values" "(read-coerce)" -"(lambda(for-syntax?_12 v_242 srcloc_11)" +"(lambda(for-syntax?_12 v_242 srcloc_12)" "(begin" "(if(not for-syntax?_12)" "(let-values()(if(syntax?$1 v_242)(let-values()(syntax->datum$1 v_242))(let-values() v_242)))" -"(let-values()(datum->syntax$1 #f v_242(if srcloc_11(to-srcloc-stx srcloc_11) #f)))))))" +"(let-values()(datum->syntax$1 #f v_242(if srcloc_12(to-srcloc-stx srcloc_12) #f)))))))" "(define-values" "(read-coerce-key)" "(lambda(for-syntax?_13 k_41)" @@ -59804,8 +59824,8 @@ static const char *startup_source = "(let-values(((def-ctx-scopes_6)(box null)))" "(let-values(((body-ctx_0)" "(let-values(((v_246) ctx_14))" -"(let-values(((the-struct_91) v_246))" -"(if(expand-context/outer? the-struct_91)" +"(let-values(((the-struct_92) v_246))" +"(if(expand-context/outer? the-struct_92)" "(let-values(((context51_0)(list(make-liberal-define-context)))" "((name52_0) #f)" "((only-immediate?53_0) #t)" @@ -59827,20 +59847,20 @@ static const char *startup_source = " use-site-scopes58_0" " frame-id59_0" " context51_0" -"(expand-context/outer-env the-struct_91)" +"(expand-context/outer-env the-struct_92)" " post-expansion-scope-action56_0" " scopes57_1" " def-ctx-scopes54_0" -"(expand-context/outer-binding-layer the-struct_91)" +"(expand-context/outer-binding-layer the-struct_92)" " reference-records60_0" " only-immediate?53_0" -"(expand-context/outer-need-eventually-defined the-struct_91)" -"(expand-context/outer-current-introduction-scopes the-struct_91)" +"(expand-context/outer-need-eventually-defined the-struct_92)" +"(expand-context/outer-current-introduction-scopes the-struct_92)" " name52_0))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_91))))))" +" the-struct_92))))))" "(let-values(((maybe-increment-binding-layer_0)" "(lambda(ids_27 body-ctx_1)" "(begin" @@ -59914,10 +59934,10 @@ static const char *startup_source = " #f)" "(let-values(((v_235)" " body-ctx_2))" -"(let-values(((the-struct_92)" +"(let-values(((the-struct_93)" " v_235))" "(if(expand-context/outer?" -" the-struct_92)" +" the-struct_93)" "(let-values(((name77_0)" " name_79)" "((inner78_0)" @@ -59926,36 +59946,36 @@ static const char *startup_source = "(expand-context/outer1.1" " inner78_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_92)" +" the-struct_93)" "(root-expand-context/outer-use-site-scopes" -" the-struct_92)" +" the-struct_93)" "(root-expand-context/outer-frame-id" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-context" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-env" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-scopes" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-def-ctx-scopes" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-binding-layer" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-reference-records" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-only-immediate?" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-need-eventually-defined" -" the-struct_92)" +" the-struct_93)" "(expand-context/outer-current-introduction-scopes" -" the-struct_92)" +" the-struct_93)" " name77_0))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_92))))" +" the-struct_93))))" " body-ctx_2)))" "(expand7.1" " #f" @@ -61117,10 +61137,10 @@ static const char *startup_source = "(loop_126" "(let-values(((v_248)" " body-ctx_2))" -"(let-values(((the-struct_93)" +"(let-values(((the-struct_94)" " v_248))" "(if(expand-context/outer?" -" the-struct_93)" +" the-struct_94)" "(let-values(((env124_0)" " extended-env_1)" "((binding-layer125_0)" @@ -61133,35 +61153,35 @@ static const char *startup_source = "(expand-context/outer1.1" " inner126_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_93)" +" the-struct_94)" "(root-expand-context/outer-use-site-scopes" -" the-struct_93)" +" the-struct_94)" "(root-expand-context/outer-frame-id" -" the-struct_93)" +" the-struct_94)" "(expand-context/outer-context" -" the-struct_93)" +" the-struct_94)" " env124_0" "(expand-context/outer-post-expansion-scope-action" -" the-struct_93)" +" the-struct_94)" "(expand-context/outer-scopes" -" the-struct_93)" +" the-struct_94)" "(expand-context/outer-def-ctx-scopes" -" the-struct_93)" +" the-struct_94)" " binding-layer125_0" "(expand-context/outer-reference-records" -" the-struct_93)" +" the-struct_94)" "(expand-context/outer-only-immediate?" -" the-struct_93)" +" the-struct_94)" "(expand-context/outer-need-eventually-defined" -" the-struct_93)" +" the-struct_94)" "(expand-context/outer-current-introduction-scopes" -" the-struct_93)" +" the-struct_94)" "(expand-context/outer-name" -" the-struct_93)))" +" the-struct_94)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_93))))" +" the-struct_94))))" " rest-bodys_0" " done-bodys_0" " val-idss_0" @@ -61285,8 +61305,8 @@ static const char *startup_source = "(accumulate-def-ctx-scopes" " body-ctx_3" " def-ctx-scopes_7)))" -"(let-values(((the-struct_94) v_249))" -"(if(expand-context/outer? the-struct_94)" +"(let-values(((the-struct_95) v_249))" +"(if(expand-context/outer? the-struct_95)" "(let-values(((context127_0) 'expression)" "((use-site-scopes128_0)(box null))" "((scopes129_0)" @@ -61304,24 +61324,24 @@ static const char *startup_source = " inner133_0" " post-expansion-scope132_0" " use-site-scopes128_0" -"(root-expand-context/outer-frame-id the-struct_94)" +"(root-expand-context/outer-frame-id the-struct_95)" " context127_0" -"(expand-context/outer-env the-struct_94)" +"(expand-context/outer-env the-struct_95)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_94)" +" the-struct_95)" " scopes129_0" " def-ctx-scopes131_0" -"(expand-context/outer-binding-layer the-struct_94)" -"(expand-context/outer-reference-records the-struct_94)" +"(expand-context/outer-binding-layer the-struct_95)" +"(expand-context/outer-reference-records the-struct_95)" " only-immediate?130_0" -"(expand-context/outer-need-eventually-defined the-struct_94)" +"(expand-context/outer-need-eventually-defined the-struct_95)" "(expand-context/outer-current-introduction-scopes" -" the-struct_94)" -"(expand-context/outer-name the-struct_94)))" +" the-struct_95)" +"(expand-context/outer-name the-struct_95)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_94))))))" +" the-struct_95))))))" "(let-values(((finish-bodys_0)" "(lambda()" "(begin" @@ -61421,10 +61441,10 @@ static const char *startup_source = " #f)" "(let-values(((v_250)" " finish-ctx_0))" -"(let-values(((the-struct_95)" +"(let-values(((the-struct_96)" " v_250))" "(if(expand-context/outer?" -" the-struct_95)" +" the-struct_96)" "(let-values(((name136_0)" " name_80)" "((inner137_0)" @@ -61433,36 +61453,36 @@ static const char *startup_source = "(expand-context/outer1.1" " inner137_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_95)" +" the-struct_96)" "(root-expand-context/outer-use-site-scopes" -" the-struct_95)" +" the-struct_96)" "(root-expand-context/outer-frame-id" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-context" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-env" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-scopes" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-def-ctx-scopes" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-binding-layer" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-reference-records" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-only-immediate?" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-need-eventually-defined" -" the-struct_95)" +" the-struct_96)" "(expand-context/outer-current-introduction-scopes" -" the-struct_95)" +" the-struct_96)" " name136_0))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_95))))" +" the-struct_96))))" " finish-ctx_0)))" "(expand7.1" " #f" @@ -62151,8 +62171,8 @@ static const char *startup_source = "(values))))" "(let-values(((body-ctx_4)" "(let-values(((v_251) ctx_77))" -"(let-values(((the-struct_96) v_251))" -"(if(expand-context/outer? the-struct_96)" +"(let-values(((the-struct_97) v_251))" +"(if(expand-context/outer? the-struct_97)" "(let-values(((env42_0) body-env_0)" "((scopes43_0)(cons sc_31(expand-context-scopes ctx_77)))" "((binding-layer44_0)" @@ -62161,24 +62181,24 @@ static const char *startup_source = "((inner46_0)(root-expand-context/outer-inner v_251)))" "(expand-context/outer1.1" " inner46_0" -"(root-expand-context/outer-post-expansion-scope the-struct_96)" -"(root-expand-context/outer-use-site-scopes the-struct_96)" +"(root-expand-context/outer-post-expansion-scope the-struct_97)" +"(root-expand-context/outer-use-site-scopes the-struct_97)" " frame-id45_0" -"(expand-context/outer-context the-struct_96)" +"(expand-context/outer-context the-struct_97)" " env42_0" -"(expand-context/outer-post-expansion-scope-action the-struct_96)" +"(expand-context/outer-post-expansion-scope-action the-struct_97)" " scopes43_0" -"(expand-context/outer-def-ctx-scopes the-struct_96)" +"(expand-context/outer-def-ctx-scopes the-struct_97)" " binding-layer44_0" -"(expand-context/outer-reference-records the-struct_96)" -"(expand-context/outer-only-immediate? the-struct_96)" -"(expand-context/outer-need-eventually-defined the-struct_96)" -"(expand-context/outer-current-introduction-scopes the-struct_96)" -"(expand-context/outer-name the-struct_96)))" +"(expand-context/outer-reference-records the-struct_97)" +"(expand-context/outer-only-immediate? the-struct_97)" +"(expand-context/outer-need-eventually-defined the-struct_97)" +"(expand-context/outer-current-introduction-scopes the-struct_97)" +"(expand-context/outer-name the-struct_97)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_96))))))" +" the-struct_97))))))" "(let-values(((exp-body_2)" "(let-values(((temp49_3)" "(let-values(((temp52_6) #t))" @@ -64330,9 +64350,9 @@ static const char *startup_source = " expr-ctx_0)))" "(let-values(((rec-ctx_0)" "(let-values(((v_252) expr-ctx_0))" -"(let-values(((the-struct_97) v_252))" +"(let-values(((the-struct_98) v_252))" "(if(expand-context/outer?" -" the-struct_97)" +" the-struct_98)" "(let-values(((env151_1) rec-env_0)" "((scopes152_0)" "(cons" @@ -64358,33 +64378,33 @@ static const char *startup_source = "(expand-context/outer1.1" " inner155_2" "(root-expand-context/outer-post-expansion-scope" -" the-struct_97)" +" the-struct_98)" "(root-expand-context/outer-use-site-scopes" -" the-struct_97)" +" the-struct_98)" "(root-expand-context/outer-frame-id" -" the-struct_97)" +" the-struct_98)" "(expand-context/outer-context" -" the-struct_97)" +" the-struct_98)" " env151_1" "(expand-context/outer-post-expansion-scope-action" -" the-struct_97)" +" the-struct_98)" " scopes152_0" "(expand-context/outer-def-ctx-scopes" -" the-struct_97)" +" the-struct_98)" " binding-layer154_0" " reference-records153_0" "(expand-context/outer-only-immediate?" -" the-struct_97)" +" the-struct_98)" "(expand-context/outer-need-eventually-defined" -" the-struct_97)" +" the-struct_98)" "(expand-context/outer-current-introduction-scopes" -" the-struct_97)" +" the-struct_98)" "(expand-context/outer-name" -" the-struct_97)))" +" the-struct_98)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_97))))))" +" the-struct_98))))))" "(let-values(((letrec-values-id_0)" "(if(not" "(expand-context-to-parsed? ctx_82))" @@ -64541,10 +64561,10 @@ static const char *startup_source = "(let-values(((body-ctx_5)" "(let-values(((v_253)" " rec-ctx_0))" -"(let-values(((the-struct_98)" +"(let-values(((the-struct_99)" " v_253))" "(if(expand-context/outer?" -" the-struct_98)" +" the-struct_99)" "(let-values(((reference-records162_0)" " orig-rrs_0)" "((inner163_0)" @@ -64553,36 +64573,36 @@ static const char *startup_source = "(expand-context/outer1.1" " inner163_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_98)" +" the-struct_99)" "(root-expand-context/outer-use-site-scopes" -" the-struct_98)" +" the-struct_99)" "(root-expand-context/outer-frame-id" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-context" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-env" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-scopes" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-def-ctx-scopes" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-binding-layer" -" the-struct_98)" +" the-struct_99)" " reference-records162_0" "(expand-context/outer-only-immediate?" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-need-eventually-defined" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-current-introduction-scopes" -" the-struct_98)" +" the-struct_99)" "(expand-context/outer-name" -" the-struct_98)))" +" the-struct_99)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_98))))))" +" the-struct_99))))))" "(let-values(((temp160_2)" "(let-values(((ctx165_0)" " ctx_82))" @@ -68670,19 +68690,19 @@ static const char *startup_source = "((temp105_4)" "(let-values(((v_254)" " ctx_104))" -"(let-values(((the-struct_99)" +"(let-values(((the-struct_100)" " v_254))" "(if(expand-context/outer?" -" the-struct_99)" +" the-struct_100)" "(let-values(((def-ctx-scopes106_0)" "(box" " null))" "((inner107_0)" -"(let-values(((the-struct_100)" +"(let-values(((the-struct_101)" "(root-expand-context/outer-inner" " v_254)))" "(if(expand-context/inner?" -" the-struct_100)" +" the-struct_101)" "(let-values(((stops108_0)" "(free-id-set" " at-phase_13" @@ -68692,91 +68712,91 @@ static const char *startup_source = " at-phase_13)))))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_100)" +" the-struct_101)" "(root-expand-context/inner-module-scopes" -" the-struct_100)" +" the-struct_101)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_100)" +" the-struct_101)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_100)" +" the-struct_101)" "(root-expand-context/inner-defined-syms" -" the-struct_100)" +" the-struct_101)" "(root-expand-context/inner-counter" -" the-struct_100)" +" the-struct_101)" "(root-expand-context/inner-lift-key" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-to-parsed?" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-phase" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-namespace" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-just-once?" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-module-begin-k" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-allow-unbound?" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-in-local-expand?" -" the-struct_100)" +" the-struct_101)" " stops108_0" "(expand-context/inner-declared-submodule-names" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-lifts" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-lift-envs" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-module-lifts" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-require-lifts" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-to-module-lifts" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-requires+provides" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-observer" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-for-serializable?" -" the-struct_100)" +" the-struct_101)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_100)))" +" the-struct_101)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_100)))))" +" the-struct_101)))))" "(expand-context/outer1.1" " inner107_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_99)" +" the-struct_100)" "(root-expand-context/outer-use-site-scopes" -" the-struct_99)" +" the-struct_100)" "(root-expand-context/outer-frame-id" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-context" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-env" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-scopes" -" the-struct_99)" +" the-struct_100)" " def-ctx-scopes106_0" "(expand-context/outer-binding-layer" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-reference-records" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-only-immediate?" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-need-eventually-defined" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-current-introduction-scopes" -" the-struct_99)" +" the-struct_100)" "(expand-context/outer-name" -" the-struct_99)))" +" the-struct_100)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_99))))))" +" the-struct_100))))))" "(expand7.1" " #f" " #f" @@ -69738,56 +69758,56 @@ static const char *startup_source = "((expand-context-module-begin-k ctx_108)" " s_83" "(let-values(((v_38) ctx_108))" -"(let-values(((the-struct_101) v_38))" -"(if(expand-context/outer? the-struct_101)" +"(let-values(((the-struct_102) v_38))" +"(if(expand-context/outer? the-struct_102)" "(let-values(((inner226_0)" -"(let-values(((the-struct_102)(root-expand-context/outer-inner v_38)))" -"(if(expand-context/inner? the-struct_102)" +"(let-values(((the-struct_103)(root-expand-context/outer-inner v_38)))" +"(if(expand-context/inner? the-struct_103)" "(let-values(((module-begin-k227_0) #f))" "(expand-context/inner2.1" -"(root-expand-context/inner-self-mpi the-struct_102)" -"(root-expand-context/inner-module-scopes the-struct_102)" -"(root-expand-context/inner-top-level-bind-scope the-struct_102)" -"(root-expand-context/inner-all-scopes-stx the-struct_102)" -"(root-expand-context/inner-defined-syms the-struct_102)" -"(root-expand-context/inner-counter the-struct_102)" -"(root-expand-context/inner-lift-key the-struct_102)" -"(expand-context/inner-to-parsed? the-struct_102)" -"(expand-context/inner-phase the-struct_102)" -"(expand-context/inner-namespace the-struct_102)" -"(expand-context/inner-just-once? the-struct_102)" +"(root-expand-context/inner-self-mpi the-struct_103)" +"(root-expand-context/inner-module-scopes the-struct_103)" +"(root-expand-context/inner-top-level-bind-scope the-struct_103)" +"(root-expand-context/inner-all-scopes-stx the-struct_103)" +"(root-expand-context/inner-defined-syms the-struct_103)" +"(root-expand-context/inner-counter the-struct_103)" +"(root-expand-context/inner-lift-key the-struct_103)" +"(expand-context/inner-to-parsed? the-struct_103)" +"(expand-context/inner-phase the-struct_103)" +"(expand-context/inner-namespace the-struct_103)" +"(expand-context/inner-just-once? the-struct_103)" " module-begin-k227_0" -"(expand-context/inner-allow-unbound? the-struct_102)" -"(expand-context/inner-in-local-expand? the-struct_102)" -"(expand-context/inner-stops the-struct_102)" -"(expand-context/inner-declared-submodule-names the-struct_102)" -"(expand-context/inner-lifts the-struct_102)" -"(expand-context/inner-lift-envs the-struct_102)" -"(expand-context/inner-module-lifts the-struct_102)" -"(expand-context/inner-require-lifts the-struct_102)" -"(expand-context/inner-to-module-lifts the-struct_102)" -"(expand-context/inner-requires+provides the-struct_102)" -"(expand-context/inner-observer the-struct_102)" -"(expand-context/inner-for-serializable? the-struct_102)" -"(expand-context/inner-should-not-encounter-macros? the-struct_102)))" -" (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_102)))))" +"(expand-context/inner-allow-unbound? the-struct_103)" +"(expand-context/inner-in-local-expand? the-struct_103)" +"(expand-context/inner-stops the-struct_103)" +"(expand-context/inner-declared-submodule-names the-struct_103)" +"(expand-context/inner-lifts the-struct_103)" +"(expand-context/inner-lift-envs the-struct_103)" +"(expand-context/inner-module-lifts the-struct_103)" +"(expand-context/inner-require-lifts the-struct_103)" +"(expand-context/inner-to-module-lifts the-struct_103)" +"(expand-context/inner-requires+provides the-struct_103)" +"(expand-context/inner-observer the-struct_103)" +"(expand-context/inner-for-serializable? the-struct_103)" +"(expand-context/inner-should-not-encounter-macros? the-struct_103)))" +" (raise-argument-error 'struct-copy \"expand-context/inner?\" the-struct_103)))))" "(expand-context/outer1.1" " inner226_0" -"(root-expand-context/outer-post-expansion-scope the-struct_101)" -"(root-expand-context/outer-use-site-scopes the-struct_101)" -"(root-expand-context/outer-frame-id the-struct_101)" -"(expand-context/outer-context the-struct_101)" -"(expand-context/outer-env the-struct_101)" -"(expand-context/outer-post-expansion-scope-action the-struct_101)" -"(expand-context/outer-scopes the-struct_101)" -"(expand-context/outer-def-ctx-scopes the-struct_101)" -"(expand-context/outer-binding-layer the-struct_101)" -"(expand-context/outer-reference-records the-struct_101)" -"(expand-context/outer-only-immediate? the-struct_101)" -"(expand-context/outer-need-eventually-defined the-struct_101)" -"(expand-context/outer-current-introduction-scopes the-struct_101)" -"(expand-context/outer-name the-struct_101)))" -" (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_101)))))))))" +"(root-expand-context/outer-post-expansion-scope the-struct_102)" +"(root-expand-context/outer-use-site-scopes the-struct_102)" +"(root-expand-context/outer-frame-id the-struct_102)" +"(expand-context/outer-context the-struct_102)" +"(expand-context/outer-env the-struct_102)" +"(expand-context/outer-post-expansion-scope-action the-struct_102)" +"(expand-context/outer-scopes the-struct_102)" +"(expand-context/outer-def-ctx-scopes the-struct_102)" +"(expand-context/outer-binding-layer the-struct_102)" +"(expand-context/outer-reference-records the-struct_102)" +"(expand-context/outer-only-immediate? the-struct_102)" +"(expand-context/outer-need-eventually-defined the-struct_102)" +"(expand-context/outer-current-introduction-scopes the-struct_102)" +"(expand-context/outer-name the-struct_102)))" +" (raise-argument-error 'struct-copy \"expand-context/outer?\" the-struct_102)))))))))" "(void" "(add-core-form!*" " '#%declare" @@ -70098,18 +70118,18 @@ static const char *startup_source = "(copy-root-expand-context" " init-ctx_0" " root-ctx_6)))" -"(let-values(((the-struct_103)" +"(let-values(((the-struct_104)" " v_99))" "(if(expand-context/outer?" -" the-struct_103)" +" the-struct_104)" "(let-values(((post-expansion-scope-action267_0)" " add-scope)" "((inner268_0)" -"(let-values(((the-struct_104)" +"(let-values(((the-struct_105)" "(root-expand-context/outer-inner" " v_99)))" "(if(expand-context/inner?" -" the-struct_104)" +" the-struct_105)" "(let-values(((allow-unbound?269_0)" " #f)" "((namespace270_0)" @@ -70120,88 +70140,88 @@ static const char *startup_source = " #f))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_104)" +" the-struct_105)" "(root-expand-context/inner-module-scopes" -" the-struct_104)" +" the-struct_105)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_104)" +" the-struct_105)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_104)" +" the-struct_105)" "(root-expand-context/inner-defined-syms" -" the-struct_104)" +" the-struct_105)" "(root-expand-context/inner-counter" -" the-struct_104)" +" the-struct_105)" "(root-expand-context/inner-lift-key" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-to-parsed?" -" the-struct_104)" +" the-struct_105)" " phase271_0" " namespace270_0" " just-once?272_0" "(expand-context/inner-module-begin-k" -" the-struct_104)" +" the-struct_105)" " allow-unbound?269_0" "(expand-context/inner-in-local-expand?" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-stops" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-declared-submodule-names" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-lifts" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-lift-envs" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-module-lifts" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-require-lifts" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-to-module-lifts" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-requires+provides" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-observer" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-for-serializable?" -" the-struct_104)" +" the-struct_105)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_104)))" +" the-struct_105)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_104)))))" +" the-struct_105)))))" "(expand-context/outer1.1" " inner268_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_103)" +" the-struct_104)" "(root-expand-context/outer-use-site-scopes" -" the-struct_103)" +" the-struct_104)" "(root-expand-context/outer-frame-id" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-context" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-env" -" the-struct_103)" +" the-struct_104)" " post-expansion-scope-action267_0" "(expand-context/outer-scopes" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-def-ctx-scopes" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-binding-layer" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-reference-records" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-only-immediate?" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-need-eventually-defined" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-current-introduction-scopes" -" the-struct_103)" +" the-struct_104)" "(expand-context/outer-name" -" the-struct_103)))" +" the-struct_104)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_103))))))" +" the-struct_104))))))" "(let-values(((bodys_15)" "(let-values(((scoped-s_0)" "(apply-module-scopes_0" @@ -70445,16 +70465,16 @@ static const char *startup_source = "(let-values(((ctx_111)" "(let-values(((v_211)" " mb-init-ctx_0))" -"(let-values(((the-struct_80)" +"(let-values(((the-struct_81)" " v_211))" "(if(expand-context/outer?" -" the-struct_80)" +" the-struct_81)" "(let-values(((inner306_0)" -"(let-values(((the-struct_105)" +"(let-values(((the-struct_106)" "(root-expand-context/outer-inner" " v_211)))" "(if(expand-context/inner?" -" the-struct_105)" +" the-struct_106)" "(let-values(((module-begin-k307_0)" "(lambda(s_214" " ctx_112)" @@ -70503,92 +70523,92 @@ static const char *startup_source = " compiled-module-box310_0))))))))))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_105)" +" the-struct_106)" "(root-expand-context/inner-module-scopes" -" the-struct_105)" +" the-struct_106)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_105)" +" the-struct_106)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_105)" +" the-struct_106)" "(root-expand-context/inner-defined-syms" -" the-struct_105)" +" the-struct_106)" "(root-expand-context/inner-counter" -" the-struct_105)" +" the-struct_106)" "(root-expand-context/inner-lift-key" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-to-parsed?" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-phase" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-namespace" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-just-once?" -" the-struct_105)" +" the-struct_106)" " module-begin-k307_0" "(expand-context/inner-allow-unbound?" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-in-local-expand?" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-stops" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-declared-submodule-names" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-lifts" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-lift-envs" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-module-lifts" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-require-lifts" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-to-module-lifts" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-requires+provides" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-observer" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-for-serializable?" -" the-struct_105)" +" the-struct_106)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_105)))" +" the-struct_106)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_105)))))" +" the-struct_106)))))" "(expand-context/outer1.1" " inner306_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_80)" +" the-struct_81)" "(root-expand-context/outer-use-site-scopes" -" the-struct_80)" +" the-struct_81)" "(root-expand-context/outer-frame-id" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-context" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-env" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-scopes" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-def-ctx-scopes" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-binding-layer" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-reference-records" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-only-immediate?" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-need-eventually-defined" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-current-introduction-scopes" -" the-struct_80)" +" the-struct_81)" "(expand-context/outer-name" -" the-struct_80)))" +" the-struct_81)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_80))))))" +" the-struct_81))))))" "(let-values(((added-s_2)" "(add-scope" " mb-s_0" @@ -70704,10 +70724,10 @@ static const char *startup_source = "(let-values(((partial-body-ctx_0)" "(let-values(((v_255)" " ctx_111))" -"(let-values(((the-struct_106)" +"(let-values(((the-struct_107)" " v_255))" "(if(expand-context/outer?" -" the-struct_106)" +" the-struct_107)" "(let-values(((context326_0)" " 'module)" "((def-ctx-scopes327_0)" @@ -70715,11 +70735,11 @@ static const char *startup_source = "((need-eventually-defined328_0)" " need-eventually-defined_1)" "((inner329_0)" -"(let-values(((the-struct_107)" +"(let-values(((the-struct_108)" "(root-expand-context/outer-inner" " v_255)))" "(if(expand-context/inner?" -" the-struct_107)" +" the-struct_108)" "(let-values(((phase330_0)" " phase_153)" "((namespace331_0)" @@ -70773,81 +70793,81 @@ static const char *startup_source = " phase_153))))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_107)" +" the-struct_108)" "(root-expand-context/inner-module-scopes" -" the-struct_107)" +" the-struct_108)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_107)" +" the-struct_108)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_107)" +" the-struct_108)" "(root-expand-context/inner-defined-syms" -" the-struct_107)" +" the-struct_108)" "(root-expand-context/inner-counter" -" the-struct_107)" +" the-struct_108)" " lift-key334_0" "(expand-context/inner-to-parsed?" -" the-struct_107)" +" the-struct_108)" " phase330_0" " namespace331_0" "(expand-context/inner-just-once?" -" the-struct_107)" +" the-struct_108)" "(expand-context/inner-module-begin-k" -" the-struct_107)" +" the-struct_108)" "(expand-context/inner-allow-unbound?" -" the-struct_107)" +" the-struct_108)" "(expand-context/inner-in-local-expand?" -" the-struct_107)" +" the-struct_108)" " stops332_0" " declared-submodule-names333_0" " lifts335_0" "(expand-context/inner-lift-envs" -" the-struct_107)" +" the-struct_108)" " module-lifts336_0" " require-lifts337_0" " to-module-lifts338_0" "(expand-context/inner-requires+provides" -" the-struct_107)" +" the-struct_108)" "(expand-context/inner-observer" -" the-struct_107)" +" the-struct_108)" "(expand-context/inner-for-serializable?" -" the-struct_107)" +" the-struct_108)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_107)))" +" the-struct_108)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_107)))))" +" the-struct_108)))))" "(expand-context/outer1.1" " inner329_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_106)" +" the-struct_107)" "(root-expand-context/outer-use-site-scopes" -" the-struct_106)" +" the-struct_107)" "(root-expand-context/outer-frame-id" -" the-struct_106)" +" the-struct_107)" " context326_0" "(expand-context/outer-env" -" the-struct_106)" +" the-struct_107)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_106)" +" the-struct_107)" "(expand-context/outer-scopes" -" the-struct_106)" +" the-struct_107)" " def-ctx-scopes327_0" "(expand-context/outer-binding-layer" -" the-struct_106)" +" the-struct_107)" "(expand-context/outer-reference-records" -" the-struct_106)" +" the-struct_107)" "(expand-context/outer-only-immediate?" -" the-struct_106)" +" the-struct_107)" " need-eventually-defined328_0" "(expand-context/outer-current-introduction-scopes" -" the-struct_106)" +" the-struct_107)" "(expand-context/outer-name" -" the-struct_106)))" +" the-struct_107)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_106))))))" +" the-struct_107))))))" "(let-values(((partially-expanded-bodys_0)" "(let-values(((phase348_0)" " phase_153)" @@ -70914,20 +70934,20 @@ static const char *startup_source = "(accumulate-def-ctx-scopes" " partial-body-ctx_0" " def-ctx-scopes_8)))" -"(let-values(((the-struct_108)" +"(let-values(((the-struct_109)" " v_256))" "(if(expand-context/outer?" -" the-struct_108)" +" the-struct_109)" "(let-values(((def-ctx-scopes363_0)" " #f)" "((post-expansion-scope364_0)" " #f)" "((inner365_0)" -"(let-values(((the-struct_109)" +"(let-values(((the-struct_110)" "(root-expand-context/outer-inner" " v_256)))" "(if(expand-context/inner?" -" the-struct_109)" +" the-struct_110)" "(let-values(((stops366_0)" " empty-free-id-set)" "((to-module-lifts367_0)" @@ -70941,89 +70961,89 @@ static const char *startup_source = " phase_153))))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_109)" +" the-struct_110)" "(root-expand-context/inner-module-scopes" -" the-struct_109)" +" the-struct_110)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_109)" +" the-struct_110)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_109)" +" the-struct_110)" "(root-expand-context/inner-defined-syms" -" the-struct_109)" +" the-struct_110)" "(root-expand-context/inner-counter" -" the-struct_109)" +" the-struct_110)" "(root-expand-context/inner-lift-key" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-to-parsed?" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-phase" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-namespace" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-just-once?" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-module-begin-k" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-allow-unbound?" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-in-local-expand?" -" the-struct_109)" +" the-struct_110)" " stops366_0" "(expand-context/inner-declared-submodule-names" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-lifts" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-lift-envs" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-module-lifts" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-require-lifts" -" the-struct_109)" +" the-struct_110)" " to-module-lifts367_0" "(expand-context/inner-requires+provides" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-observer" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-for-serializable?" -" the-struct_109)" +" the-struct_110)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_109)))" +" the-struct_110)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_109)))))" +" the-struct_110)))))" "(expand-context/outer1.1" " inner365_0" " post-expansion-scope364_0" "(root-expand-context/outer-use-site-scopes" -" the-struct_108)" +" the-struct_109)" "(root-expand-context/outer-frame-id" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-context" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-env" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-scopes" -" the-struct_108)" +" the-struct_109)" " def-ctx-scopes363_0" "(expand-context/outer-binding-layer" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-reference-records" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-only-immediate?" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-need-eventually-defined" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-current-introduction-scopes" -" the-struct_108)" +" the-struct_109)" "(expand-context/outer-name" -" the-struct_108)))" +" the-struct_109)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_108))))))" +" the-struct_109))))))" "(let-values(((phase319_0)" " phase_153)" "((body-ctx320_0)" @@ -71140,108 +71160,108 @@ static const char *startup_source = "(let-values(((submod-ctx_0)" "(let-values(((v_257)" " ctx_111))" -"(let-values(((the-struct_110)" +"(let-values(((the-struct_111)" " v_257))" "(if(expand-context/outer?" -" the-struct_110)" +" the-struct_111)" "(let-values(((frame-id380_0)" " #f)" "((post-expansion-scope381_0)" " #f)" "((inner382_0)" -"(let-values(((the-struct_111)" +"(let-values(((the-struct_112)" "(root-expand-context/outer-inner" " v_257)))" "(if(expand-context/inner?" -" the-struct_111)" +" the-struct_112)" "(let-values(((namespace383_0)" " submod-m-ns_0))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_111)" +" the-struct_112)" "(root-expand-context/inner-module-scopes" -" the-struct_111)" +" the-struct_112)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_111)" +" the-struct_112)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_111)" +" the-struct_112)" "(root-expand-context/inner-defined-syms" -" the-struct_111)" +" the-struct_112)" "(root-expand-context/inner-counter" -" the-struct_111)" +" the-struct_112)" "(root-expand-context/inner-lift-key" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-to-parsed?" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-phase" -" the-struct_111)" +" the-struct_112)" " namespace383_0" "(expand-context/inner-just-once?" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-module-begin-k" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-allow-unbound?" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-in-local-expand?" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-stops" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-declared-submodule-names" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-lifts" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-lift-envs" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-module-lifts" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-require-lifts" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-to-module-lifts" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-requires+provides" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-observer" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-for-serializable?" -" the-struct_111)" +" the-struct_112)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_111)))" +" the-struct_112)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_111)))))" +" the-struct_112)))))" "(expand-context/outer1.1" " inner382_0" " post-expansion-scope381_0" "(root-expand-context/outer-use-site-scopes" -" the-struct_110)" +" the-struct_111)" " frame-id380_0" "(expand-context/outer-context" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-env" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-scopes" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-def-ctx-scopes" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-binding-layer" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-reference-records" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-only-immediate?" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-need-eventually-defined" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-current-introduction-scopes" -" the-struct_110)" +" the-struct_111)" "(expand-context/outer-name" -" the-struct_110)))" +" the-struct_111)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_110))))))" +" the-struct_111))))))" "(let-values(((declare-enclosing-module_0)" "(delay" "(lambda()" @@ -71356,108 +71376,108 @@ static const char *startup_source = "(let-values(((mb-ctx_0)" "(let-values(((v_258)" " ctx_110))" -"(let-values(((the-struct_112)" +"(let-values(((the-struct_113)" " v_258))" "(if(expand-context/outer?" -" the-struct_112)" +" the-struct_113)" "(let-values(((context409_0)" " 'module-begin)" "((inner410_0)" -"(let-values(((the-struct_113)" +"(let-values(((the-struct_114)" "(root-expand-context/outer-inner" " v_258)))" "(if(expand-context/inner?" -" the-struct_113)" +" the-struct_114)" "(let-values(((module-begin-k411_0)" " module-begin-k_1)" "((in-local-expand?412_0)" " #f))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_113)" +" the-struct_114)" "(root-expand-context/inner-module-scopes" -" the-struct_113)" +" the-struct_114)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_113)" +" the-struct_114)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_113)" +" the-struct_114)" "(root-expand-context/inner-defined-syms" -" the-struct_113)" +" the-struct_114)" "(root-expand-context/inner-counter" -" the-struct_113)" +" the-struct_114)" "(root-expand-context/inner-lift-key" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-to-parsed?" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-phase" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-namespace" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-just-once?" -" the-struct_113)" +" the-struct_114)" " module-begin-k411_0" "(expand-context/inner-allow-unbound?" -" the-struct_113)" +" the-struct_114)" " in-local-expand?412_0" "(expand-context/inner-stops" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-declared-submodule-names" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-lifts" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-lift-envs" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-module-lifts" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-require-lifts" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-to-module-lifts" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-requires+provides" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-observer" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-for-serializable?" -" the-struct_113)" +" the-struct_114)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_113)))" +" the-struct_114)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_113)))))" +" the-struct_114)))))" "(expand-context/outer1.1" " inner410_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_112)" +" the-struct_113)" "(root-expand-context/outer-use-site-scopes" -" the-struct_112)" +" the-struct_113)" "(root-expand-context/outer-frame-id" -" the-struct_112)" +" the-struct_113)" " context409_0" "(expand-context/outer-env" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-scopes" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-def-ctx-scopes" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-binding-layer" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-reference-records" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-only-immediate?" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-need-eventually-defined" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-current-introduction-scopes" -" the-struct_112)" +" the-struct_113)" "(expand-context/outer-name" -" the-struct_112)))" +" the-struct_113)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_112))))))" +" the-struct_113))))))" "(let-values(((mb-scopes-s_0)" "(if keep-enclosing-scope-at-phase_0" " disarmed-s_24" @@ -71680,32 +71700,32 @@ static const char *startup_source = "(begin" " 'make-mb-ctx" "(let-values(((v_259) ctx_113))" -"(let-values(((the-struct_114) v_259))" -"(if(expand-context/outer? the-struct_114)" +"(let-values(((the-struct_115) v_259))" +"(if(expand-context/outer? the-struct_115)" "(let-values(((context428_0) 'module-begin)" "((only-immediate?429_0) #t)" "((def-ctx-scopes430_0) def-ctx-scopes_9)" "((inner431_0)(root-expand-context/outer-inner v_259)))" "(expand-context/outer1.1" " inner431_0" -"(root-expand-context/outer-post-expansion-scope the-struct_114)" -"(root-expand-context/outer-use-site-scopes the-struct_114)" -"(root-expand-context/outer-frame-id the-struct_114)" +"(root-expand-context/outer-post-expansion-scope the-struct_115)" +"(root-expand-context/outer-use-site-scopes the-struct_115)" +"(root-expand-context/outer-frame-id the-struct_115)" " context428_0" -"(expand-context/outer-env the-struct_114)" -"(expand-context/outer-post-expansion-scope-action the-struct_114)" -"(expand-context/outer-scopes the-struct_114)" +"(expand-context/outer-env the-struct_115)" +"(expand-context/outer-post-expansion-scope-action the-struct_115)" +"(expand-context/outer-scopes the-struct_115)" " def-ctx-scopes430_0" -"(expand-context/outer-binding-layer the-struct_114)" -"(expand-context/outer-reference-records the-struct_114)" +"(expand-context/outer-binding-layer the-struct_115)" +"(expand-context/outer-reference-records the-struct_115)" " only-immediate?429_0" -"(expand-context/outer-need-eventually-defined the-struct_114)" -"(expand-context/outer-current-introduction-scopes the-struct_114)" -"(expand-context/outer-name the-struct_114)))" +"(expand-context/outer-need-eventually-defined the-struct_115)" +"(expand-context/outer-current-introduction-scopes the-struct_115)" +"(expand-context/outer-name the-struct_115)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_114))))))))" +" the-struct_115))))))))" "(let-values(((mb_1)" "(if(= 1(length bodys_18))" "(let-values()" @@ -72918,18 +72938,18 @@ static const char *startup_source = "((temp521_0)" "(let-values(((v_260)" " partial-body-ctx_1))" -"(let-values(((the-struct_115)" +"(let-values(((the-struct_116)" " v_260))" "(if(expand-context/outer?" -" the-struct_115)" +" the-struct_116)" "(let-values(((need-eventually-defined523_0)" " need-eventually-defined_2)" "((inner524_0)" -"(let-values(((the-struct_116)" +"(let-values(((the-struct_117)" "(root-expand-context/outer-inner" " v_260)))" "(if(expand-context/inner?" -" the-struct_116)" +" the-struct_117)" "(let-values(((lifts525_0)" " #f)" "((module-lifts526_0)" @@ -72938,89 +72958,89 @@ static const char *startup_source = " #f))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_116)" +" the-struct_117)" "(root-expand-context/inner-module-scopes" -" the-struct_116)" +" the-struct_117)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_116)" +" the-struct_117)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_116)" +" the-struct_117)" "(root-expand-context/inner-defined-syms" -" the-struct_116)" +" the-struct_117)" "(root-expand-context/inner-counter" -" the-struct_116)" +" the-struct_117)" "(root-expand-context/inner-lift-key" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-to-parsed?" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-phase" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-namespace" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-just-once?" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-module-begin-k" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-allow-unbound?" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-in-local-expand?" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-stops" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-declared-submodule-names" -" the-struct_116)" +" the-struct_117)" " lifts525_0" "(expand-context/inner-lift-envs" -" the-struct_116)" +" the-struct_117)" " module-lifts526_0" "(expand-context/inner-require-lifts" -" the-struct_116)" +" the-struct_117)" " to-module-lifts527_0" "(expand-context/inner-requires+provides" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-observer" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-for-serializable?" -" the-struct_116)" +" the-struct_117)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_116)))" +" the-struct_117)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_116)))))" +" the-struct_117)))))" "(expand-context/outer1.1" " inner524_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_115)" +" the-struct_116)" "(root-expand-context/outer-use-site-scopes" -" the-struct_115)" +" the-struct_116)" "(root-expand-context/outer-frame-id" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-context" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-env" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-scopes" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-def-ctx-scopes" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-binding-layer" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-reference-records" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-only-immediate?" -" the-struct_115)" +" the-struct_116)" " need-eventually-defined523_0" "(expand-context/outer-current-introduction-scopes" -" the-struct_115)" +" the-struct_116)" "(expand-context/outer-name" -" the-struct_115)))" +" the-struct_116)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_115)))))" +" the-struct_116)))))" "((temp522_0)" " #f))" "(expand+eval-for-syntaxes-binding63.1" @@ -74229,16 +74249,16 @@ static const char *startup_source = "(semi-parsed-begin-for-syntax-body(car bodys_26))" "(add1 phase_161))))" "(cons" -"(let-values(((the-struct_117)(car bodys_26)))" -"(if(semi-parsed-begin-for-syntax? the-struct_117)" +"(let-values(((the-struct_118)(car bodys_26)))" +"(if(semi-parsed-begin-for-syntax? the-struct_118)" "(let-values(((body594_0) nested-bodys_2))" "(semi-parsed-begin-for-syntax3.1" -"(semi-parsed-begin-for-syntax-s the-struct_117)" +"(semi-parsed-begin-for-syntax-s the-struct_118)" " body594_0))" "(raise-argument-error" " 'struct-copy" " \"semi-parsed-begin-for-syntax?\"" -" the-struct_117)))" +" the-struct_118)))" "(loop_133(cdr bodys_26) phase_161))))" "(let-values()" "(let-values(((disarmed-body_1)(syntax-disarm$1(car bodys_26))))" @@ -74322,18 +74342,18 @@ static const char *startup_source = " self_39" " phase_161" "(let-values(((v_261) ctx_116))" -"(let-values(((the-struct_118)" +"(let-values(((the-struct_119)" " v_261))" "(if(expand-context/outer?" -" the-struct_118)" +" the-struct_119)" "(let-values(((context599_0)" " 'top-level)" "((inner600_0)" -"(let-values(((the-struct_119)" +"(let-values(((the-struct_120)" "(root-expand-context/outer-inner" " v_261)))" "(if(expand-context/inner?" -" the-struct_119)" +" the-struct_120)" "(let-values(((phase601_0)" " phase_161)" "((namespace602_0)" @@ -74346,93 +74366,93 @@ static const char *startup_source = " declared-submodule-names_6))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_119)" +" the-struct_120)" "(root-expand-context/inner-module-scopes" -" the-struct_119)" +" the-struct_120)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_119)" +" the-struct_120)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_119)" +" the-struct_120)" "(root-expand-context/inner-defined-syms" -" the-struct_119)" +" the-struct_120)" "(root-expand-context/inner-counter" -" the-struct_119)" +" the-struct_120)" "(root-expand-context/inner-lift-key" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-to-parsed?" -" the-struct_119)" +" the-struct_120)" " phase601_0" " namespace602_0" "(expand-context/inner-just-once?" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-module-begin-k" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-allow-unbound?" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-in-local-expand?" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-stops" -" the-struct_119)" +" the-struct_120)" " declared-submodule-names604_0" "(expand-context/inner-lifts" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-lift-envs" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-module-lifts" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-require-lifts" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-to-module-lifts" -" the-struct_119)" +" the-struct_120)" " requires+provides603_0" "(expand-context/inner-observer" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-for-serializable?" -" the-struct_119)" +" the-struct_120)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_119)))" +" the-struct_120)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_119)))))" +" the-struct_120)))))" "(expand-context/outer1.1" " inner600_0" "(root-expand-context/outer-post-expansion-scope" -" the-struct_118)" +" the-struct_119)" "(root-expand-context/outer-use-site-scopes" -" the-struct_118)" +" the-struct_119)" "(root-expand-context/outer-frame-id" -" the-struct_118)" +" the-struct_119)" " context599_0" "(expand-context/outer-env" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-scopes" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-def-ctx-scopes" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-binding-layer" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-reference-records" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-only-immediate?" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-need-eventually-defined" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-current-introduction-scopes" -" the-struct_118)" +" the-struct_119)" "(expand-context/outer-name" -" the-struct_118)))" +" the-struct_119)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_118)))))))" +" the-struct_119)))))))" "(if(expand-context-to-parsed? ctx_116)" "(let-values()" "(loop_133(cdr bodys_26) phase_161))" "(let-values()" -"(let-values(((new-s_9)" +"(let-values(((new-s_10)" "(syntax-track-origin*" " track-stxes_10" "(let-values(((temp605_0)" @@ -74456,10 +74476,10 @@ static const char *startup_source = "(call-expand-observe" " obs_154" " 'exit-prim" -" new-s_9)))" +" new-s_10)))" "(void)))" "(cons" -" new-s_9" +" new-s_10" "(loop_133" "(cdr bodys_26)" " phase_161))))))))))" @@ -74946,10 +74966,10 @@ static const char *startup_source = "(if(expanded+parsed?" " submod_4)" "(let-values()" -"(let-values(((the-struct_120)" +"(let-values(((the-struct_121)" " submod_4))" "(if(expanded+parsed?" -" the-struct_120)" +" the-struct_121)" "(let-values(((s646_0)" "(syntax-shift-phase-level$1" "(expanded+parsed-s" @@ -74958,11 +74978,11 @@ static const char *startup_source = "(expanded+parsed1.1" " s646_0" "(expanded+parsed-parsed" -" the-struct_120)))" +" the-struct_121)))" "(raise-argument-error" " 'struct-copy" " \"expanded+parsed?\"" -" the-struct_120))))" +" the-struct_121))))" "(let-values()" "(syntax-shift-phase-level$1" " submod_4" @@ -75369,105 +75389,105 @@ static const char *startup_source = "(let-values(((submod_5)" "(let-values(((temp671_0)" "(let-values(((v_262) ctx_120))" -"(let-values(((the-struct_121) v_262))" -"(if(expand-context/outer? the-struct_121)" +"(let-values(((the-struct_122) v_262))" +"(if(expand-context/outer? the-struct_122)" "(let-values(((context680_0) 'module)" "((post-expansion-scope681_0)" " #f)" "((inner682_0)" -"(let-values(((the-struct_122)" +"(let-values(((the-struct_123)" "(root-expand-context/outer-inner" " v_262)))" "(if(expand-context/inner?" -" the-struct_122)" +" the-struct_123)" "(let-values(((stops683_0)" " empty-free-id-set))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" -" the-struct_122)" +" the-struct_123)" "(root-expand-context/inner-module-scopes" -" the-struct_122)" +" the-struct_123)" "(root-expand-context/inner-top-level-bind-scope" -" the-struct_122)" +" the-struct_123)" "(root-expand-context/inner-all-scopes-stx" -" the-struct_122)" +" the-struct_123)" "(root-expand-context/inner-defined-syms" -" the-struct_122)" +" the-struct_123)" "(root-expand-context/inner-counter" -" the-struct_122)" +" the-struct_123)" "(root-expand-context/inner-lift-key" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-to-parsed?" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-phase" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-namespace" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-just-once?" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-module-begin-k" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-allow-unbound?" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-in-local-expand?" -" the-struct_122)" +" the-struct_123)" " stops683_0" "(expand-context/inner-declared-submodule-names" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-lifts" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-lift-envs" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-module-lifts" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-require-lifts" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-to-module-lifts" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-requires+provides" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-observer" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-for-serializable?" -" the-struct_122)" +" the-struct_123)" "(expand-context/inner-should-not-encounter-macros?" -" the-struct_122)))" +" the-struct_123)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/inner?\"" -" the-struct_122)))))" +" the-struct_123)))))" "(expand-context/outer1.1" " inner682_0" " post-expansion-scope681_0" "(root-expand-context/outer-use-site-scopes" -" the-struct_121)" +" the-struct_122)" "(root-expand-context/outer-frame-id" -" the-struct_121)" +" the-struct_122)" " context680_0" "(expand-context/outer-env" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-post-expansion-scope-action" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-scopes" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-def-ctx-scopes" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-binding-layer" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-reference-records" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-only-immediate?" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-need-eventually-defined" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-current-introduction-scopes" -" the-struct_121)" +" the-struct_122)" "(expand-context/outer-name" -" the-struct_121)))" +" the-struct_122)))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" -" the-struct_121)))))" +" the-struct_122)))))" "((self672_0) self_43)" "((temp673_0) #t)" "((keep-enclosing-scope-at-phase674_0)" @@ -75599,67 +75619,67 @@ static const char *startup_source = "(let-values() submod_5)" "(if(expanded+parsed? submod_5)" "(let-values()" -"(let-values(((the-struct_123) submod_5))" -"(if(expanded+parsed? the-struct_123)" +"(let-values(((the-struct_124) submod_5))" +"(if(expanded+parsed? the-struct_124)" "(let-values(((parsed695_0)" -"(let-values(((the-struct_124)" +"(let-values(((the-struct_125)" "(expanded+parsed-parsed" " submod_5)))" -"(if(parsed-module? the-struct_124)" +"(if(parsed-module? the-struct_125)" "(let-values(((star?696_0) #t))" "(parsed-module25.1" -"(parsed-s the-struct_124)" +"(parsed-s the-struct_125)" " star?696_0" "(parsed-module-name-id" -" the-struct_124)" +" the-struct_125)" "(parsed-module-self" -" the-struct_124)" +" the-struct_125)" "(parsed-module-requires" -" the-struct_124)" +" the-struct_125)" "(parsed-module-provides" -" the-struct_124)" +" the-struct_125)" "(parsed-module-root-ctx-simple?" -" the-struct_124)" +" the-struct_125)" "(parsed-module-encoded-root-ctx" -" the-struct_124)" +" the-struct_125)" "(parsed-module-body" -" the-struct_124)" +" the-struct_125)" "(parsed-module-compiled-module" -" the-struct_124)" -"(parsed-module-compiled-submodules" -" the-struct_124)))" -"(raise-argument-error" -" 'struct-copy" -" \"parsed-module?\"" -" the-struct_124)))))" -"(expanded+parsed1.1" -"(expanded+parsed-s the-struct_123)" -" parsed695_0))" -"(raise-argument-error" -" 'struct-copy" -" \"expanded+parsed?\"" -" the-struct_123))))" -"(let-values()" -"(let-values(((the-struct_125) submod_5))" -"(if(parsed-module? the-struct_125)" -"(let-values(((star?697_0) #t))" -"(parsed-module25.1" -"(parsed-s the-struct_125)" -" star?697_0" -"(parsed-module-name-id the-struct_125)" -"(parsed-module-self the-struct_125)" -"(parsed-module-requires the-struct_125)" -"(parsed-module-provides the-struct_125)" -"(parsed-module-root-ctx-simple? the-struct_125)" -"(parsed-module-encoded-root-ctx the-struct_125)" -"(parsed-module-body the-struct_125)" -"(parsed-module-compiled-module the-struct_125)" +" the-struct_125)" "(parsed-module-compiled-submodules" " the-struct_125)))" "(raise-argument-error" " 'struct-copy" +" \"parsed-module?\"" +" the-struct_125)))))" +"(expanded+parsed1.1" +"(expanded+parsed-s the-struct_124)" +" parsed695_0))" +"(raise-argument-error" +" 'struct-copy" +" \"expanded+parsed?\"" +" the-struct_124))))" +"(let-values()" +"(let-values(((the-struct_126) submod_5))" +"(if(parsed-module? the-struct_126)" +"(let-values(((star?697_0) #t))" +"(parsed-module25.1" +"(parsed-s the-struct_126)" +" star?697_0" +"(parsed-module-name-id the-struct_126)" +"(parsed-module-self the-struct_126)" +"(parsed-module-requires the-struct_126)" +"(parsed-module-provides the-struct_126)" +"(parsed-module-root-ctx-simple? the-struct_126)" +"(parsed-module-encoded-root-ctx the-struct_126)" +"(parsed-module-body the-struct_126)" +"(parsed-module-compiled-module the-struct_126)" +"(parsed-module-compiled-submodules" +" the-struct_126)))" +"(raise-argument-error" +" 'struct-copy" " \"parsed-module?\"" -" the-struct_125)))))))))))))))))))))))))))))))))))" +" the-struct_126)))))))))))))))))))))))))))))))))))" "(define-values" "(expand-non-module*-submodules212.1)" "(lambda(compiled-submodules202_0"