From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Wed, 28 Nov 2018 12:47:05 +0000 (+0300)
Subject: Fixed assignment expression from compound assignment.
X-Git-Tag: 0.2.7~18
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=b7816bb670dbf8f1a8446ccefe32953398379747;p=njs.git

Fixed assignment expression from compound assignment.
---

diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c
index f23f9dfd..d4a5c0a7 100644
--- a/njs/njs_parser_expression.c
+++ b/njs/njs_parser_expression.c
@@ -237,7 +237,7 @@ 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_conditional_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/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 850f442d..b6011a4e 100644
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -597,6 +597,15 @@ static njs_unit_test_t  njs_test[] =
     { nxt_string("var a, b = (a = [2]) * (3 * 4); a +' '+ b"),
       nxt_string("2 24") },
 
+    { nxt_string("var a = 1; var b = a += 1; b"),
+      nxt_string("2") },
+
+    { nxt_string("var a = 1; var b = a -= 1; b"),
+      nxt_string("0") },
+
+    { nxt_string("var a = 1; var b = a <<= 1; b"),
+      nxt_string("2") },
+
     /* 3 address operation and side effect. */
 
     { nxt_string("var a = 1; function f(x) { a = x; return 2 }; a+f(5)+' '+a"),