Add tests for and fix assignment operator to binary operator conversi…

…on in expression analyser
TimeToogo · Sep 13, 2014 · 14e9e8a · 14e9e8a
1 parent 834caac
commit 14e9e8a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/Source/Analysis/ExpressionAnalyser.php b/Source/Analysis/ExpressionAnalyser.php
@@ -74,17 +74,19 @@ public function visitAssignment(O\AssignmentExpression $expression)
         $assignTo = $expression->getAssignTo();
         $assignmentValue = $expression->getAssignmentValue();
 
-        //$this->walk($assignTo);
         $this->walk($assignmentValue);
 
         $operator = $expression->getOperator();
         if ($operator === O\Operators\Assignment::EQUAL) {
             $this->analysisContext->setExpressionType($assignTo, $this->analysis[$assignmentValue]);
+            $this->analysis[$expression] = $this->analysis[$assignmentValue];
         } elseif ($operator === O\Operators\Assignment::EQUAL_REFERENCE) {
             $this->analysisContext->removeExpressionType($assignTo);
             $this->analysisContext->setExpressionType($assignTo, $this->analysis[$assignmentValue]);
             $this->analysisContext->createReference($assignTo, $assignmentValue);
+            $this->analysis[$expression] = $this->analysis[$assignmentValue];
         } else {
+            $this->walk($assignTo);
             $binaryOperation             = $this->typeSystem->getBinaryOperation(
                     $this->analysis[$assignTo],
                     O\Operators\Assignment::toBinaryOperator($operator),

diff --git a/Tests/Integration/Analysis/BasicExpressionAnalysisTest.php b/Tests/Integration/Analysis/BasicExpressionAnalysisTest.php
@@ -359,6 +359,51 @@ function () { '123' / 24; },
         }
     }
 
+    public function testAssignmentOperators()
+    {
+        $asserts = [
+                INativeType::TYPE_INT => [
+                        [function () { $var = 1; }],
+                        [function () { $i %= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                        [function () { $i ^= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                        [function () { $i &= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                        [function () { $i |= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                        [function () { $i >>= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                        [function () { $i <<= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                        [function () { $i += 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                        [function () { $i -= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_INT)]],
+                ],
+                INativeType::TYPE_DOUBLE => [
+                        [function ($var) { $i = 3.22; }],
+                        [function () { $i += 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_DOUBLE)]],
+                        [function () { $i -= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_DOUBLE)]],
+                ],
+                INativeType::TYPE_BOOL => [
+                        [function ($var) { $i = true; }],
+                ],
+                INativeType::TYPE_ARRAY => [
+                        [function () { $i = [1,12]; }],
+                        [function () { $i += [1,12]; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_ARRAY)]],
+                ],
+                INativeType::TYPE_STRING => [
+                        [function ($var) { $var .= 1; }],
+                ],
+                INativeType::TYPE_MIXED => [
+                        [function ($var) { $i = $var; }],
+                        [function ($var) { $i =& $var; }],
+                        [function () { $i += 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_STRING)]],
+                        [function () { $i -= 1; }, ['i' => $this->typeSystem->getNativeType(INativeType::TYPE_STRING)]],
+                ],
+        ];
+
+        foreach($asserts as $expectedType => $expressions)
+        {
+            foreach($expressions as $assert) {
+                $this->assertReturnsNativeType($assert[0], $expectedType, isset($assert[1]) ? $assert[1] : []);
+            }
+        }
+    }
+
     public function testInvalidBinaryOperator()
     {
         $this->assertAnalysisFails(function () { [] - 3.4; });