X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_misc.lisp;h=7010b0965f32bc23941e53181b89fa51d1d58c8a;hb=5d9f784170bb7cf0a360e7e545d38049a354e160;hp=d9f38daa5ef4aedafbc7c3f8dfc1498db1efb560;hpb=978e906d4f01dcc3dd386e4b0d2fa32564ecc83c;p=gacela.git

diff --git a/gacela_misc.lisp b/gacela_misc.lisp
index d9f38da..7010b09 100755
--- a/gacela_misc.lisp
+++ b/gacela_misc.lisp
@@ -14,8 +14,6 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-(in-package :gacela)
-
 (defconstant INFINITY MOST-POSITIVE-LONG-FLOAT)
 
 (defun append-if (new test tree &key (key #'first) (test-if #'equal))
@@ -68,18 +66,37 @@
 			(t (power (* p 2) n)))))
 	  (power 1 n)))
 
-(defmacro secured-eval (form &optional output-stream)
+(defmacro secure-block (output-stream &rest forms)
   (let ((error-handler #'si::universal-error-handler))
     `(block secure
        (defun si::universal-error-handler (error-name correctable function-name continue-format-string error-format-string &rest args)
-	 ,(when output-stream `(format ,output-stream error-format-string))
+	 ,(when output-stream
+	    `(format ,output-stream
+		     (cond ((eq error-name :WRONG-TYPE-ARGUMENT) (string error-name))
+			   (t error-format-string))))
 	 (setf (symbol-function 'si::universal-error-handler) ,error-handler)
 	 (return-from secure))
        (let (result-eval)
-	 (setq result-eval (eval ,form))
+	 (setq result-eval (progn ,@forms))
 	 (setf (symbol-function 'si::universal-error-handler) ,error-handler)
 	 result-eval))))
 
+(defmacro persistent-let (name vars &rest forms)
+  (labels ((get-vars (vars)
+		     (cond ((null vars) nil)
+			   (t (cons (if (consp (car vars)) (caar vars) (car vars))
+				    (get-vars (cdr vars)))))))
+   
+	  `(let ,(cond ((functionp name)
+			(let ((old-vars (funcall name)))
+			  (cond ((equal (get-vars vars) (get-vars old-vars)) old-vars)
+				(t vars))))
+		       (t vars))
+	     (defun ,name ()
+	       ,(let ((lvars (get-vars vars)))
+		  `(mapcar (lambda (x y) (list x y)) ',lvars ,(cons 'list lvars))))
+	     ,@forms)))
+
 ;Geometry
 (defun dotp (dot)
   (match-pattern dot '(0 0)))