[std] Use \keyword for 'for', 'do', 'while', 'switch', 'case', 'if', 'else'.

Author: jensmaurer

source/basic.tex

@@ -1097,7 +1097,7 @@
 
 \pnum
 The locus of a \grammarterm{for-range-declaration}
-of a range-based \tcode{for} statement\iref{stmt.ranged}
+of a range-based \keyword{for} statement\iref{stmt.ranged}
 is immediately after the \grammarterm{for-range-initializer}.
 
 \pnum

source/declarations.tex

@@ -8623,10 +8623,10 @@
 shall appear at most once in each \grammarterm{attribute-list} and
 no \grammarterm{attribute-argument-clause} shall be present.
 A fallthrough statement may only appear within
-an enclosing \tcode{switch} statement\iref{stmt.switch}.
+an enclosing \keyword{switch} statement\iref{stmt.switch}.
 The next statement that would be executed after a fallthrough statement
 shall be a labeled statement whose label is a case label or
-default label for the same \tcode{switch} statement and,
+default label for the same \keyword{switch} statement and,
 if the fallthrough statement is contained in an iteration statement,
 the next statement shall be part of the same execution of
 the substatement of the innermost enclosing iteration statement.

source/exceptions.tex

@@ -72,7 +72,7 @@
 \indextext{\idxcode{switch}!and try block}%
 \indextext{\idxcode{goto}!and handler}%
 \indextext{\idxcode{switch}!and handler}%
-A \tcode{goto} or \tcode{switch} statement shall not be used to transfer control
+A \tcode{goto} or \keyword{switch} statement shall not be used to transfer control
 into a try block or into a handler.
 \begin{example}
 \begin{codeblock}

source/limits.tex

@@ -69,9 +69,9 @@
 files\iref{cpp.include} [256].
 \item%
 Case labels for a
-\tcode{switch}
+\keyword{switch}
 statement\iref{stmt.switch} (excluding those for any nested
-\tcode{switch}
+\keyword{switch}
 statements)
 [16\,384].
 \item%

source/numerics.tex

@@ -1232,7 +1232,7 @@
 \indextext{literal!complex}%
 \pnum
 This subclause describes literal suffixes for constructing complex number literals.
-The suffixes \tcode{i}, \tcode{il}, and \tcode{if} create complex numbers of
+The suffixes \tcode{i}, \tcode{il}, and \keyword{if} create complex numbers of
 the types \tcode{complex<double>}, \tcode{complex<long double>}, and
 \tcode{complex<float>} respectively, with their imaginary part denoted by the
 given literal number and the real part being zero.

source/preprocessor.tex

@@ -494,7 +494,7 @@
 Thus, the constant expression in the following
 \tcode{\#if}
 directive and
-\tcode{if} statement\iref{stmt.if}
+\keyword{if} statement\iref{stmt.if}
 is not guaranteed to evaluate to the same value in these two
 contexts:
 \begin{codeblock}

source/statements.tex

@@ -77,7 +77,7 @@
 \pnum
 \indextext{\idxgram{condition}{s}!rules for}%
 The rules for \grammarterm{condition}{s} apply both to
-\grammarterm{selection-statement}{s} and to the \tcode{for} and \tcode{while}
+\grammarterm{selection-statement}{s} and to the \keyword{for} and \keyword{while}
 statements\iref{stmt.iter}.
 A \grammarterm{condition} that is not an \grammarterm{expression} is a
 declaration\iref{dcl.dcl}.
@@ -89,19 +89,19 @@
 
 \pnum
 The value of a \grammarterm{condition} that is an initialized declaration
-in a statement other than a \tcode{switch} statement is the value of the
+in a statement other than a \keyword{switch} statement is the value of the
 declared variable
 contextually converted to \tcode{bool}\iref{conv}.
 If that
 conversion is ill-formed, the program is ill-formed. The value of a
 \grammarterm{condition} that is an initialized declaration in a
-\tcode{switch} statement is the value of the declared variable if it has
+\keyword{switch} statement is the value of the declared variable if it has
 integral or enumeration type, or of that variable implicitly converted
 to integral or enumeration type otherwise. The value of a
 \grammarterm{condition} that is an expression is the value of the
 expression, contextually converted to \tcode{bool}
 for statements other
-than \tcode{switch};
+than \keyword{switch};
 if that conversion is ill-formed, the program is
 ill-formed. The value of the condition will be referred to as simply
 ``the condition'' where the usage is unambiguous.
@@ -143,7 +143,7 @@
 \pnum
 \indextext{label!\idxcode{case}}%
 \indextext{label!\idxcode{default}}%
-Case labels and default labels shall occur only in \tcode{switch} statements.
+Case labels and default labels shall occur only in \keyword{switch} statements.
 
 
 \rSec1[stmt.expr]{Expression statement}%
@@ -170,7 +170,7 @@
 Most statements are expression statements --- usually assignments or
 function calls. A null statement is useful to carry a label just before
 the \tcode{\}} of a compound statement and to supply a null body to an
