[elpa] 01/01: [xpm int] Add abstraction: form

[Thien-Thi Nguyen]

ttn pushed a commit to branch master
in repository elpa.

commit bd50d122eb4ec3dbc2b9eaf9f799c893ac40d1f5
Author: Thien-Thi Nguyen <address@hidden>
Date:   Fri Jun 13 13:13:28 2014 +0200

    [xpm int] Add abstraction: form
    
    * packages/xpm/flower.el (flower form): New internal func.
---
 packages/xpm/flower.el |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/xpm/flower.el b/packages/xpm/flower.el
index 5621d81..81af726 100644
--- a/packages/xpm/flower.el
+++ b/packages/xpm/flower.el
@@ -54,20 +54,16 @@
                           (lambda (θ) (cos (* τ θ)))))
          (n-mag-fns (length mag-fns)))
     (cl-flet
-        ((random-mag-fn () (aref mag-fns (random n-mag-fns))))
+        ((random-mag-fn () (aref mag-fns (random n-mag-fns)))
+         (form (fn &rest args) (apply fn half half (random 42) args)))
       (let* ((x-mag-fn (random-mag-fn))
              (y-mag-fn (random-mag-fn))
              (form (if again
                        (get 'flower 'form)
                      (delete-dups
                       (if (zerop (random 5))
-                          (let ((one (xpm-m2z-circle
-                                      half half
-                                      (random 42)))
-                                (two (xpm-m2z-ellipse
-                                      half half
-                                      (random 42)
-                                      (random 42))))
+                          (let ((one (form 'xpm-m2z-circle))
+                                (two (form 'xpm-m2z-ellipse (random 42))))
                             (append one two))
                         (cl-loop
                          for θ below τ by 0.003