cseufert / hamle

php/hamle/Parse.php

Spacing -275 removed lines

@@ -53,278 +53,3 @@
    */
 
   const REGEX_PARSE_LINE = <<<'ENDREGEX'
-  /^(\s*)(?:(?:([a-zA-Z0-9-]*)((?:[\.#!][\w\-\_]+)*)(\[(?:(?:\{\$[^\}]+\})?[^\\\]{]*?(?:\\.)*?(?:{[^\$])*?)+\])?)|([_\/]{1,3})|([\|:\$]\w+)|({?\$[^}]+}?)|)(?: (.*))?$/
-  ENDREGEX;
-
-  /**
-   * @var int Current Line Number
-   */
-  protected int $lineNo = 0;
-  /**
-   * @var int Total Lines in File
-   */
-  protected int $lineCount = 0;
-
-  function __construct()
-  {
-    $this->init();
-  }
-
-  /**
-   * Clear Lines, and Line Number, so if output is
-   * called, no output will be produced
-   */
-  protected function init():void
-  {
-    $this->lines = [];
-    $this->lineNo = 0;
-    $this->lineCount = 0;
-    $this->root = [];
-  }
-
-  protected function loadLines(string $s):void
-  {
-    $this->lines = explode("\n", str_replace("\r", '', $s));
-    $this->lineCount = count($this->lines);
-    $this->lineNo = 0;
-  }
-
-  function parseFilter(ParseFilter $filter):void
-  {
-    foreach ($this->root as $k => $tag) {
-      $this->root[$k] = $filter->filterTag($tag);
-    }
-  }
-
-  function parseSnip(string $s):void
-  {
-    //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():void
-  {
-    /** @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):void
-  {
-    $this->init();
-    $this->loadLines($s);
-    $this->procLines();
-  }
-
-  function procLines():void
-  {
-    /* @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);
-                $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(string $qs):array
-  {
-    $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(bool $minify = false):string
-  {
-    $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag) {
-      $out .= $tag->render(0, $minify);
-    }
-    return $out;
-  }
-
-  function consumeBlock(int $indent):array
-  {
-    $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(int $indent):int
-  {
-    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, 1 + (int) $k );
-        return $k;
-      }
-    }
-    $this->indents[] = $indent;
-    return max(array_keys($this->indents));
-  }
-
-  function getLineNo():int
-  {
-    return $this->lineNo;
-  }
-}

php/hamle/Text.php

Spacing +14 added lines, -14 removed lines

@@ -70,7 +70,7 @@ 
       ]);
     } catch (SyntaxError $e) {
       throw new ParseError(
-        'Unable to parse:' . $s . "\n\n" . $e->getMessage(),
+        'Unable to parse:'.$s."\n\n".$e->getMessage(),
         0,
         $e,
       );
@@ -141,7 +141,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset),
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   function toHTML(bool $escape = false): string
@@ -156,16 +156,16 @@ 
           }
           break;
         case 'scopeName':
-          $out .= '<?=' . self::renderScopeName($node) . '?>';
+          $out .= '<?='.self::renderScopeName($node).'?>';
           break;
         case 'scopeThis':
-          $out .= '<?=' . self::renderScopeThis($node) . '?>';
+          $out .= '<?='.self::renderScopeThis($node).'?>';
           break;
         case 'expr':
-          $out .= '<?=' . self::renderExpr($node) . '?>';
+          $out .= '<?='.self::renderExpr($node).'?>';
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return $out;
@@ -194,7 +194,7 @@ 
           $out[] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -202,7 +202,7 @@ 
 
   function doEval(): mixed
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode(mixed $var): mixed
@@ -210,9 +210,9 @@ 
     if (is_array($var)) {
       $code = [];
       foreach ($var as $key => $value) {
-        $code[] = self::varToCode($key) . '=>' . self::varToCode($value);
+        $code[] = self::varToCode($key).'=>'.self::varToCode($value);
       }
-      return 'array(' . implode(',', $code) . ')'; //remove unnecessary coma
+      return 'array('.implode(',', $code).')'; //remove unnecessary coma
     }
     if (is_bool($var)) {
       return $var ? 'TRUE' : 'FALSE';
@@ -224,16 +224,16 @@ 
       return $var->toPHP();
     }
     if (strpos($var, "\n") !== false) {
-      return '"' .
+      return '"'.
         str_replace(
           ['\\', '$', '"', "\n"],
           ['\\\\', '\$', '\\"', '\\n'],
           $var,
-        ) .
+        ).
         '"';
     }
-    return "'" .
-      str_replace(['\\', '$', "'"], ['\\\\', '$', "\\'"], $var) .
+    return "'".
+      str_replace(['\\', '$', "'"], ['\\\\', '$', "\\'"], $var).
       "'";
   }
 

php/hamle/Hamle.php

Spacing +4 added lines, -4 removed lines

@@ -92,8 +92,8 @@ 
     }
     if (!$baseModel instanceof Model) {
       throw new Exception\Unsupported(
-        'Unsupported Model(' .
-          get_class($baseModel) .
+        'Unsupported Model('.
+          get_class($baseModel).
           ') Type was passed, it must implement hamleModel',
       );
     }
@@ -128,7 +128,7 @@ 
       throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
     }
     $this->cacheFile = $this->setup->cachePath(
-      str_replace('/', '-', $hamleFile) . '.php',
+      str_replace('/', '-', $hamleFile).'.php',
     );
     $this->setup->debugLog("Set cache file path to ({$this->cacheFile})");
     $cacheFileAge = is_file($this->cacheFile) ? filemtime($this->cacheFile) : 0;
@@ -193,7 +193,7 @@ 
   function string(string $hamleString): void
   {
     $md5 = md5($hamleString);
-    $stringId = substr($md5, 0, 12) . substr($md5, 24, 8);
+    $stringId = substr($md5, 0, 12).substr($md5, 24, 8);
     $this->cacheFile = $this->setup->cachePath("string.$stringId.hamle.php");
     if (!is_file($this->cacheFile)) {
       $this->parse($hamleString);

php/hamle/TextNode/StringConcat.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
   static function fromParser(
     array $chars,
     ?Evaluated $expr = null,
-    string|StringLit|StringConcat $rhs = null
+    string | StringLit | StringConcat $rhs = null
   ): self {
     $o = [];
     if ($chars) {

php/hamle/TextNode/RelQuery.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
     $this->filters = $filters;
   }
 
-  static function for(string $rel, array $filters): self
+  static function for (string $rel, array $filters): self
   {
     return new self(
       $rel === '>' ? Hamle::REL_CHILD : Hamle::REL_PARENT,
@@ -30,9 +30,9 @@ 
   public function apply(string $out): string
   {
     $out =
-      $out .
-      "->hamleRel({$this->rel}," .
-      Query::queryParams($this->filters, true) .
+      $out.
+      "->hamleRel({$this->rel},".
+      Query::queryParams($this->filters, true).
       ')';
     if ($this->chain) {
       $out = $this->chain->apply($out);

php/hamle/Text/Scope.php

Spacing +2 added lines, -2 removed lines

@@ -50,9 +50,9 @@
   function toPHP(): string
   {
     if (is_numeric($this->scope)) {
-      return 'Hamle\\Scope::get(' . Text::varToCode($this->scope) . ')';
+      return 'Hamle\\Scope::get('.Text::varToCode($this->scope).')';
     } else {
-      return 'Hamle\\Scope::getName(' . Text::varToCode($this->scope) . ')';
+      return 'Hamle\\Scope::getName('.Text::varToCode($this->scope).')';
     }
   }
 

php/hamle/Text/Func.php

Spacing +13 added lines, -13 removed lines

@@ -50,7 +50,7 @@ 
   public function __construct($s)
   {
     $m = [];
-    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m)) {
+    if (!preg_match('/^\$\(('.self::REGEX_FUNCSEL.'*)(.*)\)$/', $s, $m)) {
       throw new ParseError("Unable to read \$ func in '$s'");
     }
     if (trim($m[2])) {
@@ -137,31 +137,31 @@ 
    */
   public function toPHP(): string
   {
-    $sub = $this->sub ? '->' . $this->sub->toPHP() : '';
+    $sub = $this->sub ? '->'.$this->sub->toPHP() : '';
     if ($this->scope instanceof Scope) {
-      return $this->scope->toPHP() . $sub;
+      return $this->scope->toPHP().$sub;
     } elseif ($this->scope === true) {
       return "Hamle\\Scope::get(0)$sub";
     }
     $limit =
-      Text::varToCode($this->sortlimit['sort']) .
-      ',' .
-      $this->sortlimit['limit'] .
-      ',' .
+      Text::varToCode($this->sortlimit['sort']).
+      ','.
+      $this->sortlimit['limit'].
+      ','.
       $this->sortlimit['offset'];
     if (count($this->filt['tag'])) {
-      return 'Hamle\\Run::modelTypeTags(' .
-        Text::varToCode($this->filt['tag']) .
+      return 'Hamle\\Run::modelTypeTags('.
+        Text::varToCode($this->filt['tag']).
         ",$limit)$sub";
     }
     if (count($this->filt['id'])) {
       if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1) {
-        return 'Hamle\\Run::modelId(' .
-          Text::varToCode(current($this->filt['id']['*'])) .
+        return 'Hamle\\Run::modelId('.
+          Text::varToCode(current($this->filt['id']['*'])).
           ",$limit)$sub";
       } else {
-        return 'Hamle\\Run::modelTypeId(' .
-          Text::varToCode($this->filt['id']) .
+        return 'Hamle\\Run::modelTypeId('.
+          Text::varToCode($this->filt['id']).
           ",$limit)$sub";
       }
     }

php/hamle/Text/SimpleVar.php

Spacing +3 added lines, -3 removed lines

@@ -48,9 +48,9 @@ 
   function toHTML(bool $escape = false): string
   {
     if ($escape) {
-      return '<?=htmlspecialchars(' . $this->toPHP() . ')?>';
+      return '<?=htmlspecialchars('.$this->toPHP().')?>';
     }
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
 
   function toPHP(): string
@@ -60,7 +60,7 @@ 
 
   function toPHPVar(): string
   {
-    return 'Hamle\\Scope::get()->hamleGet(' . Text::varToCode($this->var) . ')';
+    return 'Hamle\\Scope::get()->hamleGet('.Text::varToCode($this->var).')';
   }
 
   function getOrCreateModel(Model $parent = null): Model

php/hamle/Text/Complex.php

Spacing +5 added lines, -5 removed lines

@@ -64,9 +64,9 @@ 
   function toHTML(bool $escape = false): string
   {
     if ($escape) {
-      return '<?=htmlspecialchars(' . $this->toPHP() . ')?>';
+      return '<?=htmlspecialchars('.$this->toPHP().')?>';
     }
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
   function toPHP(): string
   {
@@ -80,7 +80,7 @@ 
       foreach ($this->sel as $s) {
         $sel[] = "hamleGet('$s')";
       }
-      return $this->func->toPHP() . '->' . implode('->', $sel);
+      return $this->func->toPHP().'->'.implode('->', $sel);
     } else {
       return $this->func->toPHP();
     }
@@ -95,7 +95,7 @@ 
       return $this->func->getOrCreateModel($parent);
     }
     throw new RuntimeException(
-      'Unsupported func type encountered:' .
+      'Unsupported func type encountered:'.
         ($this->func ? get_class($this->func) : 'Unknown'),
     );
   }
@@ -114,7 +114,7 @@ 
     $model = $this->getOrCreateModel();
     if (!$model instanceof WriteModel) {
       throw new RuntimeException(
-        'Can only set values on WriteModel, got ' . get_class($model),
+        'Can only set values on WriteModel, got '.get_class($model),
       );
     }
     $model->hamleSet($this->sel[0], $value);