Skip to content

Commit 11894a6

Browse files
authored
current_new_target -> current_new_target_p (#4478)
JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo [email protected]
1 parent f2e9062 commit 11894a6

26 files changed

+77
-77
lines changed

jerry-core/api/jerry.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2067,16 +2067,16 @@ jerry_create_promise (void)
20672067
jerry_assert_api_available ();
20682068

20692069
#if ENABLED (JERRY_BUILTIN_PROMISE)
2070-
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
2070+
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
20712071

20722072
if (old_new_target_p == NULL)
20732073
{
2074-
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
2074+
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
20752075
}
20762076

20772077
ecma_value_t promise_value = ecma_op_create_promise_object (ECMA_VALUE_EMPTY, ECMA_PROMISE_EXECUTOR_EMPTY);
20782078

2079-
JERRY_CONTEXT (current_new_target) = old_new_target_p;
2079+
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
20802080
return promise_value;
20812081
#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */
20822082
return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Promise not supported.")));
@@ -4622,15 +4622,15 @@ jerry_value_t
46224622
jerry_get_new_target (void)
46234623
{
46244624
#if ENABLED (JERRY_ESNEXT)
4625-
ecma_object_t *current_new_target = JERRY_CONTEXT (current_new_target);
4625+
ecma_object_t *current_new_target_p = JERRY_CONTEXT (current_new_target_p);
46264626

4627-
if (current_new_target == NULL)
4627+
if (current_new_target_p == NULL)
46284628
{
46294629
return jerry_create_undefined ();
46304630
}
46314631

4632-
ecma_ref_object (current_new_target);
4633-
return ecma_make_object_value (current_new_target);
4632+
ecma_ref_object (current_new_target_p);
4633+
return ecma_make_object_value (current_new_target_p);
46344634
#else /* !ENABLED (JERRY_ESNEXT) */
46354635
return jerry_create_undefined ();
46364636
#endif /* ENABLED (JERRY_ESNEXT) */
@@ -5091,14 +5091,14 @@ jerry_create_dataview (const jerry_value_t array_buffer, /**< arraybuffer to cre
50915091
ecma_make_uint32_value (byte_offset),
50925092
ecma_make_uint32_value (byte_length)
50935093
};
5094-
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
5094+
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
50955095
if (old_new_target_p == NULL)
50965096
{
5097-
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ECMA_BUILTIN_ID_DATAVIEW);
5097+
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ECMA_BUILTIN_ID_DATAVIEW);
50985098
}
50995099

51005100
ecma_value_t dataview_value = ecma_op_dataview_create (arguments_p, 3);
5101-
JERRY_CONTEXT (current_new_target) = old_new_target_p;
5101+
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
51025102
return jerry_return (dataview_value);
51035103
#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */
51045104
JERRY_UNUSED (array_buffer);
@@ -5657,19 +5657,19 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
56575657
return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Invalid container type.")));
56585658
}
56595659
}
5660-
ecma_object_t * old_new_target_p = JERRY_CONTEXT (current_new_target);
5660+
ecma_object_t * old_new_target_p = JERRY_CONTEXT (current_new_target_p);
56615661

56625662
if (old_new_target_p == NULL)
56635663
{
5664-
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ctor_id);
5664+
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ctor_id);
56655665
}
56665666

56675667
ecma_value_t container_value = ecma_op_container_create (arguments_list_p,
56685668
arguments_list_len,
56695669
lit_id,
56705670
proto_id);
56715671

5672-
JERRY_CONTEXT (current_new_target) = old_new_target_p;
5672+
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
56735673
return container_value;
56745674
#else /* !ENABLED (JERRY_BUILTIN_CONTAINER) */
56755675
JERRY_UNUSED (arguments_list_p);

jerry-core/ecma/base/ecma-init-finalize.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ ecma_init (void)
6161
#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */
6262

6363
#if ENABLED (JERRY_ESNEXT)
64-
JERRY_CONTEXT (current_new_target) = NULL;
64+
JERRY_CONTEXT (current_new_target_p) = NULL;
6565
#endif /* ENABLED (JERRY_ESNEXT) */
6666
} /* ecma_init */
6767

