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

- bugfix large template text of some charsets could cause parsing errors (topic 24630)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2014-06-17 20:24:20 +00:00
parent 0e1f7fdcfc
commit ee69f963c6
7 changed files with 707 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== 3.1.19-dev ===== (xx.xx.2014) ===== 3.1.19-dev ===== (xx.xx.2014)
17.06.2014
- bugfix large template text of some charsets could cause parsing errors (topic 24630)
08.06.2014 08.06.2014
- bugfix registered objects did not work after spelling fixes of 06.06.2014 - bugfix registered objects did not work after spelling fixes of 06.06.2014
- bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024) - bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)

14
libs/sysplugins/smarty_internal_config_file_compiler.php
View File

@@ -86,6 +86,15 @@ class Smarty_Internal_Config_File_Compiler
// init the lexer/parser to compile the config file // init the lexer/parser to compile the config file
$lex = new Smarty_Internal_Configfilelexer($_content, $this); $lex = new Smarty_Internal_Configfilelexer($_content, $this);
$parser = new Smarty_Internal_Configfileparser($lex, $this); $parser = new Smarty_Internal_Configfileparser($lex, $this);
if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
$mbEncoding = mb_internal_encoding();
mb_internal_encoding('ASCII');
} else {
$mbEncoding = null;
}
if ($this->smarty->_parserdebug) { if ($this->smarty->_parserdebug) {
$parser->PrintTrace(); $parser->PrintTrace();
} }
@@ -98,6 +107,11 @@ class Smarty_Internal_Config_File_Compiler
} }
// finish parsing process // finish parsing process
$parser->doParse(0, 0); $parser->doParse(0, 0);
if ($mbEncoding) {
mb_internal_encoding($mbEncoding);
}
$config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>'; $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
} }

190
libs/sysplugins/smarty_internal_configfilelexer.php
View File

