cseufert / hamle

php/hamle/Text.php

Spacing +25 added lines, -25 removed lines

@@ -51,7 +51,7 @@ 
   const FIND_DOLLARVAR = 0x02;
   const FIND_BARDOLLAR = 0x04;
 
-  const START_RULE_MAP = [self::TOKEN_HTML => 'HtmlInput', self::TOKEN_CODE => 'CodeInput',self::TOKEN_CONTROL => 'ControlInput'];
+  const START_RULE_MAP = [self::TOKEN_HTML => 'HtmlInput', self::TOKEN_CODE => 'CodeInput', self::TOKEN_CONTROL => 'ControlInput'];
 
   protected $mode;
 
@@ -61,9 +61,9 @@ 
   {
 //    var_dump($s);
     $this->mode = $mode;
-    $this->tree = (new Parser())->parse($s,['startRule' => self::START_RULE_MAP[$mode]]);
+    $this->tree = (new Parser())->parse($s, ['startRule' => self::START_RULE_MAP[$mode]]);
 //    var_dump($this->tree);
-    if(!$this->tree instanceof Doc) {
+    if (!$this->tree instanceof Doc) {
       $this->tree = new Doc(is_array($this->tree) ? $this->tree : [$this->tree]);
     }
 //    $m = [];
@@ -114,7 +114,7 @@ 
   {
     $func = $filter['func'];
     if (method_exists(Filter::class, $func)) {
-      $func = Filter::class . '::' . $func;
+      $func = Filter::class.'::'.$func;
     } elseif (in_array($func, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
     } elseif ($func === 'json') {
       $func = 'json_encode';
@@ -124,14 +124,14 @@ 
       throw new ParseError("Unknown Filter Type \"{$func}\"");
     }
     $args = join(',', array_map(function($v) {
-      if(is_array($v) && $v['type'] ?? false === 'expr') {
+      if (is_array($v) && $v['type'] ?? false === 'expr') {
         return self::renderExpr($v);
       } else
         return self::varToCode($v);
     } , $filter['args']));
-    if(strlen($args)) $args = ','.$args;
-    $o = "$func($o" . $args . ")";
-    if($filter['chain'] ?? false) {
+    if (strlen($args)) $args = ','.$args;
+    $o = "$func($o".$args.")";
+    if ($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
     }
     return $o;
@@ -139,21 +139,21 @@ 
 
   static function renderScopeThis($n)
   {
-    $o = 'Hamle\Scope::get()->hamleGet(' . self::varToCode($n['name']) . ')';
+    $o = 'Hamle\Scope::get()->hamleGet('.self::varToCode($n['name']).')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
 
   static function renderScopeId($n)
   {
-    $o = 'Hamle\Scope::get(' . $n['id'] . ')';
+    $o = 'Hamle\Scope::get('.$n['id'].')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
 
   static function renderScopeName($n)
   {
-    $o = 'Hamle\Scope::getName(' . self::varToCode($n['name']) . ')';
+    $o = 'Hamle\Scope::getName('.self::varToCode($n['name']).')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
@@ -161,7 +161,7 @@ 
   static function addParams(string $o, array $params)
   {
     while ($params['type'] ?? null === 'sub') {
-      $o .= '->hamleGet(' . self::varToCode($params['name']) . ')';
+      $o .= '->hamleGet('.self::varToCode($params['name']).')';
       $params = $params['params'] ?? [];
     }
     return $o;
@@ -170,7 +170,7 @@ 
   static function addRel(string $o, array $query, string $rel): string
   {
     $r = $rel === 'child' ? Hamle::REL_CHILD : Hamle::REL_PARENT;
-    $o = $o . "->hamleRel(" . self::varToCode($r) . ',' . self::queryParams($query, true) . ')';
+    $o = $o."->hamleRel(".self::varToCode($r).','.self::queryParams($query, true).')';
     return $o;
   }
 
@@ -230,7 +230,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset)
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   static function renderQuery($n)
@@ -249,7 +249,7 @@ 
     } elseif ($id !== null) {
       $o = self::queryId($n['query']);
     } else {
-      $o = 'Hamle\Run::modelTypeTags(' . self::queryParams($n['query']) . ')';
+      $o = 'Hamle\Run::modelTypeTags('.self::queryParams($n['query']).')';
     }
     if ($n['sub'] ?? []) {
       $o = self::addRel($o, $n['sub'], $n['rel']);
@@ -276,7 +276,7 @@ 
         $o = self::renderQuery($expr['body']);
         break;
       default:
-        throw new \RuntimeException('Invalid Node: ' . $expr['body']['type']);
+        throw new \RuntimeException('Invalid Node: '.$expr['body']['type']);
     }
     if ($expr['body']['filter'] ?? false) {
       $o = self::addFilter($o, $expr['body']['filter']);
@@ -295,16 +295,16 @@ 
             $out .= $node['body'];
           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;
@@ -332,7 +332,7 @@ 
           $out [] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -340,7 +340,7 @@ 
 
   function doEval()
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode($var)
@@ -348,9 +348,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');
@@ -361,7 +361,7 @@ 
     if ($var instanceof Text) {
       return $var->toPHP();
     }
-    return "'" . str_replace(['$', "'"], ['$', "\\'"], $var) . "'";
+    return "'".str_replace(['$', "'"], ['$', "\\'"], $var)."'";
   }
 
   /**

Braces +21 added lines, -13 removed lines

@@ -126,10 +126,13 @@ 
     $args = join(',', array_map(function($v) {
       if(is_array($v) && $v['type'] ?? false === 'expr') {
         return self::renderExpr($v);
-      } else
-        return self::varToCode($v);
+      } else {
+              return self::varToCode($v);
+      }
     } , $filter['args']));
-    if(strlen($args)) $args = ','.$args;
+    if(strlen($args)) {
+      $args = ','.$args;
+    }
     $o = "$func($o" . $args . ")";
     if($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
@@ -202,8 +205,9 @@ 
       self::varToCode($limit),
       self::varToCode($offset)
     ];
-    if ($addGroup)
-      $opt[] = self::varToCode($group);
+    if ($addGroup) {
+          $opt[] = self::varToCode($group);
+    }
     return join(',', $opt);
   }
 
@@ -239,10 +243,12 @@ 
     $id = null;
     $type = [];
     foreach ($n['query'] ?? [] as $q) {
-      if ($q['q'] === 'id')
-        $id = $q['id'] ?? null;
-      if ($q['q'] === 'type')
-        $type = $q['id'];
+      if ($q['q'] === 'id') {
+              $id = $q['id'] ?? null;
+      }
+      if ($q['q'] === 'type') {
+              $type = $q['id'];
+      }
     }
     if ($n['query'] === null) {
       $o = 'Hamle\Scope::get(0)';
@@ -291,8 +297,9 @@ 
     foreach ($this->tree as $node) {
       switch ($node['type']) {
         case 'string':
-          if ($node['body'] !== '')
-            $out .= $node['body'];
+          if ($node['body'] !== '') {
+                      $out .= $node['body'];
+          }
           break;
         case 'scopeName':
           $out .= '<?=' . self::renderScopeName($node) . '?>';
@@ -322,8 +329,9 @@ 
     foreach ($this->tree as $node) {
       switch ($node['type']) {
         case 'string':
-          if ($node['body'] !== '')
-            $out[] = self::varToCode($node['body']);
+          if ($node['body'] !== '') {
+                      $out[] = self::varToCode($node['body']);
+          }
           break;
         case 'scopeThis':
           $out[] = self::renderScopeThis($node);

php/hamle/Tag/Control.php

Spacing +14 added lines, -14 removed lines

@@ -47,13 +47,13 @@ 
    */
   function __construct($tag, $parentTag = null) {
     parent::__construct();
-    $this->o = "\$o" . self::$instCount++;
+    $this->o = "\$o".self::$instCount++;
     $this->type = strtolower($tag);
     $this->var = "";
     if ($parentTag && $this->type == "else") {
-      if($parentTag instanceof H\Tag) {
+      if ($parentTag instanceof H\Tag) {
         $elseTag = $parentTag->tags[count($parentTag->tags) - 1];
-        if($elseTag instanceof H\Tag\Control &&
+        if ($elseTag instanceof H\Tag\Control &&
             in_array($elseTag->type, array('with', 'if'))
         ) {
           $elseTag->else = true;
@@ -67,17 +67,17 @@ 
   }
 
   function renderStTag() {
-    $out = "<" . "?php ";
+    $out = "<"."?php ";
     $scopeName = "";
-    if($this->type === 'if') {
+    if ($this->type === 'if') {
       $hsvcomp = new H\Text\Comparison($this->var);
-      $out .= "if(" . $hsvcomp->toPHP() . ") {";
+      $out .= "if(".$hsvcomp->toPHP().") {";
       return $out."\n?>";
-    } elseif($this->type === 'else') {
+    } elseif ($this->type === 'else') {
       $out .= "/* else */";
       return $out."\n?>";
     }
-    if($this->var) {
+    if ($this->var) {
       if (preg_match('/ as ([a-zA-Z]+)$/', $this->var, $m)) {
         $scopeName = $m[1];
         $lookup = substr($this->var, 0, strlen($this->var) - strlen($m[0]));
@@ -88,16 +88,16 @@ 
     switch ($this->type) {
       case "each":
         if ($this->var)
-          $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
+          $out .= "foreach(".$hsv->toPHP()." as {$this->o}) { \n";
         else
           $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
         $out .= "Hamle\\Scope::add({$this->o}); ";
         break;
       case "with":
         if ($scopeName)
-          $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
+          $out .= "Hamle\\Scope::add(".$hsv->toPHP().", \"$scopeName\");\n;";
         else {
-          $out .= "if(({$this->o} = " . $hsv->toPHP() . ") && " .
+          $out .= "if(({$this->o} = ".$hsv->toPHP().") && ".
               "{$this->o}->valid()) {\n";
           $out .= "Hamle\\Scope::add({$this->o});\n;";
         }
@@ -107,7 +107,7 @@ 
         $fn = $file[0] === '#' ? 'includeFragment' : 'includeFile';
         $out .= "echo Hamle\\Run::$fn({$hsv->toPHP()});";
     }
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   /**
@@ -118,7 +118,7 @@ 
   }
 
   function renderEnTag() {
-    $out = '<' . '?php ';
+    $out = '<'.'?php ';
     switch ($this->type) {
       case "each";
         $out .= 'Hamle\\Scope::done(); ';
@@ -141,7 +141,7 @@ 
         break;
     }
     if ($this->else) $out .= "else{";
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   function render($indent = 0, $minify = false) {

Braces +23 added lines, -15 removed lines

@@ -82,21 +82,23 @@ 
         $scopeName = $m[1];
         $lookup = substr($this->var, 0, strlen($this->var) - strlen($m[0]));
         $hsv = new H\Text(trim($lookup), H\Text::TOKEN_CONTROL);
-      } else
-        $hsv = new H\Text($this->var, H\Text::TOKEN_CONTROL);
+      } else {
+              $hsv = new H\Text($this->var, H\Text::TOKEN_CONTROL);
+      }
     }
     switch ($this->type) {
       case "each":
-        if ($this->var)
-          $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
-        else
-          $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
+        if ($this->var) {
+                  $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
+        } else {
+                  $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
+        }
         $out .= "Hamle\\Scope::add({$this->o}); ";
         break;
       case "with":
-        if ($scopeName)
-          $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
-        else {
+        if ($scopeName) {
+                  $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
+        } else {
           $out .= "if(({$this->o} = " . $hsv->toPHP() . ") && " .
               "{$this->o}->valid()) {\n";
           $out .= "Hamle\\Scope::add({$this->o});\n;";
@@ -123,8 +125,9 @@ 
       case "each";
         $out .= 'Hamle\\Scope::done(); ';
         $out .= '}';
-        if (!$this->var)
-          $out .= "Hamle\\Scope::get()->rewind();\n";
+        if (!$this->var) {
+                  $out .= "Hamle\\Scope::get()->rewind();\n";
+        }
         break;
       case "if":
       case "else":
@@ -140,7 +143,9 @@ 
         return "";
         break;
     }
-    if ($this->else) $out .= "else{";
+    if ($this->else) {
+      $out .= "else{";
+    }
     return $out . "\n?>";
   }
 
@@ -148,9 +153,12 @@ 
     $ind = $minify ? '' : str_pad('', $indent);
     $oneliner = (!(count($this->content) > 1 || $this->tags));
     $out = $this->renderStTag();
-    if ($this->content) $out .= $this->renderContent($ind, $oneliner || $minify);
-    foreach ($this->tags as $tag)
-      $out .= $tag->render($indent, $minify);
+    if ($this->content) {
+      $out .= $this->renderContent($ind, $oneliner || $minify);
+    }
+    foreach ($this->tags as $tag) {
+          $out .= $tag->render($indent, $minify);
+    }
     $out .= $this->renderEnTag();
     return $out;
   }

php/hamle/Grammar/Parser.php

Indentation +3 added lines, -3 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); }

Spacing +51 added lines, -51 removed lines

@@ -67,7 +67,7 @@ 
     private $peg_currPos          = 0;
     private $peg_reportedPos      = 0;
     private $peg_cachedPos        = 0;
-    private $peg_cachedPosDetails = array('line' => 1, 'column' => 1, 'seenCR' => false );
+    private $peg_cachedPosDetails = array('line' => 1, 'column' => 1, 'seenCR' => false);
     private $peg_maxFailPos       = 0;
     private $peg_maxFailExpected  = array();
     private $peg_silentFails      = 0;
@@ -78,7 +78,7 @@ 
       $this->peg_currPos          = 0;
       $this->peg_reportedPos      = 0;
       $this->peg_cachedPos        = 0;
-      $this->peg_cachedPosDetails = array('line' => 1, 'column' => 1, 'seenCR' => false );
+      $this->peg_cachedPosDetails = array('line' => 1, 'column' => 1, 'seenCR' => false);
       $this->peg_maxFailPos       = 0;
       $this->peg_maxFailExpected  = array();
       $this->peg_silentFails      = 0;
@@ -121,7 +121,7 @@ 
     private function expected($description) {
       throw $this->peg_buildException(
         null,
-        array(array("type" => "other", "description" => $description )),
+        array(array("type" => "other", "description" => $description)),
         $this->peg_reportedPos
       );
     }
@@ -152,7 +152,7 @@ 
       if ($this->peg_cachedPos !== $pos) {
         if ($this->peg_cachedPos > $pos) {
           $this->peg_cachedPos = 0;
-          $this->peg_cachedPosDetails = array( "line" => 1, "column" => 1, "seenCR" => false );
+          $this->peg_cachedPosDetails = array("line" => 1, "column" => 1, "seenCR" => false);
         }
         $this->peg_advancePos($this->peg_cachedPosDetails, $this->peg_cachedPos, $pos);
         $this->peg_cachedPos = $pos;
@@ -213,7 +213,7 @@ 
 
         $foundDesc = $found ? json_encode($found) : "end of input";
 
-        $message = "Expected " . $expectedDesc . " but " . $foundDesc . " found.";
+        $message = "Expected ".$expectedDesc." but ".$foundDesc." found.";
       }
 
       return new SyntaxError(
@@ -302,13 +302,13 @@ 
                                                   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_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;
+    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); }
+                           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); }
@@ -321,7 +321,7 @@ 
     private function peg_f15($query) { return new \Seufert\Hamle\TextNode\Query($query); }
     private function peg_f16($id, $query) { return array_merge([['q'=>'type', 'id'=> $id]], $query); }
     private function peg_f17($query) { return array_merge([['q'=>'type', 'id'=> '*']], $query); }
-    private function peg_f18($rel, $sub) { return \Seufert\Hamle\TextNode\RelQuery::for($rel, $sub); }
+    private function peg_f18($rel, $sub) { return \Seufert\Hamle\TextNode\RelQuery::for ($rel, $sub); }
     private function peg_f19($id) { return ['q'=>'id', 'id'=> $id]; }
     private function peg_f20($id) { return ['q'=>'type', 'id'=> $id]; }
     private function peg_f21($id) { return ['q'=>'tag', 'id'=> $id]; }
@@ -335,19 +335,19 @@ 
     private function peg_f29($func, $args) { return new \Seufert\Hamle\TextNode\FilterFunc($func, null, $args); }
     private function peg_f30($func) { return new \Seufert\Hamle\TextNode\FilterFunc($func); }
     private function peg_f31($arg) { return $arg; }
-    private function peg_f32($s, $n, $d) { return \Seufert\Hamle\TextNode\FloatLit((float)"$s$n.$d"); }
+    private function peg_f32($s, $n, $d) { return \Seufert\Hamle\TextNode\FloatLit((float) "$s$n.$d"); }
     private function peg_f33($parts) { return new \Seufert\Hamle\TextNode\StringLit($parts[1]); }
     private function peg_f34($chars) { return join('', $chars); }
     private function peg_f35($char_) { return $char_; }
     private function peg_f36($sequence) { return $sequence; }
     private function peg_f37($char) { return $char; }
-    private function peg_f38($n) { return (int)join('', $n); }
-    private function peg_f39($sign, $n) { return new \Seufert\Hamle\TextNode\IntLit((int)($sign.join('', $n))); }
-    private function peg_f40($name) { return join('',$name); }
+    private function peg_f38($n) { return (int) join('', $n); }
+    private function peg_f39($sign, $n) { return new \Seufert\Hamle\TextNode\IntLit((int) ($sign.join('', $n))); }
+    private function peg_f40($name) { return join('', $name); }
     private function peg_f41($p, $s) { return $p.join('', $s); }
     private function peg_f42($s) { return join('', $s); }
     private function peg_f43($c) { return $c; }
-    private function peg_f44($char_) { return str_replace(['n', 'r', 't'], ['\\n','\\r','\\t'], $char_); }
+    private function peg_f44($char_) { return str_replace(['n', 'r', 't'], ['\\n', '\\r', '\\t'], $char_); }
 
     private function peg_parseHtmlInput() {
 
@@ -2715,77 +2715,77 @@ 
 
     $this->peg_FAILED = new \stdClass;
     $this->peg_c0 = "{";
-    $this->peg_c1 = array( "type" => "literal", "value" => "{", "description" => "\"{\"" );
+    $this->peg_c1 = array("type" => "literal", "value" => "{", "description" => "\"{\"");
     $this->peg_c2 = "}";
-    $this->peg_c3 = array( "type" => "literal", "value" => "}", "description" => "\"}\"" );
+    $this->peg_c3 = array("type" => "literal", "value" => "}", "description" => "\"}\"");
     $this->peg_c4 = "$";
-    $this->peg_c5 = array( "type" => "literal", "value" => "$", "description" => "\"$\"" );
+    $this->peg_c5 = array("type" => "literal", "value" => "$", "description" => "\"$\"");
     $this->peg_c6 = "|";
-    $this->peg_c7 = array( "type" => "literal", "value" => "|", "description" => "\"|\"" );
+    $this->peg_c7 = array("type" => "literal", "value" => "|", "description" => "\"|\"");
     $this->peg_c8 = "(";
-    $this->peg_c9 = array( "type" => "literal", "value" => "(", "description" => "\"(\"" );
+    $this->peg_c9 = array("type" => "literal", "value" => "(", "description" => "\"(\"");
     $this->peg_c10 = ")";
-    $this->peg_c11 = array( "type" => "literal", "value" => ")", "description" => "\")\"" );
+    $this->peg_c11 = array("type" => "literal", "value" => ")", "description" => "\")\"");
     $this->peg_c12 = "[";
-    $this->peg_c13 = array( "type" => "literal", "value" => "[", "description" => "\"[\"" );
+    $this->peg_c13 = array("type" => "literal", "value" => "[", "description" => "\"[\"");
     $this->peg_c14 = "]";
-    $this->peg_c15 = array( "type" => "literal", "value" => "]", "description" => "\"]\"" );
+    $this->peg_c15 = array("type" => "literal", "value" => "]", "description" => "\"]\"");
     $this->peg_c16 = "*";
-    $this->peg_c17 = array( "type" => "literal", "value" => "*", "description" => "\"*\"" );
+    $this->peg_c17 = array("type" => "literal", "value" => "*", "description" => "\"*\"");
     $this->peg_c18 = " ";
-    $this->peg_c19 = array( "type" => "literal", "value" => " ", "description" => "\" \"" );
+    $this->peg_c19 = array("type" => "literal", "value" => " ", "description" => "\" \"");
     $this->peg_c20 = "/^[><]/";
-    $this->peg_c21 = array( "type" => "class", "value" => "[><]", "description" => "[><]" );
+    $this->peg_c21 = array("type" => "class", "value" => "[><]", "description" => "[><]");
     $this->peg_c22 = "#";
-    $this->peg_c23 = array( "type" => "literal", "value" => "#", "description" => "\"#\"" );
+    $this->peg_c23 = array("type" => "literal", "value" => "#", "description" => "\"#\"");
     $this->peg_c24 = ",";
-    $this->peg_c25 = array( "type" => "literal", "value" => ",", "description" => "\",\"" );
+    $this->peg_c25 = array("type" => "literal", "value" => ",", "description" => "\",\"");
     $this->peg_c26 = ".";
-    $this->peg_c27 = array( "type" => "literal", "value" => ".", "description" => "\".\"" );
+    $this->peg_c27 = array("type" => "literal", "value" => ".", "description" => "\".\"");
     $this->peg_c28 = "^";
-    $this->peg_c29 = array( "type" => "literal", "value" => "^", "description" => "\"^\"" );
+    $this->peg_c29 = array("type" => "literal", "value" => "^", "description" => "\"^\"");
     $this->peg_c30 = "@";
-    $this->peg_c31 = array( "type" => "literal", "value" => "@", "description" => "\"@\"" );
+    $this->peg_c31 = array("type" => "literal", "value" => "@", "description" => "\"@\"");
     $this->peg_c32 = ":";
-    $this->peg_c33 = array( "type" => "literal", "value" => ":", "description" => "\":\"" );
+    $this->peg_c33 = array("type" => "literal", "value" => ":", "description" => "\":\"");
     $this->peg_c34 = "-";
-    $this->peg_c35 = array( "type" => "literal", "value" => "-", "description" => "\"-\"" );
+    $this->peg_c35 = array("type" => "literal", "value" => "-", "description" => "\"-\"");
     $this->peg_c36 = ">";
-    $this->peg_c37 = array( "type" => "literal", "value" => ">", "description" => "\">\"" );
+    $this->peg_c37 = array("type" => "literal", "value" => ">", "description" => "\">\"");
     $this->peg_c38 = "!";
-    $this->peg_c39 = array( "type" => "literal", "value" => "!", "description" => "\"!\"" );
+    $this->peg_c39 = array("type" => "literal", "value" => "!", "description" => "\"!\"");
     $this->peg_c40 = "/^[0-9]/";
-    $this->peg_c41 = array( "type" => "class", "value" => "[0-9]", "description" => "[0-9]" );
-    $this->peg_c42 = array("type" => "other", "description" => "string" );
+    $this->peg_c41 = array("type" => "class", "value" => "[0-9]", "description" => "[0-9]");
+    $this->peg_c42 = array("type" => "other", "description" => "string");
     $this->peg_c43 = "\"";
-    $this->peg_c44 = array( "type" => "literal", "value" => "\"", "description" => "\"\\\"\"" );
+    $this->peg_c44 = array("type" => "literal", "value" => "\"", "description" => "\"\\\"\"");
     $this->peg_c45 = "'";
-    $this->peg_c46 = array( "type" => "literal", "value" => "'", "description" => "\"'\"" );
+    $this->peg_c46 = array("type" => "literal", "value" => "'", "description" => "\"'\"");
     $this->peg_c47 = "\\";
-    $this->peg_c48 = array( "type" => "literal", "value" => "\\", "description" => "\"\\\\\"" );
-    $this->peg_c49 = array("type" => "any", "description" => "any character" );
+    $this->peg_c48 = array("type" => "literal", "value" => "\\", "description" => "\"\\\\\"");
+    $this->peg_c49 = array("type" => "any", "description" => "any character");
     $this->peg_c50 = "/^[a-zA-Z_]/";
-    $this->peg_c51 = array( "type" => "class", "value" => "[a-zA-Z_]", "description" => "[a-zA-Z_]" );
+    $this->peg_c51 = array("type" => "class", "value" => "[a-zA-Z_]", "description" => "[a-zA-Z_]");
     $this->peg_c52 = "/^[a-zA-Z_-]/";
-    $this->peg_c53 = array( "type" => "class", "value" => "[a-zA-Z_-]", "description" => "[a-zA-Z_-]" );
+    $this->peg_c53 = array("type" => "class", "value" => "[a-zA-Z_-]", "description" => "[a-zA-Z_-]");
     $this->peg_c54 = "/^[0-9a-zA-Z_-]/";
-    $this->peg_c55 = array( "type" => "class", "value" => "[0-9a-zA-Z_-]", "description" => "[0-9a-zA-Z_-]" );
+    $this->peg_c55 = array("type" => "class", "value" => "[0-9a-zA-Z_-]", "description" => "[0-9a-zA-Z_-]");
     $this->peg_c56 = "/^[^{\\\$]/";
-    $this->peg_c57 = array( "type" => "class", "value" => "[{\$]", "description" => "[{\$]" );
+    $this->peg_c57 = array("type" => "class", "value" => "[{\$]", "description" => "[{\$]");
     $this->peg_c58 = "/^[a-z]/";
-    $this->peg_c59 = array( "type" => "class", "value" => "[a-z]", "description" => "[a-z]" );
+    $this->peg_c59 = array("type" => "class", "value" => "[a-z]", "description" => "[a-z]");
     $this->peg_c60 = "/^[^{]/";
-    $this->peg_c61 = array( "type" => "class", "value" => "[{]", "description" => "[{]" );
+    $this->peg_c61 = array("type" => "class", "value" => "[{]", "description" => "[{]");
     $this->peg_c62 = "/^[\\n\\r\\x{2028}\\x{2029}]/";
-    $this->peg_c63 = array( "type" => "class", "value" => "[\n\r\x{2028}\x{2029}]", "description" => "[\n\r\x{2028}\x{2029}]" );
+    $this->peg_c63 = array("type" => "class", "value" => "[\n\r\x{2028}\x{2029}]", "description" => "[\n\r\x{2028}\x{2029}]");
     $this->peg_c64 = "/^['\"\\\\bfnrtv]/";
-    $this->peg_c65 = array( "type" => "class", "value" => "['\"\\bfnrtv]", "description" => "['\"\\bfnrtv]" );
+    $this->peg_c65 = array("type" => "class", "value" => "['\"\\bfnrtv]", "description" => "['\"\\bfnrtv]");
 
-    $peg_startRuleFunctions = array( 'HtmlInput' => array($this, "peg_parseHtmlInput"), 'CodeInput' => array($this, "peg_parseCodeInput"), 'ControlInput' => array($this, "peg_parseControlInput") );
+    $peg_startRuleFunctions = array('HtmlInput' => array($this, "peg_parseHtmlInput"), 'CodeInput' => array($this, "peg_parseCodeInput"), 'ControlInput' => array($this, "peg_parseControlInput"));
     $peg_startRuleFunction  = array($this, "peg_parseHtmlInput");
     if (isset($options["startRule"])) {
       if (!(isset($peg_startRuleFunctions[$options["startRule"]]))) {
-        throw new \Exception("Can't start parsing from rule \"" + $options["startRule"] + "\".");
+        throw new \Exception("Can't start parsing from rule \"" +$options["startRule"] + "\".");
       }
 
       $peg_startRuleFunction = $peg_startRuleFunctions[$options["startRule"]];
@@ -2799,7 +2799,7 @@ 
       return $peg_result;
     } else {
       if ($peg_result !== $this->peg_FAILED && $this->peg_currPos < $this->input_length) {
-        $this->peg_fail(array("type" => "end", "description" => "end of input" ));
+        $this->peg_fail(array("type" => "end", "description" => "end of input"));
       }
 
       $exception = $this->peg_buildException(null, $this->peg_maxFailExpected, $this->peg_maxFailPos);

Braces +3 added lines, -1 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; }

php/hamle/Text/Filter.php

Spacing +22 added lines, -22 removed lines

@@ -47,23 +47,23 @@ 
 
   function __construct($s, Text $what) {
     var_dump($s, $what);
-    if(preg_match("/^([a-z_]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
+    if (preg_match("/^([a-z_]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m['vars']) && strlen($m['vars']) ? explode(',', $m['vars']) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace("&comma;",',',$v);
-      if(isset($m['chained']) && strlen($m['chained'])) {
-        $this->chained = new Filter($m['chained'],$what);
+      foreach ($this->vars as $k=>$v)
+        $this->vars[$k] = str_replace("&comma;", ',', $v);
+      if (isset($m['chained']) && strlen($m['chained'])) {
+        $this->chained = new Filter($m['chained'], $what);
       }
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(method_exists(Filter::class, $this->filter)) {
+    if (method_exists(Filter::class, $this->filter)) {
       $this->filter = Filter::class.'::'.$this->filter;
-    } elseif(in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
-    } elseif($this->filter === 'json') {
+    } elseif (in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
+    } elseif ($this->filter === 'json') {
       $this->filter = 'json_encode';
-    } elseif(self::$filterResolver && $filter = (self::$filterResolver)($this->filter)) {
+    } elseif (self::$filterResolver && $filter = (self::$filterResolver)($this->filter)) {
       $this->filter = $filter;
     } else {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
@@ -72,24 +72,24 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHPpre() {
     $pre = '';
-    if($this->chained)
+    if ($this->chained)
       $pre = $this->chained->toPHPpre();
     return "$pre{$this->filter}(";
   }
 
   function toPHPpost() {
     $post = '';
-    if($this->chained)
+    if ($this->chained)
       $post = $this->chained->toPHPpost();
     $o = '';
-    foreach($this->vars as $v)
+    foreach ($this->vars as $v)
       $o .= ','.$this->varToCode($v);
     return "$o)$post";
   }
@@ -104,24 +104,24 @@ 
 
   static function itersplit($v, $sep = ",") {
     $o = [];
-    foreach(explode($sep, $v) as $k=>$i) {
-      if($i)
-        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+    foreach (explode($sep, $v) as $k=>$i) {
+      if ($i)
+        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k, 'key'=>$k];
     }
     return new WrapArray($o);
   }
 
   static function newlinebr($v) {
-    return str_replace("\n","<br />\n",$v);
+    return str_replace("\n", "<br />\n", $v);
   }
 
   static function replace($v, $src, $dst) {
-    return str_replace($src,$dst,$v);
+    return str_replace($src, $dst, $v);
   }
 
   static function ascents($v) {
-    $v = str_replace(['$',' ',','],'', $v);
-    return (int) round($v * 100,0);
+    $v = str_replace(['$', ' ', ','], '', $v);
+    return (int) round($v * 100, 0);
   }
 
 }

php/hamle/TextNode/ScopeName.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
   public function toPHP(): string
   {
-    $o = "Hamle\\Scope::getName(" . Text::varToCode($this->name) . ")";
+    $o = "Hamle\\Scope::getName(".Text::varToCode($this->name).")";
     if ($this->immediate) {
       $o = $this->immediate->apply($o);
     }

php/hamle/TextNode/ModelParam.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
   public function apply(string $out): string
   {
-    $o = "{$out}->hamleGet(" . Text::varToCode($this->name) . ")";
+    $o = "{$out}->hamleGet(".Text::varToCode($this->name).")";
     if ($this->chain) {
       $o = $this->chain->apply($o);
     }

php/hamle/TextNode/FilterFunc.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     $this->chain = $chain;
     $this->args = $args;
     if (method_exists(Filter::class, $func)) {
-      $this->func = Filter::class . "::" . $func;
+      $this->func = Filter::class."::".$func;
     } elseif (
       in_array($func, ["round", "strtoupper", "strtolower", "ucfirst"])
     ) {
@@ -48,7 +48,7 @@ 
       $this->args
     );
     array_unshift($args, $out);
-    $o = "{$this->func}(" . join(",", $args) . ")";
+    $o = "{$this->func}(".join(",", $args).")";
     if ($this->chain) {
       $o = $this->chain->apply($o);
     }

php/hamle/TextNode/RelQuery.php

Spacing +4 added lines, -4 removed lines

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

php/hamle/TextNode/Query.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
       $o = self::queryId($this->filters);
     } else {
       $o =
-        "Hamle\Run::modelTypeTags(" . self::queryParams($this->filters) . ")";
+        "Hamle\Run::modelTypeTags(".self::queryParams($this->filters).")";
     }
     if ($this->immediate) {
       $o = $this->immediate->apply($o);
@@ -127,8 +127,8 @@ 
     ];
     if (!$type || $type === "*") {
       $opt[0] = Text::varToCode($id);
-      return "Hamle\Run::modelId(" . join(",", $opt) . ")";
+      return "Hamle\Run::modelId(".join(",", $opt).")";
     }
-    return "Hamle\Run::modelTypeId(" . join(",", $opt) . ")";
+    return "Hamle\Run::modelTypeId(".join(",", $opt).")";
   }
 }