Fix multiline string interpolation when preceded by a " character
#1023
Conversation
This file contains 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
Due to an issue with the Logos parser generator, we have a special rule which looks for a `"` followed by some number of `%`s and then splits the token into one `"%+` token and an interpolation token. When symbolic strings were introduced, we changed how the lexer counts its opening `%`s, to no longer consider the `m` or `s` character as part of the token. However, we did not update the condition for the rule to patch over the Logos issue. This essentially meant that we would introduce an interpolation after a `"` with one too-few opening `%` characters. This commit fixes that behaviour by changing the `>=` check to a `>`.
matthew-healy
requested review from
vkleen,
yannham,
francois-caddet,
dpl0a,
ebresafegaga and
rapenne-s
matthew-healy
force-pushed
the
fix/multiline-interpolation
branch
from
b7536c7
to
7cb0e58
Compare
vkleen
approved these changes
Jan 2, 2023
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.
Due to an issue with the Logos parser generator, we have a special rule
which looks for a
"followed by some number of%s and then splitsthe token into one
"%+token and an interpolation token.When symbolic strings were introduced, we changed how the lexer counts
its opening
%s, to no longer consider themorscharacter as partof the token. However, we did not update the condition for the rule to
patch over the Logos issue. This essentially meant that we would
introduce an interpolation after a
"with one too-few opening%characters.
This PR fixes that behaviour by changing the
>=check to a>.I also took the opportunity to restructure the string test files.
Closes #1012.