cseufert / hamle

php/hamle/Parse.php

Indentation -279 removed lines

@@ -54,282 +54,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected $lineNo;
-  /**
-   * @var int Total Lines in File
-   */
-  protected $lineCount;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init()
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines($s)
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter)
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip($s)
-  {
-    //save root tags
-    /** @var Tag[] $roots */
-    $roots = $this->root;
-    $this->root = [];
-    $this->loadLines($s);
-    $this->procLines();
-    $this->root = array_merge($roots, $this->root);
-  }
-
-  function applySnip()
-  {
-    /** @var Tag\Snippet[] $fwdSnip */
-    $fwdSnip = [];
-    /** @var Tag\Snippet[] $revSnip */
-    $revSnip = [];
-    /** @var Tag[] $roots */
-    $roots = [];
-    foreach ($this->root as $snip) {
-      if ($snip instanceof Tag\Snippet) {
-        if ($snip->getType() == 'append') {
-          array_unshift($revSnip, $snip);
-        } else {
-          $fwdSnip[] = $snip;
-        }
-      } else {
-        $roots[] = $snip;
-      }
-    }
-    foreach ($fwdSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      }
-    }
-    foreach ($revSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      }
-    }
-    $this->root = $roots;
-  }
-
-  /**
-   * Parse HAMLE template, from a string
-   * @param string $s String to parse
-   */
-  function str($s)
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines()
-  {
-    /* @var $heir Tag[] Tag Heirachy Array */
-    $heir = [];
-    while ($this->lineNo < $this->lineCount) {
-      $line = $this->lines[$this->lineNo];
-      if (trim($line)) {
-        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
-          if (false !== strpos($m[1], "\t")) {
-            throw new ParseError(
-              'Tabs are not supported in templates at this time',
-            );
-          }
-          $indent = strlen($m[1]);
-          $tag = isset($m[2]) ? ($tag = $m[2]) : '';
-          $classid = isset($m[3]) ? $m[3] : '';
-          $params = str_replace(
-            ['\[', '\]', '\\&'],
-            ['[', ']', '%26'],
-            isset($m[4]) ? $m[4] : '',
-          );
-          $textcode = isset($m[5]) ? $m[5] : '';
-          $text = isset($m[8]) ? $m[8] : '';
-          $code = isset($m[6]) ? $m[6] : '';
-          $i = self::indentLevel($indent);
-          unset($m[0]);
-          switch (strlen($code) ? $code[0] : ($textcode ? $textcode : '')) {
-            case '|': //Control Tag
-              if ($code == '|snippet') {
-                $hTag = new Tag\Snippet($text);
-              } elseif ($code == '|form') {
-                $hTag = new Tag\Form($text);
-              } elseif ($code == '|formhint') {
-                $hTag = new Tag\FormHint();
-              } elseif ($code == '|else') {
-                $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
-                $hTag->setVar($text);
-              } else {
-                $hTag = new Tag\Control(substr($code, 1));
-                $hTag->setVar($text);
-              }
-              break;
-            case ':': //Filter Tag
-              $hTag = new Tag\Filter(substr($code, 1));
-              $hTag->addContent($text, Text::TOKEN_CODE);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            case '_': //String Tag
-            case '__': //Unescape String Tag
-            case '___': //Unescape String Tag (with unescaped vars)
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '___': //Unescape String Tag
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '/': // HTML Comment
-            case '//': // Non Printed Comment
-              $hTag = new Tag\Comment($textcode);
-              $hTag->addContent($text);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            default:
-              $attr = [];
-              if (isset($params[0]) && $params[0] == '[') {
-                $param = substr($params, 1, -1);
-                $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
-                //              parse_str($param, $attr);
-                $attr = $this->parseQueryString($param);
-              }
-              $class = [];
-              $id = '';
-              $ref = '';
-              preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-              if (isset($cid[0])) {
-                foreach ($cid[0] as $s) {
-                  if ($s[0] == '#') {
-                    $id = substr($s, 1);
-                  }
-                  if ($s[0] == '.') {
-                    $class[] = substr($s, 1);
-                  }
-                  if ($s[0] == '!') {
-                    $ref = substr($s, 1);
-                  }
-                }
-              }
-              if ($ref) {
-                $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-              } else {
-                $hTag = new Tag\Html($tag, $class, $attr, $id);
-              }
-              $hTag->addContent($text);
-              break;
-          }
-          $heir[$i] = $hTag;
-          if ($i > 0) {
-            $heir[$i - 1]->addChild($hTag);
-          } else {
-            $this->root[] = $hTag;
-          }
-        } else {
-          throw new ParseError(
-            "Unable to parse line {$this->lineNo}\n\"$line\"/" .
-              preg_last_error(),
-          );
-        }
-      }
-      $this->lineNo++;
-    }
-  }
-
-  function parseQueryString($qs)
-  {
-    $out = [];
-    foreach (explode('&', $qs) as $s) {
-      $kv = explode('=', $s, 2);
-      $out[urldecode($kv[0])] = isset($kv[1]) ? urldecode($kv[1]) : null;
-    }
-    return $out;
-  }
-
-  function output($minify = false)
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock($indent)
-  {
-    $out = [];
-    $m = [];
-    while (
-      $this->lineNo + 1 < $this->lineCount &&
-      (!trim($this->lines[$this->lineNo + 1]) ||
-        preg_match(
-          '/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
-          $this->lines[$this->lineNo + 1],
-          $m,
-        ))
-    ) {
-      if (trim($this->lines[$this->lineNo + 1])) {
-        $out[] = $m[2];
-      }
-      $this->lineNo++;
-    }
-    return $out;
-  }
-
-  function indentLevel($indent)
-  {
-    if (!isset($this->indents)) {
-      $this->indents = [];
-    }
-    if (!count($this->indents)) {
-      $this->indents = [0 => $indent];
-      // Key = indent level, Value = Depth in spaces
-      return 0;
-    }
-    foreach ($this->indents as $k => $v) {
-      if ($v == $indent) {
-        $this->indents = array_slice($this->indents, 0, $k + 1);
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo()
-  {
-    return $this->lineNo;
-  }
-}

Braces -279 removed lines

@@ -54,282 +54,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected $lineNo;
-  /**
-   * @var int Total Lines in File
-   */
-  protected $lineCount;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init()
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines($s)
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter)
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip($s)
-  {
-    //save root tags
-    /** @var Tag[] $roots */
-    $roots = $this->root;
-    $this->root = [];
-    $this->loadLines($s);
-    $this->procLines();
-    $this->root = array_merge($roots, $this->root);
-  }
-
-  function applySnip()
-  {
-    /** @var Tag\Snippet[] $fwdSnip */
-    $fwdSnip = [];
-    /** @var Tag\Snippet[] $revSnip */
-    $revSnip = [];
-    /** @var Tag[] $roots */
-    $roots = [];
-    foreach ($this->root as $snip) {
-      if ($snip instanceof Tag\Snippet) {
-        if ($snip->getType() == 'append') {
-          array_unshift($revSnip, $snip);
-        } else {
-          $fwdSnip[] = $snip;
-        }
-      } else {
-        $roots[] = $snip;
-      }
-    }
-    foreach ($fwdSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      }
-    }
-    foreach ($revSnip as $snip) {
-      foreach ($roots as $root) {
-        $snip->apply($root);
-      }
-    }
-    $this->root = $roots;
-  }
-
-  /**
-   * Parse HAMLE template, from a string
-   * @param string $s String to parse
-   */
-  function str($s)
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines()
-  {
-    /* @var $heir Tag[] Tag Heirachy Array */
-    $heir = [];
-    while ($this->lineNo < $this->lineCount) {
-      $line = $this->lines[$this->lineNo];
-      if (trim($line)) {
-        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
-          if (false !== strpos($m[1], "\t")) {
-            throw new ParseError(
-              'Tabs are not supported in templates at this time',
-            );
-          }
-          $indent = strlen($m[1]);
-          $tag = isset($m[2]) ? ($tag = $m[2]) : '';
-          $classid = isset($m[3]) ? $m[3] : '';
-          $params = str_replace(
-            ['\[', '\]', '\\&'],
-            ['[', ']', '%26'],
-            isset($m[4]) ? $m[4] : '',
-          );
-          $textcode = isset($m[5]) ? $m[5] : '';
-          $text = isset($m[8]) ? $m[8] : '';
-          $code = isset($m[6]) ? $m[6] : '';
-          $i = self::indentLevel($indent);
-          unset($m[0]);
-          switch (strlen($code) ? $code[0] : ($textcode ? $textcode : '')) {
-            case '|': //Control Tag
-              if ($code == '|snippet') {
-                $hTag = new Tag\Snippet($text);
-              } elseif ($code == '|form') {
-                $hTag = new Tag\Form($text);
-              } elseif ($code == '|formhint') {
-                $hTag = new Tag\FormHint();
-              } elseif ($code == '|else') {
-                $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
-                $hTag->setVar($text);
-              } else {
-                $hTag = new Tag\Control(substr($code, 1));
-                $hTag->setVar($text);
-              }
-              break;
-            case ':': //Filter Tag
-              $hTag = new Tag\Filter(substr($code, 1));
-              $hTag->addContent($text, Text::TOKEN_CODE);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            case '_': //String Tag
-            case '__': //Unescape String Tag
-            case '___': //Unescape String Tag (with unescaped vars)
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '___': //Unescape String Tag
-              $hTag = new Tag\Text($textcode);
-              $hTag->addContent($text);
-              break;
-            case '/': // HTML Comment
-            case '//': // Non Printed Comment
-              $hTag = new Tag\Comment($textcode);
-              $hTag->addContent($text);
-              foreach ($this->consumeBlock($indent) as $l) {
-                $hTag->addContent($l, Text::TOKEN_CODE);
-              }
-              break;
-            default:
-              $attr = [];
-              if (isset($params[0]) && $params[0] == '[') {
-                $param = substr($params, 1, -1);
-                $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
-                //              parse_str($param, $attr);
-                $attr = $this->parseQueryString($param);
-              }
-              $class = [];
-              $id = '';
-              $ref = '';
-              preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-              if (isset($cid[0])) {
-                foreach ($cid[0] as $s) {
-                  if ($s[0] == '#') {
-                    $id = substr($s, 1);
-                  }
-                  if ($s[0] == '.') {
-                    $class[] = substr($s, 1);
-                  }
-                  if ($s[0] == '!') {
-                    $ref = substr($s, 1);
-                  }
-                }
-              }
-              if ($ref) {
-                $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-              } else {
-                $hTag = new Tag\Html($tag, $class, $attr, $id);
-              }
-              $hTag->addContent($text);
-              break;
-          }
-          $heir[$i] = $hTag;
-          if ($i > 0) {
-            $heir[$i - 1]->addChild($hTag);
-          } else {
-            $this->root[] = $hTag;
-          }
-        } else {
-          throw new ParseError(
-            "Unable to parse line {$this->lineNo}\n\"$line\"/" .
-              preg_last_error(),
-          );
-        }
-      }
-      $this->lineNo++;
-    }
-  }
-
-  function parseQueryString($qs)
-  {
-    $out = [];
-    foreach (explode('&', $qs) as $s) {
-      $kv = explode('=', $s, 2);
-      $out[urldecode($kv[0])] = isset($kv[1]) ? urldecode($kv[1]) : null;
-    }
-    return $out;
-  }
-
-  function output($minify = false)
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock($indent)
-  {
-    $out = [];
-    $m = [];
-    while (
-      $this->lineNo + 1 < $this->lineCount &&
-      (!trim($this->lines[$this->lineNo + 1]) ||
-        preg_match(
-          '/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
-          $this->lines[$this->lineNo + 1],
-          $m,
-        ))
-    ) {
-      if (trim($this->lines[$this->lineNo + 1])) {
-        $out[] = $m[2];
-      }
-      $this->lineNo++;
-    }
-    return $out;
-  }
-
-  function indentLevel($indent)
-  {
-    if (!isset($this->indents)) {
-      $this->indents = [];
-    }
-    if (!count($this->indents)) {
-      $this->indents = [0 => $indent];
-      // Key = indent level, Value = Depth in spaces
-      return 0;
-    }
-    foreach ($this->indents as $k => $v) {
-      if ($v == $indent) {
-        $this->indents = array_slice($this->indents, 0, $k + 1);
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo()
-  {
-    return $this->lineNo;
-  }
-}

php/hamle/Grammar/Parser.php

Indentation +10 added lines, -10 removed lines

@@ -301,14 +301,14 @@ 
     private function peg_f1($i) { $return = array();
                                                   array_walk_recursive($i, function($a) use (&$return) { $return[] = $a; });
                                                   return $return;
-                                         }
+                                          }
     private function peg_f2($text) { return new \Seufert\Hamle\TextNode\StringLit(join('',$text)); }
     private function peg_f3($body) { return $body; }
     private function peg_f4($name) {
             return new \Seufert\Hamle\TextNode\ScopeId(null, null, new \Seufert\Hamle\TextNode\ModelParam($name)); }
     private function peg_f5($expr, $chain) { if(!$chain) return $expr;
-                           $top = array_pop($chain);
-                           while($chain) { $top = array_pop($chain)->withChain($top); } return $expr->withChain($top); }
+                            $top = array_pop($chain);
+                            while($chain) { $top = array_pop($chain)->withChain($top); } return $expr->withChain($top); }
     private function peg_f6($sub) { return $sub; }
     private function peg_f7($filter) { return $filter; }
     private function peg_f8($name) { return new \Seufert\Hamle\TextNode\ModelParam($name, null); }
