Skip to content

Commit 8e22404

Browse files
burblebeetkoeppe
authored andcommitted
[mdspan.submdspan.*] Move "otherwise" to front of itemized lists.
1 parent 1051ee4 commit 8e22404

File tree

1 file changed

+28
-17
lines changed

1 file changed

+28
-17
lines changed

source/containers.tex

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21510,11 +21510,13 @@
2151021510
\begin{itemize}
2151121511
\item
2151221512
\tcode{M::index_type}
21513-
if the function is a member of a class \tcode{M}, otherwise
21513+
if the function is a member of a class \tcode{M},
2151421514
\item
21515+
otherwise,
2151521516
\tcode{remove_reference_t<decltype(src)>::index_type}
21516-
if the function has a parameter named \tcode{src}, otherwise
21517+
if the function has a parameter named \tcode{src},
2151721518
\item
21519+
otherwise,
2151821520
the same type as the function's template argument \tcode{IndexType};
2151921521
\end{itemize}
2152021522
\item let \tcode{rank} be the number of elements in \tcode{slices};
@@ -21526,8 +21528,9 @@
2152621528
\begin{itemize}
2152721529
\item
2152821530
\tcode{dynamic_extent}
21529-
if $S_k$ models \tcode{\libconcept{convertible_to}<index_type>}, otherwise
21531+
if $S_k$ models \tcode{\libconcept{convertible_to}<index_type>},
2153021532
\item
21533+
otherwise,
2153121534
the number of types $S_j$ with $j < k$ that
2153221535
do not model \tcode{\libconcept{convertible_to}<index_type>}.
2153321536
\end{itemize}
@@ -21622,14 +21625,17 @@
2162221625
Let $\phi{}_k$ denote the following value:
2162321626
\begin{itemize}
2162421627
\item
21625-
$s_k$ if $S_k$ models \tcode{\libconcept{convertible_to}<IndexType>}; otherwise
21628+
$s_k$ if $S_k$ models \tcode{\libconcept{convertible_to}<IndexType>};
2162621629
\item
21630+
otherwise,
2162721631
\tcode{get<0>($s_k$)}
21628-
if $S_k$ models \tcode{\exposconcept{index-pair-like}<IndexType>}; otherwise
21632+
if $S_k$ models \tcode{\exposconcept{index-pair-like}<IndexType>};
2162921633
\item
21634+
otherwise,
2163021635
\tcode{\exposid{de-ice}($s_k$.offset)}
21631-
if $S_k$ is a specialization of \tcode{strided_slice}; otherwise
21636+
if $S_k$ is a specialization of \tcode{strided_slice};
2163221637
\item
21638+
otherwise,
2163321639
\tcode{0}.
2163421640
\end{itemize}
2163521641

@@ -21708,9 +21714,11 @@
2170821714
%FIXME: Also, calling first_ on each $k$ below gives us a set of indeces - how do we assign a set to the src_idx[$k$] above?
2170921715
\tcode{\exposid{first_}<IndexType, $k$>(slices...)} for each $k$
2171021716
where \tcode{\placeholder{map-rank}[$k$]} equals
21711-
\tcode{dynamic_extent}, otherwise
21717+
\tcode{dynamic_extent},
2171221718

2171321719
\item
21720+
%FIXME: How do we fail the previous \item to get here? There's no "if" test to fail.
21721+
otherwise,
2171421722
\tcode{\exposid{first_}<IndexType, $k$>(slices...)} \tcode{+}
2171521723
\tcode{indices[\placeholder{map-rank}[$k$]]}.
2171621724
\end{itemize}
@@ -21797,9 +21805,10 @@
2179721805
\tcode{\exposid{de-ice}($S_k$::stride_type())},
2179821806
if $S_k$ is a specialization of \tcode{strided_slice} whose
2179921807
\tcode{extent_type} and \tcode{stride_type}
21800-
model \exposconceptx{integral-cons\-tant-like}{integral-constant-like}; otherwise
21808+
model \exposconceptx{integral-cons\-tant-like}{integral-constant-like};
2180121809

