param->object was changed to param->this.

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index a41f3e8385eef42a67b00a80c429e5d3719134dd..bd5917f47c8a4dc18e131306c1be358aaf450664 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -803,7 +803,7 @@ ngx_http_js_ext_send_header(njs_vm_t *vm, njs_param_t *param)
 {
     ngx_http_request_t  *r;
 
-    r = njs_value_data(param->object);
+    r = njs_value_data(param->this);
 
     if (ngx_http_send_header(r) == NGX_ERROR) {
         return NJS_ERROR;
@@ -825,7 +825,7 @@ ngx_http_js_ext_send(njs_vm_t *vm, njs_param_t *param)
     ngx_chain_t         *out, *cl, **ll;
     ngx_http_request_t  *r;
 
-    r = njs_value_data(param->object);
+    r = njs_value_data(param->this);
 
     out = NULL;
     ll = &out;
@@ -890,7 +890,7 @@ ngx_http_js_ext_finish(njs_vm_t *vm, njs_param_t *param)
 {
     ngx_http_request_t  *r;
 
-    r = njs_value_data(param->object);
+    r = njs_value_data(param->this);
 
     if (ngx_http_send_special(r, NGX_HTTP_LAST) == NGX_ERROR) {
         return NJS_ERROR;

diff --git a/njs/njs_array.c b/njs/njs_array.c
index 28d3bab7449775f9815abf99b39da213467fd0e2..a91dce7c647f9dc3833ab08e315e56f9f18b4f7b 100644 (file)
--- a/njs/njs_array.c
+++ b/njs/njs_array.c
@@ -261,14 +261,14 @@ njs_array_prototype_slice(njs_vm_t *vm, njs_param_t *param)
     uint32_t     n;
     uintptr_t    nargs;
     njs_array_t  *array;
-    njs_value_t  *object, *args, *value;
+    njs_value_t  *this, *args, *value;
 
     start = 0;
     length = 0;
-    object = param->object;
+    this = param->this;
 
-    if (njs_is_array(object)) {
-        length = object->data.u.array->length;
+    if (njs_is_array(this)) {
+        length = this->data.u.array->length;
         nargs = param->nargs;
 
         if (nargs != 0) {
@@ -312,7 +312,7 @@ njs_array_prototype_slice(njs_vm_t *vm, njs_param_t *param)
     vm->retval.data.truth = 1;
 
     if (length != 0) {
-        value = object->data.u.array->start;
+        value = this->data.u.array->start;
         n = 0;
 
         do {
@@ -331,11 +331,13 @@ njs_array_prototype_push(njs_vm_t *vm, njs_param_t *param)
 {
     uintptr_t    i, nargs;
     njs_ret_t    ret;
-    njs_value_t  *args;
+    njs_value_t  *this, *args;
     njs_array_t  *array;
 
-    if (njs_is_array(param->object)) {
-        array = param->object->data.u.array;
+    this = param->this;
+
+    if (njs_is_array(this)) {
+        array = this->data.u.array;
         nargs = param->nargs;
 
         if (nargs != 0) {
@@ -365,12 +367,15 @@ static njs_ret_t
 njs_array_prototype_pop(njs_vm_t *vm, njs_param_t *param)
 {
     njs_array_t        *array;
+    njs_value_t        *this;
     const njs_value_t  *retval, *value;
 
     retval = &njs_value_void;
 
-    if (njs_is_array(param->object)) {
-        array = param->object->data.u.array;
+    this = param->this;
+
+    if (njs_is_array(this)) {
+        array = this->data.u.array;
 
         if (array->length != 0) {
             array->length--;
@@ -393,11 +398,13 @@ njs_array_prototype_unshift(njs_vm_t *vm, njs_param_t *param)
 {
     uintptr_t    nargs;
     njs_ret_t    ret;
-    njs_value_t  *args;
+    njs_value_t  *this, *args;
     njs_array_t  *array;
 
-    if (njs_is_array(param->object)) {
-        array = param->object->data.u.array;
+    this = param->this;
+
+    if (njs_is_array(this)) {
+        array = this->data.u.array;
         nargs = param->nargs;
 
         if (nargs != 0) {
@@ -430,12 +437,15 @@ static njs_ret_t
 njs_array_prototype_shift(njs_vm_t *vm, njs_param_t *param)
 {
     njs_array_t        *array;
+    njs_value_t        *this;
     const njs_value_t  *retval, *value;
 
     retval = &njs_value_void;
 
-    if (njs_is_array(param->object)) {
-        array = param->object->data.u.array;
+    this = param->this;
+
+    if (njs_is_array(this)) {
+        array = this->data.u.array;
 
         if (array->length != 0) {
             array->length--;
@@ -467,7 +477,7 @@ njs_array_prototype_to_string(njs_vm_t *vm, njs_param_t *param)
     njs_object_prop_t   *prop;
     nxt_lvlhsh_query_t  lhq;
 
-    this = param->object;
+    this = param->this;
 
     if (njs_is_object(this)) {
         lhq.key_hash = NJS_JOIN_HASH;
@@ -493,14 +503,16 @@ njs_array_prototype_join(njs_vm_t *vm, njs_param_t *param)
     nxt_int_t          ret;
     nxt_uint_t         i, n, max;
     njs_array_t        *array;
-    njs_value_t        *value, *values;
+    njs_value_t        *this, *value, *values;
     njs_string_prop_t  separator, string;
 
-    if (!njs_is_array(param->object)) {
+    this = param->this;
+
+    if (!njs_is_array(this)) {
         goto empty;
     }
 
-    array = param->object->data.u.array;
+    array = this->data.u.array;
 
     if (array->length == 0) {
         goto empty;
@@ -604,13 +616,13 @@ njs_array_prototype_concat(njs_vm_t *vm, njs_param_t *param)
     size_t       length;
     uintptr_t    nargs;
     nxt_uint_t   i;
-    njs_value_t  *object, *args, *value;
+    njs_value_t  *this, *args, *value;
     njs_array_t  *array;
 
-    object = param->object;
+    this = param->this;
 
-    if (njs_is_array(object)) {
-        length = object->data.u.array->length;
+    if (njs_is_array(this)) {
+        length = this->data.u.array->length;
 
     } else {
         length = 1;
@@ -637,7 +649,7 @@ njs_array_prototype_concat(njs_vm_t *vm, njs_param_t *param)
     vm->retval.type = NJS_ARRAY;
     vm->retval.data.truth = 1;
 
-    value = njs_array_copy(array->start, object);
+    value = njs_array_copy(array->start, this);
 
     for (i = 0; i < nargs; i++) {
         value = njs_array_copy(value, &args[i]);
@@ -676,20 +688,20 @@ njs_array_prototype_for_each(njs_vm_t *vm, njs_param_t *param)
     uintptr_t         nargs;
     njs_param_t       p;
     njs_array_t       *array;
-    njs_value_t       *object, *args, *func, arguments[3];
+    njs_value_t       *this, *args, *func, arguments[3];
     njs_array_each_t  *each;
 
-    object = param->object;
+    this = param->this;
 
     if (!vm->frame->reentrant) {
         vm->frame->reentrant = 1;
 
-        if (!njs_is_array(object)) {
+        if (!njs_is_array(this)) {
             vm->exception = &njs_exception_type_error;
             return NXT_ERROR;
         }
 
-        array = object->data.u.array;
+        array = this->data.u.array;
         n = njs_array_next(array->start, 0, array->length);
 
         if (n < 0) {
@@ -706,10 +718,10 @@ njs_array_prototype_for_each(njs_vm_t *vm, njs_param_t *param)
     n = each->index;
 
     /* GC: array elt, array */
-    array = object->data.u.array;
+    array = this->data.u.array;
     arguments[0] = array->start[n];
     njs_number_set(&arguments[1], n);
-    arguments[2] = *object;
+    arguments[2] = *this;
 
     n = njs_array_next(array->start, ++n, each->length);
     each->index = n;
@@ -721,7 +733,7 @@ njs_array_prototype_for_each(njs_vm_t *vm, njs_param_t *param)
     nargs = param->nargs;
     args = param->args;
 
-    p.object = (nargs > 1) ? &args[1] : (njs_value_t *) &njs_value_void;
+    p.this = (nargs > 1) ? &args[1] : (njs_value_t *) &njs_value_void;
     p.args = arguments;
     p.nargs = 3;
     p.retval = (njs_index_t) &each->retval;
@@ -739,20 +751,20 @@ njs_array_prototype_some(njs_vm_t *vm, njs_param_t *param)
     nxt_int_t         n;
     njs_param_t       p;
     njs_array_t       *array;
-    njs_value_t       *object, *args, *func, arguments[3];
+    njs_value_t       *this, *args, *func, arguments[3];
     njs_array_each_t  *each;
 
-    object = param->object;
+    this = param->this;
 
     if (!vm->frame->reentrant) {
         vm->frame->reentrant = 1;
 
-        if (!njs_is_array(object)) {
+        if (!njs_is_array(this)) {
             vm->exception = &njs_exception_type_error;
             return NXT_ERROR;
         }
 
-        array = object->data.u.array;
+        array = this->data.u.array;
         n = njs_array_next(array->start, 0, array->length);
         each = njs_native_data(vm->frame);
         each->index = n;
@@ -775,17 +787,17 @@ njs_array_prototype_some(njs_vm_t *vm, njs_param_t *param)
     }
 
     /* GC: array elt, array */
-    array = object->data.u.array;
+    array = this->data.u.array;
     arguments[0] = array->start[n];
     njs_number_set(&arguments[1], n);
-    arguments[2] = *object;
+    arguments[2] = *this;
 
     each->index = njs_array_next(array->start, ++n, each->length);
 
     nargs = param->nargs;
     args = param->args;
 
-    p.object = (nargs > 1) ? &args[1] : (njs_value_t *) &njs_value_void;
+    p.this = (nargs > 1) ? &args[1] : (njs_value_t *) &njs_value_void;
     p.args = arguments;
     p.nargs = 3;
     p.retval = (njs_index_t) &each->retval;
@@ -805,20 +817,20 @@ njs_array_prototype_every(njs_vm_t *vm, njs_param_t *param)
     nxt_int_t         n;
     njs_param_t       p;
     njs_array_t       *array;
-    njs_value_t       *object, *args, *func, arguments[3];
+    njs_value_t       *this, *args, *func, arguments[3];
     njs_array_each_t  *each;
 
-    object = param->object;
+    this = param->this;
 
     if (!vm->frame->reentrant) {
         vm->frame->reentrant = 1;
 
-        if (!njs_is_array(object)) {
+        if (!njs_is_array(this)) {
             vm->exception = &njs_exception_type_error;
             return NXT_ERROR;
         }
 
-        array = object->data.u.array;
+        array = this->data.u.array;
         n = njs_array_next(array->start, 0, array->length);
         each = njs_native_data(vm->frame);
         each->index = n;
@@ -841,17 +853,17 @@ njs_array_prototype_every(njs_vm_t *vm, njs_param_t *param)
     }
 
     /* GC: array elt, array */
-    array = object->data.u.array;
+    array = this->data.u.array;
     arguments[0] = array->start[n];
     njs_number_set(&arguments[1], n);
-    arguments[2] = *object;
+    arguments[2] = *this;
 
     each->index = njs_array_next(array->start, ++n, each->length);
 
     nargs = param->nargs;
     args = param->args;
 
-    p.object = (nargs > 1) ? &args[1] : (njs_value_t *) &njs_value_void;
+    p.this = (nargs > 1) ? &args[1] : (njs_value_t *) &njs_value_void;
     p.args = arguments;
     p.nargs = 3;
     p.retval = (njs_index_t) &each->retval;

diff --git a/njs/njs_boolean.c b/njs/njs_boolean.c
index 56793251c94fd33c0445575f3509147e72e898e5..4080574eac74378d49c7c91beba4721b9b9f7c84 100644 (file)
--- a/njs/njs_boolean.c
+++ b/njs/njs_boolean.c
@@ -79,7 +79,7 @@ njs_boolean_prototype_value_of(njs_vm_t *vm, njs_param_t *param)
 {
     njs_value_t  *value;
 
-    value = param->object;
+    value = param->this;
 
     if (value->type != NJS_BOOLEAN) {
 
@@ -103,7 +103,7 @@ njs_boolean_prototype_to_string(njs_vm_t *vm, njs_param_t *param)
 {
     njs_value_t  *value;
 
-    value = param->object;
+    value = param->this;
 
     if (value->type != NJS_BOOLEAN) {
 

diff --git a/njs/njs_function.c b/njs/njs_function.c
index b452aac5e9f332ac6401549cbcb5fc45f88e7bc4..dfe81863c22307e866da52018812c7b745f230e1 100644 (file)
--- a/njs/njs_function.c
+++ b/njs/njs_function.c
@@ -179,7 +179,7 @@ njs_function_frame(njs_vm_t *vm, njs_function_t *function, njs_param_t *param,
 
     frame->local = &args[nargs];
 
-    *args++ = *param->object;
+    *args++ = *param->this;
     nargs--;
 
     arguments = param->args;
@@ -264,16 +264,14 @@ njs_function_prototype_call(njs_vm_t *vm, njs_param_t *param)
     uintptr_t                   nargs;
     njs_ret_t                   ret;
     njs_param_t                 p;
-    njs_value_t                 *value;
     njs_function_t              *function;
     njs_vmcode_function_call_t  *call;
 
-    p.object = &param->args[0];
+    p.this = &param->args[0];
     p.args = &param->args[1];
 
     nargs = param->nargs;
-    value = param->object;
-    function = value->data.u.function;
+    function = param->this->data.u.function;
 
     if (function->native) {
 
@@ -292,7 +290,7 @@ njs_function_prototype_call(njs_vm_t *vm, njs_param_t *param)
         nargs--;
 
     } else {
-        p.object = (njs_value_t *) &njs_value_void;
+        p.this = (njs_value_t *) &njs_value_void;
     }
 
     p.nargs = nargs;
@@ -319,12 +317,12 @@ njs_function_prototype_apply(njs_vm_t *vm, njs_param_t *param)
     njs_ret_t                   ret;
     njs_param_t                 p;
     njs_array_t                 *array;
-    njs_value_t                 *value, *args;
+    njs_value_t                 *args;
     njs_function_t              *function;
     njs_vmcode_function_call_t  *code;
 
     args = param->args;
-    p.object = &args[0];
+    p.this = &args[0];
 
     nargs = param->nargs;
     p.nargs = nargs;
@@ -339,8 +337,7 @@ njs_function_prototype_apply(njs_vm_t *vm, njs_param_t *param)
         p.nargs = array->length;
     }
 
-    value = param->object;
-    function = value->data.u.function;
+    function = param->this->data.u.function;
 
     if (function->native) {
         p.retval = param->retval;
@@ -363,7 +360,7 @@ njs_function_prototype_apply(njs_vm_t *vm, njs_param_t *param)
             p.nargs = 0;
 
         } else {
-            p.object = (njs_value_t *) &njs_value_void;
+            p.this = (njs_value_t *) &njs_value_void;
         }
     }
 
@@ -400,7 +397,7 @@ njs_function_prototype_bind(njs_vm_t *vm, njs_param_t *param)
         nxt_lvlhsh_init(&bound->object.shared_hash);
         bound->object.__proto__ = &vm->prototypes[NJS_PROTOTYPE_FUNCTION];
         bound->args_offset = 1;
-        bound->u.lambda = param->object->data.u.function->u.lambda;
+        bound->u.lambda = param->this->data.u.function->u.lambda;
 
         vm->retval.data.u.function = bound;
         vm->retval.type = NJS_FUNCTION;

diff --git a/njs/njs_number.c b/njs/njs_number.c
index 89cefc0390982572fdfa84f8cb62360ac95b3072..6b44b150a1c441d41a76fc5945f646d40039c54c 100644 (file)
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -274,7 +274,7 @@ njs_number_prototype_value_of(njs_vm_t *vm, njs_param_t *param)
 {
     njs_value_t  *value;
 
-    value = param->object;
+    value = param->this;
 
     if (value->type != NJS_NUMBER) {
 
@@ -298,7 +298,7 @@ njs_number_prototype_to_string(njs_vm_t *vm, njs_param_t *param)
 {
     njs_value_t  *value;
 
-    value = param->object;
+    value = param->this;
 
     if (value->type != NJS_NUMBER) {
 

diff --git a/njs/njs_object.c b/njs/njs_object.c
index df516615bca1a0490e130d550be31ed04975a16d..f538217d1c855787b1a68c5c4aee59782c6c431d 100644 (file)
--- a/njs/njs_object.c
+++ b/njs/njs_object.c
@@ -174,7 +174,7 @@ njs_object_method(njs_vm_t *vm, njs_param_t *param, nxt_lvlhsh_query_t *lhq)
 {
     njs_object_prop_t  *prop;
 
-    prop = njs_object_property(vm, param->object->data.u.object, lhq);
+    prop = njs_object_property(vm, param->this->data.u.object, lhq);
 
     if (nxt_fast_path(prop != NULL)) {
         return njs_function_apply(vm, &prop->value, param);
@@ -512,7 +512,7 @@ found:
 static njs_ret_t
 njs_object_prototype_value_of(njs_vm_t *vm, njs_param_t *param)
 {
-    vm->retval = *param->object;
+    vm->retval = *param->this;
 
     return NXT_OK;
 }
@@ -541,7 +541,7 @@ njs_ret_t
 njs_object_prototype_to_string(njs_vm_t *vm, njs_param_t *param)
 {
     int32_t       index;
-    njs_value_t   *value;
+    njs_value_t   *this;
     njs_object_t  *prototype;
 
     static const njs_value_t  *class_name[] = {
@@ -566,11 +566,11 @@ njs_object_prototype_to_string(njs_vm_t *vm, njs_param_t *param)
         &njs_object_regexp_string,
     };
 
-    value = param->object;
-    index = value->type;
+    this = param->this;
+    index = this->type;
 
-    if (njs_is_object(value)) {
-        prototype = value->data.u.object;
+    if (njs_is_object(this)) {
+        prototype = this->data.u.object;
 
         do {
             index = prototype - vm->prototypes;

diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index 2415bfc667f86cb2f7ba1195e416bac6980b5f83..8351ac234ad0c548e039a51f1bb438d46dfbcba2 100644 (file)
--- a/njs/njs_regexp.c
+++ b/njs/njs_regexp.c
@@ -439,7 +439,7 @@ njs_regexp_prototype_to_string(njs_vm_t *vm, njs_param_t *param)
     size_t                length, size;
     njs_regexp_pattern_t  *pattern;
 
-    pattern = param->object->data.u.regexp->pattern;
+    pattern = param->this->data.u.regexp->pattern;
     source = pattern->source;
 
     size = strlen((char *) source);
@@ -468,7 +468,7 @@ njs_regexp_prototype_test(njs_vm_t *vm, njs_param_t *param)
             (void) njs_string_prop(&string, &val);
 
             n = (string.length != 0 && string.length != string.size);
-            pattern = param->object->data.u.regexp->pattern;
+            pattern = param->this->data.u.regexp->pattern;
 
             if (pattern->code[n] != NULL) {
                 ret = pcre_exec(pattern->code[n], pattern->extra[n],
@@ -505,7 +505,7 @@ njs_regexp_prototype_exec(njs_vm_t *vm, njs_param_t *param)
     njs_regexp_pattern_t  *pattern;
 
     if (param->nargs != 0) {
-        regexp = param->object->data.u.regexp;
+        regexp = param->this->data.u.regexp;
 
         ret = njs_value_to_string(vm, &regexp->string, &param->args[0]);
 

diff --git a/njs/njs_string.c b/njs/njs_string.c
index 5416b9c552f31984d5029a1a9e565aef3f067f71..9af2d0babf45e6ff90bcda32d373d59fb302be60 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -439,23 +439,23 @@ njs_string_cmp(const njs_value_t *v1, const njs_value_t *v2)
 static njs_ret_t
 njs_string_prototype_value_of(njs_vm_t *vm, njs_param_t *param)
 {
-    njs_value_t         *value;
-    njs_object_value_t  *object;
+    njs_value_t  *value;
 
-    value = param->object;
+    value = param->this;
 
-    if (value->type == NJS_STRING) {
-        vm->retval = *value;
+    if (value->type != NJS_STRING) {
 
-    } else if (value->type == NJS_OBJECT_STRING) {
-        object = value->data.u.object_value;
-        vm->retval = object->value;
+        if (value->type == NJS_OBJECT_STRING) {
+            value = &value->data.u.object_value->value;
 
-    } else {
-        vm->exception = &njs_exception_type_error;
-        return NXT_ERROR;
+        } else {
+            vm->exception = &njs_exception_type_error;
+            return NXT_ERROR;
+        }
     }
 
+    vm->retval = *value;
+
     return NXT_OK;
 }
 
@@ -468,20 +468,20 @@ njs_string_prototype_concat(njs_vm_t *vm, njs_param_t *param)
     uintptr_t          nargs;
     njs_ret_t          ret;
     nxt_uint_t         i;
-    njs_value_t        *object, *args, *values;
+    njs_value_t        *this, *args, *values;
     njs_string_prop_t  string;
 
-    object = param->object;
+    this = param->this;
     nargs = param->nargs;
 
     if (nargs == 0) {
-        njs_string_copy(&vm->retval, object);
+        njs_string_copy(&vm->retval, this);
         return NXT_OK;
     }
 
     values = alloca((nargs + 1) * sizeof(njs_value_t));
 
-    ret = njs_value_to_string(vm, &values[0], object);
+    ret = njs_value_to_string(vm, &values[0], this);
     if (nxt_slow_path(ret != NXT_OK)) {
         return NXT_ERROR;
     }
@@ -589,7 +589,7 @@ njs_string_prototype_to_utf8(njs_vm_t *vm, njs_param_t *param)
     njs_slice_prop_t   slice;
     njs_string_prop_t  string;
 
-    (void) njs_string_prop(&string, param->object);
+    (void) njs_string_prop(&string, param->this);
 
     string.length = 0;
     slice.string_length = string.size;
@@ -736,7 +736,7 @@ njs_string_prototype_substring(njs_vm_t *vm, njs_param_t *param)
     njs_slice_prop_t   slice;
     njs_string_prop_t  string;
 
-    length = njs_string_prop(&string, param->object);
+    length = njs_string_prop(&string, param->this);
 
     slice.string_length = length;
     start = 0;
@@ -788,7 +788,7 @@ njs_string_prototype_substr(njs_vm_t *vm, njs_param_t *param)
     njs_slice_prop_t   slice;
     njs_string_prop_t  string;
 
-    length = njs_string_prop(&string, param->object);
+    length = njs_string_prop(&string, param->this);
 
     slice.string_length = length;
     start = 0;
@@ -826,7 +826,7 @@ njs_string_prototype_char_at(njs_vm_t *vm, njs_param_t *param)
     njs_slice_prop_t   slice;
     njs_string_prop_t  string;
 
-    slice.string_length = njs_string_prop(&string, param->object);
+    slice.string_length = njs_string_prop(&string, param->this);
 
     start = 0;
     length = 1;
@@ -850,7 +850,7 @@ static nxt_noinline void
 njs_string_slice_prop(njs_param_t *param, njs_string_prop_t *string,
     njs_slice_prop_t *slice)
 {
-    slice->string_length = njs_string_prop(string, param->object);
+    slice->string_length = njs_string_prop(string, param->this);
 
     njs_string_slice_params(param, slice);
 }
@@ -983,7 +983,7 @@ njs_string_prototype_char_code_at(njs_vm_t *vm, njs_param_t *param)
     const u_char       *start, *end;
     njs_string_prop_t  string;
 
-    length = njs_string_prop(&string, param->object);
+    length = njs_string_prop(&string, param->this);
 
     index = 0;
 
@@ -1039,7 +1039,7 @@ njs_string_prototype_index_of(njs_vm_t *vm, njs_param_t *param)
             }
         }
 
-        index = njs_string_index_of(vm, param->object, &args[0], start);
+        index = njs_string_index_of(vm, param->this, &args[0], start);
     }
 
     njs_number_set(&vm->retval, index);
@@ -1073,7 +1073,7 @@ njs_string_prototype_last_index_of(njs_vm_t *vm, njs_param_t *param)
         ret = 0;
 
         for ( ;; ) {
-            ret = njs_string_index_of(vm, param->object, &args[0], ret);
+            ret = njs_string_index_of(vm, param->this, &args[0], ret);
 
             if (ret < 0 || ret >= last) {
                 break;
@@ -1259,7 +1259,7 @@ njs_string_prototype_search(njs_vm_t *vm, njs_param_t *param)
 
         index = -1;
 
-        (void) njs_string_prop(&string, param->object);
+        (void) njs_string_prop(&string, param->this);
 
         n = (string.length != 0 && string.length != string.size);
 
@@ -1308,8 +1308,8 @@ njs_string_prototype_match(njs_vm_t *vm, njs_param_t *param)
          * string.match(regexp) is the same as regexp.exec(string)
          * if the regexp has no global flag.
          */
-        param->args = param->object;
-        param->object = args;
+        param->args = param->this;
+        param->this = args;
         param->nargs = 1;
 
         return njs_regexp_prototype_exec(vm, param);
@@ -1317,7 +1317,7 @@ njs_string_prototype_match(njs_vm_t *vm, njs_param_t *param)
 
     vm->retval = njs_value_null;
 
-    (void) njs_string_prop(&string, param->object);
+    (void) njs_string_prop(&string, param->this);
 
     utf8 = 0;
     n = 0;
@@ -1457,7 +1457,7 @@ njs_value_to_string(njs_vm_t *vm, njs_value_t *dst, const njs_value_t *src)
         prop = njs_object_property(vm, &src->data.u.array->object, &lhq);
 
         if (nxt_fast_path(prop != NULL)) {
-            param.object = (njs_value_t *) src;
+            param.this = (njs_value_t *) src;
             param.args = NULL;
             param.nargs = 0;
             param.retval = (njs_index_t) dst;

diff --git a/njs/njs_vm.c b/njs/njs_vm.c
index 9c48f5a7803f829eef6e71f423ca75d3a8d440ca..7860520f6f17d9cef29b24c399ef5a9bba00bc09 100644 (file)
--- a/njs/njs_vm.c
+++ b/njs/njs_vm.c
@@ -2090,10 +2090,10 @@ njs_vmcode_function_frame(njs_vm_t *vm, njs_value_t *invld, njs_value_t *name)
             val.data.u.object = object;
             val.type = NJS_OBJECT;
             val.data.truth = 1;
-            param.object = &val;
+            param.this = &val;
 
         } else {
-            param.object = (njs_value_t *) &njs_value_void;
+            param.this = (njs_value_t *) &njs_value_void;
         }
 
         param.args = NULL;
@@ -2141,7 +2141,7 @@ njs_vmcode_method_frame(njs_vm_t *vm, njs_value_t *name, njs_value_t *object)
             function = prop->value.data.u.function;
 
             if (!function->native) {
-                param.object = object;
+                param.this = object;
                 param.args = NULL;
                 param.nargs = method->code.nargs;
 
@@ -2226,7 +2226,7 @@ njs_vmcode_function_call(njs_vm_t *vm, njs_value_t *invld, njs_value_t *retval)
     param.nargs = call->code.nargs - 1;
     args = vm->scopes[NJS_SCOPE_CALLEE_ARGUMENTS];
     param.args = args;
-    param.object = args - 1;
+    param.this = args - 1;
 
     ret = vm->frame->u.native(vm, &param);
     /*
@@ -2606,7 +2606,7 @@ njs_primitive_value(njs_vm_t *vm, njs_value_t *value, nxt_uint_t hint)
                     prop = njs_object_property(vm, value->data.u.object, &lhq);
 
                     if (nxt_fast_path(prop != NULL)) {
-                        param.object = value;
+                        param.this = value;
                         param.retval = (njs_index_t) retval;
                         param.args = NULL;
                         param.nargs = 0;

diff --git a/njs/njscript.h b/njs/njscript.h
index 8cd238a6484eb87aca5571cc5b6f957154c9e732..f412d2eb1bca8d357492f266077a1a87f571c059 100644 (file)
--- a/njs/njscript.h
+++ b/njs/njscript.h
@@ -15,7 +15,7 @@ typedef union  njs_value_s          njs_value_t;
 typedef struct njs_vm_shared_s      njs_vm_shared_t;
 
 typedef struct {
-    njs_value_t                     *object;
+    njs_value_t                     *this;
     njs_value_t                     *args;
     uintptr_t                       nargs;
     njs_index_t                     retval;

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 6af272c18a6a52747b0151564cc401c445cbcbf2..fdabefa503e6b34a0fa19ed99d5ea7d07b98925f 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -3267,7 +3267,7 @@ njs_unit_test_method_external(njs_vm_t *vm, njs_param_t *param)
                                     &next);
 
         if (ret == NXT_OK && s.len == 3 && memcmp(s.data, "YES", 3) == 0) {
-            r = njs_value_data(param->object);
+            r = njs_value_data(param->this);
             njs_vm_return_string(vm, r->uri.data, r->uri.len);
 
             return NXT_OK;