Move qv4string{_p.h|.cpp} out of the devtools

The only thing we actually need is toArrayIndex() and that is a static
method. We provide it in a separate file.

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

8 files changed, 107 insertions, 47 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 3c669c9b1a..edd479a0bd 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -47,7 +47,7 @@
 #include <private/qqmljsast_p.h>
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
-#include <private/qv4string_p.h>
+#include <private/qv4stringtoarrayindex_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4compilercontext_p.h>
 #include <private/qv4compilercontrolflow_p.h>
@@ -1245,7 +1245,7 @@ bool Codegen::visit(ArrayMemberExpression *ast)
         return false;
     if (AST::StringLiteral *str = AST::cast<AST::StringLiteral *>(ast->expression)) {
         QString s = str->value.toString();
-        uint arrayIndex = QV4::String::toArrayIndex(s);
+        uint arrayIndex = stringToArrayIndex(s);
         if (arrayIndex == UINT_MAX) {
             setExprResult(Reference::fromMember(base, str->value.toString()));
             return false;
@@ -2515,7 +2515,7 @@ bool Codegen::visit(ObjectPattern *ast)
         if (cname || p->type != PatternProperty::Literal)
             break;
         QString name = p->name->asString();
-        uint arrayIndex = QV4::String::toArrayIndex(name);
+        uint arrayIndex = stringToArrayIndex(name);
         if (arrayIndex != UINT_MAX)
             break;
         if (members.contains(name))
diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index 123d77f788..4a54e5a44b 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -40,7 +40,6 @@
 #include <qv4compiler_p.h>
 #include <qv4compileddata_p.h>
 #include <qv4codegen_p.h>
-#include <private/qv4string_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4alloca_p.h>
 #include <private/qqmljslexer_p.h>
diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index 8984b6931e..ef67a11a70 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -49,7 +49,6 @@
 #include <private/qqmljsast_p.h>
 #include <private/qv4compilercontext_p.h>
 #include <private/qv4codegen_p.h>
-#include <private/qv4string_p.h>
 
 QT_USE_NAMESPACE
 using namespace QV4;
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index de2e0603e8..fe9e4932c2 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -37,6 +37,7 @@ SOURCES += \
     $$PWD/qv4reflect.cpp \
     $$PWD/qv4regexpobject.cpp \
     $$PWD/qv4stackframe.cpp \
+    $$PWD/qv4string.cpp \
     $$PWD/qv4stringiterator.cpp \
     $$PWD/qv4stringobject.cpp \
     $$PWD/qv4variantobject.cpp \
@@ -103,6 +104,7 @@ HEADERS += \
     $$PWD/qv4regexpobject_p.h \
     $$PWD/qv4runtimecodegen_p.h \
     $$PWD/qv4stackframe_p.h \
+    $$PWD/qv4string_p.h \
     $$PWD/qv4stringiterator_p.h \
     $$PWD/qv4stringobject_p.h \
     $$PWD/qv4variantobject_p.h \
@@ -144,14 +146,13 @@ HEADERS += \
     $$PWD/qv4runtime_p.h \
     $$PWD/qv4runtimeapi_p.h \
     $$PWD/qv4value_p.h \
-    $$PWD/qv4string_p.h \
+    $$PWD/qv4stringtoarrayindex_p.h \
     $$PWD/qv4util_p.h \
     $$PWD/qv4value_p.h \
     $$PWD/qv4functiontable_p.h
 
 SOURCES += \
     $$PWD/qv4runtime.cpp \
-    $$PWD/qv4string.cpp \
     $$PWD/qv4value.cpp \
     $$PWD/qv4executableallocator.cpp
 
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 68d65f2e24..24a17bf5d5 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -256,8 +256,3 @@ qint64 String::virtualGetLength(const Managed *m)
 }
 
 #endif // V4_BOOTSTRAP
-
-uint String::toArrayIndex(const QString &str)
-{
-    return QV4::String::toArrayIndex(str.constData(), str.constData() + str.length());
-}
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h
index fbd4f5f550..a986fe185e 100644
--- a/src/qml/jsruntime/qv4string_p.h
+++ b/src/qml/jsruntime/qv4string_p.h
@@ -54,6 +54,7 @@
 #include "qv4managed_p.h"
 #include <QtCore/private/qnumeric_p.h>
 #include "qv4enginebase_p.h"
+#include "qv4stringtoarrayindex_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -242,40 +243,11 @@ protected:
 #endif
 
 public:
-    static uint toArrayIndex(const QString &str);
-
-private:
-    static inline uint toUInt(const QChar *ch) { return ch->unicode(); }
-    static inline uint toUInt(const char *ch) { return static_cast<unsigned char>(*ch); }
-
-    template <typename T>
-    static inline uint toArrayIndex(const T *ch, const T *end)
-    {
-        uint i = toUInt(ch) - '0';
-        if (i > 9)
-            return UINT_MAX;
-        ++ch;
-        // reject "01", "001", ...
-        if (i == 0 && ch != end)
-            return UINT_MAX;
-
-        while (ch < end) {
-            uint x = toUInt(ch) - '0';
-            if (x > 9)
-                return UINT_MAX;
-            if (mul_overflow(i, uint(10), &i) || add_overflow(i, x, &i)) // i = i * 10 + x
-                return UINT_MAX;
-            ++ch;
-        }
-        return i;
-    }
-
-public:
     template <typename T>
     static inline uint calculateHashValue(const T *ch, const T* end, uint *subtype)
     {
         // array indices get their number as hash value
-        uint h = toArrayIndex(ch, end);
+        uint h = stringToArrayIndex(ch, end);
         if (h != UINT_MAX) {
             if (subtype)
                 *subtype = Heap::StringOrSymbol::StringType_ArrayIndex;
@@ -283,12 +255,12 @@ public:
         }
 
         while (ch < end) {
-            h = 31 * h + toUInt(ch);
+            h = 31 * h + charToUInt(ch);
             ++ch;
         }
 
         if (subtype)
-            *subtype = (toUInt(ch) == '@') ? Heap::StringOrSymbol::StringType_Symbol : Heap::StringOrSymbol::StringType_Regular;
+            *subtype = (charToUInt(ch) == '@') ? Heap::StringOrSymbol::StringType_Symbol : Heap::StringOrSymbol::StringType_Regular;
         return h;
     }
 };
