C++: Added highlighting for labels.

Change-Id: I559a3112d2aa0a3c09554f8da8b7917f9aa27944
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

3 files changed, 24 insertions, 2 deletions

diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index 84e99548a1..82e72452c8 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -765,6 +765,23 @@ bool CheckSymbols::visit(MemInitializerAST *ast)
     return false;
 }
 
+bool CheckSymbols::visit(GotoStatementAST *ast)
+{
+    if (ast->identifier_token)
+        addUse(ast->identifier_token, SemanticInfo::LabelUse);
+
+    return false;
+}
+
+bool CheckSymbols::visit(LabeledStatementAST *ast)
+{
+    if (ast->label_token)
+        addUse(ast->label_token, SemanticInfo::LabelUse);
+
+    accept(ast->statement);
+    return false;
+}
+
 bool CheckSymbols::visit(FunctionDefinitionAST *ast)
 {
     AST *thisFunction = _astStack.takeLast();
diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h
index fb50fcfd52..d3b638ec70 100644
--- a/src/plugins/cpptools/cppchecksymbols.h
+++ b/src/plugins/cpptools/cppchecksymbols.h
@@ -154,6 +154,9 @@ protected:
 
     virtual bool visit(MemInitializerAST *ast);
 
+    virtual bool visit(GotoStatementAST *ast);
+    virtual bool visit(LabeledStatementAST *ast);
+
     NameAST *declaratorId(DeclaratorAST *ast) const;
 
     void flush();
diff --git a/src/plugins/cpptools/cppsemanticinfo.h b/src/plugins/cpptools/cppsemanticinfo.h
index 915ffad1f5..af57130071 100644
--- a/src/plugins/cpptools/cppsemanticinfo.h
+++ b/src/plugins/cpptools/cppsemanticinfo.h
@@ -46,11 +46,13 @@ class CPPTOOLS_EXPORT SemanticInfo
 {
 public:
     enum UseKind {
-        TypeUse = 0,
+        Unknown = 0,
+        TypeUse,
         LocalUse,
         FieldUse,
         StaticUse,
-        VirtualMethodUse
+        VirtualMethodUse,
+        LabelUse
     };
     typedef TextEditor::SemanticHighlighter::Result Use;