Improved compatibility with the gcc extensions.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp
index 39c3795116..c809f6e1d0 100644
--- a/src/shared/cplusplus/AST.cpp
+++ b/src/shared/cplusplus/AST.cpp
@@ -570,6 +570,8 @@ unsigned DeclarationListAST::lastToken() const
 
 unsigned DeclaratorAST::firstToken() const
 {
+    if (attributes)
+        return attributes->firstToken();
     if (ptr_operators)
         return ptr_operators->firstToken();
     else if (core_declarator)
@@ -589,7 +591,7 @@ unsigned DeclaratorAST::lastToken() const
     if (initializer)
         return initializer->lastToken();
 
-    for (SpecifierAST *it = attributes; it; it = it->next) {
+    for (SpecifierAST *it = post_attributes; it; it = it->next) {
         if (! it->next)
             return it->lastToken();
     }
@@ -607,6 +609,11 @@ unsigned DeclaratorAST::lastToken() const
             return it->lastToken();
     }
 
+    for (SpecifierAST *it = attributes; it; it = it->next) {
+        if (! it->next)
+            return it->lastToken();
+    }
+
     // ### assert?
     return 0;
 }