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

C++: Inline {TranslationUnit,Parser}::blockErrors

Browse Source 
As indicated by profiling.

Change-Id: I04d741dcc6200eb351d7aec316572e0e94ef5bec
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
hjk
2013-04-16 15:38:59 +02:00
committed by Erik Verbruggen
parent b85eddb2ea
commit f0f406bacb
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -216,9 +216,6 @@ bool Parser::maybeSplitGreaterGreaterToken(int n)
return _translationUnit->maybeSplitGreaterGreaterToken(_tokenIndex + n - 1); return _translationUnit->maybeSplitGreaterGreaterToken(_tokenIndex + n - 1);
} }
bool Parser::blockErrors(bool block)
{ return _translationUnit->blockErrors(block); }
bool Parser::skipUntil(int token) bool Parser::skipUntil(int token)
{ {
while (int tk = LA()) { while (int tk = LA()) {

2
src/libs/3rdparty/cplusplus/Parser.h vendored
View File

@@ -278,7 +278,7 @@ public:
bool switchTemplateArguments(bool templateArguments); bool switchTemplateArguments(bool templateArguments);
bool maybeSplitGreaterGreaterToken(int n = 1); bool maybeSplitGreaterGreaterToken(int n = 1);
bool blockErrors(bool block); bool blockErrors(bool block) { return _translationUnit->blockErrors(block); }
void warning(unsigned index, const char *format, ...); void warning(unsigned index, const char *format, ...);
void error(unsigned index, const char *format, ...); void error(unsigned index, const char *format, ...);
void fatal(unsigned index, const char *format, ...); void fatal(unsigned index, const char *format, ...);

7
src/libs/3rdparty/cplusplus/TranslationUnit.cpp vendored
View File

@@ -459,13 +459,6 @@ void TranslationUnit::getPosition(unsigned tokenOffset,
*fileName = file; *fileName = file;
} }
bool TranslationUnit::blockErrors(bool block)
{
bool previous = f._blockErrors;
f._blockErrors = block;
return previous;
}
void TranslationUnit::message(DiagnosticClient::Level level, unsigned index, const char *format, va_list args) void TranslationUnit::message(DiagnosticClient::Level level, unsigned index, const char *format, va_list args)
{ {
if (f._blockErrors) if (f._blockErrors)

17
src/libs/3rdparty/cplusplus/TranslationUnit.h vendored
View File

@@ -52,12 +52,9 @@ public:
void setSource(const char *source, unsigned size); void setSource(const char *source, unsigned size);
unsigned tokenCount() const unsigned tokenCount() const { return _tokens->size(); }
{ return _tokens->size(); } const Token &tokenAt(unsigned index) const { return _tokens->at(index); }
const Token &tokenAt(unsigned index) const int tokenKind(unsigned index) const { return _tokens->at(index).f.kind; }
{ return _tokens->at(index); }
int tokenKind(unsigned index) const
{ return _tokens->at(index).f.kind; }
const char *spell(unsigned index) const; const char *spell(unsigned index) const;
unsigned commentCount() const; unsigned commentCount() const;
@@ -72,8 +69,12 @@ public:
MemoryPool *memoryPool() const; MemoryPool *memoryPool() const;
AST *ast() const; AST *ast() const;
bool blockErrors() const { return f._blockErrors; } bool blockErrors(bool block)
bool blockErrors(bool block); {
const bool previous = f._blockErrors;
f._blockErrors = block;
return previous;
}
bool qtMocRunEnabled() const; bool qtMocRunEnabled() const;
void setQtMocRunEnabled(bool onoff); void setQtMocRunEnabled(bool onoff);