diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-23 23:07:23 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-02 19:29:43 +0000 |
| commit | 56bff8f7abc2f0eeadd4d197667132af6eed6f3a (patch) | |
| tree | 13990d34f9239e1845dedaa452bc1093f38b027a /src/qml/jsruntime/qv4string.cpp | |
| parent | 86f88521fbea59e8ec53e50cc1e3e68a61f53c40 (diff) | |
Clean up the property key API in StringOrSymbol
Get rid of makeIdentifier(), as toPropertyKey() will take
care of it.
Rename identifier() to propertyKey() and check that the
key is valid.
Remove String/StringOrSymbol::asArrayIndex(), we don't need it
anymore.
Change-Id: I3c490fabc1475c9ea288b49b1638b6fa1bc237b7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4string.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4string.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp index ce5bc7f13e..7c1aef482a 100644 --- a/src/qml/jsruntime/qv4string.cpp +++ b/src/qml/jsruntime/qv4string.cpp @@ -166,7 +166,7 @@ uint String::toUInt(bool *ok) const return UINT_MAX; } -void String::makeIdentifierImpl() const +void String::createPropertyKeyImpl() const { if (!d()->text) d()->simplifyString(); @@ -251,11 +251,10 @@ void Heap::StringOrSymbol::createHashValue() const } PropertyKey StringOrSymbol::toPropertyKey() const { - uint index = asArrayIndex(); - if (index < UINT_MAX) - return PropertyKey::fromArrayIndex(index); - makeIdentifier(); - return identifier(); + if (d()->identifier.isValid()) + return d()->identifier; + createPropertyKey(); + return propertyKey(); } uint String::getLength(const Managed *m) |