Merge branch 'master' of http://github.com/phalcon/zephir

zephir-lang · Oct 21, 2014 · edd567a · edd567a
2 parents 4dfbb7d + d7ee4c6
commit edd567a
Show file tree

Hide file tree

Showing 36 changed files with 62 additions and 48 deletions.
diff --git a/Library/Expression.php b/Library/Expression.php
@@ -243,7 +243,7 @@ public function emptyArray($expression, CompilationContext $compilationContext)
         /**
          * Variable that receives property accesses must be polimorphic
          */
-        if ($symbolVariable->getType() != 'variable' && $symbolVariable->getType() != 'array') {
+        if (!$symbolVariable->isVariable() && $symbolVariable->getType() != 'array') {
             throw new CompilerException("Cannot use variable: " . $symbolVariable->getName() . '(' . $symbolVariable->getType() . ") to create empty array", $expression);
         }
 
@@ -276,7 +276,7 @@ public function compileTypeHint($expression, CompilationContext $compilationCont
         }
 
         $symbolVariable = $compilationContext->symbolTable->getVariableForRead($resolved->getCode(), $compilationContext, $expression);
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Type-Hints only can be applied to dynamic variables", $expression);
         }
 

diff --git a/Library/Expression/Constants.php b/Library/Expression/Constants.php
@@ -210,7 +210,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException('Cannot use variable: ' . $symbolVariable->getType() . ' to assign property value', $expression);
         }
 

diff --git a/Library/Expression/NativeArrayAccess.php b/Library/Expression/NativeArrayAccess.php
@@ -249,7 +249,7 @@ protected function _accessDimensionArray($expression, Variable $variableVariable
         /**
          * Variable that receives property accesses must be polimorphic
          */
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable: " . $symbolVariable->getType() . " to assign array index", $expression);
         }
 

diff --git a/Library/Expression/PropertyAccess.php b/Library/Expression/PropertyAccess.php
@@ -287,7 +287,7 @@ public function compile($expression, CompilationContext $compilationContext)
         /**
          * Variable that receives a property value must be polimorphic
          */
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable: " . $symbolVariable->getType() . " to assign property value", $expression);
         }
 

diff --git a/Library/Expression/PropertyDynamicAccess.php b/Library/Expression/PropertyDynamicAccess.php
@@ -150,7 +150,7 @@ public function compile($expression, CompilationContext $compilationContext)
         /**
          * Variable that receives a property value must be polymorphic
          */