@@ -347,13 +347,13 @@ 
         }
     private function peg_f35($s) { return new \Seufert\Hamle\TextNode\StringLit(join('',$s)); }
     private function peg_f36($s, $e, $post) {
-                               $o = [];
-                               if($s) $o[] = new \Seufert\Hamle\TextNode\StringLit(join('',$s));
-                               if($e) $o[] = $e;
-                               if($post) foreach($post as $p) $o[] = $p;
-                               if(!$o) return new \Seufert\Hamle\TextNode\StringLit('');
-                               return \Seufert\Hamle\TextNode\StringConcat::fromList($o);
-                           }
+                                $o = [];
+                                if($s) $o[] = new \Seufert\Hamle\TextNode\StringLit(join('',$s));
+                                if($e) $o[] = $e;
+                                if($post) foreach($post as $p) $o[] = $p;
+                                if(!$o) return new \Seufert\Hamle\TextNode\StringLit('');
+                                return \Seufert\Hamle\TextNode\StringConcat::fromList($o);
+                            }
     private function peg_f37($parts) { return new \Seufert\Hamle\TextNode\StringLit($parts[1]); }
     private function peg_f38($chars) { return join('', $chars); }
     private function peg_f39($c) { return $c; }

Braces +27 added lines, -9 removed lines

