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

Introduce builtin intrinsic object to share property values between builtin objects (#3490)

Browse Source 
Fixed:
 - Global symbol access
 - Array.prototype.values and Array.prototype[Symbol.iterator] must be the same function object

To test the new functionality arguments object Symbol.iterator property is added.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2020-01-16 15:57:27 +01:00
committed by GitHub
parent 332e216736
commit 8b41bf306a
26 changed files with 349 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-array-object.c
+31 -1
View File
@@ -15,6 +15,7 @@
#include "ecma-alloc.h"
#include "ecma-array-object.h"
#include "ecma-iterator-object.h"
#include "ecma-builtin-helpers.h"
#include "ecma-builtins.h"
#include "ecma-exceptions.h"
@@ -687,7 +688,7 @@ ecma_op_array_species_create (ecma_object_t *original_array_p, /**< The object f
else if (ecma_is_value_object (constructor))
{
ecma_object_t *ctor_object_p = ecma_get_object_from_value (constructor);
constructor = ecma_op_object_get_by_symbol_id (ctor_object_p, LIT_MAGIC_STRING_SPECIES);
constructor = ecma_op_object_get_by_symbol_id (ctor_object_p, LIT_GLOBAL_SYMBOL_SPECIES);
ecma_deref_object (ctor_object_p);
if (ECMA_IS_VALUE_ERROR (constructor))
@@ -729,6 +730,35 @@ ecma_op_array_species_create (ecma_object_t *original_array_p, /**< The object f
ecma_free_value (len_val);
return ret_val;
} /* ecma_op_array_species_create */
/**
* CreateArrayIterator Abstract Operation
*
* See also:
* ECMA-262 v6, 22.1.5.1
*
* Referenced by:
* ECMA-262 v6, 22.1.3.4
* ECMA-262 v6, 22.1.3.13
* ECMA-262 v6, 22.1.3.29
* ECMA-262 v6, 22.1.3.30
*
* Note:
* Returned value must be freed with ecma_free_value.
*
* @return array iterator object
*/
ecma_value_t
ecma_op_create_array_iterator (ecma_object_t *obj_p, /**< array object */
ecma_array_iterator_type_t type) /**< array iterator type */
{
ecma_object_t *prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_ARRAY_ITERATOR_PROTOTYPE);
return ecma_op_create_iterator_object (ecma_make_object_value (obj_p),
prototype_obj_p,
ECMA_PSEUDO_ARRAY_ITERATOR,
(uint8_t) type);
} /* ecma_op_create_array_iterator */
#endif /* ENABLED (JERRY_ES2015) */
/**
jerry-core/ecma/operations/ecma-array-object.h
+4
View File
@@ -101,6 +101,10 @@ ecma_op_create_array_object (const ecma_value_t *arguments_list_p, ecma_length_t
ecma_value_t
ecma_op_array_species_create (ecma_object_t *original_array_p,
ecma_length_t length);
ecma_value_t
ecma_op_create_array_iterator (ecma_object_t *obj_p,
ecma_array_iterator_type_t type);
#endif /* ENABLED (JERRY_ES2015) */
ecma_value_t
jerry-core/ecma/operations/ecma-iterator-object.c
+1 -1
View File
@@ -187,7 +187,7 @@ ecma_op_get_iterator (ecma_value_t value, /**< value to get iterator from */
if (!has_method)
{
/* 2.a */
method = ecma_op_get_method_by_symbol_id (value, LIT_MAGIC_STRING_ITERATOR);
method = ecma_op_get_method_by_symbol_id (value, LIT_GLOBAL_SYMBOL_ITERATOR);
/* 2.b */
if (ECMA_IS_VALUE_ERROR (method))
jerry-core/ecma/operations/ecma-objects-arguments.c
+16
View File
@@ -140,6 +140,22 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function
ecma_property_descriptor_t prop_desc = ecma_make_empty_property_descriptor ();
#if ENABLED (JERRY_ES2015)
/* ECMAScript v6, 9.4.4.6.7, 9.4.4.7.22 */
ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR);
prop_value_p = ecma_create_named_data_property (obj_p,
symbol_p,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE,
NULL);
ecma_deref_ecma_string (symbol_p);
prop_value_p->value = ecma_op_object_get_by_magic_id (ecma_builtin_get (ECMA_BUILTIN_ID_INTRINSIC_OBJECT),
LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES);
JERRY_ASSERT (ecma_is_value_object (prop_value_p->value));
ecma_deref_object (ecma_get_object_from_value (prop_value_p->value));
#endif /* ENABLED (JERRY_ES2015) */
/* 13. */
if (!is_strict)
{
jerry-core/ecma/operations/ecma-objects-general.c
+1 -1
View File
@@ -235,7 +235,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */
ecma_value_t obj_value = ecma_make_object_value (obj_p);
ecma_value_t exotic_to_prim = ecma_op_get_method_by_symbol_id (obj_value,
LIT_MAGIC_STRING_TO_PRIMITIVE);
LIT_GLOBAL_SYMBOL_TO_PRIMITIVE);
if (ECMA_IS_VALUE_ERROR (exotic_to_prim))
{
jerry-core/ecma/operations/ecma-objects.c
+29 -24
View File
@@ -945,6 +945,21 @@ ecma_op_object_get_by_magic_id (ecma_object_t *object_p, /**< the object */
} /* ecma_op_object_get_by_magic_id */
#if ENABLED (JERRY_ES2015)
/**
* [[Get]] a well-known symbol by the given property id
*
* @return pointer to the requested well-known symbol
*/
ecma_string_t *
ecma_op_get_global_symbol (lit_magic_string_id_t property_id) /**< property symbol id */
{
ecma_value_t symbol_value = ecma_op_object_get_by_magic_id (ecma_builtin_get (ECMA_BUILTIN_ID_INTRINSIC_OBJECT),
property_id);
JERRY_ASSERT (ecma_is_value_symbol (symbol_value));
return ecma_get_symbol_from_value (symbol_value);
} /* ecma_op_get_global_symbol */
/**
* [[Get]] operation of ecma object where the property is a well-known symbol
*
@@ -955,13 +970,8 @@ ecma_value_t
ecma_op_object_get_by_symbol_id (ecma_object_t *object_p, /**< the object */
lit_magic_string_id_t property_id) /**< property symbol id */
{
ecma_value_t symbol_value = ecma_op_object_get_by_magic_id (ecma_builtin_get (ECMA_BUILTIN_ID_SYMBOL),
property_id);
JERRY_ASSERT (ecma_is_value_symbol (symbol_value));
ecma_string_t *symbol_p = ecma_get_symbol_from_value (symbol_value);
ecma_string_t *symbol_p = ecma_op_get_global_symbol (property_id);
ecma_value_t ret_value = ecma_op_object_get (object_p, symbol_p);
ecma_deref_ecma_string (symbol_p);
return ret_value;
@@ -979,10 +989,8 @@ ecma_op_object_get_by_symbol_id (ecma_object_t *object_p, /**< the object */
* raised error - otherwise
*/
static ecma_value_t
ecma_op_get_method_by_id (ecma_value_t value, /**< ecma value */
lit_magic_string_id_t id, /**< property magic id */
bool is_symbol_id) /**< true - if id represents a symbol id
* false - otherwise */
ecma_op_get_method (ecma_value_t value, /**< ecma value */
ecma_string_t *prop_name_p) /** property name */
{
/* 2. */
ecma_value_t obj_value = ecma_op_to_object (value);
@@ -995,14 +1003,7 @@ ecma_op_get_method_by_id (ecma_value_t value, /**< ecma value */
ecma_object_t *obj_p = ecma_get_object_from_value (obj_value);
ecma_value_t func;
if (is_symbol_id)
{
func = ecma_op_object_get_by_symbol_id (obj_p, id);
}
else
{
func = ecma_op_object_get_by_magic_id (obj_p, id);
}
func = ecma_op_object_get (obj_p, prop_name_p);
ecma_deref_object (obj_p);
/* 3. */
@@ -1026,7 +1027,7 @@ ecma_op_get_method_by_id (ecma_value_t value, /**< ecma value */
/* 6. */
return func;
} /* ecma_op_get_method_by_id */
} /* ecma_op_get_method */
/**
* GetMethod operation when the property is a well-known symbol
@@ -1043,7 +1044,11 @@ ecma_value_t
ecma_op_get_method_by_symbol_id (ecma_value_t value, /**< ecma value */
lit_magic_string_id_t symbol_id) /**< property symbol id */
{
return ecma_op_get_method_by_id (value, symbol_id, true);
ecma_string_t *prop_name_p = ecma_op_get_global_symbol (symbol_id);
ecma_value_t ret_value = ecma_op_get_method (value, prop_name_p);
ecma_deref_ecma_string (prop_name_p);
return ret_value;
} /* ecma_op_get_method_by_symbol_id */
/**
@@ -1061,7 +1066,7 @@ ecma_value_t
ecma_op_get_method_by_magic_id (ecma_value_t value, /**< ecma value */
lit_magic_string_id_t magic_id) /**< property magic id */
{
return ecma_op_get_method_by_id (value, magic_id, false);
return ecma_op_get_method (value, ecma_get_magic_string (magic_id));
} /* ecma_op_get_method_by_magic_id */
#endif /* ENABLED (JERRY_ES2015) */
@@ -2568,7 +2573,7 @@ ecma_op_is_concat_spreadable (ecma_value_t arg) /**< argument */
}
ecma_value_t spreadable = ecma_op_object_get_by_symbol_id (ecma_get_object_from_value (arg),
LIT_MAGIC_STRING_IS_CONCAT_SPREADABLE);
LIT_GLOBAL_SYMBOL_IS_CONCAT_SPREADABLE);
if (ECMA_IS_VALUE_ERROR (spreadable))
{
@@ -2604,7 +2609,7 @@ ecma_op_is_regexp (ecma_value_t arg) /**< argument */
}
ecma_value_t is_regexp = ecma_op_object_get_by_symbol_id (ecma_get_object_from_value (arg),
LIT_MAGIC_STRING_MATCH);
LIT_GLOBAL_SYMBOL_MATCH);
if (ECMA_IS_VALUE_ERROR (is_regexp))
{
@@ -2653,7 +2658,7 @@ ecma_op_species_constructor (ecma_object_t *this_value, /**< This Value */
}
ecma_object_t *ctor_object_p = ecma_get_object_from_value (constructor);
ecma_value_t species = ecma_op_object_get_by_symbol_id (ctor_object_p, LIT_MAGIC_STRING_SPECIES);
ecma_value_t species = ecma_op_object_get_by_symbol_id (ctor_object_p, LIT_GLOBAL_SYMBOL_SPECIES);
ecma_deref_object (ctor_object_p);
if (ECMA_IS_VALUE_ERROR (species))
jerry-core/ecma/operations/ecma-objects.h
+1
View File
@@ -43,6 +43,7 @@ ecma_value_t ecma_op_object_get_length (ecma_object_t *object_p, uint32_t *lengt
ecma_value_t ecma_op_object_get_by_uint32_index (ecma_object_t *object_p, uint32_t index);
ecma_value_t ecma_op_object_get_by_magic_id (ecma_object_t *object_p, lit_magic_string_id_t property_id);
#if ENABLED (JERRY_ES2015)
ecma_string_t *ecma_op_get_global_symbol (lit_magic_string_id_t property_id);
ecma_value_t ecma_op_object_get_by_symbol_id (ecma_object_t *object_p, lit_magic_string_id_t property_id);
ecma_value_t ecma_op_get_method_by_symbol_id (ecma_value_t value, lit_magic_string_id_t symbol_id);
ecma_value_t ecma_op_get_method_by_magic_id (ecma_value_t value, lit_magic_string_id_t magic_id);
jerry-core/ecma/operations/ecma-reference.c
+1 -1
View File
@@ -113,7 +113,7 @@ ecma_op_is_prop_unscopable (ecma_object_t *lex_env_p, /**< lexical environment *
ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p);
ecma_value_t unscopables = ecma_op_object_get_by_symbol_id (binding_obj_p, LIT_MAGIC_STRING_UNSCOPABLES);
ecma_value_t unscopables = ecma_op_object_get_by_symbol_id (binding_obj_p, LIT_GLOBAL_SYMBOL_UNSCOPABLES);
if (ECMA_IS_VALUE_ERROR (unscopables))
{