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

Fixed #ifdef blocks.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4330 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
icemank 2005-10-16 12:52:04 +00:00
parent 2bae0bb2ee
commit 0a17affe37
1 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/lineparse.cpp
View file

@ -124,25 +124,9 @@ void LineParser::freetokens()
int LineParser::doline(char *line, int ignore_escaping/*=0*/) int LineParser::doline(char *line, int ignore_escaping/*=0*/)
{ {
m_nt=0; m_nt=0;
#ifndef NSIS_FIX_COMMENT_HANDLING
if ( m_bCommentBlock )
{
while ( *line )
{
if ( *line == '*' && *(line+1) == '/' )
{
m_bCommentBlock=false; // Found end of comment block
line+=2;
break;
}
line++;
}
}
#endif
while (*line == ' ' || *line == '\t') line++; while (*line == ' ' || *line == '\t') line++;
while (*line) while (*line)
{ {
#ifdef NSIS_FIX_COMMENT_HANDLING
if ( m_bCommentBlock ) if ( m_bCommentBlock )
{ {
while ( *line ) while ( *line )
@ -158,20 +142,14 @@ int LineParser::doline(char *line, int ignore_escaping/*=0*/)
} }
} }
else { else {
#endif
int lstate=0; // 1=", 2=`, 4=' int lstate=0; // 1=", 2=`, 4='
if (*line == ';' || *line == '#') break; if (*line == ';' || *line == '#') break;
if (*line == '/' && *(line+1) == '*') if (*line == '/' && *(line+1) == '*')
{ {
m_bCommentBlock = true; m_bCommentBlock = true;
line+=2; line+=2;
#ifndef NSIS_FIX_COMMENT_HANDLING
return doline(line, ignore_escaping);
#endif
} }
#ifdef NSIS_FIX_COMMENT_HANDLING
else { else {
#endif
if (*line == '\"') lstate=1; if (*line == '\"') lstate=1;
else if (*line == '\'') lstate=2; else if (*line == '\'') lstate=2;
else if (*line == '`') lstate=4; else if (*line == '`') lstate=4;
@ -224,10 +202,8 @@ int LineParser::doline(char *line, int ignore_escaping/*=0*/)
else return -2; else return -2;
} }
while (*line == ' ' || *line == '\t') line++; while (*line == ' ' || *line == '\t') line++;
#ifdef NSIS_FIX_COMMENT_HANDLING
} }
} }
#endif
} }
return 0; return 0;
} }