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

Cleanup.

Browse Source 
Make RegEx variable capitalization consistent. Add docblocks for prepareFooRegEx functions.
This commit is contained in:
Justin Hileman
2010-12-08 08:34:27 -05:00
parent c5bf83f9a9
commit 64b5cd0964
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+29 -6
View File
@@ -264,6 +264,14 @@ class Mustache {
return $template; return $template;
} }
/**
* Prepare a section RegEx string for the given opening/closing tags.
*
* @access protected
* @param string $otag
* @param string $ctag
* @return string
*/
protected function _prepareSectionRegEx($otag, $ctag) { protected function _prepareSectionRegEx($otag, $ctag) {
return sprintf( return sprintf(
'/(?:(?<=\\n)[ \\t]*)?%s(?<type>[%s])(?<tag_name>.+?)%s\\n?/s', '/(?:(?<=\\n)[ \\t]*)?%s(?<type>[%s])(?<tag_name>.+?)%s\\n?/s',
@@ -283,7 +291,7 @@ class Mustache {
* @return array $section, $offset, $type, $tag_name and $content * @return array $section, $offset, $type, $tag_name and $content
*/ */
protected function _findSection($template) { protected function _findSection($template) {
$regex = $this->_prepareSectionRegEx($this->_otag, $this->_ctag); $regEx = $this->_prepareSectionRegEx($this->_otag, $this->_ctag);
$section_start = null; $section_start = null;
$section_type = null; $section_type = null;
@@ -293,7 +301,7 @@ class Mustache {
$section_stack = array(); $section_stack = array();
$matches = array(); $matches = array();
while (preg_match($regex, $template, $matches, PREG_OFFSET_CAPTURE, $search_offset)) { while (preg_match($regEx, $template, $matches, PREG_OFFSET_CAPTURE, $search_offset)) {
$match = $matches[0][0]; $match = $matches[0][0];
$offset = $matches[0][1]; $offset = $matches[0][1];
@@ -336,6 +344,14 @@ class Mustache {
} }
} }
/**
* Prepare a pragma RegEx for the given opening/closing tags.
*
* @access protected
* @param string $otag
* @param string $ctag
* @return string
*/
protected function _preparePragmaRegEx($otag, $ctag) { protected function _preparePragmaRegEx($otag, $ctag) {
return sprintf( return sprintf(
'/%s%%\\s*(?<pragma_name>[\\w_-]+)(?<options_string>(?: [\\w]+=[\\w]+)*)\\s*%s\\n?/s', '/%s%%\\s*(?<pragma_name>[\\w_-]+)(?<options_string>(?: [\\w]+=[\\w]+)*)\\s*%s\\n?/s',
@@ -359,8 +375,8 @@ class Mustache {
return $template; return $template;
} }
$regex = $this->_preparePragmaRegEx($this->_otag, $this->_ctag); $regEx = $this->_preparePragmaRegEx($this->_otag, $this->_ctag);
return preg_replace_callback($regex, array($this, '_renderPragma'), $template); return preg_replace_callback($regEx, array($this, '_renderPragma'), $template);
} }
/** /**
@@ -441,7 +457,15 @@ class Mustache {
return (isset($this->_throwsExceptions[$exception]) && $this->_throwsExceptions[$exception]); return (isset($this->_throwsExceptions[$exception]) && $this->_throwsExceptions[$exception]);
} }
protected function _prepareTagRegex($otag, $ctag) { /**
* Prepare a tag RegEx for the given opening/closing tags.
*
* @access protected
* @param string $otag
* @param string $ctag
* @return string
*/
protected function _prepareTagRegEx($otag, $ctag) {
return sprintf( return sprintf(
'/(?<whitespace>(?<=\\n)[ \\t]*)?%s(?<type>[%s]?)(?<tag_name>.+?)(?:\\2|})?%s(?:\\s*(?=\\n))?/s', '/(?<whitespace>(?<=\\n)[ \\t]*)?%s(?<type>[%s]?)(?<tag_name>.+?)(?:\\2|})?%s(?:\\s*(?=\\n))?/s',
preg_quote($otag, '/'), preg_quote($otag, '/'),
@@ -629,7 +653,6 @@ class Mustache {
$this->_context = $new; $this->_context = $new;
} }
/** /**
* Remove the latest context from the stack. * Remove the latest context from the stack.
* *