dwoo-project / dwoo

lib/plugins/builtin/blocks/elseif.php

Indentation +34 added lines, -34 removed lines

@@ -20,47 +20,47 @@
  */
 class Dwoo_Plugin_elseif extends Dwoo_Plugin_if implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-    public function init(array $rest)
-    {
-    }
+	public function init(array $rest)
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $preContent = '';
-        while (true) {
-            $preContent .= $compiler->removeTopBlock();
-            $block = &$compiler->getCurrentBlock();
-            $interfaces = class_implements($block['class'], false);
-            if (in_array('Dwoo_IElseable', $interfaces) !== false) {
-                break;
-            }
-        }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$preContent = '';
+		while (true) {
+			$preContent .= $compiler->removeTopBlock();
+			$block = &$compiler->getCurrentBlock();
+			$interfaces = class_implements($block['class'], false);
+			if (in_array('Dwoo_IElseable', $interfaces) !== false) {
+				break;
+			}
+		}
 
-        $params['initialized'] = true;
-        $compiler->injectBlock($type, $params);
+		$params['initialized'] = true;
+		$compiler->injectBlock($type, $params);
 
-        return $preContent;
-    }
+		return $preContent;
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $tokens = $compiler->getParamTokens($params);
-        $params = $compiler->getCompiledParams($params);
+		$tokens = $compiler->getParamTokens($params);
+		$params = $compiler->getCompiledParams($params);
 
-        $pre = Dwoo_Compiler::PHP_OPEN.'elseif ('.implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n".Dwoo_Compiler::PHP_CLOSE;
-        $post = Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$pre = Dwoo_Compiler::PHP_OPEN.'elseif ('.implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n".Dwoo_Compiler::PHP_CLOSE;
+		$post = Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 
-        if (isset($params['hasElse'])) {
-            $post .= $params['hasElse'];
-        }
+		if (isset($params['hasElse'])) {
+			$post .= $params['hasElse'];
+		}
 
-        $block = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = $pre.$content.$post;
+		$block = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = $pre.$content.$post;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/plugins/builtin/blocks/capture.php

Indentation +22 added lines, -22 removed lines

@@ -36,30 +36,30 @@
  */
 class Dwoo_Plugin_capture extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init($name = 'default', $assign = null, $cat = false, $trim = false)
-    {
-    }
+	public function init($name = 'default', $assign = null, $cat = false, $trim = false)
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return Dwoo_Compiler::PHP_OPEN.$prepend.'ob_start();'.$append.Dwoo_Compiler::PHP_CLOSE;
-    }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return Dwoo_Compiler::PHP_OPEN.$prepend.'ob_start();'.$append.Dwoo_Compiler::PHP_CLOSE;
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $params = $compiler->getCompiledParams($params);
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$params = $compiler->getCompiledParams($params);
 
-        $out = $content.Dwoo_Compiler::PHP_OPEN.$prepend."\n".'$tmp = ob_get_clean();';
-        if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
-            $out .= "\n".'$tmp = trim($tmp);';
-        }
-        if ($params['cat'] === 'true' || $params['cat'] === 1) {
-            $out .= "\n".'$tmp = $this->readVar(\'dwoo.capture.\'.'.$params['name'].') . $tmp;';
-        }
-        if ($params['assign'] !== 'null') {
-            $out .= "\n".'$this->scope['.$params['assign'].'] = $tmp;';
-        }
+		$out = $content.Dwoo_Compiler::PHP_OPEN.$prepend."\n".'$tmp = ob_get_clean();';
+		if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
+			$out .= "\n".'$tmp = trim($tmp);';
+		}
+		if ($params['cat'] === 'true' || $params['cat'] === 1) {
+			$out .= "\n".'$tmp = $this->readVar(\'dwoo.capture.\'.'.$params['name'].') . $tmp;';
+		}
+		if ($params['assign'] !== 'null') {
+			$out .= "\n".'$this->scope['.$params['assign'].'] = $tmp;';
+		}
 
-        return $out."\n".'$this->globals[\'capture\']['.$params['name'].'] = $tmp;'.$append.Dwoo_Compiler::PHP_CLOSE;
-    }
+		return $out."\n".'$this->globals[\'capture\']['.$params['name'].'] = $tmp;'.$append.Dwoo_Compiler::PHP_CLOSE;
+	}
 }

lib/plugins/builtin/blocks/loop.php

Indentation +86 added lines, -86 removed lines

@@ -43,101 +43,101 @@
  */
 class Dwoo_Plugin_loop extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-    public static $cnt = 0;
+	public static $cnt = 0;
 
