X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=gacela_misc.lisp;h=6e3e4ff0da07e867afb9baf31a1a64ecd866ad08;hb=985f70ebe19ce02926a46cf524be1152c29a44f1;hp=9a017877b2391a30bd2fae934f760d8dea22c35a;hpb=713dfecf4536609800aa869bc1218b2dccc4d970;p=gacela.git

diff --git a/gacela_misc.lisp b/gacela_misc.lisp
index 9a01787..6e3e4ff 100755
--- a/gacela_misc.lisp
+++ b/gacela_misc.lisp
@@ -14,7 +14,10 @@
 ;;; 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)
+(when (not (find-package 'gacela))
+  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+
+(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 (defconstant INFINITY MOST-POSITIVE-LONG-FLOAT)
 
@@ -73,9 +76,10 @@
     `(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
-		     (cond ((eq error-name :WRONG-TYPE-ARGUMENT) (string error-name))
-			   (t error-format-string))))
+	    `(write-line
+	      (cond ((eq error-name :WRONG-TYPE-ARGUMENT) (string error-name))
+		    (t error-format-string))
+	      ,output-stream))
 	 (setf (symbol-function 'si::universal-error-handler) ,error-handler)
 	 (return-from secure))
        (let (result-eval)
@@ -83,6 +87,22 @@
 	 (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)))