-        if ($symbolVariable->getType() != 'variable') {
+        if ($symbolVariable && !$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable: " . $symbolVariable->getType() . " to assign property value", $expression);
         }
 

diff --git a/Library/Expression/StaticConstantAccess.php b/Library/Expression/StaticConstantAccess.php
@@ -137,7 +137,7 @@ public function compile($expression, CompilationContext $compilationContext)
             /**
              * Variable that receives property accesses must be polimorphic
              */
-            if ($symbolVariable->getType() != 'variable') {
+            if (!$symbolVariable->isVariable()) {
                 throw new CompilerException("Cannot use variable: " . $symbolVariable->getType() . " to assign class constants", $expression);
             }
 

diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
@@ -146,7 +146,7 @@ public function compile($expression, CompilationContext $compilationContext)
         /**
          * Variable that receives property accesses must be polimorphic
          */
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable: " . $symbolVariable->getType() . " to assign class constants", $expression);
         }
 

diff --git a/Library/FunctionCall.php b/Library/FunctionCall.php
@@ -340,8 +340,7 @@ protected function _callNormal(array $expression, $compilationContext)
          */
         $symbolVariable = $this->getSymbolVariable();
         if ($symbolVariable) {
-
-            if ($symbolVariable->getType() != 'variable') {
+            if (!$symbolVariable->isVariable()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
             }
 
@@ -472,8 +471,7 @@ protected function _callDynamic(array $expression, $compilationContext)
          */
         $symbolVariable = $this->getSymbolVariable();
         if ($symbolVariable) {
-
-            if ($symbolVariable->getType() != 'variable') {
+            if (!$symbolVariable->isVariable()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
             }
 

diff --git a/Library/MethodCall.php b/Library/MethodCall.php
@@ -145,10 +145,8 @@ public function compile(Expression $expr, CompilationContext $compilationContext
          * Method calls only return zvals so we need to validate the target variable is also a zval
          */
         if (!$builtInType) {
-
             if ($isExpecting) {
-
-                if ($symbolVariable->getType() != 'variable') {
+                if (!$symbolVariable->isVariable()) {
                     throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
                 }
 

diff --git a/Library/Operators/Other/CloneOperator.php b/Library/Operators/Other/CloneOperator.php
@@ -63,7 +63,7 @@ public function compile($expression, CompilationContext $compilationContext)
         }
 
         $symbolVariable = $this->getExpected($compilationContext, $expression);
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Objects can only be cloned into dynamic variables", $expression);
         }
 

diff --git a/Library/Operators/Other/InstanceOfOperator.php b/Library/Operators/Other/InstanceOfOperator.php
@@ -52,7 +52,7 @@ public function compile($expression, CompilationContext $compilationContext)
         }
 
         $symbolVariable = $compilationContext->symbolTable->getVariableForRead($resolved->getCode(), $compilationContext, $expression);
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("InstanceOf requires a 'dynamic variable' in the left operand", $expression);
         }
 

diff --git a/Library/Operators/Other/NewInstanceOperator.php b/Library/Operators/Other/NewInstanceOperator.php
@@ -51,8 +51,7 @@ public function compile(array $expression, CompilationContext $compilationContex
          * Resolves the symbol that expects the value
          */
         $symbolVariable = $this->getExpected($compilationContext, $expression);
-
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Objects can only be instantiated into dynamic variables", $expression);
         }
 

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

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

diff --git a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php b/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -53,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable->getType() != 'variable') {
+        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
@@ -55,7 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable->getType() != 'variable') {
+        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
@@ -54,7 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable->getType() != 'variable') {
+        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
@@ -55,7 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable();
         if ($symbolVariable) {
-            if ($symbolVariable->getType() != 'variable') {
+            if (!$symbolVariable->isVariable()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
             }
         }

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

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

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

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

diff --git a/Library/Statements/Let/ArrayIndex.php b/Library/Statements/Let/ArrayIndex.php
@@ -355,7 +355,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
         /**
          * Only dynamic variables can be used as arrays
          */
-        if ($symbolVariable->getType() != 'variable' && $symbolVariable->getType() != 'array') {
+        if ($symbolVariable->isNotVariableAndArray()) {
             throw new CompilerException("Cannot use variable type: '" . $symbolVariable->getType() . "' as array", $statement);
         }
 

diff --git a/Library/Statements/Let/ArrayIndexAppend.php b/Library/Statements/Let/ArrayIndexAppend.php
@@ -166,7 +166,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
         /**
          * Only dynamic variables can be used as arrays
          */
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable type: '" . $symbolVariable->getType() . "' as array", $statement);
         }
 

diff --git a/Library/Statements/Let/ObjectDynamicProperty.php b/Library/Statements/Let/ObjectDynamicProperty.php
@@ -52,7 +52,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate variable '" . $variable . "' because it is not initialized", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Variable type '" . $symbolVariable->getType() . "' cannot be used as object", $statement);
         }
 
@@ -67,7 +67,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate static property '" . $compilationContext->classDefinition->getCompleteName() . "::" . $propertyName . "' because it is not initialized", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable type: " . $symbolVariable->getType() . " as an object", $statement);
         }
 

diff --git a/Library/Statements/Let/ObjectProperty.php b/Library/Statements/Let/ObjectProperty.php
@@ -52,7 +52,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate variable '" . $variable . "' because it is not initialized", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Variable type '" . $symbolVariable->getType() . "' cannot be used as object", $statement);
         }
 
