[Parse] Fix skipping string interpolation in Lexer #10246
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 |
rintaro
force-pushed
the
lexer-multiline-interpolation
branch
from
a140fcb to
3fb3789
Compare
|
@swift-ci Please smoke test |
milseman
approved these changes
Jun 15, 2017
lib/Parse/Lexer.cpp
Outdated
| @@ -1244,6 +1244,9 @@ static const char *skipToEndOfInterpolatedExpression(const char *CurPtr, | |||
| DiagnosticEngine *Diags, | |||
| bool MultilineString) { | |||
| llvm::SmallVector<char, 4> OpenDelimiters; | |||
| llvm::SmallVector<bool, 3> AllowNewline; | |||
There was a problem hiding this comment.
Very minor nitpick: why 3? Might as well go with 4 or 8, as the small vector will be pointer-size aligned. This doesn't block this PR, though.
There was a problem hiding this comment.
My thought was: if size of OpenDelimiters is 4, size of AllowNewline is at most 3.
str = "a\( "b\( "c\( something )")")"
" ( " ( -> OpenDelimiters : {'"', '(', '"', '('}
f f f -> AllowNewline : {false, false, false}
That was unnecessary restriction though. Updated to 4.
Maintain inner most string literal mode to determine whether we allow newline character or not. * Disallow newline after multiline string in string interpolation. (SR-5171) * Allow unbalanced `"` in multiline string in string interpolation.
rintaro
force-pushed
the
lexer-multiline-interpolation
branch
from
3fb3789 to
c8bd1aa
Compare
|
Thanks! |
|
@swift-ci Please smoke test and merge |
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.
Maintain inner most string literal mode to determine whether we allow
newline character or not.
Disallow newline after multiline string in string interpolation. (SR-5171)
Allow unbalanced
"in multiline string in string interpolation.