cseufert / hamle

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; }

Spacing +60 added lines, -60 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,23 +335,23 @@ 
     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 $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_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]); }
@@ -360,12 +360,12 @@ 
     private function peg_f40($s) { return $s; }
     private function peg_f41($char) { return $char; }
     private function peg_f42($sequence) { return $sequence; }
-    private function peg_f43($n) { return (int)join('', $n); }
-    private function peg_f44($sign, $n) { return new \Seufert\Hamle\TextNode\IntLit((int)($sign.join('', $n))); }
-    private function peg_f45($name) { return join('',$name); }
+    private function peg_f43($n) { return (int) join('', $n); }
+    private function peg_f44($sign, $n) { return new \Seufert\Hamle\TextNode\IntLit((int) ($sign.join('', $n))); }
+    private function peg_f45($name) { return join('', $name); }
     private function peg_f46($p, $s) { return $p.join('', $s); }
     private function peg_f47($s) { return join('', $s); }
-    private function peg_f48($char_) { return str_replace(['n', 'r', 't'], ['\\n','\\r','\\t'], $char_); }
+    private function peg_f48($char_) { return str_replace(['n', 'r', 't'], ['\\n', '\\r', '\\t'], $char_); }
 
     private function peg_parseHtmlInput() {
 
@@ -3279,77 +3279,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_c41 = array("type" => "class", "value" => "[0-9]", "description" => "[0-9]");
     $this->peg_c42 = "\"";
-    $this->peg_c43 = array( "type" => "literal", "value" => "\"", "description" => "\"\\\"\"" );
+    $this->peg_c43 = array("type" => "literal", "value" => "\"", "description" => "\"\\\"\"");
     $this->peg_c44 = "'";
-    $this->peg_c45 = array( "type" => "literal", "value" => "'", "description" => "\"'\"" );
-    $this->peg_c46 = array("type" => "other", "description" => "string" );
+    $this->peg_c45 = array("type" => "literal", "value" => "'", "description" => "\"'\"");
+    $this->peg_c46 = array("type" => "other", "description" => "string");
     $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"]];
@@ -3363,7 +3363,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 +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]); }

php/hamle/Text.php

Spacing +26 added lines, -26 removed lines

@@ -72,7 +72,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,
       );
@@ -132,7 +132,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'])
     ) {
@@ -148,7 +148,7 @@ 
     }
     $args = join(
       ',',
-      array_map(function ($v) {
+      array_map(function($v) {
         if (is_array($v) && $v['type'] ?? false === 'expr') {
           return self::renderExpr($v);
         } else {
@@ -157,9 +157,9 @@ 
       }, $filter['args']),
     );
     if (strlen($args)) {
-      $args = ',' . $args;
+      $args = ','.$args;
     }
-    $o = "$func($o" . $args . ')';
+    $o = "$func($o".$args.')';
     if ($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
     }
@@ -168,21 +168,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;
   }
@@ -190,7 +190,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;
@@ -200,11 +200,11 @@ 
   {
     $r = $rel === 'child' ? Hamle::REL_CHILD : Hamle::REL_PARENT;
     $o =
-      $o .
-      '->hamleRel(' .
-      self::varToCode($r) .
-      ',' .
-      self::queryParams($query, true) .
+      $o.
+      '->hamleRel('.
+      self::varToCode($r).
+      ','.
+      self::queryParams($query, true).
       ')';
     return $o;
   }
@@ -266,7 +266,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset),
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   static function renderQuery($n)
@@ -287,7 +287,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']);
@@ -314,7 +314,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']);
@@ -334,16 +334,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;
@@ -372,7 +372,7 @@ 
           $out[] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -380,7 +380,7 @@ 
 
   function doEval()
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode($var)
@@ -388,9 +388,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';
@@ -401,7 +401,7 @@ 
     if ($var instanceof Text) {
       return $var->toPHP();
     }
-    return "'" . str_replace(['$', "'"], ['$', "\\'"], $var) . "'";
+    return "'".str_replace(['$', "'"], ['$', "\\'"], $var)."'";
   }
 
   /**

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): self
+  static function for (string $rel, array $filters): self
   {
     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/Exception/ParseError.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     Throwable $previous = null
   ) {
     ///@todo  Include Line number & file name within parse error exceptions
-    $message .= ', on line ' . Hamle\Hamle::getLineNo() . ' in file ?.hamle';
+    $message .= ', on line '.Hamle\Hamle::getLineNo().' in file ?.hamle';
     parent::__construct($message, $code, $previous);
   }
 }