From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 26 Mar 2017 09:16:34 +0000 (+0100)
Subject: doc/list-exports.lisp, doc/SYMBOLS: Mark methods with their qualifiers.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/4b0283c7c4fa6d5491cd5c64f9c697cee992d145?hp=d610d8beaab27c822bd69bb857c3630b6a743b97

doc/list-exports.lisp, doc/SYMBOLS: Mark methods with their qualifiers.
---

diff --git a/doc/SYMBOLS b/doc/SYMBOLS
index 85750bd..af3584e 100644
--- a/doc/SYMBOLS
+++ b/doc/SYMBOLS
@@ -761,18 +761,18 @@ c-type-class
 (setf c-type-class)
   t c-class-type
 c-type-equal-p
-  t t
-  c-array-type c-array-type
-  c-atomic-type c-atomic-type
-  c-class-type c-class-type
-  c-function-type c-function-type
-  c-keyword-function-type c-keyword-function-type
-  c-pointer-type c-pointer-type
-  c-storage-specifiers-type c-type
-  c-type c-storage-specifiers-type
-  qualifiable-c-type qualifiable-c-type
-  simple-c-type simple-c-type
-  tagged-c-type tagged-c-type
+  t t [and]
+  c-array-type c-array-type [and]
+  c-atomic-type c-atomic-type [and]
+  c-class-type c-class-type [and]
+  c-function-type c-function-type [and]
+  c-keyword-function-type c-keyword-function-type [and]
+  c-pointer-type c-pointer-type [and]
+  c-storage-specifiers-type c-type [:around]
+  c-type c-storage-specifiers-type [:around]
+  qualifiable-c-type qualifiable-c-type [and]
+  simple-c-type simple-c-type [and]
+  tagged-c-type tagged-c-type [and]
 c-type-name
   simple-c-type
 c-type-qualifiers
@@ -874,7 +874,7 @@ compute-chains
 compute-cpl
   sod-class
 compute-effective-method-body
-  basic-effective-method t t
+  basic-effective-method t t [:around]
   simple-effective-method t t
 compute-effective-methods
   sod-class
@@ -889,7 +889,7 @@ compute-islots
   sod-class sod-class
 compute-method-entry-functions
   basic-effective-method
-  effective-method
+  effective-method [:around]
 compute-sod-effective-method
   sod-message sod-class
 compute-vtable
@@ -1081,47 +1081,47 @@ format-temporary-name
 guess-metaclass
   sod-class
 hook-output
-  t t t
-  base-offset (eql :c) t
-  base-offset (eql :h) t
-  basic-effective-method (eql :c) t
-  chain-offset (eql :c) t
-  chain-offset (eql :h) t
-  class-pointer (eql :c) t
-  class-pointer (eql :h) t
-  code-fragment-item t t
-  delegating-direct-method (eql :c) t
-  effective-slot (eql cl:class) t
-  ichain (eql :h) t
-  ichain (eql cl:class) t
-  ichain (eql ilayout) t
-  ichain t t
-  ilayout (eql :h) t
-  ilayout t t
-  islots (eql :h) t
-  islots (eql cl:class) t
-  islots t t
-  method-entry (eql :c) t
-  method-entry (eql vtmsgs) t
-  module (eql :c) t
-  module (eql :h) t
-  module t t
-  sod-class (eql :c) t
-  sod-class (eql :h) t
-  sod-class t t
-  sod-class-effective-slot (eql cl:class) t
-  sod-method (eql :c) t
-  sod-method (eql :h) t
-  sod-slot (eql islots) t
-  vtable (eql :c) t
-  vtable (eql :h) t
-  vtable t t
-  vtable-pointer (eql :h) t
-  vtable-pointer (eql cl:class) t
-  vtmsgs (eql :c) t
-  vtmsgs (eql :h) t
-  vtmsgs (eql vtmsgs) t
-  vtmsgs t t
+  t t t [progn]
+  base-offset (eql :c) t [progn]
+  base-offset (eql :h) t [progn]
+  basic-effective-method (eql :c) t [progn]
+  chain-offset (eql :c) t [progn]
+  chain-offset (eql :h) t [progn]
+  class-pointer (eql :c) t [progn]
+  class-pointer (eql :h) t [progn]
+  code-fragment-item t t [progn]
+  delegating-direct-method (eql :c) t [progn]
+  effective-slot (eql cl:class) t [progn]
+  ichain (eql :h) t [progn]
+  ichain (eql cl:class) t [progn]
+  ichain (eql ilayout) t [progn]
+  ichain t t [progn]
+  ilayout (eql :h) t [progn]
+  ilayout t t [progn]
+  islots (eql :h) t [progn]
+  islots (eql cl:class) t [progn]
+  islots t t [progn]
+  method-entry (eql :c) t [progn]
+  method-entry (eql vtmsgs) t [progn]
+  module (eql :c) t [progn]
+  module (eql :h) t [progn]
+  module t t [progn]
+  sod-class (eql :c) t [progn]
+  sod-class (eql :h) t [progn]
+  sod-class t t [progn]
+  sod-class-effective-slot (eql cl:class) t [progn]
+  sod-method (eql :c) t [progn]
+  sod-method (eql :h) t [progn]
+  sod-slot (eql islots) t [progn]
+  vtable (eql :c) t [progn]
+  vtable (eql :h) t [progn]
+  vtable t t [progn]
+  vtable-pointer (eql :h) t [progn]
+  vtable-pointer (eql cl:class) t [progn]
+  vtmsgs (eql :c) t [progn]
+  vtmsgs (eql :h) t [progn]
+  vtmsgs (eql vtmsgs) t [progn]
+  vtmsgs t t [progn]
 ichain-body
   ichain
 ichain-class
