cseufert / hamle

php/hamle/Grammar/Parser.php

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

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