svn commit: samba r8397 - in branches/SAMBA_4_0/source/lib/ejs: .

[tridge at samba.org]

Author: tridge
Date: 2005-07-12 23:49:08 +0000 (Tue, 12 Jul 2005)
New Revision: 8397

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8397

Log:
merged an upstream fix for the expression bug tpot found yesterday

Modified:
   branches/SAMBA_4_0/source/lib/ejs/ejsLex.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ejs/ejsLex.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ejs/ejsLex.c	2005-07-12 23:02:31 UTC (rev 8396)
+++ branches/SAMBA_4_0/source/lib/ejs/ejsLex.c	2005-07-12 23:49:08 UTC (rev 8397)
@@ -663,11 +663,11 @@
 					break;
 				}
 #if BLD_FEATURE_FLOATING_POINT
-				if (c == '.' || tolower(c) == 'e' || c == '+' || c == '-') {
+				if (c == '.' || tolower(c) == 'e' || tolower(c) == 'f') {
 					type = MPR_TYPE_FLOAT;
 				}
-			} while (isdigit(c) || c == '.' || tolower(c) == 'e' ||
-				c == '+' || c == '-');
+			} while (isdigit(c) || c == '.' || tolower(c) == 'e' || tolower(c) == 'f' ||
+				((type == MPR_TYPE_FLOAT) && (c == '+' || c == '-')));
 #else
 			} while (isdigit(c));
 #endif