diff --git a/pkgs/racket-test-core/tests/racket/syntax.rktl b/pkgs/racket-test-core/tests/racket/syntax.rktl index 5e5ed51461..8b43ddda62 100644 --- a/pkgs/racket-test-core/tests/racket/syntax.rktl +++ b/pkgs/racket-test-core/tests/racket/syntax.rktl @@ -715,6 +715,7 @@ (test 5 'let* (let* ([x 4][x 5]) x)) (error-test-let #'(() (define x 10))) (error-test-let #'(() (define x 10) (define y 20))) +(error-test-let #'(() 8 (define-syntax-rule (m) 10))) (define (do-error-test-let-values/no-* expr syntax-test) (syntax-test (datum->syntax #f (cons 'let-values expr) #f)) diff --git a/racket/src/expander/expand/body.rkt b/racket/src/expander/expand/body.rkt index 43d70d808c..97e580d6cb 100644 --- a/racket/src/expander/expand/body.rkt +++ b/racket/src/expander/expand/body.rkt @@ -78,7 +78,8 @@ [trans-idss null] ; accumulated `define-syntaxes` identifiers that have disappeared [trans-stxs null] ; accumulated `define-syntaxes` forms for tracking [stx-clauses null] ; accumulated syntax-binding clauses, used when observing - [dups (make-check-no-duplicate-table)]) + [dups (make-check-no-duplicate-table)] + [just-saw-define-syntaxes? #f]) ; make sure that `define-syntaxes` isn't last (cond [(null? bodys) ;; Partial expansion is complete, so finish by rewriting to @@ -89,6 +90,7 @@ #:original-bodys init-bodys #:source s #:stratified? stratified? + #:just-saw-define-syntaxes? just-saw-define-syntaxes? #:name name #:disappeared-transformer-bindings (reverse trans-idss) #:disappeared-transformer-forms (reverse trans-stxs))] @@ -118,7 +120,8 @@ trans-idss trans-stxs stx-clauses - dups)] + dups + just-saw-define-syntaxes?)] [(define-values) ;; Found a variable definition; add bindings, extend the ;; environment, and continue @@ -166,7 +169,8 @@ trans-idss trans-stxs stx-clauses - new-dups)] + new-dups + #f)] [(define-syntaxes) ;; Found a macro definition; add bindings, evaluate the ;; compile-time right-hand side, install the compile-time @@ -204,7 +208,8 @@ (cons ids trans-idss) (cons (keep-as-needed body-ctx exp-body #:for-track? #t) trans-stxs) (cons (datum->syntax #f (list ids (m 'rhs)) exp-body) stx-clauses) - new-dups)] + new-dups + #t)] [else (cond [stratified? @@ -223,7 +228,8 @@ trans-idss trans-stxs stx-clauses - dups)] + dups + #f)] [else ;; Found an expression; accumulate it and continue (loop body-ctx @@ -236,7 +242,8 @@ trans-idss trans-stxs stx-clauses - dups)])])]))) + dups + #f)])])]))) ;; Partial expansion is complete, so assumble the result as a ;; `letrec-values` form and continue expanding @@ -246,10 +253,12 @@ #:original-bodys init-bodys #:source s #:stratified? stratified? + #:just-saw-define-syntaxes? just-saw-define-syntaxes? #:name name #:disappeared-transformer-bindings disappeared-transformer-bindings #:disappeared-transformer-forms disappeared-transformer-forms) - (when (null? done-bodys) + (when (or (null? done-bodys) + just-saw-define-syntaxes?) (raise-syntax-error (string->symbol "begin (possibly implicit)") "no expression after a sequence of internal definitions" (datum->syntax #f (cons 'begin init-bodys) s) diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index 2bf5fbb2ca..8d6aa50adc 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -2956,24 +2956,32 @@ static const char *startup_source = "(lambda(p_0)" "(begin" "(let-values(((base1_0 name1_0 dir?_0)(split-path p_0)))" -"(if(path? base1_0)" +"(if(path-for-some-system? base1_0)" "(let-values()" "(let-values(((base2_0 name2_0 dir?_1)(split-path base1_0)))" "(if(not base2_0)" -"(let-values()(path->string p_0))" +"(let-values()(path-for-some-system->string p_0))" "(if(symbol? name2_0)" " (let-values () (string-append \".../\" (path-elem->string name1_0)))" -" (let-values () (string-append \".../\" (path->string name2_0) \"/\" (path-elem->string name1_0)))))))" +"(let-values()" +" (string-append \".../\" (path-for-some-system->string name2_0) \"/\" (path-elem->string name1_0)))))))" "(if(eq? base1_0 'relative)" "(let-values()(path-elem->string name1_0))" -"(let-values()(path->string p_0))))))))" +"(let-values()(path-for-some-system->string p_0))))))))" "(define-values" "(path-elem->string)" "(lambda(p_0)" "(begin" "(if(eq? p_0 'same)" " (let-values () \".\")" -" (if (eq? p_0 'up) (let-values () \"..\") (let-values () (path->string p_0)))))))" +" (if (eq? p_0 'up) (let-values () \"..\") (let-values () (path-for-some-system->string p_0)))))))" +"(define-values" +"(path-for-some-system->string)" +"(lambda(p_0)" +"(begin" +"(if(path? p_0)" +"(let-values()(path->string p_0))" +"(let-values()(bytes->string/utf-8(path->bytes p_0) '#\\�))))))" "(define-values" "(make-path->relative-path-elements4.1)" "(lambda(who1_0 wr-dir3_0)" @@ -28715,6 +28723,14 @@ static const char *startup_source = "(let-values(((c_0)(1/compile-linklet(correlated-linklet-expr l_0)(correlated-linklet-name l_0))))" "(begin(set-correlated-linklet-compiled! l_0 c_0) c_0)))))" "(let-values() l_0)))))" +"(define-values" +"(eval-correlated-linklet)" +"(lambda(l_0)" +"(begin" +"(if(correlated-linklet? l_0)" +"(let-values()" +"(1/eval-linklet(1/compile-linklet(correlated-linklet-expr l_0)(correlated-linklet-name l_0) #f #f '())))" +" (let-values () (error 'eval-correlated-linklet \"cannot evaluate unknown linklet: ~s\" l_0))))))" " (define-values (correlated-linklet-vm-bytes) #\"linklet\")" "(define-values" "(struct:faslable-correlated" @@ -40056,11 +40072,15 @@ static const char *startup_source = "(lambda(c_0)" "(begin" " 'compiled-expression-recompile" +"(let-values((()" "(begin" "(if(1/compiled-expression? c_0)" "(void)" -" (let-values () (raise-argument-error 'compiled-expression-recompile \"compiled-expression?\" c_0)))" -"(if(not(current-compile-target-machine))" +"(let-values()" +" (raise-argument-error 'compiled-expression-recompile \"compiled-expression?\" c_0)))" +"(values))))" +"(let-values(((target-machine_0)(current-compile-target-machine)))" +"(if(not target-machine_0)" "(let-values() c_0)" "(if(let-values(((or-part_0)(linklet-bundle? c_0)))(if or-part_0 or-part_0(linklet-directory? c_0)))" "(let-values()" @@ -40086,13 +40106,17 @@ static const char *startup_source = "(let-values()" "(raise-arguments-error" " 'compiled-expression-recompile" -" \"cannot find submodule\"" -" \"submodule path\"" +" \"cannot find submodule\"" +" \"submodule path\"" " k_0)))" "(hash-set!" " recompileds_0" " k_0" -"(recompile-bundle b_0 force-recompile-bundle_0 ns_0)))))))" +"(recompile-bundle" +" b_0" +" force-recompile-bundle_0" +" ns_0" +" target-machine_0)))))))" "(hash-ref recompileds_0 k_0))))))" "(begin" "(let-values(((ht_0) bundles_0))" @@ -40124,7 +40148,7 @@ static const char *startup_source = "(hash-iterate-first ht_0))))" "(void)" "(replace-linklet-bundles c_0 '() recompileds_0)))))))" -"(let-values()(1/compiled-expression-recompile(compiled-in-memory-linklet-directory c_0)))))))))" +"(let-values()(1/compiled-expression-recompile(compiled-in-memory-linklet-directory c_0))))))))))" "(define-values" "(extract-linklet-bundles)" "(lambda(c_0 rev-path_0 accum_0)" @@ -40243,7 +40267,7 @@ static const char *startup_source = "(make-struct-field-accessor -ref_0 2 'self))))" "(define-values" "(recompile-bundle)" -"(lambda(b_0 get-submodule-recompiled_0 ns_0)" +"(lambda(b_0 get-submodule-recompiled_0 ns_0 target-machine_0)" "(begin" "(let-values(((orig-h_0)(linklet-bundle->hash b_0)))" "(let-values(((h_0)" @@ -40288,14 +40312,23 @@ static const char *startup_source = " for-loop_0)" " '#hasheq()" "(hash-iterate-first ht_0))))))" +"(let-values(((can-eval-compiled?_0)(eq? target-machine_0(system-type 'target-machine))))" +"(let-values(((eval-metadata-linklet_0)" +"(lambda(key_0)" +"(begin" +" 'eval-metadata-linklet" +"(if can-eval-compiled?_0" +"(1/eval-linklet(hash-ref h_0 key_0))" +"(eval-correlated-linklet(hash-ref orig-h_0 key_0)))))))" "(let-values(((data-instance_0)" -"(1/instantiate-linklet(1/eval-linklet(hash-ref h_0 'data))(list deserialize-instance))))" +"(1/instantiate-linklet(eval-metadata-linklet_0 'data)(list deserialize-instance))))" "(let-values(((declaration-instance_0)" "(1/instantiate-linklet" -"(1/eval-linklet(hash-ref h_0 'decl))" +"(eval-metadata-linklet_0 'decl)" "(list deserialize-instance data-instance_0))))" "(let-values(((decl_0)" -"(lambda(key_0)(begin 'decl(1/instance-variable-value declaration-instance_0 key_0)))))" +"(lambda(key_0)" +"(begin 'decl(1/instance-variable-value declaration-instance_0 key_0)))))" "(let-values(((mpis_0)(make-module-path-index-table)))" "(let-values((()" "(begin" @@ -40314,7 +40347,8 @@ static const char *startup_source = "(begin" " 'for-loop" "(if(unsafe-fx< pos_0 len_0)" -"(let-values(((mpi_0)(unsafe-vector-ref vec_0 pos_0)))" +"(let-values(((mpi_0)" +"(unsafe-vector-ref vec_0 pos_0)))" "(let-values((()" "(let-values()" "(let-values((()" @@ -40358,7 +40392,7 @@ static const char *startup_source = "(let-values()" "(raise-arguments-error" " 'compiled-expression-recompile" -" \"cycle in linklet imports\"))" +" \"cycle in linklet imports\"))" "(void))" "(values))))" "(let-values(((b_1)(recompiled-bundle r_0)))" @@ -40372,10 +40406,10 @@ static const char *startup_source = " or-part_0" "(raise-arguments-error" " 'compiled-expression-recompile" -" \"cannot find submodule at phase\"" -" \"submodule\"" +" \"cannot find submodule at phase\"" +" \"submodule\"" " mod-name_0" -" \"phase\"" +" \"phase\"" " phase_0)))))" "(module-linklet-info2.1" " linklet_0" @@ -40400,9 +40434,12 @@ static const char *startup_source = " 'for-loop" "(if i_0" "(let-values(((phase_0 body-linklet_0)" -"(hash-iterate-key+value ht_0 i_0)))" +"(hash-iterate-key+value" +" ht_0" +" i_0)))" "(let-values(((table_1)" -"(let-values(((table_1) table_0))" +"(let-values(((table_1)" +" table_0))" "(if(exact-integer? phase_0)" "(let-values(((table_2)" " table_1))" @@ -40582,12 +40619,15 @@ static const char *startup_source = "(let-values(((h_1) h/new-body-linklets_0))" "(let-values(((h_2)(hash-set h_1 'data data-linklet_0)))" "(let-values(((h_3)" -"(hash-set h_2 'decl declaration-linklet_0)))" +"(hash-set" +" h_2" +" 'decl" +" declaration-linklet_0)))" " h_3))))))" "(recompiled1.1" " new-bundle_0" " phase-to-link-module-uses_0" -" self_0))))))))))))))))))))))" +" self_0))))))))))))))))))))))))" "(define-values" "(create-compiled-in-memorys-using-shared-data)" "(lambda(tops_0 data-linklet_0 ns_0)" @@ -65563,40 +65603,40 @@ static const char *startup_source = "(let-values(((v_0) ctx_0))" "(let-values(((the-struct_0) v_0))" "(if(expand-context/outer? the-struct_0)" -"(let-values(((context55_0)(list(make-liberal-define-context)))" -"((name56_0) #f)" -"((only-immediate?57_0) #t)" -"((def-ctx-scopes58_0) def-ctx-scopes_0)" -"((post-expansion59_0)" +"(let-values(((context57_0)(list(make-liberal-define-context)))" +"((name58_0) #f)" +"((only-immediate?59_0) #t)" +"((def-ctx-scopes60_0) def-ctx-scopes_0)" +"((post-expansion61_0)" "(lambda(s_1)" "(begin" -" 'post-expansion59" +" 'post-expansion61" "(add-scope s_1 inside-sc_0))))" -"((scopes60_0)" +"((scopes62_0)" "(cons inside-sc_0(expand-context-scopes ctx_0)))" -"((use-site-scopes61_0)(box null))" -"((frame-id62_0) frame-id_0)" -"((reference-records63_0)" +"((use-site-scopes63_0)(box null))" +"((frame-id64_0) frame-id_0)" +"((reference-records65_0)" "(cons" " frame-id_0" "(expand-context-reference-records ctx_0)))" -"((inner64_0)(root-expand-context/outer-inner v_0)))" +"((inner66_0)(root-expand-context/outer-inner v_0)))" "(expand-context/outer1.1" -" inner64_0" -" post-expansion59_0" -" use-site-scopes61_0" -" frame-id62_0" -" context55_0" +" inner66_0" +" post-expansion61_0" +" use-site-scopes63_0" +" frame-id64_0" +" context57_0" "(expand-context/outer-env the-struct_0)" -" scopes60_0" -" def-ctx-scopes58_0" +" scopes62_0" +" def-ctx-scopes60_0" "(expand-context/outer-binding-layer the-struct_0)" -" reference-records63_0" -" only-immediate?57_0" +" reference-records65_0" +" only-immediate?59_0" "(expand-context/outer-need-eventually-defined the-struct_0)" "(expand-context/outer-current-introduction-scopes the-struct_0)" "(expand-context/outer-current-use-scopes the-struct_0)" -" name56_0))" +" name58_0))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" @@ -65622,42 +65662,46 @@ static const char *startup_source = " trans-idss_0" " trans-stxs_0" " stx-clauses_0" -" dups_0)" +" dups_0" +" just-saw-define-syntaxes?_0)" "(begin" " 'loop" "(if(null? bodys_1)" "(let-values()" -"(let-values(((body-ctx65_0) body-ctx_1)" -"((frame-id66_0) frame-id_0)" -"((def-ctx-scopes67_0) def-ctx-scopes_0)" -"((temp68_0)(reverse$1 val-idss_0))" -"((temp69_0)(reverse$1 val-keyss_0))" -"((temp70_0)(reverse$1 val-rhss_0))" -"((temp71_0)(reverse$1 track-stxs_0))" -"((temp72_0)(reverse$1 stx-clauses_0))" -"((temp73_0)(reverse$1 done-bodys_0))" -"((init-bodys74_0) init-bodys_0)" -"((s75_0) s_0)" -"((stratified?76_0) stratified?_0)" -"((name77_0) name_0)" -"((temp78_0)(reverse$1 trans-idss_0))" -"((temp79_0)(reverse$1 trans-stxs_0)))" -"(finish-expanding-body31.1" -" temp78_0" -" temp79_0" -" name77_0" -" init-bodys74_0" -" s75_0" -" stratified?76_0" -" body-ctx65_0" -" frame-id66_0" -" def-ctx-scopes67_0" -" temp68_0" -" temp69_0" +"(let-values(((body-ctx67_0) body-ctx_1)" +"((frame-id68_0) frame-id_0)" +"((def-ctx-scopes69_0) def-ctx-scopes_0)" +"((temp70_0)(reverse$1 val-idss_0))" +"((temp71_0)(reverse$1 val-keyss_0))" +"((temp72_0)(reverse$1 val-rhss_0))" +"((temp73_0)(reverse$1 track-stxs_0))" +"((temp74_0)(reverse$1 stx-clauses_0))" +"((temp75_0)(reverse$1 done-bodys_0))" +"((init-bodys76_0) init-bodys_0)" +"((s77_0) s_0)" +"((stratified?78_0) stratified?_0)" +"((just-saw-define-syntaxes?79_0)" +" just-saw-define-syntaxes?_0)" +"((name80_0) name_0)" +"((temp81_0)(reverse$1 trans-idss_0))" +"((temp82_0)(reverse$1 trans-stxs_0)))" +"(finish-expanding-body33.1" +" temp81_0" +" temp82_0" +" just-saw-define-syntaxes?79_0" +" name80_0" +" init-bodys76_0" +" s77_0" +" stratified?78_0" +" body-ctx67_0" +" frame-id68_0" +" def-ctx-scopes69_0" " temp70_0" " temp71_0" " temp72_0" -" temp73_0)))" +" temp73_0" +" temp74_0" +" temp75_0)))" "(let-values()" "(let-values(((rest-bodys_0)(cdr bodys_1)))" "(let-values((()" @@ -65674,8 +65718,8 @@ static const char *startup_source = "(void)))" "(values))))" "(let-values(((exp-body_0)" -"(let-values(((temp80_0)(car bodys_1))" -"((temp81_0)" +"(let-values(((temp83_0)(car bodys_1))" +"((temp84_0)" "(if(if name_0" "(null?" "(cdr bodys_1))" @@ -65686,13 +65730,13 @@ static const char *startup_source = " v_0))" "(if(expand-context/outer?" " the-struct_0)" -"(let-values(((name82_0)" +"(let-values(((name85_0)" " name_0)" -"((inner83_0)" +"((inner86_0)" "(root-expand-context/outer-inner" " v_0)))" "(expand-context/outer1.1" -" inner83_0" +" inner86_0" "(root-expand-context/outer-post-expansion" " the-struct_0)" "(root-expand-context/outer-use-site-scopes" @@ -65719,7 +65763,7 @@ static const char *startup_source = " the-struct_0)" "(expand-context/outer-current-use-scopes" " the-struct_0)" -" name82_0))" +" name85_0))" "(raise-argument-error" " 'struct-copy" " \"expand-context/outer?\"" @@ -65729,8 +65773,8 @@ static const char *startup_source = " #f" " #f" " #f" -" temp80_0" -" temp81_0))))" +" temp83_0" +" temp84_0))))" "(let-values(((disarmed-exp-body_0)" "(syntax-disarm$1 exp-body_0)))" "(let-values(((tmp_0)" @@ -65752,13 +65796,13 @@ static const char *startup_source = " 'prim-begin)))" "(void)))" "(values))))" -"(let-values(((ok?_0 begin84_0 e85_0)" +"(let-values(((ok?_0 begin87_0 e88_0)" "(let-values(((s_1)" " disarmed-exp-body_0))" "(let-values(((orig-s_0)" " s_1))" -"(let-values(((begin84_0" -" e85_0)" +"(let-values(((begin87_0" +" e88_0)" "(let-values(((s_2)" "(if(syntax?$1" " s_1)" @@ -65767,12 +65811,12 @@ static const char *startup_source = " s_1)))" "(if(pair?" " s_2)" -"(let-values(((begin86_0)" +"(let-values(((begin89_0)" "(let-values(((s_3)" "(car" " s_2)))" " s_3))" -"((e87_0)" +"((e90_0)" "(let-values(((s_3)" "(cdr" " s_2)))" @@ -65795,16 +65839,16 @@ static const char *startup_source = "(let-values()" " flat-s_0)))))))" "(values" -" begin86_0" -" e87_0))" +" begin89_0" +" e90_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0)))))" "(values" " #t" -" begin84_0" -" e85_0))))))" +" begin87_0" +" e88_0))))))" "(let-values(((track_0)" "(lambda(e_0)" "(begin" @@ -65814,7 +65858,7 @@ static const char *startup_source = " exp-body_0)))))" "(let-values(((splice-bodys_0)" "(append" -"(map2 track_0 e85_0)" +"(map2 track_0 e88_0)" " rest-bodys_0)))" "(begin" "(let-values(((obs_0)" @@ -65839,7 +65883,8 @@ static const char *startup_source = " trans-idss_0" " trans-stxs_0" " stx-clauses_0" -" dups_0)))))))" +" dups_0" +" just-saw-define-syntaxes?_0)))))))" "(if(equal? tmp_0 'define-values)" "(let-values()" "(let-values((()" @@ -65856,16 +65901,16 @@ static const char *startup_source = "(void)))" "(values))))" "(let-values(((ok?_0" -" define-values88_0" -" id89_0" -" rhs90_0)" +" define-values91_0" +" id92_0" +" rhs93_0)" "(let-values(((s_1)" " disarmed-exp-body_0))" "(let-values(((orig-s_0)" " s_1))" -"(let-values(((define-values88_0" -" id89_0" -" rhs90_0)" +"(let-values(((define-values91_0" +" id92_0" +" rhs93_0)" "(let-values(((s_2)" "(if(syntax?$1" " s_1)" @@ -65874,13 +65919,13 @@ static const char *startup_source = " s_1)))" "(if(pair?" " s_2)" -"(let-values(((define-values91_0)" +"(let-values(((define-values94_0)" "(let-values(((s_3)" "(car" " s_2)))" " s_3))" -"((id92_0" -" rhs93_0)" +"((id95_0" +" rhs96_0)" "(let-values(((s_3)" "(cdr" " s_2)))" @@ -65892,7 +65937,7 @@ static const char *startup_source = " s_3)))" "(if(pair?" " s_4)" -"(let-values(((id94_0)" +"(let-values(((id97_0)" "(let-values(((s_5)" "(car" " s_4)))" @@ -65941,7 +65986,7 @@ static const char *startup_source = " id_0))" "(let-values(((id_2)" "(let-values()" -"(let-values(((id97_0)" +"(let-values(((id100_0)" "(let-values()" "(if(let-values(((or-part_0)" "(if(syntax?$1" @@ -65961,7 +66006,7 @@ static const char *startup_source = " orig-s_0" " s_7)))))" "(cons" -" id97_0" +" id100_0" " id_1)))))" "(values" " id_2)))))" @@ -65977,7 +66022,7 @@ static const char *startup_source = " lst_0)))))" "(reverse$1" " id_0))))))))" -"((rhs95_0)" +"((rhs98_0)" "(let-values(((s_5)" "(cdr" " s_4)))" @@ -65989,7 +66034,7 @@ static const char *startup_source = " s_5)))" "(if(pair?" " s_6)" -"(let-values(((rhs96_0)" +"(let-values(((rhs99_0)" "(let-values(((s_7)" "(car" " s_6)))" @@ -66012,34 +66057,34 @@ static const char *startup_source = " \"bad syntax\"" " orig-s_0))))))" "(values" -" rhs96_0))" +" rhs99_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0))))))" "(values" -" id94_0" -" rhs95_0))" +" id97_0" +" rhs98_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0))))))" "(values" -" define-values91_0" -" id92_0" -" rhs93_0))" +" define-values94_0" +" id95_0" +" rhs96_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0)))))" "(values" " #t" -" define-values88_0" -" id89_0" -" rhs90_0))))))" +" define-values91_0" +" id92_0" +" rhs93_0))))))" "(let-values(((ids_0)" "(remove-use-site-scopes" -" id89_0" +" id92_0" " body-ctx_1)))" "(let-values((()" "(begin" @@ -66056,24 +66101,24 @@ static const char *startup_source = " #f" "(list" " ids_0" -" rhs90_0)))))" +" rhs93_0)))))" "(void)))" "(values))))" "(let-values(((new-dups_0)" -"(let-values(((ids98_0)" +"(let-values(((ids101_0)" " ids_0)" -"((phase99_0)" +"((phase102_0)" " phase_0)" -"((exp-body100_0)" +"((exp-body103_0)" " exp-body_0)" -"((dups101_0)" +"((dups104_0)" " dups_0))" "(check-no-duplicate-ids7.1" " unsafe-undefined" -" ids98_0" -" phase99_0" -" exp-body100_0" -" dups101_0))))" +" ids101_0" +" phase102_0" +" exp-body103_0" +" dups104_0))))" "(let-values(((counter_0)" "(root-expand-context-counter" " ctx_0)))" @@ -66113,25 +66158,25 @@ static const char *startup_source = "(let-values()" "(cons" "(let-values()" -"(let-values(((id102_0)" +"(let-values(((id105_0)" " id_0)" -"((phase103_0)" +"((phase106_0)" " phase_0)" -"((counter104_0)" +"((counter107_0)" " counter_0)" -"((frame-id105_0)" +"((frame-id108_0)" " frame-id_0)" -"((exp-body106_0)" +"((exp-body109_0)" " exp-body_0)" -"((local-sym107_0)" +"((local-sym110_0)" " local-sym_0))" "(add-local-binding!39.1" -" frame-id105_0" -" exp-body106_0" -" local-sym107_0" -" id102_0" -" phase103_0" -" counter104_0)))" +" frame-id108_0" +" exp-body109_0" +" local-sym110_0" +" id105_0" +" phase106_0" +" counter107_0)))" " fold-var_1))))" "(values" " fold-var_2)))))" @@ -66218,17 +66263,17 @@ static const char *startup_source = " v_0))" "(if(expand-context/outer?" " the-struct_0)" -"(let-values(((env108_0)" +"(let-values(((env111_0)" " extended-env_0)" -"((binding-layer109_0)" +"((binding-layer112_0)" "(maybe-increment-binding-layer_0" " ids_0" " body-ctx_1))" -"((inner110_0)" +"((inner113_0)" "(root-expand-context/outer-inner" " v_0)))" "(expand-context/outer1.1" -" inner110_0" +" inner113_0" "(root-expand-context/outer-post-expansion" " the-struct_0)" "(root-expand-context/outer-use-site-scopes" @@ -66237,12 +66282,12 @@ static const char *startup_source = " the-struct_0)" "(expand-context/outer-context" " the-struct_0)" -" env108_0" +" env111_0" "(expand-context/outer-scopes" " the-struct_0)" "(expand-context/outer-def-ctx-scopes" " the-struct_0)" -" binding-layer109_0" +" binding-layer112_0" "(expand-context/outer-reference-records" " the-struct_0)" "(expand-context/outer-only-immediate?" @@ -66358,7 +66403,7 @@ static const char *startup_source = " lst_0))))" " val-keyss_0))" "(cons" -" rhs90_0" +" rhs93_0" "(append" "(reverse$1" "(let-values(((lst_0)" @@ -66409,18 +66454,18 @@ static const char *startup_source = " lst_0))))" " val-rhss_0))" "(cons" -"(let-values(((body-ctx111_0)" +"(let-values(((body-ctx114_0)" " body-ctx_1)" -"((exp-body112_0)" +"((exp-body115_0)" " exp-body_0)" -"((temp113_0)" +"((temp116_0)" " #t))" "(keep-as-needed119.1" -" temp113_0" +" temp116_0" " #f" " #f" -" body-ctx111_0" -" exp-body112_0))" +" body-ctx114_0" +" exp-body115_0))" "(append" "(reverse$1" "(let-values(((lst_0)" @@ -66470,7 +66515,8 @@ static const char *startup_source = " trans-idss_0" " trans-stxs_0" " stx-clauses_0" -" new-dups_0)))))))))))" +" new-dups_0" +" #f)))))))))))" "(if(equal? tmp_0 'define-syntaxes)" "(let-values()" "(let-values((()" @@ -66487,16 +66533,16 @@ static const char *startup_source = "(void)))" "(values))))" "(let-values(((ok?_0" -" define-syntaxes114_0" -" id115_0" -" rhs116_0)" +" define-syntaxes117_0" +" id118_0" +" rhs119_0)" "(let-values(((s_1)" " disarmed-exp-body_0))" "(let-values(((orig-s_0)" " s_1))" -"(let-values(((define-syntaxes114_0" -" id115_0" -" rhs116_0)" +"(let-values(((define-syntaxes117_0" +" id118_0" +" rhs119_0)" "(let-values(((s_2)" "(if(syntax?$1" " s_1)" @@ -66505,13 +66551,13 @@ static const char *startup_source = " s_1)))" "(if(pair?" " s_2)" -"(let-values(((define-syntaxes117_0)" +"(let-values(((define-syntaxes120_0)" "(let-values(((s_3)" "(car" " s_2)))" " s_3))" -"((id118_0" -" rhs119_0)" +"((id121_0" +" rhs122_0)" "(let-values(((s_3)" "(cdr" " s_2)))" @@ -66523,7 +66569,7 @@ static const char *startup_source = " s_3)))" "(if(pair?" " s_4)" -"(let-values(((id120_0)" +"(let-values(((id123_0)" "(let-values(((s_5)" "(car" " s_4)))" @@ -66572,7 +66618,7 @@ static const char *startup_source = " id_0))" "(let-values(((id_2)" "(let-values()" -"(let-values(((id123_0)" +"(let-values(((id126_0)" "(let-values()" "(if(let-values(((or-part_0)" "(if(syntax?$1" @@ -66592,7 +66638,7 @@ static const char *startup_source = " orig-s_0" " s_7)))))" "(cons" -" id123_0" +" id126_0" " id_1)))))" "(values" " id_2)))))" @@ -66608,7 +66654,7 @@ static const char *startup_source = " lst_0)))))" "(reverse$1" " id_0))))))))" -"((rhs121_0)" +"((rhs124_0)" "(let-values(((s_5)" "(cdr" " s_4)))" @@ -66620,7 +66666,7 @@ static const char *startup_source = " s_5)))" "(if(pair?" " s_6)" -"(let-values(((rhs122_0)" +"(let-values(((rhs125_0)" "(let-values(((s_7)" "(car" " s_6)))" @@ -66643,34 +66689,34 @@ static const char *startup_source = " \"bad syntax\"" " orig-s_0))))))" "(values" -" rhs122_0))" +" rhs125_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0))))))" "(values" -" id120_0" -" rhs121_0))" +" id123_0" +" rhs124_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0))))))" "(values" -" define-syntaxes117_0" -" id118_0" -" rhs119_0))" +" define-syntaxes120_0" +" id121_0" +" rhs122_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0)))))" "(values" " #t" -" define-syntaxes114_0" -" id115_0" -" rhs116_0))))))" +" define-syntaxes117_0" +" id118_0" +" rhs119_0))))))" "(let-values(((ids_0)" "(remove-use-site-scopes" -" id115_0" +" id118_0" " body-ctx_1)))" "(let-values((()" "(begin" @@ -66687,24 +66733,24 @@ static const char *startup_source = " #f" "(list" " ids_0" -" rhs116_0)))))" +" rhs119_0)))))" "(void)))" "(values))))" "(let-values(((new-dups_0)" -"(let-values(((ids124_0)" +"(let-values(((ids127_0)" " ids_0)" -"((phase125_0)" +"((phase128_0)" " phase_0)" -"((exp-body126_0)" +"((exp-body129_0)" " exp-body_0)" -"((dups127_0)" +"((dups130_0)" " dups_0))" "(check-no-duplicate-ids7.1" " unsafe-undefined" -" ids124_0" -" phase125_0" -" exp-body126_0" -" dups127_0))))" +" ids127_0" +" phase128_0" +" exp-body129_0" +" dups130_0))))" "(let-values(((counter_0)" "(root-expand-context-counter" " ctx_0)))" @@ -66744,25 +66790,25 @@ static const char *startup_source = "(let-values()" "(cons" "(let-values()" -"(let-values(((id128_0)" +"(let-values(((id131_0)" " id_0)" -"((phase129_0)" +"((phase132_0)" " phase_0)" -"((counter130_0)" +"((counter133_0)" " counter_0)" -"((frame-id131_0)" +"((frame-id134_0)" " frame-id_0)" -"((exp-body132_0)" +"((exp-body135_0)" " exp-body_0)" -"((local-sym133_0)" +"((local-sym136_0)" " local-sym_0))" "(add-local-binding!39.1" -" frame-id131_0" -" exp-body132_0" -" local-sym133_0" -" id128_0" -" phase129_0" -" counter130_0)))" +" frame-id134_0" +" exp-body135_0" +" local-sym136_0" +" id131_0" +" phase132_0" +" counter133_0)))" " fold-var_1))))" "(values" " fold-var_2)))))" @@ -66810,7 +66856,7 @@ static const char *startup_source = "(let-values(((vals_0)" "(eval-for-syntaxes-binding" " 'define-syntaxes" -" rhs116_0" +" rhs119_0" " ids_0" " body-ctx_1)))" "(let-values(((extended-env_0)" @@ -66922,17 +66968,17 @@ static const char *startup_source = " v_0))" "(if(expand-context/outer?" " the-struct_0)" -"(let-values(((env134_0)" +"(let-values(((env137_0)" " extended-env_0)" -"((binding-layer135_0)" +"((binding-layer138_0)" "(maybe-increment-binding-layer_0" " ids_0" " body-ctx_1))" -"((inner136_0)" +"((inner139_0)" "(root-expand-context/outer-inner" " v_0)))" "(expand-context/outer1.1" -" inner136_0" +" inner139_0" "(root-expand-context/outer-post-expansion" " the-struct_0)" "(root-expand-context/outer-use-site-scopes" @@ -66941,12 +66987,12 @@ static const char *startup_source = " the-struct_0)" "(expand-context/outer-context" " the-struct_0)" -" env134_0" +" env137_0" "(expand-context/outer-scopes" " the-struct_0)" "(expand-context/outer-def-ctx-scopes" " the-struct_0)" -" binding-layer135_0" +" binding-layer138_0" "(expand-context/outer-reference-records" " the-struct_0)" "(expand-context/outer-only-immediate?" @@ -66973,28 +67019,29 @@ static const char *startup_source = " ids_0" " trans-idss_0)" "(cons" -"(let-values(((body-ctx137_0)" +"(let-values(((body-ctx140_0)" " body-ctx_1)" -"((exp-body138_0)" +"((exp-body141_0)" " exp-body_0)" -"((temp139_0)" +"((temp142_0)" " #t))" "(keep-as-needed119.1" -" temp139_0" +" temp142_0" " #f" " #f" -" body-ctx137_0" -" exp-body138_0))" +" body-ctx140_0" +" exp-body141_0))" " trans-stxs_0)" "(cons" "(datum->syntax$1" " #f" "(list" " ids_0" -" rhs116_0)" +" rhs119_0)" " exp-body_0)" " stx-clauses_0)" -" new-dups_0))))))))))))))))" +" new-dups_0" +" #t))))))))))))))))" "(let-values()" "(if stratified?_0" "(let-values()" @@ -67031,7 +67078,8 @@ static const char *startup_source = " trans-idss_0" " trans-stxs_0" " stx-clauses_0" -" dups_0)))" +" dups_0" +" #f)))" "(let-values()" "(loop_0" " body-ctx_1" @@ -67044,7 +67092,8 @@ static const char *startup_source = " trans-idss_0" " trans-stxs_0" " stx-clauses_0" -" dups_0))))))))))))))))))" +" dups_0" +" #f))))))))))))))))))" " loop_0)" " body-ctx_0" " init-bodys_0" @@ -67056,50 +67105,54 @@ static const char *startup_source = " null" " null" " null" -"(make-check-no-duplicate-table))))))))))))))))))))" +"(make-check-no-duplicate-table)" +" #f)))))))))))))))))))" "(define-values" -"(finish-expanding-body31.1)" -"(lambda(disappeared-transformer-bindings14_0" -" disappeared-transformer-forms15_0" -" name13_0" +"(finish-expanding-body33.1)" +"(lambda(disappeared-transformer-bindings15_0" +" disappeared-transformer-forms16_0" +" just-saw-define-syntaxes?13_0" +" name14_0" " original-bodys10_0" " source11_0" " stratified?12_0" -" body-ctx22_0" -" frame-id23_0" -" def-ctx-scopes24_0" -" val-idss25_0" -" val-keyss26_0" -" val-rhss27_0" -" track-stxs28_0" -" stx-clauses29_0" -" done-bodys30_0)" +" body-ctx24_0" +" frame-id25_0" +" def-ctx-scopes26_0" +" val-idss27_0" +" val-keyss28_0" +" val-rhss29_0" +" track-stxs30_0" +" stx-clauses31_0" +" done-bodys32_0)" "(begin" -" 'finish-expanding-body31" -"(let-values(((body-ctx_0) body-ctx22_0))" -"(let-values(((frame-id_0) frame-id23_0))" -"(let-values(((def-ctx-scopes_0) def-ctx-scopes24_0))" -"(let-values(((val-idss_0) val-idss25_0))" -"(let-values(((val-keyss_0) val-keyss26_0))" -"(let-values(((val-rhss_0) val-rhss27_0))" -"(let-values(((track-stxs_0) track-stxs28_0))" -"(let-values(((stx-clauses_0) stx-clauses29_0))" -"(let-values(((done-bodys_0) done-bodys30_0))" +" 'finish-expanding-body33" +"(let-values(((body-ctx_0) body-ctx24_0))" +"(let-values(((frame-id_0) frame-id25_0))" +"(let-values(((def-ctx-scopes_0) def-ctx-scopes26_0))" +"(let-values(((val-idss_0) val-idss27_0))" +"(let-values(((val-keyss_0) val-keyss28_0))" +"(let-values(((val-rhss_0) val-rhss29_0))" +"(let-values(((track-stxs_0) track-stxs30_0))" +"(let-values(((stx-clauses_0) stx-clauses31_0))" +"(let-values(((done-bodys_0) done-bodys32_0))" "(let-values(((init-bodys_0) original-bodys10_0))" "(let-values(((s_0) source11_0))" "(let-values(((stratified?_0) stratified?12_0))" -"(let-values(((name_0) name13_0))" +"(let-values(((just-saw-define-syntaxes?_0) just-saw-define-syntaxes?13_0))" +"(let-values(((name_0) name14_0))" "(let-values(((disappeared-transformer-bindings_0)" -" disappeared-transformer-bindings14_0))" -"(let-values(((disappeared-transformer-forms_0) disappeared-transformer-forms15_0))" +" disappeared-transformer-bindings15_0))" +"(let-values(((disappeared-transformer-forms_0) disappeared-transformer-forms16_0))" "(let-values()" "(let-values((()" "(begin" -"(if(null? done-bodys_0)" +"(if(let-values(((or-part_0)(null? done-bodys_0)))" +"(if or-part_0 or-part_0 just-saw-define-syntaxes?_0))" "(let-values()" "(raise-syntax-error$1" -" (string->symbol \"begin (possibly implicit)\")" -" \"no expression after a sequence of internal definitions\"" +" (string->symbol \"begin (possibly implicit)\")" +" \"no expression after a sequence of internal definitions\"" "(datum->syntax$1 #f(cons 'begin init-bodys_0) s_0)" " #f" " init-bodys_0))" @@ -67112,31 +67165,31 @@ static const char *startup_source = " def-ctx-scopes_0)))" "(let-values(((the-struct_0) v_0))" "(if(expand-context/outer? the-struct_0)" -"(let-values(((context140_0) 'expression)" -"((use-site-scopes141_0)(box null))" -"((scopes142_0)" +"(let-values(((context143_0) 'expression)" +"((use-site-scopes144_0)(box null))" +"((scopes145_0)" "(append" "(unbox" "(root-expand-context-use-site-scopes" " body-ctx_0))" "(expand-context-scopes body-ctx_0)))" -"((only-immediate?143_0) #f)" -"((def-ctx-scopes144_0) #f)" -"((post-expansion145_0) #f)" -"((inner146_0)" +"((only-immediate?146_0) #f)" +"((def-ctx-scopes147_0) #f)" +"((post-expansion148_0) #f)" +"((inner149_0)" "(root-expand-context/outer-inner v_0)))" "(expand-context/outer1.1" -" inner146_0" -" post-expansion145_0" -" use-site-scopes141_0" +" inner149_0" +" post-expansion148_0" +" use-site-scopes144_0" "(root-expand-context/outer-frame-id the-struct_0)" -" context140_0" +" context143_0" "(expand-context/outer-env the-struct_0)" -" scopes142_0" -" def-ctx-scopes144_0" +" scopes145_0" +" def-ctx-scopes147_0" "(expand-context/outer-binding-layer the-struct_0)" "(expand-context/outer-reference-records the-struct_0)" -" only-immediate?143_0" +" only-immediate?146_0" "(expand-context/outer-need-eventually-defined" " the-struct_0)" "(expand-context/outer-current-introduction-scopes" @@ -67145,7 +67198,7 @@ static const char *startup_source = "(expand-context/outer-name the-struct_0)))" "(raise-argument-error" " 'struct-copy" -" \"expand-context/outer?\"" +" \"expand-context/outer?\"" " the-struct_0))))))" "(let-values(((finish-bodys_0)" "(lambda()" @@ -67168,7 +67221,8 @@ static const char *startup_source = " 'next-group)))" "(void)))))" "(values))))" -"(let-values(((last-i_0)(sub1(length done-bodys_0))))" +"(let-values(((last-i_0)" +"(sub1(length done-bodys_0))))" "(let-values((()" "(begin" "(let-values(((obs_0)" @@ -67236,9 +67290,9 @@ static const char *startup_source = " obs_0" " 'next)))" "(void)))" -"(let-values(((done-body147_0)" +"(let-values(((done-body150_0)" " done-body_0)" -"((temp148_0)" +"((temp151_0)" "(if(if name_0" "(=" " i_0" @@ -67250,13 +67304,13 @@ static const char *startup_source = " v_0))" "(if(expand-context/outer?" " the-struct_0)" -"(let-values(((name149_0)" +"(let-values(((name152_0)" " name_0)" -"((inner150_0)" +"((inner153_0)" "(root-expand-context/outer-inner" " v_0)))" "(expand-context/outer1.1" -" inner150_0" +" inner153_0" "(root-expand-context/outer-post-expansion" " the-struct_0)" "(root-expand-context/outer-use-site-scopes" @@ -67283,18 +67337,18 @@ static const char *startup_source = " the-struct_0)" "(expand-context/outer-current-use-scopes" " the-struct_0)" -" name149_0))" +" name152_0))" "(raise-argument-error" " 'struct-copy" -" \"expand-context/outer?\"" +" \"expand-context/outer?\"" " the-struct_0))))" " finish-ctx_0)))" "(expand9.1" " #f" " #f" " #f" -" done-body147_0" -" temp148_0))))" +" done-body150_0" +" temp151_0))))" " fold-var_1))))" "(values" " fold-var_2)))))" @@ -67358,29 +67412,29 @@ static const char *startup_source = "(void)))" "(values))))" "(let-values(((exp-s_0)" -"(let-values(((val-idss151_0) val-idss_0)" -"((val-keyss152_0) val-keyss_0)" -"((val-rhss153_0) val-rhss_0)" -"((track-stxs154_0) track-stxs_0)" -"((temp155_0)(not stratified?_0))" -"((frame-id156_0) frame-id_0)" -"((finish-ctx157_0) finish-ctx_0)" -"((s158_0) s_0)" -"((temp159_0)(pair? stx-clauses_0))" -"((finish-bodys160_0) finish-bodys_0)" -"((temp161_0) #f))" -"(expand-and-split-bindings-by-reference52.1" -" finish-ctx157_0" -" frame-id156_0" -" finish-bodys160_0" -" temp159_0" -" s158_0" -" temp155_0" -" temp161_0" -" val-idss151_0" -" val-keyss152_0" -" val-rhss153_0" -" track-stxs154_0))))" +"(let-values(((val-idss154_0) val-idss_0)" +"((val-keyss155_0) val-keyss_0)" +"((val-rhss156_0) val-rhss_0)" +"((track-stxs157_0) track-stxs_0)" +"((temp158_0)(not stratified?_0))" +"((frame-id159_0) frame-id_0)" +"((finish-ctx160_0) finish-ctx_0)" +"((s161_0) s_0)" +"((temp162_0)(pair? stx-clauses_0))" +"((finish-bodys163_0) finish-bodys_0)" +"((temp164_0) #f))" +"(expand-and-split-bindings-by-reference54.1" +" finish-ctx160_0" +" frame-id159_0" +" finish-bodys163_0" +" temp162_0" +" s161_0" +" temp158_0" +" temp164_0" +" val-idss154_0" +" val-keyss155_0" +" val-rhss156_0" +" track-stxs157_0))))" "(begin" "(let-values(((obs_0)(expand-context-observer body-ctx_0)))" "(if obs_0" @@ -67409,7 +67463,8 @@ static const char *startup_source = " 'for-loop" "(if(pair? lst_1)" "(let-values(((form_0)" -"(unsafe-car lst_1))" +"(unsafe-car" +" lst_1))" "((rest_0)" "(unsafe-cdr" " lst_1)))" @@ -67428,38 +67483,40 @@ static const char *startup_source = " exp-s_5)))" " exp-s_3))))" "(if(not #f)" -"(for-loop_0 exp-s_3 rest_0)" +"(for-loop_0" +" exp-s_3" +" rest_0)" " exp-s_3)))" " exp-s_2)))))" " for-loop_0)" " exp-s_1" -" lst_0)))))))))))))))))))))))))))))))))" +" lst_0))))))))))))))))))))))))))))))))))" "(define-values" -"(expand-and-split-bindings-by-reference52.1)" -"(lambda(ctx36_0" -" frame-id35_0" -" get-body39_0" -" had-stxes?38_0" -" source37_0" -" split?34_0" -" track?40_0" -" idss48_0" -" keyss49_0" -" rhss50_0" -" track-stxs51_0)" +"(expand-and-split-bindings-by-reference54.1)" +"(lambda(ctx38_0" +" frame-id37_0" +" get-body41_0" +" had-stxes?40_0" +" source39_0" +" split?36_0" +" track?42_0" +" idss50_0" +" keyss51_0" +" rhss52_0" +" track-stxs53_0)" "(begin" -" 'expand-and-split-bindings-by-reference52" -"(let-values(((idss_0) idss48_0))" -"(let-values(((keyss_0) keyss49_0))" -"(let-values(((rhss_0) rhss50_0))" -"(let-values(((track-stxs_0) track-stxs51_0))" -"(let-values(((split?_0) split?34_0))" -"(let-values(((frame-id_0) frame-id35_0))" -"(let-values(((ctx_0) ctx36_0))" -"(let-values(((s_0) source37_0))" -"(let-values(((had-stxes?_0) had-stxes?38_0))" -"(let-values(((get-body_0) get-body39_0))" -"(let-values(((track?_0) track?40_0))" +" 'expand-and-split-bindings-by-reference54" +"(let-values(((idss_0) idss50_0))" +"(let-values(((keyss_0) keyss51_0))" +"(let-values(((rhss_0) rhss52_0))" +"(let-values(((track-stxs_0) track-stxs53_0))" +"(let-values(((split?_0) split?36_0))" +"(let-values(((frame-id_0) frame-id37_0))" +"(let-values(((ctx_0) ctx38_0))" +"(let-values(((s_0) source39_0))" +"(let-values(((had-stxes?_0) had-stxes?40_0))" +"(let-values(((get-body_0) get-body41_0))" +"(let-values(((track?_0) track?42_0))" "(let-values()" "(let-values(((phase_0)(expand-context-phase ctx_0)))" "((letrec-values(((loop_0)" @@ -67499,9 +67556,9 @@ static const char *startup_source = " accum-keyss_0" " accum-rhss_0))" " exp-body_0))" -"(let-values(((track?162_0) track?_1)" -"((s163_0) s_0)" -"((temp164_0)" +"(let-values(((track?165_0) track?_1)" +"((s166_0) s_0)" +"((temp167_0)" "(list*" "(if(null? accum-idss_0)" "(core-id" @@ -67516,9 +67573,9 @@ static const char *startup_source = " accum-track-stxs_0)" " exp-body_0)))" "(rebuild5.1" -" track?162_0" -" s163_0" -" temp164_0)))))" +" track?165_0" +" s166_0" +" temp167_0)))))" "(begin" "(let-values(((obs_0)" "(expand-context-observer ctx_0)))" @@ -67549,8 +67606,8 @@ static const char *startup_source = "(values))))" "(let-values(((ids_0)(car idss_1)))" "(let-values(((expanded-rhs_0)" -"(let-values(((temp165_0)(car rhss_1))" -"((temp166_0)" +"(let-values(((temp168_0)(car rhss_1))" +"((temp169_0)" "(as-named-context" " ctx_0" " ids_0)))" @@ -67558,8 +67615,8 @@ static const char *startup_source = " #f" " #f" " #f" -" temp165_0" -" temp166_0))))" +" temp168_0" +" temp169_0))))" "(let-values(((track-stx_0)(car track-stxs_1)))" "(let-values(((local-or-forward-references?_0)" "(reference-record-forward-references?" @@ -67610,11 +67667,11 @@ static const char *startup_source = "(car keyss_1)" " expanded-rhs_0))" " exp-rest_0)" -"(let-values(((track?167_0)" +"(let-values(((track?170_0)" " track?_1)" -"((s168_0)" +"((s171_0)" " s_0)" -"((temp169_0)" +"((temp172_0)" "(list*" "(core-id" " 'let-values" @@ -67626,9 +67683,9 @@ static const char *startup_source = " track-stx_0))" " exp-rest_0)))" "(rebuild5.1" -" track?167_0" -" s168_0" -" temp169_0)))))" +" track?170_0" +" s171_0" +" temp172_0)))))" "(begin" "(let-values(((obs_0)" "(expand-context-observer" @@ -67690,11 +67747,11 @@ static const char *startup_source = " accum-keyss_0" " accum-rhss_0)))" " exp-rest_0)" -"(let-values(((track?170_0)" +"(let-values(((track?173_0)" " track?_1)" -"((s171_0)" +"((s174_0)" " s_0)" -"((temp172_0)" +"((temp175_0)" "(list*" "(core-id" " 'letrec-values" @@ -67711,9 +67768,9 @@ static const char *startup_source = " accum-track-stxs_0))" " exp-rest_0)))" "(rebuild5.1" -" track?170_0" -" s171_0" -" temp172_0)))))" +" track?173_0" +" s174_0" +" temp175_0)))))" "(begin" "(let-values(((obs_0)" "(expand-context-observer" @@ -70921,7 +70978,7 @@ static const char *startup_source = " get-body_0)" "((temp216_0)" " #t))" -"(expand-and-split-bindings-by-reference52.1" +"(expand-and-split-bindings-by-reference54.1" " rec-ctx212_0" " frame-id211_0" " get-body215_0"