Skip to content

[support] Correct formatting for exposition-only names #9004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
frederick-vs-ja wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −31
Open

[support] Correct formatting for exposition-only names #9004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions source/support.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3492,7 +3492,7 @@
const char* name() const noexcept;

private:
const type_info* target; // \expos
const type_info* @\exposid{target}@; // \expos
// Note that the use of a pointer here, rather than a reference,
// means that the default copy/move constructor and assignment
// operators will be provided and work as expected.
Expand All @@ -3514,7 +3514,7 @@
\begin{itemdescr}
\pnum
\effects
Constructs a \tcode{type_index} object, the equivalent of \tcode{target = \&rhs}.
Constructs a \tcode{type_index} object, the equivalent of \tcode{\exposid{target} = \&rhs}.
\end{itemdescr}

\indexlibrarymember{operator==}{type_index}%
Expand All @@ -3525,7 +3525,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{*target == *rhs.target}.
\tcode{*\exposid{target} == *rhs.\exposid{target}}.
\end{itemdescr}

\indexlibrarymember{operator<}{type_index}%
Expand All @@ -3536,7 +3536,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{target->before(*rhs.target)}.
\tcode{\exposid{target}->before(*rhs.\exposid{target})}.
\end{itemdescr}

\indexlibrarymember{operator>}{type_index}%
Expand All @@ -3547,7 +3547,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{rhs.target->before(*target)}.
\tcode{rhs.\exposid{target}->before(*\exposid{target})}.
\end{itemdescr}

\indexlibrarymember{operator<=}{type_index}%
Expand All @@ -3558,7 +3558,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{!rhs.target->before(*target)}.
\tcode{!rhs.\exposid{target}->before(*\exposid{target})}.
\end{itemdescr}

\indexlibrarymember{operator>=}{type_index}%
Expand All @@ -3569,7 +3569,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{!target->before(*rhs.target)}.
\tcode{!\exposid{target}->before(*rhs.\exposid{target})}.
\end{itemdescr}

\indexlibrarymember{operator<=>}{type_index}%
Expand All @@ -3582,8 +3582,8 @@
\effects
Equivalent to:
\begin{codeblock}
if (*target == *rhs.target) return strong_ordering::equal;
if (target->before(*rhs.target)) return strong_ordering::less;
if (*@\exposid{target}@ == *rhs.@\exposid{target}@) return strong_ordering::equal;
if (@\exposid{target}@->before(*rhs.@\exposid{target}@)) return strong_ordering::less;
return strong_ordering::greater;
\end{codeblock}
\end{itemdescr}
Expand All @@ -3596,7 +3596,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{target->hash_code()}.
\tcode{\exposid{target}->hash_code()}.
\end{itemdescr}

\indexlibrarymember{name}{type_index}%
Expand All @@ -3607,7 +3607,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{target->name()}.
\tcode{\exposid{target}->name()}.
\end{itemdescr}

\indexlibrarymember{hash}{type_index}%
Expand Down Expand Up @@ -3659,10 +3659,10 @@
constexpr const char* function_name() const noexcept;

private:
uint_least32_t line_; // \expos
uint_least32_t column_; // \expos
const char* file_name_; // \expos
const char* function_name_; // \expos
uint_least32_t @\exposid{line_}@; // \expos
uint_least32_t @\exposid{column_}@; // \expos
const char* @\exposid{file_name_}@; // \expos
const char* @\exposid{function_name_}@; // \expos
};
}
\end{codeblock}
Expand All @@ -3679,7 +3679,7 @@
\end{note}

\pnum
The data members \tcode{file_name_} and \tcode{function_name_}
The data members \exposid{file_name_} and \exposid{function_name_}
always each refer to an \ntbs{}.

\pnum
Expand Down Expand Up @@ -3720,21 +3720,21 @@
\begin{libefftabvalue}
{Value of object returned by \tcode{current}}
{support.srcloc.current}
\tcode{line_} &
\exposid{line_} &
A presumed line number\iref{cpp.predefined}.
Line numbers are presumed to be 1-indexed;
however, an implementation is encouraged to use 0
when the line number is unknown. \\ \rowsep
\tcode{column_} &
\exposid{column_} &
An \impldef{column value of \tcode{source_location::current}} value denoting
some offset from the start of the line denoted by \tcode{line_}.
some offset from the start of the line denoted by \exposid{line_}.
Column numbers are presumed to be 1-indexed;
however, an implementation is encouraged to use 0
when the column number is unknown. \\ \rowsep
\tcode{file_name_} &
\exposid{file_name_} &
A presumed name of the current source file\iref{cpp.predefined} as an \ntbs{}.
\\ \rowsep
\tcode{function_name_} &
\exposid{function_name_} &
A name of the current function
such as in \mname{func}\iref{dcl.fct.def.general} if any,
an empty string otherwise. \\
Expand Down Expand Up @@ -3807,7 +3807,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{line_}.
\exposid{line_}.
\end{itemdescr}

\begin{itemdecl}
Expand All @@ -3816,7 +3816,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{column_}.
\exposid{column_}.
\end{itemdescr}

\begin{itemdecl}
Expand All @@ -3825,7 +3825,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{file_name_}.
\exposid{file_name_}.
\end{itemdescr}

\begin{itemdecl}
Expand All @@ -3834,7 +3834,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{function_name_}.
\exposid{function_name_}.
\end{itemdescr}

\rSec1[support.exception]{Exception handling}
Expand Down Expand Up @@ -5839,7 +5839,7 @@
void destroy() const;

private:
void* ptr; // \expos
void* @\exposid{ptr}@; // \expos
};

template<class Promise>
Expand Down Expand Up @@ -5870,7 +5870,7 @@
Promise& promise() const;

private:
void* ptr; // \expos
void* @\exposid{ptr}@; // \expos
};
}
\end{codeblock}
Expand Down Expand Up @@ -5961,7 +5961,7 @@
\begin{itemdescr}
\pnum
\returns
\tcode{ptr}.
\exposid{ptr}.
\end{itemdescr}

\indexlibrarymember{from_address}{coroutine_handle}%
Expand Down Expand Up @@ -6175,7 +6175,7 @@
constexpr void* address() const noexcept;
private:
coroutine_handle(@\unspec@);
void* ptr; // \expos
void* @\exposid{ptr}@; // \expos
};
}
\end{codeblock}
Expand Down Expand Up @@ -6264,11 +6264,11 @@
\begin{itemdescr}
\pnum
\returns
\tcode{ptr}.
\exposid{ptr}.

\pnum
\remarks
A \tcode{noop_coroutine_handle}'s \tcode{ptr} is always a
A \tcode{noop_coroutine_handle}'s \exposid{ptr} is always a
non-null pointer value.
\end{itemdescr}

Expand Down
Loading