From 6fa00d65d8b3dc0fcaf3f1fd1c6b411d9d5c00c7 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Tue, 4 Jun 2019 17:15:35 -0700 Subject: [PATCH] simplify nit --- pollen/private/main-base.rkt | 20 +++++++++----------- pollen/private/ts.rktd | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pollen/private/main-base.rkt b/pollen/private/main-base.rkt index 0a6ab8d..f163368 100644 --- a/pollen/private/main-base.rkt +++ b/pollen/private/main-base.rkt @@ -37,11 +37,9 @@ (syntax-case stx () [(_ PARSER-MODE . EXPRS) (with-syntax ([META-HASH (split-metas #'EXPRS (setup:define-meta-name))] - [METAS-ID-HERE (setup:meta-export)] - [METAS-ID (datum->syntax #'EXPRS (setup:meta-export))] - [META-MOD-ID (setup:meta-export)] + [METAS-ID (setup:meta-export)] + [METAS-ID-CALLER (datum->syntax #'EXPRS (setup:meta-export))] [ROOT-ID (datum->syntax #'EXPRS (setup:main-root-node))] - [CURRENT-METAS (datum->syntax #'EXPRS 'current-metas)] [POLLEN/TOP (datum->syntax #'EXPRS 'pollen/top)] [DOC-ID (setup:main-export)]) #'(doclang:#%module-begin @@ -50,15 +48,15 @@ (define proc (make-parse-proc PARSER-MODE ROOT-ID)) (define trimmed-xs (strip-leading-newlines xs)) (define doc-elements (splice trimmed-xs (setup:splicing-tag))) - (parameterize ([CURRENT-METAS METAS-ID]) + (parameterize ([current-metas METAS-ID-CALLER]) (proc doc-elements))) ; positional arg for doclang-raw: post-processor - (module META-MOD-ID racket/base + (module METAS-ID racket/base (provide METAS-ID) (define METAS-ID META-HASH)) - (require POLLEN/TOP (submod "." META-MOD-ID)) + (require POLLEN/TOP (submod "." METAS-ID)) (provide (all-defined-out) METAS-ID DOC-ID) - (define prev-metas (CURRENT-METAS)) - (define METAS-ID METAS-ID-HERE) - (and (CURRENT-METAS METAS-ID) "") ; because empty strings get stripped, voids don't + (define prev-metas (current-metas)) + (define METAS-ID-CALLER METAS-ID) + (and (current-metas METAS-ID) "") ; because empty strings get stripped, voids don't (begin . EXPRS) - (and (CURRENT-METAS prev-metas) "")))])) ; leave behind empty string, not void + (and (current-metas prev-metas) "")))])) ; leave behind empty string, not void diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index 5b0b692..605c3f6 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1559693159 +1559693735