Small Refactoring of QScript

- Create a scope (activation object) for the native constructor in QScriptClass
- put the isCalledasConstructor in the activation object (so i can
  clean up the QScriptContext
- Remove the code duplication in all native functions.

Aknoweldged-by: Kent

1 files changed, 20 insertions, 0 deletions

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 6bf7354..4fe8f76 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -871,6 +871,26 @@ JSC::JSValue stringProtoFuncArg(JSC::ExecState *exec, JSC::JSObject*, JSC::JSVal
     return JSC::jsString(exec, qtStringToJSCUString(result));
 }
 
+
+QScriptPushScopeHelper::QScriptPushScopeHelper(JSC::CallFrame *exec, bool calledAsConstructor)
+{
+    engine = scriptEngineFromExec(exec);
+    previousFrame = engine->currentFrame;
+    engine->currentFrame = exec;
+    QScriptActivationObject *scope = new (exec) QScriptActivationObject(exec);
+    scope->d_ptr()->calledAsConstructor = calledAsConstructor;
+    exec->setScopeChain(exec->scopeChain()->copy()->push(scope));
+}
+
+QScriptPushScopeHelper::~QScriptPushScopeHelper()
+{
+    JSC::CallFrame *exec = engine->currentFrame;
+    exec->setScopeChain(exec->scopeChain()->pop());
+    exec->scopeChain()->deref();
+    engine->currentFrame = previousFrame;
+    engine->releaseContextForFrame(exec);
+}
+
 } // namespace QScript
 
 namespace JSC {