From 40dfde0f2ae2393b88bed46e5c6804f586c87db4 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Fri, 14 Feb 2020 08:26:45 -0800
Subject: [PATCH] more

---
 quad/quadwriter/query.rkt | 74 +++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/quad/quadwriter/query.rkt b/quad/quadwriter/query.rkt
index 002a5ea2..6951f771 100644
--- a/quad/quadwriter/query.rkt
+++ b/quad/quadwriter/query.rkt
@@ -1,43 +1,31 @@
 #lang debug racket
 (require quad/base "struct.rkt")
+(provide (all-defined-out))
 
-(define-syntax-rule (factory type proc)
-  (make-quad #:type type
-             #:elems (for/list ([i (in-range 2)])
-                               (quad-update! (proc)
-                                             [tag (format "~a[~a]-~a" 'proc (add1 i) (gensym))]))))
+(define (make-linear-index q)
+  (cons q (append-map make-linear-index (quad-elems q))))
 
-(define (line) (make-quad #:type line-quad))
-(define (block) (factory block-quad line))
-(define (col) (factory column-quad block))
-(define (page) (factory page-quad col))
-(define (sec) (factory section-quad page))
-(define doc (factory doc-quad sec))
+(define (string->pred str)
+  (match str
+    ["doc" doc-quad?]
+    [(or "section" "sec" "s") section-quad?]
+    [(or "page" "pg" "p") page-quad?]
+    [(or "column" "col" "c") column-quad?]
+    [(or "block" "b") block-quad?]
+    [(or "line" "ln" "l") line-quad?]))
 
-(define (parse-query-str str)
-  (define (string->pred str)
-    (match str
-      ["doc" doc-quad?]
-      [(or "section" "sec" "s") section-quad?]
-      [(or "page" "pg" "p") page-quad?]
-      [(or "column" "col" "c") column-quad?]
-      [(or "block" "b") block-quad?]
-      [(or "line" "ln" "l") line-quad?]))
+(define (parse-query str)
   (for/list ([piece (in-list (string-split str ":"))])
-            (match (regexp-match #px"^(.*)\\[(.*?)\\]$" piece)
-              [#false (cons (string->pred piece) #false)]
-              [(list all name arg) (cons (string->pred name) (or (string->number arg)
-                                                                 (string->symbol arg)))])))
-
-(define (make-linear-index q)
-  (cons q (append-map make-linear-index (quad-elems q))))
+    (match (regexp-match #px"^(.*)\\[(.*?)\\]$" piece)
+      [#false (cons (string->pred piece) #false)]
+      [(list all name arg) (cons (string->pred name) (or (string->number arg)
+                                                         (string->symbol arg)))])))
 
 (define (query q query-str)
-  (define query-assocs (parse-query-str query-str))
   (for/fold ([qs (make-linear-index q)]
              #:result (and qs (car qs)))
-            ([qa (in-list query-assocs)])
-    (match-define (cons pred count) qa)
+            ([query-piece (in-list (parse-query query-str))])
+    (match-define (cons pred count) query-piece)
     (let loop ([qs qs][seen 0])
       (define maybe-tail (memf pred qs))
       (and maybe-tail
@@ -46,5 +34,29 @@
                [(= seen count) maybe-tail]
                [else (loop (cdr maybe-tail) seen)]))))))
           
+(module+ test
+  (require rackunit)
+  
+  (define counter 0)
+  (define-syntax-rule (factory type proc)
+    (make-quad #:type type
+               #:elems (for/list ([i (in-range 3)])
+                         (set! counter (add1 counter))
+                         (define new-q (proc))
+                         (quad-update! new-q
+                                       [tag (format "~a[~a]-~a" 'proc counter (gensym))])
+                         (hash-set! (quad-attrs new-q) 'count counter)
+                         new-q)))
+
+  (define (line) (make-quad #:type line-quad))
+  (define (block) (factory block-quad line))
+  (define (col) (factory column-quad block))
+  (define (page) (factory page-quad col))
+  (define (sec) (factory section-quad page))
+
+  (define (count q) (quad-ref q 'count))
+  (define doc (factory doc-quad sec))
 
-(query doc "sec[2]:pg[1]:ln[3]")
\ No newline at end of file
+  (check-equal? (count (query doc "sec[2]")) 242)
+  (check-equal? (count (query doc "sec[2]:pg[1]")) 162)
+  (check-equal? (count (query doc "sec[2]:pg[1]:ln[3]")) 128))
\ No newline at end of file