[index] Harmonize indexing for Cpp17 concepts.

Author: jensmaurer

source/containers.tex

@@ -536,7 +536,7 @@
 \begin{itemize}
 \item
 \tcode{T} is \defnx{\oldconcept{DefaultInsertable} into \tcode{X}}
-{\oldconcept{DefaultInsertable} into X@\oldconcept{DefaultInsertable} into \tcode{X}}
+{\oldconceptname{DefaultInsertable} into X@\oldconcept{DefaultInsertable} into \tcode{X}}
 means that the following expression is well-formed:
 \begin{codeblock}
 allocator_traits<A>::construct(m, p)
@@ -553,7 +553,7 @@
 
 \item
 \tcode{T} is \defnx{\oldconcept{MoveInsertable} into \tcode{X}}
-{\oldconcept{MoveInsertable} into X@\oldconcept{MoveInsertable} into \tcode{X}}
+{\oldconceptname{MoveInsertable} into X@\oldconcept{MoveInsertable} into \tcode{X}}
 means that the following expression
 is well-formed:
 \begin{codeblock}
@@ -567,7 +567,7 @@
 
 \item
 \tcode{T} is \defnx{\oldconcept{CopyInsertable} into \tcode{X}}
-{\oldconcept{CopyInsertable} into X@\oldconcept{CopyInsertable} into \tcode{X}}
+{\oldconceptname{CopyInsertable} into X@\oldconcept{CopyInsertable} into \tcode{X}}
 means that, in addition to \tcode{T} being \oldconcept{MoveInsertable} into
 \tcode{X}, the following expression is well-formed:
 \begin{codeblock}
@@ -579,7 +579,7 @@
 \item
 \tcode{T} is
 \defnx{\oldconcept{EmplaceConstructible} into \tcode{X} from \tcode{args}}
-{\oldconcept{EmplaceConstructible} into X from args@\oldconcept{EmplaceConstructible} into \tcode{X} from \tcode{args}},
+{\oldconceptname{EmplaceConstructible} into X from args@\oldconcept{EmplaceConstructible} into \tcode{X} from \tcode{args}},
 for zero
 or more arguments \tcode{args}, means that the following expression is well-formed:
 \begin{codeblock}
@@ -589,7 +589,7 @@
 \item
 \tcode{T} is
 \defnx{\oldconcept{Erasable} from \tcode{X}}
-{\oldconcept{Erasable} from X@\oldconcept{Erasable} from \tcode{X}}
+{\oldconceptname{Erasable} from X@\oldconcept{Erasable} from \tcode{X}}
 means that the following expression is well-formed:
 \begin{codeblock}
 allocator_traits<A>::destroy(m, p)

source/lib-intro.tex

@@ -1646,8 +1646,7 @@
 \tcode{T()} shall be a well-defined expression\iref{dcl.init} if one of those
 signatures is called using the default argument\iref{dcl.fct.default}.
 
-\indextext{requirements!\idxoldconcept{EqualityComparable}}%
-\begin{concepttable}{\oldconcept{EqualityComparable} requirements}{cpp17.equalitycomparable}
+\begin{oldconcepttable}{EqualityComparable}{}{cpp17.equalitycomparable}
 {x{1in}x{1in}p{3in}}
 \topline
 \hdstyle{Expression}  &   \hdstyle{Return type} &   \rhdr{Requirement} \\ \capsep
@@ -1663,32 +1662,29 @@
 \item
 If \tcode{a == b} and \tcode{b == c}, then \tcode{a == c}.
 \end{itemize} \\
-\end{concepttable}
+\end{oldconcepttable}
 
-\indextext{requirements!\idxoldconcept{LessThanComparable}}%
-\begin{concepttable}{\oldconcept{LessThanComparable} requirements}{cpp17.lessthancomparable}
+\begin{oldconcepttable}{LessThanComparable}{}{cpp17.lessthancomparable}
 {x{1in}x{1in}p{3in}}
 \topline
 \hdstyle{Expression}  &   \hdstyle{Return type} &   \hdstyle{Requirement} \\ \capsep
 \tcode{a < b}   &
 convertible to \tcode{bool} &
 \tcode{<} is a strict weak ordering relation\iref{alg.sorting}    \\
-\end{concepttable}
+\end{oldconcepttable}
 
 \enlargethispage{-3\baselineskip}
-\indextext{requirements!\idxoldconcept{DefaultConstructible}}%
-\begin{concepttable}{\oldconcept{DefaultConstructible} requirements}{cpp17.defaultconstructible}
+\begin{oldconcepttable}{DefaultConstructible}{}{cpp17.defaultconstructible}
 {x{2.15in}p{3in}}
 \topline
 \hdstyle{Expression}        &     \hdstyle{Post-condition}  \\ \capsep
 \tcode{T t;}      &     object \tcode{t} is default-initialized   \\ \rowsep
 \tcode{T u\{\};}    &     object \tcode{u} is value-initialized or aggregate-initialized \\ \rowsep
 \tcode{T()}\br\tcode{T\{\}}  &  an object of type \tcode{T} is value-initialized
                                 or aggregate-initialized \\
