Fix #405: Named entities not lexed correctly #420
Merged
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
Geod24
changed the title
Geod24
reviewed
Jun 29, 2020
MoonlightSentinel
force-pushed
the
named-entities
branch
from
d167c0f to
cb5b19f
Compare
src/dparse/lexer.d
Outdated
| { | ||
| auto l = DLexer(`"\&"`, cf, &ca); | ||
| assert(l.front().type == tok!""); | ||
| assert(l.messages == [ Msg(1, 4, "Invalid identifier", true), Msg(1, 6, "Error: unterminated string literal", true) ]); |
There was a problem hiding this comment.
Not sure if this one is acceptable...
There was a problem hiding this comment.
The second commit adds a potential workaround.
|
Ping |
WebFreak001
requested changes
Jul 22, 2020
| error("Error: invalid named character entity"); | ||
| return false; | ||
| } | ||
| range.popFront(); |
There was a problem hiding this comment.
I believe this can RangeError if the tokens end with & identifier, because we consumed the ampersand and the identifier, but the if invalid check didn't trigger because range.empty was true
For the same effect but a more sturdy check I would rewrite the if to
if (t.type != tok!"identifier" || range.empty || range.bytes[range.index] != ';')There was a problem hiding this comment.
Fixed. Also added a test case for "\&0
There was a problem hiding this comment.
that test case wouldn't match anyway because it already fails on the identifier, make the test case use an identifier instead
MoonlightSentinel
force-pushed
the
named-entities
branch
from
10e364d to
a941472
Compare
That will close dlang-community#405. Co-authored-by: MoonlightSentinel <moonlightsentinel@disroot.org> (Rebased and extended from PR dlang-community#412)
MoonlightSentinel
force-pushed
the
named-entities
branch
from
a941472 to
225a26b
Compare
WebFreak001
approved these changes
Jul 22, 2020
Hackerpilot
approved these changes
Jul 22, 2020
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.
Rebase of #412 with the requested changes.