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

equal deleted inserted replaced

-:cc75c76972ee
+:c0432d11811c
 #include "qdebug.h"
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmetaobject.h>
+#include "CodeBlock.h"
 #include "Error.h"
 #include "JSArray.h"
 #include "JSLock.h"
 #include "Interpreter.h"
 #include "DateConstructor.h"
 if (encStr == QLatin1String("CodecForTr"))
 encoding = QCoreApplication::CodecForTr;
 else if (encStr == QLatin1String("UnicodeUTF8"))
 encoding = QCoreApplication::UnicodeUTF8;
 else
-return JSC::throwError(exec, JSC::GeneralError, QString::fromLatin1("qsTranslate(): invalid encoding '%s'").arg(encStr));
+return JSC::throwError(exec, JSC::GeneralError, QString::fromLatin1("qsTranslate(): invalid encoding '%0'").arg(encStr));
 }
 int n = -1;
 if (args.size() > 4)
 n = args.at(4).toInt32(exec);
 #endif
 if (!args.at(0).isString())
 return JSC::throwError(exec, JSC::GeneralError, "qsTr(): first argument (text) must be a string");
 if ((args.size() > 1) && !args.at(1).isString())
 return JSC::throwError(exec, JSC::GeneralError, "qsTr(): second argument (comment) must be a string");
 if ((args.size() > 2) && !args.at(2).isNumber())
-return JSC::throwError(exec, JSC::GeneralError, "qsTranslate(): third argument (n) must be a number");
+return JSC::throwError(exec, JSC::GeneralError, "qsTr(): third argument (n) must be a number");
 #ifndef QT_NO_QOBJECT
 QString context;
-QScriptContext *ctx = QScriptEnginePrivate::contextForFrame(exec);
+// The first non-empty source URL in the call stack determines the translation context.
-if (ctx && ctx->parentContext())
+{
-context = QFileInfo(QScriptContextInfo(ctx->parentContext()).fileName()).baseName();
+JSC::ExecState *frame = exec->removeHostCallFrameFlag();
+while (frame) {
+if (frame->codeBlock() && frame->codeBlock()->source()
+&& !frame->codeBlock()->source()->url().isEmpty()) {
+context = QFileInfo(frame->codeBlock()->source()->url()).baseName();
+break;
+}
+frame = frame->callerFrame()->removeHostCallFrameFlag();
+}
+}
 #endif
 QString text(args.at(0).toString(exec));
 #ifndef QT_NO_QOBJECT
 QString comment;
 if (args.size() > 1)
 void QScriptEnginePrivate::setGlobalObject(JSC::JSObject *object)
 {
 if (object == globalObject())
 return;
 QScript::GlobalObject *glob = static_cast<QScript::GlobalObject*>(originalGlobalObject());
-if (object == originalGlobalObjectProxy)
+if (object == originalGlobalObjectProxy) {
 glob->customGlobalObject = 0;
-else {
+// Sync the internal prototype, since JSObject::prototype() is not virtual.
+glob->setPrototype(originalGlobalObjectProxy->prototype());
+} else {
 Q_ASSERT(object != originalGlobalObject());
 glob->customGlobalObject = object;
+// Sync the internal prototype, since JSObject::prototype() is not virtual.
+glob->setPrototype(object->prototype());
 }
 }
 /*!
 \internal
 return result;
 }
 #ifndef QT_NO_REGEXP
-extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax);
+Q_DECL_IMPORT extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax);
 /*!
 Creates a QtScript object of class RegExp with the given
 \a regexp.
 if (!jscObject || !jscObject.isObject())
 jscObject = d->globalObject();
 //    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::PrototypeFunction(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));
 glob->stringPrototype()->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "arg"), QScript::stringProtoFuncArg));
 }

branch	RCL_3
changeset 13	c0432d11811c
parent 7	3f74d0d4af4c