suzanne.soy/hyper-literate
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Closed #2 Wrong order of chunks: all @CHUNKs are inserted first, then the @chunks

Browse Source
This commit is contained in:
Georges Dupéron 2016-09-16 23:06:25 +02:00
parent d5f2514925
commit 57a4d0184d
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
private/lp.rkt
View File

@ -45,11 +45,10 @@
;; code. ;; code.
;; For now, only #, i.e. unsyntax is supported, within @chunk. ;; For now, only #, i.e. unsyntax is supported, within @chunk.
;; Later support for UNSYNTAX within @CHUNK may be added. ;; Later support for UNSYNTAX within @CHUNK may be added.
(if unsyntax? (define expand-unsyntax
;; New hack: (if unsyntax?
(syntax-local-lift-module-end-declaration ;; New hack:
#'(begin #'((define-syntax (macro-to-expand-unsyntax _)
(define-syntax (macro-to-expand-unsyntax _)
(define a #'here) (define a #'here)
(define b (syntax-local-identifier-as-binding (define b (syntax-local-identifier-as-binding
(syntax-local-introduce #'here))) (syntax-local-introduce #'here)))
@ -58,11 +57,12 @@
(intr #`(quote-syntax (a-chunk ((... ...) name) (intr #`(quote-syntax (a-chunk ((... ...) name)
((... ...) expr) ...)) ((... ...) expr) ...))
'flip)) 'flip))
#'(begin)) #'(void))
(macro-to-expand-unsyntax))) (macro-to-expand-unsyntax))
;; Default (old) behaviour, which does not support escaping (via #,): ;; Default (old) behaviour, which does not support escaping via #,
(syntax-local-lift-expression (begin (syntax-local-lift-expression
#'(quote-syntax (a-chunk name expr ...)))) #'(quote-syntax (a-chunk name expr ...)))
#f)))
;; Extract require forms ;; Extract require forms
@ -110,9 +110,10 @@
rest ...)))) rest ...))))
(#,racketblock expr ...)))) (#,racketblock expr ...))))
#`(begin #`(begin
#,@(if expand-unsyntax expand-unsyntax #'())
#,@(if (null? (syntax-e #'(for-label-mod ... ...))) #,@(if (null? (syntax-e #'(for-label-mod ... ...)))
#'() #'()
#'((require (for-label for-label-mod ... ...)))) #'((require (for-label for-label-mod ... ...))))
#,@(if n #,@(if n
#'() #'()
#'((define-syntax name (make-element-id-transformer #'((define-syntax name (make-element-id-transformer

19
test/test-chunks-order.rkt Normal file
View File

@ -0,0 +1,19 @@
#lang hyper-literate racket/base
@chunk[<values>
'A]
@chunk[<values>
'B]
@CHUNK[<values>
'C]
@CHUNK[<values>
'D]
@chunk[<*>
(require rackunit)
(check-equal? (list <values>)
'(A B C D))]