Permalink
Browse files

Edits to formatter, defclass, and the caption of the types figure

  • Loading branch information...
1 parent 4be72d4 commit 42624410f7eeb34b6048b0d015678028d2832ed7 @trebb committed Jun 20, 2012
Showing with 13 additions and 10 deletions.
  1. +8 −7 clqr-input-output.tex
  2. +5 −3 clqr-types-and-classes.tex
View
@@ -713,9 +713,9 @@ \subsection{Format}
\IT{(\MC*{FORMATTER} \NEV{\VAR{control}})}
{
- Return \retval{function} of stream and a \kwd{\&rest} argument applying \FU{format} to
- stream, \VAR{control}, and the \kwd{\&rest} argument
- returning \NIL\ or any excess arguments.
+ Return \retval{function} of \VAR{stream} and \OPn{\VAR{arg}}
+ applying \FU{format} to \VAR{stream}, \VAR{control}, and
+ \OPn{\VAR{arg}} returning \NIL\ or any excess \VAR{arg}s.
}
\IT{(\FU*{FORMAT} \Goo{\T\XOR\NIL\XOR\VAR{out-string}\XOR\VAR{out-stream}}
@@ -724,10 +724,11 @@ \subsection{Format}
Output string \VAR{control} which may
contain \kwd{\TLD} directives possibly taking some
\VAR{arg}s. Alternatively, \VAR{control} can be a function returned
- by \MC{formatter} which is then applied to \VAR{out-stream} and \OPn{\VAR{arg}}.
- Output to \VAR{out-string}, \VAR{out-stream} or, if first
- argument is \T, to \V{\A standard-output\A}. Return \retval{\NIL}. If
- first argument is \NIL, return \retval{formatted output}.
+ by \MC{formatter} which is then applied to \VAR{out-stream} and
+ \OPn{\VAR{arg}}. Output to \VAR{out-string}, \VAR{out-stream} or,
+ if first argument is \T, to \V{\A standard-output\A}. Return
+ \retval{\NIL}. If first argument is \NIL, return
+ \retval{formatted output}.
}
\begin{LIST}{.5cm}
@@ -22,7 +22,8 @@ \section{Types and Classes}
Classes (\includegraphics{clqr-types-and-classes.4}),
Types (\includegraphics{clqr-types-and-classes.2}), and
Condition Types
- (\includegraphics{clqr-types-and-classes.5}).
+ (\includegraphics{clqr-types-and-classes.5}).\\
+ Every type is also the supertype of \NIL, the empty type.
\label{data-types}%
%
\index{*@\A}%
@@ -208,9 +209,10 @@ \section{Types and Classes}
\PROGN{\VAR{form}})}
{
Define type \retval{\VAR{foo}} which when referenced as (\VAR{foo}
- \OPn{\NEV{\VAR{arg}}}) applies expanded \VAR{form}s to \VAR{arg}s
+ \OPn{\NEV{\VAR{arg}}}) (or as \VAR{foo} if \VAR{macro-$\lambda$}
+ doesn't contain any required parameters) applies expanded \VAR{form}s to \VAR{arg}s
returning the new type. For (\OPn{\VAR{macro-$\lambda$}}) see
- p.~\pageref{section:Macros} but with default value of \kwd{\A}
+ page \pageref{section:Macros} but with default value of \kwd{\A}
instead of \NIL. \VAR{form}s are enclosed in an implicit \SO{block}
named \VAR{foo}.
}

0 comments on commit 4262441

Please sign in to comment.