Added missing bit operations (#31)

lolleko · Perryvw · commit 3bd5d04010cb · 2018-02-15T21:23:30.000+01:00
* Added missing bit operations

* Added test cases for shift operators
diff --git a/dist/Transpiler.js b/dist/Transpiler.js
@@ -443,9 +443,33 @@ var LuaTranspiler = /** @class */ (function () {
             case ts.SyntaxKind.AmpersandToken:
                 result = "bit.band(" + lhs + "," + rhs + ")";
                 break;
+            case ts.SyntaxKind.AmpersandEqualsToken:
+                result = lhs + "=bit.band(" + lhs + "," + rhs + ")";
+                break;
             case ts.SyntaxKind.BarToken:
                 result = "bit.bor(" + lhs + "," + rhs + ")";
                 break;
+            case ts.SyntaxKind.BarEqualsToken:
+                result = lhs + "=bit.bor(" + lhs + "," + rhs + ")";
+                break;
+            case ts.SyntaxKind.LessThanLessThanToken:
+                result = "bit.lshift(" + lhs + "," + rhs + ")";
+                break;
+            case ts.SyntaxKind.LessThanLessThanEqualsToken:
+                result = lhs + "=bit.lshift(" + lhs + "," + rhs + ")";
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanToken:
+                result = "bit.arshift(" + lhs + "," + rhs + ")";
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanEqualsToken:
+                result = lhs + "=bit.arshift(" + lhs + "," + rhs + ")";
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanGreaterThanToken:
+                result = "bit.rshift(" + lhs + "," + rhs + ")";
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken:
+                result = lhs + "=bit.rshift(" + lhs + "," + rhs + ")";
+                break;
             case ts.SyntaxKind.PlusToken:
                 // Replace string + with ..
                 var typeLeft = this.checker.getTypeAtLocation(node.left);
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -486,9 +486,33 @@ export class LuaTranspiler {
             case ts.SyntaxKind.AmpersandToken:
                 result = `bit.band(${lhs},${rhs})`;
                 break;
+            case ts.SyntaxKind.AmpersandEqualsToken:
+                result = `${lhs}=bit.band(${lhs},${rhs})`;
+                break;
             case ts.SyntaxKind.BarToken:
                 result = `bit.bor(${lhs},${rhs})`;
                 break;
+            case ts.SyntaxKind.BarEqualsToken:
+                result = `${lhs}=bit.bor(${lhs},${rhs})`;
+                break;
+            case ts.SyntaxKind.LessThanLessThanToken:
+                result = `bit.lshift(${lhs},${rhs})`;
+                break;
+            case ts.SyntaxKind.LessThanLessThanEqualsToken:
+                result = `${lhs}=bit.lshift(${lhs},${rhs})`;
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanToken:
+                result = `bit.arshift(${lhs},${rhs})`;
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanEqualsToken:
+                result = `${lhs}=bit.arshift(${lhs},${rhs})`;
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanGreaterThanToken:
+                result = `bit.rshift(${lhs},${rhs})`;
+                break;
+            case ts.SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken:
+                result = `${lhs}=bit.rshift(${lhs},${rhs})`;
+                break;
             case ts.SyntaxKind.PlusToken:
                 // Replace string + with ..
                 const typeLeft = this.checker.getTypeAtLocation(node.left);
diff --git a/test/unit/expressions.spec.ts b/test/unit/expressions.spec.ts
@@ -39,7 +39,15 @@ export class ExpressionTests {
     @TestCase("a*=b", "a=a*b")
     @TestCase("a/=b", "a=a/b")
     @TestCase("a&b", "bit.band(a,b)")
+    @TestCase("a&=b", "a=bit.band(a,b)")
     @TestCase("a|b", "bit.bor(a,b)")
+    @TestCase("a|=b", "a=bit.bor(a,b)")
+    @TestCase("a<<b", "bit.lshift(a,b)")
+    @TestCase("a<<=b", "a=bit.lshift(a,b)")
+    @TestCase("a>>b", "bit.arshift(a,b)")
+    @TestCase("a>>=b", "a=bit.arshift(a,b)")
+    @TestCase("a>>>b", "bit.rshift(a,b)")
+    @TestCase("a>>>=b", "a=bit.rshift(a,b)")
     @Test("Binary expressions overridden operators")
     public binaryOperatorOverride(input: string, lua: string) {
         Expect(transpileString(input)).toBe(lua);
@@ -61,4 +69,4 @@ export class ExpressionTests {
     public conditional(input: string, lua: string) {
         Expect(transpileString(input)).toBe(lua);
     }
-}
+}