@@ -63,7 +63,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate static property '" . $className . "::" . $propertyName . "' because it is not initialized", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable type: " . $symbolVariable->getType() . " as an object", $statement);
         }
 

diff --git a/Library/Statements/Let/ObjectPropertyAppend.php b/Library/Statements/Let/ObjectPropertyAppend.php
@@ -52,7 +52,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate variable '" . $variable . "' because it is not initialized", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Attempt to use variable type: " . $symbolVariable->getType() . " as object", $statement);
         }
 

diff --git a/Library/Statements/Let/ObjectPropertyArrayIndex.php b/Library/Statements/Let/ObjectPropertyArrayIndex.php
@@ -335,7 +335,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate variable '" . $variable . "' because it is not initialized", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Attempt to use variable type: " . $symbolVariable->getType() . " as object", $statement);
         }
 

diff --git a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php b/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -153,7 +153,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate variable '" . $variable . "' because it is not initialized", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Attempt to use variable type: " . $symbolVariable->getType() . " as object", $statement);
         }
 

diff --git a/Library/Statements/Let/ObjectPropertyDecr.php b/Library/Statements/Let/ObjectPropertyDecr.php
@@ -64,7 +64,7 @@ public function assign($variable, $property, ZephirVariable $symbolVariable, Com
         /**
          * Only dynamic variables can be used as arrays
          */
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable type: '" . $symbolVariable->getType() . "' as array", $statement);
         }
 

diff --git a/Library/Statements/Let/ObjectPropertyIncr.php b/Library/Statements/Let/ObjectPropertyIncr.php
@@ -65,7 +65,7 @@ public function assign($variable, $property, ZephirVariable $symbolVariable, Com
         /**
          * Only dynamic variables can be used as arrays
          */
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable type: '" . $symbolVariable->getType() . "' as array", $statement);
         }
 

diff --git a/Library/Statements/Let/Variable.php b/Library/Statements/Let/Variable.php
@@ -1056,7 +1056,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
                                             $compilationContext->symbolTable->mustGrownStack(true);
 
                                             /* Inherit the dynamic type data from the assigned value */
-                                            $symbolVariable->setDynamicTypes($itemVariable->getDynamicTypes());
+                                            $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));
                                             $symbolVariable->setClassTypes($itemVariable->getClassTypes());
 
                                             $codePrinter->output('ZEPHIR_CPY_WRT(' . $variable . ', ' . $itemVariable->getName() . ');');
@@ -1097,7 +1097,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
                                             $compilationContext->symbolTable->mustGrownStack(true);
 
                                             /* Inherit the dynamic type data from the assigned value */
-                                            $symbolVariable->setDynamicTypes($itemVariable->getDynamicTypes());
+                                            $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));
                                             $symbolVariable->setClassTypes($itemVariable->getClassTypes());
 
                                             $codePrinter->output('ZEPHIR_CPY_WRT(' . $variable . ', ' . $itemVariable->getName() . ');');

diff --git a/Library/Statements/Let/VariableAppend.php b/Library/Statements/Let/VariableAppend.php
@@ -62,7 +62,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException("Cannot mutate variable '" . $variable . "' because it is local only", $statement);
         }
 
-        if ($symbolVariable->getType() != 'variable') {
+        if (!$symbolVariable->isVariable()) {
             throw new CompilerException("Cannot use variable type: '" . $symbolVariable->getType() . "' as array", $statement);
         }
 

diff --git a/Library/StaticCall.php b/Library/StaticCall.php
@@ -478,7 +478,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
              */
             $symbolVariable->setDynamicTypes('undefined');
 
-            if ($symbolVariable->getType() != 'variable') {
+            if (!$symbolVariable->isVariable()) {
                 throw new CompilerException("Returned values by functions can only be assigned to variant variables", $expression);
             }
         }