lib/keyword.c (kw_parseempty): Use correct variable scanning `kwval' list.

[sod] / src / parser / floc-proto.lisp

diff --git a/src/parser/floc-proto.lisp b/src/parser/floc-proto.lisp
index 9acbfae7666436833aaa9b35ec6ecf40ca74f587..9eb31d400632d0c26bd14bac59f19edc5e54813a 100644 (file)
--- a/src/parser/floc-proto.lisp
+++ b/src/parser/floc-proto.lisp
@@ -53,22 +53,6 @@ (defgeneric file-location (thing)
    `file-location designator'.")
   (:method ((thing file-location)) thing))
 
-;;;--------------------------------------------------------------------------
-;;; Enclosing conditions.
-
-(export '(enclosing-condition enclosed-condition))
-(define-condition enclosing-condition (condition)
-  ((%enclosed-condition :initarg :condition :type condition
-                       :reader enclosed-condition))
-  (:documentation
-   "A condition which encloses another condition
-
-   This is useful if one wants to attach additional information to an
-   existing condition.  The enclosed condition can be obtained using the
-   `enclosed-condition' function.")
-  (:report (lambda (condition stream)
-            (princ (enclosed-condition condition) stream))))
-
 ;;;--------------------------------------------------------------------------
 ;;; Conditions with location information.
 
@@ -83,10 +67,6 @@ (define-condition enclosing-condition-with-location
     (condition-with-location enclosing-condition)
   ())
 
-(export 'information)
-(define-condition information (condition)
-  ())
-
 (export 'error-with-location)
 (define-condition error-with-location (condition-with-location error)
   ())
@@ -130,26 +110,6 @@ (define-condition simple-warning-with-location
     (warning-with-location simple-warning)
   ())
 
-(export 'simple-information)
-(define-condition simple-information (simple-condition information)
-  ())
-
-(export 'info)
-(defun info (datum &rest arguments)
-  "Report some useful diagnostic information.
-
-   Establish a simple restart named `noted', and signal the condition of type
-   `information' designated by DATUM and ARGUMENTS.  Return non-nil if the
-   restart was invoked, otherwise nil."
-  (restart-case
-      (signal (designated-condition 'simple-information datum arguments))
-    (noted () :report "Noted." t)))
-
-(export 'noted)
-(defun noted (&optional condition)
-  "Invoke the `noted' restart, possibly associated with the given CONDITION."
-  (invoke-associated-restart 'noted condition))
-
 (export 'simple-information-with-location)
 (define-condition simple-information-with-location
     (information-with-location simple-information)
@@ -243,31 +203,14 @@ (defun info-with-location (floc datum &rest arguments)
               'simple-information-with-location
               floc datum arguments)))
 
-(defun my-cerror (continue-string datum &rest arguments)
-  "Like standard `cerror', but robust against sneaky changes of conditions.
-
-   It seems that `cerror' (well, at least the version in SBCL) is careful
-   to limit its restart to the specific condition it signalled.  But that's
-   annoying, because `with-default-error-location' substitutes different
-   conditions carrying the error-location information."
-  (restart-case (apply #'error datum arguments)
-    (continue ()
-      :report (lambda (stream)
-               (apply #'format stream continue-string datum arguments))
-      nil)))
-
 (export 'cerror-with-location)
 (defun cerror-with-location (floc continue-string datum &rest arguments)
   "Report a continuable error with attached location information."
-  (my-cerror continue-string
+  (promiscuous-cerror continue-string
             (apply #'make-condition-with-location
                    'simple-error-with-location
                    floc datum arguments)))
 
-(export 'cerror*)
-(defun cerror* (datum &rest arguments)
-  (apply #'my-cerror "Continue" datum arguments))
-
 (export 'cerror*-with-location)
 (defun cerror*-with-location (floc datum &rest arguments)
   (apply #'cerror-with-location floc "Continue" datum arguments))
@@ -275,7 +218,7 @@ (defun cerror*-with-location (floc datum &rest arguments)
 ;;;--------------------------------------------------------------------------
 ;;; Stamping errors with location information.
 
-(let ((control-condition (make-instance 'condition)))
+(let ((control-condition (make-condition 'condition)))
   (defun with-default-error-location* (floc thunk)
     "Invoke THUNK in a dynamic environment which attaches FLOC to errors (and
      other conditions) which do not have file location information attached