diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-29 11:02:35 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:03 +0200 |
| commit | 42b137bd1ee07ff604a44ead02160b792e1809f0 (patch) | |
| tree | afdf2b8161ac260f7c3e44869b60bffe911c7883 /src/qml/jsruntime/qv4errorobject_p.h | |
| parent | 06ad87eb0f8abde691026b9a72d372184d6d8249 (diff) | |
Convert ErrorObject to new storage scheme
Change-Id: I356a9947b87a5cda4eda738d3b6d5d51ee9a98f2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4errorobject_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4errorobject_p.h | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/qml/jsruntime/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h index ffb22743e5..7b812ca909 100644 --- a/src/qml/jsruntime/qv4errorobject_p.h +++ b/src/qml/jsruntime/qv4errorobject_p.h @@ -51,7 +51,16 @@ namespace QV4 { struct SyntaxErrorObject; struct ErrorObject: Object { - V4_OBJECT + struct Data : Object::Data { + StackTrace stackTrace; + String *stack; + }; + struct { + StackTrace stackTrace; + String *stack; + } __data; + + V4_OBJECT_NEW Q_MANAGED_TYPE(ErrorObject) enum { IsErrorObject = true @@ -74,9 +83,6 @@ struct ErrorObject: Object { SyntaxErrorObject *asSyntaxError(); - StackTrace stackTrace; - String *stack; - static ReturnedValue method_get_stack(CallContext *ctx); static void markObjects(Managed *that, ExecutionEngine *e); static void destroy(Managed *that) { static_cast<ErrorObject *>(that)->~ErrorObject(); } @@ -103,7 +109,7 @@ struct ReferenceErrorObject: ErrorObject { }; struct SyntaxErrorObject: ErrorObject { - V4_OBJECT + V4_OBJECT_NEW SyntaxErrorObject(ExecutionEngine *engine, const ValueRef msg); SyntaxErrorObject(ExecutionEngine *engine, const QString &msg, const QString &fileName, int lineNumber, int columnNumber); }; @@ -119,7 +125,7 @@ struct URIErrorObject: ErrorObject { struct ErrorCtor: FunctionObject { - V4_OBJECT + V4_OBJECT_NEW ErrorCtor(ExecutionContext *scope); ErrorCtor(ExecutionContext *scope, const QString &name); @@ -129,7 +135,8 @@ struct ErrorCtor: FunctionObject struct EvalErrorCtor: ErrorCtor { - V4_OBJECT + V4_OBJECT_NEW + EvalErrorCtor(ExecutionContext *scope); static ReturnedValue construct(Managed *m, CallData *callData); @@ -137,7 +144,7 @@ struct EvalErrorCtor: ErrorCtor struct RangeErrorCtor: ErrorCtor { - V4_OBJECT + V4_OBJECT_NEW RangeErrorCtor(ExecutionContext *scope); static ReturnedValue construct(Managed *m, CallData *callData); @@ -145,7 +152,7 @@ struct RangeErrorCtor: ErrorCtor struct ReferenceErrorCtor: ErrorCtor { - V4_OBJECT + V4_OBJECT_NEW ReferenceErrorCtor(ExecutionContext *scope); static ReturnedValue construct(Managed *m, CallData *callData); @@ -153,7 +160,7 @@ struct ReferenceErrorCtor: ErrorCtor struct SyntaxErrorCtor: ErrorCtor { - V4_OBJECT + V4_OBJECT_NEW SyntaxErrorCtor(ExecutionContext *scope); static ReturnedValue construct(Managed *m, CallData *callData); @@ -161,7 +168,7 @@ struct SyntaxErrorCtor: ErrorCtor struct TypeErrorCtor: ErrorCtor { - V4_OBJECT + V4_OBJECT_NEW TypeErrorCtor(ExecutionContext *scope); static ReturnedValue construct(Managed *m, CallData *callData); @@ -169,7 +176,7 @@ struct TypeErrorCtor: ErrorCtor struct URIErrorCtor: ErrorCtor { - V4_OBJECT + V4_OBJECT_NEW URIErrorCtor(ExecutionContext *scope); static ReturnedValue construct(Managed *m, CallData *callData); |