suzanne.soy/scribble-enhanced
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Preserve stx-pair and stx-list in defform

Browse Source
This commit is contained in:
Georges Dupéron 2017-06-03 00:08:53 +02:00
parent 8f6f1dc385
commit 6949407da3
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
manual-form.rkt
View File

@ -205,26 +205,12 @@
(if (and (identifier? spec) (if (and (identifier? spec)
(free-identifier=? spec #'defined-id)) (free-identifier=? spec #'defined-id))
(datum->syntax #'here '(unsyntax x) spec spec) (datum->syntax #'here '(unsyntax x) spec spec)
(syntax-case spec () #;(syntax-case spec ()
[(a . b) [(a . b)
(datum->syntax spec (datum->syntax spec
(cons (loop #'a) (loop #'b)) (cons (loop #'a) (loop #'b))
spec spec
spec)] spec)]
[id
(and (identifier? #'id)
(or (free-identifier=? #'id #'quote)
(free-identifier=? #'id #'unquote)
(free-identifier=? #'id #'quasiquote)))
(if (= (source-location-span #'id) 1)
(datum->syntax #'here
`(unsyntax ',(syntax-e #'id))
spec
spec)
(datum->syntax #'here
`(unsyntax (RACKET ,(syntax-e #'id)))
spec
spec))]
[id [id
(and (identifier? #'id) (and (identifier? #'id)
(or (free-identifier=? #'id #'syntax) (or (free-identifier=? #'id #'syntax)
@ -238,8 +224,43 @@
(datum->syntax #'here (datum->syntax #'here
`(unsyntax (RACKET ,(syntax-e #'id))) `(unsyntax (RACKET ,(syntax-e #'id)))
spec spec
spec))])
(cond
[(and (identifier? spec)
(or (free-identifier=? spec #'quote)
(free-identifier=? spec #'unquote)
(free-identifier=? spec #'quasiquote)))
(if (= (source-location-span spec) 1)
(datum->syntax #'here
`(unsyntax ',(syntax-e spec))
spec
spec)
(datum->syntax #'here
`(unsyntax (RACKET ,(syntax-e spec)))
spec
spec))] spec))]
[_ spec]))))] [(and (identifier? spec)
(or (free-identifier=? spec #'syntax)
(free-identifier=? spec #'unsyntax)
(free-identifier=? spec #'quasisyntax)))
(if (= (source-location-span spec) 2)
(datum->syntax #'here
`(unsyntax ',(syntax-e spec))
spec
spec)
(datum->syntax #'here
`(unsyntax (RACKET ,(syntax-e spec)))
spec
spec))]
[(syntax? spec) (datum->syntax spec
(loop (syntax-e spec))
spec
spec)]
[(pair? spec) (cons (loop (car spec))
(loop (cdr spec)))]
[else spec]))))]
[(maybe-result ...) (if (attribute results) [(maybe-result ...) (if (attribute results)
#'(results.result ...) #'(results.result ...)
(map (λ _ #'()) (map (λ _ #'())