From 77fa84916e042fe48b79b82be1bb159238988454 Mon Sep 17 00:00:00 2001
From: mohrt <mohrt@localhost>
Date: Wed, 12 Feb 2003 22:13:18 +0000
Subject: [PATCH] fix bug with decimal numbers in if statements, misc doc
 updates

---
 NEWS                           |  2 +-
 Smarty_Compiler.class.php      |  2 +-
 docs/designers.sgml            | 30 ++++++++++++++++++------------
 libs/Smarty_Compiler.class.php |  2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/NEWS b/NEWS
index 3729edae..635cf539 100644
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,7 @@ Version 2.4.0 (Feb 2, 2003)
 ---------------------------
 
     - fix known problems with php tag handling in templates
-      (recursion, echoing <?xml tags) (Monte)
+      (recursion, echoing xml tags) (Monte)
     - add support for object registration (Monte)
     - add debug template to secure_dir, add template_dir
       to secure_dir by default (Ferdinand Beyer, Monte)
diff --git a/Smarty_Compiler.class.php b/Smarty_Compiler.class.php
index 4d65a240..d3e2c518 100644
--- a/Smarty_Compiler.class.php
+++ b/Smarty_Compiler.class.php
@@ -1097,7 +1097,7 @@ class Smarty_Compiler extends Smarty {
         preg_match_all('/(?>
 				' . $this->_obj_call_regexp . '(?:' . $this->_mod_regexp . '*) | # valid object call
 				' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)	| # var or quoted string
-				\-?\d+|!==|<=>|==|!=|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|<|>|\||\%|\+|\-|\/|\*	| # valid non-word token
+				\-?\d+(?:\.\d+)?|!==|<=>|==|!=|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|<|>|\||\%|\+|\-|\/|\*	| # valid non-word token
 				\b\w+\b														| # valid word token
 				\S+                                                           # anything else
 				)/x', $tag_args, $match);
diff --git a/docs/designers.sgml b/docs/designers.sgml
index 6a307039..0148e2f6 100644
--- a/docs/designers.sgml
+++ b/docs/designers.sgml
@@ -1462,10 +1462,9 @@ s.</programlisting>
        <chapter id="language.combining.modifiers">
         <title>Combining Modifiers</title>
         <para>
-         You can apply as many modifiers as you like to a variable. The modifiers
-         will be applied to the variable in the order they are combined, from left
-         to right. The modifier have to be separated with a <literal>|</literal>
-         (pipe) symbol.
+		 You can apply any number of modifiers to a variable. They will be
+		 applied in the order they are combined, from left to right. They must
+		 be separated with a <literal>|</literal> (pipe) character.
         </para>
         <example>
          <title>combining modifiers</title>
@@ -3107,17 +3106,24 @@ OUTPUT:
 <example>
 <title>cycle</title>
 <programlisting>
-{* initialize the values *}
-{cycle values="#eeeeee,#d0d0d0"}
-{cycle}
-{cycle}
-
+{section name=rows loop=$data}
+&lt;tr bgcolor="{cycle values="#eeeeee,#d0d0d0"}"&gt;
+   &lt;td&gt;{$data[rows]}&lt;/td&gt;
+&lt;/tr&gt;
+{/section}
 
 OUTPUT:
 
-#eeeeee
-#d0d0d0
-#eeeeee</programlisting>
+&lt;tr bgcolor="#eeeeee"&gt;
+   &lt;td&gt;1&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr bgcolor="#d0d0d0"&gt;
+   &lt;td&gt;2&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr bgcolor="#eeeeee"&gt;
+   &lt;td&gt;3&lt;/td&gt;
+&lt;/tr&gt;
+</programlisting>
 </example>
 		</sect1>
 		<sect1 id="language.function.debug">
diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php
index 4d65a240..d3e2c518 100644
--- a/libs/Smarty_Compiler.class.php
+++ b/libs/Smarty_Compiler.class.php
@@ -1097,7 +1097,7 @@ class Smarty_Compiler extends Smarty {
         preg_match_all('/(?>
 				' . $this->_obj_call_regexp . '(?:' . $this->_mod_regexp . '*) | # valid object call
 				' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)	| # var or quoted string
-				\-?\d+|!==|<=>|==|!=|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|<|>|\||\%|\+|\-|\/|\*	| # valid non-word token
+				\-?\d+(?:\.\d+)?|!==|<=>|==|!=|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|<|>|\||\%|\+|\-|\/|\*	| # valid non-word token
 				\b\w+\b														| # valid word token
 				\S+                                                           # anything else
 				)/x', $tag_args, $match);