-    public function init($from, $name = 'default')
-    {
-    }
+	public function init($from, $name = 'default')
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        // get block params and save the current template pointer to use it in the postProcessing method
-        $currentBlock = &$compiler->getCurrentBlock();
-        $currentBlock['params']['tplPointer'] = $compiler->getPointer();
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		// get block params and save the current template pointer to use it in the postProcessing method
+		$currentBlock = &$compiler->getCurrentBlock();
+		$currentBlock['params']['tplPointer'] = $compiler->getPointer();
 
-        return '';
-    }
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $params = $compiler->getCompiledParams($params);
-        $tpl = $compiler->getTemplateSource($params['tplPointer']);
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$params = $compiler->getCompiledParams($params);
+		$tpl = $compiler->getTemplateSource($params['tplPointer']);
 
-        // assigns params
-        $src = $params['from'];
-        $name = $params['name'];
+		// assigns params
+		$src = $params['from'];
+		$name = $params['name'];
 
-        // evaluates which global variables have to be computed
-        $varName = '$dwoo.loop.'.trim($name, '"\'').'.';
-        $shortVarName = '$.loop.'.trim($name, '"\'').'.';
-        $usesAny = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
-        $usesFirst = strpos($tpl, $varName.'first') !== false || strpos($tpl, $shortVarName.'first') !== false;
-        $usesLast = strpos($tpl, $varName.'last') !== false || strpos($tpl, $shortVarName.'last') !== false;
-        $usesIndex = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
-        $usesIteration = $usesLast || strpos($tpl, $varName.'iteration') !== false || strpos($tpl, $shortVarName.'iteration') !== false;
-        $usesShow = strpos($tpl, $varName.'show') !== false || strpos($tpl, $shortVarName.'show') !== false;
-        $usesTotal = $usesLast || strpos($tpl, $varName.'total') !== false || strpos($tpl, $shortVarName.'total') !== false;
+		// evaluates which global variables have to be computed
+		$varName = '$dwoo.loop.'.trim($name, '"\'').'.';
+		$shortVarName = '$.loop.'.trim($name, '"\'').'.';
+		$usesAny = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
+		$usesFirst = strpos($tpl, $varName.'first') !== false || strpos($tpl, $shortVarName.'first') !== false;
+		$usesLast = strpos($tpl, $varName.'last') !== false || strpos($tpl, $shortVarName.'last') !== false;
+		$usesIndex = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
+		$usesIteration = $usesLast || strpos($tpl, $varName.'iteration') !== false || strpos($tpl, $shortVarName.'iteration') !== false;
+		$usesShow = strpos($tpl, $varName.'show') !== false || strpos($tpl, $shortVarName.'show') !== false;
+		$usesTotal = $usesLast || strpos($tpl, $varName.'total') !== false || strpos($tpl, $shortVarName.'total') !== false;
 
-        if (strpos($name, '$this->scope[') !== false) {
-            $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
-        }
+		if (strpos($name, '$this->scope[') !== false) {
+			$usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
+		}
 
-        // gets foreach id
-        $cnt = self::$cnt++;
+		// gets foreach id
+		$cnt = self::$cnt++;
 
