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

!ifdef, again...

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2861 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-09-06 19:48:00 +00:00
parent 8c99918cae
commit acd850dd85
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/script.cpp
View file

@ -325,6 +325,12 @@ parse_again:
return PS_ERROR;
}
if (cur_ifblock->hasexeced)
{
cur_ifblock->ignore++;
return PS_OK;
}
if (line.getnumtokens() == 1)
{
cur_ifblock->ignore = !cur_ifblock->ignore;
@ -334,12 +340,6 @@ parse_again:
return PS_OK;
}
if (cur_ifblock->hasexeced)
{
cur_ifblock->ignore++;
return PS_OK;
}
line.eattoken();
int v=line.gettoken_enum(0,"ifdef\0ifndef\0");
@ -348,8 +348,6 @@ parse_again:
if (!v) tkid = TOK_P_IFDEF;
else tkid = TOK_P_IFNDEF;
if_from_else++;
SCRIPT_MSG("!else on line %d - %s\n", linecnt, line.gettoken_str(0));
}
if (tkid == TOK_P_IFNDEF || tkid == TOK_P_IFDEF)