Replace vera++ with clang-format (#4518)
JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik robert.fancsik@h-lab.eu
This commit is contained in:
@@ -13,20 +13,22 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "ecma-promise-object.h"
|
||||
|
||||
#include "ecma-alloc.h"
|
||||
#include "ecma-array-object.h"
|
||||
#include "ecma-boolean-object.h"
|
||||
#include "ecma-builtins.h"
|
||||
#include "ecma-builtin-handlers.h"
|
||||
#include "ecma-builtins.h"
|
||||
#include "ecma-exceptions.h"
|
||||
#include "ecma-function-object.h"
|
||||
#include "ecma-gc.h"
|
||||
#include "ecma-globals.h"
|
||||
#include "ecma-helpers.h"
|
||||
#include "ecma-jobqueue.h"
|
||||
#include "ecma-objects.h"
|
||||
#include "ecma-objects-general.h"
|
||||
#include "ecma-promise-object.h"
|
||||
#include "ecma-objects.h"
|
||||
|
||||
#include "jcontext.h"
|
||||
|
||||
#if JERRY_ESNEXT
|
||||
@@ -105,8 +107,8 @@ ecma_promise_set_state (ecma_object_t *obj_p, /**< points to promise object */
|
||||
JERRY_ASSERT (ecma_is_promise (obj_p));
|
||||
JERRY_ASSERT (ecma_promise_get_flags (obj_p) & ECMA_PROMISE_IS_PENDING);
|
||||
|
||||
uint8_t flags_to_invert = (is_fulfilled ? (ECMA_PROMISE_IS_PENDING | ECMA_PROMISE_IS_FULFILLED)
|
||||
: ECMA_PROMISE_IS_PENDING);
|
||||
uint8_t flags_to_invert =
|
||||
(is_fulfilled ? (ECMA_PROMISE_IS_PENDING | ECMA_PROMISE_IS_FULFILLED) : ECMA_PROMISE_IS_PENDING);
|
||||
|
||||
((ecma_extended_object_t *) obj_p)->u.cls.u1.promise_flags ^= flags_to_invert;
|
||||
} /* ecma_promise_set_state */
|
||||
@@ -198,10 +200,8 @@ ecma_reject_promise (ecma_value_t promise, /**< promise */
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_REJECT))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_REJECT,
|
||||
promise,
|
||||
reason,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_REJECT, promise, reason, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
|
||||
@@ -224,10 +224,8 @@ ecma_reject_promise (ecma_value_t promise, /**< promise */
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_ERROR))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_REJECT_WITHOUT_HANDLER,
|
||||
promise,
|
||||
reason,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_REJECT_WITHOUT_HANDLER, promise, reason, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
@@ -285,10 +283,8 @@ ecma_fulfill_promise (ecma_value_t promise, /**< promise */
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_RESOLVE))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_RESOLVE,
|
||||
promise,
|
||||
value,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_RESOLVE, promise, value, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
|
||||
@@ -330,10 +326,8 @@ ecma_reject_promise_with_checks (ecma_value_t promise, /**< promise */
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_ERROR))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_REJECT_FULFILLED,
|
||||
promise,
|
||||
reason,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_REJECT_FULFILLED, promise, reason, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
|
||||
@@ -370,10 +364,8 @@ ecma_fulfill_promise_with_checks (ecma_value_t promise, /**< promise */
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_ERROR))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_RESOLVE_FULFILLED,
|
||||
promise,
|
||||
value,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_RESOLVE_FULFILLED, promise, value, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
|
||||
@@ -450,16 +442,11 @@ ecma_promise_run_executor (ecma_object_t *promise_p, /**< Promise Object */
|
||||
ecma_value_t this_value) /**< this value */
|
||||
{
|
||||
ecma_object_t *resolve_func_p, *reject_func_p;
|
||||
resolve_func_p = ecma_promise_create_resolving_function (promise_p,
|
||||
ECMA_NATIVE_HANDLER_PROMISE_RESOLVE);
|
||||
reject_func_p = ecma_promise_create_resolving_function (promise_p,
|
||||
ECMA_NATIVE_HANDLER_PROMISE_REJECT);
|
||||
resolve_func_p = ecma_promise_create_resolving_function (promise_p, ECMA_NATIVE_HANDLER_PROMISE_RESOLVE);
|
||||
reject_func_p = ecma_promise_create_resolving_function (promise_p, ECMA_NATIVE_HANDLER_PROMISE_REJECT);
|
||||
|
||||
ecma_value_t argv[] = { ecma_make_object_value (resolve_func_p), ecma_make_object_value (reject_func_p) };
|
||||
ecma_value_t result = ecma_op_function_call (ecma_get_object_from_value (executor),
|
||||
this_value,
|
||||
argv,
|
||||
2);
|
||||
ecma_value_t result = ecma_op_function_call (ecma_get_object_from_value (executor), this_value, argv, 2);
|
||||
ecma_deref_object (resolve_func_p);
|
||||
ecma_deref_object (reject_func_p);
|
||||
|
||||
@@ -487,8 +474,7 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function
|
||||
}
|
||||
|
||||
/* 3. */
|
||||
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (new_target_p,
|
||||
ECMA_BUILTIN_ID_PROMISE_PROTOTYPE);
|
||||
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (new_target_p, ECMA_BUILTIN_ID_PROMISE_PROTOTYPE);
|
||||
|
||||
if (JERRY_UNLIKELY (proto_p == NULL))
|
||||
{
|
||||
@@ -499,9 +485,7 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function
|
||||
* allocation is performed before the object is constructed. */
|
||||
ecma_collection_t *reactions = ecma_new_collection ();
|
||||
|
||||
ecma_object_t *object_p = ecma_create_object (proto_p,
|
||||
sizeof (ecma_promise_object_t),
|
||||
ECMA_OBJECT_TYPE_CLASS);
|
||||
ecma_object_t *object_p = ecma_create_object (proto_p, sizeof (ecma_promise_object_t), ECMA_OBJECT_TYPE_CLASS);
|
||||
ecma_deref_object (proto_p);
|
||||
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
|
||||
ext_object_p->u.cls.type = ECMA_OBJECT_CLASS_PROMISE;
|
||||
@@ -517,10 +501,8 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_CREATE))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_CREATE,
|
||||
ecma_make_object_value (object_p),
|
||||
parent,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_CREATE, ecma_make_object_value (object_p), parent, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
|
||||
@@ -634,9 +616,8 @@ ecma_promise_all_or_all_settled_handler_cb (ecma_object_t *function_obj_p, /**<
|
||||
data_propery_name = LIT_MAGIC_STRING_VALUE;
|
||||
}
|
||||
|
||||
ecma_object_t *obj_p = ecma_create_object (ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT_PROTOTYPE),
|
||||
0,
|
||||
ECMA_OBJECT_TYPE_GENERAL);
|
||||
ecma_object_t *obj_p =
|
||||
ecma_create_object (ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT_PROTOTYPE), 0, ECMA_OBJECT_TYPE_GENERAL);
|
||||
ecma_property_value_t *prop_value_p;
|
||||
prop_value_p = ecma_create_named_data_property (obj_p,
|
||||
ecma_get_magic_string (LIT_MAGIC_STRING_STATUS),
|
||||
@@ -659,7 +640,7 @@ ecma_promise_all_or_all_settled_handler_cb (ecma_object_t *function_obj_p, /**<
|
||||
ecma_value_t obj_val = ecma_make_object_value (obj_p);
|
||||
/* 12. */
|
||||
ecma_op_object_put_by_index (ecma_get_object_from_value (executor_p->values),
|
||||
(uint32_t) (executor_p->index - 1),
|
||||
(uint32_t) (executor_p->index - 1),
|
||||
obj_val,
|
||||
false);
|
||||
ecma_deref_object (obj_p);
|
||||
@@ -676,10 +657,8 @@ ecma_promise_all_or_all_settled_handler_cb (ecma_object_t *function_obj_p, /**<
|
||||
if (promise_type == ECMA_PROMISE_ANY_REJECT)
|
||||
{
|
||||
ecma_value_t error_val = ecma_new_aggregate_error (executor_p->values, ECMA_VALUE_UNDEFINED);
|
||||
ret = ecma_op_function_call (ecma_get_object_from_value (capability_p->reject),
|
||||
ECMA_VALUE_UNDEFINED,
|
||||
&error_val,
|
||||
1);
|
||||
ret =
|
||||
ecma_op_function_call (ecma_get_object_from_value (capability_p->reject), ECMA_VALUE_UNDEFINED, &error_val, 1);
|
||||
ecma_free_value (error_val);
|
||||
}
|
||||
else
|
||||
@@ -842,9 +821,7 @@ ecma_promise_reject_or_resolve (ecma_value_t this_arg, /**< "this" argument */
|
||||
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not an object"));
|
||||
}
|
||||
|
||||
if (is_resolve
|
||||
&& ecma_is_value_object (value)
|
||||
&& ecma_is_promise (ecma_get_object_from_value (value)))
|
||||
if (is_resolve && ecma_is_value_object (value) && ecma_is_promise (ecma_get_object_from_value (value)))
|
||||
{
|
||||
ecma_object_t *object_p = ecma_get_object_from_value (value);
|
||||
ecma_value_t constructor = ecma_op_object_get_by_magic_id (object_p, LIT_MAGIC_STRING_CONSTRUCTOR);
|
||||
@@ -875,10 +852,7 @@ ecma_promise_reject_or_resolve (ecma_value_t this_arg, /**< "this" argument */
|
||||
|
||||
ecma_value_t func = is_resolve ? capability_p->resolve : capability_p->reject;
|
||||
|
||||
ecma_value_t call_ret = ecma_op_function_call (ecma_get_object_from_value (func),
|
||||
ECMA_VALUE_UNDEFINED,
|
||||
&value,
|
||||
1);
|
||||
ecma_value_t call_ret = ecma_op_function_call (ecma_get_object_from_value (func), ECMA_VALUE_UNDEFINED, &value, 1);
|
||||
|
||||
if (ECMA_IS_VALUE_ERROR (call_ret))
|
||||
{
|
||||
@@ -1001,10 +975,8 @@ ecma_promise_then_catch_finally_helper (ecma_object_t *function_obj_p, /**< func
|
||||
JERRY_ASSERT (ecma_op_is_callable (finally_func_obj->on_finally));
|
||||
|
||||
/* 4. */
|
||||
ecma_value_t result = ecma_op_function_call (ecma_get_object_from_value (finally_func_obj->on_finally),
|
||||
ECMA_VALUE_UNDEFINED,
|
||||
NULL,
|
||||
0);
|
||||
ecma_value_t result =
|
||||
ecma_op_function_call (ecma_get_object_from_value (finally_func_obj->on_finally), ECMA_VALUE_UNDEFINED, NULL, 0);
|
||||
|
||||
if (ECMA_IS_VALUE_ERROR (result))
|
||||
{
|
||||
@@ -1112,14 +1084,14 @@ ecma_promise_finally (ecma_value_t promise, /**< the promise which call 'finally
|
||||
if (!ecma_op_is_callable (on_finally))
|
||||
{
|
||||
ecma_free_value (species);
|
||||
ecma_value_t invoke_args[2] = {on_finally, on_finally};
|
||||
ecma_value_t invoke_args[2] = { on_finally, on_finally };
|
||||
return ecma_op_invoke_by_magic_id (promise, LIT_MAGIC_STRING_THEN, invoke_args, 2);
|
||||
}
|
||||
|
||||
/* 6.a-b */
|
||||
ecma_object_t *then_finally_obj_p;
|
||||
then_finally_obj_p = ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_THEN_FINALLY,
|
||||
sizeof (ecma_promise_finally_function_t));
|
||||
then_finally_obj_p =
|
||||
ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_THEN_FINALLY, sizeof (ecma_promise_finally_function_t));
|
||||
|
||||
/* 6.c-d */
|
||||
ecma_promise_finally_function_t *then_finally_func_obj_p = (ecma_promise_finally_function_t *) then_finally_obj_p;
|
||||
@@ -1128,8 +1100,8 @@ ecma_promise_finally (ecma_value_t promise, /**< the promise which call 'finally
|
||||
|
||||
/* 6.e-f */
|
||||
ecma_object_t *catch_finally_obj_p;
|
||||
catch_finally_obj_p = ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_CATCH_FINALLY,
|
||||
sizeof (ecma_promise_finally_function_t));
|
||||
catch_finally_obj_p =
|
||||
ecma_op_create_native_handler (ECMA_NATIVE_HANDLER_PROMISE_CATCH_FINALLY, sizeof (ecma_promise_finally_function_t));
|
||||
|
||||
/* 6.g-h */
|
||||
ecma_promise_finally_function_t *catch_finally_func_obj = (ecma_promise_finally_function_t *) catch_finally_obj_p;
|
||||
@@ -1139,11 +1111,8 @@ ecma_promise_finally (ecma_value_t promise, /**< the promise which call 'finally
|
||||
ecma_deref_object (ecma_get_object_from_value (species));
|
||||
|
||||
/* 7. */
|
||||
ecma_value_t invoke_args[2] =
|
||||
{
|
||||
ecma_make_object_value (then_finally_obj_p),
|
||||
ecma_make_object_value (catch_finally_obj_p)
|
||||
};
|
||||
ecma_value_t invoke_args[2] = { ecma_make_object_value (then_finally_obj_p),
|
||||
ecma_make_object_value (catch_finally_obj_p) };
|
||||
|
||||
ecma_value_t ret_value = ecma_op_invoke_by_magic_id (promise, LIT_MAGIC_STRING_THEN, invoke_args, 2);
|
||||
|
||||
@@ -1164,10 +1133,8 @@ ecma_promise_async_then (ecma_value_t promise, /**< promise object */
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_ASYNC_MAIN))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_ASYNC_AWAIT,
|
||||
executable_object,
|
||||
promise,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_ASYNC_AWAIT, executable_object, promise, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
|
||||
@@ -1196,10 +1163,8 @@ ecma_promise_async_then (ecma_value_t promise, /**< promise object */
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_ERROR))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_CATCH_HANDLER_ADDED,
|
||||
promise,
|
||||
ECMA_VALUE_UNDEFINED,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_CATCH_HANDLER_ADDED, promise, ECMA_VALUE_UNDEFINED, JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
@@ -1252,10 +1217,8 @@ ecma_op_if_abrupt_reject_promise (ecma_value_t *value_p, /**< [in - out] complet
|
||||
ecma_value_t reason = jcontext_take_exception ();
|
||||
|
||||
ecma_promise_capabality_t *capability_p = (ecma_promise_capabality_t *) capability_obj_p;
|
||||
ecma_value_t call_ret = ecma_op_function_call (ecma_get_object_from_value (capability_p->reject),
|
||||
ECMA_VALUE_UNDEFINED,
|
||||
&reason,
|
||||
1);
|
||||
ecma_value_t call_ret =
|
||||
ecma_op_function_call (ecma_get_object_from_value (capability_p->reject), ECMA_VALUE_UNDEFINED, &reason, 1);
|
||||
ecma_free_value (reason);
|
||||
|
||||
if (ECMA_IS_VALUE_ERROR (call_ret))
|
||||
@@ -1354,10 +1317,11 @@ ecma_promise_perform_then (ecma_value_t promise, /**< the promise which call 'th
|
||||
if (JERRY_UNLIKELY (JERRY_CONTEXT (promise_callback_filters) & JERRY_PROMISE_EVENT_FILTER_ERROR))
|
||||
{
|
||||
JERRY_ASSERT (JERRY_CONTEXT (promise_callback) != NULL);
|
||||
JERRY_CONTEXT (promise_callback) (JERRY_PROMISE_EVENT_CATCH_HANDLER_ADDED,
|
||||
promise,
|
||||
ECMA_VALUE_UNDEFINED,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
JERRY_CONTEXT (promise_callback)
|
||||
(JERRY_PROMISE_EVENT_CATCH_HANDLER_ADDED,
|
||||
promise,
|
||||
ECMA_VALUE_UNDEFINED,
|
||||
JERRY_CONTEXT (promise_callback_user_p));
|
||||
}
|
||||
}
|
||||
#endif /* JERRY_PROMISE_CALLBACK */
|
||||
|
||||
Reference in New Issue
Block a user