Merge branch 'master' of git://github.com/EmmanuelOga/liquid into EmmanuelOga/master

This commit is contained in:
Tobias Lütke
2008-11-02 10:04:01 -08:00
2 changed files with 15 additions and 1 deletions
+3 -1
View File
@@ -35,7 +35,9 @@ module Liquid
VariableIncompleteEnd = /\}\}?/
QuotedFragment = /"[^"]+"|'[^']+'|[^\s,|]+/
TagAttributes = /(\w+)\s*\:\s*(#{QuotedFragment})/
TemplateParser = /(#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd})/
AnyStartingTag = /\{\{|\{\%/
PartialTemplateParser = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/
TemplateParser = /(#{PartialTemplateParser}|#{AnyStartingTag})/
VariableParser = /\[[^\]]+\]|#{VariableSegment}+/
end