diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-10-20 15:14:41 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-07 09:00:26 +0000 |
commit | c6c79644dc869259482a011f8b737f709af02fb2 (patch) | |
tree | 6f3c3a721f7bbd1b1a76189b537faffc4de24c1a /src/qml/jsruntime/qv4runtime.cpp | |
parent | 7287690a41ab762c0c4efe02632efeaf3e0187b4 (diff) |
Rename JSCall to JSCallData
As, this is going to change in a simple stack based structure
to keep pointers to the data to pass to calls.
Change-Id: Ia9aa3f81ee3eeba36affd16aac7b2fe97d59aea9
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 9077be7bfe..2a046da346 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -428,7 +428,7 @@ ReturnedValue RuntimeHelpers::objectDefaultValue(const Object *object, int typeH Scope scope(engine); ScopedValue conv(scope, object->get(meth1)); - JSCall jsCall(scope, nullptr, 0); + JSCallData jsCall(scope, nullptr, 0); jsCall->thisObject = *object; if (FunctionObject *o = conv->as<FunctionObject>()) { @@ -981,7 +981,7 @@ ReturnedValue Runtime::method_callGlobalLookup(ExecutionEngine *engine, uint ind ReturnedValue Runtime::method_callPossiblyDirectEval(ExecutionEngine *engine, Value *argv, int argc) { Scope scope(engine); - JSCall callData(scope, argv, argc); + JSCallData callData(scope, argv, argc); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); ExecutionContext &ctx = static_cast<ExecutionContext &>(engine->currentStackFrame->jsFrame->context); @@ -1008,7 +1008,7 @@ ReturnedValue Runtime::method_callPossiblyDirectEval(ExecutionEngine *engine, Va ReturnedValue Runtime::method_callName(ExecutionEngine *engine, int nameIndex, Value *argv, int argc) { Scope scope(engine); - JSCall callData(scope, argv, argc); + JSCallData callData(scope, argv, argc); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); callData->function = engine->currentStackFrame->v4Function->compilationUnit->runtimeStrings[nameIndex]; @@ -1035,7 +1035,7 @@ ReturnedValue Runtime::method_callName(ExecutionEngine *engine, int nameIndex, V ReturnedValue Runtime::method_callProperty(ExecutionEngine *engine, Value *base, int nameIndex, Value *argv, int argc) { Scope scope(engine); - JSCall callData(scope, argv, argc, base); + JSCallData callData(scope, argv, argc, base); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); if (!callData->thisObject.isObject()) { @@ -1069,7 +1069,7 @@ ReturnedValue Runtime::method_callProperty(ExecutionEngine *engine, Value *base, ReturnedValue Runtime::method_callPropertyLookup(ExecutionEngine *engine, Value *base, uint index, Value *argv, int argc) { Scope scope(engine); - JSCall callData(scope, argv, argc, base); + JSCallData callData(scope, argv, argc, base); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); Q_ASSERT(engine->jsStackTop >= callData->args + callData->argc()); @@ -1086,7 +1086,7 @@ ReturnedValue Runtime::method_callPropertyLookup(ExecutionEngine *engine, Value ReturnedValue Runtime::method_callElement(ExecutionEngine *engine, Value *base, const Value &index, Value *argv, int argc) { Scope scope(engine); - JSCall callData(scope, argv, argc, base); + JSCallData callData(scope, argv, argc, base); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); callData->thisObject = callData->thisObject.toObject(engine); @@ -1107,7 +1107,7 @@ ReturnedValue Runtime::method_callValue(ExecutionEngine *engine, const Value &fu return engine->throwTypeError(QStringLiteral("%1 is not a function").arg(func.toQStringNoThrow())); Scope scope(engine); - JSCall callData(scope, func.asReturnedValue(), argv, argc); + JSCallData callData(scope, func.asReturnedValue(), argv, argc); Q_ASSERT(callData->args + callData->argc() == engine->jsStackTop); return static_cast<FunctionObject &>(callData->function).call(&callData->thisObject, callData->args, callData->argc()); @@ -1119,7 +1119,7 @@ ReturnedValue Runtime::method_construct(ExecutionEngine *engine, const Value &fu if (!function.isFunctionObject()) return engine->throwTypeError(); - return static_cast<const FunctionObject &>(function).construct(argv, argc); + return static_cast<const FunctionObject &>(function).callAsConstructor(argv, argc); } void Runtime::method_throwException(ExecutionEngine *engine, const Value &value) |