Skip to content

Commit fbe7a4f

Browse files
committed
FIXUP: Fix errors and make changes as suggested in the review.
1 parent 109df4b commit fbe7a4f

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

source/exceptions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,11 +1129,11 @@
11291129
whose promise type has an \tcode{unhandled_stopped} member function, or
11301130

11311131
\item%
1132-
when an object scope of type
1132+
when an object \tcode{scope} of type
11331133
\tcode{std::execution::simple_counting_scope} or
11341134
\tcode{std::execution::counting_scope}
11351135
is destroyed and
1136-
\tcode{scope.state} is not equal to
1136+
\tcode{scope.\exposid{state}} is not equal to
11371137
\exposid{joined},
11381138
\exposid{unused}, or
11391139
\exposid{unused-and-closed}\iref{exec.simple.counting.ctor}.

source/exec.tex

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4590,7 +4590,7 @@
45904590
\begin{itemdescr}
45914591
\pnum
45924592
\constraints
4593-
copy_constructible<\exposid{wrap-sender}> is \tcode{true}.
4593+
\tcode{\libconcept{copy_constructible}<\exposid{wrap-sender}>} is \tcode{true}.
45944594

45954595
\pnum
45964596
\effects
@@ -4616,7 +4616,7 @@
46164616
\pnum
46174617
\effects
46184618
Initializes \exposid{sndr} with \tcode{std::move(other.\exposid{sndr})} and
4619-
initializes \exposid{token} with \tcode{std::move(other.\linebreak{}\exposid{token})} and
4619+
initializes \exposid{token} with \tcode{std::move(other.\brk{}\exposid{token})} and
46204620
then calls \tcode{other.\exposid{sndr}.reset()}.
46214621
\end{itemdescr}
46224622

@@ -4808,7 +4808,7 @@
48084808
Otherwise,
48094809
if \tcode{remove_cvref_t<decltype((token))>} models
48104810
\libconcept{unstoppable_token} then
4811-
\tcode{\exposid{stop-when}(\linebreak{}sndr, token)} is expression-equivalent to
4811+
\tcode{\exposid{stop-when}(\brk{}sndr, token)} is expression-equivalent to
48124812
\tcode{sndr}.
48134813

48144814
\item
@@ -4831,10 +4831,10 @@
48314831
are equivalent to
48324832
\tcode{connect(write_env(sndr, prop(get_stop_token, stoken)), r)}
48334833
where \tcode{stoken} is an object of
4834-
an exposition-only type \placeholder{stoken-t} such that:
4834+
an exposition-only type \exposid{stoken-t} such that:
48354835
\begin{itemize}
48364836
\item
4837-
\placeholder{stoken-t} models \libconcept{stoppable_token};
4837+
\exposid{stoken-t} models \libconcept{stoppable_token};
48384838
\item
48394839
\tcode{stoken.stop_requested()} returns
48404840
\tcode{token.stop_requested() || rtoken.stop_reques-\linebreak{}ted()};
@@ -4846,13 +4846,13 @@
48464846
\tcode{\libconcept{invocable}<Fn>} and
48474847
\tcode{\libconcept{constructible_from}<Fn, Init>}
48484848
are modeled,
4849-
\tcode{\placeholder{stoken-t}::callback_type<Fn>} models
4849+
\tcode{\exposid{stoken-t}::callback_type<Fn>} models
48504850
\tcode{\exposconcept{stoppable-callback-for}<Fn, \exposid{sto\-ken-t}, Init>}.
48514851
\begin{tailnote}
48524852
For an object \tcode{fn} of type \tcode{Fn}
48534853
constructed from a value, \tcode{init}, of type \tcode{Init},
48544854
registering \tcode{fn} using
4855-
\tcode{\placeholder{stoken-t}::callback_type<Fn>(stoken, init)}
4855+
\tcode{\exposid{stoken-t}::callback_type<Fn>(stoken, init)}
48564856
results in an invocation of \tcode{fn} when
48574857
a callback registered with \tcode{token} or \tcode{rtoken} would be invoked.
48584858
\tcode{fn} is invoked at most once.
@@ -4883,7 +4883,7 @@
48834883
If any of
48844884
\tcode{\libconcept{sender}<Sndr>},
48854885
\tcode{\libconcept{scope_token}<Token>}, or
4886-
\tcode{queryable<Env>}
4886+
\tcode{\exposconcept{queryable}<Env>}
48874887
are not satisfied,
48884888
the expression \tcode{spawn_future(sndr, token, env)} is ill-formed.
48894889