-        // builds pre processing output
-        $pre = Dwoo_Compiler::PHP_OPEN."\n".'$_loop'.$cnt.'_data = '.$src.';';
-        // adds foreach properties
-        if ($usesAny) {
-            $pre .= "\n".'$this->globals["loop"]['.$name.'] = array'."\n(";
-            if ($usesIndex) {
-                $pre .= "\n\t".'"index"		=> 0,';
-            }
-            if ($usesIteration) {
-                $pre .= "\n\t".'"iteration"		=> 1,';
-            }
-            if ($usesFirst) {
-                $pre .= "\n\t".'"first"		=> null,';
-            }
-            if ($usesLast) {
-                $pre .= "\n\t".'"last"		=> null,';
-            }
-            if ($usesShow) {
-                $pre .= "\n\t".'"show"		=> $this->isTraversable($_loop'.$cnt.'_data, true),';
-            }
-            if ($usesTotal) {
-                $pre .= "\n\t".'"total"		=> $this->count($_loop'.$cnt.'_data),';
-            }
-            $pre .= "\n);\n".'$_loop'.$cnt.'_glob =& $this->globals["loop"]['.$name.'];';
-        }
-        // checks if the loop must be looped
-        $pre .= "\n".'if ($this->isTraversable($_loop'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
-        // iterates over keys
-        $pre .= "\n\t".'foreach ($_loop'.$cnt.'_data as $tmp_key => $this->scope["-loop-"])'."\n\t{";
-        // updates properties
-        if ($usesFirst) {
-            $pre .= "\n\t\t".'$_loop'.$cnt.'_glob["first"] = (string) ($_loop'.$cnt.'_glob["index"] === 0);';
-        }
-        if ($usesLast) {
-            $pre .= "\n\t\t".'$_loop'.$cnt.'_glob["last"] = (string) ($_loop'.$cnt.'_glob["iteration"] === $_loop'.$cnt.'_glob["total"]);';
-        }
-        $pre .= "\n\t\t".'$_loop'.$cnt.'_scope = $this->setScope(array("-loop-"));'."\n/* -- loop start output */\n".Dwoo_Compiler::PHP_CLOSE;
+		// builds pre processing output
+		$pre = Dwoo_Compiler::PHP_OPEN."\n".'$_loop'.$cnt.'_data = '.$src.';';
+		// adds foreach properties
+		if ($usesAny) {
+			$pre .= "\n".'$this->globals["loop"]['.$name.'] = array'."\n(";
+			if ($usesIndex) {
+				$pre .= "\n\t".'"index"		=> 0,';
+			}
+			if ($usesIteration) {
+				$pre .= "\n\t".'"iteration"		=> 1,';
+			}
+			if ($usesFirst) {
+				$pre .= "\n\t".'"first"		=> null,';
+			}
+			if ($usesLast) {
+				$pre .= "\n\t".'"last"		=> null,';
+			}
+			if ($usesShow) {
+				$pre .= "\n\t".'"show"		=> $this->isTraversable($_loop'.$cnt.'_data, true),';
+			}
+			if ($usesTotal) {
+				$pre .= "\n\t".'"total"		=> $this->count($_loop'.$cnt.'_data),';
+			}
+			$pre .= "\n);\n".'$_loop'.$cnt.'_glob =& $this->globals["loop"]['.$name.'];';
+		}
+		// checks if the loop must be looped
+		$pre .= "\n".'if ($this->isTraversable($_loop'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
+		// iterates over keys
+		$pre .= "\n\t".'foreach ($_loop'.$cnt.'_data as $tmp_key => $this->scope["-loop-"])'."\n\t{";
+		// updates properties
+		if ($usesFirst) {
+			$pre .= "\n\t\t".'$_loop'.$cnt.'_glob["first"] = (string) ($_loop'.$cnt.'_glob["index"] === 0);';
+		}
+		if ($usesLast) {
+			$pre .= "\n\t\t".'$_loop'.$cnt.'_glob["last"] = (string) ($_loop'.$cnt.'_glob["iteration"] === $_loop'.$cnt.'_glob["total"]);';
+		}
+		$pre .= "\n\t\t".'$_loop'.$cnt.'_scope = $this->setScope(array("-loop-"));'."\n/* -- loop start output */\n".Dwoo_Compiler::PHP_CLOSE;
 
-        // build post processing output and cache it
-        $post = Dwoo_Compiler::PHP_OPEN."\n".'/* -- loop end output */'."\n\t\t".'$this->setScope($_loop'.$cnt.'_scope, true);';
-        // update properties
-        if ($usesIndex) {
-            $post .= "\n\t\t".'$_loop'.$cnt.'_glob["index"]+=1;';
-        }
-        if ($usesIteration) {
-            $post .= "\n\t\t".'$_loop'.$cnt.'_glob["iteration"]+=1;';
-        }
-        // end loop
-        $post .= "\n\t}\n}\n".Dwoo_Compiler::PHP_CLOSE;
-        if (isset($params['hasElse'])) {
-            $post .= $params['hasElse'];
-        }
+		// build post processing output and cache it
+		$post = Dwoo_Compiler::PHP_OPEN."\n".'/* -- loop end output */'."\n\t\t".'$this->setScope($_loop'.$cnt.'_scope, true);';
+		// update properties
+		if ($usesIndex) {
+			$post .= "\n\t\t".'$_loop'.$cnt.'_glob["index"]+=1;';
+		}
+		if ($usesIteration) {
+			$post .= "\n\t\t".'$_loop'.$cnt.'_glob["iteration"]+=1;';
+		}
+		// end loop
+		$post .= "\n\t}\n}\n".Dwoo_Compiler::PHP_CLOSE;
+		if (isset($params['hasElse'])) {
+			$post .= $params['hasElse'];
+		}
 
-        return $pre.$content.$post;
-    }
+		return $pre.$content.$post;
+	}
 }

lib/plugins/builtin/blocks/forelse.php

Indentation +19 added lines, -19 removed lines

@@ -19,29 +19,29 @@
  */
 class Dwoo_Plugin_forelse extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $with = &$compiler->findBlock('for', true);
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$with = &$compiler->findBlock('for', true);
 
