Skip to content

Commit fcb0e84

Browse files
orkviorkvi
committed
Add custom dispatcher to every builtin object for consistency
JerryScript-DCO-1.0-Signed-off-by: Orkenyi Virag orkvi@inf.u-szeged.hu
1 parent 3737a28 commit fcb0e84

File tree

112 files changed

+1539
-401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1539
-401
lines changed

‎jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror-prototype.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,27 @@
3434
#define BUILTIN_UNDERSCORED_ID aggregate_error_prototype
3535
#include "ecma-builtin-internal-routines-template.inc.h"
3636

37+
/**
38+
* Dispatcher of the built-in's routines
39+
*
40+
* @return ecma value
41+
* Returned value must be freed with ecma_free_value.
42+
*/
43+
ecma_value_t
44+
ecma_builtin_aggregate_error_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide
45+
* routine identifier */
46+
ecma_value_t this_arg, /**< 'this' argument value */
47+
const ecma_value_t arguments_list_p[], /**< list of arguments
48+
* passed
49+
* to routine */
50+
uint32_t arguments_number) /**< length of arguments' list */
51+
{
52+
JERRY_UNUSED (this_arg);
53+
JERRY_UNUSED (arguments_number);
54+
JERRY_UNUSED (arguments_list_p);
55+
JERRY_UNUSED (builtin_routine_id);
56+
57+
JERRY_UNREACHABLE ();
58+
} /* ecma_builtin_aggregate_error_prototype_dispatch_routine */
59+
3760
#endif /* JERRY_ESNEXT */

‎jerry-core/ecma/builtin-objects/ecma-builtin-aggregateerror.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,27 @@ ecma_builtin_aggregate_error_dispatch_construct (const ecma_value_t *arguments_l
104104
return result;
105105
} /* ecma_builtin_aggregate_error_dispatch_construct */
106106

107+
/**
108+
* Dispatcher of the built-in's routines
109+
*
110+
* @return ecma value
111+
* Returned value must be freed with ecma_free_value.
112+
*/
113+
ecma_value_t
114+
ecma_builtin_aggregate_error_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide routine identifier */
115+
ecma_value_t this_arg, /**< 'this' argument value */
116+
const ecma_value_t arguments_list_p[], /**< list of arguments
117+
* passed to routine */
118+
uint32_t arguments_number) /**< length of arguments' list */
119+
{
120+
JERRY_UNUSED (this_arg);
121+
JERRY_UNUSED (arguments_number);
122+
JERRY_UNUSED (arguments_list_p);
123+
JERRY_UNUSED (builtin_routine_id);
124+
125+
JERRY_UNREACHABLE ();
126+
} /* ecma_builtin_aggregate_error_dispatch_routine */
127+
107128
/**
108129
* @}
109130
* @}

‎jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
#define ECMA_BUILTINS_INTERNAL
2525
#include "ecma-builtins-internal.h"
2626

27-
/**
28-
* This object has a custom dispatch function.
29-
*/
30-
#define BUILTIN_CUSTOM_DISPATCH
31-
3227
/**
3328
* List of built-in routine identifiers.
3429
*/

‎jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,27 @@
2525
#define BUILTIN_UNDERSCORED_ID array_prototype_unscopables
2626
#include "ecma-builtin-internal-routines-template.inc.h"
2727

28+
/**
29+
* Dispatcher of the built-in's routines
30+
*
31+
* @return ecma value
32+
* Returned value must be freed with ecma_free_value.
33+
*/
34+
ecma_value_t
35+
ecma_builtin_array_prototype_unscopables_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide
36+
* routine identifier */
37+
ecma_value_t this_arg, /**< 'this' argument value */
38+
const ecma_value_t arguments_list_p[], /**< list of arguments
39+
* passed
40+
* to routine */
41+
uint32_t arguments_number) /**< length of arguments' list */
42+
{
43+
JERRY_UNUSED (this_arg);
44+
JERRY_UNUSED (arguments_number);
45+
JERRY_UNUSED (arguments_list_p);
46+
JERRY_UNUSED (builtin_routine_id);
47+
48+
JERRY_UNREACHABLE ();
49+
} /* ecma_builtin_array_prototype_unscopables_dispatch_routine */
50+
2851
#endif /* JERRY_ESNEXT */

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
#define ECMA_BUILTINS_INTERNAL
3636
#include "ecma-builtins-internal.h"
3737

