diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-04-05 16:23:22 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-05 20:39:09 +0200 |
commit | 3b73dd08e0cb705dc57f6cce8b528c36aad40bcc (patch) | |
tree | 6a8feac3b99b719d91f95d2660ba5bdd6168c6a4 /src/v4/qv4functionobject.cpp | |
parent | 8da2e2af2634fbba0920a6296ad470c491ae00f7 (diff) |
Move arguments out of ExecutionContext and into CallContext
Change-Id: Ic826e3e71eac9171fa113dec79db7c69982f2386
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/v4/qv4functionobject.cpp')
-rw-r--r-- | src/v4/qv4functionobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/v4/qv4functionobject.cpp b/src/v4/qv4functionobject.cpp index 801291e0..91bff417 100644 --- a/src/v4/qv4functionobject.cpp +++ b/src/v4/qv4functionobject.cpp @@ -239,7 +239,7 @@ void FunctionPrototype::init(ExecutionContext *ctx, const Value &ctor) } -Value FunctionPrototype::method_toString(ExecutionContext *ctx) +Value FunctionPrototype::method_toString(CallContext *ctx) { FunctionObject *fun = ctx->thisObject.asFunctionObject(); if (!fun) @@ -248,7 +248,7 @@ Value FunctionPrototype::method_toString(ExecutionContext *ctx) return Value::fromString(ctx, QStringLiteral("function() { [code] }")); } -Value FunctionPrototype::method_apply(ExecutionContext *ctx) +Value FunctionPrototype::method_apply(CallContext *ctx) { Value thisArg = ctx->argument(0); @@ -273,7 +273,7 @@ Value FunctionPrototype::method_apply(ExecutionContext *ctx) return o->call(ctx, thisArg, args.data(), args.size()); } -Value FunctionPrototype::method_call(ExecutionContext *ctx) +Value FunctionPrototype::method_call(CallContext *ctx) { Value thisArg = ctx->argument(0); @@ -289,7 +289,7 @@ Value FunctionPrototype::method_call(ExecutionContext *ctx) return o->call(ctx, thisArg, args.data(), args.size()); } -Value FunctionPrototype::method_bind(ExecutionContext *ctx) +Value FunctionPrototype::method_bind(CallContext *ctx) { FunctionObject *target = ctx->thisObject.asFunctionObject(); if (!target) @@ -306,7 +306,7 @@ Value FunctionPrototype::method_bind(ExecutionContext *ctx) } -static Value throwTypeError(ExecutionContext *ctx) +static Value throwTypeError(CallContext *ctx) { ctx->throwTypeError(); return Value::undefinedValue(); @@ -414,7 +414,7 @@ Value ScriptFunction::call(Managed *that, ExecutionContext *context, const Value DEFINE_MANAGED_VTABLE(BuiltinFunctionOld); -BuiltinFunctionOld::BuiltinFunctionOld(ExecutionContext *scope, String *name, Value (*code)(ExecutionContext *)) +BuiltinFunctionOld::BuiltinFunctionOld(ExecutionContext *scope, String *name, Value (*code)(CallContext *)) : FunctionObject(scope) , code(code) { @@ -432,7 +432,7 @@ Value BuiltinFunctionOld::construct(Managed *, ExecutionContext *ctx, Value *, i Value BuiltinFunctionOld::call(Managed *that, ExecutionContext *context, const Value &thisObject, Value *args, int argc) { BuiltinFunctionOld *f = static_cast<BuiltinFunctionOld *>(that); - ExecutionContext *ctx = context->engine->newCallContext(f, thisObject, args, argc); + CallContext *ctx = context->engine->newCallContext(f, thisObject, args, argc); ctx->thisObject = thisObject; if (!f->strictMode && !thisObject.isObject()) { |