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

Removed #ifdefs so all AST nodes are always there.

Browse Source 
Also removed the (conditional) invoke_token from DeclarationAST and use
the qt_invokable_token to store the Q_INVOKABLE, and fixed the ASTMatch
code generation.
This commit is contained in:
Erik Verbruggen
2010-02-04 12:03:34 +01:00
parent 1b5168c19e
commit ae0ee18a77
13 changed files with 87 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/cplusplus/Parser.cpp
View File

@@ -3087,13 +3087,9 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node,
{
DEBUG_THIS_RULE();
unsigned qt_invokable_token = 0;
if (acceptStructDeclarator && (LA() == T_Q_SIGNAL || LA() == T_Q_SLOT))
if (acceptStructDeclarator
&& (LA() == T_Q_SIGNAL || LA() == T_Q_SLOT || LA() == T_Q_INVOKABLE))
qt_invokable_token = consumeToken();
#ifdef ICHECK_BUILD
unsigned invoke_token = 0;
if (LA() == T_Q_INVOKABLE)
invoke_token = consumeToken();
#endif
// parse a simple declaration, a function definition,
// or a contructor declaration.