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

Simplify parse_number

Browse Source 
We don't need all the multi-dot logic in a world where number comes
out of the Lexer.
This commit is contained in:
Charles-P. Clermont
2026-01-26 16:52:17 -05:00
parent e1e0129983
commit 288c4eaac3
1 changed files with 5 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/expression.rb
+5 -46
View File
@@ -57,63 +57,22 @@ module Liquid
)
end
if (num = parse_number(markup, ss))
if (num = parse_number(markup))
num
else
VariableLookup.parse(markup, ss, cache)
end
end
def parse_number(markup, ss)
def parse_number(markup)
# check if the markup is simple integer or float
case markup
when INTEGER_REGEX
return Integer(markup, 10)
Integer(markup, 10)
when FLOAT_REGEX
return markup.to_f
end
ss.string = markup
# the first byte must be a digit or a dash
byte = ss.scan_byte
return false if byte != DASH && (byte < ZERO || byte > NINE)
if byte == DASH
peek_byte = ss.peek_byte
# if it starts with a dash, the next byte must be a digit
return false if peek_byte.nil? || !(peek_byte >= ZERO && peek_byte <= NINE)
end
# The markup could be a float with multiple dots
first_dot_pos = nil
num_end_pos = nil
while (byte = ss.scan_byte)
return false if byte != DOT && (byte < ZERO || byte > NINE)
# we found our number and now we are just scanning the rest of the string
next if num_end_pos
if byte == DOT
if first_dot_pos.nil?
first_dot_pos = ss.pos
else
# we found another dot, so we know that the number ends here
num_end_pos = ss.pos - 1
end
end
end
num_end_pos = markup.length if ss.eos?
if num_end_pos
# number ends with a number "123.123"
markup.byteslice(0, num_end_pos).to_f
markup.to_f
else
# number ends with a dot "123."
markup.byteslice(0, first_dot_pos).to_f
false
end
end
end