@@ -1,15 +1,16 @@
<?php <?php
/** /**
* Smarty Internal Plugin Configfilelexer * Smarty Internal Plugin Configfilelexer
* * This is the lexer to break the config file source into tokens
* This is the lexer to break the config file source into tokens *
* @package Smarty * @package Smarty
* @subpackage Config * @subpackage Config
* @author Uwe Tews * @author Uwe Tews
*/ */
/** /**
* Smarty Internal Plugin Configfilelexer * Smarty Internal Plugin Configfilelexer
*/ */
class Smarty_Internal_Configfilelexer class Smarty_Internal_Configfilelexer
{ {
@@ -22,11 +23,10 @@ class Smarty_Internal_Configfilelexer
private $state = 1; private $state = 1;
public $yyTraceFILE; public $yyTraceFILE;
public $yyTracePrompt; public $yyTracePrompt;
public $state_name = array (1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'); public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
public $smarty_token_names = array ( // Text for parser error messages public $smarty_token_names = array( // Text for parser error messages
); );
function __construct($data, $compiler) function __construct($data, $compiler)
{ {
// set instance object // set instance object
@@ -36,23 +36,23 @@ class Smarty_Internal_Configfilelexer
$this->line = 1; $this->line = 1;
$this->compiler = $compiler; $this->compiler = $compiler;
$this->smarty = $compiler->smarty; $this->smarty = $compiler->smarty;
$this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
} }
public static function &instance($new_instance = null) public static function &instance($new_instance = null)
{ {
static $instance = null; static $instance = null;
if (isset($new_instance) && is_object($new_instance)) if (isset($new_instance) && is_object($new_instance)) {
$instance = $new_instance; $instance = $new_instance;
}
return $instance; return $instance;
} }
public function PrintTrace() public function PrintTrace()
{ {
$this->yyTraceFILE = fopen('php://output', 'w'); $this->yyTraceFILE = fopen('php://output', 'w');
$this->yyTracePrompt = '<br>'; $this->yyTracePrompt = '<br>';
} }
private $_yy_state = 1; private $_yy_state = 1;
private $_yy_stack = array(); private $_yy_stack = array();
@@ -82,7 +82,6 @@ class Smarty_Internal_Configfilelexer
if ($this->yyTraceFILE) { if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
} }
} }
public function yybegin($state) public function yybegin($state)
@@ -93,12 +92,9 @@ class Smarty_Internal_Configfilelexer
} }
} }
public function yylex1() public function yylex1()
{ {
$tokenMap = array ( $tokenMap = array(
1 => 0, 1 => 0,
2 => 0, 2 => 0,
3 => 0, 3 => 0,
@@ -108,13 +104,13 @@ class Smarty_Internal_Configfilelexer
7 => 0, 7 => 0,
8 => 0, 8 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS"; $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -134,7 +130,7 @@ class Smarty_Internal_Configfilelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r1_' . $this->token}($yysubmatches); $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -143,73 +139,78 @@ class Smarty_Internal_Configfilelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
continue; continue;
} } else { }
} else {
throw new Exception('Unexpected input at line' . $this->line . throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]); ': ' . $this->data[$this->counter]);
} }
break; break;
} while (true); } while (true);
} // end function } // end function
const START = 1; const START = 1;
function yy_r1_1($yy_subpatterns) function yy_r1_1($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
$this->yypushstate(self::COMMENT); $this->yypushstate(self::COMMENT);
} }
function yy_r1_2($yy_subpatterns) function yy_r1_2($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_OPENB; $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
$this->yypushstate(self::SECTION); $this->yypushstate(self::SECTION);
} }
function yy_r1_3($yy_subpatterns) function yy_r1_3($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
} }
function yy_r1_4($yy_subpatterns) function yy_r1_4($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
$this->yypushstate(self::VALUE); $this->yypushstate(self::VALUE);
} }
function yy_r1_5($yy_subpatterns) function yy_r1_5($yy_subpatterns)
{ {
return false; return false;
} }
function yy_r1_6($yy_subpatterns) function yy_r1_6($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
} }
function yy_r1_7($yy_subpatterns) function yy_r1_7($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_ID; $this->token = Smarty_Internal_Configfileparser::TPC_ID;
} }
function yy_r1_8($yy_subpatterns) function yy_r1_8($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_OTHER; $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
} }
public function yylex2() public function yylex2()
{ {
$tokenMap = array ( $tokenMap = array(
1 => 0, 1 => 0,
2 => 0, 2 => 0,
3 => 0, 3 => 0,
@@ -220,13 +221,13 @@ class Smarty_Internal_Configfilelexer
8 => 0, 8 => 0,
9 => 0, 9 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -246,7 +247,7 @@ class Smarty_Internal_Configfilelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r2_' . $this->token}($yysubmatches); $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -255,63 +256,69 @@ class Smarty_Internal_Configfilelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
continue; continue;
} } else { }
} else {
throw new Exception('Unexpected input at line' . $this->line . throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]); ': ' . $this->data[$this->counter]);
} }
break; break;
} while (true); } while (true);
} // end function } // end function
const VALUE = 2; const VALUE = 2;
function yy_r2_1($yy_subpatterns) function yy_r2_1($yy_subpatterns)
{ {
return false; return false;
} }
function yy_r2_2($yy_subpatterns) function yy_r2_2($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_3($yy_subpatterns) function yy_r2_3($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_INT; $this->token = Smarty_Internal_Configfileparser::TPC_INT;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_4($yy_subpatterns) function yy_r2_4($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
$this->yypushstate(self::TRIPPLE); $this->yypushstate(self::TRIPPLE);
} }
function yy_r2_5($yy_subpatterns) function yy_r2_5($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_6($yy_subpatterns) function yy_r2_6($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_7($yy_subpatterns) function yy_r2_7($yy_subpatterns)
{ {
if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) { if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no"))) {
$this->yypopstate(); $this->yypopstate();
$this->yypushstate(self::NAKED_STRING_VALUE); $this->yypushstate(self::NAKED_STRING_VALUE);
return true; //reprocess in new state return true; //reprocess in new state
@@ -320,12 +327,14 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate(); $this->yypopstate();
} }
} }
function yy_r2_8($yy_subpatterns) function yy_r2_8($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_9($yy_subpatterns) function yy_r2_9($yy_subpatterns)
{ {
@@ -334,20 +343,18 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate(); $this->yypopstate();
} }
public function yylex3() public function yylex3()
{ {
$tokenMap = array ( $tokenMap = array(
1 => 0, 1 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS"; $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -367,7 +374,7 @@ class Smarty_Internal_Configfilelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r3_' . $this->token}($yysubmatches); $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -376,24 +383,24 @@ class Smarty_Internal_Configfilelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
continue; continue;
} } else { }
} else {
throw new Exception('Unexpected input at line' . $this->line . throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]); ': ' . $this->data[$this->counter]);
} }
break; break;
} while (true); } while (true);
} // end function } // end function
const NAKED_STRING_VALUE = 3; const NAKED_STRING_VALUE = 3;
function yy_r3_1($yy_subpatterns) function yy_r3_1($yy_subpatterns)
{ {
@@ -401,22 +408,20 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate(); $this->yypopstate();
} }
public function yylex4() public function yylex4()
{ {
$tokenMap = array ( $tokenMap = array(
1 => 0, 1 => 0,
2 => 0, 2 => 0,
3 => 0, 3 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -436,7 +441,7 @@ class Smarty_Internal_Configfilelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r4_' . $this->token}($yysubmatches); $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -445,34 +450,36 @@ class Smarty_Internal_Configfilelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
continue; continue;
} } else { }
} else {
throw new Exception('Unexpected input at line' . $this->line . throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]); ': ' . $this->data[$this->counter]);
} }
break; break;
} while (true); } while (true);
} // end function } // end function
const COMMENT = 4; const COMMENT = 4;
function yy_r4_1($yy_subpatterns) function yy_r4_1($yy_subpatterns)
{ {
return false; return false;
} }
function yy_r4_2($yy_subpatterns) function yy_r4_2($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
} }
function yy_r4_3($yy_subpatterns) function yy_r4_3($yy_subpatterns)
{ {
@@ -480,21 +487,19 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate(); $this->yypopstate();
} }
public function yylex5() public function yylex5()
{ {
$tokenMap = array ( $tokenMap = array(
1 => 0, 1 => 0,
2 => 0, 2 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS"; $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -514,7 +519,7 @@ class Smarty_Internal_Configfilelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r5_' . $this->token}($yysubmatches); $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -523,29 +528,30 @@ class Smarty_Internal_Configfilelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
continue; continue;
} } else { }
} else {
throw new Exception('Unexpected input at line' . $this->line . throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]); ': ' . $this->data[$this->counter]);
} }
break; break;
} while (true); } while (true);
} // end function } // end function
const SECTION = 5; const SECTION = 5;
function yy_r5_1($yy_subpatterns) function yy_r5_1($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_DOT; $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
} }
function yy_r5_2($yy_subpatterns) function yy_r5_2($yy_subpatterns)
{ {
@@ -553,20 +559,19 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate(); $this->yypopstate();
} }
public function yylex6() public function yylex6()
{ {
$tokenMap = array ( $tokenMap = array(
1 => 0, 1 => 0,
2 => 0, 2 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS"; $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -586,7 +591,7 @@ class Smarty_Internal_Configfilelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r6_' . $this->token}($yysubmatches); $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -595,24 +600,24 @@ class Smarty_Internal_Configfilelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
continue; continue;
} } else { }
} else {
throw new Exception('Unexpected input at line' . $this->line . throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]); ': ' . $this->data[$this->counter]);
} }
break; break;
} while (true); } while (true);
} // end function } // end function
const TRIPPLE = 6; const TRIPPLE = 6;
function yy_r6_1($yy_subpatterns) function yy_r6_1($yy_subpatterns)
{ {
@@ -620,28 +625,19 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate(); $this->yypopstate();
$this->yypushstate(self::START); $this->yypushstate(self::START);
} }
function yy_r6_2($yy_subpatterns) function yy_r6_2($yy_subpatterns)
{ {
if ($this->mbstring_overload) {
$to = mb_strlen($this->data,'latin1');
} else {
$to = strlen($this->data); $to = strlen($this->data);
} preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
if (isset($match[0][1])) { if (isset($match[0][1])) {
$to = $match[0][1]; $to = $match[0][1];
} else { } else {
$this->compiler->trigger_template_error ("missing or misspelled literal closing tag"); $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
}
if ($this->mbstring_overload) {
$this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
} else {
$this->value = substr($this->data,$this->counter,$to-$this->counter);
} }
$this->value = substr($this->data, $this->counter, $to - $this->counter);
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
} }
} }

552
libs/sysplugins/smarty_internal_configfileparser.php
View File