-\end{concepttable}
+\end{oldconcepttable}
 
-\indextext{requirements!\idxoldconcept{MoveConstructible}}%
-\begin{concepttable}{\oldconcept{MoveConstructible} requirements}{cpp17.moveconstructible}
+\begin{oldconcepttable}{MoveConstructible}{}{cpp17.moveconstructible}
 {p{1in}p{4.15in}}
 \topline
 \hdstyle{Expression}          &   \hdstyle{Post-condition}  \\ \capsep
@@ -1703,20 +1699,18 @@
   work as specified whether \tcode{rv} has been moved from or not.
 \end{note}
 }\\
-\end{concepttable}
+\end{oldconcepttable}
 
-\indextext{requirements!\idxoldconcept{CopyConstructible}}%
-\begin{concepttable}{\oldconcept{CopyConstructible} requirements (in addition to \oldconcept{MoveConstructible})}{cpp17.copyconstructible}
+\begin{oldconcepttable}{CopyConstructible}{ (in addition to \oldconcept{MoveConstructible})}{cpp17.copyconstructible}
 {p{1in}p{4.15in}}
 \topline
 \hdstyle{Expression}          &   \hdstyle{Post-condition}  \\ \capsep
 \tcode{T u = v;}     &   the value of \tcode{v} is unchanged and is equivalent to \tcode{ u}\\ \rowsep
 \tcode{T(v)}        &
   the value of \tcode{v} is unchanged and is equivalent to \tcode{T(v)} \\
-\end{concepttable}
+\end{oldconcepttable}
 
-\indextext{requirements!\idxoldconcept{MoveAssignable}}%
-\begin{concepttable}{\oldconcept{MoveAssignable} requirements}{cpp17.moveassignable}
+\begin{oldconcepttable}{MoveAssignable}{}{cpp17.moveassignable}
 {p{1in}p{1in}p{1in}p{1.9in}}
 \topline
 \hdstyle{Expression} & \hdstyle{Return type} & \hdstyle{Return value} & \hdstyle{Post-condition} \\ \capsep
@@ -1732,18 +1726,16 @@
   work as specified whether \tcode{rv} has been moved from or not.
 \end{note}
 }\\
-\end{concepttable}
+\end{oldconcepttable}
 
-\indextext{requirements!\idxoldconcept{CopyAssignable}}%
-\begin{concepttable}{\oldconcept{CopyAssignable} requirements (in addition to \oldconcept{MoveAssignable})}{cpp17.copyassignable}
+\begin{oldconcepttable}{CopyAssignable}{ (in addition to \oldconcept{MoveAssignable})}{cpp17.copyassignable}
 {p{1in}p{1in}p{1in}p{1.9in}}
 \topline
 \hdstyle{Expression} & \hdstyle{Return type} & \hdstyle{Return value} & \hdstyle{Post-condition} \\ \capsep
 \tcode{t = v}   &   \tcode{T\&} &   \tcode{t}   &   \tcode{t} is equivalent to \tcode{v}, the value of \tcode{v} is unchanged\\
-\end{concepttable}
+\end{oldconcepttable}
 
-\indextext{requirements!\idxoldconcept{Destructible}}
-\begin{concepttable}{\oldconcept{Destructible} requirements}{cpp17.destructible}
+\begin{oldconcepttable}{Destructible}{}{cpp17.destructible}
 {p{1in}p{4.15in}}
 \topline
 \hdstyle{Expression}      &   \hdstyle{Post-condition}  \\ \capsep
@@ -1753,7 +1745,7 @@
   Array types and non-object types are not \oldconcept{Destructible}.
   \end{note}
 } \\
-\end{concepttable}
+\end{oldconcepttable}
 
 \rSec3[swappable.requirements]{Swappable requirements}
 
@@ -1899,8 +1891,7 @@
 denote values of type (possibly \tcode{const}) \tcode{P}, and \tcode{np} denotes
 a value of type (possibly \tcode{const}) \tcode{std::nullptr_t}.
 
-\indextext{requirements!\idxoldconcept{NullablePointer}}%
-\begin{concepttable}{\oldconcept{NullablePointer} requirements}{cpp17.nullablepointer}
+\begin{oldconcepttable}{NullablePointer}{}{cpp17.nullablepointer}
 {lll}
 \topline
 Expression  &   Return type   &   Operational semantics \\ \capsep
@@ -1935,13 +1926,12 @@
 \tcode{np != a}               &
                               &
                               \\ \rowsep
-\end{concepttable}
+\end{oldconcepttable}
 
 \rSec3[hash.requirements]{\oldconcept{Hash} requirements}
 
-\indextext{requirements!\idxoldconcept{Hash}}
 \pnum
-A type \tcode{H} meets the \oldconcept{Hash} requirements if:
+A type \tcode{H} meets the \defnoldconcept{Hash} requirements if:
 \begin{itemize}
 \item it is a function object type\iref{function.objects},
 \item it meets the \oldconcept{CopyConstructible} (\tref{cpp17.copyconstructible}) and
@@ -1956,7 +1946,7 @@
 \tcode{u} is an lvalue of type \tcode{Key}, and \tcode{k} is a value of a type convertible to
 (possibly \tcode{const}) \tcode{Key}.
 
