Allowing to pass arbitrary pointer to object iterator handler.

diff --git a/src/njs_array.c b/src/njs_array.c
index 950d11911de48c0080f925149f6d1506009bbe16..07b7fe48fb6e4d3f24237c35ac9544976d7b2f8b 100644 (file)
--- a/src/njs_array.c
+++ b/src/njs_array.c
@@ -2256,7 +2256,7 @@ njs_array_handler_filter(njs_vm_t *vm, njs_iterator_args_t *args,
         }
 
         if (njs_is_true(&vm->retval)) {
-            ret = njs_array_add(vm, args->array, &copy);
+            ret = njs_array_add(vm, args->data, &copy);
             if (njs_slow_path(ret != NJS_OK)) {
                 return ret;
             }
@@ -2275,7 +2275,7 @@ njs_array_handler_map(njs_vm_t *vm, njs_iterator_args_t *args,
     njs_array_t  *retval;
     njs_value_t  this;
 
-    retval = args->array;
+    retval = args->data;
 
     if (retval->object.fast_array) {
         njs_set_invalid(&retval->start[n]);
@@ -2431,7 +2431,7 @@ njs_array_prototype_iterator(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
             }
         }
 
-        iargs.array = array;
+        iargs.data = array;
 
         break;
     }
@@ -2481,7 +2481,7 @@ done:
     case NJS_ARRAY_FILTER:
     case NJS_ARRAY_MAP:
     default:
-        njs_set_array(&vm->retval, iargs.array);
+        njs_set_array(&vm->retval, iargs.data);
     }
 
     return NJS_OK;

diff --git a/src/njs_iterator.c b/src/njs_iterator.c
index 954f5eba8603d0f232955b105b7a3038426f40db..4faa1cde31f68e02de99e66eecc6d5f519ba9a09 100644 (file)
--- a/src/njs_iterator.c
+++ b/src/njs_iterator.c
@@ -695,8 +695,8 @@ njs_iterator_to_array(njs_vm_t *vm, njs_value_t *iterator)
         return NULL;
     }
 
-    args.array = njs_array_alloc(vm, 1, length, 0);
-    if (njs_slow_path(args.array == NULL)) {
+    args.data = njs_array_alloc(vm, 1, length, 0);
+    if (njs_slow_path(args.data == NULL)) {
         return NULL;
     }
 
@@ -705,11 +705,11 @@ njs_iterator_to_array(njs_vm_t *vm, njs_value_t *iterator)
 
     ret = njs_object_iterate(vm, &args, njs_iterator_to_array_handler);
     if (njs_slow_path(ret == NJS_ERROR)) {
-        njs_mp_free(vm->mem_pool, args.array);
+        njs_mp_free(vm->mem_pool, args.data);
         return NULL;
     }
 
-    return args.array;
+    return args.data;
 }
 
 
@@ -717,7 +717,10 @@ static njs_int_t
 njs_iterator_to_array_handler(njs_vm_t *vm, njs_iterator_args_t *args,
     njs_value_t *value, int64_t index)
 {
-    args->array->start[index] = *value;
+    njs_array_t  *array;
+
+    array = args->data;
+    array->start[index] = *value;
 
     return NJS_OK;
 }

