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

Strict parse conditions in reverse order

Browse Source
This commit is contained in:
Justin Li
2015-05-19 11:51:01 -04:00
parent b4e5017c79
commit a9c7df931f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/tags/if.rb
+10 -3
View File
@@ -84,14 +84,21 @@ module Liquid
def strict_parse(markup) def strict_parse(markup)
p = Parser.new(markup) p = Parser.new(markup)
condition = parse_comparison(p) conditions = [parse_comparison(p)]
while op = (p.id?('and'.freeze) || p.id?('or'.freeze)) while op = (p.id?('and'.freeze) || p.id?('or'.freeze))
new_cond = parse_comparison(p) conditions << op << parse_comparison(p)
end
p.consume(:end_of_string)
condition = conditions.pop
until conditions.empty?
op = conditions.pop
new_cond = conditions.pop
new_cond.send(op, condition) new_cond.send(op, condition)
condition = new_cond condition = new_cond
end end
p.consume(:end_of_string)
condition condition
end end