- bugfix increase of internal maximum parser stacksize to allow more complex tag code {forum topic 24426}

This commit is contained in:
Uwe.Tews@googlemail.com
2013-07-14 21:12:08 +00:00
parent 917f92d38b
commit f99e6a83ce
5 changed files with 824 additions and 664 deletions

View File

@@ -1,4 +1,7 @@
===== trunk =====
14.7.2013
- bugfix increase of internal maximum parser stacksize to allow more complex tag code {forum topic 24426}
12.7.2013
- bugfix Do not remove '//' from file path at normalization (Issue 142)

View File

@@ -23,8 +23,7 @@ class Smarty_Internal_Configfilelexer
public $smarty_token_names = array ( // Text for parser error messages
);
function __construct($data, $smarty)
public function __construct($data, $smarty)
{
// set instance object
self::instance($this);
@@ -39,39 +38,35 @@ class Smarty_Internal_Configfilelexer
static $instance = null;
if (isset($new_instance) && is_object($new_instance))
$instance = $new_instance;
return $instance;
}
private $_yy_state = 1;
private $_yy_stack = array();
function yylex()
public function yylex()
{
return $this->{'yylex' . $this->_yy_state}();
}
function yypushstate($state)
public function yypushstate($state)
{
array_push($this->_yy_stack, $this->_yy_state);
$this->_yy_state = $state;
}
function yypopstate()
public function yypopstate()
{
$this->_yy_state = array_pop($this->_yy_stack);
}
function yybegin($state)
public function yybegin($state)
{
$this->_yy_state = $state;
}
function yylex1()
public function yylex1()
{
$tokenMap = array (
1 => 0,
@@ -134,55 +129,51 @@ class Smarty_Internal_Configfilelexer
} // end function
const START = 1;
function yy_r1_1($yy_subpatterns)
public function yy_r1_1($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
$this->yypushstate(self::COMMENT);
}
function yy_r1_2($yy_subpatterns)
public function yy_r1_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
$this->yypushstate(self::SECTION);
}
function yy_r1_3($yy_subpatterns)
public function yy_r1_3($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
}
function yy_r1_4($yy_subpatterns)
public function yy_r1_4($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
$this->yypushstate(self::VALUE);
}
function yy_r1_5($yy_subpatterns)
public function yy_r1_5($yy_subpatterns)
{
return false;
}
function yy_r1_6($yy_subpatterns)
public function yy_r1_6($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
}
function yy_r1_7($yy_subpatterns)
public function yy_r1_7($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_ID;
}
function yy_r1_8($yy_subpatterns)
public function yy_r1_8($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
}
function yylex2()
public function yylex2()
{
$tokenMap = array (
1 => 0,
@@ -246,62 +237,61 @@ class Smarty_Internal_Configfilelexer
} // end function
const VALUE = 2;
function yy_r2_1($yy_subpatterns)
public function yy_r2_1($yy_subpatterns)
{
return false;
}
function yy_r2_2($yy_subpatterns)
public function yy_r2_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
$this->yypopstate();
}
function yy_r2_3($yy_subpatterns)
public function yy_r2_3($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_INT;
$this->yypopstate();
}
function yy_r2_4($yy_subpatterns)
public function yy_r2_4($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
$this->yypushstate(self::TRIPPLE);
}
function yy_r2_5($yy_subpatterns)
public function yy_r2_5($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
$this->yypopstate();
}
function yy_r2_6($yy_subpatterns)
public function yy_r2_6($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
$this->yypopstate();
}
function yy_r2_7($yy_subpatterns)
public function yy_r2_7($yy_subpatterns)
{
if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
$this->yypopstate();
$this->yypushstate(self::NAKED_STRING_VALUE);
return true; //reprocess in new state
} else {
$this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
$this->yypopstate();
}
}
function yy_r2_8($yy_subpatterns)
public function yy_r2_8($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
$this->yypopstate();
}
function yy_r2_9($yy_subpatterns)
public function yy_r2_9($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
@@ -309,9 +299,7 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate();
}
function yylex3()
public function yylex3()
{
$tokenMap = array (
1 => 0,
@@ -367,18 +355,15 @@ class Smarty_Internal_Configfilelexer
} // end function
const NAKED_STRING_VALUE = 3;
function yy_r3_1($yy_subpatterns)
public function yy_r3_1($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
$this->yypopstate();
}
function yylex4()
public function yylex4()
{
$tokenMap = array (
1 => 0,
@@ -436,28 +421,24 @@ class Smarty_Internal_Configfilelexer
} // end function
const COMMENT = 4;
function yy_r4_1($yy_subpatterns)
public function yy_r4_1($yy_subpatterns)
{
return false;
}
function yy_r4_2($yy_subpatterns)
public function yy_r4_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
}
function yy_r4_3($yy_subpatterns)
public function yy_r4_3($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
$this->yypopstate();
}
function yylex5()
public function yylex5()
{
$tokenMap = array (
1 => 0,
@@ -514,22 +495,20 @@ class Smarty_Internal_Configfilelexer
} // end function
const SECTION = 5;
function yy_r5_1($yy_subpatterns)
public function yy_r5_1($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_DOT;
}
function yy_r5_2($yy_subpatterns)
public function yy_r5_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
$this->yypopstate();
}
function yylex6()
public function yylex6()
{
$tokenMap = array (
1 => 0,
@@ -586,16 +565,15 @@ class Smarty_Internal_Configfilelexer
} // end function
const TRIPPLE = 6;
function yy_r6_1($yy_subpatterns)
public function yy_r6_1($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
$this->yypopstate();
$this->yypushstate(self::START);
}
function yy_r6_2($yy_subpatterns)
public function yy_r6_2($yy_subpatterns)
{
if ($this->mbstring_overload) {
@@ -617,6 +595,4 @@ class Smarty_Internal_Configfilelexer
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
}
}
?>

View File

@@ -14,7 +14,7 @@ class TPC_yyToken implements ArrayAccess
public $string = '';
public $metadata = array();
function __construct($s, $m = array())
public function __construct($s, $m = array())
{
if ($s instanceof TPC_yyToken) {
$this->string = $s->string;
@@ -29,28 +29,29 @@ class TPC_yyToken implements ArrayAccess
}
}
function __toString()
public function __toString()
{
return $this->_string;
}
function offsetExists($offset)
public function offsetExists($offset)
{
return isset($this->metadata[$offset]);
}
function offsetGet($offset)
public function offsetGet($offset)
{
return $this->metadata[$offset];
}
function offsetSet($offset, $value)
public function offsetSet($offset, $value)
{
if ($offset === null) {
if (isset($value[0])) {
$x = ($value instanceof TPC_yyToken) ?
$value->metadata : $value;
$this->metadata = array_merge($this->metadata, $x);
return;
}
$offset = count($this->metadata);
@@ -67,7 +68,7 @@ class TPC_yyToken implements ArrayAccess
}
}
function offsetUnset($offset)
public function offsetUnset($offset)
{
unset($this->metadata[$offset]);
}
@@ -82,7 +83,6 @@ class TPC_yyStackEntry
** is the value of the token */
};
#line 12 "smarty_internal_configfileparser.y"
class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
{
@@ -94,7 +94,8 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
private $lex;
private $internalError = false;
function __construct($lex, $compiler) {
public function __construct($lex, $compiler)
{
// set instance object
self::instance($this);
$this->lex = $lex;
@@ -106,21 +107,25 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
static $instance = null;
if (isset($new_instance) && is_object($new_instance))
$instance = $new_instance;
return $instance;
}
private function parse_bool($str) {
private function parse_bool($str)
{
if (in_array(strtolower($str) ,array('on','yes','true'))) {
$res = true;
} else {
$res = false;
}
return $res;
}
private static $escapes_single = Array('\\' => '\\',
'\'' => '\'');
private static function parse_single_quoted_string($qstr) {
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);
@@ -139,16 +144,20 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
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);
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);
}
private function set_var(Array $var, Array &$target_array) {
private function set_var(Array $var, Array &$target_array)
{
$key = $var["key"];
$value = $var["value"];
@@ -160,7 +169,8 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
}
}
private function add_global_vars(Array $vars) {
private function add_global_vars(Array $vars)
{
if (!isset($this->compiler->config_data['vars'])) {
$this->compiler->config_data['vars'] = Array();
}
@@ -169,7 +179,8 @@ class Smarty_Internal_Configfileparser#line 79 "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'])) {
$this->compiler->config_data['sections'][$section_name]['vars'] = Array();
}
@@ -208,7 +219,7 @@ static public $yy_action = array(
/* 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(
public static $yy_lookahead = array(
/* 0 */ 7, 8, 9, 10, 11, 12, 5, 27, 15, 16,
/* 10 */ 20, 21, 23, 23, 17, 18, 13, 14, 17, 18,
/* 20 */ 15, 2, 17, 4, 25, 26, 6, 3, 3, 14,
@@ -216,17 +227,17 @@ static public $yy_action = array(
);
const YY_SHIFT_USE_DFLT = -8;
const YY_SHIFT_MAX = 19;
static public $yy_shift_ofst = array(
public static $yy_shift_ofst = array(
/* 0 */ -8, 1, 1, 1, -7, -3, -3, 30, -8, -8,
/* 10 */ -8, 19, 5, 3, 15, 16, 24, 25, 32, 20,
);
const YY_REDUCE_USE_DFLT = -21;
const YY_REDUCE_MAX = 10;
static public $yy_reduce_ofst = array(
public static $yy_reduce_ofst = array(
/* 0 */ -10, -1, -1, -1, -20, 10, 12, 8, 14, 7,
/* 10 */ -11,
);
static public $yyExpectedTokens = array(
public static $yyExpectedTokens = array(
/* 0 */ array(),
/* 1 */ array(5, 17, 18, ),
/* 2 */ array(5, 17, 18, ),
@@ -264,7 +275,7 @@ static public $yy_action = array(
/* 34 */ array(),
/* 35 */ array(),
);
static public $yy_default = array(
public static $yy_default = array(
/* 0 */ 44, 37, 41, 40, 58, 58, 58, 36, 39, 44,
/* 10 */ 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
/* 20 */ 55, 54, 57, 56, 50, 45, 43, 42, 38, 46,
@@ -277,9 +288,9 @@ static public $yy_action = array(
const YYERRORSYMBOL = 19;
const YYERRSYMDT = 'yy0';
const YYFALLBACK = 0;
static public $yyFallback = array(
public static $yyFallback = array(
);
static function Trace($TraceFILE, $zTracePrompt)
public static function Trace($TraceFILE, $zTracePrompt)
{
if (!$TraceFILE) {
$zTracePrompt = 0;
@@ -290,14 +301,14 @@ static public $yy_action = array(
self::$yyTracePrompt = $zTracePrompt;
}
static function PrintTrace()
public static function PrintTrace()
{
self::$yyTraceFILE = fopen('php://output', 'w');
self::$yyTracePrompt = '<br>';
}
static public $yyTraceFILE;
static public $yyTracePrompt;
public static $yyTraceFILE;
public static $yyTracePrompt;
public $yyidx; /* Index of top element in stack */
public $yyerrcnt; /* Shifts left before out of the error */
public $yystack = array(); /* The parser's stack */
@@ -312,7 +323,7 @@ static public $yy_action = array(
'section', 'newline', 'var', 'value',
);
static public $yyRuleName = array(
public static $yyRuleName = array(
/* 0 */ "start ::= global_vars sections",
/* 1 */ "global_vars ::= var_list",
/* 2 */ "sections ::= sections section",
@@ -337,7 +348,7 @@ static public $yy_action = array(
/* 21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
);
function tokenName($tokenType)
public function tokenName($tokenType)
{
if ($tokenType === 0) {
return 'End of Input';
@@ -349,14 +360,14 @@ static public $yy_action = array(
}
}
static function yy_destructor($yymajor, $yypminor)
public static function yy_destructor($yymajor, $yypminor)
{
switch ($yymajor) {
default: break; /* If no destructor action specified: do nothing */
}
}
function yy_pop_parser_stack()
public function yy_pop_parser_stack()
{
if (!count($this->yystack)) {
return;
@@ -370,10 +381,11 @@ static public $yy_action = array(
$yymajor = $yytos->major;
self::yy_destructor($yymajor, $yytos->minor);
$this->yyidx--;
return $yymajor;
}
function __destruct()
public function __destruct()
{
while ($this->yystack !== Array()) {
$this->yy_pop_parser_stack();
@@ -383,7 +395,7 @@ static public $yy_action = array(
}
}
function yy_get_expected_tokens($token)
public function yy_get_expected_tokens($token)
{
$state = $this->yystack[$this->yyidx]->stateno;
$expected = self::$yyExpectedTokens[$state];
@@ -416,6 +428,7 @@ static public $yy_action = array(
self::$yyExpectedTokens[$nextstate], true)) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return array_unique($expected);
}
}
@@ -448,10 +461,11 @@ static public $yy_action = array(
} while (true);
$this->yyidx = $yyidx;
$this->yystack = $stack;
return array_unique($expected);
}
function yy_is_expected_token($token)
public function yy_is_expected_token($token)
{
if ($token === 0) {
return true; // 0 is not part of this
@@ -484,6 +498,7 @@ static public $yy_action = array(
in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
$this->yyidx = $yyidx;
$this->yystack = $stack;
return true;
}
if ($nextstate < self::YYNSTATE) {
@@ -519,10 +534,11 @@ static public $yy_action = array(
} while (true);
$this->yyidx = $yyidx;
$this->yystack = $stack;
return true;
}
function yy_find_shift_action($iLookAhead)
public function yy_find_shift_action($iLookAhead)
{
$stateno = $this->yystack[$this->yyidx]->stateno;
@@ -548,15 +564,17 @@ static public $yy_action = array(
$this->yyTokenName[$iLookAhead] . " => " .
$this->yyTokenName[$iFallback] . "\n");
}
return $this->yy_find_shift_action($iFallback);
}
return self::$yy_default[$stateno];
} else {
return self::$yy_action[$i];
}
}
function yy_find_reduce_action($stateno, $iLookAhead)
public function yy_find_reduce_action($stateno, $iLookAhead)
{
/* $stateno = $this->yystack[$this->yyidx]->stateno; */
@@ -579,7 +597,7 @@ static public $yy_action = array(
}
}
function yy_shift($yyNewState, $yyMajor, $yypMinor)
public function yy_shift($yyNewState, $yyMajor, $yypMinor)
{
$this->yyidx++;
if ($this->yyidx >= self::YYSTACKDEPTH) {
@@ -595,6 +613,7 @@ static public $yy_action = array(
$this->internalError = true;
$this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
#line 593 "smarty_internal_configfileparser.php"
return;
}
$yytos = new TPC_yyStackEntry;
@@ -606,7 +625,7 @@ static public $yy_action = array(
fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
$yyNewState);
fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
for($i = 1; $i <= $this->yyidx; $i++) {
for ($i = 1; $i <= $this->yyidx; $i++) {
fprintf(self::$yyTraceFILE, " %s",
$this->yyTokenName[$this->yystack[$i]->major]);
}
@@ -614,7 +633,7 @@ static public $yy_action = array(
}
}
static public $yyRuleInfo = array(
public static $yyRuleInfo = array(
array( 'lhs' => 20, 'rhs' => 2 ),
array( 'lhs' => 21, 'rhs' => 1 ),
array( 'lhs' => 22, 'rhs' => 2 ),
@@ -639,7 +658,7 @@ static public $yy_action = array(
array( 'lhs' => 25, 'rhs' => 3 ),
);
static public $yyReduceMap = array(
public static $yyReduceMap = array(
0 => 0,
2 => 0,
3 => 0,
@@ -664,23 +683,27 @@ static public $yy_action = array(
18 => 17,
);
#line 131 "smarty_internal_configfileparser.y"
function yy_r0(){
public function yy_r0()
{
$this->_retvalue = null;
}
#line 666 "smarty_internal_configfileparser.php"
#line 136 "smarty_internal_configfileparser.y"
function yy_r1(){
public function yy_r1()
{
$this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;
}
#line 671 "smarty_internal_configfileparser.php"
#line 149 "smarty_internal_configfileparser.y"
function yy_r4(){
public function yy_r4()
{
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
$this->_retvalue = null;
}
#line 677 "smarty_internal_configfileparser.php"
#line 154 "smarty_internal_configfileparser.y"
function yy_r5(){
public function yy_r5()
{
if ($this->smarty->config_read_hidden) {
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
}
@@ -688,69 +711,81 @@ static public $yy_action = array(
}
#line 685 "smarty_internal_configfileparser.php"
#line 162 "smarty_internal_configfileparser.y"
function yy_r6(){
public function yy_r6()
{
$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
}
#line 690 "smarty_internal_configfileparser.php"
#line 166 "smarty_internal_configfileparser.y"
function yy_r7(){
public function yy_r7()
{
$this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
}
#line 695 "smarty_internal_configfileparser.php"
#line 170 "smarty_internal_configfileparser.y"
function yy_r8(){
public function yy_r8()
{
$this->_retvalue = Array();
}
#line 700 "smarty_internal_configfileparser.php"
#line 176 "smarty_internal_configfileparser.y"
function yy_r9(){
public function yy_r9()
{
$this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
}
#line 705 "smarty_internal_configfileparser.php"
#line 181 "smarty_internal_configfileparser.y"
function yy_r10(){
public function yy_r10()
{
$this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
}
#line 710 "smarty_internal_configfileparser.php"
#line 185 "smarty_internal_configfileparser.y"
function yy_r11(){
public function yy_r11()
{
$this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
}
#line 715 "smarty_internal_configfileparser.php"
#line 189 "smarty_internal_configfileparser.y"
function yy_r12(){
public function yy_r12()
{
$this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
}
#line 720 "smarty_internal_configfileparser.php"
#line 193 "smarty_internal_configfileparser.y"
function yy_r13(){
public function yy_r13()
{
$this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
}
#line 725 "smarty_internal_configfileparser.php"
#line 197 "smarty_internal_configfileparser.y"
function yy_r14(){
public function yy_r14()
{
$this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
}
#line 730 "smarty_internal_configfileparser.php"
#line 201 "smarty_internal_configfileparser.y"
function yy_r15(){
public function yy_r15()
{
$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
}
#line 735 "smarty_internal_configfileparser.php"
#line 205 "smarty_internal_configfileparser.y"
function yy_r16(){
public function yy_r16()
{
$this->_retvalue = '';
}
#line 740 "smarty_internal_configfileparser.php"
#line 209 "smarty_internal_configfileparser.y"
function yy_r17(){
public function yy_r17()
{
$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
}
#line 745 "smarty_internal_configfileparser.php"
private $_retvalue;
function yy_reduce($yyruleno)
public function yy_reduce($yyruleno)
{
$yymsp = $this->yystack[$this->yyidx];
if (self::$yyTraceFILE && $yyruleno >= 0
@@ -770,7 +805,7 @@ static public $yy_action = array(
$yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
$yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
$this->yyidx -= $yysize;
for($i = $yysize; $i; $i--) {
for ($i = $yysize; $i; $i--) {
// pop all of the right-hand side parameters
array_pop($this->yystack);
}
@@ -791,7 +826,7 @@ static public $yy_action = array(
}
}
function yy_parse_failed()
public function yy_parse_failed()
{
if (self::$yyTraceFILE) {
fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
@@ -801,7 +836,7 @@ static public $yy_action = array(
}
}
function yy_syntax_error($yymajor, $TOKEN)
public function yy_syntax_error($yymajor, $TOKEN)
{
#line 118 "smarty_internal_configfileparser.y"
@@ -811,12 +846,11 @@ static public $yy_action = array(
#line 808 "smarty_internal_configfileparser.php"
}
function yy_accept()
public function yy_accept()
{
if (self::$yyTraceFILE) {
fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
}
while ($this->yyidx >= 0) {
} while ($this->yyidx >= 0) {
$stack = $this->yy_pop_parser_stack();
}
#line 110 "smarty_internal_configfileparser.y"
@@ -828,7 +862,7 @@ static public $yy_action = array(
#line 826 "smarty_internal_configfileparser.php"
}
function doParse($yymajor, $yytokenvalue)
public function doParse($yymajor, $yytokenvalue)
{
$yyerrorhit = 0; /* True if yymajor has invoked an error */
@@ -875,7 +909,7 @@ static public $yy_action = array(
$this->yy_syntax_error($yymajor, $yytokenvalue);
}
$yymx = $this->yystack[$this->yyidx]->major;
if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
if (self::$yyTraceFILE) {
fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
@@ -918,4 +952,3 @@ static public $yy_action = array(
} while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
}
}
?>

View File

@@ -73,8 +73,7 @@ class Smarty_Internal_Templatelexer
'TO' => 'to',
);
function __construct($data,$compiler)
public function __construct($data,$compiler)
{
// $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
$this->data = $data;
@@ -91,34 +90,31 @@ class Smarty_Internal_Templatelexer
$this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
}
private $_yy_state = 1;
private $_yy_stack = array();
function yylex()
public function yylex()
{
return $this->{'yylex' . $this->_yy_state}();
}
function yypushstate($state)
public function yypushstate($state)
{
array_push($this->_yy_stack, $this->_yy_state);
$this->_yy_state = $state;
}
function yypopstate()
public function yypopstate()
{
$this->_yy_state = array_pop($this->_yy_stack);
}
function yybegin($state)
public function yybegin($state)
{
$this->_yy_state = $state;
}
function yylex1()
public function yylex1()
{
$tokenMap = array (
1 => 0,
@@ -195,29 +191,28 @@ class Smarty_Internal_Templatelexer
} // end function
const TEXT = 1;
function yy_r1_1($yy_subpatterns)
public function yy_r1_1($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
}
function yy_r1_2($yy_subpatterns)
public function yy_r1_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_TEXT;
}
function yy_r1_3($yy_subpatterns)
public function yy_r1_3($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_COMMENT;
}
function yy_r1_5($yy_subpatterns)
public function yy_r1_5($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_STRIPON;
}
function yy_r1_6($yy_subpatterns)
public function yy_r1_6($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -226,12 +221,12 @@ class Smarty_Internal_Templatelexer
$this->token = Smarty_Internal_Templateparser::TP_STRIPON;
}
}
function yy_r1_7($yy_subpatterns)
public function yy_r1_7($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
}
function yy_r1_8($yy_subpatterns)
public function yy_r1_8($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -240,13 +235,13 @@ class Smarty_Internal_Templatelexer
$this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
}
}
function yy_r1_9($yy_subpatterns)
public function yy_r1_9($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
$this->yypushstate(self::LITERAL);
}
function yy_r1_10($yy_subpatterns)
public function yy_r1_10($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -257,7 +252,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r1_11($yy_subpatterns)
public function yy_r1_11($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -268,7 +263,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r1_13($yy_subpatterns)
public function yy_r1_13($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -279,7 +274,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r1_14($yy_subpatterns)
public function yy_r1_14($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -290,7 +285,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r1_15($yy_subpatterns)
public function yy_r1_15($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -301,7 +296,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r1_16($yy_subpatterns)
public function yy_r1_16($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -312,21 +307,21 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r1_17($yy_subpatterns)
public function yy_r1_17($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
$this->yypushstate(self::SMARTY);
$this->taglineno = $this->line;
}
function yy_r1_18($yy_subpatterns)
public function yy_r1_18($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LDEL;
$this->yypushstate(self::SMARTY);
$this->taglineno = $this->line;
}
function yy_r1_19($yy_subpatterns)
public function yy_r1_19($yy_subpatterns)
{
if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
@@ -338,27 +333,27 @@ class Smarty_Internal_Templatelexer
$this->value = substr($this->value, 0, 2);
}
}
function yy_r1_20($yy_subpatterns)
public function yy_r1_20($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
}
function yy_r1_21($yy_subpatterns)
public function yy_r1_21($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_TEXT;
}
function yy_r1_22($yy_subpatterns)
public function yy_r1_22($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
}
function yy_r1_23($yy_subpatterns)
public function yy_r1_23($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
}
function yy_r1_24($yy_subpatterns)
public function yy_r1_24($yy_subpatterns)
{
if ($this->mbstring_overload) {
@@ -378,8 +373,7 @@ class Smarty_Internal_Templatelexer
$this->token = Smarty_Internal_Templateparser::TP_TEXT;
}
function yylex2()
public function yylex2()
{
$tokenMap = array (
1 => 0,
@@ -502,14 +496,13 @@ class Smarty_Internal_Templatelexer
} // end function
const SMARTY = 2;
function yy_r2_1($yy_subpatterns)
public function yy_r2_1($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
}
function yy_r2_2($yy_subpatterns)
public function yy_r2_2($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -520,7 +513,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r2_3($yy_subpatterns)
public function yy_r2_3($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -531,7 +524,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r2_5($yy_subpatterns)
public function yy_r2_5($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -542,7 +535,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r2_6($yy_subpatterns)
public function yy_r2_6($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -553,7 +546,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r2_7($yy_subpatterns)
public function yy_r2_7($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -564,300 +557,300 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r2_8($yy_subpatterns)
public function yy_r2_8($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_RDEL;
$this->yypopstate();
}
function yy_r2_9($yy_subpatterns)
public function yy_r2_9($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
$this->yypushstate(self::SMARTY);
$this->taglineno = $this->line;
}
function yy_r2_10($yy_subpatterns)
public function yy_r2_10($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LDEL;
$this->yypushstate(self::SMARTY);
$this->taglineno = $this->line;
}
function yy_r2_11($yy_subpatterns)
public function yy_r2_11($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_RDEL;
$this->yypopstate();
}
function yy_r2_12($yy_subpatterns)
public function yy_r2_12($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISIN;
}
function yy_r2_13($yy_subpatterns)
public function yy_r2_13($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_AS;
}
function yy_r2_14($yy_subpatterns)
public function yy_r2_14($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_TO;
}
function yy_r2_15($yy_subpatterns)
public function yy_r2_15($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_STEP;
}
function yy_r2_16($yy_subpatterns)
public function yy_r2_16($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
}
function yy_r2_17($yy_subpatterns)
public function yy_r2_17($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
}
function yy_r2_18($yy_subpatterns)
public function yy_r2_18($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
}
function yy_r2_19($yy_subpatterns)
public function yy_r2_19($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_EQUALS;
}
function yy_r2_20($yy_subpatterns)
public function yy_r2_20($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
}
function yy_r2_22($yy_subpatterns)
public function yy_r2_22($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
}
function yy_r2_24($yy_subpatterns)
public function yy_r2_24($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
}
function yy_r2_26($yy_subpatterns)
public function yy_r2_26($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
}
function yy_r2_27($yy_subpatterns)
public function yy_r2_27($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
}
function yy_r2_28($yy_subpatterns)
public function yy_r2_28($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_MOD;
}
function yy_r2_29($yy_subpatterns)
public function yy_r2_29($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_NOT;
}
function yy_r2_30($yy_subpatterns)
public function yy_r2_30($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LAND;
}
function yy_r2_31($yy_subpatterns)
public function yy_r2_31($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LOR;
}
function yy_r2_32($yy_subpatterns)
public function yy_r2_32($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LXOR;
}
function yy_r2_33($yy_subpatterns)
public function yy_r2_33($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
}
function yy_r2_34($yy_subpatterns)
public function yy_r2_34($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
}
function yy_r2_35($yy_subpatterns)
public function yy_r2_35($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISODD;
}
function yy_r2_36($yy_subpatterns)
public function yy_r2_36($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
}
function yy_r2_37($yy_subpatterns)
public function yy_r2_37($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
}
function yy_r2_38($yy_subpatterns)
public function yy_r2_38($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
}
function yy_r2_39($yy_subpatterns)
public function yy_r2_39($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
}
function yy_r2_40($yy_subpatterns)
public function yy_r2_40($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
}
function yy_r2_41($yy_subpatterns)
public function yy_r2_41($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
}
function yy_r2_42($yy_subpatterns)
public function yy_r2_42($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
}
function yy_r2_43($yy_subpatterns)
public function yy_r2_43($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
}
function yy_r2_47($yy_subpatterns)
public function yy_r2_47($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_OPENP;
}
function yy_r2_48($yy_subpatterns)
public function yy_r2_48($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
}
function yy_r2_49($yy_subpatterns)
public function yy_r2_49($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_OPENB;
}
function yy_r2_50($yy_subpatterns)
public function yy_r2_50($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
}
function yy_r2_51($yy_subpatterns)
public function yy_r2_51($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_PTR;
}
function yy_r2_52($yy_subpatterns)
public function yy_r2_52($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_APTR;
}
function yy_r2_53($yy_subpatterns)
public function yy_r2_53($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_EQUAL;
}
function yy_r2_54($yy_subpatterns)
public function yy_r2_54($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_INCDEC;
}
function yy_r2_55($yy_subpatterns)
public function yy_r2_55($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
}
function yy_r2_57($yy_subpatterns)
public function yy_r2_57($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_MATH;
}
function yy_r2_59($yy_subpatterns)
public function yy_r2_59($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
}
function yy_r2_60($yy_subpatterns)
public function yy_r2_60($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
}
function yy_r2_61($yy_subpatterns)
public function yy_r2_61($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
}
function yy_r2_62($yy_subpatterns)
public function yy_r2_62($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_COLON;
}
function yy_r2_63($yy_subpatterns)
public function yy_r2_63($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_AT;
}
function yy_r2_64($yy_subpatterns)
public function yy_r2_64($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_HATCH;
}
function yy_r2_65($yy_subpatterns)
public function yy_r2_65($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
$this->yypushstate(self::DOUBLEQUOTEDSTRING);
}
function yy_r2_66($yy_subpatterns)
public function yy_r2_66($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
$this->yypopstate();
}
function yy_r2_67($yy_subpatterns)
public function yy_r2_67($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_VERT;
}
function yy_r2_68($yy_subpatterns)
public function yy_r2_68($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_DOT;
}
function yy_r2_69($yy_subpatterns)
public function yy_r2_69($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_COMMA;
}
function yy_r2_70($yy_subpatterns)
public function yy_r2_70($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
}
function yy_r2_71($yy_subpatterns)
public function yy_r2_71($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_QMARK;
}
function yy_r2_72($yy_subpatterns)
public function yy_r2_72($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_HEX;
}
function yy_r2_73($yy_subpatterns)
public function yy_r2_73($yy_subpatterns)
{
// resolve conflicts with shorttag and right_delimiter starting with '='
@@ -869,30 +862,28 @@ class Smarty_Internal_Templatelexer
$this->token = Smarty_Internal_Templateparser::TP_ATTR;
}
}
function yy_r2_74($yy_subpatterns)
public function yy_r2_74($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ID;
}
function yy_r2_75($yy_subpatterns)
public function yy_r2_75($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_INTEGER;
}
function yy_r2_76($yy_subpatterns)
public function yy_r2_76($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_SPACE;
}
function yy_r2_77($yy_subpatterns)
public function yy_r2_77($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_TEXT;
}
function yylex3()
public function yylex3()
{
$tokenMap = array (
1 => 0,
@@ -954,21 +945,20 @@ class Smarty_Internal_Templatelexer
} // end function
const LITERAL = 3;
function yy_r3_1($yy_subpatterns)
public function yy_r3_1($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
$this->yypushstate(self::LITERAL);
}
function yy_r3_2($yy_subpatterns)
public function yy_r3_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
$this->yypopstate();
}
function yy_r3_3($yy_subpatterns)
public function yy_r3_3($yy_subpatterns)
{
if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
@@ -978,22 +968,22 @@ class Smarty_Internal_Templatelexer
$this->value = substr($this->value, 0, 2);
}
}
function yy_r3_4($yy_subpatterns)
public function yy_r3_4($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
}
function yy_r3_5($yy_subpatterns)
public function yy_r3_5($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
}
function yy_r3_6($yy_subpatterns)
public function yy_r3_6($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
}
function yy_r3_7($yy_subpatterns)
public function yy_r3_7($yy_subpatterns)
{
if ($this->mbstring_overload) {
@@ -1015,8 +1005,7 @@ class Smarty_Internal_Templatelexer
$this->token = Smarty_Internal_Templateparser::TP_LITERAL;
}
function yylex4()
public function yylex4()
{
$tokenMap = array (
1 => 0,
@@ -1084,9 +1073,8 @@ class Smarty_Internal_Templatelexer
} // end function
const DOUBLEQUOTEDSTRING = 4;
function yy_r4_1($yy_subpatterns)
public function yy_r4_1($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -1097,7 +1085,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r4_2($yy_subpatterns)
public function yy_r4_2($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -1108,7 +1096,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r4_4($yy_subpatterns)
public function yy_r4_4($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -1119,7 +1107,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r4_5($yy_subpatterns)
public function yy_r4_5($yy_subpatterns)
{
if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
@@ -1130,7 +1118,7 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r4_6($yy_subpatterns)
public function yy_r4_6($yy_subpatterns)
{
if ($this->smarty->auto_literal) {
@@ -1141,27 +1129,27 @@ class Smarty_Internal_Templatelexer
$this->taglineno = $this->line;
}
}
function yy_r4_7($yy_subpatterns)
public function yy_r4_7($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
$this->yypushstate(self::SMARTY);
$this->taglineno = $this->line;
}
function yy_r4_8($yy_subpatterns)
public function yy_r4_8($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_LDEL;
$this->yypushstate(self::SMARTY);
$this->taglineno = $this->line;
}
function yy_r4_9($yy_subpatterns)
public function yy_r4_9($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
$this->yypopstate();
}
function yy_r4_10($yy_subpatterns)
public function yy_r4_10($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
@@ -1169,22 +1157,22 @@ class Smarty_Internal_Templatelexer
$this->yypushstate(self::SMARTY);
$this->taglineno = $this->line;
}
function yy_r4_11($yy_subpatterns)
public function yy_r4_11($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
}
function yy_r4_12($yy_subpatterns)
public function yy_r4_12($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_TEXT;
}
function yy_r4_13($yy_subpatterns)
public function yy_r4_13($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_TEXT;
}
function yy_r4_17($yy_subpatterns)
public function yy_r4_17($yy_subpatterns)
{
if ($this->mbstring_overload) {

File diff suppressed because it is too large Load Diff