@@ -72,7 +72,7 @@ void
7272
ecma_finalize (void)
7373
{
7474
#if ENABLED (JERRY_ESNEXT)
75-
JERRY_ASSERT (JERRY_CONTEXT (current_new_target) == NULL);
75+
JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p) == NULL);
7676
#endif /* ENABLED (JERRY_ESNEXT) */
7777

7878
ecma_finalize_global_environment ();

jerry-core/ecma/builtin-objects/ecma-builtin-array.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ ecma_builtin_array_dispatch_construct (const ecma_value_t *arguments_list_p, /**
514514
#if !ENABLED (JERRY_ESNEXT)
515515
return ecma_builtin_array_dispatch_call (arguments_list_p, arguments_list_len);
516516
#else /* ENABLED (JERRY_ESNEXT) */
517-
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
517+
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
518518
ECMA_BUILTIN_ID_ARRAY_PROTOTYPE);
519519

520520
if (proto_p == NULL)

jerry-core/ecma/builtin-objects/ecma-builtin-date.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,9 +719,9 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**<
719719
uint32_t arguments_list_len) /**< number of arguments */
720720
{
721721
#if ENABLED (JERRY_ESNEXT)
722-
JERRY_ASSERT (JERRY_CONTEXT (current_new_target));
722+
JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p));
723723

724-
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
724+
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
725725
ECMA_BUILTIN_ID_DATE_PROTOTYPE);
726726
if (JERRY_UNLIKELY (prototype_obj_p == NULL))
727727
{

jerry-core/ecma/builtin-objects/ecma-builtin-error.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ecma_builtin_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**
6767
#if !ENABLED (JERRY_ESNEXT)
6868
return ecma_builtin_error_dispatch_call (arguments_list_p, arguments_list_len);
6969
#else /* ENABLED (JERRY_ESNEXT) */
70-
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
70+
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
7171
ECMA_BUILTIN_ID_ERROR_PROTOTYPE);
7272

7373
if (proto_p == NULL)

jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ecma_builtin_eval_error_dispatch_construct (const ecma_value_t *arguments_list_p
6969
#if !ENABLED (JERRY_ESNEXT)
7070
return ecma_builtin_eval_error_dispatch_call (arguments_list_p, arguments_list_len);
7171
#else /* ENABLED (JERRY_ESNEXT) */
72-
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
72+
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
7373
ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE);
7474

7575
if (proto_p == NULL)

jerry-core/ecma/builtin-objects/ecma-builtin-object.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ ecma_builtin_object_dispatch_construct (const ecma_value_t *arguments_list_p, /*
124124
uint32_t arguments_list_len) /**< number of arguments */
125125
{
126126
#if ENABLED (JERRY_ESNEXT)
127-
if (JERRY_CONTEXT (current_new_target) != ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT))
127+
if (JERRY_CONTEXT (current_new_target_p) != ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT))
128128
{
129-
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
129+
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
130130
ECMA_BUILTIN_ID_OBJECT_PROTOTYPE);
131131
if (JERRY_UNLIKELY (prototype_obj_p == NULL))
132132
{

jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ecma_builtin_range_error_dispatch_construct (const ecma_value_t *arguments_list_
6969
#if !ENABLED (JERRY_ESNEXT)
7070
return ecma_builtin_range_error_dispatch_call (arguments_list_p, arguments_list_len);
7171
#else /* ENABLED (JERRY_ESNEXT) */
72-
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
72+
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
7373
ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE);
7474

7575
if (proto_p == NULL)

jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ecma_builtin_reference_error_dispatch_construct (const ecma_value_t *arguments_l
6969
#if !ENABLED (JERRY_ESNEXT)
7070
return ecma_builtin_reference_error_dispatch_call (arguments_list_p, arguments_list_len);
7171
#else /* ENABLED (JERRY_ESNEXT) */
72-
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
72+
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
7373
ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE);
7474

7575
if (proto_p == NULL)

jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**<
5151
#if ENABLED (JERRY_ESNEXT)
5252
bool create_regexp_from_bc = false;
5353
bool free_arguments = false;
54-
ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target);
54+
ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target_p);
5555
#else /* !ENABLED (JERRY_ESNEXT) */
5656
ecma_object_t *new_target_p = NULL;
5757
#endif /* ENABLED (JERRY_ESNEXT) */

0 commit comments

Comments
 (0)