Create implicit temporary value when an optimizer does require a retu…

…rn value, fixing PSR2
zephir-lang · Oct 24, 2014 · fe25f1b · fe25f1b
1 parent c78fa3f
commit fe25f1b
Show file tree

Hide file tree

Showing 37 changed files with 65 additions and 65 deletions.
diff --git a/Library/Call.php b/Library/Call.php
@@ -184,11 +184,17 @@ public function mustInitSymbolVariable()
     /**
      * Returns the symbol variable that must be returned by the call
      *
+     * @param boolean $useTemp
+     * @param CompilationContext $compilationContext
      * @return Variable
      */
-    public function getSymbolVariable()
+    public function getSymbolVariable($useTemp = false, CompilationContext $compilationContext = null)
     {
-        return $this->_symbolVariable;
+        $symbolVariable = $this->_symbolVariable;
+        if ($useTemp && !is_object($symbolVariable)) {
+            return $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+        }
+        return $symbolVariable;
     }
 
     /**

diff --git a/Library/Operators/Arithmetical/DivOperator.php b/Library/Operators/Arithmetical/DivOperator.php
@@ -210,7 +210,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 return new CompiledExpression('double', 'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $right->getCode() . ' TSRMLS_CC)', $expression);
 
                             case 'double':
-                            	return new CompiledExpression('double', 'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $right->getCode() . ' TSRMLS_CC)', $expression);
+                                return new CompiledExpression('double', 'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $right->getCode() . ' TSRMLS_CC)', $expression);
 
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
@@ -369,7 +369,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 }
                                 break;
 
-							case 'double':
+                            case 'double':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 if ($variableLeft->isLocalOnly()) {
                                     $op1 = '&' . $variableLeft->getName();
@@ -472,7 +472,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 return new CompiledExpression('double', 'zephir_safe_div_zval_long(' . $op1 . ', ' . $op2 . ' TSRMLS_CC)', $expression);
 
                             case 'double':
-                            	$compilationContext->headersManager->add('kernel/operators');
+                                $compilationContext->headersManager->add('kernel/operators');
                                 if ($variableLeft->isLocalOnly()) {
                                     $op1 = '&' . $variableLeft->getName();
                                 } else {

diff --git a/Library/Optimizers/FunctionCall/AddcslashesOptimizer.php b/Library/Optimizers/FunctionCall/AddcslashesOptimizer.php
@@ -55,7 +55,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/AddslashesOptimizer.php b/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -55,7 +55,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -54,7 +54,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/BasenameOptimizer.php b/Library/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -56,7 +56,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
 
             if ($symbolVariable->isNotVariableAndString()) {

diff --git a/Library/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/Library/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -53,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if (!$symbolVariable->isVariable()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);

diff --git a/Library/Optimizers/FunctionCall/CamelizeOptimizer.php b/Library/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php b/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -52,7 +52,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -53,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -53,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if (!$symbolVariable->isVariable()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);

diff --git a/Library/Optimizers/FunctionCall/EvalOptimizer.php b/Library/Optimizers/FunctionCall/EvalOptimizer.php
@@ -49,7 +49,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/ExplodeOptimizer.php b/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -56,7 +56,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if ($symbolVariable->isNotVariableAndString()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);

diff --git a/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php b/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -56,7 +56,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if ($symbolVariable->isNotVariableAndString()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);

diff --git a/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -56,7 +56,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php b/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -56,7 +56,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/GetClassOptimizer.php b/Library/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -56,7 +56,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php b/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/GettypeOptimizer.php b/Library/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/ImplodeOptimizer.php b/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -55,7 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/JoinOptimizer.php b/Library/Optimizers/FunctionCall/JoinOptimizer.php
@@ -55,7 +55,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -51,16 +51,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
-            }
-            if ($call->mustInitSymbolVariable()) {
-                $symbolVariable->initVariant($context);
-            }
-        } else {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        if (!$symbolVariable->isVariable()) {
+            throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
+        }
+        if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
 

diff --git a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php b/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -93,16 +93,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                    throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
-            }
-            if ($call->mustInitSymbolVariable()) {
-                $symbolVariable->initVariant($context);
-            }
-        } else {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+
+        if (!$symbolVariable->isVariable()) {
+            throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
+        }
+        if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
 

diff --git a/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
@@ -56,16 +56,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable) {
+        $symbolVariable = $call->getSymbolVariable(true, $context);
 
-            if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
-            }
+        if ($symbolVariable->isNotVariableAndString()) {
+            throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
+        }
 
-            if ($call->mustInitSymbolVariable()) {
-                $symbolVariable->initVariant($context);
-            }
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
         }
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);

diff --git a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php b/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/StrposOptimizer.php b/Library/Optimizers/FunctionCall/StrposOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/StrtolowerOptimizer.php b/Library/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/StrtoupperOptimizer.php b/Library/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/SubstrOptimizer.php b/Library/Optimizers/FunctionCall/SubstrOptimizer.php
@@ -94,7 +94,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/TrimOptimizer.php b/Library/Optimizers/FunctionCall/TrimOptimizer.php
@@ -60,7 +60,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }

diff --git a/Library/Optimizers/FunctionCall/UncamelizeOptimizer.php b/Library/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
+        $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
             throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
         }