From 57a4d0184d83865d6ad0b1d9a9948280705e5492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@gmail.com>
Date: Fri, 16 Sep 2016 23:06:25 +0200
Subject: [PATCH] Closed #2 Wrong order of chunks: all @CHUNKs are inserted
 first, then the @chunks

---
 private/lp.rkt             | 25 +++++++++++++------------
 test/test-chunks-order.rkt | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 test/test-chunks-order.rkt

diff --git a/private/lp.rkt b/private/lp.rkt
index 467fac12..5ad2391d 100644
--- a/private/lp.rkt
+++ b/private/lp.rkt
@@ -45,11 +45,10 @@
        ;; code.
        ;; For now, only #, i.e. unsyntax is supported, within @chunk.
        ;; Later support for UNSYNTAX within @CHUNK may be added.
-       (if unsyntax?
-           ;; New hack:
-           (syntax-local-lift-module-end-declaration
-            #'(begin
-                (define-syntax (macro-to-expand-unsyntax _)
+       (define expand-unsyntax
+         (if unsyntax?
+             ;; New hack:
+             #'((define-syntax (macro-to-expand-unsyntax _)
                   (define a #'here)
                   (define b (syntax-local-identifier-as-binding
                              (syntax-local-introduce #'here)))
@@ -58,11 +57,12 @@
                    (intr #`(quote-syntax (a-chunk ((... ...) name)
                                                   ((... ...) expr) ...))
                          'flip))
-                  #'(begin))
-                (macro-to-expand-unsyntax)))
-           ;; Default (old) behaviour, which does not support escaping (via #,):
-           (syntax-local-lift-expression
-            #'(quote-syntax (a-chunk name expr ...))))
+                  #'(void))
+                (macro-to-expand-unsyntax))
+             ;; Default (old) behaviour, which does not support escaping via #,
+             (begin (syntax-local-lift-expression
+                     #'(quote-syntax (a-chunk name expr ...)))
+                    #f)))
 
        
        ;; Extract require forms
@@ -110,9 +110,10 @@
                                              rest ...))))
                     (#,racketblock expr ...))))
          #`(begin
+             #,@(if expand-unsyntax expand-unsyntax #'())
              #,@(if (null? (syntax-e #'(for-label-mod ... ...)))
-                   #'()
-                   #'((require (for-label for-label-mod ... ...))))
+                    #'()
+                    #'((require (for-label for-label-mod ... ...))))
              #,@(if n
                     #'()
                     #'((define-syntax name (make-element-id-transformer
diff --git a/test/test-chunks-order.rkt b/test/test-chunks-order.rkt
new file mode 100644
index 00000000..8edd82b2
--- /dev/null
+++ b/test/test-chunks-order.rkt
@@ -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))]