From 50cac9ec150a00089fec2dcf23d540552bd1c64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Tue, 23 Aug 2016 13:50:27 +0200 Subject: [PATCH] Use syntax/parse for reqprov, fix documentation for require-in and change order of arguments for require-in. --- private/reqprov.rkt | 19 +++++++++---------- private/reqprov.scrbl | 5 +++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/private/reqprov.rkt b/private/reqprov.rkt index 8d70f6b..42f3572 100644 --- a/private/reqprov.rkt +++ b/private/reqprov.rkt @@ -4,7 +4,8 @@ racket/provide-syntax (for-syntax racket/base racket/provide-transform - racket/syntax)) + racket/syntax + syntax/parse)) (provide expander-in expander-out) @@ -22,14 +23,12 @@ (#,@prefix define-id-expander) (for-syntax (#,@prefix expand-all-id-expanders))))) -(define-require-syntax (expander-in stx) - (syntax-case stx () - [(_ id modpath) - (identifier? #'id) - (reqprov-transformer2 #'id #'combine-in #'(only-in modpath))])) +(define-require-syntax expander-in + (syntax-parser + [(_ require-spec id:id) + (reqprov-transformer2 #'id #'combine-in #'(only-in require-spec))])) -(define-provide-syntax (expander-out stx) - (syntax-case stx () - [(_ id) - (identifier? #'id) +(define-provide-syntax expander-out + (syntax-parser + [(_ id:id) (reqprov-transformer2 #'id #'combine-out #'(combine-out))])) \ No newline at end of file diff --git a/private/reqprov.scrbl b/private/reqprov.scrbl index 997ad6e..2478da3 100644 --- a/private/reqprov.scrbl +++ b/private/reqprov.scrbl @@ -4,9 +4,10 @@ @title{@racket[require] and @racket[provide] transformers} @defform[#:kind "require transformer" - (expander-in id)]{ + (expander-in require-spec id)]{ This @techlink[#:doc '(lib "scribblings/reference/reference.scrbl")]{ - require transformer} imports the identifiers defined by + require transformer} imports from @racket[require-spec] + the identifiers defined by @racket[(define-expander-type id)]: @itemlist[@item{@tt{@emph{id}-expander-type}} @item{@tt{make-@emph{id}-expander}}