Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 49 additions & 51 deletions docs/02.API-REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ main (void)
/* Setup Global scope code */
jerry_value_t parsed_code = jerry_parse (NULL, 0, script, script_size, JERRY_PARSE_NO_OPTS);

if (!jerry_value_has_error_flag (parsed_code))
if (!jerry_value_is_error (parsed_code))
{
/* Execute the parsed source code in the Global scope */
jerry_value_t ret_value = jerry_run (parsed_code);
Expand Down Expand Up @@ -1244,6 +1244,44 @@ jerry_value_is_constructor (const jerry_value_t value)

- [jerry_release_value](#jerry_release_value)

## jerry_value_is_error

**Summary**

Returns whether the given `jerry_value_t` is error value.

**Prototype**

```c
bool
jerry_value_is_error (const jerry_value_t value);
```

- `value` - api value
- return value
- true, if the given `jerry_value_t` is error value.
- false, otherwise

**Example**

```c
{
jerry_value_t value;
... // create or acquire value

if (jerry_value_is_error (value))
{
...
}

jerry_release_value (value);
}
```

**See also**

- [jerry_value_t](#jerry_value_t)
- [jerry_value_has_abort_flag](#jerry_value_has_abort_flag)

## jerry_value_is_function

Expand Down Expand Up @@ -1641,7 +1679,7 @@ If a non-error object is used as the input for the function the method
will return `JERRY_ERROR_NONE` indicating that the value was not
an Error object. However it is still possible that the value contains
error semantics. To correctly detect if a value have error use the
[jerry_value_has_error_flag](#jerry_value_has_error_flag) method.
[jerry_value_is_error](#jerry_value_is_error) method.

**Prototype**

Expand Down Expand Up @@ -1672,47 +1710,7 @@ jerry_get_error_type (const jerry_value_t value);
**See also**

- [jerry_create_error](#jerry_create_error)
- [jerry_value_has_error_flag](#jerry_value_has_error_flag)

## jerry_value_has_error_flag

**Summary**

Returns whether the given `jerry_value_t` has the error flag set.

**Prototype**

```c
bool
jerry_value_has_error_flag (const jerry_value_t value);
```

- `value` - api value
- return value
- true, if the given `jerry_value_t` has the error flag set
- false, otherwise

**Example**

```c
{
jerry_value_t value;
... // create or acquire value

if (jerry_value_has_error_flag (value))
{
...
}

jerry_release_value (value);
}
```

**See also**

- [jerry_value_t](#jerry_value_t)
- [jerry_value_has_abort_flag](#jerry_value_has_abort_flag)

- [jerry_value_is_error](#jerry_value_is_error)

## jerry_value_has_abort_flag

Expand Down Expand Up @@ -1751,7 +1749,7 @@ jerry_value_has_abort_flag (const jerry_value_t value);
**See also**

- [jerry_value_t](#jerry_value_t)
- [jerry_value_has_error_flag](#jerry_value_has_error_flag)
- [jerry_value_is_error](#jerry_value_is_error)


## jerry_value_clear_error_flag
Expand Down Expand Up @@ -2647,7 +2645,7 @@ jerry_resolve_or_reject_promise (jerry_value_t promise,
argument,
is_resolve);

if (jerry_value_has_error_flag (is_ok))
if (jerry_value_is_error (is_ok))
{
// handle the error.
}
Expand All @@ -2661,7 +2659,7 @@ jerry_resolve_or_reject_promise (jerry_value_t promise,
**See also**

- [jerry_release_value](#jerry_release_value)
- [jerry_value_has_error_flag](#jerry_value_has_error_flag)
- [jerry_value_is_error](#jerry_value_is_error)


# Acquire and release API values
Expand Down Expand Up @@ -2935,7 +2933,7 @@ jerry_create_error (jerry_error_t error_type,

**See also**

- [jerry_value_has_error_flag](#jerry_value_has_error_flag)
- [jerry_value_is_error](#jerry_value_is_error)
- [jerry_value_clear_error_flag](#jerry_value_clear_error_flag)
- [jerry_value_set_error_flag](#jerry_value_set_error_flag)

Expand Down Expand Up @@ -4174,7 +4172,7 @@ jerry_call_function (const jerry_value_t func_obj_val,
jerry_value_t this_val = jerry_create_undefined ();
jerry_value_t ret_val = jerry_call_function (val, this_val, NULL, 0);

if (!jerry_value_has_error_flag (ret_val))
if (!jerry_value_is_error (ret_val))
{
... // handle return value
}
Expand Down Expand Up @@ -4229,7 +4227,7 @@ jerry_construct_object (const jerry_value_t func_obj_val,
{
jerry_value_t ret_val = jerry_construct_object (val, NULL, 0);

if (!jerry_value_has_error_flag (ret_val))
if (!jerry_value_is_error (ret_val))
{
... // handle return value
}
Expand Down Expand Up @@ -4700,7 +4698,7 @@ find_my_object(const jerry_value_t candidate,
{
find_my_object_info_t *info_p = (find_my_object_info_t *) user_data_p;
jerry_value_t has_property = jerry_object_has_property (candidate, info_p->property_name);
bool keep_searching = (jerry_value_has_error_flag (has_property) || !jerry_get_boolean_value ());
bool keep_searching = (jerry_value_is_error (has_property) || !jerry_get_boolean_value ());
if (!keep_searching)
{
/* We found it, so we acquire the value and record it. */
Expand Down Expand Up @@ -5885,4 +5883,4 @@ jerry_value_t jerry_json_stringfy (const jerry_value_t object_to_stringify)
jerry_release_value (value);
jerry_release_value (stringified);
}
```
```
6 changes: 3 additions & 3 deletions docs/03.API-EXAMPLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ main (void)
/* Setup Global scope code */
jerry_value_t parsed_code = jerry_parse (NULL, 0, script, script_size, JERRY_PARSE_NO_OPTS);

if (!jerry_value_has_error_flag (parsed_code))
if (!jerry_value_is_error (parsed_code))
{
/* Execute the parsed source code in the Global scope */
jerry_value_t ret_value = jerry_run (parsed_code);
Expand Down Expand Up @@ -325,7 +325,7 @@ main (void)
false);

/* If command evaluated successfully, print value, returned by eval */
if (jerry_value_has_error_flag (ret_val))
if (jerry_value_is_error (ret_val))
{
/* Evaluated JS code thrown an exception
* and didn't handle it with try-catch-finally */
Expand Down Expand Up @@ -462,7 +462,7 @@ add_handler (const jerry_value_t func_value, /**< function object */
jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) "x");
jerry_value_t x_val = jerry_get_property (this_val, prop_name);

if (!jerry_value_has_error_flag (x_val))
if (!jerry_value_is_error (x_val))
{
/* Convert Jerry API values to double */
double x = jerry_get_number_value (x_val);
Expand Down
4 changes: 2 additions & 2 deletions docs/06.REFERENCE-COUNTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ behaviour through property getting and setting.
* prop_value contains a live reference to an error object.
* This reference must be released as well. */

if (jerry_value_has_error_flag (prop_value))
if (jerry_value_is_error (prop_value))
{
/* Errors can be handled here. */
}
Expand Down Expand Up @@ -93,7 +93,7 @@ behaviour through property getting and setting.
/* The reference stored in the 'result' variable is live whether
* the operation is successful or not, and must also be freed. */

if (jerry_value_has_error_flag (result))
if (jerry_value_is_error (result))
{
/* Errors can be handled here. */
}
Expand Down
2 changes: 1 addition & 1 deletion docs/07.DEBUGGER.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ wait_for_source_callback (const jerry_char_t *resource_name_p, /**< resource nam
source_size,
JERRY_PARSE_NO_OPTS);

if (!jerry_value_has_error_flag (ret_val))
if (!jerry_value_is_error (ret_val))
{
jerry_value_t func_val = ret_val;
ret_val = jerry_run (func_val);
Expand Down
6 changes: 3 additions & 3 deletions docs/09.EXT-REFERENCE-ARG.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ my_external_handler (const jerry_value_t function_obj,
mapping,
4);

if (jerry_value_has_error_flag (rv))
if (jerry_value_is_error (rv))
{
/* Handle error. */
return rv;
Expand Down Expand Up @@ -640,7 +640,7 @@ my_external_handler (const jerry_value_t function_obj,
mapping,
1);

if (jerry_value_has_error_flag (rv))
if (jerry_value_is_error (rv))
{
/* Handle error. */
return rv;
Expand Down Expand Up @@ -731,7 +731,7 @@ my_external_handler (const jerry_value_t function_obj,
mapping,
1);

if (jerry_value_has_error_flag (rv))
if (jerry_value_is_error (rv))
{
/* Handle error. */
return rv;
Expand Down
2 changes: 1 addition & 1 deletion docs/10.EXT-REFERENCE-HANDLER.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ register_common_functions (void)
{
jerry_value_t ret = jerry_create_undefined ();

for (int i = 0; common_functions[i].name_p != NULL && !jerry_value_has_error_flag (ret); i++)
for (int i = 0; common_functions[i].name_p != NULL && !jerry_value_is_error (ret); i++)
{
ret = jerryx_handler_register_global ((const jerry_char_t *) common_functions[i].name_p,
common_functions[i].handler_p);
Expand Down
28 changes: 14 additions & 14 deletions jerry-core/api/jerry.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,20 @@ jerry_value_is_constructor (const jerry_value_t value) /**< jerry api value */
return ecma_is_constructor (jerry_get_arg_value (value));
} /* jerry_value_is_constructor */

/**
* Check if the specified value is an error or abort value.
*
* @return true - if the specified value is an error value,
* false - otherwise
*/
bool
jerry_value_is_error (const jerry_value_t value) /**< api value */
{
jerry_assert_api_available ();

return ecma_is_value_error_reference (value);
} /* jerry_value_is_error */

/**
* Check if the specified value is a function object value.
*
Expand Down Expand Up @@ -890,20 +904,6 @@ bool jerry_is_feature_enabled (const jerry_feature_t feature)
);
} /* jerry_is_feature_enabled */

/**
* Check if the specified value is an error or abort value.
*
* @return true - if the error flag of the specified value is true,
* false - otherwise
*/
bool
jerry_value_has_error_flag (const jerry_value_t value) /**< api value */
{
jerry_assert_api_available ();

return ecma_is_value_error_reference (value);
} /* jerry_value_has_error_flag */

/**
* Check if the specified value is an abort value.
*
Expand Down
4 changes: 2 additions & 2 deletions jerry-core/include/jerryscript-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ jerry_value_t jerry_get_global_object (void);
bool jerry_value_is_array (const jerry_value_t value);
bool jerry_value_is_boolean (const jerry_value_t value);
bool jerry_value_is_constructor (const jerry_value_t value);
bool jerry_value_is_error (const jerry_value_t value);
bool jerry_value_is_function (const jerry_value_t value);
bool jerry_value_is_number (const jerry_value_t value);
bool jerry_value_is_null (const jerry_value_t value);
Expand Down Expand Up @@ -370,9 +371,8 @@ jerry_type_t jerry_value_get_type (const jerry_value_t value);
bool jerry_is_feature_enabled (const jerry_feature_t feature);

/**
* Error flag manipulation functions.
* Error manipulation functions.
*/
bool jerry_value_has_error_flag (const jerry_value_t value);
bool jerry_value_has_abort_flag (const jerry_value_t value);
void jerry_value_clear_error_flag (jerry_value_t *value_p);
void jerry_value_set_error_flag (jerry_value_t *value_p);
Expand Down
8 changes: 4 additions & 4 deletions jerry-ext/arg/arg-transform-functions.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jerryx_arg_transform_number_common (jerryx_arg_js_iterator_t *js_arg_iter_p, /**

jerry_value_t to_number = jerry_value_to_number (js_arg);

if (jerry_value_has_error_flag (to_number))
if (jerry_value_is_error (to_number))
{
jerry_release_value (to_number);

Expand Down Expand Up @@ -177,14 +177,14 @@ jerryx_arg_helper_process_double (double *d, /**< [in, out] the number to be pro
{ \
double tmp = 0.0; \
jerry_value_t rv = jerryx_arg_transform_number ## suffix ## _common (js_arg_iter_p, &tmp); \
if (jerry_value_has_error_flag (rv)) \
if (jerry_value_is_error (rv)) \
{ \
return rv; \
} \
jerry_release_value (rv); \
jerryx_arg_int_option_t *options_p = (jerryx_arg_int_option_t *) &c_arg_p->extra_info; \
rv = jerryx_arg_helper_process_double (&tmp, min, max, *options_p); \
if (jerry_value_has_error_flag (rv)) \
if (jerry_value_is_error (rv)) \
{ \
return rv; \
} \
Expand Down Expand Up @@ -329,7 +329,7 @@ jerryx_arg_transform_string_common (jerryx_arg_js_iterator_t *js_arg_iter_p, /**

jerry_value_t to_string = jerry_value_to_string (js_arg);

if (jerry_value_has_error_flag (to_string))
if (jerry_value_is_error (to_string))
{
jerry_release_value (to_string);

Expand Down
Loading