Skip to content

Commit af00685

Browse files
VadimZhestikovVadimZhestikov
committed
Use refs to njs_predefined.vs_* in the code. Part 1.
It is working increment, next patch will replace rest of njs_string() in the code by refs to njs_predeefined.vs_*.
1 parent c70d1b3 commit af00685

26 files changed

+265
-445
lines changed

‎src/njs_array.c‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,9 +1609,6 @@ njs_array_prototype_to_reversed(njs_vm_t *vm, njs_value_t *args,
16091609
}
16101610

16111611

1612-
static const njs_value_t join_string = njs_string("join");
1613-
1614-
16151612
njs_int_t
16161613
njs_array_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
16171614
njs_index_t unused, njs_value_t *retval)
@@ -1621,7 +1618,7 @@ njs_array_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
16211618
njs_lvlhsh_query_t lhq;
16221619

16231620
if (njs_is_object(njs_argument(args, 0))) {
1624-
njs_object_property_init(&lhq, &join_string, NJS_JOIN_HASH);
1621+
njs_object_property_init(&lhq, &njs_predefined.vs._join, NJS_JOIN_HASH);
16251622

16261623
ret = njs_object_property(vm, njs_object(njs_argument(args, 0)), &lhq,
16271624
&value);
@@ -1662,7 +1659,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
16621659

16631660
if (njs_slow_path(!njs_is_string(value))) {
16641661
if (njs_is_undefined(value)) {
1665-
value = njs_value_arg(&njs_string_comma);
1662+
value = njs_value_arg(&njs_predefined.vs._spec_COMMA);
16661663

16671664
} else {
16681665
ret = njs_value_to_string(vm, value, value);
@@ -1675,7 +1672,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
16751672
(void) njs_string_prop(&separator, value);
16761673

16771674
if (njs_slow_path(!njs_is_object(this))) {
1678-
njs_value_assign(retval, &njs_string_empty);
1675+
njs_value_assign(retval, &njs_predefined.vs._);
16791676
return NJS_OK;
16801677
}
16811678

@@ -1687,7 +1684,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
16871684
}
16881685

16891686
if (njs_slow_path(len == 0)) {
1690-
njs_value_assign(retval, &njs_string_empty);
1687+
njs_value_assign(retval, &njs_predefined.vs._);
16911688
return NJS_OK;
16921689
}
16931690

‎src/njs_boolean.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ njs_boolean_prototype_to_string(njs_vm_t *vm, njs_value_t *args,
110110
}
111111
}
112112

113-
njs_value_assign(retval, njs_is_true(value) ? &njs_string_true
114-
: &njs_string_false);
113+
njs_value_assign(retval, njs_is_true(value) ? &njs_predefined.vs._true
114+
: &njs_predefined.vs._false);
115115

116116
return NJS_OK;
117117
}

‎src/njs_buffer.c‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ njs_buffer_from_object(njs_vm_t *vm, njs_value_t *value, njs_value_t *retval)
361361
}
362362

