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

moved $this->_num_const_regexp out of $this->_var_regexp and added it

Browse Source 
to the places that affect $this->_var_regexp

this should fix some problems parsing plugin-names endings with digits
This commit is contained in:
messju
2004-09-15 18:58:55 +00:00
parent 867c47e9ec
commit 0580734ff9
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -1,3 +1,5 @@
- fixed more parsing problems (messju)
Version 2.6.5 (Sept 13, 2004) Version 2.6.5 (Sept 13, 2004)
----------------------------- -----------------------------

14
libs/Smarty_Compiler.class.php
View File

@@ -101,7 +101,7 @@ class Smarty_Compiler extends Smarty {
// 30 // 30
// -12 // -12
// 13.22 // 13.22
$this->_num_const_regexp = '\-?\d+(?:\.\d+)?'; $this->_num_const_regexp = '(?:\-?\d+(?:\.\d+)?)';
// matches $ vars (not objects): // matches $ vars (not objects):
// $foo // $foo
@@ -137,7 +137,7 @@ class Smarty_Compiler extends Smarty {
// #foo# // #foo#
// "text" // "text"
// "text" // "text"
$this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_num_const_regexp . '|' . $this->_qstr_regexp . ')'; $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')';
// matches valid object call (one level of object nesting allowed in parameters): // matches valid object call (one level of object nesting allowed in parameters):
// $foo->bar // $foo->bar
@@ -152,8 +152,8 @@ class Smarty_Compiler extends Smarty {
// $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar)) // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
$this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')'; $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
$this->_obj_restricted_param_regexp = '(?:' $this->_obj_restricted_param_regexp = '(?:'
. $this->_var_regexp . '(?:' . $this->_obj_ext_regexp . '(?:\((?:' . $this->_var_regexp . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
. '(?:\s*,\s*' . $this->_var_regexp . ')*)?\))?)*)'; . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
$this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|' $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
. $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)'; . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
$this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
@@ -169,7 +169,7 @@ class Smarty_Compiler extends Smarty {
// |foo:"bar":$foobar // |foo:"bar":$foobar
// |foo|bar // |foo|bar
// |foo:$foo->bar // |foo:$foo->bar
$this->_mod_regexp = '(?:\|@?\w+(?::(?>-?\w+|' $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
. $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)'; . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
// matches valid function name: // matches valid function name:
@@ -191,7 +191,7 @@ class Smarty_Compiler extends Smarty {
// "text"|bar // "text"|bar
// $foo->bar // $foo->bar
$this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|' $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
. $this->_var_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)'; . $this->_var_regexp . '|' . $this->_num_const_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
// matches valid parenthesised function parameters: // matches valid parenthesised function parameters:
// //
@@ -1528,7 +1528,7 @@ class Smarty_Compiler extends Smarty {
$token = 'false'; $token = 'false';
} else if ($token == 'null') { } else if ($token == 'null') {
$token = 'null'; $token = 'null';
} else if (preg_match('~^-?([0-9]+|0[xX][0-9a-fA-F]+)$~', $token)) { } else if (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
/* treat integer literally */ /* treat integer literally */
} else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) { } else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
/* treat as a string, double-quote it escaping quotes */ /* treat as a string, double-quote it escaping quotes */