LWG3973 Monadic operations should be ADL-proof

Author: burblebee

source/utilities.tex

@@ -4153,7 +4153,7 @@
 
 \begin{itemdescr}
 \pnum
-Let \tcode{U} be \tcode{invoke_result_t<F, decltype(value())>}.
+Let \tcode{U} be \tcode{invoke_result_t<F, decltype(*val)>}.
 
 \pnum
 \mandates
@@ -4164,7 +4164,7 @@
 Equivalent to:
 \begin{codeblock}
 if (*this) {
-  return invoke(std::forward<F>(f), value());
+  return invoke(std::forward<F>(f), *val);
 } else {
   return remove_cvref_t<U>();
 }
@@ -4179,7 +4179,7 @@
 
 \begin{itemdescr}
 \pnum
-Let \tcode{U} be \tcode{invoke_result_t<F, decltype(std::move(value()))>}.
+Let \tcode{U} be \tcode{invoke_result_t<F, decltype(std::move(*val))>}.
 
 \pnum
 \mandates
@@ -4190,7 +4190,7 @@
 Equivalent to:
 \begin{codeblock}
 if (*this) {
-  return invoke(std::forward<F>(f), std::move(value()));
+  return invoke(std::forward<F>(f), std::move(*val));
 } else {
   return remove_cvref_t<U>();
 }
@@ -4205,15 +4205,15 @@
 
 \begin{itemdescr}
 \pnum
-Let \tcode{U} be \tcode{remove_cv_t<invoke_result_t<F, decltype(value())>>}.
+Let \tcode{U} be \tcode{remove_cv_t<invoke_result_t<F, decltype(*val)>>}.
 
 \pnum
 \mandates
 \tcode{U} is a non-array object type
 other than \tcode{in_place_t} or \tcode{nullopt_t}.
 The declaration
 \begin{codeblock}
-U u(invoke(std::forward<F>(f), value()));
+U u(invoke(std::forward<F>(f), *val));
 \end{codeblock}
 is well-formed for some invented variable \tcode{u}.
 \begin{note}
@@ -4224,7 +4224,7 @@
 \returns
 If \tcode{*this} contains a value, an \tcode{optional<U>} object
 whose contained value is direct-non-list-initialized with
-\tcode{invoke(std::forward<F>(f), value())};
+\tcode{invoke(std::forward<F>(f), *val)};
 otherwise, \tcode{optional<U>()}.
 \end{itemdescr}
 
@@ -4237,15 +4237,15 @@
 \begin{itemdescr}
 \pnum
 Let \tcode{U} be
-\tcode{remove_cv_t<invoke_result_t<F, decltype(std::move(value()))>>}.
+\tcode{remove_cv_t<invoke_result_t<F, decltype(std::move(*val))>>}.
 
 \pnum
 \mandates
 \tcode{U} is a non-array object type
 other than \tcode{in_place_t} or \tcode{nullopt_t}.
 The declaration
 \begin{codeblock}
-U u(invoke(std::forward<F>(f), std::move(value())));
+U u(invoke(std::forward<F>(f), std::move(*val)));
 \end{codeblock}
 is well-formed for some invented variable \tcode{u}.
 \begin{note}
@@ -4256,7 +4256,7 @@
 \returns
 If \tcode{*this} contains a value, an \tcode{optional<U>} object
 whose contained value is direct-non-list-initialized with
-\tcode{invoke(std::forward<F>(f), std::move(value()))};
+\tcode{invoke(std::forward<F>(f), std::move(*val))};
 otherwise, \tcode{optional<U>()}.
 \end{itemdescr}
 
@@ -8368,7 +8368,7 @@
 
 \begin{itemdescr}
 \pnum
-Let \tcode{U} be \tcode{remove_cvref_t<invoke_result_t<F, decltype(**this)>>}.
+Let \tcode{U} be \tcode{remove_cvref_t<invoke_result_t<F, decltype((\exposid{val}))>>}.
 
 \pnum
 \constraints
@@ -8384,7 +8384,7 @@
 Equivalent to:
 \begin{codeblock}
 if (has_value())
-  return invoke(std::forward<F>(f), **this);
+  return invoke(std::forward<F>(f), @\exposid{val}@);
 else
   return U(unexpect, error());
 \end{codeblock}
@@ -8399,7 +8399,7 @@
 \begin{itemdescr}
 \pnum
 Let \tcode{U} be
-\tcode{remove_cvref_t<invoke_result_t<F, decltype(std::move(**this))>>}.
+\tcode{remove_cvref_t<invoke_result_t<F, decltype(std::move(\exposid{val}))>>}.
 
 \pnum
 \constraints
@@ -8415,7 +8415,7 @@
 Equivalent to:
 \begin{codeblock}
 if (has_value())
-  return invoke(std::forward<F>(f), std::move(**this));
+  return invoke(std::forward<F>(f), std::move(@\exposid{val}@));
 else
   return U(unexpect, std::move(error()));
 \end{codeblock}
@@ -8433,7 +8433,7 @@
 
 \pnum
 \constraints
-\tcode{is_constructible_v<T, decltype(**this)>} is \tcode{true}.
+\tcode{is_constructible_v<T, decltype((\exposid{val}))>} is \tcode{true}.
 
 \pnum
 \mandates
@@ -8445,7 +8445,7 @@
 Equivalent to:
 \begin{codeblock}
 if (has_value())
