smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- improvement repeated delimiter like {{ and }} will be treated as literal

Browse Source 
https://groups.google.com/forum/#!topic/smarty-developers/h9r82Bx4KZw
This commit is contained in:
Uwe Tews
2017-08-09 12:20:33 +02:00
parent 418a1fd443
commit 6a257a7ad3
3 changed files with 682 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lexer/smarty_internal_templatelexer.plex
View File

@@ -255,6 +255,14 @@ class Smarty_Internal_Templatelexer
$this->yyTraceFILE = fopen('php://output', 'w'); $this->yyTraceFILE = fopen('php://output', 'w');
$this->yyTracePrompt = '<br>'; $this->yyTracePrompt = '<br>';
} }
/*
* Check if this tag is autoliteral
*/
public function isAutoLiteral ()
{
return $this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false;
}
public function replace ($input) { public function replace ($input) {
return str_replace(array('SMARTYldel','SMARTYrawldel','SMARTYrdel'),array($this->ldel,$this->pldel,$this->rdel),$input); return str_replace(array('SMARTYldel','SMARTYrawldel','SMARTYrdel'),array($this->ldel,$this->pldel,$this->rdel),$input);
} }

13
libs/sysplugins/smarty_internal_templatelexer.php
View File

@@ -176,6 +176,10 @@ class Smarty_Internal_Templatelexer
*/ */
private $yy_global_pattern1 = null; private $yy_global_pattern1 = null;
private $yy_global_pattern2 = null; private $yy_global_pattern2 = null;
/*
* Check if this tag is autoliteral
*/
private $yy_global_pattern3 = null; private $yy_global_pattern3 = null;
private $yy_global_pattern4 = null; private $yy_global_pattern4 = null;
private $yy_global_pattern5 = null; private $yy_global_pattern5 = null;
@@ -202,8 +206,7 @@ class Smarty_Internal_Templatelexer
$this->pldel = preg_quote($this->smarty->left_delimiter, '/'); $this->pldel = preg_quote($this->smarty->left_delimiter, '/');
$this->ldel = $this->pldel . ($this->smarty->auto_literal ? '(?!\\s+)' : '\\s*'); $this->ldel = $this->pldel . ($this->smarty->auto_literal ? '(?!\\s+)' : '\\s*');
$this->ldel_length = strlen($this->smarty->left_delimiter); $this->ldel_length = strlen($this->smarty->left_delimiter);
$rdel = preg_quote($this->smarty->right_delimiter, '/'); $this->rdel = preg_quote($this->smarty->right_delimiter, '/');
$this->rdel = "(?<!{$rdel}){$rdel}(?!{$rdel})";
$this->rdel_length = strlen($this->smarty->right_delimiter); $this->rdel_length = strlen($this->smarty->right_delimiter);
$this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter; $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
$this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter; $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
@@ -215,6 +218,12 @@ class Smarty_Internal_Templatelexer
$this->yyTracePrompt = '<br>'; $this->yyTracePrompt = '<br>';
} }
public function isAutoLiteral()
{
return $this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false;
}
public function yylex1() public function yylex1()
{ {
if (!isset($this->yy_global_pattern1)) { if (!isset($this->yy_global_pattern1)) {

1441
libs/sysplugins/smarty_internal_templateparser.php
View File

File diff suppressed because it is too large Load Diff