From c86ac3e832b6c1d376b770cafd46d1393edc6f43 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Fri, 5 Dec 2014 15:32:07 +0300
Subject: [PATCH] Use standalone yapp parse driver

---
 VMXTemplate/Parser.pm | 3428 +++++++++++++++++++++++------------------
 template.skel.pm      |    5 +-
 template.yp           |    2 +-
 3 files changed, 1956 insertions(+), 1479 deletions(-)

diff --git a/VMXTemplate/Parser.pm b/VMXTemplate/Parser.pm
index a236032..f6ff0f7 100644
--- a/VMXTemplate/Parser.pm
+++ b/VMXTemplate/Parser.pm
@@ -10,9 +10,485 @@
 package VMXTemplate::Parser;
 
 use strict;
-use base qw(Parse::Yapp::Driver VMXTemplate::Compiler);
+use VMXTemplate::Compiler;
 use VMXTemplate::Utils;
-use Parse::Yapp::Driver;
+#Included Parse/Yapp/Driver.pm file----------------------------------------
+{
+#
+# Module Parse::Yapp::Driver
+#
+# This module is part of the Parse::Yapp package available on your
+# nearest CPAN
+#
+# Any use of this module in a standalone parser make the included
+# text under the same copyright as the Parse::Yapp module itself.
+#
+# This notice should remain unchanged.
+#
+# (c) Copyright 1998-2001 Francois Desarmenien, all rights reserved.
+# (see the pod text in Parse::Yapp module for use and distribution rights)
+#
+
+package Parse::Yapp::Driver;
+
+require 5.004;
+
+use strict;
+
+use vars qw ( $VERSION $COMPATIBLE $FILENAME );
+
+$VERSION = '1.05';
+$COMPATIBLE = '0.07';
+$FILENAME=__FILE__;
+
+use Carp;
+
+#Known parameters, all starting with YY (leading YY will be discarded)
+my(%params)=(YYLEX => 'CODE', 'YYERROR' => 'CODE', YYVERSION => '',
+			 YYRULES => 'ARRAY', YYSTATES => 'ARRAY', YYDEBUG => '');
+#Mandatory parameters
+my(@params)=('LEX','RULES','STATES');
+
+sub new {
+    my($class)=shift;
+	my($errst,$nberr,$token,$value,$check,$dotpos);
+    my($self)={ ERROR => \&_Error,
+				ERRST => \$errst,
+                NBERR => \$nberr,
+				TOKEN => \$token,
+				VALUE => \$value,
+				DOTPOS => \$dotpos,
+				STACK => [],
+				DEBUG => 0,
+				CHECK => \$check };
+
+	_CheckParams( [], \%params, \@_, $self );
+
+		exists($$self{VERSION})
+	and	$$self{VERSION} < $COMPATIBLE
+	and	croak "Yapp driver version $VERSION ".
+			  "incompatible with version $$self{VERSION}:\n".
+			  "Please recompile parser module.";
+
+        ref($class)
+    and $class=ref($class);
+
+    bless($self,$class);
+}
+
+sub YYParse {
+    my($self)=shift;
+    my($retval);
+
+	_CheckParams( \@params, \%params, \@_, $self );
+
+	if($$self{DEBUG}) {
+		_DBLoad();
+		$retval = eval '$self->_DBParse()';#Do not create stab entry on compile
+        $@ and die $@;
+	}
+	else {
+		$retval = $self->_Parse();
+	}
+    $retval
+}
+
+sub YYData {
+	my($self)=shift;
+
+		exists($$self{USER})
+	or	$$self{USER}={};
+
+	$$self{USER};
+	
+}
+
+sub YYErrok {
+	my($self)=shift;
+
+	${$$self{ERRST}}=0;
+    undef;
+}
+
+sub YYNberr {
+	my($self)=shift;
+
+	${$$self{NBERR}};
+}
+
+sub YYRecovering {
+	my($self)=shift;
+
+	${$$self{ERRST}} != 0;
+}
+
+sub YYAbort {
+	my($self)=shift;
+
+	${$$self{CHECK}}='ABORT';
+    undef;
+}
+
+sub YYAccept {
+	my($self)=shift;
+
+	${$$self{CHECK}}='ACCEPT';
+    undef;
+}
+
+sub YYError {
+	my($self)=shift;
+
+	${$$self{CHECK}}='ERROR';
+    undef;
+}
+
+sub YYSemval {
+	my($self)=shift;
+	my($index)= $_[0] - ${$$self{DOTPOS}} - 1;
+
+		$index < 0
+	and	-$index <= @{$$self{STACK}}
+	and	return $$self{STACK}[$index][1];
+
+	undef;	#Invalid index
+}
+
+sub YYCurtok {
+	my($self)=shift;
+
+        @_
+    and ${$$self{TOKEN}}=$_[0];
+    ${$$self{TOKEN}};
+}
+
+sub YYCurval {
+	my($self)=shift;
+
+        @_
+    and ${$$self{VALUE}}=$_[0];
+    ${$$self{VALUE}};
+}
+
+sub YYExpect {
+    my($self)=shift;
+
+    keys %{$self->{STATES}[$self->{STACK}[-1][0]]{ACTIONS}}
+}
+
+sub YYLexer {
+    my($self)=shift;
+
+	$$self{LEX};
+}
+
+
+#################
+# Private stuff #
+#################
+
+
+sub _CheckParams {
+	my($mandatory,$checklist,$inarray,$outhash)=@_;
+	my($prm,$value);
+	my($prmlst)={};
+
+	while(($prm,$value)=splice(@$inarray,0,2)) {
+        $prm=uc($prm);
+			exists($$checklist{$prm})
+		or	croak("Unknow parameter '$prm'");
+			ref($value) eq $$checklist{$prm}
+		or	croak("Invalid value for parameter '$prm'");
+        $prm=unpack('@2A*',$prm);
+		$$outhash{$prm}=$value;
+	}
+	for (@$mandatory) {
+			exists($$outhash{$_})
+		or	croak("Missing mandatory parameter '".lc($_)."'");
+	}
+}
+
+sub _Error {
+	print "Parse error.\n";
+}
+
+sub _DBLoad {
+	{
+		no strict 'refs';
+
+			exists(${__PACKAGE__.'::'}{_DBParse})#Already loaded ?
+		and	return;
+	}
+	my($fname)=__FILE__;
+	my(@drv);
+	open(DRV,"<$fname") or die "Report this as a BUG: Cannot open $fname";
+	while(<DRV>) {
+                	/^\s*sub\s+_Parse\s*{\s*$/ .. /^\s*}\s*#\s*_Parse\s*$/
+        	and     do {
+                	s/^#DBG>//;
+                	push(@drv,$_);
+        	}
+	}
+	close(DRV);
+
+	$drv[0]=~s/_P/_DBP/;
+	eval join('',@drv);
+}
+
+#Note that for loading debugging version of the driver,
+#this file will be parsed from 'sub _Parse' up to '}#_Parse' inclusive.
+#So, DO NOT remove comment at end of sub !!!
+sub _Parse {
+    my($self)=shift;
+
+	my($rules,$states,$lex,$error)
+     = @$self{ 'RULES', 'STATES', 'LEX', 'ERROR' };
+	my($errstatus,$nberror,$token,$value,$stack,$check,$dotpos)
+     = @$self{ 'ERRST', 'NBERR', 'TOKEN', 'VALUE', 'STACK', 'CHECK', 'DOTPOS' };
+
+#DBG>	my($debug)=$$self{DEBUG};
+#DBG>	my($dbgerror)=0;
+
+#DBG>	my($ShowCurToken) = sub {
+#DBG>		my($tok)='>';
+#DBG>		for (split('',$$token)) {
+#DBG>			$tok.=		(ord($_) < 32 or ord($_) > 126)
+#DBG>					?	sprintf('<%02X>',ord($_))
+#DBG>					:	$_;
+#DBG>		}
+#DBG>		$tok.='<';
+#DBG>	};
+
+	$$errstatus=0;
+	$$nberror=0;
+	($$token,$$value)=(undef,undef);
+	@$stack=( [ 0, undef ] );
+	$$check='';
+
+    while(1) {
+        my($actions,$act,$stateno);
+
+        $stateno=$$stack[-1][0];
+        $actions=$$states[$stateno];
+
+#DBG>	print STDERR ('-' x 40),"\n";
+#DBG>		$debug & 0x2
+#DBG>	and	print STDERR "In state $stateno:\n";
+#DBG>		$debug & 0x08
+#DBG>	and	print STDERR "Stack:[".
+#DBG>					 join(',',map { $$_[0] } @$stack).
+#DBG>					 "]\n";
+
+
+        if  (exists($$actions{ACTIONS})) {
+
+				defined($$token)
+            or	do {
+				($$token,$$value)=&$lex($self);
+#DBG>				$debug & 0x01
+#DBG>			and	print STDERR "Need token. Got ".&$ShowCurToken."\n";
+			};
+
+            $act=   exists($$actions{ACTIONS}{$$token})
+                    ?   $$actions{ACTIONS}{$$token}
+                    :   exists($$actions{DEFAULT})
+                        ?   $$actions{DEFAULT}
+                        :   undef;
+        }
+        else {
+            $act=$$actions{DEFAULT};
+#DBG>			$debug & 0x01
+#DBG>		and	print STDERR "Don't need token.\n";
+        }
+
+            defined($act)
+        and do {
+
+                $act > 0
+            and do {        #shift
+
+#DBG>				$debug & 0x04
+#DBG>			and	print STDERR "Shift and go to state $act.\n";
+
+					$$errstatus
+				and	do {
+					--$$errstatus;
+
+#DBG>					$debug & 0x10
+#DBG>				and	$dbgerror
+#DBG>				and	$$errstatus == 0
+#DBG>				and	do {
+#DBG>					print STDERR "**End of Error recovery.\n";
+#DBG>					$dbgerror=0;
+#DBG>				};
+				};
+
+
+                push(@$stack,[ $act, $$value ]);
+
+					$$token ne ''	#Don't eat the eof
+				and	$$token=$$value=undef;
+                next;
+            };
+
+            #reduce
+            my($lhs,$len,$code,@sempar,$semval);
+            ($lhs,$len,$code)=@{$$rules[-$act]};
+
+#DBG>			$debug & 0x04
+#DBG>		and	$act
+#DBG>		and	print STDERR "Reduce using rule ".-$act." ($lhs,$len): ";
+
+                $act
+            or  $self->YYAccept();
+
+            $$dotpos=$len;
+
+                unpack('A1',$lhs) eq '@'    #In line rule
+            and do {
+                    $lhs =~ /^\@[0-9]+\-([0-9]+)$/
+                or  die "In line rule name '$lhs' ill formed: ".
+                        "report it as a BUG.\n";
+                $$dotpos = $1;
+            };
+
+            @sempar =       $$dotpos
+                        ?   map { $$_[1] } @$stack[ -$$dotpos .. -1 ]
+                        :   ();
+
+            $semval = $code ? &$code( $self, @sempar )
+                            : @sempar ? $sempar[0] : undef;
+
+            splice(@$stack,-$len,$len);
+
+                $$check eq 'ACCEPT'
+            and do {
+
+#DBG>			$debug & 0x04
+#DBG>		and	print STDERR "Accept.\n";
+
+				return($semval);
+			};
+
+                $$check eq 'ABORT'
+            and	do {
+
+#DBG>			$debug & 0x04
+#DBG>		and	print STDERR "Abort.\n";
+
+				return(undef);
+
+			};
+
+#DBG>			$debug & 0x04
+#DBG>		and	print STDERR "Back to state $$stack[-1][0], then ";
+
+                $$check eq 'ERROR'
+            or  do {
+#DBG>				$debug & 0x04
+#DBG>			and	print STDERR 
+#DBG>				    "go to state $$states[$$stack[-1][0]]{GOTOS}{$lhs}.\n";
+
+#DBG>				$debug & 0x10
+#DBG>			and	$dbgerror
+#DBG>			and	$$errstatus == 0
+#DBG>			and	do {
+#DBG>				print STDERR "**End of Error recovery.\n";
+#DBG>				$dbgerror=0;
+#DBG>			};
+
+			    push(@$stack,
+                     [ $$states[$$stack[-1][0]]{GOTOS}{$lhs}, $semval ]);
+                $$check='';
+                next;
+            };
+
+#DBG>			$debug & 0x04
+#DBG>		and	print STDERR "Forced Error recovery.\n";
+
+            $$check='';
+
+        };
+
+        #Error
+            $$errstatus
+        or   do {
+
+            $$errstatus = 1;
+            &$error($self);
+                $$errstatus # if 0, then YYErrok has been called
+            or  next;       # so continue parsing
+
+#DBG>			$debug & 0x10
+#DBG>		and	do {
+#DBG>			print STDERR "**Entering Error recovery.\n";
+#DBG>			++$dbgerror;
+#DBG>		};
+
+            ++$$nberror;
+
+        };
+
+			$$errstatus == 3	#The next token is not valid: discard it
+		and	do {
+				$$token eq ''	# End of input: no hope
+			and	do {
+#DBG>				$debug & 0x10
+#DBG>			and	print STDERR "**At eof: aborting.\n";
+				return(undef);
+			};
+
+#DBG>			$debug & 0x10
+#DBG>		and	print STDERR "**Dicard invalid token ".&$ShowCurToken.".\n";
+
+			$$token=$$value=undef;
+		};
+
+        $$errstatus=3;
+
+		while(	  @$stack
+			  and (		not exists($$states[$$stack[-1][0]]{ACTIONS})
+			        or  not exists($$states[$$stack[-1][0]]{ACTIONS}{error})
+					or	$$states[$$stack[-1][0]]{ACTIONS}{error} <= 0)) {
+
+#DBG>			$debug & 0x10
+#DBG>		and	print STDERR "**Pop state $$stack[-1][0].\n";
+
+			pop(@$stack);
+		}
+
+			@$stack
+		or	do {
+
+#DBG>			$debug & 0x10
+#DBG>		and	print STDERR "**No state left on stack: aborting.\n";
+
+			return(undef);
+		};
+
+		#shift the error token
+
+#DBG>			$debug & 0x10
+#DBG>		and	print STDERR "**Shift \$error token and go to state ".
+#DBG>						 $$states[$$stack[-1][0]]{ACTIONS}{error}.
+#DBG>						 ".\n";
+
+		push(@$stack, [ $$states[$$stack[-1][0]]{ACTIONS}{error}, undef ]);
+
+    }
+
+    #never reached
+	croak("Error in driver logic. Please, report it as a BUG");
+
+}#_Parse
+#DO NOT remove comment
+
+1;
+
+}
+#End of include--------------------------------------------------
+
+our @ISA = qw(Parse::Yapp::Driver VMXTemplate::Compiler);
 
 
 sub new
