feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

slightly more elegant eof signalling

Browse Source 
we don't really use the current character at this point, so don't fake
it and use the cur pointer as a flag.

Change-Id: I0dd31ff07fafe0748b88b3a573d25b689f0c3748
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-07-30 20:55:35 +02:00
parent 9d5ff668ef
commit c865baa2be
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/qmakeparser.cpp
View File

@@ -385,6 +385,7 @@ bool QMakeParser::read(ProFile *pro, const QString &in, SubGrammar grammar)
++cur; ++cur;
goto flushLine; goto flushLine;
} else if (!c) { } else if (!c) {
cur = 0;
goto flushLine; goto flushLine;
} else if (c != ' ' && c != '\t' && c != '\r') { } else if (c != ' ' && c != '\t' && c != '\r') {
break; break;
@@ -765,7 +766,6 @@ bool QMakeParser::read(ProFile *pro, const QString &in, SubGrammar grammar)
xprPtr = ptr; xprPtr = ptr;
} }
} else { } else {
c = '\n';
cur = cptr; cur = cptr;
flushLine: flushLine:
FLUSH_LITERAL(); FLUSH_LITERAL();
@@ -795,7 +795,7 @@ bool QMakeParser::read(ProFile *pro, const QString &in, SubGrammar grammar)
} else { } else {
finalizeCond(tokPtr, buf, ptr, wordCount); finalizeCond(tokPtr, buf, ptr, wordCount);
} }
if (!c) if (!cur)
break; break;
++m_lineNo; ++m_lineNo;
goto freshLine; goto freshLine;