[Parse] Improve '#if' block parsing #7382
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci Please smoke test |
jtbandes
reviewed
Feb 15, 2017
lib/Parse/ParseDecl.cpp
Outdated
| diagnose(Tok.getLoc(), | ||
| diag::unexpected_rbrace_in_conditional_compilation_block); | ||
| // If we see '}', following declarations don't look like belong to | ||
| // the current decl context; Skip them. |
There was a problem hiding this comment.
🔬 nit: no need to capitalize Skip
* Don't emit duplicated 'expected #else or #endif at end of conditional
compilation block' error.
class Foo {
#if true
func foo() {}
[EOF]
* Improve error message when seeing '}' in config block.
class Foo {
#if true
func foo();
} // error: unexpected '}' in conditional compilation block
#else
#endif
* Narrow allowance of 3+ components numeric literal to condition part of the directive. * Allow 3+ components in '#if' directive in decl list position as well.
rintaro
force-pushed
the
parse-ifconfig-fix1
branch
from
1968b40 to
3b42894
Compare
|
@swift-ci Please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First commit:
expected #else or #endif at end of conditional compilation block.}in config block. [Parse] Split declaration list parsing from parseList() #6005 (comment)Second commit:
This code supposed be blocked by the Parser:
expected named member of numeric literal.#ifdirective in decl list position as well.Previously, this is rejected: