Debugger: Refactor name demangler.

So far, we converted the mangled to the demangled representation on the
fly while parsing. Because some demangled strings look different
depending on higher-level context, awkward string manipulations were
then necessary at some later point.
The new solution is much more easily maintainable, creating a tree with
a node for every rule in the grammar first and converting the complete
tree to the demangled string later.

Change-Id: I59088df259611d7cd78af47b81b6a21d628a787f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

src/plugins/debugger/debugger.pro

@@ -47,7 +47,6 @@ HEADERS += \
     memoryagent.h \
     moduleshandler.h \
     moduleswindow.h \
-    name_demangler.h \
     outputcollector.h \
     procinterrupt.h \
     registerhandler.h \
@@ -103,7 +102,6 @@ SOURCES += \
     memoryagent.cpp \
     moduleshandler.cpp \
     moduleswindow.cpp \
-    name_demangler.cpp \
     outputcollector.cpp \
     procinterrupt.cpp \
     registerhandler.cpp \
@@ -162,5 +160,6 @@ include(script/script.pri)
 include(pdb/pdb.pri)
 include(lldb/lldbhost.pri)
 include(qml/qml.pri)
+include(namedemangler/namedemangler.pri)
 
 include(shared/shared.pri)

src/plugins/debugger/debugger.qbs

@@ -92,8 +92,6 @@ QtcPlugin {
         "moduleshandler.h",
         "moduleswindow.cpp",
         "moduleswindow.h",
-        "name_demangler.cpp",
-        "name_demangler.h",
         "outputcollector.cpp",
         "outputcollector.h",
         "procinterrupt.cpp",
@@ -262,7 +260,12 @@ QtcPlugin {
         "lldb/ipcenginehost.cpp",
         "lldb/ipcenginehost.h",
         "lldb/lldbenginehost.cpp",
-        "lldb/lldbenginehost.h"
+        "lldb/lldbenginehost.h",
+        "namedemangler/namedemangler.cpp",
+        "namedemangler/namedemangler.h",
+        "namedemangler/parsetreenodes.cpp",
+        "namedemangler/parsetreenodes.h",
+        "namedemangler/demanglerexceptions.h"
     ]
 
     Group {

src/plugins/debugger/namedemangler/demanglerexceptions.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**************************************************************************/
+#ifndef DEMANGLEREXCEPTIONS_H
+#define DEMANGLEREXCEPTIONS_H
+
+#include <QtGlobal>
+#include <QString>
+
+namespace Debugger {
+namespace Internal {
+
+class ParseTreeNode;
+
+class ParseException
+{
+public:
+    ParseException(const QString &error) : error(error) {}
+
+    const QString error;
+};
+
+class InternalDemanglerException
+{
+public:
+    InternalDemanglerException(const QString &func, const QString &file, int line)
+            : func(func), file(file), line(line) {}
+
+    QString func;
+    QString file;
+    int line;
+};
+
+#define DEMANGLER_ASSERT(cond) \
+    do { \
+        if (!cond) { \
+            throw InternalDemanglerException(Q_FUNC_INFO, __FILE__, __LINE__); \
+        } \
+    } while (0)
+
+template <typename T> T *demanglerCast(ParseTreeNode *node, const QString &func,
+        const QString &file, int line)
+{
+    T * const out = dynamic_cast<T *>(node);
+    if (!out)
+        throw InternalDemanglerException(func, file, line);
+    return out;
+}
+
+#define DEMANGLER_CAST(type, input) demanglerCast<type>(input, QLatin1String(Q_FUNC_INFO), \
+        QLatin1String(__FILE__), __LINE__)
+
+} // namespace Internal
+} // namespace Debugger
+
+#endif // DEMANGLEREXCEPTIONS_H

src/plugins/debugger/namedemangler/namedemangler.pri

+HEADERS += \
+    $$PWD/namedemangler.h \
+    $$PWD/parsetreenodes.h \
+    namedemangler/demanglerexceptions.h
+
+SOURCES += \
+    $$PWD/namedemangler.cpp \
+    $$PWD/parsetreenodes.cpp

tests/auto/debugger/namedemangler.pro

 include(../qttest.pri)
 
+APPSOURCEDIR = $$CREATORSOURCEDIR/src/plugins/qt4projectmanager/wizards
+LIBS *= -L$$IDE_LIBRARY_PATH -lUtils
+
 DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
 INCLUDEPATH += $$DEBUGGERDIR
 
-HEADERS += $$DEBUGGERDIR/name_demangler.h
-SOURCES += tst_namedemangler.cpp $$DEBUGGERDIR/name_demangler.cpp
+HEADERS += \
+    $$DEBUGGERDIR/namedemangler/namedemangler.h \
+    $$DEBUGGERDIR/namedemangler/parsetreenodes.h
+SOURCES += \
+    tst_namedemangler.cpp \
+    $$DEBUGGERDIR/namedemangler/namedemangler.cpp \
+    $$DEBUGGERDIR/namedemangler/parsetreenodes.cpp