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

dropped support for modifiers on object parameters,

Browse Source 
added support for objects as modifier parameters
This commit is contained in:
mohrt
2003-02-12 22:34:05 +00:00
parent 77fa84916e
commit bd9aabdc64
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -1,3 +1,6 @@
- dropped support for modifers on object parameters,
added support for objects as modifier parameters
Version 2.4.2 (Feb 11, 2003) Version 2.4.2 (Feb 11, 2003)
---------------------------- ----------------------------
- support embedded variables in objects (Monte) - support embedded variables in objects (Monte)

30
Smarty_Compiler.class.php
View File

@@ -121,17 +121,6 @@ class Smarty_Compiler extends Smarty {
$this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|' $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
. $this->_cvar_regexp . '|' . $this->_svar_regexp . ')'; . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
// matches valid modifier syntax:
// |foo
// |@foo
// |foo:"bar"
// |foo:$bar
// |foo:"bar":$foobar
// |foo|bar
// |foo
$this->_mod_regexp = '(?:\|@?\w+(?::(?>\w+|'
. $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
// matches valid variable syntax: // matches valid variable syntax:
// $foo // $foo
// $foo // $foo
@@ -146,16 +135,27 @@ class Smarty_Compiler extends Smarty {
// $foo->bar() // $foo->bar()
// $foo->bar("text") // $foo->bar("text")
// $foo->bar($foo, $bar, "text") // $foo->bar($foo, $bar, "text")
// $foo->bar($foo|bar, "foo"|bar) // $foo->bar($foo, "foo")
// $foo->bar->foo() // $foo->bar->foo()
// $foo->bar->foo->bar() // $foo->bar->foo->bar()
$this->_obj_ext_regexp = '\->(?:\w+|' . $this->_dvar_regexp . ')'; $this->_obj_ext_regexp = '\->(?:\w+|' . $this->_dvar_regexp . ')';
$this->_obj_params_regexp = '\((?:\w+|' $this->_obj_params_regexp = '\((?:\w+|'
. $this->_var_regexp . '(?>' . $this->_mod_regexp . '*)(?:\s*,\s*(?:(?:\w+|' . $this->_var_regexp . '(?:\s*,\s*(?:(?:\w+|'
. $this->_var_regexp . '(?>' . $this->_mod_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 . ')?)';
// matches valid modifier syntax:
// |foo
// |@foo
// |foo:"bar"
// |foo:$bar
// |foo:"bar":$foobar
// |foo|bar
// |foo:$foo->bar
$this->_mod_regexp = '(?:\|@?\w+(?::(?>\w+|'
. $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
// matches valid function name: // matches valid function name:
// foo123 // foo123
// _foo_bar // _foo_bar

30
libs/Smarty_Compiler.class.php
View File

@@ -121,17 +121,6 @@ class Smarty_Compiler extends Smarty {
$this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|' $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
. $this->_cvar_regexp . '|' . $this->_svar_regexp . ')'; . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
// matches valid modifier syntax:
// |foo
// |@foo
// |foo:"bar"
// |foo:$bar
// |foo:"bar":$foobar
// |foo|bar
// |foo
$this->_mod_regexp = '(?:\|@?\w+(?::(?>\w+|'
. $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
// matches valid variable syntax: // matches valid variable syntax:
// $foo // $foo
// $foo // $foo
@@ -146,16 +135,27 @@ class Smarty_Compiler extends Smarty {
// $foo->bar() // $foo->bar()
// $foo->bar("text") // $foo->bar("text")
// $foo->bar($foo, $bar, "text") // $foo->bar($foo, $bar, "text")
// $foo->bar($foo|bar, "foo"|bar) // $foo->bar($foo, "foo")
// $foo->bar->foo() // $foo->bar->foo()
// $foo->bar->foo->bar() // $foo->bar->foo->bar()
$this->_obj_ext_regexp = '\->(?:\w+|' . $this->_dvar_regexp . ')'; $this->_obj_ext_regexp = '\->(?:\w+|' . $this->_dvar_regexp . ')';
$this->_obj_params_regexp = '\((?:\w+|' $this->_obj_params_regexp = '\((?:\w+|'
. $this->_var_regexp . '(?>' . $this->_mod_regexp . '*)(?:\s*,\s*(?:(?:\w+|' . $this->_var_regexp . '(?:\s*,\s*(?:(?:\w+|'
. $this->_var_regexp . '(?>' . $this->_mod_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 . ')?)';
// matches valid modifier syntax:
// |foo
// |@foo
// |foo:"bar"
// |foo:$bar
// |foo:"bar":$foobar
// |foo|bar
// |foo:$foo->bar
$this->_mod_regexp = '(?:\|@?\w+(?::(?>\w+|'
. $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
// matches valid function name: // matches valid function name:
// foo123 // foo123
// _foo_bar // _foo_bar