38-
/**
39-
* This object has a custom dispatch function.
40-
*/
41-
#define BUILTIN_CUSTOM_DISPATCH
42-
4338
/**
4439
* List of built-in routine identifiers.
4540
*/

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
#define ECMA_BUILTINS_INTERNAL
3535
#include "ecma-builtins-internal.h"
3636

37-
/**
38-
* This object has a custom dispatch function.
39-
*/
40-
#define BUILTIN_CUSTOM_DISPATCH
41-
4237
/**
4338
* List of built-in routine identifiers.
4439
*/

‎jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@
3232
#define ECMA_BUILTINS_INTERNAL
3333
#include "ecma-builtins-internal.h"
3434

35+
/**
36+
* List of built-in routine identifiers.
37+
*/
38+
enum
39+
{
40+
ECMA_ARRAYBUFFER_PROTOTYPE_ROUTINE_START = 0,
41+
ECMA_ARRAYBUFFER_PROTOTYPE_SLICE,
42+
ECMA_ARRAYBUFFER_PROTOTYPE_BYTELENGTH_GETTER,
43+
};
44+
3545
#define BUILTIN_INC_HEADER_NAME "ecma-builtin-arraybuffer-prototype.inc.h"
3646
#define BUILTIN_UNDERSCORED_ID arraybuffer_prototype
3747
#include "ecma-builtin-internal-routines-template.inc.h"
@@ -107,6 +117,38 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
107117
return ecma_builtin_arraybuffer_slice (this_arg, argument_list_p, arguments_number);
108118
} /* ecma_builtin_arraybuffer_prototype_object_slice */
109119

120+
/**
121+
* Dispatcher of the built-in's routines
122+
*
123+
* @return ecma value
124+
* Returned value must be freed with ecma_free_value.
125+
*/
126+
ecma_value_t
127+
ecma_builtin_arraybuffer_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide
128+
*routine
129+
*identifier */
130+
ecma_value_t this_arg, /**< 'this' argument value */
131+
const ecma_value_t arguments_list_p[], /**< list of arguments
132+
* passed to routine */
133+
uint32_t arguments_number) /**< length of arguments' list */
134+
{
135+
switch (builtin_routine_id)
136+
{
137+
case ECMA_ARRAYBUFFER_PROTOTYPE_SLICE:
138+
{
139+
return ecma_builtin_arraybuffer_prototype_object_slice (this_arg, arguments_list_p, arguments_number);
140+
}
141+
case ECMA_ARRAYBUFFER_PROTOTYPE_BYTELENGTH_GETTER:
142+
{
143+
return ecma_builtin_arraybuffer_prototype_bytelength_getter (this_arg);
144+
}
145+
default:
146+
{
147+
JERRY_UNREACHABLE ();
148+
}
149+
}
150+
} /* ecma_builtin_arraybuffer_prototype_dispatch_routine */
151+
110152
/**
111153
* @}
112154
* @}

‎jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ARRAYBUFFER, ECMA_PR
2828

2929
/* Readonly accessor properties */
3030
ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL,
31-
ecma_builtin_arraybuffer_prototype_bytelength_getter,
31+
ECMA_ARRAYBUFFER_PROTOTYPE_BYTELENGTH_GETTER,
3232
ECMA_PROPERTY_FLAG_CONFIGURABLE)
3333

3434
/* ECMA-262 v6, 24.1.4.4 */
3535
STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE)
3636

3737
/* Routine properties:
3838
* (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
39-
ROUTINE (LIT_MAGIC_STRING_SLICE, ecma_builtin_arraybuffer_prototype_object_slice, NON_FIXED, 2)
39+
ROUTINE (LIT_MAGIC_STRING_SLICE, ECMA_ARRAYBUFFER_PROTOTYPE_SLICE, NON_FIXED, 2)
4040

4141
#endif /* JERRY_BUILTIN_TYPEDARRAY */
4242

