Move char type definitions and magic string processing functions to literal component.

JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov a.shitov@samsung.com
This commit is contained in:
Andrey Shitov
2015-06-29 17:57:10 +03:00
parent 07148d319b
commit a0c5974ab8
88 changed files with 1185 additions and 1091 deletions
+26 -26
View File
@@ -518,7 +518,7 @@ ecma_op_object_is_prototype_of (ecma_object_t *base_p, /** < base object */
*
* @return class name magic string
*/
ecma_magic_string_id_t
lit_magic_string_id_t
ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
{
ecma_object_type_t type = ecma_get_object_type (obj_p);
@@ -527,19 +527,19 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
{
case ECMA_OBJECT_TYPE_ARRAY:
{
return ECMA_MAGIC_STRING_ARRAY_UL;
return LIT_MAGIC_STRING_ARRAY_UL;
}
case ECMA_OBJECT_TYPE_STRING:
{
return ECMA_MAGIC_STRING_STRING_UL;
return LIT_MAGIC_STRING_STRING_UL;
}
case ECMA_OBJECT_TYPE_ARGUMENTS:
{
return ECMA_MAGIC_STRING_ARGUMENTS_UL;
return LIT_MAGIC_STRING_ARGUMENTS_UL;
}
case ECMA_OBJECT_TYPE_FUNCTION:
{
ecma_magic_string_id_t class_name;
lit_magic_string_id_t class_name;
if (ecma_get_object_is_builtin (obj_p))
{
@@ -551,46 +551,46 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
{
case ECMA_BUILTIN_ID_OBJECT:
{
class_name = ECMA_MAGIC_STRING_OBJECT_UL;
class_name = LIT_MAGIC_STRING_OBJECT_UL;
break;
}
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_ARRAY_BUILTIN
case ECMA_BUILTIN_ID_ARRAY:
{
class_name = ECMA_MAGIC_STRING_ARRAY_UL;
class_name = LIT_MAGIC_STRING_ARRAY_UL;
break;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_ARRAY_BUILTIN */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_STRING_BUILTIN
case ECMA_BUILTIN_ID_STRING:
{
class_name = ECMA_MAGIC_STRING_STRING_UL;
class_name = LIT_MAGIC_STRING_STRING_UL;
break;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_STRING_BUILTIN */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_BOOLEAN_BUILTIN
case ECMA_BUILTIN_ID_BOOLEAN:
{
class_name = ECMA_MAGIC_STRING_BOOLEAN_UL;
class_name = LIT_MAGIC_STRING_BOOLEAN_UL;
break;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_BOOLEAN_BUILTIN */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_NUMBER_BUILTIN
case ECMA_BUILTIN_ID_NUMBER:
{
class_name = ECMA_MAGIC_STRING_NUMBER_UL;
class_name = LIT_MAGIC_STRING_NUMBER_UL;
break;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_NUMBER_BUILTIN */
case ECMA_BUILTIN_ID_FUNCTION:
{
class_name = ECMA_MAGIC_STRING_FUNCTION_UL;
class_name = LIT_MAGIC_STRING_FUNCTION_UL;
break;
}
#ifdef CONFIG_ECMA_COMPACT_PROFILE
case ECMA_BUILTIN_ID_COMPACT_PROFILE_ERROR:
{
class_name = ECMA_MAGIC_STRING_COMPACT_PROFILE_ERROR_UL;
class_name = LIT_MAGIC_STRING_COMPACT_PROFILE_ERROR_UL;
break;
}
#endif /* CONFIG_ECMA_COMPACT_PROFILE */
@@ -603,7 +603,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
case ECMA_BUILTIN_ID_TYPE_ERROR:
case ECMA_BUILTIN_ID_URI_ERROR:
{
class_name = ECMA_MAGIC_STRING_ERROR_UL;
class_name = LIT_MAGIC_STRING_ERROR_UL;
break;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_ERROR_BUILTINS */
@@ -611,14 +611,14 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
{
JERRY_ASSERT (builtin_id == ECMA_BUILTIN_ID_TYPE_ERROR_THROWER);
class_name = ECMA_MAGIC_STRING_FUNCTION_UL;
class_name = LIT_MAGIC_STRING_FUNCTION_UL;
break;
}
}
}
else
{
class_name = ECMA_MAGIC_STRING_FUNCTION_UL;
class_name = LIT_MAGIC_STRING_FUNCTION_UL;
}
return class_name;
@@ -627,7 +627,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
case ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION:
case ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION:
{
return ECMA_MAGIC_STRING_FUNCTION_UL;
return LIT_MAGIC_STRING_FUNCTION_UL;
}
default:
{
@@ -643,30 +643,30 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
{
case ECMA_BUILTIN_ID_OBJECT_PROTOTYPE:
{
return ECMA_MAGIC_STRING_OBJECT_UL;
return LIT_MAGIC_STRING_OBJECT_UL;
}
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_STRING_BUILTIN
case ECMA_BUILTIN_ID_STRING_PROTOTYPE:
{
return ECMA_MAGIC_STRING_STRING_UL;
return LIT_MAGIC_STRING_STRING_UL;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_STRING_BUILTIN */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_BOOLEAN_BUILTIN
case ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE:
{
return ECMA_MAGIC_STRING_BOOLEAN_UL;
return LIT_MAGIC_STRING_BOOLEAN_UL;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_BOOLEAN_BUILTIN */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_NUMBER_BUILTIN
case ECMA_BUILTIN_ID_NUMBER_PROTOTYPE:
{
return ECMA_MAGIC_STRING_NUMBER_UL;
return LIT_MAGIC_STRING_NUMBER_UL;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_NUMBER_BUILTIN */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_MATH_BUILTIN
case ECMA_BUILTIN_ID_MATH:
{
return ECMA_MAGIC_STRING_MATH_UL;
return LIT_MAGIC_STRING_MATH_UL;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_MATH_BUILTIN */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_ERROR_BUILTINS
@@ -678,20 +678,20 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
case ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE:
case ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE:
{
return ECMA_MAGIC_STRING_ERROR_UL;
return LIT_MAGIC_STRING_ERROR_UL;
}
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_ERROR_BUILTINS */
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
case ECMA_BUILTIN_ID_REGEXP_PROTOTYPE:
{
return ECMA_MAGIC_STRING_REGEXP_UL;
return LIT_MAGIC_STRING_REGEXP_UL;
}
#endif /* CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
default:
{
JERRY_ASSERT (ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_GLOBAL));
return ECMA_MAGIC_STRING_OBJECT_UL;
return LIT_MAGIC_STRING_OBJECT_UL;
}
}
}
@@ -702,11 +702,11 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
if (class_name_prop_p == NULL)
{
return ECMA_MAGIC_STRING_OBJECT_UL;
return LIT_MAGIC_STRING_OBJECT_UL;
}
else
{
return (ecma_magic_string_id_t) class_name_prop_p->u.internal_property.value;
return (lit_magic_string_id_t) class_name_prop_p->u.internal_property.value;
}
}
}