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

Merge branch 'experimental' of git://github.com/jamesmacaulay/liquid into jamesmacaulay/experimental

Browse Source 
Conflicts:

	lib/liquid.rb
	lib/liquid/variable.rb
This commit is contained in:
Tobias Lütke
2008-11-02 10:11:08 -08:00
parent b165599495 36860eab57
commit 7b9b5f31fb
13 changed files with 119 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid.rb
+6 -1
View File
@@ -33,7 +33,12 @@ module Liquid
VariableStart = /\{\{/
VariableEnd = /\}\}/
VariableIncompleteEnd = /\}\}?/
QuotedFragment = /"[^"]+"|'[^']+'|[^\s,|]+/
QuotedFragment = /"[^"]+"|'[^']+'|[^\s,\|]+/
StrictQuotedFragment = /"[^"]+"|'[^']+'|[^\s,\|,\:,\,]+/
FirstFilterArgument = /#{FilterArgumentSeparator}(?:#{StrictQuotedFragment})/
OtherFilterArgument = /#{ArgumentSeparator}(?:#{StrictQuotedFragment})/
SpacelessFilter = /#{FilterSeparator}(?:#{StrictQuotedFragment})(?:#{FirstFilterArgument}(?:#{OtherFilterArgument})*)?/
Expression = /(?:#{QuotedFragment}(?:#{SpacelessFilter})*)/
TagAttributes = /(\w+)\s*\:\s*(#{QuotedFragment})/
AnyStartingTag = /\{\{|\{\%/
PartialTemplateParser = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/