Skip to content

[Parser][SE-0034] Replace line directive #line with #setline #1501

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

Merged
merged 3 commits into from
Mar 2, 2016

Conversation

dduan
Copy link
Contributor

@dduan dduan commented Mar 1, 2016

What's in this pull request?

Replace line directive #line with #setline. This change was proposed in SE-0034.

Resolved bug number: (SR-840)


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
OS X platform @swift-ci Please test OS X platform
Linux platform @swift-ci Please test Linux platform

Note: Only members of the Apple organization can trigger swift-ci.

@dduan dduan changed the title Se 0034 pr [Parser][SE-0034] Replace line directive #line with #setline Mar 1, 2016
@lattner
Copy link
Contributor

lattner commented Mar 2, 2016

@swift-ci please test

@@ -291,7 +292,7 @@ ParserStatus Parser::parseBraceItems(SmallVectorImpl<ASTNode> &Entries,
PreviousHadSemi = false;
if (isStartOfDecl()
&& Tok.isNot(tok::pound_if)
&& Tok.isNot(tok::pound_line)) {
&& Tok.isNot(tok::pound_setline)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor nitpick, you can use Tok.isNot(x, y) here, though it looks like a preexisting issue.

@lattner
Copy link
Contributor

lattner commented Mar 2, 2016

Overall, the patch looks great to me, thanks! Random other question: does gyb or any other tool produce these markers? If so, it should be updated to use the new syntax.

@dduan
Copy link
Contributor Author

dduan commented Mar 2, 2016

@lattner Thanks for reminding me of gyb. There are a couple of default argument and documentation set to #line. I updated them and am running tests locally now.

@dduan
Copy link
Contributor Author

dduan commented Mar 2, 2016

gyb updated. Tests are passing locally. Can't wait to be able to trigger CI testing myself :)

@lattner
Copy link
Contributor

lattner commented Mar 2, 2016

Awesome, nice job, please commit!

dduan added a commit that referenced this pull request Mar 2, 2016
[Parser][SE-0034] Replace line directive #line with #setline
@dduan dduan merged commit 0f53348 into swiftlang:master Mar 2, 2016
@dduan dduan deleted the SE-0034-pr branch December 23, 2019 21:48
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.

3 participants