Skip to content

Commit 50cb8b2

Browse files
Remove occurences of "local variable"
Replace the uses of "local variable" with "[block] variable with automatic storage duration".
1 parent 374238a commit 50cb8b2

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

source/declarations.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4296,7 +4296,7 @@
42964296

42974297
\pnum
42984298
\begin{note}
4299-
A local variable cannot be odr-used\iref{term.odr.use}
4299+
A block variable with automatic storage duration cannot be odr-used\iref{term.odr.use}
43004300
in a default argument.
43014301
\end{note}
43024302
\begin{example}

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-
local variables for a \keyword{return} statement\iref{stmt.return},
379+
block 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 local variable \tcode{b} is destroyed\iref{stmt.jump}.
402-
Next, the local variable \tcode{y} is destroyed,
401+
Then, the block variable \tcode{b} is destroyed\iref{stmt.jump}.
402+
Next, the block 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 local variable \tcode{a}.
405+
followed by the destruction of the block variable \tcode{a}.
406406
Finally, the returned object is constructed again at \#2.
407407
\end{example}
408408

source/locales.tex

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2233,7 +2233,7 @@
22332233

22342234
\begin{description}
22352235
\stage{1}
2236-
The function initializes local variables via
2236+
The function initializes variables with automatic storage duration via
22372237
\begin{codeblock}
22382238
fmtflags flags = str.flags();
22392239
fmtflags basefield = (flags & ios_base::basefield);
@@ -2282,7 +2282,7 @@
22822282
\stage{2}
22832283
If \tcode{in == end} then stage 2 terminates.
22842284
Otherwise a \tcode{charT} is taken from \tcode{in} and
2285-
local variables are initialized as if by
2285+
variables with automatic storage duration are initialized as if by
22862286
\begin{codeblock}
22872287
char_type ct = *in;
22882288
char c = src[find(atoms, atoms + sizeof(src) - 1, ct) - atoms];
@@ -2531,7 +2531,8 @@
25312531
\effects
25322532
Writes characters to the sequence \tcode{out},
25332533
formatting \tcode{val} as desired.
2534-
In the following description, \tcode{loc} names a local variable initialized as
2534+
In the following description, \tcode{loc} names a variable
2535+
with automatic storage duration initialized as
25352536
\begin{codeblock}
25362537
locale loc = str.getloc();
25372538
\end{codeblock}
@@ -2575,7 +2576,8 @@
25752576
\begin{description}
25762577
\stage{1}
25772578
The first action of stage 1 is to determine a conversion specifier.
2578-
The tables that describe this determination use the following local variables
2579+
The tables that describe this determination use the following variables
2580+
with automatic storage duration
25792581

25802582
\begin{codeblock}
25812583
fmtflags flags = str.flags();
@@ -2672,7 +2674,7 @@
26722674
use_facet<ctype<charT>>(loc).widen(c)
26732675
\end{codeblock}
26742676

2675-
A local variable \tcode{punct} is initialized via
2677+
A variable \tcode{punct} with automatic storage duration is initialized via
26762678
\begin{codeblock}
26772679
const numpunct<charT>& punct = use_facet<numpunct<charT>>(loc);
26782680
\end{codeblock}
@@ -2685,7 +2687,7 @@
26852687
Decimal point characters(.) are replaced by \tcode{punct.decimal_point()}.
26862688

26872689
\stage{3}
2688-
A local variable is initialized as
2690+
A variable with automatic storage duration is initialized as
26892691
\begin{codeblock}
26902692
fmtflags adjustfield = (flags & (ios_base::adjustfield));
26912693
\end{codeblock}

source/regex.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3398,7 +3398,7 @@
33983398
\begin{itemdescr}
33993399
\pnum
34003400
\effects
3401-
Constructs a local variable \tcode{start} of type \tcode{BidirectionalIterator} and
3401+
Constructs a variable \tcode{start} of type \tcode{BidirectionalIterator} with automatic storage duration and
34023402
initializes it with the value of \tcode{match[0].second}.
34033403

34043404
\pnum
@@ -3743,8 +3743,8 @@
37433743
\begin{itemdescr}
37443744
\pnum
37453745
\effects
3746-
Constructs a local variable \tcode{prev} of
3747-
type \tcode{position_iterator}, initialized with the value
3746+
Constructs a variable \tcode{prev} of
3747+
type \tcode{position_iterator} with automatic storage duration, initialized with the value
37483748
of \tcode{position}.
37493749

37503750
\pnum

source/statements.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@
804804
\end{bnf}
805805

806806
\pnum
807-
\indextext{local variable!destruction of}%
807+
\indextext{block variable with automatic storage duration!destruction of}%
808808
\indextext{scope!destructor and exit from}%
809809
\begin{note}
810810
On exit from a scope (however accomplished), objects with automatic storage
@@ -946,7 +946,7 @@
946946
The copy-initialization of the result of the call is sequenced before the
947947
destruction of temporaries at the end of the full-expression established
948948
by the operand of the \tcode{return} statement, which, in turn, is sequenced
949-
before the destruction of local variables\iref{stmt.jump} of the block
949+
before the destruction of block variables with automatic storage duration\iref{stmt.jump} of the block
950950
enclosing the \tcode{return} statement.
951951

952952
\pnum

0 commit comments

Comments
 (0)