Merge pull request #2215 from organization/feat/assign-bitwise-operators

#1103 - Added support syntax assign-bitwise operators
zephir-lang · Apr 21, 2021 · 9378772 · 9378772
2 parents cc2e91a + c38d4b3
commit 9378772
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 - Fixed nullable array [#1094](https://github.com/zephir-lang/zephir/issues/1094)
 - Fixed default value detection with Reflection (only PHP 8.0) [#1134](https://github.com/zephir-lang/zephir/issues/1134)
 
+### Added
+- Added support syntax assign-bitwise operators [#1103](https://github.com/zephir-lang/zephir/issues/1103)
+
 ## [0.13.2] - 2021-04-10
 ### Fixed
 - Fixed default value of nullable string parameter [#2180](https://github.com/zephir-lang/zephir/issues/2180)

diff --git a/Library/Expression/Builder/Operators/AssignVariableOperator.php b/Library/Expression/Builder/Operators/AssignVariableOperator.php
@@ -39,6 +39,23 @@ class AssignVariableOperator extends AbstractOperator
     // %=
     const OPERATOR_MOD = 'mod-assign';
 
+    // &=
+    const OPERATOR_BITWISE_AND = 'bitwise-and-assign';
+
+    // |=
+    const OPERATOR_BITWISE_OR = 'bitwise-or-assign';
+
+    // ^=
+    const OPERATOR_BITWISE_XOR = 'bitwise-xor-assign';
+
+    // <<=
+    const OPERATOR_BITWISE_SHIFTLEFT = 'bitwise-shiftleft-assign';
+
+    // >>=
+    const OPERATOR_BITWISE_SHIFTRIGHT = 'bitwise-shiftright-assign';
+
+
+
     private $variable;
     private $operator = self::OPERATOR_ASSIGN;
     private $expression;

diff --git a/Library/Statements/LetStatement.php b/Library/Statements/LetStatement.php
@@ -37,6 +37,9 @@
 use Zephir\Statements\Let\StaticPropertySub as LetStaticPropertySub;
 use Zephir\Statements\Let\Variable as LetVariable;
 use Zephir\Statements\Let\VariableAppend as LetVariableAppend;
+use Zephir\Expression\Builder\BuilderFactory;
+use Zephir\Expression\Builder\Operators\AssignVariableOperator;
+use Zephir\Expression\Builder\Operators\BinaryOperator;
 
 /**
  * LetStatement.
@@ -88,6 +91,12 @@ public function compile(CompilationContext $compilationContext)
              * Incr/Decr assignments don't require an expression
              */
             if (isset($assignment['expr'])) {
+                /**
+                 * Replace on direct-assignment if this bitwise-assignment
+                 * TODO: Replace on supported native bitwise-assignment
+                 */
+                $assignment = $this->replaceAssignBitwiseOnDirect($assignment);
+
                 $expr = new Expression($assignment['expr']);
 
                 switch ($assignment['assign-type']) {
@@ -256,4 +265,52 @@ public function compile(CompilationContext $compilationContext)
             }
         }
     }
+
+    /**
+     * @param array $assignment
+     * @return array
+     * @throws CompilerException
+     */
+    protected function replaceAssignBitwiseOnDirect(array $assignment): array
+    {
+        switch ($assignment['operator']) {
+            case AssignVariableOperator::OPERATOR_BITWISE_AND:
+                $operator = BinaryOperator::OPERATOR_BITWISE_AND;
+                break;
+
+            case AssignVariableOperator::OPERATOR_BITWISE_OR:
+                $operator = BinaryOperator::OPERATOR_BITWISE_OR;
+                break;
+
+            case AssignVariableOperator::OPERATOR_BITWISE_XOR:
+                $operator = BinaryOperator::OPERATOR_BITWISE_XOR;
+                break;
+
+            case AssignVariableOperator::OPERATOR_BITWISE_SHIFTLEFT:
+                $operator = BinaryOperator::OPERATOR_BITWISE_SHIFT_LEFT;
+                break;
+
+            case AssignVariableOperator::OPERATOR_BITWISE_SHIFTRIGHT:
+                $operator = BinaryOperator::OPERATOR_BITWISE_SHIFT_RIGHT;
+                break;
+
+            default:
+                return $assignment;
+        }
+
+        if ($assignment['assign-type'] !== 'variable') {
+            throw new CompilerException("Operator '" . $assignment['operator'] . "' is not supported assign-type: " . $assignment['assign-type']);
+        }
+
+        $builderExpr = BuilderFactory::getInstance();
+
+        $leftExpression = $builderExpr->variable($assignment['variable']);
+
+        $assignment['expr'] = $builderExpr->operators()
+            ->binary($operator, $leftExpression, $builderExpr->raw($assignment['expr']))
+            ->build();
+
+        $assignment['operator'] = AssignVariableOperator::OPERATOR_ASSIGN;
+        return $assignment;
+    }
 }
diff --git a/stub/assign.zep b/stub/assign.zep
@@ -911,6 +911,36 @@ class Assign
 		return this->myArray;
 	}
 
+	public function testAssignBitwiseX(int a, int b)
+	{
+		var op, i;
+		var result = [];
+
+		for op in ["or", "and", "xor", "shiftleft", "shiftright"] {
+			let i = a;
+			switch op {
+				case "or":
+					let i |= b;
+					break;
+				case "and":
+					let i &= b;
+					break;
+				case "xor":
+					let i ^= b;
+					break;
+				case "shiftleft":
+					let i <<= b;
+					break;
+				case "shiftright":
+					let i >>= b;
+					break;
+			}
+			let result[op] = i;
+		}
+
+		return result;
+	}
+
 	/**
 	 * @link https://github.com/zephir-lang/zephir/issues/725
 	 */
@@ -942,18 +972,18 @@ class Assign
 
 	public function issue597()
 	{
-	    if isset _POST["a"] {
-            if isset _GET["r"] {
-                // Nothing here
-            }
-        }
+		if isset _POST["a"] {
+			if isset _GET["r"] {
+				// Nothing here
+			}
+		}
 
-        if isset _GET["s"] {
-            var s;
-            let s = _GET["s"] * 5;
-            let _GET["s"] = s;
+		if isset _GET["s"] {
+			var s;
+			let s = _GET["s"] * 5;
+			let _GET["s"] = s;
 
-            return s;
-        }
+			return s;
+		}
 	}
 }
diff --git a/tests/Extension/AssignTest.php b/tests/Extension/AssignTest.php
@@ -140,6 +140,7 @@ public function propertyAssignProvider(): array
             [$arry,                       'testStaticPropertyArrayMulti4'],
             [['test', 1, 1.5, false, []], 'testStaticPropertyArrayAppend'],
             [['a' => true, 'b' => false], 'testArrayBoolExpressionAssign'],
+            [['or' => 901, 'and' => 4, 'xor' => 897, 'shiftleft' => 28800, 'shiftright' => 28], 'testAssignBitwiseX', [900, 5]],
         ];
     }