Fix StringTokenizer::peekNextToken #1025
Merged
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.
This fixes
StringTokenizer::peekNextToken
so that both(EMPTY
and( EMPTY
areStringTokenizer::TT_WORD
.The issue was that the second assignment of
pos
(fromstr.find_first_of
) was less than the first (fromstr.find_first_not_of
), meaning that it started searching from the wrong position. The fix is simply to set the starting position topos + 1
.Closes #1013