[elpa] externals/dash b0da7b2 093/426: Declare macros before using them.

[Phillip Lord]

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

    Declare macros before using them.
---
 dash.el |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dash.el b/dash.el
index 01469fb..6902559 100644
--- a/dash.el
+++ b/dash.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012 Magnar Sveen
 
 ;; Authors: Magnar Sveen <address@hidden>
-;; Version: 1.0.0
+;; Version: 1.0.1
 ;; Keywords: lists
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -149,6 +149,24 @@ Alias: `-reject'"
 Thus function FN should return a collection."
   (--mapcat (funcall fn it) list))
 
+(defmacro --first (form list)
+  "Anaphoric form of `-first'."
+  (let ((l (make-symbol "list"))
+        (n (make-symbol "needle")))
+    `(let ((,l ,list)
+           (,n nil))
+       (while (and ,l (not ,n))
+         (let ((it (car ,l)))
+           (when ,form (setq ,n it)))
+         (setq ,l (cdr ,l)))
+       ,n)))
+
+(defun -first (fn list)
+  "Returns the first x in LIST where (FN x) is non-nil, else nil.
+
+To get the first item in the list no questions asked, use `car'."
+  (--first (funcall fn it) list))
+
 (defun ---truthy? (val)
   (not (null val)))
 
@@ -376,6 +394,11 @@ The test for equality is done with `equal',
 or with `-compare-fn' if that's non-nil."
   (--filter (not (-contains? list2 it)) list))
 
+(defvar -compare-fn nil
+  "Tests for equality use this function or `equal' if this is nil.
+It should only be set using dynamic scope with a let, like:
+(let ((-compare-fn =)) (-union numbers1 numbers2 numbers3)")
+
 (defun -contains? (list element)
   "Return whether LIST contains ELEMENT.
 The test for equality is done with `equal',
@@ -393,28 +416,5 @@ or with `-compare-fn' if that's non-nil."
           (setq lst (cdr lst)))
         lst))))))
 
-(defmacro --first (form list)
-  "Anaphoric form of `-first'."
-  (let ((l (make-symbol "list"))
-        (n (make-symbol "needle")))
-    `(let ((,l ,list)
-           (,n nil))
-       (while (and ,l (not ,n))
-         (let ((it (car ,l)))
-           (when ,form (setq ,n it)))
-         (setq ,l (cdr ,l)))
-       ,n)))
-
-(defun -first (fn list)
-  "Returns the first x in LIST where (FN x) is non-nil, else nil.
-
-To get the first item in the list no questions asked, use `car'."
-  (--first (funcall fn it) list))
-
-(defvar -compare-fn nil
-  "Tests for equality use this function or `equal' if this is nil.
-It should only be set using dynamic scope with a let, like:
-(let ((-compare-fn =)) (-union numbers1 numbers2 numbers3)")
-
 (provide 'dash)
 ;;; dash.el ends here