Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-19 19:00:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

avoid using StringScanner eos

Browse Source
This commit is contained in:
Michael Go
2024-10-30 13:45:10 -03:00
parent f00670cb01
commit ffce6de8bb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/lexer.rb
+3 -3
View File
@@ -181,7 +181,7 @@ module Liquid
@output << DOTDOT @output << DOTDOT
elsif special == DASH elsif special == DASH
# Special case for negative numbers # Special case for negative numbers
if !@ss.eos? && NUMBER_TABLE[@ss.peek_byte] if (peeked_byte = @ss.peek_byte) && NUMBER_TABLE[peeked_byte]
@ss.pos -= 1 @ss.pos -= 1
@output << [:number, @ss.scan(NUMBER_LITERAL)] @output << [:number, @ss.scan(NUMBER_LITERAL)]
else else
@@ -192,7 +192,7 @@ module Liquid
end end
elsif (sub_table = TWO_CHARS_COMPARISON_JUMP_TABLE[peeked]) elsif (sub_table = TWO_CHARS_COMPARISON_JUMP_TABLE[peeked])
@ss.scan_byte @ss.scan_byte
if !@ss.eos? && (found = sub_table[@ss.peek_byte]) if (peeked_byte = @ss.peek_byte) && (found = sub_table[peeked_byte])
@output << found @output << found
@ss.scan_byte @ss.scan_byte
else else
@@ -200,7 +200,7 @@ module Liquid
end end
elsif (sub_table = COMPARISON_JUMP_TABLE[peeked]) elsif (sub_table = COMPARISON_JUMP_TABLE[peeked])
@ss.scan_byte @ss.scan_byte
if !@ss.eos? && (found = sub_table[@ss.peek_byte]) if (peeked_byte = @ss.peek_byte) && (found = sub_table[peeked_byte])
@output << found @output << found
@ss.scan_byte @ss.scan_byte
else else
test/unit/lexer_unit_test.rb
+2 -2
View File
@@ -108,7 +108,7 @@ class LexerUnitTest < Minitest::Test
def test_error_with_utf8_character def test_error_with_utf8_character
error = assert_raises(SyntaxError) do error = assert_raises(SyntaxError) do
Lexer.new("1 < 1Ø").tokenize tokenize("1 < 1Ø")
end end
assert_equal( assert_equal(
@@ -120,7 +120,7 @@ class LexerUnitTest < Minitest::Test
def test_contains_as_attribute_name def test_contains_as_attribute_name
assert_equal( assert_equal(
[[:id, "a"], [:dot, "."], [:id, "contains"], [:dot, "."], [:id, "b"], [:end_of_string]], [[:id, "a"], [:dot, "."], [:id, "contains"], [:dot, "."], [:id, "b"], [:end_of_string]],
Lexer.new("a.contains.b").tokenize, tokenize("a.contains.b"),
) )
end end