Merge pull request #57 from jaredhoberock/flatten-n4706-diffs

Flatten n4706 diffs

Author: jaredhoberock

README.md

@@ -1,19 +1,25 @@
-    Document Number: N4726
-    Date:            2018-02-12
+    Document Number: NXXXX+1
+    Date:            2018-04-02
     Revises:
     Project:         Programming Language C++
     Project Number:  TS 19570
     Reply-to:        Jared Hoberock
                      NVIDIA Corporation
                      [email protected]
 
-# Parallelism TS Editor's Report, pre-Jacksonville mailing 
+# Parallelism TS Editor's Report, post-Jacksonville mailing 
 
-N4725 is the proposed working draft of Parallelism TS Version 2. It contains editorial changes to the Parallelism TS.
+NXXXX is the proposed working draft of Parallelism TS Version 2. It contains normative changes as directed by the ISO C++ Standards Committee at the 2018 Jacksonville meeting and editorial changes to the Parallelism TS.
 
-N4725 updates the previous draft, N4706, published in the post-Toronto mailing.
+NXXXX updates the previous draft, N4725, published in the pre-Jacksonville mailing.
+
+NYYYY is document NXXXX reformatted as a PDTS draft document.
+
+## Normative Changes
+
+* Apply the proposed wording in [P0214R9](https://wg21.link/P0214R9) (Data-Parallel Vector Types & Operations).
 
 # Acknowledgements
 
-Thanks to Pablo Halpern and Matthias Kretz for suggesting editorial changes.
+Thanks to Alisdair Meredith for suggesting editorial changes.
 

algorithms.html

@@ -83,7 +83,7 @@ <h1>Wavefront Application</h1>
     <p>
       Let <i>f</i> be a function called for each argument list in a sequence of argument lists.
       <i>Wavefront application</i> of <i>f</i> requires that evaluation A<sub>i</sub> be sequenced
-      before evaluation B<sub><ins>j</ins><del>i</del></sub> if i &lt; j and and:
+      before evaluation B<sub>j</sub> if i &lt; j and:
 
       <ul>
         <li>A<sub>i</sub> is sequenced before some evaluation B<sub>i</sub> and B<sub>i</sub> is horizontally matched with B<sub>j</sub>, or</li>
@@ -111,7 +111,6 @@ <h1>Header <code>&lt;experimental/algorithm&gt;</code> synopsis</h1>
 
 namespace std::experimental {
 inline namespace parallelism_v2 {
-
 namespace execution {
   <cxx-ref insynopsis="" to="parallel.alg.novec"></cxx-ref>
   template&lt;class F&gt;
@@ -238,7 +237,7 @@ <h1>Reductions</h1>
         <cxx-signature>template&lt;class T&gt;
 <em>unspecified</em> reduction_max(T&amp; var);</cxx-signature>
 
-        <cxx-requires>T shall meet the requirements of <code>CopyConstructible</code> and <code>MoveAssignable</code>.></cxx-requires>
+        <cxx-requires>T shall meet the requirements of <code>CopyConstructible</code> and <code>MoveAssignable</code>.</cxx-requires>
 
         <cxx-returns>a reduction object of unspecified type having reduction value type <code>T</code>, reduction identity and combiner operation as specified in table <cxx-ref to="reduction-identities-and-combiner-operations"></cxx-ref> and using the object referenced by <code>var</code> as its live-out object.</cxx-returns>
 
@@ -288,7 +287,7 @@ <h1>Reductions</h1>
           </thead>
         </table>
 
-        <cxx-example>The following code updates each element of <code>y</code> and sets <code>s</code> <ins>to</ins><del>ot</del> the sum of the squares.
+        <cxx-example>The following code updates each element of <code>y</code> and sets <code>s</code> to the sum of the squares.
 <pre>
 extern int n;
 extern float x[], y[], a;
@@ -302,7 +301,6 @@ <h1>Reductions</h1>
 );
 </pre>
         </cxx-example>
-        </ins>
       </cxx-function>
     </cxx-section>
 
@@ -333,7 +331,7 @@ <h1>Inductions</h1>
 <em>unspecified</em> induction(T&amp;&amp; var, S stride);</cxx-signature>
 
         <cxx-returns>
-          an induction object with induction value type <code>remove_cv_t<ins>&lt;</ins><del>&gt;</del>remove_reference_t<ins>&lt;</ins><del>&gt;</del>T<ins>&gt;&gt;</ins><del>&lt;&lt;</del></code>,
+          an induction object with induction value type <code>remove_cv_t&lt;remove_reference_t&lt;T&gt;&gt;</code>,
           initial value <code>var</code>, and (if specified) stride <code>stride</code>. If <code>T</code> is an lvalue reference
           to non-<code>const</code> type, then the object referenced by <code>var</code> becomes the live-out object for the
           induction object; otherwise there is no live-out object.
@@ -425,13 +423,13 @@ <h1>For loop</h1>
           The first element in the input sequence is <code>start</code>. Each subsequent element is generated by adding
           <code>stride</code> to the previous element, if <code>stride</code> is specified, otherwise by incrementing
           the previous element. <cxx-note>As described in the C++ standard, section [algorithms.general], arithmetic
-          on non-random-access iterators is performed using <ins><code>advance</code></ins><del>advance</del> and <ins><code>distance</code></ins><del>distance</del>.</cxx-note> <cxx-note>The order of the
+          on non-random-access iterators is performed using <code>advance</code> and <code>distance</code>.</cxx-note> <cxx-note>The order of the
           elements of the input sequence is important for determining ordinal position of an application of <em>f</em>,
           even though the applications themselves may be unordered.</cxx-note></p>
 
           The first argument to <em>f</em> is an element from the input sequence. <cxx-note>if <code>I</code> is an
           iterator type, the iterators in the input sequence are not dereferenced before
-          being passed to <em>f</em>.</cxx-note> For each member of the <ins><code>rest</code></ins><del>rest</del> parameter pack
+          being passed to <em>f</em>.</cxx-note> For each member of the <code>rest</code> parameter pack
           excluding <em>f</em>, an additional argument is passed to each application of <em>f</em> as follows:
 
           <ul>
@@ -478,7 +476,7 @@ <h1>No vec</h1>
         <cxx-returns>
           the result of <code>f</code>.
         </cxx-returns>
-        
+
         <cxx-notes>
           If <code>f</code> exits via an exception, then <code>terminate</code> will be called, consistent
           with all other potentially-throwing operations invoked with <code>vector_policy</code> execution.

execution_policies.html

@@ -18,7 +18,7 @@ <h1>Header <code>&lt;experimental/execution&gt;</code> synopsis</h1>
 
   <cxx-ref insynopsis="" to="parallel.execpol.objects"></cxx-ref>
   inline constexpr unsequenced_policy unseq{ <i>unspecified</i> };
-  inline constexpr <ins>vector_policy vec</ins><del>parallel_policy par</del>{ <i>unspecified</i> };
+  inline constexpr vector_policy vec{ <i>unspecified</i> };
 }
 }
 }