@@ -27,1287 +503,1277 @@ sub new
 	{#State 0
 		DEFAULT => -2,
 		GOTOS => {
-			'chunks' => 1,
-			'template' => 2
+			'chunks' => 2,
+			'template' => 1
 		}
 	},
 	{#State 1
 		ACTIONS => {
-			'' => -1,
-			'literal' => 3,
-			'error' => 5,
-			"{{" => 4,
-			"<!--" => 7
-		},
-		GOTOS => {
-			'chunk' => 6
+			'' => 3
 		}
 	},
 	{#State 2
 		ACTIONS => {
-			'' => 8
+			'error' => 7,
+			"{{" => 4,
+			'' => -1,
+			'literal' => 6,
+			"<!--" => 5
+		},
+		GOTOS => {
+			'chunk' => 8
 		}
 	},
 	{#State 3
-		DEFAULT => -5
+		DEFAULT => 0
 	},
 	{#State 4
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"!" => 18,
+			"-" => 14,
 			"(" => 17,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			'literal' => 10,
+			"{" => 12,
+			"!" => 11,
+			'name' => 19,
+			"NOT" => 18
 		},
 		GOTOS => {
-			'varref' => 14,
-			'exp' => 10,
-			'p11' => 16,
-			'p10' => 19,
-			'nonbrace' => 11
+			'varref' => 16,
+			'p10' => 15,
+			'exp' => 20,
+			'p11' => 13,
+			'nonbrace' => 9
 		}
 	},
 	{#State 5
-		DEFAULT => -3
+		ACTIONS => {
+			"-" => 14,
+			"(" => 17,
+			"BLOCK" => 25,
+			'literal' => 10,
+			"FUNCTION" => 21,
+			"{" => 12,
+			"!" => 11,
+			"FOR" => 22,
+			"IF" => 35,
+			"MACRO" => 23,
+			"FOREACH" => 31,
+			"SET" => 29,
+			'name' => 19,
+			"NOT" => 18
+		},
+		GOTOS => {
+			'code_chunk' => 34,
+			'for' => 33,
+			'exp' => 24,
+			'c_if' => 36,
+			'c_for' => 28,
+			'fn' => 30,
+			'fn_def' => 32,
+			'c_set' => 26,
+			'c_fn' => 27,
+			'varref' => 16,
+			'p10' => 15,
+			'nonbrace' => 9,
+			'p11' => 13
+		}
 	},
 	{#State 6
-		DEFAULT => -4
+		DEFAULT => -5
 	},
 	{#State 7
-		ACTIONS => {
-			"SET" => 30,
-			"-" => 9,
-			"MACRO" => 21,
-			"{" => 13,
-			'name' => 12,
-			"BLOCK" => 22,
-			"IF" => 32,
-			'literal' => 15,
-			"(" => 17,
-			"!" => 18,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FOREACH" => 27,
-			"FUNCTION" => 36
-		},
-		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'c_fn' => 35,
-			'fn' => 28
-		}
+		DEFAULT => -3
 	},
 	{#State 8
-		DEFAULT => 0
+		DEFAULT => -4
 	},
 	{#State 9
-		ACTIONS => {
-			'literal' => 15,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'varref' => 14,
-			'p11' => 37,
-			'nonbrace' => 11
-		}
+		DEFAULT => -54
 	},
 	{#State 10
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"}}" => 46,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
-		}
+		DEFAULT => -59
 	},
 	{#State 11
-		DEFAULT => -54
+		ACTIONS => {
+			"!" => 11,
+			"{" => 12,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10,
+			"(" => 17
+		},
+		GOTOS => {
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 37
+		}
 	},
 	{#State 12
 		ACTIONS => {
-			'literal' => 15,
-			'name' => 12,
-			"(" => 58,
-			"{" => 13
-		},
-		DEFAULT => -78,
-		GOTOS => {
-			'varref' => 14,
-			'nonbrace' => 57
-		}
-	},
-	{#State 13
-		ACTIONS => {
-			"-" => 9,
-			"{" => 13,
-			'name' => 12,
-			'literal' => 15,
-			"!" => 18,
+			"NOT" => 18,
+			'name' => 19,
 			"(" => 17,
-			"NOT" => 20
+			"-" => 14,
+			"!" => 11,
+			"{" => 12,
+			'literal' => 10
 		},
 		DEFAULT => -72,
 		GOTOS => {
-			'exp' => 60,
-			'nonbrace' => 11,
-			'gtpair' => 61,
-			'varref' => 14,
-			'hash' => 62,
-			'p11' => 16,
-			'pair' => 59,
-			'p10' => 19
+			'varref' => 16,
+			'pair' => 40,
+			'p10' => 15,
+			'gtpair' => 39,
+			'nonbrace' => 9,
+			'hash' => 41,
+			'p11' => 13,
+			'exp' => 38
 		}
 	},
