Enhance DeferredTokenParser

rybakit · Mar 17, 2017 · 8618a3f · 8618a3f
1 parent 8d381b1
commit 8618a3f
Showing 1 changed file with 41 additions and 32 deletions.
diff --git a/src/DeferredTokenParser.php b/src/DeferredTokenParser.php
@@ -2,47 +2,56 @@
 
 namespace Phive\Twig\Extensions\Deferred;
 
-class DeferredTokenParser extends \Twig_TokenParser_Block
+class DeferredTokenParser extends \Twig_TokenParser
 {
+    private $blockTokenParser;
+
+    public function setParser(\Twig_Parser $parser)
+    {
+        parent::setParser($parser);
+
+        $this->blockTokenParser = new \Twig_TokenParser_Block();
+        $this->blockTokenParser->setParser($parser);
+    }
+
     public function parse(\Twig_Token $token)
     {
-        $lineno = $token->getLine();
         $stream = $this->parser->getStream();
-        $name = $stream->expect(\Twig_Token::NAME_TYPE)->getValue();
+        $nameToken = $stream->next();
+        $deferredToken = $stream->nextIf(\Twig_Token::NAME_TYPE, 'deferred');
+        $stream->injectTokens(array($nameToken));
 
-        if ($this->parser->hasBlock($name)) {
-            throw new \Twig_Error_Syntax(sprintf("The block '$name' has already been defined line %d", $this->parser->getBlock($name)->getLine()), $stream->getCurrent()->getLine(), $stream->getFilename());
-        }
+        $node = $this->blockTokenParser->parse($token);
 
-        $block = $stream->nextIf(\Twig_Token::NAME_TYPE, 'deferred')
-            ? new DeferredBlockNode($name, new \Twig_Node(array()), $lineno)
-            : new \Twig_Node_Block($name, new \Twig_Node(array()), $lineno);
-
-        $this->parser->setBlock($name, $block);
-        $this->parser->pushLocalScope();
-        $this->parser->pushBlockStack($name);
-
-        if ($stream->nextIf(\Twig_Token::BLOCK_END_TYPE)) {
-            $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            if ($token = $stream->nextIf(\Twig_Token::NAME_TYPE)) {
-                $value = $token->getValue();
-
-                if ($value !== $name) {
-                    throw new \Twig_Error_Syntax(sprintf("Expected endblock for block '$name' (but %s given)", $value), $stream->getCurrent()->getLine(), $stream->getFilename());
-                }
-            }
-        } else {
-            $body = new \Twig_Node(array(
-                new \Twig_Node_Print($this->parser->getExpressionParser()->parseExpression(), $lineno),
-            ));
+        if ($deferredToken) {
+            $this->replaceBlockNode($nameToken->getValue());
         }
 
-        $stream->expect(\Twig_Token::BLOCK_END_TYPE);
+        return $node;
+    }
+
+    public function getTag()
+    {
+        return 'block';
+    }
+
+    private function replaceBlockNode($name)
+    {
+        $block = $this->parser->getBlock($name)->getNode(0);
+        $this->parser->setBlock($name, $this->createDeferredBlockNode($block));
+    }
+
+    private function createDeferredBlockNode(\Twig_Node_Block $block)
+    {
+        $name = $block->getAttribute('name');
+        $deferredBlock = new DeferredBlockNode($name, new \Twig_Node(array()), $block->getTemplateLine());
+
+        foreach ($block as $nodeName => $node) {
+            $deferredBlock->setNode($nodeName, $node);
+        }
 
-        $block->setNode('body', $body);
-        $this->parser->popBlockStack();
-        $this->parser->popLocalScope();
+        $deferredBlock->setTemplateName($block->getTemplateName());
 
-        return new \Twig_Node_BlockReference($name, $lineno, $this->getTag());
+        return $deferredBlock;
     }
 }