X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/17c7c784e0632dff2f93a69a837585fd6f31f4a1..4c35de3a0467a4cab5ec7a0d76f99de764ddc316:/doc/meta.tex

diff --git a/doc/meta.tex b/doc/meta.tex
index 25bed34..1ca5444 100644
--- a/doc/meta.tex
+++ b/doc/meta.tex
@@ -62,7 +62,7 @@
 \end{describe*}
 
 \begin{describe}{fun}
-    {make-sod-class @<name> @<superclasses> @<pset> \&optional @<floc>
+    {make-sod-class @<name> @<superclasses> @<pset> \&key :location
       @> @<class>}
 \end{describe}
 
@@ -93,6 +93,16 @@
 \end{describe}
 
 \begin{describe}{fun}
+    {select-minimal-class-property
+        \=@<supers> @<key> @<order> @<default> @<what> \\
+        \>\&key :present :allow-empty
+      \nlret @<object>}
+\end{describe}
+
+\begin{describe}{gf}{guess-metaclass @<class> @> @<metaclass>}
+\end{describe}
+
+\begin{describe}{fun}
     {sod-subclass-p @<class-a> @<class-b> @> @<generalized-boolean>}
 \end{describe}
 
@@ -115,7 +125,7 @@
 \end{describe*}
 
 \begin{describe}{gf}
-    {make-sod-slot @<class> @<name> @<type> @<pset> \&optional @<floc>
+    {make-sod-slot @<class> @<name> @<type> @<pset> \&key :location
       @> @<slot>}
 \end{describe}
 
@@ -128,11 +138,6 @@
         @> @<slot>}}
 \end{describe*}
 
-\begin{describe}{fun}
-    {find-instance-slot-by-name @<class> @<super-nick> @<slot-name>
-      @> @<slot>}
-\end{describe}
-
 \begin{describe}{cls}
     {sod-class-slot (sod-slot)                                  \\ \ind
       \&key :name :location :pset :class :type
@@ -146,11 +151,11 @@
 
 \begin{describe*}
     {\dhead{cls}{sod-initializer ()
-       \&key :slot :location :class :value}
+                  \&key :slot :location :class :value}
      \dhead{cls}{sod-instance-initializer (sod-initializer)
-       \&key :slot :location :class :value}
+                  \&key :slot :location :class :value}
      \dhead{cls}{sod-class-initializer (sod-initializer)
-       \&key :slot :location :class :value}}
+                  \&key :slot :location :class :value}}
 \end{describe*}
 
 \begin{describe*}
@@ -160,18 +165,19 @@
 
 \begin{describe*}
     {\dhead{gf}
-      {make-slot-instance-initializer
-          \=@<class> @<nick> @<name> @<value> @<pset> \&optional @<floc>
+      {make-sod-instance-initializer
+          \=@<class> @<nick> @<name> @<value> @<pset> \\
+          \>\&key :inhibit-initargs :location
         \nlret @<init>}
      \dhead{gf}
-      {make-slot-class-initializer
-          \=@<class> @<nick> @<name> @<value> @<pset> \&optional @<floc>
+      {make-sod-class-initializer
+          \=@<class> @<nick> @<name> @<value> @<pset> \&key :location
         \nlret @<init>}}
 \end{describe*}
 
 \begin{describe}{gf}
     {make-sod-initializer-using-slot
-        \=@<class> @<slot> @<init-class> @<value> @<pset> \&optional @<floc>
+        @<class> @<slot> @<init-class> @<value> @<pset> @<floc>
       \nlret @<init>}
 \end{describe}
 
@@ -191,7 +197,7 @@
 
 \begin{describe}{gf}
      {make-sod-user-initarg @<class> @<name> @<type> @<pset>
-                            \&optional @<default> @<floc>}
+                            \&key :default :location}
 \end{describe}
 
 \begin{describe}{gf}{sod-initarg-default @<initarg> @> @<default>}
@@ -207,24 +213,19 @@
 
 \begin{describe}{gf}
     {make-sod-slot-initarg @<class> @<name> @<nick> @<slot-name> @<pset>
-                           \&optional @<floc>}
-\end{describe}
-
-\begin{describe}{gf}
-    {make-sod-slot-initarg @<class> @<name> @<nick> @<slot-name> @<pset>
-                           \&optional @<floc>}
+                           \&key :location}
 \end{describe}
 
 \begin{describe}{gf}
     {make-sod-slot-initarg-using-slot @<class> @<name> @<slot> @<pset>
-                                      \&optional @<floc>}
+                                      \&key :location}
 \end{describe}
 
 \begin{describe*}
     {\dhead{gf}{make-sod-class-initfrag @<class> @<frag> @<pset>
-                                        \&optional @<floc>}
+                                        \&key :location}
      \dhead{gf}{make-sod-class-tearfrag @<class> @<frag> @<pset>
-                                        \&optional @<floc>}}
+                                        \&key :location}}
 \end{describe*}
 
 \begin{describe}{cls}{sod-message () \&key :name :location :class :type}
