Rework the public API (#4829)
Related to #4186. Some notable changes: - The term 'Error' now strictly refers to native Error objects defined in the ECMA standard, which are ordinary objects. All other uses of 'error' or 'error reference' where the term refers to a thrown value is now called 'exception'. - Simplified the naming scheme of many String API functions. These functions will now also take an 'encoding' argument to specify the desired encoding in which to operate. - Removed the substring-copy-to-buffer functions. These functions behaved awkwardly, as they use character index to specify the start/end positions, and were mostly used incorrectly with byte offsets instead. The functionality can still be replicated with other functions if necessary. - String-to-buffer functions will no longer fail if the buffer is not sufficiently large, the string will instead be cropped. - Fixed the usage of the '_sz' prefix in many API functions. The term 'sz' means zero-terminated string in hungarian notation, this was used incorrectly in many cases. - Renamed most of the public API functions to have shorter, more on-point names, rather than the often too long descriptive names. Functions are now also grouped by the type of value they operate on, where this makes sense. JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
@@ -19,25 +19,25 @@
|
||||
#include "test-common.h"
|
||||
|
||||
static jerry_value_t
|
||||
resource_name_handler (const jerry_call_info_t *call_info_p, /**< call information */
|
||||
const jerry_value_t args_p[], /**< argument list */
|
||||
const jerry_length_t args_count) /**< argument count */
|
||||
source_name_handler (const jerry_call_info_t *call_info_p, /**< call information */
|
||||
const jerry_value_t args_p[], /**< argument list */
|
||||
const jerry_length_t args_count) /**< argument count */
|
||||
{
|
||||
(void) call_info_p;
|
||||
|
||||
jerry_value_t undefined_value = jerry_create_undefined ();
|
||||
jerry_value_t resource_name = jerry_get_resource_name (args_count > 0 ? args_p[0] : undefined_value);
|
||||
jerry_release_value (undefined_value);
|
||||
jerry_value_t undefined_value = jerry_undefined ();
|
||||
jerry_value_t source_name = jerry_source_name (args_count > 0 ? args_p[0] : undefined_value);
|
||||
jerry_value_free (undefined_value);
|
||||
|
||||
return resource_name;
|
||||
} /* resource_name_handler */
|
||||
return source_name;
|
||||
} /* source_name_handler */
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
TEST_INIT ();
|
||||
|
||||
if (!jerry_is_feature_enabled (JERRY_FEATURE_LINE_INFO))
|
||||
if (!jerry_feature_enabled (JERRY_FEATURE_LINE_INFO))
|
||||
{
|
||||
jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Line info support is disabled!\n");
|
||||
return 0;
|
||||
@@ -45,22 +45,22 @@ main (void)
|
||||
|
||||
jerry_init (JERRY_INIT_EMPTY);
|
||||
|
||||
jerry_value_t global = jerry_get_global_object ();
|
||||
jerry_value_t global = jerry_current_realm ();
|
||||
|
||||
/* Register the "resourceName" method. */
|
||||
{
|
||||
jerry_value_t func = jerry_create_external_function (resource_name_handler);
|
||||
jerry_value_t name = jerry_create_string ((const jerry_char_t *) "resourceName");
|
||||
jerry_value_t result = jerry_set_property (global, name, func);
|
||||
jerry_release_value (result);
|
||||
jerry_release_value (name);
|
||||
jerry_release_value (func);
|
||||
jerry_value_t func = jerry_function_external (source_name_handler);
|
||||
jerry_value_t name = jerry_string_sz ("resourceName");
|
||||
jerry_value_t result = jerry_object_set (global, name, func);
|
||||
jerry_value_free (result);
|
||||
jerry_value_free (name);
|
||||
jerry_value_free (func);
|
||||
}
|
||||
|
||||
jerry_release_value (global);
|
||||
jerry_value_free (global);
|
||||
|
||||
jerry_parse_options_t parse_options;
|
||||
parse_options.options = JERRY_PARSE_HAS_RESOURCE;
|
||||
parse_options.options = JERRY_PARSE_HAS_SOURCE_NAME;
|
||||
|
||||
const char *source_1 = ("function f1 () {\n"
|
||||
" if (resourceName() !== 'demo1.js') return false; \n"
|
||||
@@ -70,26 +70,25 @@ main (void)
|
||||
"} \n"
|
||||
"f1();");
|
||||
|
||||
parse_options.resource_name = jerry_create_string ((jerry_char_t *) "demo1.js");
|
||||
parse_options.source_name = jerry_string_sz ("demo1.js");
|
||||
|
||||
jerry_value_t program = jerry_parse ((const jerry_char_t *) source_1, strlen (source_1), &parse_options);
|
||||
TEST_ASSERT (!jerry_value_is_error (program));
|
||||
TEST_ASSERT (!jerry_value_is_exception (program));
|
||||
|
||||
jerry_value_t run_result = jerry_run (program);
|
||||
TEST_ASSERT (!jerry_value_is_error (run_result));
|
||||
TEST_ASSERT (!jerry_value_is_exception (run_result));
|
||||
TEST_ASSERT (jerry_value_is_object (run_result));
|
||||
|
||||
jerry_value_t resource_value = jerry_get_resource_name (run_result);
|
||||
jerry_value_t compare_result =
|
||||
jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.resource_name);
|
||||
jerry_value_t resource_value = jerry_source_name (run_result);
|
||||
jerry_value_t compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.source_name);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
|
||||
jerry_release_value (compare_result);
|
||||
jerry_release_value (resource_value);
|
||||
jerry_release_value (parse_options.resource_name);
|
||||
jerry_value_free (compare_result);
|
||||
jerry_value_free (resource_value);
|
||||
jerry_value_free (parse_options.source_name);
|
||||
|
||||
jerry_release_value (run_result);
|
||||
jerry_release_value (program);
|
||||
jerry_value_free (run_result);
|
||||
jerry_value_free (program);
|
||||
|
||||
const char *source_2 = ("function f2 () { \n"
|
||||
" if (resourceName() !== 'demo2.js') return false; \n"
|
||||
@@ -101,127 +100,127 @@ main (void)
|
||||
"} \n"
|
||||
"f2(); \n");
|
||||
|
||||
parse_options.resource_name = jerry_create_string ((const jerry_char_t *) "demo2.js");
|
||||
parse_options.source_name = jerry_string_sz ("demo2.js");
|
||||
|
||||
program = jerry_parse ((const jerry_char_t *) source_2, strlen (source_2), &parse_options);
|
||||
TEST_ASSERT (!jerry_value_is_error (program));
|
||||
TEST_ASSERT (!jerry_value_is_exception (program));
|
||||
|
||||
run_result = jerry_run (program);
|
||||
TEST_ASSERT (!jerry_value_is_error (run_result));
|
||||
TEST_ASSERT (!jerry_value_is_exception (run_result));
|
||||
TEST_ASSERT (jerry_value_is_object (run_result));
|
||||
|
||||
resource_value = jerry_get_resource_name (run_result);
|
||||
compare_result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.resource_name);
|
||||
resource_value = jerry_source_name (run_result);
|
||||
compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.source_name);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
|
||||
jerry_release_value (compare_result);
|
||||
jerry_release_value (resource_value);
|
||||
jerry_release_value (parse_options.resource_name);
|
||||
jerry_value_free (compare_result);
|
||||
jerry_value_free (resource_value);
|
||||
jerry_value_free (parse_options.source_name);
|
||||
|
||||
jerry_release_value (run_result);
|
||||
jerry_release_value (program);
|
||||
if (jerry_is_feature_enabled (JERRY_FEATURE_MODULE))
|
||||
jerry_value_free (run_result);
|
||||
jerry_value_free (program);
|
||||
if (jerry_feature_enabled (JERRY_FEATURE_MODULE))
|
||||
{
|
||||
jerry_value_t anon = jerry_create_string ((const jerry_char_t *) "<anonymous>");
|
||||
jerry_value_t anon = jerry_string_sz ("<anonymous>");
|
||||
const char *source_3 = "";
|
||||
|
||||
parse_options.options = JERRY_PARSE_MODULE | JERRY_PARSE_HAS_RESOURCE;
|
||||
parse_options.resource_name = jerry_create_string ((const jerry_char_t *) "demo3.js");
|
||||
parse_options.options = JERRY_PARSE_MODULE | JERRY_PARSE_HAS_SOURCE_NAME;
|
||||
parse_options.source_name = jerry_string_sz ("demo3.js");
|
||||
|
||||
program = jerry_parse ((const jerry_char_t *) source_3, strlen (source_3), &parse_options);
|
||||
TEST_ASSERT (!jerry_value_is_error (program));
|
||||
TEST_ASSERT (!jerry_value_is_exception (program));
|
||||
|
||||
resource_value = jerry_get_resource_name (program);
|
||||
compare_result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.resource_name);
|
||||
resource_value = jerry_source_name (program);
|
||||
compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.source_name);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
|
||||
jerry_release_value (compare_result);
|
||||
jerry_release_value (resource_value);
|
||||
jerry_value_free (compare_result);
|
||||
jerry_value_free (resource_value);
|
||||
|
||||
run_result = jerry_module_link (program, NULL, NULL);
|
||||
TEST_ASSERT (!jerry_value_is_error (run_result));
|
||||
TEST_ASSERT (!jerry_value_is_exception (run_result));
|
||||
|
||||
resource_value = jerry_get_resource_name (run_result);
|
||||
compare_result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, anon);
|
||||
resource_value = jerry_source_name (run_result);
|
||||
compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, anon);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
|
||||
jerry_release_value (compare_result);
|
||||
jerry_release_value (resource_value);
|
||||
jerry_release_value (run_result);
|
||||
jerry_value_free (compare_result);
|
||||
jerry_value_free (resource_value);
|
||||
jerry_value_free (run_result);
|
||||
|
||||
run_result = jerry_module_evaluate (program);
|
||||
TEST_ASSERT (!jerry_value_is_error (run_result));
|
||||
TEST_ASSERT (!jerry_value_is_exception (run_result));
|
||||
|
||||
resource_value = jerry_get_resource_name (run_result);
|
||||
compare_result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, anon);
|
||||
resource_value = jerry_source_name (run_result);
|
||||
compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, anon);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
|
||||
jerry_release_value (compare_result);
|
||||
jerry_release_value (resource_value);
|
||||
jerry_release_value (run_result);
|
||||
jerry_release_value (program);
|
||||
jerry_release_value (parse_options.resource_name);
|
||||
jerry_value_free (compare_result);
|
||||
jerry_value_free (resource_value);
|
||||
jerry_value_free (run_result);
|
||||
jerry_value_free (program);
|
||||
jerry_value_free (parse_options.source_name);
|
||||
}
|
||||
const char *source_4 = ("function f(){} \n"
|
||||
"f.bind().bind();");
|
||||
|
||||
parse_options.options = JERRY_PARSE_HAS_RESOURCE;
|
||||
parse_options.resource_name = jerry_create_string ((jerry_char_t *) "demo4.js");
|
||||
parse_options.options = JERRY_PARSE_HAS_SOURCE_NAME;
|
||||
parse_options.source_name = jerry_string_sz ("demo4.js");
|
||||
|
||||
program = jerry_parse ((const jerry_char_t *) source_4, strlen (source_4), &parse_options);
|
||||
TEST_ASSERT (!jerry_value_is_error (program));
|
||||
TEST_ASSERT (!jerry_value_is_exception (program));
|
||||
|
||||
run_result = jerry_run (program);
|
||||
TEST_ASSERT (!jerry_value_is_error (run_result));
|
||||
TEST_ASSERT (!jerry_value_is_exception (run_result));
|
||||
TEST_ASSERT (jerry_value_is_object (run_result));
|
||||
|
||||
resource_value = jerry_get_resource_name (run_result);
|
||||
compare_result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.resource_name);
|
||||
resource_value = jerry_source_name (run_result);
|
||||
compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.source_name);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
jerry_release_value (compare_result);
|
||||
jerry_value_free (compare_result);
|
||||
|
||||
jerry_release_value (resource_value);
|
||||
jerry_release_value (parse_options.resource_name);
|
||||
jerry_release_value (run_result);
|
||||
jerry_release_value (program);
|
||||
jerry_value_free (resource_value);
|
||||
jerry_value_free (parse_options.source_name);
|
||||
jerry_value_free (run_result);
|
||||
jerry_value_free (program);
|
||||
|
||||
const char *source_5 = "";
|
||||
|
||||
parse_options.options = JERRY_PARSE_HAS_USER_VALUE | JERRY_PARSE_HAS_RESOURCE;
|
||||
parse_options.user_value = jerry_create_object ();
|
||||
parse_options.resource_name = jerry_create_string ((jerry_char_t *) "demo5.js");
|
||||
parse_options.options = JERRY_PARSE_HAS_USER_VALUE | JERRY_PARSE_HAS_SOURCE_NAME;
|
||||
parse_options.user_value = jerry_object ();
|
||||
parse_options.source_name = jerry_string_sz ("demo5.js");
|
||||
|
||||
program = jerry_parse ((const jerry_char_t *) source_5, strlen (source_5), &parse_options);
|
||||
TEST_ASSERT (!jerry_value_is_error (program));
|
||||
TEST_ASSERT (!jerry_value_is_exception (program));
|
||||
|
||||
resource_value = jerry_get_resource_name (program);
|
||||
compare_result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.resource_name);
|
||||
resource_value = jerry_source_name (program);
|
||||
compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.source_name);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
|
||||
jerry_release_value (resource_value);
|
||||
jerry_release_value (compare_result);
|
||||
jerry_release_value (parse_options.user_value);
|
||||
jerry_release_value (parse_options.resource_name);
|
||||
jerry_release_value (program);
|
||||
jerry_value_free (resource_value);
|
||||
jerry_value_free (compare_result);
|
||||
jerry_value_free (parse_options.user_value);
|
||||
jerry_value_free (parse_options.source_name);
|
||||
jerry_value_free (program);
|
||||
|
||||
const char *source_6 = "(class {})";
|
||||
|
||||
parse_options.options = JERRY_PARSE_HAS_RESOURCE;
|
||||
parse_options.resource_name = jerry_create_string ((jerry_char_t *) "demo6.js");
|
||||
parse_options.options = JERRY_PARSE_HAS_SOURCE_NAME;
|
||||
parse_options.source_name = jerry_string_sz ("demo6.js");
|
||||
|
||||
program = jerry_parse ((const jerry_char_t *) source_6, strlen (source_6), &parse_options);
|
||||
if (!jerry_value_is_error (program))
|
||||
if (!jerry_value_is_exception (program))
|
||||
{
|
||||
resource_value = jerry_get_resource_name (program);
|
||||
compare_result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.resource_name);
|
||||
resource_value = jerry_source_name (program);
|
||||
compare_result = jerry_binary_op (JERRY_BIN_OP_STRICT_EQUAL, resource_value, parse_options.source_name);
|
||||
TEST_ASSERT (jerry_value_is_true (compare_result));
|
||||
|
||||
jerry_release_value (resource_value);
|
||||
jerry_release_value (compare_result);
|
||||
jerry_value_free (resource_value);
|
||||
jerry_value_free (compare_result);
|
||||
}
|
||||
|
||||
jerry_release_value (parse_options.resource_name);
|
||||
jerry_release_value (program);
|
||||
jerry_value_free (parse_options.source_name);
|
||||
jerry_value_free (program);
|
||||
|
||||
jerry_cleanup ();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user