@@ -1,13 +1,14 @@
<?php <?php
/** /**
* Smarty Internal Plugin Configfileparser * Smarty Internal Plugin Configfileparser
* * This is the config file parser.
* This is the config file parser. * It is generated from the internal.configfileparser.y file
* It is generated from the internal.configfileparser.y file *
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
* @author Uwe Tews * @author Uwe Tews
*/ */
class TPC_yyToken implements ArrayAccess class TPC_yyToken implements ArrayAccess
{ {
public $string = ''; public $string = '';
@@ -80,13 +81,14 @@ class TPC_yyStackEntry
** number for the token at this stack level */ ** number for the token at this stack level */
public $minor; /* The user-supplied minor token value. This public $minor; /* The user-supplied minor token value. This
** is the value of the token */ ** is the value of the token */
}; }
;
#line 12 "smarty_internal_configfileparser.y" #line 12 "smarty_internal_configfileparser.y"
class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser.php" class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparser.php"
{ {
#line 14 "smarty_internal_configfileparser.y" #line 14 "smarty_internal_configfileparser.y"
// states whether the parse was successful or not // states whether the parse was successful or not
public $successful = true; public $successful = true;
@@ -94,23 +96,27 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
private $lex; private $lex;
private $internalError = false; private $internalError = false;
function __construct($lex, $compiler) { function __construct($lex, $compiler)
{
// set instance object // set instance object
self::instance($this); self::instance($this);
$this->lex = $lex; $this->lex = $lex;
$this->smarty = $compiler->smarty; $this->smarty = $compiler->smarty;
$this->compiler = $compiler; $this->compiler = $compiler;
} }
public static function &instance($new_instance = null) public static function &instance($new_instance = null)
{ {
static $instance = null; static $instance = null;
if (isset($new_instance) && is_object($new_instance)) if (isset($new_instance) && is_object($new_instance)) {
$instance = $new_instance; $instance = $new_instance;
}
return $instance; return $instance;
} }
private function parse_bool($str) { private function parse_bool($str)
if (in_array(strtolower($str) ,array('on','yes','true'))) { {
if (in_array(strtolower($str), array('on', 'yes', 'true'))) {
$res = true; $res = true;
} else { } else {
$res = false; $res = false;
@@ -120,10 +126,12 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
private static $escapes_single = Array('\\' => '\\', private static $escapes_single = Array('\\' => '\\',
'\'' => '\''); '\'' => '\'');
private static function parse_single_quoted_string($qstr) {
$escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
$ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE); private static function parse_single_quoted_string($qstr)
{
$escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
$ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
$str = ""; $str = "";
foreach ($ss as $s) { foreach ($ss as $s) {
@@ -139,16 +147,19 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
return $str; return $str;
} }
private static function parse_double_quoted_string($qstr) { private static function parse_double_quoted_string($qstr)
$inner_str = substr($qstr, 1, strlen($qstr)-2); {
$inner_str = substr($qstr, 1, strlen($qstr) - 2);
return stripcslashes($inner_str); return stripcslashes($inner_str);
} }
private static function parse_tripple_double_quoted_string($qstr) { private static function parse_tripple_double_quoted_string($qstr)
{
return stripcslashes($qstr); return stripcslashes($qstr);
} }
private function set_var(Array $var, Array &$target_array) { private function set_var(Array $var, Array &$target_array)
{
$key = $var["key"]; $key = $var["key"];
$value = $var["value"]; $value = $var["value"];
@@ -160,7 +171,8 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
} }
} }
private function add_global_vars(Array $vars) { private function add_global_vars(Array $vars)
{
if (!isset($this->compiler->config_data['vars'])) { if (!isset($this->compiler->config_data['vars'])) {
$this->compiler->config_data['vars'] = Array(); $this->compiler->config_data['vars'] = Array();
} }
@@ -169,7 +181,8 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
} }
} }
private function add_section_vars($section_name, Array $vars) { private function add_section_vars($section_name, Array $vars)
{
if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) { if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
$this->compiler->config_data['sections'][$section_name]['vars'] = Array(); $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
} }
@@ -177,7 +190,8 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
$this->set_var($var, $this->compiler->config_data['sections'][$section_name]); $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
} }
} }
#line 174 "smarty_internal_configfileparser.php"
#line 174 "smarty_internal_configfileparser.php"
const TPC_OPENB = 1; const TPC_OPENB = 1;
const TPC_SECTION = 2; const TPC_SECTION = 2;
@@ -202,74 +216,126 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
const YY_ERROR_ACTION = 58; const YY_ERROR_ACTION = 58;
const YY_SZ_ACTTAB = 38; const YY_SZ_ACTTAB = 38;
static public $yy_action = array( static public $yy_action = array(
/* 0 */ 29, 30, 34, 33, 24, 13, 19, 25, 35, 21, /* 0 */
/* 10 */ 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 29, 30, 34, 33, 24, 13, 19, 25, 35, 21,
/* 20 */ 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, /* 10 */
/* 30 */ 2, 11, 28, 22, 16, 9, 7, 10, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12,
/* 20 */
15, 17, 23, 18, 27, 26, 4, 5, 6, 32,
/* 30 */
2, 11, 28, 22, 16, 9, 7, 10,
); );
static public $yy_lookahead = array( static public $yy_lookahead = array(
/* 0 */ 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, /* 0 */
/* 10 */ 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 7, 8, 9, 10, 11, 12, 5, 27, 15, 16,
/* 20 */ 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, /* 10 */
/* 30 */ 23, 1, 24, 17, 2, 25, 22, 25, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18,
); /* 20 */
const YY_SHIFT_USE_DFLT = -8; 15, 2, 17, 4, 25, 26, 6, 3, 3, 14,
/* 30 */
23, 1, 24, 17, 2, 25, 22, 25,
);
const YY_SHIFT_USE_DFLT = - 8;
const YY_SHIFT_MAX = 19; const YY_SHIFT_MAX = 19;
static public $yy_shift_ofst = array( static public $yy_shift_ofst = array(
/* 0 */ -8, 1, 1, 1, -7, -3, -3, 30, -8, -8, /* 0 */
/* 10 */ -8, 19, 5, 3, 15, 16, 24, 25, 32, 20, - 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8,
); /* 10 */
const YY_REDUCE_USE_DFLT = -21; - 8, 19, 5, 3, 15, 16, 24, 25, 32, 20,
);
const YY_REDUCE_USE_DFLT = - 21;
const YY_REDUCE_MAX = 10; const YY_REDUCE_MAX = 10;
static public $yy_reduce_ofst = array( static public $yy_reduce_ofst = array(
/* 0 */ -10, -1, -1, -1, -20, 10, 12, 8, 14, 7, /* 0 */
/* 10 */ -11, - 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7,
); /* 10 */
- 11,
);
static public $yyExpectedTokens = array( static public $yyExpectedTokens = array(
/* 0 */ array(), /* 0 */
/* 1 */ array(5, 17, 18, ), array(),
/* 2 */ array(5, 17, 18, ), /* 1 */
/* 3 */ array(5, 17, 18, ), array(5, 17, 18,),
/* 4 */ array(7, 8, 9, 10, 11, 12, 15, 16, ), /* 2 */
/* 5 */ array(17, 18, ), array(5, 17, 18,),
/* 6 */ array(17, 18, ), /* 3 */
/* 7 */ array(1, ), array(5, 17, 18,),
/* 8 */ array(), /* 4 */
/* 9 */ array(), array(7, 8, 9, 10, 11, 12, 15, 16,),
/* 10 */ array(), /* 5 */
/* 11 */ array(2, 4, ), array(17, 18,),
/* 12 */ array(15, 17, ), /* 6 */
/* 13 */ array(13, 14, ), array(17, 18,),
/* 14 */ array(14, ), /* 7 */
/* 15 */ array(17, ), array(1,),
/* 16 */ array(3, ), /* 8 */
/* 17 */ array(3, ), array(),
/* 18 */ array(2, ), /* 9 */
/* 19 */ array(6, ), array(),
/* 20 */ array(), /* 10 */
/* 21 */ array(), array(),
/* 22 */ array(), /* 11 */
/* 23 */ array(), array(2, 4,),
/* 24 */ array(), /* 12 */
/* 25 */ array(), array(15, 17,),
/* 26 */ array(), /* 13 */
/* 27 */ array(), array(13, 14,),
/* 28 */ array(), /* 14 */
/* 29 */ array(), array(14,),
/* 30 */ array(), /* 15 */
/* 31 */ array(), array(17,),
/* 32 */ array(), /* 16 */
/* 33 */ array(), array(3,),
/* 34 */ array(), /* 17 */
/* 35 */ array(), array(3,),
); /* 18 */
array(2,),
/* 19 */
array(6,),
/* 20 */
array(),
/* 21 */
array(),
/* 22 */
array(),
/* 23 */
array(),
/* 24 */
array(),
/* 25 */
array(),
/* 26 */
array(),
/* 27 */
array(),
/* 28 */
array(),
/* 29 */
array(),
/* 30 */
array(),
/* 31 */
array(),
/* 32 */
array(),
/* 33 */
array(),
/* 34 */
array(),
/* 35 */
array(),
);
static public $yy_default = array( static public $yy_default = array(
/* 0 */ 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, /* 0 */
/* 10 */ 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, 44, 37, 41, 40, 58, 58, 58, 36, 39, 44,
/* 20 */ 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, /* 10 */
/* 30 */ 47, 52, 51, 49, 48, 53, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
); /* 20 */
55, 54, 57, 56, 50, 45, 43, 42, 38, 46,
/* 30 */
47, 52, 51, 49, 48, 53,
);
const YYNOCODE = 29; const YYNOCODE = 29;
const YYSTACKDEPTH = 100; const YYSTACKDEPTH = 100;
const YYNSTATE = 36; const YYNSTATE = 36;
@@ -277,8 +343,8 @@ static public $yy_action = array(
const YYERRORSYMBOL = 19; const YYERRORSYMBOL = 19;
const YYERRSYMDT = 'yy0'; const YYERRSYMDT = 'yy0';
const YYFALLBACK = 0; const YYFALLBACK = 0;
public static $yyFallback = array( public static $yyFallback = array();
);
public function Trace($TraceFILE, $zTracePrompt) public function Trace($TraceFILE, $zTracePrompt)
{ {
if (!$TraceFILE) { if (!$TraceFILE) {
@@ -313,28 +379,50 @@ static public $yy_action = array(
); );
public static $yyRuleName = array( public static $yyRuleName = array(
/* 0 */ "start ::= global_vars sections", /* 0 */
/* 1 */ "global_vars ::= var_list", "start ::= global_vars sections",
/* 2 */ "sections ::= sections section", /* 1 */
/* 3 */ "sections ::=", "global_vars ::= var_list",
/* 4 */ "section ::= OPENB SECTION CLOSEB newline var_list", /* 2 */
/* 5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list", "sections ::= sections section",
/* 6 */ "var_list ::= var_list newline", /* 3 */
/* 7 */ "var_list ::= var_list var", "sections ::=",
/* 8 */ "var_list ::=", /* 4 */
/* 9 */ "var ::= ID EQUAL value", "section ::= OPENB SECTION CLOSEB newline var_list",
/* 10 */ "value ::= FLOAT", /* 5 */
/* 11 */ "value ::= INT", "section ::= OPENB DOT SECTION CLOSEB newline var_list",
/* 12 */ "value ::= BOOL", /* 6 */
/* 13 */ "value ::= SINGLE_QUOTED_STRING", "var_list ::= var_list newline",
/* 14 */ "value ::= DOUBLE_QUOTED_STRING", /* 7 */
/* 15 */ "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END", "var_list ::= var_list var",
/* 16 */ "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END", /* 8 */
/* 17 */ "value ::= NAKED_STRING", "var_list ::=",
/* 18 */ "value ::= OTHER", /* 9 */
/* 19 */ "newline ::= NEWLINE", "var ::= ID EQUAL value",
/* 20 */ "newline ::= COMMENTSTART NEWLINE", /* 10 */
/* 21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE", "value ::= FLOAT",
/* 11 */
"value ::= INT",
/* 12 */
"value ::= BOOL",
/* 13 */
"value ::= SINGLE_QUOTED_STRING",
/* 14 */
"value ::= DOUBLE_QUOTED_STRING",
/* 15 */
"value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
/* 16 */
"value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
/* 17 */
"value ::= NAKED_STRING",
/* 18 */
"value ::= OTHER",
/* 19 */
"newline ::= NEWLINE",
/* 20 */
"newline ::= COMMENTSTART NEWLINE",
/* 21 */
"newline ::= COMMENTSTART NAKED_STRING NEWLINE",
); );
public function tokenName($tokenType) public function tokenName($tokenType)
@@ -352,7 +440,8 @@ static public $yy_action = array(
public static function yy_destructor($yymajor, $yypminor) public static function yy_destructor($yymajor, $yypminor)
{ {
switch ($yymajor) { switch ($yymajor) {
default: break; /* If no destructor action specified: do nothing */ default:
break; /* If no destructor action specified: do nothing */
} }
} }
@@ -369,7 +458,7 @@ static public $yy_action = array(
} }
$yymajor = $yytos->major; $yymajor = $yytos->major;
self::yy_destructor($yymajor, $yytos->minor); self::yy_destructor($yymajor, $yytos->minor);
$this->yyidx--; $this->yyidx --;
return $yymajor; return $yymajor;
} }
@@ -399,7 +488,7 @@ static public $yy_action = array(
// reduce action // reduce action
$done = 0; $done = 0;
do { do {
if ($done++ == 100) { if ($done ++ == 100) {
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;
// too much recursion prevents proper detection // too much recursion prevents proper detection
@@ -423,7 +512,7 @@ static public $yy_action = array(
} }
if ($nextstate < self::YYNSTATE) { if ($nextstate < self::YYNSTATE) {
// we need to shift a non-terminal // we need to shift a non-terminal
$this->yyidx++; $this->yyidx ++;
$x = new TPC_yyStackEntry; $x = new TPC_yyStackEntry;
$x->stateno = $nextstate; $x->stateno = $nextstate;
$x->major = self::$yyRuleInfo[$yyruleno]['lhs']; $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
@@ -471,7 +560,7 @@ static public $yy_action = array(
// reduce action // reduce action
$done = 0; $done = 0;
do { do {
if ($done++ == 100) { if ($done ++ == 100) {
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;
// too much recursion prevents proper detection // too much recursion prevents proper detection
@@ -484,7 +573,8 @@ static public $yy_action = array(
$this->yystack[$this->yyidx]->stateno, $this->yystack[$this->yyidx]->stateno,
self::$yyRuleInfo[$yyruleno]['lhs']); self::$yyRuleInfo[$yyruleno]['lhs']);
if (isset(self::$yyExpectedTokens[$nextstate]) && if (isset(self::$yyExpectedTokens[$nextstate]) &&
in_array($token, self::$yyExpectedTokens[$nextstate], true)) { in_array($token, self::$yyExpectedTokens[$nextstate], true)
) {
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;
@@ -492,7 +582,7 @@ static public $yy_action = array(
} }
if ($nextstate < self::YYNSTATE) { if ($nextstate < self::YYNSTATE) {
// we need to shift a non-terminal // we need to shift a non-terminal
$this->yyidx++; $this->yyidx ++;
$x = new TPC_yyStackEntry; $x = new TPC_yyStackEntry;
$x->stateno = $nextstate; $x->stateno = $nextstate;
$x->major = self::$yyRuleInfo[$yyruleno]['lhs']; $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
@@ -545,9 +635,11 @@ static public $yy_action = array(
} }
$i += $iLookAhead; $i += $iLookAhead;
if ($i < 0 || $i >= self::YY_SZ_ACTTAB || if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
self::$yy_lookahead[$i] != $iLookAhead) { self::$yy_lookahead[$i] != $iLookAhead
) {
if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
&& ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { && ($iFallback = self::$yyFallback[$iLookAhead]) != 0
) {
if ($this->yyTraceFILE) { if ($this->yyTraceFILE) {
fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
$this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iLookAhead] . " => " .
@@ -579,7 +671,8 @@ static public $yy_action = array(
} }
$i += $iLookAhead; $i += $iLookAhead;
if ($i < 0 || $i >= self::YY_SZ_ACTTAB || if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
self::$yy_lookahead[$i] != $iLookAhead) { self::$yy_lookahead[$i] != $iLookAhead
) {
return self::$yy_default[$stateno]; return self::$yy_default[$stateno];
} else { } else {
return self::$yy_action[$i]; return self::$yy_action[$i];
@@ -588,20 +681,20 @@ static public $yy_action = array(
public function yy_shift($yyNewState, $yyMajor, $yypMinor) public function yy_shift($yyNewState, $yyMajor, $yypMinor)
{ {
$this->yyidx++; $this->yyidx ++;
if ($this->yyidx >= self::YYSTACKDEPTH) { if ($this->yyidx >= self::YYSTACKDEPTH) {
$this->yyidx--; $this->yyidx --;
if ($this->yyTraceFILE) { if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
} }
while ($this->yyidx >= 0) { while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack(); $this->yy_pop_parser_stack();
} }
#line 125 "smarty_internal_configfileparser.y" #line 125 "smarty_internal_configfileparser.y"
$this->internalError = true; $this->internalError = true;
$this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
#line 601 "smarty_internal_configfileparser.php" #line 601 "smarty_internal_configfileparser.php"
return; return;
} }
@@ -614,37 +707,37 @@ static public $yy_action = array(
fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
$yyNewState); $yyNewState);
fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
for ($i = 1; $i <= $this->yyidx; $i++) { for ($i = 1; $i <= $this->yyidx; $i ++) {
fprintf($this->yyTraceFILE, " %s", fprintf($this->yyTraceFILE, " %s",
$this->yyTokenName[$this->yystack[$i]->major]); $this->yyTokenName[$this->yystack[$i]->major]);
} }
fwrite($this->yyTraceFILE,"\n"); fwrite($this->yyTraceFILE, "\n");
} }
} }
public static $yyRuleInfo = array( public static $yyRuleInfo = array(
array( 'lhs' => 20, 'rhs' => 2 ), array('lhs' => 20, 'rhs' => 2),
array( 'lhs' => 21, 'rhs' => 1 ), array('lhs' => 21, 'rhs' => 1),
array( 'lhs' => 22, 'rhs' => 2 ), array('lhs' => 22, 'rhs' => 2),
array( 'lhs' => 22, 'rhs' => 0 ), array('lhs' => 22, 'rhs' => 0),
array( 'lhs' => 24, 'rhs' => 5 ), array('lhs' => 24, 'rhs' => 5),
array( 'lhs' => 24, 'rhs' => 6 ), array('lhs' => 24, 'rhs' => 6),
array( 'lhs' => 23, 'rhs' => 2 ), array('lhs' => 23, 'rhs' => 2),
array( 'lhs' => 23, 'rhs' => 2 ), array('lhs' => 23, 'rhs' => 2),
array( 'lhs' => 23, 'rhs' => 0 ), array('lhs' => 23, 'rhs' => 0),
array( 'lhs' => 26, 'rhs' => 3 ), array('lhs' => 26, 'rhs' => 3),
array( 'lhs' => 27, 'rhs' => 1 ), array('lhs' => 27, 'rhs' => 1),
array( 'lhs' => 27, 'rhs' => 1 ), array('lhs' => 27, 'rhs' => 1),
array( 'lhs' => 27, 'rhs' => 1 ), array('lhs' => 27, 'rhs' => 1),
array( 'lhs' => 27, 'rhs' => 1 ), array('lhs' => 27, 'rhs' => 1),
array( 'lhs' => 27, 'rhs' => 1 ), array('lhs' => 27, 'rhs' => 1),
array( 'lhs' => 27, 'rhs' => 3 ), array('lhs' => 27, 'rhs' => 3),
array( 'lhs' => 27, 'rhs' => 2 ), array('lhs' => 27, 'rhs' => 2),
array( 'lhs' => 27, 'rhs' => 1 ), array('lhs' => 27, 'rhs' => 1),
array( 'lhs' => 27, 'rhs' => 1 ), array('lhs' => 27, 'rhs' => 1),
array( 'lhs' => 25, 'rhs' => 1 ), array('lhs' => 25, 'rhs' => 1),
array( 'lhs' => 25, 'rhs' => 2 ), array('lhs' => 25, 'rhs' => 2),
array( 'lhs' => 25, 'rhs' => 3 ), array('lhs' => 25, 'rhs' => 3),
); );
public static $yyReduceMap = array( public static $yyReduceMap = array(
@@ -671,90 +764,109 @@ static public $yy_action = array(
17 => 17, 17 => 17,
18 => 17, 18 => 17,
); );
#line 131 "smarty_internal_configfileparser.y"
function yy_r0(){ #line 131 "smarty_internal_configfileparser.y"
function yy_r0()
{
$this->_retvalue = null; $this->_retvalue = null;
} }
#line 675 "smarty_internal_configfileparser.php" #line 675 "smarty_internal_configfileparser.php"
#line 136 "smarty_internal_configfileparser.y" #line 136 "smarty_internal_configfileparser.y"
function yy_r1(){ function yy_r1()
$this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null; {
} $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
#line 680 "smarty_internal_configfileparser.php"
#line 149 "smarty_internal_configfileparser.y"
function yy_r4(){
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
$this->_retvalue = null; $this->_retvalue = null;
} }
#line 686 "smarty_internal_configfileparser.php" #line 680 "smarty_internal_configfileparser.php"
#line 154 "smarty_internal_configfileparser.y" #line 149 "smarty_internal_configfileparser.y"
function yy_r5(){ function yy_r4()
{
$this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
$this->_retvalue = null;
}
#line 686 "smarty_internal_configfileparser.php"
#line 154 "smarty_internal_configfileparser.y"
function yy_r5()
{
if ($this->smarty->config_read_hidden) { if ($this->smarty->config_read_hidden) {
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
} }
$this->_retvalue = null; $this->_retvalue = null;
} }
#line 694 "smarty_internal_configfileparser.php" #line 694 "smarty_internal_configfileparser.php"
#line 162 "smarty_internal_configfileparser.y" #line 162 "smarty_internal_configfileparser.y"
function yy_r6(){ function yy_r6()
$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; {
$this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
} }
#line 699 "smarty_internal_configfileparser.php" #line 699 "smarty_internal_configfileparser.php"
#line 166 "smarty_internal_configfileparser.y" #line 166 "smarty_internal_configfileparser.y"
function yy_r7(){ function yy_r7()
$this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); {
$this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
} }
#line 704 "smarty_internal_configfileparser.php" #line 704 "smarty_internal_configfileparser.php"
#line 170 "smarty_internal_configfileparser.y" #line 170 "smarty_internal_configfileparser.y"
function yy_r8(){ function yy_r8()
{
$this->_retvalue = Array(); $this->_retvalue = Array();
} }
#line 709 "smarty_internal_configfileparser.php" #line 709 "smarty_internal_configfileparser.php"
#line 176 "smarty_internal_configfileparser.y" #line 176 "smarty_internal_configfileparser.y"
function yy_r9(){ function yy_r9()
$this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); {
$this->_retvalue = Array("key" => $this->yystack[$this->yyidx + - 2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
} }
#line 714 "smarty_internal_configfileparser.php" #line 714 "smarty_internal_configfileparser.php"
#line 181 "smarty_internal_configfileparser.y" #line 181 "smarty_internal_configfileparser.y"
function yy_r10(){ function yy_r10()
{
$this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
} }
#line 719 "smarty_internal_configfileparser.php" #line 719 "smarty_internal_configfileparser.php"
#line 185 "smarty_internal_configfileparser.y" #line 185 "smarty_internal_configfileparser.y"
function yy_r11(){ function yy_r11()
{
$this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
} }
#line 724 "smarty_internal_configfileparser.php" #line 724 "smarty_internal_configfileparser.php"
#line 189 "smarty_internal_configfileparser.y" #line 189 "smarty_internal_configfileparser.y"
function yy_r12(){ function yy_r12()
{
$this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
} }
#line 729 "smarty_internal_configfileparser.php" #line 729 "smarty_internal_configfileparser.php"
#line 193 "smarty_internal_configfileparser.y" #line 193 "smarty_internal_configfileparser.y"
function yy_r13(){ function yy_r13()
{
$this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
} }
#line 734 "smarty_internal_configfileparser.php" #line 734 "smarty_internal_configfileparser.php"
#line 197 "smarty_internal_configfileparser.y" #line 197 "smarty_internal_configfileparser.y"
function yy_r14(){ function yy_r14()
{
$this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
} }
#line 739 "smarty_internal_configfileparser.php" #line 739 "smarty_internal_configfileparser.php"
#line 201 "smarty_internal_configfileparser.y" #line 201 "smarty_internal_configfileparser.y"
function yy_r15(){ function yy_r15()
$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor); {
$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor);
} }
#line 744 "smarty_internal_configfileparser.php" #line 744 "smarty_internal_configfileparser.php"
#line 205 "smarty_internal_configfileparser.y" #line 205 "smarty_internal_configfileparser.y"
function yy_r16(){ function yy_r16()
{
$this->_retvalue = ''; $this->_retvalue = '';
} }
#line 749 "smarty_internal_configfileparser.php" #line 749 "smarty_internal_configfileparser.php"
#line 209 "smarty_internal_configfileparser.y" #line 209 "smarty_internal_configfileparser.y"
function yy_r17(){ function yy_r17()
{
$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
} }
#line 754 "smarty_internal_configfileparser.php"
#line 754 "smarty_internal_configfileparser.php"
private $_retvalue; private $_retvalue;
@@ -762,7 +874,8 @@ static public $yy_action = array(
{ {
$yymsp = $this->yystack[$this->yyidx]; $yymsp = $this->yystack[$this->yyidx];
if ($this->yyTraceFILE && $yyruleno >= 0 if ($this->yyTraceFILE && $yyruleno >= 0
&& $yyruleno < count(self::$yyRuleName)) { && $yyruleno < count(self::$yyRuleName)
) {
fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
$this->yyTracePrompt, $yyruleno, $this->yyTracePrompt, $yyruleno,
self::$yyRuleName[$yyruleno]); self::$yyRuleName[$yyruleno]);
@@ -778,14 +891,14 @@ static public $yy_action = array(
$yygoto = self::$yyRuleInfo[$yyruleno]['lhs']; $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
$yysize = self::$yyRuleInfo[$yyruleno]['rhs']; $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
$this->yyidx -= $yysize; $this->yyidx -= $yysize;
for ($i = $yysize; $i; $i--) { for ($i = $yysize; $i; $i --) {
// pop all of the right-hand side parameters // pop all of the right-hand side parameters
array_pop($this->yystack); array_pop($this->yystack);
} }
$yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
if ($yyact < self::YYNSTATE) { if ($yyact < self::YYNSTATE) {
if (!$this->yyTraceFILE && $yysize) { if (!$this->yyTraceFILE && $yysize) {
$this->yyidx++; $this->yyidx ++;
$x = new TPC_yyStackEntry; $x = new TPC_yyStackEntry;
$x->stateno = $yyact; $x->stateno = $yyact;
$x->major = $yygoto; $x->major = $yygoto;
@@ -803,35 +916,37 @@ static public $yy_action = array(
{ {
if ($this->yyTraceFILE) { if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
} while ($this->yyidx >= 0) { }
while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack(); $this->yy_pop_parser_stack();
} }
} }
public function yy_syntax_error($yymajor, $TOKEN) public function yy_syntax_error($yymajor, $TOKEN)
{ {
#line 118 "smarty_internal_configfileparser.y" #line 118 "smarty_internal_configfileparser.y"
$this->internalError = true; $this->internalError = true;
$this->yymajor = $yymajor; $this->yymajor = $yymajor;
$this->compiler->trigger_config_file_error(); $this->compiler->trigger_config_file_error();
#line 816 "smarty_internal_configfileparser.php" #line 816 "smarty_internal_configfileparser.php"
} }
public function yy_accept() public function yy_accept()
{ {
if ($this->yyTraceFILE) { if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
} while ($this->yyidx >= 0) { }
while ($this->yyidx >= 0) {
$stack = $this->yy_pop_parser_stack(); $stack = $this->yy_pop_parser_stack();
} }
#line 110 "smarty_internal_configfileparser.y" #line 110 "smarty_internal_configfileparser.y"
$this->successful = !$this->internalError; $this->successful = !$this->internalError;
$this->internalError = false; $this->internalError = false;
$this->retvalue = $this->_retvalue; $this->retvalue = $this->_retvalue;
//echo $this->retvalue."\n\n"; //echo $this->retvalue."\n\n";
#line 833 "smarty_internal_configfileparser.php" #line 833 "smarty_internal_configfileparser.php"
} }
public function doParse($yymajor, $yytokenvalue) public function doParse($yymajor, $yytokenvalue)
@@ -840,14 +955,14 @@ static public $yy_action = array(
if ($this->yyidx === null || $this->yyidx < 0) { if ($this->yyidx === null || $this->yyidx < 0) {
$this->yyidx = 0; $this->yyidx = 0;
$this->yyerrcnt = -1; $this->yyerrcnt = - 1;
$x = new TPC_yyStackEntry; $x = new TPC_yyStackEntry;
$x->stateno = 0; $x->stateno = 0;
$x->major = 0; $x->major = 0;
$this->yystack = array(); $this->yystack = array();
array_push($this->yystack, $x); array_push($this->yystack, $x);
} }
$yyendofinput = ($yymajor==0); $yyendofinput = ($yymajor == 0);
if ($this->yyTraceFILE) { if ($this->yyTraceFILE) {
fprintf($this->yyTraceFILE, "%sInput %s\n", fprintf($this->yyTraceFILE, "%sInput %s\n",
@@ -857,13 +972,14 @@ static public $yy_action = array(
do { do {
$yyact = $this->yy_find_shift_action($yymajor); $yyact = $this->yy_find_shift_action($yymajor);
if ($yymajor < self::YYERRORSYMBOL && if ($yymajor < self::YYERRORSYMBOL &&
!$this->yy_is_expected_token($yymajor)) { !$this->yy_is_expected_token($yymajor)
) {
// force a syntax error // force a syntax error
$yyact = self::YY_ERROR_ACTION; $yyact = self::YY_ERROR_ACTION;
} }
if ($yyact < self::YYNSTATE) { if ($yyact < self::YYNSTATE) {
$this->yy_shift($yyact, $yymajor, $yytokenvalue); $this->yy_shift($yyact, $yymajor, $yytokenvalue);
$this->yyerrcnt--; $this->yyerrcnt --;
if ($yyendofinput && $this->yyidx >= 0) { if ($yyendofinput && $this->yyidx >= 0) {
$yymajor = 0; $yymajor = 0;
} else { } else {
@@ -892,10 +1008,10 @@ static public $yy_action = array(
while ($this->yyidx >= 0 && while ($this->yyidx >= 0 &&
$yymx != self::YYERRORSYMBOL && $yymx != self::YYERRORSYMBOL &&
($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
){ ) {
$this->yy_pop_parser_stack(); $this->yy_pop_parser_stack();
} }
if ($this->yyidx < 0 || $yymajor==0) { if ($this->yyidx < 0 || $yymajor == 0) {
$this->yy_destructor($yymajor, $yytokenvalue); $this->yy_destructor($yymajor, $yytokenvalue);
$this->yy_parse_failed(); $this->yy_parse_failed();
$yymajor = self::YYNOCODE; $yymajor = self::YYNOCODE;

10
libs/sysplugins/smarty_internal_smartytemplatecompiler.php
View File

@@ -98,6 +98,13 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
// start state on child templates // start state on child templates
$this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY); $this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
} }
if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
$mbEncoding = mb_internal_encoding();
mb_internal_encoding('ASCII');
} else {
$mbEncoding = null;
}
if ($this->smarty->_parserdebug) { if ($this->smarty->_parserdebug) {
$this->parser->PrintTrace(); $this->parser->PrintTrace();
$this->lex->PrintTrace(); $this->lex->PrintTrace();
@@ -117,6 +124,9 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
} }
// finish parsing process // finish parsing process
$this->parser->doParse(0, 0); $this->parser->doParse(0, 0);
if ($mbEncoding) {
mb_internal_encoding($mbEncoding);
}
// check for unclosed tags // check for unclosed tags
if (count($this->_tag_stack) > 0) { if (count($this->_tag_stack) > 0) {
// get stacked info // get stacked info

119
libs/sysplugins/smarty_internal_templatelexer.php
View File

@@ -91,7 +91,6 @@ class Smarty_Internal_Templatelexer
$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;
$this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
} }
public function PrintTrace() public function PrintTrace()
@@ -160,13 +159,13 @@ class Smarty_Internal_Templatelexer
18 => 0, 18 => 0,
19 => 0, 19 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS"; $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -186,7 +185,7 @@ class Smarty_Internal_Templatelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r1_' . $this->token}($yysubmatches); $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -195,9 +194,9 @@ class Smarty_Internal_Templatelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
@@ -368,20 +367,12 @@ class Smarty_Internal_Templatelexer
function yy_r1_19($yy_subpatterns) function yy_r1_19($yy_subpatterns)
{ {
if ($this->mbstring_overload) {
$to = mb_strlen($this->data, 'latin1');
} else {
$to = strlen($this->data); $to = strlen($this->data);
}
preg_match("/{$this->ldel}|<\?|\?>|<%|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); preg_match("/{$this->ldel}|<\?|\?>|<%|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
if (isset($match[0][1])) { if (isset($match[0][1])) {
$to = $match[0][1]; $to = $match[0][1];
} }
if ($this->mbstring_overload) {
$this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
} else {
$this->value = substr($this->data, $this->counter, $to - $this->counter); $this->value = substr($this->data, $this->counter, $to - $this->counter);
}
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} }
@@ -455,13 +446,13 @@ class Smarty_Internal_Templatelexer
75 => 0, 75 => 0,
76 => 0, 76 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS"; $yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -481,7 +472,7 @@ class Smarty_Internal_Templatelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r2_' . $this->token}($yysubmatches); $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -490,9 +481,9 @@ class Smarty_Internal_Templatelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
@@ -956,13 +947,13 @@ class Smarty_Internal_Templatelexer
6 => 0, 6 => 0,
7 => 0, 7 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS"; $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -982,7 +973,7 @@ class Smarty_Internal_Templatelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r3_' . $this->token}($yysubmatches); $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -991,9 +982,9 @@ class Smarty_Internal_Templatelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
@@ -1063,22 +1054,14 @@ class Smarty_Internal_Templatelexer
function yy_r3_7($yy_subpatterns) function yy_r3_7($yy_subpatterns)
{ {
if ($this->mbstring_overload) {
$to = mb_strlen($this->data, 'latin1');
} else {
$to = strlen($this->data); $to = strlen($this->data);
}
preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
if (isset($match[0][1])) { if (isset($match[0][1])) {
$to = $match[0][1]; $to = $match[0][1];
} else { } else {
$this->compiler->trigger_template_error("missing or misspelled literal closing tag"); $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
} }
if ($this->mbstring_overload) {
$this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
} else {
$this->value = substr($this->data, $this->counter, $to - $this->counter); $this->value = substr($this->data, $this->counter, $to - $this->counter);
}
$this->token = Smarty_Internal_Templateparser::TP_LITERAL; $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
} }
@@ -1097,13 +1080,13 @@ class Smarty_Internal_Templatelexer
11 => 3, 11 => 3,
15 => 0, 15 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS"; $yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -1123,7 +1106,7 @@ class Smarty_Internal_Templatelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r4_' . $this->token}($yysubmatches); $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -1132,9 +1115,9 @@ class Smarty_Internal_Templatelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
@@ -1247,16 +1230,8 @@ class Smarty_Internal_Templatelexer
function yy_r4_15($yy_subpatterns) function yy_r4_15($yy_subpatterns)
{ {
if ($this->mbstring_overload) {
$to = mb_strlen($this->data, 'latin1');
} else {
$to = strlen($this->data); $to = strlen($this->data);
}
if ($this->mbstring_overload) {
$this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
} else {
$this->value = substr($this->data, $this->counter, $to - $this->counter); $this->value = substr($this->data, $this->counter, $to - $this->counter);
}
$this->token = Smarty_Internal_Templateparser::TP_TEXT; $this->token = Smarty_Internal_Templateparser::TP_TEXT;
} }
@@ -1268,13 +1243,13 @@ class Smarty_Internal_Templatelexer
3 => 0, 3 => 0,
4 => 0, 4 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS"; $yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -1294,7 +1269,7 @@ class Smarty_Internal_Templatelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r5_' . $this->token}($yysubmatches); $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -1303,9 +1278,9 @@ class Smarty_Internal_Templatelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
@@ -1355,20 +1330,12 @@ class Smarty_Internal_Templatelexer
function yy_r5_4($yy_subpatterns) function yy_r5_4($yy_subpatterns)
{ {
if ($this->mbstring_overload) {
$to = mb_strlen($this->data, 'latin1');
} else {
$to = strlen($this->data); $to = strlen($this->data);
}
preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
if (isset($match[0][1])) { if (isset($match[0][1])) {
$to = $match[0][1]; $to = $match[0][1];
} }
if ($this->mbstring_overload) {
$this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
} else {
$this->value = substr($this->data, $this->counter, $to - $this->counter); $this->value = substr($this->data, $this->counter, $to - $this->counter);
}
return false; return false;
} }
@@ -1381,13 +1348,13 @@ class Smarty_Internal_Templatelexer
4 => 1, 4 => 1,
6 => 0, 6 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS"; $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -1407,7 +1374,7 @@ class Smarty_Internal_Templatelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r6_' . $this->token}($yysubmatches); $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -1416,9 +1383,9 @@ class Smarty_Internal_Templatelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
@@ -1481,20 +1448,12 @@ class Smarty_Internal_Templatelexer
function yy_r6_6($yy_subpatterns) function yy_r6_6($yy_subpatterns)
{ {
if ($this->mbstring_overload) {
$to = mb_strlen($this->data, 'latin1');
} else {
$to = strlen($this->data); $to = strlen($this->data);
}
preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
if (isset($match[0][1])) { if (isset($match[0][1])) {
$to = $match[0][1]; $to = $match[0][1];
} }
if ($this->mbstring_overload) {
$this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
} else {
$this->value = substr($this->data, $this->counter, $to - $this->counter); $this->value = substr($this->data, $this->counter, $to - $this->counter);
}
$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
} }
@@ -1505,13 +1464,13 @@ class Smarty_Internal_Templatelexer
2 => 0, 2 => 0,
3 => 0, 3 => 0,
); );
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS"; $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
do { do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
$yysubmatches = $yymatches; $yysubmatches = $yymatches;
$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
if (!count($yymatches)) { if (!count($yymatches)) {
@@ -1531,7 +1490,7 @@ class Smarty_Internal_Templatelexer
$this->value = current($yymatches); // token value $this->value = current($yymatches); // token value
$r = $this->{'yy_r7_' . $this->token}($yysubmatches); $r = $this->{'yy_r7_' . $this->token}($yysubmatches);
if ($r === null) { if ($r === null) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
// accept this token // accept this token
return true; return true;
@@ -1540,9 +1499,9 @@ class Smarty_Internal_Templatelexer
// process this token in the new state // process this token in the new state
return $this->yylex(); return $this->yylex();
} elseif ($r === false) { } elseif ($r === false) {
$this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value)); $this->counter += strlen($this->value);
$this->line += substr_count($this->value, "\n"); $this->line += substr_count($this->value, "\n");
if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
// skip this token // skip this token
@@ -1583,22 +1542,14 @@ class Smarty_Internal_Templatelexer
function yy_r7_3($yy_subpatterns) function yy_r7_3($yy_subpatterns)
{ {
if ($this->mbstring_overload) {
$to = mb_strlen($this->data, 'latin1');
} else {
$to = strlen($this->data); $to = strlen($this->data);
}
preg_match("/{$this->ldel}\/?literal\s*{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); preg_match("/{$this->ldel}\/?literal\s*{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
if (isset($match[0][1])) { if (isset($match[0][1])) {
$to = $match[0][1]; $to = $match[0][1];
} else { } else {
$this->compiler->trigger_template_error("missing or misspelled literal closing tag"); $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
} }
if ($this->mbstring_overload) {
$this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
} else {
$this->value = substr($this->data, $this->counter, $to - $this->counter); $this->value = substr($this->data, $this->counter, $to - $this->counter);
}
$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
} }
} }

3
libs/sysplugins/smarty_internal_templateparser.php
View File

@@ -2662,8 +2662,7 @@ class Smarty_Internal_Templateparser #line 80 "smarty_internal_templateparser.ph
if (isset(self::$yyExpectedTokens[$nextstate])) { if (isset(self::$yyExpectedTokens[$nextstate])) {
$expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
if (in_array($token, if (in_array($token,
self::$yyExpectedTokens[$nextstate], true) self::$yyExpectedTokens[$nextstate], true)) {
) {
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;