From 4b7fba4d88561bfbd0ff374d998df4d9ddeda8bd Mon Sep 17 00:00:00 2001 From: Uwe Tews Date: Tue, 30 Dec 2014 18:16:51 +0100 Subject: [PATCH] get config properties via compiler object - reverting part of earlier change of today --- lexer/smarty_internal_configfilelexer.plex | 2 +- lexer/smarty_internal_configfileparser.y | 6 +- .../smarty_internal_configfilelexer.php | 392 ++++++------ .../smarty_internal_configfileparser.php | 567 ++++++++---------- 4 files changed, 461 insertions(+), 506 deletions(-) diff --git a/lexer/smarty_internal_configfilelexer.plex b/lexer/smarty_internal_configfilelexer.plex index 47f06948..78552c11 100644 --- a/lexer/smarty_internal_configfilelexer.plex +++ b/lexer/smarty_internal_configfilelexer.plex @@ -117,7 +117,7 @@ class Smarty_Internal_Configfilelexer $this->line = 1; $this->compiler = $compiler; $this->smarty = $compiler->smarty; - $this->configBooleanize = $compiler->template->smarty->config_booleanize; + $this->configBooleanize = $this->smarty->config_booleanize; } public static function &instance($new_instance = null) diff --git a/lexer/smarty_internal_configfileparser.y b/lexer/smarty_internal_configfileparser.y index caecc38d..ac961772 100644 --- a/lexer/smarty_internal_configfileparser.y +++ b/lexer/smarty_internal_configfileparser.y @@ -94,10 +94,10 @@ class Smarty_Internal_Configfileparser // set instance object self::instance($this); $this->lex = $lex; - $this->smarty = $compiler->template->smarty; + $this->smarty = $compiler->smarty; $this->compiler = $compiler; - $this->configOverwrite = $compiler->smarty->config_overwrite; - $this->configReadHidden = $compiler->smarty->config_read_hidden; + $this->configOverwrite = $this->smarty->config_overwrite; + $this->configReadHidden = $this->smarty->config_read_hidden; } /** diff --git a/libs/sysplugins/smarty_internal_configfilelexer.php b/libs/sysplugins/smarty_internal_configfilelexer.php index ff725c42..3e08c9df 100644 --- a/libs/sysplugins/smarty_internal_configfilelexer.php +++ b/libs/sysplugins/smarty_internal_configfilelexer.php @@ -1,22 +1,22 @@ line = 1; $this->compiler = $compiler; $this->smarty = $compiler->smarty; - $this->configBooleanize = $compiler->template->smarty->config_booleanize; + $this->configBooleanize = $this->smarty->config_booleanize; } public static function &instance($new_instance = null) @@ -135,6 +135,8 @@ class Smarty_Internal_Configfilelexer $this->yyTracePrompt = '
'; } + + private $_yy_state = 1; private $_yy_stack = array(); @@ -146,66 +148,70 @@ class Smarty_Internal_Configfilelexer public function yypushstate($state) { if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); + fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } array_push($this->_yy_stack, $this->_yy_state); $this->_yy_state = $state; 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 yypopstate() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } - $this->_yy_state = array_pop($this->_yy_stack); + $this->_yy_state = array_pop($this->_yy_stack); 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) { - $this->_yy_state = $state; + $this->_yy_state = $state; if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); + fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); } } + + + public function yylex1() { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - ); - if ($this->counter >= strlen($this->data)) { + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + ); + if ($this->counter >= strlen($this->data)) { 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"; do { - if (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; $yymatches = preg_grep("/(.|\s)+/", $yysubmatches); if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state START'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state START'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -223,106 +229,101 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { + if ($this->counter >= strlen($this->data)) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const START = 1; + const START = 1; function yy_r1_1($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; - $this->yypushstate(self::COMMENT); + $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; + $this->yypushstate(self::COMMENT); } - function yy_r1_2($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; - $this->yypushstate(self::SECTION); + $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; + $this->yypushstate(self::SECTION); } - 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) { - $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; - $this->yypushstate(self::VALUE); + $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; + $this->yypushstate(self::VALUE); } - function yy_r1_5($yy_subpatterns) { - return false; + return false; } - 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) { - $this->token = Smarty_Internal_Configfileparser::TPC_ID; + $this->token = Smarty_Internal_Configfileparser::TPC_ID; } - function yy_r1_8($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; + $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; } + + public function yylex2() { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - 9 => 0, - ); - if ($this->counter >= strlen($this->data)) { + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, + ); + if ($this->counter >= strlen($this->data)) { 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"; do { - if (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; $yymatches = preg_grep("/(.|\s)+/", $yysubmatches); if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state VALUE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -340,116 +341,110 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { + if ($this->counter >= strlen($this->data)) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const VALUE = 2; + const VALUE = 2; function yy_r2_1($yy_subpatterns) { - return false; + return false; } - function yy_r2_2($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; + $this->yypopstate(); } - function yy_r2_3($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_INT; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_INT; + $this->yypopstate(); } - function yy_r2_4($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; - $this->yypushstate(self::TRIPPLE); + $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; + $this->yypushstate(self::TRIPPLE); } - function yy_r2_5($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; + $this->yypopstate(); } - function yy_r2_6($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; + $this->yypopstate(); } - function yy_r2_7($yy_subpatterns) { - if (!$this->configBooleanize || !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(); - } + if (!$this->configBooleanize || !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) { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->yypopstate(); } - function yy_r2_9($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->value = ""; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->value = ""; + $this->yypopstate(); } + + public function yylex3() { - $tokenMap = array( - 1 => 0, - ); - if ($this->counter >= strlen($this->data)) { + $tokenMap = array ( + 1 => 0, + ); + if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS"; do { - if (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; $yymatches = preg_grep("/(.|\s)+/", $yysubmatches); if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state NAKED_STRING_VALUE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state NAKED_STRING_VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -467,56 +462,58 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { + if ($this->counter >= strlen($this->data)) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const NAKED_STRING_VALUE = 3; + const NAKED_STRING_VALUE = 3; function yy_r3_1($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->yypopstate(); } + + public function yylex4() { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - ); - if ($this->counter >= strlen($this->data)) { + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 0, + ); + if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; do { - if (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; $yymatches = preg_grep("/(.|\s)+/", $yysubmatches); if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state COMMENT'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state COMMENT'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -534,67 +531,67 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { + if ($this->counter >= strlen($this->data)) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const COMMENT = 4; + const COMMENT = 4; function yy_r4_1($yy_subpatterns) { - return false; + return false; } - 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) { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; + $this->yypopstate(); } + + public function yylex5() { - $tokenMap = array( - 1 => 0, - 2 => 0, - ); - if ($this->counter >= strlen($this->data)) { + $tokenMap = array ( + 1 => 0, + 2 => 0, + ); + if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS"; do { - if (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; $yymatches = preg_grep("/(.|\s)+/", $yysubmatches); if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state SECTION'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state SECTION'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -612,61 +609,61 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { + if ($this->counter >= strlen($this->data)) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const SECTION = 5; + const SECTION = 5; 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) { - $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; + $this->yypopstate(); } + public function yylex6() { - $tokenMap = array( - 1 => 0, - 2 => 0, - ); - if ($this->counter >= strlen($this->data)) { + $tokenMap = array ( + 1 => 0, + 2 => 0, + ); + if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS"; do { - if (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; $yymatches = preg_grep("/(.|\s)+/", $yysubmatches); if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state TRIPPLE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state TRIPPLE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -684,41 +681,42 @@ class Smarty_Internal_Configfilelexer } elseif ($r === false) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { + if ($this->counter >= strlen($this->data)) { return false; // end of input } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const TRIPPLE = 6; + const TRIPPLE = 6; function yy_r6_1($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; - $this->yypopstate(); - $this->yypushstate(self::START); + $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; + $this->yypopstate(); + $this->yypushstate(self::START); } - function yy_r6_2($yy_subpatterns) { - $to = strlen($this->data); - preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } else { - $this->compiler->trigger_template_error("missing or misspelled literal closing tag"); - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; + $to = strlen($this->data); + preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } else { + $this->compiler->trigger_template_error ("missing or misspelled literal closing tag"); + } + $this->value = substr($this->data,$this->counter,$to-$this->counter); + $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; } + + } diff --git a/libs/sysplugins/smarty_internal_configfileparser.php b/libs/sysplugins/smarty_internal_configfileparser.php index c47004d5..acb401a8 100644 --- a/libs/sysplugins/smarty_internal_configfileparser.php +++ b/libs/sysplugins/smarty_internal_configfileparser.php @@ -1,5 +1,4 @@ lex = $lex; - $this->smarty = $compiler->template->smarty; + $this->smarty = $compiler->smarty; $this->compiler = $compiler; - $this->configOverwrite = $compiler->smarty->config_overwrite; - $this->configReadHidden = $compiler->smarty->config_read_hidden; + $this->configOverwrite = $this->smarty->config_overwrite; + $this->configReadHidden = $this->smarty->config_read_hidden; } /** @@ -302,97 +300,97 @@ class Smarty_Internal_Configfileparser } } - const TPC_OPENB = 1; - const TPC_SECTION = 2; - const TPC_CLOSEB = 3; - const TPC_DOT = 4; - const TPC_ID = 5; - const TPC_EQUAL = 6; - const TPC_FLOAT = 7; - const TPC_INT = 8; - const TPC_BOOL = 9; - const TPC_SINGLE_QUOTED_STRING = 10; - const TPC_DOUBLE_QUOTED_STRING = 11; - const TPC_TRIPPLE_QUOTES = 12; - const TPC_TRIPPLE_TEXT = 13; - const TPC_TRIPPLE_QUOTES_END = 14; - const TPC_NAKED_STRING = 15; - const TPC_OTHER = 16; - const TPC_NEWLINE = 17; - const TPC_COMMENTSTART = 18; + const TPC_OPENB = 1; + const TPC_SECTION = 2; + const TPC_CLOSEB = 3; + const TPC_DOT = 4; + const TPC_ID = 5; + const TPC_EQUAL = 6; + const TPC_FLOAT = 7; + const TPC_INT = 8; + const TPC_BOOL = 9; + const TPC_SINGLE_QUOTED_STRING = 10; + const TPC_DOUBLE_QUOTED_STRING = 11; + const TPC_TRIPPLE_QUOTES = 12; + const TPC_TRIPPLE_TEXT = 13; + const TPC_TRIPPLE_QUOTES_END = 14; + const TPC_NAKED_STRING = 15; + const TPC_OTHER = 16; + const TPC_NEWLINE = 17; + const TPC_COMMENTSTART = 18; const YY_NO_ACTION = 60; const YY_ACCEPT_ACTION = 59; const YY_ERROR_ACTION = 58; const YY_SZ_ACTTAB = 38; - static public $yy_action = array( - 29, 30, 34, 33, 24, 13, 19, 25, 35, 21, - 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, - 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, - 2, 11, 28, 22, 16, 9, 7, 10, +static public $yy_action = array( + 29, 30, 34, 33, 24, 13, 19, 25, 35, 21, + 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, + 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, + 2, 11, 28, 22, 16, 9, 7, 10, ); static public $yy_lookahead = array( - 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, - 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, - 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, - 23, 1, 24, 17, 2, 25, 22, 25, - ); - const YY_SHIFT_USE_DFLT = - 8; + 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, + 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, + 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, + 23, 1, 24, 17, 2, 25, 22, 25, +); + const YY_SHIFT_USE_DFLT = -8; const YY_SHIFT_MAX = 19; static public $yy_shift_ofst = array( - - 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - - 8, 19, 5, 3, 15, 16, 24, 25, 32, 20, - ); - const YY_REDUCE_USE_DFLT = - 21; + -8, 1, 1, 1, -7, -3, -3, 30, -8, -8, + -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( - - 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - - 11, - ); + -10, -1, -1, -1, -20, 10, 12, 8, 14, 7, + -11, +); static public $yyExpectedTokens = array( - array(), - array(5, 17, 18,), - array(5, 17, 18,), - array(5, 17, 18,), - array(7, 8, 9, 10, 11, 12, 15, 16,), - array(17, 18,), - array(17, 18,), - array(1,), - array(), - array(), - array(), - array(2, 4,), - array(15, 17,), - array(13, 14,), - array(14,), - array(17,), - array(3,), - array(3,), - array(2,), - array(6,), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - array(), - ); + array(), + array(5, 17, 18, ), + array(5, 17, 18, ), + array(5, 17, 18, ), + array(7, 8, 9, 10, 11, 12, 15, 16, ), + array(17, 18, ), + array(17, 18, ), + array(1, ), + array(), + array(), + array(), + array(2, 4, ), + array(15, 17, ), + array(13, 14, ), + array(14, ), + array(17, ), + array(3, ), + array(3, ), + array(2, ), + array(6, ), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), + array(), +); static public $yy_default = array( - 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, - 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, - 47, 52, 51, 49, 48, 53, - ); + 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, + 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, + 47, 52, 51, 49, 48, 53, +); const YYNOCODE = 29; const YYSTACKDEPTH = 100; const YYNSTATE = 36; @@ -400,8 +398,8 @@ class Smarty_Internal_Configfileparser const YYERRORSYMBOL = 19; const YYERRSYMDT = 'yy0'; const YYFALLBACK = 0; - public static $yyFallback = array(); - + public static $yyFallback = array( + ); public function Trace($TraceFILE, $zTracePrompt) { if (!$TraceFILE) { @@ -426,38 +424,38 @@ class Smarty_Internal_Configfileparser public $yystack = array(); /* The parser's stack */ public $yyTokenName = array( - '$', 'OPENB', 'SECTION', 'CLOSEB', - 'DOT', 'ID', 'EQUAL', 'FLOAT', - 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', - 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING', - 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', - 'start', 'global_vars', 'sections', 'var_list', - 'section', 'newline', 'var', 'value', + '$', 'OPENB', 'SECTION', 'CLOSEB', + 'DOT', 'ID', 'EQUAL', 'FLOAT', + 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', + 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING', + 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', + 'start', 'global_vars', 'sections', 'var_list', + 'section', 'newline', 'var', 'value', ); public static $yyRuleName = array( - "start ::= global_vars sections", - "global_vars ::= var_list", - "sections ::= sections section", - "sections ::=", - "section ::= OPENB SECTION CLOSEB newline var_list", - "section ::= OPENB DOT SECTION CLOSEB newline var_list", - "var_list ::= var_list newline", - "var_list ::= var_list var", - "var_list ::=", - "var ::= ID EQUAL value", - "value ::= FLOAT", - "value ::= INT", - "value ::= BOOL", - "value ::= SINGLE_QUOTED_STRING", - "value ::= DOUBLE_QUOTED_STRING", - "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END", - "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END", - "value ::= NAKED_STRING", - "value ::= OTHER", - "newline ::= NEWLINE", - "newline ::= COMMENTSTART NEWLINE", - "newline ::= COMMENTSTART NAKED_STRING NEWLINE", + "start ::= global_vars sections", + "global_vars ::= var_list", + "sections ::= sections section", + "sections ::=", + "section ::= OPENB SECTION CLOSEB newline var_list", + "section ::= OPENB DOT SECTION CLOSEB newline var_list", + "var_list ::= var_list newline", + "var_list ::= var_list var", + "var_list ::=", + "var ::= ID EQUAL value", + "value ::= FLOAT", + "value ::= INT", + "value ::= BOOL", + "value ::= SINGLE_QUOTED_STRING", + "value ::= DOUBLE_QUOTED_STRING", + "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END", + "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END", + "value ::= NAKED_STRING", + "value ::= OTHER", + "newline ::= NEWLINE", + "newline ::= COMMENTSTART NEWLINE", + "newline ::= COMMENTSTART NAKED_STRING NEWLINE", ); public function tokenName($tokenType) @@ -475,8 +473,7 @@ class Smarty_Internal_Configfileparser public static function yy_destructor($yymajor, $yypminor) { switch ($yymajor) { - default: - break; /* If no destructor action specified: do nothing */ + default: break; /* If no destructor action specified: do nothing */ } } @@ -488,12 +485,12 @@ class Smarty_Internal_Configfileparser $yytos = array_pop($this->yystack); if ($this->yyTraceFILE && $this->yyidx >= 0) { fwrite($this->yyTraceFILE, - $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . - "\n"); + $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . + "\n"); } $yymajor = $yytos->major; self::yy_destructor($yymajor, $yytos->minor); - $this->yyidx --; + $this->yyidx--; return $yymajor; } @@ -523,7 +520,7 @@ class Smarty_Internal_Configfileparser // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ == 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -536,9 +533,9 @@ class Smarty_Internal_Configfileparser $this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]); if (isset(self::$yyExpectedTokens[$nextstate])) { - $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); - if (in_array($token, - self::$yyExpectedTokens[$nextstate], true)) { + $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); + if (in_array($token, + self::$yyExpectedTokens[$nextstate], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; @@ -547,7 +544,7 @@ class Smarty_Internal_Configfileparser } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[$yyruleno][0]; @@ -572,8 +569,8 @@ class Smarty_Internal_Configfileparser } break; } while (true); - $this->yyidx = $yyidx; - $this->yystack = $stack; + $this->yyidx = $yyidx; + $this->yystack = $stack; return array_unique($expected); } @@ -595,7 +592,7 @@ class Smarty_Internal_Configfileparser // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ == 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -608,8 +605,7 @@ class Smarty_Internal_Configfileparser $this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]); if (isset(self::$yyExpectedTokens[$nextstate]) && - in_array($token, self::$yyExpectedTokens[$nextstate], true) - ) { + in_array($token, self::$yyExpectedTokens[$nextstate], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; @@ -617,7 +613,7 @@ class Smarty_Internal_Configfileparser } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[$yyruleno][0]; @@ -652,7 +648,7 @@ class Smarty_Internal_Configfileparser return true; } - public function yy_find_shift_action($iLookAhead) + public function yy_find_shift_action($iLookAhead) { $stateno = $this->yystack[$this->yyidx]->stateno; @@ -670,15 +666,13 @@ class Smarty_Internal_Configfileparser } $i += $iLookAhead; 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) - && ($iFallback = self::$yyFallback[$iLookAhead]) != 0 - ) { + && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { if ($this->yyTraceFILE) { fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . - $this->yyTokenName[$iLookAhead] . " => " . - $this->yyTokenName[$iFallback] . "\n"); + $this->yyTokenName[$iLookAhead] . " => " . + $this->yyTokenName[$iFallback] . "\n"); } return $this->yy_find_shift_action($iFallback); @@ -706,8 +700,7 @@ class Smarty_Internal_Configfileparser } $i += $iLookAhead; if ($i < 0 || $i >= self::YY_SZ_ACTTAB || - self::$yy_lookahead[$i] != $iLookAhead - ) { + self::$yy_lookahead[$i] != $iLookAhead) { return self::$yy_default[$stateno]; } else { return self::$yy_action[$i]; @@ -716,19 +709,19 @@ class Smarty_Internal_Configfileparser public function yy_shift($yyNewState, $yyMajor, $yypMinor) { - $this->yyidx ++; + $this->yyidx++; if ($this->yyidx >= self::YYSTACKDEPTH) { - $this->yyidx --; + $this->yyidx--; if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } - #line 255 "../smarty/lexer/smarty_internal_configfileparser.y" +#line 255 "../smarty/lexer/smarty_internal_configfileparser.y" - $this->internalError = true; - $this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); + $this->internalError = true; + $this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); return; } @@ -739,55 +732,55 @@ class Smarty_Internal_Configfileparser array_push($this->yystack, $yytos); if ($this->yyTraceFILE && $this->yyidx > 0) { fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, - $yyNewState); + $yyNewState); fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); - for ($i = 1; $i <= $this->yyidx; $i ++) { + for ($i = 1; $i <= $this->yyidx; $i++) { 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( - array(0 => 20, 1 => 2), - array(0 => 21, 1 => 1), - array(0 => 22, 1 => 2), - array(0 => 22, 1 => 0), - array(0 => 24, 1 => 5), - array(0 => 24, 1 => 6), - array(0 => 23, 1 => 2), - array(0 => 23, 1 => 2), - array(0 => 23, 1 => 0), - array(0 => 26, 1 => 3), - array(0 => 27, 1 => 1), - array(0 => 27, 1 => 1), - array(0 => 27, 1 => 1), - array(0 => 27, 1 => 1), - array(0 => 27, 1 => 1), - array(0 => 27, 1 => 3), - array(0 => 27, 1 => 2), - array(0 => 27, 1 => 1), - array(0 => 27, 1 => 1), - array(0 => 25, 1 => 1), - array(0 => 25, 1 => 2), - array(0 => 25, 1 => 3), + array( 0 => 20, 1 => 2 ), + array( 0 => 21, 1 => 1 ), + array( 0 => 22, 1 => 2 ), + array( 0 => 22, 1 => 0 ), + array( 0 => 24, 1 => 5 ), + array( 0 => 24, 1 => 6 ), + array( 0 => 23, 1 => 2 ), + array( 0 => 23, 1 => 2 ), + array( 0 => 23, 1 => 0 ), + array( 0 => 26, 1 => 3 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 3 ), + array( 0 => 27, 1 => 2 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 27, 1 => 1 ), + array( 0 => 25, 1 => 1 ), + array( 0 => 25, 1 => 2 ), + array( 0 => 25, 1 => 3 ), ); public static $yyReduceMap = array( - 0 => 0, - 2 => 0, - 3 => 0, + 0 => 0, + 2 => 0, + 3 => 0, 19 => 0, 20 => 0, 21 => 0, - 1 => 1, - 4 => 4, - 5 => 5, - 6 => 6, - 7 => 7, - 8 => 8, - 9 => 9, + 1 => 1, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 8 => 8, + 9 => 9, 10 => 10, 11 => 11, 12 => 12, @@ -798,106 +791,74 @@ class Smarty_Internal_Configfileparser 17 => 17, 18 => 17, ); - - #line 261 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r0() - { - $this->_retvalue = null; +#line 261 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r0(){ + $this->_retvalue = null; } - - #line 266 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r1() - { - $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); - $this->_retvalue = null; +#line 266 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r1(){ + $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); + $this->_retvalue = null; } - - #line 280 "../smarty/lexer/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; +#line 280 "../smarty/lexer/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; } - - #line 285 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r5() - { - if ($this->configReadHidden) { - $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor); - } - $this->_retvalue = null; +#line 285 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r5(){ + if ($this->configReadHidden) { + $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); } - - #line 293 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r6() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor; + $this->_retvalue = null; } - - #line 297 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r7() - { - $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); +#line 293 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r6(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } - - #line 301 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r8() - { - $this->_retvalue = Array(); +#line 297 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r7(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); } - - #line 307 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r9() - { - $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + - 2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); +#line 301 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r8(){ + $this->_retvalue = Array(); } - - #line 312 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r10() - { - $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; +#line 307 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r9(){ + $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); } - - #line 316 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r11() - { - $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; +#line 312 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r10(){ + $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; } - - #line 320 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r12() - { - $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); +#line 316 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r11(){ + $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; } - - #line 324 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r13() - { - $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); +#line 320 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r12(){ + $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); } - - #line 328 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r14() - { - $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); +#line 324 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r13(){ + $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); } - - #line 332 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r15() - { - $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor); +#line 328 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r14(){ + $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); } - - #line 336 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r16() - { - $this->_retvalue = ''; +#line 332 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r15(){ + $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor); } - - #line 340 "../smarty/lexer/smarty_internal_configfileparser.y" - function yy_r17() - { - $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; +#line 336 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r16(){ + $this->_retvalue = ''; + } +#line 340 "../smarty/lexer/smarty_internal_configfileparser.y" + function yy_r17(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } private $_retvalue; @@ -906,11 +867,10 @@ class Smarty_Internal_Configfileparser { $yymsp = $this->yystack[$this->yyidx]; if ($this->yyTraceFILE && $yyruleno >= 0 - && $yyruleno < count(self::$yyRuleName) - ) { + && $yyruleno < count(self::$yyRuleName)) { fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", - $this->yyTracePrompt, $yyruleno, - self::$yyRuleName[$yyruleno]); + $this->yyTracePrompt, $yyruleno, + self::$yyRuleName[$yyruleno]); } $this->_retvalue = $yy_lefthand_side = null; @@ -923,14 +883,14 @@ class Smarty_Internal_Configfileparser $yygoto = self::$yyRuleInfo[$yyruleno][0]; $yysize = self::$yyRuleInfo[$yyruleno][1]; $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); } $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); if ($yyact < self::YYNSTATE) { if (!$this->yyTraceFILE && $yysize) { - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $yyact; $x->major = $yygoto; @@ -948,34 +908,32 @@ class Smarty_Internal_Configfileparser { if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); - } - while ($this->yyidx >= 0) { + } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } } public function yy_syntax_error($yymajor, $TOKEN) { - #line 248 "../smarty/lexer/smarty_internal_configfileparser.y" +#line 248 "../smarty/lexer/smarty_internal_configfileparser.y" - $this->internalError = true; - $this->yymajor = $yymajor; - $this->compiler->trigger_config_file_error(); + $this->internalError = true; + $this->yymajor = $yymajor; + $this->compiler->trigger_config_file_error(); } public function yy_accept() { if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); - } - while ($this->yyidx >= 0) { + } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } - #line 241 "../smarty/lexer/smarty_internal_configfileparser.y" +#line 241 "../smarty/lexer/smarty_internal_configfileparser.y" - $this->successful = !$this->internalError; - $this->internalError = false; - $this->retvalue = $this->_retvalue; + $this->successful = !$this->internalError; + $this->internalError = false; + $this->retvalue = $this->_retvalue; } public function doParse($yymajor, $yytokenvalue) @@ -984,31 +942,30 @@ class Smarty_Internal_Configfileparser if ($this->yyidx === null || $this->yyidx < 0) { $this->yyidx = 0; - $this->yyerrcnt = - 1; + $this->yyerrcnt = -1; $x = new TPC_yyStackEntry; $x->stateno = 0; $x->major = 0; $this->yystack = array(); array_push($this->yystack, $x); } - $yyendofinput = ($yymajor == 0); + $yyendofinput = ($yymajor==0); if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sInput %s\n", - $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); } do { $yyact = $this->yy_find_shift_action($yymajor); if ($yymajor < self::YYERRORSYMBOL && - !$this->yy_is_expected_token($yymajor) - ) { + !$this->yy_is_expected_token($yymajor)) { // force a syntax error $yyact = self::YY_ERROR_ACTION; } if ($yyact < self::YYNSTATE) { $this->yy_shift($yyact, $yymajor, $yytokenvalue); - $this->yyerrcnt --; + $this->yyerrcnt--; if ($yyendofinput && $this->yyidx >= 0) { $yymajor = 0; } else { @@ -1019,7 +976,7 @@ class Smarty_Internal_Configfileparser } elseif ($yyact == self::YY_ERROR_ACTION) { if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sSyntax Error!\n", - $this->yyTracePrompt); + $this->yyTracePrompt); } if (self::YYERRORSYMBOL) { if ($this->yyerrcnt < 0) { @@ -1029,18 +986,18 @@ class Smarty_Internal_Configfileparser if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) { if ($this->yyTraceFILE) { fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", - $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); } $this->yy_destructor($yymajor, $yytokenvalue); $yymajor = self::YYNOCODE; } else { while ($this->yyidx >= 0 && - $yymx != self::YYERRORSYMBOL && - ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE - ) { + $yymx != self::YYERRORSYMBOL && + ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE + ){ $this->yy_pop_parser_stack(); } - if ($this->yyidx < 0 || $yymajor == 0) { + if ($this->yyidx < 0 || $yymajor==0) { $this->yy_destructor($yymajor, $yytokenvalue); $this->yy_parse_failed(); $yymajor = self::YYNOCODE;