Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

P0912R5 Merge Coroutines TS into C++20 working draft #2747

Merged
merged 62 commits into from Mar 12, 2019
Merged

P0912R5 Merge Coroutines TS into C++20 working draft #2747

merged 62 commits into from Mar 12, 2019

Conversation

GorNishanov
Copy link
Contributor

Fixes: #2693

@jensmaurer
Copy link
Member

Can someone remind me how to actually get this (non-cplusplus/draft) branch into my local git environment?

@CaseyCarter
Copy link
Contributor

CaseyCarter commented Mar 6, 2019 •
edited

Can someone remind me how to actually get this (non-cplusplus/draft) branch into my local git environment?

git fetch origin pull/2747/head:some_branch
git checkout some_branch

GorNishanov
GorNishanov commented Mar 7, 2019
View reviewed changes
source/basic.tex Outdated Show resolved Hide resolved
source/basic.tex Outdated Show resolved Hide resolved
source/statements.tex Outdated Show resolved Hide resolved
source/expressions.tex Outdated Show resolved Hide resolved
source/expressions.tex Outdated Show resolved Hide resolved
Eelis
Eelis reviewed Mar 7, 2019
View reviewed changes
source/statements.tex Outdated Show resolved Hide resolved
@jensmaurer jensmaurer added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Mar 8, 2019
@jensmaurer
Copy link
Member

@GorNishanov, this needs a rebase.

@GorNishanov
Copy link
Contributor Author

I see, another rebase coming up

@GorNishanov
[diff.cpp17.lex] Add co_xxx keywords
87830bc
@GorNishanov
[diff.cpp17.library] Added <coroutine> header
048a9d4
@GorNishanov
[cpp.predefined] Add coroutines feature test macro
47a9f98
@GorNishanov
[expr.unary] Add [expr.await] placeholder
9ffe113
@GorNishanov
[intro.execution] mention suspension of a coroutine
8d5961e
@GorNishanov
[lex.key] Add co_xxx keywords
fed1d25
@GorNishanov
[basic.start.main] Main should not be a coroutine
26cd735
@GorNishanov
.gitignore: add .synctex* exclusion
340b68c
@GorNishanov
[basic.stc.dynamic.allocation] Mention that coroutine state may resul…
d3ddacb 
…t in a call to new
@GorNishanov
[expr.unary] Add await-expression
9fa918d
@GorNishanov
[expr.compound] Add [yield.expr] placeholder
11176b9
@GorNishanov
[expr.ass] Add yield-expression grammar production
70841ba
@GorNishanov
[expr.const] Ban await and yield expr in the constexpr context
a3bacc2
@GorNishanov
[stmt.jump] Add coroutine-return-stmt production and a note
1efb7f9
@GorNishanov
[stmt.return] Add "that is not a coroutine" twice
bea1867
@GorNishanov
[stmt.return.coroutine] Added under [stmt.return]
0c7b4f0
@GorNishanov
[dcl.constexpr] Added "... shall not be a coroutine ..."
f164736
@GorNishanov
[dcl.spec.auto] Added "... shall not be a coroutine ..."
4fcdc22
@GorNishanov
[class.ctor] [class.dtor] Add "... shall not be a coroutine."
ae131ba
@GorNishanov
[class.copy.elision] Allow coro param copy elision
c480901
@GorNishanov
[class.copy.elision] Try rvalue in return_value overload
c40d2c0
@GorNishanov
[coroutine.handle.noop.resumption] Complete subsection
bfc9203
@GorNishanov
[coroutine.handle.noop.promise] Complete subsection
8b5dcad
@GorNishanov
[coroutine.handle.noop.address] Complete subsection
e8a3d09
@GorNishanov
[coroutine.promise.noop] Complete subsection
d62a538
@GorNishanov
[coroutine.noop] Complete subsection
357f581
@GorNishanov
[coroutine.trivial.awaitables] Complete subsection
c616738
@GorNishanov
[dcl.fct.def.coroutine] Add paragraphs 1 and 2
d8718aa
@GorNishanov
[dcl.fct.def.coroutine] Add paragraph 3
fb265ac
@GorNishanov
[dcl.fct.def.coroutine] Add paragraphs 4, 5, 6
0e3aa31
@GorNishanov
[dcl.fct.def.coroutine] Add paragraph 7
6b96d4e
@GorNishanov
[dcl.fct.def.coroutine] Add paragraph 8
e9bf7ac
@GorNishanov
[dcl.fct.def.coroutine] Add paragraph 9
5108ff7
@GorNishanov
[dcl.fct.def.coroutine] Add paragraph 10
0a690cf
@GorNishanov
[dcl.def.fct.coroutine] Add paragraphs 11, 12, 13 (The last one!)
5c6d576
@GorNishanov
Remove trailing whitespace
99b7b0c
@GorNishanov
Whitespace fixes in basic.tex. expressions.tex and statememts.tex
3ae2949
@GorNishanov
[stmt.return.coroutine] Add "or-" to expr-braced-init-list
b96992c
@GorNishanov
[dcl.fct.def.coroutine] Rename promise placeholders to S and s
aefe55d
@GorNishanov
Copy link
Contributor Author

@jensmaurer, I can’t seem to be able to remove the “need rebase” label. Can you remove it when you get a chance?

@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Mar 9, 2019
@jensmaurer
Copy link
Member

@GorNishanov: Done, thanks.

@burblebee
Copy link
Contributor

burblebee commented Mar 10, 2019 •
edited

@Eelis were you able to do a full review? if so, can you approve the changes? Thanks!

@Eelis
Copy link
Contributor

Eelis commented Mar 10, 2019 •
edited

@Eelis were you able to do a full review?

Nah, I barely understand any of it. :)

@GorNishanov
Copy link
Contributor Author

With regard to stable tag for coroutine definition: [dcl.fct.def.coroutine]

We talked briefly in San Diego 2018 about what would be the best stable tag for the coroutine definition section. My preference was [def.coroutine]. @jensmaurer mentioned that he'd like something else, but, ultimately it is up to the editor, i.e @zygoloid .

Would you like me to change the stable tag to something else?

@zygoloid zygoloid changed the base branch from master to motions-2019-02-cwg-15 March 12, 2019 03:18
@zygoloid zygoloid merged commit 091e6d0 into cplusplus:motions-2019-02-cwg-15 Mar 12, 2019
@zygoloid
Copy link
Member

Note: merged to local motion branch, not merged to master yet.

@zygoloid zygoloid mentioned this pull request Mar 12, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Eelis Eelis Eelis left review comments

@jensmaurer jensmaurer jensmaurer left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@GorNishanov @jensmaurer @CaseyCarter @burblebee @Eelis @zygoloid