+	{#State 13
+		DEFAULT => -52
+	},
 	{#State 14
 		ACTIONS => {
-			"[" => 63,
-			"." => 64
+			"(" => 17,
+			'literal' => 10,
+			"!" => 11,
+			"{" => 12,
+			'name' => 19,
+			"NOT" => 18
 		},
-		DEFAULT => -60,
 		GOTOS => {
-			'varpart' => 65
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 42
 		}
 	},
 	{#State 15
-		DEFAULT => -59
+		DEFAULT => -51
 	},
 	{#State 16
-		DEFAULT => -52
+		ACTIONS => {
+			"[" => 44,
+			"." => 45
+		},
+		DEFAULT => -60,
+		GOTOS => {
+			'varpart' => 43
+		}
 	},
 	{#State 17
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14,
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12,
+			'literal' => 10
 		},
 		GOTOS => {
-			'exp' => 66,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'p10' => 15,
+			'exp' => 46,
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 18
 		ACTIONS => {
-			'literal' => 15,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12,
+			'literal' => 10
 		},
 		GOTOS => {
-			'varref' => 14,
-			'p11' => 67,
-			'nonbrace' => 11
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 47
 		}
 	},
 	{#State 19
-		DEFAULT => -51
+		ACTIONS => {
+			'literal' => 10,
+			'name' => 19,
+			"{" => 12,
+			"(" => 48
+		},
+		DEFAULT => -78,
+		GOTOS => {
+			'nonbrace' => 49,
+			'varref' => 16
+		}
 	},
 	{#State 20
 		ACTIONS => {
-			'literal' => 15,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'varref' => 14,
-			'p11' => 68,
-			'nonbrace' => 11
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54,
+			">" => 55,
+			"/" => 56,
+			"+" => 57,
+			"OR" => 58,
+			"!=" => 50,
+			"&" => 51,
+			"&&" => 67,
+			"==" => 66,
+			"-" => 65,
+			">=" => 68,
+			".." => 59,
+			"*" => 60,
+			"}}" => 61,
+			"||" => 63,
+			"%" => 62,
+			"AND" => 64
 		}
 	},
 	{#State 21
-		DEFAULT => -27
+		DEFAULT => -25
 	},
 	{#State 22
-		DEFAULT => -26
+		DEFAULT => -28
 	},
 	{#State 23
-		ACTIONS => {
-			"-->" => 69
-		}
+		DEFAULT => -27
 	},
 	{#State 24
-		DEFAULT => -9
-	},
-	{#State 25
-		DEFAULT => -8
-	},
-	{#State 26
 		ACTIONS => {
-			"-->" => 70,
-			"=" => 71
-		}
-	},
-	{#State 27
-		DEFAULT => -29
-	},
-	{#State 28
-		ACTIONS => {
-			'name' => 72
-		}
-	},
-	{#State 29
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54,
+			"/" => 56,
+			">" => 55,
+			"+" => 57,
+			"OR" => 58,
+			"!=" => 50,
+			"&" => 51,
+			"==" => 66,
+			"&&" => 67,
+			"-" => 65,
+			">=" => 68,
+			".." => 59,
+			"*" => 60,
+			"||" => 63,
+			"%" => 62,
+			"AND" => 64
 		},
 		DEFAULT => -12
 	},
-	{#State 30
+	{#State 25
+		DEFAULT => -26
+	},
+	{#State 26
+		DEFAULT => -9
+	},
+	{#State 27
+		DEFAULT => -10
+	},
+	{#State 28
+		DEFAULT => -11
+	},
+	{#State 29
 		ACTIONS => {
-			'name' => 74
+			'name' => 70
 		},
 		GOTOS => {
-			'varref' => 73
+			'varref' => 69
+		}
+	},
+	{#State 30
+		ACTIONS => {
+			'name' => 71
 		}
 	},
 	{#State 31
-		ACTIONS => {
-			'name' => 74
-		},
-		GOTOS => {
-			'varref' => 75
-		}
+		DEFAULT => -29
 	},
 	{#State 32
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 76,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			"=" => 73,
+			"-->" => 72
 		}
 	},
 	{#State 33
-		DEFAULT => -28
+		ACTIONS => {
+			'name' => 70
+		},
+		GOTOS => {
+			'varref' => 74
+		}
 	},
 	{#State 34
-		DEFAULT => -11
+		ACTIONS => {
+			"-->" => 75
+		}
 	},
 	{#State 35
-		DEFAULT => -10
+		ACTIONS => {
+			"{" => 12,
+			"!" => 11,
+			'name' => 19,
+			"NOT" => 18,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'p11' => 13,
+			'nonbrace' => 9,
+			'p10' => 15,
+			'exp' => 76,
+			'varref' => 16
+		}
 	},
 	{#State 36
-		DEFAULT => -25
+		DEFAULT => -8
 	},
 	{#State 37
-		DEFAULT => -53
+		DEFAULT => -56
 	},
 	{#State 38
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 77,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			"||" => 63,
+			"%" => 62,
+			"AND" => 64,
+			".." => 59,
+			"*" => 60,
+			">=" => 68,
+			"-" => 65,
+			"&&" => 67,
+			"==" => 66,
+			"," => 77,
+			"!=" => 50,
+			"&" => 51,
+			">" => 55,
+			"=>" => 78,
+			"/" => 56,
+			"+" => 57,
+			"OR" => 58,
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54
 		}
 	},
 	{#State 39
-		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 78,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -76
 	},
 	{#State 40
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"," => 79
 		},
