Commit d148ed5

From ff270cf79e982231f345d03fb2dd544ae490dc6a Mon Sep 17 00:00:00 2001

Date: Mon, 19 Jun 2017 22:24:53 -0400

Subject: [PATCH] Hacks to make Ranges TS work with cxxdraft-htmlgen

concepts.tex | 1 -

cxx.tex | 4 ---

intro.tex | 6 ++--

macros.tex | 8 ++---

statements.tex | 49 +++++++++++++-------------

utilities.tex | 106 ++++++++++++++++++++++++++++-----------------------------

6 files changed, 82 insertions(+), 92 deletions(-)

index fa76dac..6429df4 100644

index 6f709d7..999d248 100644

index b1fa674..a59e3a1 100644

\indexdefn{projection}%

\definition{projection}{defns.projection}

@@ -103,7 +103,7 @@ ranges::sort(pairs, std::less<>{}, [](auto const& p) { return p.first; });

index f6a1f06..dcbed28 100644

For a range-based for statement of the form

@@ -32,33 +30,33 @@ and for a range-based for statement of the form

let \grammarterm{range-init} be equivalent to the \grammarterm{braced-init-list}.

In each case, a range-based for statement is equivalent to

where \tcode{__range}, \tcode{__begin}, and \tcode{__end} are variables defined for

exposition only, and \tcode{_RangeT} is the type of the

@@ -99,4 +97,3 @@ In the \grammarterm{decl-specifier-seq} of a \grammarterm{for-range-declaration}

index 4cf0b3b..7406af8 100644

@@ -658,9 +658,9 @@ complete or (possibly \cv) \tcode{void}.} \\ \rowsep

\ednote{Delete [meta.trans.other]/p3 from ISO/IEC 14882:2014 and replace it with

the following:}

\pnum

remove_reference_t<A>{}>}. Let \tcode{UNCVREF(A)} be

\tcode{remove_cv_t<remove_reference_t<A>{}>}. Let \tcode{XREF(A)}

denote a unary template \tcode{T} such that \tcode{T<UNCVREF(A)>}

@@ -674,34 +674,34 @@ or \tcode{Z} otherwise. Let \tcode{COND_RES(X, Y)} be

\tcode{decltype(declval<bool>() ? declval<X>() : declval<Y>())}.

Given types \tcode{A} and \tcode{B}, let \tcode{X} be

\tcode{remove_reference_t<A>}, let \tcode{Y} be

\begin{itemize}

\tcode{COMMON_REF(A, B)} is

\tcode{RREF_RES(COMMON_REF(X\&, Y\&))}. If \tcode{A} and \tcode{B}

are both rvalue reference types, and \tcode{C} is well-formed,

and \tcode{is_convertible<A, C>::value} and

\tcode{is_convertible<B, C>::value} are \tcode{true}, then

\tcode{COMMON_REF(const X\&, Y\&)}. If \tcode{A} is an rvalue

reference and \tcode{B} is an lvalue reference and \tcode{D} is

well-formed and \tcode{is_convertible<A, D>::value} is

is an rvalue reference, then \tcode{COMMON_REF(A, B)} is

\end{itemize}

\pnum

\tcode{T} of types, the member \tcode{type} shall be either defined or not

present as follows:

\begin{itemize}

@@ -709,22 +709,21 @@ present as follows:

\item Otherwise, if \tcode{sizeof...(T)} is one, let \changed{T0}{T1}

denote the sole type in the pack \tcode{T}. The member typedef \tcode{type}

shall denote the same type as \tcode{decay_t<\changed{T0}{T1}>}.

denote the two types in the pack \tcode{T}, and let \tcode{D1} and \tcode{D2}

\begin{itemize}

\begin{itemize}

\end{itemize}

\item Otherwise, if \tcode{sizeof...(T)} is greater than \changed{one}{two},

let \tcode{T1}, \tcode{T2}, and \tcode{R\added{est}},

respectively, denote the first, second, and (pack of) remaining types

@@ -732,48 +731,47 @@ present as follows:

\exitnote} Let \tcode{C} \removed{denote the type, if any, of an unevaluated

conditional expression (5.16) whose first operand is an arbitrary value of

type \tcode{bool}, whose second operand is an xvalue of type \tcode{T1}, and

\begin{itemize}

\tcode{type} shall denote the same type, if any, as

\end{itemize}

\end{itemize}

\pnum

\begin{itemize}

type in the pack \tcode{T}. The member typedef \tcode{type} shall denote the

\begin{itemize}

XREF(T1), XREF(T2)>::type} is well-formed, then the member typedef

\end{itemize}

\tcode{T2}, and \tcode{Rest}, respectively, denote the first, second, and

(pack of) remaining types comprising \tcode{T}. Let \tcode{C} be the type

\begin{itemize}

\end{itemize}

\end{itemize}

\rSec1[taggedtup]{Tagged tuple-like types}