From 2d05b48a8edbedb207e256d5f65874e81519bdcc Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Tue, 30 Jul 2019 21:12:08 +0300 Subject: [PATCH] Refactored usage of njs_ret_t. Currently njs_ret_t is used in 2 different cases: as a jump offset for bytecode and as a return value for ordinary functions. The second case is quite similar with njs_int_t (and is often confused with). 1) Splitting this two cases into different types to avoid confusion with njs_int_t. 2) Renaming njs_ret_t to njs_jump_off_t to better reflect its purpose. NO functional changes. --- nginx/ngx_http_js_module.c | 132 +++++++++++------------ nginx/ngx_stream_js_module.c | 74 ++++++------- src/njs.h | 31 +++--- src/njs_array.c | 92 ++++++++-------- src/njs_array.h | 8 +- src/njs_boolean.c | 6 +- src/njs_boolean.h | 2 +- src/njs_builtin.c | 14 +-- src/njs_crypto.c | 26 ++--- src/njs_crypto.h | 4 +- src/njs_date.c | 88 ++++++++-------- src/njs_date.h | 4 +- src/njs_error.c | 30 +++--- src/njs_error.h | 20 ++-- src/njs_extern.c | 2 +- src/njs_fs.c | 44 ++++---- src/njs_function.c | 46 ++++---- src/njs_function.h | 26 ++--- src/njs_generator.c | 52 ++++----- src/njs_json.c | 48 ++++----- src/njs_math.c | 76 +++++++------- src/njs_module.c | 3 +- src/njs_module.h | 2 +- src/njs_number.c | 26 ++--- src/njs_number.h | 12 +-- src/njs_object.c | 84 +++++++-------- src/njs_object.h | 24 ++--- src/njs_object_property.c | 50 ++++----- src/njs_parser.c | 28 ++--- src/njs_parser.h | 2 +- src/njs_parser_terminal.c | 12 +-- src/njs_regexp.c | 42 ++++---- src/njs_regexp.h | 8 +- src/njs_shell.c | 22 ++-- src/njs_string.c | 198 +++++++++++++++++------------------ src/njs_string.h | 32 +++--- src/njs_timer.c | 10 +- src/njs_timer.h | 6 +- src/njs_value.c | 4 +- src/njs_value.h | 16 +-- src/njs_variable.c | 22 ++-- src/njs_variable.h | 8 +- src/njs_vm.c | 26 ++--- src/njs_vm.h | 2 +- src/njs_vmcode.c | 168 ++++++++++++++--------------- src/njs_vmcode.h | 27 ++--- src/test/njs_unit_test.c | 30 +++--- 47 files changed, 847 insertions(+), 842 deletions(-) diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index 4a95e214..813faf99 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -60,76 +60,76 @@ static ngx_int_t ngx_http_js_init_vm(ngx_http_request_t *r); static void ngx_http_js_cleanup_ctx(void *data); static void ngx_http_js_cleanup_vm(void *data); -static njs_ret_t ngx_http_js_ext_get_string(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_get_string(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_foreach_header(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_foreach_header(njs_vm_t *vm, void *obj, void *next, uintptr_t data); -static njs_ret_t ngx_http_js_ext_next_header(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_next_header(njs_vm_t *vm, njs_value_t *value, void *obj, void *next); static ngx_table_elt_t *ngx_http_js_get_header(ngx_list_part_t *part, u_char *data, size_t len); -static njs_ret_t ngx_http_js_ext_get_header_out(njs_vm_t *vm, +static njs_int_t ngx_http_js_ext_get_header_out(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_set_header_out(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_set_header_out(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value); -static njs_ret_t ngx_http_js_ext_delete_header_out(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_delete_header_out(njs_vm_t *vm, void *obj, uintptr_t data, njs_bool_t delete); -static njs_ret_t ngx_http_js_ext_foreach_header_out(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_foreach_header_out(njs_vm_t *vm, void *obj, void *next); /*FIXME*/ -static njs_ret_t ngx_http_js_ext_get_status(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_get_status(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_set_status(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_set_status(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value); -static njs_ret_t ngx_http_js_ext_send_header(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_send_header(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_send(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_finish(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_finish(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_return(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_return(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_internal_redirect(njs_vm_t *vm, +static njs_int_t ngx_http_js_ext_internal_redirect(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_log(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_warn(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_warn(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_error(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_error(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_http_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ngx_uint_t level); -static njs_ret_t ngx_http_js_ext_get_http_version(njs_vm_t *vm, +static njs_int_t ngx_http_js_ext_get_http_version(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_get_remote_address(njs_vm_t *vm, +static njs_int_t ngx_http_js_ext_get_remote_address(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_get_request_body(njs_vm_t *vm, +static njs_int_t ngx_http_js_ext_get_request_body(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_get_header_in(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_get_header_in(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_foreach_header_in(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_foreach_header_in(njs_vm_t *vm, void *obj, void *next); /*FIXME*/ -static njs_ret_t ngx_http_js_ext_get_arg(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_get_arg(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_foreach_arg(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_foreach_arg(njs_vm_t *vm, void *obj, void *next); -static njs_ret_t ngx_http_js_ext_next_arg(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_next_arg(njs_vm_t *vm, njs_value_t *value, void *obj, void *next); -static njs_ret_t ngx_http_js_ext_get_variable(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_get_variable(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_set_variable(njs_vm_t *vm, void *obj, +static njs_int_t ngx_http_js_ext_set_variable(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value); -static njs_ret_t ngx_http_js_ext_subrequest(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_http_js_ext_subrequest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); static ngx_int_t ngx_http_js_subrequest(ngx_http_request_t *r, njs_str_t *uri_arg, njs_str_t *args_arg, njs_function_t *callback, ngx_http_request_t **sr); static ngx_int_t ngx_http_js_subrequest_done(ngx_http_request_t *r, void *data, ngx_int_t rc); -static njs_ret_t ngx_http_js_ext_get_parent(njs_vm_t *vm, njs_value_t *value, +static njs_int_t ngx_http_js_ext_get_parent(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_http_js_ext_get_reply_body(njs_vm_t *vm, +static njs_int_t ngx_http_js_ext_get_reply_body(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); static njs_host_event_t ngx_http_js_set_timer(njs_external_ptr_t external, @@ -139,7 +139,7 @@ static void ngx_http_js_clear_timer(njs_external_ptr_t external, static void ngx_http_js_timer_handler(ngx_event_t *ev); static void ngx_http_js_handle_event(ngx_http_request_t *r, njs_vm_event_t vm_event, njs_value_t *args, njs_uint_t nargs); -static njs_ret_t ngx_http_js_string(njs_vm_t *vm, const njs_value_t *value, +static njs_int_t ngx_http_js_string(njs_vm_t *vm, const njs_value_t *value, njs_str_t *str); static char *ngx_http_js_include(ngx_conf_t *cf, ngx_command_t *cmd, @@ -807,7 +807,7 @@ ngx_http_js_cleanup_vm(void *data) } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_string(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -821,7 +821,7 @@ ngx_http_js_ext_get_string(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_foreach_header(njs_vm_t *vm, void *obj, void *next, uintptr_t data) { @@ -850,7 +850,7 @@ ngx_http_js_ext_foreach_header(njs_vm_t *vm, void *obj, void *next, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_next_header(njs_vm_t *vm, njs_value_t *value, void *obj, void *next) { @@ -918,7 +918,7 @@ ngx_http_js_get_header(ngx_list_part_t *part, u_char *data, size_t len) } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_header_out(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -971,7 +971,7 @@ ngx_http_js_ext_get_header_out(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_set_header_out(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value) { @@ -1065,7 +1065,7 @@ ngx_http_js_ext_set_header_out(njs_vm_t *vm, void *obj, uintptr_t data, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_delete_header_out(njs_vm_t *vm, void *obj, uintptr_t data, njs_bool_t unused) { @@ -1077,7 +1077,7 @@ ngx_http_js_ext_delete_header_out(njs_vm_t *vm, void *obj, uintptr_t data, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_foreach_header_out(njs_vm_t *vm, void *obj, void *next) { return ngx_http_js_ext_foreach_header(vm, obj, next, @@ -1085,7 +1085,7 @@ ngx_http_js_ext_foreach_header_out(njs_vm_t *vm, void *obj, void *next) } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_status(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -1099,7 +1099,7 @@ ngx_http_js_ext_get_status(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_set_status(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value) { @@ -1119,7 +1119,7 @@ ngx_http_js_ext_set_status(njs_vm_t *vm, void *obj, uintptr_t data, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_send_header(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1142,7 +1142,7 @@ ngx_http_js_ext_send_header(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1216,7 +1216,7 @@ ngx_http_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_finish(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1240,7 +1240,7 @@ ngx_http_js_ext_finish(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_return(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1297,7 +1297,7 @@ ngx_http_js_ext_return(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_internal_redirect(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1331,7 +1331,7 @@ ngx_http_js_ext_internal_redirect(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1339,7 +1339,7 @@ ngx_http_js_ext_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_warn(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1347,7 +1347,7 @@ ngx_http_js_ext_warn(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_error(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1355,7 +1355,7 @@ ngx_http_js_ext_error(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ngx_uint_t level) { @@ -1388,7 +1388,7 @@ ngx_http_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_http_version(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -1416,7 +1416,7 @@ ngx_http_js_ext_get_http_version(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_remote_address(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -1431,14 +1431,14 @@ ngx_http_js_ext_get_remote_address(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_request_body(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { u_char *p, *body; size_t len; ngx_buf_t *buf; - njs_ret_t ret; + njs_int_t ret; njs_value_t *request_body; ngx_chain_t *cl; ngx_http_js_ctx_t *ctx; @@ -1510,7 +1510,7 @@ done: } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_header_in(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -1532,14 +1532,14 @@ ngx_http_js_ext_get_header_in(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_foreach_header_in(njs_vm_t *vm, void *obj, void *next) { return ngx_http_js_ext_foreach_header(vm, obj, next, offsetof(ngx_http_request_t, headers_in.headers)); } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_arg(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -1560,7 +1560,7 @@ ngx_http_js_ext_get_arg(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_foreach_arg(njs_vm_t *vm, void *obj, void *next) { ngx_str_t *entry, **e; @@ -1582,7 +1582,7 @@ ngx_http_js_ext_foreach_arg(njs_vm_t *vm, void *obj, void *next) } -static njs_ret_t +static njs_int_t ngx_http_js_ext_next_arg(njs_vm_t *vm, njs_value_t *value, void *obj, void *next) { @@ -1625,7 +1625,7 @@ ngx_http_js_ext_next_arg(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_variable(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -1653,7 +1653,7 @@ ngx_http_js_ext_get_variable(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_set_variable(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value) { @@ -1722,7 +1722,7 @@ ngx_http_js_ext_set_variable(njs_vm_t *vm, void *obj, uintptr_t data, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_subrequest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2042,7 +2042,7 @@ ngx_http_js_subrequest_done(ngx_http_request_t *r, void *data, ngx_int_t rc) } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_parent(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -2065,7 +2065,7 @@ ngx_http_js_ext_get_parent(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_http_js_ext_get_reply_body(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -2161,7 +2161,7 @@ static void ngx_http_js_handle_event(ngx_http_request_t *r, njs_vm_event_t vm_event, njs_value_t *args, njs_uint_t nargs) { - njs_ret_t rc; + njs_int_t rc; njs_str_t exception; ngx_http_js_ctx_t *ctx; @@ -2186,7 +2186,7 @@ ngx_http_js_handle_event(ngx_http_request_t *r, njs_vm_event_t vm_event, } -static njs_ret_t +static njs_int_t ngx_http_js_string(njs_vm_t *vm, const njs_value_t *value, njs_str_t *str) { if (!njs_value_is_null_or_undefined(value)) { diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c index 8a995061..72298b83 100644 --- a/nginx/ngx_stream_js_module.c +++ b/nginx/ngx_stream_js_module.c @@ -64,43 +64,43 @@ static ngx_int_t ngx_stream_js_variable(ngx_stream_session_t *s, static ngx_int_t ngx_stream_js_init_vm(ngx_stream_session_t *s); static void ngx_stream_js_cleanup_ctx(void *data); static void ngx_stream_js_cleanup_vm(void *data); -static njs_ret_t ngx_stream_js_buffer_arg(ngx_stream_session_t *s, +static njs_int_t ngx_stream_js_buffer_arg(ngx_stream_session_t *s, njs_value_t *buffer); -static njs_ret_t ngx_stream_js_flags_arg(ngx_stream_session_t *s, +static njs_int_t ngx_stream_js_flags_arg(ngx_stream_session_t *s, njs_value_t *flags); static njs_vm_event_t *ngx_stream_js_event(ngx_stream_session_t *s, njs_str_t *event); -static njs_ret_t ngx_stream_js_ext_get_remote_address(njs_vm_t *vm, +static njs_int_t ngx_stream_js_ext_get_remote_address(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_stream_js_ext_done(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_done(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_deny(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_deny(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_decline(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_decline(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_set_status(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_set_status(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ngx_int_t status); -static njs_ret_t ngx_stream_js_ext_log(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_warn(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_warn(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_error(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_error(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ngx_uint_t level); -static njs_ret_t ngx_stream_js_ext_on(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_on(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_off(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_off(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_send(njs_vm_t *vm, njs_value_t *args, +static njs_int_t ngx_stream_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t ngx_stream_js_ext_get_variable(njs_vm_t *vm, +static njs_int_t ngx_stream_js_ext_get_variable(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -static njs_ret_t ngx_stream_js_ext_set_variable(njs_vm_t *vm, void *obj, +static njs_int_t ngx_stream_js_ext_set_variable(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value); static njs_host_event_t ngx_stream_js_set_timer(njs_external_ptr_t external, @@ -110,7 +110,7 @@ static void ngx_stream_js_clear_timer(njs_external_ptr_t external, static void ngx_stream_js_timer_handler(ngx_event_t *ev); static void ngx_stream_js_handle_event(ngx_stream_session_t *s, njs_vm_event_t vm_event, njs_value_t *args, njs_uint_t nargs); -static njs_ret_t ngx_stream_js_string(njs_vm_t *vm, const njs_value_t *value, +static njs_int_t ngx_stream_js_string(njs_vm_t *vm, const njs_value_t *value, njs_str_t *str); static char *ngx_stream_js_include(ngx_conf_t *cf, ngx_command_t *cmd, @@ -406,7 +406,7 @@ static ngx_int_t ngx_stream_js_phase_handler(ngx_stream_session_t *s, ngx_str_t *name) { njs_str_t fname, exception; - njs_ret_t ret; + njs_int_t ret; ngx_int_t rc; njs_function_t *func; ngx_connection_t *c; @@ -507,7 +507,7 @@ ngx_stream_js_body_filter(ngx_stream_session_t *s, ngx_chain_t *in, ngx_uint_t from_upstream) { njs_str_t name, exception; - njs_ret_t ret; + njs_int_t ret; ngx_int_t rc; ngx_chain_t *out, *cl; njs_function_t *func; @@ -790,7 +790,7 @@ ngx_stream_js_cleanup_vm(void *data) } -static njs_ret_t +static njs_int_t ngx_stream_js_buffer_arg(ngx_stream_session_t *s, njs_value_t *buffer) { size_t len; @@ -820,7 +820,7 @@ ngx_stream_js_buffer_arg(ngx_stream_session_t *s, njs_value_t *buffer) -static njs_ret_t +static njs_int_t ngx_stream_js_flags_arg(ngx_stream_session_t *s, njs_value_t *flags) { ngx_buf_t *b; @@ -886,7 +886,7 @@ ngx_stream_js_event(ngx_stream_session_t *s, njs_str_t *event) } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_get_remote_address(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -901,7 +901,7 @@ ngx_stream_js_ext_get_remote_address(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_done(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -909,7 +909,7 @@ ngx_stream_js_ext_done(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_deny(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -918,7 +918,7 @@ ngx_stream_js_ext_deny(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_decline(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -927,7 +927,7 @@ ngx_stream_js_ext_decline(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_set_status(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ngx_int_t status) { @@ -976,7 +976,7 @@ ngx_stream_js_ext_set_status(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -984,7 +984,7 @@ ngx_stream_js_ext_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_warn(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -992,7 +992,7 @@ ngx_stream_js_ext_warn(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_error(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1000,7 +1000,7 @@ ngx_stream_js_ext_error(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ngx_uint_t level) { @@ -1033,7 +1033,7 @@ ngx_stream_js_ext_log_core(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_on(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1080,7 +1080,7 @@ ngx_stream_js_ext_on(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_off(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1113,7 +1113,7 @@ ngx_stream_js_ext_off(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1192,7 +1192,7 @@ ngx_stream_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_get_variable(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -1220,7 +1220,7 @@ ngx_stream_js_ext_get_variable(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t ngx_stream_js_ext_set_variable(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value) { @@ -1351,7 +1351,7 @@ static void ngx_stream_js_handle_event(ngx_stream_session_t *s, njs_vm_event_t vm_event, njs_value_t *args, njs_uint_t nargs) { - njs_ret_t rc; + njs_int_t rc; njs_str_t exception; ngx_stream_js_ctx_t *ctx; @@ -1376,7 +1376,7 @@ ngx_stream_js_handle_event(ngx_stream_session_t *s, njs_vm_event_t vm_event, } -static njs_ret_t +static njs_int_t ngx_stream_js_string(njs_vm_t *vm, const njs_value_t *value, njs_str_t *str) { if (!njs_value_is_null_or_undefined(value)) { diff --git a/src/njs.h b/src/njs.h index f494a7d3..6b82fae7 100644 --- a/src/njs.h +++ b/src/njs.h @@ -22,7 +22,6 @@ #include -typedef intptr_t njs_ret_t; typedef uintptr_t njs_index_t; typedef struct njs_vm_s njs_vm_t; typedef union njs_value_s njs_value_t; @@ -60,16 +59,16 @@ extern const njs_value_t njs_value_undefined; njs_vm_value_error_set(vm, njs_vm_retval(vm), fmt, ##__VA_ARGS__) -typedef njs_ret_t (*njs_extern_get_t)(njs_vm_t *vm, njs_value_t *value, +typedef njs_int_t (*njs_extern_get_t)(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data); -typedef njs_ret_t (*njs_extern_set_t)(njs_vm_t *vm, void *obj, uintptr_t data, +typedef njs_int_t (*njs_extern_set_t)(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value); -typedef njs_ret_t (*njs_extern_find_t)(njs_vm_t *vm, void *obj, uintptr_t data, +typedef njs_int_t (*njs_extern_find_t)(njs_vm_t *vm, void *obj, uintptr_t data, njs_bool_t delete); -typedef njs_ret_t (*njs_extern_foreach_t)(njs_vm_t *vm, void *obj, void *next); -typedef njs_ret_t (*njs_extern_next_t)(njs_vm_t *vm, njs_value_t *value, +typedef njs_int_t (*njs_extern_foreach_t)(njs_vm_t *vm, void *obj, void *next); +typedef njs_int_t (*njs_extern_next_t)(njs_vm_t *vm, njs_value_t *value, void *obj, void *next); -typedef njs_ret_t (*njs_extern_method_t)(njs_vm_t *vm, njs_value_t *args, +typedef njs_int_t (*njs_extern_method_t)(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); @@ -236,7 +235,7 @@ NJS_EXPORT void njs_vm_retval_set(njs_vm_t *vm, const njs_value_t *value); * Sets a byte string value. * start data is not copied and should not be freed. */ -NJS_EXPORT njs_ret_t njs_vm_value_string_set(njs_vm_t *vm, njs_value_t *value, +NJS_EXPORT njs_int_t njs_vm_value_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size); NJS_EXPORT u_char *njs_vm_value_string_alloc(njs_vm_t *vm, njs_value_t *value, uint32_t size); @@ -246,19 +245,19 @@ NJS_EXPORT njs_int_t njs_vm_value_string_copy(njs_vm_t *vm, njs_str_t *retval, /* * Converts a value to string. */ -NJS_EXPORT njs_ret_t njs_vm_value_to_string(njs_vm_t *vm, njs_str_t *dst, +NJS_EXPORT njs_int_t njs_vm_value_to_string(njs_vm_t *vm, njs_str_t *dst, const njs_value_t *src); /* * Calls njs_vm_value_to_string(), if exception was thrown adds backtrace. */ -NJS_EXPORT njs_ret_t njs_vm_value_string(njs_vm_t *vm, njs_str_t *dst, +NJS_EXPORT njs_int_t njs_vm_value_string(njs_vm_t *vm, njs_str_t *dst, const njs_value_t *src); -NJS_EXPORT njs_ret_t njs_vm_retval_string(njs_vm_t *vm, njs_str_t *dst); +NJS_EXPORT njs_int_t njs_vm_retval_string(njs_vm_t *vm, njs_str_t *dst); -NJS_EXPORT njs_ret_t njs_vm_value_dump(njs_vm_t *vm, njs_str_t *dst, +NJS_EXPORT njs_int_t njs_vm_value_dump(njs_vm_t *vm, njs_str_t *dst, const njs_value_t *value, njs_uint_t console, njs_uint_t indent); -NJS_EXPORT njs_ret_t njs_vm_retval_dump(njs_vm_t *vm, njs_str_t *dst, +NJS_EXPORT njs_int_t njs_vm_retval_dump(njs_vm_t *vm, njs_str_t *dst, njs_uint_t indent); NJS_EXPORT void njs_vm_value_error_set(njs_vm_t *vm, njs_value_t *value, @@ -285,14 +284,14 @@ NJS_EXPORT njs_int_t njs_value_is_string(const njs_value_t *value); NJS_EXPORT njs_int_t njs_value_is_object(const njs_value_t *value); NJS_EXPORT njs_int_t njs_value_is_function(const njs_value_t *value); -NJS_EXPORT njs_ret_t njs_vm_object_alloc(njs_vm_t *vm, njs_value_t *retval, +NJS_EXPORT njs_int_t njs_vm_object_alloc(njs_vm_t *vm, njs_value_t *retval, ...); NJS_EXPORT njs_value_t *njs_vm_object_prop(njs_vm_t *vm, const njs_value_t *value, const njs_str_t *key); -NJS_EXPORT njs_ret_t njs_vm_json_parse(njs_vm_t *vm, njs_value_t *args, +NJS_EXPORT njs_int_t njs_vm_json_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs); -NJS_EXPORT njs_ret_t njs_vm_json_stringify(njs_vm_t *vm, njs_value_t *args, +NJS_EXPORT njs_int_t njs_vm_json_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs); extern const njs_mem_proto_t njs_vm_mp_proto; diff --git a/src/njs_array.c b/src/njs_array.c index c2852d56..5b948baa 100644 --- a/src/njs_array.c +++ b/src/njs_array.c @@ -9,7 +9,7 @@ #include -static njs_ret_t njs_array_prototype_slice_copy(njs_vm_t *vm, +static njs_int_t njs_array_prototype_slice_copy(njs_vm_t *vm, njs_value_t *this, int64_t start, int64_t length); static njs_value_t *njs_array_copy(njs_value_t *dst, njs_value_t *src); @@ -67,10 +67,10 @@ overflow: } -njs_ret_t +njs_int_t njs_array_add(njs_vm_t *vm, njs_array_t *array, njs_value_t *value) { - njs_ret_t ret; + njs_int_t ret; ret = njs_array_expand(vm, array, 0, 1); @@ -83,11 +83,11 @@ njs_array_add(njs_vm_t *vm, njs_array_t *array, njs_value_t *value) } -njs_ret_t +njs_int_t njs_array_string_add(njs_vm_t *vm, njs_array_t *array, const u_char *start, size_t size, size_t length) { - njs_ret_t ret; + njs_int_t ret; ret = njs_array_expand(vm, array, 0, 1); @@ -100,7 +100,7 @@ njs_array_string_add(njs_vm_t *vm, njs_array_t *array, const u_char *start, } -njs_ret_t +njs_int_t njs_array_expand(njs_vm_t *vm, njs_array_t *array, uint32_t prepend, uint32_t append) { @@ -156,7 +156,7 @@ memory_error: } -njs_ret_t +njs_int_t njs_array_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -211,7 +211,7 @@ njs_array_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_is_array(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -230,7 +230,7 @@ njs_array_is_array(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_array_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -307,14 +307,14 @@ const njs_object_init_t njs_array_constructor_init = { }; -static njs_ret_t +static njs_int_t njs_array_length(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { double num; int64_t size; uint32_t length; - njs_ret_t ret; + njs_int_t ret; njs_value_t *val; njs_array_t *array; njs_object_t *proto; @@ -396,12 +396,12 @@ njs_array_length(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, * JavaScript 1.2, ECMAScript 3. */ -static njs_ret_t +static njs_int_t njs_array_prototype_slice(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { int64_t start, end, length; - njs_ret_t ret; + njs_int_t ret; njs_value_t prop_length; static const njs_value_t string_length = njs_string("length"); @@ -462,14 +462,14 @@ njs_array_prototype_slice(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_slice_copy(njs_vm_t *vm, njs_value_t *this, int64_t start, int64_t length) { size_t size; u_char *dst; uint32_t n; - njs_ret_t ret; + njs_int_t ret; njs_array_t *array; njs_value_t *value, name; const u_char *src, *end; @@ -566,11 +566,11 @@ njs_array_prototype_slice_copy(njs_vm_t *vm, njs_value_t *this, } -static njs_ret_t +static njs_int_t njs_array_prototype_push(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - njs_ret_t ret; + njs_int_t ret; njs_uint_t i; njs_array_t *array; @@ -596,7 +596,7 @@ njs_array_prototype_push(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_pop(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -624,11 +624,11 @@ njs_array_prototype_pop(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_unshift(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - njs_ret_t ret; + njs_int_t ret; njs_uint_t n; njs_array_t *array; @@ -660,7 +660,7 @@ njs_array_prototype_unshift(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_shift(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -690,11 +690,11 @@ njs_array_prototype_shift(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_splice(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - njs_ret_t ret; + njs_int_t ret; njs_int_t n, start, length, items, delta, delete; njs_uint_t i; njs_array_t *array, *deleted; @@ -790,7 +790,7 @@ njs_array_prototype_splice(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_reverse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -821,7 +821,7 @@ njs_array_prototype_reverse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -844,14 +844,14 @@ njs_array_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char *p; uint32_t max; size_t size, length, mask; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i, n; njs_array_t *array; njs_value_t *value, *values; @@ -989,7 +989,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_concat(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1048,7 +1048,7 @@ njs_array_copy(njs_value_t *dst, njs_value_t *src) } -static njs_ret_t +static njs_int_t njs_array_prototype_index_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1108,7 +1108,7 @@ done: } -static njs_ret_t +static njs_int_t njs_array_prototype_last_index_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1171,7 +1171,7 @@ done: } -static njs_ret_t +static njs_int_t njs_array_prototype_includes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1248,11 +1248,11 @@ done: } -static njs_ret_t +static njs_int_t njs_array_prototype_fill(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - njs_ret_t ret; + njs_int_t ret; njs_int_t i, start, end, length; njs_array_t *array; njs_value_t name, prop_length; @@ -1344,7 +1344,7 @@ njs_array_prototype_fill(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_inline njs_ret_t +njs_inline njs_int_t njs_array_iterator_call(njs_vm_t *vm, njs_function_t *function, const njs_value_t *this_arg, njs_value_t *value, uint32_t n, njs_value_t *array) @@ -1362,7 +1362,7 @@ njs_array_iterator_call(njs_vm_t *vm, njs_function_t *function, } -static njs_ret_t +static njs_int_t njs_array_prototype_for_each(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1402,7 +1402,7 @@ njs_array_prototype_for_each(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_some(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1449,7 +1449,7 @@ njs_array_prototype_some(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_every(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1496,7 +1496,7 @@ njs_array_prototype_every(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_filter(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1549,7 +1549,7 @@ njs_array_prototype_filter(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_find(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1597,7 +1597,7 @@ njs_array_prototype_find(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_find_index(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1646,7 +1646,7 @@ njs_array_prototype_find_index(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_array_prototype_map(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1704,7 +1704,7 @@ njs_array_prototype_map(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_inline njs_ret_t +njs_inline njs_int_t njs_array_iterator_reduce(njs_vm_t *vm, njs_function_t *function, njs_value_t *accumulator, njs_value_t *value, uint32_t n, njs_value_t *array) @@ -1723,7 +1723,7 @@ njs_array_iterator_reduce(njs_vm_t *vm, njs_function_t *function, } -static njs_ret_t +static njs_int_t njs_array_prototype_reduce(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1778,7 +1778,7 @@ njs_array_prototype_reduce(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_array_prototype_reduce_right(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1834,7 +1834,7 @@ njs_array_prototype_reduce_right(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_array_string_sort(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1867,7 +1867,7 @@ static const njs_function_t njs_array_string_sort_function = { }; -static njs_ret_t +static njs_int_t njs_array_prototype_sort(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_array.h b/src/njs_array.h index 88f88a8f..242430c8 100644 --- a/src/njs_array.h +++ b/src/njs_array.h @@ -16,12 +16,12 @@ njs_array_t *njs_array_alloc(njs_vm_t *vm, uint64_t length, uint32_t spare); -njs_ret_t njs_array_add(njs_vm_t *vm, njs_array_t *array, njs_value_t *value); -njs_ret_t njs_array_string_add(njs_vm_t *vm, njs_array_t *array, +njs_int_t njs_array_add(njs_vm_t *vm, njs_array_t *array, njs_value_t *value); +njs_int_t njs_array_string_add(njs_vm_t *vm, njs_array_t *array, const u_char *start, size_t size, size_t length); -njs_ret_t njs_array_expand(njs_vm_t *vm, njs_array_t *array, uint32_t prepend, +njs_int_t njs_array_expand(njs_vm_t *vm, njs_array_t *array, uint32_t prepend, uint32_t append); -njs_ret_t njs_array_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_array_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); extern const njs_object_init_t njs_array_constructor_init; diff --git a/src/njs_boolean.c b/src/njs_boolean.c index e409ec38..40f0bd7d 100644 --- a/src/njs_boolean.c +++ b/src/njs_boolean.c @@ -7,7 +7,7 @@ #include -njs_ret_t +njs_int_t njs_boolean_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -71,7 +71,7 @@ const njs_object_init_t njs_boolean_constructor_init = { }; -static njs_ret_t +static njs_int_t njs_boolean_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -97,7 +97,7 @@ njs_boolean_prototype_value_of(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_boolean_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_boolean.h b/src/njs_boolean.h index cf8de9ed..a936706b 100644 --- a/src/njs_boolean.h +++ b/src/njs_boolean.h @@ -8,7 +8,7 @@ #define _NJS_BOOLEAN_H_INCLUDED_ -njs_ret_t njs_boolean_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_boolean_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); extern const njs_object_init_t njs_boolean_constructor_init; diff --git a/src/njs_builtin.c b/src/njs_builtin.c index 0e50c285..57064041 100644 --- a/src/njs_builtin.c +++ b/src/njs_builtin.c @@ -23,7 +23,7 @@ typedef struct { } njs_function_init_t; -static njs_ret_t njs_prototype_function(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_prototype_function(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); static njs_arr_t *njs_vm_expression_completions(njs_vm_t *vm, njs_str_t *expression); @@ -419,7 +419,7 @@ njs_builtin_objects_create(njs_vm_t *vm) } -static njs_ret_t +static njs_int_t njs_prototype_function(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1063,7 +1063,7 @@ found: } -static njs_ret_t +static njs_int_t njs_dump_value(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1141,7 +1141,7 @@ const njs_object_init_t njs_njs_object_init = { }; -static njs_ret_t +static njs_int_t njs_process_object_argv(njs_vm_t *vm, njs_value_t *process, njs_value_t *unused, njs_value_t *retval) { @@ -1254,7 +1254,7 @@ njs_env_hash_init(njs_vm_t *vm, njs_lvlhsh_t *hash, char **environment) } -static njs_ret_t +static njs_int_t njs_process_object_env(njs_vm_t *vm, njs_value_t *process, njs_value_t *unused, njs_value_t *retval) { @@ -1299,7 +1299,7 @@ njs_process_object_env(njs_vm_t *vm, njs_value_t *process, } -static njs_ret_t +static njs_int_t njs_process_object_pid(njs_vm_t *vm, njs_value_t *unused, njs_value_t *unused2, njs_value_t *retval) { @@ -1309,7 +1309,7 @@ njs_process_object_pid(njs_vm_t *vm, njs_value_t *unused, } -static njs_ret_t +static njs_int_t njs_process_object_ppid(njs_vm_t *vm, njs_value_t *unused, njs_value_t *unused2, njs_value_t *retval) { diff --git a/src/njs_crypto.c b/src/njs_crypto.c index f7835b1a..9aa19ca0 100644 --- a/src/njs_crypto.c +++ b/src/njs_crypto.c @@ -17,7 +17,7 @@ typedef void (*njs_hash_init)(void *ctx); typedef void (*njs_hash_update)(void *ctx, const void *data, size_t size); typedef void (*njs_hash_final)(u_char *result, void *ctx); -typedef njs_ret_t (*njs_digest_encode)(njs_vm_t *vm, njs_value_t *value, +typedef njs_int_t (*njs_digest_encode)(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src); @@ -150,7 +150,7 @@ njs_crypto_object_value_alloc(njs_vm_t *vm, njs_uint_t proto) } -static njs_ret_t +static njs_int_t njs_crypto_create_hash(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -193,7 +193,7 @@ njs_crypto_create_hash(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_hash_prototype_update(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -232,12 +232,12 @@ njs_hash_prototype_update(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_hash_prototype_digest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char digest[32], *p; - njs_ret_t ret; + njs_int_t ret; njs_str_t enc_name, str; njs_digest_t *dgst; njs_hash_alg_t *alg; @@ -304,7 +304,7 @@ njs_hash_prototype_digest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_hash_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -360,7 +360,7 @@ const njs_object_init_t njs_hash_prototype_init = { }; -njs_ret_t +njs_int_t njs_hash_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -375,7 +375,7 @@ const njs_object_init_t njs_hash_constructor_init = { }; -static njs_ret_t +static njs_int_t njs_crypto_create_hmac(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -450,7 +450,7 @@ njs_crypto_create_hmac(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_hmac_prototype_update(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -489,13 +489,13 @@ njs_hmac_prototype_update(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_hmac_prototype_digest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char hash1[32], digest[32], *p; njs_str_t enc_name, str; - njs_ret_t ret; + njs_int_t ret; njs_hmac_t *ctx; njs_hash_alg_t *alg; njs_crypto_enc_t *enc; @@ -566,7 +566,7 @@ njs_hmac_prototype_digest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_hmac_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -622,7 +622,7 @@ const njs_object_init_t njs_hmac_prototype_init = { }; -njs_ret_t +njs_int_t njs_hmac_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_crypto.h b/src/njs_crypto.h index c9d082fb..ce00d3a3 100644 --- a/src/njs_crypto.h +++ b/src/njs_crypto.h @@ -7,9 +7,9 @@ #ifndef _NJS_CRYPTO_H_INCLUDED_ #define _NJS_CRYPTO_H_INCLUDED_ -njs_ret_t njs_hash_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_hash_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_hmac_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_hmac_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); extern const njs_object_init_t njs_crypto_object_init; diff --git a/src/njs_date.c b/src/njs_date.c index 8f85f2fb..b2adef17 100644 --- a/src/njs_date.c +++ b/src/njs_date.c @@ -37,7 +37,7 @@ static njs_int_t njs_date_gmtoff_parse(const u_char *start, const u_char *end); static const u_char *njs_date_number_parse(int *value, const u_char *p, const u_char *end, size_t size); static int64_t njs_timegm(struct tm *tm); -static njs_ret_t njs_date_string(njs_vm_t *vm, const char *fmt, double time); +static njs_int_t njs_date_string(njs_vm_t *vm, const char *fmt, double time); static double njs_date_time(struct tm *tm, int64_t ms); static double njs_date_utc_time(struct tm *tm, double time); @@ -67,13 +67,13 @@ njs_timeclip(double time) } -njs_ret_t +njs_int_t njs_date_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { double num, time; int64_t values[8]; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i, n; njs_date_t *date; struct tm tm; @@ -170,13 +170,13 @@ njs_date_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_utc(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { double num, time; struct tm tm; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i, n; int32_t values[8]; @@ -276,7 +276,7 @@ njs_timegm(struct tm *tm) } -static njs_ret_t +static njs_int_t njs_date_now(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -286,7 +286,7 @@ njs_date_now(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -948,7 +948,7 @@ const njs_object_init_t njs_date_constructor_init = { }; -static njs_ret_t +static njs_int_t njs_date_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -958,7 +958,7 @@ njs_date_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -967,7 +967,7 @@ njs_date_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_to_date_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -975,7 +975,7 @@ njs_date_prototype_to_date_string(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_to_time_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -983,7 +983,7 @@ njs_date_prototype_to_time_string(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_string(njs_vm_t *vm, const char *fmt, double time) { size_t size; @@ -1006,7 +1006,7 @@ njs_date_string(njs_vm_t *vm, const char *fmt, double time) } -static njs_ret_t +static njs_int_t njs_date_prototype_to_utc_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1041,7 +1041,7 @@ njs_date_prototype_to_utc_string(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_to_iso_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1049,7 +1049,7 @@ njs_date_prototype_to_iso_string(njs_vm_t *vm, njs_value_t *args, } -njs_ret_t +njs_int_t njs_date_to_string(njs_vm_t *vm, njs_value_t *retval, const njs_value_t *date) { int32_t year; @@ -1082,7 +1082,7 @@ njs_date_to_string(njs_vm_t *vm, njs_value_t *retval, const njs_value_t *date) } -static njs_ret_t +static njs_int_t njs_date_prototype_get_full_year(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1105,7 +1105,7 @@ njs_date_prototype_get_full_year(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_utc_full_year(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1128,7 +1128,7 @@ njs_date_prototype_get_utc_full_year(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_month(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1151,7 +1151,7 @@ njs_date_prototype_get_month(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_utc_month(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1175,7 +1175,7 @@ njs_date_prototype_get_utc_month(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_date(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1198,7 +1198,7 @@ njs_date_prototype_get_date(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_utc_date(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1221,7 +1221,7 @@ njs_date_prototype_get_utc_date(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_day(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1244,7 +1244,7 @@ njs_date_prototype_get_day(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_utc_day(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1267,7 +1267,7 @@ njs_date_prototype_get_utc_day(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_hours(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1291,7 +1291,7 @@ njs_date_prototype_get_hours(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_utc_hours(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1314,7 +1314,7 @@ njs_date_prototype_get_utc_hours(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_minutes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1338,7 +1338,7 @@ njs_date_prototype_get_minutes(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_utc_minutes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1361,7 +1361,7 @@ njs_date_prototype_get_utc_minutes(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_seconds(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1379,7 +1379,7 @@ njs_date_prototype_get_seconds(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_milliseconds(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1397,7 +1397,7 @@ njs_date_prototype_get_milliseconds(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_get_timezone_offset(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1420,7 +1420,7 @@ njs_date_prototype_get_timezone_offset(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_time(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1445,7 +1445,7 @@ njs_date_prototype_set_time(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_milliseconds(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1470,7 +1470,7 @@ njs_date_prototype_set_milliseconds(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_seconds(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1499,7 +1499,7 @@ njs_date_prototype_set_seconds(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_minutes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1538,7 +1538,7 @@ njs_date_prototype_set_minutes(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_utc_minutes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1573,7 +1573,7 @@ njs_date_prototype_set_utc_minutes(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_hours(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1616,7 +1616,7 @@ njs_date_prototype_set_hours(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_utc_hours(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1652,7 +1652,7 @@ njs_date_prototype_set_utc_hours(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_date(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1684,7 +1684,7 @@ njs_date_prototype_set_date(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_utc_date(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1716,7 +1716,7 @@ njs_date_prototype_set_utc_date(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_month(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1752,7 +1752,7 @@ njs_date_prototype_set_month(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_utc_month(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1788,7 +1788,7 @@ njs_date_prototype_set_utc_month(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_full_year(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1828,7 +1828,7 @@ njs_date_prototype_set_full_year(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_date_prototype_set_utc_full_year(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1895,7 +1895,7 @@ njs_date_utc_time(struct tm *tm, double time) } -static njs_ret_t +static njs_int_t njs_date_prototype_to_json(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t retval) { diff --git a/src/njs_date.h b/src/njs_date.h index 908aec73..93263b22 100644 --- a/src/njs_date.h +++ b/src/njs_date.h @@ -8,10 +8,10 @@ #define _NJS_DATE_H_INCLUDED_ -njs_ret_t njs_date_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_date_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_date_to_string(njs_vm_t *vm, njs_value_t *retval, +njs_int_t njs_date_to_string(njs_vm_t *vm, njs_value_t *retval, const njs_value_t *date); diff --git a/src/njs_error.c b/src/njs_error.c index e2fb16d1..64808bfc 100644 --- a/src/njs_error.c +++ b/src/njs_error.c @@ -127,7 +127,7 @@ memory_error: } -static njs_ret_t +static njs_int_t njs_error_create(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_value_type_t type) { @@ -152,7 +152,7 @@ njs_error_create(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_ret_t +njs_int_t njs_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -194,7 +194,7 @@ const njs_object_init_t njs_error_constructor_init = { }; -njs_ret_t +njs_int_t njs_eval_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -236,7 +236,7 @@ const njs_object_init_t njs_eval_error_constructor_init = { }; -njs_ret_t +njs_int_t njs_internal_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -278,7 +278,7 @@ const njs_object_init_t njs_internal_error_constructor_init = { }; -njs_ret_t +njs_int_t njs_range_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -320,7 +320,7 @@ const njs_object_init_t njs_range_error_constructor_init = { }; -njs_ret_t +njs_int_t njs_reference_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -362,7 +362,7 @@ const njs_object_init_t njs_reference_error_constructor_init = { }; -njs_ret_t +njs_int_t njs_syntax_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -404,7 +404,7 @@ const njs_object_init_t njs_syntax_error_constructor_init = { }; -njs_ret_t +njs_int_t njs_type_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -446,7 +446,7 @@ const njs_object_init_t njs_type_error_constructor_init = { }; -njs_ret_t +njs_int_t njs_uri_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -520,7 +520,7 @@ njs_memory_error(njs_vm_t *vm) } -njs_ret_t +njs_int_t njs_memory_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -530,7 +530,7 @@ njs_memory_error_constructor(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_memory_error_prototype_create(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -589,7 +589,7 @@ const njs_object_init_t njs_memory_error_constructor_init = { }; -static njs_ret_t +static njs_int_t njs_error_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -599,7 +599,7 @@ njs_error_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_error_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -612,7 +612,7 @@ njs_error_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_ret_t +njs_int_t njs_error_to_string(njs_vm_t *vm, njs_value_t *retval, const njs_value_t *error) { size_t size; @@ -760,7 +760,7 @@ const njs_object_init_t njs_eval_error_prototype_init = { }; -static njs_ret_t +static njs_int_t njs_internal_error_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_error.h b/src/njs_error.h index 34145f36..ac94d8d0 100644 --- a/src/njs_error.h +++ b/src/njs_error.h @@ -42,26 +42,26 @@ void njs_memory_error_set(njs_vm_t *vm, njs_value_t *value); njs_object_t *njs_error_alloc(njs_vm_t *vm, njs_value_type_t type, const njs_value_t *name, const njs_value_t *message); -njs_ret_t njs_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_eval_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_eval_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_internal_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_internal_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_range_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_range_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_reference_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_reference_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_syntax_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_syntax_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_type_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_type_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_uri_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_uri_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_memory_error_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_memory_error_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_error_to_string(njs_vm_t *vm, njs_value_t *retval, +njs_int_t njs_error_to_string(njs_vm_t *vm, njs_value_t *retval, const njs_value_t *error); extern const njs_object_init_t njs_error_constructor_init; diff --git a/src/njs_extern.c b/src/njs_extern.c index 94ed0ff6..c9a65a66 100644 --- a/src/njs_extern.c +++ b/src/njs_extern.c @@ -251,7 +251,7 @@ njs_array_t * njs_extern_keys_array(njs_vm_t *vm, const njs_extern_t *external) { uint32_t n, keys_length; - njs_ret_t ret; + njs_int_t ret; njs_array_t *keys; const njs_lvlhsh_t *hash; njs_lvlhsh_each_t lhe; diff --git a/src/njs_fs.c b/src/njs_fs.c index 269f14ad..6858da02 100644 --- a/src/njs_fs.c +++ b/src/njs_fs.c @@ -18,24 +18,24 @@ typedef struct { } njs_fs_entry_t; -static njs_ret_t njs_fs_read_file(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_read_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_fs_read_file_sync(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_read_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_fs_append_file(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_append_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_fs_write_file(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_write_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_fs_append_file_sync(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_append_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_fs_write_file_sync(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_write_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_fs_write_file_internal(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_write_file_internal(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, int default_flags); -static njs_ret_t njs_fs_write_file_sync_internal(njs_vm_t *vm, +static njs_int_t njs_fs_write_file_sync_internal(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, int default_flags); -static njs_ret_t njs_fs_error(njs_vm_t *vm, const char *syscall, +static njs_int_t njs_fs_error(njs_vm_t *vm, const char *syscall, const char *description, njs_value_t *path, int errn, njs_value_t *retval); static int njs_fs_flags(njs_str_t *value); static mode_t njs_fs_mode(njs_value_t *value); @@ -69,7 +69,7 @@ static njs_fs_entry_t njs_flags_table[] = { }; -static njs_ret_t +static njs_int_t njs_fs_read_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -77,7 +77,7 @@ njs_fs_read_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, u_char *p, *start, *end; ssize_t n, length; njs_str_t flag, encoding; - njs_ret_t ret; + njs_int_t ret; const char *path, *syscall, *description; struct stat sb; njs_value_t *callback, arguments[3]; @@ -294,7 +294,7 @@ fail: } -static njs_ret_t +static njs_int_t njs_fs_read_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -302,7 +302,7 @@ njs_fs_read_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, u_char *p, *start, *end; ssize_t n, length; njs_str_t flag, encoding; - njs_ret_t ret; + njs_int_t ret; const char *path, *syscall, *description; struct stat sb; njs_object_prop_t *prop; @@ -485,7 +485,7 @@ fail: } -static njs_ret_t +static njs_int_t njs_fs_append_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -494,7 +494,7 @@ njs_fs_append_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_fs_write_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -503,7 +503,7 @@ njs_fs_write_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t njs_fs_append_file_sync(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_append_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { return njs_fs_write_file_sync_internal(vm, args, nargs, @@ -511,7 +511,7 @@ static njs_ret_t njs_fs_append_file_sync(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t njs_fs_write_file_sync(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_write_file_sync(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { return njs_fs_write_file_sync_internal(vm, args, nargs, @@ -519,7 +519,7 @@ static njs_ret_t njs_fs_write_file_sync(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t njs_fs_write_file_internal(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_fs_write_file_internal(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, int default_flags) { int fd, errn, flags; @@ -527,7 +527,7 @@ static njs_ret_t njs_fs_write_file_internal(njs_vm_t *vm, njs_value_t *args, mode_t md; ssize_t n; njs_str_t data, flag, encoding; - njs_ret_t ret; + njs_int_t ret; const char *path, *syscall, *description; njs_value_t *callback, *mode, arguments[2]; njs_object_prop_t *prop; @@ -710,7 +710,7 @@ done: } -static njs_ret_t +static njs_int_t njs_fs_write_file_sync_internal(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, int default_flags) { @@ -719,7 +719,7 @@ njs_fs_write_file_sync_internal(njs_vm_t *vm, njs_value_t *args, mode_t md; ssize_t n; njs_str_t data, flag, encoding; - njs_ret_t ret; + njs_int_t ret; const char *path, *syscall, *description; njs_value_t *mode; njs_object_prop_t *prop; @@ -876,7 +876,7 @@ done: } -static njs_ret_t njs_fs_error(njs_vm_t *vm, const char *syscall, +static njs_int_t njs_fs_error(njs_vm_t *vm, const char *syscall, const char *description, njs_value_t *path, int errn, njs_value_t *retval) { size_t size; diff --git a/src/njs_function.c b/src/njs_function.c index cd2290f5..816bf7d7 100644 --- a/src/njs_function.c +++ b/src/njs_function.c @@ -11,7 +11,7 @@ static njs_function_t *njs_function_copy(njs_vm_t *vm, njs_function_t *function); static njs_native_frame_t *njs_function_frame_alloc(njs_vm_t *vm, size_t size); -static njs_ret_t njs_normalize_args(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_normalize_args(njs_vm_t *vm, njs_value_t *args, uint8_t *args_types, njs_uint_t nargs); @@ -150,7 +150,7 @@ njs_function_copy(njs_vm_t *vm, njs_function_t *function) /* * ES5.1, 10.6: CreateArgumentsObject. */ -njs_ret_t +njs_int_t njs_function_arguments_object_init(njs_vm_t *vm, njs_native_frame_t *frame) { njs_int_t ret; @@ -219,7 +219,7 @@ njs_function_arguments_object_init(njs_vm_t *vm, njs_native_frame_t *frame) } -njs_ret_t +njs_int_t njs_function_rest_parameters_init(njs_vm_t *vm, njs_native_frame_t *frame) { uint32_t length; @@ -253,7 +253,7 @@ njs_function_rest_parameters_init(njs_vm_t *vm, njs_native_frame_t *frame) } -static njs_ret_t +static njs_int_t njs_function_arguments_thrower(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -285,7 +285,7 @@ const njs_object_init_t njs_arguments_object_instance_init = { }; -njs_ret_t +njs_int_t njs_function_native_frame(njs_vm_t *vm, njs_function_t *function, const njs_value_t *this, const njs_value_t *args, njs_uint_t nargs, njs_bool_t ctor) @@ -336,7 +336,7 @@ njs_function_native_frame(njs_vm_t *vm, njs_function_t *function, } -njs_ret_t +njs_int_t njs_function_lambda_frame(njs_vm_t *vm, njs_function_t *function, const njs_value_t *this, const njs_value_t *args, njs_uint_t nargs, njs_bool_t ctor) @@ -463,11 +463,11 @@ njs_function_frame_alloc(njs_vm_t *vm, size_t size) } -njs_ret_t +njs_int_t njs_function_call(njs_vm_t *vm, njs_function_t *function, njs_value_t *this, njs_value_t *args, njs_uint_t nargs, njs_value_t *retval) { - njs_ret_t ret; + njs_int_t ret; njs_value_t dst njs_aligned(16); ret = njs_function_frame(vm, function, this, args, nargs, 0); @@ -485,11 +485,11 @@ njs_function_call(njs_vm_t *vm, njs_function_t *function, njs_value_t *this, } -njs_ret_t +njs_int_t njs_function_lambda_call(njs_vm_t *vm) { size_t size; - njs_ret_t ret; + njs_int_t ret; njs_uint_t n, nesting; njs_frame_t *frame; njs_value_t *dst, *src; @@ -574,10 +574,10 @@ njs_function_lambda_call(njs_vm_t *vm) } -njs_ret_t +njs_int_t njs_function_native_call(njs_vm_t *vm) { - njs_ret_t ret; + njs_int_t ret; njs_value_t *value; njs_frame_t *frame; njs_function_t *function; @@ -623,11 +623,11 @@ njs_function_native_call(njs_vm_t *vm) } -static njs_ret_t +static njs_int_t njs_normalize_args(njs_vm_t *vm, njs_value_t *args, uint8_t *args_types, njs_uint_t nargs) { - njs_ret_t ret; + njs_int_t ret; njs_uint_t n; n = njs_min(nargs, NJS_ARGS_TYPES_MAX); @@ -789,7 +789,7 @@ njs_function_frame_free(njs_vm_t *vm, njs_native_frame_t *native) * "F.prototype.constructor === F" */ -njs_ret_t +njs_int_t njs_function_prototype_create(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -841,7 +841,7 @@ njs_function_property_prototype_create(njs_vm_t *vm, njs_value_t *value) } -njs_ret_t +njs_int_t njs_function_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -889,7 +889,7 @@ const njs_object_init_t njs_function_constructor_init = { * ES5.1, 15.3.5.1 length * the typical number of arguments expected by the function. */ -static njs_ret_t +static njs_int_t njs_function_instance_length(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -940,11 +940,11 @@ njs_function_instance_length(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_function_prototype_call(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t retval) { - njs_ret_t ret; + njs_int_t ret; njs_value_t *this; njs_function_t *function; @@ -992,12 +992,12 @@ njs_function_prototype_call(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * function() { return 2; } }, * 0:'b', 1:'c'}) */ -static njs_ret_t +static njs_int_t njs_function_prototype_apply(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t retval) { uint32_t i; - njs_ret_t ret; + njs_int_t ret; njs_value_t length, name; njs_array_t *arr; njs_function_t *func; @@ -1079,7 +1079,7 @@ activate: } -static njs_ret_t +static njs_int_t njs_function_prototype_bind(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1227,7 +1227,7 @@ const njs_object_init_t njs_arrow_instance_init = { }; -njs_ret_t +njs_int_t njs_eval_function(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_function.h b/src/njs_function.h index adfa136a..12e5d6f9 100644 --- a/src/njs_function.h +++ b/src/njs_function.h @@ -112,27 +112,27 @@ struct njs_frame_s { njs_function_t *njs_function_alloc(njs_vm_t *vm, njs_function_lambda_t *lambda, njs_closure_t *closures[], njs_bool_t shared); njs_function_t *njs_function_value_copy(njs_vm_t *vm, njs_value_t *value); -njs_ret_t njs_function_arguments_object_init(njs_vm_t *vm, +njs_int_t njs_function_arguments_object_init(njs_vm_t *vm, njs_native_frame_t *frame); -njs_ret_t njs_function_rest_parameters_init(njs_vm_t *vm, +njs_int_t njs_function_rest_parameters_init(njs_vm_t *vm, njs_native_frame_t *frame); -njs_ret_t njs_function_prototype_create(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_function_prototype_create(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); njs_value_t *njs_function_property_prototype_create(njs_vm_t *vm, njs_value_t *value); -njs_ret_t njs_function_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_function_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_function_native_frame(njs_vm_t *vm, njs_function_t *function, +njs_int_t njs_function_native_frame(njs_vm_t *vm, njs_function_t *function, const njs_value_t *this, const njs_value_t *args, njs_uint_t nargs, njs_bool_t ctor); -njs_ret_t njs_function_lambda_frame(njs_vm_t *vm, njs_function_t *function, +njs_int_t njs_function_lambda_frame(njs_vm_t *vm, njs_function_t *function, const njs_value_t *this, const njs_value_t *args, njs_uint_t nargs, njs_bool_t ctor); -njs_ret_t njs_function_call(njs_vm_t *vm, njs_function_t *function, +njs_int_t njs_function_call(njs_vm_t *vm, njs_function_t *function, njs_value_t *this, njs_value_t *args, njs_uint_t nargs, njs_value_t *retval); -njs_ret_t njs_function_lambda_call(njs_vm_t *vm); -njs_ret_t njs_function_native_call(njs_vm_t *vm); +njs_int_t njs_function_lambda_call(njs_vm_t *vm); +njs_int_t njs_function_native_call(njs_vm_t *vm); void njs_function_frame_free(njs_vm_t *vm, njs_native_frame_t *frame); @@ -151,7 +151,7 @@ njs_function_lambda_alloc(njs_vm_t *vm, uint8_t ctor) } -njs_inline njs_ret_t +njs_inline njs_int_t njs_function_frame(njs_vm_t *vm, njs_function_t *function, const njs_value_t *this, const njs_value_t *args, njs_uint_t nargs, njs_bool_t ctor) @@ -180,7 +180,7 @@ njs_function_previous_frame(njs_native_frame_t *frame) } -njs_inline njs_ret_t +njs_inline njs_int_t njs_function_frame_invoke(njs_vm_t *vm, njs_index_t retval) { njs_frame_t *frame; @@ -198,7 +198,7 @@ njs_function_frame_invoke(njs_vm_t *vm, njs_index_t retval) } -njs_inline njs_ret_t +njs_inline njs_int_t njs_function_apply(njs_vm_t *vm, njs_function_t *function, njs_value_t *args, njs_uint_t nargs, njs_value_t *retval) { @@ -213,7 +213,7 @@ extern const njs_object_init_t njs_function_instance_init; extern const njs_object_init_t njs_arrow_instance_init; extern const njs_object_init_t njs_arguments_object_instance_init; -njs_ret_t njs_eval_function(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, +njs_int_t njs_eval_function(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); extern const njs_object_init_t njs_eval_function_init; diff --git a/src/njs_generator.c b/src/njs_generator.c index a3f29721..dec4d13d 100644 --- a/src/njs_generator.c +++ b/src/njs_generator.c @@ -14,11 +14,11 @@ typedef struct njs_generator_patch_s njs_generator_patch_t; struct njs_generator_patch_s { /* * The jump_offset field points to jump offset field which contains a small - * adjustment and the adjustment should be added as (njs_ret_t *) because - * pointer to u_char accesses only one byte so this does not work on big - * endian platforms. + * adjustment and the adjustment should be added as (njs_jump_off_t *) + * because pointer to u_char accesses only one byte so this does not + * work on big endian platforms. */ - njs_ret_t jump_offset; + njs_jump_off_t jump_offset; njs_generator_patch_t *next; njs_str_t label; @@ -89,9 +89,11 @@ static njs_generator_block_t *njs_generate_find_block( static void njs_generate_patch_block(njs_vm_t *vm, njs_generator_t *generator, njs_generator_patch_t *list); static njs_generator_patch_t *njs_generate_make_continuation_patch(njs_vm_t *vm, - njs_generator_block_t *block, const njs_str_t *label, njs_ret_t offset); + njs_generator_block_t *block, const njs_str_t *label, + njs_jump_off_t offset); static njs_generator_patch_t *njs_generate_make_exit_patch(njs_vm_t *vm, - njs_generator_block_t *block, const njs_str_t *label, njs_ret_t offset); + njs_generator_block_t *block, const njs_str_t *label, + njs_jump_off_t offset); static void njs_generate_patch_block_exit(njs_vm_t *vm, njs_generator_t *generator); static const njs_str_t *njs_generate_jump_destination(njs_vm_t *vm, @@ -220,7 +222,7 @@ static njs_int_t njs_generate_function_debug(njs_vm_t *vm, #define njs_code_jump_ptr(generator, offset) \ - (njs_ret_t *) (generator->code_start + offset) + (njs_jump_off_t *) (generator->code_start + offset) #define njs_code_offset_diff(generator, offset) \ @@ -666,8 +668,8 @@ static njs_int_t njs_generate_if_statement(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t jump_offset, label_offset; njs_int_t ret; + njs_jump_off_t jump_offset, label_offset; njs_vmcode_jump_t *jump; njs_vmcode_cond_jump_t *cond_jump; @@ -739,8 +741,8 @@ static njs_int_t njs_generate_cond_expression(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t jump_offset, cond_jump_offset; njs_int_t ret; + njs_jump_off_t jump_offset, cond_jump_offset; njs_parser_node_t *branch; njs_vmcode_move_t *move; njs_vmcode_jump_t *jump; @@ -822,8 +824,8 @@ static njs_int_t njs_generate_switch_statement(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *swtch) { - njs_ret_t jump_offset; njs_int_t ret; + njs_jump_off_t jump_offset; njs_index_t index; njs_parser_node_t *node, *expr, *branch; njs_vmcode_move_t *move; @@ -953,8 +955,8 @@ static njs_int_t njs_generate_while_statement(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t jump_offset, loop_offset; njs_int_t ret; + njs_jump_off_t jump_offset, loop_offset; njs_parser_node_t *condition; njs_vmcode_jump_t *jump; njs_vmcode_cond_jump_t *cond_jump; @@ -1011,8 +1013,8 @@ static njs_int_t njs_generate_do_while_statement(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t loop_offset; njs_int_t ret; + njs_jump_off_t loop_offset; njs_parser_node_t *condition; njs_vmcode_cond_jump_t *cond_jump; @@ -1057,8 +1059,8 @@ static njs_int_t njs_generate_for_statement(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t jump_offset, loop_offset; njs_int_t ret; + njs_jump_off_t jump_offset, loop_offset; njs_parser_node_t *condition, *update; njs_vmcode_jump_t *jump; njs_vmcode_cond_jump_t *cond_jump; @@ -1159,9 +1161,9 @@ static njs_int_t njs_generate_for_in_statement(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t loop_offset, prop_offset; njs_int_t ret; njs_index_t index; + njs_jump_off_t loop_offset, prop_offset; njs_parser_node_t *foreach; njs_vmcode_prop_next_t *prop_next; njs_vmcode_prop_foreach_t *prop_foreach; @@ -1330,7 +1332,7 @@ njs_generate_find_block(njs_generator_block_t *block, uint32_t mask, static njs_generator_patch_t * njs_generate_make_continuation_patch(njs_vm_t *vm, njs_generator_block_t *block, - const njs_str_t *label, njs_ret_t offset) + const njs_str_t *label, njs_jump_off_t offset) { njs_generator_patch_t *patch; @@ -1368,7 +1370,7 @@ njs_generate_patch_block(njs_vm_t *vm, njs_generator_t *generator, static njs_generator_patch_t * njs_generate_make_exit_patch(njs_vm_t *vm, njs_generator_block_t *block, - const njs_str_t *label, njs_ret_t offset) + const njs_str_t *label, njs_jump_off_t offset) { njs_generator_patch_t *patch; @@ -2005,8 +2007,8 @@ static njs_int_t njs_generate_test_jump_expression(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t jump_offset; njs_int_t ret; + njs_jump_off_t jump_offset; njs_vmcode_move_t *move; njs_vmcode_test_jump_t *test_jump; @@ -2574,8 +2576,8 @@ static njs_int_t njs_generate_function_call(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t func_offset; - njs_ret_t ret; + njs_int_t ret; + njs_jump_off_t func_offset; njs_parser_node_t *name; njs_vmcode_function_frame_t *func; @@ -2624,8 +2626,8 @@ static njs_int_t njs_generate_method_call(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t method_offset; njs_int_t ret; + njs_jump_off_t method_offset; njs_parser_node_t *prop; njs_vmcode_method_frame_t *method; @@ -2738,12 +2740,12 @@ static njs_int_t njs_generate_try_statement(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node) { - njs_ret_t try_offset, try_end_offset, catch_offset, - catch_end_offset; njs_int_t ret; - njs_index_t exception_index, exit_index, catch_index; njs_str_t try_cont_label, try_exit_label, catch_cont_label, catch_exit_label; + njs_index_t exception_index, exit_index, catch_index; + njs_jump_off_t try_offset, try_end_offset, catch_offset, + catch_end_offset; const njs_str_t *dest_label; njs_vmcode_catch_t *catch; njs_vmcode_finally_t *finally; @@ -3284,9 +3286,9 @@ njs_generate_index_release(njs_vm_t *vm, njs_generator_t *generator, static njs_int_t njs_generate_reference_error(njs_vm_t *vm, njs_generator_t *generator, - njs_parser_node_t *node) + njs_parser_node_t *node) { - njs_ret_t ret; + njs_jump_off_t ret; njs_vmcode_reference_error_t *ref_err; if (njs_slow_path(!node->u.reference.not_defined)) { diff --git a/src/njs_json.c b/src/njs_json.c index 93bd29ca..bb782442 100644 --- a/src/njs_json.c +++ b/src/njs_json.c @@ -91,8 +91,8 @@ njs_inline uint32_t njs_json_unicode(const u_char *p); static const u_char *njs_json_skip_space(const u_char *start, const u_char *end); -static njs_ret_t njs_json_parse_iterator(njs_vm_t *vm, njs_json_parse_t *parse); -static njs_ret_t njs_json_parse_iterator_call(njs_vm_t *vm, +static njs_int_t njs_json_parse_iterator(njs_vm_t *vm, njs_json_parse_t *parse); +static njs_int_t njs_json_parse_iterator_call(njs_vm_t *vm, njs_json_parse_t *parse); static njs_json_state_t *njs_json_push_parse_state(njs_vm_t *vm, njs_json_parse_t *parse, njs_value_t *value); @@ -100,16 +100,16 @@ static njs_json_state_t *njs_json_pop_parse_state(njs_json_parse_t *parse); static void njs_json_parse_exception(njs_json_parse_ctx_t *ctx, const char *msg, const u_char *pos); -static njs_ret_t njs_json_stringify_iterator(njs_vm_t *vm, +static njs_int_t njs_json_stringify_iterator(njs_vm_t *vm, njs_json_stringify_t *stringify); static njs_function_t *njs_object_to_json_function(njs_vm_t *vm, njs_value_t *value); -static njs_ret_t njs_json_stringify_to_json(njs_vm_t *vm, +static njs_int_t njs_json_stringify_to_json(njs_vm_t *vm, njs_json_stringify_t* stringify, njs_function_t *function, njs_value_t *key, njs_value_t *value); -static njs_ret_t njs_json_stringify_replacer(njs_vm_t *vm, +static njs_int_t njs_json_stringify_replacer(njs_vm_t *vm, njs_json_stringify_t* stringify, njs_value_t *key, njs_value_t *value); -static njs_ret_t njs_json_stringify_array(njs_vm_t *vm, +static njs_int_t njs_json_stringify_array(njs_vm_t *vm, njs_json_stringify_t *stringify); static njs_json_state_t *njs_json_push_stringify_state(njs_vm_t *vm, njs_json_stringify_t *stringify, const njs_value_t *value); @@ -145,7 +145,7 @@ static njs_int_t njs_json_buf_pullup(njs_json_stringify_t *stringify, static const njs_object_prop_t njs_json_object_properties[]; -static njs_ret_t +static njs_int_t njs_json_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -234,7 +234,7 @@ memory_error: } -njs_ret_t +njs_int_t njs_vm_json_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs) { njs_function_t *parse; @@ -245,13 +245,13 @@ njs_vm_json_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs) } -static njs_ret_t +static njs_int_t njs_json_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { double num; njs_int_t i; - njs_ret_t ret; + njs_int_t ret; njs_value_t *wrapper; const njs_value_t *replacer, *space; njs_json_stringify_t *stringify, json_stringify; @@ -332,7 +332,7 @@ memory_error: } -njs_ret_t +njs_int_t njs_vm_json_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs) { njs_function_t *stringify; @@ -621,7 +621,7 @@ njs_json_parse_string(njs_json_parse_ctx_t *ctx, njs_value_t *value, size_t size, surplus; ssize_t length; uint32_t utf, utf_low; - njs_ret_t ret; + njs_int_t ret; const u_char *start, *last; enum { @@ -919,7 +919,7 @@ njs_json_skip_space(const u_char *start, const u_char *end) || (((_value)->type == NJS_ARRAY) && njs_array_len(_value) != 0) -static njs_ret_t +static njs_int_t njs_json_parse_iterator(njs_vm_t *vm, njs_json_parse_t *parse) { njs_int_t ret; @@ -1060,7 +1060,7 @@ memory_error: } -static njs_ret_t +static njs_int_t njs_json_parse_iterator_call(njs_vm_t *vm, njs_json_parse_t *parse) { njs_value_t arguments[3]; @@ -1206,14 +1206,14 @@ njs_json_parse_exception(njs_json_parse_ctx_t *ctx, const char *msg, } -static njs_ret_t +static njs_int_t njs_json_stringify_iterator(njs_vm_t *vm, njs_json_stringify_t *stringify) { u_char *start; size_t size; ssize_t length; njs_int_t i; - njs_ret_t ret; + njs_int_t ret; njs_str_t str; njs_value_t *key, *value; njs_function_t *to_json; @@ -1517,7 +1517,7 @@ njs_object_to_json_function(njs_vm_t *vm, njs_value_t *value) } -static njs_ret_t +static njs_int_t njs_json_stringify_to_json(njs_vm_t *vm, njs_json_stringify_t* stringify, njs_function_t *function, njs_value_t *key, njs_value_t *value) { @@ -1562,7 +1562,7 @@ njs_json_stringify_to_json(njs_vm_t *vm, njs_json_stringify_t* stringify, } -static njs_ret_t +static njs_int_t njs_json_stringify_replacer(njs_vm_t *vm, njs_json_stringify_t* stringify, njs_value_t *key, njs_value_t *value) { @@ -1606,10 +1606,10 @@ njs_json_stringify_replacer(njs_vm_t *vm, njs_json_stringify_t* stringify, } -static njs_ret_t +static njs_int_t njs_json_stringify_array(njs_vm_t *vm, njs_json_stringify_t *stringify) { - njs_ret_t ret; + njs_int_t ret; uint32_t i, n, k, properties_length, array_length; njs_value_t *value, num_value; njs_array_t *properties, *array; @@ -2139,14 +2139,14 @@ static njs_int_t njs_dump_value(njs_json_stringify_t *stringify, const njs_value_t *value, njs_uint_t console) { - njs_ret_t ret; + njs_int_t ret; njs_str_t str; njs_uint_t written; njs_value_t str_val; const njs_extern_t *ext_proto; u_char buf[32], *p; - njs_ret_t (*to_string)(njs_vm_t *, njs_value_t *, + njs_int_t (*to_string)(njs_vm_t *, njs_value_t *, const njs_value_t *); switch (value->type) { @@ -2372,12 +2372,12 @@ memory_error: } -njs_ret_t +njs_int_t njs_vm_value_dump(njs_vm_t *vm, njs_str_t *retval, const njs_value_t *value, njs_uint_t console, njs_uint_t indent) { njs_int_t i; - njs_ret_t ret; + njs_int_t ret; njs_str_t str; njs_value_t *key, *val, ext_val; njs_object_t *object; diff --git a/src/njs_math.c b/src/njs_math.c index ebe36d46..55aad406 100644 --- a/src/njs_math.c +++ b/src/njs_math.c @@ -8,7 +8,7 @@ #include -static njs_ret_t +static njs_int_t njs_object_math_abs(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -27,7 +27,7 @@ njs_object_math_abs(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_acos(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -55,7 +55,7 @@ njs_object_math_acos(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_acosh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -74,7 +74,7 @@ njs_object_math_acosh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_asin(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -102,7 +102,7 @@ njs_object_math_asin(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_asinh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -121,7 +121,7 @@ njs_object_math_asinh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_atan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -140,7 +140,7 @@ njs_object_math_atan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_atan2(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -162,7 +162,7 @@ njs_object_math_atan2(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_atanh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -181,7 +181,7 @@ njs_object_math_atanh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_cbrt(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -200,7 +200,7 @@ njs_object_math_cbrt(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_ceil(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -219,7 +219,7 @@ njs_object_math_ceil(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_clz32(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -240,7 +240,7 @@ njs_object_math_clz32(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_cos(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -259,7 +259,7 @@ njs_object_math_cos(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_cosh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -278,7 +278,7 @@ njs_object_math_cosh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_exp(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -297,7 +297,7 @@ njs_object_math_exp(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_expm1(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -316,7 +316,7 @@ njs_object_math_expm1(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_floor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -335,7 +335,7 @@ njs_object_math_floor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_fround(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -354,12 +354,12 @@ njs_object_math_fround(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_hypot(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { double num; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i; for (i = 1; i < nargs; i++) { @@ -387,7 +387,7 @@ njs_object_math_hypot(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_imul(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -410,7 +410,7 @@ njs_object_math_imul(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -429,7 +429,7 @@ njs_object_math_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_log10(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -448,7 +448,7 @@ njs_object_math_log10(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_log1p(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -467,7 +467,7 @@ njs_object_math_log1p(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_log2(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -495,12 +495,12 @@ njs_object_math_log2(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_max(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { double num; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i; if (nargs > 1) { @@ -535,12 +535,12 @@ done: } -static njs_ret_t +static njs_int_t njs_object_math_min(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { double num; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i; if (nargs > 1) { @@ -569,7 +569,7 @@ njs_object_math_min(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_pow(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -602,7 +602,7 @@ njs_object_math_pow(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_random(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -616,7 +616,7 @@ njs_object_math_random(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_round(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -635,7 +635,7 @@ njs_object_math_round(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_sign(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -658,7 +658,7 @@ njs_object_math_sign(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_sin(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -677,7 +677,7 @@ njs_object_math_sin(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_sinh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -696,7 +696,7 @@ njs_object_math_sinh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_sqrt(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -715,7 +715,7 @@ njs_object_math_sqrt(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_tan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -734,7 +734,7 @@ njs_object_math_tan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_tanh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -753,7 +753,7 @@ njs_object_math_tanh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_math_trunc(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_module.c b/src/njs_module.c index 665dff01..40348f41 100644 --- a/src/njs_module.c +++ b/src/njs_module.c @@ -510,7 +510,8 @@ njs_module_insert(njs_vm_t *vm, njs_module_t *module) } -njs_ret_t njs_module_require(njs_vm_t *vm, njs_value_t *args, +njs_int_t +njs_module_require(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { njs_module_t *module; diff --git a/src/njs_module.h b/src/njs_module.h index c827fcc0..2fbc0c2e 100644 --- a/src/njs_module.h +++ b/src/njs_module.h @@ -19,7 +19,7 @@ typedef struct { njs_int_t njs_module_load(njs_vm_t *vm); void njs_module_reset(njs_vm_t *vm); njs_int_t njs_parser_module(njs_vm_t *vm, njs_parser_t *parser); -njs_ret_t njs_module_require(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_module_require(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); diff --git a/src/njs_number.c b/src/njs_number.c index bc0837ac..3e2cb6bc 100644 --- a/src/njs_number.c +++ b/src/njs_number.c @@ -18,7 +18,7 @@ #define NJS_MAX_SAFE_INTEGER ((1LL << 53) - 1) -static njs_ret_t njs_number_to_string_radix(njs_vm_t *vm, njs_value_t *string, +static njs_int_t njs_number_to_string_radix(njs_vm_t *vm, njs_value_t *string, double number, uint32_t radix); @@ -203,7 +203,7 @@ njs_number_radix_parse(const u_char **start, const u_char *end, uint8_t radix) } -njs_ret_t +njs_int_t njs_number_to_string(njs_vm_t *vm, njs_value_t *string, const njs_value_t *number) { @@ -238,7 +238,7 @@ njs_number_to_string(njs_vm_t *vm, njs_value_t *string, } -njs_ret_t +njs_int_t njs_number_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -268,7 +268,7 @@ njs_number_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_number_is_integer(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -292,7 +292,7 @@ njs_number_is_integer(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, -static njs_ret_t +static njs_int_t njs_number_is_safe_integer(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -315,7 +315,7 @@ njs_number_is_safe_integer(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_number_is_nan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -477,7 +477,7 @@ const njs_object_init_t njs_number_constructor_init = { }; -static njs_ret_t +static njs_int_t njs_number_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -503,7 +503,7 @@ njs_number_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_number_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -554,7 +554,7 @@ njs_number_prototype_to_string(njs_vm_t *vm, njs_value_t *args, (NJS_STRING_RADIX_INTERGRAL_LEN + NJS_STRING_RADIX_FRACTION_LEN) -static njs_ret_t +static njs_int_t njs_number_to_string_radix(njs_vm_t *vm, njs_value_t *string, double number, uint32_t radix) { @@ -653,7 +653,7 @@ const njs_object_init_t njs_number_prototype_init = { }; -njs_ret_t +njs_int_t njs_number_global_is_nan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -671,7 +671,7 @@ njs_number_global_is_nan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_ret_t +njs_int_t njs_number_is_finite(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -694,7 +694,7 @@ njs_number_is_finite(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_ret_t +njs_int_t njs_number_parse_int(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -774,7 +774,7 @@ done: } -njs_ret_t +njs_int_t njs_number_parse_float(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_number.h b/src/njs_number.h index 7b9b1dc7..cc4a9997 100644 --- a/src/njs_number.h +++ b/src/njs_number.h @@ -19,17 +19,17 @@ uint64_t njs_number_bin_parse(const u_char **start, const u_char *end); uint64_t njs_number_hex_parse(const u_char **start, const u_char *end); int64_t njs_number_radix_parse(const u_char **start, const u_char *end, uint8_t radix); -njs_ret_t njs_number_to_string(njs_vm_t *vm, njs_value_t *string, +njs_int_t njs_number_to_string(njs_vm_t *vm, njs_value_t *string, const njs_value_t *number); -njs_ret_t njs_number_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_number_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_number_global_is_nan(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_number_global_is_nan(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_number_is_finite(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_number_is_finite(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_number_parse_int(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_number_parse_int(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_number_parse_float(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_number_parse_float(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); diff --git a/src/njs_object.c b/src/njs_object.c index ed8cc8ca..ec7c610a 100644 --- a/src/njs_object.c +++ b/src/njs_object.c @@ -17,14 +17,14 @@ static uint32_t njs_object_enumerate_object_length(const njs_object_t *object, njs_bool_t all); static uint32_t njs_object_own_enumerate_object_length( const njs_object_t *object, const njs_object_t *parent, njs_bool_t all); -static njs_ret_t njs_object_enumerate_array(njs_vm_t *vm, +static njs_int_t njs_object_enumerate_array(njs_vm_t *vm, const njs_array_t *array, njs_array_t *items, njs_object_enum_t kind); -static njs_ret_t njs_object_enumerate_string(njs_vm_t *vm, +static njs_int_t njs_object_enumerate_string(njs_vm_t *vm, const njs_value_t *value, njs_array_t *items, njs_object_enum_t kind); -static njs_ret_t njs_object_enumerate_object(njs_vm_t *vm, +static njs_int_t njs_object_enumerate_object(njs_vm_t *vm, const njs_object_t *object, njs_array_t *items, njs_object_enum_t kind, njs_bool_t all); -static njs_ret_t njs_object_own_enumerate_object(njs_vm_t *vm, +static njs_int_t njs_object_own_enumerate_object(njs_vm_t *vm, const njs_object_t *object, const njs_object_t *parent, njs_array_t *items, njs_object_enum_t kind, njs_bool_t all); @@ -189,7 +189,7 @@ njs_object_hash_test(njs_lvlhsh_query_t *lhq, void *data) } -njs_ret_t +njs_int_t njs_object_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -240,7 +240,7 @@ njs_object_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, /* TODO: properties with attributes. */ -static njs_ret_t +static njs_int_t njs_object_create(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -276,7 +276,7 @@ njs_object_create(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_keys(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -303,7 +303,7 @@ njs_object_keys(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_values(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -330,7 +330,7 @@ njs_object_values(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_entries(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -443,11 +443,11 @@ njs_object_own_enumerate_length(const njs_object_t *object, } -njs_inline njs_ret_t +njs_inline njs_int_t njs_object_enumerate_value(njs_vm_t *vm, const njs_object_t *object, njs_array_t *items, njs_object_enum_t kind, njs_bool_t all) { - njs_ret_t ret; + njs_int_t ret; njs_object_value_t *obj_val; switch (object->type) { @@ -481,12 +481,12 @@ object: } -njs_inline njs_ret_t +njs_inline njs_int_t njs_object_own_enumerate_value(njs_vm_t *vm, const njs_object_t *object, const njs_object_t *parent, njs_array_t *items, njs_object_enum_t kind, njs_bool_t all) { - njs_ret_t ret; + njs_int_t ret; njs_object_value_t *obj_val; switch (object->type) { @@ -525,7 +525,7 @@ njs_object_enumerate(njs_vm_t *vm, const njs_object_t *object, njs_object_enum_t kind, njs_bool_t all) { uint32_t length; - njs_ret_t ret; + njs_int_t ret; njs_array_t *items; length = njs_object_enumerate_length(object, all); @@ -551,7 +551,7 @@ njs_object_own_enumerate(njs_vm_t *vm, const njs_object_t *object, njs_object_enum_t kind, njs_bool_t all) { uint32_t length; - njs_ret_t ret; + njs_int_t ret; njs_array_t *items; length = njs_object_own_enumerate_length(object, object, all); @@ -685,7 +685,7 @@ njs_object_own_enumerate_object_length(const njs_object_t *object, } -static njs_ret_t +static njs_int_t njs_object_enumerate_array(njs_vm_t *vm, const njs_array_t *array, njs_array_t *items, njs_object_enum_t kind) { @@ -744,7 +744,7 @@ njs_object_enumerate_array(njs_vm_t *vm, const njs_array_t *array, } -static njs_ret_t +static njs_int_t njs_object_enumerate_string(njs_vm_t *vm, const njs_value_t *value, njs_array_t *items, njs_object_enum_t kind) { @@ -863,11 +863,11 @@ njs_object_enumerate_string(njs_vm_t *vm, const njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_object_enumerate_object(njs_vm_t *vm, const njs_object_t *object, njs_array_t *items, njs_object_enum_t kind, njs_bool_t all) { - njs_ret_t ret; + njs_int_t ret; const njs_object_t *proto; ret = njs_object_own_enumerate_object(vm, object, object, items, kind, all); @@ -891,7 +891,7 @@ njs_object_enumerate_object(njs_vm_t *vm, const njs_object_t *object, } -static njs_ret_t +static njs_int_t njs_object_own_enumerate_object(njs_vm_t *vm, const njs_object_t *object, const njs_object_t *parent, njs_array_t *items, njs_object_enum_t kind, njs_bool_t all) @@ -1083,7 +1083,7 @@ njs_object_own_enumerate_object(njs_vm_t *vm, const njs_object_t *object, } -static njs_ret_t +static njs_int_t njs_object_define_property(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1124,7 +1124,7 @@ njs_object_define_property(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_define_properties(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1181,7 +1181,7 @@ njs_object_define_properties(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_get_own_property_descriptor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1201,11 +1201,11 @@ njs_object_get_own_property_descriptor(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_object_get_own_property_descriptors(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - njs_ret_t ret; + njs_int_t ret; uint32_t i, length; njs_array_t *names; njs_value_t descriptor; @@ -1268,7 +1268,7 @@ njs_object_get_own_property_descriptors(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_object_get_own_property_names(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1295,7 +1295,7 @@ njs_object_get_own_property_names(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_object_get_prototype_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1316,7 +1316,7 @@ njs_object_get_prototype_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_freeze(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1357,7 +1357,7 @@ njs_object_freeze(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_is_frozen(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1411,7 +1411,7 @@ done: } -static njs_ret_t +static njs_int_t njs_object_seal(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1451,7 +1451,7 @@ njs_object_seal(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_is_sealed(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1501,7 +1501,7 @@ done: } -static njs_ret_t +static njs_int_t njs_object_prevent_extensions(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1522,7 +1522,7 @@ njs_object_prevent_extensions(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_object_is_extensible(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1550,7 +1550,7 @@ njs_object_is_extensible(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * and of Boolean.prototype, Number.prototype, and String.prototype objects. */ -njs_ret_t +njs_int_t njs_primitive_prototype_get_proto(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -1581,7 +1581,7 @@ njs_primitive_prototype_get_proto(njs_vm_t *vm, njs_value_t *value, * getter. The properties are set to appropriate prototype. */ -njs_ret_t +njs_int_t njs_object_prototype_create(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -1878,7 +1878,7 @@ njs_object_set_prototype_of(njs_vm_t *vm, njs_object_t *object, } -njs_ret_t +njs_int_t njs_object_prototype_proto(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -1925,7 +1925,7 @@ njs_object_prototype_proto(njs_vm_t *vm, njs_value_t *value, * "constructor" getter. The properties are set to appropriate function. */ -njs_ret_t +njs_int_t njs_object_prototype_create_constructor(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -2013,7 +2013,7 @@ njs_property_constructor_create(njs_vm_t *vm, njs_lvlhsh_t *hash, } -static njs_ret_t +static njs_int_t njs_object_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2049,7 +2049,7 @@ static const njs_value_t njs_object_error_string = njs_string("[object Error]"); -njs_ret_t +njs_int_t njs_object_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2109,7 +2109,7 @@ njs_object_prototype_to_string(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_object_prototype_has_own_property(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2147,7 +2147,7 @@ njs_object_prototype_has_own_property(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_object_prototype_prop_is_enumerable(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2191,7 +2191,7 @@ njs_object_prototype_prop_is_enumerable(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_object_prototype_is_prototype_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_object.h b/src/njs_object.h index 8ffddfb3..a8cd4faa 100644 --- a/src/njs_object.h +++ b/src/njs_object.h @@ -107,38 +107,38 @@ njs_array_t *njs_object_own_enumerate(njs_vm_t *vm, const njs_object_t *object, njs_object_enum_t kind, njs_bool_t all); njs_int_t njs_object_hash_create(njs_vm_t *vm, njs_lvlhsh_t *hash, const njs_object_prop_t *prop, njs_uint_t n); -njs_ret_t njs_object_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_object_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_primitive_prototype_get_proto(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_primitive_prototype_get_proto(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); -njs_ret_t njs_object_prototype_create(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_object_prototype_create(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); njs_value_t *njs_property_prototype_create(njs_vm_t *vm, njs_lvlhsh_t *hash, njs_object_t *prototype); -njs_ret_t njs_object_prototype_proto(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_object_prototype_proto(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); -njs_ret_t njs_object_prototype_create_constructor(njs_vm_t *vm, +njs_int_t njs_object_prototype_create_constructor(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); njs_value_t *njs_property_constructor_create(njs_vm_t *vm, njs_lvlhsh_t *hash, njs_value_t *constructor); -njs_ret_t njs_object_prototype_to_string(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_object_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, +njs_int_t njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object, const njs_value_t *property); -njs_ret_t njs_value_property(njs_vm_t *vm, const njs_value_t *value, +njs_int_t njs_value_property(njs_vm_t *vm, const njs_value_t *value, const njs_value_t *property, njs_value_t *retval); -njs_ret_t njs_value_property_set(njs_vm_t *vm, njs_value_t *object, +njs_int_t njs_value_property_set(njs_vm_t *vm, njs_value_t *object, const njs_value_t *property, njs_value_t *value); njs_object_prop_t *njs_object_prop_alloc(njs_vm_t *vm, const njs_value_t *name, const njs_value_t *value, uint8_t attributes); njs_object_prop_t *njs_object_property(njs_vm_t *vm, const njs_object_t *obj, njs_lvlhsh_query_t *lhq); -njs_ret_t njs_object_prop_define(njs_vm_t *vm, njs_value_t *object, +njs_int_t njs_object_prop_define(njs_vm_t *vm, njs_value_t *object, const njs_value_t *name, const njs_value_t *value); -njs_ret_t njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, +njs_int_t njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, const njs_value_t *value, const njs_value_t *property); -njs_ret_t njs_prop_private_copy(njs_vm_t *vm, njs_property_query_t *pq); +njs_int_t njs_prop_private_copy(njs_vm_t *vm, njs_property_query_t *pq); const char *njs_prop_type_string(njs_object_prop_type_t type); extern const njs_object_init_t njs_object_constructor_init; diff --git a/src/njs_object_property.c b/src/njs_object_property.c index e1c7bff6..abb355cd 100644 --- a/src/njs_object_property.c +++ b/src/njs_object_property.c @@ -8,18 +8,18 @@ #include -static njs_ret_t njs_object_property_query(njs_vm_t *vm, +static njs_int_t njs_object_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_object_t *object, const njs_value_t *property); -static njs_ret_t njs_array_property_query(njs_vm_t *vm, +static njs_int_t njs_array_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_array_t *array, uint32_t index); -static njs_ret_t njs_string_property_query(njs_vm_t *vm, +static njs_int_t njs_string_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object, uint32_t index); -static njs_ret_t njs_external_property_query(njs_vm_t *vm, +static njs_int_t njs_external_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object); -static njs_ret_t njs_external_property_set(njs_vm_t *vm, njs_value_t *value, +static njs_int_t njs_external_property_set(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); -static njs_ret_t njs_external_property_delete(njs_vm_t *vm, njs_value_t *value, +static njs_int_t njs_external_property_delete(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); static njs_object_prop_t *njs_descriptor_prop(njs_vm_t *vm, const njs_value_t *name, const njs_object_t *descriptor); @@ -44,12 +44,12 @@ static njs_object_prop_t *njs_descriptor_prop(njs_vm_t *vm, * Object.defineProperty([1,2], '1', {configurable:false}) */ -njs_ret_t +njs_int_t njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object, const njs_value_t *property) { uint32_t index; - njs_ret_t ret; + njs_int_t ret; njs_object_t *obj; njs_value_t prop; njs_function_t *function; @@ -151,12 +151,12 @@ njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object, } -static njs_ret_t +static njs_int_t njs_object_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_object_t *object, const njs_value_t *property) { uint32_t index; - njs_ret_t ret; + njs_int_t ret; njs_bool_t own; njs_array_t *array; njs_object_t *proto; @@ -236,12 +236,12 @@ njs_object_property_query(njs_vm_t *vm, njs_property_query_t *pq, } -static njs_ret_t +static njs_int_t njs_array_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_array_t *array, uint32_t index) { uint32_t size; - njs_ret_t ret; + njs_int_t ret; njs_value_t *value; njs_object_prop_t *prop; @@ -293,7 +293,7 @@ njs_array_property_query(njs_vm_t *vm, njs_property_query_t *pq, } -static njs_ret_t +static njs_int_t njs_string_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object, uint32_t index) { @@ -334,12 +334,12 @@ njs_string_property_query(njs_vm_t *vm, njs_property_query_t *pq, } -static njs_ret_t +static njs_int_t njs_external_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object) { void *obj; - njs_ret_t ret; + njs_int_t ret; uintptr_t data; njs_object_prop_t *prop; const njs_extern_t *ext_proto; @@ -425,12 +425,12 @@ done: } -static njs_ret_t +static njs_int_t njs_external_property_set(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { void *obj; - njs_ret_t ret; + njs_int_t ret; njs_str_t s; njs_property_query_t *pq; @@ -454,7 +454,7 @@ njs_external_property_set(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, } -static njs_ret_t +static njs_int_t njs_external_property_delete(njs_vm_t *vm, njs_value_t *value, njs_value_t *unused, njs_value_t *unused2) { @@ -478,11 +478,11 @@ njs_external_property_delete(njs_vm_t *vm, njs_value_t *value, * NJS_ERROR exception has been thrown. * retval will contain undefined */ -njs_ret_t +njs_int_t njs_value_property(njs_vm_t *vm, const njs_value_t *value, const njs_value_t *property, njs_value_t *retval) { - njs_ret_t ret; + njs_int_t ret; njs_object_prop_t *prop; njs_property_query_t pq; @@ -566,11 +566,11 @@ njs_value_property(njs_vm_t *vm, const njs_value_t *value, * NJS_OK property has been set successfully * NJS_ERROR exception has been thrown. */ -njs_ret_t +njs_int_t njs_value_property_set(njs_vm_t *vm, njs_value_t *object, const njs_value_t *property, njs_value_t *value) { - njs_ret_t ret; + njs_int_t ret; njs_object_prop_t *prop, *shared; njs_property_query_t pq; @@ -769,7 +769,7 @@ njs_object_property(njs_vm_t *vm, const njs_object_t *object, * Limited support of special descriptors like length and array index * (values can be set, but without property flags support). */ -njs_ret_t +njs_int_t njs_object_prop_define(njs_vm_t *vm, njs_value_t *object, const njs_value_t *name, const njs_value_t *value) { @@ -1121,7 +1121,7 @@ static const njs_value_t njs_object_configurable_string = njs_string("configurable"); -njs_ret_t +njs_int_t njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, const njs_value_t *value, const njs_value_t *property) { @@ -1310,7 +1310,7 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, } -njs_ret_t +njs_int_t njs_prop_private_copy(njs_vm_t *vm, njs_property_query_t *pq) { njs_int_t ret; diff --git a/src/njs_parser.c b/src/njs_parser.c index e527d7d7..a49e956f 100644 --- a/src/njs_parser.c +++ b/src/njs_parser.c @@ -9,7 +9,7 @@ #include -static njs_ret_t njs_parser_scope_begin(njs_vm_t *vm, njs_parser_t *parser, +static njs_int_t njs_parser_scope_begin(njs_vm_t *vm, njs_parser_t *parser, njs_scope_t type); static void njs_parser_scope_end(njs_vm_t *vm, njs_parser_t *parser); static njs_token_t njs_parser_statement_chain(njs_vm_t *vm, @@ -77,7 +77,7 @@ static njs_token_t njs_parser_grouping_expression(njs_vm_t *vm, njs_int_t njs_parser(njs_vm_t *vm, njs_parser_t *parser, njs_parser_t *prev) { - njs_ret_t ret; + njs_int_t ret; njs_token_t token; njs_lvlhsh_t *variables, *prev_variables; njs_variable_t *var; @@ -156,7 +156,7 @@ njs_parser(njs_vm_t *vm, njs_parser_t *parser, njs_parser_t *prev) } -static njs_ret_t +static njs_int_t njs_parser_scope_begin(njs_vm_t *vm, njs_parser_t *parser, njs_scope_t type) { njs_arr_t *values; @@ -443,7 +443,7 @@ njs_parser_statement(njs_vm_t *vm, njs_parser_t *parser, static njs_token_t njs_parser_block_statement(njs_vm_t *vm, njs_parser_t *parser) { - njs_ret_t ret; + njs_int_t ret; njs_token_t token; njs_parser_node_t *node; @@ -539,7 +539,7 @@ static njs_token_t njs_parser_labelled_statement(njs_vm_t *vm, njs_parser_t *parser) { uint32_t hash; - njs_ret_t ret; + njs_int_t ret; njs_str_t name; njs_token_t token; njs_variable_t *label; @@ -633,7 +633,7 @@ njs_parser_function_alloc(njs_vm_t *vm, njs_parser_t *parser, static njs_token_t njs_parser_function_declaration(njs_vm_t *vm, njs_parser_t *parser) { - njs_ret_t ret; + njs_int_t ret; njs_token_t token; njs_variable_t *var; njs_function_t *function; @@ -690,7 +690,7 @@ njs_parser_function_declaration(njs_vm_t *vm, njs_parser_t *parser) njs_token_t njs_parser_function_expression(njs_vm_t *vm, njs_parser_t *parser) { - njs_ret_t ret; + njs_int_t ret; njs_token_t token; njs_variable_t *var; njs_function_t *function; @@ -759,7 +759,7 @@ njs_token_t njs_parser_function_lambda(njs_vm_t *vm, njs_parser_t *parser, njs_function_lambda_t *lambda, njs_token_t token) { - njs_ret_t ret; + njs_int_t ret; njs_index_t index; ret = njs_parser_scope_begin(vm, parser, NJS_SCOPE_FUNCTION); @@ -842,7 +842,7 @@ static njs_token_t njs_parser_lambda_argument(njs_vm_t *vm, njs_parser_t *parser, njs_index_t index) { - njs_ret_t ret; + njs_int_t ret; njs_variable_t *arg; arg = njs_parser_variable_add(vm, parser, NJS_VARIABLE_VAR); @@ -1579,7 +1579,7 @@ njs_parser_brk_statement(njs_vm_t *vm, njs_parser_t *parser, njs_token_t token) { uint32_t hash; - njs_ret_t ret; + njs_int_t ret; njs_str_t name; njs_parser_node_t *node; @@ -1630,7 +1630,7 @@ njs_parser_brk_statement(njs_vm_t *vm, njs_parser_t *parser, static njs_token_t njs_parser_try_statement(njs_vm_t *vm, njs_parser_t *parser) { - njs_ret_t ret; + njs_int_t ret; njs_token_t token; njs_parser_node_t *node, *try, *catch; @@ -1806,7 +1806,7 @@ njs_parser_throw_statement(njs_vm_t *vm, njs_parser_t *parser) static njs_token_t njs_parser_import_statement(njs_vm_t *vm, njs_parser_t *parser) { - njs_ret_t ret; + njs_int_t ret; njs_token_t token; njs_parser_node_t *name, *import; @@ -1873,7 +1873,7 @@ njs_parser_import_statement(njs_vm_t *vm, njs_parser_t *parser) njs_token_t njs_parser_module_lambda(njs_vm_t *vm, njs_parser_t *parser) { - njs_ret_t ret; + njs_int_t ret; njs_token_t token; njs_parser_node_t *node, *parent; njs_function_lambda_t *lambda; @@ -2137,7 +2137,7 @@ njs_token_t njs_parser_arrow_expression(njs_vm_t *vm, njs_parser_t *parser, njs_token_t token) { - njs_ret_t ret; + njs_int_t ret; njs_index_t index; njs_parser_node_t *node, *body, *parent; njs_function_lambda_t *lambda; diff --git a/src/njs_parser.h b/src/njs_parser.h index 70f10c76..a0bcd027 100644 --- a/src/njs_parser.h +++ b/src/njs_parser.h @@ -229,7 +229,7 @@ njs_parser_variable_add(njs_vm_t *vm, njs_parser_t *parser, } -njs_inline njs_ret_t +njs_inline njs_int_t njs_parser_variable_reference(njs_vm_t *vm, njs_parser_t *parser, njs_parser_node_t *node, njs_reference_type_t type) { diff --git a/src/njs_parser_terminal.c b/src/njs_parser_terminal.c index 88b11e60..bdfc4959 100644 --- a/src/njs_parser_terminal.c +++ b/src/njs_parser_terminal.c @@ -28,7 +28,7 @@ static njs_int_t njs_parser_template_expression(njs_vm_t *vm, njs_parser_t *parser); static njs_int_t njs_parser_template_string(njs_vm_t *vm, njs_parser_t *parser); -static njs_ret_t njs_parser_escape_string_calc_length(njs_vm_t *vm, +static njs_int_t njs_parser_escape_string_calc_length(njs_vm_t *vm, njs_parser_t *parser, size_t *out_size, size_t *out_length); static njs_token_t njs_parser_escape_string_create(njs_vm_t *vm, njs_parser_t *parser, njs_value_t *value); @@ -38,7 +38,7 @@ njs_token_t njs_parser_terminal(njs_vm_t *vm, njs_parser_t *parser, njs_token_t token) { double num; - njs_ret_t ret; + njs_int_t ret; njs_parser_node_t *node; ret = njs_parser_match_arrow_expression(vm, parser, token); @@ -202,7 +202,7 @@ static njs_parser_node_t * njs_parser_reference(njs_vm_t *vm, njs_parser_t *parser, njs_token_t token, njs_str_t *name, uint32_t hash, uint32_t token_line) { - njs_ret_t ret; + njs_int_t ret; njs_value_t *ext; njs_variable_t *var; njs_parser_node_t *node; @@ -431,7 +431,7 @@ static njs_int_t njs_parser_builtin(njs_vm_t *vm, njs_parser_t *parser, njs_parser_node_t *node, njs_value_type_t type, njs_str_t *name, uint32_t hash) { - njs_ret_t ret; + njs_int_t ret; njs_uint_t index; njs_variable_t *var; njs_parser_scope_t *scope; @@ -991,7 +991,7 @@ njs_parser_escape_string_create(njs_vm_t *vm, njs_parser_t *parser, u_char c, *start, *dst; size_t size, length, hex_length; uint64_t cp, cp_pair; - njs_ret_t ret; + njs_int_t ret; njs_str_t *string; const u_char *src, *end, *hex_end; @@ -1169,7 +1169,7 @@ njs_parser_escape_string_create(njs_vm_t *vm, njs_parser_t *parser, } -static njs_ret_t +static njs_int_t njs_parser_escape_string_calc_length(njs_vm_t *vm, njs_parser_t *parser, size_t *out_size, size_t *out_length) { diff --git a/src/njs_regexp.c b/src/njs_regexp.c index f6e35f63..fdbbd4da 100644 --- a/src/njs_regexp.c +++ b/src/njs_regexp.c @@ -22,7 +22,7 @@ static void *njs_regexp_malloc(size_t size, void *memory_data); static void njs_regexp_free(void *p, void *memory_data); static njs_regexp_flags_t njs_regexp_flags(u_char **start, u_char *end, njs_bool_t bound); -static njs_ret_t njs_regexp_prototype_source(njs_vm_t *vm, njs_value_t *value, +static njs_int_t njs_regexp_prototype_source(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); static int njs_regexp_pattern_compile(njs_vm_t *vm, njs_regex_t *regex, u_char *source, int options); @@ -30,13 +30,13 @@ static u_char *njs_regexp_compile_trace_handler(njs_trace_t *trace, njs_trace_data_t *td, u_char *start); static u_char *njs_regexp_match_trace_handler(njs_trace_t *trace, njs_trace_data_t *td, u_char *start); -static njs_ret_t njs_regexp_exec_result(njs_vm_t *vm, njs_regexp_t *regexp, +static njs_int_t njs_regexp_exec_result(njs_vm_t *vm, njs_regexp_t *regexp, njs_utf8_t utf8, u_char *string, njs_regex_match_data_t *match_data); -static njs_ret_t njs_regexp_string_create(njs_vm_t *vm, njs_value_t *value, +static njs_int_t njs_regexp_string_create(njs_vm_t *vm, njs_value_t *value, u_char *start, uint32_t size, int32_t length); -njs_ret_t +njs_int_t njs_regexp_init(njs_vm_t *vm) { vm->regex_context = njs_regex_context_create(njs_regexp_malloc, @@ -98,12 +98,12 @@ njs_regexp_value_flags(njs_vm_t *vm, const njs_value_t *regexp) } -njs_ret_t +njs_int_t njs_regexp_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char *start; - njs_ret_t ret; + njs_int_t ret; njs_str_t string; njs_value_t source, flags_string; const njs_value_t *pattern, *flags; @@ -216,7 +216,7 @@ njs_regexp_create(njs_vm_t *vm, njs_value_t *value, u_char *start, * Escaping it here as a workaround. */ -njs_inline njs_ret_t +njs_inline njs_int_t njs_regexp_escape(njs_vm_t *vm, njs_str_t *text) { size_t brackets, zeros; @@ -719,7 +719,7 @@ njs_regexp_alloc(njs_vm_t *vm, njs_regexp_pattern_t *pattern) } -static njs_ret_t +static njs_int_t njs_regexp_prototype_last_index(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -740,7 +740,7 @@ njs_regexp_prototype_last_index(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_regexp_prototype_global(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -754,7 +754,7 @@ njs_regexp_prototype_global(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_regexp_prototype_ignore_case(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -768,7 +768,7 @@ njs_regexp_prototype_ignore_case(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_regexp_prototype_multiline(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -782,7 +782,7 @@ njs_regexp_prototype_multiline(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_regexp_prototype_source(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -802,7 +802,7 @@ njs_regexp_prototype_source(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_regexp_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -816,7 +816,7 @@ njs_regexp_prototype_to_string(njs_vm_t *vm, njs_value_t *args, } -njs_ret_t +njs_int_t njs_regexp_to_string(njs_vm_t *vm, njs_value_t *retval, const njs_value_t *value) { @@ -835,11 +835,11 @@ njs_regexp_to_string(njs_vm_t *vm, njs_value_t *retval, } -static njs_ret_t +static njs_int_t njs_regexp_prototype_test(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - njs_ret_t ret; + njs_int_t ret; njs_uint_t n; const njs_value_t *value, *retval; njs_string_prop_t string; @@ -880,11 +880,11 @@ njs_regexp_prototype_test(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_ret_t +njs_int_t njs_regexp_prototype_exec(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { - njs_ret_t ret; + njs_int_t ret; njs_utf8_t utf8; njs_regexp_t *regexp; njs_string_prop_t string; @@ -956,14 +956,14 @@ njs_regexp_prototype_exec(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_regexp_exec_result(njs_vm_t *vm, njs_regexp_t *regexp, njs_utf8_t utf8, u_char *string, njs_regex_match_data_t *match_data) { int *captures; u_char *start; int32_t size, length; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i, n; njs_array_t *array; njs_value_t name; @@ -1116,7 +1116,7 @@ done: } -static njs_ret_t +static njs_int_t njs_regexp_string_create(njs_vm_t *vm, njs_value_t *value, u_char *start, uint32_t size, int32_t length) { diff --git a/src/njs_regexp.h b/src/njs_regexp.h index 22cde6a9..12f57981 100644 --- a/src/njs_regexp.h +++ b/src/njs_regexp.h @@ -16,8 +16,8 @@ typedef enum { } njs_regexp_flags_t; -njs_ret_t njs_regexp_init(njs_vm_t *vm); -njs_ret_t njs_regexp_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_regexp_init(njs_vm_t *vm); +njs_int_t njs_regexp_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); njs_int_t njs_regexp_create(njs_vm_t *vm, njs_value_t *value, u_char *start, size_t length, njs_regexp_flags_t flags); @@ -28,10 +28,10 @@ njs_regexp_pattern_t *njs_regexp_pattern_create(njs_vm_t *vm, njs_int_t njs_regexp_match(njs_vm_t *vm, njs_regex_t *regex, const u_char *subject, size_t len, njs_regex_match_data_t *match_data); njs_regexp_t *njs_regexp_alloc(njs_vm_t *vm, njs_regexp_pattern_t *pattern); -njs_ret_t njs_regexp_prototype_exec(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_regexp_prototype_exec(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_regexp_to_string(njs_vm_t *vm, njs_value_t *retval, +njs_int_t njs_regexp_to_string(njs_vm_t *vm, njs_value_t *retval, const njs_value_t *regexp); extern const njs_object_init_t njs_regexp_constructor_init; diff --git a/src/njs_shell.c b/src/njs_shell.c index 6284757f..f70ec284 100644 --- a/src/njs_shell.c +++ b/src/njs_shell.c @@ -90,15 +90,15 @@ static njs_int_t njs_editline_init(void); static char **njs_completion_handler(const char *text, int start, int end); static char *njs_completion_generator(const char *text, int state); -static njs_ret_t njs_ext_console_log(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_ext_console_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_ext_console_dump(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_ext_console_dump(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_ext_console_help(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_ext_console_help(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_ext_console_time(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_ext_console_time(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_ext_console_time_end(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_ext_console_time_end(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); static njs_host_event_t njs_console_set_timer(njs_external_ptr_t external, @@ -701,7 +701,7 @@ njs_create_vm(njs_opts_t *opts, njs_vm_opt_t *vm_options) static void -njs_output(njs_vm_t *vm, njs_opts_t *opts, njs_ret_t ret) +njs_output(njs_vm_t *vm, njs_opts_t *opts, njs_int_t ret) { njs_str_t out; @@ -973,7 +973,7 @@ next: } -static njs_ret_t +static njs_int_t njs_ext_console_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1005,7 +1005,7 @@ njs_ext_console_log(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_ext_console_dump(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1037,7 +1037,7 @@ njs_ext_console_dump(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_ext_console_help(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1068,7 +1068,7 @@ njs_ext_console_help(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_ext_console_time(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1092,7 +1092,7 @@ njs_ext_console_time(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_ext_console_time_end(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { diff --git a/src/njs_string.c b/src/njs_string.c index 5cc11d1d..cf88a61d 100644 --- a/src/njs_string.c +++ b/src/njs_string.c @@ -54,53 +54,53 @@ typedef struct { static void njs_encode_base64_core(njs_str_t *dst, const njs_str_t *src, const u_char *basis, njs_uint_t padding); -static njs_ret_t njs_decode_base64_core(njs_vm_t *vm, +static njs_int_t njs_decode_base64_core(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src, const u_char *basis); static void njs_string_slice_prop(njs_string_prop_t *string, njs_slice_prop_t *slice, njs_value_t *args, njs_uint_t nargs); static void njs_string_slice_args(njs_slice_prop_t *slice, njs_value_t *args, njs_uint_t nargs); -static njs_ret_t njs_string_from_char_code(njs_vm_t *vm, +static njs_int_t njs_string_from_char_code(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_string_from_code_point(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_string_from_code_point(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_string_bytes_from(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_string_bytes_from(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -static njs_ret_t njs_string_bytes_from_array(njs_vm_t *vm, +static njs_int_t njs_string_bytes_from_array(njs_vm_t *vm, const njs_value_t *value); -static njs_ret_t njs_string_bytes_from_string(njs_vm_t *vm, +static njs_int_t njs_string_bytes_from_string(njs_vm_t *vm, const njs_value_t *args, njs_uint_t nargs); -static njs_ret_t njs_string_starts_or_ends_with(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_string_starts_or_ends_with(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_bool_t starts); -static njs_ret_t njs_string_trim(njs_vm_t *vm, njs_value_t *value, +static njs_int_t njs_string_trim(njs_vm_t *vm, njs_value_t *value, njs_uint_t mode); -static njs_ret_t njs_string_prototype_pad(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_string_prototype_pad(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_bool_t pad_start); -static njs_ret_t njs_string_match_multiple(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_string_match_multiple(njs_vm_t *vm, njs_value_t *args, njs_regexp_pattern_t *pattern); -static njs_ret_t njs_string_split_part_add(njs_vm_t *vm, njs_array_t *array, +static njs_int_t njs_string_split_part_add(njs_vm_t *vm, njs_array_t *array, njs_utf8_t utf8, const u_char *start, size_t size); -static njs_ret_t njs_string_replace_regexp(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_string_replace_regexp(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r); -static njs_ret_t njs_string_replace_regexp_function(njs_vm_t *vm, +static njs_int_t njs_string_replace_regexp_function(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r, int *captures, njs_uint_t n); -static njs_ret_t njs_string_replace_regexp_join(njs_vm_t *vm, +static njs_int_t njs_string_replace_regexp_join(njs_vm_t *vm, njs_string_replace_t *r); -static njs_ret_t njs_string_replace_search(njs_vm_t *vm, njs_value_t *args, +static njs_int_t njs_string_replace_search(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r); -static njs_ret_t njs_string_replace_search_function(njs_vm_t *vm, +static njs_int_t njs_string_replace_search_function(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r); -static njs_ret_t njs_string_replace_parse(njs_vm_t *vm, +static njs_int_t njs_string_replace_parse(njs_vm_t *vm, njs_string_replace_t *r, u_char *p, u_char *end, size_t size, njs_uint_t ncaptures); -static njs_ret_t njs_string_replace_substitute(njs_vm_t *vm, +static njs_int_t njs_string_replace_substitute(njs_vm_t *vm, njs_string_replace_t *r, int *captures); -static njs_ret_t njs_string_replace_join(njs_vm_t *vm, njs_string_replace_t *r); +static njs_int_t njs_string_replace_join(njs_vm_t *vm, njs_string_replace_t *r); static void njs_string_replacement_copy(njs_string_replace_part_t *string, const njs_value_t *value); -static njs_ret_t njs_string_encode(njs_vm_t *vm, njs_value_t *value, +static njs_int_t njs_string_encode(njs_vm_t *vm, njs_value_t *value, const uint32_t *escape); -static njs_ret_t njs_string_decode(njs_vm_t *vm, njs_value_t *value, +static njs_int_t njs_string_decode(njs_vm_t *vm, njs_value_t *value, const uint32_t *reserve); @@ -108,7 +108,7 @@ static njs_ret_t njs_string_decode(njs_vm_t *vm, njs_value_t *value, #define njs_base64_decoded_length(len) (((len + 3) / 4) * 3) -njs_ret_t +njs_int_t njs_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size) { @@ -161,7 +161,7 @@ njs_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, } -njs_ret_t +njs_int_t njs_string_new(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size, uint32_t length) { @@ -270,7 +270,7 @@ njs_string_truncate(njs_value_t *value, uint32_t size) } -njs_ret_t +njs_int_t njs_string_hex(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) { u_char *p, c; @@ -372,7 +372,7 @@ njs_encode_base64_core(njs_str_t *dst, const njs_str_t *src, } -njs_ret_t +njs_int_t njs_string_base64(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) { njs_str_t dst; @@ -395,7 +395,7 @@ njs_string_base64(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) } -njs_ret_t +njs_int_t njs_string_base64url(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) { size_t padding; @@ -440,7 +440,7 @@ njs_string_copy(njs_value_t *dst, njs_value_t *src) * sets njs_string_prop_t struct. */ -njs_ret_t +njs_int_t njs_string_validate(njs_vm_t *vm, njs_string_prop_t *string, njs_value_t *value) { u_char *start; @@ -538,7 +538,7 @@ njs_string_prop(njs_string_prop_t *string, const njs_value_t *value) } -njs_ret_t +njs_int_t njs_string_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -630,7 +630,7 @@ const njs_object_init_t njs_string_constructor_init = { }; -static njs_ret_t +static njs_int_t njs_string_instance_length(njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { @@ -774,7 +774,7 @@ njs_string_cmp(const njs_value_t *v1, const njs_value_t *v2) } -static njs_ret_t +static njs_int_t njs_string_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -807,7 +807,7 @@ njs_string_prototype_value_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * base64url. */ -static njs_ret_t +static njs_int_t njs_string_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -865,13 +865,13 @@ njs_string_prototype_to_string(njs_vm_t *vm, njs_value_t *args, * JavaScript 1.2, ECMAScript 3. */ -njs_ret_t +njs_int_t njs_string_prototype_concat(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char *p, *start; uint64_t size, length, mask; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i; njs_string_prop_t string; @@ -934,7 +934,7 @@ njs_string_prototype_concat(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * The method converts an UTF-8 encoded byte string to an Unicode string. */ -static njs_ret_t +static njs_int_t njs_string_prototype_from_utf8(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -969,7 +969,7 @@ njs_string_prototype_from_utf8(njs_vm_t *vm, njs_value_t *args, * The method serializes Unicode string to an UTF-8 encoded byte string. */ -static njs_ret_t +static njs_int_t njs_string_prototype_to_utf8(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -992,7 +992,7 @@ njs_string_prototype_to_utf8(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * The method converts a byte string to an Unicode string. */ -static njs_ret_t +static njs_int_t njs_string_prototype_from_bytes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1046,7 +1046,7 @@ njs_string_prototype_from_bytes(njs_vm_t *vm, njs_value_t *args, * encountered in the Unicode string. */ -static njs_ret_t +static njs_int_t njs_string_prototype_to_bytes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1107,7 +1107,7 @@ njs_string_prototype_to_bytes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * JavaScript 1.2, ECMAScript 3. */ -static njs_ret_t +static njs_int_t njs_string_prototype_slice(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1125,7 +1125,7 @@ njs_string_prototype_slice(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * JavaScript 1.0, ECMAScript 1. */ -static njs_ret_t +static njs_int_t njs_string_prototype_substring(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1181,7 +1181,7 @@ njs_string_prototype_substring(njs_vm_t *vm, njs_value_t *args, * JavaScript 1.0, ECMAScript 3. */ -static njs_ret_t +static njs_int_t njs_string_prototype_substr(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1232,7 +1232,7 @@ njs_string_prototype_substr(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_string_prototype_char_at(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1373,7 +1373,7 @@ njs_string_slice_string_prop(njs_string_prop_t *dst, } -njs_ret_t +njs_int_t njs_string_slice(njs_vm_t *vm, njs_value_t *dst, const njs_string_prop_t *string, const njs_slice_prop_t *slice) { @@ -1391,7 +1391,7 @@ njs_string_slice(njs_vm_t *vm, njs_value_t *dst, } -static njs_ret_t +static njs_int_t njs_string_prototype_char_code_at(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1440,7 +1440,7 @@ done: * a byte string. */ -static njs_ret_t +static njs_int_t njs_string_bytes_from(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1462,12 +1462,12 @@ njs_string_bytes_from(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_string_bytes_from_array(njs_vm_t *vm, const njs_value_t *value) { u_char *p; uint32_t i, length; - njs_ret_t ret; + njs_int_t ret; njs_array_t *array; njs_value_t *octet; @@ -1500,7 +1500,7 @@ njs_string_bytes_from_array(njs_vm_t *vm, const njs_value_t *value) } -static njs_ret_t +static njs_int_t njs_string_bytes_from_string(njs_vm_t *vm, const njs_value_t *args, njs_uint_t nargs) { @@ -1533,7 +1533,7 @@ njs_string_bytes_from_string(njs_vm_t *vm, const njs_value_t *args, } -njs_ret_t +njs_int_t njs_string_decode_hex(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) { u_char *p, *dst; @@ -1580,7 +1580,7 @@ njs_string_decode_hex(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) } -njs_ret_t +njs_int_t njs_string_decode_base64(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) { static u_char basis64[] = { @@ -1607,7 +1607,7 @@ njs_string_decode_base64(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) } -njs_ret_t +njs_int_t njs_string_decode_base64url(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src) { @@ -1635,7 +1635,7 @@ njs_string_decode_base64url(njs_vm_t *vm, njs_value_t *value, } -static njs_ret_t +static njs_int_t njs_decode_base64_core(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src, const u_char *basis) { @@ -1697,14 +1697,14 @@ njs_decode_base64_core(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src, } -static njs_ret_t +static njs_int_t njs_string_from_char_code(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char *p; size_t size; uint16_t code; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i; for (i = 1; i < nargs; i++) { @@ -1737,7 +1737,7 @@ njs_string_from_char_code(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_from_code_point(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1745,7 +1745,7 @@ njs_string_from_code_point(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, double num; size_t size; int32_t code; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i; for (i = 1; i < nargs; i++) { @@ -1793,7 +1793,7 @@ range_error: } -static njs_ret_t +static njs_int_t njs_string_prototype_index_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1863,7 +1863,7 @@ done: } -static njs_ret_t +static njs_int_t njs_string_prototype_last_index_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -1967,7 +1967,7 @@ done: } -static njs_ret_t +static njs_int_t njs_string_prototype_includes(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2031,7 +2031,7 @@ done: } -static njs_ret_t +static njs_int_t njs_string_prototype_starts_with(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2039,7 +2039,7 @@ njs_string_prototype_starts_with(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_prototype_ends_with(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2047,7 +2047,7 @@ njs_string_prototype_ends_with(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_starts_or_ends_with(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_bool_t starts) { @@ -2230,7 +2230,7 @@ njs_string_offset_map_init(const u_char *start, size_t size) * folding "\u0130" to "\u0069\u0307" is not supported. */ -static njs_ret_t +static njs_int_t njs_string_prototype_to_lower_case(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2297,7 +2297,7 @@ njs_string_prototype_to_lower_case(njs_vm_t *vm, njs_value_t *args, * folding "\u00DF" to "\u0053\u0053" is not supported. */ -static njs_ret_t +static njs_int_t njs_string_prototype_to_upper_case(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2358,7 +2358,7 @@ njs_string_prototype_to_upper_case(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_prototype_trim(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2366,7 +2366,7 @@ njs_string_prototype_trim(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_string_prototype_trim_start(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2374,7 +2374,7 @@ njs_string_prototype_trim_start(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_prototype_trim_end(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2382,7 +2382,7 @@ njs_string_prototype_trim_end(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_trim(njs_vm_t *vm, njs_value_t *value, njs_uint_t mode) { uint32_t u, trim, length; @@ -2497,7 +2497,7 @@ empty: } -static njs_ret_t +static njs_int_t njs_string_prototype_repeat(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2543,7 +2543,7 @@ njs_string_prototype_repeat(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_string_prototype_pad_start(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2551,7 +2551,7 @@ njs_string_prototype_pad_start(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_prototype_pad_end(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2559,7 +2559,7 @@ njs_string_prototype_pad_end(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_prototype_pad(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_bool_t pad_start) { @@ -2655,7 +2655,7 @@ njs_string_prototype_pad(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * String.search([regexp]) */ -static njs_ret_t +static njs_int_t njs_string_prototype_search(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -2726,12 +2726,12 @@ done: * String.match([regexp]) */ -static njs_ret_t +static njs_int_t njs_string_prototype_match(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { njs_str_t string; - njs_ret_t ret; + njs_int_t ret; njs_value_t arguments[2]; njs_regexp_pattern_t *pattern; @@ -2777,13 +2777,13 @@ match: } -static njs_ret_t +static njs_int_t njs_string_match_multiple(njs_vm_t *vm, njs_value_t *args, njs_regexp_pattern_t *pattern) { int *captures; int32_t size, length; - njs_ret_t ret; + njs_int_t ret; njs_utf8_t utf8; njs_array_t *array; const u_char *p, *start, *end; @@ -2881,7 +2881,7 @@ njs_string_match_multiple(njs_vm_t *vm, njs_value_t *args, * String.prototype.split([string|regexp[, limit]]) */ -static njs_ret_t +static njs_int_t njs_string_prototype_split(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -3046,7 +3046,7 @@ done: } -static njs_ret_t +static njs_int_t njs_string_split_part_add(njs_vm_t *vm, njs_array_t *array, njs_utf8_t utf8, const u_char *start, size_t size) { @@ -3062,12 +3062,12 @@ njs_string_split_part_add(njs_vm_t *vm, njs_array_t *array, njs_utf8_t utf8, * String.replace([regexp|string[, string|function]]) */ -static njs_ret_t +static njs_int_t njs_string_prototype_replace(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char *p, *start, *end; - njs_ret_t ret; + njs_int_t ret; njs_uint_t ncaptures; njs_regex_t *regex; njs_string_prop_t string; @@ -3177,13 +3177,13 @@ original: } -static njs_ret_t +static njs_int_t njs_string_replace_regexp(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r) { int *captures; u_char *p, *start; - njs_ret_t ret; + njs_int_t ret; const u_char *end; njs_regexp_pattern_t *pattern; njs_string_replace_part_t replace; @@ -3305,13 +3305,13 @@ njs_string_replace_regexp(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_replace_regexp_function(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r, int *captures, njs_uint_t n) { u_char *start; size_t size, length; - njs_ret_t ret; + njs_int_t ret; njs_uint_t i, k; njs_value_t *arguments; njs_string_prop_t string; @@ -3392,7 +3392,7 @@ njs_string_replace_regexp_function(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_replace_regexp_join(njs_vm_t *vm, njs_string_replace_t *r) { njs_regex_match_data_free(r->match_data, vm->regex_context); @@ -3401,14 +3401,14 @@ njs_string_replace_regexp_join(njs_vm_t *vm, njs_string_replace_t *r) } -static njs_ret_t +static njs_int_t njs_string_replace_search(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r) { int captures[2]; u_char *p, *end; size_t size; - njs_ret_t ret; + njs_int_t ret; njs_str_t search; njs_string_get(&args[1], &search); @@ -3457,11 +3457,11 @@ njs_string_replace_search(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_replace_search_function(njs_vm_t *vm, njs_value_t *args, njs_string_replace_t *r) { - njs_ret_t ret; + njs_int_t ret; njs_value_t string; njs_value_t arguments[4]; @@ -3505,7 +3505,7 @@ njs_string_replace_search_function(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_replace_parse(njs_vm_t *vm, njs_string_replace_t *r, u_char *p, u_char *end, size_t size, njs_uint_t ncaptures) { @@ -3606,7 +3606,7 @@ skip: } -static njs_ret_t +static njs_int_t njs_string_replace_substitute(njs_vm_t *vm, njs_string_replace_t *r, int *captures) { @@ -3748,7 +3748,7 @@ njs_string_replace_substitute(njs_vm_t *vm, njs_string_replace_t *r, } -static njs_ret_t +static njs_int_t njs_string_replace_join(njs_vm_t *vm, njs_string_replace_t *r) { u_char *p, *string; @@ -3829,7 +3829,7 @@ njs_string_replacement_copy(njs_string_replace_part_t *string, } -njs_ret_t +njs_int_t njs_primitive_value_to_string(njs_vm_t *vm, njs_value_t *dst, const njs_value_t *src) { @@ -4352,7 +4352,7 @@ const njs_object_init_t njs_string_instance_init = { * encodeURI(string) */ -njs_ret_t +njs_int_t njs_string_encode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -4388,7 +4388,7 @@ njs_string_encode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * encodeURIComponent(string) */ -njs_ret_t +njs_int_t njs_string_encode_uri_component(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -4420,7 +4420,7 @@ njs_string_encode_uri_component(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_encode(njs_vm_t *vm, njs_value_t *value, const uint32_t *escape) { u_char byte, *src, *dst; @@ -4483,7 +4483,7 @@ njs_string_encode(njs_vm_t *vm, njs_value_t *value, const uint32_t *escape) * decodeURI(string) */ -njs_ret_t +njs_int_t njs_string_decode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -4519,7 +4519,7 @@ njs_string_decode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, * decodeURIComponent(string) */ -njs_ret_t +njs_int_t njs_string_decode_uri_component(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -4551,7 +4551,7 @@ njs_string_decode_uri_component(njs_vm_t *vm, njs_value_t *args, } -static njs_ret_t +static njs_int_t njs_string_decode(njs_vm_t *vm, njs_value_t *value, const uint32_t *reserve) { int8_t d0, d1; diff --git a/src/njs_string.h b/src/njs_string.h index e5525502..01adf15a 100644 --- a/src/njs_string.h +++ b/src/njs_string.h @@ -143,35 +143,35 @@ njs_string_length(njs_value_t *string) } -njs_ret_t njs_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, +njs_int_t njs_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size); u_char *njs_string_alloc(njs_vm_t *vm, njs_value_t *value, uint64_t size, uint64_t length); -njs_ret_t njs_string_new(njs_vm_t *vm, njs_value_t *value, const u_char *start, +njs_int_t njs_string_new(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size, uint32_t length); -njs_ret_t njs_string_hex(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_string_hex(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src); -njs_ret_t njs_string_base64(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_string_base64(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src); -njs_ret_t njs_string_base64url(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_string_base64url(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src); -njs_ret_t njs_string_decode_hex(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_string_decode_hex(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src); -njs_ret_t njs_string_decode_base64(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_string_decode_base64(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src); -njs_ret_t njs_string_decode_base64url(njs_vm_t *vm, njs_value_t *value, +njs_int_t njs_string_decode_base64url(njs_vm_t *vm, njs_value_t *value, const njs_str_t *src); void njs_string_truncate(njs_value_t *value, uint32_t size); void njs_string_copy(njs_value_t *dst, njs_value_t *src); -njs_ret_t njs_string_validate(njs_vm_t *vm, njs_string_prop_t *string, +njs_int_t njs_string_validate(njs_vm_t *vm, njs_string_prop_t *string, njs_value_t *value); size_t njs_string_prop(njs_string_prop_t *string, const njs_value_t *value); -njs_ret_t njs_string_constructor(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_string_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); njs_int_t njs_string_cmp(const njs_value_t *val1, const njs_value_t *val2); void njs_string_slice_string_prop(njs_string_prop_t *dst, const njs_string_prop_t *string, const njs_slice_prop_t *slice); -njs_ret_t njs_string_slice(njs_vm_t *vm, njs_value_t *dst, +njs_int_t njs_string_slice(njs_vm_t *vm, njs_value_t *dst, const njs_string_prop_t *string, const njs_slice_prop_t *slice); const u_char *njs_string_offset(const u_char *start, const u_char *end, size_t index); @@ -179,19 +179,19 @@ uint32_t njs_string_index(njs_string_prop_t *string, uint32_t offset); void njs_string_offset_map_init(const u_char *start, size_t size); double njs_string_to_index(const njs_value_t *value); const u_char *njs_string_to_c_string(njs_vm_t *vm, njs_value_t *value); -njs_ret_t njs_string_encode_uri(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_string_encode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_string_encode_uri_component(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_string_encode_uri_component(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_string_decode_uri(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_string_decode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_string_decode_uri_component(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_string_decode_uri_component(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); njs_index_t njs_value_index(njs_vm_t *vm, const njs_value_t *src, njs_uint_t runtime); -njs_ret_t njs_string_prototype_concat(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_string_prototype_concat(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); diff --git a/src/njs_timer.c b/src/njs_timer.c index 60b37d02..148ab9d2 100644 --- a/src/njs_timer.c +++ b/src/njs_timer.c @@ -9,7 +9,7 @@ #include -static njs_ret_t +static njs_int_t njs_set_timer(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused, njs_bool_t immediate) { @@ -79,7 +79,7 @@ memory_error: } -njs_ret_t +njs_int_t njs_set_timeout(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -87,7 +87,7 @@ njs_set_timeout(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_ret_t +njs_int_t njs_set_immediate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -95,12 +95,12 @@ njs_set_immediate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -njs_ret_t +njs_int_t njs_clear_timeout(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { u_char buf[16], *p; - njs_ret_t ret; + njs_int_t ret; njs_event_t *event; njs_lvlhsh_query_t lhq; diff --git a/src/njs_timer.h b/src/njs_timer.h index e8c7e9af..c250b87b 100644 --- a/src/njs_timer.h +++ b/src/njs_timer.h @@ -8,11 +8,11 @@ #define _NJS_TIMER_H_INCLUDED_ -njs_ret_t njs_set_timeout(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_set_timeout(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_set_immediate(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_set_immediate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); -njs_ret_t njs_clear_timeout(njs_vm_t *vm, njs_value_t *args, +njs_int_t njs_clear_timeout(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused); diff --git a/src/njs_value.c b/src/njs_value.c index 11f3ef53..6d300235 100644 --- a/src/njs_value.c +++ b/src/njs_value.c @@ -100,11 +100,11 @@ njs_value_release(njs_vm_t *vm, njs_value_t *value) * for numbers and "toString", "valueOf" for strings. */ -njs_ret_t +njs_int_t njs_value_to_primitive(njs_vm_t *vm, njs_value_t *dst, njs_value_t *value, njs_uint_t hint) { - njs_ret_t ret; + njs_int_t ret; njs_uint_t tries; njs_value_t retval; njs_object_prop_t *prop; diff --git a/src/njs_value.h b/src/njs_value.h index 36f02c66..0fb1ca45 100644 --- a/src/njs_value.h +++ b/src/njs_value.h @@ -97,9 +97,9 @@ typedef enum { * NJS_ERROR - some error, vm->retval contains appropriate exception; * NJS_DECLINED - handler was applied to inappropriate object. */ -typedef njs_ret_t (*njs_prop_handler_t) (njs_vm_t *vm, njs_value_t *value, +typedef njs_int_t (*njs_prop_handler_t) (njs_vm_t *vm, njs_value_t *value, njs_value_t *setval, njs_value_t *retval); -typedef njs_ret_t (*njs_function_native_t) (njs_vm_t *vm, njs_value_t *args, +typedef njs_int_t (*njs_function_native_t) (njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t retval); @@ -742,7 +742,7 @@ njs_set_object_value(njs_value_t *value, njs_object_value_t *object_value) void njs_value_retain(njs_value_t *value); void njs_value_release(njs_vm_t *vm, njs_value_t *value); -njs_ret_t njs_value_to_primitive(njs_vm_t *vm, njs_value_t *dst, +njs_int_t njs_value_to_primitive(njs_vm_t *vm, njs_value_t *dst, njs_value_t *value, njs_uint_t hint); njs_array_t *njs_value_enumerate(njs_vm_t *vm, const njs_value_t *value, njs_object_enum_t kind, njs_bool_t all); @@ -751,18 +751,18 @@ njs_array_t *njs_value_own_enumerate(njs_vm_t *vm, const njs_value_t *value, const char *njs_type_string(njs_value_type_t type); const char *njs_arg_type_string(uint8_t arg); -njs_ret_t njs_primitive_value_to_string(njs_vm_t *vm, njs_value_t *dst, +njs_int_t njs_primitive_value_to_string(njs_vm_t *vm, njs_value_t *dst, const njs_value_t *src); double njs_string_to_number(const njs_value_t *value, njs_bool_t parse_float); njs_bool_t njs_string_eq(const njs_value_t *v1, const njs_value_t *v2); -njs_inline njs_ret_t +njs_inline njs_int_t njs_value_to_numeric(njs_vm_t *vm, njs_value_t *dst, njs_value_t *value) { double num; - njs_ret_t ret; + njs_int_t ret; njs_value_t primitive; if (njs_slow_path(!njs_is_primitive(value))) { @@ -791,10 +791,10 @@ njs_value_to_numeric(njs_vm_t *vm, njs_value_t *dst, njs_value_t *value) } -njs_inline njs_ret_t +njs_inline njs_int_t njs_value_to_string(njs_vm_t *vm, njs_value_t *dst, njs_value_t *value) { - njs_ret_t ret; + njs_int_t ret; njs_value_t primitive; if (njs_slow_path(!njs_is_primitive(value))) { diff --git a/src/njs_variable.c b/src/njs_variable.c index a5ab01ee..d61c84c8 100644 --- a/src/njs_variable.c +++ b/src/njs_variable.c @@ -12,7 +12,7 @@ static njs_variable_t *njs_variable_scope_add(njs_vm_t *vm, njs_parser_scope_t *scope, njs_lvlhsh_query_t *lhq, njs_variable_type_t type); -static njs_ret_t njs_variable_reference_resolve(njs_vm_t *vm, +static njs_int_t njs_variable_reference_resolve(njs_vm_t *vm, njs_variable_reference_t *vr, njs_parser_scope_t *node_scope); static njs_variable_t *njs_variable_alloc(njs_vm_t *vm, njs_str_t *name, njs_variable_type_t type); @@ -184,7 +184,7 @@ njs_label_add(njs_vm_t *vm, njs_parser_scope_t *scope, njs_str_t *name, } -njs_ret_t +njs_int_t njs_label_remove(njs_vm_t *vm, njs_parser_scope_t *scope, njs_str_t *name, uint32_t hash) { @@ -237,12 +237,12 @@ const njs_lvlhsh_proto_t njs_references_hash_proto }; -njs_ret_t +njs_int_t njs_variable_reference(njs_vm_t *vm, njs_parser_scope_t *scope, njs_parser_node_t *node, njs_str_t *name, uint32_t hash, njs_reference_type_t type) { - njs_ret_t ret; + njs_int_t ret; njs_lvlhsh_query_t lhq; njs_variable_reference_t *vr; @@ -272,11 +272,11 @@ njs_variable_reference(njs_vm_t *vm, njs_parser_scope_t *scope, } -static njs_ret_t +static njs_int_t njs_variables_scope_resolve(njs_vm_t *vm, njs_parser_scope_t *scope, njs_bool_t closure) { - njs_ret_t ret; + njs_int_t ret; njs_queue_t *nested; njs_queue_link_t *lnk; njs_parser_node_t *node; @@ -326,10 +326,10 @@ njs_variables_scope_resolve(njs_vm_t *vm, njs_parser_scope_t *scope, } -njs_ret_t +njs_int_t njs_variables_scope_reference(njs_vm_t *vm, njs_parser_scope_t *scope) { - njs_ret_t ret; + njs_int_t ret; /* * Calculating proper scope types for variables. @@ -474,7 +474,7 @@ njs_label_find(njs_vm_t *vm, njs_parser_scope_t *scope, njs_str_t *name, } -static njs_ret_t +static njs_int_t njs_variable_reference_resolve(njs_vm_t *vm, njs_variable_reference_t *vr, njs_parser_scope_t *node_scope) { @@ -591,7 +591,7 @@ njs_scope_next_index(njs_vm_t *vm, njs_parser_scope_t *scope, static njs_variable_t * njs_variable_alloc(njs_vm_t *vm, njs_str_t *name, njs_variable_type_t type) { - njs_ret_t ret; + njs_int_t ret; njs_variable_t *var; var = njs_mp_zalloc(vm->mem_pool, sizeof(njs_variable_t)); @@ -616,7 +616,7 @@ njs_variable_alloc(njs_vm_t *vm, njs_str_t *name, njs_variable_type_t type) } -njs_ret_t +njs_int_t njs_name_copy(njs_vm_t *vm, njs_str_t *dst, njs_str_t *src) { dst->length = src->length; diff --git a/src/njs_variable.h b/src/njs_variable.h index 6af6f72d..12fbe973 100644 --- a/src/njs_variable.h +++ b/src/njs_variable.h @@ -60,16 +60,16 @@ njs_variable_t * njs_label_add(njs_vm_t *vm, njs_parser_scope_t *scope, njs_str_t *name, uint32_t hash); njs_variable_t *njs_label_find(njs_vm_t *vm, njs_parser_scope_t *scope, njs_str_t *name, uint32_t hash); -njs_ret_t njs_label_remove(njs_vm_t *vm, njs_parser_scope_t *scope, +njs_int_t njs_label_remove(njs_vm_t *vm, njs_parser_scope_t *scope, njs_str_t *name, uint32_t hash); -njs_ret_t njs_variable_reference(njs_vm_t *vm, njs_parser_scope_t *scope, +njs_int_t njs_variable_reference(njs_vm_t *vm, njs_parser_scope_t *scope, njs_parser_node_t *node, njs_str_t *name, uint32_t hash, njs_reference_type_t type); -njs_ret_t njs_variables_scope_reference(njs_vm_t *vm, +njs_int_t njs_variables_scope_reference(njs_vm_t *vm, njs_parser_scope_t *scope); njs_index_t njs_scope_next_index(njs_vm_t *vm, njs_parser_scope_t *scope, njs_uint_t scope_index, const njs_value_t *default_value); -njs_ret_t njs_name_copy(njs_vm_t *vm, njs_str_t *dst, njs_str_t *src); +njs_int_t njs_name_copy(njs_vm_t *vm, njs_str_t *dst, njs_str_t *src); extern const njs_lvlhsh_proto_t njs_variables_hash_proto; diff --git a/src/njs_vm.c b/src/njs_vm.c index ea3edab7..e34eed49 100644 --- a/src/njs_vm.c +++ b/src/njs_vm.c @@ -471,7 +471,7 @@ njs_int_t njs_vm_invoke(njs_vm_t *vm, njs_function_t *function, const njs_value_t *args, njs_uint_t nargs, njs_index_t retval) { - njs_ret_t ret; + njs_int_t ret; njs_value_t *this; this = (njs_value_t *) &njs_value_undefined; @@ -631,7 +631,7 @@ njs_vm_run(njs_vm_t *vm) njs_int_t njs_vm_start(njs_vm_t *vm) { - njs_ret_t ret; + njs_int_t ret; ret = njs_module_load(vm); if (njs_slow_path(ret != NJS_OK)) { @@ -718,7 +718,7 @@ njs_vm_retval_set(njs_vm_t *vm, const njs_value_t *value) } -njs_ret_t +njs_int_t njs_vm_value_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size) { @@ -769,7 +769,7 @@ njs_vm_backtrace(njs_vm_t *vm) } -static njs_ret_t +static njs_int_t njs_vm_backtrace_dump(njs_vm_t *vm, njs_str_t *dst, const njs_value_t *src) { u_char *p, *start, *end; @@ -867,10 +867,10 @@ njs_vm_backtrace_dump(njs_vm_t *vm, njs_str_t *dst, const njs_value_t *src) } -njs_ret_t +njs_int_t njs_vm_value_string(njs_vm_t *vm, njs_str_t *dst, const njs_value_t *src) { - njs_ret_t ret; + njs_int_t ret; njs_uint_t exception; if (njs_slow_path(src->type == NJS_NUMBER @@ -915,7 +915,7 @@ again: } -njs_ret_t +njs_int_t njs_vm_retval_string(njs_vm_t *vm, njs_str_t *dst) { if (vm->top_frame == NULL) { @@ -928,7 +928,7 @@ njs_vm_retval_string(njs_vm_t *vm, njs_str_t *dst) } -njs_ret_t +njs_int_t njs_vm_retval_dump(njs_vm_t *vm, njs_str_t *dst, njs_uint_t indent) { if (vm->top_frame == NULL) { @@ -941,12 +941,12 @@ njs_vm_retval_dump(njs_vm_t *vm, njs_str_t *dst, njs_uint_t indent) } -njs_ret_t +njs_int_t njs_vm_object_alloc(njs_vm_t *vm, njs_value_t *retval, ...) { va_list args; njs_int_t ret; - njs_ret_t rc; + njs_int_t rc; njs_value_t *name, *value; njs_object_t *object; njs_object_prop_t *prop; @@ -1037,12 +1037,12 @@ njs_vm_object_prop(njs_vm_t *vm, const njs_value_t *value, const njs_str_t *key) } -njs_ret_t +njs_int_t njs_vm_value_to_string(njs_vm_t *vm, njs_str_t *dst, const njs_value_t *src) { u_char *start; size_t size; - njs_ret_t ret; + njs_int_t ret; njs_value_t value; if (njs_slow_path(src == NULL)) { @@ -1127,7 +1127,7 @@ njs_vm_value_string_copy(njs_vm_t *vm, njs_str_t *retval, } -njs_ret_t +njs_int_t njs_vm_add_backtrace_entry(njs_vm_t *vm, njs_frame_t *frame) { njs_int_t ret; diff --git a/src/njs_vm.h b/src/njs_vm.h index 80fdc7b0..59128ce7 100644 --- a/src/njs_vm.h +++ b/src/njs_vm.h @@ -340,7 +340,7 @@ struct njs_vm_shared_s { void njs_vm_scopes_restore(njs_vm_t *vm, njs_frame_t *frame, njs_native_frame_t *previous); -njs_ret_t njs_vm_add_backtrace_entry(njs_vm_t *vm, njs_frame_t *frame); +njs_int_t njs_vm_add_backtrace_entry(njs_vm_t *vm, njs_frame_t *frame); njs_int_t njs_builtin_objects_create(njs_vm_t *vm); njs_int_t njs_builtin_objects_clone(njs_vm_t *vm); diff --git a/src/njs_vmcode.c b/src/njs_vmcode.c index 2985822a..9d05fbfc 100644 --- a/src/njs_vmcode.c +++ b/src/njs_vmcode.c @@ -14,45 +14,45 @@ struct njs_property_next_s { njs_array_t *array; }; -static njs_ret_t njs_vmcode_object(njs_vm_t *vm); -static njs_ret_t njs_vmcode_array(njs_vm_t *vm, u_char *pc); -static njs_ret_t njs_vmcode_function(njs_vm_t *vm, u_char *pc); -static njs_ret_t njs_vmcode_arguments(njs_vm_t *vm, u_char *pc); -static njs_ret_t njs_vmcode_regexp(njs_vm_t *vm, u_char *pc); -static njs_ret_t njs_vmcode_template_literal(njs_vm_t *vm, njs_value_t *inlvd1, - njs_value_t *inlvd2); -static njs_ret_t njs_vmcode_object_copy(njs_vm_t *vm, njs_value_t *value, +static njs_jump_off_t njs_vmcode_object(njs_vm_t *vm); +static njs_jump_off_t njs_vmcode_array(njs_vm_t *vm, u_char *pc); +static njs_jump_off_t njs_vmcode_function(njs_vm_t *vm, u_char *pc); +static njs_jump_off_t njs_vmcode_arguments(njs_vm_t *vm, u_char *pc); +static njs_jump_off_t njs_vmcode_regexp(njs_vm_t *vm, u_char *pc); +static njs_jump_off_t njs_vmcode_template_literal(njs_vm_t *vm, + njs_value_t *inlvd1, njs_value_t *inlvd2); +static njs_jump_off_t njs_vmcode_object_copy(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld); -static njs_ret_t njs_vmcode_property_init(njs_vm_t *vm, njs_value_t *object, - njs_value_t *property, njs_value_t *retval); -static njs_ret_t njs_vmcode_property_in(njs_vm_t *vm, njs_value_t *property, - njs_value_t *object); -static njs_ret_t njs_vmcode_property_delete(njs_vm_t *vm, njs_value_t *object, - njs_value_t *property); -static njs_ret_t njs_vmcode_property_foreach(njs_vm_t *vm, njs_value_t *object, - njs_value_t *invld, u_char *pc); -static njs_ret_t njs_vmcode_property_next(njs_vm_t *vm, njs_value_t *object, - njs_value_t *value, u_char *pc); -static njs_ret_t njs_vmcode_instance_of(njs_vm_t *vm, njs_value_t *object, +static njs_jump_off_t njs_vmcode_property_init(njs_vm_t *vm, + njs_value_t *object, njs_value_t *property, njs_value_t *retval); +static njs_jump_off_t njs_vmcode_property_in(njs_vm_t *vm, + njs_value_t *property, njs_value_t *object); +static njs_jump_off_t njs_vmcode_property_delete(njs_vm_t *vm, + njs_value_t *object, njs_value_t *property); +static njs_jump_off_t njs_vmcode_property_foreach(njs_vm_t *vm, + njs_value_t *object, njs_value_t *invld, u_char *pc); +static njs_jump_off_t njs_vmcode_property_next(njs_vm_t *vm, + njs_value_t *object, njs_value_t *value, u_char *pc); +static njs_jump_off_t njs_vmcode_instance_of(njs_vm_t *vm, njs_value_t *object, njs_value_t *constructor); -static njs_ret_t njs_vmcode_typeof(njs_vm_t *vm, njs_value_t *value, +static njs_jump_off_t njs_vmcode_typeof(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld); -static njs_ret_t njs_vmcode_method_frame(njs_vm_t *vm, njs_value_t *object, +static njs_jump_off_t njs_vmcode_method_frame(njs_vm_t *vm, njs_value_t *object, njs_value_t *method, u_char *pc); -static njs_ret_t njs_vmcode_return(njs_vm_t *vm, njs_value_t *invld, +static njs_jump_off_t njs_vmcode_return(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval); -static njs_ret_t njs_vmcode_try_start(njs_vm_t *vm, njs_value_t *value, +static njs_jump_off_t njs_vmcode_try_start(njs_vm_t *vm, njs_value_t *value, njs_value_t *offset, u_char *pc); -static njs_ret_t njs_vmcode_try_break(njs_vm_t *vm, njs_value_t *value, +static njs_jump_off_t njs_vmcode_try_break(njs_vm_t *vm, njs_value_t *value, njs_value_t *offset); -static njs_ret_t njs_vmcode_try_continue(njs_vm_t *vm, njs_value_t *value, +static njs_jump_off_t njs_vmcode_try_continue(njs_vm_t *vm, njs_value_t *value, njs_value_t *offset); -static njs_ret_t njs_vmcode_try_end(njs_vm_t *vm, njs_value_t *invld, +static njs_jump_off_t njs_vmcode_try_end(njs_vm_t *vm, njs_value_t *invld, njs_value_t *offset); -static njs_ret_t njs_vmcode_finally(njs_vm_t *vm, njs_value_t *invld, +static njs_jump_off_t njs_vmcode_finally(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval, u_char *pc); static void njs_vmcode_reference_error(njs_vm_t *vm, u_char *pc); @@ -62,14 +62,15 @@ static void njs_vmcode_reference_error(njs_vm_t *vm, u_char *pc); * and should fit in CPU L1 instruction cache. */ -static njs_ret_t njs_string_concat(njs_vm_t *vm, njs_value_t *val1, +static njs_jump_off_t njs_string_concat(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2); -static njs_ret_t njs_values_equal(njs_vm_t *vm, njs_value_t *val1, +static njs_jump_off_t njs_values_equal(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2); -static njs_ret_t njs_primitive_values_compare(njs_vm_t *vm, njs_value_t *val1, - njs_value_t *val2); -static njs_ret_t njs_function_frame_create(njs_vm_t *vm, njs_value_t *value, - const njs_value_t *this, uintptr_t nargs, njs_bool_t ctor); +static njs_jump_off_t njs_primitive_values_compare(njs_vm_t *vm, + njs_value_t *val1, njs_value_t *val2); +static njs_jump_off_t njs_function_frame_create(njs_vm_t *vm, + njs_value_t *value, const njs_value_t *this, uintptr_t nargs, + njs_bool_t ctor); static njs_object_t *njs_function_new_object(njs_vm_t *vm, njs_value_t *value); /* @@ -85,13 +86,13 @@ njs_vmcode_interpreter(njs_vm_t *vm, u_char *pc) double num, exponent; int32_t i32; uint32_t u32; - njs_ret_t ret; njs_uint_t hint; njs_bool_t valid, lambda_call; njs_value_t *retval, *value1, *value2, *src, *s1, *s2; njs_value_t numeric1, numeric2, primitive1, primitive2, dst; njs_frame_t *frame; + njs_jump_off_t ret; njs_vmcode_this_t *this; njs_native_frame_t *previous; njs_property_next_t *next; @@ -592,7 +593,7 @@ next: goto done; case NJS_VMCODE_JUMP: - ret = (njs_ret_t) value2; + ret = (njs_jump_off_t) value2; break; case NJS_VMCODE_PROPERTY_SET: @@ -613,8 +614,8 @@ next: ret ^= op - NJS_VMCODE_IF_TRUE_JUMP; - ret = ret ? (njs_ret_t) value2 - : (njs_ret_t) sizeof(njs_vmcode_cond_jump_t); + ret = ret ? (njs_jump_off_t) value2 + : (njs_jump_off_t) sizeof(njs_vmcode_cond_jump_t); break; @@ -784,11 +785,12 @@ next: case NJS_VMCODE_CATCH: *value1 = vm->retval; - if ((njs_ret_t) value2 == sizeof(njs_vmcode_catch_t)) { + if ((njs_jump_off_t) value2 == sizeof(njs_vmcode_catch_t)) { ret = njs_vmcode_try_end(vm, value1, value2); } else { - vm->top_frame->exception.catch = pc + (njs_ret_t) value2; + vm->top_frame->exception.catch = + pc + (njs_jump_off_t) value2; ret = sizeof(njs_vmcode_catch_t); } @@ -871,7 +873,7 @@ done: } -static njs_ret_t +static njs_jump_off_t njs_vmcode_object(njs_vm_t *vm) { njs_object_t *object; @@ -888,7 +890,7 @@ njs_vmcode_object(njs_vm_t *vm) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_array(njs_vm_t *vm, u_char *pc) { uint32_t length; @@ -927,7 +929,7 @@ njs_vmcode_array(njs_vm_t *vm, u_char *pc) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_function(njs_vm_t *vm, u_char *pc) { njs_function_t *function; @@ -948,12 +950,12 @@ njs_vmcode_function(njs_vm_t *vm, u_char *pc) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_arguments(njs_vm_t *vm, u_char *pc) { - njs_int_t ret; njs_frame_t *frame; njs_value_t *value; + njs_jump_off_t ret; njs_vmcode_arguments_t *code; frame = (njs_frame_t *) vm->active_frame; @@ -974,7 +976,7 @@ njs_vmcode_arguments(njs_vm_t *vm, u_char *pc) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_regexp(njs_vm_t *vm, u_char *pc) { njs_regexp_t *regexp; @@ -994,13 +996,13 @@ njs_vmcode_regexp(njs_vm_t *vm, u_char *pc) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_template_literal(njs_vm_t *vm, njs_value_t *invld1, njs_value_t *retval) { - njs_int_t ret; - njs_array_t *array; - njs_value_t *value; + njs_array_t *array; + njs_value_t *value; + njs_jump_off_t ret; static const njs_function_t concat = { .native = 1, @@ -1030,7 +1032,7 @@ njs_vmcode_template_literal(njs_vm_t *vm, njs_value_t *invld1, } -static njs_ret_t +static njs_jump_off_t njs_vmcode_object_copy(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld) { njs_object_t *object; @@ -1066,15 +1068,15 @@ njs_vmcode_object_copy(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_property_init(njs_vm_t *vm, njs_value_t *object, njs_value_t *property, njs_value_t *init) { uint32_t index, size; - njs_ret_t ret; njs_array_t *array; njs_value_t *value, name; njs_object_t *obj; + njs_jump_off_t ret; njs_object_prop_t *prop; njs_lvlhsh_query_t lhq; @@ -1169,10 +1171,10 @@ njs_vmcode_property_init(njs_vm_t *vm, njs_value_t *object, } -static njs_ret_t +static njs_jump_off_t njs_vmcode_property_in(njs_vm_t *vm, njs_value_t *object, njs_value_t *property) { - njs_ret_t ret; + njs_jump_off_t ret; njs_object_prop_t *prop; const njs_value_t *retval; njs_property_query_t pq; @@ -1216,11 +1218,11 @@ njs_vmcode_property_in(njs_vm_t *vm, njs_value_t *object, njs_value_t *property) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_property_delete(njs_vm_t *vm, njs_value_t *object, njs_value_t *property) { - njs_ret_t ret; + njs_jump_off_t ret; njs_object_prop_t *prop, *whipeout; njs_property_query_t pq; @@ -1312,14 +1314,14 @@ done: } -static njs_ret_t +static njs_jump_off_t njs_vmcode_property_foreach(njs_vm_t *vm, njs_value_t *object, njs_value_t *invld, u_char *pc) { void *obj; - njs_ret_t ret; - njs_property_next_t *next; + njs_jump_off_t ret; const njs_extern_t *ext_proto; + njs_property_next_t *next; njs_vmcode_prop_foreach_t *code; if (njs_is_external(object)) { @@ -1360,13 +1362,13 @@ done: } -static njs_ret_t +static njs_jump_off_t njs_vmcode_property_next(njs_vm_t *vm, njs_value_t *object, njs_value_t *value, u_char *pc) { void *obj; - njs_ret_t ret; njs_value_t *retval; + njs_jump_off_t ret; njs_property_next_t *next; const njs_extern_t *ext_proto; njs_vmcode_prop_next_t *code; @@ -1410,13 +1412,13 @@ njs_vmcode_property_next(njs_vm_t *vm, njs_value_t *object, njs_value_t *value, } -static njs_ret_t +static njs_jump_off_t njs_vmcode_instance_of(njs_vm_t *vm, njs_value_t *object, njs_value_t *constructor) { - njs_int_t ret; njs_value_t value; njs_object_t *prototype, *proto; + njs_jump_off_t ret; const njs_value_t *retval; static njs_value_t prototype_string = njs_string("prototype"); @@ -1464,7 +1466,7 @@ njs_vmcode_instance_of(njs_vm_t *vm, njs_value_t *object, } -static njs_ret_t +static njs_jump_off_t njs_vmcode_typeof(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld) { /* ECMAScript 5.1: null, array and regexp are objects. */ @@ -1512,7 +1514,7 @@ njs_vmcode_typeof(njs_vm_t *vm, njs_value_t *value, njs_value_t *invld) } -static njs_ret_t +static njs_jump_off_t njs_string_concat(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2) { u_char *start; @@ -1550,10 +1552,10 @@ njs_string_concat(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2) } -static njs_ret_t +static njs_jump_off_t njs_values_equal(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2) { - njs_ret_t ret; + njs_int_t ret; njs_bool_t nv1, nv2; njs_value_t primitive; njs_value_t *hv, *lv; @@ -1625,7 +1627,7 @@ again: * -1 if the values are not comparable. */ -static njs_ret_t +static njs_jump_off_t njs_primitive_values_compare(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2) { double num1, num2; @@ -1658,7 +1660,7 @@ njs_primitive_values_compare(njs_vm_t *vm, njs_value_t *val1, njs_value_t *val2) } -static njs_ret_t +static njs_jump_off_t njs_function_frame_create(njs_vm_t *vm, njs_value_t *value, const njs_value_t *this, uintptr_t nargs, njs_bool_t ctor) { @@ -1700,9 +1702,9 @@ njs_function_frame_create(njs_vm_t *vm, njs_value_t *value, static njs_object_t * njs_function_new_object(njs_vm_t *vm, njs_value_t *value) { - njs_int_t ret; njs_value_t *proto; njs_object_t *object; + njs_jump_off_t ret; njs_function_t *function; njs_object_prop_t *prop; njs_lvlhsh_query_t lhq; @@ -1736,13 +1738,13 @@ njs_function_new_object(njs_vm_t *vm, njs_value_t *value) } -static njs_ret_t +static njs_jump_off_t njs_vmcode_method_frame(njs_vm_t *vm, njs_value_t *object, njs_value_t *name, u_char *pc) { - njs_ret_t ret; njs_str_t string; njs_value_t *value; + njs_jump_off_t ret; njs_object_prop_t *prop; njs_property_query_t pq; njs_vmcode_method_frame_t *method; @@ -1819,7 +1821,7 @@ njs_vmcode_method_frame(njs_vm_t *vm, njs_value_t *object, njs_value_t *name, } -static njs_ret_t +static njs_jump_off_t njs_vmcode_return(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval) { njs_value_t *value; @@ -1864,7 +1866,7 @@ njs_vmcode_return(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval) * "finally" blocks and to initialize a value to track uncaught exception. */ -static njs_ret_t +static njs_jump_off_t njs_vmcode_try_start(njs_vm_t *vm, njs_value_t *exception_value, njs_value_t *offset, u_char *pc) { @@ -1883,7 +1885,7 @@ njs_vmcode_try_start(njs_vm_t *vm, njs_value_t *exception_value, vm->top_frame->exception.next = e; } - vm->top_frame->exception.catch = pc + (njs_ret_t) offset; + vm->top_frame->exception.catch = pc + (njs_jump_off_t) offset; njs_set_invalid(exception_value); @@ -1902,7 +1904,7 @@ njs_vmcode_try_start(njs_vm_t *vm, njs_value_t *exception_value, * the nearest try_end block. The exit_value is checked by njs_vmcode_finally(). */ -static njs_ret_t +static njs_jump_off_t njs_vmcode_try_break(njs_vm_t *vm, njs_value_t *exit_value, njs_value_t *offset) { @@ -1911,7 +1913,7 @@ njs_vmcode_try_break(njs_vm_t *vm, njs_value_t *exit_value, njs_number(exit_value) = 1; } - return (njs_ret_t) offset; + return (njs_jump_off_t) offset; } @@ -1920,13 +1922,13 @@ njs_vmcode_try_break(njs_vm_t *vm, njs_value_t *exit_value, * the nearest try_end block. The exit_value is checked by njs_vmcode_finally(). */ -static njs_ret_t +static njs_jump_off_t njs_vmcode_try_continue(njs_vm_t *vm, njs_value_t *exit_value, njs_value_t *offset) { njs_number(exit_value) = -1; - return (njs_ret_t) offset; + return (njs_jump_off_t) offset; } @@ -1935,7 +1937,7 @@ njs_vmcode_try_continue(njs_vm_t *vm, njs_value_t *exit_value, * It is also set on the end of a "catch" block followed by a "finally" block. */ -static njs_ret_t +static njs_jump_off_t njs_vmcode_try_end(njs_vm_t *vm, njs_value_t *invld, njs_value_t *offset) { njs_exception_t *e; @@ -1950,7 +1952,7 @@ njs_vmcode_try_end(njs_vm_t *vm, njs_value_t *invld, njs_value_t *offset) njs_mp_free(vm->mem_pool, e); } - return (njs_ret_t) offset; + return (njs_jump_off_t) offset; } @@ -1962,7 +1964,7 @@ njs_vmcode_try_end(njs_vm_t *vm, njs_value_t *invld, njs_value_t *offset) * 3) to finalize "return" instruction from "try" block. */ -static njs_ret_t +static njs_jump_off_t njs_vmcode_finally(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval, u_char *pc) { @@ -1992,7 +1994,7 @@ njs_vmcode_finally(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval, return njs_vmcode_return(vm, NULL, exit_value); } else if (njs_number(exit_value) != 0) { - return (njs_ret_t) (njs_number(exit_value) > 0) + return (njs_jump_off_t) (njs_number(exit_value) > 0) ? finally->break_offset : finally->continue_offset; } diff --git a/src/njs_vmcode.h b/src/njs_vmcode.h index ff08a32a..83a9c1ef 100644 --- a/src/njs_vmcode.h +++ b/src/njs_vmcode.h @@ -22,6 +22,7 @@ #define NJS_PREEMPT (-11) +typedef intptr_t njs_jump_off_t; typedef uint8_t njs_vmcode_operation_t; @@ -215,20 +216,20 @@ typedef struct { typedef struct { njs_vmcode_t code; - njs_ret_t offset; + njs_jump_off_t offset; } njs_vmcode_jump_t; typedef struct { njs_vmcode_t code; - njs_ret_t offset; + njs_jump_off_t offset; njs_index_t cond; } njs_vmcode_cond_jump_t; typedef struct { njs_vmcode_t code; - njs_ret_t offset; + njs_jump_off_t offset; njs_index_t value1; njs_index_t value2; } njs_vmcode_equal_jump_t; @@ -238,7 +239,7 @@ typedef struct { njs_vmcode_t code; njs_index_t retval; njs_index_t value; - njs_ret_t offset; + njs_jump_off_t offset; } njs_vmcode_test_jump_t; @@ -262,7 +263,7 @@ typedef struct { njs_vmcode_t code; njs_index_t next; njs_index_t object; - njs_ret_t offset; + njs_jump_off_t offset; } njs_vmcode_prop_foreach_t; @@ -271,7 +272,7 @@ typedef struct { njs_index_t retval; njs_index_t object; njs_index_t next; - njs_ret_t offset; + njs_jump_off_t offset; } njs_vmcode_prop_next_t; @@ -320,7 +321,7 @@ typedef struct { typedef struct { njs_vmcode_t code; - njs_ret_t offset; + njs_jump_off_t offset; njs_index_t exception_value; njs_index_t exit_value; } njs_vmcode_try_start_t; @@ -328,14 +329,14 @@ typedef struct { typedef struct { njs_vmcode_t code; - njs_ret_t offset; + njs_jump_off_t offset; njs_index_t exit_value; } njs_vmcode_try_trampoline_t; typedef struct { njs_vmcode_t code; - njs_ret_t offset; + njs_jump_off_t offset; njs_index_t exception; } njs_vmcode_catch_t; @@ -348,7 +349,7 @@ typedef struct { typedef struct { njs_vmcode_t code; - njs_ret_t offset; + njs_jump_off_t offset; } njs_vmcode_try_end_t; @@ -356,7 +357,7 @@ typedef struct { njs_vmcode_t code; njs_index_t save; njs_index_t retval; - njs_ret_t offset; + njs_jump_off_t offset; } njs_vmcode_try_return_t; @@ -364,8 +365,8 @@ typedef struct { njs_vmcode_t code; njs_index_t retval; njs_index_t exit_value; - njs_ret_t continue_offset; - njs_ret_t break_offset; + njs_jump_off_t continue_offset; + njs_jump_off_t break_offset; } njs_vmcode_finally_t; diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c index 6914b713..f3691cca 100644 --- a/src/test/njs_unit_test.c +++ b/src/test/njs_unit_test.c @@ -13530,7 +13530,7 @@ lvlhsh_unit_test_add(njs_unit_test_req_t *r, njs_unit_test_prop_t *prop) } -static njs_ret_t +static njs_int_t njs_unit_test_r_get_uri_external(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -13544,7 +13544,7 @@ njs_unit_test_r_get_uri_external(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t njs_unit_test_r_set_uri_external(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value) { @@ -13560,7 +13560,7 @@ njs_unit_test_r_set_uri_external(njs_vm_t *vm, void *obj, uintptr_t data, } -static njs_ret_t +static njs_int_t njs_unit_test_r_get_a_external(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -13575,7 +13575,7 @@ njs_unit_test_r_get_a_external(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t njs_unit_test_r_get_b_external(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -13585,7 +13585,7 @@ njs_unit_test_r_get_b_external(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t njs_unit_test_host_external(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -13593,7 +13593,7 @@ njs_unit_test_host_external(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t njs_unit_test_r_get_vars(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -13625,7 +13625,7 @@ njs_unit_test_r_get_vars(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t njs_unit_test_r_set_vars(njs_vm_t *vm, void *obj, uintptr_t data, njs_str_t *value) { @@ -13662,7 +13662,7 @@ njs_unit_test_r_set_vars(njs_vm_t *vm, void *obj, uintptr_t data, } -static njs_ret_t +static njs_int_t njs_unit_test_r_del_vars(njs_vm_t *vm, void *obj, uintptr_t data, njs_bool_t delete) { @@ -13696,7 +13696,7 @@ njs_unit_test_r_del_vars(njs_vm_t *vm, void *obj, uintptr_t data, } -static njs_ret_t +static njs_int_t njs_unit_test_header_external(njs_vm_t *vm, njs_value_t *value, void *obj, uintptr_t data) { @@ -13721,7 +13721,7 @@ njs_unit_test_header_external(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t njs_unit_test_header_foreach_external(njs_vm_t *vm, void *obj, void *next) { u_char *s; @@ -13734,7 +13734,7 @@ njs_unit_test_header_foreach_external(njs_vm_t *vm, void *obj, void *next) } -static njs_ret_t +static njs_int_t njs_unit_test_header_next_external(njs_vm_t *vm, njs_value_t *value, void *obj, void *next) { @@ -13751,7 +13751,7 @@ njs_unit_test_header_next_external(njs_vm_t *vm, njs_value_t *value, void *obj, } -static njs_ret_t +static njs_int_t njs_unit_test_method_external(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -13776,7 +13776,7 @@ njs_unit_test_method_external(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } -static njs_ret_t +static njs_int_t njs_unit_test_create_external(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, njs_index_t unused) { @@ -14255,7 +14255,7 @@ njs_regexp_optional_test(njs_opts_t *opts, njs_stat_t *stat) { int erroff; pcre *re1, *re2; - njs_ret_t ret; + njs_int_t ret; const char *errstr; /* @@ -14430,7 +14430,7 @@ done: static njs_int_t njs_vm_object_alloc_test(njs_vm_t *vm, njs_opts_t *opts, njs_stat_t *stat) { - njs_ret_t ret; + njs_int_t ret; njs_value_t args[2], obj; static const njs_value_t num_key = njs_string("num"); -- 2.47.3