get config properties via compiler object

- reverting part of earlier change of today
This commit is contained in:
Uwe Tews
2014-12-30 18:16:51 +01:00
parent e351c0123f
commit 4b7fba4d88
4 changed files with 461 additions and 506 deletions

View File

@@ -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)

View File

@@ -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;
}
/**

View File

@@ -1,15 +1,15 @@
<?php
/**
* 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
* @subpackage Config
* @author Uwe Tews
*/
/**
* Smarty_Internal_Configfilelexer
*
* This is the config file lexer.
* It is generated from the smarty_internal_configfilelexer.plex file
*
@@ -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)
@@ -135,6 +135,8 @@ class Smarty_Internal_Configfilelexer
$this->yyTracePrompt = '<br>';
}
private $_yy_state = 1;
private $_yy_stack = array();
@@ -164,6 +166,7 @@ class Smarty_Internal_Configfilelexer
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);
}
}
public function yybegin($state)
@@ -174,6 +177,9 @@ class Smarty_Internal_Configfilelexer
}
}
public function yylex1()
{
$tokenMap = array (
@@ -228,68 +234,63 @@ class Smarty_Internal_Configfilelexer
}
// skip this token
continue;
}
} else {
} } else {
throw new Exception('Unexpected input at line' . $this->line .
': ' . $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);
}
function yy_r1_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
$this->yypushstate(self::SECTION);
}
function yy_r1_3($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
}
function yy_r1_4($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
$this->yypushstate(self::VALUE);
}
function yy_r1_5($yy_subpatterns)
{
return false;
}
function yy_r1_6($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
}
function yy_r1_7($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_ID;
}
function yy_r1_8($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
}
public function yylex2()
{
$tokenMap = array (
@@ -345,58 +346,52 @@ class Smarty_Internal_Configfilelexer
}
// skip this token
continue;
}
} else {
} } else {
throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]);
}
break;
} while (true);
} // end function
const VALUE = 2;
const VALUE = 2;
function yy_r2_1($yy_subpatterns)
{
return false;
}
function yy_r2_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
$this->yypopstate();
}
function yy_r2_3($yy_subpatterns)
{
$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);
}
function yy_r2_5($yy_subpatterns)
{
$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();
}
function yy_r2_7($yy_subpatterns)
{
@@ -409,14 +404,12 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate();
}
}
function yy_r2_8($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
$this->yypopstate();
}
function yy_r2_9($yy_subpatterns)
{
@@ -425,6 +418,8 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate();
}
public function yylex3()
{
$tokenMap = array (
@@ -472,17 +467,17 @@ class Smarty_Internal_Configfilelexer
}
// skip this token
continue;
}
} else {
} } else {
throw new Exception('Unexpected input at line' . $this->line .
': ' . $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)
{
@@ -490,6 +485,8 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate();
}
public function yylex4()
{
$tokenMap = array (
@@ -539,29 +536,27 @@ class Smarty_Internal_Configfilelexer
}
// skip this token
continue;
}
} else {
} } else {
throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]);
}
break;
} while (true);
} // end function
const COMMENT = 4;
const COMMENT = 4;
function yy_r4_1($yy_subpatterns)
{
return false;
}
function yy_r4_2($yy_subpatterns)
{
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
}
function yy_r4_3($yy_subpatterns)
{
@@ -569,6 +564,8 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate();
}
public function yylex5()
{
$tokenMap = array (
@@ -617,23 +614,22 @@ class Smarty_Internal_Configfilelexer
}
// skip this token
continue;
}
} else {
} } else {
throw new Exception('Unexpected input at line' . $this->line .
': ' . $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;
}
function yy_r5_2($yy_subpatterns)
{
@@ -641,6 +637,7 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate();
}
public function yylex6()
{
$tokenMap = array (
@@ -689,17 +686,17 @@ class Smarty_Internal_Configfilelexer
}
// skip this token
continue;
}
} else {
} } else {
throw new Exception('Unexpected input at line' . $this->line .
': ' . $this->data[$this->counter]);
}
break;
} while (true);
} // end function
const TRIPPLE = 6;
const TRIPPLE = 6;
function yy_r6_1($yy_subpatterns)
{
@@ -707,7 +704,6 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate();
$this->yypushstate(self::START);
}
function yy_r6_2($yy_subpatterns)
{
@@ -721,4 +717,6 @@ class Smarty_Internal_Configfilelexer
$this->value = substr($this->data,$this->counter,$to-$this->counter);
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
}
}

View File

@@ -1,5 +1,4 @@
<?php
class TPC_yyToken implements ArrayAccess
{
public $string = '';
@@ -72,17 +71,16 @@ class TPC_yyStackEntry
** number for the token at this stack level */
public $minor; /* The user-supplied minor token value. This
** is the value of the token */
}
};
;
#line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
/**
* Smarty Internal Plugin Configfileparse
*
* This is the config file parser.
* It is generated from the smarty_internal_configfileparser.y file
*
* @package Smarty
* @subpackage Compiler
* @author Uwe Tews
@@ -162,10 +160,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;
}
/**
@@ -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) {
@@ -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 */
}
}
@@ -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;
@@ -670,11 +666,9 @@ 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] . " => " .
@@ -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];
@@ -798,105 +791,73 @@ class Smarty_Internal_Configfileparser
17 => 17,
18 => 17,
);
#line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r0()
{
function yy_r0(){
$this->_retvalue = null;
}
#line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r1()
{
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()
{
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()
{
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 293 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r6()
{
function yy_r6(){
$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
}
#line 297 "../smarty/lexer/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));
}
#line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r8()
{
function yy_r8(){
$this->_retvalue = Array();
}
#line 307 "../smarty/lexer/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);
}
#line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r10()
{
function yy_r10(){
$this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
}
#line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r11()
{
function yy_r11(){
$this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
}
#line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r12()
{
function yy_r12(){
$this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
}
#line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r13()
{
function yy_r13(){
$this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
}
#line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r14()
{
function yy_r14(){
$this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
}
#line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r15()
{
function yy_r15(){
$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
}
#line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r16()
{
function yy_r16(){
$this->_retvalue = '';
}
#line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
function yy_r17()
{
function yy_r17(){
$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
}
@@ -906,8 +867,7 @@ 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]);
@@ -948,8 +908,7 @@ 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();
}
}
@@ -967,8 +926,7 @@ class Smarty_Internal_Configfileparser
{
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"
@@ -1001,8 +959,7 @@ class Smarty_Internal_Configfileparser
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;
}