Skip to content

Commit 0e8a42c

Browse files
robertsipkarobertsipka
committed
Unified the commenting form of the internal properties and removed the unused types.
JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
1 parent 7813801 commit 0e8a42c

File tree

3 files changed

+22
-69
lines changed

3 files changed

+22
-69
lines changed

‎jerry-core/ecma/base/ecma-gc.c‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -242,22 +242,6 @@ ecma_gc_mark_property (ecma_property_t *property_p) /**< property */
242242

243243
switch (ECMA_PROPERTY_GET_INTERNAL_PROPERTY_TYPE (property_p))
244244
{
245-
case ECMA_INTERNAL_PROPERTY_NUMBER_INDEXED_ARRAY_VALUES: /* a collection of ecma values */
246-
case ECMA_INTERNAL_PROPERTY_STRING_INDEXED_ARRAY_VALUES: /* a collection of ecma values */
247-
{
248-
JERRY_UNIMPLEMENTED ("Indexed array storage is not implemented yet.");
249-
}
250-
251-
case ECMA_INTERNAL_PROPERTY_PROTOTYPE: /* the property's value is located in ecma_object_t
252-
* (see above in the routine) */
253-
case ECMA_INTERNAL_PROPERTY_EXTENSIBLE: /* the property's value is located in ecma_object_t
254-
* (see above in the routine) */
255-
case ECMA_INTERNAL_PROPERTY__COUNT: /* not a real internal property type,
256-
* but number of the real internal property types */
257-
{
258-
JERRY_UNREACHABLE ();
259-
}
260-
261245
case ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE: /* compressed pointer to a ecma_string_t */
262246
case ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE: /* compressed pointer to a ecma_number_t */
263247
case ECMA_INTERNAL_PROPERTY_PRIMITIVE_BOOLEAN_VALUE: /* a simple boolean value */
@@ -268,7 +252,6 @@ ecma_gc_mark_property (ecma_property_t *property_p) /**< property */
268252
case ECMA_INTERNAL_PROPERTY_FREE_CALLBACK: /* an object's native free callback */
269253
case ECMA_INTERNAL_PROPERTY_BUILT_IN_ID: /* an integer */
270254
case ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_DESC: /* an integer */
271-
case ECMA_INTERNAL_PROPERTY_EXTENSION_ID: /* an integer */
272255
case ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_0_31: /* an integer (bit-mask) */
273256
case ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_32_63: /* an integer (bit-mask) */
274257
case ECMA_INTERNAL_PROPERTY_REGEXP_BYTECODE:
@@ -322,6 +305,12 @@ ecma_gc_mark_property (ecma_property_t *property_p) /**< property */
322305

323306
break;
324307
}
308+
case ECMA_INTERNAL_PROPERTY__COUNT: /* not a real internal property type,
309+
* but number of the real internal property types */
310+
{
311+
JERRY_UNREACHABLE ();
312+
break;
313+
}
325314
}
326315
break;
327316
}

