From 3281c147696f500e4bfa86de2d53660ff60454ee Mon Sep 17 00:00:00 2001 From: "monte.ohrt" Date: Tue, 1 Oct 2013 19:35:02 +0000 Subject: [PATCH 01/15] update change log --- change_log.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/change_log.txt b/change_log.txt index 69f8ce01..5c067595 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,5 @@ ===== trunk ===== + ===== Smarty 3.1.15 ===== 01.10.2013 - use current delimiters in compiler error messages (issue 157) - improvement on performance when using error handler and multiple template folders (issue 152) From 655a2d9301f4336613ef227a30734bd0bb4d6a88 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Thu, 3 Oct 2013 09:16:27 +0000 Subject: [PATCH 02/15] - bugfix loops using modifier capitalize did eat up memory (issue 159) --- change_log.txt | 3 ++ libs/plugins/modifier.capitalize.php | 44 +++++++++++++++++++++------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/change_log.txt b/change_log.txt index 5c067595..0200a394 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== +03.10.2013 + - bugfix loops using modifier capitalize did eat up memory (issue 159) + ===== Smarty 3.1.15 ===== 01.10.2013 - use current delimiters in compiler error messages (issue 157) diff --git a/libs/plugins/modifier.capitalize.php b/libs/plugins/modifier.capitalize.php index b3036b86..985c54b4 100644 --- a/libs/plugins/modifier.capitalize.php +++ b/libs/plugins/modifier.capitalize.php @@ -30,36 +30,58 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET ); } else { // uppercase word breaks - $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[2]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '");'), $string); + $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_mbconvert_cb('$matches'), $string); } // check uc_digits case if (!$uc_digits) { if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) { - foreach ($matches[1] as $match) { + foreach($matches[1] as $match) { $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0])); } - } + } } - $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '");'), $upper_string); - + $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_mbconvert2_cb('$matches'), $upper_string); return $upper_string; } - + // lowercase first if ($lc_rest) { $string = strtolower($string); } // uppercase (including hyphenated words) - $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).ucfirst(stripslashes($matches[2]));'), $string); + $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_ucfirst_cb('$matches'), $string); // check uc_digits case if (!$uc_digits) { if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) { - foreach ($matches[1] as $match) { + foreach($matches[1] as $match) { $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0])); } - } + } } - $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).ucfirst(stripslashes($matches[3]));'), $upper_string); - + $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_ucfirst2_cb('$matches'), $upper_string); return $upper_string; +} + +/* + * + * Bug: create_function() use exhausts memory when used in long loops + * Fix: use declared functions for callbacks instead of using create_function() + * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3 + * + * @author Kyle Renfrow + */ +function smarty_mod_cap_mbconvert_cb($matches){ + return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[2]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '"); +} + +function smarty_mod_cap_mbconvert2_cb($matches){ + return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '"); +} + +function smarty_mod_cap_ucfirst_cb($matches){ + return stripslashes($matches[1]).ucfirst(stripslashes($matches[2])); +} + +function smarty_mod_cap_ucfirst2_cb($matches){ + return stripslashes($matches[1]).ucfirst(stripslashes($matches[3])); } From 51453d196b17dfb22680ecd78bbf576eedcfd8a6 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Fri, 4 Oct 2013 08:47:46 +0000 Subject: [PATCH 03/15] - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of template inheritance of 24.08.2013 (forum topic 24585) --- change_log.txt | 4 ++++ libs/sysplugins/smarty_internal_compile_extends.php | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/change_log.txt b/change_log.txt index 0200a394..f6ed0612 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,8 @@ ===== trunk ===== + 04.10.2013 + - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of + template inheritance of 24.08.2013 (forum topic 24585) + 03.10.2013 - bugfix loops using modifier capitalize did eat up memory (issue 159) diff --git a/libs/sysplugins/smarty_internal_compile_extends.php b/libs/sysplugins/smarty_internal_compile_extends.php index aa3d6df3..c60a9dee 100644 --- a/libs/sysplugins/smarty_internal_compile_extends.php +++ b/libs/sysplugins/smarty_internal_compile_extends.php @@ -50,13 +50,6 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase if (strpos($_attr['file'], '$_tmp') !== false) { $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno); } - // add tag to call parent template at the end of source - - if ($compiler->has_variable_string || !((substr_count($_attr['file'], '"') == 2 || substr_count($_attr['file'], "'") == 2)) - || substr_count($_attr['file'], '(') != 0 || substr_count($_attr['file'], '$_smarty_tpl->') != 0 - ) { - $compiler->trigger_template_error('variable template file name not allowed', $compiler->lex->taglineno); - } $name = trim($_attr['file'],"\"'"); // create template object From cd6c1c2ff87061f3ce347fdb5339c92a6b0d3002 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Sun, 13 Oct 2013 12:48:07 +0000 Subject: [PATCH 04/15] bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24585) (Issue 161) --- change_log.txt | 3 +++ libs/sysplugins/smarty_internal_compile_include.php | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/change_log.txt b/change_log.txt index f6ed0612..298d9a7b 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== + 13.10.2013 + bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24585) (Issue 161) + 04.10.2013 - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of template inheritance of 24.08.2013 (forum topic 24585) diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index 3bd2095c..067bd587 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -135,9 +135,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0 ) { $merge_compiled_includes = false; - if ($compiler->inheritance) { - $compiler->trigger_template_error(' variable template file names not allow within {block} tags'); - } } // variable compile_id? if (isset($_attr['compile_id'])) { @@ -145,9 +142,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0 ) { $merge_compiled_includes = false; - if ($compiler->inheritance) { - $compiler->trigger_template_error(' variable compile_id not allow within {block} tags'); - } } } if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) { From c3994f40061968d4cba81502da49d57224b4dec8 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Sun, 13 Oct 2013 17:49:38 +0000 Subject: [PATCH 05/15] .- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161) --- change_log.txt | 3 ++- libs/sysplugins/smarty_internal_template.php | 2 +- libs/sysplugins/smarty_resource.php | 23 ++++++++++++++------ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/change_log.txt b/change_log.txt index 298d9a7b..ecf14adb 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,6 +1,7 @@ ===== trunk ===== 13.10.2013 - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24585) (Issue 161) + - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161) +.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161) 04.10.2013 - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of diff --git a/libs/sysplugins/smarty_internal_template.php b/libs/sysplugins/smarty_internal_template.php index d60fc6bf..c2bf4501 100644 --- a/libs/sysplugins/smarty_internal_template.php +++ b/libs/sysplugins/smarty_internal_template.php @@ -243,7 +243,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { // already in template cache? if ($this->smarty->allow_ambiguous_resources) { - $_templateId = Smarty_Resource::getUniqueTemplateName($this->smarty, $template) . $cache_id . $compile_id; + $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id; } else { $_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id; } diff --git a/libs/sysplugins/smarty_resource.php b/libs/sysplugins/smarty_resource.php index 0cb4ce0b..8a6ea11a 100644 --- a/libs/sysplugins/smarty_resource.php +++ b/libs/sysplugins/smarty_resource.php @@ -491,17 +491,21 @@ abstract class Smarty_Resource /** * modify template_resource according to resource handlers specifications * - * @param string $smarty Smarty instance + * @param Smarty_Internal_template $template Smarty instance * @param string $template_resource template_resource to extracate resource handler and name of * @return string unique resource name */ - public static function getUniqueTemplateName($smarty, $template_resource) + public static function getUniqueTemplateName($template, $template_resource) { - self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type); + self::parseResourceName($template_resource, $template->smarty->default_resource_type, $name, $type); // TODO: optimize for Smarty's internal resource types - $resource = Smarty_Resource::load($smarty, $type); - - return $resource->buildUniqueResourceName($smarty, $name); + $resource = Smarty_Resource::load($template->smarty, $type); + // go relative to a given template? + $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); + if ($template instanceof Smarty_Internal_Template && $_file_is_dotted && ($template->source->type == 'file' || $template->parent->source->type == 'extends')) { + $name = dirname($template->source->filepath) . DS . $name; + } + return $resource->buildUniqueResourceName($template->smarty, $name); } /** @@ -524,7 +528,12 @@ abstract class Smarty_Resource // parse resource_name, load resource handler, identify unique resource name self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type); $resource = Smarty_Resource::load($smarty, $type); - $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name); + // go relative to a given template? + $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); + if ($_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) { + $name2 = dirname($_template->parent->source->filepath) . DS . $name; + } + $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name2); // check runtime cache $_cache_key = 'template|' . $unique_resource_name; From fccd80818b71593517507bf1b030d076a1942f4c Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Mon, 14 Oct 2013 07:47:49 +0000 Subject: [PATCH 06/15] - bugfix yesterdays fix could result in an undefined variable --- change_log.txt | 3 +++ libs/sysplugins/smarty_resource.php | 2 ++ 2 files changed, 5 insertions(+) diff --git a/change_log.txt b/change_log.txt index ecf14adb..04e0dd6c 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== + 14.10.2013 + - bugfix yesterdays fix could result in an undefined variable + 13.10.2013 - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161) .- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161) diff --git a/libs/sysplugins/smarty_resource.php b/libs/sysplugins/smarty_resource.php index 8a6ea11a..4c9e1595 100644 --- a/libs/sysplugins/smarty_resource.php +++ b/libs/sysplugins/smarty_resource.php @@ -532,6 +532,8 @@ abstract class Smarty_Resource $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); if ($_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) { $name2 = dirname($_template->parent->source->filepath) . DS . $name; + } else { + $name2 = $name; } $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name2); From 8342cf45f31a1bbaf8995d90ad7a4744431ebfe6 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Sun, 20 Oct 2013 15:27:35 +0000 Subject: [PATCH 07/15] - bugfix a variable file name at {extends} tag did fail (forum topic 24618) --- change_log.txt | 3 +++ libs/sysplugins/smarty_internal_compile_extends.php | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/change_log.txt b/change_log.txt index 04e0dd6c..7e93d057 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== + 20.10.2013 + - bugfix a variable file name at {extends} tag did fail (forum topic 24618) + 14.10.2013 - bugfix yesterdays fix could result in an undefined variable diff --git a/libs/sysplugins/smarty_internal_compile_extends.php b/libs/sysplugins/smarty_internal_compile_extends.php index c60a9dee..aca36c12 100644 --- a/libs/sysplugins/smarty_internal_compile_extends.php +++ b/libs/sysplugins/smarty_internal_compile_extends.php @@ -51,9 +51,11 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno); } - $name = trim($_attr['file'],"\"'"); + $name = $_attr['file']; + $_smarty_tpl = $compiler->template; + eval("\$tpl_name = $name;"); // create template object - $_template = new $compiler->smarty->template_class($name, $compiler->smarty, $compiler->template); + $_template = new $compiler->smarty->template_class($tpl_name, $compiler->smarty, $compiler->template); // check for recursion $uid = $_template->source->uid; if (isset($compiler->extends_uid[$uid])) { From 26e4a5120ecb284df3e264b7cb822ab59cb1f9a1 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Mon, 28 Oct 2013 18:24:01 +0000 Subject: [PATCH 08/15] - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) --- change_log.txt | 3 +++ libs/sysplugins/smarty_internal_compile_include.php | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/change_log.txt b/change_log.txt index 7e93d057..a1d38610 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== + 28.10.2013 + - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) + 20.10.2013 - bugfix a variable file name at {extends} tag did fail (forum topic 24618) diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index 067bd587..a0812c84 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -85,7 +85,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $_caching = Smarty::CACHING_OFF; // flag if included template code should be merged into caller - $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled; + $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $compiler->inheritance || $_attr['inline'] === true) && !$compiler->template->source->recompiled; // set default when in nocache mode // if ($compiler->template->caching && ($compiler->nocache || $compiler->tag_nocache || $compiler->forceNocache == 2)) { @@ -121,7 +121,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } if ($_attr['nocache'] === true) { $compiler->tag_nocache = true; - if ($merge_compiled_includes || $compiler->inheritance) { + if ($merge_compiled_includes) { $_caching = self::CACHING_NOCACHE_CODE; } else { $_caching = Smarty::CACHING_OFF; @@ -129,7 +129,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } $has_compiled_template = false; - if ($merge_compiled_includes || $compiler->inheritance) { + if ($merge_compiled_includes) { // variable template name ? if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2)) || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0 @@ -151,7 +151,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } } } - if ($merge_compiled_includes || $compiler->inheritance) { + if ($merge_compiled_includes) { // we must observe different compile_id $uid = sha1($_compile_id); $tpl_name = null; From c3e6823f5dfbcb9f952a6e432dbd4b4a75f66c24 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Mon, 28 Oct 2013 23:53:01 +0000 Subject: [PATCH 09/15] - bugfix notice "Trying to get property of non-object" removed (Issue 163) --- change_log.txt | 1 + libs/sysplugins/smarty_resource.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/change_log.txt b/change_log.txt index a1d38610..58521758 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,6 +1,7 @@ ===== trunk ===== 28.10.2013 - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) + - bugfix notice "Trying to get property of non-object" removed (Issue 163) 20.10.2013 - bugfix a variable file name at {extends} tag did fail (forum topic 24618) diff --git a/libs/sysplugins/smarty_resource.php b/libs/sysplugins/smarty_resource.php index 4c9e1595..703d6145 100644 --- a/libs/sysplugins/smarty_resource.php +++ b/libs/sysplugins/smarty_resource.php @@ -529,8 +529,8 @@ abstract class Smarty_Resource self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type); $resource = Smarty_Resource::load($smarty, $type); // go relative to a given template? - $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); - if ($_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) { + $_file_is_dotted = isset($name[0]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); + if ($_file_is_dotted && isset($_template) && $_template->parent instanceof Smarty_Internal_Template && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) { $name2 = dirname($_template->parent->source->filepath) . DS . $name; } else { $name2 = $name; From 5dc4b61771cc324a274a3cb8fda0bc26c906c317 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Mon, 28 Oct 2013 23:56:41 +0000 Subject: [PATCH 10/15] - bugfix correction of modifier capitalize fix from 3.10.2013 (issue 159) --- change_log.txt | 1 + libs/plugins/modifier.capitalize.php | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/change_log.txt b/change_log.txt index 58521758..02280937 100644 --- a/change_log.txt +++ b/change_log.txt @@ -2,6 +2,7 @@ 28.10.2013 - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) - bugfix notice "Trying to get property of non-object" removed (Issue 163) + - bugfix correction of modifier capitalize fix from 3.10.2013 (issue 159) 20.10.2013 - bugfix a variable file name at {extends} tag did fail (forum topic 24618) diff --git a/libs/plugins/modifier.capitalize.php b/libs/plugins/modifier.capitalize.php index 985c54b4..c019df5f 100644 --- a/libs/plugins/modifier.capitalize.php +++ b/libs/plugins/modifier.capitalize.php @@ -30,7 +30,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET ); } else { // uppercase word breaks - $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_mbconvert_cb('$matches'), $string); + $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert_cb', $string); } // check uc_digits case if (!$uc_digits) { @@ -40,7 +40,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals } } } - $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_mbconvert2_cb('$matches'), $upper_string); + $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string); return $upper_string; } @@ -49,7 +49,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals $string = strtolower($string); } // uppercase (including hyphenated words) - $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_ucfirst_cb('$matches'), $string); + $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb', $string); // check uc_digits case if (!$uc_digits) { if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) { @@ -58,7 +58,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals } } } - $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, smarty_mod_cap_ucfirst2_cb('$matches'), $upper_string); + $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb', $upper_string); return $upper_string; } @@ -71,11 +71,11 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals * @author Kyle Renfrow */ function smarty_mod_cap_mbconvert_cb($matches){ - return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[2]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '"); + return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[2]),MB_CASE_UPPER, Smarty::$_CHARSET); } function smarty_mod_cap_mbconvert2_cb($matches){ - return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '"); + return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, Smarty::$_CHARSET); } function smarty_mod_cap_ucfirst_cb($matches){ From c8996a408529f4f2c3c32d905d36cefe2640a070 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Tue, 29 Oct 2013 00:40:14 +0000 Subject: [PATCH 11/15] - bugfix multiple {block}s with same name in parent did not work (forum topic 24631) --- change_log.txt | 1 + libs/sysplugins/smarty_internal_compile_block.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/change_log.txt b/change_log.txt index 02280937..c856d6ff 100644 --- a/change_log.txt +++ b/change_log.txt @@ -3,6 +3,7 @@ - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) - bugfix notice "Trying to get property of non-object" removed (Issue 163) - bugfix correction of modifier capitalize fix from 3.10.2013 (issue 159) + - bugfix multiple {block}s with same name in parent did not work (forum topic 24631) 20.10.2013 - bugfix a variable file name at {extends} tag did fail (forum topic 24618) diff --git a/libs/sysplugins/smarty_internal_compile_block.php b/libs/sysplugins/smarty_internal_compile_block.php index ea62d98b..0699aa08 100644 --- a/libs/sysplugins/smarty_internal_compile_block.php +++ b/libs/sysplugins/smarty_internal_compile_block.php @@ -330,8 +330,8 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase } else { $_output = $compiler->parser->current_buffer->to_smarty_php(); } - unset($compiler->template->block_data[$_name]['compiled']); } + unset($compiler->template->block_data[$_name]['compiled']); // reset flags $compiler->parser->current_buffer = $saved_data[2]; if ($compiler->nocache) { From 4e1f7b15683ea42c7d424d8eea95549a3f67c02d Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Thu, 7 Nov 2013 19:09:37 +0000 Subject: [PATCH 12/15] - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599) --- change_log.txt | 3 +++ libs/sysplugins/smarty_internal_compile_include.php | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/change_log.txt b/change_log.txt index c856d6ff..bb8014c9 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== + 07.11.2013 + - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599) + 28.10.2013 - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) - bugfix notice "Trying to get property of non-object" removed (Issue 163) diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index a0812c84..7a7f960c 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -146,9 +146,6 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) { $merge_compiled_includes = false; - if ($compiler->inheritance) { - $compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags'); - } } } if ($merge_compiled_includes) { From 6abc9ea0d3f2f7384b1333c0c943d258fc962805 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Thu, 7 Nov 2013 20:00:56 +0000 Subject: [PATCH 13/15] - bugfix compiler could fail if PHP mbstring.func_overload is enabled (Issue 164) --- change_log.txt | 1 + .../smarty_internal_templatelexer.php | 54 +++++++++---------- .../smarty_internal_templateparser.php | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/change_log.txt b/change_log.txt index bb8014c9..a2c2aa6f 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,6 +1,7 @@ ===== trunk ===== 07.11.2013 - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599) + - bugfix compiler could fail if PHP mbstring.func_overload is enabled (Issue 164) 28.10.2013 - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163) diff --git a/libs/sysplugins/smarty_internal_templatelexer.php b/libs/sysplugins/smarty_internal_templatelexer.php index 61555aba..f15f50b1 100644 --- a/libs/sysplugins/smarty_internal_templatelexer.php +++ b/libs/sysplugins/smarty_internal_templatelexer.php @@ -205,7 +205,7 @@ class Smarty_Internal_Templatelexer function yy_r1_4($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_STRIPON; @@ -214,7 +214,7 @@ class Smarty_Internal_Templatelexer function yy_r1_5($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; @@ -223,7 +223,7 @@ class Smarty_Internal_Templatelexer function yy_r1_6($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; @@ -233,7 +233,7 @@ class Smarty_Internal_Templatelexer function yy_r1_7($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELIF; @@ -244,7 +244,7 @@ class Smarty_Internal_Templatelexer function yy_r1_9($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; @@ -255,7 +255,7 @@ class Smarty_Internal_Templatelexer function yy_r1_10($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; @@ -266,7 +266,7 @@ class Smarty_Internal_Templatelexer function yy_r1_11($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; @@ -277,7 +277,7 @@ class Smarty_Internal_Templatelexer function yy_r1_12($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; @@ -288,7 +288,7 @@ class Smarty_Internal_Templatelexer function yy_r1_13($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDEL; @@ -786,7 +786,7 @@ class Smarty_Internal_Templatelexer function yy_r2_70($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELIF; @@ -797,7 +797,7 @@ class Smarty_Internal_Templatelexer function yy_r2_72($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; @@ -808,7 +808,7 @@ class Smarty_Internal_Templatelexer function yy_r2_73($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; @@ -819,7 +819,7 @@ class Smarty_Internal_Templatelexer function yy_r2_74($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; @@ -830,7 +830,7 @@ class Smarty_Internal_Templatelexer function yy_r2_75($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDEL; @@ -913,7 +913,7 @@ class Smarty_Internal_Templatelexer function yy_r3_1($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; @@ -923,7 +923,7 @@ class Smarty_Internal_Templatelexer function yy_r3_2($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; @@ -1049,7 +1049,7 @@ class Smarty_Internal_Templatelexer function yy_r4_1($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELIF; @@ -1060,7 +1060,7 @@ class Smarty_Internal_Templatelexer function yy_r4_3($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; @@ -1071,7 +1071,7 @@ class Smarty_Internal_Templatelexer function yy_r4_4($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; @@ -1082,7 +1082,7 @@ class Smarty_Internal_Templatelexer function yy_r4_5($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; @@ -1093,7 +1093,7 @@ class Smarty_Internal_Templatelexer function yy_r4_6($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_TEXT; } else { $this->token = Smarty_Internal_Templateparser::TP_LDEL; @@ -1211,7 +1211,7 @@ class Smarty_Internal_Templatelexer function yy_r5_1($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { return false; } else { $this->token = Smarty_Internal_Templateparser::TP_STRIPON; @@ -1220,7 +1220,7 @@ class Smarty_Internal_Templatelexer function yy_r5_2($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { return false; } else { $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; @@ -1229,7 +1229,7 @@ class Smarty_Internal_Templatelexer function yy_r5_3($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { return false; } else { $this->yypopstate(); @@ -1321,7 +1321,7 @@ class Smarty_Internal_Templatelexer function yy_r6_1($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; } else { $this->yypopstate(); @@ -1331,7 +1331,7 @@ class Smarty_Internal_Templatelexer function yy_r6_2($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; } else { $this->yypopstate(); @@ -1341,7 +1341,7 @@ class Smarty_Internal_Templatelexer function yy_r6_3($yy_subpatterns) { - if ($this->smarty->auto_literal && (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false)) { + if ($this->smarty->auto_literal && ($this->mbstring_overload ? (mb_strpos(" \n\t\r",mb_substr($this->value,$this->ldel_length,1,'latin1'),0,'latin1') !== false) : (strpos(" \n\t\r",substr($this->value,$this->ldel_length,1)) !== false))) { $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; } else { $this->yypopstate(); diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php index 482af6e2..06ec28e4 100644 --- a/libs/sysplugins/smarty_internal_templateparser.php +++ b/libs/sysplugins/smarty_internal_templateparser.php @@ -3241,4 +3241,4 @@ static public $yy_action = array( } } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } -} \ No newline at end of file +} From 7f88dcd31fbe2623c616d0d1fdb90ddb0b644033 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Sun, 15 Dec 2013 15:19:01 +0000 Subject: [PATCH 14/15] - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161) Read 3.1.16_RELEASE_NOTES for more details --- 3.1.16_RELEASE_NOTES.txt | 35 +++++++++++++++++++ change_log.txt | 4 +++ libs/Smarty.class.php | 5 +++ .../smarty_internal_compile_block.php | 1 + .../smarty_internal_compile_include.php | 16 +++++++-- 5 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 3.1.16_RELEASE_NOTES.txt diff --git a/3.1.16_RELEASE_NOTES.txt b/3.1.16_RELEASE_NOTES.txt new file mode 100644 index 00000000..4a351fa5 --- /dev/null +++ b/3.1.16_RELEASE_NOTES.txt @@ -0,0 +1,35 @@ +In Smarty 3.1 template inheritance is a compile time process. All the extending of {block} tags +is done at compile time and the parent and child templates are compiled in a single compiled template. +{include} subtemplate could also {block} tags. Such subtemplate could not compiled by it's own because +it could be used in other context where the {block} extended with a different result. For that reasion +the compiled code of {include} subtemplates gets also merged in compiled inheritance template. + +Merging the code into a single compile template has some drawbacks. +1. You could not use variable file names in {include} Smarty would use the {include} of compilation time. +2. You could not use individual compile_id in {include} +3. Seperate caching of subtemplate was not possible +4. Any change of the template directory structure between calls was not necessarily seen. + +Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out +that a couple of users did use some of above and now got exceptions. + +To resolve this starting with 3.1.16 there is a new configuration parameter $inheritance_merge_compiled_includes. +For most backward compatibility its default setting is true. +With this setting all {include} subtemplate will be merge into the compiled inheritance template, but the above cases +could be rejected by exception. + + +If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged. +You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option. +{include file='foo.bar' inline} + +1. In case of a variable file name like {include file=$foo inline} you must you the variable in a compile_id $smarty->compile_id = $foo; +2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the + global compile_id as well $smarty->compile_id = $foo; +3. If call templates with different template_dir configurations and a parent could same named child template from different folders + you must make the folder name part of the compile_id. + + +In the upcomming major release Smarty 3.2 inheritance will no longer be a compile time process. +All restrictions will be then removed. + diff --git a/change_log.txt b/change_log.txt index a2c2aa6f..2657bbb1 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,8 @@ ===== trunk ===== + 15.12.2013 + - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161) + Read 3.1.16_RELEASE_NOTES for more details + 07.11.2013 - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599) - bugfix compiler could fail if PHP mbstring.func_overload is enabled (Issue 164) diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 897b385a..893ffb2e 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -299,6 +299,11 @@ class Smarty extends Smarty_Internal_TemplateBase * @var boolean */ public $merge_compiled_includes = false; + /** + * template inheritance merge compiled includes + * @var boolean + */ + public $inheritance_merge_compiled_includes = true; /** * cache lifetime in seconds * @var integer diff --git a/libs/sysplugins/smarty_internal_compile_block.php b/libs/sysplugins/smarty_internal_compile_block.php index 0699aa08..ba26ed0a 100644 --- a/libs/sysplugins/smarty_internal_compile_block.php +++ b/libs/sysplugins/smarty_internal_compile_block.php @@ -160,6 +160,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase if ($compiler->smarty->debugging) { Smarty_Internal_Debug::ignore($_tpl); } + $_tpl->tpl_vars = $compiler->template->tpl_vars; $_tpl->variable_filters = $compiler->template->variable_filters; $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; $_tpl->allow_relative_path = true; diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index 7a7f960c..1ea8b577 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -85,7 +85,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $_caching = Smarty::CACHING_OFF; // flag if included template code should be merged into caller - $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $compiler->inheritance || $_attr['inline'] === true) && !$compiler->template->source->recompiled; + $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes ||($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes)|| $_attr['inline'] === true) && !$compiler->template->source->recompiled; // set default when in nocache mode // if ($compiler->template->caching && ($compiler->nocache || $compiler->tag_nocache || $compiler->forceNocache == 2)) { @@ -129,12 +129,15 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } $has_compiled_template = false; - if ($merge_compiled_includes) { + if ($merge_compiled_includes && $_attr['inline'] !== true) { // variable template name ? if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2)) || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0 ) { $merge_compiled_includes = false; + if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) { + $compiler->trigger_template_error(' variable template file names not allow within {block} tags'); + } } // variable compile_id? if (isset($_attr['compile_id'])) { @@ -142,10 +145,18 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0 ) { $merge_compiled_includes = false; + if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) { + $compiler->trigger_template_error(' variable compile_id not allow within {block} tags'); + } } } + } + if ($merge_compiled_includes) { if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) { $merge_compiled_includes = false; + if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) { + $compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags'); + } } } if ($merge_compiled_includes) { @@ -153,6 +164,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $uid = sha1($_compile_id); $tpl_name = null; $nocache = false; + $_smarty_tpl = $compiler->template; eval("\$tpl_name = $include_file;"); if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid]) || $compiler->inheritance) { $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id); From a0a24e1975de9b00ea9c716947ca7f6020a6f4da Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Sun, 15 Dec 2013 15:25:50 +0000 Subject: [PATCH 15/15] - enhancement additional debug output at $smarty->_parserdebug = true; --- change_log.txt | 3 +- .../smarty_internal_configfilelexer.php | 122 +++++++--- .../smarty_internal_configfileparser.php | 220 ++++++++---------- ...smarty_internal_smartytemplatecompiler.php | 4 +- .../smarty_internal_templatelexer.php | 29 ++- .../smarty_internal_templateparser.php | 78 +++---- 6 files changed, 253 insertions(+), 203 deletions(-) diff --git a/change_log.txt b/change_log.txt index 2657bbb1..075077c5 100644 --- a/change_log.txt +++ b/change_log.txt @@ -2,7 +2,8 @@ 15.12.2013 - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161) Read 3.1.16_RELEASE_NOTES for more details - + - enhancement additional debug output at $smarty->_parserdebug = true; + 07.11.2013 - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599) - bugfix compiler could fail if PHP mbstring.func_overload is enabled (Issue 164) diff --git a/libs/sysplugins/smarty_internal_configfilelexer.php b/libs/sysplugins/smarty_internal_configfilelexer.php index 4bc2b9e8..1e84d579 100644 --- a/libs/sysplugins/smarty_internal_configfilelexer.php +++ b/libs/sysplugins/smarty_internal_configfilelexer.php @@ -2,10 +2,10 @@ /** * 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 +* @author Uwe Tews */ /** * Smarty Internal Plugin Configfilelexer @@ -20,17 +20,21 @@ class Smarty_Internal_Configfilelexer public $node; public $line; private $state = 1; + public $yyTraceFILE; + public $yyTracePrompt; + public $state_name = array (1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'); public $smarty_token_names = array ( // Text for parser error messages - ); - - public function __construct($data, $smarty) + ); + + + function __construct($data, $smarty) { // set instance object - self::instance($this); + self::instance($this); $this->data = $data . "\n"; //now all lines are \n-terminated $this->counter = 0; $this->line = 1; - $this->smarty = $smarty; + $this->smarty = $smarty; $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; } public static function &instance($new_instance = null) @@ -38,10 +42,16 @@ class Smarty_Internal_Configfilelexer static $instance = null; if (isset($new_instance) && is_object($new_instance)) $instance = $new_instance; - return $instance; + } + public function PrintTrace() + { + $this->yyTraceFILE = fopen('php://output', 'w'); + $this->yyTracePrompt = '
'; } + + private $_yy_state = 1; private $_yy_stack = array(); @@ -52,20 +62,39 @@ 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); + } 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); + } } public function yypopstate() { - $this->_yy_state = array_pop($this->_yy_stack); + 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); + 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) { - $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); + } } + + + public function yylex1() { $tokenMap = array ( @@ -129,50 +158,54 @@ class Smarty_Internal_Configfilelexer } // end function + const START = 1; - public function yy_r1_1($yy_subpatterns) + function yy_r1_1($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; $this->yypushstate(self::COMMENT); } - public function yy_r1_2($yy_subpatterns) + function yy_r1_2($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; $this->yypushstate(self::SECTION); } - public function yy_r1_3($yy_subpatterns) + function yy_r1_3($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; } - public function yy_r1_4($yy_subpatterns) + function yy_r1_4($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; $this->yypushstate(self::VALUE); } - public function yy_r1_5($yy_subpatterns) + function yy_r1_5($yy_subpatterns) { + return false; } - public function yy_r1_6($yy_subpatterns) + function yy_r1_6($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; } - public function yy_r1_7($yy_subpatterns) + function yy_r1_7($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_ID; } - public function yy_r1_8($yy_subpatterns) + function yy_r1_8($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; } + + public function yylex2() { $tokenMap = array ( @@ -237,61 +270,62 @@ class Smarty_Internal_Configfilelexer } // end function + const VALUE = 2; - public function yy_r2_1($yy_subpatterns) + function yy_r2_1($yy_subpatterns) { + return false; } - public function yy_r2_2($yy_subpatterns) + function yy_r2_2($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; $this->yypopstate(); } - public function yy_r2_3($yy_subpatterns) + function yy_r2_3($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_INT; $this->yypopstate(); } - public function yy_r2_4($yy_subpatterns) + function yy_r2_4($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; $this->yypushstate(self::TRIPPLE); } - public function yy_r2_5($yy_subpatterns) + function yy_r2_5($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; $this->yypopstate(); } - public function yy_r2_6($yy_subpatterns) + function yy_r2_6($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; $this->yypopstate(); } - public function yy_r2_7($yy_subpatterns) + 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(); } } - public function yy_r2_8($yy_subpatterns) + function yy_r2_8($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->yypopstate(); } - public function yy_r2_9($yy_subpatterns) + function yy_r2_9($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; @@ -299,6 +333,8 @@ class Smarty_Internal_Configfilelexer $this->yypopstate(); } + + public function yylex3() { $tokenMap = array ( @@ -355,14 +391,17 @@ class Smarty_Internal_Configfilelexer } // end function + const NAKED_STRING_VALUE = 3; - public function yy_r3_1($yy_subpatterns) + function yy_r3_1($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->yypopstate(); } + + public function yylex4() { $tokenMap = array ( @@ -421,23 +460,27 @@ class Smarty_Internal_Configfilelexer } // end function + const COMMENT = 4; - public function yy_r4_1($yy_subpatterns) + function yy_r4_1($yy_subpatterns) { + return false; } - public function yy_r4_2($yy_subpatterns) + function yy_r4_2($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; } - public function yy_r4_3($yy_subpatterns) + function yy_r4_3($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; $this->yypopstate(); } + + public function yylex5() { $tokenMap = array ( @@ -495,19 +538,21 @@ class Smarty_Internal_Configfilelexer } // end function + const SECTION = 5; - public function yy_r5_1($yy_subpatterns) + function yy_r5_1($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_DOT; } - public function yy_r5_2($yy_subpatterns) + function yy_r5_2($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; $this->yypopstate(); } + public function yylex6() { $tokenMap = array ( @@ -565,15 +610,16 @@ class Smarty_Internal_Configfilelexer } // end function + const TRIPPLE = 6; - public function yy_r6_1($yy_subpatterns) + function yy_r6_1($yy_subpatterns) { $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; $this->yypopstate(); $this->yypushstate(self::START); } - public function yy_r6_2($yy_subpatterns) + function yy_r6_2($yy_subpatterns) { if ($this->mbstring_overload) { @@ -586,7 +632,7 @@ class Smarty_Internal_Configfilelexer $to = $match[0][1]; } else { $this->compiler->trigger_template_error ("missing or misspelled literal closing tag"); - } + } if ($this->mbstring_overload) { $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1'); } else { @@ -595,4 +641,6 @@ class Smarty_Internal_Configfilelexer $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 99cd2e18..2bfd1302 100644 --- a/libs/sysplugins/smarty_internal_configfileparser.php +++ b/libs/sysplugins/smarty_internal_configfileparser.php @@ -83,8 +83,9 @@ class TPC_yyStackEntry ** is the value of the token */ }; + #line 12 "smarty_internal_configfileparser.y" -class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php" +class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser.php" { #line 14 "smarty_internal_configfileparser.y" @@ -94,12 +95,11 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser private $lex; private $internalError = false; - public function __construct($lex, $compiler) - { + function __construct($lex, $compiler) { // set instance object - self::instance($this); + self::instance($this); $this->lex = $lex; - $this->smarty = $compiler->smarty; + $this->smarty = $compiler->smarty; $this->compiler = $compiler; } public static function &instance($new_instance = null) @@ -107,25 +107,21 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser static $instance = null; if (isset($new_instance) && is_object($new_instance)) $instance = $new_instance; - return $instance; } - private function parse_bool($str) - { + private function parse_bool($str) { if (in_array(strtolower($str) ,array('on','yes','true'))) { $res = true; } else { $res = false; } - return $res; } private static $escapes_single = Array('\\' => '\\', '\'' => '\''); - private static function parse_single_quoted_string($qstr) - { + private static function parse_single_quoted_string($qstr) { $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE); @@ -144,20 +140,16 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser return $str; } - private static function parse_double_quoted_string($qstr) - { + private static function parse_double_quoted_string($qstr) { $inner_str = substr($qstr, 1, strlen($qstr)-2); - return stripcslashes($inner_str); } - private static function parse_tripple_double_quoted_string($qstr) - { + private static function parse_tripple_double_quoted_string($qstr) { return stripcslashes($qstr); } - private function set_var(Array $var, Array &$target_array) - { + private function set_var(Array $var, Array &$target_array) { $key = $var["key"]; $value = $var["value"]; @@ -169,8 +161,7 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser } } - private function add_global_vars(Array $vars) - { + private function add_global_vars(Array $vars) { if (!isset($this->compiler->config_data['vars'])) { $this->compiler->config_data['vars'] = Array(); } @@ -179,8 +170,7 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser } } - private function add_section_vars($section_name, Array $vars) - { + private function add_section_vars($section_name, Array $vars) { if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) { $this->compiler->config_data['sections'][$section_name]['vars'] = Array(); } @@ -188,7 +178,7 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser $this->set_var($var, $this->compiler->config_data['sections'][$section_name]); } } -#line 173 "smarty_internal_configfileparser.php" +#line 174 "smarty_internal_configfileparser.php" const TPC_OPENB = 1; const TPC_SECTION = 2; @@ -219,7 +209,7 @@ static public $yy_action = array( /* 20 */ 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, /* 30 */ 2, 11, 28, 22, 16, 9, 7, 10, ); - public static $yy_lookahead = array( + static public $yy_lookahead = array( /* 0 */ 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, /* 10 */ 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, /* 20 */ 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, @@ -227,17 +217,17 @@ static public $yy_action = array( ); const YY_SHIFT_USE_DFLT = -8; const YY_SHIFT_MAX = 19; - public static $yy_shift_ofst = array( + static public $yy_shift_ofst = array( /* 0 */ -8, 1, 1, 1, -7, -3, -3, 30, -8, -8, /* 10 */ -8, 19, 5, 3, 15, 16, 24, 25, 32, 20, ); const YY_REDUCE_USE_DFLT = -21; const YY_REDUCE_MAX = 10; - public static $yy_reduce_ofst = array( + static public $yy_reduce_ofst = array( /* 0 */ -10, -1, -1, -1, -20, 10, 12, 8, 14, 7, /* 10 */ -11, ); - public static $yyExpectedTokens = array( + static public $yyExpectedTokens = array( /* 0 */ array(), /* 1 */ array(5, 17, 18, ), /* 2 */ array(5, 17, 18, ), @@ -275,7 +265,7 @@ static public $yy_action = array( /* 34 */ array(), /* 35 */ array(), ); - public static $yy_default = array( + static public $yy_default = array( /* 0 */ 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, /* 10 */ 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, /* 20 */ 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, @@ -290,37 +280,37 @@ static public $yy_action = array( const YYFALLBACK = 0; public static $yyFallback = array( ); - public static function Trace($TraceFILE, $zTracePrompt) + public function Trace($TraceFILE, $zTracePrompt) { if (!$TraceFILE) { $zTracePrompt = 0; } elseif (!$zTracePrompt) { $TraceFILE = 0; } - self::$yyTraceFILE = $TraceFILE; - self::$yyTracePrompt = $zTracePrompt; + $this->yyTraceFILE = $TraceFILE; + $this->yyTracePrompt = $zTracePrompt; } - public static function PrintTrace() + public function PrintTrace() { - self::$yyTraceFILE = fopen('php://output', 'w'); - self::$yyTracePrompt = '
'; + $this->yyTraceFILE = fopen('php://output', 'w'); + $this->yyTracePrompt = '
'; } - public static $yyTraceFILE; - public static $yyTracePrompt; + public $yyTraceFILE; + public $yyTracePrompt; public $yyidx; /* Index of top element in stack */ public $yyerrcnt; /* Shifts left before out of the error */ public $yystack = array(); /* The parser's stack */ public $yyTokenName = array( - '$', 'OPENB', 'SECTION', 'CLOSEB', - 'DOT', 'ID', 'EQUAL', 'FLOAT', + '$', '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', + 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', + 'start', 'global_vars', 'sections', 'var_list', + 'section', 'newline', 'var', 'value', ); public static $yyRuleName = array( @@ -373,9 +363,9 @@ static public $yy_action = array( return; } $yytos = array_pop($this->yystack); - if (self::$yyTraceFILE && $this->yyidx >= 0) { - fwrite(self::$yyTraceFILE, - self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . + if ($this->yyTraceFILE && $this->yyidx >= 0) { + fwrite($this->yyTraceFILE, + $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n"); } $yymajor = $yytos->major; @@ -390,8 +380,8 @@ static public $yy_action = array( while ($this->yystack !== Array()) { $this->yy_pop_parser_stack(); } - if (is_resource(self::$yyTraceFILE)) { - fclose(self::$yyTraceFILE); + if (is_resource($this->yyTraceFILE)) { + fclose($this->yyTraceFILE); } } @@ -559,8 +549,8 @@ static public $yy_action = array( self::$yy_lookahead[$i] != $iLookAhead) { if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { - if (self::$yyTraceFILE) { - fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " . + if ($this->yyTraceFILE) { + fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n"); } @@ -602,8 +592,8 @@ static public $yy_action = array( $this->yyidx++; if ($this->yyidx >= self::YYSTACKDEPTH) { $this->yyidx--; - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); @@ -612,7 +602,7 @@ static public $yy_action = array( $this->internalError = true; $this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); -#line 593 "smarty_internal_configfileparser.php" +#line 601 "smarty_internal_configfileparser.php" return; } @@ -621,15 +611,15 @@ static public $yy_action = array( $yytos->major = $yyMajor; $yytos->minor = $yypMinor; array_push($this->yystack, $yytos); - if (self::$yyTraceFILE && $this->yyidx > 0) { - fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt, + if ($this->yyTraceFILE && $this->yyidx > 0) { + fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState); - fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt); + fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); for ($i = 1; $i <= $this->yyidx; $i++) { - fprintf(self::$yyTraceFILE, " %s", + fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]); } - fwrite(self::$yyTraceFILE,"\n"); + fwrite($this->yyTraceFILE,"\n"); } } @@ -683,115 +673,99 @@ static public $yy_action = array( 18 => 17, ); #line 131 "smarty_internal_configfileparser.y" - public function yy_r0() - { + function yy_r0(){ $this->_retvalue = null; } -#line 666 "smarty_internal_configfileparser.php" +#line 675 "smarty_internal_configfileparser.php" #line 136 "smarty_internal_configfileparser.y" - public function yy_r1() - { + function yy_r1(){ $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null; } -#line 671 "smarty_internal_configfileparser.php" +#line 680 "smarty_internal_configfileparser.php" #line 149 "smarty_internal_configfileparser.y" - public 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 677 "smarty_internal_configfileparser.php" +#line 686 "smarty_internal_configfileparser.php" #line 154 "smarty_internal_configfileparser.y" - public function yy_r5() - { + function yy_r5(){ if ($this->smarty->config_read_hidden) { $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); } $this->_retvalue = null; } -#line 685 "smarty_internal_configfileparser.php" +#line 694 "smarty_internal_configfileparser.php" #line 162 "smarty_internal_configfileparser.y" - public function yy_r6() - { + function yy_r6(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } -#line 690 "smarty_internal_configfileparser.php" +#line 699 "smarty_internal_configfileparser.php" #line 166 "smarty_internal_configfileparser.y" - public function yy_r7() - { + function yy_r7(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); } -#line 695 "smarty_internal_configfileparser.php" +#line 704 "smarty_internal_configfileparser.php" #line 170 "smarty_internal_configfileparser.y" - public function yy_r8() - { + function yy_r8(){ $this->_retvalue = Array(); } -#line 700 "smarty_internal_configfileparser.php" +#line 709 "smarty_internal_configfileparser.php" #line 176 "smarty_internal_configfileparser.y" - public function yy_r9() - { + function yy_r9(){ $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); } -#line 705 "smarty_internal_configfileparser.php" +#line 714 "smarty_internal_configfileparser.php" #line 181 "smarty_internal_configfileparser.y" - public function yy_r10() - { + function yy_r10(){ $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; } -#line 710 "smarty_internal_configfileparser.php" +#line 719 "smarty_internal_configfileparser.php" #line 185 "smarty_internal_configfileparser.y" - public function yy_r11() - { + function yy_r11(){ $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; } -#line 715 "smarty_internal_configfileparser.php" +#line 724 "smarty_internal_configfileparser.php" #line 189 "smarty_internal_configfileparser.y" - public function yy_r12() - { + function yy_r12(){ $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); } -#line 720 "smarty_internal_configfileparser.php" +#line 729 "smarty_internal_configfileparser.php" #line 193 "smarty_internal_configfileparser.y" - public function yy_r13() - { + function yy_r13(){ $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); } -#line 725 "smarty_internal_configfileparser.php" +#line 734 "smarty_internal_configfileparser.php" #line 197 "smarty_internal_configfileparser.y" - public function yy_r14() - { + function yy_r14(){ $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); } -#line 730 "smarty_internal_configfileparser.php" +#line 739 "smarty_internal_configfileparser.php" #line 201 "smarty_internal_configfileparser.y" - public function yy_r15() - { + function yy_r15(){ $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor); } -#line 735 "smarty_internal_configfileparser.php" +#line 744 "smarty_internal_configfileparser.php" #line 205 "smarty_internal_configfileparser.y" - public function yy_r16() - { + function yy_r16(){ $this->_retvalue = ''; } -#line 740 "smarty_internal_configfileparser.php" +#line 749 "smarty_internal_configfileparser.php" #line 209 "smarty_internal_configfileparser.y" - public function yy_r17() - { + function yy_r17(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } -#line 745 "smarty_internal_configfileparser.php" +#line 754 "smarty_internal_configfileparser.php" private $_retvalue; public function yy_reduce($yyruleno) { $yymsp = $this->yystack[$this->yyidx]; - if (self::$yyTraceFILE && $yyruleno >= 0 + if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) { - fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n", - self::$yyTracePrompt, $yyruleno, + fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", + $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]); } @@ -811,7 +785,7 @@ static public $yy_action = array( } $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); if ($yyact < self::YYNSTATE) { - if (!self::$yyTraceFILE && $yysize) { + if (!$this->yyTraceFILE && $yysize) { $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $yyact; @@ -828,8 +802,8 @@ static public $yy_action = array( public function yy_parse_failed() { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } @@ -842,13 +816,13 @@ static public $yy_action = array( $this->internalError = true; $this->yymajor = $yymajor; $this->compiler->trigger_config_file_error(); -#line 808 "smarty_internal_configfileparser.php" +#line 816 "smarty_internal_configfileparser.php" } public function yy_accept() { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $stack = $this->yy_pop_parser_stack(); } @@ -858,7 +832,7 @@ static public $yy_action = array( $this->internalError = false; $this->retvalue = $this->_retvalue; //echo $this->retvalue."\n\n"; -#line 826 "smarty_internal_configfileparser.php" +#line 833 "smarty_internal_configfileparser.php" } public function doParse($yymajor, $yytokenvalue) @@ -876,9 +850,9 @@ static public $yy_action = array( } $yyendofinput = ($yymajor==0); - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sInput %s\n", - self::$yyTracePrompt, $this->yyTokenName[$yymajor]); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sInput %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); } do { @@ -899,9 +873,9 @@ static public $yy_action = array( } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { $this->yy_reduce($yyact - self::YYNSTATE); } elseif ($yyact == self::YY_ERROR_ACTION) { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sSyntax Error!\n", - self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sSyntax Error!\n", + $this->yyTracePrompt); } if (self::YYERRORSYMBOL) { if ($this->yyerrcnt < 0) { @@ -909,9 +883,9 @@ static public $yy_action = array( } $yymx = $this->yystack[$this->yyidx]->major; if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n", - self::$yyTracePrompt, $this->yyTokenName[$yymajor]); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); } $this->yy_destructor($yymajor, $yytokenvalue); $yymajor = self::YYNOCODE; diff --git a/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/libs/sysplugins/smarty_internal_smartytemplatecompiler.php index 8e0d22f1..9453ef4c 100644 --- a/libs/sysplugins/smarty_internal_smartytemplatecompiler.php +++ b/libs/sysplugins/smarty_internal_smartytemplatecompiler.php @@ -98,8 +98,10 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom // start state on child templates $this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY); } - if ($this->smarty->_parserdebug) + if ($this->smarty->_parserdebug) { $this->parser->PrintTrace(); + $this->lex->PrintTrace(); + } // get tokens from lexer and parse them while ($this->lex->yylex() && !$this->abort_and_recompile) { if ($this->smarty->_parserdebug) { diff --git a/libs/sysplugins/smarty_internal_templatelexer.php b/libs/sysplugins/smarty_internal_templatelexer.php index f15f50b1..aeb1bd4d 100644 --- a/libs/sysplugins/smarty_internal_templatelexer.php +++ b/libs/sysplugins/smarty_internal_templatelexer.php @@ -21,6 +21,9 @@ class Smarty_Internal_Templatelexer public $taglineno; public $state = 1; private $heredoc_id_stack = Array(); + public $yyTraceFILE; + public $yyTracePrompt; + public $state_name = array (1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY'); public $smarty_token_names = array ( // Text for parser error messages 'IDENTITY' => '===', 'NONEIDENTITY' => '!==', @@ -91,6 +94,12 @@ class Smarty_Internal_Templatelexer $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; } + public function PrintTrace() + { + $this->yyTraceFILE = fopen('php://output', 'w'); + $this->yyTracePrompt = '
'; + } + private $_yy_state = 1; private $_yy_stack = array(); @@ -102,18 +111,34 @@ class Smarty_Internal_Templatelexer 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); + } 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); + } } public function yypopstate() { - $this->_yy_state = array_pop($this->_yy_stack); + 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); + 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) { - $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); + } } diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php index 06ec28e4..00d2f247 100644 --- a/libs/sysplugins/smarty_internal_templateparser.php +++ b/libs/sysplugins/smarty_internal_templateparser.php @@ -1179,25 +1179,25 @@ static public $yy_action = array( const YYFALLBACK = 0; public static $yyFallback = array( ); - public static function Trace($TraceFILE, $zTracePrompt) + public function Trace($TraceFILE, $zTracePrompt) { if (!$TraceFILE) { $zTracePrompt = 0; } elseif (!$zTracePrompt) { $TraceFILE = 0; } - self::$yyTraceFILE = $TraceFILE; - self::$yyTracePrompt = $zTracePrompt; + $this->yyTraceFILE = $TraceFILE; + $this->yyTracePrompt = $zTracePrompt; } - public static function PrintTrace() + public function PrintTrace() { - self::$yyTraceFILE = fopen('php://output', 'w'); - self::$yyTracePrompt = '
'; + $this->yyTraceFILE = fopen('php://output', 'w'); + $this->yyTracePrompt = '
'; } - public static $yyTraceFILE; - public static $yyTracePrompt; + public $yyTraceFILE; + public $yyTracePrompt; public $yyidx; /* Index of top element in stack */ public $yyerrcnt; /* Shifts left before out of the error */ public $yystack = array(); /* The parser's stack */ @@ -1469,9 +1469,9 @@ static public $yy_action = array( return; } $yytos = array_pop($this->yystack); - if (self::$yyTraceFILE && $this->yyidx >= 0) { - fwrite(self::$yyTraceFILE, - self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . + if ($this->yyTraceFILE && $this->yyidx >= 0) { + fwrite($this->yyTraceFILE, + $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n"); } $yymajor = $yytos->major; @@ -1486,8 +1486,8 @@ static public $yy_action = array( while ($this->yystack !== Array()) { $this->yy_pop_parser_stack(); } - if (is_resource(self::$yyTraceFILE)) { - fclose(self::$yyTraceFILE); + if (is_resource($this->yyTraceFILE)) { + fclose($this->yyTraceFILE); } } @@ -1655,8 +1655,8 @@ static public $yy_action = array( self::$yy_lookahead[$i] != $iLookAhead) { if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { - if (self::$yyTraceFILE) { - fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " . + if ($this->yyTraceFILE) { + fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n"); } @@ -1698,8 +1698,8 @@ static public $yy_action = array( $this->yyidx++; if ($this->yyidx >= self::YYSTACKDEPTH) { $this->yyidx--; - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); @@ -1717,15 +1717,15 @@ static public $yy_action = array( $yytos->major = $yyMajor; $yytos->minor = $yypMinor; array_push($this->yystack, $yytos); - if (self::$yyTraceFILE && $this->yyidx > 0) { - fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt, + if ($this->yyTraceFILE && $this->yyidx > 0) { + fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState); - fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt); + fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); for ($i = 1; $i <= $this->yyidx; $i++) { - fprintf(self::$yyTraceFILE, " %s", + fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]); } - fwrite(self::$yyTraceFILE,"\n"); + fwrite($this->yyTraceFILE,"\n"); } } @@ -3079,10 +3079,10 @@ static public $yy_action = array( public function yy_reduce($yyruleno) { $yymsp = $this->yystack[$this->yyidx]; - if (self::$yyTraceFILE && $yyruleno >= 0 + if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) { - fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n", - self::$yyTracePrompt, $yyruleno, + fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", + $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]); } @@ -3102,7 +3102,7 @@ static public $yy_action = array( } $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); if ($yyact < self::YYNSTATE) { - if (!self::$yyTraceFILE && $yysize) { + if (!$this->yyTraceFILE && $yysize) { $this->yyidx++; $x = new TP_yyStackEntry; $x->stateno = $yyact; @@ -3119,8 +3119,8 @@ static public $yy_action = array( public function yy_parse_failed() { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } @@ -3138,8 +3138,8 @@ static public $yy_action = array( public function yy_accept() { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); } while ($this->yyidx >= 0) { $stack = $this->yy_pop_parser_stack(); } @@ -3167,9 +3167,9 @@ static public $yy_action = array( } $yyendofinput = ($yymajor==0); - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sInput %s\n", - self::$yyTracePrompt, $this->yyTokenName[$yymajor]); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sInput %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); } do { @@ -3190,9 +3190,9 @@ static public $yy_action = array( } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { $this->yy_reduce($yyact - self::YYNSTATE); } elseif ($yyact == self::YY_ERROR_ACTION) { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sSyntax Error!\n", - self::$yyTracePrompt); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sSyntax Error!\n", + $this->yyTracePrompt); } if (self::YYERRORSYMBOL) { if ($this->yyerrcnt < 0) { @@ -3200,9 +3200,9 @@ static public $yy_action = array( } $yymx = $this->yystack[$this->yyidx]->major; if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) { - if (self::$yyTraceFILE) { - fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n", - self::$yyTracePrompt, $this->yyTokenName[$yymajor]); + if ($this->yyTraceFILE) { + fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", + $this->yyTracePrompt, $this->yyTokenName[$yymajor]); } $this->yy_destructor($yymajor, $yytokenvalue); $yymajor = self::YYNOCODE;