cvs: smarty /libs Smarty_Compiler.class.php

messju		Fri Apr 16 04:50:30 2004 EDT

  Modified files:              
    /smarty/libs	Smarty_Compiler.class.php 
  Log:
  added explanation for $this->_num_const_regexp
  
  
http://cvs.php.net/diff.php/smarty/libs/Smarty_Compiler.class.php?r1=1.318&r2=1.319&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.318 smarty/libs/Smarty_Compiler.class.php:1.319
--- smarty/libs/Smarty_Compiler.class.php:1.318	Fri Apr 16 04:34:39 2004
+++ smarty/libs/Smarty_Compiler.class.php	Fri Apr 16 04:50:27 2004
@@ -26,7 +26,7 @@
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.318 2004/04/16 08:34:39 messju Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.319 2004/04/16 08:50:27 messju Exp $ */
 
 /**
  * Template compiling class
@@ -97,6 +97,12 @@
         // [$bar]
         $this->_var_bracket_regexp = '\[\$?[\w\.]+\]';
 
+        // matches numerical constants
+        // 30
+        // -12
+        // 13.22
+        $this->_num_const_regexp = '\-?\d+(?:\.\d+)?';
+
         // matches $ vars (not objects):
         // $foo
         // $foo.bar
@@ -105,12 +111,10 @@
         // $foo[$bar]
         // $foo[5][blah]
         // $foo[5].bar[$foobar][4]
-        $this->_num_const_regexp = '\-?\d+(?:\.\d+)?';
-
         $this->_dvar_math_regexp = '[\+\-\*\/\%]';
         $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
         $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
-                . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:\-?\d+(?:\.\d+)?|' . $this->_dvar_math_var_regexp . ')*)?';
+                . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
         $this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp;
 
         // matches config vars:

-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php