diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-12 23:49:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:14 -0500 |
| commit | e5700ea5607c366ff8c4fbf272749efae886bbab (patch) | |
| tree | 1c76d5cbb67b1d0ce73ef707577362fba4276b43 | |
| parent | 61edb97bdfabf1ab313fbec5f47f5e6c8a79da1a (diff) | |
| download | samba-e5700ea5607c366ff8c4fbf272749efae886bbab.tar.gz samba-e5700ea5607c366ff8c4fbf272749efae886bbab.tar.bz2 samba-e5700ea5607c366ff8c4fbf272749efae886bbab.zip | |
r8397: merged an upstream fix for the expression bug tpot found yesterday
(This used to be commit 93712dd894b4ddaa2281034c754c0fa15f5ec34c)
| -rw-r--r-- | source4/lib/ejs/ejsLex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/ejs/ejsLex.c b/source4/lib/ejs/ejsLex.c index 6dcc1c7b78..a5f15c2979 100644 --- a/source4/lib/ejs/ejsLex.c +++ b/source4/lib/ejs/ejsLex.c @@ -663,11 +663,11 @@ static int getLexicalToken(Ejs *ep, int state) 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 |