-iteration statement such as a \tcode{while}
+iteration statement such as a \keyword{while}
 statement\iref{stmt.while}.
 \end{note}
 
@@ -233,21 +233,21 @@
 
 \pnum
 If the condition\iref{stmt.select} yields \tcode{true} the first
-substatement is executed. If the \tcode{else} part of the selection
+substatement is executed. If the \keyword{else} part of the selection
 statement is present and the condition yields \tcode{false}, the second
 substatement is executed. If the first substatement is reached via a
 label, the condition is not evaluated and the second substatement is
-not executed. In the second form of \tcode{if} statement
-(the one including \tcode{else}), if the first substatement is also an
-\tcode{if} statement then that inner \tcode{if} statement shall contain
-an \tcode{else} part.
+not executed. In the second form of \keyword{if} statement
+(the one including \keyword{else}), if the first substatement is also an
+\keyword{if} statement then that inner \tcode{if} statement shall contain
+an \keyword{else} part.
 \begin{footnote}
-In other words, the \tcode{else} is associated with the nearest un-elsed
-\tcode{if}.
+In other words, the \keyword{else} is associated with the nearest un-elsed
+\keyword{if}.
 \end{footnote}
 
 \pnum
-If the \tcode{if} statement is of the form \tcode{if constexpr}, the value
+If the \keyword{if} statement is of the form \tcode{if constexpr}, the value
 of the condition shall be a contextually
 converted constant expression of type \tcode{bool}\iref{expr.const}; this
 form is called a \defn{constexpr if} statement. If the value of the
@@ -261,9 +261,9 @@
 Odr-uses\iref{basic.def.odr} in a discarded statement do not require
 an entity to be defined.
 \end{note}
-A \tcode{case} or \tcode{default} label appearing within such an
-\tcode{if} statement shall be associated with a \tcode{switch}
-statement\iref{stmt.switch} within the same \tcode{if} statement.
+A \keyword{case} or \keyword{default} label appearing within such an
+\keyword{if} statement shall be associated with a \keyword{switch}
+statement\iref{stmt.switch} within the same \keyword{if} statement.
 A label\iref{stmt.label} declared in a substatement of a constexpr if
 statement shall only be referred to by a statement\iref{stmt.goto} in
 the same substatement.
@@ -290,7 +290,7 @@
 \end{example}
 
 \pnum
-An \tcode{if} statement of the form
+An \keyword{if} statement of the form
 \begin{ncsimplebnf}
 \keyword{if} \opt{\keyword{constexpr}} \terminal{(} init-statement condition \terminal{)} statement
 \end{ncsimplebnf}
@@ -301,7 +301,7 @@
 \bnfindent \keyword{if} \opt{\keyword{constexpr}} \terminal{(} condition \terminal{)} statement\br
 \terminal{\}}
 \end{ncsimplebnf}