-		GOTOS => {
-			'exp' => 79,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -70
 	},
 	{#State 41
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 80,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			"}" => 80
 		}
 	},
 	{#State 42
-		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 81,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -53
 	},
 	{#State 43
-		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 82,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -79
 	},
 	{#State 44
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14,
+			"!" => 11,
+			"{" => 12,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10
 		},
 		GOTOS => {
-			'exp' => 83,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'varref' => 16,
+			'exp' => 81,
+			'p10' => 15,
+			'p11' => 13,
+			'nonbrace' => 9
 		}
 	},
 	{#State 45
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 84,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'name' => 82
 		}
 	},
 	{#State 46
-		DEFAULT => -7
+		ACTIONS => {
+			"&" => 51,
+			"!=" => 50,
+			"<=" => 54,
+			"<" => 53,
+			"XOR" => 52,
+			")" => 83,
+			"OR" => 58,
+			"+" => 57,
+			"/" => 56,
+			">" => 55,
+			"*" => 60,
+			".." => 59,
+			"AND" => 64,
+			"||" => 63,
+			"%" => 62,
+			"==" => 66,
+			"-" => 65,
+			"&&" => 67,
+			">=" => 68
+		}
 	},
 	{#State 47
-		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 85,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -57
 	},
 	{#State 48
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
+			"{" => 12,
+			"!" => 11,
+			'literal' => 10,
+			")" => 87,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14,
+			"NOT" => 18,
+			'name' => 19
 		},
 		GOTOS => {
-			'exp' => 86,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'varref' => 16,
+			'p10' => 15,
+			'gthash' => 88,
+			'gtpair' => 86,
+			'p11' => 13,
+			'nonbrace' => 9,
+			'list' => 85,
+			'exp' => 84
 		}
 	},
 	{#State 49
-		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 87,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -64
 	},
 	{#State 50
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
+			"-" => 14,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			'literal' => 10,
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12
 		},
 		GOTOS => {
-			'exp' => 88,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'varref' => 16,
+			'p10' => 15,
+			'exp' => 89,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 51
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
+			"-" => 14,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			'literal' => 10,
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12
 		},
 		GOTOS => {
-			'exp' => 89,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'p10' => 15,
+			'exp' => 90,
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 52
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
+			"-" => 14,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			'literal' => 10,
+			"!" => 11,
+			"{" => 12,
+			"NOT" => 18,
+			'name' => 19
 		},
 		GOTOS => {
-			'exp' => 90,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'exp' => 91,
+			'p10' => 15,
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 53
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
+			"{" => 12,
+			"!" => 11,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14
 		},
 		GOTOS => {
-			'exp' => 91,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'varref' => 16,
+			'p10' => 15,
+			'exp' => 92,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 54
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
+			"-" => 14,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			'literal' => 10,
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12
 		},
 		GOTOS => {
-			'exp' => 92,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'nonbrace' => 9,
+			'p11' => 13,
+			'p10' => 15,
+			'exp' => 93,
+			'varref' => 16
 		}
 	},
 	{#State 55
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14,
+			"{" => 12,
+			"!" => 11,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10
 		},
 		GOTOS => {
-			'exp' => 93,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'p11' => 13,
+			'nonbrace' => 9,
+			'varref' => 16,
+			'exp' => 94,
+			'p10' => 15
 		}
 	},
 	{#State 56
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14,
+			"{" => 12,
+			"!" => 11,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10
 		},
 		GOTOS => {
-			'exp' => 94,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'p11' => 13,
+			'nonbrace' => 9,
+			'varref' => 16,
+			'p10' => 15,
+			'exp' => 95
 		}
 	},
 	{#State 57
-		DEFAULT => -64
+		ACTIONS => {
+			"(" => 17,
+			"-" => 14,
+			"!" => 11,
+			"{" => 12,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10
+		},
+		GOTOS => {
+			'varref' => 16,
+			'exp' => 96,
+			'p10' => 15,
+			'p11' => 13,
+			'nonbrace' => 9
+		}
 	},
 	{#State 58
 		ACTIONS => {
-			"-" => 9,
-			"{" => 13,
-			'name' => 12,
-			'literal' => 15,
-			"!" => 18,
+			"!" => 11,
+			"{" => 12,
+			'name' => 19,
+			"NOT" => 18,
+			'literal' => 10,
 			"(" => 17,
-			"NOT" => 20,
-			")" => 95
+			"-" => 14
 		},
 		GOTOS => {
+			'p10' => 15,
 			'exp' => 97,
-			'nonbrace' => 11,
-			'gtpair' => 98,
-			'varref' => 14,
-			'p11' => 16,
-			'p10' => 19,
-			'gthash' => 99,
-			'list' => 96
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 59
 		ACTIONS => {
-			"," => 100
+			"-" => 14,
+			"(" => 17,
+			'literal' => 10,
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12
 		},
-		DEFAULT => -70
+		GOTOS => {
+			'varref' => 16,
+			'exp' => 98,
+			'p10' => 15,
+			'p11' => 13,
+			'nonbrace' => 9
+		}
 	},
 	{#State 60
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"," => 101,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"=>" => 102,
-			"<=" => 55,
-			">" => 56
+			'name' => 19,
+			"NOT" => 18,
+			"{" => 12,
+			"!" => 11,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'nonbrace' => 9,
+			'p11' => 13,
+			'varref' => 16,
+			'exp' => 99,
+			'p10' => 15
 		}
 	},
 	{#State 61
-		DEFAULT => -76
+		DEFAULT => -7
 	},
 	{#State 62
 		ACTIONS => {
-			"}" => 103
+			"(" => 17,
+			"-" => 14,
+			'name' => 19,
+			"NOT" => 18,
+			"!" => 11,
+			"{" => 12,
+			'literal' => 10
+		},
+		GOTOS => {
+			'p11' => 13,
+			'nonbrace' => 9,
+			'exp' => 100,
+			'p10' => 15,
+			'varref' => 16
 		}
 	},
 	{#State 63
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14,
+			"!" => 11,
+			"{" => 12,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10
 		},
 		GOTOS => {
-			'exp' => 104,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'nonbrace' => 9,
+			'p11' => 13,
+			'varref' => 16,
+			'p10' => 15,
+			'exp' => 101
 		}
 	},
 	{#State 64
 		ACTIONS => {
-			'name' => 105
+			'name' => 19,
+			"NOT" => 18,
+			"!" => 11,
+			"{" => 12,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'nonbrace' => 9,
+			'p11' => 13,
+			'varref' => 16,
+			'exp' => 102,
+			'p10' => 15
 		}
 	},
 	{#State 65
-		DEFAULT => -79
+		ACTIONS => {
+			"(" => 17,
+			"-" => 14,
+			'name' => 19,
+			"NOT" => 18,
+			"!" => 11,
+			"{" => 12,
+			'literal' => 10
+		},
+		GOTOS => {
+			'p11' => 13,
+			'nonbrace' => 9,
+			'p10' => 15,
+			'exp' => 103,
+			'varref' => 16
+		}
 	},
 	{#State 66
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			")" => 106,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			'literal' => 10,
+			"!" => 11,
+			"{" => 12,
+			'name' => 19,
+			"NOT" => 18,
+			"-" => 14,
+			"(" => 17
+		},
+		GOTOS => {
+			'varref' => 16,
+			'exp' => 104,
+			'p10' => 15,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 67
-		DEFAULT => -56
-	},
-	{#State 68
-		DEFAULT => -57
-	},
-	{#State 69
-		DEFAULT => -6
-	},
-	{#State 70
-		DEFAULT => -2,
-		GOTOS => {
-			'chunks' => 107
-		}
-	},
-	{#State 71
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
+			"!" => 11,
+			"{" => 12,
+			'name' => 19,
+			"NOT" => 18,
+			'literal' => 10,
 			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"-" => 14
 		},
 		GOTOS => {
-			'exp' => 108,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'exp' => 105,
+			'p10' => 15,
+			'varref' => 16,
+			'p11' => 13,
+			'nonbrace' => 9
 		}
 	},
-	{#State 72
+	{#State 68
+		ACTIONS => {
+			"NOT" => 18,
+			'name' => 19,
+			"{" => 12,
+			"!" => 11,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'p11' => 13,
+			'nonbrace' => 9,
+			'exp' => 106,
+			'p10' => 15,
+			'varref' => 16
+		}
+	},
+	{#State 69
+		ACTIONS => {
+			"[" => 44,
+			"-->" => 108,
+			"=" => 107,
+			"." => 45
+		},
+		GOTOS => {
+			'varpart' => 43
+		}
+	},
+	{#State 70
+		DEFAULT => -78
+	},
+	{#State 71
 		ACTIONS => {
 			"(" => 109
 		}
 	},
+	{#State 72
+		DEFAULT => -2,
+		GOTOS => {
+			'chunks' => 110
+		}
+	},
 	{#State 73
 		ACTIONS => {
-			"-->" => 110,
-			"[" => 63,
-			"." => 64,
-			"=" => 111
+			"-" => 14,
+			"(" => 17,
+			'literal' => 10,
+			"!" => 11,
+			"{" => 12,
+			"NOT" => 18,
+			'name' => 19
 		},
 		GOTOS => {
-			'varpart' => 65
+			'p11' => 13,
+			'nonbrace' => 9,
+			'varref' => 16,
+			'p10' => 15,
+			'exp' => 111
 		}
 	},
 	{#State 74
-		DEFAULT => -78
-	},
-	{#State 75
 		ACTIONS => {
-			"[" => 63,
-			"." => 64,
+			"[" => 44,
+			"." => 45,
 			"=" => 112
 		},
 		GOTOS => {
-			'varpart' => 65
+			'varpart' => 43
 		}
 	},
+	{#State 75
+		DEFAULT => -6
+	},
 	{#State 76
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
 			"-->" => 113,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			"!=" => 50,
+			"&" => 51,
+			">" => 55,
+			"/" => 56,
+			"+" => 57,
+			"OR" => 58,
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			".." => 59,
+			"*" => 60,
+			">=" => 68,
+			"&&" => 67,
+			"-" => 65,
+			"==" => 66
 		}
 	},
 	{#State 77
 		ACTIONS => {
-			"%" => 43,
-			"*" => 47,
-			"&" => 52,
-			"/" => 53
+			"-" => 14,
+			"(" => 17,
+			'literal' => 10,
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12
 		},
-		DEFAULT => -46
+		GOTOS => {
+			'nonbrace' => 9,
+			'p11' => 13,
+			'varref' => 16,
+			'exp' => 114,
+			'p10' => 15
+		}
 	},
 	{#State 78
 		ACTIONS => {
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			"-" => 14,
+			"(" => 17,
+			'literal' => 10,
+			"NOT" => 18,
+			'name' => 19,
+			"!" => 11,
+			"{" => 12
 		},
-		DEFAULT => -33
+		GOTOS => {
+			'p10' => 15,
+			'exp' => 115,
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 13
+		}
 	},
 	{#State 79
 		ACTIONS => {
-			"-" => 38,
-			"<" => undef,
-			"+" => 42,
-			"%" => 43,
-			"==" => undef,
-			">=" => undef,
-			"*" => 47,
-			"!=" => undef,
-			"&" => 52,
-			"/" => 53,
-			"<=" => undef,
-			">" => undef
+			"-" => 14,
+			"(" => 17,
+			'literal' => 10,
+			"!" => 11,
+			"{" => 12,
+			"NOT" => 18,
+			'name' => 19
 		},
-		DEFAULT => -41
+		DEFAULT => -72,
+		GOTOS => {
+			'varref' => 16,
+			'pair' => 40,
+			'gtpair' => 39,
+			'p10' => 15,
+			'p11' => 13,
+			'nonbrace' => 9,
+			'hash' => 116,
+			'exp' => 38
+		}
 	},
 	{#State 80
-		ACTIONS => {
-			"-" => 38,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"&" => 52,
-			"/" => 53,
-			"<=" => 55,
-			">" => 56
-		},
-		DEFAULT => -35
+		DEFAULT => -58
 	},
 	{#State 81
 		ACTIONS => {
-			"%" => 43,
-			"*" => 47,
-			"&" => 52,
-			"/" => 53
-		},
-		DEFAULT => -45
+			"&" => 51,
+			"]" => 117,
+			"!=" => 50,
+			"<=" => 54,
+			"<" => 53,
+			"XOR" => 52,
+			"OR" => 58,
+			"+" => 57,
+			"/" => 56,
+			">" => 55,
+			"*" => 60,
+			".." => 59,
+			"AND" => 64,
+			"%" => 62,
+			"||" => 63,
+			"&&" => 67,
+			"-" => 65,
+			"==" => 66,
+			">=" => 68
+		}
 	},
 	{#State 82
-		DEFAULT => -50
+		ACTIONS => {
+			"(" => 118
+		},
+		DEFAULT => -80
 	},
 	{#State 83
-		ACTIONS => {
-			"-" => 38,
-			"<" => undef,
-			"+" => 42,
-			"%" => 43,
-			"==" => undef,
-			">=" => undef,
-			"*" => 47,
-			"!=" => undef,
-			"&" => 52,
-			"/" => 53,
-			"<=" => undef,
-			">" => undef
-		},
-		DEFAULT => -39
+		DEFAULT => -84,
+		GOTOS => {
+			'varpath' => 119
+		}
 	},
 	{#State 84
 		ACTIONS => {
-			"-" => 38,
-			"<" => undef,
-			"+" => 42,
-			"%" => 43,
-			"==" => undef,
-			">=" => undef,
-			"*" => 47,
-			"!=" => undef,
-			"&" => 52,
-			"/" => 53,
-			"<=" => undef,
-			">" => undef
+			"XOR" => 52,
+			"<=" => 54,
+			"<" => 53,
+			"+" => 57,
+			">" => 55,
+			"/" => 56,
+			"=>" => 78,
+			"OR" => 58,
+			"!=" => 50,
+			"&" => 51,
+			"," => 120,
+			"==" => 66,
+			"&&" => 67,
+			"-" => 65,
+			">=" => 68,
+			"*" => 60,
+			".." => 59,
+			"AND" => 64,
+			"%" => 62,
+			"||" => 63
 		},
-		DEFAULT => -44
+		DEFAULT => -65
 	},
 	{#State 85
-		DEFAULT => -48
+		ACTIONS => {
+			")" => 121
+		}
 	},
 	{#State 86
 		ACTIONS => {
-			"-" => 38,
-			"<" => undef,
-			"+" => 42,
-			"%" => 43,
-			"==" => undef,
-			">=" => undef,
-			"*" => 47,
-			"!=" => undef,
-			"&" => 52,
-			"/" => 53,
-			"<=" => undef,
-			">" => undef
+			"," => 122
 		},
-		DEFAULT => -40
+		DEFAULT => -73
 	},
 	{#State 87
-		ACTIONS => {
-			"-" => 38,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"&" => 52,
-			"/" => 53,
-			"<=" => 55,
-			">" => 56
-		},
-		DEFAULT => -38
+		DEFAULT => -61
 	},
 	{#State 88
 		ACTIONS => {
-			"-" => 38,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"&" => 52,
-			"/" => 53,
-			"<=" => 55,
-			">" => 56
-		},
-		DEFAULT => -37
+			")" => 123
+		}
 	},
 	{#State 89
 		ACTIONS => {
-			"-" => 38,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"&" => 52,
-			"/" => 53,
-			"<=" => 55,
-			">" => 56
+			"<=" => undef,
+			"<" => undef,
+			"+" => 57,
+			">" => undef,
+			"/" => 56,
+			"!=" => undef,
+			"&" => 51,
+			"==" => undef,
+			"-" => 65,
+			">=" => undef,
+			"*" => 60,
+			"%" => 62
 		},
-		DEFAULT => -34
+		DEFAULT => -40
 	},
 	{#State 90
 		ACTIONS => {
-			"%" => 43,
-			"*" => 47,
-			"/" => 53
+			"%" => 62,
+			"*" => 60,
+			"/" => 56
 		},
 		DEFAULT => -47
 	},
 	{#State 91
-		DEFAULT => -49
-	},
-	{#State 92
 		ACTIONS => {
-			"-" => 38,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"&" => 52,
-			"/" => 53,
-			"<=" => 55,
-			">" => 56
+			"*" => 60,
+			"AND" => 64,
+			"%" => 62,
+			"&&" => 67,
+			"-" => 65,
+			"==" => 66,
+			">=" => 68,
+			"&" => 51,
+			"!=" => 50,
+			"<=" => 54,
+			"<" => 53,
+			"+" => 57,
+			"/" => 56,
+			">" => 55
 		},
 		DEFAULT => -36
 	},
