Eliminating redundant NJS_METHOD type.

Previously, NJS_METHOD was the same as NJS_PROPERTY with function value
type.

diff --git a/src/njs_array.c b/src/njs_array.c
index 2e083a7f420086a4cb38638f55295c7d17989632..9e923c390381cc662f0d26335a0dcb565c3f6cef 100644 (file)
--- a/src/njs_array.c
+++ b/src/njs_array.c
@@ -280,7 +280,7 @@ static const njs_object_prop_t  njs_array_constructor_properties[] =
 
     /* Array.isArray(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isArray"),
         .value = njs_native_function(njs_array_is_array, 0),
         .writable = 1,
@@ -290,7 +290,7 @@ static const njs_object_prop_t  njs_array_constructor_properties[] =
     /* ES6. */
     /* Array.of(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("of"),
         .value = njs_native_function(njs_array_of, 0),
         .writable = 1,
@@ -1975,7 +1975,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("slice"),
         .value = njs_native_function(njs_array_prototype_slice,
                      NJS_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -1984,7 +1984,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("push"),
         .value = njs_native_function(njs_array_prototype_push, 0),
         .writable = 1,
@@ -1992,7 +1992,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("pop"),
         .value = njs_native_function(njs_array_prototype_pop, 0),
         .writable = 1,
@@ -2000,7 +2000,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("unshift"),
         .value = njs_native_function(njs_array_prototype_unshift, 0),
         .writable = 1,
@@ -2008,7 +2008,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("shift"),
         .value = njs_native_function(njs_array_prototype_shift, 0),
         .writable = 1,
@@ -2016,7 +2016,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("splice"),
         .value = njs_native_function(njs_array_prototype_splice,
                     NJS_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -2025,7 +2025,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("reverse"),
         .value = njs_native_function(njs_array_prototype_reverse,
                                      NJS_OBJECT_ARG),
@@ -2034,7 +2034,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_array_prototype_to_string, 0),
         .writable = 1,
@@ -2042,7 +2042,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("join"),
         .value = njs_native_function(njs_array_prototype_join,
                      NJS_OBJECT_ARG, NJS_STRING_ARG),
@@ -2051,7 +2051,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("concat"),
         .value = njs_native_function(njs_array_prototype_concat, 0),
         .writable = 1,
@@ -2059,7 +2059,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("indexOf"),
         .value = njs_native_function(njs_array_prototype_index_of,
                      NJS_OBJECT_ARG, NJS_SKIP_ARG, NJS_INTEGER_ARG),
@@ -2068,7 +2068,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("lastIndexOf"),
         .value = njs_native_function(njs_array_prototype_last_index_of,
                      NJS_OBJECT_ARG, NJS_SKIP_ARG, NJS_INTEGER_ARG),
@@ -2078,7 +2078,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
 
     /* ES7. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("includes"),
         .value = njs_native_function(njs_array_prototype_includes,
                      NJS_OBJECT_ARG, NJS_SKIP_ARG, NJS_INTEGER_ARG),
@@ -2087,7 +2087,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("forEach"),
         .value = njs_native_function(njs_array_prototype_for_each, 0),
         .writable = 1,
@@ -2095,7 +2095,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("some"),
         .value = njs_native_function(njs_array_prototype_some, 0),
         .writable = 1,
@@ -2103,7 +2103,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("every"),
         .value = njs_native_function(njs_array_prototype_every, 0),
         .writable = 1,
@@ -2112,7 +2112,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("fill"),
         .value = njs_native_function(njs_array_prototype_fill,
                      NJS_OBJECT_ARG, NJS_SKIP_ARG, NJS_NUMBER_ARG,
@@ -2122,7 +2122,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("filter"),
         .value = njs_native_function(njs_array_prototype_filter, 0),
         .writable = 1,
@@ -2131,7 +2131,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("find"),
         .value = njs_native_function(njs_array_prototype_find, 0),
         .writable = 1,
@@ -2140,7 +2140,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("findIndex"),
         .value = njs_native_function(njs_array_prototype_find_index, 0),
         .writable = 1,
@@ -2148,7 +2148,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("map"),
         .value = njs_native_function(njs_array_prototype_map, 0),
         .writable = 1,
@@ -2156,7 +2156,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("reduce"),
         .value = njs_native_function(njs_array_prototype_reduce, 0),
         .writable = 1,
@@ -2164,7 +2164,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("reduceRight"),
         .value = njs_native_function(njs_array_prototype_reduce_right, 0),
         .writable = 1,
@@ -2172,7 +2172,7 @@ static const njs_object_prop_t  njs_array_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("sort"),
         .value = njs_native_function(njs_array_prototype_sort, 0),
         .writable = 1,

diff --git a/src/njs_boolean.c b/src/njs_boolean.c
index a4de1d48ceba21041595daf4b01be9dacfb5be74..79c54beddb760184f885965c9e8d0891eb713202 100644 (file)
--- a/src/njs_boolean.c
+++ b/src/njs_boolean.c
@@ -143,7 +143,7 @@ static const njs_object_prop_t  njs_boolean_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("valueOf"),
         .value = njs_native_function(njs_boolean_prototype_value_of, 0),
         .writable = 1,
@@ -151,7 +151,7 @@ static const njs_object_prop_t  njs_boolean_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_boolean_prototype_to_string, 0),
         .writable = 1,

diff --git a/src/njs_builtin.c b/src/njs_builtin.c
index 6fc311a40d2c2a23c01a5d8062933b55e0954e11..5232cc3ad2535a4c2c3a455fbd99f9f7be3b64ab 100644 (file)
--- a/src/njs_builtin.c
+++ b/src/njs_builtin.c
@@ -964,7 +964,7 @@ njs_builtin_match(const njs_object_init_t **objects, njs_function_t *function,
         for (i = 0; i < o->items; i++) {
             pr = &o->properties[i];
 
-            if (pr->type != NJS_METHOD) {
+            if (pr->type != NJS_PROPERTY || !njs_is_function(&pr->value)) {
                 continue;
             }
 
@@ -1116,7 +1116,7 @@ static const njs_object_prop_t  njs_njs_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("dump"),
         .value = njs_native_function(njs_dump_value,
                                     NJS_SKIP_ARG, NJS_SKIP_ARG, NJS_NUMBER_ARG),

diff --git a/src/njs_crypto.c b/src/njs_crypto.c
index afef1ff20b9939353e64202ef4df92bf390eb6c1..1993fad157d8fe57e31f97536fee116ab2550a31 100644 (file)
--- a/src/njs_crypto.c
+++ b/src/njs_crypto.c
@@ -321,7 +321,7 @@ static const njs_object_prop_t  njs_hash_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_hash_prototype_to_string, 0),
         .writable = 1,
@@ -329,7 +329,7 @@ static const njs_object_prop_t  njs_hash_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("update"),
         .value = njs_native_function(njs_hash_prototype_update,
                                      NJS_OBJECT_ARG, NJS_SKIP_ARG),
@@ -338,7 +338,7 @@ static const njs_object_prop_t  njs_hash_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("digest"),
         .value = njs_native_function(njs_hash_prototype_digest,
                                      NJS_OBJECT_ARG, NJS_SKIP_ARG),
@@ -583,7 +583,7 @@ static const njs_object_prop_t  njs_hmac_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_hmac_prototype_to_string, 0),
         .writable = 1,
@@ -591,7 +591,7 @@ static const njs_object_prop_t  njs_hmac_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("update"),
         .value = njs_native_function(njs_hmac_prototype_update,
                                      NJS_OBJECT_ARG, NJS_SKIP_ARG),
@@ -600,7 +600,7 @@ static const njs_object_prop_t  njs_hmac_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("digest"),
         .value = njs_native_function(njs_hmac_prototype_digest,
                                      NJS_OBJECT_ARG, NJS_SKIP_ARG),
@@ -648,7 +648,7 @@ static const njs_object_prop_t  njs_crypto_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("createHash"),
         .value = njs_native_function(njs_crypto_create_hash,
                                      NJS_SKIP_ARG),
@@ -657,7 +657,7 @@ static const njs_object_prop_t  njs_crypto_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("createHmac"),
         .value = njs_native_function(njs_crypto_create_hmac,
                                      NJS_SKIP_ARG),

diff --git a/src/njs_date.c b/src/njs_date.c
index ea6508c8e9e04b111b6ab27b231159f3fad84b23..4da948101430b93e117152d595f248a45be1c7e2 100644 (file)
--- a/src/njs_date.c
+++ b/src/njs_date.c
@@ -912,7 +912,7 @@ static const njs_object_prop_t  njs_date_constructor_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("UTC"),
         .value = njs_native_function(njs_date_utc, 0),
         .writable = 1,
@@ -920,7 +920,7 @@ static const njs_object_prop_t  njs_date_constructor_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("now"),
         .value = njs_native_function(njs_date_now, 0),
         .writable = 1,
@@ -928,7 +928,7 @@ static const njs_object_prop_t  njs_date_constructor_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("parse"),
         .value = njs_native_function(njs_date_parse,
                                      NJS_SKIP_ARG, NJS_STRING_ARG),
@@ -1936,7 +1936,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("valueOf"),
         .value = njs_native_function(njs_date_prototype_value_of, NJS_DATE_ARG),
         .writable = 1,
@@ -1944,7 +1944,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_date_prototype_to_string,
                                      NJS_DATE_ARG),
@@ -1953,7 +1953,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toDateString"),
         .value = njs_native_function(njs_date_prototype_to_date_string,
                                      NJS_DATE_ARG),
@@ -1962,7 +1962,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toTimeString"),
         .value = njs_native_function(njs_date_prototype_to_time_string,
                                      NJS_DATE_ARG),
@@ -1971,7 +1971,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toLocaleString"),
         .value = njs_native_function(njs_date_prototype_to_string,
                                      NJS_DATE_ARG),
@@ -1980,7 +1980,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("toLocaleDateString"),
         .value = njs_native_function(njs_date_prototype_to_date_string,
                                      NJS_DATE_ARG),
@@ -1989,7 +1989,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("toLocaleTimeString"),
         .value = njs_native_function(njs_date_prototype_to_time_string,
                                      NJS_DATE_ARG),
@@ -1998,7 +1998,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toUTCString"),
         .value = njs_native_function(njs_date_prototype_to_utc_string,
                                      NJS_DATE_ARG),
@@ -2007,7 +2007,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toISOString"),
         .value = njs_native_function(njs_date_prototype_to_iso_string,
                                      NJS_DATE_ARG),
@@ -2016,7 +2016,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getTime"),
         .value = njs_native_function(njs_date_prototype_value_of, NJS_DATE_ARG),
         .writable = 1,
@@ -2024,7 +2024,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getFullYear"),
         .value = njs_native_function(njs_date_prototype_get_full_year,
                                      NJS_DATE_ARG),
@@ -2033,7 +2033,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getUTCFullYear"),
         .value = njs_native_function(njs_date_prototype_get_utc_full_year,
                                      NJS_DATE_ARG),
@@ -2042,7 +2042,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getMonth"),
         .value = njs_native_function(njs_date_prototype_get_month,
                                      NJS_DATE_ARG),
@@ -2051,7 +2051,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getUTCMonth"),
         .value = njs_native_function(njs_date_prototype_get_utc_month,
                                      NJS_DATE_ARG),
@@ -2060,7 +2060,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getDate"),
         .value = njs_native_function(njs_date_prototype_get_date,
                                      NJS_DATE_ARG),
@@ -2069,7 +2069,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getUTCDate"),
         .value = njs_native_function(njs_date_prototype_get_utc_date,
                                      NJS_DATE_ARG),
@@ -2078,7 +2078,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getDay"),
         .value = njs_native_function(njs_date_prototype_get_day, NJS_DATE_ARG),
         .writable = 1,
@@ -2086,7 +2086,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getUTCDay"),
         .value = njs_native_function(njs_date_prototype_get_utc_day,
                                      NJS_DATE_ARG),
@@ -2095,7 +2095,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getHours"),
         .value = njs_native_function(njs_date_prototype_get_hours,
                                      NJS_DATE_ARG),
@@ -2104,7 +2104,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getUTCHours"),
         .value = njs_native_function(njs_date_prototype_get_utc_hours,
                                      NJS_DATE_ARG),
@@ -2113,7 +2113,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getMinutes"),
         .value = njs_native_function(njs_date_prototype_get_minutes,
                                      NJS_DATE_ARG),
@@ -2122,7 +2122,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getUTCMinutes"),
         .value = njs_native_function(njs_date_prototype_get_utc_minutes,
                                      NJS_DATE_ARG),
@@ -2131,7 +2131,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getSeconds"),
         .value = njs_native_function(njs_date_prototype_get_seconds,
                                      NJS_DATE_ARG),
@@ -2140,7 +2140,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getUTCSeconds"),
         .value = njs_native_function(njs_date_prototype_get_seconds,
                                      NJS_DATE_ARG),
@@ -2149,7 +2149,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("getMilliseconds"),
         .value = njs_native_function(njs_date_prototype_get_milliseconds,
                                      NJS_DATE_ARG),
@@ -2158,7 +2158,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("getUTCMilliseconds"),
         .value = njs_native_function(njs_date_prototype_get_milliseconds,
                                      NJS_DATE_ARG),
@@ -2167,7 +2167,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("getTimezoneOffset"),
         .value = njs_native_function(njs_date_prototype_get_timezone_offset,
                                      NJS_DATE_ARG),
@@ -2176,7 +2176,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setTime"),
         .value = njs_native_function(njs_date_prototype_set_time,
                                      NJS_DATE_ARG, NJS_NUMBER_ARG),
@@ -2185,7 +2185,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("setMilliseconds"),
         .value = njs_native_function(njs_date_prototype_set_milliseconds,
                                      NJS_DATE_ARG, NJS_NUMBER_ARG),
@@ -2194,7 +2194,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("setUTCMilliseconds"),
         .value = njs_native_function(njs_date_prototype_set_milliseconds,
                                      NJS_DATE_ARG, NJS_NUMBER_ARG),
@@ -2203,7 +2203,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setSeconds"),
         .value = njs_native_function(njs_date_prototype_set_seconds,
                                      NJS_DATE_ARG, NJS_NUMBER_ARG),
@@ -2212,7 +2212,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setUTCSeconds"),
         .value = njs_native_function(njs_date_prototype_set_seconds,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG),
@@ -2221,7 +2221,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setMinutes"),
         .value = njs_native_function(njs_date_prototype_set_minutes,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG,
@@ -2231,7 +2231,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setUTCMinutes"),
         .value = njs_native_function(njs_date_prototype_set_utc_minutes,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG,
@@ -2241,7 +2241,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setHours"),
         .value = njs_native_function(njs_date_prototype_set_hours,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG,
@@ -2251,7 +2251,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setUTCHours"),
         .value = njs_native_function(njs_date_prototype_set_utc_hours,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG,
@@ -2261,7 +2261,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setDate"),
         .value = njs_native_function(njs_date_prototype_set_date,
                      NJS_DATE_ARG, NJS_NUMBER_ARG),
@@ -2270,7 +2270,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setUTCDate"),
         .value = njs_native_function(njs_date_prototype_set_utc_date,
                      NJS_DATE_ARG, NJS_NUMBER_ARG),
@@ -2279,7 +2279,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setMonth"),
         .value = njs_native_function(njs_date_prototype_set_month,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG),
@@ -2288,7 +2288,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setUTCMonth"),
         .value = njs_native_function(njs_date_prototype_set_utc_month,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG),
@@ -2297,7 +2297,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setFullYear"),
         .value = njs_native_function(njs_date_prototype_set_full_year,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG,
@@ -2307,7 +2307,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("setUTCFullYear"),
         .value = njs_native_function(njs_date_prototype_set_utc_full_year,
                      NJS_DATE_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG,
@@ -2317,7 +2317,7 @@ static const njs_object_prop_t  njs_date_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toJSON"),
         .value = njs_native_function(njs_date_prototype_to_json, 0),
         .writable = 1,

diff --git a/src/njs_error.c b/src/njs_error.c
index d770cf88f80ad59a9a40a9d7ca8f8e5fc4bd11b9..5531f0a4485f18bb8666e1947f83ca1e651a2200 100644 (file)
--- a/src/njs_error.c
+++ b/src/njs_error.c
@@ -711,7 +711,7 @@ static const njs_object_prop_t  njs_error_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("valueOf"),
         .value = njs_native_function(njs_error_prototype_value_of, 0),
         .writable = 1,
@@ -719,7 +719,7 @@ static const njs_object_prop_t  njs_error_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_error_prototype_to_string, 0),
         .writable = 1,
@@ -793,7 +793,7 @@ static const njs_object_prop_t  njs_internal_error_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_internal_error_prototype_to_string, 0),
         .writable = 1,

diff --git a/src/njs_fs.c b/src/njs_fs.c
index 21b38932680963c7927706203e865f9f3b13df93..e7f11551caa1be68101858a0bba903b05ea7b2e2 100644 (file)
--- a/src/njs_fs.c
+++ b/src/njs_fs.c
@@ -1017,7 +1017,7 @@ static const njs_object_prop_t  njs_fs_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("readFile"),
         .value = njs_native_function(njs_fs_read_file, 0),
         .writable = 1,
@@ -1025,7 +1025,7 @@ static const njs_object_prop_t  njs_fs_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("readFileSync"),
         .value = njs_native_function(njs_fs_read_file_sync, 0),
         .writable = 1,
@@ -1033,7 +1033,7 @@ static const njs_object_prop_t  njs_fs_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("appendFile"),
         .value = njs_native_function(njs_fs_append_file, 0),
         .writable = 1,
@@ -1041,7 +1041,7 @@ static const njs_object_prop_t  njs_fs_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("appendFileSync"),
         .value = njs_native_function(njs_fs_append_file_sync, 0),
         .writable = 1,
@@ -1049,7 +1049,7 @@ static const njs_object_prop_t  njs_fs_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("writeFile"),
         .value = njs_native_function(njs_fs_write_file, 0),
         .writable = 1,
@@ -1057,7 +1057,7 @@ static const njs_object_prop_t  njs_fs_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("writeFileSync"),
         .value = njs_native_function(njs_fs_write_file_sync, 0),
         .writable = 1,

diff --git a/src/njs_function.c b/src/njs_function.c
index f0d835af242f5c3c27afc9badd7b2192699e9b24..e2466b834518b9ba0c058cbde1a69111b5becafb 100644 (file)
--- a/src/njs_function.c
+++ b/src/njs_function.c
@@ -1152,7 +1152,7 @@ static const njs_object_prop_t  njs_function_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("call"),
         .value = njs_native_function(njs_function_prototype_call, 0),
         .writable = 1,
@@ -1160,7 +1160,7 @@ static const njs_object_prop_t  njs_function_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("apply"),
         .value = njs_native_function(njs_function_prototype_apply, 0),
         .writable = 1,
@@ -1168,7 +1168,7 @@ static const njs_object_prop_t  njs_function_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("bind"),
         .value = njs_native_function(njs_function_prototype_bind, 0),
         .writable = 1,

diff --git a/src/njs_json.c b/src/njs_json.c
index 09c2d5d7625a79c987dc85fda9ea12a2572afbac..b7ebf1252eeba646a5dc8fc4b867d179fe8d9a63 100644 (file)
--- a/src/njs_json.c
+++ b/src/njs_json.c
@@ -2082,7 +2082,7 @@ static const njs_object_prop_t  njs_json_object_properties[] =
 {
     /* JSON.parse(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("parse"),
         .value = njs_native_function(njs_json_parse,
                                      NJS_SKIP_ARG, NJS_STRING_ARG,
@@ -2093,7 +2093,7 @@ static const njs_object_prop_t  njs_json_object_properties[] =
 
     /* JSON.stringify(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("stringify"),
         .value = njs_native_function(njs_json_stringify,
                                      NJS_SKIP_ARG, NJS_SKIP_ARG, NJS_SKIP_ARG,

diff --git a/src/njs_math.c b/src/njs_math.c
index b58ba6e6147bc9d57502e17ee670b893428f8cc4..a2cc9dd6617f28f70f1777cc1fdba0fcae687b79 100644 (file)
--- a/src/njs_math.c
+++ b/src/njs_math.c
@@ -831,7 +831,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("abs"),
         .value = njs_native_function(njs_object_math_abs,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -840,7 +840,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("acos"),
         .value = njs_native_function(njs_object_math_acos,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -850,7 +850,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("acosh"),
         .value = njs_native_function(njs_object_math_acosh,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -859,7 +859,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("asin"),
         .value = njs_native_function(njs_object_math_asin,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -869,7 +869,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("asinh"),
         .value = njs_native_function(njs_object_math_asinh,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -878,7 +878,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("atan"),
         .value = njs_native_function(njs_object_math_atan,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -887,7 +887,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("atan2"),
         .value = njs_native_function(njs_object_math_atan2,
                      NJS_SKIP_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG),
@@ -897,7 +897,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("atanh"),
         .value = njs_native_function(njs_object_math_atanh,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -907,7 +907,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("cbrt"),
         .value = njs_native_function(njs_object_math_cbrt,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -916,7 +916,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("ceil"),
         .value = njs_native_function(njs_object_math_ceil,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -926,7 +926,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("clz32"),
         .value = njs_native_function(njs_object_math_clz32,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -935,7 +935,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("cos"),
         .value = njs_native_function(njs_object_math_cos,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -945,7 +945,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("cosh"),
         .value = njs_native_function(njs_object_math_cosh,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -954,7 +954,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("exp"),
         .value = njs_native_function(njs_object_math_exp,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -964,7 +964,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("expm1"),
         .value = njs_native_function(njs_object_math_expm1,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -973,7 +973,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("floor"),
         .value = njs_native_function(njs_object_math_floor,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -983,7 +983,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("fround"),
         .value = njs_native_function(njs_object_math_fround,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -993,7 +993,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("hypot"),
         .value = njs_native_function(njs_object_math_hypot, 0),
         .writable = 1,
@@ -1002,7 +1002,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("imul"),
         .value = njs_native_function(njs_object_math_imul,
                      NJS_SKIP_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG),
@@ -1011,7 +1011,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("log"),
         .value = njs_native_function(njs_object_math_log,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1021,7 +1021,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("log10"),
         .value = njs_native_function(njs_object_math_log10,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1031,7 +1031,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("log1p"),
         .value = njs_native_function(njs_object_math_log1p,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1041,7 +1041,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("log2"),
         .value = njs_native_function(njs_object_math_log2,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1050,7 +1050,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("max"),
         .value = njs_native_function(njs_object_math_max, 0),
         .writable = 1,
@@ -1058,7 +1058,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("min"),
         .value = njs_native_function(njs_object_math_min, 0),
         .writable = 1,
@@ -1066,7 +1066,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("pow"),
         .value = njs_native_function(njs_object_math_pow,
                      NJS_SKIP_ARG, NJS_NUMBER_ARG, NJS_NUMBER_ARG),
@@ -1075,7 +1075,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("random"),
         .value = njs_native_function(njs_object_math_random, 0),
         .writable = 1,
@@ -1083,7 +1083,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("round"),
         .value = njs_native_function(njs_object_math_round,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1093,7 +1093,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("sign"),
         .value = njs_native_function(njs_object_math_sign,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1102,7 +1102,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("sin"),
         .value = njs_native_function(njs_object_math_sin,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1112,7 +1112,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("sinh"),
         .value = njs_native_function(njs_object_math_sinh,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1121,7 +1121,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("sqrt"),
         .value = njs_native_function(njs_object_math_sqrt,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1130,7 +1130,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("tan"),
         .value = njs_native_function(njs_object_math_tan,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1140,7 +1140,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("tanh"),
         .value = njs_native_function(njs_object_math_tanh,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),
@@ -1150,7 +1150,7 @@ static const njs_object_prop_t  njs_math_object_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("trunc"),
         .value = njs_native_function(njs_object_math_trunc,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),

diff --git a/src/njs_number.c b/src/njs_number.c
index 260e668c0454a366791e5a5462a43dfc6f8d44e9..5d09ccc0ac098e9ad5363bd238b505a3fdd99ae7 100644 (file)
--- a/src/njs_number.c
+++ b/src/njs_number.c
@@ -412,7 +412,7 @@ static const njs_object_prop_t  njs_number_constructor_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isFinite"),
         .value = njs_native_function(njs_number_is_finite, 0),
         .writable = 1,
@@ -421,7 +421,7 @@ static const njs_object_prop_t  njs_number_constructor_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isInteger"),
         .value = njs_native_function(njs_number_is_integer, 0),
         .writable = 1,
@@ -430,7 +430,7 @@ static const njs_object_prop_t  njs_number_constructor_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isSafeInteger"),
         .value = njs_native_function(njs_number_is_safe_integer, 0),
         .writable = 1,
@@ -439,7 +439,7 @@ static const njs_object_prop_t  njs_number_constructor_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isNaN"),
         .value = njs_native_function(njs_number_is_nan, 0),
         .writable = 1,
@@ -448,7 +448,7 @@ static const njs_object_prop_t  njs_number_constructor_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("parseFloat"),
         .value = njs_native_function(njs_number_parse_float,
                                      NJS_SKIP_ARG, NJS_STRING_ARG),
@@ -458,7 +458,7 @@ static const njs_object_prop_t  njs_number_constructor_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("parseInt"),
         .value = njs_native_function(njs_number_parse_int,
                      NJS_SKIP_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
@@ -626,7 +626,7 @@ static const njs_object_prop_t  njs_number_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("valueOf"),
         .value = njs_native_function(njs_number_prototype_value_of, 0),
         .writable = 1,
@@ -634,7 +634,7 @@ static const njs_object_prop_t  njs_number_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_number_prototype_to_string,
                                      NJS_SKIP_ARG, NJS_NUMBER_ARG),

diff --git a/src/njs_object.c b/src/njs_object.c
index fce9e7a017d688614008f71b0154551df3324402..2fb1f9e880da8ec5ce9c55c2fd4574428d2f8308 100644 (file)
--- a/src/njs_object.c
+++ b/src/njs_object.c
@@ -1672,7 +1672,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.create(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("create"),
         .value = njs_native_function(njs_object_create, 0),
         .writable = 1,
@@ -1681,7 +1681,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.keys(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("keys"),
         .value = njs_native_function(njs_object_keys,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1691,7 +1691,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* ES8: Object.values(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("values"),
         .value = njs_native_function(njs_object_values,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1701,7 +1701,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* ES8: Object.entries(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("entries"),
         .value = njs_native_function(njs_object_entries,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1711,7 +1711,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.defineProperty(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("defineProperty"),
         .value = njs_native_function(njs_object_define_property,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG,
@@ -1722,7 +1722,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.defineProperties(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("defineProperties"),
         .value = njs_native_function(njs_object_define_properties,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG,
@@ -1733,7 +1733,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.getOwnPropertyDescriptor(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("getOwnPropertyDescriptor"),
         .value = njs_native_function(njs_object_get_own_property_descriptor,
                                      NJS_SKIP_ARG, NJS_SKIP_ARG,
@@ -1744,7 +1744,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.getOwnPropertyDescriptors(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("getOwnPropertyDescriptors"),
         .value = njs_native_function(njs_object_get_own_property_descriptors,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1754,7 +1754,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.getOwnPropertyNames(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("getOwnPropertyNames"),
         .value = njs_native_function(njs_object_get_own_property_names,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1764,7 +1764,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.getPrototypeOf(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("getPrototypeOf"),
         .value = njs_native_function(njs_object_get_prototype_of,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1774,7 +1774,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.freeze(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("freeze"),
         .value = njs_native_function(njs_object_freeze,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1784,7 +1784,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.isFrozen(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isFrozen"),
         .value = njs_native_function(njs_object_is_frozen,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1794,7 +1794,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.seal(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("seal"),
         .value = njs_native_function(njs_object_seal,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1804,7 +1804,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.isSealed(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isSealed"),
         .value = njs_native_function(njs_object_is_sealed,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1814,7 +1814,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.preventExtensions(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("preventExtensions"),
         .value = njs_native_function(njs_object_prevent_extensions,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -1824,7 +1824,7 @@ static const njs_object_prop_t  njs_object_constructor_properties[] =
 
     /* Object.isExtensible(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isExtensible"),
         .value = njs_native_function(njs_object_is_extensible,
                                      NJS_SKIP_ARG, NJS_OBJECT_ARG),
@@ -2243,7 +2243,7 @@ static const njs_object_prop_t  njs_object_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("valueOf"),
         .value = njs_native_function(njs_object_prototype_value_of, 0),
         .writable = 1,
@@ -2251,7 +2251,7 @@ static const njs_object_prop_t  njs_object_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_object_prototype_to_string, 0),
         .writable = 1,
@@ -2259,7 +2259,7 @@ static const njs_object_prop_t  njs_object_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("hasOwnProperty"),
         .value = njs_native_function(njs_object_prototype_has_own_property,
                                      NJS_OBJECT_ARG, NJS_STRING_ARG),
@@ -2268,7 +2268,7 @@ static const njs_object_prop_t  njs_object_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_long_string("propertyIsEnumerable"),
         .value = njs_native_function(njs_object_prototype_prop_is_enumerable,
                                      NJS_OBJECT_ARG, NJS_STRING_ARG),
@@ -2277,7 +2277,7 @@ static const njs_object_prop_t  njs_object_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("isPrototypeOf"),
         .value = njs_native_function(njs_object_prototype_is_prototype_of,
                                      NJS_OBJECT_ARG, NJS_OBJECT_ARG),

diff --git a/src/njs_object_prop.c b/src/njs_object_prop.c
index c659bccf38d62d7c7be335ababae01feb82f9079..157dc133eafb9cad08a75f25f9a541e1f5c0ee40 100644 (file)
--- a/src/njs_object_prop.c
+++ b/src/njs_object_prop.c
@@ -159,7 +159,6 @@ njs_object_prop_define(njs_vm_t *vm, njs_value_t *object,
     prev = pq.lhq.value;
 
     switch (prev->type) {
-    case NJS_METHOD:
     case NJS_PROPERTY:
     case NJS_PROPERTY_HANDLER:
         break;
@@ -450,7 +449,6 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest,
     prop = pq.lhq.value;
 
     switch (prop->type) {
-    case NJS_METHOD:
     case NJS_PROPERTY:
         break;
 
@@ -602,9 +600,6 @@ njs_prop_type_string(njs_object_prop_type_t type)
     case NJS_PROPERTY_REF:
         return "property_ref";
 
-    case NJS_METHOD:
-        return "method";
-
     case NJS_PROPERTY_HANDLER:
         return "property handler";
 

diff --git a/src/njs_regexp.c b/src/njs_regexp.c
index a7507291628f61ac4ba0cf60619f4bb7e5d14f21..dbf2840ce0a69fc7e83d9fdf97df1baccb5b8bd3 100644 (file)
--- a/src/njs_regexp.c
+++ b/src/njs_regexp.c
@@ -1200,7 +1200,7 @@ static const njs_object_prop_t  njs_regexp_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_regexp_prototype_to_string, 0),
         .writable = 1,
@@ -1208,7 +1208,7 @@ static const njs_object_prop_t  njs_regexp_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("test"),
         .value = njs_native_function(njs_regexp_prototype_test,
                                      NJS_OBJECT_ARG, NJS_STRING_ARG),
@@ -1217,7 +1217,7 @@ static const njs_object_prop_t  njs_regexp_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("exec"),
         .value = njs_native_function(njs_regexp_prototype_exec,
                                      NJS_OBJECT_ARG, NJS_STRING_ARG),

diff --git a/src/njs_string.c b/src/njs_string.c
index 2da29d0884113cb624433dd69f9d9e5c99e92166..d96a310f4408f36023855ef3b440c65b3704f26d 100644 (file)
--- a/src/njs_string.c
+++ b/src/njs_string.c
@@ -593,7 +593,7 @@ static const njs_object_prop_t  njs_string_constructor_properties[] =
 
     /* String.bytesFrom(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("bytesFrom"),
         .value = njs_native_function(njs_string_bytes_from, NJS_SKIP_ARG,
                                      NJS_SKIP_ARG, NJS_STRING_ARG),
@@ -603,7 +603,7 @@ static const njs_object_prop_t  njs_string_constructor_properties[] =
 
     /* String.fromCharCode(). */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("fromCharCode"),
         .value = njs_native_function(njs_string_from_char_code, 0),
         .writable = 1,
