diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-08-16 20:40:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-17 09:26:40 +0200 |
| commit | 0da208381f98ffd22790716a144aa5f22a5fd07e (patch) | |
| tree | 0f9598c0a466cf243b78f6255b0c4be77aec3288 /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | 3cfc7e0c026faf70eff8e180a2df3a01b34491c0 (diff) | |
Never convert the this object when calling a builtin function
When calling builtin methods, the this object should should be
passed unmodified to the method. This failed so far because some
of our buitin methods where implemented slightly wrong.
Change-Id: I725f4dc952b4af6101645cf702e01b5410406a92
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 214ec9381c..ee69be4e31 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -147,12 +147,15 @@ Value ArrayPrototype::method_concat(SimpleCallContext *ctx) if (ArrayObject *instance = ctx->thisObject.asArrayObject()) { result->copyArrayData(instance); + } else if (ctx->thisObject.isString()) { + QString v = ctx->thisObject.stringValue()->toQString(); + result->arraySet(0, Value::fromString(ctx, v)); } else if (ctx->thisObject.asStringObject()) { QString v = ctx->thisObject.toString(ctx)->toQString(); result->arraySet(0, Value::fromString(ctx, v)); } else { - Object *instance = ctx->thisObject.asObject(); - result->arraySet(0, ctx->thisObject); + Object *instance = ctx->thisObject.toObject(ctx); + result->arraySet(0, Value::fromObject(instance)); } for (uint i = 0; i < ctx->argumentCount; ++i) { @@ -646,7 +649,7 @@ Value ArrayPrototype::method_every(SimpleCallContext *ctx) Value args[3]; args[0] = v; args[1] = Value::fromDouble(k); - args[2] = ctx->thisObject; + args[2] = Value::fromObject(instance); Value r = callback->call(thisArg, args, 3); ok = r.toBoolean(); } @@ -674,7 +677,7 @@ Value ArrayPrototype::method_some(SimpleCallContext *ctx) Value args[3]; args[0] = v; args[1] = Value::fromDouble(k); - args[2] = ctx->thisObject; + args[2] = Value::fromObject(instance); Value r = callback->call(thisArg, args, 3); if (r.toBoolean()) return Value::fromBoolean(true); @@ -703,7 +706,7 @@ Value ArrayPrototype::method_forEach(SimpleCallContext *ctx) Value args[3]; args[0] = v; args[1] = Value::fromDouble(k); - args[2] = ctx->thisObject; + args[2] = Value::fromObject(instance); callback->call(thisArg, args, 3); } return Value::undefinedValue(); @@ -734,7 +737,7 @@ Value ArrayPrototype::method_map(SimpleCallContext *ctx) Value args[3]; args[0] = v; args[1] = Value::fromDouble(k); - args[2] = ctx->thisObject; + args[2] = Value::fromObject(instance); Value mapped = callback->call(thisArg, args, 3); a->arraySet(k, mapped); } @@ -766,7 +769,7 @@ Value ArrayPrototype::method_filter(SimpleCallContext *ctx) Value args[3]; args[0] = v; args[1] = Value::fromDouble(k); - args[2] = ctx->thisObject; + args[2] = Value::fromObject(instance); Value selected = callback->call(thisArg, args, 3); if (selected.toBoolean()) { a->arraySet(to, v); @@ -810,7 +813,7 @@ Value ArrayPrototype::method_reduce(SimpleCallContext *ctx) args[0] = acc; args[1] = v; args[2] = Value::fromDouble(k); - args[3] = ctx->thisObject; + args[3] = Value::fromObject(instance); acc = callback->call(Value::undefinedValue(), args, 4); } ++k; @@ -858,7 +861,7 @@ Value ArrayPrototype::method_reduceRight(SimpleCallContext *ctx) args[0] = acc; args[1] = v; args[2] = Value::fromDouble(k - 1); - args[3] = ctx->thisObject; + args[3] = Value::fromObject(instance); acc = callback->call(Value::undefinedValue(), args, 4); } --k; |