src/parser/floc-proto.lisp, src/utilities.lisp: Move generic condition stuff.

[sod] / doc / SYMBOLS

diff --git a/doc/SYMBOLS b/doc/SYMBOLS
index 6f230a2..023bda6 100644 (file)
--- a/doc/SYMBOLS
+++ b/doc/SYMBOLS
@@ -1622,14 +1622,11 @@ Package `sod-parser'
 floc-proto.lisp
   base-lexer-error                              class
   base-syntax-error                             class
-  cerror*                                       function
   cerror*-with-location                         function
   cerror-with-location                          function
   classify-condition                            generic
   condition-with-location                       class
   count-and-report-errors                       macro
-  enclosed-condition                            generic
-  enclosing-condition                           class
   enclosing-condition-with-location             class
   enclosing-condition-with-location-type        generic
   enclosing-error-with-location                 class
@@ -1641,20 +1638,16 @@ floc-proto.lisp
   file-location-filename                        function
   file-location-line                            function
   file-location-p                               function
-  info                                          function
   info-with-location                            function
-  information                                   class
   information-with-location                     class
   make-condition-with-location                  function
   make-file-location                            function
-  noted                                         function
   parser-error                                  class
   parser-error-expected                         generic
   parser-error-found                            generic
   report-parser-error                           function
   simple-condition-with-location                class
   simple-error-with-location                    class
-  simple-information                            class
   simple-information-with-location              class
   simple-lexer-error                            class
   simple-syntax-error                           class
@@ -1794,9 +1787,9 @@ cl:t
   sb-pcl::slot-object
     cl:condition
       condition-with-location
-        enclosing-condition-with-location [enclosing-condition]
+        enclosing-condition-with-location [sod-utilities:enclosing-condition]
           enclosing-error-with-location [cl:error]
-          enclosing-information-with-location [information]
+          enclosing-information-with-location [sod-utilities:information]
           enclosing-warning-with-location [cl:warning]
         error-with-location [cl:error]
           base-lexer-error
@@ -1806,21 +1799,21 @@ cl:t
           simple-error-with-location [cl:simple-error]
             simple-lexer-error [base-lexer-error]
             simple-syntax-error [base-syntax-error]
-        information-with-location [information]
-          simple-information-with-location [simple-information]
+        information-with-location [sod-utilities:information]
+          simple-information-with-location [sod-utilities:simple-information]
         simple-condition-with-location [cl:simple-condition]
         warning-with-location [cl:warning]
           simple-warning-with-location [cl:simple-warning]
-      enclosing-condition
+      sod-utilities:enclosing-condition
         enclosing-condition-with-location [condition-with-location]
           enclosing-error-with-location [cl:error]
-          enclosing-information-with-location [information]
+          enclosing-information-with-location [sod-utilities:information]
           enclosing-warning-with-location [cl:warning]
-      information
+      sod-utilities:information
         enclosing-information-with-location [enclosing-condition-with-location]
         information-with-location [condition-with-location]
-          simple-information-with-location [simple-information]
-        simple-information [cl:simple-condition]
+          simple-information-with-location [sod-utilities:simple-information]
+        sod-utilities:simple-information [cl:simple-condition]
           simple-information-with-location [information-with-location]
       cl:serious-condition
         cl:error
@@ -1844,7 +1837,7 @@ cl:t
           simple-error-with-location [error-with-location]
             simple-lexer-error [base-lexer-error]
             simple-syntax-error [base-syntax-error]
-        simple-information [information]
+        sod-utilities:simple-information [sod-utilities:information]
           simple-information-with-location [information-with-location]
         cl:simple-warning [cl:warning]
           simple-warning-with-location [warning-with-location]
@@ -1961,14 +1954,12 @@ classify-condition
   cl:warning
   base-lexer-error
   base-syntax-error
-  information
-enclosed-condition
-  enclosing-condition
+  sod-utilities:information
 enclosing-condition-with-location-type
   cl:condition
   cl:error
   cl:warning
-  information
+  sod-utilities:information
 expand-parser-form
   t (eql cl:and) t
   t (eql cl:list) t
@@ -2299,6 +2290,7 @@ utilities.lisp
   awhen                                         macro
   backtrack-position                            function
   categorize                                    macro
+  cerror*                                       function
   compose                                       function
   copy-instance                                 function
   copy-instance-using-class                     generic
@@ -2309,12 +2301,16 @@ utilities.lisp
   designated-condition                          function
   distinguished-point-shortest-paths            function
   dosequence                                    macro
+  enclosed-condition                            generic
+  enclosing-condition                           class
   sb-mop:eql-specializer                        class
   sb-mop:eql-specializer-object                 generic
   find-duplicates                               function
   frob-identifier                               function
   sb-mop:generic-function-methods               generic setf
   inconsistent-merge-error                      class
+  info                                          function
+  information                                   class
   instance-initargs                             generic
   invoke-associated-restart                     function
   it
@@ -2331,12 +2327,15 @@ utilities.lisp
   merge-error-present-function                  generic
   merge-lists                                   function
   sb-mop:method-specializers                    generic
+  noted                                         function
   once-only                                     macro
   parse-body                                    function
   partial-order-minima                          function
   print-ugly-stuff                              function
+  promiscuous-cerror                            function
   ref                                           function setf
   simple-control-error                          class
+  simple-information                            class
   symbolicate                                   function
   update-position                               function
   whitespace-char-p                             function
@@ -2347,6 +2346,9 @@ Classes:
 cl:t
   sb-pcl::slot-object
     cl:condition
+      enclosing-condition
+      information
+        simple-information [cl:simple-condition]
       cl:serious-condition
         cl:error
           cl:control-error
@@ -2357,6 +2359,7 @@ cl:t
       cl:simple-condition
         cl:simple-error [cl:error]
           simple-control-error [cl:control-error]
+        simple-information [information]
     cl:standard-object
       sb-mop:metaobject
         sb-mop:specializer
@@ -2370,8 +2373,14 @@ cl:t
       loc
 
 Methods:
+sod-parser:classify-condition
+  information
 copy-instance-using-class
   cl:standard-class t
+enclosed-condition
+  enclosing-condition
+sod-parser:enclosing-condition-with-location-type
+  information
 sb-mop:eql-specializer-object
   sb-mop:eql-specializer
 sb-mop:generic-function-methods