diff --git a/src/qml/jsruntime/qv4stringtoarrayindex_p.h b/src/qml/jsruntime/qv4stringtoarrayindex_p.h
new file mode 100644
index 0000000000..61bd988d1e
--- /dev/null
+++ b/src/qml/jsruntime/qv4stringtoarrayindex_p.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QV4STRINGTOARRAYINDEX_P_H
+#define QV4STRINGTOARRAYINDEX_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qnumeric_p.h>
+#include <QtCore/qstring.h>
+#include <limits>
+
+QT_BEGIN_NAMESPACE
+
+namespace QV4 {
+
+inline uint charToUInt(const QChar *ch) { return ch->unicode(); }
+inline uint charToUInt(const char *ch) { return static_cast<unsigned char>(*ch); }
+
+template <typename T>
+uint stringToArrayIndex(const T *ch, const T *end)
+{
+    uint i = charToUInt(ch) - '0';
+    if (i > 9)
+        return std::numeric_limits<uint>::max();
+    ++ch;
+    // reject "01", "001", ...
+    if (i == 0 && ch != end)
+        return std::numeric_limits<uint>::max();
+
+    while (ch < end) {
+        uint x = charToUInt(ch) - '0';
+        if (x > 9)
+            return std::numeric_limits<uint>::max();
+        if (mul_overflow(i, uint(10), &i) || add_overflow(i, x, &i)) // i = i * 10 + x
+            return std::numeric_limits<uint>::max();
+        ++ch;
+    }
+    return i;
+}
+
+inline uint stringToArrayIndex(const QString &str)
+{
+    return stringToArrayIndex(str.constData(), str.constData() + str.length());
+}
+
+} // namespace QV4
+
+QT_END_NAMESPACE
+
+#endif // QV4STRINGTOARRAYINDEX_P_H
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp
index 9b50938ccb..82cf11f148 100644
--- a/src/qml/jsruntime/qv4value.cpp
+++ b/src/qml/jsruntime/qv4value.cpp
@@ -38,9 +38,9 @@
 ****************************************************************************/
 
 #include <qv4runtime_p.h>
-#include <qv4string_p.h>
 #include <qv4propertykey_p.h>
 #ifndef V4_BOOTSTRAP
+#include <qv4string_p.h>
 #include <qv4symbol_p.h>
 #include <qv4object_p.h>
 #include <qv4objectproto_p.h>
@@ -248,7 +248,6 @@ QV4::PropertyKey Value::toPropertyKey(ExecutionEngine *e) const
     ScopedStringOrSymbol s(scope, v);
     return s->toPropertyKey();
 }
-#endif // V4_BOOTSTRAP
 
 bool Value::sameValue(Value other) const {
     if (_val == other._val)
@@ -285,7 +284,6 @@ bool Value::sameValueZero(Value other) const {
     return false;
 }
 
-#ifndef V4_BOOTSTRAP
 Heap::String *Value::toString(ExecutionEngine *e, Value val)
 {
     return RuntimeHelpers::convertToString(e, val);