@@ -1296,7 +1296,7 @@ pprint-c-storage-specifier
   cl:symbol t
   alignas-storage-specifier t
 pprint-c-type
-  t t t
+  t t t [:around]
   c-array-type t t
   c-atomic-type t t
   c-function-type t t
@@ -1375,22 +1375,22 @@ sequencer-constraints
 sequencer-table
   sequencer
 cl:shared-initialize
-  aggregating-message t
-  basic-direct-method t
-  c-function-type t
-  c-keyword-function-type t
-  effective-method t
-  method-codegen t
-  module t
+  aggregating-message t [:before]
+  basic-direct-method t [:after]
+  c-function-type t [:after]
+  c-keyword-function-type t [:after]
+  effective-method t [:after]
+  method-codegen t [:after]
+  module t [:after]
   sequencer t
-  simple-effective-method t
-  sod-class t
-  sod-class-slot t
-  sod-initializer t
-  sod-message t
-  sod-method t
-  sod-slot t
-  sod-token-scanner t
+  simple-effective-method t [:after]
+  sod-class t [:after]
+  sod-class-slot t [:after]
+  sod-initializer t [:after]
+  sod-message t [:after]
+  sod-method t [:after]
+  sod-slot t [:after]
+  sod-token-scanner t [:after]
 simple-method-body
   aggregating-effective-method t t
   sod::lifecycle-effective-method t t
@@ -1946,7 +1946,7 @@ cl:print-object
 push-operator
   t sod-parser::expression-parse-state
   close-parenthesis sod-parser::expression-parse-state
-  open-parenthesis sod-parser::expression-parse-state
+  open-parenthesis sod-parser::expression-parse-state [:after]
   prefix-operator sod-parser::expression-parse-state
 push-value
   t sod-parser::expression-parse-state
@@ -2002,9 +2002,9 @@ scanner-token
 scanner-unread
   charbuf-scanner t
 cl:shared-initialize
-  charbuf-scanner t
-  simple-binary-operator t
-  token-scanner t
+  charbuf-scanner t [:after]
+  simple-binary-operator t [:after]
+  token-scanner t [:after]
 sb-gray:stream-line-column
   position-aware-output-stream
 stream-pathname
diff --git a/doc/list-exports.lisp b/doc/list-exports.lisp
index 240ecc2..eb87d16 100755
--- a/doc/list-exports.lisp
+++ b/doc/list-exports.lisp
@@ -360,7 +360,7 @@ (defun analyse-generic-functions (package)
 				#'order-specializers
 				:key #'method-specializers))
 	    (when (gethash method methods)
-	      (format t "~2T~{~A~^ ~}~%"
+	      (format t "~2T~{~A~^ ~}~@[ [~{~(~S~)~^ ~}]~]~%"
 		      (mapcar
 		       (lambda (spec)
 			 (etypecase spec
@@ -374,7 +374,8 @@ (defun analyse-generic-functions (package)
 				      (if (symbolp obj)
 					  (pretty-symbol-name obj package)
 					  obj))))))
-		       (method-specializers method))))))))))
+		       (method-specializers method))
+		      (method-qualifiers method)))))))))
 
 (defun check-slot-names (package)
   (setf package (find-package package))