-and an \tcode{if} statement of the form
+and an \keyword{if} statement of the form
 \begin{ncsimplebnf}
 \keyword{if} \opt{\keyword{constexpr}} \terminal{(} init-statement condition \terminal{)} statement \keyword{else} statement
 \end{ncsimplebnf}
@@ -319,7 +319,7 @@
 \indextext{statement!\idxcode{switch}}
 
 \pnum
-The \tcode{switch} statement causes control to be transferred to one of
+The \keyword{switch} statement causes control to be transferred to one of
 several statements depending on the value of a condition.
 
 \pnum
@@ -331,7 +331,7 @@
 promotions\iref{conv.prom}, the condition is converted
 to the promoted type.
 Any
-statement within the \tcode{switch} statement can be labeled with one or
+statement within the \keyword{switch} statement can be labeled with one or
 more case labels as follows:
 \begin{ncbnf}
 \indextext{label!\idxcode{case}}%
@@ -348,40 +348,40 @@
 \begin{codeblock}
 default :
 \end{codeblock}
-within a \tcode{switch} statement.
+within a \keyword{switch} statement.
 
 \pnum
-Switch statements can be nested; a \tcode{case} or \tcode{default} label
+Switch statements can be nested; a \keyword{case} or \keyword{default} label
 is associated with the smallest switch enclosing it.
 
 \pnum
-When the \tcode{switch} statement is executed, its condition is
+When the \keyword{switch} statement is executed, its condition is
 evaluated.
 \indextext{label!\idxcode{case}}%
 If one of the case constants has the same value as the condition,
 control is passed to the statement following the matched case label. If
 no case constant matches the condition, and if there is a
 \indextext{label!\idxcode{default}}%
-\tcode{default} label, control passes to the statement labeled by the
-default label. If no case matches and if there is no \tcode{default}
+\keyword{default} label, control passes to the statement labeled by the
+default label. If no case matches and if there is no \keyword{default}
 then none of the statements in the switch is executed.
 
 \pnum
-\tcode{case} and \tcode{default} labels in themselves do not alter the
+\keyword{case} and \keyword{default} labels in themselves do not alter the
 flow of control, which continues unimpeded across such labels. To exit
-from a switch, see \tcode{break}, \ref{stmt.break}.
+from a switch, see \keyword{break}, \ref{stmt.break}.
 \begin{note}
 Usually, the substatement that is the subject of a switch is compound
-and \tcode{case} and \tcode{default} labels appear on the top-level
+and \keyword{case} and \keyword{default} labels appear on the top-level
 statements contained within the (compound) substatement, but this is not
 required.
 \indextext{statement!declaration in \tcode{switch}}%
 Declarations can appear in the substatement of a
-\tcode{switch} statement.
+\keyword{switch} statement.
 \end{note}
 
 \pnum
-A \tcode{switch} statement of the form
+A \keyword{switch} statement of the form
 \begin{ncsimplebnf}
 \keyword{switch} \terminal{(} init-statement condition \terminal{)} statement
 \end{ncsimplebnf}
@@ -454,21 +454,21 @@
   int i;
 }
 \end{codeblock}
-Thus after the \tcode{while} statement, \tcode{i} is no longer in scope.
+Thus after the \keyword{while} statement, \tcode{i} is no longer in scope.
 \end{example}
 
 \rSec2[stmt.while]{The \tcode{while} statement}%
 \indextext{statement!\idxcode{while}}
 
 \pnum
-In the \tcode{while} statement the substatement is executed repeatedly
+In the \keyword{while} statement the substatement is executed repeatedly
 until the value of the condition\iref{stmt.select} becomes
 \tcode{false}. The test takes place before each execution of the
 substatement.
 
 \pnum
 \indextext{statement!declaration in \tcode{while}}%
