summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-06-23 05:26:52 (GMT)
committerFred Drake <fdrake@acm.org>2001-06-23 05:26:52 (GMT)
commitf5eae668a81050919293453054be392cfe4f6b8d (patch)
treec568fdf85903b5c93b5bdc8da28a61377e85dde1
parent1ab1f71ec3da8844104afc9a01611826886eb39d (diff)
downloadcpython-f5eae668a81050919293453054be392cfe4f6b8d.zip
cpython-f5eae668a81050919293453054be392cfe4f6b8d.tar.gz
cpython-f5eae668a81050919293453054be392cfe4f6b8d.tar.bz2
Add "yeild" to the list of keywords.
Fix a very minor (but annoying when looking for things!) markup nit.
-rw-r--r--Doc/ref/ref2.tex20
1 files changed, 18 insertions, 2 deletions
diff --git a/Doc/ref/ref2.tex b/Doc/ref/ref2.tex
index 3a8bba2..6650b99 100644
--- a/Doc/ref/ref2.tex
+++ b/Doc/ref/ref2.tex
@@ -28,11 +28,13 @@ though the current implementation appears to favor Latin-1. This
applies both to the source character set and the run-time character
set.
+
\section{Line structure\label{line-structure}}
A Python program is divided into a number of \emph{logical lines}.
\index{line structure}
+
\subsection{Logical lines\label{logical}}
The end of
@@ -46,6 +48,7 @@ by following the explicit or implicit \emph{line joining} rules.
\index{line joining}
\index{NEWLINE token}
+
\subsection{Physical lines\label{physical}}
A physical line ends in whatever the current platform's convention is
@@ -54,6 +57,7 @@ character. On DOS/Windows, it is the \ASCII{} sequence CR LF (return
followed by linefeed). On Macintosh, it is the \ASCII{} CR (return)
character.
+
\subsection{Comments\label{comments}}
A comment starts with a hash character (\code{\#}) that is not part of
@@ -64,6 +68,7 @@ Comments are ignored by the syntax; they are not tokens.
\index{comment}
\index{hash character}
+
\subsection{Explicit line joining\label{explicit-joining}}
Two or more physical lines may be joined into logical lines using
@@ -203,6 +208,7 @@ The following example shows various indentation errors:
last error is found by the lexical analyzer --- the indentation of
\code{return r} does not match a level popped off the stack.)
+
\subsection{Whitespace between tokens\label{whitespace}}
Except at the beginning of a logical line or in string literals, the
@@ -211,6 +217,7 @@ interchangeably to separate tokens. Whitespace is needed between two
tokens only if their concatenation could otherwise be interpreted as a
different token (e.g., ab is one token, but a b is two tokens).
+
\section{Other tokens\label{other-tokens}}
Besides NEWLINE, INDENT and DEDENT, the following categories of tokens
@@ -222,6 +229,7 @@ Where
ambiguity exists, a token comprises the longest possible string that
forms a legal token, when read from left to right.
+
\section{Identifiers and keywords\label{identifiers}}
Identifiers (also referred to as \emph{names}) are described by the following
@@ -239,6 +247,7 @@ digit: "0"..."9"
Identifiers are unlimited in length. Case is significant.
+
\subsection{Keywords\label{keywords}}
The following identifiers are used as reserved words, or
@@ -251,13 +260,14 @@ identifiers. They must be spelled exactly as written here:%
and del for is raise
assert elif from lambda return
break else global not try
-class except if or while
-continue exec import pass
+class except if or yeild
+continue exec import pass while
def finally in print
\end{verbatim}
% When adding keywords, use reswords.py for reformatting
+
\subsection{Reserved classes of identifiers\label{id-classes}}
Certain classes of identifiers (besides keywords) have special
@@ -287,6 +297,7 @@ Literals are notations for constant values of some built-in types.
\index{literal}
\index{constant}
+
\subsection{String literals\label{strings}}
String literals are described by the following lexical definitions:
@@ -384,6 +395,7 @@ escape the following quote character). Note also that a single
backslash followed by a newline is interpreted as those two characters
as part of the string, \emph{not} as a line continuation.
+
\subsection{String literal concatenation\label{string-catenation}}
Multiple adjacent string literals (delimited by whitespace), possibly
@@ -434,6 +446,7 @@ Note that numeric literals do not include a sign; a phrase like
\code{-1} is actually an expression composed of the unary operator
`\code{-}' and the literal \code{1}.
+
\subsection{Integer and long integer literals\label{integers}}
Integer and long integer literals are described by the following
@@ -468,6 +481,7 @@ Some examples of plain and long integer literals:
3L 79228162514264337593543950336L 0377L 0x100000000L
\end{verbatim}
+
\subsection{Floating point literals\label{floating}}
Floating point literals are described by the following lexical
@@ -498,6 +512,7 @@ Note that numeric literals do not include a sign; a phrase like
\code{-1} is actually an expression composed of the operator
\code{-} and the literal \code{1}.
+
\subsection{Imaginary literals\label{imaginary}}
Imaginary literals are described by the following lexical definitions:
@@ -532,6 +547,7 @@ The comparison operators \code{<>} and \code{!=} are alternate
spellings of the same operator. \code{!=} is the preferred spelling;
\code{<>} is obsolescent.
+
\section{Delimiters\label{delimiters}}
The following tokens serve as delimiters in the grammar: