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

Merge pull request #570 from Shopify/fix-strict-conditions

Browse Source 
Fix condition parse order in strict mode
This commit is contained in:
Justin Li
2015-05-28 16:37:43 -04:00
parent 5d7c00a202
commit 49f2af4209
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/tags/if.rb
+8 -8
View File
@@ -78,16 +78,16 @@ module Liquid
def strict_parse(markup)
p = Parser.new(markup)
condition = parse_comparison(p)
while op = (p.id?('and'.freeze) || p.id?('or'.freeze))
new_cond = parse_comparison(p)
new_cond.send(op, condition)
condition = new_cond
end
condition = parse_binary_comparison(p)
p.consume(:end_of_string)
condition
end
def parse_binary_comparison(p)
condition = parse_comparison(p)
if op = (p.id?('and'.freeze) || p.id?('or'.freeze))
condition.send(op, parse_binary_comparison(p))
end
condition
end