From efc01fd994a4d7fcc6cc55137bb8c57588d9efa1 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Tue, 1 Jun 2010 11:42:49 +0200 Subject: [PATCH] Fixed ClassSpecifierAST::lastToken() to return a valid token. --- src/shared/cplusplus/AST.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp index 55b978790b2..359467b27da 100644 --- a/src/shared/cplusplus/AST.cpp +++ b/src/shared/cplusplus/AST.cpp @@ -562,10 +562,13 @@ unsigned ClassSpecifierAST::lastToken() const else if (dot_dot_dot_token) return dot_dot_dot_token + 1; - else if (base_clause_list) - return base_clause_list->lastToken(); + else if (base_clause_list) { + unsigned token = base_clause_list->lastToken(); + if (token) + return token; + } - else if (colon_token) + if (colon_token) return colon_token + 1; else if (name)