@@ -237,7 +238,7 @@
 \end{describe*}
 
 \begin{describe}{gf}
-    {make-sod-message @<class> @<name> @<type> @<pset> \&optional @<floc>
+    {make-sod-message @<class> @<name> @<type> @<pset> \&key :location
       @> @<message>}
 \end{describe}
 
@@ -263,7 +264,7 @@
 \begin{describe}{gf}
     {make-sod-method
         \=@<class> @<nick> @<name> @<type> @<body>            \+\\
-          @<pset> \&optional @<floc>                          \-
+          @<pset> \&key :location                             \-
       \nlret @<method>}
 \end{describe}
 
@@ -271,7 +272,7 @@
     {make-sod-method-using-message
         \=@<message> @<class>
           @<type> @<body>                                     \+\\
-          @<pset> \&optional @<floc>                          \-
+          @<pset> \&key :location                             \-
       \nlret @<method>}
 \end{describe}
 
@@ -301,6 +302,16 @@
 %%%--------------------------------------------------------------------------
 \section{Class finalization protocol} \label{sec:meta.finalization}
 
+\begin{describe}{mac}
+    {finalization-error (@<token> @<arg>^*) \\ \ind
+      @<declaration>^* \\
+      @<form>^* \-
+     \nlret @<value>^*}
+\end{describe}
+
+\begin{describe}{fun}{finalization-failed}
+\end{describe}
+
 \begin{describe*}
     {\dhead{gf}{sod-class-precedence-list @<class> @> @<list>}
      \dhead{gf}{sod-class-type @<class> @> @<c-type>}
@@ -313,19 +324,36 @@
 \begin{describe}{gf}{compute-cpl @<class> @> @<list>}
 \end{describe}
 
-\begin{describe}{fun}{merge-class-lists @<lists> @<pick> @> @<list>}
+\begin{describe}{fun}
+    {report-class-list-merge-error @<class> @<lists> @<error>}
+\end{describe}
+
+\begin{describe}{fun}{merge-class-lists @<class> @<lists> @<pick> @> @<list>}
 \end{describe}
 
 \begin{describe}{gf}{compute-chains @<class> @> @<list>}
 \end{describe}
 
-\begin{describe}{gf}{guess-metaclass @<class> @> @<metaclass>}
+\begin{describe}{gf}{check-class-initializer @<slot> @<class>}
+  \begin{describe}{meth}{effective-slot,sod-class}
+      {check-class-initializer (@<slot> effective-slot) (@<class> sod-class)}
+  \end{describe}
+  \begin{describe}{meth}{sod-class-effective-slot,sod-class}
+      {check-class-initializer (@<slot> sod-class-effective-slot)
+                               (@<class> sod-class)}
+  \end{describe}
 \end{describe}
 
 \begin{describe}{gf}{check-sod-class @<class>}
 \end{describe}
 
-\begin{describe}{gf}{finalize-sod-class @<class>}
+\begin{describe}{gf}{finalize-sod-class @<class> @> @<generalized-boolean>}
+  \begin{describe}{meth}{sod-class}
+      {finalize-sod-class (@<class> sod-class)}
+  \end{describe}
+  \begin{describe}{ar-meth}{sod-class}
+      {finalize-sod-class (@<class> sod-class) @> @<generalized-boolean>}
+  \end{describe}
 \end{describe}
 
 \begin{describe}{fun}{clos-cpl @<class> @> @<list>}