Add error messages to ecam/operations. (#1396)

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
This commit is contained in:
László Langó
2016-10-19 02:37:51 +02:00
committed by yichoi
parent 6af70e5899
commit a130059c8b
9 changed files with 23 additions and 22 deletions
@@ -66,9 +66,10 @@ ecma_op_create_array_object (const ecma_value_t *arguments_list_p, /**< list of
{ {
ecma_number_t num = ecma_get_number_from_value (arguments_list_p[0]); ecma_number_t num = ecma_get_number_from_value (arguments_list_p[0]);
uint32_t num_uint32 = ecma_number_to_uint32 (num); uint32_t num_uint32 = ecma_number_to_uint32 (num);
if (num != ((ecma_number_t) num_uint32)) if (num != ((ecma_number_t) num_uint32))
{ {
return ecma_raise_range_error (ECMA_ERR_MSG ("")); return ecma_raise_range_error (ECMA_ERR_MSG ("Invalid array length."));
} }
else else
{ {
@@ -211,7 +212,7 @@ ecma_op_array_object_define_own_property (ecma_object_t *obj_p, /**< the array o
if (((ecma_number_t) new_len_uint32) != new_len_num) if (((ecma_number_t) new_len_uint32) != new_len_num)
{ {
return ecma_raise_range_error (ECMA_ERR_MSG ("")); return ecma_raise_range_error (ECMA_ERR_MSG ("Invalid array length."));
} }
else else
{ {
+6 -6
View File
@@ -57,7 +57,7 @@ ecma_op_check_object_coercible (ecma_value_t value) /**< ecma value */
if (ecma_is_value_undefined (value) if (ecma_is_value_undefined (value)
|| ecma_is_value_null (value)) || ecma_is_value_null (value))
{ {
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Argument cannot be converted to an object."));
} }
else else
{ {
@@ -413,7 +413,7 @@ ecma_op_to_object (ecma_value_t value) /**< ecma value */
if (ecma_is_value_undefined (value) if (ecma_is_value_undefined (value)
|| ecma_is_value_null (value)) || ecma_is_value_null (value))
{ {
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Argument cannot be converted to an object."));
} }
else else
{ {
@@ -570,7 +570,7 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
// 1. // 1.
if (!ecma_is_value_object (obj_value)) if (!ecma_is_value_object (obj_value))
{ {
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("")); ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Expected an object."));
} }
else else
{ {
@@ -678,7 +678,7 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
if (!ecma_op_is_callable (get_prop_value) if (!ecma_op_is_callable (get_prop_value)
&& !ecma_is_value_undefined (get_prop_value)) && !ecma_is_value_undefined (get_prop_value))
{ {
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("")); ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Expected a function."));
} }
else else
{ {
@@ -722,7 +722,7 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
if (!ecma_op_is_callable (set_prop_value) if (!ecma_op_is_callable (set_prop_value)
&& !ecma_is_value_undefined (set_prop_value)) && !ecma_is_value_undefined (set_prop_value))
{ {
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("")); ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Expected a function."));
} }
else else
{ {
@@ -760,7 +760,7 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
if (prop_desc.is_value_defined if (prop_desc.is_value_defined
|| prop_desc.is_writable_defined) || prop_desc.is_writable_defined)
{ {
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("")); ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Accessors cannot be writable."));
} }
} }
} }
@@ -406,7 +406,7 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
if (ecma_get_object_is_builtin (func_obj_p) if (ecma_get_object_is_builtin (func_obj_p)
&& ecma_builtin_function_is_routine (func_obj_p)) && ecma_builtin_function_is_routine (func_obj_p))
{ {
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Function parameter cannot be built-in a function."));
} }
if (!ecma_is_value_object (value)) if (!ecma_is_value_object (value))
@@ -424,7 +424,7 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
if (!ecma_is_value_object (prototype_obj_value)) if (!ecma_is_value_object (prototype_obj_value))
{ {
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("")); ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Expected an object."));
} }
else else
{ {
@@ -456,7 +456,7 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object *
} }
else if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION) else if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION)
{ {
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("")); ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Expected a function."));
} }
else else
{ {
@@ -789,7 +789,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
/* 2. */ /* 2. */
if (!ecma_is_constructor (ecma_make_object_value (target_func_obj_p))) if (!ecma_is_constructor (ecma_make_object_value (target_func_obj_p)))
{ {
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("")); ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Expected a constructor."));
} }
else else
{ {
@@ -53,7 +53,7 @@ ecma_op_get_value_lex_env_base (ecma_object_t *ref_base_lex_env_p, /**< referenc
// 3. // 3.
if (unlikely (is_unresolvable_reference)) if (unlikely (is_unresolvable_reference))
{ {
return ecma_raise_reference_error (ECMA_ERR_MSG ("")); return ecma_raise_reference_error (ECMA_ERR_MSG ("Cannot resolve reference."));
} }
// 5. // 5.
@@ -150,7 +150,7 @@ ecma_op_put_value_lex_env_base (ecma_object_t *ref_base_lex_env_p, /**< referenc
// 3.a. // 3.a.
if (is_strict) if (is_strict)
{ {
return ecma_raise_reference_error (ECMA_ERR_MSG ("")); return ecma_raise_reference_error (ECMA_ERR_MSG ("Cannot resolve reference."));
} }
else else
{ {
+2 -2
View File
@@ -199,7 +199,7 @@ ecma_op_set_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environment
} }
else if (is_strict) else if (is_strict)
{ {
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Binding cannot be set."));
} }
} }
else else
@@ -263,7 +263,7 @@ ecma_op_get_binding_value (ecma_object_t *lex_env_p, /**< lexical environment */
{ {
if (is_strict) if (is_strict)
{ {
result = ecma_raise_reference_error (ECMA_ERR_MSG ("")); result = ecma_raise_reference_error (ECMA_ERR_MSG ("Binding does not exist or is uninitialised."));
} }
else else
{ {
@@ -42,7 +42,7 @@ ecma_reject (bool is_throw) /**< Throw flag */
{ {
if (is_throw) if (is_throw)
{ {
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid argument type."));
} }
else else
{ {
@@ -173,7 +173,7 @@ ecma_op_general_object_delete (ecma_object_t *obj_p, /**< the object */
else if (is_throw) else if (is_throw)
{ {
// 4. // 4.
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Expected a configurable property."));
} }
else else
{ {
@@ -262,7 +262,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */
ecma_free_value (call_completion); ecma_free_value (call_completion);
} }
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid argument type in [[DefaultValue]]."));
} /* ecma_op_general_object_default_value */ } /* ecma_op_general_object_default_value */
/** /**
+1 -1
View File
@@ -1007,7 +1007,7 @@ ecma_op_object_has_instance (ecma_object_t *obj_p, /**< the object */
case ECMA_OBJECT_TYPE_STRING: case ECMA_OBJECT_TYPE_STRING:
case ECMA_OBJECT_TYPE_ARGUMENTS: case ECMA_OBJECT_TYPE_ARGUMENTS:
{ {
return ecma_raise_type_error (ECMA_ERR_MSG ("")); return ecma_raise_type_error (ECMA_ERR_MSG ("Expected a function object."));
} }
case ECMA_OBJECT_TYPE_FUNCTION: case ECMA_OBJECT_TYPE_FUNCTION:
+1 -1
View File
@@ -99,7 +99,7 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical
lex_env_p = ecma_get_lex_env_outer_reference (lex_env_p); lex_env_p = ecma_get_lex_env_outer_reference (lex_env_p);
} }
return ecma_raise_reference_error (ECMA_ERR_MSG ("")); return ecma_raise_reference_error (ECMA_ERR_MSG ("Cannot resolve reference."));
} /* ecma_op_resolve_reference_value */ } /* ecma_op_resolve_reference_value */
/** /**
@@ -1150,7 +1150,7 @@ re_match_regexp (re_matcher_ctx_t *re_ctx_p, /**< RegExp matcher context */
default: default:
{ {
JERRY_TRACE_MSG ("UNKNOWN opcode (%u)!\n", (unsigned int) op); JERRY_TRACE_MSG ("UNKNOWN opcode (%u)!\n", (unsigned int) op);
return ecma_raise_common_error (ECMA_ERR_MSG ("")); return ecma_raise_common_error (ECMA_ERR_MSG ("Unknown RegExp opcode."));
} }
} }
} }