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:
@@ -35,9 +35,9 @@ compare_string (jerry_value_t value, /**< value to compare */
|
||||
|
||||
size_t size = strlen (string_p);
|
||||
TEST_ASSERT (size <= sizeof (string_buffer));
|
||||
TEST_ASSERT (size == jerry_get_string_size (value));
|
||||
TEST_ASSERT (size == jerry_string_size (value, JERRY_ENCODING_CESU8));
|
||||
|
||||
jerry_string_to_char_buffer (value, string_buffer, (jerry_size_t) size);
|
||||
jerry_string_to_buffer (value, JERRY_ENCODING_CESU8, string_buffer, (jerry_size_t) size);
|
||||
TEST_ASSERT (memcmp (string_p, string_buffer, size) == 0);
|
||||
} /* compare_string */
|
||||
|
||||
@@ -47,97 +47,97 @@ main (void)
|
||||
TEST_INIT ();
|
||||
jerry_init (JERRY_INIT_EMPTY);
|
||||
|
||||
jerry_value_t pp_string = jerry_create_string ((const jerry_char_t *) "pp");
|
||||
jerry_value_t qq_string = jerry_create_string ((const jerry_char_t *) "qq");
|
||||
jerry_value_t rr_string = jerry_create_string ((const jerry_char_t *) "rr");
|
||||
jerry_value_t pp_string = jerry_string_sz ("pp");
|
||||
jerry_value_t qq_string = jerry_string_sz ("qq");
|
||||
jerry_value_t rr_string = jerry_string_sz ("rr");
|
||||
|
||||
jerry_value_t object = create_object ("'use strict';\n"
|
||||
"({ pp:'A', get qq() { return 'B' } })");
|
||||
|
||||
jerry_value_t result = jerry_get_own_property (object, pp_string, object, NULL);
|
||||
jerry_value_t result = jerry_object_find_own (object, pp_string, object, NULL);
|
||||
compare_string (result, "A");
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
bool found = false;
|
||||
result = jerry_get_own_property (object, pp_string, object, &found);
|
||||
result = jerry_object_find_own (object, pp_string, object, &found);
|
||||
compare_string (result, "A");
|
||||
TEST_ASSERT (found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
result = jerry_get_own_property (object, qq_string, object, NULL);
|
||||
result = jerry_object_find_own (object, qq_string, object, NULL);
|
||||
compare_string (result, "B");
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
found = false;
|
||||
result = jerry_get_own_property (object, qq_string, object, &found);
|
||||
result = jerry_object_find_own (object, qq_string, object, &found);
|
||||
compare_string (result, "B");
|
||||
TEST_ASSERT (found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
result = jerry_get_own_property (object, rr_string, object, NULL);
|
||||
result = jerry_object_find_own (object, rr_string, object, NULL);
|
||||
TEST_ASSERT (jerry_value_is_undefined (result));
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
found = true;
|
||||
result = jerry_get_own_property (object, rr_string, object, &found);
|
||||
result = jerry_object_find_own (object, rr_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_undefined (result));
|
||||
TEST_ASSERT (!found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
jerry_release_value (object);
|
||||
jerry_value_free (object);
|
||||
|
||||
object = create_object ("'use strict';\n"
|
||||
"Object.create({ pp:'Found!' })\n");
|
||||
|
||||
found = true;
|
||||
/* Does not check prototype. */
|
||||
result = jerry_get_own_property (object, pp_string, object, &found);
|
||||
result = jerry_object_find_own (object, pp_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_undefined (result));
|
||||
TEST_ASSERT (!found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
jerry_release_value (object);
|
||||
jerry_value_free (object);
|
||||
|
||||
object = create_object ("'use strict';\n"
|
||||
"var obj = Object.create({ get pp() { return this.qq } })\n"
|
||||
"Object.defineProperty(obj, 'qq', { value: 'Prop' })\n"
|
||||
"obj");
|
||||
jerry_value_t prototype = jerry_get_prototype (object);
|
||||
jerry_value_t prototype = jerry_object_proto (object);
|
||||
|
||||
TEST_ASSERT (jerry_value_is_object (prototype));
|
||||
found = false;
|
||||
result = jerry_get_own_property (prototype, pp_string, object, &found);
|
||||
result = jerry_object_find_own (prototype, pp_string, object, &found);
|
||||
compare_string (result, "Prop");
|
||||
TEST_ASSERT (found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
jerry_release_value (prototype);
|
||||
jerry_release_value (object);
|
||||
jerry_value_free (prototype);
|
||||
jerry_value_free (object);
|
||||
|
||||
/* Error cases. */
|
||||
jerry_value_t invalid_arg = jerry_create_null ();
|
||||
object = jerry_create_object ();
|
||||
jerry_value_t invalid_arg = jerry_null ();
|
||||
object = jerry_object ();
|
||||
|
||||
found = true;
|
||||
result = jerry_get_own_property (invalid_arg, pp_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_error (result));
|
||||
result = jerry_object_find_own (invalid_arg, pp_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_exception (result));
|
||||
TEST_ASSERT (!found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
result = jerry_get_own_property (object, pp_string, invalid_arg, NULL);
|
||||
TEST_ASSERT (jerry_value_is_error (result));
|
||||
jerry_release_value (result);
|
||||
result = jerry_object_find_own (object, pp_string, invalid_arg, NULL);
|
||||
TEST_ASSERT (jerry_value_is_exception (result));
|
||||
jerry_value_free (result);
|
||||
|
||||
found = true;
|
||||
result = jerry_get_own_property (object, invalid_arg, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_error (result));
|
||||
result = jerry_object_find_own (object, invalid_arg, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_exception (result));
|
||||
TEST_ASSERT (!found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
jerry_release_value (object);
|
||||
jerry_release_value (invalid_arg);
|
||||
jerry_value_free (object);
|
||||
jerry_value_free (invalid_arg);
|
||||
|
||||
if (jerry_is_feature_enabled (JERRY_FEATURE_PROXY))
|
||||
if (jerry_feature_enabled (JERRY_FEATURE_PROXY))
|
||||
{
|
||||
object = create_object ("'use strict';\n"
|
||||
"var proxy = new Proxy({}, {\n"
|
||||
@@ -150,21 +150,21 @@ main (void)
|
||||
"Object.defineProperty(obj, 'pp', { value: 'Prop' })\n"
|
||||
"obj");
|
||||
|
||||
prototype = jerry_get_prototype (object);
|
||||
prototype = jerry_object_proto (object);
|
||||
found = false;
|
||||
result = jerry_get_own_property (prototype, pp_string, object, &found);
|
||||
result = jerry_object_find_own (prototype, pp_string, object, &found);
|
||||
compare_string (result, "Prop");
|
||||
TEST_ASSERT (found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
found = false;
|
||||
result = jerry_get_own_property (prototype, qq_string, object, &found);
|
||||
result = jerry_object_find_own (prototype, qq_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_undefined (result));
|
||||
TEST_ASSERT (found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
jerry_release_value (prototype);
|
||||
jerry_release_value (object);
|
||||
jerry_value_free (prototype);
|
||||
jerry_value_free (object);
|
||||
|
||||
object = create_object ("'use strict';\n"
|
||||
"(new Proxy({}, {\n"
|
||||
@@ -174,38 +174,38 @@ main (void)
|
||||
"}))\n");
|
||||
|
||||
found = false;
|
||||
result = jerry_get_own_property (object, qq_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_error (result));
|
||||
result = jerry_object_find_own (object, qq_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_exception (result));
|
||||
TEST_ASSERT (found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
jerry_release_value (object);
|
||||
jerry_value_free (object);
|
||||
}
|
||||
|
||||
if (jerry_is_feature_enabled (JERRY_FEATURE_SYMBOL))
|
||||
if (jerry_feature_enabled (JERRY_FEATURE_SYMBOL))
|
||||
{
|
||||
object = create_object ("'use strict'\n"
|
||||
"var sym = Symbol();\n"
|
||||
"({ pp:sym, [sym]:'Prop' })");
|
||||
|
||||
found = false;
|
||||
jerry_value_t symbol = jerry_get_own_property (object, pp_string, object, &found);
|
||||
jerry_value_t symbol = jerry_object_find_own (object, pp_string, object, &found);
|
||||
TEST_ASSERT (jerry_value_is_symbol (symbol));
|
||||
TEST_ASSERT (found);
|
||||
|
||||
found = false;
|
||||
result = jerry_get_own_property (object, symbol, object, &found);
|
||||
result = jerry_object_find_own (object, symbol, object, &found);
|
||||
compare_string (result, "Prop");
|
||||
TEST_ASSERT (found);
|
||||
jerry_release_value (result);
|
||||
jerry_value_free (result);
|
||||
|
||||
jerry_release_value (symbol);
|
||||
jerry_release_value (object);
|
||||
jerry_value_free (symbol);
|
||||
jerry_value_free (object);
|
||||
}
|
||||
|
||||
jerry_release_value (pp_string);
|
||||
jerry_release_value (qq_string);
|
||||
jerry_release_value (rr_string);
|
||||
jerry_value_free (pp_string);
|
||||
jerry_value_free (qq_string);
|
||||
jerry_value_free (rr_string);
|
||||
|
||||
jerry_cleanup ();
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user