some preliminary work on QScriptProgram

5 files changed, 372 insertions, 0 deletions

diff --git a/src/script/api/api.pri b/src/script/api/api.pri
index 17ec9b6..aebadd5 100644
--- a/src/script/api/api.pri
+++ b/src/script/api/api.pri
@@ -6,6 +6,7 @@ SOURCES += \
     $$PWD/qscriptengine.cpp \
     $$PWD/qscriptengineagent.cpp \
     $$PWD/qscriptextensionplugin.cpp \
+    $$PWD/qscriptprogram.cpp \
     $$PWD/qscriptstring.cpp \
     $$PWD/qscriptvalue.cpp \
     $$PWD/qscriptvalueiterator.cpp \
@@ -23,6 +24,8 @@ HEADERS += \
     $$PWD/qscriptengineagent_p.h \
     $$PWD/qscriptextensioninterface.h \
     $$PWD/qscriptextensionplugin.h \
+    $$PWD/qscriptprogram.h \
+    $$PWD/qscriptprogram_p.h \
     $$PWD/qscriptstring.h \
     $$PWD/qscriptstring_p.h \
     $$PWD/qscriptvalue.h \
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index b1f36be..b11c276 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -51,6 +51,8 @@
 #include "qscriptvalue_p.h"
 #include "qscriptvalueiterator.h"
 #include "qscriptclass.h"
+#include "qscriptprogram.h"
+#include "qscriptprogram_p.h"
 #include "qdebug.h"
 
 #include <QtCore/qstringlist.h>
@@ -2214,6 +2216,77 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file
     return d->scriptValueFromJSCValue(result);
 }
 