diff --git a/src/njs_iterator.h b/src/njs_iterator.h
index b5d4b8ec93b01cd2dbd95fa97928141d73b0161a..8c02826c4354117c5ef56f0c707c41e039498cdb 100644 (file)
--- a/src/njs_iterator.h
+++ b/src/njs_iterator.h
@@ -13,7 +13,7 @@ typedef struct {
     njs_value_t     *argument;
     njs_value_t     *value;
 
-    njs_array_t     *array;
+    void            *data;
 
     int64_t         from;
     int64_t         to;

diff --git a/src/njs_promise.c b/src/njs_promise.c
index be9697228badbefd7eab2d06178f790400c32564..34e48e10b3d71dee9b71d3ca51eec90a16eaf40a 100644 (file)
--- a/src/njs_promise.c
+++ b/src/njs_promise.c
@@ -1344,8 +1344,8 @@ njs_promise_perform_all(njs_vm_t *vm, njs_value_t *iterator,
         return ret;
     }
 
-    pargs->args.array = njs_array_alloc(vm, 1, length, 0);
-    if (njs_slow_path(pargs->args.array == NULL)) {
+    pargs->args.data = njs_array_alloc(vm, 1, length, 0);
+    if (njs_slow_path(pargs->args.data == NULL)) {
         return NJS_ERROR;
     }
 
@@ -1368,7 +1368,7 @@ njs_promise_perform_all(njs_vm_t *vm, njs_value_t *iterator,
     if (--(*pargs->remaining) == 0) {
         njs_mp_free(vm->mem_pool, pargs->remaining);
 
-        njs_set_array(&argument, pargs->args.array);
+        njs_set_array(&argument, pargs->args.data);
 
         if (handler == njs_promise_perform_any_handler) {
             error = njs_error_alloc(vm, NJS_OBJ_TYPE_AGGREGATE_ERROR,
@@ -1398,6 +1398,7 @@ njs_promise_perform_all_handler(njs_vm_t *vm, njs_iterator_args_t *args,
     njs_value_t *value, int64_t index)
 {
     njs_int_t                    ret;
+    njs_array_t                  *array;
     njs_value_t                  arguments[2], next;
     njs_function_t               *on_fulfilled;
     njs_promise_capability_t     *capability;
@@ -1408,7 +1409,8 @@ njs_promise_perform_all_handler(njs_vm_t *vm, njs_iterator_args_t *args,
 
     capability = pargs->capability;
 
-    njs_set_undefined(&pargs->args.array->start[index]);
+    array = args->data;
+    njs_set_undefined(&array->start[index]);
 
     ret = njs_function_call(vm, pargs->function, pargs->constructor, value,
                             1, &next);
@@ -1429,7 +1431,7 @@ njs_promise_perform_all_handler(njs_vm_t *vm, njs_iterator_args_t *args,
 
     context->already_called = 0;
     context->index = (uint32_t) index;
-    context->values = pargs->args.array;
+    context->values = pargs->args.data;
     context->capability = capability;
     context->remaining_elements = pargs->remaining;
 
@@ -1486,6 +1488,7 @@ njs_promise_perform_all_settled_handler(njs_vm_t *vm, njs_iterator_args_t *args,
     njs_value_t *value, int64_t index)
 {
     njs_int_t                    ret;
+    njs_array_t                  *array;
     njs_value_t                  arguments[2], next;
     njs_function_t               *on_fulfilled, *on_rejected;
     njs_promise_capability_t     *capability;
@@ -1496,7 +1499,8 @@ njs_promise_perform_all_settled_handler(njs_vm_t *vm, njs_iterator_args_t *args,
 
     capability = pargs->capability;
 
-    njs_set_undefined(&pargs->args.array->start[index]);
+    array = args->data;
+    njs_set_undefined(&array->start[index]);
 
     ret = njs_function_call(vm, pargs->function, pargs->constructor, value,
                             1, &next);
@@ -1514,7 +1518,7 @@ njs_promise_perform_all_settled_handler(njs_vm_t *vm, njs_iterator_args_t *args,
 
     context->already_called = 0;
     context->index = (uint32_t) index;
-    context->values = pargs->args.array;
+    context->values = pargs->args.data;
     context->capability = capability;
     context->remaining_elements = pargs->remaining;
 
@@ -1623,6 +1627,7 @@ njs_promise_perform_any_handler(njs_vm_t *vm, njs_iterator_args_t *args,
     njs_value_t *value, int64_t index)
 {
     njs_int_t                    ret;
+    njs_array_t                  *array;
     njs_value_t                  arguments[2], next;
     njs_function_t               *on_rejected;
     njs_promise_capability_t     *capability;
@@ -1633,7 +1638,8 @@ njs_promise_perform_any_handler(njs_vm_t *vm, njs_iterator_args_t *args,
 
     capability = pargs->capability;
 
-    njs_set_undefined(&pargs->args.array->start[index]);
+    array = pargs->args.data;
+    njs_set_undefined(&array->start[index]);
 
     ret = njs_function_call(vm, pargs->function, pargs->constructor, value, 1,
                             &next);
@@ -1654,7 +1660,7 @@ njs_promise_perform_any_handler(njs_vm_t *vm, njs_iterator_args_t *args,
 
     context->already_called = 0;
     context->index = (uint32_t) index;
-    context->values = pargs->args.array;
+    context->values = pargs->args.data;
     context->capability = capability;
     context->remaining_elements = pargs->remaining;