From 1945adf0663fa4514ff6a789903d277a23232711 Mon Sep 17 00:00:00 2001
From: Matthias Kretz <m.kretz@gsi.de>
Date: Wed, 26 Jun 2024 20:40:06 -0500
Subject: [PATCH] Use "models" in Constraints

ChangeLog:

	* P1928/changelog.tex:
	* P1928/wording.tex:
---
 P1928/changelog.tex |  3 +++
 P1928/wording.tex   | 42 ++++++------------------------------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/P1928/changelog.tex b/P1928/changelog.tex
index d4e714a..51664f0 100644
--- a/P1928/changelog.tex
+++ b/P1928/changelog.tex
@@ -156,5 +156,8 @@ \section{Changelog}
 \item Remove paragraph about default initialization of \simd.
 \item Reword all constructor \emph{Effects} from “Constructs an object \ldots”
   to “Initializes \ldots”.
+\item Instead of writing “satisfies X” in \emph{Constraints} and “models X” in
+  \emph{Preconditions}, say only “models X” in \emph{Constraints}.
+
   \todo Reorder \code{simd} and \code{simd_mask} specification in the wording (mask first).
 \end{revision}
diff --git a/P1928/wording.tex b/P1928/wording.tex
index 3f14bd7..0c28b0b 100644
--- a/P1928/wording.tex
+++ b/P1928/wording.tex
@@ -793,7 +793,7 @@
   \pnum\constraints
   \begin{itemize}
     \item \tcode{iter_value_t<It>} is a vectorizable type, and
-    \item \tcode{It} satisfies \tcode{contiguous_iterator}.
+    \item \tcode{It} models \tcode{contiguous_iterator}.
   \end{itemize}
 
   \pnum\mandates
@@ -802,7 +802,6 @@
   \pnum\expects
   \begin{itemize}
     \item #1
-    \item \tcode{It} models \tcode{contiguous_iterator}.
     \flagsRequires{basic_simd, iter_value_t<It>}{iter_value_t<It>}
   \end{itemize}
 
@@ -861,8 +860,8 @@
   \pnum\constraints
   \begin{itemize}
     \item \tcode{iter_value_t<Out>} is a vectorizable type, and
-    \item \tcode{Out} satisfies \tcode{contiguous_iterator}, and
-    \item \tcode{Out} satisfies \tcode{indirectly_writable<value_type>}.
+    \item \tcode{Out} models \tcode{contiguous_iterator}, and
+    \item \tcode{Out} models \tcode{indirectly_writable<value_type>}.
   \end{itemize}
 
   \pnum\mandates
@@ -871,8 +870,6 @@
   \pnum\expects
   \begin{itemize}
     \item #1
-    \item \tcode{Out} models \tcode{contiguous_iterator}.
-    \item \tcode{Out} models \tcode{indirectly_writable<value_type>}.
     \flagsRequires{basic_simd, iter_value_t<Out>}{iter_value_t<Out>}
   \end{itemize}
 
@@ -1252,9 +1249,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\returns
@@ -1269,9 +1263,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\returns
@@ -1285,9 +1276,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\returns
@@ -1302,9 +1290,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\returns
@@ -1375,9 +1360,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\returns
@@ -1391,9 +1373,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\returns
@@ -1408,9 +1387,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\returns
@@ -1429,9 +1405,6 @@
 
 \begin{itemdescr}
   \pnum\constraints
-  \tcode{T} satisfies \tcode{totally_ordered}.
-
-  \pnum\expects
   \tcode{T} models \tcode{totally_ordered}.
 
   \pnum\expects
@@ -1661,13 +1634,12 @@
   \pnum\constraints
   \begin{itemize}
     \item \tcode{iter_value_t<It>} is of type \tcode{bool}, and
-    \item \tcode{It} satisfies \tcode{contiguous_iterator}.
+    \item \tcode{It} models \tcode{contiguous_iterator}.
   \end{itemize}
 
   \pnum\expects
   \begin{itemize}
     \item #1
-    \item \tcode{It} models \tcode{contiguous_iterator}.
     \flagsRequires{basic_simd_mask}{value_type}
   \end{itemize}
 
@@ -1726,15 +1698,13 @@
   \pnum\constraints
   \begin{itemize}
     \item \tcode{iter_value_t<Out>} is of type \tcode{bool}, and
-    \item \tcode{Out} satisfies \tcode{contiguous_iterator}, and
-    \item \tcode{Out} satisfies \tcode{indirectly_writable<value_type>}.
+    \item \tcode{Out} models \tcode{contiguous_iterator}, and
+    \item \tcode{Out} models \tcode{indirectly_writable<value_type>}.
   \end{itemize}
 
   \pnum\expects
   \begin{itemize}
     \item #1
-    \item \tcode{Out} models \tcode{contiguous_iterator}.
-    \item \tcode{Out} models \tcode{indirectly_writable<value_type>}.
     \flagsRequires{basic_simd_mask}{value_type}
   \end{itemize}