fixed bug #1554178 - Compiler ignores next line after comment line ends with \
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4876 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
f47023d9df
commit
94fc6745fa
3 changed files with 21 additions and 1 deletions
|
@ -23,6 +23,7 @@
|
|||
LineParser::LineParser(bool bCommentBlock)
|
||||
{
|
||||
m_bCommentBlock=bCommentBlock;
|
||||
m_incomment=false;
|
||||
m_nt=m_eat=0;
|
||||
m_tokens=0;
|
||||
}
|
||||
|
@ -32,6 +33,11 @@ LineParser::~LineParser()
|
|||
freetokens();
|
||||
}
|
||||
|
||||
bool LineParser::inComment()
|
||||
{
|
||||
return m_incomment;
|
||||
}
|
||||
|
||||
bool LineParser::InCommentBlock()
|
||||
{
|
||||
return m_bCommentBlock;
|
||||
|
@ -140,6 +146,7 @@ void LineParser::freetokens()
|
|||
int LineParser::doline(char *line, int ignore_escaping/*=0*/)
|
||||
{
|
||||
m_nt=0;
|
||||
m_incomment = false;
|
||||
while (*line == ' ' || *line == '\t') line++;
|
||||
while (*line)
|
||||
{
|
||||
|
@ -159,7 +166,11 @@ int LineParser::doline(char *line, int ignore_escaping/*=0*/)
|
|||
}
|
||||
else {
|
||||
int lstate=0; // 1=", 2=`, 4='
|
||||
if (*line == ';' || *line == '#') break;
|
||||
if (*line == ';' || *line == '#')
|
||||
{
|
||||
m_incomment = true;
|
||||
break;
|
||||
}
|
||||
if (*line == '/' && *(line+1) == '*')
|
||||
{
|
||||
m_bCommentBlock = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue