Skip to content

Commit

Permalink
Remove occurences of "local variable"
Browse files Browse the repository at this point in the history
Replace the uses of "local variable" with "[block] variable with
automatic storage duration". Sometimes the automatic storage duration"
can be inferred from the context.
  • Loading branch information
frederick-vs-ja committed Oct 16, 2024
1 parent f818270 commit bb77bca
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion source/declarations.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4296,7 +4296,7 @@

\pnum
\begin{note}
A local variable cannot be odr-used\iref{term.odr.use}
A block variable with automatic storage duration cannot be odr-used\iref{term.odr.use}
in a default argument.
\end{note}
\begin{example}
Expand Down
8 changes: 4 additions & 4 deletions source/exceptions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@
constructed, but not yet destroyed,
since the try block was entered.
If an exception is thrown during the destruction of temporaries or
local variables for a \keyword{return} statement\iref{stmt.return},
block variables for a \keyword{return} statement\iref{stmt.return},
the destructor for the returned object (if any) is also invoked.
The objects are destroyed in the reverse order of the completion
of their construction.
Expand All @@ -398,11 +398,11 @@
}
\end{codeblock}
At \#1, the returned object of type \tcode{A} is constructed.
Then, the local variable \tcode{b} is destroyed\iref{stmt.jump}.
Next, the local variable \tcode{y} is destroyed,
Then, the block variable \tcode{b} is destroyed\iref{stmt.jump}.
Next, the block variable \tcode{y} is destroyed,
causing stack unwinding,
resulting in the destruction of the returned object,
followed by the destruction of the local variable \tcode{a}.
followed by the destruction of the block variable \tcode{a}.
Finally, the returned object is constructed again at \#2.
\end{example}

Expand Down
4 changes: 2 additions & 2 deletions source/statements.tex
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@
\end{bnf}

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

\pnum
Expand Down
16 changes: 8 additions & 8 deletions source/text.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2583,7 +2583,7 @@

\begin{description}
\stage{1}
The function initializes local variables via
The function initializes block variables via
\begin{codeblock}
fmtflags flags = str.flags();
fmtflags basefield = (flags & ios_base::basefield);
Expand Down Expand Up @@ -2632,7 +2632,7 @@
\stage{2}
If \tcode{in == end} then stage 2 terminates.
Otherwise a \tcode{charT} is taken from \tcode{in} and
local variables are initialized as if by
block variables are initialized as if by
\begin{codeblock}
char_type ct = *in;
char c = src[find(atoms, atoms + sizeof(src) - 1, ct) - atoms];
Expand Down Expand Up @@ -2881,7 +2881,7 @@
\effects
Writes characters to the sequence \tcode{out},
formatting \tcode{val} as desired.
In the following description, \tcode{loc} names a local variable initialized as
In the following description, \tcode{loc} names a block variable initialized as
\begin{codeblock}
locale loc = str.getloc();
\end{codeblock}
Expand Down Expand Up @@ -2925,7 +2925,7 @@
\begin{description}
\stage{1}
The first action of stage 1 is to determine a conversion specifier.
The tables that describe this determination use the following local variables
The tables that describe this determination use the following block variables

\begin{codeblock}
fmtflags flags = str.flags();
Expand Down Expand Up @@ -3022,7 +3022,7 @@
use_facet<ctype<charT>>(loc).widen(c)
\end{codeblock}

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

\stage{3}
A local variable is initialized as
A block variable is initialized as
\begin{codeblock}
fmtflags adjustfield = (flags & (ios_base::adjustfield));
\end{codeblock}
Expand Down Expand Up @@ -12398,7 +12398,7 @@
\begin{itemdescr}
\pnum
\effects
Constructs a local variable \tcode{start} of type \tcode{BidirectionalIterator} and
Constructs a block variable \tcode{start} of type \tcode{BidirectionalIterator} and
initializes it with the value of \tcode{match[0].second}.

\pnum
Expand Down Expand Up @@ -12743,7 +12743,7 @@
\begin{itemdescr}
\pnum
\effects
Constructs a local variable \tcode{prev} of
Constructs a block variable \tcode{prev} of
type \tcode{position_iterator}, initialized with the value
of \tcode{position}.

Expand Down

0 comments on commit bb77bca

Please sign in to comment.