@@ -306,7 +306,9 @@ 
     private function peg_f3($body) { return $body; }
     private function peg_f4($name) {
             return new \Seufert\Hamle\TextNode\ScopeId(null, null, new \Seufert\Hamle\TextNode\ModelParam($name)); }
-    private function peg_f5($expr, $chain) { if(!$chain) return $expr;
+    private function peg_f5($expr, $chain) { if(!$chain) {
+      return $expr;
+    }
                            $top = array_pop($chain);
                            while($chain) { $top = array_pop($chain)->withChain($top); } return $expr->withChain($top); }
     private function peg_f6($sub) { return $sub; }
@@ -339,19 +341,35 @@ 
     private function peg_f33($parts) { return $parts[1]; }
     private function peg_f34($s, $e, $post) {
             $o = [];
-            if($s) $o[] = new \Seufert\Hamle\TextNode\StringLit(join('',$s));
-            if($e) $o[] = $e;
-            if($post) foreach($post as $p) $o[] = $p;
-            if(!$o) return new \Seufert\Hamle\TextNode\StringLit('');
+            if($s) {
+              $o[] = new \Seufert\Hamle\TextNode\StringLit(join('',$s));
+            }
+            if($e) {
+              $o[] = $e;
+            }
+            if($post) {
+              foreach($post as $p) $o[] = $p;
+            }
+            if(!$o) {
+              return new \Seufert\Hamle\TextNode\StringLit('');
+            }
             return \Seufert\Hamle\TextNode\StringConcat::fromList($o);
         }
     private function peg_f35($s) { return new \Seufert\Hamle\TextNode\StringLit(join('',$s)); }
     private function peg_f36($s, $e, $post) {
                                $o = [];
-                               if($s) $o[] = new \Seufert\Hamle\TextNode\StringLit(join('',$s));
-                               if($e) $o[] = $e;
-                               if($post) foreach($post as $p) $o[] = $p;
-                               if(!$o) return new \Seufert\Hamle\TextNode\StringLit('');
+                               if($s) {
+                                 $o[] = new \Seufert\Hamle\TextNode\StringLit(join('',$s));
+                               }
+                               if($e) {
+                                 $o[] = $e;
+                               }
+                               if($post) {
+                                 foreach($post as $p) $o[] = $p;
+                               }
+                               if(!$o) {
+                                 return new \Seufert\Hamle\TextNode\StringLit('');
+                               }
                                return \Seufert\Hamle\TextNode\StringConcat::fromList($o);
                            }
     private function peg_f37($parts) { return new \Seufert\Hamle\TextNode\StringLit($parts[1]); }