Improve error message

JerryScript-DCO-1.0-Signed-off-by: Yanhui Shen [email protected]

Author: bsdelf

jerry-core/ecma/operations/ecma-exceptions.h

@@ -59,6 +59,16 @@ ecma_value_t ecma_raise_syntax_error (const char *msg_p);
 ecma_value_t ecma_raise_type_error (const char *msg_p);
 ecma_value_t ecma_raise_uri_error (const char *msg_p);
 
+#define ECMA_DEFINE_ERROR_VALUE(var_name, error_type, msg_fmt, ...) \
+  ecma_value_t var_name = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY); \
+  do { \
+    const int msg_size = snprintf (NULL, 0, msg_fmt, __VA_ARGS__) + 1; \
+    JMEM_DEFINE_LOCAL_ARRAY (msg_p, msg_size, char); \
+    snprintf (msg_p, (size_t) msg_size, msg_fmt, __VA_ARGS__); \
+    var_name = ecma_raise_standard_error (error_type, (const lit_utf8_byte_t *) msg_p); \
+    JMEM_FINALIZE_LOCAL_ARRAY (msg_p); \
+  } while (0)
+
 /**
  * @}
  * @}

jerry-core/ecma/operations/ecma-get-put-value.c

@@ -52,7 +52,10 @@ ecma_op_get_value_lex_env_base (ecma_object_t *ref_base_lex_env_p, /**< referenc
   /* 3. */
   if (unlikely (is_unresolvable_reference))
   {
-    return ecma_raise_reference_error (ECMA_ERR_MSG ("Cannot resolve reference."));
+    ECMA_STRING_TO_UTF8_STRING (var_name_string_p, var_name_string_utf8_p, var_name_string_size);
+    ECMA_DEFINE_ERROR_VALUE (error_value, ECMA_ERROR_REFERENCE, "%s is not defined", var_name_string_utf8_p);
+    ECMA_FINALIZE_UTF8_STRING (var_name_string_utf8_p, var_name_string_size);
+    return error_value;
   }
 
   /* 5. */
@@ -149,7 +152,10 @@ ecma_op_put_value_lex_env_base (ecma_object_t *ref_base_lex_env_p, /**< referenc
     /* 3.a. */
     if (is_strict)
     {
-      return ecma_raise_reference_error (ECMA_ERR_MSG ("Cannot resolve reference."));
+      ECMA_STRING_TO_UTF8_STRING (var_name_string_p, var_name_string_utf8_p, var_name_string_size);
+      ECMA_DEFINE_ERROR_VALUE (error_value, ECMA_ERROR_REFERENCE, "%s is not defined", var_name_string_utf8_p);
+      ECMA_FINALIZE_UTF8_STRING (var_name_string_utf8_p, var_name_string_size);
+      return error_value;
     }
     else
     {

jerry-core/ecma/operations/ecma-reference.c

@@ -123,7 +123,10 @@ 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);
   }
 
-  return ecma_raise_reference_error (ECMA_ERR_MSG ("Cannot resolve reference."));
+  ECMA_STRING_TO_UTF8_STRING (name_p, name_utf8_p, name_size);
+  ECMA_DEFINE_ERROR_VALUE (error_value, ECMA_ERROR_REFERENCE, "%s is not defined", name_utf8_p);
+  ECMA_FINALIZE_UTF8_STRING (name_utf8_p, name_size);
+  return error_value;
 } /* ecma_op_resolve_reference_value */
 
 /**

jerry-core/vm/vm.c

@@ -96,7 +96,16 @@ vm_op_get_value (ecma_value_t object, /**< base object */
 
   if (unlikely (ecma_is_value_undefined (object) || ecma_is_value_null (object)))
   {
-    return ecma_raise_type_error (ECMA_ERR_MSG ("Base object cannot be null or undefined."));
+    ecma_string_t *property_name_p = ecma_get_string_from_value (property);
+    ECMA_STRING_TO_UTF8_STRING (property_name_p, property_name_utf8_p, property_name_size);
+    const char *value_type_p = ecma_is_value_undefined (object) ? "undefined" : "null";
+    ECMA_DEFINE_ERROR_VALUE (error_value,
+                             ECMA_ERROR_TYPE,
+                             "Cannot read property '%s' of %s",
+                             property_name_utf8_p,
+                             value_type_p);
+    ECMA_FINALIZE_UTF8_STRING (property_name_utf8_p, property_name_size);
+    return error_value;
   }
 
   ecma_value_t prop_to_string_result = ecma_op_to_string (property);
@@ -137,7 +146,18 @@ vm_op_set_value (ecma_value_t object, /**< base object */
     if (ECMA_IS_VALUE_ERROR (to_object))
     {
       ecma_free_value (property);
-      return to_object;
+      ecma_free_value (to_object);
+
+      ecma_string_t *property_name_p = ecma_get_string_from_value (property);
+      ECMA_STRING_TO_UTF8_STRING (property_name_p, property_name_utf8_p, property_name_size);
+      const char *value_type_p = ecma_is_value_undefined (object) ? "undefined" : "null";
+      ECMA_DEFINE_ERROR_VALUE (error_value,
+                               ECMA_ERROR_TYPE,
+                               "Cannot set property '%s' of %s",
+                               property_name_utf8_p,
+                               value_type_p);
+      ECMA_FINALIZE_UTF8_STRING (property_name_utf8_p, property_name_size);
+      return error_value;
     }
 
     object = to_object;
@@ -1076,16 +1096,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
             ref_base_lex_env_p = ecma_op_resolve_reference_base (frame_ctx_p->lex_env_p,
                                                                  name_p);
 
-            if (ref_base_lex_env_p != NULL)
-            {
-              result = ecma_op_get_value_lex_env_base (ref_base_lex_env_p,
-                                                       name_p,
-                                                       is_strict);
-            }
-            else
-            {
-              result = ecma_raise_reference_error (ECMA_ERR_MSG ("Cannot resolve reference."));
-            }
+            result = ecma_op_get_value_lex_env_base (ref_base_lex_env_p,
+                                                     name_p,
+                                                     is_strict);
 
             if (ECMA_IS_VALUE_ERROR (result))
             {