diff --git a/src/libecmabuiltins/ecma-builtin-function-object.c b/src/libecmabuiltins/ecma-builtin-function-object.c new file mode 100644 index 000000000..f92ed1e33 --- /dev/null +++ b/src/libecmabuiltins/ecma-builtin-function-object.c @@ -0,0 +1,246 @@ +/* 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 "ecma-alloc.h" +#include "ecma-builtins.h" +#include "ecma-conversion.h" +#include "ecma-exceptions.h" +#include "ecma-gc.h" +#include "ecma-globals.h" +#include "ecma-helpers.h" +#include "ecma-objects.h" +#include "ecma-function-object.h" +#include "ecma-try-catch-macro.h" +#include "globals.h" + +#define ECMA_BUILTINS_INTERNAL +#include "ecma-builtins-internal.h" + +/** \addtogroup ecma ECMA + * @{ + * + * \addtogroup ecmabuiltins + * @{ + * + * \addtogroup function ECMA Function object built-in + * @{ + */ + +/** + * List of the Function object built-in object value properties in format 'macro (name, value)'. + */ +#define ECMA_BUILTIN_FUNCTION_OBJECT_OBJECT_VALUES_PROPERTY_LIST(macro) \ + macro (ECMA_MAGIC_STRING_PROTOTYPE, ecma_builtin_get (ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE)) +#define ECMA_BUILTIN_FUNCTION_OBJECT_NUMBER_VALUES_PROPERTY_LIST(macro) \ + macro (ECMA_MAGIC_STRING_LENGTH, 1) + +/** + * List of the Function object's built-in property names + */ +static const ecma_magic_string_id_t ecma_builtin_function_property_names[] = +{ +#define VALUE_PROP_LIST(name, value) name, +#define ROUTINE_PROP_LIST(name, c_function_name, args_number, length) name, + ECMA_BUILTIN_FUNCTION_OBJECT_OBJECT_VALUES_PROPERTY_LIST (VALUE_PROP_LIST) + ECMA_BUILTIN_FUNCTION_OBJECT_NUMBER_VALUES_PROPERTY_LIST (VALUE_PROP_LIST) +#undef VALUE_PROP_LIST +#undef ROUTINE_PROP_LIST +}; + +/** + * Number of the Function object's built-in properties + */ +const ecma_length_t ecma_builtin_function_property_number = (sizeof (ecma_builtin_function_property_names) / + sizeof (ecma_magic_string_id_t)); + +/** + * If the property's name is one of built-in properties of the Function object + * that is not instantiated yet, instantiate the property and + * return pointer to the instantiated property. + * + * @return pointer property, if one was instantiated, + * NULL - otherwise. + */ +ecma_property_t* +ecma_builtin_function_try_to_instantiate_property (ecma_object_t *obj_p, /**< object */ + ecma_string_t *prop_name_p) /**< property's name */ +{ + JERRY_ASSERT (ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_FUNCTION)); + JERRY_ASSERT (ecma_find_named_property (obj_p, prop_name_p) == NULL); + + ecma_magic_string_id_t id; + + if (!ecma_is_string_magic (prop_name_p, &id)) + { + return NULL; + } + + int32_t index = ecma_builtin_bin_search_for_magic_string_id_in_array (ecma_builtin_function_property_names, + ecma_builtin_function_property_number, + id); + + if (index == -1) + { + return NULL; + } + + JERRY_ASSERT (index >= 0 && (uint32_t) index < sizeof (uint64_t) * JERRY_BITSINBYTE); + + uint32_t bit; + ecma_internal_property_id_t mask_prop_id; + + if (index >= 32) + { + mask_prop_id = ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_32_63; + bit = (uint32_t) 1u << (index - 32); + } + else + { + mask_prop_id = ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_0_31; + bit = (uint32_t) 1u << index; + } + + ecma_property_t *mask_prop_p = ecma_get_internal_property (obj_p, mask_prop_id); + uint32_t bit_mask = mask_prop_p->u.internal_property.value; + + if (!(bit_mask & bit)) + { + return NULL; + } + + bit_mask &= ~bit; + + mask_prop_p->u.internal_property.value = bit_mask; + + ecma_value_t value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY); + ecma_property_writable_value_t writable = ECMA_PROPERTY_WRITABLE; + ecma_property_enumerable_value_t enumerable = ECMA_PROPERTY_NOT_ENUMERABLE; + ecma_property_configurable_value_t configurable = ECMA_PROPERTY_CONFIGURABLE; + + switch (id) + { +#define CASE_VALUE_PROP_LIST(name, value) case name: + ECMA_BUILTIN_FUNCTION_OBJECT_OBJECT_VALUES_PROPERTY_LIST (CASE_VALUE_PROP_LIST) + ECMA_BUILTIN_FUNCTION_OBJECT_NUMBER_VALUES_PROPERTY_LIST (CASE_VALUE_PROP_LIST) +#undef CASE_VALUE_PROP_LIST + { + writable = ECMA_PROPERTY_NOT_WRITABLE; + enumerable = ECMA_PROPERTY_NOT_ENUMERABLE; + configurable = ECMA_PROPERTY_NOT_CONFIGURABLE; + + switch (id) + { +#define CASE_OBJECT_VALUE_PROP_LIST(name, value_obj) case name: { value = ecma_make_object_value (value_obj); break; } + ECMA_BUILTIN_FUNCTION_OBJECT_OBJECT_VALUES_PROPERTY_LIST (CASE_OBJECT_VALUE_PROP_LIST) +#undef CASE_OBJECT_VALUE_PROP_LIST +#define CASE_NUMBER_VALUE_PROP_LIST(name, value_num) case name: { ecma_number_t *num_p = ecma_alloc_number (); \ + *num_p = (ecma_number_t) value_num; \ + value = ecma_make_number_value (num_p); break; } + ECMA_BUILTIN_FUNCTION_OBJECT_NUMBER_VALUES_PROPERTY_LIST (CASE_NUMBER_VALUE_PROP_LIST) +#undef CASE_NUMBER_VALUE_PROP_LIST + default: + { + JERRY_UNREACHABLE (); + } + } + + break; + } + + default: + { + JERRY_UNREACHABLE (); + } + } + + ecma_property_t *prop_p = ecma_create_named_data_property (obj_p, + prop_name_p, + writable, + enumerable, + configurable); + + prop_p->u.named_data_property.value = ecma_copy_value (value, false); + ecma_gc_update_may_ref_younger_object_flag_by_value (obj_p, + prop_p->u.named_data_property.value); + + ecma_free_value (value, true); + + return prop_p; +} /* ecma_builtin_function_try_to_instantiate_property */ + +/** + * Dispatcher of the Function object's built-in routines + * + * @return completion-value + * Returned value must be freed with ecma_free_completion_value. + */ +ecma_completion_value_t +ecma_builtin_function_dispatch_routine (ecma_magic_string_id_t builtin_routine_id __unused, /**< Function object's + built-in routine's + name */ + ecma_value_t this_arg_value __unused, /**< 'this' argument value */ + ecma_value_t arguments_list [] __unused, /**< list of arguments + passed to routine */ + ecma_length_t arguments_number __unused) /**< length of arguments' list */ +{ + JERRY_UNREACHABLE (); +} /* ecma_builtin_function_dispatch_routine */ + +/** + * Get number of routine's parameters + * + * @return number of parameters + */ +ecma_length_t +ecma_builtin_function_get_routine_parameters_number (ecma_magic_string_id_t builtin_routine_id __unused) /**< built-in + routine's + name */ +{ + JERRY_UNREACHABLE (); +} /* ecma_builtin_function_get_routine_parameters_number */ + +/** + * Handle calling [[Call]] of built-in Function object + * + * @return completion-value + */ +ecma_completion_value_t +ecma_builtin_function_dispatch_call (ecma_value_t *arguments_list_p, /**< arguments list */ + ecma_length_t arguments_list_len) /**< number of arguments */ +{ + JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); + + return ecma_builtin_function_dispatch_construct (arguments_list_p, arguments_list_len); +} /* ecma_builtin_function_dispatch_call */ + +/** + * Handle calling [[Construct]] of built-in Function object + * + * @return completion-value + */ +ecma_completion_value_t +ecma_builtin_function_dispatch_construct (ecma_value_t *arguments_list_p, /**< arguments list */ + ecma_length_t arguments_list_len) /**< number of arguments */ +{ + JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); + + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (arguments_list_p, arguments_list_len); +} /* ecma_builtin_function_dispatch_construct */ + +/** + * @} + * @} + * @} + */ diff --git a/src/libecmabuiltins/ecma-builtin-function-prototype-object.c b/src/libecmabuiltins/ecma-builtin-function-prototype-object.c new file mode 100644 index 000000000..499adfa82 --- /dev/null +++ b/src/libecmabuiltins/ecma-builtin-function-prototype-object.c @@ -0,0 +1,374 @@ +/* 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 "ecma-alloc.h" +#include "ecma-builtins.h" +#include "ecma-conversion.h" +#include "ecma-exceptions.h" +#include "ecma-gc.h" +#include "ecma-globals.h" +#include "ecma-helpers.h" +#include "ecma-objects.h" +#include "ecma-string-object.h" +#include "ecma-try-catch-macro.h" +#include "globals.h" + +#define ECMA_BUILTINS_INTERNAL +#include "ecma-builtins-internal.h" + +/** \addtogroup ecma ECMA + * @{ + * + * \addtogroup ecmabuiltins + * @{ + * + * \addtogroup functionprototype ECMA Function.prototype object built-in + * @{ + */ + +/** + * List of the Function.prototype object built-in object value properties in format 'macro (name, value)'. + */ +#define ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_OBJECT_VALUES_PROPERTY_LIST(macro) \ + macro (ECMA_MAGIC_STRING_CONSTRUCTOR, ecma_builtin_get (ECMA_BUILTIN_ID_FUNCTION)) + +/** + * List of the Function.prototype object built-in routine properties in format + * 'macro (name, C function name, arguments number of the routine, length value of the routine)'. + */ +#define ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_ROUTINES_PROPERTY_LIST(macro) \ + macro (ECMA_MAGIC_STRING_TO_STRING_UL, \ + ecma_builtin_function_prototype_object_to_string, \ + 0, \ + 0) \ + macro (ECMA_MAGIC_STRING_APPLY, \ + ecma_builtin_function_prototype_object_apply, \ + 2, \ + 2) \ + macro (ECMA_MAGIC_STRING_CALL, \ + ecma_builtin_function_prototype_object_call, \ + NON_FIXED, \ + 1) \ + macro (ECMA_MAGIC_STRING_BIND, \ + ecma_builtin_function_prototype_object_bind, \ + NON_FIXED, \ + 1) + +/** + * List of the Function.prototype object's built-in property names + */ +static const ecma_magic_string_id_t ecma_builtin_property_names[] = +{ +#define VALUE_PROP_LIST(name, value) name, +#define ROUTINE_PROP_LIST(name, c_function_name, args_number, length) name, + ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_OBJECT_VALUES_PROPERTY_LIST (VALUE_PROP_LIST) + ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_ROUTINES_PROPERTY_LIST (ROUTINE_PROP_LIST) +#undef VALUE_PROP_LIST +#undef ROUTINE_PROP_LIST +}; + +/** + * Number of the Function.prototype object's built-in properties + */ +const ecma_length_t ecma_builtin_function_prototype_property_number = (sizeof (ecma_builtin_property_names) / + sizeof (ecma_magic_string_id_t)); + +/** + * The Function.prototype object's 'toString' routine + * + * See also: + * ECMA-262 v5, 15.3.4.2 + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value. + */ +static ecma_completion_value_t +ecma_builtin_function_prototype_object_to_string (ecma_value_t this) /**< this argument */ +{ + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (this); +} /* ecma_builtin_function_prototype_object_to_string */ + +/** + * The Function.prototype object's 'apply' routine + * + * See also: + * ECMA-262 v5, 15.3.4.3 + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value. + */ +static ecma_completion_value_t +ecma_builtin_function_prototype_object_apply (ecma_value_t this, /**< this argument */ + ecma_value_t arg1, /**< first argument */ + ecma_value_t arg2) /**< second argument */ +{ + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (this, arg1, arg2); +} /* ecma_builtin_function_prototype_object_apply */ + +/** + * The Function.prototype object's 'call' routine + * + * See also: + * ECMA-262 v5, 15.3.4.4 + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value. + */ +static ecma_completion_value_t +ecma_builtin_function_prototype_object_call (ecma_value_t this, /**< this argument */ + ecma_value_t *arguments_list_p, /**< list of arguments */ + ecma_length_t arguments_number) /**< number of arguments */ +{ + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (this, arguments_list_p, arguments_number); +} /* ecma_builtin_function_prototype_object_call */ + +/** + * The Function.prototype object's 'bind' routine + * + * See also: + * ECMA-262 v5, 15.3.4.5 + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value. + */ +static ecma_completion_value_t +ecma_builtin_function_prototype_object_bind (ecma_value_t this, /**< this argument */ + ecma_value_t *arguments_list_p, /**< list of arguments */ + ecma_length_t arguments_number) /**< number of arguments */ +{ + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (this, arguments_list_p, arguments_number); +} /* ecma_builtin_function_prototype_object_bind */ + +/** + * Handle calling [[Call]] of built-in Function.prototype object + * + * @return completion-value + */ +ecma_completion_value_t +ecma_builtin_function_prototype_dispatch_call (ecma_value_t *arguments_list_p, /**< arguments list */ + ecma_length_t arguments_list_len) /**< number of arguments */ +{ + JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); + + return ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_UNDEFINED); +} /* ecma_builtin_function_prototype_dispatch_call */ + +/** + * Handle calling [[Construct]] of built-in Function.prototype object + * + * @return completion-value + */ +ecma_completion_value_t +ecma_builtin_function_prototype_dispatch_construct (ecma_value_t *arguments_list_p, /**< arguments list */ + ecma_length_t arguments_list_len) /**< number of arguments */ +{ + JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); + + return ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE)); +} /* ecma_builtin_function_prototype_dispatch_construct */ + +/** + * If the property's name is one of built-in properties of the Function.prototype object + * that is not instantiated yet, instantiate the property and + * return pointer to the instantiated property. + * + * @return pointer property, if one was instantiated, + * NULL - otherwise. + */ +ecma_property_t* +ecma_builtin_function_prototype_try_to_instantiate_property (ecma_object_t *obj_p, /**< object */ + ecma_string_t *prop_name_p) /**< property's name */ +{ + JERRY_ASSERT (ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE)); + JERRY_ASSERT (ecma_find_named_property (obj_p, prop_name_p) == NULL); + + ecma_magic_string_id_t id; + + if (!ecma_is_string_magic (prop_name_p, &id)) + { + return NULL; + } + + int32_t index = ecma_builtin_bin_search_for_magic_string_id_in_array (ecma_builtin_property_names, + ecma_builtin_function_prototype_property_number, + id); + + if (index == -1) + { + return NULL; + } + + JERRY_ASSERT (index >= 0 && (uint32_t) index < sizeof (uint64_t) * JERRY_BITSINBYTE); + + uint32_t bit; + ecma_internal_property_id_t mask_prop_id; + + if (index >= 32) + { + mask_prop_id = ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_32_63; + bit = (uint32_t) 1u << (index - 32); + } + else + { + mask_prop_id = ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_0_31; + bit = (uint32_t) 1u << index; + } + + ecma_property_t *mask_prop_p = ecma_get_internal_property (obj_p, mask_prop_id); + uint32_t bit_mask = mask_prop_p->u.internal_property.value; + + if (!(bit_mask & bit)) + { + return NULL; + } + + bit_mask &= ~bit; + + mask_prop_p->u.internal_property.value = bit_mask; + + ecma_value_t value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY); + ecma_property_writable_value_t writable = ECMA_PROPERTY_WRITABLE; + ecma_property_enumerable_value_t enumerable = ECMA_PROPERTY_NOT_ENUMERABLE; + ecma_property_configurable_value_t configurable = ECMA_PROPERTY_CONFIGURABLE; + + switch (id) + { +#define CASE_ROUTINE_PROP_LIST(name, c_function_name, args_number, length) case name: + ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_ROUTINES_PROPERTY_LIST (CASE_ROUTINE_PROP_LIST) +#undef CASE_ROUTINE_PROP_LIST + { + ecma_object_t *func_obj_p = ecma_builtin_make_function_object_for_routine (ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, + id); + + value = ecma_make_object_value (func_obj_p); + + break; + } +#define CASE_VALUE_PROP_LIST(name, value) case name: + ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_OBJECT_VALUES_PROPERTY_LIST (CASE_VALUE_PROP_LIST) +#undef CASE_VALUE_PROP_LIST + { + writable = ECMA_PROPERTY_NOT_WRITABLE; + enumerable = ECMA_PROPERTY_NOT_ENUMERABLE; + configurable = ECMA_PROPERTY_NOT_CONFIGURABLE; + + switch (id) + { +#define CASE_OBJECT_VALUE_PROP_LIST(name, value_obj) case name: { value = ecma_make_object_value (value_obj); break; } + ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_OBJECT_VALUES_PROPERTY_LIST (CASE_OBJECT_VALUE_PROP_LIST) +#undef CASE_OBJECT_VALUE_PROP_LIST + default: + { + JERRY_UNREACHABLE (); + } + } + + break; + } + + default: + { + JERRY_UNREACHABLE (); + } + } + + ecma_property_t *prop_p = ecma_create_named_data_property (obj_p, + prop_name_p, + writable, + enumerable, + configurable); + + prop_p->u.named_data_property.value = ecma_copy_value (value, false); + ecma_gc_update_may_ref_younger_object_flag_by_value (obj_p, + prop_p->u.named_data_property.value); + + ecma_free_value (value, true); + + return prop_p; +} /* ecma_builtin_function_prototype_try_to_instantiate_property */ + +/** + * Dispatcher of the Function.prototype object's built-in routines + * + * @return completion-value + * Returned value must be freed with ecma_free_completion_value. + */ +ecma_completion_value_t +ecma_builtin_function_prototype_dispatch_routine (ecma_magic_string_id_t builtin_routine_id, /**< Function.prototype + object's built-in + routine's name */ + ecma_value_t this_arg_value __unused, /**< 'this' argument value */ + ecma_value_t arguments_list [], /**< list of arguments + passed to routine */ + ecma_length_t arguments_number) /**< length of arguments' list */ +{ + const ecma_value_t value_undefined = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED); + + switch (builtin_routine_id) + { +#define ROUTINE_ARG(n) (arguments_number >= n ? arguments_list[n - 1] : value_undefined) +#define ROUTINE_ARG_LIST_0 +#define ROUTINE_ARG_LIST_1 , ROUTINE_ARG(1) +#define ROUTINE_ARG_LIST_2 ROUTINE_ARG_LIST_1, ROUTINE_ARG(2) +#define ROUTINE_ARG_LIST_3 ROUTINE_ARG_LIST_2, ROUTINE_ARG(3) +#define ROUTINE_ARG_LIST_NON_FIXED , arguments_list, arguments_number +#define CASE_ROUTINE_PROP_LIST(name, c_function_name, args_number, length) \ + case name: \ + { \ + return c_function_name (this_arg_value ROUTINE_ARG_LIST_ ## args_number); \ + } + ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_ROUTINES_PROPERTY_LIST (CASE_ROUTINE_PROP_LIST) +#undef CASE_ROUTINE_PROP_LIST +#undef ROUTINE_ARG_LIST_0 +#undef ROUTINE_ARG_LIST_1 +#undef ROUTINE_ARG_LIST_2 +#undef ROUTINE_ARG_LIST_3 +#undef ROUTINE_ARG_LIST_NON_FIXED + + default: + { + JERRY_UNREACHABLE (); + } + } +} /* ecma_builtin_function_prototype_dispatch_routine */ + +/** + * Get number of routine's parameters + * + * @return number of parameters + */ +ecma_length_t +ecma_builtin_function_prototype_get_routine_parameters_number (ecma_magic_string_id_t builtin_routine_id) /**< built-in + routine's + name */ +{ + switch (builtin_routine_id) + { +#define CASE_ROUTINE_PROP_LIST(name, c_function_name, args_number, length) case name: return length; + ECMA_BUILTIN_FUNCTION_PROTOTYPE_OBJECT_ROUTINES_PROPERTY_LIST (CASE_ROUTINE_PROP_LIST) +#undef CASE_ROUTINE_PROP_LIST + + default: + { + JERRY_UNREACHABLE (); + } + } +} /* ecma_builtin_function_prototype_get_routine_parameters_number */ + +/** + * @} + * @} + * @} + */ diff --git a/src/libecmabuiltins/ecma-builtin-global-object.c b/src/libecmabuiltins/ecma-builtin-global-object.c index 7eb535009..af6ee0caf 100644 --- a/src/libecmabuiltins/ecma-builtin-global-object.c +++ b/src/libecmabuiltins/ecma-builtin-global-object.c @@ -505,8 +505,15 @@ ecma_builtin_global_try_to_instantiate_property (ecma_object_t *obj_p, /**< obje break; } - case ECMA_MAGIC_STRING_FUNCTION_UL: + { + ecma_object_t *function_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_FUNCTION); + + value = ecma_make_object_value (function_obj_p); + + break; + } + case ECMA_MAGIC_STRING_BOOLEAN_UL: case ECMA_MAGIC_STRING_NUMBER_UL: case ECMA_MAGIC_STRING_DATE_UL: diff --git a/src/libecmabuiltins/ecma-builtins-internal.h b/src/libecmabuiltins/ecma-builtins-internal.h index ff235a7ee..e2d2c1f34 100644 --- a/src/libecmabuiltins/ecma-builtins-internal.h +++ b/src/libecmabuiltins/ecma-builtins-internal.h @@ -64,6 +64,11 @@ ecma_builtin_bin_search_for_magic_string_id_in_array (const ecma_magic_string_id OBJECT_UL, \ ECMA_BUILTIN_ID__COUNT /* no prototype */, \ object_prototype) \ + macro (FUNCTION_PROTOTYPE, \ + TYPE_FUNCTION, \ + FUNCTION_UL, \ + ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, \ + function_prototype) \ macro (STRING_PROTOTYPE, \ TYPE_GENERAL, \ STRING_UL, \ @@ -89,6 +94,11 @@ ecma_builtin_bin_search_for_magic_string_id_in_array (const ecma_magic_string_id STRING_UL, \ ECMA_BUILTIN_ID_STRING_PROTOTYPE, \ string) \ + macro (FUNCTION, \ + TYPE_FUNCTION, \ + FUNCTION_UL, \ + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, \ + function) \ macro (GLOBAL, \ TYPE_GENERAL, \ OBJECT_UL, \ diff --git a/src/libecmaobjects/ecma-globals.h b/src/libecmaobjects/ecma-globals.h index 7bd4ec08f..3fb2f25d2 100644 --- a/src/libecmaobjects/ecma-globals.h +++ b/src/libecmaobjects/ecma-globals.h @@ -810,6 +810,9 @@ typedef enum ECMA_MAGIC_STRING_TO_UTC_STRING_UL, /**< "toUTCString" */ ECMA_MAGIC_STRING_TO_ISO_STRING_UL, /**< "toISOString" */ ECMA_MAGIC_STRING_TO_JSON_UL, /**< "toJSON" */ + ECMA_MAGIC_STRING_APPLY, /**< "apply" */ + ECMA_MAGIC_STRING_CALL, /**< "call" */ + ECMA_MAGIC_STRING_BIND, /**< "bind" */ ECMA_MAGIC_STRING_EXEC, /**< "exec" */ ECMA_MAGIC_STRING_TEST, /**< "test" */ ECMA_MAGIC_STRING_NAME, /**< "name" */ diff --git a/src/libecmaobjects/ecma-helpers-string.c b/src/libecmaobjects/ecma-helpers-string.c index 425d7c76b..5b62e57da 100644 --- a/src/libecmaobjects/ecma-helpers-string.c +++ b/src/libecmaobjects/ecma-helpers-string.c @@ -1425,6 +1425,9 @@ ecma_get_magic_string_zt (ecma_magic_string_id_t id) /**< magic string id */ case ECMA_MAGIC_STRING_TO_UTC_STRING_UL: return (ecma_char_t*) "toUTCString"; case ECMA_MAGIC_STRING_TO_ISO_STRING_UL: return (ecma_char_t*) "toISOString"; case ECMA_MAGIC_STRING_TO_JSON_UL: return (ecma_char_t*) "toJSON"; + case ECMA_MAGIC_STRING_APPLY: return (ecma_char_t*) "apply"; + case ECMA_MAGIC_STRING_CALL: return (ecma_char_t*) "call"; + case ECMA_MAGIC_STRING_BIND: return (ecma_char_t*) "bind"; case ECMA_MAGIC_STRING_EXEC: return (ecma_char_t*) "exec"; case ECMA_MAGIC_STRING_TEST: return (ecma_char_t*) "test"; case ECMA_MAGIC_STRING_NAME: return (ecma_char_t*) "name"; diff --git a/tests/jerry/function.js b/tests/jerry/function.js new file mode 100644 index 000000000..f1a22a3e4 --- /dev/null +++ b/tests/jerry/function.js @@ -0,0 +1,17 @@ +// 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. + +assert(Function.constructor === Function); +assert(Function.prototype() === undefined); +assert(Function.length === 1);