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

fix object parameter regex, allow one level of object indirection

Browse Source
This commit is contained in:
mohrt
2004-09-09 16:09:55 +00:00
parent 8cbe83510b
commit 9ea847409c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/Smarty_Compiler.class.php
View File

@@ -137,7 +137,7 @@ class Smarty_Compiler extends Smarty {
// #foo# // #foo#
// "text" // "text"
// "text" // "text"
$this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')'; $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_num_const_regexp . '|' . $this->_qstr_regexp . ')';
// matches valid object call (no objects allowed in parameters): // matches valid object call (no objects allowed in parameters):
// $foo->bar // $foo->bar
@@ -148,8 +148,11 @@ class Smarty_Compiler extends Smarty {
// $foo->bar->foo() // $foo->bar->foo()
// $foo->bar->foo->bar() // $foo->bar->foo->bar()
$this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')'; $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
$this->_obj_params_regexp = '\((?:(?:' . $this->_num_const_regexp . ')|\w+|' $this->_obj_params_regexp = '\((?:\w+|(?:'
. $this->_var_regexp . '(?:\s*,\s*(?:(?:\w+|' . $this->_var_regexp . '(?:' . $this->_obj_ext_regexp
. '(?:\((?:' . $this->_var_regexp
. '(?:\s*,\s*' . $this->_var_regexp
. ')*)?\))?)*)(?:\s*,\s*(?:(?:\w+|'
. $this->_var_regexp . ')))*)?\)'; . $this->_var_regexp . ')))*)?\)';
$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)'; $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
$this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?)'; $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?)';