Revert "Merge pull request #476 from Shopify/missing-variable-name-error"

This reverts commit 4dc682313f, reversing
changes made to a8f60ff6b1.
This commit is contained in:
Florian Weingarten
2014-11-07 01:48:16 +00:00
parent b242a7273a
commit 9c33e9601b
2 changed files with 6 additions and 9 deletions
+2 -2
View File
@@ -62,8 +62,8 @@ module Liquid
@filters = [] @filters = []
p = Parser.new(markup) p = Parser.new(markup)
# Could be just filters with no input
@name = Expression.parse(p.expression) @name = p.look(:pipe) ? nil : Expression.parse(p.expression)
while p.consume?(:pipe) while p.consume?(:pipe)
filtername = p.consume(:id) filtername = p.consume(:id)
filterargs = p.consume?(:colon) ? parse_filterargs(p) : [] filterargs = p.consume?(:colon) ? parse_filterargs(p) : []
+4 -7
View File
@@ -28,14 +28,11 @@ class ParsingQuirksTest < Minitest::Test
def test_error_on_empty_filter def test_error_on_empty_filter
assert Template.parse("{{test}}") assert Template.parse("{{test}}")
assert Template.parse("{{|test}}")
with_error_mode(:lax) do
assert Template.parse("{{|test}}")
end
with_error_mode(:strict) do with_error_mode(:strict) do
assert_raises(SyntaxError) { Template.parse("{{|test}}") } assert_raises(SyntaxError) do
assert_raises(SyntaxError) { Template.parse("{{test |a|b|}}") } Template.parse("{{test |a|b|}}")
end
end end
end end