Fix naming of methods defined in object or class literals

Change-Id: I01b7774097a447520c85ae6766e6ca1162e921ba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 23 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4propertykey.cpp b/src/qml/jsruntime/qv4propertykey.cpp
index e5e96bedb8..12a3653034 100644
--- a/src/qml/jsruntime/qv4propertykey.cpp
+++ b/src/qml/jsruntime/qv4propertykey.cpp
@@ -41,6 +41,7 @@
 
 #include <QtCore/qstring.h>
 #include <qv4string_p.h>
+#include <qv4engine_p.h>
 
 QV4::Heap::StringOrSymbol *QV4::PropertyKey::toStringOrSymbol(QV4::ExecutionEngine *e)
 {
@@ -63,8 +64,27 @@ QString QV4::PropertyKey::toQString() const
 {
     if (isArrayIndex())
         return QString::number(asArrayIndex());
-    Heap::Base *b = asStringOrSymbol();
-    Q_ASSERT(b->internalClass->vtable->isStringOrSymbol);
-    Heap::StringOrSymbol *s = static_cast<Heap::StringOrSymbol *>(b);
+    Heap::StringOrSymbol *s = asStringOrSymbol();
+    Q_ASSERT(s->internalClass->vtable->isStringOrSymbol);
     return s->toQString();
 }
+
+QV4::Heap::String *QV4::PropertyKey::asFunctionName(ExecutionEngine *engine, FunctionNamePrefix prefix) const
+{
+    QString n;
+    if (prefix == Getter)
+        n = QStringLiteral("get ");
+    else if (prefix == Setter)
+        n = QStringLiteral("set ");
+    if (isArrayIndex())
+        n += QString::number(asArrayIndex());
+    else {
+        Heap::StringOrSymbol *s = asStringOrSymbol();
+        QString str = s->toQString();
+        if (s->internalClass->vtable->isString)
+            n += s->toQString();
+        else if (str.length() > 1)
+            n += QChar::fromLatin1('[') + str.midRef(1) + QChar::fromLatin1(']');
+    }
+    return engine->newString(n);
+}