diff --git a/change_log.txt b/change_log.txt
index 4203866e..5fd4bf9c 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,8 @@
  ===== 3.1.24.dev ===== (xx.xx.2015)
+ 18.05.2015
+  - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher
+    compilation speed 
+
  16.05.2015
   - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33
   - improvement remove not needed ?><?php transitions from compiled code
diff --git a/lexer/smarty_internal_templatelexer.plex b/lexer/smarty_internal_templatelexer.plex
index e062a7bf..10c274ef 100644
--- a/lexer/smarty_internal_templatelexer.plex
+++ b/lexer/smarty_internal_templatelexer.plex
@@ -132,8 +132,8 @@ class Smarty_Internal_Templatelexer
      *
      * @var array
      */
-    public $state_name = array(1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING',
-            5 => 'CHILDBODY', 6 => 'CHILDBLOCK', 7 => 'CHILDLITERAL');
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',
+            6 => 'CHILDBODY', 7 => 'CHILDBLOCK', 8 => 'CHILDLITERAL');
 
     /**
      * storage for assembled token patterns
@@ -147,6 +147,7 @@ class Smarty_Internal_Templatelexer
     private $yy_global_pattern5 = null;
     private $yy_global_pattern6 = null;
     private $yy_global_pattern7 = null;
+    private $yy_global_pattern8 = null;
 
     /**
      * token names
@@ -231,7 +232,6 @@ class Smarty_Internal_Templatelexer
      linebreak = /[\t ]*[\r\n]+[\t ]*/
      text = /[\S\s]/
      textdoublequoted = /([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=(SMARTYldel|\$|`\$|"))/
-     dollarid = /\$[0-9]*[a-zA-Z_]\w*/
      namespace = /([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+/
      all = /[\S\s]+/
      emptyjava = /\{\}/
@@ -244,6 +244,8 @@ class Smarty_Internal_Templatelexer
      slash = /\//
      ldel = /SMARTYldel\s*/
      rdel = /\s*SMARTYrdel/
+     nocacherdel = /(\s+nocache)?\s*SMARTYrdel/
+     notblockid = /(?:(?!block)[0-9]*[a-zA-Z_]\w*)/
      smartyblockchildparent = /[\$]smarty\.block\.(child|parent)/
      integer = /\d+/
      hex =  /0[xX][0-9a-fA-F]+/
@@ -262,16 +264,14 @@ class Smarty_Internal_Templatelexer
      colon = /\s*\:\s*/
      at = /@/
      hatch = /#/
-     semicolon = /\s*\;/
+     semicolon = /\s*\;\s*/
      equal = /\s*=\s*/
      space = /\s+/
      ptr = /\s*\->\s*/
      aptr = /\s*=>\s*/
      singlequotestring = /'[^'\\]*(?:\\.[^'\\]*)*'/
      backtick = /`/
-     backtickdollar = /`\$/
      vert = /\|/
-     andsym = /\s*\&\s*/
      qmark = /\s*\?\s*/
      constant = /([_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*)(?![0-9A-Z_]*[a-z])/
      attr = /\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\s*=\s*/
@@ -304,20 +304,6 @@ class Smarty_Internal_Templatelexer
      comment {
        $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
      }
-     ldel strip rdel {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false)  {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-         $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-       }
-     }
-     ldel slash strip rdel {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-         $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-       }
-     }
      ldel literal rdel {
        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
           $this->token = Smarty_Internal_Templateparser::TP_TEXT;
@@ -326,67 +312,12 @@ class Smarty_Internal_Templatelexer
          $this->yypushstate(self::LITERAL);
         }
      }
-     ldel if {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel for {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel foreach {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel setfilter {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     phptag {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_PHP;
-          $this->phpType = 'tag';
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel slash {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-         $this->yypushstate(self::SMARTY);
-         $this->taglineno = $this->line;
-       }
-     }
      ldel {
        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
        } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
+          $this->yypushstate(self::TAG);
+          return true;
        }
      }
      rdel {
@@ -425,11 +356,67 @@ class Smarty_Internal_Templatelexer
        $this->value = substr($this->data,$this->counter,$to-$this->counter);
        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
-
-
      */
      /*!lex2php
-     %statename SMARTY
+     %statename TAG
+     ldel if {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel for {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel foreach {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel setfilter {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     phptag {
+          $this->yypopstate();
+          $this->token = Smarty_Internal_Templateparser::TP_PHP;
+          $this->phpType = 'tag';
+          $this->taglineno = $this->line;
+     }
+     ldel id nocacherdel {
+          $this->yypopstate();
+          $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+          $this->taglineno = $this->line;
+     }
+     ldel slash notblockid rdel {
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+         $this->taglineno = $this->line;
+     }
+     ldel dollar id nocacherdel {
+          $this->yypopstate();
+          $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+          $this->taglineno = $this->line;
+     }
+     ldel slash {
+         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+         $this->yybegin(self::TAGBODY);
+         $this->taglineno = $this->line;
+     }
+     ldel {
+          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     */
+     /*!lex2php
+     %statename TAGBODY     
+     rdel {
+       $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+       $this->yypopstate();
+     }
      double_quote {
        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
@@ -441,13 +428,12 @@ class Smarty_Internal_Templatelexer
           $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
           $this->taglineno = $this->line;
      }
+     dollar id {
+       $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
      dollar {
        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
      }
-     rdel {
-       $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-       $this->yypopstate();
-     }
      isin {
        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
      }
@@ -555,9 +541,6 @@ class Smarty_Internal_Templatelexer
      colon {
        $this->token = Smarty_Internal_Templateparser::TP_COLON;
      }
-     andsym {
-       $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-     }
      qmark {
        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
      }
@@ -567,49 +550,12 @@ class Smarty_Internal_Templatelexer
      space {
        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
      }
-     ldel if {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel for {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel foreach {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel slash {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-         $this->yypushstate(self::SMARTY);
-         $this->taglineno = $this->line;
-       }
-     }
      ldel {
        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
        } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
+          $this->yypushstate(self::TAG);
+          return true;
        }
      }
      text {
@@ -646,72 +592,50 @@ class Smarty_Internal_Templatelexer
      */
      /*!lex2php
      %statename DOUBLEQUOTEDSTRING
-     ldel if {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel for {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
-     ldel foreach {
-       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-       } else {
-          $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-          $this->yypushstate(self::SMARTY);
-          $this->taglineno = $this->line;
-       }
-     }
      ldel literal rdel {
          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
      ldel slash literal rdel {
          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
-
      ldel slash {
        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
        } else {
-         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-         $this->yypushstate(self::SMARTY);
-         $this->taglineno = $this->line;
+          $this->yypushstate(self::TAG);
+          return true;
+       }
+     }
+     ldel id {
+       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       } else {
+          $this->yypushstate(self::TAG);
+          return true;
        }
      }
      ldel {
        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
        } else {
           $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-          $this->yypushstate(self::SMARTY);
           $this->taglineno = $this->line;
+          $this->yypushstate(self::TAGBODY);
        }
      }
      double_quote {
        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
        $this->yypopstate();
      }
-     backtickdollar {
+     backtick dollar {
        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
        $this->value = substr($this->value,0,-1);
-       $this->yypushstate(self::SMARTY);
+       $this->yypushstate(self::TAGBODY);
        $this->taglineno = $this->line;
      }
-     dollarid {
+     dollar id {
        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
      }
-
      dollar {
        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
      }
diff --git a/lexer/smarty_internal_templateparser.y b/lexer/smarty_internal_templateparser.y
index 77b3e84d..9063ee65 100644
--- a/lexer/smarty_internal_templateparser.y
+++ b/lexer/smarty_internal_templateparser.y
@@ -240,7 +240,7 @@ template       ::= .
 // template elements
 //
                       // Smarty tag
-template_element(res)::= smartytag(st) RDEL. {
+template_element(res)::= smartytag(st). {
      if ($this->compiler->has_code) {
          res = $this->mergePrefixCode(st);
      } else {
@@ -336,28 +336,49 @@ literal_element(res) ::= LITERAL(l). {
     res = l;
 }
 
+smartytag(res)   ::= tag(t) RDEL. {
+    res  = t;
+}
 //
 // output tags start here
 //
+smartytag(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        res = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+    } else {
+        res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+    }
+}
 
                   // output with optional attributes
-smartytag(res)   ::= LDEL value(e). {
+tag(res)   ::= LDEL variable(e). {
     res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
 }
 
-smartytag(res)   ::= LDEL value(e) modifierlist(l) attributes(a). {
+tag(res)   ::= LDEL variable(e) modifierlist(l) attributes(a). {
     res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e, 'modifierlist'=>l));
 }
 
-smartytag(res)   ::= LDEL value(e) attributes(a). {
+tag(res)   ::= LDEL variable(e) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+}
+tag(res)   ::= LDEL value(e). {
+    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
+}
+tag(res)   ::= LDEL value(e) modifierlist(l) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e, 'modifierlist'=>l));
+}
+
+tag(res)   ::= LDEL value(e) attributes(a). {
     res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
 }
 
-smartytag(res)   ::= LDEL expr(e) modifierlist(l) attributes(a). {
+tag(res)   ::= LDEL expr(e) modifierlist(l) attributes(a). {
     res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e,'modifierlist'=>l));
 }
 
-smartytag(res)   ::= LDEL expr(e) attributes(a). {
+tag(res)   ::= LDEL expr(e) attributes(a). {
     res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
 }
 
@@ -366,24 +387,46 @@ smartytag(res)   ::= LDEL expr(e) attributes(a). {
 //
 
                   // assign new style
-smartytag(res)   ::= LDEL DOLLAR ID(i) EQUAL value(e). {
-    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>"'".i."'")));
+tag(res)   ::= LDEL DOLLARID(i) EQUAL value(e). {
+    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
 }
                   
-smartytag(res)   ::= LDEL DOLLAR ID(i) EQUAL expr(e). {
-    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>"'".i."'")));
+tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e). {
+    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
 }
                  
-smartytag(res)   ::= LDEL DOLLAR ID(i) EQUAL expr(e) attributes(a). {
-    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>"'".i."'")),a));
+tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e) attributes(a). {
+    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')),a));
 }                  
 
-smartytag(res)   ::= LDEL varindexed(vi) EQUAL expr(e) attributes(a). {
+tag(res)   ::= LDEL varindexed(vi) EQUAL expr(e) attributes(a). {
     res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>vi['var'])),a),array('smarty_internal_index'=>vi['smarty_internal_index']));
-} 
-                 
+}
+
+// simple tag like {name}
+smartytag(res)::= SIMPLETAG(t). {
+    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        res = null;;
+    } else {
+        if (defined($tag)) {
+            if (isset($this->smarty->security_policy)) {
+               $this->smarty->security_policy->isTrustedConstant($tag, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                res = $this->compiler->compileTag($match[1],array('nocache'));
+            } else {
+                res = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+}
+
                   // tag with optional Smarty2 style attributes
-smartytag(res)   ::= LDEL ID(i) attributes(a). {
+tag(res)   ::= LDEL ID(i) attributes(a). {
         if (defined(i)) {
             if (isset($this->smarty->security_policy)) {
                 $this->smarty->security_policy->isTrustedConstant(i, $this->compiler);
@@ -393,7 +436,7 @@ smartytag(res)   ::= LDEL ID(i) attributes(a). {
             res = $this->compiler->compileTag(i,a);
         }
 }
-smartytag(res)   ::= LDEL ID(i). {
+tag(res)   ::= LDEL ID(i). {
         if (defined(i)) {
             if (isset($this->smarty->security_policy)) {
                 $this->smarty->security_policy->isTrustedConstant(i, $this->compiler);
@@ -406,7 +449,7 @@ smartytag(res)   ::= LDEL ID(i). {
 
 
                   // tag with modifier and optional Smarty2 style attributes
-smartytag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
+tag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
         if (defined(i)) {
             if (isset($this->smarty->security_policy)) {
                 $this->smarty->security_policy->isTrustedConstant(i, $this->compiler);
@@ -419,39 +462,39 @@ smartytag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
 }
 
                   // registered object tag
-smartytag(res)   ::= LDEL ID(i) PTR ID(m) attributes(a). {
+tag(res)   ::= LDEL ID(i) PTR ID(m) attributes(a). {
     res = $this->compiler->compileTag(i,a,array('object_method'=>m));
 }
 
                   // registered object tag with modifiers
-smartytag(res)   ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). {
+tag(res)   ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). {
     res = '<?php ob_start();?>'.$this->compiler->compileTag(i,a,array('object_method'=>me)).'<?php echo ';
     res .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>l,'value'=>'ob_get_clean()')).';?>';
 }
 
                   // {if}, {elseif} and {while} tag
-smartytag(res)   ::= LDELIF(i) expr(ie). {
+tag(res)   ::= LDELIF(i) expr(ie). {
     $tag = trim(substr(i,$this->lex->ldel_length)); 
     res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
 }
 
-smartytag(res)   ::= LDELIF(i) expr(ie) attributes(a). {
+tag(res)   ::= LDELIF(i) expr(ie) attributes(a). {
     $tag = trim(substr(i,$this->lex->ldel_length));
     res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
 }
 
-smartytag(res)   ::= LDELIF(i) statement(ie). {
+tag(res)   ::= LDELIF(i) statement(ie). {
     $tag = trim(substr(i,$this->lex->ldel_length));
     res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
 }
 
-smartytag(res)   ::= LDELIF(i) statement(ie)  attributes(a). {
+tag(res)   ::= LDELIF(i) statement(ie)  attributes(a). {
     $tag = trim(substr(i,$this->lex->ldel_length));
     res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
 }
 
                   // {for} tag
-smartytag(res)   ::= LDELFOR statements(st) SEMICOLON optspace expr(ie) SEMICOLON optspace DOLLAR varvar(v2) foraction(e2) attributes(a). {
+tag(res)   ::= LDELFOR statements(st) SEMICOLON expr(ie) SEMICOLON varindexed(v2) foraction(e2) attributes(a). {
     res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('ifexp'=>ie),array('var'=>v2),array('step'=>e2))),1);
 }
 
@@ -463,47 +506,47 @@ smartytag(res)   ::= LDELFOR statements(st) SEMICOLON optspace expr(ie) SEMICOLO
     res = e;
 }
 
-smartytag(res)   ::= LDELFOR statement(st) TO expr(v) attributes(a). {
+tag(res)   ::= LDELFOR statement(st) TO expr(v) attributes(a). {
     res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v))),0);
 }
 
-smartytag(res)   ::= LDELFOR statement(st) TO expr(v) STEP expr(v2) attributes(a). {
+tag(res)   ::= LDELFOR statement(st) TO expr(v) STEP expr(v2) attributes(a). {
     res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v),array('step'=>v2))),0);
 }
 
                   // {foreach} tag
-smartytag(res)   ::= LDELFOREACH attributes(a). {
+tag(res)   ::= LDELFOREACH attributes(a). {
     res = $this->compiler->compileTag('foreach',a);
 }
 
                   // {foreach $array as $var} tag
-smartytag(res)   ::= LDELFOREACH SPACE value(v1) AS DOLLAR varvar(v0) attributes(a). {
+tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v0) attributes(a). {
     res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0))));
 }
 
-smartytag(res)   ::= LDELFOREACH SPACE value(v1) AS DOLLAR varvar(v2) APTR DOLLAR varvar(v0) attributes(a). {
+tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v2) APTR varvar(v0) attributes(a). {
     res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0),array('key'=>v2))));
 }
 
-smartytag(res)   ::= LDELFOREACH SPACE expr(e) AS DOLLAR varvar(v0) attributes(a). {
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v0) attributes(a). {
     res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0))));
 }
 
-smartytag(res)   ::= LDELFOREACH SPACE expr(e) AS DOLLAR varvar(v1) APTR DOLLAR varvar(v0) attributes(a). {
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v1) APTR varvar(v0) attributes(a). {
     res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0),array('key'=>v1))));
 }
 
                   // {setfilter}
-smartytag(res)   ::= LDELSETFILTER ID(m) modparameters(p). {
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p). {
     res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array(m),p))));
 }
 
-smartytag(res)   ::= LDELSETFILTER ID(m) modparameters(p) modifierlist(l). {
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p) modifierlist(l). {
     res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array(m),p)),l)));
 }
 
                   // {$smarty.block.child} or {$smarty.block.parent}
-smartytag(res)   ::= LDEL SMARTYBLOCKCHILDPARENT(i). {
+tag(res)   ::= LDEL SMARTYBLOCKCHILDPARENT(i). {
     $j = strrpos(i,'.');
     if (i[$j+1] == 'c') {
         // {$smarty.block.child}
@@ -516,20 +559,29 @@ smartytag(res)   ::= LDEL SMARTYBLOCKCHILDPARENT(i). {
 
                   
                   // end of block tag  {/....}                  
-smartytag(res)   ::= LDELSLASH ID(i). {
+smartytag(res)::= CLOSETAG(t). {
+    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length), ' /');
+    if ($tag == 'strip') {
+        $this->strip = false;
+        res = null;
+    } else {
+       res = $this->compiler->compileTag($tag.'close',array());
+    }
+ }
+tag(res)   ::= LDELSLASH ID(i). {
     res = $this->compiler->compileTag(i.'close',array());
 }
 
-smartytag(res)   ::= LDELSLASH ID(i) modifierlist(l). {
+tag(res)   ::= LDELSLASH ID(i) modifierlist(l). {
     res = $this->compiler->compileTag(i.'close',array(),array('modifier_list'=>l));
 }
 
                   // end of block object tag  {/....}                 
-smartytag(res)   ::= LDELSLASH ID(i) PTR ID(m). {
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m). {
     res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m));
 }
 
-smartytag(res)   ::= LDELSLASH ID(i) PTR ID(m) modifierlist(l). {
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m) modifierlist(l). {
     res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m, 'modifier_list'=>l));
 }
 
@@ -560,7 +612,7 @@ attribute(res)   ::= SPACE ID(v) EQUAL ID(id). {
         }
         res = array(v=>id);
     } else {
-        res = array(v=>"'".id."'");
+        res = array(v=>'\''.id.'\'');
     }
 }
 
@@ -573,7 +625,7 @@ attribute(res)   ::= ATTR(v) value(e). {
 }
 
 attribute(res)   ::= SPACE ID(v). {
-    res = "'".v."'";
+    res = '\''.v.'\'';
 }
 
 attribute(res)   ::= SPACE expr(e). {
@@ -602,8 +654,11 @@ statements(res)   ::= statements(s1) COMMA statement(s). {
     res = s1;
 }
 
-statement(res)    ::= DOLLAR varvar(v) EQUAL expr(e). {
-    res = array('var' => v, 'value'=>e);
+statement(res)    ::= DOLLARID(i) EQUAL INTEGER(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+statement(res)    ::= DOLLARID(i) EQUAL expr(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
 }
 
 statement(res)    ::= varindexed(vi) EQUAL expr(e). {
@@ -630,8 +685,8 @@ expr(res)        ::= ternary(v). {
 }
 
                  // resources/streams
-expr(res)        ::= DOLLAR ID(i) COLON ID(i2). {
-    res = '$_smarty_tpl->getStreamVariable(\''. i .'://'. i2 . '\')';
+expr(res)        ::= DOLLARID(i) COLON ID(i2). {
+    res = '$_smarty_tpl->getStreamVariable(\''.substr(i,1).'://' . i2 . '\')';
 }
 
                   // arithmetic expression
@@ -643,11 +698,6 @@ expr(res)        ::= expr(e) UNIMATH(m) value(v). {
     res = e . trim(m) . v;
 }
  
-                  // bit operation 
-expr(res)        ::= expr(e) ANDSYM(m) value(v). {
-    res = e . trim(m) . v;
-} 
-
                   // array
 expr(res)       ::= array(a). {
     res = a;
@@ -683,8 +733,8 @@ expr(res)        ::= variable(v1) INSTANCEOF(i) ns1(v2). {
 //
 // ternary
 //
-ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK DOLLAR ID(e1) COLON  expr(e2). {
-    res = v.' ? '. $this->compiler->compileVariable("'".e1."'") . ' : '.e2;
+ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK DOLLARID(e1) COLON  expr(e2). {
+    res = v.' ? '. $this->compiler->compileVariable('\''.substr(e1,1).'\'') . ' : '.e2;
 }
 
 ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK  expr(e1) COLON  expr(e2). {
@@ -743,7 +793,7 @@ value(res)       ::= ID(id). {
         }
         res = id;
     } else {
-        res = "'".id."'";
+        res = '\''.id.'\'';
     }
 }
 
@@ -776,11 +826,10 @@ value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
         $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.' = '. $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>';
     }
     res = '$_tmp'.self::$prefix_number.'::'.r[0].r[1];
-
 }
 
                   // Smarty tag
-value(res)       ::= smartytag(st) RDEL. {
+value(res)       ::= smartytag(st). {
     self::$prefix_number++;
     $tmp = $this->compiler->appendCode('<?php ob_start();?>', st);
     $this->compiler->prefix_code[] = $this->compiler->appendCode($tmp, '<?php $_tmp'.self::$prefix_number.'=ob_get_clean();?>');
@@ -820,9 +869,9 @@ ns1(res)           ::= NAMESPACE(i). {
     res = i;
 }
 
-ns1(res)           ::= variable(v). {
-    res = v;
-}
+//ns1(res)           ::= variable(v). {
+//    res = v;
+//}
 
 
 
@@ -831,6 +880,9 @@ ns1(res)           ::= variable(v). {
 // variables 
 //
                   // Smarty variable (optional array)
+variable(res)    ::= DOLLARID(i). {
+   res = $this->compiler->compileVariable('\''.substr(i,1).'\'');
+}
 variable(res)    ::= varindexed(vi). {
     if (vi['var'] == '\'smarty\'') {
         $smarty_var = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']);
@@ -844,7 +896,7 @@ variable(res)    ::= varindexed(vi). {
 }
 
                   // variable with property
-variable(res)    ::= DOLLAR varvar(v) AT ID(p). {
+variable(res)    ::= varvar(v) AT ID(p). {
     res = '$_smarty_tpl->tpl_vars['. v .']->'.p;
 }
 
@@ -870,7 +922,10 @@ variable(res)    ::= HATCH variable(v) HATCH arrayindex(a). {
     res = '(is_array($tmp = $_smarty_tpl->getConfigVariable( '. v .')) ? $tmp'.a.' : null)';
 }
 
-varindexed(res)  ::= DOLLAR varvar(v) arrayindex(a). {
+varindexed(res)  ::= DOLLARID(i) arrayindex(a). {
+    res = array('var'=>'\''.substr(i,1).'\'', 'smarty_internal_index'=>a);
+}
+varindexed(res)  ::= varvar(v) arrayindex(a). {
     res = array('var'=>v, 'smarty_internal_index'=>a);
 }
 
@@ -889,11 +944,14 @@ arrayindex        ::= . {
 
 // single index definition
                     // Smarty2 style index 
-indexdef(res)    ::= DOT DOLLAR varvar(v).  {
+indexdef(res)    ::= DOT DOLLARID(i).  {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+}
+indexdef(res)    ::= DOT varvar(v).  {
     res = '['.$this->compiler->compileVariable(v).']';
 }
 
-indexdef(res)    ::= DOT DOLLAR varvar(v) AT ID(p). {
+indexdef(res)    ::= DOT varvar(v) AT ID(p). {
     res = '['.$this->compiler->compileVariable(v).'->'.p.']';
 }
 
@@ -902,19 +960,19 @@ indexdef(res)   ::= DOT ID(i). {
             if (isset($this->smarty->security_policy)) {
                 $this->smarty->security_policy->isTrustedConstant(i, $this->compiler);
             }
-            res = "[". i ."]";
+            res = '['. i .']';
         } else {
             res = "['". i ."']";
         }
 }
 
 indexdef(res)   ::= DOT INTEGER(n). {
-    res = "[". n ."]";
+    res = '['. n .']';
 }
 
 
 indexdef(res)   ::= DOT LDEL expr(e) RDEL. {
-    res = "[". e ."]";
+    res = '['. e .']';
 }
 
                     // section tag index
@@ -925,10 +983,25 @@ indexdef(res)   ::= OPENB ID(i)CLOSEB. {
 indexdef(res)   ::= OPENB ID(i) DOT ID(i2) CLOSEB. {
     res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\''.i2.'\']').']';
 }
+indexdef(res)   ::= OPENB SINGLEQUOTESTRING(s) CLOSEB. {
+    res = '['.s.']';
+}
+indexdef(res)   ::= OPENB INTEGER(n) CLOSEB. {
+    res = '['.n.']';
+}
+indexdef(res)   ::= OPENB DOLLARID(i) CLOSEB. {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';;
+}
+indexdef(res)   ::= OPENB variable(v) CLOSEB. {
+    res = '['.v.']';
+}
+indexdef(res)   ::= OPENB value(v) CLOSEB. {
+    res = '['.v.']';
+}
 
                     // PHP style index
 indexdef(res)   ::= OPENB expr(e) CLOSEB. {
-    res = "[". e ."]";
+    res = '['. e .']';
 }
 
                     // for assign append array
@@ -940,9 +1013,14 @@ indexdef(res)  ::= OPENB CLOSEB. {
 //
 // variable variable names
 //
+
                     // singel identifier element
-varvar(res)      ::= varvarele(v). {
-    res = v;
+varvar(res)      ::= DOLLARID(i). {
+    res = '\''.substr(i,1).'\'';
+}
+                    // single $
+varvar(res)      ::= DOLLAR. {
+    res = "''";
 }
 
                     // sequence of identifier elements
@@ -954,6 +1032,10 @@ varvar(res)      ::= varvar(v1) varvarele(v2). {
 varvarele(res)   ::= ID(s). {
     res = '\''.s.'\'';
 }
+varvarele(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+    res = $this->compiler->compileVariable('\''.$var.'\'');
+}
 
                     // variable sections of element
 varvarele(res)   ::= LDEL expr(e) RDEL. {
@@ -989,7 +1071,7 @@ objectelement(res)::= PTR ID(i) arrayindex(a). {
     res = '->'.i.a;
 }
 
-objectelement(res)::= PTR DOLLAR varvar(v) arrayindex(a). {
+objectelement(res)::= PTR varvar(v) arrayindex(a). {
     if ($this->security) {
         $this->compiler->trigger_template_error (self::Err2);
     }
@@ -1065,12 +1147,12 @@ method(res)     ::= ID(f) OPENP params(p) CLOSEP. {
     res = f . "(". implode(',',p) .")";
 }
 
-method(res)     ::= DOLLAR ID(f) OPENP params(p) CLOSEP.  {
+method(res)     ::= DOLLARID(f) OPENP params(p) CLOSEP.  {
     if ($this->security) {
         $this->compiler->trigger_template_error (self::Err2);
     }
     self::$prefix_number++;
-    $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.'='.$this->compiler->compileVariable("'".f."'").';?>';
+    $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.'='.$this->compiler->compileVariable('\''.substr(f,1).'\'').';?>';
     res = '$_tmp'.self::$prefix_number.'('. implode(',',p) .')';
 }
 
@@ -1147,13 +1229,13 @@ static_class_access(res)       ::= ID(v). {
 }
 
                   // static class variables
-static_class_access(res)       ::=  DOLLAR ID(v) arrayindex(a). {
-    res = array('$'.v, a, 'property');
+static_class_access(res)       ::=  DOLLARID(v) arrayindex(a). {
+    res = array(v, a, 'property');
 }
 
                   // static class variables with object chain
-static_class_access(res)       ::= DOLLAR ID(v) arrayindex(a) objectchain(oc). {
-    res = array('$'.v, a.oc, 'property');
+static_class_access(res)       ::= DOLLARID(v) arrayindex(a) objectchain(oc). {
+    res = array(v, a.oc, 'property');
 }
 
 
@@ -1272,7 +1354,7 @@ doublequotedcontent(res)           ::=  LDEL expr(e) RDEL. {
     res = new Smarty_Internal_ParseTree_Code($this, '(string)('.e.')');
 }
 
-doublequotedcontent(res)     ::=  smartytag(st) RDEL. {
+doublequotedcontent(res)     ::=  smartytag(st). {
     res = new Smarty_Internal_ParseTree_Tag($this, st);
 }
 
@@ -1280,14 +1362,3 @@ doublequotedcontent(res)           ::=  TEXT(o). {
     res = new Smarty_Internal_ParseTree_DqContent($this, o);
 }
 
-
-//
-// optional space
-//
-optspace(res)     ::= SPACE(s).  {
-    res = s;
-}
-
-optspace(res)     ::= .          {
-    res = '';
-}
diff --git a/libs/sysplugins/smarty_internal_templatelexer.php b/libs/sysplugins/smarty_internal_templatelexer.php
index d8d3d4b7..6bbc6feb 100644
--- a/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/libs/sysplugins/smarty_internal_templatelexer.php
@@ -151,7 +151,7 @@ class Smarty_Internal_Templatelexer
      *
      * @var array
      */
-    public $state_name = array(1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY', 6 => 'CHILDBLOCK', 7 => 'CHILDLITERAL');
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING', 6 => 'CHILDBODY', 7 => 'CHILDBLOCK', 8 => 'CHILDLITERAL');
 
     /**
      * storage for assembled token patterns
@@ -172,6 +172,8 @@ class Smarty_Internal_Templatelexer
 
     private $yy_global_pattern7 = null;
 
+    private $yy_global_pattern8 = null;
+
     /**
      * token names
      *
@@ -253,7 +255,7 @@ class Smarty_Internal_Templatelexer
     public function yylex1()
     {
         if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G((" . $this->ldel . "\\s*php\\s*(.)*?" . $this->rdel . "([\S\s]*?)" . $this->ldel . "\\s*\/php\\s*" . $this->rdel . ")|(" . $this->ldel . "\\s*[\/]?php\\s*(.)*?" . $this->rdel . "))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel . ")|\G(<\\?xml\\s+([\S\s]*?)\\?>)|\G(<%((('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")|(\/\\*[\S\s]*?\\*\/)|[\S\s])*?)%>)|\G((<\\?(?:php\\s+|=)?)((('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")|(\/\\*[\S\s]*?\\*\/)|[\S\s])*?)\\?>)|\G(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>((('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")|(\/\\*[\S\s]*?\\*\/)|[\S\s])*?)<\/script>)|\G((<(\\?(?:php\\s+|=)?|(script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|%))|\\?>|%>)|\G([\S\s])/iS";
+            $this->yy_global_pattern1 = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel . ")|\G(<\\?xml\\s+([\S\s]*?)\\?>)|\G(<%((('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")|(\/\\*[\S\s]*?\\*\/)|[\S\s])*?)%>)|\G((<\\?(?:php\\s+|=)?)((('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")|(\/\\*[\S\s]*?\\*\/)|[\S\s])*?)\\?>)|\G(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>((('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")|(\/\\*[\S\s]*?\\*\/)|[\S\s])*?)<\/script>)|\G((<(\\?(?:php\\s+|=)?|(script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|%))|\\?>|%>)|\G([\S\s])/iS";
         }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
@@ -315,7 +317,8 @@ class Smarty_Internal_Templatelexer
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+            $this->yypushstate(self::LITERAL);
         }
     }
 
@@ -325,119 +328,25 @@ class Smarty_Internal_Templatelexer
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
+            $this->yypushstate(self::TAG);
+            return true;
         }
     }
 
     function yy_r1_6()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-            $this->yypushstate(self::LITERAL);
-        }
-    }
-
-    function yy_r1_7()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_9()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_10()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_11()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_12()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_PHP;
-            $this->phpType = 'tag';
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_18()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_19()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_20()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r1_21()
+    function yy_r1_7()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
         $this->taglineno = $this->line;
     }
 
-    function yy_r1_23()
+    function yy_r1_9()
     {
 
         $this->phpType = 'asp';
@@ -445,7 +354,7 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_PHP;
     }
 
-    function yy_r1_29()
+    function yy_r1_15()
     {
 
         $this->phpType = 'php';
@@ -453,7 +362,7 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_PHP;
     }
 
-    function yy_r1_36()
+    function yy_r1_22()
     {
 
         $this->phpType = 'script';
@@ -461,7 +370,7 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_PHP;
     }
 
-    function yy_r1_42()
+    function yy_r1_28()
     {
 
         $this->phpType = 'unmatched';
@@ -469,7 +378,7 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_PHP;
     }
 
-    function yy_r1_46()
+    function yy_r1_32()
     {
 
         $to = strlen($this->data);
@@ -484,7 +393,7 @@ class Smarty_Internal_Templatelexer
     public function yylex2()
     {
         if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neg|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\\s+(not\\s+)?(odd|even|div)\\s+by))\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(!\\s*|not\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS";
+            $this->yy_global_pattern2 = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G((" . $this->ldel . "\\s*php\\s*(.)*?" . $this->rdel . "([\S\s]*?)" . $this->ldel . "\\s*\/php\\s*" . $this->rdel . ")|(" . $this->ldel . "\\s*[\/]?php\\s*(.)*?" . $this->rdel . "))|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/(?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\\$[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)/iS";
         }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
@@ -495,7 +404,7 @@ class Smarty_Internal_Templatelexer
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state SMARTY');
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TAG');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -526,341 +435,93 @@ class Smarty_Internal_Templatelexer
         } while (true);
     } // end function
 
-    const SMARTY = 2;
+    const TAG = 2;
 
     function yy_r2_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-
-    function yy_r2_2()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
     function yy_r2_3()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
     }
 
     function yy_r2_5()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
     function yy_r2_6()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
         $this->yypopstate();
-    }
-
-    function yy_r2_7()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
-
-    function yy_r2_8()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-
-    function yy_r2_9()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
-
-    function yy_r2_10()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-
-    function yy_r2_11()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+        $this->token = Smarty_Internal_Templateparser::TP_PHP;
+        $this->phpType = 'tag';
+        $this->taglineno = $this->line;
     }
 
     function yy_r2_12()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_14()
+    {
+
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r2_15()
+    {
+
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+        $this->taglineno = $this->line;
     }
 
     function yy_r2_17()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_22()
+    function yy_r2_18()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
-    }
-
-    function yy_r2_25()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
-
-    function yy_r2_26()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
-
-    function yy_r2_30()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
-
-    function yy_r2_31()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
-
-    function yy_r2_32()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
-
-    function yy_r2_33()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
-
-    function yy_r2_34()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PTR;
-    }
-
-    function yy_r2_35()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
-
-    function yy_r2_36()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
-
-    function yy_r2_37()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
-
-    function yy_r2_38()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
-
-    function yy_r2_40()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
-
-    function yy_r2_42()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
-
-    function yy_r2_43()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
-
-    function yy_r2_44()
-    {
-
-        // resolve conflicts with shorttag and right_delimiter starting with '='
-        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
-            preg_match("/\s+/", $this->value, $match);
-            $this->value = $match[0];
-            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
-        }
-    }
-
-    function yy_r2_45()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
-    }
-
-    function yy_r2_48()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
-
-    function yy_r2_49()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
-
-    function yy_r2_50()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->yypopstate();
-    }
-
-    function yy_r2_51()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
-
-    function yy_r2_52()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
-
-    function yy_r2_53()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
-
-    function yy_r2_54()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
-
-    function yy_r2_55()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
-
-    function yy_r2_56()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
-
-    function yy_r2_57()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-    }
-
-    function yy_r2_58()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
-
-    function yy_r2_59()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
-
-    function yy_r2_60()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    }
-
-    function yy_r2_61()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_63()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_64()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_65()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_66()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_67()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
     public function yylex3()
     {
         if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
+            $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neg|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\\s+(not\\s+)?(odd|even|div)\\s+by))\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(!\\s*|not\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;\\s*)|\G(::)|\G(\\s*:\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS";
         }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
@@ -871,7 +532,7 @@ class Smarty_Internal_Templatelexer
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state LITERAL');
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TAGBODY     ');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -902,45 +563,292 @@ class Smarty_Internal_Templatelexer
         } while (true);
     } // end function
 
-    const LITERAL = 3;
+    const TAGBODY = 3;
 
     function yy_r3_1()
     {
 
-        $this->literal_cnt ++;
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
     }
 
     function yy_r3_2()
     {
 
-        if ($this->literal_cnt) {
-            $this->literal_cnt --;
-            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-            $this->yypopstate();
-        }
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
     }
 
     function yy_r3_3()
     {
 
-        $to = strlen($this->data);
-        preg_match("/{$this->ldel}\/?literal{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+    }
+
+    function yy_r3_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r3_6()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+    }
+
+    function yy_r3_7()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+    }
+
+    function yy_r3_8()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+    }
+
+    function yy_r3_9()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+    }
+
+    function yy_r3_10()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+    }
+
+    function yy_r3_11()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+    }
+
+    function yy_r3_12()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+    }
+
+    function yy_r3_13()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+    }
+
+    function yy_r3_18()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+    }
+
+    function yy_r3_23()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+    }
+
+    function yy_r3_26()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+    }
+
+    function yy_r3_27()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+    }
+
+    function yy_r3_31()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+    }
+
+    function yy_r3_32()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+    }
+
+    function yy_r3_33()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+    }
+
+    function yy_r3_34()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+    }
+
+    function yy_r3_35()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+    }
+
+    function yy_r3_36()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+    }
+
+    function yy_r3_37()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+    }
+
+    function yy_r3_38()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+    }
+
+    function yy_r3_39()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+    }
+
+    function yy_r3_41()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+    }
+
+    function yy_r3_43()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+    }
+
+    function yy_r3_44()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+    }
+
+    function yy_r3_45()
+    {
+
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
+            preg_match("/\s+/", $this->value, $match);
+            $this->value = $match[0];
+            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
         } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
         }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+    }
+
+    function yy_r3_46()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+    }
+
+    function yy_r3_49()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+    }
+
+    function yy_r3_50()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+    }
+
+    function yy_r3_51()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
+    }
+
+    function yy_r3_52()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+    }
+
+    function yy_r3_53()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+    }
+
+    function yy_r3_54()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+    }
+
+    function yy_r3_55()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+    }
+
+    function yy_r3_56()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+    }
+
+    function yy_r3_57()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+    }
+
+    function yy_r3_58()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+    }
+
+    function yy_r3_59()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+    }
+
+    function yy_r3_60()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+    }
+
+    function yy_r3_61()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
+        }
+    }
+
+    function yy_r3_62()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
     public function yylex4()
     {
         if (!isset($this->yy_global_pattern4)) {
-            $this->yy_global_pattern4 = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
+            $this->yy_global_pattern4 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
         }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
@@ -951,7 +859,7 @@ class Smarty_Internal_Templatelexer
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -982,126 +890,45 @@ class Smarty_Internal_Templatelexer
         } while (true);
     } // end function
 
-    const DOUBLEQUOTEDSTRING = 4;
+    const LITERAL = 4;
 
     function yy_r4_1()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->literal_cnt ++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+    }
+
+    function yy_r4_2()
+    {
+
+        if ($this->literal_cnt) {
+            $this->literal_cnt --;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
         }
     }
 
     function yy_r4_3()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r4_4()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r4_5()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r4_6()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r4_7()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r4_8()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r4_9()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypopstate();
-    }
-
-    function yy_r4_10()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-        $this->value = substr($this->value, 0, - 1);
-        $this->yypushstate(self::SMARTY);
-        $this->taglineno = $this->line;
-    }
-
-    function yy_r4_11()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
-
-    function yy_r4_12()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r4_13()
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r4_17()
     {
 
         $to = strlen($this->data);
+        preg_match("/{$this->ldel}\/?literal{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1];
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+        }
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
     public function yylex5()
     {
         if (!isset($this->yy_global_pattern5)) {
-            $this->yy_global_pattern5 = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS";
+            $this->yy_global_pattern5 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
         }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
@@ -1112,7 +939,7 @@ class Smarty_Internal_Templatelexer
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBODY');
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -1143,35 +970,27 @@ class Smarty_Internal_Templatelexer
         } while (true);
     } // end function
 
-    const CHILDBODY = 5;
+    const DOUBLEQUOTEDSTRING = 5;
 
     function yy_r5_1()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-        }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
     function yy_r5_2()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-        }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
     function yy_r5_3()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->yypopstate();
+            $this->yypushstate(self::TAG);
             return true;
         }
     }
@@ -1179,19 +998,72 @@ class Smarty_Internal_Templatelexer
     function yy_r5_4()
     {
 
-        $to = strlen($this->data);
-        preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
         }
+    }
+
+    function yy_r5_5()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->taglineno = $this->line;
+            $this->yypushstate(self::TAGBODY);
+        }
+    }
+
+    function yy_r5_6()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypopstate();
+    }
+
+    function yy_r5_7()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value, 0, - 1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r5_8()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+    }
+
+    function yy_r5_9()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    function yy_r5_10()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    function yy_r5_14()
+    {
+
+        $to = strlen($this->data);
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        return false;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
     public function yylex6()
     {
         if (!isset($this->yy_global_pattern6)) {
-            $this->yy_global_pattern6 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS";
+            $this->yy_global_pattern6 = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS";
         }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
@@ -1202,7 +1074,7 @@ class Smarty_Internal_Templatelexer
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBLOCK');
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBODY');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -1233,16 +1105,15 @@ class Smarty_Internal_Templatelexer
         } while (true);
     } // end function
 
-    const CHILDBLOCK = 6;
+    const CHILDBODY = 6;
 
     function yy_r6_1()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+            return false;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-            $this->yypushstate(self::CHILDLITERAL);
+            $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
         }
     }
 
@@ -1250,10 +1121,9 @@ class Smarty_Internal_Templatelexer
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+            return false;
         } else {
-            $this->yypopstate();
-            return true;
+            $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
         }
     }
 
@@ -1261,7 +1131,7 @@ class Smarty_Internal_Templatelexer
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+            return false;
         } else {
             $this->yypopstate();
             return true;
@@ -1269,32 +1139,21 @@ class Smarty_Internal_Templatelexer
     }
 
     function yy_r6_4()
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r6_6()
     {
 
         $to = strlen($this->data);
-        preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         }
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+        return false;
     }
 
     public function yylex7()
     {
         if (!isset($this->yy_global_pattern7)) {
-            $this->yy_global_pattern7 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
+            $this->yy_global_pattern7 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS";
         }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
@@ -1305,7 +1164,7 @@ class Smarty_Internal_Templatelexer
                 $yysubmatches = $yymatches;
                 $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDLITERAL');
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDBLOCK');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -1336,7 +1195,7 @@ class Smarty_Internal_Templatelexer
         } while (true);
     } // end function
 
-    const CHILDLITERAL = 7;
+    const CHILDBLOCK = 7;
 
     function yy_r7_1()
     {
@@ -1350,6 +1209,109 @@ class Smarty_Internal_Templatelexer
     }
 
     function yy_r7_2()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+        } else {
+            $this->yypopstate();
+            return true;
+        }
+    }
+
+    function yy_r7_3()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+        } else {
+            $this->yypopstate();
+            return true;
+        }
+    }
+
+    function yy_r7_4()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+        } else {
+            $this->yypopstate();
+            return true;
+        }
+    }
+
+    function yy_r7_6()
+    {
+
+        $to = strlen($this->data);
+        preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1];
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+    }
+
+    public function yylex8()
+    {
+        if (!isset($this->yy_global_pattern8)) {
+            $this->yy_global_pattern8 = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
+        }
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+
+        do {
+            if (preg_match($this->yy_global_pattern8, $this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state CHILDLITERAL');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r8_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+    } // end function
+
+    const CHILDLITERAL = 8;
+
+    function yy_r8_1()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
+            $this->yypushstate(self::CHILDLITERAL);
+        }
+    }
+
+    function yy_r8_2()
     {
 
         if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
@@ -1360,7 +1322,7 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r7_3()
+    function yy_r8_3()
     {
 
         $to = strlen($this->data);
diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php
index 52159eaf..42873642 100644
--- a/libs/sysplugins/smarty_internal_templateparser.php
+++ b/libs/sysplugins/smarty_internal_templateparser.php
@@ -272,157 +272,161 @@ class Smarty_Internal_Templateparser
 
     const TP_COLON = 2;
 
-    const TP_RDEL = 3;
+    const TP_COMMENT = 3;
 
-    const TP_COMMENT = 4;
+    const TP_PHP = 4;
 
-    const TP_PHP = 5;
+    const TP_XMLTAG = 5;
 
-    const TP_XMLTAG = 6;
+    const TP_TEXT = 6;
 
-    const TP_TEXT = 7;
+    const TP_STRIPON = 7;
 
-    const TP_STRIPON = 8;
+    const TP_STRIPOFF = 8;
 
-    const TP_STRIPOFF = 9;
+    const TP_BLOCKSOURCE = 9;
 
-    const TP_BLOCKSOURCE = 10;
+    const TP_LITERALSTART = 10;
 
-    const TP_LITERALSTART = 11;
+    const TP_LITERALEND = 11;
 
-    const TP_LITERALEND = 12;
+    const TP_LITERAL = 12;
 
-    const TP_LITERAL = 13;
+    const TP_RDEL = 13;
 
-    const TP_LDEL = 14;
+    const TP_SIMPELOUTPUT = 14;
 
-    const TP_DOLLAR = 15;
+    const TP_LDEL = 15;
 
-    const TP_ID = 16;
+    const TP_DOLLARID = 16;
 
     const TP_EQUAL = 17;
 
-    const TP_PTR = 18;
+    const TP_SIMPLETAG = 18;
 
-    const TP_LDELIF = 19;
+    const TP_ID = 19;
 
-    const TP_LDELFOR = 20;
+    const TP_PTR = 20;
 
-    const TP_SEMICOLON = 21;
+    const TP_LDELIF = 21;
 
-    const TP_INCDEC = 22;
+    const TP_LDELFOR = 22;
 
-    const TP_TO = 23;
+    const TP_SEMICOLON = 23;
 
-    const TP_STEP = 24;
+    const TP_INCDEC = 24;
 
-    const TP_LDELFOREACH = 25;
+    const TP_TO = 25;
 
-    const TP_SPACE = 26;
+    const TP_STEP = 26;
 
-    const TP_AS = 27;
+    const TP_LDELFOREACH = 27;
 
-    const TP_APTR = 28;
+    const TP_SPACE = 28;
 
-    const TP_LDELSETFILTER = 29;
+    const TP_AS = 29;
 
-    const TP_SMARTYBLOCKCHILDPARENT = 30;
+    const TP_APTR = 30;
 
-    const TP_LDELSLASH = 31;
+    const TP_LDELSETFILTER = 31;
 
-    const TP_ATTR = 32;
+    const TP_SMARTYBLOCKCHILDPARENT = 32;
 
-    const TP_INTEGER = 33;
+    const TP_CLOSETAG = 33;
 
-    const TP_COMMA = 34;
+    const TP_LDELSLASH = 34;
 
-    const TP_OPENP = 35;
+    const TP_ATTR = 35;
 
-    const TP_CLOSEP = 36;
+    const TP_INTEGER = 36;
 
-    const TP_MATH = 37;
+    const TP_COMMA = 37;
 
-    const TP_UNIMATH = 38;
+    const TP_OPENP = 38;
 
-    const TP_ANDSYM = 39;
+    const TP_CLOSEP = 39;
 
-    const TP_ISIN = 40;
+    const TP_MATH = 40;
 
-    const TP_INSTANCEOF = 41;
+    const TP_UNIMATH = 41;
 
-    const TP_QMARK = 42;
+    const TP_ISIN = 42;
 
-    const TP_NOT = 43;
+    const TP_INSTANCEOF = 43;
 
-    const TP_TYPECAST = 44;
+    const TP_QMARK = 44;
 
-    const TP_HEX = 45;
+    const TP_NOT = 45;
 
-    const TP_DOT = 46;
+    const TP_TYPECAST = 46;
 
-    const TP_SINGLEQUOTESTRING = 47;
+    const TP_HEX = 47;
 
-    const TP_DOUBLECOLON = 48;
+    const TP_DOT = 48;
 
-    const TP_NAMESPACE = 49;
+    const TP_SINGLEQUOTESTRING = 49;
 
-    const TP_AT = 50;
+    const TP_DOUBLECOLON = 50;
 
-    const TP_HATCH = 51;
+    const TP_NAMESPACE = 51;
 
-    const TP_OPENB = 52;
+    const TP_AT = 52;
 
-    const TP_CLOSEB = 53;
+    const TP_HATCH = 53;
 
-    const TP_LOGOP = 54;
+    const TP_OPENB = 54;
 
-    const TP_TLOGOP = 55;
+    const TP_CLOSEB = 55;
 
-    const TP_SINGLECOND = 56;
+    const TP_DOLLAR = 56;
 
-    const TP_QUOTE = 57;
+    const TP_LOGOP = 57;
 
-    const TP_BACKTICK = 58;
+    const TP_TLOGOP = 58;
 
-    const TP_DOLLARID = 59;
+    const TP_SINGLECOND = 59;
 
-    const YY_NO_ACTION = 519;
+    const TP_QUOTE = 60;
 
-    const YY_ACCEPT_ACTION = 518;
+    const TP_BACKTICK = 61;
 
-    const YY_ERROR_ACTION = 517;
+    const YY_NO_ACTION = 537;
 
-    const YY_SZ_ACTTAB = 1543;
+    const YY_ACCEPT_ACTION = 536;
 
-    static public $yy_action = array(10, 121, 77, 199, 306, 5, 94, 106, 20, 8, 270, 130, 13, 112, 161, 234, 305, 240, 83, 230, 24, 31, 242, 265, 40, 20, 12, 270, 17, 43, 42, 266, 216, 323, 275, 211, 443, 92, 1, 10, 114, 198, 79, 82, 5, 94, 166, 88, 163, 443, 130, 186, 182, 171, 234, 280, 240, 280, 230, 81, 31, 227, 280, 40, 127, 36, 319, 268, 43, 42, 266, 216, 323, 192, 211, 189, 92, 1, 262, 314, 189, 158, 82, 10, 107, 204, 9, 167, 5, 94, 280, 5, 94, 20, 130, 270, 280, 130, 234, 209, 240, 234, 230, 240, 16, 24, 265, 40, 20, 269, 270, 12, 43, 42, 266, 216, 323, 34, 211, 443, 92, 1, 10, 114, 204, 79, 82, 5, 94, 304, 30, 307, 443, 130, 453, 264, 182, 234, 6, 240, 453, 230, 302, 31, 223, 20, 40, 270, 17, 36, 319, 43, 42, 266, 216, 323, 20, 211, 270, 92, 1, 10, 114, 195, 189, 82, 5, 94, 24, 235, 214, 20, 130, 270, 12, 233, 234, 23, 240, 253, 208, 20, 31, 270, 33, 40, 179, 294, 293, 261, 43, 42, 266, 216, 323, 209, 211, 356, 92, 1, 10, 114, 194, 209, 82, 5, 94, 227, 89, 168, 136, 130, 120, 95, 315, 234, 37, 240, 280, 230, 24, 31, 329, 330, 40, 144, 12, 325, 24, 43, 42, 266, 216, 323, 12, 211, 189, 92, 1, 10, 119, 204, 226, 82, 5, 94, 11, 128, 298, 24, 130, 107, 327, 199, 234, 12, 240, 29, 230, 8, 31, 14, 144, 40, 273, 299, 178, 316, 43, 42, 266, 216, 323, 209, 211, 393, 92, 1, 10, 124, 204, 160, 82, 5, 94, 328, 23, 92, 310, 130, 280, 21, 125, 234, 19, 240, 185, 230, 24, 7, 12, 265, 40, 269, 12, 27, 15, 43, 42, 266, 216, 323, 441, 211, 443, 92, 1, 10, 114, 202, 79, 82, 5, 94, 189, 441, 192, 443, 130, 176, 316, 23, 234, 252, 240, 238, 230, 187, 31, 22, 144, 40, 228, 243, 206, 233, 43, 42, 266, 216, 323, 209, 211, 396, 92, 1, 10, 107, 204, 157, 82, 5, 94, 287, 222, 285, 246, 130, 280, 292, 125, 234, 291, 240, 215, 230, 396, 16, 175, 134, 40, 269, 396, 129, 300, 43, 42, 266, 216, 323, 265, 211, 320, 92, 2, 201, 212, 278, 324, 82, 325, 397, 111, 443, 286, 282, 283, 289, 290, 296, 297, 179, 174, 313, 10, 219, 443, 215, 275, 5, 94, 280, 132, 184, 397, 130, 129, 215, 172, 234, 397, 240, 117, 441, 269, 73, 129, 280, 201, 212, 278, 324, 136, 325, 279, 263, 441, 159, 200, 212, 278, 324, 215, 325, 217, 192, 280, 117, 441, 325, 73, 129, 155, 205, 309, 93, 180, 86, 156, 279, 263, 441, 441, 200, 212, 278, 324, 280, 325, 215, 36, 319, 177, 221, 133, 441, 442, 67, 129, 312, 249, 3, 107, 218, 189, 189, 279, 263, 154, 442, 200, 212, 278, 324, 110, 325, 20, 280, 270, 215, 189, 268, 213, 18, 133, 181, 316, 67, 129, 518, 52, 254, 222, 285, 246, 192, 279, 263, 92, 215, 200, 212, 278, 324, 133, 325, 118, 67, 129, 209, 37, 20, 207, 245, 103, 108, 279, 263, 105, 215, 200, 212, 278, 324, 133, 325, 122, 56, 101, 231, 275, 20, 203, 220, 275, 99, 279, 263, 244, 224, 200, 212, 278, 324, 215, 325, 209, 284, 317, 133, 151, 275, 48, 101, 116, 39, 41, 44, 38, 90, 169, 279, 263, 209, 85, 200, 212, 278, 324, 280, 325, 24, 332, 333, 331, 209, 209, 12, 361, 164, 275, 269, 39, 41, 44, 38, 215, 189, 209, 229, 28, 133, 232, 226, 56, 129, 165, 408, 408, 332, 333, 331, 260, 279, 263, 280, 126, 200, 212, 278, 324, 35, 325, 24, 209, 209, 399, 366, 20, 12, 237, 269, 318, 192, 39, 41, 44, 38, 146, 140, 269, 441, 241, 408, 408, 408, 408, 123, 87, 399, 24, 332, 333, 331, 441, 399, 12, 143, 215, 441, 408, 408, 408, 133, 275, 238, 68, 129, 209, 215, 144, 22, 441, 275, 133, 279, 263, 69, 129, 200, 212, 278, 324, 209, 325, 399, 279, 263, 183, 150, 200, 212, 278, 324, 215, 325, 4, 84, 280, 133, 125, 288, 47, 129, 39, 41, 44, 38, 399, 225, 97, 279, 263, 275, 399, 200, 212, 278, 324, 215, 325, 332, 333, 331, 133, 322, 275, 55, 129, 228, 250, 257, 140, 228, 231, 274, 279, 263, 188, 215, 200, 212, 278, 324, 133, 325, 277, 76, 129, 215, 113, 20, 6, 210, 135, 255, 279, 263, 129, 215, 200, 212, 278, 324, 133, 325, 189, 70, 129, 248, 201, 212, 278, 324, 153, 325, 279, 263, 267, 191, 200, 212, 278, 324, 215, 325, 276, 271, 32, 133, 109, 272, 66, 129, 148, 137, 321, 26, 308, 152, 147, 279, 263, 273, 215, 200, 212, 278, 324, 133, 325, 281, 54, 129, 215, 144, 149, 269, 311, 141, 104, 279, 263, 129, 215, 200, 212, 278, 324, 133, 325, 326, 75, 129, 295, 201, 212, 278, 324, 91, 325, 279, 263, 247, 288, 200, 212, 278, 324, 215, 325, 288, 288, 288, 80, 288, 288, 49, 102, 288, 288, 288, 288, 288, 288, 288, 279, 263, 288, 215, 200, 212, 278, 324, 133, 325, 288, 51, 129, 215, 288, 288, 288, 288, 139, 288, 279, 263, 129, 215, 200, 212, 278, 324, 133, 325, 288, 59, 129, 288, 201, 212, 278, 324, 288, 325, 279, 263, 288, 288, 200, 212, 278, 324, 215, 325, 288, 288, 288, 133, 288, 288, 60, 129, 288, 288, 288, 288, 288, 288, 288, 279, 263, 288, 215, 196, 212, 278, 324, 133, 325, 288, 58, 129, 215, 288, 288, 288, 288, 138, 288, 279, 263, 129, 215, 200, 212, 278, 324, 80, 325, 288, 45, 102, 288, 201, 212, 278, 324, 288, 325, 279, 263, 288, 288, 197, 212, 278, 324, 215, 325, 288, 288, 288, 98, 288, 288, 64, 129, 288, 288, 288, 288, 288, 288, 288, 279, 263, 288, 215, 200, 212, 278, 324, 96, 325, 288, 53, 129, 215, 288, 288, 288, 288, 131, 288, 279, 263, 129, 215, 200, 212, 278, 324, 133, 325, 288, 46, 129, 288, 201, 212, 278, 324, 288, 325, 279, 263, 288, 288, 200, 212, 278, 324, 215, 325, 182, 145, 288, 133, 288, 288, 61, 129, 288, 288, 280, 288, 288, 36, 319, 279, 263, 288, 215, 200, 212, 278, 324, 133, 325, 288, 71, 129, 189, 288, 288, 288, 288, 288, 288, 279, 263, 288, 215, 200, 212, 278, 324, 133, 325, 288, 63, 129, 288, 288, 288, 288, 288, 288, 288, 279, 263, 288, 288, 200, 212, 278, 324, 215, 325, 182, 173, 288, 115, 288, 288, 50, 129, 288, 288, 280, 288, 288, 36, 319, 279, 263, 288, 215, 200, 212, 278, 324, 133, 325, 288, 78, 129, 189, 288, 288, 288, 288, 288, 288, 279, 263, 288, 215, 200, 212, 278, 324, 100, 325, 288, 72, 129, 288, 288, 288, 288, 288, 288, 288, 279, 263, 288, 288, 200, 212, 278, 324, 215, 325, 182, 162, 288, 133, 288, 288, 74, 129, 288, 288, 280, 288, 288, 36, 319, 279, 263, 288, 215, 200, 212, 278, 324, 133, 325, 288, 65, 129, 189, 288, 288, 288, 288, 288, 288, 279, 263, 288, 215, 200, 212, 278, 324, 133, 325, 288, 57, 129, 288, 288, 288, 288, 288, 288, 288, 279, 263, 209, 288, 200, 212, 278, 324, 215, 325, 288, 288, 288, 133, 288, 288, 62, 129, 288, 288, 288, 288, 288, 288, 288, 279, 263, 24, 288, 200, 212, 278, 324, 12, 325, 288, 209, 288, 39, 41, 44, 38, 288, 288, 288, 288, 314, 288, 288, 288, 288, 288, 288, 9, 288, 332, 333, 331, 5, 94, 288, 288, 288, 288, 130, 288, 288, 288, 234, 288, 240, 256, 39, 41, 44, 38, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 332, 333, 331, 288, 209, 215, 259, 303, 30, 307, 142, 209, 288, 288, 129, 288, 209, 288, 190, 288, 288, 288, 288, 258, 288, 288, 201, 212, 278, 324, 288, 325, 288, 288, 288, 288, 288, 288, 288, 288, 39, 41, 44, 38, 209, 288, 288, 39, 41, 44, 38, 288, 39, 41, 44, 38, 288, 332, 333, 331, 288, 288, 288, 334, 332, 333, 331, 209, 25, 332, 333, 331, 209, 288, 251, 288, 209, 288, 193, 239, 39, 41, 44, 38, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 332, 333, 331, 209, 288, 288, 39, 41, 44, 38, 209, 39, 41, 44, 38, 39, 41, 44, 38, 288, 288, 288, 288, 332, 333, 331, 288, 288, 332, 333, 331, 209, 332, 333, 331, 288, 236, 288, 288, 39, 41, 44, 38, 288, 288, 288, 39, 41, 44, 38, 288, 288, 288, 288, 288, 288, 332, 333, 331, 288, 301, 288, 288, 332, 333, 331, 288, 39, 41, 44, 38, 288, 288, 288, 288, 288, 288, 182, 170, 288, 288, 288, 288, 288, 332, 333, 331, 280, 288, 288, 36, 319, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 189,);
+    const YY_ERROR_ACTION = 535;
 
-    static public $yy_lookahead = array(14, 15, 16, 46, 3, 19, 20, 15, 14, 52, 16, 25, 14, 15, 16, 29, 30, 31, 77, 33, 26, 35, 28, 22, 38, 14, 32, 16, 17, 43, 44, 45, 46, 47, 93, 49, 35, 51, 52, 14, 15, 16, 41, 57, 19, 20, 71, 70, 71, 48, 25, 21, 70, 71, 29, 80, 31, 80, 33, 16, 35, 50, 80, 38, 34, 83, 84, 99, 43, 44, 45, 46, 47, 98, 49, 98, 51, 52, 53, 7, 98, 71, 57, 14, 15, 16, 14, 71, 19, 20, 80, 19, 20, 14, 25, 16, 80, 25, 29, 1, 31, 29, 33, 31, 35, 26, 22, 38, 14, 93, 16, 32, 43, 44, 45, 46, 47, 14, 49, 35, 51, 52, 14, 15, 16, 41, 57, 19, 20, 57, 58, 59, 48, 25, 46, 16, 70, 29, 35, 31, 52, 33, 58, 35, 50, 14, 38, 16, 17, 83, 84, 43, 44, 45, 46, 47, 14, 49, 16, 51, 52, 14, 15, 16, 98, 57, 19, 20, 26, 50, 28, 14, 25, 16, 32, 64, 29, 34, 31, 36, 33, 14, 35, 16, 17, 38, 11, 12, 13, 22, 43, 44, 45, 46, 47, 1, 49, 3, 51, 52, 14, 15, 16, 1, 57, 19, 20, 50, 70, 71, 73, 25, 16, 102, 103, 29, 2, 31, 80, 33, 26, 35, 85, 86, 38, 18, 32, 90, 26, 43, 44, 45, 46, 47, 32, 49, 98, 51, 52, 14, 15, 16, 2, 57, 19, 20, 14, 15, 16, 26, 25, 15, 16, 46, 29, 32, 31, 17, 33, 52, 35, 17, 18, 38, 92, 33, 94, 95, 43, 44, 45, 46, 47, 1, 49, 3, 51, 52, 14, 15, 16, 71, 57, 19, 20, 49, 34, 51, 36, 25, 80, 76, 48, 29, 26, 31, 70, 33, 26, 35, 32, 22, 38, 93, 32, 28, 17, 43, 44, 45, 46, 47, 35, 49, 35, 51, 52, 14, 15, 16, 41, 57, 19, 20, 98, 48, 98, 48, 25, 94, 95, 34, 29, 36, 31, 46, 33, 79, 35, 17, 18, 38, 73, 74, 75, 64, 43, 44, 45, 46, 47, 1, 49, 3, 51, 52, 14, 15, 16, 71, 57, 19, 20, 63, 64, 65, 66, 25, 80, 65, 48, 29, 68, 31, 64, 33, 26, 35, 79, 69, 38, 93, 32, 73, 103, 43, 44, 45, 46, 47, 22, 49, 82, 51, 34, 85, 86, 87, 88, 57, 90, 3, 77, 35, 4, 5, 6, 7, 8, 9, 10, 11, 71, 53, 14, 17, 48, 64, 93, 19, 20, 80, 69, 16, 26, 25, 73, 64, 71, 29, 32, 31, 69, 35, 93, 72, 73, 80, 85, 86, 87, 88, 73, 90, 81, 82, 48, 71, 85, 86, 87, 88, 64, 90, 85, 98, 80, 69, 35, 90, 72, 73, 91, 100, 101, 79, 70, 70, 71, 81, 82, 48, 35, 85, 86, 87, 88, 80, 90, 64, 83, 84, 70, 46, 69, 48, 35, 72, 73, 101, 53, 35, 15, 16, 98, 98, 81, 82, 71, 48, 85, 86, 87, 88, 48, 90, 14, 80, 16, 64, 98, 99, 97, 23, 69, 94, 95, 72, 73, 61, 62, 63, 64, 65, 66, 98, 81, 82, 51, 64, 85, 86, 87, 88, 69, 90, 15, 72, 73, 1, 2, 14, 97, 16, 77, 15, 81, 82, 77, 64, 85, 86, 87, 88, 69, 90, 35, 72, 73, 74, 93, 14, 97, 16, 93, 77, 81, 82, 15, 16, 85, 86, 87, 88, 64, 90, 1, 7, 3, 69, 91, 93, 72, 73, 74, 37, 38, 39, 40, 70, 71, 81, 82, 1, 77, 85, 86, 87, 88, 80, 90, 26, 54, 55, 56, 1, 1, 32, 3, 91, 93, 93, 37, 38, 39, 40, 64, 98, 1, 16, 28, 69, 18, 2, 72, 73, 71, 1, 2, 54, 55, 56, 26, 81, 82, 80, 78, 85, 86, 87, 88, 24, 90, 26, 1, 1, 3, 3, 14, 32, 16, 93, 89, 98, 37, 38, 39, 40, 91, 96, 93, 35, 18, 37, 38, 39, 40, 15, 77, 26, 26, 54, 55, 56, 48, 32, 32, 77, 64, 35, 54, 55, 56, 69, 93, 46, 72, 73, 1, 64, 18, 17, 48, 93, 69, 81, 82, 72, 73, 85, 86, 87, 88, 1, 90, 3, 81, 82, 21, 71, 85, 86, 87, 88, 64, 90, 35, 77, 80, 69, 48, 3, 72, 73, 37, 38, 39, 40, 26, 27, 77, 81, 82, 93, 32, 85, 86, 87, 88, 64, 90, 54, 55, 56, 69, 89, 93, 72, 73, 73, 74, 16, 96, 73, 74, 16, 81, 82, 70, 64, 85, 86, 87, 88, 69, 90, 16, 72, 73, 64, 15, 14, 35, 16, 69, 53, 81, 82, 73, 64, 85, 86, 87, 88, 69, 90, 98, 72, 73, 36, 85, 86, 87, 88, 51, 90, 81, 82, 16, 16, 85, 86, 87, 88, 64, 90, 16, 33, 2, 69, 15, 33, 72, 73, 51, 16, 3, 42, 3, 91, 91, 81, 82, 92, 64, 85, 86, 87, 88, 69, 90, 80, 72, 73, 64, 18, 91, 93, 96, 69, 67, 81, 82, 73, 64, 85, 86, 87, 88, 69, 90, 95, 72, 73, 12, 85, 86, 87, 88, 91, 90, 81, 82, 76, 104, 85, 86, 87, 88, 64, 90, 104, 104, 104, 69, 104, 104, 72, 73, 104, 104, 104, 104, 104, 104, 104, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 64, 104, 104, 104, 104, 69, 104, 81, 82, 73, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 104, 85, 86, 87, 88, 104, 90, 81, 82, 104, 104, 85, 86, 87, 88, 64, 90, 104, 104, 104, 69, 104, 104, 72, 73, 104, 104, 104, 104, 104, 104, 104, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 64, 104, 104, 104, 104, 69, 104, 81, 82, 73, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 104, 85, 86, 87, 88, 104, 90, 81, 82, 104, 104, 85, 86, 87, 88, 64, 90, 104, 104, 104, 69, 104, 104, 72, 73, 104, 104, 104, 104, 104, 104, 104, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 64, 104, 104, 104, 104, 69, 104, 81, 82, 73, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 104, 85, 86, 87, 88, 104, 90, 81, 82, 104, 104, 85, 86, 87, 88, 64, 90, 70, 71, 104, 69, 104, 104, 72, 73, 104, 104, 80, 104, 104, 83, 84, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 98, 104, 104, 104, 104, 104, 104, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 104, 104, 104, 104, 104, 104, 104, 81, 82, 104, 104, 85, 86, 87, 88, 64, 90, 70, 71, 104, 69, 104, 104, 72, 73, 104, 104, 80, 104, 104, 83, 84, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 98, 104, 104, 104, 104, 104, 104, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 104, 104, 104, 104, 104, 104, 104, 81, 82, 104, 104, 85, 86, 87, 88, 64, 90, 70, 71, 104, 69, 104, 104, 72, 73, 104, 104, 80, 104, 104, 83, 84, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 98, 104, 104, 104, 104, 104, 104, 81, 82, 104, 64, 85, 86, 87, 88, 69, 90, 104, 72, 73, 104, 104, 104, 104, 104, 104, 104, 81, 82, 1, 104, 85, 86, 87, 88, 64, 90, 104, 104, 104, 69, 104, 104, 72, 73, 104, 104, 104, 104, 104, 104, 104, 81, 82, 26, 104, 85, 86, 87, 88, 32, 90, 104, 1, 104, 37, 38, 39, 40, 104, 104, 104, 104, 7, 104, 104, 104, 104, 104, 104, 14, 104, 54, 55, 56, 19, 20, 104, 104, 104, 104, 25, 104, 104, 104, 29, 104, 31, 36, 37, 38, 39, 40, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 54, 55, 56, 104, 1, 64, 3, 57, 58, 59, 69, 1, 104, 104, 73, 104, 1, 104, 3, 104, 104, 104, 104, 82, 104, 104, 85, 86, 87, 88, 104, 90, 104, 104, 104, 104, 104, 104, 104, 104, 37, 38, 39, 40, 1, 104, 104, 37, 38, 39, 40, 104, 37, 38, 39, 40, 104, 54, 55, 56, 104, 104, 104, 53, 54, 55, 56, 1, 2, 54, 55, 56, 1, 104, 3, 104, 1, 104, 3, 36, 37, 38, 39, 40, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 54, 55, 56, 1, 104, 104, 37, 38, 39, 40, 1, 37, 38, 39, 40, 37, 38, 39, 40, 104, 104, 104, 104, 54, 55, 56, 104, 104, 54, 55, 56, 1, 54, 55, 56, 104, 27, 104, 104, 37, 38, 39, 40, 104, 104, 104, 37, 38, 39, 40, 104, 104, 104, 104, 104, 104, 54, 55, 56, 104, 58, 104, 104, 54, 55, 56, 104, 37, 38, 39, 40, 104, 104, 104, 104, 104, 104, 70, 71, 104, 104, 104, 104, 104, 54, 55, 56, 80, 104, 104, 83, 84, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 98,);
+    const YY_SZ_ACTTAB = 2069;
 
-    const YY_SHIFT_USE_DFLT = - 44;
+    static public $yy_action = array(263, 8, 133, 21, 265, 74, 178, 7, 84, 244, 16, 93, 163, 116, 270, 259, 300, 221, 328, 317, 222, 259, 218, 12, 28, 151, 3, 43, 140, 12, 19, 39, 41, 314, 240, 292, 19, 215, 192, 81, 1, 3, 297, 90, 158, 183, 52, 263, 8, 132, 94, 265, 200, 259, 7, 84, 25, 281, 25, 281, 116, 237, 230, 211, 221, 108, 317, 222, 297, 207, 192, 28, 192, 452, 43, 184, 267, 256, 39, 41, 314, 240, 231, 241, 215, 452, 81, 1, 338, 297, 320, 137, 13, 52, 263, 8, 134, 10, 265, 212, 452, 7, 84, 244, 16, 91, 160, 116, 270, 17, 205, 221, 452, 317, 222, 259, 218, 12, 28, 171, 312, 43, 410, 97, 19, 39, 41, 314, 240, 292, 277, 215, 192, 81, 1, 205, 297, 410, 169, 173, 52, 263, 8, 134, 410, 265, 197, 365, 7, 84, 253, 249, 243, 225, 116, 205, 232, 337, 221, 335, 317, 222, 12, 218, 232, 28, 244, 16, 43, 19, 297, 270, 39, 41, 314, 240, 292, 226, 215, 205, 81, 1, 124, 297, 195, 15, 101, 52, 263, 8, 134, 410, 265, 199, 205, 7, 84, 299, 326, 205, 308, 116, 187, 289, 235, 221, 410, 317, 222, 284, 208, 404, 28, 410, 107, 43, 219, 205, 465, 39, 41, 314, 240, 292, 465, 215, 12, 81, 1, 407, 297, 316, 310, 19, 52, 263, 8, 135, 167, 265, 212, 335, 7, 84, 407, 100, 232, 259, 116, 237, 262, 407, 221, 108, 317, 222, 30, 218, 33, 28, 136, 100, 43, 224, 195, 220, 39, 41, 314, 240, 292, 205, 215, 138, 81, 1, 27, 297, 247, 85, 334, 52, 263, 8, 134, 219, 265, 212, 23, 7, 84, 111, 321, 96, 142, 116, 185, 81, 12, 221, 297, 317, 222, 259, 198, 19, 28, 22, 312, 43, 27, 34, 251, 39, 41, 314, 240, 292, 260, 215, 192, 81, 1, 192, 297, 92, 165, 173, 52, 263, 8, 131, 6, 265, 212, 259, 7, 84, 465, 298, 244, 16, 116, 453, 465, 270, 221, 2, 317, 222, 323, 218, 192, 5, 23, 453, 43, 100, 189, 113, 39, 41, 314, 240, 292, 159, 215, 452, 81, 1, 27, 297, 295, 143, 259, 52, 263, 8, 136, 452, 265, 212, 259, 7, 84, 192, 322, 111, 331, 116, 155, 195, 276, 221, 255, 317, 222, 266, 218, 195, 26, 182, 100, 43, 239, 164, 37, 39, 41, 314, 240, 292, 322, 215, 259, 81, 1, 179, 297, 301, 170, 108, 52, 263, 8, 134, 276, 265, 203, 259, 7, 84, 111, 481, 481, 168, 116, 276, 481, 286, 221, 276, 317, 222, 174, 218, 120, 28, 312, 205, 43, 296, 152, 259, 39, 41, 314, 240, 292, 11, 215, 259, 81, 1, 205, 297, 19, 173, 223, 52, 263, 8, 136, 276, 265, 212, 370, 7, 84, 285, 481, 481, 156, 116, 176, 481, 120, 221, 139, 317, 222, 259, 218, 259, 26, 244, 16, 43, 188, 289, 270, 39, 41, 314, 240, 292, 105, 215, 195, 81, 195, 238, 297, 191, 289, 408, 52, 311, 481, 229, 248, 246, 278, 268, 272, 273, 275, 184, 297, 258, 408, 263, 8, 227, 205, 265, 98, 408, 7, 84, 452, 35, 201, 112, 116, 290, 376, 141, 221, 172, 317, 222, 452, 234, 283, 129, 259, 190, 259, 232, 216, 12, 291, 118, 68, 110, 100, 145, 19, 101, 276, 452, 329, 307, 244, 16, 213, 330, 287, 270, 299, 269, 297, 452, 192, 237, 242, 283, 12, 108, 206, 313, 232, 216, 137, 19, 125, 64, 110, 194, 10, 274, 101, 4, 181, 329, 307, 205, 37, 213, 330, 287, 219, 299, 279, 324, 150, 283, 288, 309, 210, 261, 232, 216, 83, 146, 125, 56, 104, 242, 186, 192, 101, 312, 257, 329, 307, 319, 36, 213, 330, 287, 205, 299, 283, 144, 318, 183, 161, 232, 216, 180, 87, 118, 68, 110, 264, 259, 89, 101, 25, 281, 329, 307, 308, 154, 213, 330, 287, 147, 299, 24, 302, 283, 192, 86, 183, 157, 232, 216, 175, 315, 125, 47, 104, 119, 259, 276, 101, 25, 281, 329, 307, 88, 149, 213, 330, 287, 109, 299, 20, 217, 283, 192, 148, 304, 304, 232, 216, 95, 304, 125, 64, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 304, 304, 304, 304, 283, 304, 209, 304, 304, 232, 216, 304, 297, 125, 64, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 205, 304, 304, 232, 79, 304, 214, 82, 48, 106, 304, 304, 250, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 304, 304, 283, 304, 304, 304, 304, 232, 216, 304, 304, 125, 70, 110, 40, 42, 38, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 304, 283, 303, 305, 306, 304, 232, 216, 304, 304, 125, 49, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 80, 304, 304, 82, 44, 106, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 46, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 304, 304, 232, 216, 304, 304, 125, 60, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 72, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 183, 177, 232, 216, 304, 304, 125, 61, 110, 304, 259, 304, 101, 25, 281, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 192, 304, 232, 204, 304, 304, 114, 62, 110, 40, 42, 38, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 333, 299, 304, 304, 303, 305, 306, 304, 263, 9, 336, 304, 265, 304, 304, 7, 84, 304, 304, 304, 304, 116, 304, 304, 283, 221, 304, 317, 222, 232, 216, 304, 304, 125, 45, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 333, 299, 304, 304, 304, 327, 14, 304, 263, 9, 336, 304, 265, 304, 304, 7, 84, 304, 304, 304, 304, 116, 304, 304, 304, 221, 283, 317, 222, 304, 304, 232, 216, 304, 304, 125, 58, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 325, 14, 232, 216, 304, 304, 125, 66, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 183, 166, 232, 216, 304, 304, 125, 54, 110, 304, 259, 304, 101, 25, 281, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 192, 304, 232, 216, 304, 304, 125, 65, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 63, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 183, 162, 232, 216, 304, 304, 117, 50, 110, 304, 259, 304, 101, 25, 281, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 192, 304, 232, 216, 304, 304, 125, 53, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 78, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 76, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 304, 304, 232, 216, 304, 304, 125, 75, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 67, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 103, 73, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 304, 304, 232, 216, 304, 304, 125, 57, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 99, 59, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 71, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 304, 304, 232, 216, 304, 304, 125, 77, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 102, 69, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 304, 304, 304, 232, 216, 304, 304, 125, 56, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 304, 299, 283, 304, 304, 304, 304, 232, 202, 304, 304, 125, 55, 110, 304, 304, 304, 101, 304, 304, 329, 307, 304, 304, 213, 330, 287, 283, 299, 205, 18, 304, 232, 228, 304, 304, 123, 304, 110, 304, 304, 304, 101, 304, 304, 304, 282, 304, 304, 213, 330, 287, 283, 299, 205, 304, 304, 232, 228, 304, 304, 130, 304, 110, 304, 304, 304, 101, 40, 42, 38, 271, 304, 304, 213, 330, 287, 304, 299, 32, 304, 12, 304, 304, 233, 303, 305, 306, 19, 304, 304, 233, 304, 40, 42, 38, 481, 481, 304, 22, 304, 481, 465, 481, 481, 233, 31, 304, 481, 465, 303, 305, 306, 304, 481, 481, 304, 481, 481, 481, 465, 304, 481, 465, 304, 304, 304, 304, 304, 304, 465, 304, 465, 304, 481, 304, 465, 465, 304, 465, 304, 481, 304, 465, 304, 304, 304, 304, 465, 304, 465, 465, 481, 465, 465, 481, 304, 465, 293, 304, 283, 304, 205, 304, 205, 232, 228, 304, 304, 121, 304, 110, 304, 304, 280, 101, 362, 304, 304, 304, 304, 304, 213, 330, 287, 304, 299, 312, 304, 12, 304, 12, 304, 304, 304, 304, 19, 304, 19, 283, 304, 40, 42, 38, 232, 228, 173, 304, 126, 304, 110, 304, 205, 304, 101, 304, 304, 304, 303, 305, 306, 213, 330, 287, 283, 299, 304, 304, 304, 232, 228, 304, 304, 128, 304, 110, 304, 420, 420, 101, 153, 304, 304, 304, 304, 304, 213, 330, 287, 283, 299, 40, 42, 38, 232, 228, 304, 304, 122, 304, 110, 304, 304, 304, 101, 304, 304, 304, 303, 305, 306, 213, 330, 287, 452, 299, 420, 420, 420, 304, 304, 304, 304, 304, 304, 304, 452, 304, 304, 304, 304, 283, 304, 420, 420, 420, 232, 228, 205, 304, 127, 304, 110, 304, 304, 304, 101, 304, 304, 304, 304, 304, 304, 213, 330, 287, 233, 299, 536, 51, 245, 249, 243, 225, 304, 12, 232, 304, 481, 481, 304, 29, 19, 481, 465, 304, 304, 40, 42, 38, 304, 304, 304, 481, 481, 304, 304, 304, 481, 465, 304, 304, 304, 304, 303, 305, 306, 304, 304, 304, 304, 304, 465, 414, 465, 205, 481, 304, 465, 304, 205, 304, 304, 414, 304, 414, 304, 465, 414, 465, 304, 481, 254, 465, 304, 414, 304, 414, 304, 414, 304, 205, 304, 304, 304, 304, 304, 304, 219, 304, 205, 304, 304, 304, 40, 42, 38, 304, 304, 40, 42, 38, 193, 205, 304, 304, 304, 304, 304, 304, 304, 303, 305, 306, 205, 196, 303, 305, 306, 236, 40, 42, 38, 304, 205, 304, 304, 304, 304, 40, 42, 38, 304, 304, 304, 304, 115, 303, 305, 306, 304, 304, 40, 42, 38, 205, 303, 305, 306, 304, 205, 304, 304, 40, 42, 38, 304, 304, 304, 303, 305, 306, 252, 40, 42, 38, 304, 304, 304, 304, 303, 305, 306, 304, 304, 304, 304, 304, 304, 304, 303, 305, 306, 304, 40, 42, 38, 205, 304, 40, 42, 38, 304, 304, 304, 304, 304, 304, 304, 294, 304, 303, 305, 306, 304, 332, 303, 305, 306, 304, 312, 304, 304, 304, 12, 304, 304, 304, 304, 304, 304, 19, 304, 304, 304, 304, 304, 304, 304, 173,);
 
-    const YY_SHIFT_MAX = 247;
+    static public $yy_lookahead = array(14, 15, 16, 15, 18, 19, 74, 21, 22, 14, 15, 73, 74, 27, 19, 83, 97, 31, 32, 33, 34, 83, 36, 28, 38, 30, 38, 41, 16, 28, 35, 45, 46, 47, 48, 49, 35, 51, 100, 53, 54, 38, 56, 73, 74, 73, 60, 14, 15, 16, 38, 18, 19, 83, 21, 22, 86, 87, 86, 87, 27, 77, 78, 79, 31, 81, 33, 34, 56, 36, 100, 38, 100, 38, 41, 10, 11, 12, 45, 46, 47, 48, 49, 48, 51, 50, 53, 54, 55, 56, 55, 48, 30, 60, 14, 15, 16, 54, 18, 19, 38, 21, 22, 14, 15, 73, 74, 27, 19, 23, 1, 31, 50, 33, 34, 83, 36, 28, 38, 30, 24, 41, 13, 37, 35, 45, 46, 47, 48, 49, 16, 51, 100, 53, 54, 1, 56, 28, 29, 43, 60, 14, 15, 16, 35, 18, 19, 13, 21, 22, 65, 66, 67, 68, 27, 1, 71, 61, 31, 66, 33, 34, 28, 36, 71, 38, 14, 15, 41, 35, 56, 19, 45, 46, 47, 48, 49, 72, 51, 1, 53, 54, 77, 56, 100, 17, 81, 60, 14, 15, 16, 13, 18, 19, 1, 21, 22, 92, 105, 1, 94, 27, 96, 97, 52, 31, 28, 33, 34, 55, 36, 13, 38, 35, 81, 41, 48, 1, 48, 45, 46, 47, 48, 49, 54, 51, 28, 53, 54, 13, 56, 98, 19, 35, 60, 14, 15, 16, 74, 18, 19, 66, 21, 22, 28, 20, 71, 83, 27, 77, 78, 35, 31, 81, 33, 34, 44, 36, 17, 38, 16, 20, 41, 19, 100, 52, 45, 46, 47, 48, 49, 1, 51, 81, 53, 54, 37, 56, 39, 104, 105, 60, 14, 15, 16, 48, 18, 19, 17, 21, 22, 50, 55, 73, 74, 27, 73, 53, 28, 31, 56, 33, 34, 83, 36, 35, 38, 17, 24, 41, 37, 17, 39, 45, 46, 47, 48, 49, 24, 51, 100, 53, 54, 100, 56, 73, 74, 43, 60, 14, 15, 16, 37, 18, 19, 83, 21, 22, 48, 55, 14, 15, 27, 38, 54, 19, 31, 38, 33, 34, 55, 36, 100, 38, 17, 50, 41, 20, 73, 50, 45, 46, 47, 48, 49, 74, 51, 38, 53, 54, 37, 56, 39, 74, 83, 60, 14, 15, 16, 50, 18, 19, 83, 21, 22, 100, 101, 50, 36, 27, 93, 100, 95, 31, 67, 33, 34, 70, 36, 100, 38, 16, 20, 41, 19, 74, 2, 45, 46, 47, 48, 49, 101, 51, 83, 53, 54, 77, 56, 19, 74, 81, 60, 14, 15, 16, 95, 18, 19, 83, 21, 22, 50, 14, 15, 93, 27, 95, 19, 91, 31, 95, 33, 34, 74, 36, 98, 38, 24, 1, 41, 51, 74, 83, 45, 46, 47, 48, 49, 28, 51, 83, 53, 54, 1, 56, 35, 43, 20, 60, 14, 15, 16, 95, 18, 19, 13, 21, 22, 91, 14, 15, 74, 27, 74, 19, 98, 31, 16, 33, 34, 83, 36, 83, 38, 14, 15, 41, 96, 97, 19, 45, 46, 47, 48, 49, 69, 51, 100, 53, 100, 19, 56, 96, 97, 13, 60, 19, 52, 17, 3, 4, 5, 6, 7, 8, 9, 10, 56, 39, 28, 14, 15, 52, 1, 18, 82, 35, 21, 22, 38, 15, 16, 19, 27, 19, 13, 74, 31, 74, 33, 34, 50, 20, 66, 19, 83, 73, 83, 71, 72, 28, 36, 75, 76, 77, 20, 53, 35, 81, 95, 38, 84, 85, 14, 15, 88, 89, 90, 19, 92, 6, 56, 50, 100, 77, 78, 66, 28, 81, 102, 103, 71, 72, 48, 35, 75, 76, 77, 19, 54, 11, 81, 38, 73, 84, 85, 1, 2, 88, 89, 90, 48, 92, 19, 36, 53, 66, 19, 19, 99, 13, 71, 72, 19, 93, 75, 76, 77, 78, 82, 100, 81, 24, 19, 84, 85, 55, 25, 88, 89, 90, 1, 92, 66, 93, 55, 73, 74, 71, 72, 82, 81, 75, 76, 77, 83, 83, 81, 81, 86, 87, 84, 85, 94, 93, 88, 89, 90, 93, 92, 30, 88, 66, 100, 81, 73, 74, 71, 72, 93, 103, 75, 76, 77, 78, 83, 95, 81, 86, 87, 84, 85, 81, 93, 88, 89, 90, 80, 92, 15, 16, 66, 100, 19, 106, 106, 71, 72, 93, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 106, 106, 106, 106, 66, 106, 99, 106, 106, 71, 72, 106, 56, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 1, 106, 106, 71, 72, 106, 99, 75, 76, 77, 106, 106, 13, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 106, 106, 66, 106, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 40, 41, 42, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 106, 66, 57, 58, 59, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 73, 74, 71, 72, 106, 106, 75, 76, 77, 106, 83, 106, 81, 86, 87, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 100, 106, 71, 72, 106, 106, 75, 76, 77, 40, 41, 42, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 6, 92, 106, 106, 57, 58, 59, 106, 14, 15, 16, 106, 18, 106, 106, 21, 22, 106, 106, 106, 106, 27, 106, 106, 66, 31, 106, 33, 34, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 6, 92, 106, 106, 106, 60, 61, 106, 14, 15, 16, 106, 18, 106, 106, 21, 22, 106, 106, 106, 106, 27, 106, 106, 106, 31, 66, 33, 34, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 60, 61, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 73, 74, 71, 72, 106, 106, 75, 76, 77, 106, 83, 106, 81, 86, 87, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 100, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 73, 74, 71, 72, 106, 106, 75, 76, 77, 106, 83, 106, 81, 86, 87, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 100, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 106, 92, 66, 106, 106, 106, 106, 71, 72, 106, 106, 75, 76, 77, 106, 106, 106, 81, 106, 106, 84, 85, 106, 106, 88, 89, 90, 66, 92, 1, 2, 106, 71, 72, 106, 106, 75, 106, 77, 106, 106, 106, 81, 106, 106, 106, 85, 106, 106, 88, 89, 90, 66, 92, 1, 106, 106, 71, 72, 106, 106, 75, 106, 77, 106, 106, 106, 81, 40, 41, 42, 85, 106, 106, 88, 89, 90, 106, 92, 26, 106, 28, 106, 106, 2, 57, 58, 59, 35, 106, 106, 2, 106, 40, 41, 42, 14, 15, 106, 17, 106, 19, 20, 14, 15, 2, 17, 106, 19, 20, 57, 58, 59, 106, 14, 15, 106, 14, 15, 19, 20, 106, 19, 20, 106, 106, 106, 106, 106, 106, 48, 106, 50, 106, 52, 106, 54, 48, 106, 50, 106, 52, 106, 54, 106, 106, 106, 106, 48, 106, 50, 48, 52, 50, 54, 52, 106, 54, 55, 106, 66, 106, 1, 106, 1, 71, 72, 106, 106, 75, 106, 77, 106, 106, 13, 81, 13, 106, 106, 106, 106, 106, 88, 89, 90, 106, 92, 24, 106, 28, 106, 28, 106, 106, 106, 106, 35, 106, 35, 66, 106, 40, 41, 42, 71, 72, 43, 106, 75, 106, 77, 106, 1, 106, 81, 106, 106, 106, 57, 58, 59, 88, 89, 90, 66, 92, 106, 106, 106, 71, 72, 106, 106, 75, 106, 77, 106, 1, 2, 81, 29, 106, 106, 106, 106, 106, 88, 89, 90, 66, 92, 40, 41, 42, 71, 72, 106, 106, 75, 106, 77, 106, 106, 106, 81, 106, 106, 106, 57, 58, 59, 88, 89, 90, 38, 92, 40, 41, 42, 106, 106, 106, 106, 106, 106, 106, 50, 106, 106, 106, 106, 66, 106, 57, 58, 59, 71, 72, 1, 106, 75, 106, 77, 106, 106, 106, 81, 106, 106, 106, 106, 106, 106, 88, 89, 90, 2, 92, 63, 64, 65, 66, 67, 68, 106, 28, 71, 106, 14, 15, 106, 2, 35, 19, 20, 106, 106, 40, 41, 42, 106, 106, 106, 14, 15, 106, 106, 106, 19, 20, 106, 106, 106, 106, 57, 58, 59, 106, 106, 106, 106, 106, 48, 13, 50, 1, 52, 106, 54, 106, 1, 106, 106, 23, 106, 25, 106, 48, 28, 50, 106, 52, 13, 54, 106, 35, 106, 37, 106, 39, 106, 1, 106, 106, 106, 106, 106, 106, 48, 106, 1, 106, 106, 106, 40, 41, 42, 106, 106, 40, 41, 42, 13, 1, 106, 106, 106, 106, 106, 55, 106, 57, 58, 59, 1, 13, 57, 58, 59, 39, 40, 41, 42, 106, 1, 106, 106, 106, 106, 40, 41, 42, 106, 106, 106, 106, 23, 57, 58, 59, 106, 106, 40, 41, 42, 1, 57, 58, 59, 106, 1, 106, 106, 40, 41, 42, 106, 106, 106, 57, 58, 59, 39, 40, 41, 42, 106, 106, 106, 106, 57, 58, 59, 106, 106, 106, 106, 106, 106, 106, 57, 58, 59, 106, 40, 41, 42, 1, 106, 40, 41, 42, 106, 106, 106, 106, 106, 106, 106, 13, 106, 57, 58, 59, 106, 61, 57, 58, 59, 106, 24, 106, 106, 106, 28, 106, 106, 106, 106, 106, 106, 35, 106, 106, 106, 106, 106, 106, 106, 43,);
 
-    static public $yy_shift_ofst = array(400, 303, 303, 108, 108, 264, 108, 264, 25, - 14, - 14, 108, 108, 108, 108, 108, 108, 108, 108, 147, 108, 108, 108, 108, 147, 108, 225, 108, 108, 108, 108, 108, 186, 108, 108, 108, 108, 69, 69, 342, 342, 342, 342, 342, 342, 575, 617, 1252, 1252, 1252, 1252, 1252, 400, 1446, 1286, 1355, 1383, 1411, 1343, 1415, 1439, 1406, 687, 1350, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 548, 644, 548, 236, 194, 202, 72, 142, - 6, 79, 272, 79, 272, 202, 202, 207, 477, 538, 521, 1290, 702, 11, 350, 167, 643, 322, 244, 157, 175, 131, 492, 492, 492, 492, 553, 492, 547, 492, 527, 605, 223, 592, 492, 634, 604, 757, 521, 492, 527, 553, 223, 521, 492, 672, 268, 98, 98, 98, 98, 98, 817, 98, 98, 98, 817, 98, - 44, 94, - 2, 223, - 43, - 43, 88, - 43, 223, - 43, - 43, 88, 223, - 43, 223, 223, 223, 223, 223, 103, 223, 223, - 43, 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, 214, 817, 98, 817, 842, 98, 817, 98, 606, 681, 98, 606, 214, 98, - 44, - 44, - 44, - 44, - 44, 626, 398, 84, 1, 437, 232, 279, 368, 277, 143, 423, 360, 30, 297, 289, 119, 240, 451, 456, 252, 795, 813, 778, 763, 743, 735, 681, 603, 718, 739, 737, 755, 750, 790, 674, 722, 639, 753, 799, 815, 783, 782, 652, 806, 774, 775, 196, 43, 530, 490, 407, 621, 570, - 8,);
+    const YY_SHIFT_USE_DFLT = - 15;
 
-    const YY_REDUCE_USE_DFLT = - 60;
+    const YY_SHIFT_MAX = 242;
 
-    const YY_REDUCE_MAX = 193;
+    static public $yy_shift_ofst = array(517, 409, 80, 80, 80, 315, 409, 315, - 14, - 14, 33, 174, 174, 80, 80, 80, 80, 80, 80, 80, 80, 80, 268, 80, 80, 80, 80, 80, 80, 127, 221, 80, 80, 80, 80, 80, 80, 362, 362, 456, 456, 456, 456, 456, 1690, 1582, 1826, 1826, 1826, 1826, 1826, 517, 988, 1952, 1962, 1983, 1919, 1557, 759, 1740, 1928, 1941, 1893, 1898, 1988, 1988, 1988, 1988, 1988, 1988, 1988, 1988, 1988, 1988, 533, 1988, 1988, 941, 941, 1692, 2025, 244, 134, 270, 12, 1037, 89, - 5, 560, 560, 198, 198, 270, 270, 12, 546, 270, 12, 606, 109, 685, 152, 216, 178, 337, 65, 241, 326, 326, 1, 382, 385, 448, 385, 154, 472, 431, 463, 641, 1, 225, 193, 193, 193, 225, 193, 193, 193, 193, 193, - 15, 1611, 1632, 1618, 1843, 1858, 1629, 526, 481, 419, 290, 1, 1, 1, 43, 170, 43, 43, - 12, 43, 170, 114, 1, 114, 43, 43, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 43, 114, 1, 114, 1, 400, 1, 43, 1, 1, 1, 294, 404, 193, 565, 193, 590, 193, 404, 225, 225, 193, 193, 225, - 15, - 15, - 15, - 15, - 15, 1765, 1879, 502, 35, 466, 96, 62, 284, 213, 295, 237, 168, 239, 273, 86, 329, 309, 333, 305, 424, 565, 564, 579, 595, 580, 524, 536, 514, 575, 563, 599, 609, 615, 613, 582, 608, 600, 605, 498, 212, 271, 591, 3, 352, 492, 490,);
 
-    static public $yy_reduce_ofst = array(458, 363, 388, 445, 415, 510, 465, 485, 1040, 910, 805, 890, 935, 845, 825, 740, 760, 780, 975, 955, 1170, 1195, 1150, 1130, 1105, 1085, 1000, 1020, 715, 1065, 870, 552, 695, 625, 675, 650, 614, 1281, 310, 965, 900, 835, 353, 705, 770, 397, 1126, 996, - 18, 397, 1061, 1444, 300, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 519, 66, 137, - 23, 138, 111, 210, 288, 341, 427, 16, 555, - 25, 357, 172, 369, 412, 269, 281, 226, 567, 226, 558, 226, 421, 421, 567, 304, 567, 488, 467, 517, 591, 563, 518, 325, - 59, 467, 226, 10, 226, 471, 467, 688, 467, 680, 640, 653, 656, 376, 676, 600, 421, 638, 226, 226, 226, 226, 226, 421, 396, 226, 226, 235, 226, 226, 744, 742, 751, 731, 731, 745, 731, 751, 731, 731, 729, 751, 731, 751, 751, 751, 751, 751, 728, 751, 751, 731, 751, 751, 751, 751, 751, 751, 751, 751, 751, 751, - 32, 756, 228, 756, 773, 228, 756, 228, 787, 768, 228, 215, - 32, 228, 258, 489, 386, 299, 371,);
+    const YY_REDUCE_USE_DFLT = - 82;
 
-    static public $yyExpectedTokens = array(array(4, 5, 6, 7, 8, 9, 10, 11, 14, 19, 20, 25, 29, 31,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 53, 57,), array(14, 15, 16, 19, 20, 25, 29, 30, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 30, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 52, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 57,), array(14, 15, 16, 19, 20, 25, 29, 31, 33, 35, 38, 43, 44, 45, 46, 47, 49, 51, 57,), array(1, 3, 26, 32, 37, 38, 39, 40, 54, 55, 56,), array(1, 24, 26, 32, 37, 38, 39, 40, 54, 55, 56,), array(1, 26, 32, 37, 38, 39, 40, 54, 55, 56,), array(1, 26, 32, 37, 38, 39, 40, 54, 55, 56,), array(1, 26, 32, 37, 38, 39, 40, 54, 55, 56,), array(1, 26, 32, 37, 38, 39, 40, 54, 55, 56,), array(1, 26, 32, 37, 38, 39, 40, 54, 55, 56,), array(4, 5, 6, 7, 8, 9, 10, 11, 14, 19, 20, 25, 29, 31,), array(1, 27, 37, 38, 39, 40, 54, 55, 56,), array(1, 36, 37, 38, 39, 40, 54, 55, 56,), array(1, 3, 37, 38, 39, 40, 54, 55, 56,), array(1, 36, 37, 38, 39, 40, 54, 55, 56,), array(1, 3, 37, 38, 39, 40, 54, 55, 56,), array(1, 3, 37, 38, 39, 40, 54, 55, 56,), array(1, 3, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56, 58,), array(1, 2, 37, 38, 39, 40, 54, 55, 56,), array(1, 21, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 53, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(1, 37, 38, 39, 40, 54, 55, 56,), array(37, 38, 39, 40, 54, 55, 56,), array(1, 3, 18, 26, 32, 35, 48,), array(37, 38, 39, 40, 54, 55, 56,), array(15, 16, 49, 51,), array(1, 3, 26, 32,), array(1, 26, 32,), array(7, 14, 19, 20, 25, 29, 31, 57, 58, 59,), array(14, 16, 26, 28, 32,), array(14, 16, 26, 28, 32,), array(14, 16, 26, 32,), array(1, 3, 26, 32,), array(14, 16, 26, 32,), array(1, 3, 26, 32,), array(1, 26, 32,), array(1, 26, 32,), array(18, 46, 52,), array(15, 16, 51,), array(1, 2,), array(15, 35,), array(7, 14, 19, 20, 25, 29, 31, 57, 58, 59,), array(1, 3, 26, 27, 32,), array(14, 16, 17, 50,), array(1, 3, 26, 32,), array(14, 16, 17, 22,), array(1, 3, 26, 32,), array(17, 18, 48,), array(17, 18, 48,), array(14, 16, 50,), array(11, 12, 13,), array(14, 16, 17,), array(14, 16,), array(14, 16,), array(14, 16,), array(14, 16,), array(15, 16,), array(14, 16,), array(14, 16,), array(14, 16,), array(14, 16,), array(1, 3,), array(26, 32,), array(1, 28,), array(14, 16,), array(14, 16,), array(1, 18,), array(14, 16,), array(15, 35,), array(14, 16,), array(14, 16,), array(15, 16,), array(26, 32,), array(15, 35,), array(14, 16,), array(18, 48,), array(26, 32,), array(1,), array(1,), array(1,), array(1,), array(1,), array(18,), array(1,), array(1,), array(1,), array(18,), array(1,), array(), array(14, 16, 50,), array(14, 15, 16,), array(26, 32,), array(46, 52,), array(46, 52,), array(46, 52,), array(46, 52,), array(26, 32,), array(46, 52,), array(46, 52,), array(46, 52,), array(26, 32,), array(46, 52,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(14, 35,), array(26, 32,), array(26, 32,), array(46, 52,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(26, 32,), array(2,), array(18,), array(1,), array(18,), array(12,), array(1,), array(18,), array(1,), array(26,), array(35,), array(1,), array(26,), array(2,), array(1,), array(), array(), array(), array(), array(), array(1, 2, 35, 37, 38, 39, 40, 48, 54, 55, 56,), array(3, 17, 26, 32, 35, 48,), array(22, 35, 41, 48, 58,), array(3, 22, 35, 41, 48,), array(35, 46, 48, 53,), array(14, 15, 16, 33,), array(22, 35, 41, 48,), array(22, 35, 48,), array(28, 35, 48,), array(34, 36,), array(35, 48,), array(34, 53,), array(21, 34,), array(34, 36,), array(17, 46,), array(16, 50,), array(2, 17,), array(35, 48,), array(35, 48,), array(34, 36,), array(15,), array(3,), array(33,), array(51,), array(51,), array(16,), array(35,), array(16,), array(3,), array(16,), array(35,), array(15,), array(16,), array(16,), array(17,), array(53,), array(46,), array(36,), array(16,), array(3,), array(16,), array(16,), array(15,), array(2,), array(33,), array(42,), array(16,), array(16,), array(15,), array(23,), array(16,), array(2,), array(7,), array(15,), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),);
+    const YY_REDUCE_MAX = 196;
 
-    static public $yy_default = array(338, 500, 517, 480, 480, 517, 480, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 393, 393, 370, 393, 362, 393, 335, 398, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 395, 404, 400, 479, 414, 375, 501, 502, 398, 503, 478, 403, 419, 431, 420, 517, 406, 393, 517, 393, 393, 393, 413, 393, 438, 393, 393, 492, 517, 384, 517, 517, 406, 453, 406, 517, 406, 444, 444, 453, 517, 453, 517, 517, 517, 517, 517, 453, 517, 517, 517, 406, 372, 406, 517, 517, 387, 517, 517, 517, 517, 517, 393, 517, 517, 444, 393, 409, 424, 406, 417, 423, 444, 389, 422, 410, 489, 411, 487, 454, 517, 378, 451, 448, 449, 450, 379, 473, 470, 447, 359, 472, 360, 382, 373, 374, 380, 453, 377, 358, 471, 357, 369, 381, 368, 365, 364, 371, 367, 363, 383, 481, 490, 385, 493, 353, 390, 467, 413, 516, 453, 438, 516, 482, 388, 486, 453, 486, 486, 453, 431, 431, 421, 421, 431, 517, 421, 421, 431, 517, 431, 517, 517, 517, 427, 517, 465, 439, 517, 517, 517, 517, 517, 517, 517, 517, 465, 517, 517, 517, 491, 517, 517, 517, 517, 517, 427, 517, 517, 517, 517, 517, 517, 465, 429, 433, 517, 517, 517, 401, 517, 465, 344, 517, 405, 459, 402, 466, 475, 476, 336, 460, 433, 394, 488, 458, 515, 376, 462, 412, 484, 425, 426, 483, 485, 464, 465, 428, 430, 452, 455, 463, 445, 408, 432, 407, 392, 391, 342, 343, 346, 341, 340, 337, 339, 345, 347, 352, 354, 355, 351, 350, 348, 349, 456, 457, 506, 509, 508, 505, 504, 386, 511, 510, 513, 498, 477, 474, 499, 497, 514, 507, 468, 512, 440, 415, 416, 437, 436, 434, 435, 446, 469, 441, 442, 443, 418, 496, 494, 495, 461,);
+    static public $yy_reduce_ofst = array(1784, 488, 636, 521, 667, 551, 578, 607, 692, 774, 903, 1336, 1284, 1361, 1465, 1259, 1105, 1157, 1182, 1413, 876, 826, 851, 1028, 1080, 1207, 1053, 1234, 1438, 1388, 1311, 1130, 799, 749, 721, 1003, 952, 1515, 1490, 1687, 1623, 1662, 1712, 1754, - 30, 574, 603, 872, - 30, 1049, 1126, 85, 175, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, - 28, 252, - 28, - 28, - 28, - 28, 220, 220, 105, 32, - 62, - 16, 93, 346, 378, 475, 331, 291, 164, 299, 408, 508, 106, 410, 172, 285, 223, 133, 342, 223, 223, 402, 327, 402, 297, 342, - 68, 402, 348, 484, 388, 223, 340, 370, 223, 223, 473, 417, 223, 223, 223, 402, 223, 223, 223, 223, 531, 223, 587, 587, 587, 587, 587, 587, 192, 592, 587, 587, 573, 573, 573, 570, 601, 570, 570, 576, 570, 572, 577, 573, 571, 570, 570, 573, 573, 573, 573, 573, 573, 573, 573, 573, 573, 573, 573, 570, 594, 573, 612, 573, 584, 573, 570, 573, 573, 573, 618, 311, 84, 616, 84, 437, 84, 311, - 81, - 81, 84, 84, - 81, 569, 532, 454, 548, 552,);
 
-    const YYNOCODE = 105;
+    static public $yyExpectedTokens = array(array(3, 4, 5, 6, 7, 8, 9, 10, 14, 15, 18, 21, 22, 27, 31, 33, 34,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 32, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 32, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 55, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 54, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 56, 60,), array(14, 15, 16, 18, 19, 21, 22, 27, 31, 33, 34, 36, 38, 41, 45, 46, 47, 48, 49, 51, 53, 56, 60,), array(1, 13, 28, 35, 40, 41, 42, 57, 58, 59,), array(1, 26, 28, 35, 40, 41, 42, 57, 58, 59,), array(1, 28, 35, 40, 41, 42, 57, 58, 59,), array(1, 28, 35, 40, 41, 42, 57, 58, 59,), array(1, 28, 35, 40, 41, 42, 57, 58, 59,), array(1, 28, 35, 40, 41, 42, 57, 58, 59,), array(1, 28, 35, 40, 41, 42, 57, 58, 59,), array(3, 4, 5, 6, 7, 8, 9, 10, 14, 15, 18, 21, 22, 27, 31, 33, 34,), array(6, 14, 15, 16, 18, 21, 22, 27, 31, 33, 34, 60, 61,), array(1, 23, 40, 41, 42, 57, 58, 59,), array(1, 39, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59, 61,), array(1, 39, 40, 41, 42, 57, 58, 59,), array(1, 2, 40, 41, 42, 57, 58, 59,), array(1, 13, 40, 41, 42, 57, 58, 59,), array(1, 29, 40, 41, 42, 57, 58, 59,), array(1, 13, 40, 41, 42, 57, 58, 59,), array(1, 13, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 55, 57, 58, 59,), array(1, 13, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 13, 20, 28, 35, 38, 50,), array(1, 40, 41, 42, 57, 58, 59,), array(1, 40, 41, 42, 57, 58, 59,), array(40, 41, 42, 57, 58, 59,), array(40, 41, 42, 57, 58, 59,), array(1, 13, 24, 28, 35, 43,), array(1, 13, 24, 28, 35, 43,), array(16, 19, 53, 56,), array(1, 13, 28, 35,), array(1, 28, 35,), array(16, 38, 56,), array(6, 14, 15, 16, 18, 21, 22, 27, 31, 33, 34, 60, 61,), array(14, 15, 19, 28, 30, 35,), array(14, 15, 19, 28, 30, 35,), array(14, 15, 19, 28, 35,), array(14, 15, 19, 28, 35,), array(1, 13, 28, 35,), array(1, 13, 28, 35,), array(1, 28, 35,), array(1, 28, 35,), array(16, 38, 56,), array(20, 48, 54,), array(1, 28, 35,), array(16, 38, 56,), array(1, 2,), array(1, 13, 28, 29, 35,), array(15, 16, 19, 56,), array(14, 15, 19, 52,), array(1, 13, 28, 35,), array(1, 13, 28, 35,), array(17, 20, 50,), array(10, 11, 12,), array(17, 20, 50,), array(14, 15, 19,), array(14, 15, 19,), array(28, 35,), array(20, 50,), array(16, 19,), array(1, 20,), array(16, 19,), array(1, 55,), array(16, 56,), array(28, 35,), array(1, 13,), array(1, 30,), array(28, 35,), array(20,), array(1,), array(1,), array(1,), array(20,), array(1,), array(1,), array(1,), array(1,), array(1,), array(), array(2, 14, 15, 17, 19, 20, 48, 50, 52, 54,), array(2, 14, 15, 19, 20, 48, 50, 52, 54, 55,), array(2, 14, 15, 17, 19, 20, 48, 50, 52, 54,), array(2, 14, 15, 19, 20, 48, 50, 52, 54,), array(2, 14, 15, 19, 20, 48, 50, 52, 54,), array(14, 15, 19, 20, 48, 50, 52, 54,), array(15, 16, 19, 36, 56,), array(14, 15, 19, 52,), array(14, 15, 19,), array(17, 48, 54,), array(28, 35,), array(28, 35,), array(28, 35,), array(48, 54,), array(48, 54,), array(48, 54,), array(48, 54,), array(15, 38,), array(48, 54,), array(48, 54,), array(16, 56,), array(28, 35,), array(16, 56,), array(48, 54,), array(48, 54,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(28, 35,), array(48, 54,), array(16, 56,), array(28, 35,), array(16, 56,), array(28, 35,), array(19, 51,), array(28, 35,), array(48, 54,), array(28, 35,), array(28, 35,), array(28, 35,), array(17, 24,), array(2,), array(1,), array(38,), array(1,), array(11,), array(1,), array(2,), array(20,), array(20,), array(1,), array(1,), array(20,), array(), array(), array(), array(), array(), array(1, 2, 38, 40, 41, 42, 50, 57, 58, 59,), array(13, 23, 25, 28, 35, 37, 39, 48,), array(13, 17, 28, 35, 38, 50,), array(38, 48, 50, 55,), array(14, 15, 19, 52,), array(24, 43, 61,), array(30, 38, 50,), array(24, 43, 55,), array(19, 52,), array(37, 55,), array(48, 55,), array(17, 48,), array(37, 39,), array(37, 39,), array(23, 37,), array(38, 50,), array(38, 50,), array(37, 39,), array(38, 50,), array(24, 43,), array(38,), array(48,), array(36,), array(19,), array(19,), array(19,), array(19,), array(53,), array(6,), array(53,), array(19,), array(24,), array(19,), array(25,), array(55,), array(13,), array(19,), array(19,), array(19,), array(44,), array(17,), array(55,), array(38,), array(36,), array(19,), array(39,), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),);
+
+    static public $yy_default = array(342, 520, 500, 500, 500, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, 404, 404, 380, 404, 404, 371, 339, 535, 535, 535, 535, 535, 535, 535, 409, 535, 535, 535, 535, 499, 521, 416, 411, 523, 406, 385, 522, 415, 409, 442, 498, 425, 430, 431, 432, 432, 535, 418, 404, 535, 535, 404, 404, 404, 404, 424, 449, 404, 404, 535, 512, 404, 535, 394, 418, 535, 465, 418, 418, 455, 535, 455, 465, 465, 404, 455, 535, 398, 535, 418, 535, 404, 418, 418, 382, 509, 421, 422, 428, 455, 418, 435, 433, 434, 400, 507, 454, 454, 454, 454, 454, 454, 535, 467, 465, 481, 383, 364, 377, 492, 458, 493, 490, 465, 459, 460, 535, 392, 535, 461, 491, 379, 388, 369, 368, 367, 387, 372, 378, 393, 375, 373, 366, 463, 535, 390, 535, 391, 535, 389, 462, 363, 381, 384, 535, 502, 401, 465, 424, 357, 449, 501, 513, 487, 395, 399, 510, 506, 465, 506, 506, 465, 442, 438, 442, 442, 466, 432, 442, 432, 535, 535, 438, 438, 535, 535, 535, 442, 535, 535, 450, 432, 481, 438, 440, 535, 535, 535, 535, 535, 348, 535, 535, 432, 535, 412, 445, 535, 535, 535, 535, 444, 535, 535, 511, 535, 535, 535, 345, 485, 340, 346, 495, 344, 343, 471, 496, 444, 341, 486, 358, 359, 405, 417, 403, 386, 360, 413, 361, 402, 374, 356, 355, 349, 350, 484, 508, 351, 352, 354, 353, 483, 481, 347, 503, 532, 426, 427, 448, 478, 451, 447, 446, 468, 488, 469, 470, 445, 476, 531, 497, 453, 482, 477, 457, 489, 452, 429, 514, 479, 515, 516, 423, 464, 420, 504, 456, 436, 518, 437, 519, 494, 397, 473, 474, 472, 475, 505, 517, 439, 525, 526, 524, 396, 419, 443, 441, 529, 534, 527, 533, 530, 528, 480,);
+
+    const YYNOCODE = 107;
 
     const YYSTACKDEPTH = 500;
 
-    const YYNSTATE = 335;
+    const YYNSTATE = 339;
 
-    const YYNRULE = 182;
+    const YYNRULE = 196;
 
-    const YYERRORSYMBOL = 60;
+    const YYERRORSYMBOL = 62;
 
     const YYERRSYMDT = 'yy0';
 
@@ -455,9 +459,9 @@ class Smarty_Internal_Templateparser
     public $yyerrcnt;                 /* Shifts left before out of the error */
     public $yystack = array();  /* The parser's stack */
 
-    public $yyTokenName = array('$', 'VERT', 'COLON', 'RDEL', 'COMMENT', 'PHP', 'XMLTAG', 'TEXT', 'STRIPON', 'STRIPOFF', 'BLOCKSOURCE', 'LITERALSTART', 'LITERALEND', 'LITERAL', 'LDEL', 'DOLLAR', 'ID', 'EQUAL', 'PTR', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', 'STEP', 'LDELFOREACH', 'SPACE', 'AS', 'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA', 'OPENP', 'CLOSEP', 'MATH', 'UNIMATH', 'ANDSYM', 'ISIN', 'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST', 'HEX', 'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', 'OPENB', 'CLOSEB', 'LOGOP', 'TLOGOP', 'SINGLECOND', 'QUOTE', 'BACKTICK', 'DOLLARID', 'error', 'start', 'template', 'template_element', 'smartytag', 'literal', 'text_content', 'literal_elements', 'literal_element', 'value', 'modifierlist', 'attributes', 'expr', 'varindexed', 'statement', 'statements', 'optspace', 'varvar', 'foraction', 'modparameters', 'attribute', 'ternary', 'array', 'lop', 'scond', 'variable', 'ns1', 'function', 'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex', 'indexdef', 'varvarele', 'objectchain', 'objectelement', 'method', 'params', 'modifier', 'modparameter', 'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent',);
+    public $yyTokenName = array('$', 'VERT', 'COLON', 'COMMENT', 'PHP', 'XMLTAG', 'TEXT', 'STRIPON', 'STRIPOFF', 'BLOCKSOURCE', 'LITERALSTART', 'LITERALEND', 'LITERAL', 'RDEL', 'SIMPELOUTPUT', 'LDEL', 'DOLLARID', 'EQUAL', 'SIMPLETAG', 'ID', 'PTR', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', 'STEP', 'LDELFOREACH', 'SPACE', 'AS', 'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA', 'OPENP', 'CLOSEP', 'MATH', 'UNIMATH', 'ISIN', 'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST', 'HEX', 'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', 'OPENB', 'CLOSEB', 'DOLLAR', 'LOGOP', 'TLOGOP', 'SINGLECOND', 'QUOTE', 'BACKTICK', 'error', 'start', 'template', 'template_element', 'smartytag', 'literal', 'text_content', 'literal_elements', 'literal_element', 'tag', 'variable', 'modifierlist', 'attributes', 'value', 'expr', 'varindexed', 'statement', 'statements', 'foraction', 'varvar', 'modparameters', 'attribute', 'ternary', 'array', 'lop', 'scond', 'ns1', 'function', 'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex', 'indexdef', 'varvarele', 'objectchain', 'objectelement', 'method', 'params', 'modifier', 'modparameter', 'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent',);
 
-    public static $yyRuleName = array('start ::= template', 'template ::= template_element', 'template ::= template template_element', 'template ::=', 'template_element ::= smartytag RDEL', 'template_element ::= COMMENT', 'template_element ::= literal', 'template_element ::= PHP', 'template_element ::= XMLTAG', 'template_element ::= text_content', 'text_content ::= TEXT', 'text_content ::= text_content TEXT', 'template_element ::= STRIPON', 'template_element ::= STRIPOFF', 'template_element ::= BLOCKSOURCE', 'literal ::= LITERALSTART LITERALEND', 'literal ::= LITERALSTART literal_elements LITERALEND', 'literal_elements ::= literal_elements literal_element', 'literal_elements ::=', 'literal_element ::= literal', 'literal_element ::= LITERAL', 'smartytag ::= LDEL value', 'smartytag ::= LDEL value modifierlist attributes', 'smartytag ::= LDEL value attributes', 'smartytag ::= LDEL expr modifierlist attributes', 'smartytag ::= LDEL expr attributes', 'smartytag ::= LDEL DOLLAR ID EQUAL value', 'smartytag ::= LDEL DOLLAR ID EQUAL expr', 'smartytag ::= LDEL DOLLAR ID EQUAL expr attributes', 'smartytag ::= LDEL varindexed EQUAL expr attributes', 'smartytag ::= LDEL ID attributes', 'smartytag ::= LDEL ID', 'smartytag ::= LDEL ID modifierlist attributes', 'smartytag ::= LDEL ID PTR ID attributes', 'smartytag ::= LDEL ID PTR ID modifierlist attributes', 'smartytag ::= LDELIF expr', 'smartytag ::= LDELIF expr attributes', 'smartytag ::= LDELIF statement', 'smartytag ::= LDELIF statement attributes', 'smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes', 'foraction ::= EQUAL expr', 'foraction ::= INCDEC', 'smartytag ::= LDELFOR statement TO expr attributes', 'smartytag ::= LDELFOR statement TO expr STEP expr attributes', 'smartytag ::= LDELFOREACH attributes', 'smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes', 'smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes', 'smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes', 'smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes', 'smartytag ::= LDELSETFILTER ID modparameters', 'smartytag ::= LDELSETFILTER ID modparameters modifierlist', 'smartytag ::= LDEL SMARTYBLOCKCHILDPARENT', 'smartytag ::= LDELSLASH ID', 'smartytag ::= LDELSLASH ID modifierlist', 'smartytag ::= LDELSLASH ID PTR ID', 'smartytag ::= LDELSLASH ID PTR ID modifierlist', 'attributes ::= attributes attribute', 'attributes ::= attribute', 'attributes ::=', 'attribute ::= SPACE ID EQUAL ID', 'attribute ::= ATTR expr', 'attribute ::= ATTR value', 'attribute ::= SPACE ID', 'attribute ::= SPACE expr', 'attribute ::= SPACE value', 'attribute ::= SPACE INTEGER EQUAL expr', 'statements ::= statement', 'statements ::= statements COMMA statement', 'statement ::= DOLLAR varvar EQUAL expr', 'statement ::= varindexed EQUAL expr', 'statement ::= OPENP statement CLOSEP', 'expr ::= value', 'expr ::= ternary', 'expr ::= DOLLAR ID COLON ID', 'expr ::= expr MATH value', 'expr ::= expr UNIMATH value', 'expr ::= expr ANDSYM value', 'expr ::= array', 'expr ::= expr modifierlist', 'expr ::= expr lop expr', 'expr ::= expr scond', 'expr ::= expr ISIN array', 'expr ::= expr ISIN value', 'expr ::= variable INSTANCEOF ns1', 'ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr', 'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', 'value ::= variable', 'value ::= UNIMATH value', 'value ::= NOT value', 'value ::= TYPECAST value', 'value ::= variable INCDEC', 'value ::= HEX', 'value ::= INTEGER', 'value ::= INTEGER DOT INTEGER', 'value ::= INTEGER DOT', 'value ::= DOT INTEGER', 'value ::= ID', 'value ::= function', 'value ::= OPENP expr CLOSEP', 'value ::= SINGLEQUOTESTRING', 'value ::= doublequoted_with_quotes', 'value ::= varindexed DOUBLECOLON static_class_access', 'value ::= smartytag RDEL', 'value ::= value modifierlist', 'value ::= NAMESPACE', 'value ::= ns1 DOUBLECOLON static_class_access', 'ns1 ::= ID', 'ns1 ::= NAMESPACE', 'ns1 ::= variable', 'variable ::= varindexed', 'variable ::= DOLLAR varvar AT ID', 'variable ::= object', 'variable ::= HATCH ID HATCH', 'variable ::= HATCH ID HATCH arrayindex', 'variable ::= HATCH variable HATCH', 'variable ::= HATCH variable HATCH arrayindex', 'varindexed ::= DOLLAR varvar arrayindex', 'arrayindex ::= arrayindex indexdef', 'arrayindex ::=', 'indexdef ::= DOT DOLLAR varvar', 'indexdef ::= DOT DOLLAR varvar AT ID', 'indexdef ::= DOT ID', 'indexdef ::= DOT INTEGER', 'indexdef ::= DOT LDEL expr RDEL', 'indexdef ::= OPENB ID CLOSEB', 'indexdef ::= OPENB ID DOT ID CLOSEB', 'indexdef ::= OPENB expr CLOSEB', 'indexdef ::= OPENB CLOSEB', 'varvar ::= varvarele', 'varvar ::= varvar varvarele', 'varvarele ::= ID', 'varvarele ::= LDEL expr RDEL', 'object ::= varindexed objectchain', 'objectchain ::= objectelement', 'objectchain ::= objectchain objectelement', 'objectelement ::= PTR ID arrayindex', 'objectelement ::= PTR DOLLAR varvar arrayindex', 'objectelement ::= PTR LDEL expr RDEL arrayindex', 'objectelement ::= PTR ID LDEL expr RDEL arrayindex', 'objectelement ::= PTR method', 'function ::= ns1 OPENP params CLOSEP', 'method ::= ID OPENP params CLOSEP', 'method ::= DOLLAR ID OPENP params CLOSEP', 'params ::= params COMMA expr', 'params ::= expr', 'params ::=', 'modifierlist ::= modifierlist modifier modparameters', 'modifierlist ::= modifier modparameters', 'modifier ::= VERT AT ID', 'modifier ::= VERT ID', 'modparameters ::= modparameters modparameter', 'modparameters ::=', 'modparameter ::= COLON value', 'modparameter ::= COLON array', 'static_class_access ::= method', 'static_class_access ::= method objectchain', 'static_class_access ::= ID', 'static_class_access ::= DOLLAR ID arrayindex', 'static_class_access ::= DOLLAR ID arrayindex objectchain', 'lop ::= LOGOP', 'lop ::= TLOGOP', 'scond ::= SINGLECOND', 'array ::= OPENB arrayelements CLOSEB', 'arrayelements ::= arrayelement', 'arrayelements ::= arrayelements COMMA arrayelement', 'arrayelements ::=', 'arrayelement ::= value APTR expr', 'arrayelement ::= ID APTR expr', 'arrayelement ::= expr', 'doublequoted_with_quotes ::= QUOTE QUOTE', 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE', 'doublequoted ::= doublequoted doublequotedcontent', 'doublequoted ::= doublequotedcontent', 'doublequotedcontent ::= BACKTICK variable BACKTICK', 'doublequotedcontent ::= BACKTICK expr BACKTICK', 'doublequotedcontent ::= DOLLARID', 'doublequotedcontent ::= LDEL variable RDEL', 'doublequotedcontent ::= LDEL expr RDEL', 'doublequotedcontent ::= smartytag RDEL', 'doublequotedcontent ::= TEXT', 'optspace ::= SPACE', 'optspace ::=',);
+    public static $yyRuleName = array('start ::= template', 'template ::= template_element', 'template ::= template template_element', 'template ::=', 'template_element ::= smartytag', 'template_element ::= COMMENT', 'template_element ::= literal', 'template_element ::= PHP', 'template_element ::= XMLTAG', 'template_element ::= text_content', 'text_content ::= TEXT', 'text_content ::= text_content TEXT', 'template_element ::= STRIPON', 'template_element ::= STRIPOFF', 'template_element ::= BLOCKSOURCE', 'literal ::= LITERALSTART LITERALEND', 'literal ::= LITERALSTART literal_elements LITERALEND', 'literal_elements ::= literal_elements literal_element', 'literal_elements ::=', 'literal_element ::= literal', 'literal_element ::= LITERAL', 'smartytag ::= tag RDEL', 'smartytag ::= SIMPELOUTPUT', 'tag ::= LDEL variable', 'tag ::= LDEL variable modifierlist attributes', 'tag ::= LDEL variable attributes', 'tag ::= LDEL value', 'tag ::= LDEL value modifierlist attributes', 'tag ::= LDEL value attributes', 'tag ::= LDEL expr modifierlist attributes', 'tag ::= LDEL expr attributes', 'tag ::= LDEL DOLLARID EQUAL value', 'tag ::= LDEL DOLLARID EQUAL expr', 'tag ::= LDEL DOLLARID EQUAL expr attributes', 'tag ::= LDEL varindexed EQUAL expr attributes', 'smartytag ::= SIMPLETAG', 'tag ::= LDEL ID attributes', 'tag ::= LDEL ID', 'tag ::= LDEL ID modifierlist attributes', 'tag ::= LDEL ID PTR ID attributes', 'tag ::= LDEL ID PTR ID modifierlist attributes', 'tag ::= LDELIF expr', 'tag ::= LDELIF expr attributes', 'tag ::= LDELIF statement', 'tag ::= LDELIF statement attributes', 'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes', 'foraction ::= EQUAL expr', 'foraction ::= INCDEC', 'tag ::= LDELFOR statement TO expr attributes', 'tag ::= LDELFOR statement TO expr STEP expr attributes', 'tag ::= LDELFOREACH attributes', 'tag ::= LDELFOREACH SPACE value AS varvar attributes', 'tag ::= LDELFOREACH SPACE value AS varvar APTR varvar attributes', 'tag ::= LDELFOREACH SPACE expr AS varvar attributes', 'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes', 'tag ::= LDELSETFILTER ID modparameters', 'tag ::= LDELSETFILTER ID modparameters modifierlist', 'tag ::= LDEL SMARTYBLOCKCHILDPARENT', 'smartytag ::= CLOSETAG', 'tag ::= LDELSLASH ID', 'tag ::= LDELSLASH ID modifierlist', 'tag ::= LDELSLASH ID PTR ID', 'tag ::= LDELSLASH ID PTR ID modifierlist', 'attributes ::= attributes attribute', 'attributes ::= attribute', 'attributes ::=', 'attribute ::= SPACE ID EQUAL ID', 'attribute ::= ATTR expr', 'attribute ::= ATTR value', 'attribute ::= SPACE ID', 'attribute ::= SPACE expr', 'attribute ::= SPACE value', 'attribute ::= SPACE INTEGER EQUAL expr', 'statements ::= statement', 'statements ::= statements COMMA statement', 'statement ::= DOLLARID EQUAL INTEGER', 'statement ::= DOLLARID EQUAL expr', 'statement ::= varindexed EQUAL expr', 'statement ::= OPENP statement CLOSEP', 'expr ::= value', 'expr ::= ternary', 'expr ::= DOLLARID COLON ID', 'expr ::= expr MATH value', 'expr ::= expr UNIMATH value', 'expr ::= array', 'expr ::= expr modifierlist', 'expr ::= expr lop expr', 'expr ::= expr scond', 'expr ::= expr ISIN array', 'expr ::= expr ISIN value', 'expr ::= variable INSTANCEOF ns1', 'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr', 'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', 'value ::= variable', 'value ::= UNIMATH value', 'value ::= NOT value', 'value ::= TYPECAST value', 'value ::= variable INCDEC', 'value ::= HEX', 'value ::= INTEGER', 'value ::= INTEGER DOT INTEGER', 'value ::= INTEGER DOT', 'value ::= DOT INTEGER', 'value ::= ID', 'value ::= function', 'value ::= OPENP expr CLOSEP', 'value ::= SINGLEQUOTESTRING', 'value ::= doublequoted_with_quotes', 'value ::= varindexed DOUBLECOLON static_class_access', 'value ::= smartytag', 'value ::= value modifierlist', 'value ::= NAMESPACE', 'value ::= ns1 DOUBLECOLON static_class_access', 'ns1 ::= ID', 'ns1 ::= NAMESPACE', 'variable ::= DOLLARID', 'variable ::= varindexed', 'variable ::= varvar AT ID', 'variable ::= object', 'variable ::= HATCH ID HATCH', 'variable ::= HATCH ID HATCH arrayindex', 'variable ::= HATCH variable HATCH', 'variable ::= HATCH variable HATCH arrayindex', 'varindexed ::= DOLLARID arrayindex', 'varindexed ::= varvar arrayindex', 'arrayindex ::= arrayindex indexdef', 'arrayindex ::=', 'indexdef ::= DOT DOLLARID', 'indexdef ::= DOT varvar', 'indexdef ::= DOT varvar AT ID', 'indexdef ::= DOT ID', 'indexdef ::= DOT INTEGER', 'indexdef ::= DOT LDEL expr RDEL', 'indexdef ::= OPENB ID CLOSEB', 'indexdef ::= OPENB ID DOT ID CLOSEB', 'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB', 'indexdef ::= OPENB INTEGER CLOSEB', 'indexdef ::= OPENB DOLLARID CLOSEB', 'indexdef ::= OPENB variable CLOSEB', 'indexdef ::= OPENB value CLOSEB', 'indexdef ::= OPENB expr CLOSEB', 'indexdef ::= OPENB CLOSEB', 'varvar ::= DOLLARID', 'varvar ::= DOLLAR', 'varvar ::= varvar varvarele', 'varvarele ::= ID', 'varvarele ::= SIMPELOUTPUT', 'varvarele ::= LDEL expr RDEL', 'object ::= varindexed objectchain', 'objectchain ::= objectelement', 'objectchain ::= objectchain objectelement', 'objectelement ::= PTR ID arrayindex', 'objectelement ::= PTR varvar arrayindex', 'objectelement ::= PTR LDEL expr RDEL arrayindex', 'objectelement ::= PTR ID LDEL expr RDEL arrayindex', 'objectelement ::= PTR method', 'function ::= ns1 OPENP params CLOSEP', 'method ::= ID OPENP params CLOSEP', 'method ::= DOLLARID OPENP params CLOSEP', 'params ::= params COMMA expr', 'params ::= expr', 'params ::=', 'modifierlist ::= modifierlist modifier modparameters', 'modifierlist ::= modifier modparameters', 'modifier ::= VERT AT ID', 'modifier ::= VERT ID', 'modparameters ::= modparameters modparameter', 'modparameters ::=', 'modparameter ::= COLON value', 'modparameter ::= COLON array', 'static_class_access ::= method', 'static_class_access ::= method objectchain', 'static_class_access ::= ID', 'static_class_access ::= DOLLARID arrayindex', 'static_class_access ::= DOLLARID arrayindex objectchain', 'lop ::= LOGOP', 'lop ::= TLOGOP', 'scond ::= SINGLECOND', 'array ::= OPENB arrayelements CLOSEB', 'arrayelements ::= arrayelement', 'arrayelements ::= arrayelements COMMA arrayelement', 'arrayelements ::=', 'arrayelement ::= value APTR expr', 'arrayelement ::= ID APTR expr', 'arrayelement ::= expr', 'doublequoted_with_quotes ::= QUOTE QUOTE', 'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE', 'doublequoted ::= doublequoted doublequotedcontent', 'doublequoted ::= doublequotedcontent', 'doublequotedcontent ::= BACKTICK variable BACKTICK', 'doublequotedcontent ::= BACKTICK expr BACKTICK', 'doublequotedcontent ::= DOLLARID', 'doublequotedcontent ::= LDEL variable RDEL', 'doublequotedcontent ::= LDEL expr RDEL', 'doublequotedcontent ::= smartytag', 'doublequotedcontent ::= TEXT',);
 
     public function tokenName($tokenType)
     {
@@ -759,9 +763,9 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    public static $yyRuleInfo = array(array(0 => 61, 1 => 1), array(0 => 62, 1 => 1), array(0 => 62, 1 => 2), array(0 => 62, 1 => 0), array(0 => 63, 1 => 2), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 66, 1 => 1), array(0 => 66, 1 => 2), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 65, 1 => 2), array(0 => 65, 1 => 3), array(0 => 67, 1 => 2), array(0 => 67, 1 => 0), array(0 => 68, 1 => 1), array(0 => 68, 1 => 1), array(0 => 64, 1 => 2), array(0 => 64, 1 => 4), array(0 => 64, 1 => 3), array(0 => 64, 1 => 4), array(0 => 64, 1 => 3), array(0 => 64, 1 => 5), array(0 => 64, 1 => 5), array(0 => 64, 1 => 6), array(0 => 64, 1 => 5), array(0 => 64, 1 => 3), array(0 => 64, 1 => 2), array(0 => 64, 1 => 4), array(0 => 64, 1 => 5), array(0 => 64, 1 => 6), array(0 => 64, 1 => 2), array(0 => 64, 1 => 3), array(0 => 64, 1 => 2), array(0 => 64, 1 => 3), array(0 => 64, 1 => 11), array(0 => 78, 1 => 2), array(0 => 78, 1 => 1), array(0 => 64, 1 => 5), array(0 => 64, 1 => 7), array(0 => 64, 1 => 2), array(0 => 64, 1 => 7), array(0 => 64, 1 => 10), array(0 => 64, 1 => 7), array(0 => 64, 1 => 10), array(0 => 64, 1 => 3), array(0 => 64, 1 => 4), array(0 => 64, 1 => 2), array(0 => 64, 1 => 2), array(0 => 64, 1 => 3), array(0 => 64, 1 => 4), array(0 => 64, 1 => 5), array(0 => 71, 1 => 2), array(0 => 71, 1 => 1), array(0 => 71, 1 => 0), array(0 => 80, 1 => 4), array(0 => 80, 1 => 2), array(0 => 80, 1 => 2), array(0 => 80, 1 => 2), array(0 => 80, 1 => 2), array(0 => 80, 1 => 2), array(0 => 80, 1 => 4), array(0 => 75, 1 => 1), array(0 => 75, 1 => 3), array(0 => 74, 1 => 4), array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), array(0 => 72, 1 => 1), array(0 => 72, 1 => 1), array(0 => 72, 1 => 4), array(0 => 72, 1 => 3), array(0 => 72, 1 => 3), array(0 => 72, 1 => 3), array(0 => 72, 1 => 1), array(0 => 72, 1 => 2), array(0 => 72, 1 => 3), array(0 => 72, 1 => 2), array(0 => 72, 1 => 3), array(0 => 72, 1 => 3), array(0 => 72, 1 => 3), array(0 => 81, 1 => 8), array(0 => 81, 1 => 7), array(0 => 69, 1 => 1), array(0 => 69, 1 => 2), array(0 => 69, 1 => 2), array(0 => 69, 1 => 2), array(0 => 69, 1 => 2), array(0 => 69, 1 => 1), array(0 => 69, 1 => 1), array(0 => 69, 1 => 3), array(0 => 69, 1 => 2), array(0 => 69, 1 => 2), array(0 => 69, 1 => 1), array(0 => 69, 1 => 1), array(0 => 69, 1 => 3), array(0 => 69, 1 => 1), array(0 => 69, 1 => 1), array(0 => 69, 1 => 3), array(0 => 69, 1 => 2), array(0 => 69, 1 => 2), array(0 => 69, 1 => 1), array(0 => 69, 1 => 3), array(0 => 86, 1 => 1), array(0 => 86, 1 => 1), array(0 => 86, 1 => 1), array(0 => 85, 1 => 1), array(0 => 85, 1 => 4), array(0 => 85, 1 => 1), array(0 => 85, 1 => 3), array(0 => 85, 1 => 4), array(0 => 85, 1 => 3), array(0 => 85, 1 => 4), array(0 => 73, 1 => 3), array(0 => 91, 1 => 2), array(0 => 91, 1 => 0), array(0 => 92, 1 => 3), array(0 => 92, 1 => 5), array(0 => 92, 1 => 2), array(0 => 92, 1 => 2), array(0 => 92, 1 => 4), array(0 => 92, 1 => 3), array(0 => 92, 1 => 5), array(0 => 92, 1 => 3), array(0 => 92, 1 => 2), array(0 => 77, 1 => 1), array(0 => 77, 1 => 2), array(0 => 93, 1 => 1), array(0 => 93, 1 => 3), array(0 => 90, 1 => 2), array(0 => 94, 1 => 1), array(0 => 94, 1 => 2), array(0 => 95, 1 => 3), array(0 => 95, 1 => 4), array(0 => 95, 1 => 5), array(0 => 95, 1 => 6), array(0 => 95, 1 => 2), array(0 => 87, 1 => 4), array(0 => 96, 1 => 4), array(0 => 96, 1 => 5), array(0 => 97, 1 => 3), array(0 => 97, 1 => 1), array(0 => 97, 1 => 0), array(0 => 70, 1 => 3), array(0 => 70, 1 => 2), array(0 => 98, 1 => 3), array(0 => 98, 1 => 2), array(0 => 79, 1 => 2), array(0 => 79, 1 => 0), array(0 => 99, 1 => 2), array(0 => 99, 1 => 2), array(0 => 89, 1 => 1), array(0 => 89, 1 => 2), array(0 => 89, 1 => 1), array(0 => 89, 1 => 3), array(0 => 89, 1 => 4), array(0 => 83, 1 => 1), array(0 => 83, 1 => 1), array(0 => 84, 1 => 1), array(0 => 82, 1 => 3), array(0 => 100, 1 => 1), array(0 => 100, 1 => 3), array(0 => 100, 1 => 0), array(0 => 101, 1 => 3), array(0 => 101, 1 => 3), array(0 => 101, 1 => 1), array(0 => 88, 1 => 2), array(0 => 88, 1 => 3), array(0 => 102, 1 => 2), array(0 => 102, 1 => 1), array(0 => 103, 1 => 3), array(0 => 103, 1 => 3), array(0 => 103, 1 => 1), array(0 => 103, 1 => 3), array(0 => 103, 1 => 3), array(0 => 103, 1 => 2), array(0 => 103, 1 => 1), array(0 => 76, 1 => 1), array(0 => 76, 1 => 0),);
+    public static $yyRuleInfo = array(array(0 => 63, 1 => 1), array(0 => 64, 1 => 1), array(0 => 64, 1 => 2), array(0 => 64, 1 => 0), array(0 => 65, 1 => 1), array(0 => 65, 1 => 1), array(0 => 65, 1 => 1), array(0 => 65, 1 => 1), array(0 => 65, 1 => 1), array(0 => 65, 1 => 1), array(0 => 68, 1 => 1), array(0 => 68, 1 => 2), array(0 => 65, 1 => 1), array(0 => 65, 1 => 1), array(0 => 65, 1 => 1), array(0 => 67, 1 => 2), array(0 => 67, 1 => 3), array(0 => 69, 1 => 2), array(0 => 69, 1 => 0), array(0 => 70, 1 => 1), array(0 => 70, 1 => 1), array(0 => 66, 1 => 2), array(0 => 66, 1 => 1), array(0 => 71, 1 => 2), array(0 => 71, 1 => 4), array(0 => 71, 1 => 3), array(0 => 71, 1 => 2), array(0 => 71, 1 => 4), array(0 => 71, 1 => 3), array(0 => 71, 1 => 4), array(0 => 71, 1 => 3), array(0 => 71, 1 => 4), array(0 => 71, 1 => 4), array(0 => 71, 1 => 5), array(0 => 71, 1 => 5), array(0 => 66, 1 => 1), array(0 => 71, 1 => 3), array(0 => 71, 1 => 2), array(0 => 71, 1 => 4), array(0 => 71, 1 => 5), array(0 => 71, 1 => 6), array(0 => 71, 1 => 2), array(0 => 71, 1 => 3), array(0 => 71, 1 => 2), array(0 => 71, 1 => 3), array(0 => 71, 1 => 8), array(0 => 80, 1 => 2), array(0 => 80, 1 => 1), array(0 => 71, 1 => 5), array(0 => 71, 1 => 7), array(0 => 71, 1 => 2), array(0 => 71, 1 => 6), array(0 => 71, 1 => 8), array(0 => 71, 1 => 6), array(0 => 71, 1 => 8), array(0 => 71, 1 => 3), array(0 => 71, 1 => 4), array(0 => 71, 1 => 2), array(0 => 66, 1 => 1), array(0 => 71, 1 => 2), array(0 => 71, 1 => 3), array(0 => 71, 1 => 4), array(0 => 71, 1 => 5), array(0 => 74, 1 => 2), array(0 => 74, 1 => 1), array(0 => 74, 1 => 0), array(0 => 83, 1 => 4), array(0 => 83, 1 => 2), array(0 => 83, 1 => 2), array(0 => 83, 1 => 2), array(0 => 83, 1 => 2), array(0 => 83, 1 => 2), array(0 => 83, 1 => 4), array(0 => 79, 1 => 1), array(0 => 79, 1 => 3), array(0 => 78, 1 => 3), array(0 => 78, 1 => 3), array(0 => 78, 1 => 3), array(0 => 78, 1 => 3), array(0 => 76, 1 => 1), array(0 => 76, 1 => 1), array(0 => 76, 1 => 3), array(0 => 76, 1 => 3), array(0 => 76, 1 => 3), array(0 => 76, 1 => 1), array(0 => 76, 1 => 2), array(0 => 76, 1 => 3), array(0 => 76, 1 => 2), array(0 => 76, 1 => 3), array(0 => 76, 1 => 3), array(0 => 76, 1 => 3), array(0 => 84, 1 => 7), array(0 => 84, 1 => 7), array(0 => 75, 1 => 1), array(0 => 75, 1 => 2), array(0 => 75, 1 => 2), array(0 => 75, 1 => 2), array(0 => 75, 1 => 2), array(0 => 75, 1 => 1), array(0 => 75, 1 => 1), array(0 => 75, 1 => 3), array(0 => 75, 1 => 2), array(0 => 75, 1 => 2), array(0 => 75, 1 => 1), array(0 => 75, 1 => 1), array(0 => 75, 1 => 3), array(0 => 75, 1 => 1), array(0 => 75, 1 => 1), array(0 => 75, 1 => 3), array(0 => 75, 1 => 1), array(0 => 75, 1 => 2), array(0 => 75, 1 => 1), array(0 => 75, 1 => 3), array(0 => 88, 1 => 1), array(0 => 88, 1 => 1), array(0 => 72, 1 => 1), array(0 => 72, 1 => 1), array(0 => 72, 1 => 3), array(0 => 72, 1 => 1), array(0 => 72, 1 => 3), array(0 => 72, 1 => 4), array(0 => 72, 1 => 3), array(0 => 72, 1 => 4), array(0 => 77, 1 => 2), array(0 => 77, 1 => 2), array(0 => 93, 1 => 2), array(0 => 93, 1 => 0), array(0 => 94, 1 => 2), array(0 => 94, 1 => 2), array(0 => 94, 1 => 4), array(0 => 94, 1 => 2), array(0 => 94, 1 => 2), array(0 => 94, 1 => 4), array(0 => 94, 1 => 3), array(0 => 94, 1 => 5), array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), array(0 => 94, 1 => 3), array(0 => 94, 1 => 2), array(0 => 81, 1 => 1), array(0 => 81, 1 => 1), array(0 => 81, 1 => 2), array(0 => 95, 1 => 1), array(0 => 95, 1 => 1), array(0 => 95, 1 => 3), array(0 => 92, 1 => 2), array(0 => 96, 1 => 1), array(0 => 96, 1 => 2), array(0 => 97, 1 => 3), array(0 => 97, 1 => 3), array(0 => 97, 1 => 5), array(0 => 97, 1 => 6), array(0 => 97, 1 => 2), array(0 => 89, 1 => 4), array(0 => 98, 1 => 4), array(0 => 98, 1 => 4), array(0 => 99, 1 => 3), array(0 => 99, 1 => 1), array(0 => 99, 1 => 0), array(0 => 73, 1 => 3), array(0 => 73, 1 => 2), array(0 => 100, 1 => 3), array(0 => 100, 1 => 2), array(0 => 82, 1 => 2), array(0 => 82, 1 => 0), array(0 => 101, 1 => 2), array(0 => 101, 1 => 2), array(0 => 91, 1 => 1), array(0 => 91, 1 => 2), array(0 => 91, 1 => 1), array(0 => 91, 1 => 2), array(0 => 91, 1 => 3), array(0 => 86, 1 => 1), array(0 => 86, 1 => 1), array(0 => 87, 1 => 1), array(0 => 85, 1 => 3), array(0 => 102, 1 => 1), array(0 => 102, 1 => 3), array(0 => 102, 1 => 0), array(0 => 103, 1 => 3), array(0 => 103, 1 => 3), array(0 => 103, 1 => 1), array(0 => 90, 1 => 2), array(0 => 90, 1 => 3), array(0 => 104, 1 => 2), array(0 => 104, 1 => 1), array(0 => 105, 1 => 3), array(0 => 105, 1 => 3), array(0 => 105, 1 => 1), array(0 => 105, 1 => 3), array(0 => 105, 1 => 3), array(0 => 105, 1 => 1), array(0 => 105, 1 => 1),);
 
-    public static $yyReduceMap = array(0 => 0, 1 => 1, 2 => 2, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 19 => 10, 20 => 10, 41 => 10, 63 => 10, 64 => 10, 71 => 10, 72 => 10, 77 => 10, 86 => 10, 91 => 10, 92 => 10, 97 => 10, 99 => 10, 100 => 10, 104 => 10, 106 => 10, 107 => 10, 108 => 10, 111 => 10, 128 => 10, 163 => 10, 168 => 10, 180 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 18 => 15, 181 => 15, 16 => 16, 70 => 16, 17 => 17, 87 => 17, 89 => 17, 90 => 17, 117 => 17, 21 => 21, 22 => 22, 23 => 23, 25 => 23, 24 => 24, 26 => 26, 27 => 26, 28 => 28, 29 => 29, 30 => 30, 31 => 31, 32 => 32, 33 => 33, 34 => 34, 35 => 35, 36 => 36, 38 => 36, 37 => 37, 39 => 39, 40 => 40, 42 => 42, 43 => 43, 44 => 44, 45 => 45, 47 => 45, 46 => 46, 48 => 46, 49 => 49, 50 => 50, 51 => 51, 52 => 52, 53 => 53, 54 => 54, 55 => 55, 56 => 56, 57 => 57, 66 => 57, 144 => 57, 148 => 57, 152 => 57, 153 => 57, 58 => 58, 145 => 58, 151 => 58, 59 => 59, 60 => 60, 61 => 60, 62 => 62, 65 => 65, 67 => 67, 68 => 68, 69 => 68, 73 => 73, 74 => 74, 75 => 74, 76 => 74, 78 => 78, 103 => 78, 79 => 79, 80 => 80, 81 => 81, 82 => 82, 83 => 83, 84 => 84, 85 => 85, 88 => 88, 93 => 93, 94 => 94, 95 => 95, 96 => 96, 98 => 98, 101 => 101, 102 => 102, 105 => 105, 109 => 109, 110 => 110, 112 => 112, 113 => 113, 114 => 114, 115 => 115, 116 => 116, 118 => 118, 165 => 118, 119 => 119, 120 => 120, 121 => 121, 122 => 122, 123 => 123, 126 => 123, 124 => 124, 125 => 125, 127 => 127, 129 => 129, 130 => 130, 131 => 131, 132 => 132, 133 => 133, 134 => 134, 135 => 135, 136 => 136, 137 => 137, 138 => 138, 139 => 139, 140 => 140, 141 => 141, 142 => 142, 143 => 143, 146 => 146, 147 => 147, 149 => 149, 150 => 150, 154 => 154, 155 => 155, 156 => 156, 157 => 157, 158 => 158, 159 => 159, 160 => 160, 161 => 161, 162 => 162, 164 => 164, 166 => 166, 167 => 167, 169 => 169, 170 => 170, 171 => 171, 172 => 172, 173 => 173, 174 => 173, 176 => 173, 175 => 175, 177 => 177, 178 => 178, 179 => 179,);
+    public static $yyReduceMap = array(0 => 0, 1 => 1, 2 => 2, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 19 => 10, 20 => 10, 47 => 10, 70 => 10, 71 => 10, 79 => 10, 80 => 10, 84 => 10, 93 => 10, 98 => 10, 99 => 10, 104 => 10, 106 => 10, 107 => 10, 111 => 10, 113 => 10, 114 => 10, 118 => 10, 179 => 10, 184 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 18 => 15, 16 => 16, 78 => 16, 17 => 17, 94 => 17, 96 => 17, 97 => 17, 125 => 17, 21 => 21, 22 => 22, 23 => 23, 26 => 23, 24 => 24, 27 => 24, 25 => 25, 28 => 25, 30 => 25, 29 => 29, 31 => 31, 32 => 31, 33 => 33, 34 => 34, 35 => 35, 36 => 36, 37 => 37, 38 => 38, 39 => 39, 40 => 40, 41 => 41, 42 => 42, 44 => 42, 43 => 43, 45 => 45, 46 => 46, 48 => 48, 49 => 49, 50 => 50, 51 => 51, 53 => 51, 52 => 52, 54 => 52, 55 => 55, 56 => 56, 57 => 57, 58 => 58, 59 => 59, 60 => 60, 61 => 61, 62 => 62, 63 => 63, 64 => 64, 73 => 64, 160 => 64, 164 => 64, 168 => 64, 169 => 64, 65 => 65, 161 => 65, 167 => 65, 66 => 66, 67 => 67, 68 => 67, 69 => 69, 145 => 69, 72 => 72, 74 => 74, 75 => 75, 76 => 75, 77 => 77, 81 => 81, 82 => 82, 83 => 82, 85 => 85, 110 => 85, 86 => 86, 87 => 87, 88 => 88, 89 => 89, 90 => 90, 91 => 91, 92 => 92, 95 => 95, 100 => 100, 101 => 101, 102 => 102, 103 => 103, 105 => 105, 108 => 108, 109 => 109, 112 => 112, 115 => 115, 116 => 116, 117 => 117, 119 => 119, 120 => 120, 121 => 121, 122 => 122, 123 => 123, 124 => 124, 126 => 126, 181 => 126, 127 => 127, 128 => 128, 129 => 129, 130 => 130, 131 => 131, 132 => 132, 140 => 132, 133 => 133, 134 => 134, 135 => 135, 136 => 135, 138 => 135, 139 => 135, 137 => 137, 141 => 141, 142 => 142, 143 => 143, 185 => 143, 144 => 144, 146 => 146, 147 => 147, 148 => 148, 149 => 149, 150 => 150, 151 => 151, 152 => 152, 153 => 153, 154 => 154, 155 => 155, 156 => 156, 157 => 157, 158 => 158, 159 => 159, 162 => 162, 163 => 163, 165 => 165, 166 => 166, 170 => 170, 171 => 171, 172 => 172, 173 => 173, 174 => 174, 175 => 175, 176 => 176, 177 => 177, 178 => 178, 180 => 180, 182 => 182, 183 => 183, 186 => 186, 187 => 187, 188 => 188, 189 => 189, 190 => 189, 192 => 189, 191 => 191, 193 => 193, 194 => 194, 195 => 195,);
 
     #line 214 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r0()
@@ -790,7 +794,7 @@ class Smarty_Internal_Templateparser
     function yy_r4()
     {
         if ($this->compiler->has_code) {
-            $this->_retvalue = $this->mergePrefixCode($this->yystack[$this->yyidx + - 1]->minor);
+            $this->_retvalue = $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor);
         } else {
             $this->_retvalue = null;
         }
@@ -894,50 +898,90 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 344 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 339 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r21()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
+    }
+
+    #line 345 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r22()
+    {
+        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' $');
+        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array('nocache'), array('value' => $this->compiler->compileVariable('\'' . $match[1] . '\'')));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->compiler->compileVariable('\'' . $var . '\'')));
+        }
+    }
+
+    #line 355 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r23()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 348 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r22()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
-    }
-
-    #line 352 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r23()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
-    }
-
-    #line 356 "../smarty/lexer/smarty_internal_templateparser.y"
+    #line 359 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r24()
     {
         $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 369 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r26()
+    #line 363 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r25()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 2]->minor . "'")));
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
     #line 377 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r28()
+    function yy_r29()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 3]->minor . "'")), $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 381 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r29()
+    #line 390 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r31()
+    {
+        $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor), array('var' => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'')));
+    }
+
+    #line 398 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r33()
+    {
+        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => '\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'')), $this->yystack[$this->yyidx + 0]->minor));
+    }
+
+    #line 402 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r34()
     {
         $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => $this->yystack[$this->yyidx + - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + - 3]->minor['smarty_internal_index']));
     }
 
-    #line 386 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r30()
+    #line 407 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r35()
+    {
+        $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length));
+        if ($tag == 'strip') {
+            $this->strip = true;
+            $this->_retvalue = null;;
+        } else {
+            if (defined($tag)) {
+                if (isset($this->smarty->security_policy)) {
+                    $this->smarty->security_policy->isTrustedConstant($tag, $this->compiler);
+                }
+                $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
+            } else {
+                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                    $this->_retvalue = $this->compiler->compileTag($match[1], array('nocache'));
+                } else {
+                    $this->_retvalue = $this->compiler->compileTag($tag, array());
+                }
+            }
+        }
+    }
+
+    #line 429 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r36()
     {
         if (defined($this->yystack[$this->yyidx + - 1]->minor)) {
             if (isset($this->smarty->security_policy)) {
@@ -949,8 +993,8 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 396 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r31()
+    #line 439 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r37()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
             if (isset($this->smarty->security_policy)) {
@@ -962,8 +1006,8 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 409 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r32()
+    #line 452 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r38()
     {
         if (defined($this->yystack[$this->yyidx + - 2]->minor)) {
             if (isset($this->smarty->security_policy)) {
@@ -976,96 +1020,96 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 422 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r33()
+    #line 465 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r39()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 427 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r34()
+    #line 470 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r40()
     {
         $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) . '<?php echo ';
         $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . ';?>';
     }
 
-    #line 433 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r35()
+    #line 476 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r41()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 438 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r36()
+    #line 481 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r42()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 2]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor, array('if condition' => $this->yystack[$this->yyidx + - 1]->minor));
     }
 
-    #line 443 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r37()
+    #line 486 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r43()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
         $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 454 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r39()
+    #line 497 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r45()
     {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 9]->minor), array('ifexp' => $this->yystack[$this->yyidx + - 6]->minor), array('var' => $this->yystack[$this->yyidx + - 2]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1);
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 6]->minor), array('ifexp' => $this->yystack[$this->yyidx + - 4]->minor), array('var' => $this->yystack[$this->yyidx + - 2]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1);
     }
 
-    #line 458 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r40()
+    #line 501 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r46()
     {
         $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 466 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r42()
+    #line 509 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r48()
     {
         $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 3]->minor), array('to' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
     }
 
-    #line 470 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r43()
+    #line 513 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r49()
     {
         $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 5]->minor), array('to' => $this->yystack[$this->yyidx + - 3]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
     }
 
-    #line 475 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r44()
+    #line 518 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r50()
     {
         $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 480 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r45()
+    #line 523 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r51()
     {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 4]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor))));
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 3]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor))));
     }
 
-    #line 484 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r46()
+    #line 527 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r52()
     {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 7]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor), array('key' => $this->yystack[$this->yyidx + - 4]->minor))));
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 5]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor), array('key' => $this->yystack[$this->yyidx + - 3]->minor))));
     }
 
-    #line 497 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r49()
+    #line 540 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r55()
     {
         $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx + - 1]->minor), $this->yystack[$this->yyidx + 0]->minor))));
     }
 
-    #line 501 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r50()
+    #line 544 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r56()
     {
         $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx + - 2]->minor), $this->yystack[$this->yyidx + - 1]->minor)), $this->yystack[$this->yyidx + 0]->minor)));
     }
 
-    #line 506 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r51()
+    #line 549 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r57()
     {
         $j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.');
         if ($this->yystack[$this->yyidx + 0]->minor[$j + 1] == 'c') {
@@ -1077,51 +1121,63 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 519 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r52()
+    #line 562 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r58()
+    {
+        $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' /');
+        if ($tag == 'strip') {
+            $this->strip = false;
+            $this->_retvalue = null;
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
+        }
+    }
+
+    #line 571 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r59()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array());
     }
 
-    #line 523 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r53()
+    #line 575 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r60()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor . 'close', array(), array('modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 528 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r54()
+    #line 580 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r61()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 532 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r55()
+    #line 584 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r62()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + - 1]->minor, 'modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 540 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r56()
+    #line 592 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r63()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
         $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 546 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r57()
+    #line 598 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r64()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 551 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r58()
+    #line 603 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r65()
     {
         $this->_retvalue = array();
     }
 
-    #line 556 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r59()
+    #line 608 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r66()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
             if (isset($this->smarty->security_policy)) {
@@ -1129,127 +1185,133 @@ class Smarty_Internal_Templateparser
             }
             $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
         } else {
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => "'" . $this->yystack[$this->yyidx + 0]->minor . "'");
+            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'');
         }
     }
 
-    #line 567 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r60()
+    #line 619 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r67()
     {
         $this->_retvalue = array(trim($this->yystack[$this->yyidx + - 1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 575 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r62()
+    #line 627 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r69()
     {
-        $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
+        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
     }
 
-    #line 587 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r65()
+    #line 639 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r72()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 600 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r67()
+    #line 652 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r74()
     {
         $this->yystack[$this->yyidx + - 2]->minor[] = $this->yystack[$this->yyidx + 0]->minor;
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor;
     }
 
-    #line 605 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r68()
+    #line 657 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r75()
+    {
+        $this->_retvalue = array('var' => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'', 'value' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 664 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r77()
     {
         $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 633 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r73()
+    #line 688 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r81()
     {
-        $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+        $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
     }
 
-    #line 638 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r74()
+    #line 693 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r82()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . trim($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 657 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r78()
+    #line 707 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r85()
     {
         $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value' => $this->yystack[$this->yyidx + - 1]->minor, 'modifierlist' => $this->yystack[$this->yyidx + 0]->minor));
     }
 
-    #line 663 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r79()
+    #line 713 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r86()
     {
         $this->_retvalue = (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ? $this->yystack[$this->yyidx + - 1]->minor['pre'] : '') . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor['op'] . $this->yystack[$this->yyidx + 0]->minor . (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ? ')' : '');
     }
 
-    #line 666 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r80()
+    #line 716 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r87()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
 
-    #line 670 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r81()
+    #line 720 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r88()
     {
         $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
 
-    #line 674 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r82()
+    #line 724 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r89()
     {
         $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',(array)' . $this->yystack[$this->yyidx + 0]->minor . ')';
     }
 
-    #line 678 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r83()
+    #line 728 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r90()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 686 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r84()
+    #line 736 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r91()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 6]->minor . ' ? ' . $this->compiler->compileVariable("'" . $this->yystack[$this->yyidx + - 2]->minor . "'") . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'') . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 690 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r85()
+    #line 740 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r92()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 705 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r88()
+    #line 755 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r95()
     {
         $this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 726 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r93()
+    #line 776 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r100()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 730 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r94()
+    #line 780 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r101()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.';
     }
 
-    #line 734 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r95()
+    #line 784 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r102()
     {
         $this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 739 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r96()
+    #line 789 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r103()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
             if (isset($this->smarty->security_policy)) {
@@ -1257,18 +1319,18 @@ class Smarty_Internal_Templateparser
             }
             $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
         } else {
-            $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
+            $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
         }
     }
 
-    #line 756 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r98()
+    #line 806 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r105()
     {
         $this->_retvalue = "(" . $this->yystack[$this->yyidx + - 1]->minor . ")";
     }
 
-    #line 771 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r101()
+    #line 821 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r108()
     {
         self::$prefix_number ++;
         if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') {
@@ -1279,17 +1341,17 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '$_tmp' . self::$prefix_number . '::' . $this->yystack[$this->yyidx + 0]->minor[0] . $this->yystack[$this->yyidx + 0]->minor[1];
     }
 
-    #line 783 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r102()
+    #line 832 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r109()
     {
         self::$prefix_number ++;
-        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + - 1]->minor);
+        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
         $this->compiler->prefix_code[] = $this->compiler->appendCode($tmp, '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>');
         $this->_retvalue = '$_tmp' . self::$prefix_number;
     }
 
-    #line 800 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r105()
+    #line 849 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r112()
     {
         if (!in_array(strtolower($this->yystack[$this->yyidx + - 2]->minor), array('self', 'parent')) && (!$this->security || $this->smarty->security_policy->isTrustedStaticClassAccess($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
             if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor])) {
@@ -1302,8 +1364,14 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 834 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r109()
+    #line 883 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r115()
+    {
+        $this->_retvalue = $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'');
+    }
+
+    #line 886 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r116()
     {
         if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
             $smarty_var = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
@@ -1316,123 +1384,160 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 847 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r110()
+    #line 899 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r117()
     {
         $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 857 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r112()
+    #line 909 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r119()
     {
         $this->_retvalue = '$_smarty_tpl->getConfigVariable( \'' . $this->yystack[$this->yyidx + - 1]->minor . '\')';
     }
 
-    #line 861 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r113()
+    #line 913 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r120()
     {
         $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable( \'' . $this->yystack[$this->yyidx + - 2]->minor . '\')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' :null)';
     }
 
-    #line 865 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r114()
+    #line 917 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r121()
     {
         $this->_retvalue = '$_smarty_tpl->getConfigVariable( ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
 
-    #line 869 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r115()
+    #line 921 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r122()
     {
         $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable( ' . $this->yystack[$this->yyidx + - 2]->minor . ')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
     }
 
-    #line 873 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r116()
+    #line 925 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r123()
+    {
+        $this->_retvalue = array('var' => '\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'', 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 928 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r124()
     {
         $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 1]->minor, 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 886 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r118()
+    #line 941 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r126()
     {
         return;
     }
 
-    #line 892 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r119()
+    #line 947 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r127()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'') . ']';
+    }
+
+    #line 950 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r128()
     {
         $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
     }
 
-    #line 896 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r120()
+    #line 954 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r129()
     {
         $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' . $this->yystack[$this->yyidx + 0]->minor . ']';
     }
 
-    #line 900 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r121()
+    #line 958 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r130()
     {
         if (defined($this->yystack[$this->yyidx + 0]->minor)) {
             if (isset($this->smarty->security_policy)) {
                 $this->smarty->security_policy->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
             }
-            $this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]";
+            $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
         } else {
             $this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']";
         }
     }
 
-    #line 911 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r122()
+    #line 969 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r131()
     {
-        $this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]";
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
     }
 
-    #line 916 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r123()
+    #line 974 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r132()
     {
-        $this->_retvalue = "[" . $this->yystack[$this->yyidx + - 1]->minor . "]";
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
     }
 
-    #line 921 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r124()
+    #line 979 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r133()
     {
         $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\'][\'index\']') . ']';
     }
 
-    #line 925 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r125()
+    #line 983 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r134()
     {
         $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 3]->minor . '\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\']') . ']';
     }
 
-    #line 935 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r127()
+    #line 986 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r135()
+    {
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
+    }
+
+    #line 992 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r137()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'') . ']';;
+    }
+
+    #line 1008 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r141()
     {
         $this->_retvalue = '[]';
     }
 
-    #line 949 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r129()
+    #line 1018 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r142()
+    {
+        $this->_retvalue = '\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'';
+    }
+
+    #line 1022 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r143()
+    {
+        $this->_retvalue = "''";
+    }
+
+    #line 1027 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r144()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 954 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r130()
+    #line 1035 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r146()
     {
-        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
+        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length), ' $');
+        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
     }
 
-    #line 959 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r131()
+    #line 1041 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r147()
     {
         $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
 
-    #line 966 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r132()
+    #line 1048 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r148()
     {
         if ($this->yystack[$this->yyidx + - 1]->minor['var'] == '\'smarty\'') {
             $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index']) . $this->yystack[$this->yyidx + 0]->minor;
@@ -1441,20 +1546,20 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 975 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r133()
+    #line 1057 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r149()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 980 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r134()
+    #line 1062 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r150()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 985 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r135()
+    #line 1067 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r151()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 1]->minor, 0, 1) == '_') {
             $this->compiler->trigger_template_error(self::Err1);
@@ -1462,8 +1567,8 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 992 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r136()
+    #line 1074 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r152()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
@@ -1471,8 +1576,8 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
 
-    #line 999 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r137()
+    #line 1081 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r153()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
@@ -1480,8 +1585,8 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
 
-    #line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r138()
+    #line 1088 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r154()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
@@ -1489,14 +1594,14 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
 
-    #line 1014 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r139()
+    #line 1096 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r155()
     {
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1022 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r140()
+    #line 1104 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r156()
     {
         if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)) {
             if (strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'array') === 0 || is_callable($this->yystack[$this->yyidx + - 3]->minor)) {
@@ -1532,8 +1637,8 @@ class Smarty_Internal_Templateparser
         }
     }
 
-    #line 1061 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r141()
+    #line 1143 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r157()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 3]->minor, 0, 1) == '_') {
             $this->compiler->trigger_template_error(self::Err1);
@@ -1541,174 +1646,168 @@ class Smarty_Internal_Templateparser
         $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
     }
 
-    #line 1068 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r142()
+    #line 1150 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r158()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
         self::$prefix_number ++;
-        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compiler->compileVariable("'" . $this->yystack[$this->yyidx + - 3]->minor . "'") . ';?>';
+        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'') . ';?>';
         $this->_retvalue = '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')';
     }
 
-    #line 1079 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r143()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 1096 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r146()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor)));
-    }
-
-    #line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r147()
-    {
-        $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
-    }
-
-    #line 1108 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r149()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 1116 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r150()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
-    }
-
-    #line 1135 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r154()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
-    }
-
-    #line 1140 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r155()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
-    }
-
-    #line 1145 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r156()
-    {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
-    }
-
-    #line 1150 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r157()
-    {
-        $this->_retvalue = array('$' . $this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
-    }
-
-    #line 1155 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r158()
-    {
-        $this->_retvalue = array('$' . $this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor, 'property');
-    }
-
     #line 1161 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r159()
+    {
+        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
+    }
+
+    #line 1178 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r162()
+    {
+        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor)));
+    }
+
+    #line 1182 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r163()
+    {
+        $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
+    }
+
+    #line 1190 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r165()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 1198 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r166()
+    {
+        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    #line 1217 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r170()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
+    }
+
+    #line 1222 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r171()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+    }
+
+    #line 1227 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r172()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
+    }
+
+    #line 1232 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r173()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+
+    #line 1237 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r174()
+    {
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+
+    #line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r175()
     {
         $this->_retvalue['op'] = ' ' . trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
     }
 
-    #line 1165 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r160()
+    #line 1247 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r176()
     {
         static $lops = array('eq' => array('op' => ' == ', 'pre' => null), 'ne' => array('op' => ' != ', 'pre' => null), 'neq' => array('op' => ' != ', 'pre' => null), 'gt' => array('op' => ' > ', 'pre' => null), 'ge' => array('op' => ' >= ', 'pre' => null), 'gte' => array('op' => ' >= ', 'pre' => null), 'lt' => array('op' => ' < ', 'pre' => null), 'le' => array('op' => ' <= ', 'pre' => null), 'lte' => array('op' => ' <= ', 'pre' => null), 'mod' => array('op' => ' % ', 'pre' => null), 'and' => array('op' => ' && ', 'pre' => null), 'or' => array('op' => ' || ', 'pre' => null), 'xor' => array('op' => ' xor ', 'pre' => null), 'isdivby' => array('op' => ' % ', 'pre' => '!('), 'isnotdivby' => array('op' => ' % ', 'pre' => '('), 'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '), 'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '), 'isoddby' => array('op' => ' / ', 'pre' => '(1 & '), 'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),);
         $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
         $this->_retvalue = $lops[$op];
     }
 
-    #line 1191 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r161()
+    #line 1273 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r177()
     {
         static $scond = array('iseven' => '!(1 & ', 'isnoteven' => '(1 & ', 'isodd' => '(1 & ', 'isnotodd' => '!(1 & ',);
         $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
         $this->_retvalue = $scond[$op];
     }
 
-    #line 1205 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r162()
+    #line 1287 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r178()
     {
         $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
 
-    #line 1213 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r164()
+    #line 1295 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r180()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1221 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r166()
+    #line 1303 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r182()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1225 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r167()
+    #line 1307 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r183()
     {
         $this->_retvalue = '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 1237 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r169()
-    {
-        $this->_retvalue = "''";
-    }
-
-    #line 1241 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r170()
+    #line 1323 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r186()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php();
     }
 
-    #line 1246 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r171()
+    #line 1328 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r187()
     {
         $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
 
-    #line 1251 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r172()
+    #line 1333 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r188()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 1255 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r173()
+    #line 1337 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r189()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)' . $this->yystack[$this->yyidx + - 1]->minor);
     }
 
-    #line 1263 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r175()
+    #line 1345 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r191()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\']->value');
     }
 
-    #line 1271 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r177()
+    #line 1353 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r193()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_Code($this, '(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')');
     }
 
-    #line 1275 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r178()
+    #line 1357 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r194()
     {
-        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + - 1]->minor);
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 1279 "../smarty/lexer/smarty_internal_templateparser.y"
-    function yy_r179()
+    #line 1361 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r195()
     {
         $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this, $this->yystack[$this->yyidx + 0]->minor);
     }