summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2002-03-08 00:54:43 (GMT)
committerFred Drake <fdrake@acm.org>2002-03-08 00:54:43 (GMT)
commit6cb64f9e4650c101179134850f414435abab95ee (patch)
tree4457d3f568223d8c2ce8846c12a90528d16fb1bf
parentdf708788b6a0b06b0eaf07173b760ea80ffce87b (diff)
downloadcpython-6cb64f9e4650c101179134850f414435abab95ee.zip
cpython-6cb64f9e4650c101179134850f414435abab95ee.tar.gz
cpython-6cb64f9e4650c101179134850f414435abab95ee.tar.bz2
"Shortcut" should be "short-circuit".
This closes SF bug #526277.
-rw-r--r--Doc/tut/tut.tex13
1 files changed, 7 insertions, 6 deletions
diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex
index 27f33c9..d7d363c 100644
--- a/Doc/tut/tut.tex
+++ b/Doc/tut/tut.tex
@@ -2039,12 +2039,13 @@ the highest priority, and \code{or} the lowest, so that
course, parentheses can be used to express the desired composition.
The Boolean operators \code{and} and \code{or} are so-called
-\emph{shortcut} operators: their arguments are evaluated from left to
-right, and evaluation stops as soon as the outcome is determined.
-E.g., if \code{A} and \code{C} are true but \code{B} is false, \code{A
-and B and C} does not evaluate the expression C. In general, the
-return value of a shortcut operator, when used as a general value and
-not as a Boolean, is the last evaluated argument.
+\emph{short-circuit} operators: their arguments are evaluated from
+left to right, and evaluation stops as soon as the outcome is
+determined. For example, if \code{A} and \code{C} are true but
+\code{B} is false, \code{A and B and C} does not evaluate the
+expression \code{C}. In general, the return value of a short-circuit
+operator, when used as a general value and not as a Boolean, is the
+last evaluated argument.
It is possible to assign the result of a comparison or other Boolean
expression to a variable. For example,