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.

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

[lex, dcl.decl] Use \nontermdef and \grammarterm more consistently. #481

Merged
merged 1 commit into from Mar 19, 2016

Conversation

Oxyd
Copy link
Contributor

@Oxyd Oxyd commented Apr 14, 2015

No description provided.

@tkoeppe
Copy link
Contributor

tkoeppe commented Apr 15, 2015

Could you please amend the commit to start the commit message with the affected clauses/secions? Like [lex, dcl.decl] Use \nontermdef and \grammarterm more consistently.?

@Oxyd Oxyd changed the title Use \nontermdef and \grammarterm more consistently. [lex, dcl.decl] Use \nontermdef and \grammarterm more consistently. Apr 15, 2015
@Oxyd
Copy link
Contributor Author

Oxyd commented Apr 15, 2015

I'm not sure if I did this correctly, but it looks amended to me now. If not, I can create a new pull request with proper commit message.

@tkoeppe
Copy link
Contributor

tkoeppe commented Apr 16, 2015

This looks good, thanks!

@tkoeppe
Copy link
Contributor

tkoeppe commented Dec 14, 2015

@zygoloid: PTAL?

@@ -1370,7 +1370,7 @@

\pnum
\enternote A source-file new-line in a raw string literal results in a new-line in the
resulting execution \term{string-literal}. Assuming no
resulting execution \grammarterm{string-literal}. Assuming no
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be "string literal", not "\grammarterm{...}" nor "\term{...}", because it's talking about the string literal object, not the element of the grammar.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Oxyd: Could you please revise and rebase?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zygoloid: Since you have push access, can you not make the change yourself directly in github?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tkoeppe It looks like I'd need push access to Oxyd/draft for that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zygoloid: Ah, so that's what that means. I thought you could somehow edit the change in flight, but obviously that doesn't make any sense. Never mind then, we'll wait for the OP to edit his branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zygoloid @tkoeppe Okay, I made the requested change and rebased.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Oxyd: I think zygoloid asked for "string literal", not "string-literal".

@tkoeppe
Copy link
Contributor

tkoeppe commented Mar 8, 2016

@Oxyd: please take another look.

@Oxyd
Copy link
Contributor Author

Oxyd commented Mar 12, 2016

@tkoeppe Okay, changed "string-literal" to "string literal".

@tkoeppe
Copy link
Contributor

tkoeppe commented Mar 12, 2016

Thank you. @zygoloid: This looks ready.

zygoloid added a commit that referenced this pull request Mar 19, 2016
[lex, dcl.decl] Use \nontermdef and \grammarterm more consistently.
@zygoloid zygoloid merged commit c8dc0ca into cplusplus:master Mar 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants