Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Typo fixes and minor changes in several places.

  • Loading branch information...
commit babe43629c2fc550b402c7d804750c6714726032 1 parent 8ca4f94
@trebb authored
View
76 clqr-conditions-and-errors.tex
@@ -102,46 +102,48 @@ \section{Conditions and Errors}
\VAR{type}\text{ } \Goos{\kwd{:}\VAR{initarg-name} \VAR{value}}\\
\VAR{control}\text{ } \OPn{\VAR{arg}}}{\}}}})}
{
- If \VAR{test}, which may depend on \VAR{place}s, returns \NIL,
- signal as correctable \kwd{error} \VAR{condition} or a new condition
- of \VAR{type} or, with \FU{format} \VAR{control} and \VAR{arg}s (see
- p.\ \pageref{section:Format}), \kwd{error}. When using the
- debugger's continue option, \VAR{place}s can be altered before
- re-evaluation of \VAR{test}. Return \retval{\NIL}.
+ If \VAR{test}, which may depend on \VAR{place}s, returns \NIL,
+ signal as correctable \kwd{error} \VAR{condition} or a new condition
+ of \VAR{type} or, with \FU{format} \VAR{control} and \VAR{arg}s (see
+ p.\ \pageref{section:Format}), \kwd{error}. When using the
+ debugger's continue option, \VAR{place}s can be altered before
+ re-evaluation of \VAR{test}. Return \retval{\NIL}.
}
- \IT{(\MC*{HANDLER-CASE} \VAR{test}
+ \IT{(\MC*{HANDLER-CASE} \VAR{foo}
\OPn{(\VAR{type} (\Op{\VAR{var}})
- \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})} \PROGN{\VAR{condition-form}})}
- \Op{(\kwd{:no-error} (\OPn{\VAR{ord-$\lambda$}}) \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})}
+ \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})}
+ \PROGN{\VAR{condition-form}})}
+ \Op{(\kwd{:no-error} (\OPn{\VAR{ord-$\lambda$}})
+ \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})}
\PROGN{\VAR{form}})})}
{
- If, on evaluation of \VAR{test}, a condition of \VAR{type} is
- signalled, evaluate matching \VAR{condition-form}s
- with \VAR{var} bound to the condition, and return \retval{their
- values}. Without a condition, bind \VAR{ord-$\lambda$}s to values
- of \VAR{test} and return \retval{values of \VAR{form}s} or, without
- a \kwd{:no-error} clause, return \retval{values of \VAR{test}}. See
- p.\ \pageref{section:Functions} for (\OPn{\VAR{ord-$\lambda$}}).
+ If, on evaluation of \VAR{foo}, a condition of \VAR{type} is
+ signalled, evaluate matching \VAR{condition-form}s with \VAR{var}
+ bound to the condition, and return \retval{their values}. Without
+ a condition, bind \VAR{ord-$\lambda$}s to values of \VAR{foo} and
+ return \retval{values of \VAR{form}s} or, without a
+ \kwd{:no-error} clause, return \retval{values of \VAR{foo}}. See
+ p.\ \pageref{section:Functions} for (\OPn{\VAR{ord-$\lambda$}}).
}
\IT{(\MC*{HANDLER-BIND} (\OPn{(\VAR{condition-type}
\VAR{handler-function})}) \PROGN{\VAR{form}})}
{
- Return \retval{values of \VAR{form}s} after evaluating them with
- \VAR{condition-type}s dynamically bound to their respective
- \VAR{handler-function}s of argument condition.
+ Return \retval{values of \VAR{form}s} after evaluating them with
+ \VAR{condition-type}s dynamically bound to their respective
+ \VAR{handler-function}s of argument condition.
}
\IT{(\MC*{WITH-SIMPLE-RESTART} (\xorGOO{\VAR{restart}\\
\NIL}{\}} \VAR{control}
\OPn{\VAR{arg}}) \PROGN{\VAR{form}})}
{
- Return \retval{values of \VAR{form}s} unless \VAR{restart} is called
- during their evaluation. In this case, describe restart using
- \FU{format} \VAR{control} and \VAR{arg}s (see
- p.\ \pageref{section:Format}) and return \retval{\NIL}
- and \retvalii{\T}.
+ Return \retval{values of \VAR{form}s} unless \VAR{restart} is called
+ during their evaluation. In this case, describe restart using
+ \FU{format} \VAR{control} and \VAR{arg}s (see
+ p.\ \pageref{section:Format}) and return \retval{\NIL}
+ and \retvalii{\T}.
}
\IT{(\MC*{RESTART-CASE} \VAR{form} \OPn{(\VAR{foo}
@@ -154,16 +156,18 @@ \section{Conditions and Errors}
\OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})}
\PROGN{\VAR{restart-form}})})}
{
- Evaluate \VAR{form} with dynamically established restarts \VAR{foo}. Return
- \retval{values of \VAR{form}} or, if by (\FU{invoke-restart}
- \VAR{foo} \OPn{\VAR{arg}}) one restart \VAR{foo} is called, use
- \VAR{string} or \VAR{report-function} (of a stream) to print a
- description of restart \VAR{foo} and
- return the \retval{values of its \VAR{restart-form}s}.
- \VAR{arg-function} supplies appropriate \VAR{arg}s if \VAR{foo} is
- called by \FU{invoke-restart-interactively}. If (\VAR{test-function} \VAR{condition})
- returns \T, \VAR{foo} is made visible under \VAR{condition}.
- For (\OPn{\VAR{ord-$\lambda$}}) see p.\ \pageref{section:Functions}.
+ Evaluate \VAR{form} with dynamically established restarts
+ \VAR{foo}. Return \retval{values of \VAR{form}} or, if by
+ (\FU{invoke-restart} \VAR{foo} \OPn{\VAR{arg}}) one restart
+ \VAR{foo} is called, use \VAR{string} or \VAR{report-function} (of
+ a stream) to print a description of restart \VAR{foo} and return
+ the \retval{values of its \VAR{restart-form}s}. \VAR{arg-function}
+ supplies appropriate \VAR{arg}s if \VAR{foo} is called by
+ \FU{invoke-restart-interactively}. If (\VAR{test-function}
+ \VAR{condition}) returns \T, \VAR{foo} is made visible under
+ \VAR{condition}. \OPn{\VAR{arg}} matches
+ (\OPn{\VAR{ord-$\lambda$}}); see p.\ \pageref{section:Functions}
+ for the latter.
}
\IT{(\MC*{RESTART-BIND} (\OPn{(\xorGOO{\NEV{\VAR{restart}}\\
@@ -173,8 +177,8 @@ \section{Conditions and Errors}
\kwd{:report-function} \VAR{ function}\\
\kwd{:test-function} \VAR{ function}}{\}})}) \PROGN{\VAR{form}})}
{
- Return \retval{values of \VAR{form}s} evaluated with \VAR{restart}s
- dynamically bound to \VAR{restart-function}s.
+ Return \retval{values of \VAR{form}s} evaluated with
+ \VAR{restart}s dynamically bound to \VAR{restart-function}s.
}
\IT{\arrGOO{(\FU*{INVOKE-RESTART} \VAR{ restart} \OPn{\VAR{ arg}})\\
View
10 clqr-control-structure.tex
@@ -50,7 +50,7 @@ \subsection{Predicates}
\IT{(\FU*{NOT} \VAR{foo})}
{
- \retval{\T} if \VAR{foo} is \NIL, \retval{\NIL} otherwise.
+ \retval{\T} if \VAR{foo} is \NIL; \retval{\NIL} otherwise.
}
\IT{(\FU*{BOUNDP} \VAR{symbol})}
@@ -677,12 +677,12 @@ \subsection{Control Flow}
\IT{(\xorGOO{\MC*{PROG}\\
\MC*{PROG\A}}{\}}
(\orGOO{%
- \VAR{var}\\
- (\VAR{var } \Op{\VAR{value}\DF{\NIL}})}{\}^{\!\!*}})
+ \VAR{name}\\
+ (\VAR{name } \Op{\VAR{value}\DF{\NIL}})}{\}^{\!\!*}})
\OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})}
\xorGOO{\NEV{\VAR{tag}}\\\VAR{form}}{\}^{\!\!*}})}
{
- Evaluate \SO{TAGBODY}-like body with \VAR{var}s locally bound (in
+ Evaluate \SO{TAGBODY}-like body with \VAR{name}s lexically bound (in
parallel or sequentially, respectively) to \VAR{value}s. Return
\retval{\NIL} or explicitly \retval{\MC{return}ed values}.
Implicitly, the whole form is a \SO{block} named \NIL.
@@ -1172,7 +1172,7 @@ \subsection{Loop Facility}
\IT{\LKWD*{=} \VAR{foo} \Op{\LKWD*{then}
\VAR{bar}\DF{\VAR{foo}}}}
{
- Bind \VAR{var} in first iteration to \VAR{foo} and later to
+ Bind \VAR{var} initially to \VAR{foo} and later to
\VAR{bar}.
}
View
38 clqr-external-environment.tex
@@ -1,4 +1,4 @@
-% Copyright (C) 2008 Bert Burgemeister
+% Copyright (C) 2008, 2010 Bert Burgemeister
%
% Permission is granted to copy, distribute and/or modify this
% document under the terms of the GNU Free Documentation License,
@@ -15,13 +15,13 @@ \section{External Environment}
\IT{\arrGOO{(\FU*{GET-INTERNAL-REAL-TIME})\\
(\FU*{GET-INTERNAL-RUN-TIME})}{.}}
{
- \retval{Current time}, or \retval{computing time},
- respectively, in clock ticks.
+ \retval{Current time}, or \retval{computing time},
+ respectively, in clock ticks.
}
\IT{\CNS*{INTERNAL-TIME-UNITS-PER-SECOND}}
{
- Number of clock ticks per second.
+ Number of clock ticks per second.
}
\IT{\arrGOO{(\FU*{ENCODE-UNIVERSAL-TIME} \VAR{ sec} \VAR{ min}
@@ -29,27 +29,27 @@ \section{External Environment}
\Op{\VAR{zone}\DF{curr}})\\
(\FU*{GET-UNIVERSAL-TIME})}{.}}
{
- \retval{Seconds from 1900-01-01, 00:00}.
+ \retval{Seconds from 1900-01-01, 00:00}, ignoring leap seconds.
}
\IT{\arrGOO{(\FU*{DECODE-UNIVERSAL-TIME} \VAR{ universal-time }
\Op{\VAR{time-zone}\DF{current}})\\
(\FU*{GET-DECODED-TIME})}{.}}
{
- Return \retval{second}, \retvalii{minute}, \retvaliii{hour},
- \retvaln{4}{date}, \retvaln{5}{month}, \retvaln{6}{year}, \retvaln{7}{day},
- \retvaln{8}{daylight-p}, and \retvaln{9}{zone}.
+ Return \retval{second}, \retvalii{minute}, \retvaliii{hour},
+ \retvaln{4}{date}, \retvaln{5}{month}, \retvaln{6}{year},
+ \retvaln{7}{day}, \retvaln{8}{daylight-p}, and \retvaln{9}{zone}.
}
\IT{(\FU*{ROOM} \Op{\Goo{\NIL\XOR\kwd{:default}\XOR\T}})}
{
- Print information about internal storage management.
+ Print information about internal storage management.
}
\IT{\arrGOO{(\FU*{SHORT-SITE-NAME})\\
(\FU*{LONG-SITE-NAME})}{.}}
{
- \retval{String} representing physical location of computer.
+ \retval{String} representing physical location of computer.
}
\IT{(\xorGOO{\FU{LISP-IMPLEMENTATION}\\
@@ -58,19 +58,19 @@ \section{External Environment}
\xorGOO{\kwd{TYPE}\\
\kwd{VERSION}}{\}})}
{
- \index{LISP-IMPLEMENTATION-TYPE}%
- \index{LISP-IMPLEMENTATION-VERSION}%
- \index{SOFTWARE-TYPE}%
- \index{SOFTWARE-VERSION}%
- \index{MACHINE-TYPE}%
- \index{MACHINE-VERSION}%
- \retval{Name} or \retval{version} of implementation, operating
- system, or hardware, respectively.
+ \index{LISP-IMPLEMENTATION-TYPE}%
+ \index{LISP-IMPLEMENTATION-VERSION}%
+ \index{SOFTWARE-TYPE}%
+ \index{SOFTWARE-VERSION}%
+ \index{MACHINE-TYPE}%
+ \index{MACHINE-VERSION}%
+ \retval{Name} or \retval{version} of implementation, operating
+ system, or hardware, respectively.
}
\IT{(\FU*{MACHINE-INSTANCE})}
{
- \retval{Computer name}.
+ \retval{Computer name}.
}
\end{LIST}
View
35 clqr-input-output.tex
@@ -125,7 +125,7 @@ \subsection{Reader}
{
Next, or if \VAR{mode} is \T, next non-whitespace
\retval{character}, or if \VAR{mode} is a character, \retval{next instance}
- of it, from stream without removing it there.
+ of it, from \VAR{stream} without removing it there.
}
\IT{(\FU*{UNREAD-CHAR} \VAR{character}
@@ -246,28 +246,28 @@ \subsection{Character Syntax}
\KWD{\#\boldmath$|$ }\OPn{\VAR{multi-line-comment}}\KWD{ \boldmath$|$\#}\\
\KWD*{; }\OPn{\VAR{one-line-comment}}}{.}}
{\index{\#{$"|$} {$"|$}\#}
- Comments. There are conventions:
+ Comments. There are conventions:
}
\begin{LIST}{.5cm}
\IT{\KWD{;;;;} \VAR{title}\qquad\qquad}
{Short title for a block of code.}
-
+
\IT{\KWD{;;;} \VAR{intro}\qquad\qquad}
{Description before a block of code.}
-
+
\IT{\KWD{;;} \VAR{state}\qquad\qquad}
{State of program or of following code.}
-
+
\IT{\KWD{;} \VAR{explanation}}
{Regarding line on which it appears.}
-
+
\end{LIST}
-
+
\IT{\KWD*{(}\OPn{\VAR{foo}}\Op{ \KWD*{.} \VAR{bar}\DF{\NIL}}\KWD*{)}}
{
List of \VAR{foo}s with the terminating cdr \VAR{bar}.
}
-
+
\IT{\KWD{"}\qquad\qquad}
{\index{""}
Begin and end of a string.
@@ -289,7 +289,7 @@ \subsection{Character Syntax}
\IT{\KWD{\#\boldmath{$\backslash$}}\VAR{c}}
{
- (\FU*{character} \LIT{"}\VAR{c}\LIT{"}), the character \VAR{c}.
+ (\FU*{character} \LIT{"}\VAR{c}\LIT{"}), the character \VAR{c}.
}
\index{\#@\#$\backslash$}%
@@ -383,7 +383,7 @@ \subsection{Character Syntax}
{\index{\#<@\#$<$}%
Have the reader signal \kwd{reader-error}.
}
-
+
\IT{\arrGOO{\KWD*{\#+}\VAR{feature } \VAR{when-feature}\\
\KWD*{\#--}\VAR{feature } \VAR{unless-feature}}{.}}
{
@@ -399,11 +399,12 @@ \subsection{Character Syntax}
}
\IT{\kwd{\boldmath$|$}\OPn{\VAR{c}}\kwd{\boldmath$|$};
- \kwd{\boldmath$\backslash$}\VAR{c}}
- {\index{\@{$\backslash$}}\index{{$"|$} {$"|$}}%
+ \kwd{\boldmath$\backslash$}\VAR{c}}
+ {
+ \index{{$"|$} {$"|$}}%
Treat arbitrary character(s) \VAR{c} as alphabetic preserving case.
}
-
+ \index{\@{$\backslash$}}%
\end{LIST}
@@ -879,8 +880,8 @@ \subsection{Format}
\OP{\KWD{,}\Op{\VAR{min-pad}\DF{\LIT{0}}}
\OP{\KWD{,}\VAR{pad-char}\DF{\kwd{'}\textvisiblespace}}}}
\KWD{\Op{:} \Op{@} \boldmath{$<$}}
- \OP{\VAR{nl-text} \KWD{\TLD}\Op{\VAR{spare}\DF{\LIT{0}} \Op{,\VAR{width}}}\kwd{:;}}
- \Goos{\VAR{text}\KWD{\TLD;}} \VAR{text} \KWD{\TLD\boldmath{$>$}}}
+ \OP{\VAR{nl-text} \KWD{\TLD}\Op{\VAR{spare}\DF{\LIT{0}} \Op{\KWD{,}\VAR{width}}}\kwd{:;}}
+ \Goos{\VAR{text} \KWD{\TLD;}} \VAR{text} \KWD{\TLD\boldmath{$>$}}}
{\index{\~<\~>@$\sim$$<$ $\sim$$>$}%
\EM{Justification. }
Justify text produced by \VAR{text}s in a field of at least
@@ -944,7 +945,7 @@ \subsection{Format}
lists of which a new one is used at each iteration step.
}
- \IT{\KWD{\TLD} \OP{\VAR{x} \OP{\kwd{,} \VAR{y} \Op{\kwd{,} \VAR{z}}}}
+ \IT{\KWD{\TLD} \OP{\VAR{x} \OP{\kwd{,}\VAR{y} \Op{\kwd{,}\VAR{z}}}}
\KWD{\^{}}}
{\index{\~\^{}@$\sim$\^{}}%
\EM{Escape Upward. }
@@ -976,7 +977,7 @@ \subsection{Format}
rest of the original arguments.
}
- \IT{\KWD{\TLD} \OP{\VAR{prefix}\Goos{\kwd{,}
+ \IT{\KWD{\TLD} \OP{\VAR{prefix} \Goos{\kwd{,}%
\VAR{prefix}}} \Op{\kwd{:}} \Op{\kwd{@}} \KWD{/}\VAR{function}\KWD{/}}
{\index{\~/ /@$\sim$/ /}%
\EM{Call Function. }
View
2  clqr-types-and-classes.tex
@@ -178,7 +178,7 @@ \section{Types and Classes}
}
\IT{(\MC*{CHECK-TYPE} \VAR{place} \VAR{type}
- \Op{\VAR{string}\DF{\Goo{\LIT{a}\XOR\LIT{an}} \VAR{type}}})}
+ \Op{\VAR{string}\DF{\Goo{\LIT{a}\XOR\LIT{an}}\hspace{.3ex}\VAR{type}}})}
{
Signal correctable \kwd{type-error} if \VAR{place} is
not of \VAR{type}. Return \retval{\NIL}.
Please sign in to comment.
Something went wrong with that request. Please try again.