-  return G(in_place, **this);
+  return G(in_place, @\exposid{val}@);
 else
   return invoke(std::forward<F>(f), error());
 \end{codeblock}
@@ -8464,7 +8464,7 @@
 
 \pnum
 \constraints
-\tcode{is_constructible_v<T, decltype(std::move(**this))>} is \tcode{true}.
+\tcode{is_constructible_v<T, decltype(std::move(\exposid{val}))>} is \tcode{true}.
 
 \pnum
 \mandates
@@ -8476,7 +8476,7 @@
 Equivalent to:
 \begin{codeblock}
 if (has_value())
-  return G(in_place, std::move(**this));
+  return G(in_place, std::move(@\exposid{val}@));
 else
   return invoke(std::forward<F>(f), std::move(error()));
 \end{codeblock}
@@ -8491,7 +8491,7 @@
 \begin{itemdescr}
 \pnum
 Let \tcode{U} be
-\tcode{remove_cv_t<invoke_result_t<F, decltype(**this)>>}.
+\tcode{remove_cv_t<invoke_result_t<F, decltype((\exposid{val}))>>}.
 
 \pnum
 \constraints
@@ -8503,7 +8503,7 @@
 If \tcode{is_void_v<U>} is \tcode{false},
 the declaration
 \begin{codeblock}
-U u(invoke(std::forward<F>(f), **this));
+U u(invoke(std::forward<F>(f), @\exposid{val}@));
 \end{codeblock}
 is well-formed.
 
@@ -8517,9 +8517,9 @@
 Otherwise, if \tcode{is_void_v<U>} is \tcode{false}, returns an
 \tcode{expected<U, E>} object whose \exposid{has_val} member is \tcode{true}
 and \exposid{val} member is direct-non-list-initialized with
-\tcode{invoke(std::forward<F>(f), **this)}.
+\tcode{invoke(std::forward<F>(f), \exposid{val})}.
 \item
-Otherwise, evaluates \tcode{invoke(std::forward<F>(f), **this)} and then
+Otherwise, evaluates \tcode{invoke(std::forward<F>(f), \exposid{val})} and then
 returns \tcode{expected<U, E>()}.
 \end{itemize}
 \end{itemdescr}
@@ -8533,7 +8533,7 @@
 \begin{itemdescr}
 \pnum
 Let \tcode{U} be
-\tcode{remove_cv_t<invoke_result_t<F, decltype(std::move(**this))>>}.
+\tcode{remove_cv_t<invoke_result_t<F, decltype(std::move(\exposid{val}))>>}.
 
 \pnum
 \constraints
@@ -8544,7 +8544,7 @@
 \tcode{U} is a valid value type for \tcode{expected}. If \tcode{is_void_v<U>} is
 \tcode{false}, the declaration
 \begin{codeblock}
-U u(invoke(std::forward<F>(f), std::move(**this)));
+U u(invoke(std::forward<F>(f), std::move(@\exposid{val}@)));
 \end{codeblock}
 is well-formed.
 
@@ -8558,9 +8558,9 @@
 Otherwise, if \tcode{is_void_v<U>} is \tcode{false}, returns an
 \tcode{expected<U, E>} object whose \exposid{has_val} member is \tcode{true}
 and \exposid{val} member is direct-non-list-initialized with
-\tcode{invoke(std::forward<F>(f), std::move(**this))}.
+\tcode{invoke(std::forward<F>(f), std::move(\exposid{val}))}.
 \item
-Otherwise, evaluates \tcode{invoke(std::forward<F>(f), std::move(**this))} and
+Otherwise, evaluates \tcode{invoke(std::forward<F>(f), std::move(\exposid{val}))} and
 then returns \tcode{ex\-pected<U, E>()}.
 \end{itemize}
 \end{itemdescr}
@@ -8577,7 +8577,7 @@
 
 \pnum
 \constraints
-\tcode{is_constructible_v<T, decltype(**this)>} is \tcode{true}.
+\tcode{is_constructible_v<T, decltype((\exposid{val}))>} is \tcode{true}.
 
 \pnum
 \mandates
@@ -8591,7 +8591,7 @@
 \pnum
 \returns
 If \tcode{has_value()} is \tcode{true},
-\tcode{expected<T, G>(in_place, **this)}; otherwise, an \tcode{expected<T, G>}
+\tcode{expected<T, G>(in_place, \exposid{val})}; otherwise, an \tcode{expected<T, G>}
 object whose \exposid{has_val} member is \tcode{false} and \exposid{unex} member
 is direct-non-list-initialized with \tcode{invoke(std::forward<F>(f), error())}.
 \end{itemdescr}
@@ -8609,7 +8609,7 @@
 
 \pnum
 \constraints
-\tcode{is_constructible_v<T, decltype(std::move(**this))>} is \tcode{true}.
+\tcode{is_constructible_v<T, decltype(std::move(\exposid{val}))>} is \tcode{true}.
 
 \pnum
 \mandates
@@ -8623,7 +8623,7 @@
 \pnum
 \returns
 If \tcode{has_value()} is \tcode{true},
-\tcode{expected<T, G>(in_place, std::move(**this))}; otherwise, an
+\tcode{expected<T, G>(in_place, std::move(\exposid{val}))}; otherwise, an
 \tcode{expected<T, G>} object whose \exposid{has_val} member is \tcode{false}
 and \exposid{unex} member is direct-non-list-initialized with
 \tcode{invoke(std::forward<F>(f), std::move(error()))}.