diff --git a/pkgs/racket-test-core/tests/racket/module.rktl b/pkgs/racket-test-core/tests/racket/module.rktl index 70d7774469..20748c9e9b 100644 --- a/pkgs/racket-test-core/tests/racket/module.rktl +++ b/pkgs/racket-test-core/tests/racket/module.rktl @@ -2620,6 +2620,40 @@ case of module-leve bindings; it doesn't cover local bindings. (require (submod "." m ".."))))) exn:fail?) +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; If `local-expand` creates a macro binding, and if +;; the definition is discarded with a non-macro definition +;; is introduced, then make sure the non-macro definition +;; is referenced. + +(module discards-module-begin-macro-definition racket/base + + (module mb racket/base + (require (for-syntax racket/base)) + (provide (except-out (all-from-out racket/base) + #%module-begin) + (rename-out [module-begin #%module-begin])) + (define-syntax (module-begin stx) + (syntax-case stx () + [(_ a b) + (begin + (local-expand #'(#%module-begin a) 'module-begin null) + #'(#%module-begin b))]))) + + (module use (submod ".." mb) + (begin + (require (for-syntax racket/base)) + (define-syntax (m stx) #''not-ok)) + (begin + (define (m) 'ok) + (define result (m)) + (provide result))) + + (require 'use) + (provide result)) + +(test 'ok dynamic-require ''discards-module-begin-macro-definition 'result) + ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (report-errs) diff --git a/racket/src/expander/expand/module.rkt b/racket/src/expander/expand/module.rkt index e8171fd3d3..1316c35576 100644 --- a/racket/src/expander/expand/module.rkt +++ b/racket/src/expander/expand/module.rkt @@ -777,6 +777,9 @@ #:frame-id frame-id #:requires+provides requires+provides #:in exp-body)) + (for ([sym (in-list syms)]) + ;; In case `local-expand` created a binding with `sym` to a transformer + (namespace-unset-transformer! m-ns phase sym)) (add-defined-syms! requires+provides syms phase) (log-expand partial-body-ctx 'exit-prim (datum->syntax #f `(,(m 'define-values) ,ids ,(m 'rhs)) exp-body)) diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index 6fbad2785b..7f3847b8db 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -73949,6 +73949,48 @@ static const char *startup_source = " phase499_0" " all-scopes-stx500_0))))" "(begin" +"(let-values(((lst_428)" +" syms_22))" +"(begin" +"(if(variable-reference-from-unsafe?" +"(#%variable-reference))" +"(void)" +"(let-values()" +"(check-list" +" lst_428)))" +"((letrec-values(((for-loop_334)" +"(lambda(lst_429)" +"(begin" +" 'for-loop" +"(if(pair?" +" lst_429)" +"(let-values(((sym_109)" +"(unsafe-car" +" lst_429))" +"((rest_255)" +"(unsafe-cdr" +" lst_429)))" +"(let-values((()" +"(let-values()" +"(let-values((()" +"(let-values()" +"(begin" +"(let-values()" +"(namespace-unset-transformer!" +" m-ns_20" +" phase_49" +" sym_109))" +"(values)))))" +"(values)))))" +"(if(not" +" #f)" +"(for-loop_334" +" rest_255)" +"(values))))" +"(values))))))" +" for-loop_334)" +" lst_428)))" +"(void)" "(let-values(((requires+provides492_0)" " requires+provides_7)" "((syms493_0)" @@ -74088,7 +74130,7 @@ static const char *startup_source = " orig-s_88))" "(let-values()" "(let-values(((id_150)" -"(let-values(((lst_428)" +"(let-values(((lst_430)" " flat-s_61))" "(begin" "(if(variable-reference-from-unsafe?" @@ -74096,20 +74138,20 @@ static const char *startup_source = "(void)" "(let-values()" "(check-list" -" lst_428)))" -"((letrec-values(((for-loop_334)" +" lst_430)))" +"((letrec-values(((for-loop_335)" "(lambda(id_151" -" lst_429)" +" lst_431)" "(begin" " 'for-loop" "(if(pair?" -" lst_429)" -"(let-values(((s_839)" +" lst_431)" +"(let-values(((s_568)" "(unsafe-car" -" lst_429))" -"((rest_255)" +" lst_431))" +"((rest_256)" "(unsafe-cdr" -" lst_429)))" +" lst_431)))" "(let-values(((id_152)" "(let-values(((id_153)" " id_151))" @@ -74119,21 +74161,21 @@ static const char *startup_source = "(let-values()" "(if(let-values(((or-part_405)" "(if(syntax?$1" -" s_839)" +" s_568)" "(symbol?" "(syntax-e$1" -" s_839))" +" s_568))" " #f)))" "(if or-part_405" " or-part_405" "(symbol?" -" s_839)))" -" s_839" +" s_568)))" +" s_568" "(raise-syntax-error$1" " #f" " \"not an identifier\"" " orig-s_88" -" s_839)))))" +" s_568)))))" "(cons" " id524_0" " id_153)))))" @@ -74141,45 +74183,45 @@ static const char *startup_source = " id_154)))))" "(if(not" " #f)" -"(for-loop_334" +"(for-loop_335" " id_152" -" rest_255)" +" rest_256)" " id_152)))" " id_151)))))" -" for-loop_334)" +" for-loop_335)" " null" -" lst_428)))))" +" lst_430)))))" "(reverse$1" " id_150))))))))" "((rhs511_0)" -"(let-values(((s_840)" +"(let-values(((s_839)" "(cdr" " s_836)))" -"(let-values(((s_841)" +"(let-values(((s_840)" "(if(syntax?$1" -" s_840)" +" s_839)" "(syntax-e$1" -" s_840)" -" s_840)))" +" s_839)" +" s_839)))" "(if(pair?" -" s_841)" +" s_840)" "(let-values(((rhs512_0)" -"(let-values(((s_842)" +"(let-values(((s_841)" "(car" -" s_841)))" -" s_842))" +" s_840)))" +" s_841))" "(()" -"(let-values(((s_843)" +"(let-values(((s_842)" "(cdr" -" s_841)))" -"(let-values(((s_844)" +" s_840)))" +"(let-values(((s_843)" "(if(syntax?$1" -" s_843)" +" s_842)" "(syntax-e$1" -" s_843)" -" s_843)))" +" s_842)" +" s_842)))" "(if(null?" -" s_844)" +" s_843)" "(values)" "(raise-syntax-error$1" " #f" @@ -74419,11 +74461,11 @@ static const char *startup_source = " temp537_0))))" "(let-values((()" "(begin" -"(let-values(((lst_430)" +"(let-values(((lst_432)" " syms_23)" -"((lst_431)" +"((lst_433)" " vals_10)" -"((lst_432)" +"((lst_434)" " ids_46))" "(begin" "(if(variable-reference-from-unsafe?" @@ -74431,51 +74473,51 @@ static const char *startup_source = "(void)" "(let-values()" "(check-list" -" lst_430)))" -"(if(variable-reference-from-unsafe?" -"(#%variable-reference))" -"(void)" -"(let-values()" -"(check-list" -" lst_431)))" -"(if(variable-reference-from-unsafe?" -"(#%variable-reference))" -"(void)" -"(let-values()" -"(check-list" " lst_432)))" -"((letrec-values(((for-loop_335)" -"(lambda(lst_433" -" lst_434" -" lst_435)" +"(if(variable-reference-from-unsafe?" +"(#%variable-reference))" +"(void)" +"(let-values()" +"(check-list" +" lst_433)))" +"(if(variable-reference-from-unsafe?" +"(#%variable-reference))" +"(void)" +"(let-values()" +"(check-list" +" lst_434)))" +"((letrec-values(((for-loop_336)" +"(lambda(lst_435" +" lst_436" +" lst_437)" "(begin" " 'for-loop" "(if(if(pair?" -" lst_433)" -"(if(pair?" -" lst_434)" -"(pair?" " lst_435)" +"(if(pair?" +" lst_436)" +"(pair?" +" lst_437)" " #f)" " #f)" -"(let-values(((sym_109)" -"(unsafe-car" -" lst_433))" -"((rest_256)" -"(unsafe-cdr" -" lst_433))" -"((val_87)" -"(unsafe-car" -" lst_434))" -"((rest_257)" -"(unsafe-cdr" -" lst_434))" -"((id_155)" +"(let-values(((sym_110)" "(unsafe-car" " lst_435))" +"((rest_257)" +"(unsafe-cdr" +" lst_435))" +"((val_87)" +"(unsafe-car" +" lst_436))" "((rest_258)" "(unsafe-cdr" -" lst_435)))" +" lst_436))" +"((id_155)" +"(unsafe-car" +" lst_437))" +"((rest_259)" +"(unsafe-cdr" +" lst_437)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -74491,22 +74533,22 @@ static const char *startup_source = "(namespace-set-transformer!" " m-ns_20" " phase_49" -" sym_109" +" sym_110" " val_87)))" "(values)))))" "(values)))))" "(if(not" " #f)" -"(for-loop_335" -" rest_256" +"(for-loop_336" " rest_257" -" rest_258)" +" rest_258" +" rest_259)" "(values))))" "(values))))))" -" for-loop_335)" -" lst_430" -" lst_431" -" lst_432)))" +" for-loop_336)" +" lst_432" +" lst_433" +" lst_434)))" "(values))))" "(let-values()" "(let-values((()" @@ -74584,38 +74626,38 @@ static const char *startup_source = "(let-values(((ok?_85" " #%require546_0" " req547_0)" -"(let-values(((s_845)" +"(let-values(((s_844)" " ready-body_0))" "(let-values(((orig-s_89)" -" s_845))" +" s_844))" "(let-values(((#%require546_1" " req547_1)" -"(let-values(((s_846)" +"(let-values(((s_845)" "(if(syntax?$1" -" s_845)" +" s_844)" "(syntax-e$1" -" s_845)" -" s_845)))" +" s_844)" +" s_844)))" "(if(pair?" -" s_846)" +" s_845)" "(let-values(((#%require548_0)" -"(let-values(((s_847)" +"(let-values(((s_846)" "(car" -" s_846)))" -" s_847))" +" s_845)))" +" s_846))" "((req549_0)" -"(let-values(((s_848)" +"(let-values(((s_847)" "(cdr" -" s_846)))" -"(let-values(((s_849)" +" s_845)))" +"(let-values(((s_848)" "(if(syntax?$1" -" s_848)" +" s_847)" "(syntax-e$1" -" s_848)" -" s_848)))" +" s_847)" +" s_847)))" "(let-values(((flat-s_62)" "(to-syntax-list.1" -" s_849)))" +" s_848)))" "(if(not" " flat-s_62)" "(let-values()" @@ -74775,38 +74817,38 @@ static const char *startup_source = "(let-values(((ok?_86" " #%declare567_0" " kw568_0)" -"(let-values(((s_850)" +"(let-values(((s_849)" " disarmed-exp-body_1))" "(let-values(((orig-s_90)" -" s_850))" +" s_849))" "(let-values(((#%declare567_1" " kw568_1)" +"(let-values(((s_850)" +"(if(syntax?$1" +" s_849)" +"(syntax-e$1" +" s_849)" +" s_849)))" +"(if(pair?" +" s_850)" +"(let-values(((#%declare569_0)" +"(let-values(((s_276)" +"(car" +" s_850)))" +" s_276))" +"((kw570_0)" +"(let-values(((s_277)" +"(cdr" +" s_850)))" "(let-values(((s_851)" "(if(syntax?$1" -" s_850)" +" s_277)" "(syntax-e$1" -" s_850)" -" s_850)))" -"(if(pair?" -" s_851)" -"(let-values(((#%declare569_0)" -"(let-values(((s_274)" -"(car" -" s_851)))" -" s_274))" -"((kw570_0)" -"(let-values(((s_852)" -"(cdr" -" s_851)))" -"(let-values(((s_853)" -"(if(syntax?$1" -" s_852)" -"(syntax-e$1" -" s_852)" -" s_852)))" +" s_277)" +" s_277)))" "(let-values(((flat-s_63)" "(to-syntax-list.1" -" s_853)))" +" s_851)))" "(if(not" " flat-s_63)" "(let-values()" @@ -74829,7 +74871,7 @@ static const char *startup_source = " kw568_1))))))" "(let-values((()" "(begin" -"(let-values(((lst_436)" +"(let-values(((lst_438)" " kw568_0))" "(begin" "(if(variable-reference-from-unsafe?" @@ -74837,19 +74879,19 @@ static const char *startup_source = "(void)" "(let-values()" "(check-list" -" lst_436)))" -"((letrec-values(((for-loop_336)" -"(lambda(lst_437)" +" lst_438)))" +"((letrec-values(((for-loop_337)" +"(lambda(lst_439)" "(begin" " 'for-loop" "(if(pair?" -" lst_437)" +" lst_439)" "(let-values(((kw_1)" "(unsafe-car" -" lst_437))" -"((rest_259)" +" lst_439))" +"((rest_260)" "(unsafe-cdr" -" lst_437)))" +" lst_439)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -74900,12 +74942,12 @@ static const char *startup_source = "(values)))))" "(if(not" " #f)" -"(for-loop_336" -" rest_259)" +"(for-loop_337" +" rest_260)" "(values))))" "(values))))))" -" for-loop_336)" -" lst_436)))" +" for-loop_337)" +" lst_438)))" "(values))))" "(let-values()" "(let-values(((parsed-body_1)" @@ -74955,18 +74997,18 @@ static const char *startup_source = "(lambda(ids_47 rhs_23 phase_146)" "(let-values(((scoped-ids_0)" "(reverse$1" -"(let-values(((lst_438) ids_47))" +"(let-values(((lst_440) ids_47))" "(begin" "(if(variable-reference-from-unsafe?(#%variable-reference))" "(void)" -"(let-values()(check-list lst_438)))" -"((letrec-values(((for-loop_337)" -"(lambda(fold-var_376 lst_439)" +"(let-values()(check-list lst_440)))" +"((letrec-values(((for-loop_338)" +"(lambda(fold-var_376 lst_441)" "(begin" " 'for-loop" -"(if(pair? lst_439)" -"(let-values(((id_156)(unsafe-car lst_439))" -"((rest_260)(unsafe-cdr lst_439)))" +"(if(pair? lst_441)" +"(let-values(((id_156)(unsafe-car lst_441))" +"((rest_261)(unsafe-cdr lst_441)))" "(let-values(((fold-var_377)" "(let-values(((fold-var_378) fold-var_376))" "(let-values(((fold-var_379)" @@ -74978,11 +75020,11 @@ static const char *startup_source = " inside-scope_2))" " fold-var_378))))" "(values fold-var_379)))))" -"(if(not #f)(for-loop_337 fold-var_377 rest_260) fold-var_377)))" +"(if(not #f)(for-loop_338 fold-var_377 rest_261) fold-var_377)))" " fold-var_376)))))" -" for-loop_337)" +" for-loop_338)" " null" -" lst_438))))))" +" lst_440))))))" "(let-values(((syms_24)" "(let-values(((scoped-ids571_0) scoped-ids_0)" "((defined-syms572_0) defined-syms_13)" @@ -75002,7 +75044,7 @@ static const char *startup_source = " self573_0" " phase574_0" " all-scopes-stx575_0))))" -"(let-values(((s_292)" +"(let-values(((s_295)" "(add-scope" "(datum->syntax$1" " #f" @@ -75011,7 +75053,7 @@ static const char *startup_source = " scoped-ids_0" " rhs_23))" " inside-scope_2)))" -"(values scoped-ids_0(semi-parsed-define-values2.1 s_292 syms_24 scoped-ids_0 rhs_23)))))))))" +"(values scoped-ids_0(semi-parsed-define-values2.1 s_295 syms_24 scoped-ids_0 rhs_23)))))))))" "(define-values" "(add-post-expansion-scope)" "(lambda(bodys_23 ctx_114)" @@ -75019,15 +75061,15 @@ static const char *startup_source = "(let-values(((sc_40)(root-expand-context-post-expansion-scope ctx_114)))" "(if sc_40" "(reverse$1" -"(let-values(((lst_440) bodys_23))" +"(let-values(((lst_442) bodys_23))" "(begin" -"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_440)))" -"((letrec-values(((for-loop_338)" -"(lambda(fold-var_380 lst_441)" +"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_442)))" +"((letrec-values(((for-loop_339)" +"(lambda(fold-var_380 lst_443)" "(begin" " 'for-loop" -"(if(pair? lst_441)" -"(let-values(((body_21)(unsafe-car lst_441))((rest_261)(unsafe-cdr lst_441)))" +"(if(pair? lst_443)" +"(let-values(((body_21)(unsafe-car lst_443))((rest_262)(unsafe-cdr lst_443)))" "(let-values(((fold-var_381)" "(let-values(((fold-var_382) fold-var_380))" "(let-values(((fold-var_383)" @@ -75036,11 +75078,11 @@ static const char *startup_source = "(let-values()(add-scope body_21 sc_40))" " fold-var_382))))" "(values fold-var_383)))))" -"(if(not #f)(for-loop_338 fold-var_381 rest_261) fold-var_381)))" +"(if(not #f)(for-loop_339 fold-var_381 rest_262) fold-var_381)))" " fold-var_380)))))" -" for-loop_338)" +" for-loop_339)" " null" -" lst_440))))" +" lst_442))))" " bodys_23)))))" "(define-values" "(finish-expanding-body-expressons99.1)" @@ -75147,86 +75189,86 @@ static const char *startup_source = "(let-values(((syms_25)" "(semi-parsed-define-values-syms" " body_22)))" -"(let-values(((s_854)" +"(let-values(((s_852)" "(semi-parsed-define-values-s" " body_22)))" "(let-values(((ok?_87" " define-values578_0" " _579_0" " _580_0)" -"(let-values(((s_855)" +"(let-values(((s_853)" "(syntax-disarm$1" -" s_854)))" +" s_852)))" "(if(if(not" "(expand-context-to-parsed?" " rhs-ctx_2))" " #t" " #f)" "(let-values(((orig-s_91)" -" s_855))" +" s_853))" "(let-values(((define-values578_1" " _579_1" " _580_1)" -"(let-values(((s_856)" +"(let-values(((s_854)" "(if(syntax?$1" -" s_855)" +" s_853)" "(syntax-e$1" -" s_855)" -" s_855)))" +" s_853)" +" s_853)))" "(if(pair?" -" s_856)" +" s_854)" "(let-values(((define-values581_0)" -"(let-values(((s_857)" +"(let-values(((s_855)" "(car" -" s_856)))" -" s_857))" +" s_854)))" +" s_855))" "((_582_0" " _583_0)" -"(let-values(((s_858)" +"(let-values(((s_856)" "(cdr" +" s_854)))" +"(let-values(((s_857)" +"(if(syntax?$1" +" s_856)" +"(syntax-e$1" +" s_856)" " s_856)))" -"(let-values(((s_859)" -"(if(syntax?$1" -" s_858)" -"(syntax-e$1" -" s_858)" -" s_858)))" "(if(pair?" -" s_859)" +" s_857)" "(let-values(((_584_0)" -"(let-values(((s_860)" +"(let-values(((s_858)" "(car" -" s_859)))" -" s_860))" +" s_857)))" +" s_858))" "((_585_0)" -"(let-values(((s_861)" +"(let-values(((s_859)" "(cdr" +" s_857)))" +"(let-values(((s_860)" +"(if(syntax?$1" +" s_859)" +"(syntax-e$1" +" s_859)" " s_859)))" -"(let-values(((s_862)" -"(if(syntax?$1" -" s_861)" -"(syntax-e$1" -" s_861)" -" s_861)))" "(if(pair?" -" s_862)" +" s_860)" "(let-values(((_586_0)" -"(let-values(((s_863)" +"(let-values(((s_861)" "(car" -" s_862)))" -" s_863))" +" s_860)))" +" s_861))" "(()" -"(let-values(((s_864)" +"(let-values(((s_862)" "(cdr" -" s_862)))" -"(let-values(((s_865)" +" s_860)))" +"(let-values(((s_863)" "(if(syntax?$1" -" s_864)" +" s_862)" "(syntax-e$1" -" s_864)" -" s_864)))" +" s_862)" +" s_862)))" "(if(null?" -" s_865)" +" s_863)" "(values)" "(raise-syntax-error$1" " #f" @@ -75267,7 +75309,7 @@ static const char *startup_source = "(let-values(((rhs-ctx587_0)" " rhs-ctx_2)" "((s588_0)" -" s_854)" +" s_852)" "((temp589_0)" " #t))" "(keep-as-needed119.1" @@ -75478,7 +75520,7 @@ static const char *startup_source = "(let-values(((ht_162) need-eventually-defined_3))" "(begin" "(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-in-hash ht_162)))" -"((letrec-values(((for-loop_339)" +"((letrec-values(((for-loop_340)" "(lambda(i_189)" "(begin" " 'for-loop" @@ -75491,24 +75533,24 @@ static const char *startup_source = "(begin" "(let-values()" "(begin" -"(let-values(((lst_442) l_89))" +"(let-values(((lst_444) l_89))" "(begin" "(if(variable-reference-from-unsafe?" "(#%variable-reference))" "(void)" -"(let-values()(check-list lst_442)))" -"((letrec-values(((for-loop_340)" -"(lambda(lst_443)" +"(let-values()(check-list lst_444)))" +"((letrec-values(((for-loop_341)" +"(lambda(lst_445)" "(begin" " 'for-loop" "(if(pair?" -" lst_443)" +" lst_445)" "(let-values(((id_157)" "(unsafe-car" -" lst_443))" -"((rest_262)" +" lst_445))" +"((rest_263)" "(unsafe-cdr" -" lst_443)))" +" lst_445)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -75591,18 +75633,18 @@ static const char *startup_source = "(values)))))" "(values)))))" "(if(not #f)" -"(for-loop_340" -" rest_262)" +"(for-loop_341" +" rest_263)" "(values))))" "(values))))))" -" for-loop_340)" -" lst_442)))" +" for-loop_341)" +" lst_444)))" "(void)))" "(values)))))" "(values)))))" -"(if(not #f)(for-loop_339(hash-iterate-next ht_162 i_189))(values))))" +"(if(not #f)(for-loop_340(hash-iterate-next ht_162 i_189))(values))))" "(values))))))" -" for-loop_339)" +" for-loop_340)" "(hash-iterate-first ht_162))))" "(void)))))" "(define-values" @@ -75678,35 +75720,35 @@ static const char *startup_source = "(void)))" "(values))))" "(let-values(((ok?_88 #%provide611_0 spec612_0)" -"(let-values(((s_866) disarmed-body_1))" -"(let-values(((orig-s_92) s_866))" +"(let-values(((s_864) disarmed-body_1))" +"(let-values(((orig-s_92) s_864))" "(let-values(((#%provide611_1" " spec612_1)" -"(let-values(((s_663)" +"(let-values(((s_865)" "(if(syntax?$1" -" s_866)" +" s_864)" "(syntax-e$1" -" s_866)" -" s_866)))" -"(if(pair? s_663)" +" s_864)" +" s_864)))" +"(if(pair? s_865)" "(let-values(((#%provide613_0)" -"(let-values(((s_867)" +"(let-values(((s_866)" "(car" -" s_663)))" -" s_867))" +" s_865)))" +" s_866))" "((spec614_0)" -"(let-values(((s_868)" +"(let-values(((s_867)" "(cdr" -" s_663)))" -"(let-values(((s_869)" +" s_865)))" +"(let-values(((s_868)" "(if(syntax?$1" -" s_868)" +" s_867)" "(syntax-e$1" -" s_868)" -" s_868)))" +" s_867)" +" s_867)))" "(let-values(((flat-s_64)" "(to-syntax-list.1" -" s_869)))" +" s_868)))" "(if(not" " flat-s_64)" "(let-values()" @@ -75981,16 +76023,16 @@ static const char *startup_source = " compiled-module631_0)))))))))))))))))))))))))" "(define-values" "(attach-root-expand-context-properties)" -"(lambda(s_870 root-ctx_8 orig-self_1 new-self_2)" +"(lambda(s_684 root-ctx_8 orig-self_1 new-self_2)" "(begin" -"(let-values(((s_871)" -"(syntax-property$1 s_870 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))" -"(let-values(((s_684)" +"(let-values(((s_688)" +"(syntax-property$1 s_684 'module-body-context(root-expand-context-all-scopes-stx root-ctx_8))))" +"(let-values(((s_869)" "(syntax-property$1" -" s_871" +" s_688" " 'module-body-inside-context" "(add-scope empty-syntax(root-expand-context-post-expansion-scope root-ctx_8)))))" -" s_684)))))" +" s_869)))))" "(define-values" "(expand-post-submodules165.1)" "(lambda(all-scopes-s147_0" @@ -76035,37 +76077,37 @@ static const char *startup_source = "(semi-parsed-begin-for-syntax-s" " body_23)))" "(let-values(((ok?_89 begin-for-syntax633_0 _634_0)" -"(let-values(((s_696)" +"(let-values(((s_870)" "(syntax-disarm$1" " body-s_0)))" -"(let-values(((orig-s_93) s_696))" +"(let-values(((orig-s_93) s_870))" "(let-values(((begin-for-syntax633_1" " _634_1)" -"(let-values(((s_872)" +"(let-values(((s_871)" "(if(syntax?$1" -" s_696)" +" s_870)" "(syntax-e$1" -" s_696)" -" s_696)))" -"(if(pair? s_872)" +" s_870)" +" s_870)))" +"(if(pair? s_871)" "(let-values(((begin-for-syntax635_0)" -"(let-values(((s_873)" +"(let-values(((s_872)" "(car" -" s_872)))" -" s_873))" +" s_871)))" +" s_872))" "((_636_0)" -"(let-values(((s_874)" +"(let-values(((s_873)" "(cdr" -" s_872)))" -"(let-values(((s_875)" +" s_871)))" +"(let-values(((s_874)" "(if(syntax?$1" -" s_874)" +" s_873)" "(syntax-e$1" -" s_874)" -" s_874)))" +" s_873)" +" s_873)))" "(let-values(((flat-s_65)" "(to-syntax-list.1" -" s_875)))" +" s_874)))" "(if(not" " flat-s_65)" "(let-values()" @@ -76152,60 +76194,60 @@ static const char *startup_source = " module*641_0" " name642_0" " _643_0)" -"(let-values(((s_876)" +"(let-values(((s_875)" " disarmed-body_2))" -"(if(let-values(((s_703)" +"(if(let-values(((s_876)" "(if(syntax?$1" -" s_876)" +" s_875)" "(syntax-e$1" -" s_876)" -" s_876)))" -"(if(pair? s_703)" +" s_875)" +" s_875)))" +"(if(pair? s_876)" "(if(let-values(((s_877)" "(car" -" s_703)))" +" s_876)))" " #t)" "(let-values(((s_878)" "(cdr" -" s_703)))" -"(let-values(((s_704)" +" s_876)))" +"(let-values(((s_879)" "(if(syntax?$1" " s_878)" "(syntax-e$1" " s_878)" " s_878)))" "(if(pair?" -" s_704)" -"(if(let-values(((s_879)" +" s_879)" +"(if(let-values(((s_880)" "(car" -" s_704)))" +" s_879)))" " #t)" -"(let-values(((s_880)" -"(cdr" -" s_704)))" "(let-values(((s_881)" +"(cdr" +" s_879)))" +"(let-values(((s_882)" "(if(syntax?$1" -" s_880)" -"(syntax-e$1" -" s_880)" -" s_880)))" -"(if(pair?" " s_881)" -"(if(let-values(((s_882)" -"(car" -" s_881)))" -"(let-values(((s_883)" -"(if(syntax?$1" -" s_882)" "(syntax-e$1" +" s_881)" +" s_881)))" +"(if(pair?" " s_882)" +"(if(let-values(((s_883)" +"(car" " s_882)))" +"(let-values(((s_884)" +"(if(syntax?$1" +" s_883)" +"(syntax-e$1" +" s_883)" +" s_883)))" "(eq?" " #f" -" s_883)))" -"(let-values(((s_884)" +" s_884)))" +"(let-values(((s_885)" "(cdr" -" s_881)))" +" s_882)))" " #t)" " #f)" " #f)))" @@ -76217,37 +76259,37 @@ static const char *startup_source = "(let-values(((module*641_1" " name642_1" " _643_1)" -"(let-values(((s_885)" -"(if(syntax?$1" -" s_876)" -"(syntax-e$1" -" s_876)" -" s_876)))" -"(let-values(((module*644_0)" "(let-values(((s_886)" +"(if(syntax?$1" +" s_875)" +"(syntax-e$1" +" s_875)" +" s_875)))" +"(let-values(((module*644_0)" +"(let-values(((s_887)" "(car" -" s_885)))" -" s_886))" +" s_886)))" +" s_887))" "((name645_0" " _646_0)" -"(let-values(((s_887)" -"(cdr" -" s_885)))" "(let-values(((s_888)" -"(if(syntax?$1" -" s_887)" -"(syntax-e$1" -" s_887)" -" s_887)))" -"(let-values(((name647_0)" +"(cdr" +" s_886)))" "(let-values(((s_889)" -"(car" +"(if(syntax?$1" +" s_888)" +"(syntax-e$1" +" s_888)" " s_888)))" -" s_889))" +"(let-values(((name647_0)" +"(let-values(((s_705)" +"(car" +" s_889)))" +" s_705))" "((_648_0)" "(let-values(((s_890)" "(cdr" -" s_888)))" +" s_889)))" "(let-values(((s_891)" "(if(syntax?$1" " s_890)" @@ -76258,7 +76300,7 @@ static const char *startup_source = "(let-values(((s_892)" "(car" " s_891)))" -"(let-values(((s_705)" +"(let-values(((s_706)" "(if(syntax?$1" " s_892)" "(syntax-e$1" @@ -76429,18 +76471,18 @@ static const char *startup_source = "(let-values(((s_894) in168_0))" "(let-values()" "(begin" -"(let-values(((lst_444) ids_49))" +"(let-values(((lst_446) ids_49))" "(begin" "(if(variable-reference-from-unsafe?(#%variable-reference))" "(void)" -"(let-values()(check-list lst_444)))" -"((letrec-values(((for-loop_341)" -"(lambda(lst_445)" +"(let-values()(check-list lst_446)))" +"((letrec-values(((for-loop_342)" +"(lambda(lst_447)" "(begin" " 'for-loop" -"(if(pair? lst_445)" -"(let-values(((id_126)(unsafe-car lst_445))" -"((rest_263)(unsafe-cdr lst_445)))" +"(if(pair? lst_447)" +"(let-values(((id_158)(unsafe-car lst_447))" +"((rest_264)(unsafe-cdr lst_447)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -76449,7 +76491,7 @@ static const char *startup_source = "(let-values()" "(let-values(((requires+provides671_0)" " requires+provides_13)" -"((id672_0) id_126)" +"((id672_0) id_158)" "((phase673_0)" " phase_153)" "((s674_0) s_894)" @@ -76467,25 +76509,25 @@ static const char *startup_source = " phase673_0)))" "(values)))))" "(values)))))" -"(if(not #f)(for-loop_341 rest_263)(values))))" +"(if(not #f)(for-loop_342 rest_264)(values))))" "(values))))))" -" for-loop_341)" -" lst_444)))" +" for-loop_342)" +" lst_446)))" "(void))))))))))" "(define-values" "(eval-nested-bodys)" "(lambda(bodys_28 phase_154 m-ns_23 self_41 ctx_119)" "(begin" "(begin" -"(let-values(((lst_446) bodys_28))" +"(let-values(((lst_448) bodys_28))" "(begin" -"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_446)))" -"((letrec-values(((for-loop_342)" -"(lambda(lst_447)" +"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_448)))" +"((letrec-values(((for-loop_343)" +"(lambda(lst_449)" "(begin" " 'for-loop" -"(if(pair? lst_447)" -"(let-values(((body_24)(unsafe-car lst_447))((rest_264)(unsafe-cdr lst_447)))" +"(if(pair? lst_449)" +"(let-values(((body_24)(unsafe-car lst_449))((rest_265)(unsafe-cdr lst_449)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -76512,59 +76554,59 @@ static const char *startup_source = " m-ns_23" " ctx_119)))" "(begin" -"(let-values(((lst_448) ids_50)" -"((lst_449)" +"(let-values(((lst_450) ids_50)" +"((lst_451)" "(parsed-define-values-syms" " p_87))" -"((lst_450) vals_11))" +"((lst_452) vals_11))" "(begin" "(if(variable-reference-from-unsafe?" "(#%variable-reference))" "(void)" "(let-values()" -"(check-list lst_448)))" -"(if(variable-reference-from-unsafe?" -"(#%variable-reference))" -"(void)" -"(let-values()" -"(check-list lst_449)))" -"(if(variable-reference-from-unsafe?" -"(#%variable-reference))" -"(void)" -"(let-values()" "(check-list lst_450)))" -"((letrec-values(((for-loop_343)" -"(lambda(lst_451" -" lst_452" -" lst_453)" +"(if(variable-reference-from-unsafe?" +"(#%variable-reference))" +"(void)" +"(let-values()" +"(check-list lst_451)))" +"(if(variable-reference-from-unsafe?" +"(#%variable-reference))" +"(void)" +"(let-values()" +"(check-list lst_452)))" +"((letrec-values(((for-loop_344)" +"(lambda(lst_453" +" lst_454" +" lst_455)" "(begin" " 'for-loop" "(if(if(pair?" -" lst_451)" -"(if(pair?" -" lst_452)" -"(pair?" " lst_453)" +"(if(pair?" +" lst_454)" +"(pair?" +" lst_455)" " #f)" " #f)" -"(let-values(((id_158)" -"(unsafe-car" -" lst_451))" -"((rest_265)" -"(unsafe-cdr" -" lst_451))" -"((sym_110)" -"(unsafe-car" -" lst_452))" -"((rest_266)" -"(unsafe-cdr" -" lst_452))" -"((val_88)" +"(let-values(((id_159)" "(unsafe-car" " lst_453))" +"((rest_266)" +"(unsafe-cdr" +" lst_453))" +"((sym_111)" +"(unsafe-car" +" lst_454))" "((rest_267)" "(unsafe-cdr" -" lst_453)))" +" lst_454))" +"((val_88)" +"(unsafe-car" +" lst_455))" +"((rest_268)" +"(unsafe-cdr" +" lst_455)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -76574,22 +76616,22 @@ static const char *startup_source = "(namespace-set-variable!" " m-ns_23" " phase_154" -" sym_110" +" sym_111" " val_88))" "(values)))))" "(values)))))" "(if(not" " #f)" -"(for-loop_343" -" rest_265" +"(for-loop_344" " rest_266" -" rest_267)" +" rest_267" +" rest_268)" "(values))))" "(values))))))" -" for-loop_343)" -" lst_448" -" lst_449" -" lst_450)))" +" for-loop_344)" +" lst_450" +" lst_451" +" lst_452)))" "(void)))))" "(if(let-values(((or-part_411)" "(parsed-define-syntaxes?" @@ -76635,10 +76677,10 @@ static const char *startup_source = " m-ns_23)))))))))" "(values)))))" "(values)))))" -"(if(not #f)(for-loop_342 rest_264)(values))))" +"(if(not #f)(for-loop_343 rest_265)(values))))" "(values))))))" -" for-loop_342)" -" lst_446)))" +" for-loop_343)" +" lst_448)))" "(void)))))" "(define-values" "(expand-submodule197.1)" @@ -76656,7 +76698,7 @@ static const char *startup_source = " ctx196_0)" "(begin" " 'expand-submodule197" -"(let-values(((s_730) s194_0))" +"(let-values(((s_734) s194_0))" "(let-values(((self_42) self195_0))" "(let-values(((ctx_120) ctx196_0))" "(let-values(((is-star?_0) is-star?176_0))" @@ -76679,42 +76721,42 @@ static const char *startup_source = "(let-values()" "(let-values()" "(begin" -"(call-expand-observe obs_161 'enter-prim s_730)" +"(call-expand-observe obs_161 'enter-prim s_734)" "(call-expand-observe" " obs_161" "(if is-star?_0 'prim-submodule* 'prim-submodule)))))" "(void)))))" "(values))))" "(let-values(((ok?_91 module678_0 name679_0 _680_0)" -"(let-values(((s_756) s_730))" -"(let-values(((orig-s_94) s_756))" +"(let-values(((s_895) s_734))" +"(let-values(((orig-s_94) s_895))" "(let-values(((module678_1 name679_1 _680_1)" -"(let-values(((s_895)" -"(if(syntax?$1 s_756)" -"(syntax-e$1 s_756)" -" s_756)))" -"(if(pair? s_895)" +"(let-values(((s_896)" +"(if(syntax?$1 s_895)" +"(syntax-e$1 s_895)" +" s_895)))" +"(if(pair? s_896)" "(let-values(((module681_0)" -"(let-values(((s_896)(car s_895)))" -" s_896))" +"(let-values(((s_897)(car s_896)))" +" s_897))" "((name682_0 _683_0)" -"(let-values(((s_897)(cdr s_895)))" -"(let-values(((s_898)" -"(if(syntax?$1" -" s_897)" -"(syntax-e$1 s_897)" -" s_897)))" -"(if(pair? s_898)" -"(let-values(((name684_0)" +"(let-values(((s_898)(cdr s_896)))" "(let-values(((s_899)" -"(car" +"(if(syntax?$1" +" s_898)" +"(syntax-e$1 s_898)" " s_898)))" -" s_899))" -"((_685_0)" +"(if(pair? s_899)" +"(let-values(((name684_0)" "(let-values(((s_900)" +"(car" +" s_899)))" +" s_900))" +"((_685_0)" +"(let-values(((s_901)" "(cdr" -" s_898)))" -" s_900)))" +" s_899)))" +" s_901)))" "(values name684_0 _685_0))" "(raise-syntax-error$1" " #f" @@ -76734,7 +76776,7 @@ static const char *startup_source = "(raise-syntax-error$1" " #f" " \"submodule already declared with the same name\"" -" s_730" +" s_734" " name_82))" "(void))" "(values))))" @@ -76751,11 +76793,11 @@ static const char *startup_source = "(if obs_162" "(let-values()" "(let-values()" -"(call-expand-observe obs_162 'enter-prim s_730)))" +"(call-expand-observe obs_162 'enter-prim s_734)))" "(void)))" "(values))))" "(let-values(((submod_5)" -"(let-values(((s686_0) s_730)" +"(let-values(((s686_0) s_734)" "((temp687_0)" "(let-values(((v_277) ctx_120))" "(let-values(((the-struct_118) v_277))" @@ -77054,18 +77096,18 @@ static const char *startup_source = "(let-values(((modules-being-compiled_9) modules-being-compiled203_0))" "(let-values()" "(reverse$1" -"(let-values(((lst_454) bodys_29))" +"(let-values(((lst_456) bodys_29))" "(begin" "(if(variable-reference-from-unsafe?(#%variable-reference))" "(void)" -"(let-values()(check-list lst_454)))" -"((letrec-values(((for-loop_344)" -"(lambda(fold-var_384 lst_455)" +"(let-values()(check-list lst_456)))" +"((letrec-values(((for-loop_345)" +"(lambda(fold-var_384 lst_457)" "(begin" " 'for-loop" -"(if(pair? lst_455)" -"(let-values(((body_25)(unsafe-car lst_455))" -"((rest_268)(unsafe-cdr lst_455)))" +"(if(pair? lst_457)" +"(let-values(((body_25)(unsafe-car lst_457))" +"((rest_269)(unsafe-cdr lst_457)))" "(let-values(((fold-var_385)" "(let-values(((fold-var_386) fold-var_384))" "(let-values(((fold-var_387)" @@ -77112,12 +77154,12 @@ static const char *startup_source = " fold-var_386))))" "(values fold-var_387)))))" "(if(not #f)" -"(for-loop_344 fold-var_385 rest_268)" +"(for-loop_345 fold-var_385 rest_269)" " fold-var_385)))" " fold-var_384)))))" -" for-loop_344)" +" for-loop_345)" " null" -" lst_454))))))))))))))))" +" lst_456))))))))))))))))" "(define-values" "(make-parse-lifted-require220.1)" "(lambda(declared-submodule-names215_0 m-ns217_0 self218_0 requires+provides219_0)" @@ -77128,37 +77170,37 @@ static const char *startup_source = "(let-values(((requires+provides_14) requires+provides219_0))" "(let-values(((declared-submodule-names_10) declared-submodule-names215_0))" "(let-values()" -"(lambda(s_901 phase_156)" +"(lambda(s_902 phase_156)" "(let-values(((ok?_92 #%require722_0 req723_0)" -"(let-values(((s_902)(syntax-disarm$1 s_901)))" -"(let-values(((orig-s_95) s_902))" +"(let-values(((s_903)(syntax-disarm$1 s_902)))" +"(let-values(((orig-s_95) s_903))" "(let-values(((#%require722_1 req723_1)" -"(let-values(((s_903)" -"(if(syntax?$1 s_902)(syntax-e$1 s_902) s_902)))" -"(if(pair? s_903)" +"(let-values(((s_904)" +"(if(syntax?$1 s_903)(syntax-e$1 s_903) s_903)))" +"(if(pair? s_904)" "(let-values(((#%require724_0)" -"(let-values(((s_904)(car s_903))) s_904))" +"(let-values(((s_905)(car s_904))) s_905))" "((req725_0)" -"(let-values(((s_905)(cdr s_903)))" -"(let-values(((s_906)" -"(if(syntax?$1 s_905)" -"(syntax-e$1 s_905)" -" s_905)))" -"(if(pair? s_906)" -"(let-values(((req726_0)" +"(let-values(((s_906)(cdr s_904)))" "(let-values(((s_907)" -"(car s_906)))" -" s_907))" -"(()" +"(if(syntax?$1 s_906)" +"(syntax-e$1 s_906)" +" s_906)))" +"(if(pair? s_907)" +"(let-values(((req726_0)" "(let-values(((s_908)" -"(cdr s_906)))" +"(car s_907)))" +" s_908))" +"(()" "(let-values(((s_909)" +"(cdr s_907)))" +"(let-values(((s_910)" "(if(syntax?$1" -" s_908)" +" s_909)" "(syntax-e$1" -" s_908)" -" s_908)))" -"(if(null? s_909)" +" s_909)" +" s_909)))" +"(if(null? s_910)" "(values)" "(raise-syntax-error$1" " #f" @@ -77173,7 +77215,7 @@ static const char *startup_source = " (raise-syntax-error$1 #f \"bad syntax\" orig-s_95)))))" "(values #t #%require722_1 req723_1))))))" "(let-values(((temp727_0)(list req723_0))" -"((s728_0) s_901)" +"((s728_0) s_902)" "((self729_0) self_44)" "((m-ns730_0) m-ns_24)" "((phase731_0) phase_156)" @@ -77210,16 +77252,16 @@ static const char *startup_source = "(lambda(lifted-defns_2)" "(begin" "(reverse$1" -"(let-values(((lst_456) lifted-defns_2))" +"(let-values(((lst_458) lifted-defns_2))" "(begin" -"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_456)))" -"((letrec-values(((for-loop_345)" -"(lambda(fold-var_388 lst_457)" +"(if(variable-reference-from-unsafe?(#%variable-reference))(void)(let-values()(check-list lst_458)))" +"((letrec-values(((for-loop_346)" +"(lambda(fold-var_388 lst_459)" "(begin" " 'for-loop" -"(if(pair? lst_457)" -"(let-values(((lifted-defn_0)(unsafe-car lst_457))" -"((rest_269)(unsafe-cdr lst_457)))" +"(if(pair? lst_459)" +"(let-values(((lifted-defn_0)(unsafe-car lst_459))" +"((rest_270)(unsafe-cdr lst_459)))" "(let-values(((fold-var_389)" "(let-values(((fold-var_390) fold-var_388))" "(let-values(((fold-var_391)" @@ -77229,11 +77271,11 @@ static const char *startup_source = "(defn-extract-syntax lifted-defn_0))" " fold-var_390))))" "(values fold-var_391)))))" -"(if(not #f)(for-loop_345 fold-var_389 rest_269) fold-var_389)))" +"(if(not #f)(for-loop_346 fold-var_389 rest_270) fold-var_389)))" " fold-var_388)))))" -" for-loop_345)" +" for-loop_346)" " null" -" lst_456)))))))" +" lst_458)))))))" "(define-values" "(log-lifted-defns)" "(lambda(partial-body-ctx_2 lifted-defns_3 exp-body_10 rest-bodys_4)" @@ -77249,18 +77291,18 @@ static const char *startup_source = "(let-values((()(begin(call-expand-observe obs_165 'module-lift-loop s-lifted-defns_0)(values))))" "(let-values((()" "(begin" -"(let-values(((lst_458) s-lifted-defns_0))" +"(let-values(((lst_460) s-lifted-defns_0))" "(begin" "(if(variable-reference-from-unsafe?(#%variable-reference))" "(void)" -"(let-values()(check-list lst_458)))" -"((letrec-values(((for-loop_346)" -"(lambda(lst_459)" +"(let-values()(check-list lst_460)))" +"((letrec-values(((for-loop_347)" +"(lambda(lst_461)" "(begin" " 'for-loop" -"(if(pair? lst_459)" -"(let-values(((s-lifted-defn_0)(unsafe-car lst_459))" -"((rest_270)(unsafe-cdr lst_459)))" +"(if(pair? lst_461)" +"(let-values(((s-lifted-defn_0)(unsafe-car lst_461))" +"((rest_271)(unsafe-cdr lst_461)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -77270,38 +77312,38 @@ static const char *startup_source = "(let-values(((ok?_93" " define-values740_0" " _741_0)" -"(let-values(((s_910)" +"(let-values(((s_911)" " s-lifted-defn_0))" "(let-values(((orig-s_96)" -" s_910))" +" s_911))" "(let-values(((define-values740_1" " _741_1)" -"(let-values(((s_911)" -"(if(syntax?$1" -" s_910)" -"(syntax-e$1" -" s_910)" -" s_910)))" -"(if(pair?" -" s_911)" -"(let-values(((define-values742_0)" "(let-values(((s_912)" -"(car" -" s_911)))" -" s_912))" -"((_743_0)" -"(let-values(((s_913)" -"(cdr" -" s_911)))" -"(let-values(((s_914)" "(if(syntax?$1" -" s_913)" +" s_911)" "(syntax-e$1" -" s_913)" -" s_913)))" +" s_911)" +" s_911)))" +"(if(pair?" +" s_912)" +"(let-values(((define-values742_0)" +"(let-values(((s_913)" +"(car" +" s_912)))" +" s_913))" +"((_743_0)" +"(let-values(((s_914)" +"(cdr" +" s_912)))" +"(let-values(((s_915)" +"(if(syntax?$1" +" s_914)" +"(syntax-e$1" +" s_914)" +" s_914)))" "(let-values(((flat-s_66)" "(to-syntax-list.1" -" s_914)))" +" s_915)))" "(if(not" " flat-s_66)" "(let-values()" @@ -77366,23 +77408,23 @@ static const char *startup_source = " s-lifted-defn_0))))" "(values)))))" "(values)))))" -"(if(not #f)(for-loop_346 rest_270)(values))))" +"(if(not #f)(for-loop_347 rest_271)(values))))" "(values))))))" -" for-loop_346)" -" lst_458)))" +" for-loop_347)" +" lst_460)))" "(values))))" "(let-values()" "(let-values(((ok?_94 form-id736_0 _737_0)" -"(let-values(((s_915) exp-body_10))" -"(let-values(((orig-s_97) s_915))" +"(let-values(((s_916) exp-body_10))" +"(let-values(((orig-s_97) s_916))" "(let-values(((form-id736_1 _737_1)" -"(let-values(((s_916)" -"(if(syntax?$1 s_915)(syntax-e$1 s_915) s_915)))" -"(if(pair? s_916)" +"(let-values(((s_917)" +"(if(syntax?$1 s_916)(syntax-e$1 s_916) s_916)))" +"(if(pair? s_917)" "(let-values(((form-id738_0)" -"(let-values(((s_917)(car s_916))) s_917))" +"(let-values(((s_918)(car s_917))) s_918))" "((_739_0)" -"(let-values(((s_918)(cdr s_916))) s_918)))" +"(let-values(((s_919)(cdr s_917))) s_919)))" "(values form-id738_0 _739_0))" " (raise-syntax-error$1 #f \"bad syntax\" orig-s_97)))))" "(values #t form-id736_1 _737_1))))))" @@ -77404,20 +77446,20 @@ static const char *startup_source = "(let-values()" "(let-values(((s-defn_0)(defn-extract-syntax defn_1)))" "(let-values(((ok?_95 define-values744_0 _745_0)" -"(let-values(((s_919) s-defn_0))" -"(let-values(((orig-s_98) s_919))" +"(let-values(((s_920) s-defn_0))" +"(let-values(((orig-s_98) s_920))" "(let-values(((define-values744_1 _745_1)" -"(let-values(((s_920)(if(syntax?$1 s_919)(syntax-e$1 s_919) s_919)))" -"(if(pair? s_920)" +"(let-values(((s_921)(if(syntax?$1 s_920)(syntax-e$1 s_920) s_920)))" +"(if(pair? s_921)" "(let-values(((define-values746_0)" -"(let-values(((s_921)(car s_920))) s_921))" +"(let-values(((s_922)(car s_921))) s_922))" "((_747_0)" -"(let-values(((s_922)(cdr s_920)))" -"(let-values(((s_923)" -"(if(syntax?$1 s_922)" -"(syntax-e$1 s_922)" -" s_922)))" -"(let-values(((flat-s_67)(to-syntax-list.1 s_923)))" +"(let-values(((s_923)(cdr s_921)))" +"(let-values(((s_924)" +"(if(syntax?$1 s_923)" +"(syntax-e$1 s_923)" +" s_923)))" +"(let-values(((flat-s_67)(to-syntax-list.1 s_924)))" "(if(not flat-s_67)" "(let-values()" "(raise-syntax-error$1" @@ -77490,17 +77532,17 @@ static const char *startup_source = "(values))))" "(let-values(((tmp-bind-ids_0)" "(reverse$1" -"(let-values(((lst_460) tl-ids_2))" +"(let-values(((lst_462) tl-ids_2))" "(begin" "(if(variable-reference-from-unsafe?(#%variable-reference))" "(void)" -"(let-values()(check-list lst_460)))" +"(let-values()(check-list lst_462)))" "((letrec-values(((for-loop_80)" "(lambda(fold-var_216 lst_86)" "(begin" " 'for-loop" "(if(pair? lst_86)" -"(let-values(((id_159)(unsafe-car lst_86))" +"(let-values(((id_160)(unsafe-car lst_86))" "((rest_250)(unsafe-cdr lst_86)))" "(let-values(((fold-var_26)" "(let-values(((fold-var_394) fold-var_216))" @@ -77509,7 +77551,7 @@ static const char *startup_source = "(cons" "(let-values()" "(add-scope" -" id_159" +" id_160" " top-level-bind-scope_6))" " fold-var_394))))" "(values fold-var_219)))))" @@ -77519,7 +77561,7 @@ static const char *startup_source = " fold-var_216)))))" " for-loop_80)" " null" -" lst_460))))))" +" lst_462))))))" "(values tl-ids_2(select-defined-syms-and-bind!/ctx tmp-bind-ids_0 ctx_124)))))))))" "(void" "(add-core-form!*" @@ -77581,7 +77623,7 @@ static const char *startup_source = "(check-list" " lst_80)))" "((letrec-values(((for-loop_96)" -"(lambda(id_160" +"(lambda(id_161" " lst_81)" "(begin" " 'for-loop" @@ -77593,9 +77635,9 @@ static const char *startup_source = "((rest_121)" "(unsafe-cdr" " lst_81)))" -"(let-values(((id_161)" "(let-values(((id_162)" -" id_160))" +"(let-values(((id_163)" +" id_161))" "(let-values(((id_114)" "(let-values()" "(let-values(((id10_1)" @@ -77619,16 +77661,16 @@ static const char *startup_source = " s_88)))))" "(cons" " id10_1" -" id_162)))))" +" id_163)))))" "(values" " id_114)))))" "(if(not" " #f)" "(for-loop_96" -" id_161" +" id_162" " rest_121)" -" id_161)))" -" id_160)))))" +" id_162)))" +" id_161)))))" " for-loop_96)" " null" " lst_80)))))" @@ -77720,14 +77762,14 @@ static const char *startup_source = " s_25)))" "(if(pair? s_305)" "(let-values(((id21_1)" -"(let-values(((s_924)(car s_305)))" -"(let-values(((s_925)" -"(if(syntax?$1 s_924)" -"(syntax-e$1 s_924)" -" s_924)))" +"(let-values(((s_925)(car s_305)))" +"(let-values(((s_926)" +"(if(syntax?$1 s_925)" +"(syntax-e$1 s_925)" +" s_925)))" "(let-values(((flat-s_69)" "(to-syntax-list.1" -" s_925)))" +" s_926)))" "(if(not flat-s_69)" "(let-values()" "(raise-syntax-error$1" @@ -77735,8 +77777,8 @@ static const char *startup_source = " \"bad syntax\"" " orig-s_100))" "(let-values()" -"(let-values(((id_163)" -"(let-values(((lst_461)" +"(let-values(((id_164)" +"(let-values(((lst_463)" " flat-s_69))" "(begin" "(if(variable-reference-from-unsafe?" @@ -77744,66 +77786,66 @@ static const char *startup_source = "(void)" "(let-values()" "(check-list" -" lst_461)))" +" lst_463)))" "((letrec-values(((for-loop_2)" -"(lambda(id_164" -" lst_462)" +"(lambda(id_165" +" lst_464)" "(begin" " 'for-loop" "(if(pair?" -" lst_462)" -"(let-values(((s_926)" +" lst_464)" +"(let-values(((s_927)" "(unsafe-car" -" lst_462))" -"((rest_271)" +" lst_464))" +"((rest_272)" "(unsafe-cdr" -" lst_462)))" -"(let-values(((id_165)" +" lst_464)))" "(let-values(((id_166)" -" id_164))" "(let-values(((id_167)" +" id_165))" +"(let-values(((id_168)" "(let-values()" "(let-values(((id24_0)" "(let-values()" "(if(let-values(((or-part_218)" "(if(syntax?$1" -" s_926)" +" s_927)" "(symbol?" "(syntax-e$1" -" s_926))" +" s_927))" " #f)))" "(if or-part_218" " or-part_218" "(symbol?" -" s_926)))" -" s_926" +" s_927)))" +" s_927" "(raise-syntax-error$1" " #f" " \"not an identifier\"" " orig-s_100" -" s_926)))))" +" s_927)))))" "(cons" " id24_0" -" id_166)))))" -"(values" " id_167)))))" +"(values" +" id_168)))))" "(if(not" " #f)" "(for-loop_2" -" id_165" -" rest_271)" -" id_165)))" -" id_164)))))" +" id_166" +" rest_272)" +" id_166)))" +" id_165)))))" " for-loop_2)" " null" -" lst_461)))))" -"(reverse$1 id_163))))))))" +" lst_463)))))" +"(reverse$1 id_164))))))))" "((rhs22_0)" -"(let-values(((s_927)(cdr s_305)))" +"(let-values(((s_928)(cdr s_305)))" "(let-values(((s_175)" -"(if(syntax?$1 s_927)" -"(syntax-e$1 s_927)" -" s_927)))" +"(if(syntax?$1 s_928)" +"(syntax-e$1 s_928)" +" s_928)))" "(if(pair? s_175)" "(let-values(((rhs23_2)" "(let-values(((s_451)" @@ -78084,7 +78126,7 @@ static const char *startup_source = "(void" "(add-core-form!*" " '#%require" -"(lambda(s_928 ctx_126)" +"(lambda(s_929 ctx_126)" "(let-values((()" "(begin" "(let-values(((obs_177)(expand-context-observer ctx_126)))" @@ -78094,9 +78136,9 @@ static const char *startup_source = "(begin" "(if(eq?(expand-context-context ctx_126) 'top-level)" "(void)" -" (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_928)))" +" (let-values () (raise-syntax-error$1 #f \"allowed only in a module or the top level\" s_929)))" "(values))))" -"(let-values(((disarmed-s_27)(syntax-disarm$1 s_928)))" +"(let-values(((disarmed-s_27)(syntax-disarm$1 s_929)))" "(let-values(((ok?_97 #%require47_0 req48_0)" "(let-values(((s_63) disarmed-s_27))" "(let-values(((orig-s_102) s_63))" @@ -78155,7 +78197,7 @@ static const char *startup_source = " for-loop_25)" " null" " lst_32)))))" -"((s52_0) s_928)" +"((s52_0) s_929)" "((temp53_6) #f)" "((temp54_6)(expand-context-namespace ctx_126))" "((temp55_5)(expand-context-phase ctx_126))" @@ -78178,7 +78220,7 @@ static const char *startup_source = " temp54_6" " temp55_5" " temp56_5))" -"(if(expand-context-to-parsed? ctx_126)(parsed-require23.1 s_928) s_928))))))))))" +"(if(expand-context-to-parsed? ctx_126)(parsed-require23.1 s_929) s_929))))))))))" "(void" "(add-core-form!*" " '#%provide"