363363
if (ret == NJS_DECLINED) {
364-
ret = njs_value_property(vm, value, njs_value_arg(&njs_string_type),
364+
ret = njs_value_property(vm, value, njs_value_arg(&njs_predefined.vs._type),
365365
&val);
366366
if (njs_slow_path(ret != NJS_OK)) {
367367
return ret;
@@ -378,7 +378,7 @@ njs_buffer_from_object(njs_vm_t *vm, njs_value_t *value, njs_value_t *retval)
378378
return NJS_DECLINED;
379379
}
380380

381-
ret = njs_value_property(vm, value, njs_value_arg(&njs_string_data),
381+
ret = njs_value_property(vm, value, njs_value_arg(&njs_predefined.vs._data),
382382
&val);
383383
if (njs_slow_path(ret != NJS_OK)) {
384384
return ret;
@@ -1992,7 +1992,7 @@ njs_buffer_prototype_to_string(njs_vm_t *vm, njs_value_t *args,
19921992
str.length = end - start;
19931993

19941994
if (njs_slow_path(str.length == 0)) {
1995-
njs_value_assign(retval, &njs_string_empty);
1995+
njs_value_assign(retval, &njs_predefined.vs._);
19961996
return NJS_OK;
19971997
}
19981998

@@ -2358,9 +2358,6 @@ njs_buffer_prototype_swap(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
23582358
}
23592359

23602360

2361-
static const njs_value_t string_buffer = njs_string("Buffer");
2362-
2363-
23642361
static njs_int_t
23652362
njs_buffer_prototype_to_json(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
23662363
njs_index_t unused, njs_value_t *retval)
@@ -2386,8 +2383,9 @@ njs_buffer_prototype_to_json(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
23862383

23872384
njs_set_object(&object, obj);
23882385

2389-
ret = njs_value_property_set(vm, &object, njs_value_arg(&njs_string_type),
2390-
njs_value_arg(&string_buffer));
2386+
ret = njs_value_property_set(vm, &object,
2387+
njs_value_arg(&njs_predefined.vs._type),
2388+
njs_value_arg(&njs_predefined.vs._Buffer));
23912389
if (njs_slow_path(ret != NJS_OK)) {
23922390
return NJS_ERROR;
23932391
}
@@ -2413,7 +2411,8 @@ njs_buffer_prototype_to_json(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
24132411

24142412
njs_set_array(&array, arr);
24152413

2416-
ret = njs_value_property_set(vm, &object, njs_value_arg(&njs_string_data),
2414+
ret = njs_value_property_set(vm, &object,
2415+
njs_value_arg(&njs_predefined.vs._data),
24172416
&array);
24182417
if (njs_slow_path(ret != NJS_OK)) {
24192418
return NJS_ERROR;

‎src/njs_builtin.c‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ njs_builtin_traverse(njs_vm_t *vm, njs_traverse_t *traverse, void *data)
335335
symbol = 1;
336336
key = *njs_symbol_description(&key);
337337
if (njs_is_undefined(&key)) {
338-
key = njs_string_empty;
338+
key = njs_predefined.vs._;
339339
}
340340
}
341341

@@ -476,7 +476,8 @@ njs_builtin_match_native_function(njs_vm_t *vm, njs_function_t *function,
476476
for (i = NJS_OBJ_TYPE_HIDDEN_MIN; i < NJS_OBJ_TYPE_HIDDEN_MAX; i++) {
477477
njs_set_object(&value, &njs_vm_ctor(vm, i).object);
478478

479-
ret = njs_value_property(vm, &value, njs_value_arg(&njs_string_name),
479+
ret = njs_value_property(vm, &value,
480+
njs_value_arg(&njs_predefined.vs._name),
480481
&tag);
481482

482483
if (ret == NJS_OK && njs_is_string(&tag)) {
@@ -655,12 +656,6 @@ njs_ext_on(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
655656
}
656657

657658

658-
static const njs_value_t size_string = njs_string("size");
659-
static const njs_value_t nblocks_string = njs_string("nblocks");
660-
static const njs_value_t page_string = njs_string("page_size");
661-
static const njs_value_t cluster_string = njs_string("cluster_size");
662-
663-
664659
static njs_int_t
665660
njs_ext_memory_stats(njs_vm_t *vm, njs_object_prop_t *prop,
666661
njs_value_t *unused, njs_value_t *unused2, njs_value_t *retval)
@@ -681,31 +676,35 @@ njs_ext_memory_stats(njs_vm_t *vm, njs_object_prop_t *prop,
681676

682677
njs_set_number(&value, mp_stat.size);
683678

684-
ret = njs_value_property_set(vm, &object, njs_value_arg(&size_string),
679+
ret = njs_value_property_set(vm, &object,
680+
njs_value_arg(&njs_predefined.vs._size),
685681
&value);
686682
if (njs_slow_path(ret != NJS_OK)) {
687683
return NJS_ERROR;
688684
}
689685

690686
njs_set_number(&value, mp_stat.nblocks);
691687

692-
ret = njs_value_property_set(vm, &object, njs_value_arg(&nblocks_string),
688+
ret = njs_value_property_set(vm, &object,
689+
njs_value_arg(&njs_predefined.vs._nblocks),
693690
&value);
694691
if (njs_slow_path(ret != NJS_OK)) {
695692
return NJS_ERROR;
696693
}
697694

698695
njs_set_number(&value, mp_stat.cluster_size);
699696

700-
ret = njs_value_property_set(vm, &object, njs_value_arg(&cluster_string),
701-
&value);
697+
ret = njs_value_property_set(vm, &object,
698+
njs_value_arg(&njs_predefined.vs._cluster_size),
699+
&value);
702700
if (njs_slow_path(ret != NJS_OK)) {
703701
return NJS_ERROR;
704702
}
705703

706704
njs_set_number(&value, mp_stat.page_size);
707705

708-
ret = njs_value_property_set(vm, &object, njs_value_arg(&page_string),
706+
ret = njs_value_property_set(vm, &object,
707+
njs_value_arg(&njs_predefined.vs._page_size),
709708
&value);
710709
if (njs_slow_path(ret != NJS_OK)) {
711710
return NJS_ERROR;
@@ -1187,9 +1186,6 @@ static const njs_object_init_t njs_njs_object_init = {
11871186
};
11881187

11891188

1190-
static const njs_value_t argv_string = njs_string("argv");
1191-
1192-
11931189
static njs_int_t
11941190
njs_process_object_argv(njs_vm_t *vm, njs_object_prop_t *pr,
11951191
njs_value_t *process, njs_value_t *unused, njs_value_t *retval)
@@ -1213,7 +1209,8 @@ njs_process_object_argv(njs_vm_t *vm, njs_object_prop_t *pr,
12131209
njs_strlen(*arg));
12141210
}
12151211

1216-
prop = njs_object_prop_alloc(vm, &argv_string, &njs_value_undefined, 1);
1212+
prop = njs_object_prop_alloc(vm, &njs_predefined.vs._argv,
1213+
&njs_value_undefined, 1);
12171214
if (njs_slow_path(prop == NULL)) {
12181215
return NJS_ERROR;
12191216
}
@@ -1322,9 +1319,6 @@ njs_env_hash_init(njs_vm_t *vm, njs_lvlhsh_t *hash, char **environment)
13221319
}
13231320

13241321

1325-
static const njs_value_t env_string = njs_string("env");
1326-
1327-
13281322
static njs_int_t
13291323
njs_process_object_env(njs_vm_t *vm, njs_object_prop_t *pr,
13301324
njs_value_t *process, njs_value_t *unused, njs_value_t *retval)
@@ -1341,7 +1335,8 @@ njs_process_object_env(njs_vm_t *vm, njs_object_prop_t *pr,
13411335

13421336
env->shared_hash = vm->shared->env_hash;
13431337

1344-
prop = njs_object_prop_alloc(vm, &env_string, &njs_value_undefined, 1);
1338+
prop = njs_object_prop_alloc(vm, &njs_predefined.vs._env,
1339+
&njs_value_undefined, 1);
13451340
if (njs_slow_path(prop == NULL)) {
13461341
return NJS_ERROR;
13471342
}

‎src/njs_date.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ static njs_int_t njs_date_string(njs_vm_t *vm, njs_value_t *retval,
6969
njs_date_fmt_t fmt, double time);
7070

7171

72-
static const njs_value_t njs_string_invalid_date = njs_string("Invalid Date");
73-
74-
7572
njs_inline int64_t
7673
njs_mod(int64_t a, int64_t b)
7774
{
@@ -1206,7 +1203,7 @@ njs_date_string(njs_vm_t *vm, njs_value_t *retval, njs_date_fmt_t fmt,
12061203
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
12071204

12081205
if (njs_slow_path(isnan(time))) {
1209-
*retval = njs_string_invalid_date;
1206+
*retval = njs_predefined.vs._Invalid_Date;
12101207
return NJS_OK;
12111208
}
12121209

@@ -1439,9 +1436,6 @@ njs_date_prototype_set_fields(njs_vm_t *vm, njs_value_t *args,
14391436
}
14401437

14411438

1442-
static const njs_value_t to_iso_string = njs_string("toISOString");
1443-
1444-
14451439
static njs_int_t
14461440
njs_date_prototype_to_json(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
14471441
njs_index_t unused, njs_value_t *retval)
@@ -1451,7 +1445,8 @@ njs_date_prototype_to_json(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
14511445
njs_lvlhsh_query_t lhq;
14521446

14531447
if (njs_is_object(njs_argument(args, 0))) {
1454-
njs_object_property_init(&lhq, &to_iso_string, NJS_TO_ISO_STRING_HASH);
1448+
njs_object_property_init(&lhq, &njs_predefined.vs._toISOString,
1449+
NJS_TO_ISO_STRING_HASH);
14551450

14561451
ret = njs_object_property(vm, njs_object(njs_argument(args, 0)), &lhq,
14571452
&value);

‎src/njs_encoding.c‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@ njs_text_encoder_encode_utf8(njs_vm_t *vm, njs_string_prop_t *prop,
154154
}
155155

156156

157-
static const njs_value_t read_str = njs_string("read");
158-
static const njs_value_t written_str = njs_string("written");
159-
160-
161157
static njs_int_t
162158
njs_text_encoder_encode_into(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
163159
njs_index_t unused, njs_value_t *retval)
@@ -230,8 +226,8 @@ njs_text_encoder_encode_into(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
230226
to = njs_utf8_encode(to, cp);
231227
}
232228

233-
return njs_vm_object_alloc(vm, retval, &read_str, &read,
234-
&written_str, &written, NULL);
229+
return njs_vm_object_alloc(vm, retval, &njs_predefined.vs._read, &read,
230+
&njs_predefined.vs._written, &written, NULL);
235231
}
236232

237233

@@ -358,10 +354,6 @@ njs_text_decoder_arg_encoding(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
358354
}
359355

360356

361-
static const njs_value_t fatal_str = njs_string("fatal");
362-
static const njs_value_t ignore_bom_str = njs_string("ignoreBOM");
363-
364-
365357
static njs_int_t
366358
njs_text_decoder_arg_options(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
367359
njs_encoding_decode_t *data)
@@ -383,14 +375,14 @@ njs_text_decoder_arg_options(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
383375
return NJS_ERROR;
384376
}
385377

386-
ret = njs_value_property(vm, value, njs_value_arg(&fatal_str), &retval);
378+
ret = njs_value_property(vm, value, njs_value_arg(&njs_predefined.vs._fatal), &retval);
387379
if (njs_slow_path(ret == NJS_ERROR)) {
388380
return ret;
389381
}
390382

391383
data->fatal = njs_bool(&retval);
392384

393-
ret = njs_value_property(vm, value, njs_value_arg(&ignore_bom_str),
385+
ret = njs_value_property(vm, value, njs_value_arg(&njs_predefined.vs._ignoreBOM),
394386
&retval);
395387
if (njs_slow_path(ret == NJS_ERROR)) {
396388
return ret;
@@ -402,9 +394,6 @@ njs_text_decoder_arg_options(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
402394
}
403395

404396

405-
static const njs_value_t utf8_str = njs_string("utf-8");
406-
407-
408397
static njs_int_t
409398
njs_text_decoder_encoding(njs_vm_t *vm, njs_object_prop_t *prop,
410399
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
@@ -420,7 +409,7 @@ njs_text_decoder_encoding(njs_vm_t *vm, njs_object_prop_t *prop,
420409

421410
switch (data->encoding) {
422411
case NJS_ENCODING_UTF8:
423-
*retval = utf8_str;
412+
*retval = njs_predefined.vs._utf_8;
424413
break;
425414

426415
default:
@@ -470,9 +459,6 @@ njs_text_decoder_ignore_bom(njs_vm_t *vm, njs_object_prop_t *prop,
470459
}
471460

472461

473-
static const njs_value_t stream_str = njs_string("stream");
474-
475-
476462
static njs_int_t
477463
njs_text_decoder_decode(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
478464
njs_index_t unused, njs_value_t *retval)
@@ -532,7 +518,8 @@ njs_text_decoder_decode(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
532518
return NJS_ERROR;
533519
}
534520

535-
ret = njs_value_property(vm, options, njs_value_arg(&stream_str),
521+
ret = njs_value_property(vm, options,
522+
njs_value_arg(&njs_predefined.vs._stream),
536523
retval);
537524
if (njs_slow_path(ret == NJS_ERROR)) {
538525
return ret;

0 commit comments

Comments
 (0)