YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the jerry_value_has_error_flag function. (#2290)

Browse Source 
Rename the function to represent it's real functionality.

JerryScript-DCO-1.0-Signed-off-by: Istvan Miklos imiklos2@inf.u-szeged.hu
This commit is contained in:
Istvan Miklos
2018-05-03 08:24:05 +02:00
committed by László Langó
parent d672d1e71c
commit ba2e49caaa
42 changed files with 271 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/curie_bsp/jerry_app/quark/main.c
+2 -2
View File
@@ -44,7 +44,7 @@ jerry_value_t print_function;
void jerry_resolve_error (jerry_value_t ret_value)
{
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
jerry_value_clear_error_flag (&ret_value);
jerry_value_t err_str_val = jerry_value_to_string (ret_value);
@@ -113,7 +113,7 @@ void eval_jerry_script (int argc, char *argv[], struct tcmd_handler_ctx *ctx)
jerry_value_t eval_ret = jerry_eval (buffer, str_total_length - 1, false);
if (jerry_value_has_error_flag (eval_ret))
if (jerry_value_is_error (eval_ret))
{
jerry_resolve_error (eval_ret);
TCMD_RSP_ERROR (ctx, NULL);
targets/esp8266/user/jerry_extapi.c
+1 -1
View File
@@ -166,7 +166,7 @@ register_native_function (const char* name,
jerry_release_value (global_obj_val);
jerry_release_value (prop_name_val);
if (jerry_value_has_error_flag (res))
if (jerry_value_is_error (res))
{
printf ("!!! register_native_function failed: [%s]\r\n", name);
jerry_release_value (res);
targets/esp8266/user/jerry_run.c
+3 -3
View File
@@ -37,7 +37,7 @@ int js_eval (const char *source_p, const size_t source_size)
jerry_value_t res = jerry_eval ((jerry_char_t *) source_p,
source_size,
false);
if (jerry_value_has_error_flag (res)) {
if (jerry_value_is_error (res)) {
jerry_release_value (res);
return -1;
}
@@ -54,7 +54,7 @@ int js_loop (uint32_t ticknow)
jerry_value_t sysloop_func = jerry_get_property (global_obj_val, prop_name_val);
jerry_release_value (prop_name_val);
if (jerry_value_has_error_flag (sysloop_func)) {
if (jerry_value_is_error (sysloop_func)) {
printf ("Error: '%s' not defined!!!\r\n", fn_sys_loop_name);
jerry_release_value (sysloop_func);
jerry_release_value (global_obj_val);
@@ -83,7 +83,7 @@ int js_loop (uint32_t ticknow)
jerry_release_value (sysloop_func);
jerry_release_value (global_obj_val);
if (jerry_value_has_error_flag (res)) {
if (jerry_value_is_error (res)) {
jerry_release_value (res);
return -3;
}
targets/mbed/source/jerry_extapi.cpp
+2 -2
View File
@@ -111,7 +111,7 @@ register_native_function (const char* name,
return is_ok;
}
if (jerry_value_has_error_flag (reg_function))
if (jerry_value_is_error (reg_function))
{
is_ok = false;
printf ("Error: create_external_function has error flag! \n\r");
@@ -127,7 +127,7 @@ register_native_function (const char* name,
reg_function);
if (jerry_value_has_error_flag (set_result))
if (jerry_value_is_error (set_result))
{
is_ok = false;
printf ("Error: register_native_function failed: [%s]\r\n", name);
targets/mbed/source/jerry_run.cpp
+5 -5
View File
@@ -32,11 +32,11 @@ int js_entry (const char *source_p, const size_t source_size)
jerry_value_t parsed_code = jerry_parse (NULL, 0, jerry_src, source_size, JERRY_PARSE_NO_OPTS);
if (!jerry_value_has_error_flag (parsed_code))
if (!jerry_value_is_error (parsed_code))
{
jerry_value_t ret_value = jerry_run (parsed_code);
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
printf ("Error: ret_value has an error flag!\r\n");
return ret_code = -1;
@@ -63,7 +63,7 @@ int js_eval (const char *source_p, const size_t source_size)
source_size,
false);
if (jerry_value_has_error_flag (ret_val))
if (jerry_value_is_error (ret_val))
{
printf ("Error: jerry_eval failed!\r\n");
status = -1;
@@ -83,7 +83,7 @@ int js_loop (uint32_t ticknow)
jerry_release_value (sys_name);
if (jerry_value_has_error_flag (sysloop_func))
if (jerry_value_is_error (sysloop_func))
{
printf ("Error: '%s' not defined!!!\r\n", fn_sys_loop_name);
jerry_release_value (global_obj);
@@ -108,7 +108,7 @@ int js_loop (uint32_t ticknow)
global_obj,
val_args,
val_argv);
if (jerry_value_has_error_flag (ret_val_sysloop))
if (jerry_value_is_error (ret_val_sysloop))
{
status = -3;
}
targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setInterval-js.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ DECLARE_GLOBAL_FUNCTION(setInterval) {
jerry_value_t result = jerry_set_property_by_index(function_obj_p, id, args[0]);
if (jerry_value_has_error_flag(result)) {
if (jerry_value_is_error(result)) {
jerry_release_value(result);
mbed::js::EventLoop::getInstance().getQueue().cancel(id);
targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setTimeout-js.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ DECLARE_GLOBAL_FUNCTION(setTimeout) {
jerry_value_t result = jerry_set_property_by_index(function_obj_p, id, args[0]);
if (jerry_value_has_error_flag(result)) {
if (jerry_value_is_error(result)) {
jerry_release_value(result);
mbed::js::EventLoop::getInstance().getQueue().cancel(id);
targets/mbedos5/jerryscript-mbed/jerryscript-mbed-launcher/source/launcher.cpp
+2 -2
View File
@@ -44,7 +44,7 @@ static int load_javascript() {
jerry_value_t parsed_code = jerry_parse(NULL, 0, code, length, JERRY_PARSE_NO_OPTS);
if (jerry_value_has_error_flag(parsed_code)) {
if (jerry_value_is_error(parsed_code)) {
LOG_PRINT_ALWAYS("jerry_parse failed [%s]\r\n", js_codes[src].name);
jerry_release_value(parsed_code);
jsmbed_js_exit();
@@ -54,7 +54,7 @@ static int load_javascript() {
jerry_value_t returned_value = jerry_run(parsed_code);
jerry_release_value(parsed_code);
if (jerry_value_has_error_flag(returned_value)) {
if (jerry_value_is_error(returned_value)) {
LOG_PRINT_ALWAYS("jerry_run failed [%s]\r\n", js_codes[src].name);
jerry_release_value(returned_value);
jsmbed_js_exit();
targets/mbedos5/jerryscript-mbed/jerryscript-mbed-library-registry/source/wrap_tools.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ bool jsmbed_wrap_register_global_function(const char* name, jerry_external_handl
return is_ok;
}
if (jerry_value_has_error_flag(reg_function)) {
if (jerry_value_is_error(reg_function)) {
is_ok = false;
LOG_PRINT_ALWAYS("Error: jerry_create_external_function has error flag! \r\n");
jerry_release_value(global_object_val);
@@ -45,7 +45,7 @@ bool jsmbed_wrap_register_global_function(const char* name, jerry_external_handl
jerry_value_t set_result = jerry_set_property(global_object_val, jerry_name, reg_function);
if (jerry_value_has_error_flag(set_result)) {
if (jerry_value_is_error(set_result)) {
is_ok = false;
LOG_PRINT_ALWAYS("Error: jerry_create_external_function failed: [%s]\r\n", name);
}
targets/nuttx-stm32f4/jerry_main.c
+7 -7
View File
@@ -150,7 +150,7 @@ static void
print_unhandled_exception (jerry_value_t error_value, /**< error value */
const jerry_char_t *source_p) /**< source_p */
{
assert (jerry_value_has_error_flag (error_value));
assert (jerry_value_is_error (error_value));
error_value = jerry_get_value_without_error_flag (error_value);
jerry_value_t err_str_val = jerry_value_to_string (error_value);
@@ -279,7 +279,7 @@ register_js_function (const char *name_p, /**< name of the function */
{
jerry_value_t result_val = jerryx_handler_register_global ((const jerry_char_t *) name_p, handler_p);
if (jerry_value_has_error_flag (result_val))
if (jerry_value_is_error (result_val))
{
jerry_port_log (JERRY_LOG_LEVEL_WARNING, "Warning: failed to register '%s' method.", name_p);
}
@@ -397,7 +397,7 @@ int jerry_main (int argc, char *argv[])
ret_value = jerry_parse (NULL, 0, script, script_size, JERRY_PARSE_NO_OPTS);
if (!jerry_value_has_error_flag (ret_value))
if (!jerry_value_is_error (ret_value))
{
ret_value = jerry_run (ret_value);
}
@@ -421,14 +421,14 @@ int jerry_main (int argc, char *argv[])
source_size,
JERRY_PARSE_NO_OPTS);
if (!jerry_value_has_error_flag (ret_value))
if (!jerry_value_is_error (ret_value))
{
jerry_value_t func_val = ret_value;
ret_value = jerry_run (func_val);
jerry_release_value (func_val);
}
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
print_unhandled_exception (ret_value, source_p);
free ((void*) source_p);
@@ -445,7 +445,7 @@ int jerry_main (int argc, char *argv[])
int ret_code = JERRY_STANDALONE_EXIT_CODE_OK;
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
ret_code = JERRY_STANDALONE_EXIT_CODE_FAIL;
}
@@ -454,7 +454,7 @@ int jerry_main (int argc, char *argv[])
ret_value = jerry_run_all_enqueued_jobs ();
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
ret_code = JERRY_STANDALONE_EXIT_CODE_FAIL;
}
targets/riot-stm32f4/source/main-riotos.c
+3 -3
View File
@@ -36,7 +36,7 @@ register_js_function (const char *name_p, /**< name of the function */
{
jerry_value_t result_val = jerryx_handler_register_global ((const jerry_char_t *) name_p, handler_p);
if (jerry_value_has_error_flag (result_val))
if (jerry_value_is_error (result_val))
{
printf ("Warning: failed to register '%s' method.", name_p);
}
@@ -68,7 +68,7 @@ int test_jerry (int argc, char **argv)
/* Setup Global scope code */
ret_value = jerry_parse (NULL, 0, script, script_size, JERRY_PARSE_NO_OPTS);
if (!jerry_value_has_error_flag (ret_value))
if (!jerry_value_is_error (ret_value))
{
/* Execute the parsed source code in the Global scope */
ret_value = jerry_run (ret_value);
@@ -76,7 +76,7 @@ int test_jerry (int argc, char **argv)
int ret_code = JERRY_STANDALONE_EXIT_CODE_OK;
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
printf ("Script Error!");
targets/tizenrt-artik053/apps/jerryscript/jerry_main.c
+6 -6
View File
@@ -128,7 +128,7 @@ static void
print_unhandled_exception (jerry_value_t error_value, /**< error value */
const jerry_char_t *source_p) /**< source_p */
{
assert (jerry_value_has_error_flag (error_value));
assert (jerry_value_is_error (error_value));
error_value = jerry_get_value_without_error_flag (error_value);
jerry_value_t err_str_val = jerry_value_to_string (error_value);
@@ -257,7 +257,7 @@ register_js_function (const char *name_p, /**< name of the function */
{
jerry_value_t result_val = jerryx_handler_register_global ((const jerry_char_t *) name_p, handler_p);
if (jerry_value_has_error_flag (result_val))
if (jerry_value_is_error (result_val))
{
jerry_port_log (JERRY_LOG_LEVEL_WARNING, "Warning: failed to register '%s' method.", name_p);
}
@@ -373,7 +373,7 @@ jerry_cmd_main (int argc, char *argv[])
ret_value = jerry_parse (NULL, 0, script, script_size, JERRY_PARSE_NO_OPTS);
if (!jerry_value_has_error_flag (ret_value))
if (!jerry_value_is_error (ret_value))
{
ret_value = jerry_run (ret_value);
}
@@ -397,14 +397,14 @@ jerry_cmd_main (int argc, char *argv[])
source_size,
JERRY_PARSE_NO_OPTS);
if (!jerry_value_has_error_flag (ret_value))
if (!jerry_value_is_error (ret_value))
{
jerry_value_t func_val = ret_value;
ret_value = jerry_run (func_val);
jerry_release_value (func_val);
}
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
print_unhandled_exception (ret_value, source_p);
free ((void*) source_p);
@@ -421,7 +421,7 @@ jerry_cmd_main (int argc, char *argv[])
int ret_code = JERRY_STANDALONE_EXIT_CODE_OK;
if (jerry_value_has_error_flag (ret_value))
if (jerry_value_is_error (ret_value))
{
ret_code = JERRY_STANDALONE_EXIT_CODE_FAIL;
}
targets/zephyr/src/main-zephyr.c
+4 -4
View File
@@ -36,7 +36,7 @@ register_js_function (const char *name_p, /**< name of the function */
{
jerry_value_t result_val = jerryx_handler_register_global ((const jerry_char_t *) name_p, handler_p);
if (jerry_value_has_error_flag (result_val))
if (jerry_value_is_error (result_val))
{
jerry_port_log (JERRY_LOG_LEVEL_WARNING, "Warning: failed to register '%s' method.", name_p);
}
@@ -52,7 +52,7 @@ static int shell_cmd_handler (char *source_buffer)
strlen (source_buffer),
false);
if (jerry_value_has_error_flag (ret_val))
if (jerry_value_is_error (ret_val))
{
/* User-friendly error messages require at least "cp" JerryScript
profile. Include a message prefix in case "cp_minimal" profile
@@ -63,7 +63,7 @@ static int shell_cmd_handler (char *source_buffer)
jerry_value_clear_error_flag (&ret_val);
}
if (!jerry_value_has_error_flag (print_function))
if (!jerry_value_is_error (print_function))
{
jerry_value_t ret_val_print = jerry_call_function (print_function,
jerry_create_undefined (),
@@ -96,7 +96,7 @@ void main (void)
print_function = jerry_get_property (global_obj_val, print_func_name_val);
jerry_release_value (print_func_name_val);
jerry_release_value (global_obj_val);
if (jerry_value_has_error_flag (print_function))
if (jerry_value_is_error (print_function))
{
printf ("Error: could not look up print function, expression results won't be printed\n");
}