Spec fixes #6
Merged
Spec fixes #6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, qt-mustache will not allow any whitespace between the =
signs and the start/end delimiter in set delimiter tags. It will
treat such whitespace as being part of the delimiters and yield the
error "Custom delimiters may not contain '=' or spaces.".
Apparently, even though the specification reads
"The tag's content MUST be any two non-whitespace sequences
(separated by whitespace) EXCEPT an equals sign ('=') followed
by the current closing delimiter." [1],
apparently such whitespace should ignored. E.g. tags such as
{{= [ ] =}}
should be allowed [2]. The spec is slightly ambiguos here I think,
but that is apparently the intention.
This patch changes `readSetDelimiter(..)` to ignore such whitespace.
As a result the "Pair with Padding" test case in `delimiters.json`
now passes, since it has such a set delimiter tag. The "Sections"
test case in the same file have one as well, and would also pass
now if we only handled standalone tags properly.
[1] https://github.com/mustache/spec/blob/v1.1.2/specs/delimiters.yml#L5-L7
[2] mustache/spec#29
Currently, qt-mustache will not allow any whitespace between the =
signs and the start/end delimiter in set delimiter tags. It will
treat such whitespace as being part of the delimiters and yield the
error "Custom delimiters may not contain '=' or spaces.".
Apparently, even though the specification reads
"The tag's content MUST be any two non-whitespace sequences
(separated by whitespace) EXCEPT an equals sign ('=') followed
by the current closing delimiter." [1],
apparently such whitespace should ignored. E.g. tags such as
{{= [ ] =}}
should be allowed [2]. The spec is slightly ambiguos here I think,
but that is apparently the intention.
This patch changes `readSetDelimiter(..)` to ignore such whitespace.
As a result the "Pair with Padding" test case in `delimiters.json`
now passes, since it has such a set delimiter tag. The "Sections"
test case in the same file have one as well, and would also pass
now if we only handled standalone tags properly.
[1] https://github.com/mustache/spec/blob/v1.1.2/specs/delimiters.yml#L5-L7
[2] mustache/spec#29
robertknight
added a commit
that referenced
this pull request
Aug 18, 2014
Spec fixes - Allow whitespace between '=' and start/end of delimiter when reading custom delimiters.
|
Thanks. A small issue which was present in the original code is that comparisons between a QChar and an ASCII literal should wrap the char in QLatin1Char() or use unicode(). Otherwise an expensive conversion from the local 8 bit encoding is used. eg. 'someString.at(index) == QLatin1Char('=')'. This is just a potential micro-optimization though. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow whitespace between '=' and delimiter.
Currently, qt-mustache will not allow any whitespace between the = signs and the start/end delimiter in set delimiter tags. It will treat such whitespace as being part of the delimiters and yield the error "Custom delimiters may not contain '=' or spaces.".
Apparently, even though the specification reads
apparently such whitespace should ignored. E.g. tags such as
should be allowed. The spec is slightly ambiguos here I think, but that is apparently the intention.
This patch changes
readSetDelimiter(..)to ignore such whitespace. As a result the "Pair with Padding" test case indelimiters.jsonnow passes, since it has such a set delimiter tag. The "Sections" test case in the same file have one as well, and would also pass now if we only handled standalone tags properly.