diff options
author | Robin Burchell <robin.burchell@crimson.no> | 2017-02-08 23:16:12 +0100 |
---|---|---|
committer | Robin Burchell <robin.burchell@crimson.no> | 2017-02-09 14:53:06 +0000 |
commit | 62268fb2a025fee49d0ac8bcf965cc989b583cae (patch) | |
tree | 0139e9019bcef78d14d75d3ff856dd5c86e73a1a /src/qml/jsruntime/qv4objectproto.cpp | |
parent | 5f83e6dfe698d65a0c145ccfd09c9f00609311ca (diff) |
Object: Introduce set and setIndexed
These names are what the ES6 spec uses for this operation. We also
introduce a bool to allow throwing unconditionally if a set fails (which
the spec requires the Set operation to do in a number of places). This
requirement was also present in ES5, but we ignored it, and thus far got
away with it.
Long term, put and putIndexed should go away, but I don't feel
comfortable porting everything over blindly, as some operations do
require throwing, namely:
* Various Array & TypedArray methods that alter 'length'
* Various RegExp methods that alter 'lastIndex'
This change also ports the new Object.assign to use the must-throw
version of set(), which coincidentally fixes the one test failure in
non-strict mode.
Change-Id: Ida641a552d805af0fd9de3333eb62cc6adb3713c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index d8063c64de..f650ffc7b1 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -194,7 +194,7 @@ void ObjectPrototype::method_assign(const BuiltinFunction *, Scope &scope, CallD continue; propValue = from->get(nextKey); - to->put(nextKey, propValue); + to->set(nextKey, propValue, Object::DoThrowOnRejection); CHECK_EXCEPTION(); } } |