‎jerry-core/ecma/base/ecma-globals.h‎

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -120,59 +120,39 @@ typedef uint32_t ecma_value_t;
120120
typedef enum
121121
{
122122
ECMA_INTERNAL_PROPERTY_CLASS, /**< [[Class]] */
123-
ECMA_INTERNAL_PROPERTY_PROTOTYPE, /**< [[Prototype]] */
124-
ECMA_INTERNAL_PROPERTY_EXTENSIBLE, /**< [[Extensible]] */
125123
ECMA_INTERNAL_PROPERTY_SCOPE, /**< [[Scope]] */
126124
ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP, /**< [[ParametersMap]] */
127-
ECMA_INTERNAL_PROPERTY_CODE_BYTECODE, /**< first part of [[Code]] - compressed pointer to bytecode array */
125+
ECMA_INTERNAL_PROPERTY_CODE_BYTECODE, /**< pointer to compact bytecode array */
126+
ECMA_INTERNAL_PROPERTY_REGEXP_BYTECODE, /**< pointer to RegExp bytecode array */
127+
128128
ECMA_INTERNAL_PROPERTY_NATIVE_CODE, /**< native handler location descriptor */
129129
ECMA_INTERNAL_PROPERTY_NATIVE_HANDLE, /**< native handle associated with an object */
130130
ECMA_INTERNAL_PROPERTY_FREE_CALLBACK, /**< object's native free callback */
131131
ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE, /**< [[Primitive value]] for String objects */
132132
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE, /**< [[Primitive value]] for Number objects */
133133
ECMA_INTERNAL_PROPERTY_PRIMITIVE_BOOLEAN_VALUE, /**< [[Primitive value]] for Boolean objects */
134134

135-
/** Part of an array, that is indexed by numbers */
136-
ECMA_INTERNAL_PROPERTY_NUMBER_INDEXED_ARRAY_VALUES,
137-
138-
/** Part of an array, that is indexed by strings */
139-
ECMA_INTERNAL_PROPERTY_STRING_INDEXED_ARRAY_VALUES,
140-
141-
/** Implementation-defined identifier of built-in object */
142-
ECMA_INTERNAL_PROPERTY_BUILT_IN_ID,
143-
144-
/** Implementation-defined identifier of built-in routine
145-
that corresponds to a built-in function object
146-
([[Built-in routine's description]]) */
147-
ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_DESC,
148-
149-
/** Identifier of implementation-defined extension object */
150-
ECMA_INTERNAL_PROPERTY_EXTENSION_ID,
151-
152135
/** Bound function internal properties **/
153136
ECMA_INTERNAL_PROPERTY_BOUND_FUNCTION_TARGET_FUNCTION,
154137
ECMA_INTERNAL_PROPERTY_BOUND_FUNCTION_BOUND_THIS,
155138
ECMA_INTERNAL_PROPERTY_BOUND_FUNCTION_BOUND_ARGS,
156139

157-
/**
158-
* Bit-mask of non-instantiated built-in's properties (bits 0-31)
159-
*/
160-
ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_0_31,
140+
ECMA_INTERNAL_PROPERTY_BUILT_IN_ID, /**< Implementation-defined identifier of built-in object */
161141

162-
/**
163-
* Bit-mask of non-instantiated built-in's properties (bits 32-63)
164-
*/
165-
ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_32_63,
142+
ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_DESC, /**< Implementation-defined identifier of built-in routine
143+
* that corresponds to a built-in function object
144+
* ([[Built-in routine's description]])
145+
*/
166146

167-
/**
168-
* RegExp bytecode array
169-
*/
170-
ECMA_INTERNAL_PROPERTY_REGEXP_BYTECODE,
147+
ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_0_31, /**< Bit-mask of non-instantiated
148+
* built-in's properties (bits 0-31)
149+
*/
171150

172-
/**
173-
* Number of internal properties' types
174-
*/
175-
ECMA_INTERNAL_PROPERTY__COUNT
151+
ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_32_63, /**< Bit-mask of non-instantiated
152+
* built-in's properties (bits 32-63)
153+
*/
154+
155+
ECMA_INTERNAL_PROPERTY__COUNT /**< Number of internal properties' types */
176156
} ecma_internal_property_id_t;
177157

178158
/**

‎jerry-core/ecma/base/ecma-helpers.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,6 @@ ecma_find_internal_property (ecma_object_t *object_p, /**< object descriptor */
516516
{
517517
JERRY_ASSERT (object_p != NULL);
518518

519-
JERRY_ASSERT (property_id != ECMA_INTERNAL_PROPERTY_PROTOTYPE
520-
&& property_id != ECMA_INTERNAL_PROPERTY_EXTENSIBLE);
521-
522519
ecma_property_header_t *prop_iter_p = ecma_get_property_list (object_p);
523520

524521
if (prop_iter_p != NULL
@@ -804,16 +801,6 @@ ecma_free_internal_property (ecma_property_t *property_p) /**< the property */
804801

805802
switch (ECMA_PROPERTY_GET_INTERNAL_PROPERTY_TYPE (property_p))
806803
{
807-
case ECMA_INTERNAL_PROPERTY_NUMBER_INDEXED_ARRAY_VALUES: /* a collection */
808-
case ECMA_INTERNAL_PROPERTY_STRING_INDEXED_ARRAY_VALUES: /* a collection */
809-
{
810-
ecma_free_values_collection (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_header_t,
811-
property_value),
812-
true);
813-
814-
break;
815-
}
816-
817804
case ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE: /* compressed pointer to a ecma_string_t */
818805
{
819806
ecma_string_t *str_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_string_t, property_value);
@@ -842,12 +829,9 @@ ecma_free_internal_property (ecma_property_t *property_p) /**< the property */
842829
case ECMA_INTERNAL_PROPERTY_PRIMITIVE_BOOLEAN_VALUE: /* a simple boolean value */
843830
case ECMA_INTERNAL_PROPERTY_SCOPE: /* a lexical environment */
844831
case ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP: /* an object */
845-
case ECMA_INTERNAL_PROPERTY_PROTOTYPE: /* the property's value is located in ecma_object_t */
846-
case ECMA_INTERNAL_PROPERTY_EXTENSIBLE: /* the property's value is located in ecma_object_t */
847832
case ECMA_INTERNAL_PROPERTY_CLASS: /* an enum */
848833
case ECMA_INTERNAL_PROPERTY_BUILT_IN_ID: /* an integer */
849834
case ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_DESC: /* an integer */
850-
case ECMA_INTERNAL_PROPERTY_EXTENSION_ID: /* an integer */
851835
case ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_0_31: /* an integer (bit-mask) */
852836
case ECMA_INTERNAL_PROPERTY_NON_INSTANTIATED_BUILT_IN_MASK_32_63: /* an integer (bit-mask) */
853837
case ECMA_INTERNAL_PROPERTY_BOUND_FUNCTION_TARGET_FUNCTION:

0 commit comments

Comments
 (0)