@@ -612,7 +612,7 @@ static const njs_object_prop_t  njs_string_constructor_properties[] =
 
     /* String.fromCodePoint(), ECMAScript 6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("fromCodePoint"),
         .value = njs_native_function(njs_string_from_code_point, 0),
         .writable = 1,
@@ -4041,7 +4041,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("valueOf"),
         .value = njs_native_function(njs_string_prototype_value_of, 0),
         .writable = 1,
@@ -4049,7 +4049,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toString"),
         .value = njs_native_function(njs_string_prototype_to_string, 0),
         .writable = 1,
@@ -4057,7 +4057,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("concat"),
         .value = njs_native_function(njs_string_prototype_concat, 0),
         .writable = 1,
@@ -4065,7 +4065,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("fromUTF8"),
         .value = njs_native_function(njs_string_prototype_from_utf8,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -4074,7 +4074,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toUTF8"),
         .value = njs_native_function(njs_string_prototype_to_utf8,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -4083,7 +4083,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("fromBytes"),
         .value = njs_native_function(njs_string_prototype_from_bytes,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -4092,7 +4092,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toBytes"),
         .value = njs_native_function(njs_string_prototype_to_bytes,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -4101,7 +4101,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("slice"),
         .value = njs_native_function(njs_string_prototype_slice,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -4110,7 +4110,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("substring"),
         .value = njs_native_function(njs_string_prototype_substring,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -4119,7 +4119,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("substr"),
         .value = njs_native_function(njs_string_prototype_substr,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_INTEGER_ARG),
@@ -4128,7 +4128,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("charAt"),
         .value = njs_native_function(njs_string_prototype_char_at,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG),
@@ -4137,7 +4137,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("charCodeAt"),
         .value = njs_native_function(njs_string_prototype_char_code_at,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG),
@@ -4147,7 +4147,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* String.codePointAt(), ECMAScript 6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("codePointAt"),
         .value = njs_native_function(njs_string_prototype_char_code_at,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG),
@@ -4156,7 +4156,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("indexOf"),
         .value = njs_native_function(njs_string_prototype_index_of,
                      NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
@@ -4165,7 +4165,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("lastIndexOf"),
         .value = njs_native_function(njs_string_prototype_last_index_of,
                      NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_NUMBER_ARG),
@@ -4175,7 +4175,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("includes"),
         .value = njs_native_function(njs_string_prototype_includes,
                      NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
@@ -4185,7 +4185,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("startsWith"),
         .value = njs_native_function(njs_string_prototype_starts_with,
                      NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
@@ -4195,7 +4195,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("endsWith"),
         .value = njs_native_function(njs_string_prototype_ends_with,
                      NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
@@ -4204,7 +4204,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toLowerCase"),
         .value = njs_native_function(njs_string_prototype_to_lower_case,
                                      NJS_STRING_OBJECT_ARG),
@@ -4213,7 +4213,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("toUpperCase"),
         .value = njs_native_function(njs_string_prototype_to_upper_case,
                                      NJS_STRING_OBJECT_ARG),
@@ -4222,7 +4222,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("trim"),
         .value = njs_native_function(njs_string_prototype_trim,
                                      NJS_STRING_OBJECT_ARG),
@@ -4232,7 +4232,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES10. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("trimStart"),
         .value = njs_native_function(njs_string_prototype_trim_start,
                                      NJS_STRING_OBJECT_ARG),
@@ -4242,7 +4242,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES10. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("trimEnd"),
         .value = njs_native_function(njs_string_prototype_trim_end,
                                      NJS_STRING_OBJECT_ARG),
@@ -4252,7 +4252,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES6. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("repeat"),
         .value = njs_native_function(njs_string_prototype_repeat,
                                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG),
@@ -4262,7 +4262,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES8. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("padStart"),
         .value = njs_native_function(njs_string_prototype_pad_start,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_STRING_ARG),
@@ -4272,7 +4272,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
 
     /* ES8. */
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("padEnd"),
         .value = njs_native_function(njs_string_prototype_pad_end,
                      NJS_STRING_OBJECT_ARG, NJS_INTEGER_ARG, NJS_STRING_ARG),
