diff options
| author | con <qtc-committer@nokia.com> | 2009-11-04 19:15:14 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-11-04 19:15:14 +0100 |
| commit | c8bb7e174bad675502df890e73033c0d91a502a5 (patch) | |
| tree | 2649793665a60775007a7dfbff120d570e7b6e3f /src/shared/cplusplus/Parser.cpp | |
| parent | fa3484757122bc75925df38638eae32cb28e711e (diff) | |
| parent | 2a7439cde86f0186014576c104b1b70c95056d20 (diff) | |
| download | qt-creator-c8bb7e174bad675502df890e73033c0d91a502a5.tar.gz | |
Merge commit 'origin/1.3'
Conflicts:
src/plugins/qt4projectmanager/qt4project.cpp
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
| -rw-r--r-- | src/shared/cplusplus/Parser.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index 835b2c11c8..ca26cb629e 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -1200,6 +1200,14 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, bool stopAtCppInitializer) break; } + if (LA() == T___ASM__ && LA(2) == T_LPAREN) { // ### store the asm specifier in the AST + consumeToken(); // skip __asm__ + consumeToken(); // skip T_LPAREN + + if (skipUntil(T_RPAREN)) + consumeToken(); // skip T_RPAREN + } + SpecifierAST **spec_ptr = &node->post_attributes; while (LA() == T___ATTRIBUTE__) { parseAttributeSpecifier(*spec_ptr); |