dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added !if S==, S!=, = and <> compare ops and hex/int/float parsing support

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6198 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-12-06 19:14:45 +00:00
parent 357aa9675b
commit 67d0b165b1
5 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/lineparse.cpp
View file

@ -88,6 +88,7 @@ double LineParser::gettoken_float(int token, int *success/*=0*/)
if (success)
{
TCHAR *t=m_tokens[token];
if (_T('-') == *t || _T('+') == *t) ++t;
*success=*t?1:0;
while (*t)
{
@ -108,12 +109,22 @@ int LineParser::gettoken_int(int token, int *success/*=0*/)
}
TCHAR *tmp;
int l;
if (m_tokens[token][0] == _T('-')) l=_tcstol(m_tokens[token],&tmp,0);
else l=(int)_tcstoul(m_tokens[token],&tmp,0);
if (_T('-') == m_tokens[token][0])
l=_tcstol(m_tokens[token],&tmp,0);
else
l=(int)_tcstoul(m_tokens[token],&tmp,0);
if (success) *success=! (int)(*tmp);
return l;
}
double LineParser::gettoken_number(int token, int *success/*=0*/)
{
const TCHAR*str=gettoken_str(token);
if (_T('-') == *str || _T('+') == *str) ++str;
if (_T('0') == str[0] && _T('x') == (str[1]|32)) return gettoken_int(token,success);
return gettoken_float(token,success);
}
TCHAR* LineParser::gettoken_str(int token)
{
token+=m_eat;