YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass function arguments through ecma-collections.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
This commit is contained in:
Ruben Ayrapetyan
2015-08-04 19:27:18 +03:00
parent 7daabb1974
commit 1cafff32b5
19 changed files with 245 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-function-object.cpp
+85 -82
View File
@@ -154,16 +154,16 @@ ecma_is_constructor (ecma_value_t value) /**< ecma-value */
* - [[Call]] implementation for Function objects.
* - [[Construct]] implementation for Function objects.
*
* @return ecma_value_t* - pointer to the merged argument list.
* @return collection of arguments that should be freed
* using ecma_free_values_collection with do_ref_if_object flag set
*/
static ecma_value_t*
static ecma_collection_header_t *
ecma_function_bind_merge_arg_lists (ecma_object_t *func_obj_p, /**< Function object */
const ecma_value_t *arguments_list_p, /**< arguments list */
ecma_length_t arguments_list_len, /**< length of arguments list */
ecma_length_t *total_args_count) /**< length of the merged argument list */
ecma_collection_header_t* passed_arg_collection_p) /**< passed arguments list */
{
ecma_value_t *arg_list_p;
ecma_length_t bound_args_count = 0;
ecma_length_t passed_args_number = passed_arg_collection_p != NULL ? passed_arg_collection_p->unit_number : 0;
ecma_collection_header_t *merged_arg_collection_p = ecma_new_values_collection (NULL, 0, true);
ecma_property_t *bound_args_prop_p;
bound_args_prop_p = ecma_find_internal_property (func_obj_p, ECMA_INTERNAL_PROPERTY_BOUND_FUNCTION_BOUND_ARGS);
@@ -176,35 +176,26 @@ ecma_function_bind_merge_arg_lists (ecma_object_t *func_obj_p, /**< Function obj
ecma_collection_iterator_t bound_args_iterator;
ecma_collection_iterator_init (&bound_args_iterator, bound_arg_list_p);
bound_args_count = bound_arg_list_p->unit_number;
*total_args_count = bound_args_count + arguments_list_len;
const size_t arg_list_size = (size_t) *total_args_count * sizeof (ecma_value_t);
arg_list_p = static_cast <ecma_value_t *> (mem_heap_alloc_block (arg_list_size, MEM_HEAP_ALLOC_SHORT_TERM));
for (ecma_length_t i = 0; i < bound_args_count; i++)
for (ecma_length_t i = 0; i < bound_arg_list_p->unit_number; i++)
{
bool is_moved = ecma_collection_iterator_next (&bound_args_iterator);
JERRY_ASSERT (is_moved);
arg_list_p[i] = *bound_args_iterator.current_value_p;
ecma_append_to_values_collection (merged_arg_collection_p, *bound_args_iterator.current_value_p, true);
}
}
else
{
*total_args_count = arguments_list_len;
const size_t arg_list_size = (size_t) *total_args_count * sizeof (ecma_value_t);
arg_list_p = static_cast <ecma_value_t *> (mem_heap_alloc_block (arg_list_size, MEM_HEAP_ALLOC_SHORT_TERM));
ecma_collection_iterator_t passed_args_iterator;
ecma_collection_iterator_init (&passed_args_iterator, passed_arg_collection_p);
for (ecma_length_t i = 0; i < passed_args_number; i++)
{
bool is_moved = ecma_collection_iterator_next (&passed_args_iterator);
JERRY_ASSERT (is_moved);
ecma_append_to_values_collection (merged_arg_collection_p, *passed_args_iterator.current_value_p, true);
}
for (ecma_length_t i = 0; i < arguments_list_len; i++)
{
arg_list_p[i + bound_args_count] = arguments_list_p[i];
}
return arg_list_p;
return merged_arg_collection_p;
} /* ecma_function_bind_merge_arg_lists */
/**
@@ -435,8 +426,7 @@ ecma_op_create_external_function_object (ecma_external_pointer_t code_p) /**< po
static ecma_completion_value_t
ecma_function_call_setup_args_variables (ecma_object_t *func_obj_p, /**< Function object */
ecma_object_t *env_p, /**< lexical environment */
const ecma_value_t *arguments_list_p, /**< arguments list */
ecma_length_t arguments_list_len, /**< length of argument list */
ecma_collection_header_t *arg_collection_p, /**< arguments collection */
bool is_strict, /**< flag indicating strict mode */
bool do_instantiate_arguments_object) /**< flag indicating whether
* Arguments object should be
@@ -452,7 +442,9 @@ ecma_function_call_setup_args_variables (ecma_object_t *func_obj_p, /**< Functio
{
ecma_length_t formal_parameters_count = formal_parameters_p->unit_number;
ecma_collection_iterator_t formal_params_iterator;
ecma_collection_iterator_t arguments_iterator, formal_params_iterator;
ecma_collection_iterator_init (&arguments_iterator, arg_collection_p);
ecma_collection_iterator_init (&formal_params_iterator, formal_parameters_p);
/*
@@ -467,14 +459,14 @@ ecma_function_call_setup_args_variables (ecma_object_t *func_obj_p, /**< Functio
n < formal_parameters_count;
n++)
{
ecma_value_t v;
if (n >= arguments_list_len)
ecma_value_t arg_value;
if (ecma_collection_iterator_next (&arguments_iterator))
{
v = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
arg_value = *arguments_iterator.current_value_p;
}
else
{
v = arguments_list_p[n];
arg_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
}
bool is_moved = ecma_collection_iterator_next (&formal_params_iterator);
@@ -499,7 +491,7 @@ ecma_function_call_setup_args_variables (ecma_object_t *func_obj_p, /**< Functio
ecma_completion_value_t completion = ecma_op_set_mutable_binding (env_p,
formal_parameter_name_string_p,
v,
arg_value,
is_strict);
if (ecma_is_completion_value_throw (completion))
@@ -536,8 +528,7 @@ ecma_function_call_setup_args_variables (ecma_object_t *func_obj_p, /**< Functio
ecma_object_t *args_obj_p = ecma_op_create_arguments_object (func_obj_p,
env_p,
formal_parameters_p,
arguments_list_p,
arguments_list_len,
arg_collection_p,
is_strict);
if (is_strict)
@@ -657,6 +648,41 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
return ret_value;
} /* ecma_op_function_has_instance */
/**
* Function call helper with arguments list specified in array instead of collection
*
* See also:
* ecma_op_function_call
*
* @return completion value
* Returned value must be freed with ecma_free_completion_value
*/
ecma_completion_value_t
ecma_op_function_call_array_args (ecma_object_t *func_obj_p, /**< Function object */
ecma_value_t this_arg_value, /**< 'this' argument's value */
const ecma_value_t* arguments_list_p, /**< arguments list */
ecma_length_t arguments_list_len) /**< length of arguments list */
{
if (arguments_list_len == 0)
{
return ecma_op_function_call (func_obj_p, this_arg_value, NULL);
}
else
{
ecma_collection_header_t *arg_collection_p = ecma_new_values_collection (arguments_list_p,
arguments_list_len,
true);
ecma_completion_value_t ret_value = ecma_op_function_call (func_obj_p,
this_arg_value,
arg_collection_p);
ecma_free_values_collection (arg_collection_p, true);
return ret_value;
}
} /* ecma_op_function_call_array_args */
/**
* [[Call]] implementation for Function objects,
* created through 13.2 (ECMA_OBJECT_TYPE_FUNCTION)
@@ -670,13 +696,11 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
ecma_completion_value_t
ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
ecma_value_t this_arg_value, /**< 'this' argument's value */
const ecma_value_t* arguments_list_p, /**< arguments list */
ecma_length_t arguments_list_len) /**< length of arguments list */
ecma_collection_header_t* arg_collection_p) /**< arguments list */
{
JERRY_ASSERT (func_obj_p != NULL
&& !ecma_is_lexical_environment (func_obj_p));
JERRY_ASSERT (ecma_op_is_callable (ecma_make_object_value (func_obj_p)));
JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL);
ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
@@ -686,8 +710,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
{
ret_value = ecma_builtin_dispatch_call (func_obj_p,
this_arg_value,
arguments_list_p,
arguments_list_len);
arg_collection_p);
}
else
{
@@ -737,8 +760,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
ECMA_TRY_CATCH (args_var_declaration_ret,
ecma_function_call_setup_args_variables (func_obj_p,
local_env_p,
arguments_list_p,
arguments_list_len,
arg_collection_p,
is_strict,
do_instantiate_args_obj),
ret_value);
@@ -769,8 +791,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
{
ret_value = ecma_builtin_dispatch_call (func_obj_p,
this_arg_value,
arguments_list_p,
arguments_list_len);
arg_collection_p);
}
else if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION)
{
@@ -783,8 +804,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
ret_value = jerry_dispatch_external_function (func_obj_p,
handler_p,
this_arg_value,
arguments_list_p,
arguments_list_len);
arg_collection_p);
}
else
{
@@ -801,29 +821,22 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
ecma_object_t *target_func_obj_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t,
target_function_prop_p->u.internal_property.value);
ecma_length_t total_args_count;
/* 4. */
ecma_value_t *arg_list_p = ecma_function_bind_merge_arg_lists (func_obj_p,
arguments_list_p,
arguments_list_len,
&total_args_count);
ecma_collection_header_t *merged_arg_collection_p = ecma_function_bind_merge_arg_lists (func_obj_p,
arg_collection_p);
ecma_value_t bound_this_value = bound_this_prop_p->u.internal_property.value;
/* 5. */
ret_value = ecma_op_function_call (target_func_obj_p,
bound_this_value,
arg_list_p,
total_args_count);
merged_arg_collection_p);
if (arg_list_p != NULL)
{
mem_heap_free_block (arg_list_p);
}
ecma_free_values_collection (merged_arg_collection_p, true);
}
JERRY_ASSERT (!ecma_is_completion_value_empty (ret_value));
return ret_value;
} /* ecma_op_function_call */
@@ -837,8 +850,8 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
*/
static ecma_completion_value_t
ecma_op_function_construct_simple_or_external (ecma_object_t *func_obj_p, /**< Function object */
const ecma_value_t* arguments_list_p, /**< arguments list */
ecma_length_t arguments_list_len) /**< length of arguments list */
ecma_collection_header_t* arg_collection_p) /**< arguments
* collection */
{
JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION
|| ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION);
@@ -885,8 +898,7 @@ ecma_op_function_construct_simple_or_external (ecma_object_t *func_obj_p, /**< F
ECMA_TRY_CATCH (call_completion,
ecma_op_function_call (func_obj_p,
ecma_make_object_value (obj_p),
arguments_list_p,
arguments_list_len),
arg_collection_p),
ret_value);
ecma_value_t obj_value;
@@ -927,13 +939,11 @@ ecma_op_function_construct_simple_or_external (ecma_object_t *func_obj_p, /**< F
*/
ecma_completion_value_t
ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
const ecma_value_t* arguments_list_p, /**< arguments list */
ecma_length_t arguments_list_len) /**< length of arguments list */
ecma_collection_header_t *arg_collection_p) /**< arguments collection */
{
JERRY_ASSERT (func_obj_p != NULL
&& !ecma_is_lexical_environment (func_obj_p));
JERRY_ASSERT (ecma_is_constructor (ecma_make_object_value (func_obj_p)));
JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL);
ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
@@ -942,16 +952,16 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
if (unlikely (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION
&& ecma_get_object_is_builtin (func_obj_p)))
{
ret_value = ecma_builtin_dispatch_construct (func_obj_p, arguments_list_p, arguments_list_len);
ret_value = ecma_builtin_dispatch_construct (func_obj_p, arg_collection_p);
}
else
{
ret_value = ecma_op_function_construct_simple_or_external (func_obj_p, arguments_list_p, arguments_list_len);
ret_value = ecma_op_function_construct_simple_or_external (func_obj_p, arg_collection_p);
}
}
else if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION)
{
ret_value = ecma_op_function_construct_simple_or_external (func_obj_p, arguments_list_p, arguments_list_len);
ret_value = ecma_op_function_construct_simple_or_external (func_obj_p, arg_collection_p);
}
else
{
@@ -972,22 +982,15 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
}
else
{
ecma_length_t total_args_count;
/* 4. */
ecma_value_t *arg_list_p = ecma_function_bind_merge_arg_lists (func_obj_p,
arguments_list_p,
arguments_list_len,
&total_args_count);
ecma_collection_header_t *merged_arg_collection_p = ecma_function_bind_merge_arg_lists (func_obj_p,
arg_collection_p);
/* 5. */
ret_value = ecma_op_function_construct (target_func_obj_p,
arg_list_p,
total_args_count);
if (arg_list_p != NULL)
{
mem_heap_free_block (arg_list_p);
}
merged_arg_collection_p);
ecma_free_values_collection (merged_arg_collection_p, true);
}
}
jerry-core/ecma/operations/ecma-function-object.h
+9 -4
View File
@@ -42,13 +42,18 @@ ecma_op_create_external_function_object (ecma_external_pointer_t code_p);
extern ecma_completion_value_t
ecma_op_function_call (ecma_object_t *func_obj_p,
ecma_value_t this_arg_value,
const ecma_value_t* arguments_list_p,
ecma_length_t arguments_list_len);
ecma_collection_header_t *arg_collection_p);
extern ecma_completion_value_t
ecma_op_function_call_array_args (ecma_object_t *func_obj_p,
ecma_value_t this_arg_value,
const ecma_value_t* arguments_list_p,
ecma_length_t arguments_list_len);
extern ecma_completion_value_t
ecma_op_function_construct (ecma_object_t *func_obj_p,
const ecma_value_t* arguments_list_p,
ecma_length_t arguments_list_len);
ecma_collection_header_t *arg_collection_p);
extern ecma_completion_value_t
ecma_op_function_has_instance (ecma_object_t *func_obj_p,
jerry-core/ecma/operations/ecma-get-put-value.cpp
+2 -3
View File
@@ -146,8 +146,7 @@ ecma_op_get_value_object_base (ecma_reference_t ref) /**< ECMA-reference */
// 7.
ret_value = ecma_op_function_call (obj_p,
base,
NULL,
0);
NULL);
}
}
@@ -324,7 +323,7 @@ ecma_op_put_value_object_base (ecma_reference_t ref, /**< ECMA-reference */
JERRY_ASSERT (setter_p != NULL);
ECMA_TRY_CATCH (call_ret,
ecma_op_function_call (setter_p, base, &value, 1),
ecma_op_function_call_array_args (setter_p, base, &value, 1),
ret_value);
ret_value = ecma_make_empty_completion_value ();
jerry-core/ecma/operations/ecma-objects-arguments.cpp
+13 -6
View File
@@ -45,13 +45,14 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function
ecma_object_t *lex_env_p, /**< lexical environment the Arguments
object is created for */
ecma_collection_header_t *formal_params_p, /**< formal parameters collection */
const ecma_value_t *arguments_list_p, /**< list of arguments */
ecma_length_t arguments_list_length, /**< length of arguments' list */
ecma_collection_header_t *arg_collection_p, /**< arguments collection */
bool is_strict) /**< flag indicating whether strict mode is enabled */
{
const ecma_length_t arguments_number = arg_collection_p != NULL ? arg_collection_p->unit_number : 0;
// 1.
ecma_number_t *len_p = ecma_alloc_number ();
*len_p = ecma_uint32_to_number (arguments_list_length);
*len_p = ecma_uint32_to_number (arguments_number);
// 2., 3., 6.
ecma_object_t *prototype_p = ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT_PROTOTYPE);
@@ -90,14 +91,20 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function
ecma_dealloc_number (len_p);
// 11.a, 11.b
ecma_collection_iterator_t args_iterator;
ecma_collection_iterator_init (&args_iterator, arg_collection_p);
for (ecma_length_t indx = 0;
indx < arguments_list_length;
indx < arguments_number;
indx++)
{
bool is_moved = ecma_collection_iterator_next (&args_iterator);
JERRY_ASSERT (is_moved);
prop_desc = ecma_make_empty_property_descriptor ();
{
prop_desc.is_value_defined = true;
prop_desc.value = arguments_list_p[indx];
prop_desc.value = *args_iterator.current_value_p;
prop_desc.is_writable_defined = true;
prop_desc.is_writable = true;
@@ -128,7 +135,7 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function
ecma_collection_iterator_init (&formal_params_iterator, formal_params_p);
if (!is_strict
&& arguments_list_length > 0
&& arguments_number > 0
&& formal_params_number > 0)
{
// 8.
jerry-core/ecma/operations/ecma-objects-arguments.h
+1 -2
View File
@@ -23,8 +23,7 @@ extern ecma_object_t*
ecma_op_create_arguments_object (ecma_object_t *func_obj_p,
ecma_object_t *lex_env_p,
ecma_collection_header_t *formal_params_p,
const ecma_value_t *arguments_list_p,
ecma_length_t arguments_list_length,
ecma_collection_header_t *arg_collection_p,
bool is_strict);
extern ecma_completion_value_t ecma_op_arguments_object_get (ecma_object_t *obj_p,
jerry-core/ecma/operations/ecma-objects-general.cpp
+6 -7
View File
@@ -174,8 +174,7 @@ ecma_op_general_object_get (ecma_object_t *obj_p, /**< the object */
{
return ecma_op_function_call (getter_p,
ecma_make_object_value (obj_p),
NULL,
0);
NULL);
}
}
@@ -314,10 +313,10 @@ ecma_op_general_object_put (ecma_object_t *obj_p, /**< the object */
ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
ECMA_TRY_CATCH (call_ret,
ecma_op_function_call (setter_p,
ecma_make_object_value (obj_p),
&value,
1),
ecma_op_function_call_array_args (setter_p,
ecma_make_object_value (obj_p),
&value,
1),
ret_value);
ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE);
@@ -569,7 +568,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */
call_completion = ecma_op_function_call (func_obj_p,
ecma_make_object_value (obj_p),
NULL, 0);
NULL);
}
ecma_free_completion_value (function_value_get_completion);