Correctly handle added / kept elements within removed elements, for @hlite.

2017-05-15 22:05:06 +02:00 · 2017-05-15 22:05:06 +02:00 · 35871c47c9
commit 35871c47c9
parent a499901ead
1 changed files with 12 additions and 3 deletions
--- a/diff1.rkt
+++ b/diff1.rkt
@ -233,9 +233,18 @@
                     (loop2 #f
                            (cdr guide)
                            (cdr body)
-                            (if (eq? mode '-)
-                                acc
-                                (cons (loop mode (car guide) (car body)) acc)))]
+                            (cond
+                              [(and (eq? mode '-)
+                                    (or (pair? (car body))
+                                        (and (syntax (car body))
+                                             (pair? (syntax-e (car body))))))
+                               (let ([r (loop mode (car guide) (car body))])
+                                 (append (if (syntax? r) (syntax->list r) r)
+                                         acc))]
+                              [(eq? mode '-)
+                               acc]
+                              [else
+                               (cons (loop mode (car guide) (car body)) acc)]))]
                    ;; If body is not a pair, then we will treat it as an
                    ;; "improper tail" element, unless it is null?
                    [(null? body)