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

more opt

Browse Source
This commit is contained in:
Ian Ker-Seymer
2024-10-30 13:54:01 -03:00
committed by Michael Go
parent d76663f570
commit be8e329cef
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/tokenizer.rb
+27 -7
View File
@@ -14,6 +14,9 @@ module Liquid
CLOSE_CURLEY = "}".ord CLOSE_CURLEY = "}".ord
PERCENTAGE = "%".ord PERCENTAGE = "%".ord
CLOSE_CURLEY_FOLLOWED_BY_CLOSE_CURLEY = (CLOSE_CURLEY << 8) | CLOSE_CURLEY
OPEN_CURLEY_FOLLOWED_BY_PERCENTAGE = (OPEN_CURLEY << 8) | PERCENTAGE
def initialize(source, line_numbers = false, line_number: nil, for_liquid_tag: false) def initialize(source, line_numbers = false, line_number: nil, for_liquid_tag: false)
@line_number = line_number || (line_numbers ? 1 : nil) @line_number = line_number || (line_numbers ? 1 : nil)
@for_liquid_tag = for_liquid_tag @for_liquid_tag = for_liquid_tag
@@ -24,18 +27,34 @@ module Liquid
def shift def shift
return if @ss.eos? return if @ss.eos?
token = @for_liquid_tag ? next_liquid_token : next_token @for_liquid_tag ? shift_liquid_tag : shift_normal
end
private
def shift_normal
token = next_token
return nil unless token return nil unless token
if @line_number if @line_number
@line_number += @for_liquid_tag ? 1 : token.count("\n") @line_number += token.count("\n")
end end
token token
end end
private def shift_liquid_tag
token = next_liquid_token
return (@ss = nil) unless token
if @line_number
@line_number += 1
end
token
end
def next_liquid_token def next_liquid_token
# read until we find a \n # read until we find a \n
@@ -93,20 +112,21 @@ module Liquid
byte_b = byte_a byte_b = byte_a
while byte_b while byte_b
byte_a = @ss.scan_byte while byte_a && byte_a != CLOSE_CURLEY && byte_a != OPEN_CURLEY byte_a = @ss.scan_byte while byte_a && (byte_a != CLOSE_CURLEY && byte_a != OPEN_CURLEY)
break unless byte_a break unless byte_a
byte_b = @ss.scan_byte byte_b = @ss.scan_byte
if byte_b != CLOSE_CURLEY && byte_b != PERCENTAGE if byte_b > CLOSE_CURLEY || (byte_b != CLOSE_CURLEY && byte_b != PERCENTAGE)
byte_a = byte_b byte_a = byte_b
next next
end end
if byte_a == CLOSE_CURLEY && byte_b == CLOSE_CURLEY val = (byte_a << 8) | byte_b
if val == CLOSE_CURLEY_FOLLOWED_BY_CLOSE_CURLEY
return @source.byteslice(start, @ss.pos - start) return @source.byteslice(start, @ss.pos - start)
elsif byte_a == OPEN_CURLEY && byte_b == PERCENTAGE elsif val == OPEN_CURLEY_FOLLOWED_BY_PERCENTAGE
return next_tag_token_with_start(start) return next_tag_token_with_start(start)
end end
end end
test/test_helper.rb
+1 -1
View File
@@ -13,7 +13,7 @@ if (env_mode = ENV['LIQUID_PARSER_MODE'])
puts "-- #{env_mode.upcase} ERROR MODE" puts "-- #{env_mode.upcase} ERROR MODE"
mode = env_mode.to_sym mode = env_mode.to_sym
end end
Liquid::Template.error_mode = mode Liquid::Environment.default.error_mode = mode
if ENV['LIQUID_C'] == '1' if ENV['LIQUID_C'] == '1'
puts "-- LIQUID C" puts "-- LIQUID C"