diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-05-30 14:55:34 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-06-04 13:02:28 +0000 |
commit | 502678a183e68a837a5b2ddee2978a3be5e9e008 (patch) | |
tree | acfd88d08ce3c9f3dc1f6867d136e0dcd14fdee0 /src/qml/jsruntime/qv4value_p.h | |
parent | 9a0a074452c6534f25a878047398eea77a8c7e0e (diff) |
Implement ToPropertyKey() from the ES7 spec
and use it where required.
Change-Id: I309ca61e0360b26428fc2ea5a2eea47c8e0632a0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4value_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index af956e84e1..59a8adca8f 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -415,11 +415,8 @@ public: return reinterpret_cast<Heap::String *>(m()); return toString(e, *this); } - Heap::StringOrSymbol *toStringOrSymbol(ExecutionEngine *e) const { - if (isStringOrSymbol()) - return reinterpret_cast<Heap::StringOrSymbol *>(m()); - return reinterpret_cast<Heap::StringOrSymbol *>(toString(e, *this)); - } + Heap::StringOrSymbol *toPropertyKey(ExecutionEngine *e) const; + static Heap::String *toString(ExecutionEngine *e, Value val); Heap::Object *toObject(ExecutionEngine *e) const { if (isObject()) |