Make Liquid::C::Tokenizer#shift private so it is only used for testing#140
Merged
dylanahsmith merged 1 commit intomasterfrom Jan 7, 2021
Merged
Make Liquid::C::Tokenizer#shift private so it is only used for testing#140dylanahsmith merged 1 commit intomasterfrom
dylanahsmith merged 1 commit intomasterfrom
Conversation
peterzhu2118
approved these changes
Jan 7, 2021
macournoyer
approved these changes
Jan 7, 2021
lib/liquid/c.rb
Outdated
| source = source.to_s | ||
| if source.bytesize <= Liquid::C::Tokenizer::MAX_SOURCE_BYTE_SIZE | ||
| source = source.encode(Encoding::UTF_8) | ||
| return Liquid::C::Tokenizer.new(source, line_number || 0, for_liquid_tag) |
Contributor
Author
There was a problem hiding this comment.
The C code uses 0 to mean that line numbers aren't tracked, similar to if line_number is nil in the ruby tokenizer.
Since it won't be supported for liquid template (de)serialization.
dylanahsmith
force-pushed
the
tokenizer-private-shift
branch
from
bf2e637 to
fb27449
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Depends on Shopify/liquid#1386
Problem
The liquid template (de)serialization support that is being added by #138 won't actually support
Liquid::C::Tokenizer#shiftbeing used during parsing. The method would seem to work for the initial parsing, but then it would fail on deserialization where there is no longer a tokenizer.Solution
Leverage Shopify/liquid#1386 to update the tokenizer monkey patch to instead be on Liquid::ParseContext.new_tokenizer so that we avoid using the Liquid::C::Tokenizer when the liquid-c VM is disabled.
Make Liquid::C::Tokenizer#shift private, like
shift_trimmed, and only use it for testing.