Update to Smarty 3.1.15

This commit is contained in:
Némunaire 2013-10-09 19:08:38 +02:00
commit 1c9cd9208f
119 changed files with 5232 additions and 4641 deletions

View file

@ -21,10 +21,9 @@ class Smarty_Internal_Configfilelexer
public $line;
private $state = 1;
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;
}
}
?>