[elpa] externals/dash 3e0ef58 012/439: !filter can now take either a function or form (anaphoric)

[Phillip Lord]

branch: externals/dash
commit 3e0ef58cd4ce5ec721330ac498091e71337b8f47
Author: Magnar Sveen <address@hidden>
Commit: Magnar Sveen <address@hidden>

    !filter can now take either a function or form (anaphoric)
---
 README.md |   16 ++++++++++++++++
 bang.el   |   11 +++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index eef2dba..b6c806d 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,22 @@ Right now it relies on `cl` which should be one of the very 
first things we fix.
 
 This is so much a work in progress that you should definitely not be using it 
yet.
 
+## Anaphoric functions
+
+While `!filter` takes a function to filter the list by, you can also pass
+it a forms - which will then be executed with `it` exposed as the list item.
+Here's an example:
+
+    (!filter (lambda (num) (= 0 (% num 2))) '(1 2 3 4)) ;; normal version
+
+    (!filter (= 0 (% it 2)) '(1 2 3 4)) ;; anaphoric version
+
+of course the original can also be written like
+
+    (!filter 'even? '(1 2 3 4))
+
+which demonstrates the usefulness of both versions.
+
 ## License
 
 Copyright (C) 2012 Magnar Sveen, Joel McCracken
diff --git a/bang.el b/bang.el
index e552988..dc330f9 100644
--- a/bang.el
+++ b/bang.el
@@ -37,7 +37,6 @@ It should only be set using dynamic scope with a let, like:
 
 (defalias '!map 'mapcar)
 
-(defalias '!filter 'remove-if-not)
 (defalias '!select 'remove-if-not)
 (defalias '!reject 'remove-if)
 
@@ -46,11 +45,11 @@ It should only be set using dynamic scope with a let, like:
 (defun !mapcat (fn list)
   (!concat (!map fn list)))
 
-(defmacro !-filter (list &rest forms)
+(defmacro !filter (form-or-fn list)
   `(let (!--result)
      (while list
        (let ((it (car list)))
-         (when (progn ,@forms)
+         (when ,(if (functionp form-or-fn) (list form-or-fn 'it) (list 'progn 
form-or-fn))
            (setq !--result (cons it !--result))))
        (setq list (cdr list)))
      (nreverse !--result)))
@@ -59,19 +58,19 @@ It should only be set using dynamic scope with a let, like:
   "Return a new list with all duplicates removed.
 The test for equality is done with `equal',
 or with `!compare-fn' if that's non-nil."
-  (!-filter list (not (!contains-p !--result it))))
+  (!filter (not (!contains-p !--result it)) list))
 
 (defun !intersection (list list2)
   "Return a new list containing only the elements that are members of both 
LIST and LIST2.
 The test for equality is done with `equal',
 or with `!compare-fn' if that's non-nil."
-  (!-filter list (!contains-p list2 it)))
+  (!filter (!contains-p list2 it) list))
 
 (defun !difference (list list2)
   "Return a new list with only the members of LIST that are not in LIST2.
 The test for equality is done with `equal',
 or with `!compare-fn' if that's non-nil."
-  (!-filter list (not (!contains-p list2 it))))
+  (!filter (not (!contains-p list2 it)) list))
 
 (defun !contains-p (list element)
   "Return whether LIST contains ELEMENT.