Skip to content

Commit 930132a

Browse files
Address reviews comments
- Use "initializes variables with automatic storage duration" in [text]. - Drop some adjectives in [except.ctor].
1 parent bb77bca commit 930132a

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

source/exceptions.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
constructed, but not yet destroyed,
377377
since the try block was entered.
378378
If an exception is thrown during the destruction of temporaries or
379-
block variables for a \keyword{return} statement\iref{stmt.return},
379+
variables for a \keyword{return} statement\iref{stmt.return},
380380
the destructor for the returned object (if any) is also invoked.
381381
The objects are destroyed in the reverse order of the completion
382382
of their construction.
@@ -398,11 +398,11 @@
398398
}
399399
\end{codeblock}
400400
At \#1, the returned object of type \tcode{A} is constructed.
401-
Then, the block variable \tcode{b} is destroyed\iref{stmt.jump}.
402-
Next, the block variable \tcode{y} is destroyed,
401+
Then, the variable \tcode{b} is destroyed\iref{stmt.jump}.
402+
Next, the variable \tcode{y} is destroyed,
403403
causing stack unwinding,
404404
resulting in the destruction of the returned object,
405-
followed by the destruction of the block variable \tcode{a}.
405+
followed by the destruction of the variable \tcode{a}.
406406
Finally, the returned object is constructed again at \#2.
407407
\end{example}
408408

source/text.tex

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2583,7 +2583,7 @@
25832583

25842584
\begin{description}
25852585
\stage{1}
2586-
The function initializes block variables via
2586+
The function initializes variables with automatic storage duration via
25872587
\begin{codeblock}
25882588
fmtflags flags = str.flags();
25892589
fmtflags basefield = (flags & ios_base::basefield);
@@ -2632,7 +2632,7 @@
26322632
\stage{2}
26332633
If \tcode{in == end} then stage 2 terminates.
26342634
Otherwise a \tcode{charT} is taken from \tcode{in} and
2635-
block variables are initialized as if by
2635+
variables with automatic storage duration are initialized as if by
26362636
\begin{codeblock}
26372637
char_type ct = *in;
26382638
char c = src[find(atoms, atoms + sizeof(src) - 1, ct) - atoms];
@@ -2881,7 +2881,8 @@
28812881
\effects
28822882
Writes characters to the sequence \tcode{out},
28832883
formatting \tcode{val} as desired.
2884-
In the following description, \tcode{loc} names a block variable initialized as
2884+
In the following description, \tcode{loc} names a variable with
2885+
automatic storage duration initialized as
28852886
\begin{codeblock}
28862887
locale loc = str.getloc();
28872888
\end{codeblock}
@@ -2925,7 +2926,8 @@
29252926
\begin{description}
29262927
\stage{1}
29272928
The first action of stage 1 is to determine a conversion specifier.
2928-
The tables that describe this determination use the following block variables
2929+
The tables that describe this determination use the following variables with
2930+
automatic storage duration.
29292931

29302932
\begin{codeblock}
29312933
fmtflags flags = str.flags();
@@ -3022,7 +3024,7 @@
30223024
use_facet<ctype<charT>>(loc).widen(c)
30233025
\end{codeblock}
30243026

3025-
A block variable \tcode{punct} is initialized via
3027+
A variable \tcode{punct} with automatic storage duration is initialized via
30263028
\begin{codeblock}
30273029
const numpunct<charT>& punct = use_facet<numpunct<charT>>(loc);
30283030
\end{codeblock}
@@ -3035,7 +3037,7 @@
30353037
Decimal point characters(.) are replaced by \tcode{punct.decimal_point()}.
30363038

30373039
\stage{3}
3038-
A block variable is initialized as
3040+
A variable with automatic storage is initialized as
30393041
\begin{codeblock}
30403042
fmtflags adjustfield = (flags & (ios_base::adjustfield));
30413043
\end{codeblock}
@@ -12398,7 +12400,8 @@
1239812400
\begin{itemdescr}
1239912401
\pnum
1240012402
\effects
12401-
Constructs a block variable \tcode{start} of type \tcode{BidirectionalIterator} and
12403+
Constructs a variable \tcode{start} of type \tcode{BidirectionalIterator}
12404+
with automatic storage duration and
1240212405
initializes it with the value of \tcode{match[0].second}.
1240312406

1240412407
\pnum
@@ -12743,9 +12746,8 @@
1274312746
\begin{itemdescr}
1274412747
\pnum
1274512748
\effects
12746-
Constructs a block variable \tcode{prev} of
12747-
type \tcode{position_iterator}, initialized with the value
12748-
of \tcode{position}.
12749+
Constructs a variable \tcode{prev} of type \tcode{position_iterator}
12750+
with automatic storage duration, initialized with the value of \tcode{position}.
1274912751

1275012752
\pnum
1275112753
If \tcode{*this} is a suffix iterator, sets \tcode{*this} to an

0 commit comments

Comments
 (0)