Fixed custom optimizers

kuhler-Stratege · Apr 4, 2015 · 9ab8c26 · 9ab8c26
1 parent b79dd08
commit 9ab8c26
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/optimizers/PhannotParseAnnotationsOptimizer.php b/optimizers/PhannotParseAnnotationsOptimizer.php
@@ -68,9 +68,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
 		$resolvedParams = $call->getResolvedParams($expression['parameters'], $context, $expression);
 
-		$context->codePrinter->output('if (phannot_parse_annotations(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ' TSRMLS_CC) == FAILURE) {');
-        $context->codePrinter->output("\t" . 'RETURN_MM();');
-        $context->codePrinter->output('}');
+		$call->addCallStatusFlag($context);
+
+		$context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ' TSRMLS_CC);');
+
+		$call->checkTempParameters($context);
+		$call->addCallStatusOrJump($context);
 
 		return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
 	}

diff --git a/optimizers/PhqlParsePhqlOptimizer.php b/optimizers/PhqlParsePhqlOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
 		$call->addCallStatusFlag($context);
 
-		$context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = (phql_parse_phql(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ' TSRMLS_CC) != FAILURE);');
+		$context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = phql_parse_phql(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ' TSRMLS_CC);');
 
         $call->checkTempParameters($context);
 		$call->addCallStatusOrJump($context);

diff --git a/optimizers/PhvoltParseViewOptimizer.php b/optimizers/PhvoltParseViewOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
 		$call->addCallStatusFlag($context);
 
-		$context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = (phvolt_parse_view(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ' TSRMLS_CC) != FAILURE);');
+		$context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = phvolt_parse_view(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ' TSRMLS_CC);');
 
 		$call->checkTempParameters($context);
 		$call->addCallStatusOrJump($context);