-        $params['initialized'] = true;
-        $compiler->injectBlock($type, $params);
+		$params['initialized'] = true;
+		$compiler->injectBlock($type, $params);
 
-        return '';
-    }
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $block = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$block = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/plugins/builtin/blocks/topLevelBlock.php

Indentation +11 added lines, -11 removed lines

@@ -19,17 +19,17 @@
  */
 final class Dwoo_Plugin_topLevelBlock extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '/* end template head */ ob_start(); /* template body */ '.Dwoo_Compiler::PHP_CLOSE;
-    }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '/* end template head */ ob_start(); /* template body */ '.Dwoo_Compiler::PHP_CLOSE;
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        return $content.Dwoo_Compiler::PHP_OPEN.' /* end template body */'."\n".'return $this->buffer . ob_get_clean();';
-    }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		return $content.Dwoo_Compiler::PHP_OPEN.' /* end template body */'."\n".'return $this->buffer . ob_get_clean();';
+	}
 }

lib/plugins/builtin/blocks/foreachelse.php

Indentation +19 added lines, -19 removed lines

@@ -19,29 +19,29 @@
  */
 class Dwoo_Plugin_foreachelse extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $with = &$compiler->findBlock('foreach', true);
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$with = &$compiler->findBlock('foreach', true);
 
-        $params['initialized'] = true;
-        $compiler->injectBlock($type, $params);
+		$params['initialized'] = true;
+		$compiler->injectBlock($type, $params);
 
-        return '';
-    }
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $block = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$block = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/plugins/builtin/blocks/block.php

Indentation +11 added lines, -11 removed lines

@@ -21,17 +21,17 @@
  */
 class Dwoo_Plugin_block extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init($name = '')
-    {
-    }
+	public function init($name = '')
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '';
-    }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        return $content;
-    }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		return $content;
+	}
 }

lib/plugins/builtin/blocks/with.php

Indentation +24 added lines, -24 removed lines

@@ -43,36 +43,36 @@
  */
 class Dwoo_Plugin_with extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-    protected static $cnt = 0;
+	protected static $cnt = 0;
 
-    public function init($var)
-    {
-    }
+	public function init($var)
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '';
-    }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $rparams = $compiler->getRealParams($params);
-        $cparams = $compiler->getCompiledParams($params);
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$rparams = $compiler->getRealParams($params);
+		$cparams = $compiler->getCompiledParams($params);
 
-        $compiler->setScope($rparams['var']);
+		$compiler->setScope($rparams['var']);
 
-        $pre = Dwoo_Compiler::PHP_OPEN.'if ('.$cparams['var'].')'."\n{\n".
-            '$_with'.(self::$cnt).' = $this->setScope("'.$rparams['var'].'");'.
-            "\n/* -- start with output */\n".Dwoo_Compiler::PHP_CLOSE;
+		$pre = Dwoo_Compiler::PHP_OPEN.'if ('.$cparams['var'].')'."\n{\n".
+			'$_with'.(self::$cnt).' = $this->setScope("'.$rparams['var'].'");'.
+			"\n/* -- start with output */\n".Dwoo_Compiler::PHP_CLOSE;
 
-        $post = Dwoo_Compiler::PHP_OPEN."\n/* -- end with output */\n".
-            '$this->setScope($_with'.(self::$cnt++).', true);'.
-            "\n}\n".Dwoo_Compiler::PHP_CLOSE;
+		$post = Dwoo_Compiler::PHP_OPEN."\n/* -- end with output */\n".
+			'$this->setScope($_with'.(self::$cnt++).', true);'.
+			"\n}\n".Dwoo_Compiler::PHP_CLOSE;
 
-        if (isset($params['hasElse'])) {
-            $post .= $params['hasElse'];
-        }
+		if (isset($params['hasElse'])) {
+			$post .= $params['hasElse'];
+		}
 
-        return $pre.$content.$post;
-    }
+		return $pre.$content.$post;
+	}
 }

lib/plugins/builtin/blocks/withelse.php

Indentation +19 added lines, -19 removed lines

@@ -19,29 +19,29 @@
  */
 class Dwoo_Plugin_withelse extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $with = &$compiler->findBlock('with', true);
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$with = &$compiler->findBlock('with', true);
 
-        $params['initialized'] = true;
-        $compiler->injectBlock($type, $params);
+		$params['initialized'] = true;
+		$compiler->injectBlock($type, $params);
 
-        return '';
-    }
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $block = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$block = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 
-        return '';
-    }
+		return '';
+	}
 }