Skip to content

Refactored working with built-in strings, symbols and small integers. #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VadimZhestikov merged 3 commits into from
Apr 30, 2025
Merged

Refactored working with built-in strings, symbols and small integers. #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee35200
Refactored working with built-in strings, symbols and small integers.
VadimZhestikov Aug 29, 2024
cb4e515
Introduced NJS_VMCODE_PROPERTY_ATOM_GET instruction.
xeioex Mar 26, 2025
a5cf037
Introduced NJS_VMCODE_PROPERTY_ATOM_SET instruction.
xeioex Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auto/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ NJS_LIB_SRCS=" \
src/njs_utils.c \
src/njs_chb.c \
src/njs_value.c \
src/njs_atom.c \
src/njs_vm.c \
src/njs_vmcode.c \
src/njs_lexer.c \
src/njs_lexer_keyword.c \
src/njs_parser.c \
src/njs_variable.c \
src/njs_scope.c \
Expand Down
8 changes: 4 additions & 4 deletions external/njs_crypto_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ njs_hash_prototype_update(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return NJS_ERROR;
}

njs_value_string_get(njs_value_arg(&result), &data);
njs_value_string_get(vm, njs_value_arg(&result), &data);

} else if (njs_value_is_buffer(value)) {
ret = njs_value_buffer_get(vm, value, &data);
Expand Down Expand Up @@ -526,7 +526,7 @@ njs_crypto_create_hmac(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return NJS_ERROR;
}

njs_value_string_get(njs_value_arg(&result), &key);
njs_value_string_get(vm, njs_value_arg(&result), &key);

} else if (njs_value_is_buffer(value)) {
ret = njs_value_buffer_get(vm, value, &key);
Expand Down Expand Up @@ -589,7 +589,7 @@ njs_crypto_algorithm(njs_vm_t *vm, njs_value_t *value)
return NULL;
}

njs_value_string_get(value, &name);
njs_value_string_get(vm, value, &name);

