cseufert / hamle

php/hamle/Field/Memo.php

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 
   function isClicked()
   {
-    return isset($_REQUEST[$this->form . '_' . $this->name]);
+    return isset($_REQUEST[$this->form.'_'.$this->name]);
   }
 }

php/autoload.php

Spacing +2 added lines, -2 removed lines

@@ -34,11 +34,11 @@
  * @param string $class Class name to be autoloaded
  */
 spl_autoload_register(
-  function ($class) {
+  function($class) {
     if (strpos($class, 'Seufert\\Hamle\\') === 0) {
       $s = DIRECTORY_SEPARATOR;
       $class = str_replace('\\', $s, substr($class, 14));
-      $path = __DIR__ . $s . 'hamle' . $s . "$class.php";
+      $path = __DIR__.$s.'hamle'.$s."$class.php";
       if (is_file($path)) {
         include_once $path;
       }

php/hamle/Parse.php

Spacing -279 removed lines

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

php/hamle/Grammar/Parser.php

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