Skip to content

Commit 69cb9c4

Browse files
jaredhoberockjaredhoberock
authored
Merge pull request #75 from cplusplus/additional_editorial_corrections
Additional editorial corrections
2 parents b64be46 + 5a8f4ea commit 69cb9c4

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ N4757 is document N4755 reformatted as a TS document.
3131

3232
Thanks to Matthias Kretz for help typesetting the final TS document.
3333

34-
Thanks to [reviewers] for reviewing and suggesting editorial changes.
34+
Thanks to Matthias Kretz, Bryce Lelbach, Marshall Clow, and Hubert Tong for reviewing and suggesting editorial changes.
3535

‎src/algorithms.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
\end{note}
5555

5656
\pnum
57-
In the following, $X_i$ and $X_j$ refer to evaluations of the \emph{same} expression
57+
In the following, $X_i$ and $X_j$ refer to evaluations of the same expression
5858
or statement contained in the application of an element access function
5959
corresponding to the $i^\text{th}$ and $j^\text{th}$ elements of the input sequence.
6060
\begin{note}There might be several evaluations $X_k$, $Y_k$, etc. of a single
@@ -71,7 +71,7 @@
7171
\item there exist horizontally matched evaluations $A_i$ and $A_j$ that are vertical antecedents of evaluations $B_i$ and $B_j$, respectively.
7272
\end{itemize}
7373

74-
\begin{note}\term{Horizontally matched} establishes a theoretical \emph{lock-step} relationship between evaluations in different applications of an element access function.\end{note}
74+
\begin{note}\term{Horizontally matched} establishes a theoretical lock-step relationship between evaluations in different applications of an element access function.\end{note}
7575

7676
\pnum
7777
Let $f$ be a function called for each argument list in a sequence of argument lists. \defn{Wavefront application} of $f$ requires that evaluation $A_i$ be sequenced before evaluation $B_j$ if $i < j$ and:
@@ -82,7 +82,7 @@
8282
\end{itemize}
8383

8484
\begin{note}
85-
\term{Wavefront application} guarantees that parallel applications $i$ and $j$ execute such that progress on application $j$ never gets \emph{ahead} of application $i$.
85+
\term{Wavefront application} guarantees that parallel applications $i$ and $j$ execute such that progress on application $j$ never gets ahead of application $i$.
8686
\end{note}
8787
\begin{note}
8888
The relationships between $A_i$ and $B_i$ and between $A_j$ and $B_j$ are \term{sequenced before}, not \term{vertical antecedent}.

‎src/simd.tex

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
int find_first_set(@\UNSP{T}@);
162162
int find_last_set(@\UNSP{T}@);
163163

164-
// \ref{parallel.simd.whereexpr}, Class templates \tcode{const_where_expression} and \tcode{where_expression}
164+
// \ref{parallel.simd.whereexpr}, Where expression class templates
165165
template<class M, class T> class const_where_expression;
166166
template<class M, class T> class where_expression;
167167

@@ -466,7 +466,7 @@
466466
Where present, the member typedef \tcode{type} names \tcode{simd<T, Abi1>} if \tcode V is \tcode{simd<T, Abi0>} or \tcode{simd_mask<T, Abi1>} if \tcode V is \tcode{simd_mask<T, Abi0>}.
467467
\end{itemdescr}
468468

469-
\rSec2[parallel.simd.whereexpr]{Class templates \tcode{const_where_expression} and \tcode{where_expression}}
469+
\rSec2[parallel.simd.whereexpr]{Where expression class templates}
470470

