smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-07 11:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- check at compile time for variable filter to improve rendering speed if no filter is used

Browse Source 
- fixed bug at combination of {elseif} tag and {...} in double quoted strings of static class parameter
This commit is contained in:
Uwe.Tews
2009-10-20 17:09:22 +00:00
parent fad5c12f3a
commit dc592e5a44
7 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
change_log.txt
View File

@@ -1,3 +1,7 @@
10/20/2009
- check at compile time for variable filter to improve rendering speed if no filter is used
- fixed bug at combination of {elseif} tag and {...} in double quoted strings of static class parameter
10/19/2009 10/19/2009
- fixed compiled template merging on variable double quoted strings as name - fixed compiled template merging on variable double quoted strings as name
- fixed bug in caching mode 2 and cache_lifetime -1 - fixed bug in caching mode 2 and cache_lifetime -1

4
libs/sysplugins/internal.compile_else.php
View File

@@ -23,8 +23,8 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
public function compile($args, $compiler) public function compile($args, $compiler)
{ {
$this->compiler = $compiler; $this->compiler = $compiler;
$this->_close_tag(array('if', 'elseif')); $nesting = $this->_close_tag(array('if', 'elseif'));
$this->_open_tag('else'); $this->_open_tag('else',$nesting);
return '<?php else: ?>'; return '<?php else: ?>';
} }

16
libs/sysplugins/internal.compile_elseif.php
View File

@@ -21,15 +21,23 @@ class Smarty_Internal_Compile_ElseIf extends Smarty_Internal_CompileBase {
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
{ {
$this->compiler = $compiler; $this->compiler = $compiler;
$this->required_attributes = array('if condition'); $this->required_attributes = array('if condition');
// check and get attributes // check and get attributes
$_attr = $this->_get_attributes($args); $_attr = $this->_get_attributes($args);
$this->_close_tag(array('if', 'elseif')); $nesting = $this->_close_tag(array('if', 'elseif'));
$this->_open_tag('elseif');
return '<?php elseif (' . $args['if condition'] . '): ?>'; if (empty($this->compiler->prefix_code)) {
$this->_open_tag('elseif', $nesting);
return '<?php elseif (' . $args['if condition'] . '): ?>';
} else {
$tmp = '';
foreach ($this->compiler->prefix_code as $code) $tmp .= $code;
$this->compiler->prefix_code = array();
$this->_open_tag('elseif', $nesting + 1);
return '<?php else: ?>' . $tmp . '<?php if (' . $args['if condition'] . '): ?>';
}
} }
} }

2
libs/sysplugins/internal.compile_if.php
View File

@@ -26,7 +26,7 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
// check and get attributes // check and get attributes
$_attr = $this->_get_attributes($args); $_attr = $this->_get_attributes($args);
$this->_open_tag('if'); $this->_open_tag('if',1);
if (is_array($args['if condition'])) { if (is_array($args['if condition'])) {
$_output = " <?php if (!isset(\$_smarty_tpl->tpl_vars[".$args['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$args['if condition']['var']."] = new Smarty_Variable;\n"; $_output = " <?php if (!isset(\$_smarty_tpl->tpl_vars[".$args['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$args['if condition']['var']."] = new Smarty_Variable;\n";
$_output .= "if (\$_smarty_tpl->tpl_vars[".$args['if condition']['var']."]->value = ".$args['if condition']['value']."): ?>"; $_output .= "if (\$_smarty_tpl->tpl_vars[".$args['if condition']['var']."]->value = ".$args['if condition']['value']."): ?>";

8
libs/sysplugins/internal.compile_ifclose.php
View File

@@ -23,9 +23,11 @@ class Smarty_Internal_Compile_IfClose extends Smarty_Internal_CompileBase {
public function compile($args, $compiler) public function compile($args, $compiler)
{ {
$this->compiler = $compiler; $this->compiler = $compiler;
$this->_close_tag(array('if', 'else', 'elseif')); $nesting = $this->_close_tag(array('if', 'else', 'elseif'));
return "<?php endif;?>"; $tmp = '';
for ($i = 0; $i < $nesting ; $i++) $tmp .= ' endif;';
return "<?php $tmp ?>";
} }
} }
?> ?>

6
libs/sysplugins/internal.compile_print_expression.php
View File

@@ -48,7 +48,11 @@ class Smarty_Internal_Compile_Print_Expression extends Smarty_Internal_CompileBa
} else { } else {
// display value // display value
$this->compiler->has_output = true; $this->compiler->has_output = true;
$output = '<?php echo $this->smarty->filter_handler->execute(\'variable\', ' . $_attr['value'] . ',' . $_attr['filter'] . ');?>'; if (isset($this->compiler->smarty->registered_filters['variable'])) {
$output = '<?php echo $this->smarty->filter_handler->execute(\'variable\', ' . $_attr['value'] . ',' . $_attr['filter'] . ');?>';
} else {
$output = '<?php echo ' . $_attr['value'] . ';?>';
}
} }
return $output; return $output;
} }

14
libs/sysplugins/internal.templateparser.php
View File