+	{#State 92
+		ACTIONS => {
+			">=" => undef,
+			"==" => undef,
+			"-" => 65,
+			"%" => 62,
+			"*" => 60,
+			">" => undef,
+			"/" => 56,
+			"+" => 57,
+			"<" => undef,
+			"<=" => undef,
+			"&" => 51,
+			"!=" => undef
+		},
+		DEFAULT => -41
+	},
 	{#State 93
 		ACTIONS => {
-			"-" => 38,
-			"<" => undef,
-			"+" => 42,
-			"%" => 43,
+			"*" => 60,
+			"%" => 62,
 			"==" => undef,
+			"-" => 65,
 			">=" => undef,
-			"*" => 47,
 			"!=" => undef,
-			"&" => 52,
-			"/" => 53,
+			"&" => 51,
 			"<=" => undef,
-			">" => undef
+			"<" => undef,
+			"+" => 57,
+			">" => undef,
+			"/" => 56
 		},
 		DEFAULT => -43
 	},
 	{#State 94
 		ACTIONS => {
-			"-" => 38,
-			"<" => undef,
-			"+" => 42,
-			"%" => 43,
-			"==" => undef,
-			">=" => undef,
-			"*" => 47,
-			"!=" => undef,
-			"&" => 52,
-			"/" => 53,
 			"<=" => undef,
-			">" => undef
+			"<" => undef,
+			"+" => 57,
+			"/" => 56,
+			">" => undef,
+			"&" => 51,
+			"!=" => undef,
+			"==" => undef,
+			"-" => 65,
+			">=" => undef,
+			"*" => 60,
+			"%" => 62
 		},
 		DEFAULT => -42
 	},
 	{#State 95
-		DEFAULT => -61
+		DEFAULT => -49
 	},
 	{#State 96
 		ACTIONS => {
-			")" => 114
-		}
+			"/" => 56,
+			"&" => 51,
+			"*" => 60,
+			"%" => 62
+		},
+		DEFAULT => -45
 	},
 	{#State 97
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"," => 115,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"=>" => 102,
-			"<=" => 55,
-			">" => 56
+			"*" => 60,
+			"%" => 62,
+			"AND" => 64,
+			"&&" => 67,
+			"-" => 65,
+			"==" => 66,
+			">=" => 68,
+			"&" => 51,
+			"!=" => 50,
+			"<" => 53,
+			"<=" => 54,
+			">" => 55,
+			"/" => 56,
+			"+" => 57
 		},
-		DEFAULT => -65
+		DEFAULT => -35
 	},
 	{#State 98
 		ACTIONS => {
-			"," => 116
+			"==" => 66,
+			"&&" => 67,
+			"-" => 65,
+			">=" => 68,
+			"*" => 60,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54,
+			">" => 55,
+			"/" => 56,
+			"+" => 57,
+			"OR" => 58,
+			"!=" => 50,
+			"&" => 51
 		},
-		DEFAULT => -73
+		DEFAULT => -33
 	},
 	{#State 99
-		ACTIONS => {
-			")" => 117
-		}
+		DEFAULT => -48
 	},
 	{#State 100
-		ACTIONS => {
-			"-" => 9,
-			"{" => 13,
-			'name' => 12,
-			'literal' => 15,
-			"!" => 18,
-			"(" => 17,
-			"NOT" => 20
-		},
-		DEFAULT => -72,
-		GOTOS => {
-			'exp' => 60,
-			'nonbrace' => 11,
-			'gtpair' => 61,
-			'varref' => 14,
-			'hash' => 118,
-			'p11' => 16,
-			'pair' => 59,
-			'p10' => 19
-		}
+		DEFAULT => -50
 	},
 	{#State 101
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"!=" => 50,
+			"&" => 51,
+			"+" => 57,
+			">" => 55,
+			"/" => 56,
+			"<=" => 54,
+			"<" => 53,
+			"AND" => 64,
+			"%" => 62,
+			"*" => 60,
+			">=" => 68,
+			"==" => 66,
+			"-" => 65,
+			"&&" => 67
 		},
-		GOTOS => {
-			'exp' => 119,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -34
 	},
 	{#State 102
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			"<" => 53,
+			"<=" => 54,
+			">" => 55,
+			"/" => 56,
+			"+" => 57,
+			"&" => 51,
+			"!=" => 50,
+			"==" => 66,
+			"-" => 65,
+			">=" => 68,
+			"*" => 60,
+			"%" => 62
 		},
