mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Done #28

Browse Source
This commit is contained in:
bzick
2013-08-05 13:07:16 +04:00
parent 09f952686b
commit c7a90789de
5 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Fenom/Compiler.php
View File

@ -873,7 +873,7 @@ class Compiler
public static function macroOpen(Tokenizer $tokens, Scope $scope)
{
$scope["name"] = $tokens->get(Tokenizer::MACRO_STRING);
$scope["recursive"] = array();
$scope["recursive"] = false;
$args = array();
$defaults = array();
if (!$tokens->valid()) {
@ -897,10 +897,11 @@ class Compiler
}
$tokens->skipIf(')');
$scope["macro"] = array(
"id" => $scope->tpl->i++,
"name" => $scope["name"],
"args" => $args,
"defaults" => $defaults,
"body" => ""
"body" => "",
"recursive" => false
);
return;
}
@ -912,21 +913,9 @@ class Compiler
public static function macroClose(Tokenizer $tokens, Scope $scope)
{
if ($scope["recursive"]) {
$switch = "switch(\$call['mark']) {\n";
foreach ($scope["recursive"] as $mark) {
$switch .= "case $mark: goto macro_$mark;\n";
}
$switch .= "}";
$stack = '$stack_' . $scope["macro"]['id'];
$scope["macro"]["body"] = '<?php ' . $stack . ' = array(); macro_' . $scope["macro"]['id'] . ': ?>' . $scope->cutContent() . '<?php if(' . $stack . ') {' . PHP_EOL .
'$call = array_pop(' . $stack . ');' . PHP_EOL .
'$tpl = $call["tpl"];' . PHP_EOL .
$switch . PHP_EOL .
'unset($call, ' . $stack . ');' . PHP_EOL .
'} ?>';
} else {
$scope["macro"]["body"] = $scope->cutContent();
$scope["macro"]["recursive"] = true;
}
$scope["macro"]["body"] = $scope->cutContent();
$scope->tpl->macros[$scope["name"]] = $scope["macro"];
}