src/parser/floc-proto.lisp: Add `enclosing-condition-with-location-type'.

[sod] / doc / misc.tex

diff --git a/doc/misc.tex b/doc/misc.tex
index 16337a9..ae1fd2b 100644 (file)
--- a/doc/misc.tex
+++ b/doc/misc.tex
@@ -76,6 +76,9 @@ These symbols are defined in the @|sod-utilities| package.
 \begin{describe}{mac}{aif @<condition> @<consequent> @[@<alt>@]}
 \end{describe}
 
+\begin{describe}{mac}{aand @<form>^*}
+\end{describe}
+
 \begin{describe}{mac}{awhen @<condition> @<form>^*}
 \end{describe}
 
@@ -133,7 +136,7 @@ These symbols are defined in the @|sod-utilities| package.
 \end{describe}
 
 \begin{describe}{fun}
-    {merge-lists @<lists> \&key :pick (:test \#'eql) @> @<list>}
+    {merge-lists @<lists> \&key :pick (:test \#'eql) :present @> @<list>}
 \end{describe}
 
 \begin{describe}{mac}
@@ -520,6 +523,11 @@ These symbols are defined in the @!optparse| package.
 \end{describe}
 
 \begin{describe}{fun}
+    {parse-property @<scanner> @<pset>
+      @> @<result> @<success-flag> @<consumed-flag>}
+\end{describe}
+
+\begin{describe}{fun}
     {parse-property-set @<scanner>
       @> @<result> @<success-flag> @<consumed-flag>}
 \end{describe}
@@ -542,8 +550,8 @@ These symbols are defined in the @!optparse| package.
 \end{describe}
 
 \begin{describe}{mac}
-    {test-parser (@<scanner>) @<parser> @<input>
-      @> @<success-flag> @<result> @<remainder>}
+    {test-parser (@<scanner> \&key :backtrace) @<parser> @<input>
+      @> @<result> @<status> @<remainder>}
 \end{describe}
 
 \begin{describe}{fun}{exercise}