summaryrefslogtreecommitdiff
path: root/ste.php
diff options
context:
space:
mode:
authorKevin Chabowski <kevin@kch42.de>2013-10-28 18:09:50 +0100
committerKevin Chabowski <kevin@kch42.de>2013-10-28 18:09:50 +0100
commita77a2ec58947f5fc7cb4023db3b8f8298e2f01f2 (patch)
tree0aa5a38a23f8afc49c4c8bc50ad5edd51f4897d2 /ste.php
parent55d47c27247e3cdbd88818c0ba98646ee11fb315 (diff)
downloadste-a77a2ec58947f5fc7cb4023db3b8f8298e2f01f2.tar.gz
ste-a77a2ec58947f5fc7cb4023db3b8f8298e2f01f2.tar.bz2
ste-a77a2ec58947f5fc7cb4023db3b8f8298e2f01f2.zip
ste:foreach now has an else clause for empty arrays.
Diffstat (limited to 'ste.php')
-rw-r--r--ste.php23
1 files changed, 20 insertions, 3 deletions
diff --git a/ste.php b/ste.php
index 3715435..018d754 100644
--- a/ste.php
+++ b/ste.php
@@ -887,14 +887,29 @@ $ste_builtins = array(
$loopbody .= "\$${loopname}_counter++;\n\$ste->set_var_by_name(\$${loopname}_countervar, \$${loopname}_counter);\n";
}
+ $loop = array();
+ $else = array();
+ foreach($ast->sub as $node) {
+ if(($node instanceof TagNode) && ($node->name == "else")) {
+ $else = array_merge($else, $node->sub);
+ } else {
+ $loop[] = $node;
+ }
+ }
+
$loopbody .= "\$ste->set_var_by_name(\$${loopname}_valuevar, \$${loopname}_value);\n";
if(!empty($ast->params["key"])) {
$loopbody .= "\$ste->set_var_by_name(\$${loopname}_keyvar, \$${loopname}_key);\n";
}
$loopbody .= "\n";
- $loopbody .= _transcompile($ast->sub);
+ $loopbody .= _transcompile($loop);
$loopbody = "{\n" . loopbody(indent_code($loopbody)) . "\n}\n";
+ if(!empty($else)) {
+ $code .= "if(empty(\$${loopname}_array))\n{\n";
+ $code .= indent_code(_transcompile($else));
+ $code .= "\n}\nelse ";
+ }
$code .= "foreach(\$${loopname}_array as \$${loopname}_key => \$${loopname}_value)\n$loopbody\n";
return $code;
@@ -1351,13 +1366,15 @@ class STECore {
}
private function &_get_var_reference(&$from, $name, $create_if_not_exist) {
+ $nullref = NULL;
+
$bracket_open = strpos($name, "[");
if($bracket_open === false) {
if(isset($from[$name]) or $create_if_not_exist) {
$ref = &$from[$name];
return $ref;
} else {
- return NULL;
+ return $nullref;
}
} else {
$old_varname = $varname;
@@ -1371,7 +1388,7 @@ class STECore {
if($create_if_not_exist) {
$from[$varname] = array();
} else {
- return NULL;
+ return $nullref;
}
}
try {