From 35b0883d3e551c5cbc4f416082957e977d6e03eb Mon Sep 17 00:00:00 2001
From: Sean Allred <code@seanallred.com>
Date: Tue, 30 Dec 2014 18:10:39 -0500
Subject: Reapply ef1d321a157e300d29c48e461257897fca1c9aa4

It was somehow lost in the merging.
---
 sx.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sx.el')

diff --git a/sx.el b/sx.el
index 508de46..8fe31ac 100644
--- a/sx.el
+++ b/sx.el
@@ -136,10 +136,11 @@ with a `link' property)."
 If ALIST doesn't have a `site' property, one is created using the
 `link' property."
   (declare (indent 1) (debug t))
+  (require 'let-alist)
   `(progn
-     (require 'let-alist)
      (sx--ensure-site ,alist)
-     (let-alist ,alist ,@body)))
+     ,(macroexpand
+       `(let-alist ,alist ,@body))))
 
 
 ;;; Browsing filter
-- 
cgit v1.2.3


From 7d73bc8b9da4a093b0a3b477da81252d5b805ca5 Mon Sep 17 00:00:00 2001
From: Sean Allred <code@seanallred.com>
Date: Thu, 1 Jan 2015 14:19:58 -0500
Subject: Prune sx--filter-data

---
 sx.el             | 44 --------------------------------------------
 test/test-util.el | 35 -----------------------------------
 2 files changed, 79 deletions(-)

(limited to 'sx.el')

diff --git a/sx.el b/sx.el
index 8fe31ac..73d1a40 100644
--- a/sx.el
+++ b/sx.el
@@ -239,50 +239,6 @@ and sequences of strings."
                            (funcall first-f sequence-sep)
                          ";"))))))
 
-(defun sx--filter-data (data desired-tree)
-  "Filter DATA and return the DESIRED-TREE.
-
-For example:
-
-  (sx--filter-data
-    '((prop1 . value1)
-      (prop2 . value2)
-      (prop3
-       (test1 . 1)
-       (test2 . 2))
-      (prop4 . t))
-    '(prop1 (prop3 test2)))
-
-would yield
-
-  ((prop1 . value1)
-   (prop3
-    (test2 . 2)))"
-  (if (vectorp data)
-      (apply #'vector
-             (mapcar (lambda (entry)
-                       (sx--filter-data
-                        entry desired-tree))
-                     data))
-    (delq
-     nil
-     (mapcar (lambda (cons-cell)
-               ;; @TODO the resolution of `f' is O(2n) in the worst
-               ;; case.  It may be faster to implement the same
-               ;; functionality as a `while' loop to stop looking the
-               ;; list once it has found a match.  Do speed tests.
-               ;; See edfab4443ec3d376c31a38bef12d305838d3fa2e.
-               (let ((f (or (memq (car cons-cell) desired-tree)
-                            (assoc (car cons-cell) desired-tree))))
-                 (when f
-                   (if (and (sequencep (cdr cons-cell))
-                            (sequencep (elt (cdr cons-cell) 0)))
-                       (cons (car cons-cell)
-                             (sx--filter-data
-                              (cdr cons-cell) (cdr f)))
-                     cons-cell))))
-             data))))
-
 (defun sx--shorten-url (url)
   "Shorten URL hiding anything other than the domain.
 Paths after the domain are replaced with \"...\".
diff --git a/test/test-util.el b/test/test-util.el
index 49df274..5db1691 100644
--- a/test/test-util.el
+++ b/test/test-util.el
@@ -1,38 +1,3 @@
-(ert-deftest test-tree-filter ()
-  "Test `sx-core-filter-data'"
-  ;; flat
-  (should
-   (equal
-    '((1 . t) (2 . [1 2]) (3))
-    (sx--filter-data '((0 . 3) (1 . t) (a . five) (2 . [1 2])
-                       ("5" . bop) (3) (p . 4))
-                     '(1 2 3))))
-  ;; complex
-  (should
-   (equal
-    '((1 . [a b c])
-      (2 . [((a . 1) (c . 3))
-            ((a . 4) (c . 6))])
-      (3 . peach))
-    (sx--filter-data '((1 . [a b c])
-                       (2 . [((a . 1) (b . 2) (c . 3))
-                             ((a . 4) (b . 5) (c . 6))])
-                       (3 . peach)
-                       (4 . banana))
-                     '(1 (2 a c) 3))))
-
-  ;; vector
-  (should
-   (equal
-    [((1 . 2) (2 . 3) (3 . 4))
-     ((1 . a) (2 . b) (3 . c))
-     nil ((1 . alpha) (2 . beta))]
-    (sx--filter-data [((1 . 2) (2 . 3) (3 . 4))
-                      ((1 . a) (2 . b) (3 . c) (5 . seven))
-                      ((should-not-go))
-                      ((1 . alpha) (2 . beta))]
-                     '(1 2 3)))))
-
 (ert-deftest thing-as-string ()
   "Test `sx--thing-as-string'"
   (should
-- 
cgit v1.2.3