Support line info for class fields (#4670)
Furthermore fix function info for call frames. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
@@ -129,6 +129,38 @@ async_backtrace_callback (jerry_backtrace_frame_t *frame_p, /* frame information
|
||||
return true;
|
||||
} /* async_backtrace_callback */
|
||||
|
||||
static bool
|
||||
class_backtrace_callback (jerry_backtrace_frame_t *frame_p, /* frame information */
|
||||
void *user_p) /* user data */
|
||||
{
|
||||
TEST_ASSERT ((void *) handler_args_p == user_p);
|
||||
TEST_ASSERT (jerry_backtrace_get_frame_type (frame_p) == JERRY_BACKTRACE_FRAME_JS);
|
||||
|
||||
const jerry_backtrace_location_t *location_p = jerry_backtrace_get_location (frame_p);
|
||||
const jerry_value_t *function_p = jerry_backtrace_get_function (frame_p);
|
||||
|
||||
TEST_ASSERT (location_p != NULL);
|
||||
TEST_ASSERT (function_p != NULL);
|
||||
|
||||
compare_string (location_p->resource_name, "class_capture_test.js");
|
||||
|
||||
++frame_index;
|
||||
|
||||
if (frame_index == 1)
|
||||
{
|
||||
TEST_ASSERT (jerry_backtrace_is_strict (frame_p));
|
||||
TEST_ASSERT (location_p->line == 3);
|
||||
TEST_ASSERT (location_p->column == 1);
|
||||
return false;
|
||||
}
|
||||
|
||||
TEST_ASSERT (frame_index == 2);
|
||||
TEST_ASSERT (jerry_backtrace_is_strict (frame_p));
|
||||
TEST_ASSERT (location_p->line == 2);
|
||||
TEST_ASSERT (location_p->column == 1);
|
||||
return false;
|
||||
} /* class_backtrace_callback */
|
||||
|
||||
static jerry_value_t
|
||||
capture_handler (const jerry_call_info_t *call_info_p, /**< call information */
|
||||
const jerry_value_t args_p[], /**< argument list */
|
||||
@@ -138,14 +170,24 @@ capture_handler (const jerry_call_info_t *call_info_p, /**< call information */
|
||||
JERRY_UNUSED (args_p);
|
||||
JERRY_UNUSED (args_count);
|
||||
|
||||
TEST_ASSERT (args_count == 2 || args_count == 3);
|
||||
TEST_ASSERT (frame_index == 0);
|
||||
TEST_ASSERT (args_count == 0 || args_count == 2 || args_count == 3);
|
||||
TEST_ASSERT (args_count == 0 || frame_index == 0);
|
||||
|
||||
jerry_backtrace_callback_t callback = backtrace_callback;
|
||||
|
||||
if (args_count == 0)
|
||||
{
|
||||
callback = class_backtrace_callback;
|
||||
}
|
||||
else if (args_count == 2)
|
||||
{
|
||||
callback = async_backtrace_callback;
|
||||
}
|
||||
|
||||
handler_args_p = args_p;
|
||||
jerry_backtrace_capture (callback, (void *) args_p);
|
||||
|
||||
jerry_backtrace_capture (args_count == 3 ? backtrace_callback : async_backtrace_callback, (void *) args_p);
|
||||
|
||||
TEST_ASSERT (frame_index == (int) args_count);
|
||||
TEST_ASSERT (args_count == 0 || frame_index == (int) args_count);
|
||||
|
||||
return jerry_create_undefined ();
|
||||
} /* capture_handler */
|
||||
@@ -343,6 +385,33 @@ test_get_backtrace_api_call (void)
|
||||
|
||||
jerry_release_value (result);
|
||||
|
||||
/* Test class initializer frame capturing. */
|
||||
source_p = "class C {}";
|
||||
result = jerry_eval ((const jerry_char_t *) source_p, strlen (source_p), JERRY_PARSE_NO_OPTS);
|
||||
|
||||
if (!jerry_value_is_error (result))
|
||||
{
|
||||
jerry_release_value (result);
|
||||
|
||||
frame_index = 0;
|
||||
source_p = ("class C {\n"
|
||||
" a = capture();\n"
|
||||
" static b = capture();\n"
|
||||
"}\n"
|
||||
"new C;\n");
|
||||
|
||||
result = run ("class_capture_test.js", source_p);
|
||||
|
||||
TEST_ASSERT (!jerry_value_is_error (result));
|
||||
TEST_ASSERT (frame_index == 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
TEST_ASSERT (jerry_get_error_type (result) == JERRY_ERROR_SYNTAX);
|
||||
}
|
||||
|
||||
jerry_release_value (result);
|
||||
|
||||
jerry_cleanup ();
|
||||
} /* test_get_backtrace_api_call */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user