@@ -4909,7 +4909,7 @@
49094909
Let \tcode{Sigs} be the pack of arguments to
49104910
the \tcode{completion_signatures} specialization provided as
49114911
a parameter to the \exposid{spawn-future-state-base} class template.
4912-
Let \placeholder{as-tuple} be an alias template that
4912+
Let \exposid{as-tuple} be an alias template that
49134913
transforms a completion signature \tcode{Tag(Args...)}
49144914
into the tuple specialization \tcode{\exposid{decayed-tuple}<Tag, Args...>}.
49154915

@@ -4981,7 +4981,7 @@
49814981
Let \placeholder{ssource-t} be an unspecified type
49824982
that models \exposconcept{stoppable-source} and
49834983
let \tcode{ssource} be an lvalue of type \placeholder{ssource-t}.
4984-
Let \placeholder{stoken-t} be \tcode{decltype(ssource.get_token())}.
4984+
Let \tcode{\placeholder{stoken-t}} be \tcode{decltype(ssource.get_token())}.
49854985
Let \exposid{future-spawned-sender} be the alias template:
49864986

49874987
\begin{codeblock}
@@ -5199,7 +5199,7 @@
51995199
\begin{itemize}
52005200
\item
52015201
Uses \tcode{alloc} to allocate and construct an object \tcode{s} of
5202-
a type that is a specialization of \exposid{spawn-future-\linebreak{}state}
5202+
a type that is a specialization of \exposid{spawn-future-\brk{}state}
52035203
from \tcode{alloc}, \tcode{token.wrap(sndr)}, \tcode{token}, and \tcode{senv}.
52045204
If an exception is thrown then
52055205
any constructed objects are destroyed and
@@ -5496,7 +5496,7 @@
54965496
\tcode{\libconcept{scope_token}<Token>}, or
54975497
\tcode{\exposconcept{queryable}<Env>}
54985498
are not satisfied,
5499-
the expression \tcode{spawn(\linebreak{}sndr, token, env)} is ill-formed.
5499+
the expression \tcode{spawn(\brk{}sndr, token, env)} is ill-formed.
55005500

55015501
\pnum
55025502
Let \exposid{spawn-state-base} be the exposition-only class:
@@ -5658,7 +5658,7 @@
56585658

56595659
\pnum
56605660
The expression \tcode{spawn(sndr, token)} is expression-equivalent to
5661-
\tcode{spawn(sndr, token, execution::env<>(\linebreak{}))}.
5661+
\tcode{spawn(sndr, token, execution::env<>(\brk{}))}.
56625662

56635663
\rSec1[exec.util]{Sender/receiver utilities}
56645664

@@ -6616,7 +6616,7 @@
66166616
of objects of type \tcode{Token}; and
66176617

66186618
\item
6619-
given an lvalue token of type (possibly const) \tcode{Token},
6619+
given an lvalue \tcode{token} of type (possibly const) \tcode{Token},
66206620
for all expressions \tcode{sndr} such that
66216621
\tcode{decltype((\linebreak{}sndr))} models \libconcept{sender}:
66226622
\begin{itemize}
@@ -6842,7 +6842,8 @@
68426842
\pnum
68436843
For purposes of determining the existence of a data race,
68446844
\tcode{get_token},
6845-
\tcode{close}, \tcode{join},
6845+
\tcode{close},
6846+
\tcode{join},
68466847
\exposid{try-associate},
68476848
\exposid{disassociate}, and
68486849
\exposid{start-join-sender}

0 commit comments

Comments
 (0)