-		GOTOS => {
-			'exp' => 120,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -38
 	},
 	{#State 103
-		DEFAULT => -58
+		ACTIONS => {
+			"&" => 51,
+			"/" => 56,
+			"*" => 60,
+			"%" => 62
+		},
+		DEFAULT => -46
 	},
 	{#State 104
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"]" => 121,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
-		}
+			"!=" => undef,
+			"&" => 51,
+			"/" => 56,
+			">" => undef,
+			"+" => 57,
+			"<" => undef,
+			"<=" => undef,
+			"%" => 62,
+			"*" => 60,
+			">=" => undef,
+			"==" => undef,
+			"-" => 65
+		},
+		DEFAULT => -39
 	},
 	{#State 105
 		ACTIONS => {
-			"(" => 122
+			"*" => 60,
+			"%" => 62,
+			"-" => 65,
+			"==" => 66,
+			">=" => 68,
+			"!=" => 50,
+			"&" => 51,
+			"<=" => 54,
+			"<" => 53,
+			"+" => 57,
+			">" => 55,
+			"/" => 56
 		},
-		DEFAULT => -80
+		DEFAULT => -37
 	},
 	{#State 106
-		DEFAULT => -84,
-		GOTOS => {
-			'varpath' => 123
-		}
+		ACTIONS => {
+			"+" => 57,
+			"/" => 56,
+			">" => undef,
+			"<=" => undef,
+			"<" => undef,
+			"!=" => undef,
+			"&" => 51,
+			">=" => undef,
+			"-" => 65,
+			"==" => undef,
+			"%" => 62,
+			"*" => 60
+		},
+		DEFAULT => -44
 	},
 	{#State 107
 		ACTIONS => {
-			'literal' => 3,
-			"{{" => 4,
-			'error' => 5,
-			"<!--" => 124
+			"{" => 12,
+			"!" => 11,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
 		},
 		GOTOS => {
-			'chunk' => 6
+			'varref' => 16,
+			'exp' => 124,
+			'p10' => 15,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 108
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
-		},
-		DEFAULT => -22
+		DEFAULT => -2,
+		GOTOS => {
+			'chunks' => 125
+		}
 	},
 	{#State 109
 		ACTIONS => {
-			'name' => 125
+			'name' => 127
 		},
 		DEFAULT => -69,
 		GOTOS => {
@@ -1315,45 +1781,55 @@ sub new
 		}
 	},
 	{#State 110
-		DEFAULT => -2,
+		ACTIONS => {
+			'error' => 7,
+			'literal' => 6,
+			"<!--" => 128,
+			"{{" => 4
+		},
 		GOTOS => {
-			'chunks' => 127
+			'chunk' => 8
 		}
 	},
 	{#State 111
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			".." => 59,
+			"*" => 60,
+			"||" => 63,
+			"%" => 62,
+			"AND" => 64,
+			"-" => 65,
+			"==" => 66,
+			"&&" => 67,
+			">=" => 68,
+			"&" => 51,
+			"!=" => 50,
+			"<" => 53,
+			"<=" => 54,
+			"XOR" => 52,
+			"OR" => 58,
+			">" => 55,
+			"/" => 56,
+			"+" => 57
 		},
-		GOTOS => {
-			'exp' => 128,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -22
 	},
 	{#State 112
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
+			'literal' => 10,
+			"!" => 11,
+			"{" => 12,
+			'name' => 19,
+			"NOT" => 18,
+			"-" => 14,
+			"(" => 17
 		},
 		GOTOS => {
+			'p11' => 13,
+			'nonbrace' => 9,
+			'varref' => 16,
 			'exp' => 129,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			'p10' => 15
 		}
 	},
 	{#State 113
@@ -1363,358 +1839,358 @@ sub new
 		}
 	},
 	{#State 114
-		DEFAULT => -62
-	},
-	{#State 115
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 132,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19,
-			'list' => 131
-		}
-	},
-	{#State 116
-		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'exp' => 133,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'gtpair' => 98,
-			'p10' => 19,
-			'gthash' => 134
-		}
-	},
-	{#State 117
-		DEFAULT => -63
-	},
-	{#State 118
-		DEFAULT => -71
-	},
-	{#State 119
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			"&&" => 67,
+			"-" => 65,
+			"==" => 66,
+			">=" => 68,
+			".." => 59,
+			"*" => 60,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54,
+			">" => 55,
+			"/" => 56,
+			"+" => 57,
+			"OR" => 58,
+			"!=" => 50,
+			"&" => 51
 		},
 		DEFAULT => -75
 	},
-	{#State 120
+	{#State 115
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			"!=" => 50,
+			"&" => 51,
+			"/" => 56,
+			">" => 55,
+			"+" => 57,
+			"OR" => 58,
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			".." => 59,
+			"*" => 60,
+			">=" => 68,
+			"==" => 66,
+			"&&" => 67,
+			"-" => 65
 		},
 		DEFAULT => -77
 	},
-	{#State 121
+	{#State 116
+		DEFAULT => -71
+	},
+	{#State 117
 		DEFAULT => -81
 	},
-	{#State 122
+	{#State 118
 		ACTIONS => {
-			"-" => 9,
-			"{" => 13,
-			'name' => 12,
-			'literal' => 15,
-			"!" => 18,
+			"!" => 11,
+			"{" => 12,
+			'literal' => 10,
 			"(" => 17,
-			"NOT" => 20,
-			")" => 135
+			")" => 131,
+			"-" => 14,
+			"NOT" => 18,
+			'name' => 19
 		},
 		GOTOS => {
-			'exp' => 132,
-			'varref' => 14,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19,
-			'list' => 136
+			'varref' => 16,
+			'exp' => 133,
+			'p10' => 15,
+			'p11' => 13,
+			'nonbrace' => 9,
+			'list' => 132
 		}
 	},
-	{#State 123
+	{#State 119
 		ACTIONS => {
-			"[" => 63,
-			"." => 64
+			"." => 45,
+			"[" => 44
 		},
 		DEFAULT => -55,
 		GOTOS => {
-			'varpart' => 137
+			'varpart' => 134
 		}
 	},
+	{#State 120
+		ACTIONS => {
+			"{" => 12,
+			"!" => 11,
+			'name' => 19,
+			"NOT" => 18,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'p11' => 13,
+			'list' => 135,
+			'nonbrace' => 9,
+			'exp' => 133,
+			'p10' => 15,
+			'varref' => 16
+		}
+	},
+	{#State 121
+		DEFAULT => -62
+	},
+	{#State 122
+		ACTIONS => {
+			"NOT" => 18,
+			'name' => 19,
+			"{" => 12,
+			"!" => 11,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'varref' => 16,
+			'gthash' => 137,
+			'exp' => 136,
+			'gtpair' => 86,
+			'p10' => 15,
+			'nonbrace' => 9,
+			'p11' => 13
+		}
+	},
+	{#State 123
+		DEFAULT => -63
+	},
 	{#State 124
 		ACTIONS => {
-			"END" => 138,
-			"SET" => 30,
-			"-" => 9,
-			"MACRO" => 21,
-			"{" => 13,
-			'name' => 12,
-			"BLOCK" => 22,
-			"IF" => 32,
-			'literal' => 15,
-			"(" => 17,
-			"!" => 18,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FOREACH" => 27,
-			"FUNCTION" => 36
+			"*" => 60,
+			".." => 59,
+			"AND" => 64,
+			"%" => 62,
+			"||" => 63,
+			"&&" => 67,
+			"-" => 65,
+			"==" => 66,
+			">=" => 68,
+			"&" => 51,
+			"!=" => 50,
+			"<=" => 54,
+			"<" => 53,
+			"XOR" => 52,
+			"OR" => 58,
+			"+" => 57,
+			">" => 55,
+			"/" => 56
 		},
-		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'c_fn' => 35,
-			'fn' => 28
-		}
+		DEFAULT => -19
 	},
 	{#State 125
 		ACTIONS => {
-			"," => 139
+			'error' => 7,
+			"{{" => 4,
+			'literal' => 6,
+			"<!--" => 138
 		},
-		DEFAULT => -67
+		GOTOS => {
+			'chunk' => 8
+		}
 	},
 	{#State 126
 		ACTIONS => {
-			")" => 140
+			")" => 139
 		}
 	},
 	{#State 127
 		ACTIONS => {
-			'literal' => 3,
-			"{{" => 4,
-			'error' => 5,
-			"<!--" => 141
+			"," => 140
 		},
-		GOTOS => {
-			'chunk' => 6
-		}
+		DEFAULT => -67
 	},
 	{#State 128
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			"END" => 141,
+			"SET" => 29,
+			"FOREACH" => 31,
+			"NOT" => 18,
+			'name' => 19,
+			"FOR" => 22,
+			"MACRO" => 23,
+			"IF" => 35,
+			'literal' => 10,
+			"BLOCK" => 25,
+			"{" => 12,
+			"!" => 11,
+			"FUNCTION" => 21,
+			"-" => 14,
+			"(" => 17
 		},
-		DEFAULT => -19
+		GOTOS => {
+			'varref' => 16,
+			'p10' => 15,
+			'c_set' => 26,
+			'c_fn' => 27,
+			'p11' => 13,
+			'nonbrace' => 9,
+			'for' => 33,
+			'code_chunk' => 34,
+			'c_if' => 36,
+			'exp' => 24,
+			'fn_def' => 32,
+			'c_for' => 28,
+			'fn' => 30
+		}
 	},
 	{#State 129
 		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
+			"&" => 51,
+			"!=" => 50,
 			"-->" => 142,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+			"<" => 53,
+			"<=" => 54,
+			"XOR" => 52,
+			"OR" => 58,
+			">" => 55,
+			"/" => 56,
+			"+" => 57,
+			".." => 59,
+			"*" => 60,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			"==" => 66,
+			"&&" => 67,
+			"-" => 65,
+			">=" => 68
 		}
 	},
 	{#State 130
 		ACTIONS => {
-			'literal' => 3,
 			"{{" => 4,
-			'error' => 5,
-			"<!--" => 144
+			'literal' => 6,
+			"<!--" => 144,
+			'error' => 7
 		},
 		GOTOS => {
-			'c_elseifs' => 143,
-			'chunk' => 6
+			'chunk' => 8,
+			'c_elseifs' => 143
 		}
 	},
 	{#State 131
-		DEFAULT => -66
-	},
-	{#State 132
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"," => 115,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
-		},
-		DEFAULT => -65
-	},
-	{#State 133
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"&&" => 50,
-			"||" => 51,
-			"&" => 52,
-			"/" => 53,
-			"XOR" => 54,
-			"=>" => 102,
-			"<=" => 55,
-			">" => 56
-		}
-	},
-	{#State 134
-		DEFAULT => -74
-	},
-	{#State 135
 		DEFAULT => -82
 	},
