diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-28 12:33:00 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-28 13:20:29 +0000 |
| commit | 1e6b41cc180b99dfdbc58d61258871677a643ca6 (patch) | |
| tree | b50bebf4fff02dca7e59cafc198b13fdf68eecb4 /src/qml/jsruntime/qv4runtimeapi_p.h | |
| parent | 4c66a78e2f72a2767a7a4b7587436ecdfb3aebdb (diff) | |
Cleanup and inline context push/pop related code
Change-Id: I38ee6c3039663e10aee47b2005f8755fc9c50289
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4runtimeapi_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4runtimeapi_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h index c46e848ca4..68ac28919d 100644 --- a/src/qml/jsruntime/qv4runtimeapi_p.h +++ b/src/qml/jsruntime/qv4runtimeapi_p.h @@ -125,9 +125,8 @@ struct ExceptionCheck<void (*)(QV4::NoThrowEngine *, A, B, C)> { /* exceptions & scopes */ \ F(void, throwException, (ExecutionEngine *engine, const Value &value)) \ F(ReturnedValue, unwindException, (ExecutionEngine *engine)) \ - F(ReturnedValue, pushWithContext, (const Value &o, NoThrowEngine *engine)) \ - F(ReturnedValue, pushCatchContext, (NoThrowEngine *engine, int exceptionVarNameIndex)) \ - F(void, popContext, (NoThrowEngine *engine, const Value &oldContext)) \ + F(ReturnedValue, createWithContext, (ExecutionContext *parent, const Value &o)) \ + F(ReturnedValue, createCatchContext, (ExecutionContext *parent, int exceptionVarNameIndex)) \ \ /* closures */ \ F(ReturnedValue, closure, (ExecutionEngine *engine, int functionId)) \ @@ -140,7 +139,6 @@ struct ExceptionCheck<void (*)(QV4::NoThrowEngine *, A, B, C)> { /* literals */ \ F(ReturnedValue, arrayLiteral, (ExecutionEngine *engine, Value *values, uint length)) \ F(ReturnedValue, objectLiteral, (ExecutionEngine *engine, const Value *args, int classId, int arrayValueCount, int arrayGetterSetterCountAndFlags)) \ - F(ReturnedValue, regexpLiteral, (ExecutionEngine *engine, int id)) \ \ /* foreach */ \ F(ReturnedValue, foreachIterator, (ExecutionEngine *engine, const Value &in)) \ |