From 040e7af22f1166f9d202dc4fa736279e5dde33d9 Mon Sep 17 00:00:00 2001 From: hongzhidao Date: Fri, 5 Apr 2019 20:59:15 +0800 Subject: [PATCH] Removed unnecessary njs_parser_var_expression(). --- njs/njs_parser.c | 4 +-- njs/njs_parser.h | 2 -- njs/njs_parser_expression.c | 53 ------------------------------------- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/njs/njs_parser.c b/njs/njs_parser.c index 4d294a7b..12608cd5 100644 --- 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 62ce9405..95fb681a 100644 --- 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 72f54900..ddd0a5fa 100644 --- 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) -- 2.47.3