-	{#State 136
+	{#State 132
 		ACTIONS => {
 			")" => 145
 		}
 	},
-	{#State 137
+	{#State 133
+		ACTIONS => {
+			".." => 59,
+			"*" => 60,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			"-" => 65,
+			"==" => 66,
+			"&&" => 67,
+			">=" => 68,
+			"&" => 51,
+			"!=" => 50,
+			"," => 120,
+			"<" => 53,
+			"<=" => 54,
+			"XOR" => 52,
+			"OR" => 58,
+			"/" => 56,
+			">" => 55,
+			"+" => 57
+		},
+		DEFAULT => -65
+	},
+	{#State 134
 		DEFAULT => -85
 	},
+	{#State 135
+		DEFAULT => -66
+	},
+	{#State 136
+		ACTIONS => {
+			"==" => 66,
+			"&&" => 67,
+			"-" => 65,
+			">=" => 68,
+			".." => 59,
+			"*" => 60,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			"XOR" => 52,
+			"<" => 53,
+			"<=" => 54,
+			">" => 55,
+			"=>" => 78,
+			"/" => 56,
+			"+" => 57,
+			"OR" => 58,
+			"!=" => 50,
+			"&" => 51
+		}
+	},
+	{#State 137
+		DEFAULT => -74
+	},
 	{#State 138
-		DEFAULT => -23
+		ACTIONS => {
+			'name' => 19,
+			"NOT" => 18,
+			"END" => 146,
+			"SET" => 29,
+			"FOREACH" => 31,
+			"IF" => 35,
+			"MACRO" => 23,
+			"FOR" => 22,
+			"{" => 12,
+			"!" => 11,
+			"FUNCTION" => 21,
+			'literal' => 10,
+			"BLOCK" => 25,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'varref' => 16,
+			'p10' => 15,
+			'c_set' => 26,
+			'c_fn' => 27,
+			'p11' => 13,
+			'nonbrace' => 9,
+			'for' => 33,
+			'code_chunk' => 34,
+			'c_if' => 36,
+			'exp' => 24,
+			'fn_def' => 32,
+			'c_for' => 28,
+			'fn' => 30
+		}
 	},
 	{#State 139
+		DEFAULT => -21
+	},
+	{#State 140
 		ACTIONS => {
-			'name' => 125
+			'name' => 127
 		},
 		DEFAULT => -69,
 		GOTOS => {
-			'arglist' => 146
+			'arglist' => 147
 		}
 	},
-	{#State 140
-		DEFAULT => -21
-	},
 	{#State 141
-		ACTIONS => {
-			"END" => 147,
-			"SET" => 30,
-			"-" => 9,
-			"MACRO" => 21,
-			"{" => 13,
-			'name' => 12,
-			"BLOCK" => 22,
-			"IF" => 32,
-			'literal' => 15,
-			"(" => 17,
-			"!" => 18,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FOREACH" => 27,
-			"FUNCTION" => 36
-		},
-		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'c_fn' => 35,
-			'fn' => 28
-		}
+		DEFAULT => -23
 	},
 	{#State 142
 		DEFAULT => -2,
@@ -1730,366 +2206,366 @@ sub new
 	},
 	{#State 144
 		ACTIONS => {
-			"-" => 9,
-			"MACRO" => 21,
-			"BLOCK" => 22,
-			"ELSIF" => 150,
-			'literal' => 15,
-			"!" => 18,
-			"FOREACH" => 27,
-			"ELSE" => 153,
-			"END" => 151,
-			"SET" => 30,
-			"{" => 13,
-			'name' => 12,
-			"ELSEIF" => 152,
-			"IF" => 32,
+			"-" => 14,
+			"FUNCTION" => 21,
+			'literal' => 10,
+			"MACRO" => 23,
+			"FOR" => 22,
+			"ELSIF" => 151,
+			'name' => 19,
+			"NOT" => 18,
 			"(" => 17,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FUNCTION" => 36
+			"!" => 11,
+			"{" => 12,
+			"ELSEIF" => 150,
+			"BLOCK" => 25,
+			"IF" => 35,
+			"ELSE" => 154,
+			"END" => 153,
+			"SET" => 29,
+			"FOREACH" => 31
 		},
 		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'elseif' => 154,
-			'c_fn' => 35,
-			'fn' => 28
+			'nonbrace' => 9,
+			'elseif' => 152,
+			'p11' => 13,
+			'c_set' => 26,
+			'c_fn' => 27,
+			'varref' => 16,
+			'p10' => 15,
+			'c_for' => 28,
+			'fn' => 30,
+			'fn_def' => 32,
+			'code_chunk' => 34,
+			'for' => 33,
+			'exp' => 24,
+			'c_if' => 36
 		}
 	},
 	{#State 145
 		DEFAULT => -83
 	},
 	{#State 146
-		DEFAULT => -68
+		DEFAULT => -20
 	},
 	{#State 147
-		DEFAULT => -20
+		DEFAULT => -68
 	},
 	{#State 148
 		ACTIONS => {
-			'literal' => 3,
-			'error' => 5,
+			'literal' => 6,
+			"<!--" => 155,
 			"{{" => 4,
-			"<!--" => 155
+			'error' => 7
 		},
 		GOTOS => {
-			'chunk' => 6
+			'chunk' => 8
 		}
 	},
 	{#State 149
 		ACTIONS => {
-			'literal' => 3,
-			'error' => 5,
+			'literal' => 6,
+			"<!--" => 156,
 			"{{" => 4,
-			"<!--" => 156
+			'error' => 7
 		},
 		GOTOS => {
-			'chunk' => 6
+			'chunk' => 8
 		}
 	},
 	{#State 150
-		DEFAULT => -31
-	},
-	{#State 151
-		DEFAULT => -13
-	},
-	{#State 152
 		DEFAULT => -32
 	},
-	{#State 153
+	{#State 151
+		DEFAULT => -31
+	},
+	{#State 152
 		ACTIONS => {
-			"IF" => 157,
-			"-->" => 158
+			"(" => 17,
+			"-" => 14,
+			"{" => 12,
+			"!" => 11,
+			"NOT" => 18,
+			'name' => 19,
+			'literal' => 10
+		},
+		GOTOS => {
+			'varref' => 16,
+			'p10' => 15,
+			'exp' => 157,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
+	{#State 153
+		DEFAULT => -13
+	},
 	{#State 154
 		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'varref' => 14,
-			'exp' => 159,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
+			"-->" => 158,
+			"IF" => 159
 		}
 	},
 	{#State 155
 		ACTIONS => {
-			"SET" => 30,
-			"END" => 160,
-			"-" => 9,
-			"MACRO" => 21,
-			"{" => 13,
-			'name' => 12,
-			"BLOCK" => 22,
-			'literal' => 15,
-			"IF" => 32,
+			"-" => 14,
 			"(" => 17,
-			"!" => 18,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FOREACH" => 27,
-			"FUNCTION" => 36
+			'literal' => 10,
+			"BLOCK" => 25,
+			"{" => 12,
+			"!" => 11,
+			"FUNCTION" => 21,
+			"FOR" => 22,
+			"IF" => 35,
+			"MACRO" => 23,
+			"END" => 160,
+			"SET" => 29,
+			"FOREACH" => 31,
+			'name' => 19,
+			"NOT" => 18
 		},
 		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'c_fn' => 35,
-			'fn' => 28
+			'c_set' => 26,
+			'c_fn' => 27,
+			'varref' => 16,
+			'p10' => 15,
+			'nonbrace' => 9,
+			'p11' => 13,
+			'code_chunk' => 34,
+			'for' => 33,
+			'c_if' => 36,
+			'exp' => 24,
+			'c_for' => 28,
+			'fn' => 30,
+			'fn_def' => 32
 		}
 	},
 	{#State 156
 		ACTIONS => {
-			"-" => 9,
-			"MACRO" => 21,
-			"BLOCK" => 22,
-			"ELSIF" => 150,
-			'literal' => 15,
-			"!" => 18,
+			"MACRO" => 23,
+			"FOR" => 22,
+			"NOT" => 18,
+			'name' => 19,
+			"ELSIF" => 151,
+			"-" => 14,
+			"FUNCTION" => 21,
+			'literal' => 10,
+			"IF" => 35,
 			"ELSE" => 162,
-			"FOREACH" => 27,
-			"END" => 161,
-			"SET" => 30,
-			"{" => 13,
-			'name' => 12,
-			"ELSEIF" => 152,
-			"IF" => 32,
+			"FOREACH" => 31,
+			"END" => 163,
+			"SET" => 29,
 			"(" => 17,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FUNCTION" => 36
+			"ELSEIF" => 150,
+			"{" => 12,
+			"!" => 11,
+			"BLOCK" => 25
 		},
 		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'elseif' => 163,
-			'c_fn' => 35,
-			'fn' => 28
+			'exp' => 24,
+			'c_if' => 36,
+			'for' => 33,
+			'code_chunk' => 34,
+			'fn_def' => 32,
+			'fn' => 30,
+			'c_for' => 28,
+			'p10' => 15,
+			'varref' => 16,
+			'c_fn' => 27,
+			'c_set' => 26,
+			'p11' => 13,
+			'elseif' => 161,
+			'nonbrace' => 9
 		}
 	},
 	{#State 157
-		DEFAULT => -30
+		ACTIONS => {
+			"OR" => 58,
+			">" => 55,
+			"/" => 56,
+			"+" => 57,
+			"<" => 53,
+			"<=" => 54,
+			"XOR" => 52,
+			"-->" => 164,
+			"&" => 51,
+			"!=" => 50,
+			">=" => 68,
+			"-" => 65,
+			"&&" => 67,
+			"==" => 66,
+			"%" => 62,
+			"||" => 63,
+			"AND" => 64,
+			".." => 59,
+			"*" => 60
+		}
 	},
 	{#State 158
 		DEFAULT => -2,
 		GOTOS => {
-			'chunks' => 164
+			'chunks' => 165
 		}
 	},
 	{#State 159
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"||" => 51,
-			"&&" => 50,
-			"&" => 52,
-			"-->" => 165,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
-		}
+		DEFAULT => -30
 	},
 	{#State 160
 		DEFAULT => -24
 	},
 	{#State 161
-		DEFAULT => -15
+		ACTIONS => {
+			'name' => 19,
+			"NOT" => 18,
+			"{" => 12,
+			"!" => 11,
+			'literal' => 10,
+			"(" => 17,
+			"-" => 14
+		},
+		GOTOS => {
+			'nonbrace' => 9,
+			'p11' => 13,
+			'exp' => 166,
+			'p10' => 15,
+			'varref' => 16
+		}
 	},
 	{#State 162
 		ACTIONS => {
-			"IF" => 157,
-			"-->" => 166
+			"-->" => 167,
+			"IF" => 159
 		}
 	},
 	{#State 163
-		ACTIONS => {
-			'literal' => 15,
-			"-" => 9,
-			"(" => 17,
-			"!" => 18,
-			"NOT" => 20,
-			"{" => 13,
-			'name' => 12
-		},
-		GOTOS => {
-			'varref' => 14,
-			'exp' => 167,
-			'p11' => 16,
-			'nonbrace' => 11,
-			'p10' => 19
-		}
+		DEFAULT => -15
 	},
 	{#State 164
-		ACTIONS => {
-			'literal' => 3,
-			'error' => 5,
-			"{{" => 4,
-			"<!--" => 168
-		},
-		GOTOS => {
-			'chunk' => 6
-		}
-	},
-	{#State 165
 		DEFAULT => -17
 	},