2180221810
\item
21811+
otherwise,
2180321812
\tcode{dynamic_extent}.
2180421813
\end{itemize}
2180521814
\end{itemize}
@@ -21815,12 +21824,13 @@
2181521824
\tcode{ext.extent(\placeholder{map-rank}[$k$])} equals
2181621825
\tcode{$s_k$.extent == 0 ? 0 : 1 + (\exposid{de-ice}($s_k$.extent) - 1) /}\linebreak{}
2181721826
\tcode{\exposid{de-ice}($s_k$.stride)}
21818-
if $S_k$ is a specialization of \tcode{strided_slice}, otherwise
21827+
if $S_k$ is a specialization of \tcode{strided_slice},
2181921828

2182021829
\item
21830+
otherwise,
2182121831
\tcode{ext.extent(\placeholder{map-rank}[$k$])} equals
2182221832
\tcode{\exposid{last_}<$k$>(src, slices...) -}
21823-
\tcode{\exposid{first_}<IndexType, $k$>(\linebreak{}slices...)}.
21833+
\tcode{\exposid{first_}<Index-\linebreak{}Type, $k$>(slices...)}.
2182421834
\end{itemize}
2182521835
\end{itemdescr}
2182621836

@@ -21898,9 +21908,10 @@
2189821908
\item
2189921909
\tcode{stride($k$) * \exposid{de-ice}($s_k$.stride)}
2190021910
if $S_k$ is a specialization of \tcode{strided_slice} and
21901-
\tcode{$s_k$.stride < $s_k$.extent}; otherwise
21911+
\tcode{$s_k$.stride < $s_k$.extent};
2190221912

2190321913
\item
21914+
otherwise,
2190421915
\tcode{stride($k$)}.
2190521916
\end{itemize}
2190621917

@@ -21918,9 +21929,10 @@
2191821929
\begin{itemize}
2191921930
\item
2192021931
\tcode{submdspan_mapping_result\{*this, 0\}},
21921-
if \tcode{Extents::rank() == 0} is \tcode{true}; otherwise
21932+
if \tcode{Extents::rank() == 0} is \tcode{true};
2192221933

2192321934
\item
21935+
otherwise,
2192421936
\tcode{submdspan_mapping_result\{layout_left::mapping(sub_ext), offset\}},
2192521937
if
2192621938
\begin{itemize}
@@ -21932,9 +21944,7 @@
2193221944
\item
2193321945
for $k$ equal to \tcode{SubExtents::rank() - 1},
2193421946
$S_k$ models \tcode{\exposconcept{index-pair-like}<index_type>} or
21935-
%FIXME: Dangling "otherwise" in nested itemized list is lost, reword to move "otherwise" to start of alternate items
2193621947
\tcode{is_convertible_v<$S_k$, full_extent_t>} is \tcode{true};
21937-
otherwise
2193821948
\end{itemize}
2193921949
\begin{note}
2194021950
If the above conditions are true,
@@ -21943,6 +21953,7 @@
2194321953
\end{note}
2194421954

2194521955
\item
21956+
otherwise,
2194621957
\tcode{submdspan_mapping_result\{layout_right::mapping(sub_ext), offset\}},
2194721958
if
2194821959
\begin{itemize}
@@ -21955,8 +21966,7 @@
2195521966
\item
2195621967
for $k$ equal to \tcode{Extents::rank() - SubExtents::rank()},
2195721968
$S_k$ models \tcode{\exposconcept{index-pair-like}<in\-dex_type>} or
21958-
%FIXME: Dangling "otherwise" in nested itemized list is lost
21959-
\tcode{is_convertible_v<$S_k$, full_extent_t>} is \tcode{true}; otherwise
21969+
\tcode{is_convertible_v<$S_k$, full_extent_t>} is \tcode{true};
2196021970
\end{itemize}
2196121971
\begin{note}
2196221972
If the above conditions are true,
@@ -21965,7 +21975,8 @@
2196521975
\end{note}
2196621976

2196721977
\item
21968-
\tcode{submdspan_mapping_result\{layout_stride::mapping(sub_ext, sub_strides), offset\}}.
21978+
otherwise,
21979+
\tcode{submdspan_mapping_result\{layout_stride::mapping(sub_ext, sub_strides),\linebreak{}offset\}}.
2196921980
\end{itemize}
2197021981
\end{itemdescr}
2197121982

0 commit comments

Comments
 (0)