for (e = &njs_hash_algorithms[0]; e->name.length != 0; e++) {
if (njs_strstr_eq(&name, &e->name)) {
Expand Down Expand Up @@ -618,7 +618,7 @@ njs_crypto_encoding(njs_vm_t *vm, njs_value_t *value)
return &njs_encodings[0];
}

njs_value_string_get(value, &name);
njs_value_string_get(vm, value, &name);

for (e = &njs_encodings[1]; e->name.length != 0; e++) {
if (njs_strstr_eq(&name, &e->name)) {
Expand Down
28 changes: 15 additions & 13 deletions external/njs_fs_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ static njs_int_t njs_fs_write_file(njs_vm_t *vm, njs_value_t *args,
njs_uint_t nargs, njs_index_t calltype, njs_value_t *retval);

static njs_int_t njs_fs_constant(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
uint32_t unused, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval);

static njs_int_t njs_fs_dirent_constructor(njs_vm_t *vm, njs_value_t *args,
njs_uint_t nargs, njs_index_t unused, njs_value_t *retval);
Expand All @@ -190,7 +191,8 @@ static njs_int_t njs_fs_dirent_test(njs_vm_t *vm, njs_value_t *args,
static njs_int_t njs_fs_stats_test(njs_vm_t *vm, njs_value_t *args,
njs_uint_t nargs, njs_index_t testtype, njs_value_t *retval);
static njs_int_t njs_fs_stats_prop(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
uint32_t unused, njs_value_t *value, njs_value_t *setval,
njs_value_t *retval);
static njs_int_t njs_fs_stats_create(njs_vm_t *vm, struct stat *st,
njs_value_t *retval);

Expand Down Expand Up @@ -1966,7 +1968,7 @@ njs_fs_readdir(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,


if (njs_value_is_string(njs_value_arg(&encode))) {
njs_value_string_get(njs_value_arg(&encode), &s);
njs_value_string_get(vm, njs_value_arg(&encode), &s);

} else {
s.length = 0;
Expand Down Expand Up @@ -2111,7 +2113,7 @@ njs_fs_readlink(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
encoding = NULL;

if (njs_value_is_string(njs_value_arg(&encode))) {
njs_value_string_get(njs_value_arg(&encode), &s);
njs_value_string_get(vm, njs_value_arg(&encode), &s);

} else {
s.length = 0;
Expand Down Expand Up @@ -2203,7 +2205,7 @@ njs_fs_realpath(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
encoding = NULL;

if (njs_value_is_string(njs_value_arg(&encode))) {
njs_value_string_get(njs_value_arg(&encode), &s);
njs_value_string_get(vm, njs_value_arg(&encode), &s);

} else {
s.length = 0;
Expand Down Expand Up @@ -2610,7 +2612,7 @@ njs_fs_write(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return NJS_ERROR;
}

njs_value_string_get(njs_value_arg(&result), &data);
njs_value_string_get(vm, njs_value_arg(&result), &data);

goto process;
}
Expand Down Expand Up @@ -2790,7 +2792,7 @@ njs_fs_write_file(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return NJS_ERROR;
}

njs_value_string_get(njs_value_arg(&result), &content);
njs_value_string_get(vm, njs_value_arg(&result), &content);
}

flags = njs_fs_flags(vm, njs_value_arg(&flag), O_CREAT | O_WRONLY);
Expand Down Expand Up @@ -3213,7 +3215,7 @@ njs_fs_path(njs_vm_t *vm, char storage[NJS_MAX_PATH + 1], njs_value_t *src,
njs_int_t ret;

if (njs_value_is_string(src)) {
njs_value_string_get(src, &str);
njs_value_string_get(vm, src, &str);

} else if (njs_value_is_buffer(src)) {
ret = njs_value_buffer_get(vm, src, &str);
Expand Down Expand Up @@ -3261,7 +3263,7 @@ njs_fs_flags(njs_vm_t *vm, njs_value_t *value, int default_flags)
return -1;
}

njs_value_string_get(value, &flags);
njs_value_string_get(vm, value, &flags);

for (fl = &njs_flags_table[0]; fl->name.length != 0; fl++) {
if (njs_strstr_eq(&flags, &fl->name)) {
Expand Down Expand Up @@ -3651,8 +3653,8 @@ njs_fs_stats_test(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,


static njs_int_t
njs_fs_stats_prop(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval)
njs_fs_stats_prop(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t unused,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
{
double v;
njs_int_t ret;
Expand Down Expand Up @@ -3870,8 +3872,8 @@ njs_fs_bytes_written_create(njs_vm_t *vm, int bytes, njs_value_t *buffer,


njs_int_t
njs_fs_constant(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval)
njs_fs_constant(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t unused,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
{
njs_value_number_set(retval, njs_vm_prop_magic32(prop));

Expand Down
44 changes: 22 additions & 22 deletions external/njs_query_string_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ njs_query_string_append(njs_vm_t *vm, njs_value_t *object, const u_char *key,
}
}

ret = njs_value_property(vm, object, njs_value_arg(&name),
njs_value_arg(&retval));
ret = njs_value_property_val(vm, object, njs_value_arg(&name),
njs_value_arg(&retval));

if (ret == NJS_OK) {
if (njs_value_is_array(njs_value_arg(&retval))) {
Expand Down Expand Up @@ -331,8 +331,8 @@ njs_query_string_append(njs_vm_t *vm, njs_value_t *object, const u_char *key,
njs_value_assign(&value, &array);
}

return njs_value_property_set(vm, object, njs_value_arg(&name),
njs_value_arg(&value));
return njs_value_property_val_set(vm, object, njs_value_arg(&name),
njs_value_arg(&value));
}


Expand Down Expand Up @@ -383,7 +383,7 @@ njs_query_string_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
string = njs_arg(args, nargs, 1);

if (njs_value_is_string(string)) {
njs_value_string_get(string, &str);
njs_value_string_get(vm, string, &str);

} else {
str = njs_str_value("");
Expand All @@ -399,8 +399,8 @@ njs_query_string_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return ret;
}

if (njs_string_length(njs_value_arg(&val_sep)) != 0) {
njs_value_string_get(njs_value_arg(&val_sep), &sep);
if (njs_value_string_length(vm, njs_value_arg(&val_sep)) != 0) {
njs_value_string_get(vm, njs_value_arg(&val_sep), &sep);
}
}

Expand All @@ -411,8 +411,8 @@ njs_query_string_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return ret;
}

if (njs_string_length(njs_value_arg(&val_eq)) != 0) {
njs_value_string_get(njs_value_arg(&val_eq), &eq);
if (njs_value_string_length(vm, njs_value_arg(&val_eq)) != 0) {
njs_value_string_get(vm, njs_value_arg(&val_eq), &eq);
}
}

Expand Down Expand Up @@ -614,7 +614,7 @@ njs_query_string_encoder_call(njs_vm_t *vm, njs_chb_t *chain,
}

if (njs_fast_path(njs_query_string_is_native_encoder(encoder))) {
njs_value_string_get(string, &str);
njs_value_string_get(vm, string, &str);
return njs_query_string_encode(chain, &str);
}

Expand All @@ -631,7 +631,7 @@ njs_query_string_encoder_call(njs_vm_t *vm, njs_chb_t *chain,
}
}

njs_value_string_get(njs_value_arg(&retval), &str);
njs_value_string_get(vm, njs_value_arg(&retval), &str);

njs_chb_append_str(chain, &str);

Expand Down Expand Up @@ -705,8 +705,8 @@ njs_query_string_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return ret;
}

if (njs_string_length(arg) > 0) {
njs_value_string_get(arg, &sep);
if (njs_value_string_length(vm, arg) > 0) {
njs_value_string_get(vm, arg, &sep);
}
}

Expand All @@ -717,8 +717,8 @@ njs_query_string_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return ret;
}

if (njs_string_length(arg) > 0) {
njs_value_string_get(arg, &eq);
if (njs_value_string_length(vm, arg) > 0) {
njs_value_string_get(vm, arg, &eq);
}
}

Expand Down Expand Up @@ -764,8 +764,8 @@ njs_query_string_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
}

for (n = 0; n < keys_length; n++, string++) {
ret = njs_value_property(vm, object, njs_value_arg(string),
njs_value_arg(&value));
ret = njs_value_property_val(vm, object, njs_value_arg(string),
njs_value_arg(&value));
if (njs_slow_path(ret == NJS_ERROR)) {
goto failed;
}
Expand All @@ -775,9 +775,9 @@ njs_query_string_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,

for (i = 0; i < len; i++) {
njs_value_number_set(njs_value_arg(&key), i);
ret = njs_value_property(vm, njs_value_arg(&value),
njs_value_arg(&key),
njs_value_arg(&result));
ret = njs_value_property_val(vm, njs_value_arg(&value),
njs_value_arg(&key),
njs_value_arg(&result));
if (njs_slow_path(ret == NJS_ERROR)) {
goto failed;
}
Expand Down Expand Up @@ -839,7 +839,7 @@ njs_query_string_escape(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
string = njs_value_arg(&value);
}

njs_value_string_get(string, &str);
njs_value_string_get(vm, string, &str);

NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));

Expand Down Expand Up @@ -876,7 +876,7 @@ njs_query_string_unescape(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
string = njs_value_arg(&value);
}

njs_value_string_get(string, &str);
njs_value_string_get(vm, string, &str);

return njs_query_string_decode(vm, retval, str.start, str.length);
}
Expand Down
13 changes: 7 additions & 6 deletions external/njs_shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,8 +1585,9 @@ njs_engine_njs_complete(njs_engine_t *engine, njs_str_t *expression)
return NULL;
}

ret = njs_value_property(vm, njs_value_arg(&value), njs_value_arg(&key),
njs_value_arg(&retval));
ret = njs_value_property_val(vm, njs_value_arg(&value),
njs_value_arg(&key),
njs_value_arg(&retval));
if (njs_slow_path(ret != NJS_OK)) {
if (ret == NJS_DECLINED && !global) {
goto done;
Expand Down Expand Up @@ -3664,11 +3665,11 @@ njs_ext_console_time(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return ret;
}

njs_value_string_get(value, &name);
njs_value_string_get(vm, value, &name);
}

} else {
njs_value_string_get(value, &name);
njs_value_string_get(vm, value, &name);
}

if (njs_console_time(console, &name) != NJS_OK) {
Expand Down Expand Up @@ -3713,11 +3714,11 @@ njs_ext_console_time_end(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
return ret;
}

njs_value_string_get(value, &name);
njs_value_string_get(vm, value, &name);
}

} else {
njs_value_string_get(value, &name);
njs_value_string_get(vm, value, &name);
}

njs_console_time_end(console, &name, ns);
Expand Down
Loading