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

52
src/shared/cplusplus/ASTMatcher.cpp
View File

@@ -27,9 +27,17 @@
**
**************************************************************************/
//
// W A R N I N G
// -------------
//
// This file is automatically generated.
// Changes will be lost.
//
#include "AST.h"
#include "ASTMatcher.h"
#include "TranslationUnit.h"
using namespace CPlusPlus;
@@ -195,14 +203,9 @@ bool ASTMatcher::match(AccessDeclarationAST *node, AccessDeclarationAST *pattern
pattern->colon_token = node->colon_token;
#ifdef ICHECK_BUILD
pattern->invoke_token = node->invoke_token;
#endif
return true;
}
#ifdef ICHECK_BUILD
bool ASTMatcher::match(QPropertyDeclarationAST *node, QPropertyDeclarationAST *pattern)
{
(void) node;
@@ -210,14 +213,30 @@ bool ASTMatcher::match(QPropertyDeclarationAST *node, QPropertyDeclarationAST *p
pattern->property_specifier_token = node->property_specifier_token;
pattern->lparen_token = node->lparen_token;
pattern->type_token = node->type_token;
pattern->type_name_token = node->type_name_token;
pattern->read_token = node->read_token;
pattern->read_function_token = node->read_function_token;
pattern->write_token = node->write_token;
pattern->write_function_token = node->write_function_token;
pattern->reset_token = node->reset_token;
pattern->reset_function_token = node->reset_function_token;
pattern->notify_token = node->notify_token;
pattern->notify_function_token = node->notify_function_token;
pattern->rparen_token = node->rparen_token;
return true;
}
@@ -228,6 +247,10 @@ bool ASTMatcher::match(QEnumDeclarationAST *node, QEnumDeclarationAST *pattern)
pattern->enum_specifier_token = node->enum_specifier_token;
pattern->lparen_token = node->lparen_token;
pattern->rparen_token = node->rparen_token;
if (! pattern->enumerator_list)
pattern->enumerator_list = node->enumerator_list;
else if (! AST::match(node->enumerator_list, pattern->enumerator_list, this))
@@ -243,6 +266,10 @@ bool ASTMatcher::match(QFlagsDeclarationAST *node, QFlagsDeclarationAST *pattern
pattern->flags_specifier_token = node->flags_specifier_token;
pattern->lparen_token = node->lparen_token;
pattern->rparen_token = node->rparen_token;
if (! pattern->enumerator_list)
pattern->enumerator_list = node->enumerator_list;
else if (! AST::match(node->enumerator_list, pattern->enumerator_list, this))
@@ -257,12 +284,17 @@ bool ASTMatcher::match(QDeclareFlagsDeclarationAST *node, QDeclareFlagsDeclarati
(void) pattern;
pattern->declareflags_specifier_token = node->declareflags_specifier_token;
pattern->lparen_token = node->lparen_token;
pattern->flag_token = node->flag_token;
pattern->enum_token = node->enum_token;
pattern->rparen_token = node->rparen_token;
return true;
}
#endif
bool ASTMatcher::match(AsmDefinitionAST *node, AsmDefinitionAST *pattern)
{
@@ -2204,6 +2236,8 @@ bool ASTMatcher::match(ObjCTypeNameAST *node, ObjCTypeNameAST *pattern)
pattern->lparen_token = node->lparen_token;
pattern->type_qualifier_token = node->type_qualifier_token;
if (! pattern->type_id)
pattern->type_id = node->type_id;
else if (! AST::match(node->type_id, pattern->type_id, this))
@@ -2433,8 +2467,12 @@ bool ASTMatcher::match(ObjCSynthesizedPropertyAST *node, ObjCSynthesizedProperty
(void) node;
(void) pattern;
pattern->property_identifier_token = node->property_identifier_token;
pattern->equals_token = node->equals_token;
pattern->alias_identifier_token = node->alias_identifier_token;
return true;
}