[optional.monadic] Replace *val with **this

Author: jensmaurer

source/utilities.tex

@@ -4171,7 +4171,7 @@
 Equivalent to:
 \begin{codeblock}
 if (*this) {
-  return invoke(std::forward<F>(f), *val);
+  return invoke(std::forward<F>(f), **this);
 } else {
   return remove_cvref_t<U>();
 }
@@ -4186,7 +4186,7 @@
 
 \begin{itemdescr}
 \pnum
-Let \tcode{U} be \tcode{invoke_result_t<F, decltype(std::move(*val))>}.
+Let \tcode{U} be \tcode{invoke_result_t<F, decltype(std::move(**this))>}.
 
 \pnum
 \mandates
@@ -4197,7 +4197,7 @@
 Equivalent to:
 \begin{codeblock}
 if (*this) {
-  return invoke(std::forward<F>(f), std::move(*val));
+  return invoke(std::forward<F>(f), std::move(**this));
 } else {
   return remove_cvref_t<U>();
 }
@@ -4212,15 +4212,15 @@
 
 \begin{itemdescr}
 \pnum
-Let \tcode{U} be \tcode{remove_cv_t<invoke_result_t<F, decltype(*val)>>}.
+Let \tcode{U} be \tcode{remove_cv_t<invoke_result_t<F, decltype(**this)>>}.
 
 \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), *val));
+U u(invoke(std::forward<F>(f), **this));
 \end{codeblock}
 is well-formed for some invented variable \tcode{u}.
 \begin{note}
@@ -4231,7 +4231,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), *val)};
+\tcode{invoke(std::forward<F>(f), **this)};
 otherwise, \tcode{optional<U>()}.
 \end{itemdescr}
 
@@ -4244,15 +4244,15 @@
 \begin{itemdescr}
 \pnum
 Let \tcode{U} be
-\tcode{remove_cv_t<invoke_result_t<F, decltype(std::move(*val))>>}.
+\tcode{remove_cv_t<invoke_result_t<F, decltype(std::move(**this))>>}.
 
 \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(*val)));
+U u(invoke(std::forward<F>(f), std::move(**this)));
 \end{codeblock}
 is well-formed for some invented variable \tcode{u}.
 \begin{note}
@@ -4263,7 +4263,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(*val))};
+\tcode{invoke(std::forward<F>(f), std::move(**this))};
 otherwise, \tcode{optional<U>()}.
 \end{itemdescr}