@@ -4281,7 +4281,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("search"),
         .value = njs_native_function(njs_string_prototype_search,
                                      NJS_STRING_OBJECT_ARG, NJS_REGEXP_ARG),
@@ -4290,7 +4290,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("match"),
         .value = njs_native_function(njs_string_prototype_match,
                                      NJS_STRING_OBJECT_ARG, NJS_REGEXP_ARG),
@@ -4299,7 +4299,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("split"),
         .value = njs_native_function(njs_string_prototype_split,
                      NJS_STRING_OBJECT_ARG, NJS_REGEXP_ARG, NJS_INTEGER_ARG),
@@ -4308,7 +4308,7 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
     },
 
     {
-        .type = NJS_METHOD,
+        .type = NJS_PROPERTY,
         .name = njs_string("replace"),
         .value = njs_native_function(njs_string_prototype_replace,
                      NJS_STRING_OBJECT_ARG, NJS_REGEXP_ARG, NJS_FUNCTION_ARG),

diff --git a/src/njs_value.c b/src/njs_value.c
index 536e0799dcd3220d0ed06b629f442b532cc6f3d5..f2718e4e5602b411e5e1fcc00f06b46f6656875d 100644 (file)
--- a/src/njs_value.c
+++ b/src/njs_value.c
@@ -474,9 +474,9 @@ njs_value_is_function(const njs_value_t *value)
  *   NJS_OK               property has been found in object,
  *     retval of type njs_object_prop_t * is in pq->lhq.value.
  *     in NJS_PROPERTY_QUERY_GET
- *       prop->type is NJS_PROPERTY, NJS_METHOD or NJS_PROPERTY_HANDLER.
+ *       prop->type is NJS_PROPERTY or NJS_PROPERTY_HANDLER.
  *     in NJS_PROPERTY_QUERY_SET, NJS_PROPERTY_QUERY_DELETE
- *       prop->type is NJS_PROPERTY, NJS_PROPERTY_REF, NJS_METHOD or
+ *       prop->type is NJS_PROPERTY, NJS_PROPERTY_REF or
  *       NJS_PROPERTY_HANDLER.
  *   NJS_DECLINED         property was not found in object,
  *     if pq->lhq.value != NULL it contains retval of type
@@ -999,7 +999,6 @@ njs_value_property(njs_vm_t *vm, njs_value_t *value, njs_value_t *key,
 
         switch (prop->type) {
 
-        case NJS_METHOD:
         case NJS_PROPERTY:
             if (njs_is_data_descriptor(prop)) {
                 *retval = prop->value;
@@ -1108,7 +1107,6 @@ njs_value_property_set(njs_vm_t *vm, njs_value_t *value, njs_value_t *key,
         if (pq.own) {
             switch (prop->type) {
             case NJS_PROPERTY:
-            case NJS_METHOD:
                 goto found;
 
             case NJS_PROPERTY_REF:

diff --git a/src/njs_value.h b/src/njs_value.h
index 91184c474a4f6f018fb30b93e73078ff999c4d31..853d3cf54a86d038f02d7c25ec1bdb6f48e76e84 100644 (file)
--- a/src/njs_value.h
+++ b/src/njs_value.h
@@ -301,7 +301,6 @@ typedef enum {
 typedef enum {
     NJS_PROPERTY = 0,
     NJS_PROPERTY_REF,
-    NJS_METHOD,
     NJS_PROPERTY_HANDLER,
     NJS_WHITEOUT,
 } njs_object_prop_type_t;

diff --git a/src/njs_vmcode.c b/src/njs_vmcode.c
index 272e7573da7b4e3d2f26995a41b1e16003c83fd0..a5f16d85281ad42a578492e1cf2c4f4681dd7194 100644 (file)
--- a/src/njs_vmcode.c
+++ b/src/njs_vmcode.c
@@ -1256,7 +1256,6 @@ njs_vmcode_property_delete(njs_vm_t *vm, njs_value_t *value, njs_value_t *key)
             /* Fall through. */
 
         case NJS_PROPERTY:
-        case NJS_METHOD:
             break;
 
         case NJS_PROPERTY_REF: