Removed unnecessary njs_parser_var_expression().

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index 4d294a7b6c00f92ad49c36f3e0b448404ef557c0..12608cd52299122e539a65621fff63e05cde4897 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -1055,7 +1055,7 @@ njs_parser_var_statement(njs_vm_t *vm, njs_parser_t *parser)
                 return token;
             }
 
-            token = njs_parser_var_expression(vm, parser, token);
+            token = njs_parser_assignment_expression(vm, parser, token);
             if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) {
                 return token;
             }
@@ -1501,7 +1501,7 @@ njs_parser_for_var_statement(njs_vm_t *vm, njs_parser_t *parser)
                 return token;
             }
 
-            token = njs_parser_var_expression(vm, parser, token);
+            token = njs_parser_assignment_expression(vm, parser, token);
             if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) {
                 return token;
             }

diff --git a/njs/njs_parser.h b/njs/njs_parser.h
index 62ce9405fe0b25ca4bad8ed6f43f7197e3f75aec..95fb681ac535d1a4c0d0632dfaa14c4ca1c5920d 100644 (file)
--- a/njs/njs_parser.h
+++ b/njs/njs_parser.h
@@ -78,8 +78,6 @@ nxt_int_t njs_parser(njs_vm_t *vm, njs_parser_t *parser,
     njs_parser_t *prev);
 njs_token_t njs_parser_expression(njs_vm_t *vm, njs_parser_t *parser,
     njs_token_t token);
-njs_token_t njs_parser_var_expression(njs_vm_t *vm, njs_parser_t *parser,
-    njs_token_t token);
 njs_token_t njs_parser_assignment_expression(njs_vm_t *vm,
     njs_parser_t *parser, njs_token_t token);
 njs_token_t njs_parser_function_expression(njs_vm_t *vm, njs_parser_t *parser);

diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c
index 72f54900174026263e21175bdbe86fb159b43b58..ddd0a5faf01179ed03decf4fafcd7fa4c31960ef 100644 (file)
--- a/njs/njs_parser_expression.c
+++ b/njs/njs_parser_expression.c
@@ -210,59 +210,6 @@ njs_parser_expression(njs_vm_t *vm, njs_parser_t *parser, njs_token_t token)
 }
 
 
-njs_token_t
-njs_parser_var_expression(njs_vm_t *vm, njs_parser_t *parser, njs_token_t token)
-{
-    njs_parser_node_t       *node;
-    njs_vmcode_operation_t  operation;
-
-    token = njs_parser_assignment_expression(vm, parser, token);
-    if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) {
-        return token;
-    }
-
-    for ( ;; ) {
-        switch (token) {
-
-        case NJS_TOKEN_ASSIGNMENT:
-            nxt_thread_log_debug("JS: =");
-            operation = njs_vmcode_move;
-            break;
-
-        default:
-            return token;
-        }
-
-        if (!njs_parser_is_lvalue(parser->node)) {
-            njs_parser_ref_error(vm, parser,
-                                 "Invalid left-hand side in assignment");
-            return NJS_TOKEN_ILLEGAL;
-        }
-
-        node = njs_parser_node_new(vm, parser, token);
-        if (nxt_slow_path(node == NULL)) {
-            return NJS_TOKEN_ERROR;
-        }
-
-        node->u.operation = operation;
-        node->left = parser->node;
-
-        token = njs_parser_token(vm, parser);
-        if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) {
-            return token;
-        }
-
-        token = njs_parser_var_expression(vm, parser, token);
-        if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) {
-            return token;
-        }
-
-        node->right = parser->node;
-        parser->node = node;
-    }
-}
-
-
 static njs_token_t
 njs_parser_any_expression(njs_vm_t *vm, njs_parser_t *parser,
     const njs_parser_expression_t *expr, njs_token_t token)