diff --git a/racket/src/expander/README.txt b/racket/src/expander/README.txt index 2b0d05d681..6fa7d23671 100644 --- a/racket/src/expander/README.txt +++ b/racket/src/expander/README.txt @@ -60,12 +60,12 @@ Running: Expands the given file, instead of compiling and running it. - % racket run.rkt -c --linklets -l + % racket bootstrap-run.rkt -s -c --linklets -l Compiles the given file to a set of linklets in S-expression form, instead of compiling and running it. - % racket run.rkt -c -x + % racket bootstrap-run.rkt -s -c -x Checks possibility of converting a module to a stand-alone linklet with no imports --- used mainly to extract the expander itself. diff --git a/racket/src/expander/compile/form.rkt b/racket/src/expander/compile/form.rkt index f00eb11357..9b2a95671c 100644 --- a/racket/src/expander/compile/form.rkt +++ b/racket/src/expander/compile/form.rkt @@ -44,7 +44,6 @@ #:definition-callback [definition-callback void] #:other-form-callback [other-form-callback void] #:get-module-linklet-info [get-module-linklet-info (lambda (mod-name p) #f)] ; to support submodules - #:to-source? [to-source? #f] #:serializable? [serializable? #t] #:cross-linklet-inlining? [cross-linklet-inlining? #t]) (define phase (compile-context-phase cctx)) @@ -252,10 +251,8 @@ (define-values (linklet new-module-use*s) (performance-region ['compile '_ 'linklet] - ((if to-source? - (lambda (l name keys getter) (values l keys)) - (lambda (l name keys getter) - (compile-linklet l name keys getter (if serializable? '(serializable) '())))) + ((lambda (l name keys getter) + (compile-linklet l name keys getter (if serializable? '(serializable) '()))) `(linklet ;; imports (,@body-imports diff --git a/racket/src/expander/compile/module.rkt b/racket/src/expander/compile/module.rkt index 1644aea9f8..4ecf255b1b 100644 --- a/racket/src/expander/compile/module.rkt +++ b/racket/src/expander/compile/module.rkt @@ -27,12 +27,10 @@ (provide compile-module) ;; Compiles module to a set of linklets that is returned as a -;; `compiled-in-memory` --- or a hash table containing S-expression -;; linklets if `to-source?` is true. +;; `compiled-in-memory` (define (compile-module p cctx #:force-linklet-directory? [force-linklet-directory? #f] #:serializable? [serializable? #f] - #:to-source? [to-source? #f] #:modules-being-compiled [modules-being-compiled (make-hasheq)] #:need-compiled-submodule-rename? [need-compiled-submodule-rename? #t]) @@ -75,7 +73,6 @@ #:full-module-name full-module-name #:force-linklet-directory? force-linklet-directory? #:serializable? serializable? - #:to-source? to-source? #:modules-being-compiled modules-being-compiled #:pre-submodules pre-submodules #:post-submodules post-submodules @@ -87,7 +84,6 @@ #:full-module-name full-module-name #:force-linklet-directory? force-linklet-directory? #:serializable? serializable? - #:to-source? to-source? #:modules-being-compiled modules-being-compiled #:pre-submodules pre-submodules #:post-submodules post-submodules @@ -170,7 +166,6 @@ (define ht (and modules-being-compiled (hash-ref modules-being-compiled mod-name #f))) (and ht (hash-ref ht phase #f))) - #:to-source? to-source? #:serializable? serializable?)) (when modules-being-compiled @@ -193,9 +188,9 @@ ;; declaration, and is shared among instances (define declaration-linklet (and serializable? - ((if to-source? values (lambda (s) (performance-region - ['compile 'module 'linklet] - (compile-linklet s 'decl)))) + ((lambda (s) (performance-region + ['compile 'module 'linklet] + (compile-linklet s 'decl))) `(linklet ;; imports (,deserialize-imports @@ -217,18 +212,18 @@ ;; objects in the module. (define syntax-literals-linklet (and (not (syntax-literals-empty? syntax-literals)) - ((if to-source? values (lambda (s) - (performance-region - ['compile 'module 'linklet] - (define-values (linklet new-keys) - (compile-linklet s 'syntax-literals - (vector deserialize-instance - empty-top-syntax-literal-instance - empty-syntax-literals-data-instance - empty-instance-instance) - (lambda (inst) (values inst #f)) - (if serializable? '(serializable) '()))) - linklet))) + ((lambda (s) + (performance-region + ['compile 'module 'linklet] + (define-values (linklet new-keys) + (compile-linklet s 'syntax-literals + (vector deserialize-instance + empty-top-syntax-literal-instance + empty-syntax-literals-data-instance + empty-instance-instance) + (lambda (inst) (values inst #f)) + (if serializable? '(serializable) '()))) + linklet)) `(linklet ;; imports (,deserialize-imports @@ -266,9 +261,9 @@ (define syntax-literals-data-linklet (and serializable? (not (syntax-literals-empty? syntax-literals)) - ((if to-source? values (lambda (s) (performance-region - ['compile 'module 'linklet] - (compile-linklet s 'syntax-literals-data)))) + ((lambda (s) (performance-region + ['compile 'module 'linklet] + (compile-linklet s 'syntax-literals-data))) `(linklet ;; imports (,deserialize-imports @@ -288,9 +283,9 @@ ;; across module instances. (define data-linklet (and serializable? - ((if to-source? values (lambda (s) (performance-region - ['compile 'module 'linklet] - (compile-linklet s 'data)))) + ((lambda (s) (performance-region + ['compile 'module 'linklet] + (compile-linklet s 'data))) `(linklet ;; imports (,deserialize-imports) @@ -352,30 +347,27 @@ ;; Just use the bundle representation directly: bundle] [else - ((if to-source? values hash->linklet-directory) + (hash->linklet-directory (for/fold ([ht (hasheq #f bundle)]) ([sm (in-list (append pre-submodules post-submodules))]) (hash-set ht (car sm) - ((if to-source? values compiled-in-memory-linklet-directory) + (compiled-in-memory-linklet-directory (cdr sm)))))])) - (cond - [to-source? ld] - [else - ;; Save mpis and syntax for direct evaluation, instead of unmarshaling: - (compiled-in-memory ld - self - requires - provides - phase-to-link-module-uses - (current-code-inspector) - phase-to-link-extra-inspectorsss - (mpis-as-vector mpis) - (syntax-literals-as-vector syntax-literals) - (map cdr pre-submodules) - (map cdr post-submodules) - #f ; no namespace scopes - #f)]))) ; not purely functional, since it declares a module + ;; Save mpis and syntax for direct evaluation, instead of unmarshaling: + (compiled-in-memory ld + self + requires + provides + phase-to-link-module-uses + (current-code-inspector) + phase-to-link-extra-inspectorsss + (mpis-as-vector mpis) + (syntax-literals-as-vector syntax-literals) + (map cdr pre-submodules) + (map cdr post-submodules) + #f ; no namespace scopes + #f))) ; not purely functional, since it declares a module ;; ---------------------------------------- diff --git a/racket/src/expander/compile/multi-top.rkt b/racket/src/expander/compile/multi-top.rkt index 23c7d5b911..6d7ad7e8bb 100644 --- a/racket/src/expander/compile/multi-top.rkt +++ b/racket/src/expander/compile/multi-top.rkt @@ -18,7 +18,6 @@ ;; top of a tree, we repeat work only twice and avoid non-linear ;; behavior.) (define (compiled-tops->compiled-top all-cims - #:to-source? [to-source? #f] #:merge-serialization? [merge-serialization? #f] #:namespace [ns #f]) ; need for `merge-serialization?` (define cims (remove-nontail-purely-functional all-cims)) @@ -30,7 +29,7 @@ (for/hasheq ([cim (in-list cims)] [i (in-naturals)]) (values (string->symbol (number->string i)) - ((if to-source? values compiled-in-memory-linklet-directory) + (compiled-in-memory-linklet-directory cim)))) (define ht (if merge-serialization? (hash-set sequence-ht @@ -42,22 +41,19 @@ 0 (build-shared-data-linklet cims ns)))))) sequence-ht)) - (cond - [to-source? ht] - [else - (compiled-in-memory (hash->linklet-directory ht) - #f ; self - #f ; requires - #f ; provides - #hasheqv() - #f - #hasheqv() - #() ; mpis - #() ; syntax-literals - cims - null - #f - #f)])])) + (compiled-in-memory (hash->linklet-directory ht) + #f ; self + #f ; requires + #f ; provides + #hasheqv() + #f + #hasheqv() + #() ; mpis + #() ; syntax-literals + cims + null + #f + #f)])) ;; Decode a sequence of compiled top-level forms by unpacking the ;; linklet directory into a list of linklet directories diff --git a/racket/src/expander/compile/top.rkt b/racket/src/expander/compile/top.rkt index 98d59d1381..a48453616c 100644 --- a/racket/src/expander/compile/top.rkt +++ b/racket/src/expander/compile/top.rkt @@ -35,13 +35,10 @@ ;; `define-syntaxes` form, or an expression (where `begin` is treated ;; as an expression form). If `serializable?` is false, don't bother ;; generating the linklet for serialized data, because it won't be -;; used. If `to-source?` is true, the result is a hash table containing -;; S-expression linkets, instead of a `compiled-in-memory` containing -;; compiled linklets. +;; used. (define (compile-top p cctx #:serializable? [serializable? #t] - #:single-expression? [single-expression? #f] - #:to-source? [to-source? #f]) + #:single-expression? [single-expression? #f]) (performance-region ['compile (if single-expression? 'transformer 'top)] @@ -72,7 +69,6 @@ #:body-import-instances (list top-level-instance empty-top-syntax-literal-instance empty-instance-instance) - #:to-source? to-source? #:serializable? serializable? #:definition-callback (lambda () (set! purely-functional? #f)) #:compiled-expression-callback @@ -91,7 +87,7 @@ ht)) (define bundle - ((if to-source? values hash->linklet-bundle) + (hash->linklet-bundle (add-metadata (cond [serializable? @@ -108,16 +104,16 @@ (compile-context-namespace cctx)))) (define link-linklet - ((if to-source? values (lambda (s) - (performance-region - ['compile 'top 'linklet] - (define-values (linklet new-keys) - (compile-linklet s - #f - (vector deserialize-instance - empty-eager-instance-instance) - (lambda (inst) (values inst #f)))) - linklet))) + ((lambda (s) + (performance-region + ['compile 'top 'linklet] + (define-values (linklet new-keys) + (compile-linklet s + #f + (vector deserialize-instance + empty-eager-instance-instance) + (lambda (inst) (values inst #f)))) + linklet)) `(linklet ;; imports (,deserialize-imports @@ -139,25 +135,21 @@ ;; Will combine the linking unit with non-serialized link info body-linklets])))) - (cond - [to-source? - (hasheq #f bundle)] - [else - ;; If the compiled code is executed directly, it must be in its - ;; original phase, and we'll share the original values - (compiled-in-memory (hash->linklet-directory (hasheq #f bundle)) - #f ; self - #f ; requires - #f ; provides - phase-to-link-module-uses - (current-code-inspector) - phase-to-link-extra-inspectorss - (mpis-as-vector mpis) - (syntax-literals-as-vector syntax-literals) - null - null - (extract-namespace-scopes (compile-context-namespace cctx)) - purely-functional?)]))) + ;; If the compiled code is executed directly, it must be in its + ;; original phase, and we'll share the original values + (compiled-in-memory (hash->linklet-directory (hasheq #f bundle)) + #f ; self + #f ; requires + #f ; provides + phase-to-link-module-uses + (current-code-inspector) + phase-to-link-extra-inspectorss + (mpis-as-vector mpis) + (syntax-literals-as-vector syntax-literals) + null + null + (extract-namespace-scopes (compile-context-namespace cctx)) + purely-functional?))) ;; Callback for compiling a sequence of expressions: handle `require` ;; (which is handled separately for modules) diff --git a/racket/src/expander/eval/main.rkt b/racket/src/expander/eval/main.rkt index 14ee0a0825..d4d64dae03 100644 --- a/racket/src/expander/eval/main.rkt +++ b/racket/src/expander/eval/main.rkt @@ -34,9 +34,7 @@ compile expand expand-once - expand-to-top-form - - compile-to-linklets) + expand-to-top-form) ;; This `eval` is suitable as an eval handler that will be called by ;; the `eval` and `eval-syntax` of '#%kernel. @@ -71,7 +69,7 @@ ;; by the `compile` and `compile-syntax` of '#%kernel ;; [Don't use keyword arguments here, because the function is ;; exported for use by an embedding runtime system.] -(define (compile s [ns (current-namespace)] [serializable? #t] [expand expand] [to-source? #f]) +(define (compile s [ns (current-namespace)] [serializable? #t] [expand expand]) ;; The given `s` might be an already-compiled expression because it ;; went through some strange path, such as a `load` on a bytecode ;; file, which would wrap `#%top-interaction` around the compiled @@ -86,47 +84,35 @@ (per-top-level s ns #:single (lambda (s ns as-tail?) (list (compile-single s ns expand - serializable? - to-source?))) + serializable?))) #:combine append #:observer #f)])) (if (and (= 1 (length cs)) (not (compiled-multiple-top? (car cs)))) (car cs) (compiled-tops->compiled-top cs - #:to-source? to-source? #:merge-serialization? serializable? #:namespace ns))) -;; Result is a hash table containing S-expressons that may have -;; "correlated" parts in the sense of "host/correlate.rkt"; use -;; `datum->correlated` plus `correlated->datum` to get a plain -;; S-expression -(define (compile-to-linklets s [ns (current-namespace)]) - (compile s ns #t expand #t)) - ;; To communicate lifts from `expand-single` to `compile-single`: (struct lifted-parsed-begin (seq last)) -(define (compile-single s ns expand serializable? to-source?) +(define (compile-single s ns expand serializable?) (define exp-s (expand s ns #f #t serializable?)) (let loop ([exp-s exp-s]) (cond [(parsed-module? exp-s) (compile-module exp-s (make-compile-context #:namespace ns) - #:serializable? serializable? - #:to-source? to-source?)] + #:serializable? serializable?)] [(lifted-parsed-begin? exp-s) ;; expansion must have captured lifts (compiled-tops->compiled-top (for/list ([e (in-list (append (lifted-parsed-begin-seq exp-s) (list (lifted-parsed-begin-last exp-s))))]) - (loop e)) - #:to-source? to-source?)] + (loop e)))] [else (compile-top exp-s (make-compile-context #:namespace ns) - #:serializable? serializable? - #:to-source? to-source?)]))) + #:serializable? serializable?)]))) ;; This `expand` is suitable as an expand handler (if such a thing ;; existed) to be called by `expand` and `expand-syntax`. diff --git a/racket/src/expander/main.rkt b/racket/src/expander/main.rkt index 4ad70c6f7b..cd8e1f2a11 100644 --- a/racket/src/expander/main.rkt +++ b/racket/src/expander/main.rkt @@ -75,8 +75,6 @@ use-collection-link-paths use-user-specific-search-paths - compile-to-linklets - syntax? read-syntax datum->syntax syntax->datum diff --git a/racket/src/expander/run.rkt b/racket/src/expander/run.rkt index 35a5ee6a55..d9d907de31 100644 --- a/racket/src/expander/run.rkt +++ b/racket/src/expander/run.rkt @@ -313,7 +313,7 @@ [linklets? (pretty-write (correlated->datum (datum->correlated - (apply-to-module compile-to-linklets startup-module) #f)))] + (apply-to-module compile startup-module) #f)))] [else ;; Load and run the requested module (parameterize ([current-command-line-arguments (list->vector args)]) diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index f71b18c97b..5dfaac32e9 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -6,7 +6,6 @@ static const char *startup_source = "(1/bound-identifier=? bound-identifier=?)" "(1/compile compile)" "(compile-keep-source-locations! compile-keep-source-locations!)" -"(compile-to-linklets compile-to-linklets)" "(1/current-compile current-compile)" "(1/current-compiled-file-roots current-compiled-file-roots)" "(1/current-eval current-eval)" @@ -28569,28 +28568,27 @@ static const char *startup_source = "(make-struct-field-accessor -ref_0 2 'extra-inspectorsss)" "(make-struct-field-accessor -ref_0 3 'def-decls))))" "(define-values" -"(compile-forms31.1)" +"(compile-forms29.1)" "(lambda(body-import-instances3_0" " body-imports2_0" " body-suffix-forms4_0" " compiled-expression-callback8_0" -" cross-linklet-inlining?14_0" +" cross-linklet-inlining?13_0" " definition-callback9_0" " encoded-root-expand-ctx-box6_0" " force-phases5_0" " get-module-linklet-info11_0" " other-form-callback10_0" " root-ctx-only-if-syntax?7_0" -" serializable?13_0" -" to-source?12_0" -" bodys28_0" -" cctx29_0" -" mpis30_0)" +" serializable?12_0" +" bodys26_0" +" cctx27_0" +" mpis28_0)" "(begin" -" 'compile-forms31" -"(let-values(((bodys_0) bodys28_0))" -"(let-values(((cctx_0) cctx29_0))" -"(let-values(((mpis_0) mpis30_0))" +" 'compile-forms29" +"(let-values(((bodys_0) bodys26_0))" +"(let-values(((cctx_0) cctx27_0))" +"(let-values(((mpis_0) mpis28_0))" "(let-values(((body-imports_0) body-imports2_0))" "(let-values(((body-import-instances_0) body-import-instances3_0))" "(let-values(((body-suffix-forms_0) body-suffix-forms4_0))" @@ -28611,9 +28609,8 @@ static const char *startup_source = "(if(eq? get-module-linklet-info11_0 unsafe-undefined)" "(lambda(mod-name_0 p_0)(begin 'get-module-linklet-info #f))" " get-module-linklet-info11_0)))" -"(let-values(((to-source?_0) to-source?12_0))" -"(let-values(((serializable?_0) serializable?13_0))" -"(let-values(((cross-linklet-inlining?_0) cross-linklet-inlining?14_0))" +"(let-values(((serializable?_0) serializable?12_0))" +"(let-values(((cross-linklet-inlining?_0) cross-linklet-inlining?13_0))" "(let-values()" "(let-values(((phase_0)(compile-context-phase cctx_0)))" "(let-values(((self_0)(compile-context-self cctx_0)))" @@ -28994,26 +28991,26 @@ static const char *startup_source = "(let-values()" "(cons" "(let-values()" -"(let-values(((header35_0)" +"(let-values(((header33_0)" " header_0)" -"((temp36_0)" +"((temp34_0)" "(compile-context-self" " cctx_0))" -"((phase37_0)" +"((phase35_0)" " phase_1)" -"((binding-sym38_0)" +"((binding-sym36_0)" " binding-sym_0)" -"((temp39_0)" +"((temp37_0)" " #f)" -"((temp40_0)" +"((temp38_0)" " #t))" "(register-required-variable-use!19.1" -" temp40_0" -" header35_0" -" temp36_0" -" phase37_0" -" binding-sym38_0" -" temp39_0)))" +" temp38_0" +" header33_0" +" temp34_0" +" phase35_0" +" binding-sym36_0" +" temp37_0)))" " fold-var_1))))" "(values" " fold-var_2)))))" @@ -29035,14 +29032,14 @@ static const char *startup_source = " cctx_0))" "(if(compile-context?" " the-struct_0)" -"(let-values(((phase41_0)" +"(let-values(((phase39_0)" " phase_1)" -"((header42_0)" +"((header40_0)" " header_0))" "(compile-context1.1" "(compile-context-namespace" " the-struct_0)" -" phase41_0" +" phase39_0" "(compile-context-self" " the-struct_0)" "(compile-context-module-self" @@ -29051,10 +29048,10 @@ static const char *startup_source = " the-struct_0)" "(compile-context-lazy-syntax-literals?" " the-struct_0)" -" header42_0))" +" header40_0))" "(raise-argument-error" " 'struct-copy" -" \"compile-context?\"" +" \"compile-context?\"" " the-struct_0)))" "(if(=" "(length" @@ -29158,14 +29155,14 @@ static const char *startup_source = " cctx_0))" "(if(compile-context?" " the-struct_0)" -"(let-values(((phase43_0)" +"(let-values(((phase41_0)" " phase_1)" -"((header44_0)" +"((header42_0)" " header_0))" "(compile-context1.1" "(compile-context-namespace" " the-struct_0)" -" phase43_0" +" phase41_0" "(compile-context-self" " the-struct_0)" "(compile-context-module-self" @@ -29174,10 +29171,10 @@ static const char *startup_source = " the-struct_0)" "(compile-context-lazy-syntax-literals?" " the-struct_0)" -" header44_0))" +" header42_0))" "(raise-argument-error" " 'struct-copy" -" \"compile-context?\"" +" \"compile-context?\"" " the-struct_0)))" " #f)))))))))))" "(if(parsed-define-syntaxes?" @@ -29254,15 +29251,15 @@ static const char *startup_source = " cctx_0))" "(if(compile-context?" " the-struct_0)" -"(let-values(((phase45_0)" +"(let-values(((phase43_0)" "(add1" " phase_1))" -"((header46_0)" +"((header44_0)" " next-header_0))" "(compile-context1.1" "(compile-context-namespace" " the-struct_0)" -" phase45_0" +" phase43_0" "(compile-context-self" " the-struct_0)" "(compile-context-module-self" @@ -29271,10 +29268,10 @@ static const char *startup_source = " the-struct_0)" "(compile-context-lazy-syntax-literals?" " the-struct_0)" -" header46_0))" +" header44_0))" "(raise-argument-error" " 'struct-copy" -" \"compile-context?\"" +" \"compile-context?\"" " the-struct_0))))))" "(let-values((()" "(begin" @@ -29394,14 +29391,14 @@ static const char *startup_source = " cctx_0))" "(if(compile-context?" " the-struct_0)" -"(let-values(((phase47_0)" +"(let-values(((phase45_0)" " phase_1)" -"((header48_0)" +"((header46_0)" " header_0))" "(compile-context1.1" "(compile-context-namespace" " the-struct_0)" -" phase47_0" +" phase45_0" "(compile-context-self" " the-struct_0)" "(compile-context-module-self" @@ -29410,10 +29407,10 @@ static const char *startup_source = " the-struct_0)" "(compile-context-lazy-syntax-literals?" " the-struct_0)" -" header48_0))" +" header46_0))" "(raise-argument-error" " 'struct-copy" -" \"compile-context?\"" +" \"compile-context?\"" " the-struct_0)))" " gen-syms_0)))))" "(set! saw-define-syntaxes?_0" @@ -29449,14 +29446,14 @@ static const char *startup_source = " cctx_0))" "(if(compile-context?" " the-struct_0)" -"(let-values(((phase49_0)" +"(let-values(((phase47_0)" " phase_1)" -"((header50_0)" +"((header48_0)" " header_0))" "(compile-context1.1" "(compile-context-namespace" " the-struct_0)" -" phase49_0" +" phase47_0" "(compile-context-self" " the-struct_0)" "(compile-context-module-self" @@ -29465,10 +29462,10 @@ static const char *startup_source = " the-struct_0)" "(compile-context-lazy-syntax-literals?" " the-struct_0)" -" header50_0))" +" header48_0))" "(raise-argument-error" " 'struct-copy" -" \"compile-context?\"" +" \"compile-context?\"" " the-struct_0))))))" "(if e_0" "(let-values()" @@ -29491,14 +29488,14 @@ static const char *startup_source = " cctx_0))" "(if(compile-context?" " the-struct_0)" -"(let-values(((phase51_0)" +"(let-values(((phase49_0)" " phase_1)" -"((header52_0)" +"((header50_0)" " header_0))" "(compile-context1.1" "(compile-context-namespace" " the-struct_0)" -" phase51_0" +" phase49_0" "(compile-context-self" " the-struct_0)" "(compile-context-module-self" @@ -29507,10 +29504,10 @@ static const char *startup_source = " the-struct_0)" "(compile-context-lazy-syntax-literals?" " the-struct_0)" -" header52_0))" +" header50_0))" "(raise-argument-error" " 'struct-copy" -" \"compile-context?\"" +" \"compile-context?\"" " the-struct_0)))" " #f" "(=" @@ -29566,11 +29563,11 @@ static const char *startup_source = " #f)" " #f)))" "(let-values(((phases-in-order_0)" -"(let-values(((temp53_0)" +"(let-values(((temp51_0)" "(hash-keys" " phase-to-body_0))" -"((<54_0) <))" -"(sort7.1 #f #f temp53_0 <54_0))))" +"((<52_0) <))" +"(sort7.1 #f #f temp51_0 <52_0))))" "(let-values(((min-phase_0)" "(if(pair? phases-in-order_0)" "(car phases-in-order_0)" @@ -29578,8 +29575,7 @@ static const char *startup_source = "(let-values(((max-phase_0)" "(if(pair? phases-in-order_0)" "(car" -"(reverse$1" -" phases-in-order_0))" +"(reverse$1 phases-in-order_0))" " phase_0)))" "(let-values(((phase-to-link-info_0)" "(let-values(((lst_0)" @@ -29709,15 +29705,7 @@ static const char *startup_source = "(void))" "(begin0" "(let-values()" -"((if to-source?_0" -"(lambda(l_0" -" name_0" -" keys_0" -" getter_0)" -"(values" -" l_0" -" keys_0))" -"(lambda(l_0" +"((lambda(l_0" " name_0" " keys_0" " getter_0)" @@ -29728,7 +29716,7 @@ static const char *startup_source = " getter_0" "(if serializable?_0" " '(serializable)" -" '()))))" +" '())))" "(list*" " 'linklet" "(qq-append" @@ -30031,7 +30019,7 @@ static const char *startup_source = " phase-to-link-module-uses-expr_0" " phase-to-link-extra-inspectorsss_0" " syntax-literals_0" -" encoded-root-expand-pos_0)))))))))))))))))))))))))))))))))))))))))))))" +" encoded-root-expand-pos_0))))))))))))))))))))))))))))))))))))))))))))" "(define-values" "(compile-top-level-bind)" "(lambda(ids_0 binding-syms_0 cctx_0 trans-exprs_0)" @@ -30520,14 +30508,13 @@ static const char *startup_source = " loop_0)" " cims_0))))" "(define-values" -"(compiled-tops->compiled-top8.1)" -"(lambda(merge-serialization?2_0 namespace3_0 to-source?1_0 all-cims7_0)" +"(compiled-tops->compiled-top6.1)" +"(lambda(merge-serialization?1_0 namespace2_0 all-cims5_0)" "(begin" -" 'compiled-tops->compiled-top8" -"(let-values(((all-cims_0) all-cims7_0))" -"(let-values(((to-source?_0) to-source?1_0))" -"(let-values(((merge-serialization?_0) merge-serialization?2_0))" -"(let-values(((ns_0) namespace3_0))" +" 'compiled-tops->compiled-top6" +"(let-values(((all-cims_0) all-cims5_0))" +"(let-values(((merge-serialization?_0) merge-serialization?1_0))" +"(let-values(((ns_0) namespace2_0))" "(let-values()" "(let-values(((cims_0)(remove-nontail-purely-functional all-cims_0)))" "(if(= 1(length cims_0))" @@ -30561,9 +30548,7 @@ static const char *startup_source = "(string->symbol" "(number->string" " i_0))" -"((if to-source?_0" -" values" -" compiled-in-memory-linklet-directory)" +"(compiled-in-memory-linklet-directory" " cim_0)))))" "(hash-set" " table_1" @@ -30586,12 +30571,8 @@ static const char *startup_source = "(1/hash->linklet-directory" "(hasheq" " #f" -"(1/hash->linklet-bundle" -"(hasheq 0(build-shared-data-linklet cims_0 ns_0))))))" +"(1/hash->linklet-bundle(hasheq 0(build-shared-data-linklet cims_0 ns_0))))))" " sequence-ht_0)))" -"(if to-source?_0" -"(let-values() ht_0)" -"(let-values()" "(compiled-in-memory1.1" "(1/hash->linklet-directory ht_0)" " #f" @@ -30605,7 +30586,7 @@ static const char *startup_source = " cims_0" " null" " #f" -" #f))))))))))))))))" +" #f)))))))))))))" "(define-values" "(compiled-top->compiled-tops)" "(lambda(ld_0)" @@ -33429,18 +33410,17 @@ static const char *startup_source = "(compile-single)" "(lambda(p_0 cctx_0)" "(begin" -"(let-values(((p12_0) p_0)((cctx13_0) cctx_0)((temp14_0) #f)((temp15_0) #t))" -"(compile-top9.1 temp14_0 temp15_0 #f p12_0 cctx13_0)))))" +"(let-values(((p10_0) p_0)((cctx11_0) cctx_0)((temp12_0) #f)((temp13_0) #t))" +"(compile-top7.1 temp12_0 temp13_0 p10_0 cctx11_0)))))" "(define-values" -"(compile-top9.1)" -"(lambda(serializable?1_0 single-expression?2_0 to-source?3_0 p7_0 cctx8_0)" +"(compile-top7.1)" +"(lambda(serializable?1_0 single-expression?2_0 p5_0 cctx6_0)" "(begin" -" 'compile-top9" -"(let-values(((p_0) p7_0))" -"(let-values(((cctx_0) cctx8_0))" +" 'compile-top7" +"(let-values(((p_0) p5_0))" +"(let-values(((cctx_0) cctx6_0))" "(let-values(((serializable?_0) serializable?1_0))" "(let-values(((single-expression?_0) single-expression?2_0))" -"(let-values(((to-source?_0) to-source?3_0))" "(let-values()" "(begin" "(if log-performance?" @@ -33459,64 +33439,61 @@ static const char *startup_source = " phase-to-link-extra-inspectorss_0" " syntax-literals_0" " no-root-context-pos_0)" -"(let-values(((temp16_0)(list p_0))" -"((cctx17_0) cctx_0)" -"((mpis18_0) mpis_0)" -"((temp19_0)" +"(let-values(((temp14_0)(list p_0))" +"((cctx15_0) cctx_0)" +"((mpis16_0) mpis_0)" +"((temp17_0)" "(if single-expression?_0" "(list* '()(list syntax-literals-id) '(()))" "(list" "(list top-level-bind!-id top-level-require!-id)" "(list mpi-vector-id syntax-literals-id)" " instance-imports)))" -"((temp20_0)" +"((temp18_0)" "(list" " top-level-instance" " empty-top-syntax-literal-instance" " empty-instance-instance))" -"((to-source?21_0) to-source?_0)" -"((serializable?22_0) serializable?_0)" -"((temp23_0)(lambda()(set! purely-functional?_0 #f)))" -"((temp24_0)" +"((serializable?19_0) serializable?_0)" +"((temp20_0)(lambda()(set! purely-functional?_0 #f)))" +"((temp21_0)" "(lambda(e_0 expected-results_0 phase_1 required-reference?_0)" "(if(if purely-functional?_0" -"(let-values(((e27_0) e_0)" -"((expected-results28_0)" -" expected-results_0)" -"((required-reference?29_0)" +"(let-values(((e24_0) e_0)" +"((expected-results25_0) expected-results_0)" +"((required-reference?26_0)" " required-reference?_0))" "(any-side-effects?9.1" " unsafe-undefined" " unsafe-undefined" -" required-reference?29_0" -" e27_0" -" expected-results28_0))" +" required-reference?26_0" +" e24_0" +" expected-results25_0))" " #f)" "(let-values()(set! purely-functional?_0 #f))" "(void))))" -"((temp25_0)" +"((temp22_0)" "(lambda(s_0 cctx_1)" "(begin" "(set! purely-functional?_0 #f)" "(compile-top-level-require s_0 cctx_1))))" -"((temp26_0)(not single-expression?_0)))" -"(compile-forms31.1" -" temp20_0" -" temp19_0" +"((temp23_0)(not single-expression?_0)))" +"(compile-forms29.1" +" temp18_0" +" temp17_0" " null" -" temp24_0" -" temp26_0" +" temp21_0" " temp23_0" +" temp20_0" " #f" " null" " unsafe-undefined" -" temp25_0" +" temp22_0" " #f" -" serializable?22_0" -" to-source?21_0" -" temp16_0" -" cctx17_0" -" mpis18_0))))" +" serializable?19_0" +" temp14_0" +" cctx15_0" +" mpis16_0))))" "(let-values(((add-metadata_0)" "(lambda(ht_0)" "(begin" @@ -33525,7 +33502,7 @@ static const char *startup_source = "(let-values(((ht_2)(hash-set ht_1 'max-phase max-phase_0)))" " ht_2))))))" "(let-values(((bundle_0)" -"((if to-source?_0 values 1/hash->linklet-bundle)" +"(1/hash->linklet-bundle" "(add-metadata_0" "(if serializable?_0" "(let-values()" @@ -33550,9 +33527,7 @@ static const char *startup_source = "(let-values()(end-performance-region))" "(void))))))" "(let-values(((link-linklet_0)" -"((if to-source?_0" -" values" -"(lambda(s_0)" +"((lambda(s_0)" "(begin" "(if log-performance?" "(let-values()" @@ -33574,14 +33549,11 @@ static const char *startup_source = "(values inst_0 #f)))))" " linklet_0))" "(if log-performance?" -"(let-values()" -"(end-performance-region))" -"(void))))))" +"(let-values()(end-performance-region))" +"(void)))))" "(list" " 'linklet" -"(list" -" deserialize-imports" -" eager-instance-imports)" +"(list deserialize-imports eager-instance-imports)" "(list" " mpi-vector-id" " deserialized-syntax-vector-id" @@ -33590,8 +33562,7 @@ static const char *startup_source = "(list" " 'define-values" "(list mpi-vector-id)" -"(generate-module-path-index-deserialize" -" mpis_0))" +"(generate-module-path-index-deserialize mpis_0))" "(list" " 'define-values" "(list deserialized-syntax-vector-id)" @@ -33606,9 +33577,6 @@ static const char *startup_source = " syntax-literals-expr_0)))))" "(hash-set body-linklets_0 'link link-linklet_0))))" "(let-values() body-linklets_0))))))" -"(if to-source?_0" -"(let-values()(hasheq #f bundle_0))" -"(let-values()" "(compiled-in-memory1.1" "(1/hash->linklet-directory(hasheq #f bundle_0))" " #f" @@ -33622,8 +33590,8 @@ static const char *startup_source = " null" " null" "(extract-namespace-scopes(compile-context-namespace cctx_0))" -" purely-functional?_0))))))))))" -"(if log-performance?(let-values()(end-performance-region))(void)))))))))))))" +" purely-functional?_0))))))))" +"(if log-performance?(let-values()(end-performance-region))(void))))))))))))" "(define-values" "(compile-top-level-require)" "(lambda(p_0 cctx_0)" @@ -36052,26 +36020,24 @@ static const char *startup_source = "(if pre?_0 'pre 'post)" "(map2 module-compiled-immediate-name submods_0))))))" "(define-values" -"(compile-module13.1)" +"(compile-module11.1)" "(lambda(force-linklet-directory?1_0" -" modules-being-compiled4_0" -" need-compiled-submodule-rename?5_0" +" modules-being-compiled3_0" +" need-compiled-submodule-rename?4_0" " serializable?2_0" -" to-source?3_0" -" p11_0" -" cctx12_0)" +" p9_0" +" cctx10_0)" "(begin" -" 'compile-module13" -"(let-values(((p_0) p11_0))" -"(let-values(((cctx_0) cctx12_0))" +" 'compile-module11" +"(let-values(((p_0) p9_0))" +"(let-values(((cctx_0) cctx10_0))" "(let-values(((force-linklet-directory?_0) force-linklet-directory?1_0))" "(let-values(((serializable?_0) serializable?2_0))" -"(let-values(((to-source?_0) to-source?3_0))" "(let-values(((modules-being-compiled_0)" -"(if(eq? modules-being-compiled4_0 unsafe-undefined)" +"(if(eq? modules-being-compiled3_0 unsafe-undefined)" "(make-hasheq)" -" modules-being-compiled4_0)))" -"(let-values(((need-compiled-submodule-rename?_0) need-compiled-submodule-rename?5_0))" +" modules-being-compiled3_0)))" +"(let-values(((need-compiled-submodule-rename?_0) need-compiled-submodule-rename?4_0))" "(let-values()" "(let-values(((full-module-name_0)" "(let-values(((parent-full-name_0)(compile-context-full-module-name cctx_0))" @@ -36098,9 +36064,7 @@ static const char *startup_source = " 'for-loop" "(if i_0" "(let-values(((name_0 star?+compiled_0)" -"(hash-iterate-key+value" -" ht_0" -" i_0)))" +"(hash-iterate-key+value ht_0 i_0)))" "(let-values(((fold-var_1)" "(let-values(((fold-var_1)" " fold-var_0))" @@ -36156,52 +36120,48 @@ static const char *startup_source = "(map2 cdr post-submodules_0)))))" " c1_0)" "(let-values()" -"(let-values(((p37_0) p_0)" -"((cctx38_0) cctx_0)" -"((full-module-name39_0) full-module-name_0)" -"((force-linklet-directory?40_0) force-linklet-directory?_0)" -"((serializable?41_0) serializable?_0)" -"((to-source?42_0) to-source?_0)" -"((modules-being-compiled43_0) modules-being-compiled_0)" -"((pre-submodules44_0) pre-submodules_0)" -"((post-submodules45_0) post-submodules_0)" -"((need-compiled-submodule-rename?46_0)" +"(let-values(((p33_0) p_0)" +"((cctx34_0) cctx_0)" +"((full-module-name35_0) full-module-name_0)" +"((force-linklet-directory?36_0) force-linklet-directory?_0)" +"((serializable?37_0) serializable?_0)" +"((modules-being-compiled38_0) modules-being-compiled_0)" +"((pre-submodules39_0) pre-submodules_0)" +"((post-submodules40_0) post-submodules_0)" +"((need-compiled-submodule-rename?41_0)" " need-compiled-submodule-rename?_0))" -"(compile-module-from-parsed34.1" -" force-linklet-directory?40_0" -" full-module-name39_0" -" modules-being-compiled43_0" -" need-compiled-submodule-rename?46_0" -" post-submodules45_0" -" pre-submodules44_0" -" serializable?41_0" -" to-source?42_0" -" p37_0" -" cctx38_0)))))))))))))))))))))" +"(compile-module-from-parsed30.1" +" force-linklet-directory?36_0" +" full-module-name35_0" +" modules-being-compiled38_0" +" need-compiled-submodule-rename?41_0" +" post-submodules40_0" +" pre-submodules39_0" +" serializable?37_0" +" p33_0" +" cctx34_0))))))))))))))))))))" "(define-values" -"(compile-module-from-parsed34.1)" -"(lambda(force-linklet-directory?17_0" -" full-module-name16_0" -" modules-being-compiled20_0" -" need-compiled-submodule-rename?23_0" -" post-submodules22_0" -" pre-submodules21_0" -" serializable?18_0" -" to-source?19_0" -" p32_0" -" cctx33_0)" +"(compile-module-from-parsed30.1)" +"(lambda(force-linklet-directory?15_0" +" full-module-name14_0" +" modules-being-compiled17_0" +" need-compiled-submodule-rename?20_0" +" post-submodules19_0" +" pre-submodules18_0" +" serializable?16_0" +" p28_0" +" cctx29_0)" "(begin" -" 'compile-module-from-parsed34" -"(let-values(((p_0) p32_0))" -"(let-values(((cctx_0) cctx33_0))" -"(let-values(((full-module-name_0) full-module-name16_0))" -"(let-values(((force-linklet-directory?_0) force-linklet-directory?17_0))" -"(let-values(((serializable?_0) serializable?18_0))" -"(let-values(((to-source?_0) to-source?19_0))" -"(let-values(((modules-being-compiled_0) modules-being-compiled20_0))" -"(let-values(((pre-submodules_0) pre-submodules21_0))" -"(let-values(((post-submodules_0) post-submodules22_0))" -"(let-values(((need-compiled-submodule-rename?_0) need-compiled-submodule-rename?23_0))" +" 'compile-module-from-parsed30" +"(let-values(((p_0) p28_0))" +"(let-values(((cctx_0) cctx29_0))" +"(let-values(((full-module-name_0) full-module-name14_0))" +"(let-values(((force-linklet-directory?_0) force-linklet-directory?15_0))" +"(let-values(((serializable?_0) serializable?16_0))" +"(let-values(((modules-being-compiled_0) modules-being-compiled17_0))" +"(let-values(((pre-submodules_0) pre-submodules18_0))" +"(let-values(((post-submodules_0) post-submodules19_0))" +"(let-values(((need-compiled-submodule-rename?_0) need-compiled-submodule-rename?20_0))" "(let-values()" "(begin" "(if log-performance?(let-values()(start-performance-region 'compile 'module))(void))" @@ -36213,8 +36173,7 @@ static const char *startup_source = "(let-values(((provides_0)(parsed-module-provides p_0)))" "(let-values(((encoded-root-expand-ctx-box_0)" "(box(parsed-module-encoded-root-ctx p_0))))" -"(let-values(((body-context-simple?_0)" -"(parsed-module-root-ctx-simple? p_0)))" +"(let-values(((body-context-simple?_0)(parsed-module-root-ctx-simple? p_0)))" "(let-values(((language-info_0)" "(filter-language-info" "(syntax-property$1(parsed-s p_0) 'module-language))))" @@ -36224,23 +36183,23 @@ static const char *startup_source = "(let-values(((body-cctx_0)" "(let-values(((the-struct_0) cctx_0))" "(if(compile-context? the-struct_0)" -"(let-values(((phase47_0) 0)" -"((self48_0) self_0)" -"((module-self49_0) self_0)" -"((full-module-name50_0)" +"(let-values(((phase42_0) 0)" +"((self43_0) self_0)" +"((module-self44_0) self_0)" +"((full-module-name45_0)" " full-module-name_0)" -"((lazy-syntax-literals?51_0) #t))" +"((lazy-syntax-literals?46_0) #t))" "(compile-context1.1" "(compile-context-namespace the-struct_0)" -" phase47_0" -" self48_0" -" module-self49_0" -" full-module-name50_0" -" lazy-syntax-literals?51_0" +" phase42_0" +" self43_0" +" module-self44_0" +" full-module-name45_0" +" lazy-syntax-literals?46_0" "(compile-context-header the-struct_0)))" "(raise-argument-error" " 'struct-copy" -" \"compile-context?\"" +" \"compile-context?\"" " the-struct_0)))))" "(let-values(((cross-phase-persistent?_0) #f))" "(let-values(((side-effects_0)(make-hasheqv)))" @@ -36254,17 +36213,17 @@ static const char *startup_source = "(if(hash-ref side-effects_0 phase_0 #f)" "(void)" "(let-values()" -"(if(let-values(((e52_0) e_0)" -"((expected-results53_0)" +"(if(let-values(((e47_0) e_0)" +"((expected-results48_0)" " expected-results_0)" -"((required-reference?54_0)" +"((required-reference?49_0)" " required-reference?_0))" "(any-side-effects?9.1" " unsafe-undefined" " unsafe-undefined" -" required-reference?54_0" -" e52_0" -" expected-results53_0))" +" required-reference?49_0" +" e47_0" +" expected-results48_0))" "(let-values()" "(hash-set!" " side-effects_0" @@ -36282,7 +36241,7 @@ static const char *startup_source = "(void)" "(let-values()" "(error" -" \"internal error: have post submodules, but not already compiled\")))" +" \"internal error: have post submodules, but not already compiled\")))" "(register-compiled-submodules" " modules-being-compiled_0" " pre-submodules_0" @@ -36297,42 +36256,40 @@ static const char *startup_source = " phase-to-link-extra-inspectorsss_0" " syntax-literals_0" " root-ctx-pos_0)" -"(let-values(((bodys55_0) bodys_0)" -"((body-cctx56_0) body-cctx_0)" -"((mpis57_0) mpis_0)" -"((temp58_0)" +"(let-values(((bodys50_0) bodys_0)" +"((body-cctx51_0) body-cctx_0)" +"((mpis52_0) mpis_0)" +"((temp53_0)" "(list" -"(list" -" get-syntax-literal!-id)" -"(list" -" set-transformer!-id)))" -"((temp59_0)" +"(list get-syntax-literal!-id)" +"(list set-transformer!-id)))" +"((temp54_0)" "(list" " empty-syntax-literals-instance" " empty-module-body-instance))" -"((temp60_0) '((void)))" -"((temp61_0) '(0))" -"((encoded-root-expand-ctx-box62_0)" +"((temp55_0) '((void)))" +"((temp56_0) '(0))" +"((encoded-root-expand-ctx-box57_0)" " encoded-root-expand-ctx-box_0)" -"((body-context-simple?63_0)" +"((body-context-simple?58_0)" " body-context-simple?_0)" -"((check-side-effects!64_0)" +"((check-side-effects!59_0)" " check-side-effects!_0)" -"((temp65_0)" +"((temp60_0)" "(lambda(body_0 cctx_1)" "(if(parsed-#%declare?" " body_0)" "(let-values()" "(let-values(((ok?_0" -" _69_0" -" kw70_0)" +" _63_0" +" kw64_0)" "(let-values(((s_0)" "(parsed-s" " body_0)))" "(let-values(((orig-s_0)" " s_0))" -"(let-values(((_69_0" -" kw70_0)" +"(let-values(((_63_0" +" kw64_0)" "(let-values(((s_1)" "(if(syntax?$1" " s_0)" @@ -36341,12 +36298,12 @@ static const char *startup_source = " s_0)))" "(if(pair?" " s_1)" -"(let-values(((_71_0)" +"(let-values(((_65_0)" "(let-values(((s_2)" "(car" " s_1)))" " s_2))" -"((kw72_0)" +"((kw66_0)" "(let-values(((s_2)" "(cdr" " s_1)))" @@ -36364,24 +36321,24 @@ static const char *startup_source = "(let-values()" "(raise-syntax-error$1" " #f" -" \"bad syntax\"" +" \"bad syntax\"" " orig-s_0))" "(let-values()" " flat-s_0)))))))" "(values" -" _71_0" -" kw72_0))" +" _65_0" +" kw66_0))" "(raise-syntax-error$1" " #f" -" \"bad syntax\"" +" \"bad syntax\"" " orig-s_0)))))" "(values" " #t" -" _69_0" -" kw70_0))))))" +" _63_0" +" kw64_0))))))" "(begin" "(let-values(((lst_0)" -" kw70_0))" +" kw64_0))" "(begin" "(if(variable-reference-from-unsafe?" "(#%variable-reference))" @@ -36441,7 +36398,7 @@ static const char *startup_source = "(void)" " #f)))" "(let-values() #f))))" -"((temp66_0)" +"((temp61_0)" "(lambda(mod-name_0 phase_0)" "(let-values(((ht_0)" "(if modules-being-compiled_0" @@ -36456,27 +36413,24 @@ static const char *startup_source = " phase_0" " #f)" " #f))))" -"((to-source?67_0)" -" to-source?_0)" -"((serializable?68_0)" +"((serializable?62_0)" " serializable?_0))" -"(compile-forms31.1" -" temp59_0" -" temp58_0" -" temp60_0" -" check-side-effects!64_0" +"(compile-forms29.1" +" temp54_0" +" temp53_0" +" temp55_0" +" check-side-effects!59_0" " #t" " unsafe-undefined" -" encoded-root-expand-ctx-box62_0" +" encoded-root-expand-ctx-box57_0" +" temp56_0" " temp61_0" -" temp66_0" -" temp65_0" -" body-context-simple?63_0" -" serializable?68_0" -" to-source?67_0" -" bodys55_0" -" body-cctx56_0" -" mpis57_0))))" +" temp60_0" +" body-context-simple?58_0" +" serializable?62_0" +" bodys50_0" +" body-cctx51_0" +" mpis52_0))))" "(let-values((()" "(begin" "(if modules-being-compiled_0" @@ -36546,15 +36500,12 @@ static const char *startup_source = " table_0)))))" " for-loop_0)" " '#hasheq()" -"(hash-iterate-first" -" ht_0))))))" +"(hash-iterate-first ht_0))))))" "(void))" "(values))))" "(let-values(((declaration-linklet_0)" "(if serializable?_0" -"((if to-source?_0" -" values" -"(lambda(s_0)" +"((lambda(s_0)" "(begin" "(if log-performance?" "(let-values()" @@ -36571,7 +36522,7 @@ static const char *startup_source = "(if log-performance?" "(let-values()" "(end-performance-region))" -"(void))))))" +"(void)))))" "(list" " 'linklet" "(list" @@ -36590,25 +36541,25 @@ static const char *startup_source = "(list" " 'define-values" " '(requires)" -"(let-values(((requires73_0)" +"(let-values(((requires67_0)" " requires_0)" -"((mpis74_0) mpis_0)" -"((temp75_0) #f))" +"((mpis68_0) mpis_0)" +"((temp69_0) #f))" "(generate-deserialize6.1" -" temp75_0" -" requires73_0" -" mpis74_0)))" +" temp69_0" +" requires67_0" +" mpis68_0)))" "(list" " 'define-values" " '(provides)" -"(let-values(((provides76_0)" +"(let-values(((provides70_0)" " provides_0)" -"((mpis77_0) mpis_0)" -"((temp78_0) #f))" +"((mpis71_0) mpis_0)" +"((temp72_0) #f))" "(generate-deserialize6.1" -" temp78_0" -" provides76_0" -" mpis77_0)))" +" temp72_0" +" provides70_0" +" mpis71_0)))" "(list" " 'define-values" " '(phase-to-link-modules)" @@ -36618,9 +36569,7 @@ static const char *startup_source = "(if(not" "(syntax-literals-empty?" " syntax-literals_0))" -"((if to-source?_0" -" values" -"(lambda(s_0)" +"((lambda(s_0)" "(begin" "(if log-performance?" "(let-values()" @@ -36652,7 +36601,7 @@ static const char *startup_source = "(if log-performance?" "(let-values()" "(end-performance-region))" -"(void))))))" +"(void)))))" "(list*" " 'linklet" "(list" @@ -36668,20 +36617,18 @@ static const char *startup_source = " get-syntax-literal!-id" " '(get-encoded-root-expand-ctx))" "(qq-append" -"(let-values(((syntax-literals79_0)" +"(let-values(((syntax-literals73_0)" " syntax-literals_0)" -"((mpis80_0)" -" mpis_0)" -"((self81_0)" -" self_0)" -"((temp82_0)" +"((mpis74_0) mpis_0)" +"((self75_0) self_0)" +"((temp76_0)" "(not" " serializable?_0)))" "(generate-lazy-syntax-literals!9.1" -" temp82_0" -" syntax-literals79_0" -" mpis80_0" -" self81_0))" +" temp76_0" +" syntax-literals73_0" +" mpis74_0" +" self75_0))" "(list" "(list" " 'define-values" @@ -36695,17 +36642,14 @@ static const char *startup_source = " root-ctx-pos_0)))" "(if empty-result-for-module->namespace?_0" "(let-values() ''empty)" -"(let-values()" -" ''#f))))))))" +"(let-values() ''#f))))))))" " #f)))" "(let-values(((syntax-literals-data-linklet_0)" "(if serializable?_0" "(if(not" "(syntax-literals-empty?" " syntax-literals_0))" -"((if to-source?_0" -" values" -"(lambda(s_0)" +"((lambda(s_0)" "(begin" "(if log-performance?" "(let-values()" @@ -36722,7 +36666,7 @@ static const char *startup_source = "(if log-performance?" "(let-values()" "(end-performance-region))" -"(void))))))" +"(void)))))" "(list*" " 'linklet" "(list" @@ -36761,9 +36705,7 @@ static const char *startup_source = " #f)))" "(let-values(((data-linklet_0)" "(if serializable?_0" -"((if to-source?_0" -" values" -"(lambda(s_0)" +"((lambda(s_0)" "(begin" "(if log-performance?" "(let-values()" @@ -36780,7 +36722,7 @@ static const char *startup_source = "(if log-performance?" "(let-values()" "(end-performance-region))" -"(void))))))" +"(void)))))" "(list" " 'linklet" "(list deserialize-imports)" @@ -36887,16 +36829,16 @@ static const char *startup_source = "(hash-set" " bundle_10" " 'side-effects" -"(let-values(((temp83_0)" +"(let-values(((temp77_0)" "(hash-keys" " side-effects_0))" -"((<84_0)" +"((<78_0)" " <))" "(sort7.1" " #f" " #f" -" temp83_0" -" <84_0)))" +" temp77_0" +" <78_0)))" " bundle_10)))" "(let-values(((bundle_12)" "(if empty-result-for-module->namespace?_0" @@ -36918,9 +36860,7 @@ static const char *startup_source = " #f)" "(let-values() bundle_0)" "(let-values()" -"((if to-source?_0" -" values" -" 1/hash->linklet-directory)" +"(1/hash->linklet-directory" "(let-values(((lst_0)" "(append" " pre-submodules_0" @@ -36954,9 +36894,7 @@ static const char *startup_source = " ht_1" "(car" " sm_0)" -"((if to-source?_0" -" values" -" compiled-in-memory-linklet-directory)" +"(compiled-in-memory-linklet-directory" "(cdr" " sm_0))))))" "(values" @@ -36969,13 +36907,8 @@ static const char *startup_source = " ht_1)))" " ht_0)))))" " for-loop_0)" -"(hasheq" -" #f" -" bundle_0)" +"(hasheq #f bundle_0)" " lst_0))))))))" -"(if to-source?_0" -"(let-values() ld_0)" -"(let-values()" "(compiled-in-memory1.1" " ld_0" " self_0" @@ -36990,8 +36923,8 @@ static const char *startup_source = "(map2 cdr pre-submodules_0)" "(map2 cdr post-submodules_0)" " #f" -" #f)))))))))))))))))))))))))))" -"(if log-performance?(let-values()(end-performance-region))(void))))))))))))))))))" +" #f)))))))))))))))))))))))))" +"(if log-performance?(let-values()(end-performance-region))(void)))))))))))))))))" "(define-values" "(update-submodule-names)" "(lambda(cim_0 name_0 full-module-name_0)" @@ -45162,13 +45095,13 @@ static const char *startup_source = " #f)" "(let-values()(eval-compiled(1/syntax->datum s_0) ns_0))" "(let-values()" -"(let-values(((s66_0) s_0)" -"((ns67_0) ns_0)" -"((temp68_0)" +"(let-values(((s61_0) s_0)" +"((ns62_0) ns_0)" +"((temp63_0)" "(lambda(s_1 ns_1 tail?_0)" "(eval-compiled(compile_0 s_1 ns_1) ns_1 tail?_0)))" -"((temp69_0) #f))" -"(per-top-level54.1 #f #f temp69_0 #t #f temp68_0 #f s66_0 ns67_0)))))))))))))" +"((temp64_0) #f))" +"(per-top-level49.1 #f #f temp64_0 #t #f temp63_0 #f s61_0 ns62_0)))))))))))))" "(case-lambda" "((s_0)(begin 'eval(eval4_0 s_0 unsafe-undefined unsafe-undefined)))" "((s_0 ns_0 compile2_0)(eval4_0 s_0 ns_0 compile2_0))" @@ -45185,22 +45118,21 @@ static const char *startup_source = "(let-values()" "(if(1/compiled-module-expression? c_0)" "(let-values()" -"(let-values(((c70_0) c_0)((ns71_0) ns_0))(eval-module8.1 ns71_0 #f #t c70_0)))" +"(let-values(((c65_0) c_0)((ns66_0) ns_0))(eval-module8.1 ns66_0 #f #t c65_0)))" "(let-values()(eval-top c_0 ns_0 eval-compiled as-tail?_0)))))))))))" "(case-lambda" "((c_0 ns_0)(begin(eval-compiled9_0 c_0 ns_0 #t)))" "((c_0 ns_0 as-tail?6_0)(eval-compiled9_0 c_0 ns_0 as-tail?6_0)))))" "(define-values" "(1/compile)" -"(let-values(((compile16_0)" -"(lambda(s15_0 ns11_0 serializable?12_0 expand13_0 to-source?14_0)" +"(let-values(((compile15_0)" +"(lambda(s14_0 ns11_0 serializable?12_0 expand13_0)" "(begin" -" 'compile16" -"(let-values(((s_0) s15_0))" +" 'compile15" +"(let-values(((s_0) s14_0))" "(let-values(((ns_0)(if(eq? ns11_0 unsafe-undefined)(1/current-namespace) ns11_0)))" "(let-values(((serializable?_0) serializable?12_0))" "(let-values(((expand_0)(if(eq? expand13_0 unsafe-undefined) expand$1 expand13_0)))" -"(let-values(((to-source?_0) to-source?14_0))" "(let-values()" "(let-values(((cs_0)" "(if(1/compiled-expression? s_0)" @@ -45208,61 +45140,40 @@ static const char *startup_source = "(if(if(syntax?$1 s_0)(1/compiled-expression?(1/syntax-e s_0)) #f)" "(let-values()(list(1/syntax-e s_0)))" "(let-values()" -"(let-values(((s72_0) s_0)" -"((ns73_0) ns_0)" -"((temp74_0)" +"(let-values(((s67_0) s_0)" +"((ns68_0) ns_0)" +"((temp69_0)" "(lambda(s_1 ns_1 as-tail?_0)" "(list" "(compile-single$1" " s_1" " ns_1" " expand_0" -" serializable?_0" -" to-source?_0))))" -"((append75_0) append)" -"((temp76_0) #f))" -"(per-top-level54.1" -" append75_0" +" serializable?_0))))" +"((append70_0) append)" +"((temp71_0) #f))" +"(per-top-level49.1" +" append70_0" " #f" -" temp76_0" +" temp71_0" " #t" " #f" -" temp74_0" +" temp69_0" " #f" -" s72_0" -" ns73_0)))))))" +" s67_0" +" ns68_0)))))))" "(if(if(= 1(length cs_0))(not(compiled-multiple-top?(car cs_0))) #f)" "(car cs_0)" -"(let-values(((cs77_0) cs_0)" -"((to-source?78_0) to-source?_0)" -"((serializable?79_0) serializable?_0)" -"((ns80_0) ns_0))" -"(compiled-tops->compiled-top8.1" -" serializable?79_0" -" ns80_0" -" to-source?78_0" -" cs77_0))))))))))))))" +"(let-values(((cs72_0) cs_0)((serializable?73_0) serializable?_0)((ns74_0) ns_0))" +"(compiled-tops->compiled-top6.1 serializable?73_0 ns74_0 cs72_0)))))))))))))" "(case-lambda" -"((s_0)(begin 'compile(compile16_0 s_0 unsafe-undefined #t unsafe-undefined #f)))" -"((s_0 ns_0 serializable?_0 expand_0 to-source?14_0)(compile16_0 s_0 ns_0 serializable?_0 expand_0 to-source?14_0))" -"((s_0 ns_0 serializable?_0 expand13_0)(compile16_0 s_0 ns_0 serializable?_0 expand13_0 #f))" -"((s_0 ns_0 serializable?12_0)(compile16_0 s_0 ns_0 serializable?12_0 unsafe-undefined #f))" -"((s_0 ns11_0)(compile16_0 s_0 ns11_0 #t unsafe-undefined #f)))))" -"(define-values" -"(compile-to-linklets)" -"(let-values(((compile-to-linklets20_0)" -"(lambda(s19_0 ns18_0)" -"(begin" -" 'compile-to-linklets20" -"(let-values(((s_0) s19_0))" -"(let-values(((ns_0)(if(eq? ns18_0 unsafe-undefined)(1/current-namespace) ns18_0)))" -"(let-values()(1/compile s_0 ns_0 #t expand$1 #t))))))))" -"(case-lambda" -"((s_0)(begin(compile-to-linklets20_0 s_0 unsafe-undefined)))" -"((s_0 ns18_0)(compile-to-linklets20_0 s_0 ns18_0)))))" +"((s_0)(begin 'compile(compile15_0 s_0 unsafe-undefined #t unsafe-undefined)))" +"((s_0 ns_0 serializable?_0 expand13_0)(compile15_0 s_0 ns_0 serializable?_0 expand13_0))" +"((s_0 ns_0 serializable?12_0)(compile15_0 s_0 ns_0 serializable?12_0 unsafe-undefined))" +"((s_0 ns11_0)(compile15_0 s_0 ns11_0 #t unsafe-undefined)))))" "(define-values" "(struct:lifted-parsed-begin" -" lifted-parsed-begin22.1" +" lifted-parsed-begin17.1" " lifted-parsed-begin?" " lifted-parsed-begin-seq" " lifted-parsed-begin-last)" @@ -45289,7 +45200,7 @@ static const char *startup_source = "(make-struct-field-accessor -ref_0 1 'last))))" "(define-values" "(compile-single$1)" -"(lambda(s_0 ns_0 expand_0 serializable?_0 to-source?_0)" +"(lambda(s_0 ns_0 expand_0 serializable?_0)" "(begin" " 'compile-single" "(let-values(((exp-s_0)(expand_0 s_0 ns_0 #f #t serializable?_0)))" @@ -45299,29 +45210,21 @@ static const char *startup_source = " 'loop" "(if(parsed-module? exp-s_1)" "(let-values()" -"(let-values(((exp-s82_0) exp-s_1)" -"((temp83_0)" -"(let-values(((ns86_0) ns_0))" +"(let-values(((exp-s76_0) exp-s_1)" +"((temp77_0)" +"(let-values(((ns79_0) ns_0))" "(make-compile-context14.1" " #f" " unsafe-undefined" " #f" -" ns86_0" +" ns79_0" " unsafe-undefined" " unsafe-undefined)))" -"((serializable?84_0) serializable?_0)" -"((to-source?85_0) to-source?_0))" -"(compile-module13.1" -" #f" -" unsafe-undefined" -" #t" -" serializable?84_0" -" to-source?85_0" -" exp-s82_0" -" temp83_0)))" +"((serializable?78_0) serializable?_0))" +"(compile-module11.1 #f unsafe-undefined #t serializable?78_0 exp-s76_0 temp77_0)))" "(if(lifted-parsed-begin? exp-s_1)" "(let-values()" -"(let-values(((temp87_0)" +"(let-values(((temp80_0)" "(reverse$1" "(let-values(((lst_0)" "(append" @@ -45357,36 +45260,34 @@ static const char *startup_source = " fold-var_0)))))" " for-loop_0)" " null" -" lst_0)))))" -"((to-source?88_0) to-source?_0))" -"(compiled-tops->compiled-top8.1 #f #f to-source?88_0 temp87_0)))" +" lst_0))))))" +"(compiled-tops->compiled-top6.1 #f #f temp80_0)))" "(let-values()" -"(let-values(((exp-s89_0) exp-s_1)" -"((temp90_0)" -"(let-values(((ns93_0) ns_0))" +"(let-values(((exp-s81_0) exp-s_1)" +"((temp82_0)" +"(let-values(((ns84_0) ns_0))" "(make-compile-context14.1" " #f" " unsafe-undefined" " #f" -" ns93_0" +" ns84_0" " unsafe-undefined" " unsafe-undefined)))" -"((serializable?91_0) serializable?_0)" -"((to-source?92_0) to-source?_0))" -"(compile-top9.1 serializable?91_0 #f to-source?92_0 exp-s89_0 temp90_0)))))))))" +"((serializable?83_0) serializable?_0))" +"(compile-top7.1 serializable?83_0 #f exp-s81_0 temp82_0)))))))))" " loop_0)" " exp-s_0)))))" "(define-values" "(expand$1)" -"(let-values(((expand28_0)" -"(lambda(s27_0 ns23_0 observable?24_0 to-parsed?25_0 serializable?26_0)" +"(let-values(((expand23_0)" +"(lambda(s22_0 ns18_0 observable?19_0 to-parsed?20_0 serializable?21_0)" "(begin" -" 'expand28" -"(let-values(((s_0) s27_0))" -"(let-values(((ns_0)(if(eq? ns23_0 unsafe-undefined)(1/current-namespace) ns23_0)))" -"(let-values(((observable?_0) observable?24_0))" -"(let-values(((to-parsed?_0) to-parsed?25_0))" -"(let-values(((serializable?_0) serializable?26_0))" +" 'expand23" +"(let-values(((s_0) s22_0))" +"(let-values(((ns_0)(if(eq? ns18_0 unsafe-undefined)(1/current-namespace) ns18_0)))" +"(let-values(((observable?_0) observable?19_0))" +"(let-values(((to-parsed?_0) to-parsed?20_0))" +"(let-values(((serializable?_0) serializable?21_0))" "(let-values()" "(let-values(((observer_0)(if observable?_0(current-expand-observe) #f)))" "(begin" @@ -45398,9 +45299,9 @@ static const char *startup_source = " current-expand-observe" " #f)" "(let-values()" -"(let-values(((s94_0) s_0)" -"((ns95_0) ns_0)" -"((temp96_0)" +"(let-values(((s85_0) s_0)" +"((ns86_0) ns_0)" +"((temp87_0)" "(lambda(s_1 ns_1 as-tail?_0)" "(expand-single" " s_1" @@ -45408,62 +45309,62 @@ static const char *startup_source = " observer_0" " to-parsed?_0" " serializable?_0)))" -"((cons97_0) cons)" -"((re-pair98_0) re-pair)" -"((observer99_0) observer_0))" -"(per-top-level54.1" -" cons97_0" +"((cons88_0) cons)" +"((re-pair89_0) re-pair)" +"((observer90_0) observer_0))" +"(per-top-level49.1" +" cons88_0" " #f" -" observer99_0" +" observer90_0" " #t" " #f" -" temp96_0" -" re-pair98_0" -" s94_0" -" ns95_0))))))))))))))))" +" temp87_0" +" re-pair89_0" +" s85_0" +" ns86_0))))))))))))))))" "(case-lambda" -"((s_0)(begin 'expand(expand28_0 s_0 unsafe-undefined #f #f #f)))" -"((s_0 ns_0 observable?_0 to-parsed?_0 serializable?26_0)" -"(expand28_0 s_0 ns_0 observable?_0 to-parsed?_0 serializable?26_0))" -"((s_0 ns_0 observable?_0 to-parsed?25_0)(expand28_0 s_0 ns_0 observable?_0 to-parsed?25_0 #f))" -"((s_0 ns_0 observable?24_0)(expand28_0 s_0 ns_0 observable?24_0 #f #f))" -"((s_0 ns23_0)(expand28_0 s_0 ns23_0 #f #f #f)))))" +"((s_0)(begin 'expand(expand23_0 s_0 unsafe-undefined #f #f #f)))" +"((s_0 ns_0 observable?_0 to-parsed?_0 serializable?21_0)" +"(expand23_0 s_0 ns_0 observable?_0 to-parsed?_0 serializable?21_0))" +"((s_0 ns_0 observable?_0 to-parsed?20_0)(expand23_0 s_0 ns_0 observable?_0 to-parsed?20_0 #f))" +"((s_0 ns_0 observable?19_0)(expand23_0 s_0 ns_0 observable?19_0 #f #f))" +"((s_0 ns18_0)(expand23_0 s_0 ns18_0 #f #f #f)))))" "(define-values" "(expand-single)" "(lambda(s_0 ns_0 observer_0 to-parsed?_0 serializable?_0)" "(begin" "(let-values(((rebuild-s_0)(keep-properties-only s_0)))" "(let-values(((ctx_0)" -"(let-values(((ns100_0) ns_0)" -"((to-parsed?101_0) to-parsed?_0)" -"((serializable?102_0) serializable?_0)" -"((observer103_0) observer_0))" -"(make-expand-context10.1 serializable?102_0 observer103_0 to-parsed?101_0 ns100_0))))" +"(let-values(((ns91_0) ns_0)" +"((to-parsed?92_0) to-parsed?_0)" +"((serializable?93_0) serializable?_0)" +"((observer94_0) observer_0))" +"(make-expand-context10.1 serializable?93_0 observer94_0 to-parsed?92_0 ns91_0))))" "(let-values(((require-lifts_0 lifts_0 exp-s_0)(expand-capturing-lifts s_0 ctx_0)))" "(if(if(null? require-lifts_0)(null? lifts_0) #f)" "(let-values() exp-s_0)" "(if to-parsed?_0" "(let-values()" -"(let-values(((require-lifts104_0) require-lifts_0)" -"((lifts105_0) lifts_0)" -"((exp-s106_0) exp-s_0)" -"((rebuild-s107_0) rebuild-s_0)" -"((temp108_0)" +"(let-values(((require-lifts95_0) require-lifts_0)" +"((lifts96_0) lifts_0)" +"((exp-s97_0) exp-s_0)" +"((rebuild-s98_0) rebuild-s_0)" +"((temp99_0)" "(lambda(form_0)(expand-single form_0 ns_0 observer_0 to-parsed?_0 serializable?_0))))" -"(wrap-lifts-as-lifted-parsed-begin63.1" -" temp108_0" -" require-lifts104_0" -" lifts105_0" -" exp-s106_0" -" rebuild-s107_0)))" +"(wrap-lifts-as-lifted-parsed-begin58.1" +" temp99_0" +" require-lifts95_0" +" lifts96_0" +" exp-s97_0" +" rebuild-s98_0)))" "(let-values()" "(let-values((()" "(begin" "(log-top-lift-begin-before ctx_0 require-lifts_0 lifts_0 exp-s_0 ns_0)" "(values))))" "(let-values(((new-s_0)" -"(let-values(((temp109_0)(append require-lifts_0 lifts_0))" -"((temp110_0)" +"(let-values(((temp100_0)(append require-lifts_0 lifts_0))" +"((temp101_0)" "(lambda(form_0)" "(begin" "(let-values(((obs_0)(expand-context-observer ctx_0)))" @@ -45477,7 +45378,7 @@ static const char *startup_source = " observer_0" " to-parsed?_0" " serializable?_0))))" -"((temp111_0)" +"((temp102_0)" "(lambda(form_0)" "(if to-parsed?_0" "(let-values() form_0)" @@ -45494,39 +45395,39 @@ static const char *startup_source = " observer_0" " to-parsed?_0" " serializable?_0))))))" -"((exp-s112_0) exp-s_0)" -"((temp113_0)(namespace-phase ns_0)))" -"(wrap-lifts-as-begin16.1 temp111_0 temp110_0 temp109_0 exp-s112_0 temp113_0))))" +"((exp-s103_0) exp-s_0)" +"((temp104_0)(namespace-phase ns_0)))" +"(wrap-lifts-as-begin16.1 temp102_0 temp101_0 temp100_0 exp-s103_0 temp104_0))))" "(begin(log-top-begin-after ctx_0 new-s_0) new-s_0))))))))))))" "(define-values" "(expand-once$1)" -"(let-values(((expand-once32_0)" -"(lambda(s31_0 ns30_0)" +"(let-values(((expand-once27_0)" +"(lambda(s26_0 ns25_0)" "(begin" -" 'expand-once32" -"(let-values(((s_0) s31_0))" -"(let-values(((ns_0)(if(eq? ns30_0 unsafe-undefined)(1/current-namespace) ns30_0)))" +" 'expand-once27" +"(let-values(((s_0) s26_0))" +"(let-values(((ns_0)(if(eq? ns25_0 unsafe-undefined)(1/current-namespace) ns25_0)))" "(let-values()" -"(let-values(((s114_0) s_0)" -"((ns115_0) ns_0)" -"((temp116_0)(lambda(s_1 ns_1 as-tail?_0)(expand-single-once s_1 ns_1)))" -"((cons117_0) cons)" -"((re-pair118_0) re-pair)" -"((temp119_0) #t)" -"((temp120_0) #f))" -"(per-top-level54.1" -" cons117_0" -" temp119_0" -" temp120_0" +"(let-values(((s105_0) s_0)" +"((ns106_0) ns_0)" +"((temp107_0)(lambda(s_1 ns_1 as-tail?_0)(expand-single-once s_1 ns_1)))" +"((cons108_0) cons)" +"((re-pair109_0) re-pair)" +"((temp110_0) #t)" +"((temp111_0) #f))" +"(per-top-level49.1" +" cons108_0" +" temp110_0" +" temp111_0" " #t" " #f" -" temp116_0" -" re-pair118_0" -" s114_0" -" ns115_0)))))))))" +" temp107_0" +" re-pair109_0" +" s105_0" +" ns106_0)))))))))" "(case-lambda" -"((s_0)(begin 'expand-once(expand-once32_0 s_0 unsafe-undefined)))" -"((s_0 ns30_0)(expand-once32_0 s_0 ns30_0)))))" +"((s_0)(begin 'expand-once(expand-once27_0 s_0 unsafe-undefined)))" +"((s_0 ns25_0)(expand-once27_0 s_0 ns25_0)))))" "(define-values" "(expand-single-once)" "(lambda(s_0 ns_0)" @@ -45534,13 +45435,13 @@ static const char *startup_source = "(let-values(((require-lifts_0 lifts_0 exp-s_0)" "(expand-capturing-lifts" " s_0" -"(let-values(((v_0)(let-values(((ns121_0) ns_0))(make-expand-context10.1 #f #f #f ns121_0))))" +"(let-values(((v_0)(let-values(((ns112_0) ns_0))(make-expand-context10.1 #f #f #f ns112_0))))" "(let-values(((the-struct_0) v_0))" "(if(expand-context/outer? the-struct_0)" -"(let-values(((inner122_0)" +"(let-values(((inner113_0)" "(let-values(((the-struct_1)(root-expand-context/outer-inner v_0)))" "(if(expand-context/inner? the-struct_1)" -"(let-values(((just-once?123_0) #t))" +"(let-values(((just-once?114_0) #t))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi the-struct_1)" "(root-expand-context/inner-module-scopes the-struct_1)" @@ -45552,7 +45453,7 @@ static const char *startup_source = "(expand-context/inner-to-parsed? the-struct_1)" "(expand-context/inner-phase the-struct_1)" "(expand-context/inner-namespace the-struct_1)" -" just-once?123_0" +" just-once?114_0" "(expand-context/inner-module-begin-k the-struct_1)" "(expand-context/inner-allow-unbound? the-struct_1)" "(expand-context/inner-in-local-expand? the-struct_1)" @@ -45573,7 +45474,7 @@ static const char *startup_source = " \"expand-context/inner?\"" " the-struct_1)))))" "(expand-context/outer1.1" -" inner122_0" +" inner113_0" "(root-expand-context/outer-post-expansion the-struct_0)" "(root-expand-context/outer-use-site-scopes the-struct_0)" "(root-expand-context/outer-frame-id the-struct_0)" @@ -45592,18 +45493,18 @@ static const char *startup_source = "(if(if(null? require-lifts_0)(null? lifts_0) #f)" "(let-values() exp-s_0)" "(let-values()" -"(let-values(((temp124_0)(append require-lifts_0 lifts_0))" -"((exp-s125_0) exp-s_0)" -"((temp126_0)(namespace-phase ns_0)))" -"(wrap-lifts-as-begin16.1 unsafe-undefined unsafe-undefined temp124_0 exp-s125_0 temp126_0))))))))" +"(let-values(((temp115_0)(append require-lifts_0 lifts_0))" +"((exp-s116_0) exp-s_0)" +"((temp117_0)(namespace-phase ns_0)))" +"(wrap-lifts-as-begin16.1 unsafe-undefined unsafe-undefined temp115_0 exp-s116_0 temp117_0))))))))" "(define-values" "(expand-to-top-form$1)" -"(let-values(((expand-to-top-form36_0)" -"(lambda(s35_0 ns34_0)" +"(let-values(((expand-to-top-form31_0)" +"(lambda(s30_0 ns29_0)" "(begin" -" 'expand-to-top-form36" -"(let-values(((s_0) s35_0))" -"(let-values(((ns_0)(if(eq? ns34_0 unsafe-undefined)(1/current-namespace) ns34_0)))" +" 'expand-to-top-form31" +"(let-values(((s_0) s30_0))" +"(let-values(((ns_0)(if(eq? ns29_0 unsafe-undefined)(1/current-namespace) ns29_0)))" "(let-values()" "(let-values(((observer_0)(current-expand-observe)))" "(begin" @@ -45615,51 +45516,51 @@ static const char *startup_source = " current-expand-observe" " #f)" "(let-values()" -"(let-values(((s127_0) s_0)" -"((ns128_0) ns_0)" -"((temp129_0) #f)" -"((temp130_0) #f)" -"((observer131_0) observer_0))" -"(per-top-level54.1" +"(let-values(((s118_0) s_0)" +"((ns119_0) ns_0)" +"((temp120_0) #f)" +"((temp121_0) #f)" +"((observer122_0) observer_0))" +"(per-top-level49.1" " #f" " #f" -" observer131_0" -" temp130_0" +" observer122_0" +" temp121_0" " #f" -" temp129_0" +" temp120_0" " #f" -" s127_0" -" ns128_0)))))))))))))" +" s118_0" +" ns119_0)))))))))))))" "(case-lambda" -"((s_0)(begin 'expand-to-top-form(expand-to-top-form36_0 s_0 unsafe-undefined)))" -"((s_0 ns34_0)(expand-to-top-form36_0 s_0 ns34_0)))))" +"((s_0)(begin 'expand-to-top-form(expand-to-top-form31_0 s_0 unsafe-undefined)))" +"((s_0 ns29_0)(expand-to-top-form31_0 s_0 ns29_0)))))" "(define-values" -"(per-top-level54.1)" -"(lambda(combine39_0" -" just-once?41_0" -" observer44_0" -" quick-immediate?42_0" -" serializable?43_0" -" single38_0" -" wrap40_0" -" given-s52_0" -" ns53_0)" +"(per-top-level49.1)" +"(lambda(combine34_0" +" just-once?36_0" +" observer39_0" +" quick-immediate?37_0" +" serializable?38_0" +" single33_0" +" wrap35_0" +" given-s47_0" +" ns48_0)" "(begin" -" 'per-top-level54" -"(let-values(((given-s_0) given-s52_0))" -"(let-values(((ns_0) ns53_0))" -"(let-values(((single_0) single38_0))" -"(let-values(((combine_0) combine39_0))" -"(let-values(((wrap_0) wrap40_0))" -"(let-values(((just-once?_0) just-once?41_0))" -"(let-values(((quick-immediate?_0) quick-immediate?42_0))" -"(let-values(((serializable?_0) serializable?43_0))" -"(let-values(((observer_0) observer44_0))" +" 'per-top-level49" +"(let-values(((given-s_0) given-s47_0))" +"(let-values(((ns_0) ns48_0))" +"(let-values(((single_0) single33_0))" +"(let-values(((combine_0) combine34_0))" +"(let-values(((wrap_0) wrap35_0))" +"(let-values(((just-once?_0) just-once?36_0))" +"(let-values(((quick-immediate?_0) quick-immediate?37_0))" +"(let-values(((serializable?_0) serializable?38_0))" +"(let-values(((observer_0) observer39_0))" "(let-values()" "(let-values(((s_0)(maybe-intro given-s_0 ns_0)))" "(let-values(((ctx_0)" -"(let-values(((ns132_0) ns_0)((observer133_0) observer_0))" -"(make-expand-context10.1 #f observer133_0 #f ns132_0))))" +"(let-values(((ns123_0) ns_0)((observer124_0) observer_0))" +"(make-expand-context10.1 #f observer124_0 #f ns123_0))))" "(let-values(((phase_0)(namespace-phase ns_0)))" "((letrec-values(((loop_0)" "(lambda(s_1 phase_1 ns_1 as-tail?_0)" @@ -45669,19 +45570,19 @@ 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(((inner134_0)" +"(let-values(((inner125_0)" "(let-values(((the-struct_1)" "(root-expand-context/outer-inner" " v_0)))" "(if(expand-context/inner?" " the-struct_1)" -"(let-values(((phase135_0)" +"(let-values(((phase126_0)" " phase_1)" -"((namespace136_0)" +"((namespace127_0)" " ns_1)" -"((just-once?137_0)" +"((just-once?128_0)" " just-once?_0)" -"((for-serializable?138_0)" +"((for-serializable?129_0)" " serializable?_0))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" @@ -45700,9 +45601,9 @@ static const char *startup_source = " the-struct_1)" "(expand-context/inner-to-parsed?" " the-struct_1)" -" phase135_0" -" namespace136_0" -" just-once?137_0" +" phase126_0" +" namespace127_0" +" just-once?128_0" "(expand-context/inner-module-begin-k" " the-struct_1)" "(expand-context/inner-allow-unbound?" @@ -45729,7 +45630,7 @@ static const char *startup_source = " the-struct_1)" "(expand-context/inner-observer" " the-struct_1)" -" for-serializable?138_0" +" for-serializable?129_0" "(expand-context/inner-should-not-encounter-macros?" " the-struct_1)))" "(raise-argument-error" @@ -45737,7 +45638,7 @@ static const char *startup_source = " \"expand-context/inner?\"" " the-struct_1)))))" "(expand-context/outer1.1" -" inner134_0" +" inner125_0" "(root-expand-context/outer-post-expansion" " the-struct_0)" "(root-expand-context/outer-use-site-scopes" @@ -45787,17 +45688,17 @@ static const char *startup_source = "(let-values(((v_0) tl-ctx_0))" "(let-values(((the-struct_0) v_0))" "(if(expand-context/outer? the-struct_0)" -"(let-values(((only-immediate?139_0)" +"(let-values(((only-immediate?130_0)" " #t)" -"((inner140_0)" +"((inner131_0)" "(let-values(((the-struct_1)" "(root-expand-context/outer-inner" " v_0)))" "(if(expand-context/inner?" " the-struct_1)" -"(let-values(((phase141_0)" +"(let-values(((phase132_0)" " phase_1)" -"((namespace142_0)" +"((namespace133_0)" " ns_1))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" @@ -45816,8 +45717,8 @@ static const char *startup_source = " the-struct_1)" "(expand-context/inner-to-parsed?" " the-struct_1)" -" phase141_0" -" namespace142_0" +" phase132_0" +" namespace133_0" "(expand-context/inner-just-once?" " the-struct_1)" "(expand-context/inner-module-begin-k" @@ -45855,7 +45756,7 @@ static const char *startup_source = " \"expand-context/inner?\"" " the-struct_1)))))" "(expand-context/outer1.1" -" inner140_0" +" inner131_0" "(root-expand-context/outer-post-expansion" " the-struct_0)" "(root-expand-context/outer-use-site-scopes" @@ -45874,7 +45775,7 @@ static const char *startup_source = " the-struct_0)" "(expand-context/outer-reference-records" " the-struct_0)" -" only-immediate?139_0" +" only-immediate?130_0" "(expand-context/outer-need-eventually-defined" " the-struct_0)" "(expand-context/outer-current-introduction-scopes" @@ -45893,18 +45794,18 @@ static const char *startup_source = "(if or-part_0 or-part_0(pair? lifts_0)))" "(let-values()" "(let-values(((new-s_0)" -"(let-values(((temp143_0)" +"(let-values(((temp134_0)" "(append" " require-lifts_0" " lifts_0))" -"((exp-s144_0) exp-s_0)" -"((phase145_0) phase_1))" +"((exp-s135_0) exp-s_0)" +"((phase136_0) phase_1))" "(wrap-lifts-as-begin16.1" " unsafe-undefined" " unsafe-undefined" -" temp143_0" -" exp-s144_0" -" phase145_0))))" +" temp134_0" +" exp-s135_0" +" phase136_0))))" "(begin" "(let-values(((obs_0)" "(expand-context-observer" @@ -45957,13 +45858,13 @@ static const char *startup_source = " 'prim-begin)))" "(void)))" "(values))))" -"(let-values(((ok?_0 begin146_0 e147_0)" +"(let-values(((ok?_0 begin137_0 e138_0)" "(let-values(((s_2)" " disarmed-exp-s_0))" "(let-values(((orig-s_0)" " s_2))" -"(let-values(((begin146_0" -" e147_0)" +"(let-values(((begin137_0" +" e138_0)" "(let-values(((s_3)" "(if(syntax?$1" " s_2)" @@ -45972,12 +45873,12 @@ static const char *startup_source = " s_2)))" "(if(pair?" " s_3)" -"(let-values(((begin148_0)" +"(let-values(((begin139_0)" "(let-values(((s_4)" "(car" " s_3)))" " s_4))" -"((e149_0)" +"((e140_0)" "(let-values(((s_4)" "(cdr" " s_3)))" @@ -46000,16 +45901,16 @@ static const char *startup_source = "(let-values()" " flat-s_0)))))))" "(values" -" begin148_0" -" e149_0))" +" begin139_0" +" e140_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0)))))" "(values" " #t" -" begin146_0" -" e147_0))))))" +" begin137_0" +" e138_0))))))" "(letrec-values(((begin-loop_0)" "(lambda(es_0)" "(begin" @@ -46074,10 +45975,10 @@ static const char *startup_source = "(let-values()" "(let-values(((new-s_0)" "(wrap_0" -" begin146_0" +" begin137_0" " exp-s_0" "(begin-loop_0" -" e147_0))))" +" e138_0))))" "(begin" "(let-values(((obs_0)" "(expand-context-observer" @@ -46092,7 +45993,7 @@ static const char *startup_source = "(void)))" " new-s_0)))" "(let-values()" -"(begin-loop_0 e147_0)))))))" +"(begin-loop_0 e138_0)))))))" "(if(equal? tmp_0 'begin-for-syntax)" "(let-values()" "(let-values((()" @@ -46109,14 +46010,14 @@ static const char *startup_source = "(void)))" "(values))))" "(let-values(((ok?_0" -" begin-for-syntax150_0" -" e151_0)" +" begin-for-syntax141_0" +" e142_0)" "(let-values(((s_2)" " disarmed-exp-s_0))" "(let-values(((orig-s_0)" " s_2))" -"(let-values(((begin-for-syntax150_0" -" e151_0)" +"(let-values(((begin-for-syntax141_0" +" e142_0)" "(let-values(((s_3)" "(if(syntax?$1" " s_2)" @@ -46125,12 +46026,12 @@ static const char *startup_source = " s_2)))" "(if(pair?" " s_3)" -"(let-values(((begin-for-syntax152_0)" +"(let-values(((begin-for-syntax143_0)" "(let-values(((s_4)" "(car" " s_3)))" " s_4))" -"((e153_0)" +"((e144_0)" "(let-values(((s_4)" "(cdr" " s_3)))" @@ -46153,16 +46054,16 @@ static const char *startup_source = "(let-values()" " flat-s_0)))))))" "(values" -" begin-for-syntax152_0" -" e153_0))" +" begin-for-syntax143_0" +" e144_0))" "(raise-syntax-error$1" " #f" " \"bad syntax\"" " orig-s_0)))))" "(values" " #t" -" begin-for-syntax150_0" -" e151_0))))))" +" begin-for-syntax141_0" +" e142_0))))))" "(let-values(((next-phase_0)" "(add1 phase_1)))" "(let-values(((next-ns_0)" @@ -46198,7 +46099,7 @@ static const char *startup_source = "(let-values(((l_0)" "(reverse$1" "(let-values(((lst_0)" -" e151_0))" +" e142_0))" "(begin" "(if(variable-reference-from-unsafe?" "(#%variable-reference))" @@ -46259,7 +46160,7 @@ static const char *startup_source = "(let-values()" "(let-values(((new-s_0)" "(wrap_0" -" begin-for-syntax150_0" +" begin-for-syntax141_0" " exp-s_0" " l_0)))" "(begin" @@ -46310,26 +46211,26 @@ static const char *startup_source = "(let-values(((ns_0)(expand-context-namespace ctx_0)))" "(let-values((()(begin(namespace-visit-available-modules! ns_0)(values))))" "(let-values(((lift-ctx_0)" -"(let-values(((temp154_0)(make-top-level-lift ctx_0)))" -"(make-lift-context6.1 #f temp154_0))))" +"(let-values(((temp145_0)(make-top-level-lift ctx_0)))" +"(make-lift-context6.1 #f temp145_0))))" "(let-values(((require-lift-ctx_0)" "(make-require-lift-context" "(namespace-phase ns_0)" "(make-parse-top-lifted-require ns_0))))" "(let-values(((exp-s_0)" -"(let-values(((s155_0) s_0)" -"((temp156_0)" +"(let-values(((s146_0) s_0)" +"((temp147_0)" "(let-values(((v_0) ctx_0))" "(let-values(((the-struct_0) v_0))" "(if(expand-context/outer? the-struct_0)" -"(let-values(((inner157_0)" +"(let-values(((inner148_0)" "(let-values(((the-struct_1)" "(root-expand-context/outer-inner" " v_0)))" "(if(expand-context/inner? the-struct_1)" -"(let-values(((lifts158_0) lift-ctx_0)" -"((module-lifts159_0) lift-ctx_0)" -"((require-lifts160_0)" +"(let-values(((lifts149_0) lift-ctx_0)" +"((module-lifts150_0) lift-ctx_0)" +"((require-lifts151_0)" " require-lift-ctx_0))" "(expand-context/inner2.1" "(root-expand-context/inner-self-mpi" @@ -46363,10 +46264,10 @@ static const char *startup_source = "(expand-context/inner-stops the-struct_1)" "(expand-context/inner-declared-submodule-names" " the-struct_1)" -" lifts158_0" +" lifts149_0" "(expand-context/inner-lift-envs the-struct_1)" -" module-lifts159_0" -" require-lifts160_0" +" module-lifts150_0" +" require-lifts151_0" "(expand-context/inner-to-module-lifts" " the-struct_1)" "(expand-context/inner-requires+provides" @@ -46381,7 +46282,7 @@ static const char *startup_source = " \"expand-context/inner?\"" " the-struct_1)))))" "(expand-context/outer1.1" -" inner157_0" +" inner148_0" "(root-expand-context/outer-post-expansion the-struct_0)" "(root-expand-context/outer-use-site-scopes the-struct_0)" "(root-expand-context/outer-frame-id the-struct_0)" @@ -46400,7 +46301,7 @@ static const char *startup_source = " 'struct-copy" " \"expand-context/outer?\"" " the-struct_0))))))" -"(expand9.1 #f #f #f s155_0 temp156_0))))" +"(expand9.1 #f #f #f s146_0 temp147_0))))" "(values" "(get-and-clear-require-lifts! require-lift-ctx_0)" "(get-and-clear-lifts! lift-ctx_0)" @@ -46411,19 +46312,19 @@ static const char *startup_source = "(lambda(ns_0)" "(begin" "(lambda(s_0 phase_0)" -"(let-values(((ok?_0 #%require161_0 req162_0)" +"(let-values(((ok?_0 #%require152_0 req153_0)" "(let-values(((s_1)(syntax-disarm$1 s_0)))" "(let-values(((orig-s_0) s_1))" -"(let-values(((#%require161_0 req162_0)" +"(let-values(((#%require152_0 req153_0)" "(let-values(((s_2)(if(syntax?$1 s_1)(syntax-e$1 s_1) s_1)))" "(if(pair? s_2)" -"(let-values(((#%require163_0)(let-values(((s_3)(car s_2))) s_3))" -"((req164_0)" +"(let-values(((#%require154_0)(let-values(((s_3)(car s_2))) s_3))" +"((req155_0)" "(let-values(((s_3)(cdr s_2)))" "(let-values(((s_4)" "(if(syntax?$1 s_3)(syntax-e$1 s_3) s_3)))" "(if(pair? s_4)" -"(let-values(((req165_0)" +"(let-values(((req156_0)" "(let-values(((s_5)(car s_4))) s_5))" "(()" "(let-values(((s_5)(cdr s_4)))" @@ -46437,46 +46338,46 @@ static const char *startup_source = " #f" " \"bad syntax\"" " orig-s_0))))))" -"(values req165_0))" +"(values req156_0))" " (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))))))" -"(values #%require163_0 req164_0))" +"(values #%require154_0 req155_0))" " (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))" -"(values #t #%require161_0 req162_0))))))" -"(let-values(((temp166_0)(list req162_0))" -"((s167_0) s_0)" -"((ns168_0) ns_0)" -"((phase169_0) phase_0)" -"((phase170_0) phase_0)" -"((temp171_0)(let-values(((temp173_0) #f))(make-requires+provides8.1 #f temp173_0)))" -"((temp172_0) 'require))" +"(values #t #%require152_0 req153_0))))))" +"(let-values(((temp157_0)(list req153_0))" +"((s158_0) s_0)" +"((ns159_0) ns_0)" +"((phase160_0) phase_0)" +"((phase161_0) phase_0)" +"((temp162_0)(let-values(((temp164_0) #f))(make-requires+provides8.1 #f temp164_0)))" +"((temp163_0) 'require))" "(parse-and-perform-requires!30.1" " #f" " #f" " unsafe-undefined" " #f" -" phase170_0" +" phase161_0" " #f" " #f" " #f" " #t" -" temp172_0" -" temp166_0" -" s167_0" -" ns168_0" -" phase169_0" -" temp171_0)))))))" +" temp163_0" +" temp157_0" +" s158_0" +" ns159_0" +" phase160_0" +" temp162_0)))))))" "(define-values" -"(wrap-lifts-as-lifted-parsed-begin63.1)" -"(lambda(adjust-form57_0 require-lifts59_0 lifts60_0 exp-s61_0 rebuild-s62_0)" +"(wrap-lifts-as-lifted-parsed-begin58.1)" +"(lambda(adjust-form52_0 require-lifts54_0 lifts55_0 exp-s56_0 rebuild-s57_0)" "(begin" -" 'wrap-lifts-as-lifted-parsed-begin63" -"(let-values(((require-lifts_0) require-lifts59_0))" -"(let-values(((lifts_0) lifts60_0))" -"(let-values(((exp-s_0) exp-s61_0))" -"(let-values(((rebuild-s_0) rebuild-s62_0))" -"(let-values(((adjust-form_0) adjust-form57_0))" +" 'wrap-lifts-as-lifted-parsed-begin58" +"(let-values(((require-lifts_0) require-lifts54_0))" +"(let-values(((lifts_0) lifts55_0))" +"(let-values(((exp-s_0) exp-s56_0))" +"(let-values(((rebuild-s_0) rebuild-s57_0))" +"(let-values(((adjust-form_0) adjust-form52_0))" "(let-values()" -"(lifted-parsed-begin22.1" +"(lifted-parsed-begin17.1" "(append" "(reverse$1" "(let-values(((lst_0) require-lifts_0))" @@ -46548,12 +46449,12 @@ static const char *startup_source = " exp-rhs_0))" "(if(lifted-parsed-begin?" " the-struct_0)" -"(let-values(((last174_0)" +"(let-values(((last165_0)" " dv_0))" -"(lifted-parsed-begin22.1" +"(lifted-parsed-begin17.1" "(lifted-parsed-begin-seq" " the-struct_0)" -" last174_0))" +" last165_0))" "(raise-argument-error" " 'struct-copy" " \"lifted-parsed-begin?\"" @@ -46575,15 +46476,15 @@ static const char *startup_source = "(if obs_0" "(let-values()" "(let-values(((new-s_0)" -"(let-values(((temp175_0)(append require-lifts_0 lifts_0))" -"((exp-s176_0) exp-s_0)" -"((temp177_0)(namespace-phase ns_0)))" +"(let-values(((temp166_0)(append require-lifts_0 lifts_0))" +"((exp-s167_0) exp-s_0)" +"((temp168_0)(namespace-phase ns_0)))" "(wrap-lifts-as-begin16.1" " unsafe-undefined" " unsafe-undefined" -" temp175_0" -" exp-s176_0" -" temp177_0))))" +" temp166_0" +" exp-s167_0" +" temp168_0))))" "(begin(call-expand-observe obs_0 'lift-loop new-s_0)(log-top-begin-before ctx_0 new-s_0))))" "(void))))))" "(define-values" @@ -46593,14 +46494,14 @@ static const char *startup_source = "(let-values(((obs_0)(expand-context-observer ctx_0)))" "(if obs_0" "(let-values()" -"(let-values(((ok?_0 begin178_0 e179_0)" +"(let-values(((ok?_0 begin169_0 e170_0)" "(let-values(((s_0) new-s_0))" "(let-values(((orig-s_0) s_0))" -"(let-values(((begin178_0 e179_0)" +"(let-values(((begin169_0 e170_0)" "(let-values(((s_1)(if(syntax?$1 s_0)(syntax-e$1 s_0) s_0)))" "(if(pair? s_1)" -"(let-values(((begin180_0)(let-values(((s_2)(car s_1))) s_2))" -"((e181_0)" +"(let-values(((begin171_0)(let-values(((s_2)(car s_1))) s_2))" +"((e172_0)" "(let-values(((s_2)(cdr s_1)))" "(let-values(((s_3)" "(if(syntax?$1 s_2)" @@ -46611,15 +46512,15 @@ static const char *startup_source = "(let-values()" " (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))" "(let-values() flat-s_0)))))))" -"(values begin180_0 e181_0))" +"(values begin171_0 e172_0))" " (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))" -"(values #t begin178_0 e179_0))))))" +"(values #t begin169_0 e170_0))))))" "(begin" "(call-expand-observe obs_0 'visit new-s_0)" -"(call-expand-observe obs_0 'resolve begin178_0)" +"(call-expand-observe obs_0 'resolve begin169_0)" "(call-expand-observe obs_0 'enter-prim new-s_0)" "(call-expand-observe obs_0 'prim-begin)" -"(call-expand-observe obs_0 'enter-list(1/datum->syntax #f e179_0 new-s_0)))))" +"(call-expand-observe obs_0 'enter-list(1/datum->syntax #f e170_0 new-s_0)))))" "(void))))))" "(define-values" "(log-top-begin-after)" @@ -46628,14 +46529,14 @@ static const char *startup_source = "(let-values(((obs_0)(expand-context-observer ctx_0)))" "(if obs_0" "(let-values()" -"(let-values(((ok?_0 begin182_0 e183_0)" +"(let-values(((ok?_0 begin173_0 e174_0)" "(let-values(((s_0) new-s_0))" "(let-values(((orig-s_0) s_0))" -"(let-values(((begin182_0 e183_0)" +"(let-values(((begin173_0 e174_0)" "(let-values(((s_1)(if(syntax?$1 s_0)(syntax-e$1 s_0) s_0)))" "(if(pair? s_1)" -"(let-values(((begin184_0)(let-values(((s_2)(car s_1))) s_2))" -"((e185_0)" +"(let-values(((begin175_0)(let-values(((s_2)(car s_1))) s_2))" +"((e176_0)" "(let-values(((s_2)(cdr s_1)))" "(let-values(((s_3)" "(if(syntax?$1 s_2)" @@ -46646,15 +46547,15 @@ static const char *startup_source = "(let-values()" " (raise-syntax-error$1 #f \"bad syntax\" orig-s_0))" "(let-values() flat-s_0)))))))" -"(values begin184_0 e185_0))" +"(values begin175_0 e176_0))" " (raise-syntax-error$1 #f \"bad syntax\" orig-s_0)))))" -"(values #t begin182_0 e183_0))))))" +"(values #t begin173_0 e174_0))))))" "(let-values(((obs_1)(expand-context-observer ctx_0)))" "(if obs_1" "(let-values()" "(let-values()" "(begin" -"(call-expand-observe obs_1 'exit-list(1/datum->syntax #f e183_0 new-s_0))" +"(call-expand-observe obs_1 'exit-list(1/datum->syntax #f e174_0 new-s_0))" "(call-expand-observe obs_1 'exit-prim new-s_0)" "(call-expand-observe obs_1 'return new-s_0))))" "(void)))))" @@ -76497,12 +76398,11 @@ static const char *startup_source = "((temp622_0)(expand-context-for-serializable? ctx_0))" "((modules-being-compiled623_0) modules-being-compiled_0)" "((temp624_0) #f))" -"(compile-module13.1" +"(compile-module11.1" " #f" " modules-being-compiled623_0" " temp624_0" " temp622_0" -" #f" " parsed-mod620_0" " temp621_0))))" "(let-values((()" @@ -77451,12 +77351,11 @@ static const char *startup_source = "((modules-being-compiled699_0)" " modules-being-compiled_0)" "((temp700_0) #f))" -"(compile-module13.1" +"(compile-module11.1" " temp697_0" " modules-being-compiled699_0" " temp700_0" " temp698_0" -" #f" " temp695_0" " temp696_0))))" "(begin"