Merge the QJSEngine and QJSValue development branch into master.

This replaces the dependency to QtScript with two new builtin classes
QJSValue and QJSEngine.

This is still work in progress, development continues now in the master branch.

Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de
Reviewed-on: http://codereview.qt.nokia.com/2299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

1 files changed, 216 insertions, 0 deletions

diff --git a/src/declarative/qml/v8/qscripttools_p.h b/src/declarative/qml/v8/qscripttools_p.h
new file mode 100644
index 0000000000..f74fbab83f
--- /dev/null
+++ b/src/declarative/qml/v8/qscripttools_p.h
@@ -0,0 +1,216 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtScript module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-ONLY$
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  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.
+//
+
+
+#ifndef QSCRIPTTOOLS_P_H
+#define QSCRIPTTOOLS_P_H
+
+#include <qdebug.h>
+
+QT_BEGIN_NAMESPACE
+
+template<class T>
+class QScriptBagContainer;
+
+/*!
+  \internal
+  \interface
+  Helper class for a container. The purpuse of it is to add two pointer properties to a class
+  inheriting this class without bloating an interface.
+
+  This class exist only as a memory storage implementation. The only way to use it is to inherit it.
+*/
+class QScriptLinkedNode
+{
+protected:
+    QScriptLinkedNode()
+        : m_next(0)
+        , m_prev(0)
+    {}
+
+    ~QScriptLinkedNode()
+    {
+        Q_ASSERT_X(!isUsed(), Q_FUNC_INFO, "Destorying QScriptLinkedNode instance that still is in a container");
+    }
+
+private:
+    bool isUsed() const
+    {
+        return m_next || m_prev;
+    }
+
+#if defined(Q_NO_TEMPLATE_FRIENDS)
+public:
+#else
+    template<class T>
+    friend class QScriptBagContainer;
+#endif
+    QScriptLinkedNode *m_next;
+    QScriptLinkedNode *m_prev;
+};
+
+/*!
+  \internal
+  The QScriptBagContainer is a simple, low level, set like container for a pointer type castable to
+  QScriptLinkedNode*.
+  Algorithms complexity:
+  put: O(1)
+  get: O(1)
+  forEach: O(n)
+  \note This container doesn't take ownership of pointed values.
+  \attention All values have to be unique.
+*/
+template<class T>
+class QScriptBagContainer
+{
+public:
+    QScriptBagContainer()
+        : m_first(0)
+    {}
+
+    /*!
+      \internal
+      Add a this \a value to this container
+    */
+    void insert(T* value)
+    {
+        //dump(Q_FUNC_INFO, value);
+        Q_ASSERT_X(!contains(value), Q_FUNC_INFO, "Can't insert a value which is in the bag already");
+        QScriptLinkedNode* v = static_cast<QScriptLinkedNode*>(value);
+        Q_ASSERT(v);
+        Q_ASSERT_X(!v->m_next && !v->m_prev, Q_FUNC_INFO, "Can't insert a value which is in an another bag");
+
+        if (m_first)
+            m_first->m_prev = v;
+
+        v->m_next = m_first;
+        v->m_prev = 0;
+        m_first = v;
+    }
+
+    /*!
+      \internal
+      Remove this \a value from this container
+    */
+    void remove(T* value)
+    {
+        //dump(Q_FUNC_INFO, value);
+        QScriptLinkedNode* v = static_cast<QScriptLinkedNode*>(value);
+        Q_ASSERT(v);
+
+        if (!v->m_next && !v->m_prev && m_first != v) {
+            // ignore that value as it is not registered at all
+            // FIXME: That may be optimized out if unregister call is removed from ~QtDataBase
+            return;
+        }
+
+        Q_ASSERT_X(contains(value), Q_FUNC_INFO, "Can't remove a value which is not in the bag");
+        Q_ASSERT(v->m_prev || (m_first == v && !v->m_prev));
+
+        if (v->m_next)
+            v->m_next->m_prev= v->m_prev;
+
+        if (v->m_prev)
+            v->m_prev->m_next = v->m_next;
+        else
+            m_first = v->m_next;
+        // reset removed value
+        v->m_next = v->m_prev = 0;
+    }
+
+    /*!
+      \internal
+      Call \a fun for each element in this container. Fun should accept T* as a parameter.
+      \note In general it is not allowed to change this container by calling put() or get() unless
+      given value is the same as currently procceded by forEach.
+    */
+    template<class Functor>
+    void forEach(Functor fun)
+    {
+        //dump(Q_FUNC_INFO);
+        QScriptLinkedNode *i = m_first;
+        QScriptLinkedNode *tmp;
+        while (i) {
+            tmp = i;
+            i = i->m_next;
+            fun(static_cast<T*>(tmp));
+        }
+    }
+
+    /*!
+      \internal
+      Clear this container.
+    */
+    void clear()
+    {
+        m_first = 0;
+    }
+
+    /*!
+      \internal
+      Returns true if this container is empty; false otherwise.
+    */
+    bool isEmpty() const
+    {
+        return !m_first;
+    }
+
+//    void dump(const char* msg, T* obj = 0) const
+//    {
+//        qDebug() << msg << obj;
+//        qDebug() << m_first;
+//        QScriptLinkedNode *i = m_first;
+//        while (i) {
+//            qDebug() <<"  - " << i << "(" << i->m_prev << ", " << i->m_next <<")";
+//            i = i->m_next;
+//        }
+//    }
+
+private:
+    bool contains(T *value) const
+    {
+        QScriptLinkedNode *i = m_first;
+        while (i) {
+            if (static_cast<T*>(i) == value)
+                return true;
+            i = i->m_next;
+        }
+        return false;
+    }
+    QScriptLinkedNode *m_first;
+};
+
+QT_END_NAMESPACE
+
+#endif //QSCRIPTTOOLS_P_H