aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v4/qv4instruction_p.h
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2012-04-02 16:35:51 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-03 16:22:04 +0200
commit66e6b017190df4216d765da8c09a2e75501e38b4 (patch)
tree6a3267b91139881a5c3f864d0540827136fd83ef /src/qml/qml/v4/qv4instruction_p.h
parent373d78837d1d5049c5b1c2790d6f4023e6ecf974 (diff)
Add Throw instruction to the V4 virtual machine
Also, throw an exception when trying to assign something that is not a QUrl or a QString to a QUrl. Change-Id: Ic48fd519c8318d391706ebca1955a5dd2ef6e80e Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/qml/qml/v4/qv4instruction_p.h')
-rw-r--r--src/qml/qml/v4/qv4instruction_p.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4instruction_p.h b/src/qml/qml/v4/qv4instruction_p.h
index 49ac65ccf0..46a03b37c7 100644
--- a/src/qml/qml/v4/qv4instruction_p.h
+++ b/src/qml/qml/v4/qv4instruction_p.h
@@ -160,6 +160,7 @@ QT_BEGIN_NAMESPACE
F(BranchFalse, branchop) \
F(Branch, branchop) \
F(Block, blockop) \
+ F(Throw, throwop) \
/* Speculative property resolution */ \
F(InitString, initstring)
@@ -359,6 +360,12 @@ union Q_AUTOTEST_EXPORT V4Instr {
quint32 block;
};
+ struct instr_throwop {
+ QML_V4_INSTR_HEADER
+ quint8 exceptionId;
+ quint32 message;
+ };
+
instr_common common;
instr_id id;
instr_init init;
@@ -384,6 +391,7 @@ union Q_AUTOTEST_EXPORT V4Instr {
instr_initstring initstring;
instr_branchop branchop;
instr_blockop blockop;
+ instr_throwop throwop;
};
template<int N>