diff --git a/pkgs/racket-test-core/tests/racket/module.rktl b/pkgs/racket-test-core/tests/racket/module.rktl index 561f3a09ff..e67724fa96 100644 --- a/pkgs/racket-test-core/tests/racket/module.rktl +++ b/pkgs/racket-test-core/tests/racket/module.rktl @@ -2456,6 +2456,29 @@ case of module-leve bindings; it doesn't cover local bindings. (check '(begin-for-syntax (struct bar ())) #rx"later defined as syntax") (check '(require (for-syntax (only-in racket/base [car bar]))) #rx"later bound differently")) +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Check that dynamic-require with a symbol argument +;; does not make the required module available for visits + +(module shouldntvisit racket/base + (define x 5) + (provide x) + (require (for-syntax racket/base)) + (define-for-syntax v #f) + (define-syntax (m stx) + (set! v #t) + #'(void)) + (m) + (begin-for-syntax + (when (not v) + (error 'shouldntvisit "visited")))) + +(module visitor racket/base + (require (for-syntax racket/base)) + (begin-for-syntax + (dynamic-require ''shouldntvisit 'x)) + (begin-for-syntax)) + ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (report-errs) diff --git a/racket/src/expander/eval/dynamic-require.rkt b/racket/src/expander/eval/dynamic-require.rkt index fb1f256053..2361b9ffd0 100644 --- a/racket/src/expander/eval/dynamic-require.rkt +++ b/racket/src/expander/eval/dynamic-require.rkt @@ -70,7 +70,8 @@ (define binding (provided-as-binding binding/p)) (define ex-sym (module-binding-sym binding)) (define ex-phase (module-binding-phase binding)) - (namespace-module-instantiate! ns mpi phase #:run-phase phase) + (namespace-module-instantiate! ns mpi phase #:run-phase phase + #:otherwise-available? #f) (define ex-mod-name (module-path-index-resolve (module-path-index-shift (module-binding-module binding) diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index 02c1f5342e..e2a9b24cd2 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -46400,11 +46400,11 @@ static const char *startup_source = "(let-values(((ns33_0) ns_58)" "((mpi34_0) mpi_49)" "((phase35_1) phase_142)" -"((phase36_0)" -" phase_142))" +"((phase36_0) phase_142)" +"((temp37_2) #f))" "(namespace-module-instantiate!96.1" -" #f" -" #f" +" temp37_2" +" #t" " phase36_0" " #t" " #f" @@ -46422,34 +46422,34 @@ static const char *startup_source = "(module-self m_22)" " mpi_49))))" "(let-values(((m-ns_16)" -"(let-values(((ns37_1) ns_58)" -"((ex-mod-name38_0)" +"(let-values(((ns38_0) ns_58)" +"((ex-mod-name39_0)" " ex-mod-name_0)" -"((temp39_4)" +"((temp40_2)" "(phase-" " phase_142" " ex-phase_0))" -"((temp40_2) #t))" +"((temp41_3) #t))" "(namespace->module-namespace82.1" " #f" " #f" -" temp40_2" +" temp41_3" " #t" " #f" " #f" -" ns37_1" -" ex-mod-name38_0" -" temp39_4))))" +" ns38_0" +" ex-mod-name39_0" +" temp40_2))))" "(let-values(((ex-m_0)" "(namespace->module" " ns_58" " ex-mod-name_0)))" "(let-values(((access_4)" -"(let-values(((or-part_30)" +"(let-values(((or-part_31)" "(module-access" " ex-m_0)))" -"(if or-part_30" -" or-part_30" +"(if or-part_31" +" or-part_31" "(module-compute-access!" " ex-m_0)))))" "(let-values((()" @@ -46519,39 +46519,39 @@ static const char *startup_source = "(gensym 'missing)))" "(let-values((()" "(begin" -"(let-values(((ns41_2)" +"(let-values(((ns42_3)" " ns_58)" -"((mpi42_1)" +"((mpi43_1)" " mpi_49)" -"((phase43_2)" -" phase_142)" "((phase44_0)" +" phase_142)" +"((phase45_1)" " phase_142))" "(namespace-module-visit!104.1" -" phase44_0" +" phase45_1" " #t" -" ns41_2" -" mpi42_1" -" phase43_2))" +" ns42_3" +" mpi43_1" +" phase44_0))" "(values))))" -"(let-values(((t_57)" +"(let-values(((t_18)" "(namespace-get-transformer" " m-ns_16" " ex-phase_0" " ex-sym_2" " missing_1)))" -"(if(eq? t_57 missing_1)" +"(if(eq? t_18 missing_1)" "(let-values()(fail_1))" "(let-values()" "(let-values(((tmp-ns_0)" -"(let-values(((ns45_0)" +"(let-values(((ns46_0)" " ns_58))" "(new-namespace9.1" " #f" " #f" " #f" " #f" -" ns45_0" +" ns46_0" " #t))))" "(let-values(((mod-path_16)" "(resolved-module-path->module-path" @@ -46590,7 +46590,7 @@ static const char *startup_source = "(let-values()(do-dynamic-require 'dynamic-require mod-path_19 sym_88 fail-k_3)))))))))))" "(case-lambda" "((mod-path_20 sym_89)(begin 'dynamic-require(dynamic-require12_0 mod-path_20 sym_89 #f #f)))" -"((mod-path_21 sym_90 fail-k8_1)(dynamic-require12_0 mod-path_21 sym_90 fail-k8_1 #t)))))" +"((mod-path_21 sym_60 fail-k8_1)(dynamic-require12_0 mod-path_21 sym_60 fail-k8_1 #t)))))" "(define-values" "(1/dynamic-require-for-syntax)" "(let-values(((dynamic-require-for-syntax18_0)" @@ -46598,7 +46598,7 @@ static const char *startup_source = "(begin" " 'dynamic-require-for-syntax18" "(let-values(((mod-path_22) mod-path16_0))" -"(let-values(((sym_27) sym17_1))" +"(let-values(((sym_90) sym17_1))" "(let-values(((fail-k_4)(if fail-k15_0 fail-k14_0 default-dynamic-require-fail-thunk)))" "(let-values()" "(let-values()" @@ -46608,13 +46608,13 @@ static const char *startup_source = "(extend-parameterization" "(continuation-mark-set-first #f parameterization-key)" " 1/current-namespace" -"(let-values(((ns_95)(1/current-namespace)))" -"(namespace->namespace-at-phase ns_95(add1(namespace-phase ns_95)))))" +"(let-values(((ns_113)(1/current-namespace)))" +"(namespace->namespace-at-phase ns_113(add1(namespace-phase ns_113)))))" "(let-values()" "(do-dynamic-require" " 'dynamic-require-for-syntax" " mod-path_22" -" sym_27" +" sym_90" " fail-k_4)))))))))))))" "(case-lambda" "((mod-path_23 sym_91)" @@ -48644,9 +48644,9 @@ static const char *startup_source = "((temp36_4)" "(let-values(((s_486)(exn-message exn_2)))" " (regexp-replace \"^[a-z-]*: \" s_486 \"\")))" -"((temp37_2)(exn-continuation-marks exn_2)))" +"((temp37_3)(exn-continuation-marks exn_2)))" "(reader-error12.1" -" temp37_2" +" temp37_3" " #t" " #f" " #f" @@ -52281,7 +52281,7 @@ static const char *startup_source = "(if(check-parameter 1/read-square-bracket-as-paren config_43)" "(let-values()" "(let-values(((read-one40_0) read-one_6)" -"((temp41_3) '#\\[)" +"((temp41_4) '#\\[)" "((temp42_3) '#\\[)" "((temp43_2) '#\\])" "((in44_0) in_33)" @@ -52294,7 +52294,7 @@ static const char *startup_source = " vector-mode46_0" " #t" " read-one40_0" -" temp41_3" +" temp41_4" " temp42_3" " temp43_2" " in44_0" @@ -52692,9 +52692,9 @@ static const char *startup_source = "(let-values()" "(let-values(((in37_1) in_38)" "((config38_0) config_46)" -" ((temp39_5) \"`#...~a` forms not ~a\")" +" ((temp39_4) \"`#...~a` forms not ~a\")" "((c40_0) c_50)" -"((temp41_4)" +"((temp41_5)" "(if(read-config-for-syntax? config_46)" " \"enabled\"" " \"allowed in `read-syntax` mode\")))" @@ -52709,8 +52709,8 @@ static const char *startup_source = " #f" " in37_1" " config38_0" -" temp39_5" -"(list c40_0 temp41_4))))" +" temp39_4" +"(list c40_0 temp41_5))))" "(void))" "(if(<=(accum-string-count accum-str_3) 8)" "(void)" @@ -53098,7 +53098,7 @@ static const char *startup_source = "(let-values()" "(let-values(((in37_2) in_38)" "((config38_1) config_46)" -"((temp39_6)" +"((temp39_5)" " \"illegal use of `~a`\")" "((c40_1) c_70))" "(reader-error12.1" @@ -53112,7 +53112,7 @@ static const char *startup_source = " #f" " in37_2" " config38_1" -" temp39_6" +" temp39_5" "(list c40_1))))))" "(if(if(equal? tmp_50 '#\\e)" " #t" @@ -57000,11 +57000,11 @@ static const char *startup_source = "(void)" "(let-values()(raise-argument-error 'module-predefined? module-reference-str mod_7)))" "(values))))" -"(let-values(((ns_113)(1/current-namespace)))" +"(let-values(((ns_114)(1/current-namespace)))" "(let-values(((name_68)" "(let-values(((mod39_0) mod_7)((temp40_4) #f))" "(reference->resolved-module-path32.1 temp40_4 mod39_0))))" -"(let-values(((m_24)(namespace->module ns_113 name_68)))" +"(let-values(((m_24)(namespace->module ns_114 name_68)))" "(if m_24(module-is-predefined? m_24) #f))))))))))" "(define-values" "(module->)" @@ -57075,12 +57075,12 @@ static const char *startup_source = " mod_16))))" "(define-values" "(1/module-provide-protected?)" -"(lambda(mod_17 sym_86)" +"(lambda(mod_17 sym_95)" "(begin" " 'module-provide-protected?" "(module->" "(lambda(m_28)" -"(let-values(((b/p_3)(hash-ref(module-provides m_28) sym_86 #f)))" +"(let-values(((b/p_3)(hash-ref(module-provides m_28) sym_95 #f)))" "(let-values(((or-part_33)(not b/p_3)))(if or-part_33 or-part_33(provided-as-protected? b/p_3)))))" " 'module-provide-protected?" " mod_17))))" @@ -57091,7 +57091,7 @@ static const char *startup_source = "(begin" " 'module->namespace21" "(let-values(((mod_18) mod20_0))" -"(let-values(((ns_114)(if ns19_1 ns18_2(1/current-namespace))))" +"(let-values(((ns_115)(if ns19_1 ns18_2(1/current-namespace))))" "(let-values()" "(let-values()" "(let-values()" @@ -57107,17 +57107,17 @@ static const char *startup_source = "(values))))" "(let-values((()" "(begin" -"(if(1/namespace? ns_114)" +"(if(1/namespace? ns_115)" "(void)" "(let-values()" -" (raise-argument-error 'module->namespace \"namespace?\" ns_114)))" +" (raise-argument-error 'module->namespace \"namespace?\" ns_115)))" "(values))))" "(let-values(((name_69)" "(let-values(((mod49_0) mod_18)((temp50_4) #t))" "(reference->resolved-module-path32.1 temp50_4 mod49_0))))" -"(let-values(((phase_132)(namespace-phase ns_114)))" +"(let-values(((phase_132)(namespace-phase ns_115)))" "(let-values(((m-ns_17)" -"(let-values(((ns51_1) ns_114)" +"(let-values(((ns51_1) ns_115)" "((name52_0) name_69)" "((phase53_0) phase_132))" "(namespace->module-namespace82.1" @@ -57135,7 +57135,7 @@ static const char *startup_source = "(void)" "(let-values()" "(begin" -"(namespace->module/complain 'module->namespace ns_114 name_69)" +"(namespace->module/complain 'module->namespace ns_115 name_69)" "(raise-arguments-error" " 'module->namespace" " \"module not instantiated in the current namespace\"" @@ -57158,10 +57158,10 @@ static const char *startup_source = " m-ns_17" "(let-values(((temp54_5)(namespace-mpi m-ns_17)))" "(make-root-expand-context13.1 #f #f #f #f #f #f #f #f temp54_5)))))" -"(let-values(((ns46_0) ns_114)" +"(let-values(((ns46_1) ns_115)" "((temp47_2)(namespace-mpi m-ns_17))" "((phase48_2) phase_132))" -"(namespace-module-make-available!112.1 #f #f ns46_0 temp47_2 phase48_2))" +"(namespace-module-make-available!112.1 #f #f ns46_1 temp47_2 phase48_2))" " m-ns_17)))))))))))))))" "(case-lambda" "((mod_19)(begin 'module->namespace(module->namespace21_0 mod_19 #f #f)))" @@ -57174,7 +57174,7 @@ static const char *startup_source = " 'namespace-unprotect-module27" "(let-values(((insp_12) insp25_0))" "(let-values(((mod_21) mod26_0))" -"(let-values(((ns_115)(if ns24_1 ns23_0(1/current-namespace))))" +"(let-values(((ns_116)(if ns24_1 ns23_0(1/current-namespace))))" "(let-values()" "(let-values()" "(let-values()" @@ -57200,20 +57200,20 @@ static const char *startup_source = "(values))))" "(let-values((()" "(begin" -"(if(1/namespace? ns_115)" +"(if(1/namespace? ns_116)" "(void)" "(let-values()" "(raise-argument-error" " 'namespace-unprotect-module" " \"namespace?\"" -" ns_115)))" +" ns_116)))" "(values))))" "(let-values(((name_70)" "(let-values(((mod56_0) mod_21)((temp57_0) #f))" "(reference->resolved-module-path32.1 temp57_0 mod56_0))))" -"(let-values(((phase_114)(namespace-phase ns_115)))" +"(let-values(((phase_114)(namespace-phase ns_116)))" "(let-values(((m-ns_15)" -"(let-values(((ns58_0) ns_115)" +"(let-values(((ns58_0) ns_116)" "((name59_0) name_70)" "((phase60_0) phase_114))" "(namespace->module-namespace82.1" @@ -57246,9 +57246,9 @@ static const char *startup_source = "((insp_19 mod_23 ns23_1)(namespace-unprotect-module27_0 insp_19 mod_23 ns23_1 #t)))))" "(define-values" "(namespace->module/complain)" -"(lambda(who_36 ns_116 name_71)" +"(lambda(who_36 ns_117 name_71)" "(begin" -"(let-values(((or-part_209)(namespace->module ns_116 name_71)))" +"(let-values(((or-part_209)(namespace->module ns_117 name_71)))" "(if or-part_209" " or-part_209" " (raise-arguments-error who_36 \"unknown module in the current namespace\" \"name\" name_71))))))" @@ -57318,11 +57318,11 @@ static const char *startup_source = " 'read/recursive" "(let-values(((in35_0) in_77)" "((temp36_8) #f)" -"((temp37_3) #t)" +"((temp37_4) #t)" "((start38_0) start_59)" "((readtable39_0) readtable_5)" "((temp40_5)(not graph?_2)))" -"(read*14.1 temp36_8 start38_0 #t temp40_5 #t readtable39_0 #t temp37_3 #t #f #f in35_0)))))" +"(read*14.1 temp36_8 start38_0 #t temp40_5 #t readtable39_0 #t temp37_4 #t #f #f in35_0)))))" "(define-values" "(read*14.1)" "(lambda(for-syntax?1_0" @@ -57531,7 +57531,7 @@ static const char *startup_source = "(begin" " 'dynamic-require-reader21" "(let-values(((mod-path_30) mod-path19_0))" -"(let-values(((sym_95) sym20_0))" +"(let-values(((sym_96) sym20_0))" "(let-values(((fail-thunk_1)" "(if fail-thunk18_0 fail-thunk17_0 default-dynamic-require-fail-thunk)))" "(let-values()" @@ -57543,11 +57543,11 @@ static const char *startup_source = "(continuation-mark-set-first #f parameterization-key)" " 1/current-namespace" " root-ns_0)" -"(let-values()(1/dynamic-require mod-path_30 sym_95 fail-thunk_1)))" -"(1/dynamic-require mod-path_30 sym_95 fail-thunk_1)))))))))))" +"(let-values()(1/dynamic-require mod-path_30 sym_96 fail-thunk_1)))" +"(1/dynamic-require mod-path_30 sym_96 fail-thunk_1)))))))))))" "(case-lambda" -"((mod-path_31 sym_96)(begin(dynamic-require-reader21_0 mod-path_31 sym_96 #f #f)))" -"((mod-path_32 sym_97 fail-thunk17_1)(dynamic-require-reader21_0 mod-path_32 sym_97 fail-thunk17_1 #t)))))" +"((mod-path_31 sym_97)(begin(dynamic-require-reader21_0 mod-path_31 sym_97 #f #f)))" +"((mod-path_32 sym_98 fail-thunk17_1)(dynamic-require-reader21_0 mod-path_32 sym_98 fail-thunk17_1 #t)))))" "(define-values" "(1/read-syntax)" "(let-values(((read-syntax5_0)" @@ -57813,7 +57813,7 @@ static const char *startup_source = "(begin" " 'for-loop" "(if(pair? lst_267)" -"(let-values(((sym_98)(unsafe-car lst_267))" +"(let-values(((sym_99)(unsafe-car lst_267))" "((rest_177)(unsafe-cdr lst_267)))" "(let-values((()" "(let-values()" @@ -57824,11 +57824,11 @@ static const char *startup_source = "(let-values(((val_22)" "(1/instance-variable-value" " inst_7" -" sym_98)))" +" sym_99)))" "(namespace-set-variable!" " ns_46" " 0" -" sym_98" +" sym_99" " val_22)))" "(values)))))" "(values)))))" @@ -58696,15 +58696,15 @@ static const char *startup_source = "(let-values()" " (raise-argument-error 'variable-reference->namespace \"variable-reference?\" vr_1)))" "(values))))" -"(let-values(((ns_117)(variable-reference->namespace* vr_1)))" -"(let-values(((mpi_52)(namespace-mpi ns_117)))" +"(let-values(((ns_118)(variable-reference->namespace* vr_1)))" +"(let-values(((mpi_52)(namespace-mpi ns_118)))" "(begin" "(if(non-self-module-path-index? mpi_52)" "(let-values()" -"(let-values(((ns4_0) ns_117)((mpi5_1) mpi_52)((temp6_5)(namespace-0-phase ns_117)))" +"(let-values(((ns4_0) ns_118)((mpi5_1) mpi_52)((temp6_5)(namespace-0-phase ns_118)))" "(namespace-module-make-available!112.1 #f #f ns4_0 mpi5_1 temp6_5)))" "(void))" -" ns_117)))))))))" +" ns_118)))))))))" "(define-values" "(variable-reference->namespace*)" "(lambda(vr_2)" @@ -59098,7 +59098,7 @@ static const char *startup_source = "(lambda(eval1_0 main-ids2_0 read-ids3_0 ns7_1)" "(begin" " 'declare-kernel-module!8" -"(let-values(((ns_118) ns7_1))" +"(let-values(((ns_119) ns7_1))" "(let-values()" "(let-values(((main-ids_0) main-ids2_0))" "(let-values(((read-ids_0) read-ids3_0))" @@ -59115,9 +59115,9 @@ static const char *startup_source = " 1/variable-reference-constant?" " 'variable-reference-from-unsafe?" " 1/variable-reference-from-unsafe?))" -"((ns57_0) ns_118))" +"((ns57_0) ns_119))" "(copy-runtime-module!26.1 #f #f temp56_2 #t ns57_0 #f #f #f #f temp55_3 #t temp54_6 #t temp53_4))" -"(let-values(((temp58_3) '#%kernel)((temp59_7) '(#%core #%runtime #%main #%read))((ns60_0) ns_118))" +"(let-values(((temp58_3) '#%kernel)((temp59_7) '(#%core #%runtime #%main #%read))((ns60_0) ns_119))" "(declare-reexporting-module!50.1 ns60_0 #f #f temp58_3 temp59_7)))))))))))" "(define-values" "(copy-runtime-module!26.1)" @@ -59139,7 +59139,7 @@ static const char *startup_source = " 'copy-runtime-module!26" "(let-values(((name_65) name25_0))" "(let-values(((to-name_0)(if to18_0 to11_0 name_65)))" -"(let-values(((ns_119) namespace12_0))" +"(let-values(((ns_120) namespace12_0))" "(let-values(((skip-syms_0)(if skip20_0 skip13_0(seteq))))" "(let-values(((alts_0)(if alts21_0 alts14_0 '#hasheq())))" "(let-values(((extras_0)(if extras22_0 extras15_0 '#hasheq())))" @@ -59159,7 +59159,7 @@ static const char *startup_source = "(begin" " 'for-loop" "(if i_26" -"(let-values(((sym_99)" +"(let-values(((sym_100)" "(hash-iterate-key ht_24 i_26)))" "(let-values((()" "(let-values()" @@ -59168,7 +59168,7 @@ static const char *startup_source = "(begin" "(let-values()" "(register-built-in-symbol!" -" sym_99))" +" sym_100))" "(values)))))" "(values)))))" "(if(not #f)" @@ -59191,7 +59191,7 @@ static const char *startup_source = "(begin" " 'for-loop" "(if i_183" -"(let-values(((sym_100 val_5)" +"(let-values(((sym_101 val_5)" "(hash-iterate-key+value" " ht_160" " i_183)))" @@ -59200,7 +59200,7 @@ static const char *startup_source = " table_11))" "(if(set-member?" " skip-syms_0" -" sym_100)" +" sym_101)" " table_221" "(let-values(((table_20)" " table_221))" @@ -59210,11 +59210,11 @@ static const char *startup_source = " val_83)" "(let-values()" "(values" -" sym_100" +" sym_101" "(let-values(((or-part_219)" "(hash-ref" " alts_0" -" sym_100" +" sym_101" " #f)))" "(if or-part_219" " or-part_219" @@ -59268,7 +59268,7 @@ static const char *startup_source = "(hash-iterate-first ht_161))))))" "(let-values(((to-name61_0) to-name_0)" "((ht+extras62_0) ht+extras_0)" -"((ns63_0) ns_119)" +"((ns63_0) ns_120)" "((primitive?64_0) primitive?_9)" "((protected?65_0) protected?_10))" "(declare-hash-based-module!41.1" @@ -59300,14 +59300,14 @@ static const char *startup_source = " 'declare-hash-based-module!41" "(let-values(((name_74) name39_0))" "(let-values(((ht_164) ht40_0))" -"(let-values(((ns_120) namespace29_0))" +"(let-values(((ns_121) namespace29_0))" "(let-values(((primitive?_10)(if primitive?35_0 primitive?30_0 #f)))" "(let-values(((protected?_11)(if protected?36_0 protected?31_0 #f)))" "(let-values(((protected-syms_0)(if protected37_0 protected32_0 null)))" "(let-values(((register-builtin?_0)(if register-builtin?38_0 register-builtin?33_0 #f)))" "(let-values()" "(let-values(((mpi_55)(1/module-path-index-join(list 'quote name_74) #f)))" -"(let-values(((ns66_1) ns_120)" +"(let-values(((ns66_1) ns_121)" "((temp67_1)" "(let-values(((temp69_3) #t)" "((primitive?70_0) primitive?_10)" @@ -59327,7 +59327,7 @@ static const char *startup_source = "(begin" " 'for-loop" "(if i_185" -"(let-values(((sym_101)" +"(let-values(((sym_102)" "(hash-iterate-key" " ht_165" " i_185)))" @@ -59344,7 +59344,7 @@ static const char *startup_source = "(if register-builtin?_0" "(let-values()" "(register-built-in-symbol!" -" sym_101))" +" sym_102))" "(void))" "(values))))" "(let-values(((binding_28)" @@ -59353,7 +59353,7 @@ static const char *startup_source = "((temp77_3)" " 0)" "((sym78_0)" -" sym_101))" +" sym_102))" "(make-module-binding22.1" " #f" " #f" @@ -59377,13 +59377,13 @@ static const char *startup_source = " temp77_3" " sym78_0))))" "(values" -" sym_101" +" sym_102" "(if(let-values(((or-part_359)" " protected?_11))" "(if or-part_359" " or-part_359" "(member" -" sym_101" +" sym_102" " protected-syms_0)))" "(provided1.1" " binding_28" @@ -59409,7 +59409,7 @@ static const char *startup_source = "(hash-iterate-first ht_165))))))" "((temp75_3)" "(lambda(data-box_6" -" ns_121" +" ns_122" " phase-shift_21" " phase-level_23" " self_29" @@ -59429,7 +59429,7 @@ static const char *startup_source = "(begin" " 'for-loop" "(if i_186" -"(let-values(((sym_102 val_31)" +"(let-values(((sym_103 val_31)" "(hash-iterate-key+value" " ht_166" " i_186)))" @@ -59440,9 +59440,9 @@ static const char *startup_source = "(begin" "(let-values()" "(namespace-set-variable!" -" ns_121" +" ns_122" " 0" -" sym_102" +" sym_103" " val_31))" "(values)))))" "(values)))))" @@ -59501,7 +59501,7 @@ static const char *startup_source = "(let-values(((name_75) name48_1))" "(let-values(((require-names_0) require-names49_0))" "(let-values(((reexport?_0)(if reexport?46_0 reexport?44_0 #t)))" -"(let-values(((ns_122) namespace45_0))" +"(let-values(((ns_123) namespace45_0))" "(let-values()" "(let-values(((mpi_56)(1/module-path-index-join(list 'quote name_75) #f)))" "(let-values(((require-mpis_0)" @@ -59538,7 +59538,7 @@ static const char *startup_source = " for-loop_207)" " null" " lst_202))))))" -"(let-values(((ns79_1) ns_122)" +"(let-values(((ns79_1) ns_123)" "((temp80_4)" "(let-values(((temp82_7) #t)" "((temp83_3) #t)" @@ -59565,7 +59565,7 @@ static const char *startup_source = "(let-values(((table_228)" "(let-values(((m_29)" "(namespace->module" -" ns_122" +" ns_123" "(1/module-path-index-resolve" " require-mpi_0))))" "(begin" @@ -59598,7 +59598,7 @@ static const char *startup_source = "(begin" " 'for-loop" "(if i_187" -"(let-values(((sym_103" +"(let-values(((sym_104" " binding_29)" "(hash-iterate-key+value" " ht_167" @@ -59612,7 +59612,7 @@ static const char *startup_source = " val_85)" "(let-values()" "(values" -" sym_103" +" sym_104" " binding_29))))" "(hash-set" " table_163" @@ -59742,13 +59742,13 @@ static const char *startup_source = "(let-values()" "(case-lambda" "((s_71)(begin 'eval((1/current-eval)(intro s_71))))" -"((s_187 ns_123)" +"((s_187 ns_124)" "(begin" -" (if (1/namespace? ns_123) (void) (let-values () (raise-argument-error 'eval \"namespace?\" ns_123)))" +" (if (1/namespace? ns_124) (void) (let-values () (raise-argument-error 'eval \"namespace?\" ns_124)))" "(with-continuation-mark" " parameterization-key" -"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_123)" -"(let-values()((1/current-eval)(intro s_187 ns_123))))))))))" +"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_124)" +"(let-values()((1/current-eval)(intro s_187 ns_124))))))))))" "(define-values" "(1/eval-syntax)" "(let-values()" @@ -59760,13 +59760,13 @@ static const char *startup_source = "(begin" " (if (syntax?$1 s_8) (void) (let-values () (raise-argument-error 'eval-syntax \"syntax?\" s_8)))" "((1/current-eval) s_8))))" -"((s_2 ns_124)" +"((s_2 ns_125)" "(begin" " (if (syntax?$1 s_2) (void) (let-values () (raise-argument-error 'eval-syntax \"syntax?\" s_2)))" -" (if (1/namespace? ns_124) (void) (let-values () (raise-argument-error 'eval-syntax \"namespace?\" ns_124)))" +" (if (1/namespace? ns_125) (void) (let-values () (raise-argument-error 'eval-syntax \"namespace?\" ns_125)))" "(with-continuation-mark" " parameterization-key" -"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_124)" +"(extend-parameterization(continuation-mark-set-first #f parameterization-key) 1/current-namespace ns_125)" "(let-values()((1/current-eval) s_2)))))))))" "(define-values(compile$1)(lambda(s_176)(begin 'compile((1/current-compile)(intro s_176) #f))))" "(define-values" @@ -60564,7 +60564,7 @@ static const char *startup_source = "(if am_0(if bm_0(if(>=(cdr am_0)(cdr bm_0)) am_0 #f) #f) #f))))" " #f)))))" "(let-values(((with-dir*_0)" -"(lambda(base_25 t_58)" +"(lambda(base_25 t_57)" "(begin" " 'with-dir*" "(with-continuation-mark" @@ -60573,7 +60573,7 @@ static const char *startup_source = "(continuation-mark-set-first #f parameterization-key)" " current-load-relative-directory" "(if(path? base_25) base_25(current-directory)))" -"(let-values()(t_58)))))))" +"(let-values()(t_57)))))))" "(lambda(path_15 expect-module_0)" "(begin" "(let-values((()" @@ -61601,7 +61601,7 @@ static const char *startup_source = "(let-values()" "((1/current-load/use-compiled)" " filename_2" -"(let-values(((sym_104)" +"(let-values(((sym_105)" "(string->symbol" "(path->string" " no-sfx_0))))" @@ -61612,9 +61612,9 @@ static const char *startup_source = " #f)" "(cons #f subm-path_0)" "(cons" -" sym_104" +" sym_105" " subm-path_0))" -" sym_104))))))))))))))" +" sym_105))))))))))))))" "(void))" "(if(if(not(vector? s-parsed_0))" "(if load?_7" @@ -64019,8 +64019,8 @@ static const char *startup_source = "(let-values(((ids34_0) ids_33)" "((phase35_2) phase_148)" "((s36_0) s_73)" -" ((temp37_4) \"argument name\"))" -"(check-no-duplicate-ids8.1 temp37_4 #t ids34_0 phase35_2 s36_0 #f #f))" +" ((temp37_5) \"argument name\"))" +"(check-no-duplicate-ids8.1 temp37_5 #t ids34_0 phase35_2 s36_0 #f #f))" "(values))))" "(let-values(((counter_7)(root-expand-context-counter ctx_80)))" "(let-values(((keys_7)" @@ -68517,7 +68517,7 @@ static const char *startup_source = "(let-values()(raise-ambiguous-error id_127 ctx_98))" "(void))" "(values))))" -"(let-values(((t_59 primitive?_11 insp_24 protected?_12)" +"(let-values(((t_58 primitive?_11 insp_24 protected?_12)" "(if binding_30" "(let-values(((binding407_0) binding_30)" "((ctx408_0) ctx_98)" @@ -68530,7 +68530,7 @@ static const char *startup_source = "(let-values()" "(let-values()(call-expand-observe obs_121 'resolve id_127)))" "(void)))" -"(if(let-values(((or-part_379)(variable? t_59)))" +"(if(let-values(((or-part_379)(variable? t_58)))" "(if or-part_379" " or-part_379" "(if(not binding_30)" @@ -68597,7 +68597,7 @@ static const char *startup_source = "(list" " set!394_0" "(let-values(((id416_0) id_127)" -"((t417_0) t_59)" +"((t417_0) t_58)" "((temp418_0)" "(free-id-set-empty-or-just-module*?" "(expand-context-stops" @@ -68617,9 +68617,9 @@ static const char *startup_source = " id_127" " null" "(syntax-debug-info-string id_127 ctx_98)))" -"(if(1/set!-transformer? t_59)" +"(if(1/set!-transformer? t_58)" "(let-values()" -"(if(not-in-this-expand-context? t_59 ctx_98)" +"(if(not-in-this-expand-context? t_58 ctx_98)" "(let-values()" "(let-values(((temp419_0)" "(avoid-current-expand-context" @@ -68631,13 +68631,13 @@ static const char *startup_source = " id_127" " from-rename?_0" " ctx_98)" -" t_59" +" t_58" " ctx_98))" "((ctx420_0) ctx_98))" "(expand7.1 #f #f #f #f temp419_0 ctx420_0)))" "(let-values()" "(let-values(((exp-s_14 re-ctx_1)" -"(let-values(((t421_0) t_59)" +"(let-values(((t421_0) t_58)" "((insp422_0) insp_24)" "((s423_0) s_704)" "((orig-id424_0) orig-id_1)" @@ -68659,9 +68659,9 @@ static const char *startup_source = "(let-values(((exp-s428_0) exp-s_14)" "((re-ctx429_0) re-ctx_1))" "(expand7.1 #f #f #f #f exp-s428_0 re-ctx429_0))))))))" -"(if(1/rename-transformer? t_59)" +"(if(1/rename-transformer? t_58)" "(let-values()" -"(if(not-in-this-expand-context? t_59 ctx_98)" +"(if(not-in-this-expand-context? t_58 ctx_98)" "(let-values()" "(let-values(((temp430_0)" "(avoid-current-expand-context" @@ -68673,15 +68673,15 @@ static const char *startup_source = " id_127" " from-rename?_0" " ctx_98" -" t_59)" -" t_59" +" t_58)" +" t_58" " ctx_98))" "((ctx431_0) ctx_98))" "(expand7.1 #f #f #f #f temp430_0 ctx431_0)))" "(let-values()" "(rename-loop_0" "(syntax-track-origin$1" -"(rename-transformer-target-in-context t_59 ctx_98)" +"(rename-transformer-target-in-context t_58 ctx_98)" " id_127" " id_127)" " #t))))" @@ -68707,14 +68707,14 @@ static const char *startup_source = "(let-values(((rhs-s_0) rhs-s29_0))" "(let-values(((from-rename?_1) from-rename?30_0))" "(let-values(((ctx_99) ctx31_0))" -"(let-values(((t_60)(if t24_0 t23_0 #f)))" +"(let-values(((t_59)(if t24_0 t23_0 #f)))" "(let-values()" -"(if(let-values(((or-part_381) t_60))" +"(if(let-values(((or-part_381) t_59))" "(if or-part_381 or-part_381 from-rename?_1))" "(let-values()" "(let-values(((new-id_1)" -"(if t_60" -"(rename-transformer-target-in-context t_60 ctx_99)" +"(if t_59" +"(rename-transformer-target-in-context t_59 ctx_99)" " id_128)))" "(syntax-rearm$1" "(datum->syntax$1" @@ -68908,7 +68908,7 @@ static const char *startup_source = " null" "(syntax-debug-info-string var-id_0 ctx_102))))" "(values))))" -"(let-values(((t_61 primitive?_12 insp-of-t_7 protected?_13)" +"(let-values(((t_60 primitive?_12 insp-of-t_7 protected?_13)" "(if binding_31" "(let-values(((binding452_0) binding_31)" "((ctx453_0) ctx_102)" @@ -68918,7 +68918,7 @@ static const char *startup_source = "(lookup28.1 s455_0 #t temp456_0 #t binding452_0 ctx453_0 var-id454_0))" "(values #f #f #f #f))))" "(begin" -"(if(if t_61(not(variable? t_61)) #f)" +"(if(if t_60(not(variable? t_60)) #f)" "(let-values()" " (raise-syntax-error$1 #f \"identifier does not refer to a variable\" var-id_0 s_719))" "(void))" @@ -69012,12 +69012,12 @@ static const char *startup_source = " (void (add-core-form!* 'unquote-splicing (lambda (s_771 ctx_105) (raise-syntax-error$1 #f \"not in quasiquote\" s_771))))" "(define-values" "(binding-for-transformer?)" -"(lambda(b_42 id_131 at-phase_12 ns_123)" +"(lambda(b_42 id_131 at-phase_12 ns_124)" "(begin" "(if(not at-phase_12)" "(let-values()" "(let-values(((m_30)" -"(namespace->module ns_123(1/module-path-index-resolve(module-binding-nominal-module b_42)))))" +"(namespace->module ns_124(1/module-path-index-resolve(module-binding-nominal-module b_42)))))" "(let-values(((b/p_4)" "(hash-ref" "(hash-ref(module-provides m_30)(module-binding-nominal-phase b_42) '#hasheq())" @@ -69029,7 +69029,7 @@ static const char *startup_source = "(let-values(((b1_8) b_42)" "((empty-env2_0) empty-env)" "((null3_0) null)" -"((ns4_1) ns_123)" +"((ns4_1) ns_124)" "((at-phase5_0) at-phase_12)" "((id6_0) id_131))" "(binding-lookup50.1 #f #f #f #f b1_8 empty-env2_0 null3_0 ns4_1 at-phase5_0 id6_0))))" @@ -69040,7 +69040,7 @@ static const char *startup_source = "(parse-and-expand-provides!)" "(lambda(specs_0 orig-s_62 rp_1 self_30 phase_46 ctx_106)" "(begin" -"(let-values(((ns_125)(expand-context-namespace ctx_106)))" +"(let-values(((ns_126)(expand-context-namespace ctx_106)))" "((letrec-values(((loop_115)" "(lambda(specs_1 at-phase_13 protected?_15 layer_6)" "(begin" @@ -69181,7 +69181,7 @@ static const char *startup_source = "(syntax-e$1" " spec_0)" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15)" "(values" @@ -69746,7 +69746,7 @@ static const char *startup_source = "(syntax-e$1" " id:to33_0)" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15)" "(values" @@ -69969,7 +69969,7 @@ static const char *startup_source = " orig-s_62" " id:field42_0" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15)" "(values" @@ -70065,7 +70065,7 @@ static const char *startup_source = " self_30" " null" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15" " ctx_106)" @@ -70233,7 +70233,7 @@ static const char *startup_source = " self_30" " id57_0" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15" " ctx_106)" @@ -70307,7 +70307,7 @@ static const char *startup_source = " null" " #f" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15)" "(values" @@ -70446,7 +70446,7 @@ static const char *startup_source = " id67_0" " #f" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15)" "(values" @@ -70560,7 +70560,7 @@ static const char *startup_source = "(syntax-e$1" " id:prefix72_0)" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15)" "(values" @@ -70748,7 +70748,7 @@ static const char *startup_source = "(syntax-e$1" " id:prefix77_0)" " at-phase_13" -" ns_125" +" ns_126" " rp_1" " protected?_15)" "(values" @@ -71195,9 +71195,9 @@ static const char *startup_source = " 'raw)))))" "(define-values" "(parse-identifier!)" -"(lambda(spec_1 orig-s_78 sym_105 at-phase_14 ns_126 rp_2 protected?_16)" +"(lambda(spec_1 orig-s_78 sym_106 at-phase_14 ns_127 rp_2 protected?_16)" "(begin" -"(let-values(((b_95)(resolve+shift/extra-inspector spec_1 at-phase_14 ns_126)))" +"(let-values(((b_95)(resolve+shift/extra-inspector spec_1 at-phase_14 ns_127)))" "(let-values((()" "(begin" "(if b_95" @@ -71209,12 +71209,12 @@ static const char *startup_source = " orig-s_78" " spec_1)))" "(values))))" -"(let-values(((as-transformer?_7)(binding-for-transformer? b_95 spec_1 at-phase_14 ns_126)))" +"(let-values(((as-transformer?_7)(binding-for-transformer? b_95 spec_1 at-phase_14 ns_127)))" "(let-values(((immed-b_0)" "(let-values(((spec118_0) spec_1)((at-phase119_0) at-phase_14)((temp120_4) #t))" "(resolve+shift30.1 #f #f #f #f #f #f temp120_4 #t #f #f spec118_0 at-phase119_0))))" "(let-values(((rp109_0) rp_2)" -"((sym110_0) sym_105)" +"((sym110_0) sym_106)" "((at-phase111_0) at-phase_14)" "((b112_0) b_95)" "((immed-b113_0) immed-b_0)" @@ -71234,22 +71234,22 @@ static const char *startup_source = " orig-s115_0)))))))))" "(define-values" "(parse-struct!)" -"(lambda(id:struct_0 orig-s_79 fields_0 at-phase_15 ns_127 rp_3 protected?_17)" +"(lambda(id:struct_0 orig-s_79 fields_0 at-phase_15 ns_128 rp_3 protected?_17)" "(begin" "(let-values(((mk_0)" "(lambda(fmt_1)" "(begin" " 'mk" -"(let-values(((sym_106)(string->symbol(format fmt_1(syntax-e$1 id:struct_0)))))" -"(datum->syntax$1 id:struct_0 sym_106 id:struct_0))))))" +"(let-values(((sym_107)(string->symbol(format fmt_1(syntax-e$1 id:struct_0)))))" +"(datum->syntax$1 id:struct_0 sym_107 id:struct_0))))))" "(let-values(((mk2_0)" "(lambda(fmt_2 field-id_0)" "(begin" " 'mk2" -"(let-values(((sym_107)" +"(let-values(((sym_108)" "(string->symbol" "(format fmt_2(syntax-e$1 id:struct_0)(syntax-e$1 field-id_0)))))" -"(datum->syntax$1 id:struct_0 sym_107 id:struct_0))))))" +"(datum->syntax$1 id:struct_0 sym_108 id:struct_0))))))" "(begin" " (let-values (((lst_415) (list \"~a\" \"make-~a\" \"struct:~a\" \"~a?\")))" "(begin" @@ -71274,7 +71274,7 @@ static const char *startup_source = " orig-s_79" "(syntax-e$1 id_144)" " at-phase_15" -" ns_127" +" ns_128" " rp_3" " protected?_17)))" "(values)))))" @@ -71313,7 +71313,7 @@ static const char *startup_source = " orig-s_79" "(syntax-e$1 get-id_0)" " at-phase_15" -" ns_127" +" ns_128" " rp_3" " protected?_17)" "(parse-identifier!" @@ -71321,7 +71321,7 @@ static const char *startup_source = " orig-s_79" "(syntax-e$1 set-id_0)" " at-phase_15" -" ns_127" +" ns_128" " rp_3" " protected?_17)))))" "(values)))))" @@ -71333,7 +71333,7 @@ static const char *startup_source = "(void)))))))" "(define-values" "(parse-all-from)" -"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_128 rp_4 protected?_18 ctx_107)" +"(lambda(mod-path-stx_0 orig-s_80 self_31 except-ids_0 at-phase_16 ns_129 rp_4 protected?_18 ctx_107)" "(begin" "(let-values(((mod-path_33)(syntax->datum$1 mod-path-stx_0)))" "(let-values((()" @@ -71344,10 +71344,10 @@ static const char *startup_source = " (raise-syntax-error$1 provide-form-name \"not a module path\" orig-s_80 mod-path-stx_0)))" "(values))))" "(let-values(((mpi_57)(module-path->mpi/context mod-path_33 ctx_107)))" -"(parse-all-from-module mpi_57 #f orig-s_80 except-ids_0 #f at-phase_16 ns_128 rp_4 protected?_18)))))))" +"(parse-all-from-module mpi_57 #f orig-s_80 except-ids_0 #f at-phase_16 ns_129 rp_4 protected?_18)))))))" "(define-values" "(parse-all-from-module)" -"(lambda(mpi_58 matching-stx_0 orig-s_81 except-ids_1 prefix-sym_0 at-phase_17 ns_129 rp_5 protected?_19)" +"(lambda(mpi_58 matching-stx_0 orig-s_81 except-ids_1 prefix-sym_0 at-phase_17 ns_130 rp_5 protected?_19)" "(begin" "(let-values(((requireds_2)(extract-module-requires rp_5 mpi_58 at-phase_17)))" "(let-values(((phase-desc_0)" @@ -71371,10 +71371,10 @@ static const char *startup_source = " matching-stx_0)))" "(values))))" "(let-values(((add-prefix_1)" -"(lambda(sym_108)" +"(lambda(sym_109)" "(begin" " 'add-prefix" -" (if prefix-sym_0 (string->symbol (format \"~a~a\" prefix-sym_0 sym_108)) sym_108)))))" +" (if prefix-sym_0 (string->symbol (format \"~a~a\" prefix-sym_0 sym_109)) sym_109)))))" "(let-values(((found_0)(make-hasheq)))" "(begin" "(let-values(((lst_419) requireds_2))" @@ -71478,7 +71478,7 @@ static const char *startup_source = "(resolve+shift/extra-inspector" " id_145" " phase_153" -" ns_129)))" +" ns_130)))" "(let-values(((immed-b_1)" "(let-values(((id130_1)" " id_145)" @@ -72366,7 +72366,7 @@ static const char *startup_source = " ns243_0)" "(begin" " 'make-m-ns244" -"(let-values(((ns_130) ns243_0))" +"(let-values(((ns_131) ns243_0))" "(let-values(((for-submodule?_1)" "(if for-submodule?242_0" " for-submodule?241_0" @@ -72375,7 +72375,7 @@ static const char *startup_source = " #f))))" "(let-values()" "(let-values(((ns262_0)" -" ns_130)" +" ns_131)" "((self263_0)" " self_14)" "((root-ctx264_0)" @@ -75468,7 +75468,7 @@ static const char *startup_source = " lst_438)" " #f)" " #f)" -"(let-values(((sym_109)" +"(let-values(((sym_110)" "(unsafe-car" " lst_436))" "((rest_248)" @@ -75501,7 +75501,7 @@ static const char *startup_source = "(namespace-set-transformer!" " m-ns_19" " phase_53" -" sym_109" +" sym_110" " val_87)))" "(values)))))" "(values)))))" @@ -77624,7 +77624,7 @@ static const char *startup_source = "((rest_257)" "(unsafe-cdr" " lst_454))" -"((sym_110)" +"((sym_111)" "(unsafe-car" " lst_455))" "((rest_258)" @@ -77645,7 +77645,7 @@ static const char *startup_source = "(namespace-set-variable!" " m-ns_22" " phase_167" -" sym_110" +" sym_111" " val_88))" "(values)))))" "(values)))))" @@ -77987,7 +77987,7 @@ static const char *startup_source = "(extract-syntax submod_5))))" "(void)))" "(values))))" -"(let-values(((ns_131)(expand-context-namespace ctx_121)))" +"(let-values(((ns_132)(expand-context-namespace ctx_121)))" "(let-values(((module-name_3)(1/module-path-index-resolve self_41)))" "(let-values(((root-module-name_1)" "(resolved-module-path-root-name module-name_3)))" @@ -77997,7 +77997,7 @@ static const char *startup_source = "(expanded+parsed-parsed submod_5)" " submod_5))" "((temp693_0)" -"(let-values(((ns698_0) ns_131)" +"(let-values(((ns698_0) ns_132)" "((self699_0) self_41)" "((temp700_0)" "(1/resolved-module-path-name" @@ -78045,7 +78045,7 @@ static const char *startup_source = "(extend-parameterization" "(continuation-mark-set-first #f parameterization-key)" " 1/current-namespace" -" ns_131" +" ns_132" " 1/current-module-declare-name" "(1/make-resolved-module-path root-module-name_1))" "(let-values()"