support for buffered blocks

everzet · Aug 10, 2010 · 6e48d71 · 6e48d71
1 parent 0d829dd
commit 6e48d71
Showing 1 changed file with 25 additions and 28 deletions.
diff --git a/src/Everzet/Jade/Parser.php b/src/Everzet/Jade/Parser.php
@@ -461,37 +461,34 @@ protected function parseExpr()
             case 'code':
                 $tok = $this->advance();
                 $val = $tok->val;
-                if ($tok->buffer) {
-                    $buf = sprintf("<?php echo %s ?>\n",
-                        preg_replace(array("/^ */", "/ *$/"), '', $val)
-                    );
-                } else {
-                    $beg = preg_replace(array("/^ */", "/ *$/"), '', $val);
-                    $end = null;
-                    $indents = $this->getIndentation();
-                    foreach ($this->blocks as $regexp => $close) {
-                        if (preg_match($regexp, $beg)) {
-                            $end = $close;
-                            break;
-                        }
+                $buf = $tok->buffer ? '<?php echo ' : '<?php ';
+
+                $beg = preg_replace(array("/^ */", "/ *$/"), '', $val);
+                $end = null;
+                $indents = $this->getIndentation();
+                foreach ($this->blocks as $regexp => $close) {
+                    if (preg_match($regexp, $beg)) {
+                        $end = $close;
+                        break;
                     }
-                    $buf = sprintf('<?php %s', $beg);
-                    $this->skipNewlines();
-                    if ('indent' === $this->peek()->type) {
-                        $buf .= (null === $end ? '{' : '') . " ?>\n";
-                        $buf .= $this->parseBlock();
-                        $buf  = preg_replace(array("/^ */", "/ *$/"), '', $buf);
-                        $peek = $this->peek();
-                        if ('code' !== $peek->type || false === strpos($peek->val, 'else')) {
-                            $buf .= sprintf("%s<?php %s ?>\n",
-                                $indents,
-                                null === $end ? '}' : $end . ';'
-                            );
-                        }
-                    } else {
-                        $buf .= " ?>\n";
+                }
+                $buf .= $beg;
+                $this->skipNewlines();
+                if ('indent' === $this->peek()->type) {
+                    $buf .= (null === $end ? '{' : '') . " ?>\n";
+                    $buf .= $this->parseBlock();
+                    $buf  = preg_replace(array("/^ */", "/ *$/"), '', $buf);
+                    $peek = $this->peek();
+                    if ('code' !== $peek->type || false === strpos($peek->val, 'else')) {
+                        $buf .= sprintf("%s<?php %s ?>\n",
+                            $indents,
+                            null === $end ? '}' : $end . ';'
+                        );
                     }
+                } else {
+                    $buf .= " ?>\n";
                 }
+
                 return $buf;
             case 'comment':
                 $tok = $this->advance();