kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-09 11:45:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to make the regexes more readable.

Browse Source
This commit is contained in:
Dylan Thacker-Smith
2015-07-09 15:42:22 -04:00
parent 87e3234b58
commit 77bdccf5ec
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/liquid/variable.rb
View File

@@ -10,7 +10,16 @@ module Liquid
# {{ user | link }}
#
class Variable
FilterParser = /\s*(?:#{FilterSeparator}|(['"\|]+?))\s*((?:\s+|#{QuotedFragment}|#{ArgumentSeparator})+)/o
capture_ignored_variable_prefix = /([\s,\|'"]+?)??/
capture_expression = /(#{QuotedFragment})/o
capture_ignored_filter_prefix = /([^\|]+?)??/
capture_filters = /(#{FilterSeparator}.*)/o
VariableSyntax = /\A\s*#{capture_ignored_variable_prefix}\s*#{capture_expression}\s*(?:#{capture_ignored_filter_prefix}\s*#{capture_filters})?\z/om
capture_lax_seperator = /(['"\|]+?)/
capture_filter = /((?:\s+|#{QuotedFragment}|#{ArgumentSeparator})+)/o
FilterParser = /\s*(?:#{FilterSeparator}|#{capture_lax_seperator})\s*#{capture_filter}/o
attr_accessor :filters, :name, :line_number
attr_reader :parse_context
alias_method :options, :parse_context
@@ -35,7 +44,7 @@ module Liquid
def lax_parse(markup)
@filters = []
return unless markup =~ /\A\s*([\s,\|'"]+?)??\s*(#{QuotedFragment})\s*(?:([^\|]+?)??\s*(#{FilterSeparator}.*))?\s*\z/om
return unless markup =~ VariableSyntax
add_syntax_warning("variable prefixed with ignored characters: #{$1.inspect}") if $1
name_markup = $2
@@ -43,8 +52,8 @@ module Liquid
filters_markup = $4
@name = Expression.parse(name_markup)
if filters_markup
filters_markup.scan(FilterParser) do |sep, f|
add_syntax_warning("unterminated quote or multiple pipe characters used as a filter seperator: #{sep.inspect}") if sep
filters_markup.scan(FilterParser) do |lax_sep, f|
add_syntax_warning("unterminated quote or multiple pipe characters used as a filter seperator: #{lax_sep.inspect}") if lax_sep
next unless f =~ /\A\s*(\W+)??(\w+)/
add_syntax_warning("ignored characters before filter name: #{$1.inspect}") if $1
filtername = $2