#2276 - Add support for mixed type in parameters

zephir-lang · Sep 20, 2021 · 1d17840 · 1d17840
1 parent c0dd5e8
commit 1d17840
Show file tree

Hide file tree

Showing 11 changed files with 291 additions and 58 deletions.
diff --git a/Library/Backends/ZendEngine3/Backend.php b/Library/Backends/ZendEngine3/Backend.php
@@ -105,7 +105,7 @@ public function getStringsManager()
     /**
      * {@inheritdoc}
      */
-    public function getTypeDefinition($type)
+    public function getTypeDefinition($type): array
     {
         switch ($type) {
             case 'zend_ulong':
@@ -154,6 +154,7 @@ public function getTypeDefinition($type)
             case 'variable':
             case 'array':
             case 'null':
+            case 'mixed':
                 $pointer = '*';
                 $code = 'zval';
                 break;
@@ -316,7 +317,7 @@ public function onPostCompile(ClassMethod $method, CompilationContext $context)
 
     public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable)
     {
-        $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object'], true);
+        $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
 
         if ($isComplex && !$variable->isDoublePointer()) { /* && $variable->mustInitNull() */
             $groupVariables[] = $variable->getName();
@@ -365,6 +366,7 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
                 case 'resource':
                 case 'callable':
                 case 'object':
+                case 'mixed':
                     $groupVariables[] = $pointer.$variable->getName();
                     break;
 
@@ -594,7 +596,7 @@ public function addArrayEntry(Variable $variable, $key, $value, CompilationConte
             $keyType = 'append';
         } elseif ($key instanceof CompiledExpression) {
             $typeKey = $key->getType();
-            if ('variable' == $typeKey) {
+            if ('variable' === $typeKey || 'mixed' === $typeKey) {
                 $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
                 $typeKey = $var->getType();
             }
@@ -629,6 +631,7 @@ public function addArrayEntry(Variable $variable, $key, $value, CompilationConte
 
             case 'variable':
             case 'array':
+            case 'mixed':
                 $type = 'zval';
                 break;
         }
@@ -846,20 +849,21 @@ public function resolveValue($value, CompilationContext $context, $usePointer =
                 $tempVariable = new Variable('variable', $varName, $context->branchManager->getCurrentBranch());
                 $context->symbolTable->addRawVariable($tempVariable);
             }
+
             $tempVariable = $context->symbolTable->getVariableForWrite($varName, $context);
             $tempVariable->increaseUses();
-            $tempVariable->setUsed(true, null);
+            $tempVariable->setUsed(true);
+
             if ('null' == $value) {
                 $tempVariable->setDynamicTypes('null');
             } else {
                 $tempVariable->setDynamicTypes('bool');
             }
+
             $value = $this->getVariableCode($tempVariable);
         } else {
             if ($value instanceof CompiledExpression) {
-                if ('array' == $value->getType()) {
-                    $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context, null);
-                } elseif ('variable' == $value->getType()) {
+                if (in_array($value->getType(), ['array', 'variable', 'mixed'])) {
                     $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context);
                 } else {
                     return $value->getCode();

diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
@@ -1447,7 +1447,7 @@ public function assignZvalValue(array $parameter, CompilationContext $compilatio
     {
         $dataType = $this->getParamDataType($parameter);
 
-        if (in_array($dataType, ['variable', 'callable', 'object', 'resource'])) {
+        if (in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
             return "";
         }
 
@@ -1652,6 +1652,7 @@ public function compile(CompilationContext $compilationContext): void
                         case 'callable':
                         case 'resource':
                         case 'variable':
+                        case 'mixed':
                             $symbol = $symbolTable->addVariable($parameter['data-type'], $parameter['name'], $compilationContext);
                             /* TODO: Move this to the respective backend, which requires refactoring how this works */
                             if ($compilationContext->backend->isZE3()) {
@@ -1878,6 +1879,7 @@ public function compile(CompilationContext $compilationContext): void
                     case 'callable':
                     case 'resource':
                     case 'variable':
+                    case 'mixed':
                         $name = $parameter['name'];
                         break;
 

diff --git a/Library/ClassMethodParameters.php b/Library/ClassMethodParameters.php
@@ -115,6 +115,7 @@ public function fetchParameters(bool $isMethodInternal): array
                 case 'callable':
                 case 'resource':
                 case 'variable':
+                case 'mixed':
                     $parameters[] = $isMethodInternal ? $name : '&'.$name;
                     break;
 

diff --git a/Library/Expression/NativeArray.php b/Library/Expression/NativeArray.php
@@ -152,6 +152,7 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
                     case 'string':
                     case 'variable':
                     case 'array':
+                    case 'mixed':
                         return $itemVariable;
 
                     default:

diff --git a/Library/Statements/ReturnStatement.php b/Library/Statements/ReturnStatement.php
@@ -138,6 +138,7 @@ public function compile(CompilationContext $compilationContext): void
                         break;
 
                     case Types::T_VARIABLE:
+                    case Types::T_MIXED:
                         $symbolVariable = $compilationContext->symbolTable->getVariableForRead(
                             $resolvedExpr->getCode(),
                             $compilationContext,
@@ -176,6 +177,7 @@ public function compile(CompilationContext $compilationContext): void
                                 break;
 
                             case Types::T_VARIABLE:
+                            case Types::T_MIXED:
                                 break;
                         }
                         break;
@@ -221,6 +223,7 @@ public function compile(CompilationContext $compilationContext): void
                     break;
 
                 case Types::T_VARIABLE:
+                case Types::T_MIXED:
                     if (!isset($symbolVariable)) {
                         $symbolVariable = $compilationContext->symbolTable->getVariableForRead(
                             $resolvedExpr->getCode(),
@@ -256,6 +259,7 @@ public function compile(CompilationContext $compilationContext): void
                             break;
 
                         case Types::T_VARIABLE:
+                        case Types::T_MIXED:
                             if ('this_ptr' == $symbolVariable->getName()) {
                                 $codePrinter->output('RETURN_THIS();');
                             } else {

diff --git a/Library/SymbolTable.php b/Library/SymbolTable.php
@@ -253,7 +253,7 @@ public function getVariablesByBranch($branchId)
      */
     public function getVariableForRead($name, CompilationContext $compilationContext = null, array $statement = null)
     {
-        /*
+        /**
          * Validate that 'this' cannot be used in a static function
          */
         if ('this' == $name || 'this_ptr' == $name) {
@@ -262,7 +262,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
             }
         }
 
-        /*
+        /**
          * Create superglobals just in time
          */
         if ($this->globalsManager->isSuperGlobal($name)) {
@@ -295,7 +295,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
 
         $variable->increaseUses();
 
-        /*
+        /**
          * Analise branches to detect possible initialization of variables in conditional branches
          */
         if (!$variable->isTemporal() && !$variable->getSkipVariant()) {
@@ -306,6 +306,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                             case 'variable':
                             case 'string':
                             case 'array':
+                            case 'mixed':
                                 if (!$variable->isLocalOnly()) {
                                     $variable->setMustInitNull(true);
                                 }
@@ -380,7 +381,6 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                                 foreach ($branches as $branch) {
                                     $graph->addLeaf($branch);
                                 }
-                                //echo $graph->getRoot()->show();
                             } else {
                                 /*
                                  * Variable is assigned just once and it's assigned in a conditional branch

diff --git a/ext/stub/types/mixedtype.zep.c b/ext/stub/types/mixedtype.zep.c
diff --git a/ext/stub/types/mixedtype.zep.h b/ext/stub/types/mixedtype.zep.h