1 files changed, 86 insertions, 7 deletions

diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index cde116d..ec7c144 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -101,11 +101,22 @@ namespace QScript
     class TimeoutCheckerProxy;
 
     //some conversion helper functions
-    QScriptEnginePrivate *scriptEngineFromExec(const JSC::ExecState *exec);
+    inline QScriptEnginePrivate *scriptEngineFromExec(const JSC::ExecState *exec);
     bool isFunction(JSC::JSValue value);
 
     class UStringSourceProviderWithFeedback;
-}
+
+struct GlobalClientData : public JSC::JSGlobalData::ClientData
+{
+    GlobalClientData(QScriptEnginePrivate *e)
+        : engine(e) {}
+    virtual ~GlobalClientData() {}
+    virtual void mark(JSC::MarkStack& markStack);
+
+    QScriptEnginePrivate *engine;
+};
+
+} // namespace QScript
 
 class QScriptEnginePrivate
 #ifndef QT_NO_QOBJECT
@@ -147,16 +158,16 @@ public:
     JSC::JSValue defaultPrototype(int metaTypeId) const;
     void setDefaultPrototype(int metaTypeId, JSC::JSValue prototype);
 
-    static QScriptContext *contextForFrame(JSC::ExecState *frame);
-    static JSC::ExecState *frameForContext(QScriptContext *context);
-    static const JSC::ExecState *frameForContext(const QScriptContext *context);
+    static inline QScriptContext *contextForFrame(JSC::ExecState *frame);
+    static inline JSC::ExecState *frameForContext(QScriptContext *context);
+    static inline const JSC::ExecState *frameForContext(const QScriptContext *context);
 
     JSC::JSGlobalObject *originalGlobalObject() const;
     JSC::JSObject *getOriginalGlobalObjectProxy();
     JSC::JSObject *customGlobalObject() const;
     JSC::JSObject *globalObject() const;
     void setGlobalObject(JSC::JSObject *object);
-    JSC::ExecState *globalExec() const;
+    inline JSC::ExecState *globalExec() const;
     JSC::JSValue toUsableValue(JSC::JSValue value);
     static JSC::JSValue thisForContext(JSC::ExecState *frame);
     static JSC::Register *thisRegisterForFrame(JSC::ExecState *frame);
@@ -367,6 +378,11 @@ private:
     JSC::ExecState *oldFrame;
 };
 
+inline QScriptEnginePrivate *scriptEngineFromExec(const JSC::ExecState *exec)
+{
+    return static_cast<GlobalClientData*>(exec->globalData().clientData)->engine;
+}
+
 } // namespace QScript
 
 inline QScriptValuePrivate *QScriptEnginePrivate::allocateScriptValuePrivate(size_t size)
@@ -451,7 +467,7 @@ inline void QScriptValuePrivate::initFrom(JSC::JSValue value)
         engine->registerScriptValue(this);
 }
 
-inline void QScriptValuePrivate::initFrom(double value)
+inline void QScriptValuePrivate::initFrom(qsreal value)
 {
     type = Number;
     numberValue = value;
@@ -473,6 +489,28 @@ inline QScriptValue QScriptValuePrivate::property(const QString &name, int resol
     return property(JSC::Identifier(exec, name), resolveMode);
 }
 
+inline QScriptValue QScriptValuePrivate::property(const JSC::Identifier &id, int resolveMode) const
+{
+    Q_ASSERT(isObject());
+    JSC::ExecState *exec = engine->currentFrame;
+    JSC::JSObject *object = JSC::asObject(jscValue);
+    JSC::PropertySlot slot(object);
+    if ((resolveMode & QScriptValue::ResolvePrototype) && object->getPropertySlot(exec, id, slot))
+        return engine->scriptValueFromJSCValue(slot.getValue(exec, id));
+    return propertyHelper(id, resolveMode);
+}
+
+inline QScriptValue QScriptValuePrivate::property(quint32 index, int resolveMode) const
+{
+    Q_ASSERT(isObject());
+    JSC::ExecState *exec = engine->currentFrame;
+    JSC::JSObject *object = JSC::asObject(jscValue);
+    JSC::PropertySlot slot(object);
+    if ((resolveMode & QScriptValue::ResolvePrototype) && object->getPropertySlot(exec, index, slot))
+        return engine->scriptValueFromJSCValue(slot.getValue(exec, index));
+    return propertyHelper(index, resolveMode);
+}
+
 inline void* QScriptValuePrivate::operator new(size_t size, QScriptEnginePrivate *engine)
 {
     if (engine)
@@ -489,6 +527,22 @@ inline void QScriptValuePrivate::operator delete(void *ptr)
         qFree(d);
 }
 
+inline void QScriptValuePrivate::saveException(JSC::ExecState *exec, JSC::JSValue *val)
+{
+    if (exec) {
+        *val = exec->exception();
+        exec->clearException();
+    } else {
+        *val = JSC::JSValue();
+    }
+}
+
+inline void QScriptValuePrivate::restoreException(JSC::ExecState *exec, JSC::JSValue val)
+{
+    if (exec && val)
+        exec->setException(val);
+}
+
 inline void QScriptEnginePrivate::registerScriptString(QScriptStringPrivate *value)
 {
     Q_ASSERT(value->type == QScriptStringPrivate::HeapAllocated);
@@ -512,6 +566,31 @@ inline void QScriptEnginePrivate::unregisterScriptString(QScriptStringPrivate *v
     value->next = 0;
 }
 
+inline QScriptContext *QScriptEnginePrivate::contextForFrame(JSC::ExecState *frame)
+{
+    if (frame && frame->callerFrame()->hasHostCallFrameFlag() && !frame->callee()
+        && frame->callerFrame()->removeHostCallFrameFlag() == QScript::scriptEngineFromExec(frame)->globalExec()) {
+        //skip the "fake" context created in Interpreter::execute.
+        frame = frame->callerFrame()->removeHostCallFrameFlag();
+    }
+    return reinterpret_cast<QScriptContext *>(frame);
+}
+
+inline JSC::ExecState *QScriptEnginePrivate::frameForContext(QScriptContext *context)
+{
+    return reinterpret_cast<JSC::ExecState*>(context);
+}
+
+inline const JSC::ExecState *QScriptEnginePrivate::frameForContext(const QScriptContext *context)
+{
+    return reinterpret_cast<const JSC::ExecState*>(context);
+}
+
+inline JSC::ExecState *QScriptEnginePrivate::globalExec() const
+{
+    return originalGlobalObject()->globalExec();
+}
+
 QT_END_NAMESPACE
 
 #endif