Replacing items of ecma_object_class_t with corresponding ecma magic strings.

src/libecmabuiltins/ecma-builtin-array-object.c

@@ -94,7 +94,7 @@ ecma_builtin_array_object_is_array (ecma_value_t arg) /**< first argument */
     ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p,
                                                                 ECMA_INTERNAL_PROPERTY_CLASS);
 
-    if (class_prop_p->u.internal_property.value == ECMA_OBJECT_CLASS_ARRAY)
+    if (class_prop_p->u.internal_property.value == ECMA_MAGIC_STRING_ARRAY_UL)
     {
       is_array = ECMA_SIMPLE_VALUE_TRUE;
     }

src/libecmabuiltins/ecma-builtin-string-prototype-object.c

@@ -167,7 +167,7 @@ ecma_builtin_string_prototype_object_to_string (ecma_value_t this) /**< this arg
 
     ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_CLASS);
 
-    if (class_prop_p->u.internal_property.value == ECMA_OBJECT_CLASS_STRING)
+    if (class_prop_p->u.internal_property.value == ECMA_MAGIC_STRING_STRING_UL)
     {
       ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
                                                                        ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE);

src/libecmabuiltins/ecma-builtins-internal.h

@@ -61,37 +61,37 @@ ecma_builtin_bin_search_for_magic_string_id_in_array (const ecma_magic_string_id
 #define ECMA_BUILTIN_LIST(macro) \
   macro (OBJECT_PROTOTYPE, \
          TYPE_GENERAL, \
-         CLASS_OBJECT, \
+         OBJECT_UL, \
          ECMA_BUILTIN_ID__COUNT /* no prototype */, \
          object_prototype) \
   macro (STRING_PROTOTYPE, \
          TYPE_GENERAL, \
-         CLASS_STRING, \
+         STRING_UL, \
          ECMA_BUILTIN_ID__COUNT /* FIXME: ECMA_BUILTIN_ID_OBJECT_PROTOTYPE */, \
          string_prototype) \
   macro (OBJECT, \
          TYPE_FUNCTION, \
-         CLASS_OBJECT, \
+         OBJECT_UL, \
          ECMA_BUILTIN_ID__COUNT /* FIXME: ECMA_BUILTIN_ID_OBJECT_PROTOTYPE */, \
          object) \
   macro (MATH, \
          TYPE_GENERAL, \
-         CLASS_MATH, \
+         MATH_UL, \
          ECMA_BUILTIN_ID__COUNT /* FIXME: ECMA_BUILTIN_ID_OBJECT_PROTOTYPE */, \
          math) \
   macro (ARRAY, \
          TYPE_FUNCTION, \
-         CLASS_ARRAY, \
+         ARRAY_UL, \
          ECMA_BUILTIN_ID__COUNT /* FIXME: ECMA_BUILTIN_ID_ARRAY_PROTOTYPE */, \
          array) \
   macro (STRING, \
          TYPE_FUNCTION, \
-         CLASS_STRING, \
+         STRING_UL, \
          ECMA_BUILTIN_ID_STRING_PROTOTYPE, \
          string) \
   macro (GLOBAL, \
          TYPE_GENERAL, \
-         CLASS_OBJECT, \
+         OBJECT_UL, \
          ECMA_BUILTIN_ID__COUNT /* no prototype */, \
          global)
 

src/libecmabuiltins/ecma-builtins.c

@@ -88,7 +88,7 @@ static ecma_object_t*
 ecma_builtin_init_object (ecma_builtin_id_t obj_builtin_id, /**< built-in ID */
                           ecma_object_t* prototype_obj_p, /**< prototype object */
                           ecma_object_type_t obj_type, /**< object's type */
-                          ecma_object_class_t obj_class, /**< object's class */
+                          ecma_magic_string_id_t obj_class, /**< object's class */
                           ecma_length_t property_number) /**< number of the object's properties */
 {
   ecma_object_t *object_obj_p = ecma_create_object (prototype_obj_p, true, obj_type);
@@ -155,7 +155,7 @@ ecma_init_builtins (void)
     ecma_object_t *builtin_obj_p =  ecma_builtin_init_object (ECMA_BUILTIN_ID_ ## builtin_id, \
                                                               prototype_obj_p, \
                                                               ECMA_OBJECT_ ## object_type, \
-                                                              ECMA_OBJECT_ ## object_class, \
+                                                              ECMA_MAGIC_STRING_ ## object_class, \
                                                               ecma_builtin_ ## lowercase_name ## _property_number); \
     ecma_builtin_objects [ECMA_BUILTIN_ID_ ## builtin_id] = builtin_obj_p; \
   }