-	{#State 166
-		DEFAULT => -2,
+	{#State 165
+		ACTIONS => {
+			'error' => 7,
+			'literal' => 6,
+			"<!--" => 168,
+			"{{" => 4
+		},
 		GOTOS => {
-			'chunks' => 169
+			'chunk' => 8
+		}
+	},
+	{#State 166
+		ACTIONS => {
+			"!=" => 50,
+			"&" => 51,
+			"-->" => 169,
+			"XOR" => 52,
+			"<=" => 54,
+			"<" => 53,
+			"+" => 57,
+			">" => 55,
+			"/" => 56,
+			"OR" => 58,
+			"*" => 60,
+			".." => 59,
+			"AND" => 64,
+			"||" => 63,
+			"%" => 62,
+			"==" => 66,
+			"&&" => 67,
+			"-" => 65,
+			">=" => 68
 		}
 	},
 	{#State 167
-		ACTIONS => {
-			".." => 39,
-			"-" => 38,
-			"OR" => 41,
-			"<" => 40,
-			"+" => 42,
-			"%" => 43,
-			"==" => 44,
-			">=" => 45,
-			"*" => 47,
-			"!=" => 48,
-			"AND" => 49,
-			"||" => 51,
-			"&&" => 50,
-			"&" => 52,
-			"-->" => 170,
-			"/" => 53,
-			"XOR" => 54,
-			"<=" => 55,
-			">" => 56
+		DEFAULT => -2,
+		GOTOS => {
+			'chunks' => 170
 		}
 	},
 	{#State 168
 		ACTIONS => {
-			"SET" => 30,
-			"END" => 171,
-			"-" => 9,
-			"MACRO" => 21,
-			"{" => 13,
-			'name' => 12,
-			"BLOCK" => 22,
-			'literal' => 15,
-			"IF" => 32,
+			"FUNCTION" => 21,
+			"{" => 12,
+			"!" => 11,
+			"BLOCK" => 25,
+			'literal' => 10,
 			"(" => 17,
-			"!" => 18,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FOREACH" => 27,
-			"FUNCTION" => 36
+			"-" => 14,
+			'name' => 19,
+			"NOT" => 18,
+			"FOREACH" => 31,
+			"SET" => 29,
+			"END" => 171,
+			"IF" => 35,
+			"MACRO" => 23,
+			"FOR" => 22
 		},
 		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'c_fn' => 35,
-			'fn' => 28
+			'c_fn' => 27,
+			'c_set' => 26,
+			'p10' => 15,
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 13,
+			'c_if' => 36,
+			'exp' => 24,
+			'for' => 33,
+			'code_chunk' => 34,
+			'fn' => 30,
+			'c_for' => 28,
+			'fn_def' => 32
 		}
 	},
 	{#State 169
-		ACTIONS => {
-			'literal' => 3,
-			'error' => 5,
-			"{{" => 4,
-			"<!--" => 172
-		},
-		GOTOS => {
-			'chunk' => 6
-		}
+		DEFAULT => -18
 	},
 	{#State 170
-		DEFAULT => -18
+		ACTIONS => {
+			'error' => 7,
+			"<!--" => 172,
+			'literal' => 6,
+			"{{" => 4
+		},
+		GOTOS => {
+			'chunk' => 8
+		}
 	},
 	{#State 171
 		DEFAULT => -14
 	},
 	{#State 172
 		ACTIONS => {
-			"SET" => 30,
-			"END" => 173,
-			"-" => 9,
-			"MACRO" => 21,
-			"{" => 13,
-			'name' => 12,
-			"BLOCK" => 22,
-			'literal' => 15,
-			"IF" => 32,
+			"-" => 14,
 			"(" => 17,
-			"!" => 18,
-			"FOR" => 33,
-			"NOT" => 20,
-			"FOREACH" => 27,
-			"FUNCTION" => 36
+			"BLOCK" => 25,
+			'literal' => 10,
+			"FUNCTION" => 21,
+			"!" => 11,
+			"{" => 12,
+			"FOR" => 22,
+			"MACRO" => 23,
+			"IF" => 35,
+			"FOREACH" => 31,
+			"SET" => 29,
+			"END" => 173,
+			'name' => 19,
+			"NOT" => 18
 		},
 		GOTOS => {
-			'exp' => 29,
-			'nonbrace' => 11,
-			'for' => 31,
-			'code_chunk' => 23,
-			'varref' => 14,
-			'p11' => 16,
-			'c_set' => 24,
-			'p10' => 19,
-			'c_if' => 25,
-			'fn_def' => 26,
-			'c_for' => 34,
-			'c_fn' => 35,
-			'fn' => 28
+			'exp' => 24,
+			'c_if' => 36,
+			'code_chunk' => 34,
+			'for' => 33,
+			'fn' => 30,
+			'c_for' => 28,
+			'fn_def' => 32,
+			'c_fn' => 27,
+			'c_set' => 26,
+			'p10' => 15,
+			'varref' => 16,
+			'nonbrace' => 9,
+			'p11' => 13
 		}
 	},
 	{#State 173
@@ -2715,7 +3191,7 @@ sub
   }
 	]
 ],
-#line 29 "template.skel.pm"
+#line 30 "template.skel.pm"
     ), $class;
     $self->{options} = $options;
     return $self;
diff --git a/template.skel.pm b/template.skel.pm
index c507903..9fb8deb 100644
--- a/template.skel.pm
+++ b/template.skel.pm
@@ -10,9 +10,10 @@
 package VMXTemplate::Parser;
 
 use strict;
-use base qw(Parse::Yapp::Driver VMXTemplate::Compiler);
+use VMXTemplate::Compiler;
 use VMXTemplate::Utils;
 <<$driver>>
+our @ISA = qw(Parse::Yapp::Driver VMXTemplate::Compiler);
 
 <<$head>>
 sub new
@@ -26,7 +27,7 @@ sub new
 <<$states>>,
         yyrules =>
 <<$rules>>,
-#line 29 "template.skel.pm"
+#line 30 "template.skel.pm"
     ), $class;
     $self->{options} = $options;
     return $self;
diff --git a/template.yp b/template.yp
index 2c96127..23a50ed 100644
--- a/template.yp
+++ b/template.yp
@@ -1,6 +1,6 @@
 # Контекстно-свободная Parse::Yapp-грамматика шаблонизатора
 #
-# Компилировать так: yapp -o VMXTemplate/Parser.pm -t template.skel.pm template.yp
+# Компилировать так: yapp -s -o VMXTemplate/Parser.pm -t template.skel.pm template.yp
 #
 # {{ двойные скобки }} нужно исключительно чтобы маркеры начала и конца подстановки
 # были уникальны в грамматике. Вместо них обычно используются { одинарные }, а