Skip to content

Commit bb77bca

Browse files
Remove occurences of "local variable"
Replace the uses of "local variable" with "[block] variable with automatic storage duration". Sometimes the automatic storage duration" can be inferred from the context.
1 parent f818270 commit bb77bca

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
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/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

source/text.tex

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

25842584
\begin{description}
25852585
\stage{1}
2586-
The function initializes local variables via
2586+
The function initializes block variables 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-
local variables are initialized as if by
2635+
block variables 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,7 @@
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 local variable initialized as
2884+
In the following description, \tcode{loc} names a block variable initialized as
28852885
\begin{codeblock}
28862886
locale loc = str.getloc();
28872887
\end{codeblock}
@@ -2925,7 +2925,7 @@
29252925
\begin{description}
29262926
\stage{1}
29272927
The first action of stage 1 is to determine a conversion specifier.
2928-
The tables that describe this determination use the following local variables
2928+
The tables that describe this determination use the following block variables
29292929

29302930
\begin{codeblock}
29312931
fmtflags flags = str.flags();
@@ -3022,7 +3022,7 @@
30223022
use_facet<ctype<charT>>(loc).widen(c)
30233023
\end{codeblock}
30243024

3025-
A local variable \tcode{punct} is initialized via
3025+
A block variable \tcode{punct} is initialized via
30263026
\begin{codeblock}
30273027
const numpunct<charT>& punct = use_facet<numpunct<charT>>(loc);
30283028
\end{codeblock}
@@ -3035,7 +3035,7 @@
30353035
Decimal point characters(.) are replaced by \tcode{punct.decimal_point()}.
30363036

30373037
\stage{3}
3038-
A local variable is initialized as
3038+
A block variable is initialized as
30393039
\begin{codeblock}
30403040
fmtflags adjustfield = (flags & (ios_base::adjustfield));
30413041
\end{codeblock}
@@ -12398,7 +12398,7 @@
1239812398
\begin{itemdescr}
1239912399
\pnum
1240012400
\effects
12401-
Constructs a local variable \tcode{start} of type \tcode{BidirectionalIterator} and
12401+
Constructs a block variable \tcode{start} of type \tcode{BidirectionalIterator} and
1240212402
initializes it with the value of \tcode{match[0].second}.
1240312403

1240412404
\pnum
@@ -12743,7 +12743,7 @@
1274312743
\begin{itemdescr}
1274412744
\pnum
1274512745
\effects
12746-
Constructs a local variable \tcode{prev} of
12746+
Constructs a block variable \tcode{prev} of
1274712747
type \tcode{position_iterator}, initialized with the value
1274812748
of \tcode{position}.
1274912749

0 commit comments

Comments
 (0)