Logical assignment operators added

Author: ackava

YantraJS.Core.Tests/Generator/Files/es6/Syntax/assign/assign-operators.js

@@ -0,0 +1,36 @@
+var b = { b: 2 };
+b.b += 2;
+b.b &&= 1;
+assert.strictEqual('{"b":1}', JSON.stringify(b));
+
+b.b = 0;
+b.b &&= 1;
+assert.strictEqual('{"b":0}', JSON.stringify(b));
+
+let called = false;
+function getValue(i) {
+    called = true;
+    return i;
+}
+
+b.b = 0;
+b.b &&= getValue(1);
+assert.strictEqual(false, called);
+assert.strictEqual('{"b":0}', JSON.stringify(b));
+
+b.b = 1;
+b.b &&= getValue(1);
+assert.strictEqual(true, called);
+assert.strictEqual('{"b":1}', JSON.stringify(b));
+
+called = false;
+b.b = 0;
+b.b ||= getValue(1);
+assert.strictEqual(true, called);
+assert.strictEqual('{"b":1}', JSON.stringify(b));
+
+called = false;
+b.b = 1;
+b.b ||= getValue(1);
+assert.strictEqual(false, called);
+assert.strictEqual('{"b":1}', JSON.stringify(b));

YantraJS.Core/FastParser/FastScanner.cs

@@ -372,7 +372,11 @@ private FastToken _ReadToken()
                 case '&':
                     switch (Consume()) {
                         case '&':
-                            Consume();
+                            if(Consume() == '=')
+                            {
+                                Consume();
+                                return state.Commit(TokenTypes.AssignBooleanAnd);
+                            }
                             return state.Commit(TokenTypes.BooleanAnd);
                         case '=':
                             Consume();
@@ -383,7 +387,11 @@ private FastToken _ReadToken()
                     switch (Consume())
                     {
                         case '|':
-                            Consume();
+                            if(Consume() == '=')
+                            {
+                                Consume();
+                                return state.Commit(TokenTypes.AssignBooleanOr);
+                            }
                             return state.Commit(TokenTypes.BooleanOr);
                         case '=':
                             Consume();

YantraJS.Core/FastParser/TokenTypes.cs

@@ -63,6 +63,8 @@ public enum TokenTypes
         AssignLeftShift,
         AssignCoalesce,
         AssignPower,
+        AssignBooleanAnd,
+        AssignBooleanOr,
 
         // not used...
         EndAssignTokens,

YantraJS.Core/Utils/BinaryOperation.cs

@@ -113,6 +113,10 @@ public static Expression Assign(Expression left, Expression right, TokenTypes as
                     return Assign(left, right);
                 case TokenTypes.AssignAdd:
                     return Assign(left, ExpHelper.JSValueBuilder.Add(left, right));
+                case TokenTypes.AssignBooleanAnd:
+                    return Assign(left, JSValueBuilder.LogicalAnd(left, right));
+                case TokenTypes.AssignBooleanOr:
+                    return Assign(left, JSValueBuilder.LogicalOr(left, right));
             }
 
             var leftDouble = ExpHelper.JSValueBuilder.DoubleValue(left);