FCL/sf/mw/qt: comparison src/script/api/qscriptengine.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 #include <math.h>
 #include "CodeBlock.h"
 #include "Error.h"
-#include "JSLock.h"
 #include "Interpreter.h"
 #include "PrototypeFunction.h"
 #include "InitializeThreading.h"
 #include "ObjectPrototype.h"
 error); in that case, the return value is the value that was thrown
 (typically an \c{Error} object). You can check whether the
 evaluation caused an exception by calling hasUncaughtException(). In
 that case, you can call toString() on the error object to obtain an
 error message. The current uncaught exception is also available
-through uncaughtException(). You can obtain a human-readable
+through uncaughtException().
-backtrace of the exception with uncaughtExceptionBacktrace().
 Calling clearExceptions() will cause any uncaught exceptions to be
 cleared.
 \snippet doc/src/snippets/code/src_script_qscriptengine.cpp 4
 static JSC::JSValue JSC_HOST_CALL functionQsTranslate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 static JSC::JSValue JSC_HOST_CALL functionQsTranslateNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 static JSC::JSValue JSC_HOST_CALL functionQsTr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 static JSC::JSValue JSC_HOST_CALL functionQsTrNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
+static JSC::JSValue JSC_HOST_CALL functionQsTrId(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
+static JSC::JSValue JSC_HOST_CALL functionQsTrIdNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 JSC::JSValue JSC_HOST_CALL functionQsTranslate(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args)
 {
 if (args.size() < 2)
 return JSC::throwError(exec, JSC::GeneralError, "qsTranslate() requires at least two arguments");
 if (args.size() < 1)
 return JSC::jsUndefined();
 return args.at(0);
 }
+JSC::JSValue JSC_HOST_CALL functionQsTrId(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args)
+{
+if (args.size() < 1)
+return JSC::throwError(exec, JSC::GeneralError, "qsTrId() requires at least one argument");
+if (!args.at(0).isString())
+return JSC::throwError(exec, JSC::TypeError, "qsTrId(): first argument (id) must be a string");
+if ((args.size() > 1) && !args.at(1).isNumber())
+return JSC::throwError(exec, JSC::TypeError, "qsTrId(): second argument (n) must be a number");
+JSC::UString id = args.at(0).toString(exec);
+int n = -1;
+if (args.size() > 1)
+n = args.at(1).toInt32(exec);
+return JSC::jsString(exec, qtTrId(QScript::convertToLatin1(id).constData(), n));
+}
+JSC::JSValue JSC_HOST_CALL functionQsTrIdNoOp(JSC::ExecState *, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args)
+{
+if (args.size() < 1)
+return JSC::jsUndefined();
+return args.at(0);
+}
 static JSC::JSValue JSC_HOST_CALL stringProtoFuncArg(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 JSC::JSValue JSC_HOST_CALL stringProtoFuncArg(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue thisObject, const JSC::ArgList &args)
 {
 QString value(thisObject.toString(exec));
 detachAllRegisteredScriptValues();
 detachAllRegisteredScriptStrings();
 qDeleteAll(m_qobjectData);
 qDeleteAll(m_typeInfos);
-JSC::JSLock lock(false);
 globalData->heap.destroy();
 globalData->deref();
 while (freeScriptValues) {
 QScriptValuePrivate *p = freeScriptValues;
 freeScriptValues = p->next;
 return globalData->heap.isBusy();
 }
 void QScriptEnginePrivate::collectGarbage()
 {
-JSC::JSLock lock(false);
 QScript::APIShim shim(this);
 globalData->heap.collectAllGarbage();
 }
 void QScriptEnginePrivate::reportAdditionalMemoryCost(int size)
 JSC::JSValue QScriptEnginePrivate::evaluateHelper(JSC::ExecState *exec, intptr_t sourceId,
 JSC::EvalExecutable *executable,
 bool &compile)
 {
 Q_Q(QScriptEngine);
-JSC::JSLock lock(false); // ### hmmm
 QBoolBlocker inEvalBlocker(inEval, true);
 q->currentContext()->activationObject(); //force the creation of a context for native function;
 JSC::Debugger* debugger = originalGlobalObject()->debugger();
 if (debugger)
 bool compile = true;
 return d->scriptValueFromJSCValue(d->evaluateHelper(exec, sourceId, executable.get(), compile));
 }
 /*!
-\internal
+\since 4.7
-\since 4.6
 Evaluates the given \a program and returns the result of the
 evaluation.
 */
 QScriptValue QScriptEngine::evaluate(const QScriptProgram &program)
 Returns true if the last script evaluation resulted in an uncaught
 exception; otherwise returns false.
 The exception state is cleared when evaluate() is called.
-\sa uncaughtException(), uncaughtExceptionLineNumber(),
+\sa uncaughtException(), uncaughtExceptionLineNumber()
-uncaughtExceptionBacktrace()
 */
 bool QScriptEngine::hasUncaughtException() const
 {
 Q_D(const QScriptEngine);
 JSC::ExecState* exec = d->globalExec();
 The exception value is typically an \c{Error} object; in that case,
 you can call toString() on the return value to obtain an error
 message.
 \sa hasUncaughtException(), uncaughtExceptionLineNumber(),
-uncaughtExceptionBacktrace()
 */
 QScriptValue QScriptEngine::uncaughtException() const
 {
 Q_D(const QScriptEngine);
 QScriptValue result;
 Returns the line number where the last uncaught exception occurred.
 Line numbers are 1-based, unless a different base was specified as
 the second argument to evaluate().
-\sa hasUncaughtException(), uncaughtExceptionBacktrace()
+\sa hasUncaughtException()
 */
 int QScriptEngine::uncaughtExceptionLineNumber() const
 {
 if (!hasUncaughtException())
 return -1;
 }
 /*!
 Returns a human-readable backtrace of the last uncaught exception.
-Each line is of the form \c{<function-name>(<arguments>)@<file-name>:<line-number>}.
+It is in the form \c{<function-name>()@<file-name>:<line-number>}.
 \sa uncaughtException()
 */
 QStringList QScriptEngine::uncaughtExceptionBacktrace() const
 {
 \header \o Script Function \o Corresponding C++ Function
 \row    \o qsTr()       \o QObject::tr()
 \row    \o QT_TR_NOOP() \o QT_TR_NOOP()
 \row    \o qsTranslate() \o QCoreApplication::translate()
 \row    \o QT_TRANSLATE_NOOP() \o QT_TRANSLATE_NOOP()
+\row    \o qsTrId() (since 4.7) \o qtTrId()
+\row    \o QT_TRID_NOOP() (since 4.7) \o QT_TRID_NOOP()
 \endtable
 \sa {Internationalization with Qt}
 */
 void QScriptEngine::installTranslatorFunctions(const QScriptValue &object)
 //    unsigned attribs = JSC::DontEnum;
 JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 5, JSC::Identifier(exec, "qsTranslate"), QScript::functionQsTranslate));
 JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 2, JSC::Identifier(exec, "QT_TRANSLATE_NOOP"), QScript::functionQsTranslateNoOp));
 JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 3, JSC::Identifier(exec, "qsTr"), QScript::functionQsTr));
 JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "QT_TR_NOOP"), QScript::functionQsTrNoOp));
+JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "qsTrId"), QScript::functionQsTrId));
+JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "QT_TRID_NOOP"), QScript::functionQsTrIdNoOp));
 glob->stringPrototype()->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "arg"), QScript::stringProtoFuncArg));
 }
 /*!
 if (agent && (agent->engine() != this)) {
 qWarning("QScriptEngine::setAgent(): "
 "cannot set agent belonging to different engine");
 return;
 }
+QScript::APIShim shim(d);
 if (d->activeAgent)
 QScriptEngineAgentPrivate::get(d->activeAgent)->detach();
 d->activeAgent = agent;
 if (agent) {
 QScriptEngineAgentPrivate::get(agent)->attach();

changeset 37	758a864f9613
parent 33	3e2da88830cd