-\begin{concepttable}{\oldconcept{Hash} requirements}{cpp17.hash}
+\begin{oldconcepttable}{Hash}{}{cpp17.hash}
 {llp{.55\hsize}}
 \topline
 Expression        &     Return type     &       Requirement \\ \capsep
@@ -1977,11 +1967,11 @@
 \tcode{h(u)}      &
   \tcode{size_t}  &
   Shall not modify \tcode{u}. \\
-\end{concepttable}
+\end{oldconcepttable}
 
 \rSec3[allocator.requirements]{\oldconcept{Allocator} requirements}
 
-\indextext{requirements!\idxoldconcept{Allocator}}%
+\indextext{\idxoldconcept{Allocator}}%
 \pnum
 The library describes a standard set of requirements for \term{allocators},
 which are class-type objects that encapsulate the information about an allocation model.

source/macros.tex

@@ -355,14 +355,15 @@
 \newcommand{\commentellip}{\tcode{/* ...\ */}}
 
 %% Concepts
-\newcommand{\oldconcept}[1]{\textit{Cpp17#1}}
-\newcommand{\oldconceptdefn}[1]{\defn{Cpp17#1}}
-\newcommand{\idxoldconcept}[1]{Cpp17#1@\textit{Cpp17#1}}
+\newcommand{\oldconceptname}[1]{Cpp17#1}
+\newcommand{\oldconcept}[1]{\textit{\oldconceptname{#1}}}
+\newcommand{\defnoldconcept}[1]{\indexdefn{\idxoldconcept{#1}}\oldconcept{#1}}
+\newcommand{\idxoldconcept}[1]{\oldconceptname{#1}@\oldconcept{#1}}
 % FIXME: A "new" oldconcept (added after C++17),
 % which doesn't get a Cpp17 prefix.
 \newcommand{\newoldconcept}[1]{\textit{#1}}
-\newcommand{\newoldconceptdefn}[1]{\defn{#1}}
-\newcommand{\idxnewoldconcept}[1]{#1@\textit{#1}}
+\newcommand{\defnnewoldconcept}[1]{\indexdefn{\idxnewoldconcept{#1}}\newoldconcept{#1}}
+\newcommand{\idxnewoldconcept}[1]{#1@\newoldconcept{#1}}
 
 \newcommand{\cname}[1]{\tcode{#1}}
 \newcommand{\ecname}[1]{\tcode{\placeholder{#1}}}

source/tables.tex

@@ -170,6 +170,17 @@
  \end{floattablebase}
 }
 
+% usage: \begin{oldconcepttable}{NAME}{EXTRA}{XREF}{LAYOUT}
+% produces table at current location
+\newenvironment{oldconcepttable}[4]
+{
+ \indextext{\idxoldconcept{#1}}%
+ \begin{concepttable}{\oldconcept{#1} requirements#2}{#3}{#4}
+}
+{
+ \end{concepttable}
+}
+
 % usage: \begin{simpletypetable}{TITLE}{XREF}{LAYOUT}
 % produces table at current location
 \newenvironment{simpletypetable}[3]

source/time.tex

@@ -929,6 +929,7 @@
 
 \rSec1[time.clock.req]{\oldconcept{Clock} requirements}
 
+\indextext{\idxoldconcept{Clock}}%
 \pnum
 A clock is a bundle consisting of a \tcode{duration}, a
 \tcode{time_point}, and a function \tcode{now()} to get the current \tcode{time_point}.

source/utilities.tex

@@ -16180,7 +16180,7 @@
 \rSec2[meta.rqmts]{Requirements}
 
 \pnum
-A \oldconceptdefn{UnaryTypeTrait} describes a property
+A \defnoldconcept{UnaryTypeTrait} describes a property
 of a type. It shall be a class template that takes one template type
 argument and, optionally, additional arguments that help define the
 property being described. It shall be \oldconcept{DefaultConstructible},
@@ -16195,7 +16195,7 @@
 unambiguously available in the \oldconcept{UnaryTypeTrait}.
 
 \pnum
-A \oldconceptdefn{BinaryTypeTrait} describes a
+A \defnoldconcept{BinaryTypeTrait} describes a
 relationship between two types. It shall be a class template that
 takes two template type arguments and, optionally, additional
 arguments that help define the relationship being described. It shall
@@ -16211,7 +16211,7 @@
 unambiguously available in the \oldconcept{BinaryTypeTrait}.
 
 \pnum
-A \oldconceptdefn{TransformationTrait}
+A \defnoldconcept{TransformationTrait}
 modifies a property
 of a type. It shall be a class template that takes one
 template type argument and, optionally, additional arguments that help
@@ -20401,8 +20401,7 @@
 \rSec3[formatter.requirements]{Formatter requirements}
 
 \pnum
-\indextext{requirements!\idxnewoldconcept{Formatter}}%
-A type \tcode{F} meets the \newoldconceptdefn{Formatter} requirements if:
+A type \tcode{F} meets the \defnnewoldconcept{Formatter} requirements if:
 \begin{itemize}
 \item
 it meets the