July 2006 - cells-cvs@common-lisp.net - mailman3.common-lisp.net

[cells-cvs] CVS cells
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cells/cvsroot/cells In directory clnet:/tmp/cvs-serv10324 Modified Files: cells.asd constructors.lisp family.lisp integrity.lisp link.lisp synapse.lisp Log Message: --- /project/cells/cvsroot/cells/cells.asd 2006/05/30 02:47:45 1.4 +++ /project/cells/cvsroot/cells/cells.asd 2006/07/06 22:10:01 1.5 @@ -30,7 +30,6 @@ (:file "initialize") (:file "md-slot-value") (:file "slot-utilities") - (:file "optimization") (:file "link") (:file "propagate") (:file "model-object") --- /project/cells/cvsroot/cells/constructors.lisp 2006/06/09 17:21:35 1.7 +++ /project/cells/cvsroot/cells/constructors.lisp 2006/07/06 22:10:01 1.8 @@ -18,7 +18,7 @@ (in-package :cells) -(eval-when (compile load eval) +(eval-now! (export '(c?n))) ;___________________ constructors _______________________________ --- /project/cells/cvsroot/cells/family.lisp 2006/06/29 09:54:06 1.9 +++ /project/cells/cvsroot/cells/family.lisp 2006/07/06 22:10:01 1.10 @@ -141,7 +141,6 @@ (md-install-cell self slot-name c-or-value))))))))) (defobserver .kids ((self family) new-kids old-kids) - (declare (ignorable usage)) (c-assert (listp new-kids) () "New kids value for ~a not listp: ~a ~a" self (type-of new-kids) new-kids) (c-assert (listp old-kids)) (c-assert (not (member nil old-kids))) --- /project/cells/cvsroot/cells/integrity.lisp 2006/06/23 01:04:56 1.10 +++ /project/cells/cvsroot/cells/integrity.lisp 2006/07/06 22:10:01 1.11 @@ -64,8 +64,7 @@ (let ((*within-integrity* nil) *unfinished-business* *defer-changes* - *call-stack* - (*data-pulse-id* 0)) + *call-stack*) (funcall action))) (defun ufb-queue (opcode) --- /project/cells/cvsroot/cells/link.lisp 2006/07/03 00:08:29 1.14 +++ /project/cells/cvsroot/cells/link.lisp 2006/07/06 22:10:01 1.15 @@ -129,10 +129,3 @@ ;(c.trc "its ruled" c) (dolist (used (cd-useds c)) (dump-useds used (+ 1 depth))))) - - -(defun test-wk () - (let ((h (make-hash-table :test 'eq :weak-keys t))) - (loop for n below 10 - do (setf (gethash (make-cell :value n) h) n)) - (maphash (lambda (k v) (print (list k v))) h))) \ No newline at end of file --- /project/cells/cvsroot/cells/synapse.lisp 2006/06/23 01:04:56 1.12 +++ /project/cells/cvsroot/cells/synapse.lisp 2006/07/06 22:10:01 1.13 @@ -22,7 +22,6 @@ (export '(mk-synapse f-delta f-sensitivity f-plusp f-zerop fdifferent))) (defmacro with-synapse (synapse-id (&rest closure-vars) &body body) - (declare (ignorable trcp)) (let ((syn-id (gensym))(syn-caller (gensym))) `(let* ((,syn-id ,synapse-id) (,syn-caller (car *call-stack*))

1 0

[cells-cvs] CVS cells/cells-test
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cells/cvsroot/cells/cells-test In directory clnet:/tmp/cvs-serv10324/cells-test Modified Files: test-lazy.lisp Log Message: --- /project/cells/cvsroot/cells/cells-test/test-lazy.lisp 2006/03/16 05:22:08 1.3 +++ /project/cells/cvsroot/cells/cells-test/test-lazy.lisp 2006/07/06 22:10:02 1.4 @@ -118,3 +118,24 @@ #+(or) (cv-test-lazy) + +(defparameter *lz1-count* 0) + +(defmd lz-simple () + (lz1 (c?_ (incf *lz1-count*) + (* 2 (^lz2)))) + (lz2 (c-in 0))) + +(defun lz-test () + (cells-reset) + (let ((*lz1-count* 0) + (lz (make-instance 'lz-simple))) + (assert (zerop *lz1-count*)) + (incf (lz2 lz)) + (assert (zerop *lz1-count*)) + (assert (= (lz1 lz) 2)) + (assert (= 1 *lz1-count*)) + lz)) + +#+test +(lz-test)

1 0

[cells-cvs] CVS cells/gui-geometry
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cells/cvsroot/cells/gui-geometry In directory clnet:/tmp/cvs-serv10324/gui-geometry Modified Files: geo-data-structures.lisp geo-family.lisp geometer.lisp Added Files: gui-geometry.asd Log Message: --- /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp 2006/07/03 00:08:29 1.4 +++ /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp 2006/07/06 22:10:02 1.5 @@ -16,7 +16,7 @@ (in-package :gui-geometry) -(eval-when (compile load eval) +(eval-now! (export '(v2))) ;----------------------------- @@ -312,7 +312,7 @@ ;;; --- Up / Down variability management --- -(eval-when (compile load eval) +(eval-now! (export '(*up-is-positive* ups ups-more ups-most downs downs-most downs-more))) (defparameter *up-is-positive* t --- /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp 2006/07/03 00:08:29 1.5 +++ /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp 2006/07/06 22:10:02 1.6 @@ -16,7 +16,7 @@ (in-package :gui-geometry) -(eval-when (compile load eval) +(eval-now! (export '(geo-inline-lazy))) ;--------------- geo-inline ----------------------------- --- /project/cells/cvsroot/cells/gui-geometry/geometer.lisp 2006/07/03 00:08:29 1.5 +++ /project/cells/cvsroot/cells/gui-geometry/geometer.lisp 2006/07/06 22:10:02 1.6 @@ -16,7 +16,7 @@ (in-package #:gui-geometry) -(eval-when (compile load eval) +(eval-now! (export '(outset ^outset))) (defmd geometer () --- /project/cells/cvsroot/cells/gui-geometry/gui-geometry.asd 2006/07/06 22:10:02 NONE +++ /project/cells/cvsroot/cells/gui-geometry/gui-geometry.asd 2006/07/06 22:10:02 1.1 ;;;; -*- Mode: lisp; indent-tabs-mode: nil -*- (asdf:defsystem :gui-geometry :author "Kenny Tilton <kentilton(a)gmail.com>" :maintainer "Kenny Tilton <kentilton(a)gmail.com>" :licence "Lisp LGPL" :depends-on (:cells) :serial t :components ((:file "defpackage") (:file "geo-data-structures") (:file "coordinate-xform") (:file "geometer") (:file "geo-family")))

1 0

[cells-cvs] CVS Celtk
by ktilton 03 Jul '06

03 Jul '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv17691 Modified Files: lotsa-widgets.lisp togl.lisp Log Message: --- /project/cells/cvsroot/Celtk/lotsa-widgets.lisp 2006/06/07 22:13:41 1.4 +++ /project/cells/cvsroot/Celtk/lotsa-widgets.lisp 2006/07/03 01:31:38 1.5 @@ -19,6 +19,15 @@ (in-package :celtk-user) +;;; Creates a pathname with NAME and TYPE in the same +;;; directory/host/device/whatever as this lisp file. Tries to get +;;; that at compile time to cope with some useful ASDF extensions that +;;; place fasls in arbitrary places. +(defun data-pathname (name type) + (merge-pathnames (make-pathname :name name :type type) + #.(or *compile-file-truename* *load-truename*))) + + (defmodel lotsa-widgets (window) () (:default-initargs @@ -27,9 +36,7 @@ (mk-row (:packing (c?pack-self)) (mk-label :text "aaa" - :image-files (list (list 'kt (make-pathname #+lispworks :host #-lispworks :device "c" - :directory '(:absolute "0dev" "Celtk") - :name "kt69" :type "gif"))) + :image-files (list (list 'kt (data-pathname "kt69" "gif"))) :height 200 :width 300 :image (c? (format nil "~(~a.~a~)" (ctk::^path) 'kt))) @@ -145,10 +152,7 @@ :height 350 :kids (c? (the-kids (mk-bitmap :coords (list 140 140) - :bitmap (conc$ "@" (namestring (make-pathname - :directory '(:absolute "0dev" "Celtk") - :name "x1" - :type "xbm")))) + :bitmap (conc$ "@" (namestring (data-pathname "x1" "xbm")))) (mk-rectangle :coords (list 10 10 100 60) :tk-fill "red") (mk-text-item :coords (list 100 80) --- /project/cells/cvsroot/Celtk/togl.lisp 2006/07/03 00:32:52 1.12 +++ /project/cells/cvsroot/Celtk/togl.lisp 2006/07/03 01:31:38 1.13 @@ -20,7 +20,8 @@ (define-foreign-library Togl - (:darwin (:or "/opt/tcltk/togl/lib/Togl1.7/libtogl1.7.dylib")) + (:darwin (:or "libTogl1.7.dylib" + "/opt/tcltk/togl/lib/Togl1.7/libtogl1.7.dylib")) (:windows (:or "/tcl/lib/togl/togl17.dll")) (:unix "/usr/lib/Togl1.7/libTogl1.7.so"))

1 0

[cells-cvs] CVS Celtk
by ktilton 03 Jul '06

03 Jul '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv10289 Modified Files: Celtk.lisp composites.lisp run.lisp togl.lisp Log Message: --- /project/cells/cvsroot/Celtk/Celtk.lisp 2006/06/29 09:54:52 1.32 +++ /project/cells/cvsroot/Celtk/Celtk.lisp 2006/07/03 00:32:52 1.33 @@ -16,12 +16,13 @@ |# -;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.32 2006/06/29 09:54:52 ktilton Exp $ +;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.33 2006/07/03 00:32:52 ktilton Exp $ (defpackage :celtk (:nicknames "CTK") (:use :common-lisp :utils-kt :cells :cffi) (:export + #:right #:left #:<1> #:tk-event-type #:xsv #:name #:x #:y #:x-root #:y-root #:title$ #:pop-up #:path #:parent-path #:^keyboard-modifiers #:keyboard-modifiers #:window #:panedwindow #:mk-row #:c?pack-self #:mk-stack #:mk-text-widget #:text-widget @@ -45,7 +46,7 @@ #:timer #:timers #:repeat #:executions #:state #:timer-reset #:make-timer-steps #:^widget-menu #:widget-menu #:tk-format-now #:coords #:^coords #:tk-translate-keysym - #:*tkw*)) + #:*tkw*)) (defpackage :celtk-user (:use :common-lisp :utils-kt :cells :celtk)) --- /project/cells/cvsroot/Celtk/composites.lisp 2006/06/29 09:54:52 1.11 +++ /project/cells/cvsroot/Celtk/composites.lisp 2006/07/03 00:32:52 1.12 @@ -107,26 +107,28 @@ (tk-format '(:fini new-value) "focus ~a" (path new-value)))) (defun tkfont-info-loader () - (c? (eko (nil "tkfinfo") - (loop with scaling = (^tk-scaling) - for (tkfont fname) in (^tkfonts-to-load) - collect (cons tkfont - (apply 'vector - (loop for fsize in (^tkfont-sizes-to-load) - for id = (format nil "~(~a-~2,'0d~)" tkfont fsize) - for tkf = (tk-eval "font create ~a -family {~a} -size ~a" - id fname fsize) - for (nil ascent nil descent nil linespace nil fixed) = (tk-eval-list "font metrics ~a" tkf) - collect (make-tkfinfo :ascent (round (parse-integer ascent) scaling) - :id id - :family fname - :size fsize - :descent (round (parse-integer descent) scaling) - :linespace (round (parse-integer linespace) scaling) - :fixed (plusp (parse-integer fixed)) - :em (round (parse-integer - (tk-eval "font measure ~(~a~) \"m\"" tkfont)) - scaling))))))))) + (c? (eko (nil "tkfinfo") + (loop with scaling = (^tk-scaling) + for (tkfont fname) in (^tkfonts-to-load) + collect (cons tkfont + (apply 'vector + (loop for fsize in (^tkfont-sizes-to-load) + for id = (format nil "~(~a-~2,'0d~)" tkfont fsize) + for tkf = (tk-eval "font create ~a -family {~a} -size ~a" + id fname fsize) + for (nil ascent nil descent nil linespace nil fixed) = (tk-eval-list "font metrics ~a" tkf) + collect + (progn (trc nil "tkfontloaded" id fname fsize tkfont tkf) + (make-tkfinfo :ascent (round (parse-integer ascent) scaling) + :id id + :family fname + :size fsize + :descent (round (parse-integer descent) scaling) + :linespace (round (parse-integer linespace) scaling) + :fixed (plusp (parse-integer fixed)) + :em (round (parse-integer + (tk-eval "font measure ~(~a~) \"m\"" tkfont)) + scaling)))))))))) (defobserver title$ ((self window)) (tk-format '(:configure "title") "wm title . ~s" (or new-value "Untitled"))) --- /project/cells/cvsroot/Celtk/run.lisp 2006/06/29 09:54:52 1.17 +++ /project/cells/cvsroot/Celtk/run.lisp 2006/07/03 00:32:52 1.18 @@ -23,7 +23,7 @@ (eval-when (compile load eval) (export '(tk-scaling run-window test-window))) -(defun run-window (root-class &optional (resetp t)) +(defun run-window (root-class &optional (resetp t) &rest window-initargs) (declare (ignorable root-class)) (setf *tkw* nil) (when resetp @@ -49,8 +49,10 @@ (setf *app* (make-instance 'application :kids (c? (the-kids - (setf *tkw* (make-instance root-class - :fm-parent *parent*))))))) + (setf *tkw* (apply 'make-instance root-class + :fm-parent *parent* + window-initargs)))) + ))) (assert (tkwin *tkw*)) @@ -143,7 +145,7 @@ (defmethod window-idle ((self window))) -(defun test-window (root-class &optional (resetp t)) +(defun test-window (root-class &optional (resetp t) &rest window-initargs) "nails existing window as a convenience in iterative development" (declare (ignorable root-class)) @@ -154,7 +156,7 @@ (force-output *tkw*) (setf *tkw* nil)) - (run-window root-class resetp)) + (apply 'run-window root-class resetp window-initargs)) ;;; --- commands ----------------------------------------------------------------- --- /project/cells/cvsroot/Celtk/togl.lisp 2006/06/29 09:54:52 1.11 +++ /project/cells/cvsroot/Celtk/togl.lisp 2006/07/03 00:32:52 1.12 @@ -178,7 +178,9 @@ (defmethod ,(intern uc$) ((self togl)))))) (def-togl-callback create () - (setf (togl-ptr self) togl-ptr) + (trc "!!!!!!!!!!!!!!!!!! about to install togl-ptr!!!!!!!!!!!!!!!!!!" togl-ptr self) + (setf (togl-ptr self) (setf cl-ftgl::*ftgl-ogl* ;; help debug failure to use lazy cells/classes to defer FTGL till Ogl ready + togl-ptr)) (setf (gethash (pointer-address togl-ptr) (tkwins *tkw*)) self)) (def-togl-callback display ())

1 0

[cells-cvs] CVS cells
by ktilton 03 Jul '06

03 Jul '06

Update of /project/cells/cvsroot/cells In directory clnet:/tmp/cvs-serv6754 Modified Files: defmodel.lisp link.lisp Log Message: --- /project/cells/cvsroot/cells/defmodel.lisp 2006/06/23 01:04:56 1.6 +++ /project/cells/cvsroot/cells/defmodel.lisp 2006/07/03 00:08:29 1.7 @@ -100,7 +100,6 @@ ) (setf (md-slot-cell-type class slotname) cell) - `(progn ,(when reader-fn `(defmethod ,reader-fn ((self ,class)) @@ -173,7 +172,7 @@ :accessor spec) slots))) finally (return (list* (nreverse slots) - (delete-if 'null + (delete nil (list* `(:default-initargs ,@definitargs) (nreverse class-options))))))))) --- /project/cells/cvsroot/cells/link.lisp 2006/06/23 01:04:56 1.13 +++ /project/cells/cvsroot/cells/link.lisp 2006/07/03 00:08:29 1.14 @@ -76,7 +76,7 @@ (handle-used (incf rev-pos))) (handle-used (setf rev-pos 0)))))) (nail-unused (cd-useds c)) - (setf (cd-useds c) (delete-if #'null (cd-useds c))))))) + (setf (cd-useds c) (delete nil (cd-useds c))))))) (defun c-caller-path-exists-p (from-used to-caller) (count-it :caller-path-exists-p)

1 0

[cells-cvs] CVS cells/gui-geometry
by ktilton 03 Jul '06

03 Jul '06

Update of /project/cells/cvsroot/cells/gui-geometry In directory clnet:/tmp/cvs-serv6754/gui-geometry Modified Files: defpackage.lisp geo-data-structures.lisp geo-family.lisp geometer.lisp Log Message: --- /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp 2006/06/23 01:04:57 1.5 +++ /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp 2006/07/03 00:08:29 1.6 @@ -21,7 +21,7 @@ #:px #:py #:ll #:lt #:lr #:lb #:pl #:pt #:pr #:pb #:^px #:^py #:^ll #:^lt #:^lr #:^lb #:u96ths #:udots #:uinches #:uin #:upoints #:upts #:u8ths #:u16ths #:u32nds - #:mkr #:v2-move #:l-height #:mkv2 #:^offset-within #:inset-lr #:v2-v #:v2-h + #:mkr #:v2-nmove #:l-height #:mkv2 #:^offset-within #:inset-lr #:v2-v #:v2-h #:r-bounds #:l-box #:lb #:cs-target-res --- /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp 2006/06/29 09:54:06 1.3 +++ /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp 2006/07/03 00:08:29 1.4 @@ -16,6 +16,8 @@ (in-package :gui-geometry) +(eval-when (compile load eval) + (export '(v2))) ;----------------------------- (defstruct v2 @@ -55,7 +57,7 @@ (progn (incf (v2-h p1) x) (incf (v2-v p1) y)) - (v2-move p1 (v2-h x)(v2-v x))) + (v2-nmove p1 (v2-h x)(v2-v x))) p1) (defun v2-in-rect (v2 r) --- /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp 2006/06/29 09:54:06 1.4 +++ /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp 2006/07/03 00:08:29 1.5 @@ -21,7 +21,6 @@ ;--------------- geo-inline ----------------------------- ; - (defmodel geo-inline (geo-zero-tl) ((orientation :initarg :orientation :initform nil :accessor orientation :documentation ":vertical (for a column) or :horizontal (row)") @@ -37,7 +36,7 @@ maximizing (l-width k))) (:horizontal (bif (lk (last1 (^kids))) (pr lk) 0))))) - :lb (c? (+ (downs (^outset)) + :lb (c? (+ (- (^outset)) (ecase (orientation self) (:vertical (bif (lk (last1 (^kids))) (pb lk) 0)) @@ -73,7 +72,7 @@ maximizing (l-width k))) (:horizontal (bif (lk (last1 (^kids))) (pr lk) 0))))) - :lb (c_? (+ (downs (^outset)) + :lb (c_? (+ (- (^outset)) (ecase (orientation self) (:vertical (bif (lk (last1 (^kids))) (pb lk) 0)) @@ -85,8 +84,10 @@ (mk-kid-slot (px :if-missing t) (c_? (^px-self-centered (justify .parent)))) (mk-kid-slot (py) - (c_? (py-maintain-pt - (^prior-sib-pb self (spacing .parent))))))) + (c_? (eko (nil "py" self (^lt) (l-height self)(psib)) + (py-maintain-pt + (eko (nil "psib-pb") + (^prior-sib-pb self (spacing .parent))))))))) (:horizontal (list (mk-kid-slot (py :if-missing t) (c_? (^py-self-centered (justify .parent)))) --- /project/cells/cvsroot/cells/gui-geometry/geometer.lisp 2006/06/23 01:04:57 1.4 +++ /project/cells/cvsroot/cells/gui-geometry/geometer.lisp 2006/07/03 00:08:29 1.5 @@ -16,19 +16,16 @@ (in-package #:gui-geometry) -(defmodel geometer () - ((inset :cell nil :initarg :inset :reader inset - :unchanged-if 'v2= :initform (mkv2 0 0)) - (outset :initarg :outset :initform 0 :accessor outset) - (collapsed :initarg :collapsed :initform nil :accessor collapsed) - (px :initarg :px :initform nil :accessor px) - (py :initarg :py :initform nil :accessor py) - (ll :initarg :ll :initform nil :accessor ll) - (lt :initarg :lt :initform nil :accessor lt) - (lr :initarg :lr :initform nil :accessor lr) - (lb :initarg :lb :initform nil :accessor lb) - (w-box :cell nil :initform (mkr 0 0 0 0) :accessor w-box - :documentation "bbox in window coordinate system"))) +(eval-when (compile load eval) + (export '(outset ^outset))) + +(defmd geometer () + px py ll lt lr lb + collapsed + (inset (mkv2 0 0) :unchanged-if 'v2=) + (outset 0) + (w-box (mkr 0 0 0 0) :cell nil :accessor w-box + :documentation "bbox in window coordinate system")) (defmethod collapsed (other) (declare (ignore other)) @@ -40,14 +37,14 @@ () (:default-initargs :ll (c? (- (outset self))) - :lt (c? (ups (outset self))) + :lt (c? (+ (outset self))) :lr (c? (geo-kid-wrap self 'pr)) :lb (c? (geo-kid-wrap self 'pb)) :kid-slots (def-kid-slots (mk-kid-slot (px :if-missing t) (c? (px-maintain-pl 0))) (mk-kid-slot (py :if-missing t) - (c? (py-maintain-pt 0)))))) + (c? (break)(py-maintain-pt 0)))))) (defmodel geo-kid-sized (family) () @@ -206,7 +203,7 @@ (- (lr self) (outset self))) (defun inset-lb (self) - (ups (lb self) (outset self))) + (+ (lb self) (outset self))) (defun inset-height (self) (- (l-height self) (outset self) (outset self))) @@ -293,19 +290,14 @@ `(c? (lr-maintain-pr (- (inset-lr .parent) ,padding)))) -(defmacro ^prior-sib-pb (self &optional (spacing 0)) - (let ((kid (gensym)) - (psib (gensym))) - `(let* ((,kid ,self) - (,psib (find-prior ,kid (kids (fm-parent ,kid)) - :test (lambda (sib) - (not (collapsed sib))))) - ) - ;(trc "^priorSib-pb > kid, sib" ,kid ,pSib) - (if ,psib - (+ (- (abs ,spacing)) ;; force spacing to minus(= down for OpenGL) - (pb ,psib)) - 0)))) +(defun ^prior-sib-pb (self &optional (spacing 0)) + (bif (psib (find-prior self (kids .parent) + :test (lambda (sib) + (not (collapsed sib))))) + (eko (nil "^prior-sib-pb spc pb-psib -lt" (- (abs spacing)) (pb psib) (- (^lt))) + (+ (- (abs spacing)) ;; force spacing to minus(= down for OpenGL) + (pb psib))) + 0)) (defmacro ^prior-sib-pt (self &optional (spacing 0)) (let ((kid (gensym))

1 0

[cells-cvs] CVS cells/utils-kt
by ktilton 03 Jul '06

03 Jul '06

Update of /project/cells/cvsroot/cells/utils-kt In directory clnet:/tmp/cvs-serv6754/utils-kt Modified Files: flow-control.lisp Log Message: --- /project/cells/cvsroot/cells/utils-kt/flow-control.lisp 2006/05/20 06:32:20 1.3 +++ /project/cells/cvsroot/cells/utils-kt/flow-control.lisp 2006/07/03 00:08:29 1.4 @@ -55,7 +55,7 @@ list)) (defun packed-flat! (&rest u-nameit) - (delete-if #'null (list-flatten! u-nameit))) + (delete nil (list-flatten! u-nameit))) (defmacro with-dynamic-fn ((fn-name (&rest fn-args) &body fn-body) &body body) `(let ((,fn-name (lambda ,fn-args ,@fn-body)))

1 0