471471
\begin{codeblock}
472472
template<class M, class T> class const_where_expression {
@@ -625,7 +625,7 @@
625625
\begin{itemdescr}
626626
\pnum\requires
627627
\begin{itemize}
628-
\item If \tcode{is_simd_flag_type_v<U>} \ednote{\tcode{U} is wrong. P0214R9 says \tcode{M} instead. And it should be consistent with the wording in \tcode{copy_to} above.} is \tcode{true}, for all selected indices $i$, $i$ shall be less than the number of values pointed to by \tcode{mem}.
628+
\item If \tcode{is_simd_flag_type_v<U>} is \tcode{true}, for all selected indices $i$, $i$ shall be less than the number of values pointed to by \tcode{mem}.
629629
\flagsRequires{T, U}{U}
630630
\end{itemize}
631631

@@ -662,21 +662,21 @@
662662

663663
simd() noexcept = default;
664664

665-
// \ref{parallel.simd.ctor}, Constructors
665+
// \ref{parallel.simd.ctor}, \tcode{simd} constructors
666666
template<class U> simd(U&& value) noexcept;
667667
template<class U> simd(const simd<U, simd_abi::fixed_size<size()>>&) noexcept;
668668
template<class G> explicit simd(G&& gen) noexcept;
669669
template<class U, class Flags> simd(const U* mem, Flags f);
670670

671-
// \ref{parallel.simd.copy}, Copy functions
671+
// \ref{parallel.simd.copy}, \tcode{simd} copy functions
672672
template<class U, class Flags> copy_from(const U* mem, Flags f);
673673
template<class U, class Flags> copy_to(U* mem, Flags f);
674674

675-
// \ref{parallel.simd.subscr}, Subscript operators
675+
// \ref{parallel.simd.subscr}, \tcode{simd} subscript operators
676676
reference operator[](size_t);
677677
value_type operator[](size_t) const;
678678

679-
// \ref{parallel.simd.unary}, Unary operators
679+
// \ref{parallel.simd.unary}, \tcode{simd} unary operators
680680
simd& operator++() noexcept;
681681
simd operator++(int) noexcept;
682682
simd& operator--() noexcept;
@@ -686,7 +686,7 @@
686686
simd operator+() const noexcept;
687687
simd operator-() const noexcept;
688688

689-
// \ref{parallel.simd.binary}, Binary operators
689+
// \ref{parallel.simd.binary}, \tcode{simd} binary operators
690690
friend simd operator+(const simd&, const simd&) noexcept;
691691
friend simd operator-(const simd&, const simd&) noexcept;
692692
friend simd operator*(const simd&, const simd&) noexcept;
@@ -700,7 +700,7 @@
700700
friend simd operator<<(const simd&, int) noexcept;
701701
friend simd operator>>(const simd&, int) noexcept;
702702

703-
// \ref{parallel.simd.cassign}, Compound assignment
703+
// \ref{parallel.simd.cassign}, \tcode{simd} compound assignment
704704
friend simd& operator+=(simd&, const simd&) noexcept;
705705
friend simd& operator-=(simd&, const simd&) noexcept;
706706
friend simd& operator*=(simd&, const simd&) noexcept;
@@ -714,7 +714,7 @@
714714
friend simd& operator<<=(simd&, int) noexcept;
715715
friend simd& operator>>=(simd&, int) noexcept;
716716

717-
// \ref{parallel.simd.comparison}, Compare operators
717+
// \ref{parallel.simd.comparison}, \tcode{simd} compare operators
718718
friend mask_type operator==(const simd&, const simd&) noexcept;
719719
friend mask_type operator!=(const simd&, const simd&) noexcept;
720720
friend mask_type operator>=(const simd&, const simd&) noexcept;
@@ -919,7 +919,7 @@
919919
Exchanges the values \tcode{a} and \tcode{b} refer to.
920920
\end{itemdescr}
921921

922-
\rSec2[parallel.simd.ctor]{Constructors}
922+
\rSec2[parallel.simd.ctor]{\tcode{simd} constructors}
923923

924924
\begin{itemdecl}
925925
template<class U> simd(U&&) noexcept;
@@ -994,7 +994,7 @@
994994
\end{itemize}
995995
\end{itemdescr}
996996

997-
\rSec2[parallel.simd.copy]{Copy functions}
997+
\rSec2[parallel.simd.copy]{\tcode{simd} copy functions}
998998

999999
\begin{itemdecl}
10001000
template<class U, class Flags> void copy_from(const U* mem, Flags);
@@ -1040,7 +1040,7 @@
10401040
\end{itemize}
10411041
\end{itemdescr}
10421042

1043-
\rSec2[parallel.simd.subscr]{Subscript operators}
1043+
\rSec2[parallel.simd.subscr]{\tcode{simd} subscript operators}
10441044

10451045
\begin{itemdecl}
10461046
reference operator[](size_t i);
@@ -1070,7 +1070,7 @@
10701070
\pnum\throws Nothing.
10711071
\end{itemdescr}
10721072

1073-
\rSec2[parallel.simd.unary]{Unary operators}
1073+
\rSec2[parallel.simd.unary]{\tcode{simd} unary operators}
10741074

10751075
\pnum
10761076
Effects in this subclause are applied as unary element-wise operations.
@@ -1162,9 +1162,9 @@
11621162
A \tcode{simd} object where the $i^\text{th}$ element is initialized to \tcode{-operator[]($i$)} \foralli.
11631163
\end{itemdescr}
11641164

1165-
\rSec1[parallel.simd.nonmembers]{Non-member operations}
1165+
\rSec1[parallel.simd.nonmembers]{\tcode{simd} non-member operations}
11661166

1167-
\rSec2[parallel.simd.binary]{Binary operators}
1167+
\rSec2[parallel.simd.binary]{\tcode{simd} binary operators}
11681168

11691169
\begin{itemdecl}
11701170
friend simd operator+(const simd& lhs, const simd& rhs) noexcept;
@@ -1200,7 +1200,7 @@
12001200
These operators shall not participate in overload resolution unless the indicated operator can be applied to objects of type \tcode{value_type}.
12011201
\end{itemdescr}
12021202

1203-
\rSec2[parallel.simd.cassign]{Compound assignment}
1203+
\rSec2[parallel.simd.cassign]{\tcode{simd} compound assignment}
12041204

12051205
\begin{itemdecl}
12061206
friend simd& operator+=(simd& lhs, const simd& rhs) noexcept;
@@ -1239,7 +1239,7 @@
12391239
These operators shall not participate in overload resolution unless the indicated operator can be applied to objects of type \tcode{value_type}.
12401240
\end{itemdescr}
12411241

1242-
\rSec2[parallel.simd.comparison]{Compare operators}
1242+
\rSec2[parallel.simd.comparison]{\tcode{simd} compare operators}
12431243

12441244
\begin{itemdecl}
12451245
friend mask_type operator==(const simd& lhs, const simd& rhs) noexcept;
@@ -1895,7 +1895,7 @@
18951895

18961896
\begin{itemdescr}
18971897
\pnum\returns
1898-
An object initialized with the results of applying the indicated operator to \tcode{lhs} and \tcode{rhs} as a binary element-wise operation.
1898+
A \tcode{simd_mask} object initialized with the results of applying the indicated operator to \tcode{lhs} and \tcode{rhs} as a binary element-wise operation.
18991899
\end{itemdescr}
19001900

19011901
\rSec2[parallel.simd.mask.reductions]{Reductions}

0 commit comments

Comments
 (0)