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

don't ignore multiple line comments inside ifdef'ed blocks

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4427 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-11-25 11:54:11 +00:00
parent 025dd40024
commit 82ff45a521
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/script.cpp
View file

@ -262,9 +262,6 @@ int CEXEBuild::doParse(const char *str)
while (*str == ' ' || *str == '\t') str++;
// if ignoring, ignore all lines that don't begin with !.
if (cur_ifblock && (cur_ifblock->ignore || cur_ifblock->inherited_ignore) && *str!='!' && !last_line_had_slash) return PS_OK;
if (m_linebuild.getlen()>1) m_linebuild.resize(m_linebuild.getlen()-2);
m_linebuild.add(str,strlen(str)+1);
@ -282,6 +279,14 @@ int CEXEBuild::doParse(const char *str)
m_linebuild.resize(0);
// if ignoring, ignore all lines that don't begin with an exclamation mark
{
bool ignore_line = cur_ifblock && (cur_ifblock->ignore || cur_ifblock->inherited_ignore);
char first_char = *(char *) m_linebuild.get();
if (ignore_line && first_char!='!' && !last_line_had_slash)
return PS_OK;
}
if (res)
{
if (res==-2) ERROR_MSG("Error: unterminated string parsing line at %s:%d\n",curfilename,linecnt);