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

- optimize {extends} compilation

Browse Source
This commit is contained in:
Uwe Tews
2015-07-12 01:11:22 +02:00
parent b3fd262541
commit 878724c4ea
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
change_log.txt
View File

@@ -1,6 +1,9 @@
 ===== 3.1.28-dev===== (xx.xx.2015)  ===== 3.1.28-dev===== (xx.xx.2015)
12.07.2015
- optimize {extends} compilation
10.07.2015 10.07.2015
- bugfix force file: resource in demo resource.extendsall.php - bugfix force file: resource in demo resource.extendsall.php
08.07.2015 08.07.2015
- bugfix convert each word of class names to ucfirst in in compiler. (forum topic 25588) - bugfix convert each word of class names to ucfirst in in compiler. (forum topic 25588)

2
libs/Smarty.class.php
View File

@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.28-dev/26'; const SMARTY_VERSION = '3.1.28-dev/27';
/** /**
* define variable scopes * define variable scopes

36
libs/sysplugins/smarty_internal_compile_extends.php
View File

@@ -24,6 +24,7 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $required_attributes = array('file'); public $required_attributes = array('file');
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -52,32 +53,39 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
} }
$name = $_attr['file']; $name = $_attr['file'];
/** @var Smarty_Internal_Template $_smarty_tpl if ($compiler->has_variable_string || !((substr_count($name, '"') == 2 || substr_count($name, "'") == 2)) ||
* used in evaluated code substr_count($name, '(') != 0 || substr_count($name, '$_smarty_tpl->') != 0
*/ ) {
$_smarty_tpl = $compiler->template; /** @var Smarty_Internal_Template $_smarty_tpl
eval("\$tpl_name = $name;"); * used in evaluated code
// create template object */
$_template = new $compiler->smarty->template_class($tpl_name, $compiler->smarty, $compiler->template); $_smarty_tpl = $compiler->template;
eval("\$tpl_name = {$name};");
} else {
$tpl_name = trim($name, '\'"');
}
// create source object
$_source = Smarty_Template_Source::load(null, $compiler->smarty, $tpl_name);
// check for recursion // check for recursion
$uid = $_template->source->uid; $uid = $_source->uid;
if (isset($compiler->extends_uid[$uid])) { if (isset($compiler->extends_uid[$uid])) {
$compiler->trigger_template_error("illegal recursive call of \"$include_file\"", $compiler->lex->line - 1); $compiler->trigger_template_error("illegal recursive call of \"{$_source->filepath}\"", $compiler->lex->line -
1);
} }
$compiler->extends_uid[$uid] = true; $compiler->extends_uid[$uid] = true;
if (empty($_template->source->components)) { if (empty($_source->components)) {
array_unshift($compiler->sources, $_template->source); array_unshift($compiler->sources, $_source);
} else { } else {
foreach ($_template->source->components as $source) { foreach ($_source->components as $source) {
array_unshift($compiler->sources, $source); array_unshift($compiler->sources, $source);
$uid = $source->uid; $uid = $source->uid;
if (isset($compiler->extends_uid[$uid])) { if (isset($compiler->extends_uid[$uid])) {
$compiler->trigger_template_error("illegal recursive call of \"{$source->filepath}\"", $compiler->lex->line - 1); $compiler->trigger_template_error("illegal recursive call of \"{$source->filepath}\"", $compiler->lex->line -
1);
} }
$compiler->extends_uid[$uid] = true; $compiler->extends_uid[$uid] = true;
} }
} }
unset ($_template);
$compiler->inheritance_child = true; $compiler->inheritance_child = true;
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY); $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
return ''; return '';