Skip to content

Commit 493cd75

Browse files
committed
Print unhandled errors in REPL mode
JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
1 parent 7b10f91 commit 493cd75

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

jerry-core/jerry.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,17 +527,14 @@ jerry_api_convert_eval_completion_to_retval (jerry_api_value_t *retval_p, /**< [
527527
* code execution */
528528
{
529529
jerry_completion_code_t ret_code;
530+
jerry_api_convert_ecma_value_to_api_value (retval_p, completion);
530531

531532
if (!ecma_is_value_error (completion))
532533
{
533-
jerry_api_convert_ecma_value_to_api_value (retval_p, completion);
534-
535534
ret_code = JERRY_COMPLETION_CODE_OK;
536535
}
537536
else
538537
{
539-
jerry_api_convert_ecma_value_to_api_value (retval_p, ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED));
540-
541538
ret_code = JERRY_COMPLETION_CODE_UNHANDLED_EXCEPTION;
542539
}
543540

main-unix.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -560,19 +560,12 @@ main (int argc,
560560
jerry_api_value_t ret_val;
561561
ret_code = jerry_api_eval (buffer, len, false, false, &ret_val);
562562

563-
if (ret_code == JERRY_COMPLETION_CODE_OK)
563+
// print return value
564+
const jerry_api_value_t args[] = {ret_val};
565+
jerry_api_value_t ret_val_print;
566+
if (jerry_api_call_function (print_function.u.v_object, NULL, &ret_val_print, args, 1))
564567
{
565-
// print return value
566-
const jerry_api_value_t args[] = {ret_val};
567-
jerry_api_value_t ret_val_print;
568-
if (jerry_api_call_function (print_function.u.v_object, NULL, &ret_val_print, args, 1))
569-
{
570-
jerry_api_release_value (&ret_val_print);
571-
}
572-
}
573-
else
574-
{
575-
printf ("JERRY_COMPLETION_CODE_UNHANDLED_EXCEPTION\n");
568+
jerry_api_release_value (&ret_val_print);
576569
}
577570

578571
jerry_api_release_value (&ret_val);

0 commit comments

Comments
 (0)