@@ -131,7 +131,7 @@ class Smarty_Internal_Templateparser#line 109 "internal.templateparser.php"
$this->cacher = $this->template->cacher_object; $this->cacher = $this->template->cacher_object;
$this->compiler->has_variable_string = false; $this->compiler->has_variable_string = false;
$this->nocache = false; $this->nocache = false;
$this->prefix_code = array(); $this->compiler->prefix_code = array();
$this->prefix_number = 0; $this->prefix_number = 0;
} }
public static function &instance($new_instance = null) public static function &instance($new_instance = null)
@@ -1982,7 +1982,7 @@ static public $yy_action = array(
#line 94 "internal.templateparser.y" #line 94 "internal.templateparser.y"
function yy_r3(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); function yy_r3(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s);
if ($this->compiler->has_code) { if ($this->compiler->has_code) {
$tmp =''; foreach ($this->prefix_code as $code) {$tmp.=$code;} $this->prefix_code=array(); $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
$this->_retvalue = $this->cacher->processNocacheCode($tmp.$s[0].$this->yystack[$this->yyidx + -1]->minor, $this->compiler,$this->nocache,true); $this->_retvalue = $this->cacher->processNocacheCode($tmp.$s[0].$this->yystack[$this->yyidx + -1]->minor, $this->compiler,$this->nocache,true);
} else { $this->_retvalue = $s[0].$this->yystack[$this->yyidx + -1]->minor;} $this->nocache=false; $this->compiler->has_variable_string = false; } } else { $this->_retvalue = $s[0].$this->yystack[$this->yyidx + -1]->minor;} $this->nocache=false; $this->compiler->has_variable_string = false; }
#line 1993 "internal.templateparser.php" #line 1993 "internal.templateparser.php"
@@ -2190,13 +2190,13 @@ static public $yy_action = array(
function yy_r65(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; } function yy_r65(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; }
#line 2196 "internal.templateparser.php" #line 2196 "internal.templateparser.php"
#line 314 "internal.templateparser.y" #line 314 "internal.templateparser.y"
function yy_r66(){ $this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -1]->minor .')'; } function yy_r66(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -1]->minor .')'; }
#line 2199 "internal.templateparser.php" #line 2199 "internal.templateparser.php"
#line 316 "internal.templateparser.y" #line 316 "internal.templateparser.y"
function yy_r67(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.'::'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } function yy_r67(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.'::'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; }
#line 2202 "internal.templateparser.php" #line 2202 "internal.templateparser.php"
#line 317 "internal.templateparser.y" #line 317 "internal.templateparser.y"
function yy_r68(){ $this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -4]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -7]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -2]->minor .')'.$this->yystack[$this->yyidx + 0]->minor; } function yy_r68(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -4]->minor .'\')->value;?>'; $this->_retvalue = $this->yystack[$this->yyidx + -7]->minor.'::$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -2]->minor .')'.$this->yystack[$this->yyidx + 0]->minor; }
#line 2205 "internal.templateparser.php" #line 2205 "internal.templateparser.php"
#line 319 "internal.templateparser.y" #line 319 "internal.templateparser.y"
function yy_r69(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; } function yy_r69(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; }
@@ -2208,7 +2208,7 @@ static public $yy_action = array(
function yy_r71(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.'::$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } function yy_r71(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.'::$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; }
#line 2214 "internal.templateparser.php" #line 2214 "internal.templateparser.php"
#line 325 "internal.templateparser.y" #line 325 "internal.templateparser.y"
function yy_r72(){ $this->prefix_number++; $this->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = '$_tmp'.$this->prefix_number; } function yy_r72(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = '$_tmp'.$this->prefix_number; }
#line 2217 "internal.templateparser.php" #line 2217 "internal.templateparser.php"
#line 334 "internal.templateparser.y" #line 334 "internal.templateparser.y"
function yy_r73(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { $this->_retvalue = $this->compiler->compileTag('internal_smarty_var',$this->yystack[$this->yyidx + 0]->minor['index']);} else { function yy_r73(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { $this->_retvalue = $this->compiler->compileTag('internal_smarty_var',$this->yystack[$this->yyidx + 0]->minor['index']);} else {
@@ -2351,7 +2351,7 @@ static public $yy_action = array(
function yy_r125(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; } function yy_r125(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; }
#line 2357 "internal.templateparser.php" #line 2357 "internal.templateparser.php"
#line 473 "internal.templateparser.y" #line 473 "internal.templateparser.y"
function yy_r131(){$this->prefix_number++; $this->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number; } function yy_r131(){$this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number; }
#line 2360 "internal.templateparser.php" #line 2360 "internal.templateparser.php"
#line 475 "internal.templateparser.y" #line 475 "internal.templateparser.y"
function yy_r132(){$this->_retvalue = '=='; } function yy_r132(){$this->_retvalue = '=='; }
@@ -2414,7 +2414,7 @@ static public $yy_action = array(
function yy_r155(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->_retvalue = $s[0].'".('.$this->yystack[$this->yyidx + -1]->minor.')."'; $this->compiler->has_variable_string = true; } function yy_r155(){preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->_retvalue = $s[0].'".('.$this->yystack[$this->yyidx + -1]->minor.')."'; $this->compiler->has_variable_string = true; }
#line 2420 "internal.templateparser.php" #line 2420 "internal.templateparser.php"
#line 509 "internal.templateparser.y" #line 509 "internal.templateparser.y"
function yy_r156(){ preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->prefix_number++; $this->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = $s[0].'".$_tmp'.$this->prefix_number.'."'; $this->compiler->has_variable_string = true; } function yy_r156(){ preg_match('/\s*/',$this->yystack[$this->yyidx + -2]->minor,$s); $this->prefix_number++; $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + -1]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; $this->_retvalue = $s[0].'".$_tmp'.$this->prefix_number.'."'; $this->compiler->has_variable_string = true; }
#line 2423 "internal.templateparser.php" #line 2423 "internal.templateparser.php"
#line 510 "internal.templateparser.y" #line 510 "internal.templateparser.y"
function yy_r157(){$this->_retvalue = '$'.$this->yystack[$this->yyidx + 0]->minor; } function yy_r157(){$this->_retvalue = '$'.$this->yystack[$this->yyidx + 0]->minor; }