‎jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@
2929
#define ECMA_BUILTINS_INTERNAL
3030
#include "ecma-builtins-internal.h"
3131

32+
/**
33+
* List of built-in routine identifiers.
34+
*/
35+
enum
36+
{
37+
ECMA_ARRAYBUFFER_ROUTINE_START = 0,
38+
ECMA_ARRAYBUFFER_OBJECT_IS_VIEW,
39+
ECMA_ARRAYBUFFER_SPECIES_GET,
40+
};
41+
3242
#define BUILTIN_INC_HEADER_NAME "ecma-builtin-arraybuffer.inc.h"
3343
#define BUILTIN_UNDERSCORED_ID arraybuffer
3444
#include "ecma-builtin-internal-routines-template.inc.h"
@@ -94,16 +104,36 @@ ecma_builtin_arraybuffer_dispatch_construct (const ecma_value_t *arguments_list_
94104
} /* ecma_builtin_arraybuffer_dispatch_construct */
95105

96106
/**
97-
* 24.1.3.3 get ArrayBuffer [ @@species ] accessor
107+
* Dispatcher of the built-in's routines
98108
*
99-
* @return ecma_value
100-
* returned value must be freed with ecma_free_value
109+
* @return ecma value
110+
* Returned value must be freed with ecma_free_value.
101111
*/
102112
ecma_value_t
103-
ecma_builtin_arraybuffer_species_get (ecma_value_t this_value) /**< This Value */
113+
ecma_builtin_arraybuffer_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide routine identifier */
114+
ecma_value_t this_arg, /**< 'this' argument value */
115+
const ecma_value_t arguments_list_p[], /**< list of arguments
116+
* passed to routine */
117+
uint32_t arguments_number) /**< length of arguments' list */
104118
{
105-
return ecma_copy_value (this_value);
106-
} /* ecma_builtin_arraybuffer_species_get */
119+
JERRY_UNUSED (arguments_number);
120+
121+
switch (builtin_routine_id)
122+
{
123+
case ECMA_ARRAYBUFFER_OBJECT_IS_VIEW:
124+
{
125+
return ecma_builtin_arraybuffer_object_is_view (this_arg, arguments_list_p[0]);
126+
}
127+
case ECMA_ARRAYBUFFER_SPECIES_GET:
128+
{
129+
return ecma_copy_value (this_arg);
130+
}
131+
default:
132+
{
133+
JERRY_UNREACHABLE ();
134+
}
135+
}
136+
} /* ecma_builtin_arraybuffer_dispatch_routine */
107137

108138
/**
109139
* @}

‎jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_PROP
3737
* (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
3838

3939
/* ES2015 24.1.3.1 */
40-
ROUTINE (LIT_MAGIC_STRING_IS_VIEW_UL, ecma_builtin_arraybuffer_object_is_view, 1, 1)
40+
ROUTINE (LIT_MAGIC_STRING_IS_VIEW_UL, ECMA_ARRAYBUFFER_OBJECT_IS_VIEW, 1, 1)
4141

4242
/* ES2015 24.1.3.3 */
43-
ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_arraybuffer_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE)
43+
ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ECMA_ARRAYBUFFER_SPECIES_GET, ECMA_PROPERTY_FLAG_CONFIGURABLE)
4444

4545
#endif /* JERRY_BUILTIN_TYPEDARRAY */
4646

‎jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,28 @@
3434
* @{
3535
*/
3636

37+
/**
38+
* Dispatcher of the built-in's routines
39+
*
40+
* @return ecma value
41+
* Returned value must be freed with ecma_free_value.
42+
*/
43+
ecma_value_t
44+
ecma_builtin_async_function_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide
45+
* routine identifier */
46+
ecma_value_t this_arg, /**< 'this' argument value */
47+
const ecma_value_t arguments_list_p[], /**< list of arguments
48+
* passed to routine */
49+
uint32_t arguments_number) /**< length of arguments' list */
50+
{
51+
JERRY_UNUSED (this_arg);
52+
JERRY_UNUSED (arguments_number);
53+
JERRY_UNUSED (arguments_list_p);
54+
JERRY_UNUSED (builtin_routine_id);
55+
56+
JERRY_UNREACHABLE ();
57+
} /* ecma_builtin_async_function_prototype_dispatch_routine */
58+
3759
/**
3860
* @}
3961
* @}

‎jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,27 @@ ecma_builtin_async_function_dispatch_construct (const ecma_value_t *arguments_li
6363
return ecma_builtin_async_function_dispatch_call (arguments_list_p, arguments_list_len);
6464
} /* ecma_builtin_async_function_dispatch_construct */
6565