-A \tcode{while} statement is equivalent to
+A \keyword{while} statement is equivalent to
 \begin{ncsimplebnf}
 \exposid{label} \terminal{:}\br
 \terminal{\{}\br
@@ -509,15 +509,15 @@
 if that conversion is ill-formed, the program is ill-formed.
 
 \pnum
-In the \tcode{do} statement the substatement is executed repeatedly
+In the \keyword{do} statement the substatement is executed repeatedly
 until the value of the expression becomes \tcode{false}. The test takes
 place after each execution of the statement.
 
 \rSec2[stmt.for]{The \tcode{for} statement}%
 \indextext{statement!\idxcode{for}}
 
 \pnum
-The \tcode{for} statement
+The \keyword{for} statement
 \begin{ncsimplebnf}
 \keyword{for} \terminal{(} init-statement \opt{condition} \terminal{;} \opt{expression} \terminal{)} statement
 \end{ncsimplebnf}
@@ -535,7 +535,7 @@
 in the same scope as the \grammarterm{condition}, and
 except that a
 \indextext{statement!\tcode{continue} in \tcode{for}}%
-\tcode{continue} in \grammarterm{statement} (not enclosed in another
+\keyword{continue} in \grammarterm{statement} (not enclosed in another
 iteration statement) will execute \grammarterm{expression} before
 re-evaluating \grammarterm{condition}.
 \begin{note}
@@ -550,14 +550,14 @@
 Either or both of the \grammarterm{condition}
 and the \grammarterm{expression} can be omitted.
 A missing \grammarterm{condition}
-makes the implied \tcode{while} clause
+makes the implied \keyword{while} clause
 equivalent to \tcode{while(true)}.
 
 \rSec2[stmt.ranged]{The range-based \tcode{for} statement}%
 \indextext{statement!range based for@range based \tcode{for}}
 
 \pnum
-The range-based \tcode{for} statement
+The range-based \keyword{for} statement
 \begin{ncsimplebnf}
 \keyword{for} \terminal{(} \opt{init-statement} for-range-declaration \terminal{:} for-range-initializer \terminal{)} statement
 \end{ncsimplebnf}
@@ -679,20 +679,20 @@
 \indextext{statement!\idxcode{break}}
 
 \pnum
-The \tcode{break} statement shall occur only in an
+The \keyword{break} statement shall occur only in an
 \indextext{\idxgram{iteration-statement}}%
 \indextext{statement!\idxcode{switch}}%
-\grammarterm{iteration-statement} or a \tcode{switch} statement and causes
+\grammarterm{iteration-statement} or a \keyword{switch} statement and causes
 termination of the smallest enclosing \grammarterm{iteration-statement} or
-\tcode{switch} statement; control passes to the statement following the
+\keyword{switch} statement; control passes to the statement following the
 terminated statement, if any.
 
 \rSec2[stmt.cont]{The \tcode{continue} statement}%
 \indextext{statement!\idxcode{continue}}
 
 \pnum
 The
-\tcode{continue}
+\keyword{continue}
 statement shall occur only in an
 \indextext{\idxgram{iteration-statement}}%
 \grammarterm{iteration-statement}
@@ -731,7 +731,7 @@
 \end{codeblock}
 \end{minipage}
 
-a \tcode{continue} not contained in an enclosed iteration statement is
+a \keyword{continue} not contained in an enclosed iteration statement is
 equivalent to \tcode{goto} \exposid{contin}.
 
 \rSec2[stmt.return]{The \tcode{return} statement}%
@@ -893,8 +893,8 @@
 unless all such variables have vacuous initialization\iref{basic.life},
 the transfer of control shall not be a jump.
 \begin{footnote}
-The transfer from the condition of a \tcode{switch} statement to a
-\tcode{case} label is considered a jump in this respect.
+The transfer from the condition of a \keyword{switch} statement to a
+\keyword{case} label is considered a jump in this respect.
 \end{footnote}
 When a \grammarterm{declaration-statement} is executed,
 $P$ and $Q$ are the points immediately before and after it;