+QScriptProgram QScriptEngine::compile(const QString &program, const QString &fileName, int lineNumber)
+{
+    Q_D(QScriptEngine);
+    JSC::UString jscProgram = program;
+    JSC::UString jscFileName = fileName;
+    WTF::PassRefPtr<QScript::UStringSourceProviderWithFeedback> provider
+            = QScript::UStringSourceProviderWithFeedback::create(jscProgram, jscFileName, lineNumber, d);
+    JSC::SourceCode source(provider, lineNumber); //after construction of SourceCode provider variable will be null.
+
+    JSC::ExecState* exec = d->currentFrame;
+    exec->clearException();
+    JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject());
+
+    JSC::EvalExecutable *executable = new JSC::EvalExecutable(exec, source);
+    JSC::JSObject* error = executable->compile(exec, exec->scopeChain());
+    if (error != 0) {
+        delete executable;
+        return QScriptProgram();
+    }
+    return QScriptProgramPrivate::create(d, executable, provider->asID());
+}
+
+QScriptValue QScriptEngine::evaluate(const QScriptProgram &program)
+{
+    Q_D(QScriptEngine);
+    QScriptProgramPrivate *program_d = QScriptProgramPrivate::get(program);
+    if (!program_d || !program_d->engine || !program_d->executable)
+        return QScriptValue();
+
+    JSC::ExecState* exec = d->currentFrame;
+    exec->clearException();
+    JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject());
+
+    intptr_t sourceId = program_d->sourceId;
+    JSC::Debugger* debugger = d->originalGlobalObject()->debugger();
+    if (debugger)
+        debugger->evaluateStart(sourceId);
+
+    JSC::JSValue thisValue = d->thisForContext(exec);
+    JSC::JSObject* thisObject = (!thisValue || thisValue.isUndefinedOrNull()) ? exec->dynamicGlobalObject() : thisValue.toObject(exec);
+    JSC::JSValue exceptionValue;
+    d->timeoutChecker()->setShouldAbort(false);
+    if (d->processEventsInterval > 0)
+        d->timeoutChecker()->reset();
+    JSC::JSValue result = exec->interpreter()->execute(program_d->executable, exec, thisObject, exec->scopeChain(), &exceptionValue);
+
+    if (d->timeoutChecker()->shouldAbort()) {
+        if (d->abortResult.isError())
+            exec->setException(d->scriptValueToJSCValue(d->abortResult));
+
+        if (debugger)
+            debugger->evaluateStop(d->scriptValueToJSCValue(d->abortResult), sourceId);
+
+        return d->abortResult;
+    }
+
+    if (exceptionValue) {
+        exec->setException(exceptionValue);
+
+        if (debugger)
+            debugger->evaluateStop(exceptionValue, sourceId);
+
+        return d->scriptValueFromJSCValue(exceptionValue);
+    }
+
+    if (debugger)
+        debugger->evaluateStop(result, sourceId);
+
+    Q_ASSERT(!exec->hadException());
+    return d->scriptValueFromJSCValue(result);
+}
 
 /*!
   Returns the current context.
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp
new file mode 100644
index 0000000..2746c44
--- /dev/null
+++ b/src/script/api/qscriptprogram.cpp
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qscriptprogram.h"
+#include "qscriptprogram_p.h"
+#include "qscriptengine.h"
+#include "qscriptengine_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+  \since 4.6
+  \class QScriptProgram
+
+  \brief The QScriptProgram class ...
+
+  \ingroup script
+
+*/
+
+QScriptProgramPrivate::QScriptProgramPrivate(QScriptEnginePrivate *e,
+                                             JSC::EvalExecutable *x,
+                                             intptr_t id)
+    : engine(e), executable(x), sourceId(id)
+{
+    ref = 0;
+}
+
+QScriptProgramPrivate::~QScriptProgramPrivate()
+{
+}
+
+QScriptProgramPrivate *QScriptProgramPrivate::get(const QScriptProgram &q)
+{
+    return const_cast<QScriptProgramPrivate*>(q.d_func());
+}
+
+QScriptProgram QScriptProgramPrivate::create(QScriptEnginePrivate *engine,
+                                             JSC::EvalExecutable *executable,
+                                             intptr_t sourceId)
+{
+    QScriptProgramPrivate *d = new QScriptProgramPrivate(engine, executable, sourceId);
+    QScriptProgram result;
+    result.d_ptr = d;
+    return result;
+}
+
+/*!
+  Constructs an invalid QScriptProgram.
+*/
+QScriptProgram::QScriptProgram()
+    : d_ptr(0)
+{
+}
+
+/*!
+  Constructs a new QScriptProgram that is a copy of \a other.
+*/
+QScriptProgram::QScriptProgram(const QScriptProgram &other)
+    : d_ptr(other.d_ptr)
+{
+}
+
+/*!
+  Destroys this QScriptProgram.
+*/
+QScriptProgram::~QScriptProgram()
+{
+    Q_D(QScriptProgram);
+    //    if (d->engine && (d->ref == 1))
+    //      d->engine->unregisterScriptProgram(d);
+}
+
+/*!
+  Assigns the \a other value to this QScriptProgram.
+*/
+QScriptProgram &QScriptProgram::operator=(const QScriptProgram &other)
+{
+  //    if (d_func() && d_func()->engine && (d_func()->ref == 1))
+      //        d_func()->engine->unregisterScriptProgram(d_func());
+  //    }
+    d_ptr = other.d_ptr;
+    return *this;
+}
+
+/*!
+  Returns true if this QScriptProgram is valid; otherwise
+  returns false.
+*/
+bool QScriptProgram::isValid() const
+{
+    Q_D(const QScriptProgram);
+    return (d && d->engine);
+}
+
+QT_END_NAMESPACE
diff --git a/src/script/api/qscriptprogram.h b/src/script/api/qscriptprogram.h
new file mode 100644
index 0000000..6c2ba47
--- /dev/null
+++ b/src/script/api/qscriptprogram.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSCRIPTPROGRAM_H
+#define QSCRIPTPROGRAM_H
+
+#include <QtCore/qsharedpointer.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Script)
+
+class QScriptProgramPrivate;
+class Q_SCRIPT_EXPORT QScriptProgram
+{
+public:
+    QScriptProgram();
+    QScriptProgram(const QScriptProgram &other);
+    ~QScriptProgram();
+
+    QScriptProgram &operator=(const QScriptProgram &other);
+
+    bool isValid() const;
+
+private:
+    QExplicitlySharedDataPointer<QScriptProgramPrivate> d_ptr;
+    Q_DECLARE_PRIVATE(QScriptProgram)
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QSCRIPTPROGRAM_H
diff --git a/src/script/api/qscriptprogram_p.h b/src/script/api/qscriptprogram_p.h
new file mode 100644
index 0000000..fe06b38
--- /dev/null
+++ b/src/script/api/qscriptprogram_p.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSCRIPTPROGRAM_P_H
+#define QSCRIPTPROGRAM_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/qobjectdefs.h>
+
+namespace JSC
+{
+    class EvalExecutable;
+}
+
+QT_BEGIN_NAMESPACE
+
+class QScriptEnginePrivate;
+
+class QScriptProgramPrivate
+{
+public:
+    QScriptProgramPrivate(QScriptEnginePrivate*,
+                          JSC::EvalExecutable*,
+                          intptr_t);
+    ~QScriptProgramPrivate();
+
+    static QScriptProgramPrivate *get(const QScriptProgram &q);
+    static QScriptProgram create(QScriptEnginePrivate*,
+                                 JSC::EvalExecutable*,
+                                 intptr_t);
+
+    QBasicAtomicInt ref;
+    QScriptEnginePrivate *engine;
+    JSC::EvalExecutable *executable;
+    intptr_t sourceId;
+};
+
+QT_END_NAMESPACE
+
+#endif