(no commit message)

[gacela.git] / gacela_misc.lisp

diff --git a/gacela_misc.lisp b/gacela_misc.lisp
index 419181b7680236407ec82526a376eb1e475466c9..d9f38daa5ef4aedafbc7c3f8dfc1498db1efb560 100755 (executable)
--- a/gacela_misc.lisp
+++ b/gacela_misc.lisp
@@ -14,7 +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)
@@ -69,15 +68,17 @@
                        (t (power (* p 2) n)))))
          (power 1 n)))
 
-(defmacro mapcconst (type c-type name)
-  (let ((c-header (concatenate 'string c-type " gacela_" name " (void)"))
-       (c-body (concatenate 'string "return " name ";"))
-       (c-name (concatenate 'string "gacela_" name))
-       (lisp-name (intern (string-upcase name))))
-    `(progn
-       (defcfun ,c-header 0 ,c-body)
-       (defentry ,lisp-name () (,type ,c-name))
-       (eval-when (load) (defconstant ,lisp-name (,lisp-name))))))
+(defmacro secured-eval (form &optional output-stream)
+  (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))
+        (setf (symbol-function 'si::universal-error-handler) ,error-handler)
+        (return-from secure))
+       (let (result-eval)
+        (setq result-eval (eval ,form))
+        (setf (symbol-function 'si::universal-error-handler) ,error-handler)
+        result-eval))))
 
 ;Geometry
 (defun dotp (dot)