diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-02-06 15:04:23 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-02-12 10:39:51 +0000 |
| commit | ae3aa07c4df1f8e6e413b7513611d306063b126b (patch) | |
| tree | afcc64f1f8fa654482b1d3a11e4e2522b968184f /src/libs/3rdparty/cplusplus/Parser.h | |
| parent | d68fc038cccc168ae8f3d03f12c00779876233f0 (diff) | |
C++: Remove workaround for crashing if parsing invalid code
This reverts the changes
commit beac7b9539457fe721de1709b9a406cac2379851
C++: Fix highlighting after "invalid code"
commit 78ab287fc6d3770646012e461b0a518db4e9c9f4
C++: Stop parsing a declaration after two tries
which were a work around for QTCREATORBUG-12890.
A follow-up patch provides a proper fix.
Task-number: QTCREATORBUG-12890
Change-Id: I2650a8e41c8ff1180cad9f069e463fc51bd2f1b1
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Parser.h')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.h b/src/libs/3rdparty/cplusplus/Parser.h index 5f0a182bd1..4a2a6dfb7e 100644 --- a/src/libs/3rdparty/cplusplus/Parser.h +++ b/src/libs/3rdparty/cplusplus/Parser.h @@ -33,7 +33,7 @@ namespace CPlusPlus { class CPLUSPLUS_EXPORT Parser { public: - Parser(TranslationUnit *translationUnit, int retryParseDeclarationLimit); + Parser(TranslationUnit *translationUnit); ~Parser(); bool parseTranslationUnit(TranslationUnitAST *&node); @@ -254,7 +254,6 @@ public: bool parseDesignator(DesignatorAST *&node); bool skipUntil(int token); - void skipUntilAfterSemicolonOrRightBrace(); void skipUntilDeclaration(); bool skipUntilStatement(); bool skip(int l, int r); @@ -317,7 +316,6 @@ private: MemoryPool *_pool; LanguageFeatures _languageFeatures; unsigned _tokenIndex; - int _retryParseDeclarationLimit; bool _templateArguments: 1; bool _inFunctionBody: 1; bool _inExpressionStatement: 1; |