Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified tag RegEx. Fixed bug preventing section modifiers inside comments.

Browse Source
This commit is contained in:
Justin Hileman
2010-04-26 22:38:33 -04:00
parent bee280f127
commit 9b8454f2ba
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+3 -2
View File
@@ -177,7 +177,7 @@ class Mustache {
$otag = $this->prepareRegEx($this->otag); $otag = $this->prepareRegEx($this->otag);
$ctag = $this->prepareRegEx($this->ctag); $ctag = $this->prepareRegEx($this->ctag);
$this->tagRegEx = '/' . $otag . "(#|\/|=|!|>|\\{|&)?([^\/#]+?)\\1?" . $ctag . "+/"; $this->tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/";
$html = ''; $html = '';
$matches = array(); $matches = array();
while (preg_match($this->tagRegEx, $template, $matches, PREG_OFFSET_CAPTURE)) { while (preg_match($this->tagRegEx, $template, $matches, PREG_OFFSET_CAPTURE)) {
@@ -210,6 +210,7 @@ class Mustache {
protected function renderTag($modifier, $tag_name, &$context) { protected function renderTag($modifier, $tag_name, &$context) {
switch ($modifier) { switch ($modifier) {
case '#': case '#':
case '^':
if ($this->throwSectionExceptions) { if ($this->throwSectionExceptions) {
throw new MustacheException('Unclosed section: ' . $tag_name, MustacheException::UNCLOSED_SECTION); throw new MustacheException('Unclosed section: ' . $tag_name, MustacheException::UNCLOSED_SECTION);
} else { } else {
@@ -310,7 +311,7 @@ class Mustache {
$otag = $this->prepareRegEx($this->otag); $otag = $this->prepareRegEx($this->otag);
$ctag = $this->prepareRegEx($this->ctag); $ctag = $this->prepareRegEx($this->ctag);
$this->tagRegEx = '/' . $otag . "(#|\/|=|!|>|\\{|&)?([^\/#\^]+?)\\1?" . $ctag . "+/"; $this->tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/";
return ''; return '';
} }
examples/comments/comments.mustache
+1 -1
View File
@@ -1 +1 @@
<h1>{{title}}{{! just something interesting... or not... }}</h1> <h1>{{title}}{{! just something interesting... #or ^not... }}</h1>