66+
/**
67+
* Dispatcher of the built-in's routines
68+
*
69+
* @return ecma value
70+
* Returned value must be freed with ecma_free_value.
71+
*/
72+
ecma_value_t
73+
ecma_builtin_async_function_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide routine identifier */
74+
ecma_value_t this_arg, /**< 'this' argument value */
75+
const ecma_value_t arguments_list_p[], /**< list of arguments
76+
* passed to routine */
77+
uint32_t arguments_number) /**< length of arguments' list */
78+
{
79+
JERRY_UNUSED (this_arg);
80+
JERRY_UNUSED (arguments_number);
81+
JERRY_UNUSED (arguments_list_p);
82+
JERRY_UNUSED (builtin_routine_id);
83+
84+
JERRY_UNREACHABLE ();
85+
} /* ecma_builtin_async_function_dispatch_routine */
86+
6687
/**
6788
* @}
6889
* @}

‎jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,28 @@ ecma_builtin_async_generator_function_dispatch_construct (const ecma_value_t *ar
6565
return ecma_builtin_async_generator_function_dispatch_call (arguments_list_p, arguments_list_len);
6666
} /* ecma_builtin_async_generator_function_dispatch_construct */
6767

68+
/**
69+
* Dispatcher of the built-in's routines
70+
*
71+
* @return ecma value
72+
* Returned value must be freed with ecma_free_value.
73+
*/
74+
ecma_value_t
75+
ecma_builtin_async_generator_function_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide
76+
* routine identifier */
77+
ecma_value_t this_arg, /**< 'this' argument value */
78+
const ecma_value_t arguments_list_p[], /**< list of arguments
79+
* passed to routine */
80+
uint32_t arguments_number) /**< length of arguments' list */
81+
{
82+
JERRY_UNUSED (this_arg);
83+
JERRY_UNUSED (arguments_number);
84+
JERRY_UNUSED (arguments_list_p);
85+
JERRY_UNUSED (builtin_routine_id);
86+
87+
JERRY_UNREACHABLE ();
88+
} /* ecma_builtin_async_generator_function_dispatch_routine */
89+
6890
/**
6991
* @}
7092
* @}

‎jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
#define ECMA_BUILTINS_INTERNAL
3232
#include "ecma-builtins-internal.h"
3333

34-
/**
35-
* This object has a custom dispatch function.
36-
*/
37-
#define BUILTIN_CUSTOM_DISPATCH
38-
3934
/**
4035
* List of built-in routine identifiers.
4136
*/

‎jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,27 @@
3434
* @{
3535
*/
3636

37+
/**
38+
* Dispatcher of the built-in's routines
39+
*
40+
* @return ecma value
41+
* Returned value must be freed with ecma_free_value.
42+
*/
43+
ecma_value_t
44+
ecma_builtin_async_generator_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wide routine identifier */
45+
ecma_value_t this_arg, /**< 'this' argument value */
46+
const ecma_value_t arguments_list_p[], /**< list of arguments
47+
* passed to routine */
48+
uint32_t arguments_number) /**< length of arguments' list */
49+
{
50+
JERRY_UNUSED (this_arg);
51+
JERRY_UNUSED (arguments_number);
52+
JERRY_UNUSED (arguments_list_p);
53+
JERRY_UNUSED (builtin_routine_id);
54+
55+
JERRY_UNREACHABLE ();
56+
} /* ecma_builtin_async_generator_dispatch_routine */
57+
3758
/**
3859
* @}
3960
* @}

0 commit comments

Comments
 (0)