r8844: laptop updates

diff --git a/macros.lisp b/macros.lisp
index 46894ba5e6fc82e3fc728c8cf2ea5688617e8e85..9b6150a470dc9597470fe8ad2ba8e303e9c3e853 100644 (file)
--- a/macros.lisp
+++ b/macros.lisp
@@ -233,3 +233,9 @@
         (defun ,release-name (instance)
           (kmrcl::with-lock-held (,lock-name)
             (push instance ,cache-name))))))
         (defun ,release-name (instance)
           (kmrcl::with-lock-held (,lock-name)
             (push instance ,cache-name))))))

+
+(defmacro with-ignore-errors (&rest forms)
+  `(progn
+     ,@(mapcar
+       (lambda (x) (list 'ignore-errors x))
+       forms)))

diff --git a/mop.lisp b/mop.lisp
index 82fcb471dd51affbf49563ddaecb06f244c5c7fa..8decec559d7ec7330ac0e79202d4817b53da800c 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -53,29 +53,29 @@
 (defun intern-eql-specializer (slot)
   `(eql ,slot))
 
 (defun intern-eql-specializer (slot)
   `(eql ,slot))
 

-  (defmacro process-class-option (metaclass slot-name &optional required)
-    #+lispworks
-    `(defmethod clos:process-a-class-option ((class ,metaclass)
-                                            (name (eql ,slot-name))
-                                            value)
-      (when (and ,required (null value))
-       (error "metaclass ~A class slot ~A must have a value" (quote ,metaclass) name))
-      (list name `',value))
-    #-lispworks
-    (declare (ignore metaclass slot-name required))
-    )
+(defmacro process-class-option (metaclass slot-name &optional required)
+  #+lispworks
+  `(defmethod clos:process-a-class-option ((class ,metaclass)
+                                          (name (eql ,slot-name))
+                                          value)
+    (when (and ,required (null value))
+      (error "metaclass ~A class slot ~A must have a value" (quote ,metaclass) name))
+    (list name `',value))
+  #-lispworks
+  (declare (ignore metaclass slot-name required))
+  )

 
 

-  (defmacro process-slot-option (metaclass slot-name)
-    #+lispworks
-    `(defmethod clos:process-a-slot-option ((class ,metaclass)
-                                           (option (eql ,slot-name))
-                                           value
-                                           already-processed-options
-                                           slot)
-      (list* option `',value already-processed-options))
-    #-lispworks
-    (declare (ignore metaclass slot-name))
-    )
+(defmacro process-slot-option (metaclass slot-name)
+  #+lispworks
+  `(defmethod clos:process-a-slot-option ((class ,metaclass)
+                                         (option (eql ,slot-name))
+                                         value
+                                         already-processed-options
+                                         slot)
+    (list* option `',value already-processed-options))
+  #-lispworks
+  (declare (ignore metaclass slot-name))
+  )

 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

diff --git a/package.lisp b/package.lisp
index 60df299046f2063c70dae23801138864275d9ce6..9e61ef606fdfc5e93a3e23c41366dc544f3ae8d8 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -138,6 +138,7 @@
    #:deflex
    #:def-cached-vector
    #:def-cached-instance
    #:deflex
    #:def-cached-vector
    #:def-cached-instance

+   #:with-ignore-errors

    
    ;; files.lisp
    #:print-file-contents
    
    ;; files.lisp
    #:print-file-contents