@@ -39,7 +39,7 @@ <h1>Unsequenced execution policy</h1>
 
     <p><cxx-note>This overrides the usual guarantee from the C++ Standard, <cxx-ref in="cxx" to="intro.execution"></cxx-ref> [intro.execution] that function executions do not overlap with one another.</cxx-note></p>
 
-    <p>During the execution of a parallel algorithm with the <code>experimental::execution::unsequenced_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> <ins>will</ins><del>shall</del> be called.</p>
+    <p>During the execution of a parallel algorithm with the <code>experimental::execution::unsequenced_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> will be called.</p>
 
   </cxx-section>
 
@@ -52,18 +52,18 @@ <h1>Vector execution policy</h1>
 
     <p>The class <code>vector_policy</code> is an execution policy type used as a unique type to disambiguate parallel algorithm overloading and indicate that a parallel algorithm's execution may be vectorized. Additionally, such vectorization will result in an execution that respects the sequencing constraints of wavefront application ([parallel.alg.general.wavefront]). <cxx-note>The implementation thus makes stronger guarantees than for <code>unsequenced_policy</code>, for example.</cxx-note></p>
 
-    <p>The invocations of element access functions in parallel algorithms invoked with an execution policy of type <code>vector_policy</code> are permitted to execute in unordered fashion in the calling thread, unsequenced with respect to one another within the calling thread, subject to the sequencing constraints of wavefront application (<cxx-ref to="parallel.alg.general.wavefront"></cxx-ref>) for the last argument to <code>for_loop</code><ins>, for_loop_n,</ins> <del>or </del><code>for_loop_strided</code><ins>, or <code>for_loop_strided_n</code>.</p>
+    <p>The invocations of element access functions in parallel algorithms invoked with an execution policy of type <code>vector_policy</code> are permitted to execute in unordered fashion in the calling thread, unsequenced with respect to one another within the calling thread, subject to the sequencing constraints of wavefront application (<cxx-ref to="parallel.alg.general.wavefront"></cxx-ref>) for the last argument to <code>for_loop</code>, <code>for_loop_n</code>, <code>for_loop_strided</code>, or <code>for_loop_strided_n</code>.</p>
 
-    <p>During the execution of a parallel algorithm with the <code>experimental::execution::vector_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> <ins>will</ins><del>shall</del> be called.</p>
+    <p>During the execution of a parallel algorithm with the <code>experimental::execution::vector_policy</code> policy, if the invocation of an element access function exits via an uncaught exception, <code>terminate()</code> will be called.</p>
 
   </cxx-section>
 
   <cxx-section id="parallel.execpol.objects">
     <h1>Execution policy objects</h1>
 
 <pre>
-<ins>inline </ins>constexpr execution::unsequenced_policy unseq{};
-<ins>inline </ins>constexpr execution::vector_policy vec{};
+inline constexpr execution::unsequenced_policy unseq{};
+inline constexpr execution::vector_policy vec{};
 </pre>
 
     <p>The header <code>&lt;experimental/execution&gt;</code> declares a global object associated with each type of execution policy defined by this Technical Specification.</p>

front_matter.html

@@ -1,8 +1,8 @@
 <cxx-titlepage stage="draft">
-<cxx-docnum>N4725</cxx-docnum>
+<cxx-docnum>NXXXX</cxx-docnum>
 <cxx-project-number>19570</cxx-project-number>
-  <time pubdate="">2018-02-12</time>
-  <cxx-revises><a href="http://wg21.link/N4706">N4706</a></cxx-revises>
+  <time pubdate="">2018-04-02</time>
+  <cxx-revises><a href="http://wg21.link/N4725">N4725</a></cxx-revises>
   <cxx-editor>
     Jared Hoberock<br/>
     NVIDIA Corporation<br/>

normative_references.html

@@ -19,7 +19,7 @@ <h1>Normative references</h1>
   Algorithms Library</dfn>.</p>
 
   <p>Unless otherwise specified, the whole of the C++ Standard's Library
-  introduction (C++14 §20) is included into this
+  introduction (<cxx-ref in="cxx" to="library"></cxx-ref>) is included into this
   Technical Specification by reference.</p>
 </cxx-clause>