diff --git a/src/libecmabuiltins/ecma-builtin-global-object.c b/src/libecmabuiltins/ecma-builtin-global-object.c index 1bbf32f8a..d95266cd3 100644 --- a/src/libecmabuiltins/ecma-builtin-global-object.c +++ b/src/libecmabuiltins/ecma-builtin-global-object.c @@ -244,6 +244,41 @@ ecma_builtin_global_object_encode_uri_component (ecma_value_t uri_component) /** JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (uri_component); } /* ecma_builtin_global_object_encode_uri_component */ +/** + * Get number of routine's parameters + * + * @return number of parameters + */ +ecma_length_t +ecma_builtin_global_get_routine_parameters_number (ecma_builtin_global_detail_id_t builtin_routine_id) /**< routine's + id */ +{ + switch (builtin_routine_id) + { + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_EVAL: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_PARSE_FLOAT: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_IS_NAN: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_IS_FINITE: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_DECODE_URI: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_DECODE_URI_COMPONENT: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_ENCODE_URI: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_ENCODE_URI_COMPONENT: + { + return 1; + } + + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_PARSE_INT: + { + return 2; + } + + default: + { + JERRY_UNREACHABLE (); + } + } +} /* ecma_builtin_global_get_routine_parameters_number */ + /** * Dispatcher of the Global object's built-in routines * @@ -251,27 +286,26 @@ ecma_builtin_global_object_encode_uri_component (ecma_value_t uri_component) /** * Returned value must be freed with ecma_free_completion_value. */ ecma_completion_value_t -ecma_builtin_global_dispatch_routine (ecma_builtin_global_property_id_t builtin_routine_id, /**< identifier of - the Global object's - initial property that - corresponds to - routine to be called */ +ecma_builtin_global_dispatch_routine (ecma_builtin_global_detail_id_t builtin_routine_id, /**< identifier of + the Global object's + initial property that + corresponds to + routine to be called */ ecma_value_t arguments_list [], /**< list of arguments passed to routine */ ecma_length_t arguments_number) /**< length of arguments' list */ { - ecma_completion_value_t ret_value = ecma_make_empty_completion_value (); const ecma_value_t value_undefined = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED); switch (builtin_routine_id) { - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_EVAL: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_EVAL: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); return ecma_builtin_global_object_eval (arg); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_PARSE_INT: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_PARSE_INT: { ecma_value_t arg1 = (arguments_number >= 1 ? arguments_list[0] : value_undefined); ecma_value_t arg2 = (arguments_number >= 2 ? arguments_list[1] : value_undefined); @@ -279,49 +313,49 @@ ecma_builtin_global_dispatch_routine (ecma_builtin_global_property_id_t builtin_ return ecma_builtin_global_object_parse_int (arg1, arg2); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_PARSE_FLOAT: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_PARSE_FLOAT: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); return ecma_builtin_global_object_parse_float (arg); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_IS_NAN: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_IS_NAN: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); return ecma_builtin_global_object_is_nan (arg); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_IS_FINITE: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_IS_FINITE: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); return ecma_builtin_global_object_is_finite (arg); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_DECODE_URI: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_DECODE_URI: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); return ecma_builtin_global_object_decode_uri (arg); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_DECODE_URI_COMPONENT: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_DECODE_URI_COMPONENT: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); return ecma_builtin_global_object_decode_uri_component (arg); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_ENCODE_URI: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_ENCODE_URI: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); return ecma_builtin_global_object_encode_uri (arg); } - case ECMA_BUILTIN_GLOBAL_PROPERTY_ID_ENCODE_URI_COMPONENT: + case ECMA_BUILTIN_GLOBAL_DETAIL_ID_ENCODE_URI_COMPONENT: { ecma_value_t arg = (arguments_number >= 1 ? arguments_list[0] : value_undefined); @@ -333,8 +367,6 @@ ecma_builtin_global_dispatch_routine (ecma_builtin_global_property_id_t builtin_ JERRY_UNREACHABLE (); } } - - JERRY_ASSERT (!ecma_is_completion_value_empty (ret_value)); } /* ecma_builtin_global_dispatch_routine */ /** diff --git a/src/libecmabuiltins/ecma-builtin-routines-dispatcher.c b/src/libecmabuiltins/ecma-builtin-routines-dispatcher.c deleted file mode 100644 index 3fb604adc..000000000 --- a/src/libecmabuiltins/ecma-builtin-routines-dispatcher.c +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "globals.h" -#include "ecma-builtins.h" -#include "ecma-globals.h" -#include "ecma-magic-strings.h" - -#define ECMA_BUILTINS_INTERNAL -#include "ecma-builtins-internal.h" - -/** \addtogroup ecma ECMA - * @{ - * - * \addtogroup ecmabuiltins - * @{ - */ - -/** - * Dispatcher of built-in routines - * - * @return completion-value - * Returned value must be freed with ecma_free_completion_value. - */ -ecma_completion_value_t -ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id, /**< built-in object' identifier */ - uint32_t builtin_routine_id, /**< identifier of the built-in object's routine - property (one of ecma_builtin_{*}_property_id_t) */ - ecma_value_t arguments_list [], /**< list of arguments passed to routine */ - ecma_length_t arguments_number) /**< length of arguments' list */ -{ - switch (builtin_object_id) - { - case ECMA_BUILTIN_ID_GLOBAL: - { - JERRY_ASSERT (builtin_routine_id < ECMA_BUILTIN_GLOBAL_PROPERTY_ID__COUNT); - return ecma_builtin_global_dispatch_routine ((ecma_builtin_global_property_id_t) builtin_routine_id, - arguments_list, arguments_number); - } - case ECMA_BUILTIN_ID_OBJECT: - case ECMA_BUILTIN_ID_OBJECT_PROTOTYPE: - case ECMA_BUILTIN_ID_FUNCTION: - case ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE: - case ECMA_BUILTIN_ID_ARRAY: - case ECMA_BUILTIN_ID_ARRAY_PROTOTYPE: - case ECMA_BUILTIN_ID_STRING: - case ECMA_BUILTIN_ID_STRING_PROTOTYPE: - case ECMA_BUILTIN_ID_BOOLEAN: - case ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE: - case ECMA_BUILTIN_ID_NUMBER: - case ECMA_BUILTIN_ID_NUMBER_PROTOTYPE: - case ECMA_BUILTIN_ID_DATE: - case ECMA_BUILTIN_ID_REGEXP: - case ECMA_BUILTIN_ID_REGEXP_PROTOTYPE: - case ECMA_BUILTIN_ID_ERROR: - case ECMA_BUILTIN_ID_ERROR_PROTOTYPE: - case ECMA_BUILTIN_ID_EVAL_ERROR: - case ECMA_BUILTIN_ID_RANGE_ERROR: - case ECMA_BUILTIN_ID_REFERENCE_ERROR: - case ECMA_BUILTIN_ID_SYNTAX_ERROR: - case ECMA_BUILTIN_ID_TYPE_ERROR: - case ECMA_BUILTIN_ID_SYNTAX_URI_ERROR: - case ECMA_BUILTIN_ID_MATH: - case ECMA_BUILTIN_ID_JSON: - { - JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (builtin_routine_id, - arguments_list, - arguments_number); - } - } - - JERRY_UNREACHABLE (); -} /* ecma_builtin_dispatch_routine */ - - -/** - * @} - * @} - */ diff --git a/src/libecmabuiltins/ecma-builtins-internal.h b/src/libecmabuiltins/ecma-builtins-internal.h index 9e24d7125..e8a5aa646 100644 --- a/src/libecmabuiltins/ecma-builtins-internal.h +++ b/src/libecmabuiltins/ecma-builtins-internal.h @@ -56,47 +56,103 @@ typedef enum } ecma_builtin_id_t; /** - * Identifier of an Global object's property + * Identifier of Global object's detail */ typedef enum { /* Non-object value properties */ - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_NAN, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_INFINITY, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_UNDEFINED, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_NAN, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_INFINITY, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_UNDEFINED, /* Object value properties */ - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_OBJECT, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_FUNCTION, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_ARRAY, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_STRING, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_BOOLEAN, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_NUMBER, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_DATE, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_REGEXP, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_ERROR, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_RANGE_ERROR, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_REFERENCE_ERROR, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_SYNTAX_ERROR, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_SYNTAX_URI_ERROR, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_MATH, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_JSON, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_OBJECT, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_FUNCTION, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_ARRAY, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_STRING, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_BOOLEAN, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_NUMBER, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_DATE, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_REGEXP, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_ERROR, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_RANGE_ERROR, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_REFERENCE_ERROR, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_SYNTAX_ERROR, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_SYNTAX_URI_ERROR, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_MATH, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_JSON, /* Routine properties */ - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_EVAL, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_PARSE_INT, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_PARSE_FLOAT, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_IS_NAN, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_IS_FINITE, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_DECODE_URI, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_DECODE_URI_COMPONENT, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_ENCODE_URI, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID_ENCODE_URI_COMPONENT, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_EVAL, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_PARSE_INT, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_PARSE_FLOAT, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_IS_NAN, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_IS_FINITE, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_DECODE_URI, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_DECODE_URI_COMPONENT, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_ENCODE_URI, + ECMA_BUILTIN_GLOBAL_DETAIL_ID_ENCODE_URI_COMPONENT, - ECMA_BUILTIN_GLOBAL_PROPERTY_ID__COUNT -} ecma_builtin_global_property_id_t; + /* Details number */ + ECMA_BUILTIN_GLOBAL_DETAIL_ID__COUNT +} ecma_builtin_global_detail_id_t; -/* ecma-builtin-routines-dispatcher.c */ +/** + * Identifier of Object object's detail + */ +typedef enum +{ + /* Value subbuilt-ins */ + ECMA_BUILTIN_OBJECT_DETAIL_ID_PROTOTYPE, + + /* Routine subbuilt-ins */ + ECMA_BUILTIN_OBJECT_DETAIL_ID_CALL, /**< [[Call]] of the Object built-in */ + ECMA_BUILTIN_OBJECT_DETAIL_ID_CONSTRUCT, /**< [[Construct]] of the Object built-in */ + ECMA_BUILTIN_OBJECT_DETAIL_ID_GET_PROTOTYPE_OF, + ECMA_BUILTIN_OBJECT_DETAIL_ID_GET_OWN_PROPERTY_DESCRIPTOR, + ECMA_BUILTIN_OBJECT_DETAIL_ID_GET_OWN_PROPERTY_NAMES, + ECMA_BUILTIN_OBJECT_DETAIL_ID_CREATE, + ECMA_BUILTIN_OBJECT_DETAIL_ID_DEFINE_PROPERTY, + ECMA_BUILTIN_OBJECT_DETAIL_ID_DEFINE_PROPERTIES, + ECMA_BUILTIN_OBJECT_DETAIL_ID_SEAL, + ECMA_BUILTIN_OBJECT_DETAIL_ID_FREEZE, + ECMA_BUILTIN_OBJECT_DETAIL_ID_IS_SEALED, + ECMA_BUILTIN_OBJECT_DETAIL_ID_IS_FROZEN, + ECMA_BUILTIN_OBJECT_DETAIL_ID_IS_EXTENSIBLE, + ECMA_BUILTIN_OBJECT_DETAIL_ID_KEYS, + + /* Details number */ + ECMA_BUILTIN_OBJECT_DETAIL_ID__COUNT +} ecma_builtin_object_detail_id_t; + +/** + * Position of built-in object's id field in [[Built-in routine ID]] internal property + */ +#define ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_OBJECT_ID_POS (0) + +/** + * Width of built-in object's id field in [[Built-in routine ID]] internal property + */ +#define ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_OBJECT_ID_WIDTH (16) + +/** + * Position of built-in routine's id field in [[Built-in routine ID]] internal property + */ +#define ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_ROUTINE_ID_POS \ + (ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_OBJECT_ID_POS + \ + ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_OBJECT_ID_WIDTH) + +/** + * Width of built-in routine's id field in [[Built-in routine ID]] internal property + */ +#define ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_ROUTINE_ID_WIDTH (16)/* ecma-builtins.c */ + +extern ecma_object_t* +ecma_builtin_make_function_object_for_routine (ecma_builtin_id_t builtin_id, + uint32_t routine_id); +extern ecma_length_t +ecma_builtin_get_routine_parameters_number (ecma_builtin_id_t builtin_id, + uint32_t routine_id); extern ecma_completion_value_t ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id, uint32_t builtin_routine_id, @@ -107,8 +163,10 @@ ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id, extern void ecma_builtin_init_global_object (void); extern void ecma_builtin_finalize_global_object (void); +extern ecma_length_t +ecma_builtin_global_get_routine_parameters_number (ecma_builtin_global_detail_id_t routine_id); extern ecma_completion_value_t -ecma_builtin_global_dispatch_routine (ecma_builtin_global_property_id_t builtin_routine_id, +ecma_builtin_global_dispatch_routine (ecma_builtin_global_detail_id_t builtin_routine_id, ecma_value_t arguments_list [], ecma_length_t arguments_number); diff --git a/src/libecmabuiltins/ecma-builtins.c b/src/libecmabuiltins/ecma-builtins.c index 3099d0ae8..f54e3c2ea 100644 --- a/src/libecmabuiltins/ecma-builtins.c +++ b/src/libecmabuiltins/ecma-builtins.c @@ -13,8 +13,13 @@ * limitations under the License. */ +#include "ecma-alloc.h" #include "ecma-builtins.h" #include "ecma-globals.h" +#include "ecma-helpers.h" +#include "ecma-magic-strings.h" +#include "ecma-objects.h" +#include "jrt-bit-fields.h" #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -59,6 +64,180 @@ ecma_object_try_to_get_non_instantiated_property (ecma_object_t *object_p, /**< JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (object_p, string_p); } /* ecma_object_try_to_get_non_instantiated_property */ +/** + * Construct a Function object for specified built-in routine + * + * See also: ECMA-262 v5, 15 + * + * @return pointer to constructed Function object + */ +ecma_object_t* +ecma_builtin_make_function_object_for_routine (ecma_builtin_id_t builtin_id, /**< identifier of built-in object + that initially contains property + with the routine */ + uint32_t routine_id) /**< identifier of the built-in object's + routine property + (one of ecma_builtin_{*}_property_id_t) */ +{ + FIXME(Setup prototype of Function object to built-in Function prototype object (15.3.3.1)); + + ecma_object_t *func_obj_p = ecma_create_object (NULL, true, ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION); + + uint64_t packed_value = jrt_set_bit_field_value (0, + builtin_id, + ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_OBJECT_ID_POS, + ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_OBJECT_ID_WIDTH); + packed_value = jrt_set_bit_field_value (packed_value, + routine_id, + ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_ROUTINE_ID_POS, + ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_ROUTINE_ID_WIDTH); + ecma_property_t *routine_id_prop_p = ecma_create_internal_property (func_obj_p, + ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_ID); + + JERRY_ASSERT ((uint32_t) packed_value == packed_value); + routine_id_prop_p->u.internal_property.value = (uint32_t) packed_value; + + ecma_number_t* len_p = ecma_alloc_number (); + *len_p = ecma_uint32_to_number (ecma_builtin_get_routine_parameters_number (builtin_id, routine_id)); + + ecma_property_descriptor_t length_prop_desc = ecma_make_empty_property_descriptor (); + length_prop_desc.is_value_defined = true; + length_prop_desc.value = ecma_make_number_value (len_p); + length_prop_desc.is_writable_defined = false; + length_prop_desc.writable = ECMA_PROPERTY_NOT_WRITABLE; + length_prop_desc.is_enumerable_defined = false; + length_prop_desc.enumerable = ECMA_PROPERTY_NOT_ENUMERABLE; + length_prop_desc.is_configurable_defined = false; + length_prop_desc.configurable = ECMA_PROPERTY_NOT_CONFIGURABLE; + + ecma_string_t* magic_string_length_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LENGTH); + ecma_completion_value_t completion = ecma_op_object_define_own_property (func_obj_p, + magic_string_length_p, + length_prop_desc, + false); + ecma_deref_ecma_string (magic_string_length_p); + + JERRY_ASSERT (ecma_is_completion_value_normal_true (completion) + || ecma_is_completion_value_normal_false (completion)); + + ecma_dealloc_number (len_p); + len_p = NULL; + + return func_obj_p; +} /* ecma_builtin_make_function_object_for_routine */ + +/** + * Get parameters number of the built-in routine + * + * @return number of parameters of the routine according to ECMA-262 v5 specification + */ +ecma_length_t +ecma_builtin_get_routine_parameters_number (ecma_builtin_id_t builtin_id, /**< identifier of built-in object + that initially contains property + with the routine */ + uint32_t routine_id) /**< identifier of the built-in object's + routine property + (one of ecma_builtin_{*}_property_id_t) */ +{ + switch (builtin_id) + { + case ECMA_BUILTIN_ID_GLOBAL: + { + JERRY_ASSERT (routine_id < ECMA_BUILTIN_GLOBAL_DETAIL_ID__COUNT); + + return ecma_builtin_global_get_routine_parameters_number ((ecma_builtin_global_detail_id_t) routine_id); + } + case ECMA_BUILTIN_ID_OBJECT: + case ECMA_BUILTIN_ID_OBJECT_PROTOTYPE: + case ECMA_BUILTIN_ID_FUNCTION: + case ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE: + case ECMA_BUILTIN_ID_ARRAY: + case ECMA_BUILTIN_ID_ARRAY_PROTOTYPE: + case ECMA_BUILTIN_ID_STRING: + case ECMA_BUILTIN_ID_STRING_PROTOTYPE: + case ECMA_BUILTIN_ID_BOOLEAN: + case ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE: + case ECMA_BUILTIN_ID_NUMBER: + case ECMA_BUILTIN_ID_NUMBER_PROTOTYPE: + case ECMA_BUILTIN_ID_DATE: + case ECMA_BUILTIN_ID_REGEXP: + case ECMA_BUILTIN_ID_REGEXP_PROTOTYPE: + case ECMA_BUILTIN_ID_ERROR: + case ECMA_BUILTIN_ID_ERROR_PROTOTYPE: + case ECMA_BUILTIN_ID_EVAL_ERROR: + case ECMA_BUILTIN_ID_RANGE_ERROR: + case ECMA_BUILTIN_ID_REFERENCE_ERROR: + case ECMA_BUILTIN_ID_SYNTAX_ERROR: + case ECMA_BUILTIN_ID_TYPE_ERROR: + case ECMA_BUILTIN_ID_SYNTAX_URI_ERROR: + case ECMA_BUILTIN_ID_MATH: + case ECMA_BUILTIN_ID_JSON: + { + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (routine_id); + } + } + + JERRY_UNREACHABLE (); +} /* ecma_builtin_get_routine_parameters_number */ + +/** + * Dispatcher of built-in routines + * + * @return completion-value + * Returned value must be freed with ecma_free_completion_value. + */ +ecma_completion_value_t +ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id, /**< built-in object' identifier */ + uint32_t builtin_routine_id, /**< identifier of the built-in object's routine + property (one of ecma_builtin_{*}_property_id_t) */ + ecma_value_t arguments_list [], /**< list of arguments passed to routine */ + ecma_length_t arguments_number) /**< length of arguments' list */ +{ + switch (builtin_object_id) + { + case ECMA_BUILTIN_ID_GLOBAL: + { + JERRY_ASSERT (builtin_routine_id < ECMA_BUILTIN_GLOBAL_DETAIL_ID__COUNT); + + return ecma_builtin_global_dispatch_routine ((ecma_builtin_global_detail_id_t) builtin_routine_id, + arguments_list, + arguments_number); + } + case ECMA_BUILTIN_ID_OBJECT: + case ECMA_BUILTIN_ID_OBJECT_PROTOTYPE: + case ECMA_BUILTIN_ID_FUNCTION: + case ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE: + case ECMA_BUILTIN_ID_ARRAY: + case ECMA_BUILTIN_ID_ARRAY_PROTOTYPE: + case ECMA_BUILTIN_ID_STRING: + case ECMA_BUILTIN_ID_STRING_PROTOTYPE: + case ECMA_BUILTIN_ID_BOOLEAN: + case ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE: + case ECMA_BUILTIN_ID_NUMBER: + case ECMA_BUILTIN_ID_NUMBER_PROTOTYPE: + case ECMA_BUILTIN_ID_DATE: + case ECMA_BUILTIN_ID_REGEXP: + case ECMA_BUILTIN_ID_REGEXP_PROTOTYPE: + case ECMA_BUILTIN_ID_ERROR: + case ECMA_BUILTIN_ID_ERROR_PROTOTYPE: + case ECMA_BUILTIN_ID_EVAL_ERROR: + case ECMA_BUILTIN_ID_RANGE_ERROR: + case ECMA_BUILTIN_ID_REFERENCE_ERROR: + case ECMA_BUILTIN_ID_SYNTAX_ERROR: + case ECMA_BUILTIN_ID_TYPE_ERROR: + case ECMA_BUILTIN_ID_SYNTAX_URI_ERROR: + case ECMA_BUILTIN_ID_MATH: + case ECMA_BUILTIN_ID_JSON: + { + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (builtin_routine_id, + arguments_list, + arguments_number); + } + } + + JERRY_UNREACHABLE (); +} /* ecma_builtin_dispatch_routine */ + /** * @} * @} diff --git a/src/libecmaobjects/ecma-gc.c b/src/libecmaobjects/ecma-gc.c index ead47b3d3..b738ae914 100644 --- a/src/libecmaobjects/ecma-gc.c +++ b/src/libecmaobjects/ecma-gc.c @@ -408,6 +408,7 @@ ecma_gc_mark (ecma_object_t *object_p, /**< start object */ case ECMA_INTERNAL_PROPERTY_PROVIDE_THIS: /* a boolean */ case ECMA_INTERNAL_PROPERTY_CLASS: /* an enum */ case ECMA_INTERNAL_PROPERTY_CODE: /* an integer */ + case ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_ID: /* an integer */ { break; } diff --git a/src/libecmaobjects/ecma-globals.h b/src/libecmaobjects/ecma-globals.h index 163c7a37d..872e81bf6 100644 --- a/src/libecmaobjects/ecma-globals.h +++ b/src/libecmaobjects/ecma-globals.h @@ -171,12 +171,6 @@ typedef struct uint32_t depth; } ecma_label_descriptor_t; -/** - * Target value indicating that target field - * of ecma_completion_value_t defines no target. - */ -#define ECMA_TARGET_ID_RESERVED 255 - /** * Internal properties' identifiers. */ @@ -200,7 +194,12 @@ typedef enum ECMA_INTERNAL_PROPERTY_NUMBER_INDEXED_ARRAY_VALUES, /** Part of an array, that is indexed by strings */ - ECMA_INTERNAL_PROPERTY_STRING_INDEXED_ARRAY_VALUES + ECMA_INTERNAL_PROPERTY_STRING_INDEXED_ARRAY_VALUES, + + /** Implementation-defined identifier of built-in routine + that corresponds to a built-in function object + ([[Built-in routine ID]]) */ + ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_ID } ecma_internal_property_id_t; /** diff --git a/src/libecmaobjects/ecma-helpers.c b/src/libecmaobjects/ecma-helpers.c index 7f520f02b..ba5dca183 100644 --- a/src/libecmaobjects/ecma-helpers.c +++ b/src/libecmaobjects/ecma-helpers.c @@ -663,6 +663,7 @@ ecma_free_internal_property (ecma_property_t *property_p) /**< the property */ case ECMA_INTERNAL_PROPERTY_PROVIDE_THIS: /* a boolean */ case ECMA_INTERNAL_PROPERTY_CLASS: /* an enum */ case ECMA_INTERNAL_PROPERTY_CODE: /* an integer */ + case ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_ID: /* an integer */ { break; } diff --git a/src/libecmaoperations/ecma-function-object.c b/src/libecmaoperations/ecma-function-object.c index b5cc89000..78147df94 100644 --- a/src/libecmaoperations/ecma-function-object.c +++ b/src/libecmaoperations/ecma-function-object.c @@ -549,8 +549,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ JERRY_ASSERT(ecma_op_is_callable (ecma_make_object_value (func_obj_p))); JERRY_ASSERT(arguments_list_len == 0 || arguments_list_p != NULL); - if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION - || ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION) + if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION) { ecma_completion_value_t ret_value; @@ -616,6 +615,10 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ return ret_value; } + else if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION) + { + JERRY_UNIMPLEMENTED (); + } else { JERRY_ASSERT(ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_BOUND_FUNCTION);