From cf6ad41c12a84256acd34016ea833a05518a974b Mon Sep 17 00:00:00 2001
From: vitalif <vitalif@2be256b4-0725-11dc-8e68-8b2fc2fe2491>
Date: Thu, 27 Nov 2014 22:51:14 +0000
Subject: [PATCH] Fix bugs in perl VMXTemplate

---
 VMXTemplate.pm          |   22 +-
 VMXTemplate/Compiler.pm |    1 +
 VMXTemplate/Lexer.pm    |    2 +-
 VMXTemplate/Options.pm  |    2 +-
 VMXTemplate/Parser.pm   | 3194 +++++++++++++++++++--------------------
 template.yp             |    4 +-
 6 files changed, 1616 insertions(+), 1609 deletions(-)

diff --git a/VMXTemplate.pm b/VMXTemplate.pm
index a638c4e..d29bff2 100644
--- a/VMXTemplate.pm
+++ b/VMXTemplate.pm
@@ -32,8 +32,9 @@ use strict;
 use Digest::MD5 qw(md5_hex);
 use POSIX;
 
+use VMXTemplate::Utils;
 use VMXTemplate::Options;
-use VMXTemplate::Compiler;
+use VMXTemplate::Parser;
 
 # Version of code classes, saved into compiled files
 use constant CODE_VERSION => 4;
@@ -97,7 +98,7 @@ sub vars
 sub parse
 {
     my ($self, $fn, $vars) = @_;
-    return $self->parse_real($fn, undef, '_main', $vars);
+    return $self->parse_real($fn, undef, undef, $vars);
 }
 
 # Call named block/function from a template
@@ -112,7 +113,7 @@ sub exec_from
 sub parse_inline
 {
     my ($self, $code, $vars) = @_;
-    return $self->parse_real(undef, $_[1], '_main', $vars);
+    return $self->parse_real(undef, $_[1], undef, $vars);
 }
 
 # Call function from a string parsed as a template
@@ -141,7 +142,7 @@ sub parse_real
     # Load code
     if ($filename)
     {
-        $filename = $self->{root}.$filename if $filename !~ m!^/!so;
+        $filename = $self->{options}->{root}.$filename if $filename !~ m!^/!so;
         unless ($text = $self->loadfile($filename))
         {
             $self->{options}->error("couldn't load template file '$filename'");
@@ -178,14 +179,19 @@ sub _run
     my ($code, $is_outer, $function, $filename, $vars) = @_;
     $function ||= ':main';
     my $str = $code->{$function};
+    if (!defined $str)
+    {
+        $self->{options}->error("template function '$function' not found in '".($filename || 'inline template')."'");
+        return $is_outer ? $self->{options}->get_errors : '';
+    }
     # a template function is just a constant if not a coderef
-    if (ref $str eq 'CODE')
+    elsif (ref $str eq 'CODE')
     {
         local $self->{tpldata} = $vars if $vars;
         $str = eval { &$str($self) };
         if ($@)
         {
-            $self->{options}->error("error running '".($filename || 'inline template').'::'."$function': $@");
+            $self->{options}->error("error running function '$function' from '".($filename || 'inline template')."': $@");
             return $is_outer ? $self->{options}->get_errors : '';
         }
     }
@@ -296,7 +302,7 @@ sub compile
 
     # call Compiler
     $self->{options}->{input_filename} = $fn;
-    $self->{compiler} ||= VMXTemplate::Compiler->new($self->{options});
+    $self->{compiler} ||= VMXTemplate::Parser->new($self->{options});
     $code = $self->{compiler}->compile($code);
 
     # write compiled code to file
@@ -319,7 +325,7 @@ sub compile
     $self->{compiled_code}->{$key} = eval $code;
     if ($@)
     {
-        $self->error("error compiling '$fn': [$@] in CODE:\n$code");
+        $self->{options}->error("error compiling '$fn': [$@] in CODE:\n$code");
         return ();
     }
 
diff --git a/VMXTemplate/Compiler.pm b/VMXTemplate/Compiler.pm
index 4e693c9..cf8ac6e 100644
--- a/VMXTemplate/Compiler.pm
+++ b/VMXTemplate/Compiler.pm
@@ -233,6 +233,7 @@ sub compile_function
 sub fmop
 {
     my $op = shift;
+    my $self = shift;
     return "((" . join(") $op (", @_) . "))";
 }
 
diff --git a/VMXTemplate/Lexer.pm b/VMXTemplate/Lexer.pm
index 70cd035..dab7bad 100644
--- a/VMXTemplate/Lexer.pm
+++ b/VMXTemplate/Lexer.pm
@@ -106,7 +106,7 @@ sub read_token
     {
         my $r;
         my $code_pos = index($self->{code}, $self->{options}->{begin_code});
-        my $subst_pos = index($self->{code}, $self->{options}->{begin_subst});
+        my $subst_pos = $self->{options}->{begin_subst} ne '' ? index($self->{code}, $self->{options}->{begin_subst}) : -1;
         if ($code_pos == -1 && $subst_pos == -1)
         {
             # No more directives
diff --git a/VMXTemplate/Options.pm b/VMXTemplate/Options.pm
index fced8e1..93d7e39 100644
--- a/VMXTemplate/Options.pm
+++ b/VMXTemplate/Options.pm
@@ -77,7 +77,7 @@ sub get_errors
     {
         return '<div id="template-errors" style="display: block; border: 1px solid black; padding: 8px; background: #fcc">'.
             'VMXTemplate errors:<ul><li>'.
-            join('</li><li>', map \&html_pbr, @{$self->{errors}}).
+            join('</li><li>', map { html_pbr($_) } @{$self->{errors}}).
             '</li></ul>';
     }
     return '';
diff --git a/VMXTemplate/Parser.pm b/VMXTemplate/Parser.pm
index 95b71d1..79c6f97 100644
--- a/VMXTemplate/Parser.pm
+++ b/VMXTemplate/Parser.pm
@@ -27,1471 +27,1500 @@ sub new
 	{#State 0
 		DEFAULT => -2,
 		GOTOS => {
-			'chunks' => 2,
-			'template' => 1
+			'chunks' => 1,
+			'template' => 2
 		}
 	},
 	{#State 1
 		ACTIONS => {
-			'' => 3
+			'' => -1,
+			'literal' => 3,
+			"{{" => 5,
+			'error' => 4,
+			"<!--" => 7
+		},
+		GOTOS => {
+			'chunk' => 6
 		}
 	},
 	{#State 2
 		ACTIONS => {
-			"{{" => 4,
-			"<!--" => 6,
-			'error' => 7,
-			'' => -1,
-			'literal' => 8
-		},
-		GOTOS => {
-			'chunk' => 5
+			'' => 8
 		}
 	},
 	{#State 3
-		DEFAULT => 0
-	},
-	{#State 4
-		ACTIONS => {
-			"-" => 12,
-			"{" => 10,
-			"NOT" => 11,
-			"(" => 16,
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19
-		},
-		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'varref' => 15,
-			'nonbrace' => 9,
-			'exp' => 17
-		}
-	},
-	{#State 5
-		DEFAULT => -3
-	},
-	{#State 6
-		ACTIONS => {
-			"FOR" => 23,
-			"{" => 10,
-			"BLOCK" => 31,
-			"NOT" => 11,
-			"-" => 12,
-			"IF" => 30,
-			"(" => 16,
-			"SET" => 35,
-			"FUNCTION" => 27,
-			"FOREACH" => 26,
-			'literal' => 18,
-			'name' => 19,
-			"MACRO" => 33,
-			"!" => 20
-		},
-		GOTOS => {
-			'c_for' => 22,
-			'nonbrace' => 9,
-			'code_chunk' => 32,
-			'p10' => 13,
-			'p11' => 14,
-			'fn_def' => 29,
-			'for' => 28,
-			'fn' => 21,
-			'exp' => 34,
-			'c_fn' => 25,
-			'c_if' => 36,
-			'varref' => 15,
-			'c_set' => 24
-		}
-	},
-	{#State 7
-		DEFAULT => -7
-	},
-	{#State 8
 		DEFAULT => -4
 	},
+	{#State 4
+		DEFAULT => -7
+	},
+	{#State 5
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"!" => 18,
+			"(" => 17,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'varref' => 14,
+			'exp' => 10,
+			'p11' => 16,
+			'p10' => 19,
+			'nonbrace' => 11
+		}
+	},
+	{#State 6
+		DEFAULT => -3
+	},
+	{#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
+		}
+	},
+	{#State 8
+		DEFAULT => 0
+	},
 	{#State 9
-		DEFAULT => -54
+		ACTIONS => {
+			'literal' => 15,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'varref' => 14,
+			'p11' => 37,
+			'nonbrace' => 11
+		}
 	},
 	{#State 10
 		ACTIONS => {
-			"NOT" => 11,
-			"{" => 10,
-			"-" => 12,
-			"(" => 16,
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20
-		},
-		DEFAULT => -72,
-		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'nonbrace' => 9,
-			'gtpair' => 39,
-			'exp' => 38,
-			'varref' => 15,
-			'pair' => 40,
-			'hash' => 37
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"}}" => 46,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		}
 	},
 	{#State 11
-		ACTIONS => {
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20,
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10
-		},
-		GOTOS => {
-			'p11' => 41,
-			'nonbrace' => 9,
-			'varref' => 15
-		}
+		DEFAULT => -54
 	},
 	{#State 12
 		ACTIONS => {
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19,
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10
-		},
-		GOTOS => {
-			'varref' => 15,
-			'nonbrace' => 9,
-			'p11' => 42
-		}
-	},
-	{#State 13
-		DEFAULT => -51
-	},
-	{#State 14
-		DEFAULT => -52
-	},
-	{#State 15
-		ACTIONS => {
-			"[" => 43,
-			"." => 44
-		},
-		DEFAULT => -60,
-		GOTOS => {
-			'varpart' => 45
-		}
-	},
-	{#State 16
-		ACTIONS => {
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18
-		},
-		GOTOS => {
-			'varref' => 15,
-			'exp' => 46,
-			'nonbrace' => 9,
-			'p11' => 14,
-			'p10' => 13
-		}
-	},
-	{#State 17
-		ACTIONS => {
-			"!=" => 64,
-			"AND" => 65,
-			"&" => 59,
-			"%" => 58,
-			"OR" => 63,
-			".." => 61,
-			">=" => 60,
-			"&&" => 62,
-			"==" => 54,
-			"}}" => 56,
-			"<=" => 57,
-			"*" => 55,
-			"-" => 50,
-			">" => 52,
-			"XOR" => 51,
-			"/" => 47,
-			"+" => 49,
-			"<" => 48,
-			"||" => 53
-		}
-	},
-	{#State 18
-		DEFAULT => -59
-	},
-	{#State 19
-		ACTIONS => {
-			"(" => 67,
-			'literal' => 18,
-			"{" => 10,
-			'name' => 19
+			'literal' => 15,
+			'name' => 12,
+			"(" => 58,
+			"{" => 13
 		},
 		DEFAULT => -78,
 		GOTOS => {
-			'varref' => 15,
-			'nonbrace' => 66
+			'varref' => 14,
+			'nonbrace' => 57
 		}
 	},
+	{#State 13
+		ACTIONS => {
+			"-" => 9,
+			"{" => 13,
+			'name' => 12,
+			'literal' => 15,
+			"!" => 18,
+			"(" => 17,
+			"NOT" => 20
+		},
+		DEFAULT => -72,
+		GOTOS => {
+			'exp' => 60,
+			'nonbrace' => 11,
+			'gtpair' => 61,
+			'varref' => 14,
+			'hash' => 62,
+			'p11' => 16,
+			'pair' => 59,
+			'p10' => 19
+		}
+	},
+	{#State 14
+		ACTIONS => {
+			"[" => 63,
+			"." => 64
+		},
+		DEFAULT => -60,
+		GOTOS => {
+			'varpart' => 65
+		}
+	},
+	{#State 15
+		DEFAULT => -59
+	},
+	{#State 16
+		DEFAULT => -52
+	},
+	{#State 17
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 66,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
+	},
+	{#State 18
+		ACTIONS => {
+			'literal' => 15,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'varref' => 14,
+			'p11' => 67,
+			'nonbrace' => 11
+		}
+	},
+	{#State 19
+		DEFAULT => -51
+	},
 	{#State 20
 		ACTIONS => {
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19
+			'literal' => 15,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
+			'varref' => 14,
 			'p11' => 68,
-			'nonbrace' => 9,
-			'varref' => 15
+			'nonbrace' => 11
 		}
 	},
 	{#State 21
-		ACTIONS => {
-			'name' => 69
-		}
+		DEFAULT => -27
 	},
 	{#State 22
-		DEFAULT => -11
+		DEFAULT => -26
 	},
 	{#State 23
-		DEFAULT => -28
+		ACTIONS => {
+			"-->" => 69
+		}
 	},
 	{#State 24
 		DEFAULT => -9
 	},
 	{#State 25
-		DEFAULT => -10
+		DEFAULT => -8
 	},
 	{#State 26
-		DEFAULT => -29
+		ACTIONS => {
+			"-->" => 70,
+			"=" => 71
+		}
 	},
 	{#State 27
-		DEFAULT => -25
+		DEFAULT => -29
 	},
 	{#State 28
 		ACTIONS => {
-			'name' => 71
-		},
-		GOTOS => {
-			'varref' => 70
+			'name' => 72
 		}
 	},
 	{#State 29
 		ACTIONS => {
-			"-->" => 73,
-			"=" => 72
-		}
-	},
-	{#State 30
-		ACTIONS => {
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18,
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16
-		},
-		GOTOS => {
-			'p11' => 14,
-			'p10' => 13,
-			'nonbrace' => 9,
-			'exp' => 74,
-			'varref' => 15
-		}
-	},
-	{#State 31
-		DEFAULT => -26
-	},
-	{#State 32
-		ACTIONS => {
-			"-->" => 75
-		}
-	},
-	{#State 33
-		DEFAULT => -27
-	},
-	{#State 34
-		ACTIONS => {
-			">=" => 60,
-			"&&" => 62,
-			".." => 61,
-			"OR" => 63,
-			"%" => 58,
-			"&" => 59,
-			"AND" => 65,
-			"!=" => 64,
-			"||" => 53,
-			"+" => 49,
-			"<" => 48,
-			"/" => 47,
-			"XOR" => 51,
-			"-" => 50,
-			">" => 52,
-			"*" => 55,
-			"<=" => 57,
-			"==" => 54
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		},
 		DEFAULT => -12
 	},
-	{#State 35
+	{#State 30
 		ACTIONS => {
-			'name' => 71
+			'name' => 74
 		},
 		GOTOS => {
-			'varref' => 76
+			'varref' => 73
 		}
 	},
+	{#State 31
+		ACTIONS => {
+			'name' => 74
+		},
+		GOTOS => {
+			'varref' => 75
+		}
+	},
+	{#State 32
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 76,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
+	},
+	{#State 33
+		DEFAULT => -28
+	},
+	{#State 34
+		DEFAULT => -11
+	},
+	{#State 35
+		DEFAULT => -10
+	},
 	{#State 36
-		DEFAULT => -8
+		DEFAULT => -25
 	},
 	{#State 37
-		ACTIONS => {
-			"}" => 77
-		}
+		DEFAULT => -53
 	},
 	{#State 38
 		ACTIONS => {
-			"AND" => 65,
-			"!=" => 64,
-			"OR" => 63,
-			".." => 61,
-			"&&" => 62,
-			">=" => 60,
-			"&" => 59,
-			"%" => 58,
-			"<=" => 57,
-			"*" => 55,
-			"==" => 54,
-			"," => 79,
-			"||" => 53,
-			"-" => 50,
-			">" => 52,
-			"XOR" => 51,
-			"=>" => 78,
-			"<" => 48,
-			"+" => 49,
-			"/" => 47
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 77,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 39
-		DEFAULT => -76
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 78,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
 	},
 	{#State 40
 		ACTIONS => {
-			"," => 80
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
-		DEFAULT => -70
+		GOTOS => {
+			'exp' => 79,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
 	},
 	{#State 41
-		DEFAULT => -57
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 80,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
 	},
 	{#State 42
-		DEFAULT => -53
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 81,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
 	},
 	{#State 43
 		ACTIONS => {
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18,
-			"-" => 12,
-			"(" => 16,
-			"{" => 10,
-			"NOT" => 11
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'varref' => 15,
-			'exp' => 81,
-			'nonbrace' => 9
+			'exp' => 82,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 44
 		ACTIONS => {
-			'name' => 82
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 83,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 45
-		DEFAULT => -79
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 84,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
 	},
 	{#State 46
-		ACTIONS => {
-			"!=" => 64,
-			"AND" => 65,
-			"%" => 58,
-			"&" => 59,
-			"&&" => 62,
-			">=" => 60,
-			".." => 61,
-			"OR" => 63,
-			"==" => 54,
-			")" => 83,
-			"*" => 55,
-			"<=" => 57,
-			"/" => 47,
-			"<" => 48,
-			"+" => 49,
-			">" => 52,
-			"XOR" => 51,
-			"-" => 50,
-			"||" => 53
-		}
+		DEFAULT => -6
 	},
 	{#State 47
 		ACTIONS => {
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10,
-			"-" => 12,
-			'literal' => 18,
-			'name' => 19,
-			"!" => 20
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p11' => 14,
-			'p10' => 13,
-			'varref' => 15,
-			'exp' => 84,
-			'nonbrace' => 9
+			'exp' => 85,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 48
 		ACTIONS => {
-			"-" => 12,
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10,
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p11' => 14,
-			'p10' => 13,
-			'nonbrace' => 9,
-			'exp' => 85,
-			'varref' => 15
+			'exp' => 86,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 49
 		ACTIONS => {
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19,
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'nonbrace' => 9,
-			'exp' => 86,
-			'varref' => 15,
-			'p11' => 14,
-			'p10' => 13
+			'exp' => 87,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 50
 		ACTIONS => {
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20,
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10,
-			"-" => 12
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p11' => 14,
-			'p10' => 13,
-			'exp' => 87,
-			'nonbrace' => 9,
-			'varref' => 15
+			'exp' => 88,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 51
 		ACTIONS => {
-			"-" => 12,
-			"{" => 10,
-			"NOT" => 11,
-			"(" => 16,
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'varref' => 15,
-			'exp' => 88,
-			'nonbrace' => 9,
-			'p11' => 14,
-			'p10' => 13
+			'exp' => 89,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 52
 		ACTIONS => {
-			"(" => 16,
-			"{" => 10,
-			"NOT" => 11,
-			"-" => 12,
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p11' => 14,
-			'p10' => 13,
-			'exp' => 89,
-			'nonbrace' => 9,
-			'varref' => 15
+			'exp' => 90,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 53
 		ACTIONS => {
-			"{" => 10,
-			"NOT" => 11,
-			"(" => 16,
-			"-" => 12,
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'nonbrace' => 9,
-			'exp' => 90,
-			'varref' => 15
+			'exp' => 91,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 54
 		ACTIONS => {
-			"(" => 16,
-			"{" => 10,
-			"NOT" => 11,
-			"-" => 12,
-			'literal' => 18,
-			'name' => 19,
-			"!" => 20
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'exp' => 91,
-			'nonbrace' => 9,
-			'varref' => 15,
-			'p10' => 13,
-			'p11' => 14
+			'exp' => 92,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 55
 		ACTIONS => {
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18,
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p11' => 14,
-			'p10' => 13,
-			'nonbrace' => 9,
-			'exp' => 92,
-			'varref' => 15
+			'exp' => 93,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 56
-		DEFAULT => -6
-	},
-	{#State 57
 		ACTIONS => {
-			'literal' => 18,
-			'name' => 19,
-			"!" => 20,
-			"{" => 10,
-			"NOT" => 11,
-			"(" => 16,
-			"-" => 12
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'exp' => 93,
-			'nonbrace' => 9,
-			'varref' => 15
+			'exp' => 94,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
+	{#State 57
+		DEFAULT => -64
+	},
 	{#State 58
 		ACTIONS => {
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20,
-			"{" => 10,
-			"NOT" => 11,
-			"(" => 16,
-			"-" => 12
+			"-" => 9,
+			"{" => 13,
+			'name' => 12,
+			'literal' => 15,
+			"!" => 18,
+			"(" => 17,
+			"NOT" => 20,
+			")" => 95
 		},
 		GOTOS => {
-			'nonbrace' => 9,
-			'exp' => 94,
-			'varref' => 15,
-			'p10' => 13,
-			'p11' => 14
+			'exp' => 97,
+			'nonbrace' => 11,
+			'gtpair' => 98,
+			'varref' => 14,
+			'p11' => 16,
+			'p10' => 19,
+			'gthash' => 99,
+			'list' => 96
 		}
 	},
 	{#State 59
 		ACTIONS => {
-			"-" => 12,
-			"(" => 16,
-			"{" => 10,
-			"NOT" => 11,
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18
+			"," => 100
 		},
-		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'exp' => 95,
-			'nonbrace' => 9,
-			'varref' => 15
-		}
+		DEFAULT => -70
 	},
 	{#State 60
 		ACTIONS => {
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"-" => 12,
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20
-		},
-		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'varref' => 15,
-			'exp' => 96,
-			'nonbrace' => 9
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"," => 101,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"=>" => 102,
+			"<=" => 55,
+			">" => 56
 		}
 	},
 	{#State 61
-		ACTIONS => {
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18
-		},
-		GOTOS => {
-			'nonbrace' => 9,
-			'exp' => 97,
-			'varref' => 15,
-			'p10' => 13,
-			'p11' => 14
-		}
+		DEFAULT => -76
 	},
 	{#State 62
 		ACTIONS => {
-			"-" => 12,
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10,
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19
-		},
-		GOTOS => {
-			'varref' => 15,
-			'nonbrace' => 9,
-			'exp' => 98,
-			'p10' => 13,
-			'p11' => 14
+			"}" => 103
 		}
 	},
 	{#State 63
 		ACTIONS => {
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'varref' => 15,
-			'nonbrace' => 9,
-			'exp' => 99,
-			'p10' => 13,
-			'p11' => 14
+			'exp' => 104,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 64
 		ACTIONS => {
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18
-		},
-		GOTOS => {
-			'varref' => 15,
-			'exp' => 100,
-			'nonbrace' => 9,
-			'p10' => 13,
-			'p11' => 14
+			'name' => 105
 		}
 	},
 	{#State 65
-		ACTIONS => {
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10,
-			"-" => 12,
-			'literal' => 18,
-			'name' => 19,
-			"!" => 20
-		},
-		GOTOS => {
-			'p11' => 14,
-			'p10' => 13,
-			'varref' => 15,
-			'exp' => 101,
-			'nonbrace' => 9
-		}
+		DEFAULT => -79
 	},
 	{#State 66
-		DEFAULT => -64
+		ACTIONS => {
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			")" => 106,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
+		}
 	},
 	{#State 67
-		ACTIONS => {
-			"{" => 10,
-			"NOT" => 11,
-			"-" => 12,
-			"(" => 16,
-			")" => 105,
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20
-		},
-		GOTOS => {
-			'gtpair' => 102,
-			'list' => 103,
-			'p10' => 13,
-			'p11' => 14,
-			'nonbrace' => 9,
-			'gthash' => 104,
-			'exp' => 106,
-			'varref' => 15
-		}
-	},
-	{#State 68
 		DEFAULT => -56
 	},
+	{#State 68
+		DEFAULT => -57
+	},
 	{#State 69
-		ACTIONS => {
-			"(" => 107
-		}
+		DEFAULT => -5
 	},
 	{#State 70
-		ACTIONS => {
-			"[" => 43,
-			"=" => 108,
-			"." => 44
-		},
+		DEFAULT => -2,
 		GOTOS => {
-			'varpart' => 45
+			'chunks' => 107
 		}
 	},
 	{#State 71
-		DEFAULT => -78
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 108,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
 	},
 	{#State 72
 		ACTIONS => {
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18,
-			"-" => 12,
-			"(" => 16,
-			"{" => 10,
-			"NOT" => 11
-		},
-		GOTOS => {
-			'varref' => 15,
-			'exp' => 109,
-			'nonbrace' => 9,
-			'p10' => 13,
-			'p11' => 14
+			"(" => 109
 		}
 	},
 	{#State 73
-		DEFAULT => -2,
+		ACTIONS => {
+			"-->" => 110,
+			"[" => 63,
+			"." => 64,
+			"=" => 111
+		},
 		GOTOS => {
-			'chunks' => 110
+			'varpart' => 65
 		}
 	},
 	{#State 74
-		ACTIONS => {
-			"||" => 53,
-			"XOR" => 51,
-			"-" => 50,
-			">" => 52,
-			"-->" => 111,
-			"/" => 47,
-			"<" => 48,
-			"+" => 49,
-			"<=" => 57,
-			"*" => 55,
-			"==" => 54,
-			"OR" => 63,
-			".." => 61,
-			"&&" => 62,
-			">=" => 60,
-			"&" => 59,
-			"%" => 58,
-			"AND" => 65,
-			"!=" => 64
-		}
+		DEFAULT => -78
 	},
 	{#State 75
-		DEFAULT => -5
+		ACTIONS => {
+			"[" => 63,
+			"." => 64,
+			"=" => 112
+		},
+		GOTOS => {
+			'varpart' => 65
+		}
 	},
 	{#State 76
 		ACTIONS => {
-			"." => 44,
-			"-->" => 112,
-			"=" => 113,
-			"[" => 43
-		},
-		GOTOS => {
-			'varpart' => 45
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"-->" => 113,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		}
 	},
 	{#State 77
-		DEFAULT => -58
-	},
-	{#State 78
 		ACTIONS => {
-			"-" => 12,
-			"{" => 10,
-			"NOT" => 11,
-			"(" => 16,
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19
-		},
-		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'exp' => 114,
-			'nonbrace' => 9,
-			'varref' => 15
-		}
-	},
-	{#State 79
-		ACTIONS => {
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"-" => 12
-		},
-		GOTOS => {
-			'varref' => 15,
-			'exp' => 115,
-			'nonbrace' => 9,
-			'p10' => 13,
-			'p11' => 14
-		}
-	},
-	{#State 80
-		ACTIONS => {
-			"(" => 16,
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18,
-			"-" => 12,
-			"{" => 10,
-			"NOT" => 11
-		},
-		DEFAULT => -72,
-		GOTOS => {
-			'gtpair' => 39,
-			'p11' => 14,
-			'p10' => 13,
-			'nonbrace' => 9,
-			'pair' => 40,
-			'hash' => 116,
-			'exp' => 38,
-			'varref' => 15
-		}
-	},
-	{#State 81
-		ACTIONS => {
-			"%" => 58,
-			"&" => 59,
-			"&&" => 62,
-			">=" => 60,
-			".." => 61,
-			"OR" => 63,
-			"!=" => 64,
-			"AND" => 65,
-			"<" => 48,
-			"+" => 49,
-			"]" => 117,
-			"/" => 47,
-			"XOR" => 51,
-			">" => 52,
-			"-" => 50,
-			"||" => 53,
-			"==" => 54,
-			"*" => 55,
-			"<=" => 57
-		}
-	},
-	{#State 82
-		ACTIONS => {
-			"(" => 118
-		},
-		DEFAULT => -80
-	},
-	{#State 83
-		DEFAULT => -84,
-		GOTOS => {
-			'varpath' => 119
-		}
-	},
-	{#State 84
-		DEFAULT => -49
-	},
-	{#State 85
-		ACTIONS => {
-			"==" => undef,
-			"*" => 55,
-			"<=" => undef,
-			"+" => 49,
-			"<" => undef,
-			"/" => 47,
-			"-" => 50,
-			">" => undef,
-			"!=" => undef,
-			"%" => 58,
-			"&" => 59,
-			">=" => undef
-		},
-		DEFAULT => -41
-	},
-	{#State 86
-		ACTIONS => {
-			"%" => 58,
-			"&" => 59,
-			"*" => 55,
-			"/" => 47
-		},
-		DEFAULT => -45
-	},
-	{#State 87
-		ACTIONS => {
-			"/" => 47,
-			"*" => 55,
-			"&" => 59,
-			"%" => 58
+			"%" => 43,
+			"*" => 47,
+			"&" => 52,
+			"/" => 53
 		},
 		DEFAULT => -46
 	},
-	{#State 88
+	{#State 78
 		ACTIONS => {
-			"==" => 54,
-			"*" => 55,
-			"<=" => 57,
-			"+" => 49,
-			"<" => 48,
-			"/" => 47,
-			">" => 52,
-			"-" => 50,
-			"!=" => 64,
-			"AND" => 65,
-			"%" => 58,
-			"&" => 59,
-			">=" => 60,
-			"&&" => 62
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		},
-		DEFAULT => -36
+		DEFAULT => -33
 	},
-	{#State 89
+	{#State 79
 		ACTIONS => {
-			"<=" => undef,
-			"*" => 55,
-			"==" => undef,
-			"-" => 50,
-			">" => undef,
-			"/" => 47,
-			"+" => 49,
+			"-" => 38,
 			"<" => undef,
-			"!=" => undef,
-			">=" => undef,
-			"&" => 59,
-			"%" => 58
-		},
-		DEFAULT => -42
-	},
-	{#State 90
-		ACTIONS => {
-			"&" => 59,
-			"%" => 58,
-			"&&" => 62,
-			">=" => 60,
-			"!=" => 64,
-			"AND" => 65,
-			">" => 52,
-			"-" => 50,
-			"/" => 47,
-			"+" => 49,
-			"<" => 48,
-			"==" => 54,
-			"<=" => 57,
-			"*" => 55
-		},
-		DEFAULT => -34
-	},
-	{#State 91
-		ACTIONS => {
-			"*" => 55,
-			"<=" => undef,
+			"+" => 42,
+			"%" => 43,
 			"==" => undef,
-			"/" => 47,
-			"+" => 49,
-			"<" => undef,
-			">" => undef,
-			"-" => 50,
-			"!=" => undef,
 			">=" => undef,
-			"%" => 58,
-			"&" => 59
+			"*" => 47,
+			"!=" => undef,
+			"&" => 52,
+			"/" => 53,
+			"<=" => undef,
+			">" => undef
+		},
+		DEFAULT => -41
+	},
+	{#State 80
+		ACTIONS => {
+			"-" => 38,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"&" => 52,
+			"/" => 53,
+			"<=" => 55,
+			">" => 56
+		},
+		DEFAULT => -35
+	},
+	{#State 81
+		ACTIONS => {
+			"%" => 43,
+			"*" => 47,
+			"&" => 52,
+			"/" => 53
+		},
+		DEFAULT => -45
+	},
+	{#State 82
+		DEFAULT => -50
+	},
+	{#State 83
+		ACTIONS => {
+			"-" => 38,
+			"<" => undef,
+			"+" => 42,
+			"%" => 43,
+			"==" => undef,
+			">=" => undef,
+			"*" => 47,
+			"!=" => undef,
+			"&" => 52,
+			"/" => 53,
+			"<=" => undef,
+			">" => undef
 		},
 		DEFAULT => -39
 	},
-	{#State 92
+	{#State 84
+		ACTIONS => {
+			"-" => 38,
+			"<" => undef,
+			"+" => 42,
+			"%" => 43,
+			"==" => undef,
+			">=" => undef,
+			"*" => 47,
+			"!=" => undef,
+			"&" => 52,
+			"/" => 53,
+			"<=" => undef,
+			">" => undef
+		},
+		DEFAULT => -44
+	},
+	{#State 85
 		DEFAULT => -48
 	},
+	{#State 86
+		ACTIONS => {
+			"-" => 38,
+			"<" => undef,
+			"+" => 42,
+			"%" => 43,
+			"==" => undef,
+			">=" => undef,
+			"*" => 47,
+			"!=" => undef,
+			"&" => 52,
+			"/" => 53,
+			"<=" => undef,
+			">" => undef
+		},
+		DEFAULT => -40
+	},
+	{#State 87
+		ACTIONS => {
+			"-" => 38,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"&" => 52,
+			"/" => 53,
+			"<=" => 55,
+			">" => 56
+		},
+		DEFAULT => -38
+	},
+	{#State 88
+		ACTIONS => {
+			"-" => 38,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"&" => 52,
+			"/" => 53,
+			"<=" => 55,
+			">" => 56
+		},
+		DEFAULT => -37
+	},
+	{#State 89
+		ACTIONS => {
+			"-" => 38,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"&" => 52,
+			"/" => 53,
+			"<=" => 55,
+			">" => 56
+		},
+		DEFAULT => -34
+	},
+	{#State 90
+		ACTIONS => {
+			"%" => 43,
+			"*" => 47,
+			"/" => 53
+		},
+		DEFAULT => -47
+	},
+	{#State 91
+		DEFAULT => -49
+	},
+	{#State 92
+		ACTIONS => {
+			"-" => 38,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"&" => 52,
+			"/" => 53,
+			"<=" => 55,
+			">" => 56
+		},
+		DEFAULT => -36
+	},
 	{#State 93
 		ACTIONS => {
-			"&" => 59,
-			"%" => 58,
-			">=" => undef,
-			"!=" => undef,
-			">" => undef,
-			"-" => 50,
-			"/" => 47,
-			"+" => 49,
+			"-" => 38,
 			"<" => undef,
+			"+" => 42,
+			"%" => 43,
 			"==" => undef,
+			">=" => undef,
+			"*" => 47,
+			"!=" => undef,
+			"&" => 52,
+			"/" => 53,
 			"<=" => undef,
-			"*" => 55
+			">" => undef
 		},
 		DEFAULT => -43
 	},
 	{#State 94
-		DEFAULT => -50
+		ACTIONS => {
+			"-" => 38,
+			"<" => undef,
+			"+" => 42,
+			"%" => 43,
+			"==" => undef,
+			">=" => undef,
+			"*" => 47,
+			"!=" => undef,
+			"&" => 52,
+			"/" => 53,
+			"<=" => undef,
+			">" => undef
+		},
+		DEFAULT => -42
 	},
 	{#State 95
-		ACTIONS => {
-			"*" => 55,
-			"/" => 47,
-			"%" => 58
-		},
-		DEFAULT => -47
+		DEFAULT => -61
 	},
 	{#State 96
 		ACTIONS => {
-			"<=" => undef,
-			"*" => 55,
-			"==" => undef,
-			">" => undef,
-			"-" => 50,
-			"/" => 47,
-			"<" => undef,
-			"+" => 49,
-			"!=" => undef,
-			">=" => undef,
-			"&" => 59,
-			"%" => 58
-		},
-		DEFAULT => -44
+			")" => 114
+		}
 	},
 	{#State 97
 		ACTIONS => {
-			"<=" => 57,
-			"*" => 55,
-			"==" => 54,
-			"||" => 53,
-			"XOR" => 51,
-			"-" => 50,
-			">" => 52,
-			"+" => 49,
-			"<" => 48,
-			"/" => 47,
-			"AND" => 65,
-			"!=" => 64,
-			"OR" => 63,
-			"&&" => 62,
-			">=" => 60,
-			"&" => 59,
-			"%" => 58
-		},
-		DEFAULT => -33
-	},
-	{#State 98
-		ACTIONS => {
-			"==" => 54,
-			"*" => 55,
-			"<=" => 57,
-			"+" => 49,
-			"<" => 48,
-			"/" => 47,
-			">" => 52,
-			"-" => 50,
-			"!=" => 64,
-			"%" => 58,
-			"&" => 59,
-			">=" => 60
-		},
-		DEFAULT => -37
-	},
-	{#State 99
-		ACTIONS => {
-			"AND" => 65,
-			"!=" => 64,
-			"&&" => 62,
-			">=" => 60,
-			"%" => 58,
-			"&" => 59,
-			"*" => 55,
-			"<=" => 57,
-			"==" => 54,
-			"<" => 48,
-			"+" => 49,
-			"/" => 47,
-			"-" => 50,
-			">" => 52
-		},
-		DEFAULT => -35
-	},
-	{#State 100
-		ACTIONS => {
-			"!=" => undef,
-			">=" => undef,
-			"&" => 59,
-			"%" => 58,
-			"<=" => undef,
-			"*" => 55,
-			"==" => undef,
-			">" => undef,
-			"-" => 50,
-			"/" => 47,
-			"<" => undef,
-			"+" => 49
-		},
-		DEFAULT => -40
-	},
-	{#State 101
-		ACTIONS => {
-			"*" => 55,
-			"<=" => 57,
-			"==" => 54,
-			"<" => 48,
-			"+" => 49,
-			"/" => 47,
-			">" => 52,
-			"-" => 50,
-			"!=" => 64,
-			">=" => 60,
-			"%" => 58,
-			"&" => 59
-		},
-		DEFAULT => -38
-	},
-	{#State 102
-		ACTIONS => {
-			"," => 120
-		},
-		DEFAULT => -73
-	},
-	{#State 103
-		ACTIONS => {
-			")" => 121
-		}
-	},
-	{#State 104
-		ACTIONS => {
-			")" => 122
-		}
-	},
-	{#State 105
-		DEFAULT => -61
-	},
-	{#State 106
-		ACTIONS => {
-			"==" => 54,
-			"*" => 55,
-			"<=" => 57,
-			"/" => 47,
-			"<" => 48,
-			"+" => 49,
-			"=>" => 78,
-			"XOR" => 51,
-			"-" => 50,
-			">" => 52,
-			"||" => 53,
-			"," => 123,
-			"!=" => 64,
-			"AND" => 65,
-			"%" => 58,
-			"&" => 59,
-			">=" => 60,
-			".." => 61,
-			"&&" => 62,
-			"OR" => 63
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"," => 115,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"=>" => 102,
+			"<=" => 55,
+			">" => 56
 		},
 		DEFAULT => -65
 	},
+	{#State 98
+		ACTIONS => {
+			"," => 116
+		},
+		DEFAULT => -73
+	},
+	{#State 99
+		ACTIONS => {
+			")" => 117
+		}
+	},
+	{#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
+		}
+	},
+	{#State 101
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 119,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
+	},
+	{#State 102
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'exp' => 120,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
+	},
+	{#State 103
+		DEFAULT => -58
+	},
+	{#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
+		}
+	},
+	{#State 105
+		ACTIONS => {
+			"(" => 122
+		},
+		DEFAULT => -80
+	},
+	{#State 106
+		DEFAULT => -84,
+		GOTOS => {
+			'varpath' => 123
+		}
+	},
 	{#State 107
+		ACTIONS => {
+			'literal' => 3,
+			"{{" => 5,
+			'error' => 4,
+			"<!--" => 124
+		},
+		GOTOS => {
+			'chunk' => 6
+		}
+	},
+	{#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
+	},
+	{#State 109
 		ACTIONS => {
 			'name' => 125
 		},
 		DEFAULT => -69,
 		GOTOS => {
-			'arglist' => 124
+			'arglist' => 126
 		}
 	},
-	{#State 108
-		ACTIONS => {
-			"!" => 20,
-			'name' => 19,
-			'literal' => 18,
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16
-		},
-		GOTOS => {
-			'nonbrace' => 9,
-			'exp' => 126,
-			'varref' => 15,
-			'p11' => 14,
-			'p10' => 13
-		}
-	},
-	{#State 109
-		ACTIONS => {
-			"*" => 55,
-			"<=" => 57,
-			"==" => 54,
-			"||" => 53,
-			"+" => 49,
-			"<" => 48,
-			"/" => 47,
-			">" => 52,
-			"XOR" => 51,
-			"-" => 50,
-			"AND" => 65,
-			"!=" => 64,
-			".." => 61,
-			"&&" => 62,
-			">=" => 60,
-			"OR" => 63,
-			"%" => 58,
-			"&" => 59
-		},
-		DEFAULT => -22
-	},
 	{#State 110
-		ACTIONS => {
-			'error' => 7,
-			"{{" => 4,
-			"<!--" => 127,
-			'literal' => 8
-		},
+		DEFAULT => -2,
 		GOTOS => {
-			'chunk' => 5
+			'chunks' => 127
 		}
 	},
 	{#State 111
-		DEFAULT => -2,
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
 		GOTOS => {
-			'chunks' => 128
+			'exp' => 128,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 112
-		DEFAULT => -2,
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
 		GOTOS => {
-			'chunks' => 129
+			'exp' => 129,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 113
-		ACTIONS => {
-			"(" => 16,
-			"{" => 10,
-			"NOT" => 11,
-			"-" => 12,
-			'literal' => 18,
-			'name' => 19,
-			"!" => 20
-		},
+		DEFAULT => -2,
 		GOTOS => {
-			'varref' => 15,
-			'nonbrace' => 9,
-			'exp' => 130,
-			'p11' => 14,
-			'p10' => 13
+			'chunks' => 130
 		}
 	},
 	{#State 114
-		ACTIONS => {
-			"/" => 47,
-			"+" => 49,
-			"<" => 48,
-			">" => 52,
-			"-" => 50,
-			"XOR" => 51,
-			"||" => 53,
-			"==" => 54,
-			"*" => 55,
-			"<=" => 57,
-			"%" => 58,
-			"&" => 59,
-			"&&" => 62,
-			">=" => 60,
-			".." => 61,
-			"OR" => 63,
-			"!=" => 64,
-			"AND" => 65
-		},
-		DEFAULT => -77
+		DEFAULT => -62
 	},
 	{#State 115
 		ACTIONS => {
-			">" => 52,
-			"XOR" => 51,
-			"-" => 50,
-			"/" => 47,
-			"+" => 49,
-			"<" => 48,
-			"||" => 53,
-			"==" => 54,
-			"<=" => 57,
-			"*" => 55,
-			"&" => 59,
-			"%" => 58,
-			"OR" => 63,
-			".." => 61,
-			"&&" => 62,
-			">=" => 60,
-			"!=" => 64,
-			"AND" => 65
-		},
-		DEFAULT => -75
-	},
-	{#State 116
-		DEFAULT => -71
-	},
-	{#State 117
-		DEFAULT => -81
-	},
-	{#State 118
-		ACTIONS => {
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			")" => 131,
-			"(" => 16,
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'nonbrace' => 9,
-			'exp' => 133,
-			'varref' => 15,
-			'p11' => 14,
-			'p10' => 13,
-			'list' => 132
+			'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 => {
-			"[" => 43,
-			"." => 44
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		},
-		DEFAULT => -55,
-		GOTOS => {
-			'varpart' => 134
-		}
+		DEFAULT => -75
 	},
 	{#State 120
 		ACTIONS => {
-			'literal' => 18,
-			'name' => 19,
-			"!" => 20,
-			"{" => 10,
-			"NOT" => 11,
-			"(" => 16,
-			"-" => 12
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		},
-		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'varref' => 15,
-			'nonbrace' => 9,
-			'exp' => 135,
-			'gthash' => 136,
-			'gtpair' => 102
-		}
+		DEFAULT => -77
 	},
 	{#State 121
-		DEFAULT => -62
+		DEFAULT => -81
 	},
 	{#State 122
-		DEFAULT => -63
+		ACTIONS => {
+			"-" => 9,
+			"{" => 13,
+			'name' => 12,
+			'literal' => 15,
+			"!" => 18,
+			"(" => 17,
+			"NOT" => 20,
+			")" => 135
+		},
+		GOTOS => {
+			'exp' => 132,
+			'varref' => 14,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19,
+			'list' => 136
+		}
 	},
 	{#State 123
 		ACTIONS => {
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20,
-			"(" => 16,
-			"NOT" => 11,
-			"{" => 10,
-			"-" => 12
+			"[" => 63,
+			"." => 64
 		},
+		DEFAULT => -55,
 		GOTOS => {
-			'list' => 137,
-			'varref' => 15,
-			'exp' => 133,
-			'nonbrace' => 9,
-			'p11' => 14,
-			'p10' => 13
+			'varpart' => 137
 		}
 	},
 	{#State 124
 		ACTIONS => {
-			")" => 138
+			"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
+		},
+		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
 		}
 	},
 	{#State 125
@@ -1502,173 +1531,144 @@ sub new
 	},
 	{#State 126
 		ACTIONS => {
-			".." => 61,
-			"&&" => 62,
-			">=" => 60,
-			"OR" => 63,
-			"%" => 58,
-			"&" => 59,
-			"AND" => 65,
-			"!=" => 64,
-			"||" => 53,
-			"/" => 47,
-			"+" => 49,
-			"<" => 48,
-			"XOR" => 51,
-			"-->" => 140,
-			">" => 52,
-			"-" => 50,
-			"*" => 55,
-			"<=" => 57,
-			"==" => 54
+			")" => 140
 		}
 	},
 	{#State 127
 		ACTIONS => {
-			"SET" => 35,
-			"(" => 16,
-			"FUNCTION" => 27,
-			"FOREACH" => 26,
-			'literal' => 18,
-			'name' => 19,
-			"MACRO" => 33,
-			"!" => 20,
-			"FOR" => 23,
-			"{" => 10,
-			"NOT" => 11,
-			"BLOCK" => 31,
-			"-" => 12,
-			"END" => 141,
-			"IF" => 30
+			'literal' => 3,
+			"{{" => 5,
+			'error' => 4,
+			"<!--" => 141
 		},
 		GOTOS => {
-			'c_set' => 24,
-			'varref' => 15,
-			'c_if' => 36,
-			'c_fn' => 25,
-			'exp' => 34,
-			'fn' => 21,
-			'fn_def' => 29,
-			'for' => 28,
-			'p10' => 13,
-			'p11' => 14,
-			'code_chunk' => 32,
-			'c_for' => 22,
-			'nonbrace' => 9
+			'chunk' => 6
 		}
 	},
 	{#State 128
 		ACTIONS => {
-			'literal' => 8,
-			'error' => 7,
-			"<!--" => 142,
-			"{{" => 4
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		},
-		GOTOS => {
-			'c_elseifs' => 143,
-			'chunk' => 5
-		}
+		DEFAULT => -19
 	},
 	{#State 129
 		ACTIONS => {
-			"{{" => 4,
-			"<!--" => 144,
-			'error' => 7,
-			'literal' => 8
-		},
-		GOTOS => {
-			'chunk' => 5
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"&&" => 50,
+			"||" => 51,
+			"&" => 52,
+			"/" => 53,
+			"-->" => 142,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		}
 	},
 	{#State 130
 		ACTIONS => {
-			"<=" => 57,
-			"*" => 55,
-			"==" => 54,
-			"||" => 53,
-			">" => 52,
-			"-" => 50,
-			"XOR" => 51,
-			"/" => 47,
-			"+" => 49,
-			"<" => 48,
-			"AND" => 65,
-			"!=" => 64,
-			"OR" => 63,
-			">=" => 60,
-			".." => 61,
-			"&&" => 62,
-			"&" => 59,
-			"%" => 58
+			'literal' => 3,
+			"{{" => 5,
+			'error' => 4,
+			"<!--" => 144
 		},
-		DEFAULT => -19
+		GOTOS => {
+			'c_elseifs' => 143,
+			'chunk' => 6
+		}
 	},
 	{#State 131
-		DEFAULT => -82
+		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
 		ACTIONS => {
 			")" => 145
 		}
 	},
-	{#State 133
-		ACTIONS => {
-			">" => 52,
-			"XOR" => 51,
-			"-" => 50,
-			"<" => 48,
-			"+" => 49,
-			"/" => 47,
-			"," => 123,
-			"||" => 53,
-			"==" => 54,
-			"<=" => 57,
-			"*" => 55,
-			"&" => 59,
-			"%" => 58,
-			"OR" => 63,
-			"&&" => 62,
-			".." => 61,
-			">=" => 60,
-			"!=" => 64,
-			"AND" => 65
-		},
-		DEFAULT => -65
-	},
-	{#State 134
+	{#State 137
 		DEFAULT => -85
 	},
-	{#State 135
-		ACTIONS => {
-			"||" => 53,
-			"/" => 47,
-			"<" => 48,
-			"+" => 49,
-			"=>" => 78,
-			"-" => 50,
-			"XOR" => 51,
-			">" => 52,
-			"*" => 55,
-			"<=" => 57,
-			"==" => 54,
-			".." => 61,
-			"&&" => 62,
-			">=" => 60,
-			"OR" => 63,
-			"%" => 58,
-			"&" => 59,
-			"AND" => 65,
-			"!=" => 64
-		}
-	},
-	{#State 136
-		DEFAULT => -74
-	},
-	{#State 137
-		DEFAULT => -66
-	},
 	{#State 138
-		DEFAULT => -21
+		DEFAULT => -23
 	},
 	{#State 139
 		ACTIONS => {
@@ -1680,90 +1680,90 @@ sub new
 		}
 	},
 	{#State 140
-		DEFAULT => -2,
-		GOTOS => {
-			'chunks' => 147
-		}
+		DEFAULT => -21
 	},
 	{#State 141
-		DEFAULT => -23
-	},
-	{#State 142
 		ACTIONS => {
-			"FUNCTION" => 27,
-			"FOREACH" => 26,
-			'name' => 19,
-			"ELSEIF" => 152,
-			"!" => 20,
-			"FOR" => 23,
-			"NOT" => 11,
-			"{" => 10,
-			"-" => 12,
-			"ELSE" => 150,
-			"END" => 151,
-			"(" => 16,
-			"SET" => 35,
-			"ELSIF" => 149,
-			'literal' => 18,
-			"MACRO" => 33,
-			"BLOCK" => 31,
-			"IF" => 30
+			"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 => {
-			'code_chunk' => 32,
-			'nonbrace' => 9,
-			'c_for' => 22,
-			'p10' => 13,
-			'p11' => 14,
-			'for' => 28,
-			'fn_def' => 29,
-			'fn' => 21,
-			'varref' => 15,
-			'c_if' => 36,
-			'c_fn' => 25,
-			'exp' => 34,
-			'elseif' => 148,
-			'c_set' => 24
+			'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
+		}
+	},
+	{#State 142
+		DEFAULT => -2,
+		GOTOS => {
+			'chunks' => 148
 		}
 	},
 	{#State 143
 		DEFAULT => -2,
 		GOTOS => {
-			'chunks' => 153
+			'chunks' => 149
 		}
 	},
 	{#State 144
 		ACTIONS => {
-			"END" => 154,
-			"IF" => 30,
-			"FOR" => 23,
-			"BLOCK" => 31,
-			"NOT" => 11,
-			"{" => 10,
-			"-" => 12,
-			'name' => 19,
-			'literal' => 18,
-			"MACRO" => 33,
-			"!" => 20,
-			"(" => 16,
-			"SET" => 35,
-			"FUNCTION" => 27,
-			"FOREACH" => 26
+			"-" => 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,
+			"(" => 17,
+			"FOR" => 33,
+			"NOT" => 20,
+			"FUNCTION" => 36
 		},
 		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'code_chunk' => 32,
-			'c_for' => 22,
-			'nonbrace' => 9,
-			'fn' => 21,
-			'fn_def' => 29,
-			'for' => 28,
-			'c_if' => 36,
-			'varref' => 15,
-			'exp' => 34,
-			'c_fn' => 25,
-			'c_set' => 24
+			'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
 		}
 	},
 	{#State 145
@@ -1773,42 +1773,32 @@ sub new
 		DEFAULT => -68
 	},
 	{#State 147
-		ACTIONS => {
-			"<!--" => 155,
-			"{{" => 4,
-			'error' => 7,
-			'literal' => 8
-		},
-		GOTOS => {
-			'chunk' => 5
-		}
+		DEFAULT => -20
 	},
 	{#State 148
 		ACTIONS => {
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20,
-			"(" => 16,
-			"{" => 10,
-			"NOT" => 11,
-			"-" => 12
+			'literal' => 3,
+			'error' => 4,
+			"{{" => 5,
+			"<!--" => 155
 		},
 		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'varref' => 15,
-			'exp' => 156,
-			'nonbrace' => 9
+			'chunk' => 6
 		}
 	},
 	{#State 149
-		DEFAULT => -31
+		ACTIONS => {
+			'literal' => 3,
+			'error' => 4,
+			"{{" => 5,
+			"<!--" => 156
+		},
+		GOTOS => {
+			'chunk' => 6
+		}
 	},
 	{#State 150
-		ACTIONS => {
-			"-->" => 158,
-			"IF" => 157
-		}
+		DEFAULT => -31
 	},
 	{#State 151
 		DEFAULT => -13
@@ -1818,73 +1808,98 @@ sub new
 	},
 	{#State 153
 		ACTIONS => {
-			'literal' => 8,
-			"<!--" => 159,
-			"{{" => 4,
-			'error' => 7
-		},
-		GOTOS => {
-			'chunk' => 5
+			"IF" => 157,
+			"-->" => 158
 		}
 	},
 	{#State 154
-		DEFAULT => -20
+		ACTIONS => {
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
+		},
+		GOTOS => {
+			'varref' => 14,
+			'exp' => 159,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
+		}
 	},
 	{#State 155
 		ACTIONS => {
-			"(" => 16,
-			"SET" => 35,
-			"FUNCTION" => 27,
-			"FOREACH" => 26,
-			'name' => 19,
-			'literal' => 18,
-			"MACRO" => 33,
-			"!" => 20,
-			"FOR" => 23,
-			"{" => 10,
-			"BLOCK" => 31,
-			"NOT" => 11,
-			"-" => 12,
+			"SET" => 30,
 			"END" => 160,
-			"IF" => 30
+			"-" => 9,
+			"MACRO" => 21,
+			"{" => 13,
+			'name' => 12,
+			"BLOCK" => 22,
+			'literal' => 15,
+			"IF" => 32,
+			"(" => 17,
+			"!" => 18,
+			"FOR" => 33,
+			"NOT" => 20,
+			"FOREACH" => 27,
+			"FUNCTION" => 36
 		},
 		GOTOS => {
-			'c_if' => 36,
-			'varref' => 15,
-			'c_fn' => 25,
-			'exp' => 34,
+			'exp' => 29,
+			'nonbrace' => 11,
+			'for' => 31,
+			'code_chunk' => 23,
+			'varref' => 14,
+			'p11' => 16,
 			'c_set' => 24,
-			'p10' => 13,
-			'p11' => 14,
-			'code_chunk' => 32,
-			'c_for' => 22,
-			'nonbrace' => 9,
-			'fn' => 21,
-			'fn_def' => 29,
-			'for' => 28
+			'p10' => 19,
+			'c_if' => 25,
+			'fn_def' => 26,
+			'c_for' => 34,
+			'c_fn' => 35,
+			'fn' => 28
 		}
 	},
 	{#State 156
 		ACTIONS => {
-			"<=" => 57,
-			"*" => 55,
-			"==" => 54,
-			"||" => 53,
-			"XOR" => 51,
-			"-->" => 161,
-			">" => 52,
-			"-" => 50,
-			"/" => 47,
-			"+" => 49,
-			"<" => 48,
-			"AND" => 65,
-			"!=" => 64,
-			"OR" => 63,
-			".." => 61,
-			"&&" => 62,
-			">=" => 60,
-			"&" => 59,
-			"%" => 58
+			"-" => 9,
+			"MACRO" => 21,
+			"BLOCK" => 22,
+			"ELSIF" => 150,
+			'literal' => 15,
+			"!" => 18,
+			"ELSE" => 162,
+			"FOREACH" => 27,
+			"END" => 161,
+			"SET" => 30,
+			"{" => 13,
+			'name' => 12,
+			"ELSEIF" => 152,
+			"IF" => 32,
+			"(" => 17,
+			"FOR" => 33,
+			"NOT" => 20,
+			"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,
+			'elseif' => 163,
+			'c_fn' => 35,
+			'fn' => 28
 		}
 	},
 	{#State 157
@@ -1893,203 +1908,188 @@ sub new
 	{#State 158
 		DEFAULT => -2,
 		GOTOS => {
-			'chunks' => 162
+			'chunks' => 164
 		}
 	},
 	{#State 159
 		ACTIONS => {
-			"MACRO" => 33,
-			'literal' => 18,
-			"ELSIF" => 149,
-			"(" => 16,
-			"SET" => 35,
-			"IF" => 30,
-			"BLOCK" => 31,
-			"!" => 20,
-			"ELSEIF" => 152,
-			'name' => 19,
-			"FOREACH" => 26,
-			"FUNCTION" => 27,
-			"END" => 164,
-			"ELSE" => 165,
-			"-" => 12,
-			"{" => 10,
-			"NOT" => 11,
-			"FOR" => 23
-		},
-		GOTOS => {
-			'c_if' => 36,
-			'varref' => 15,
-			'c_fn' => 25,
-			'exp' => 34,
-			'elseif' => 163,
-			'c_set' => 24,
-			'code_chunk' => 32,
-			'nonbrace' => 9,
-			'c_for' => 22,
-			'p10' => 13,
-			'p11' => 14,
-			'for' => 28,
-			'fn_def' => 29,
-			'fn' => 21
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"||" => 51,
+			"&&" => 50,
+			"&" => 52,
+			"-->" => 165,
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		}
 	},
 	{#State 160
 		DEFAULT => -24
 	},
 	{#State 161
-		DEFAULT => -17
+		DEFAULT => -15
 	},
 	{#State 162
 		ACTIONS => {
-			'literal' => 8,
-			'error' => 7,
-			"<!--" => 166,
-			"{{" => 4
-		},
-		GOTOS => {
-			'chunk' => 5
+			"IF" => 157,
+			"-->" => 166
 		}
 	},
 	{#State 163
 		ACTIONS => {
-			"-" => 12,
-			"NOT" => 11,
-			"{" => 10,
-			"(" => 16,
-			"!" => 20,
-			'literal' => 18,
-			'name' => 19
+			'literal' => 15,
+			"-" => 9,
+			"(" => 17,
+			"!" => 18,
+			"NOT" => 20,
+			"{" => 13,
+			'name' => 12
 		},
 		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'varref' => 15,
-			'nonbrace' => 9,
-			'exp' => 167
+			'varref' => 14,
+			'exp' => 167,
+			'p11' => 16,
+			'nonbrace' => 11,
+			'p10' => 19
 		}
 	},
 	{#State 164
-		DEFAULT => -15
-	},
-	{#State 165
 		ACTIONS => {
-			"IF" => 157,
-			"-->" => 168
-		}
-	},
-	{#State 166
-		ACTIONS => {
-			"FOREACH" => 26,
-			"FUNCTION" => 27,
-			"SET" => 35,
-			"(" => 16,
-			"!" => 20,
-			"MACRO" => 33,
-			'literal' => 18,
-			'name' => 19,
-			"-" => 12,
-			"BLOCK" => 31,
-			"NOT" => 11,
-			"{" => 10,
-			"FOR" => 23,
-			"IF" => 30,
-			"END" => 169
+			'literal' => 3,
+			'error' => 4,
+			"{{" => 5,
+			"<!--" => 168
 		},
 		GOTOS => {
-			'p10' => 13,
-			'p11' => 14,
-			'c_for' => 22,
-			'nonbrace' => 9,
-			'code_chunk' => 32,
-			'fn' => 21,
-			'for' => 28,
-			'fn_def' => 29,
-			'c_fn' => 25,
-			'exp' => 34,
-			'varref' => 15,
-			'c_if' => 36,
-			'c_set' => 24
+			'chunk' => 6
+		}
+	},
+	{#State 165
+		DEFAULT => -17
+	},
+	{#State 166
+		DEFAULT => -2,
+		GOTOS => {
+			'chunks' => 169
 		}
 	},
 	{#State 167
 		ACTIONS => {
-			"%" => 58,
-			"&" => 59,
-			">=" => 60,
-			".." => 61,
-			"&&" => 62,
-			"OR" => 63,
-			"!=" => 64,
-			"AND" => 65,
-			"+" => 49,
-			"<" => 48,
-			"/" => 47,
+			".." => 39,
+			"-" => 38,
+			"OR" => 41,
+			"<" => 40,
+			"+" => 42,
+			"%" => 43,
+			"==" => 44,
+			">=" => 45,
+			"*" => 47,
+			"!=" => 48,
+			"AND" => 49,
+			"||" => 51,
+			"&&" => 50,
+			"&" => 52,
 			"-->" => 170,
-			"XOR" => 51,
-			">" => 52,
-			"-" => 50,
-			"||" => 53,
-			"==" => 54,
-			"*" => 55,
-			"<=" => 57
+			"/" => 53,
+			"XOR" => 54,
+			"<=" => 55,
+			">" => 56
 		}
 	},
 	{#State 168
-		DEFAULT => -2,
+		ACTIONS => {
+			"SET" => 30,
+			"END" => 171,
+			"-" => 9,
+			"MACRO" => 21,
+			"{" => 13,
+			'name' => 12,
+			"BLOCK" => 22,
+			'literal' => 15,
+			"IF" => 32,
+			"(" => 17,
+			"!" => 18,
+			"FOR" => 33,
+			"NOT" => 20,
+			"FOREACH" => 27,
+			"FUNCTION" => 36
+		},
 		GOTOS => {
-			'chunks' => 171
+			'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
 		}
 	},
 	{#State 169
-		DEFAULT => -14
+		ACTIONS => {
+			'literal' => 3,
+			'error' => 4,
+			"{{" => 5,
+			"<!--" => 172
+		},
+		GOTOS => {
+			'chunk' => 6
+		}
 	},
 	{#State 170
 		DEFAULT => -18
 	},
 	{#State 171
-		ACTIONS => {
-			'literal' => 8,
-			"<!--" => 172,
-			"{{" => 4,
-			'error' => 7
-		},
-		GOTOS => {
-			'chunk' => 5
-		}
+		DEFAULT => -14
 	},
 	{#State 172
 		ACTIONS => {
-			"NOT" => 11,
-			"BLOCK" => 31,
-			"{" => 10,
-			"FOR" => 23,
-			"-" => 12,
+			"SET" => 30,
 			"END" => 173,
-			"IF" => 30,
-			"SET" => 35,
-			"(" => 16,
-			"FOREACH" => 26,
-			"FUNCTION" => 27,
-			'name' => 19,
-			'literal' => 18,
-			"!" => 20,
-			"MACRO" => 33
+			"-" => 9,
+			"MACRO" => 21,
+			"{" => 13,
+			'name' => 12,
+			"BLOCK" => 22,
+			'literal' => 15,
+			"IF" => 32,
+			"(" => 17,
+			"!" => 18,
+			"FOR" => 33,
+			"NOT" => 20,
+			"FOREACH" => 27,
+			"FUNCTION" => 36
 		},
 		GOTOS => {
-			'fn' => 21,
-			'fn_def' => 29,
-			'for' => 28,
-			'p11' => 14,
-			'p10' => 13,
-			'c_for' => 22,
-			'nonbrace' => 9,
-			'code_chunk' => 32,
+			'exp' => 29,
+			'nonbrace' => 11,
+			'for' => 31,
+			'code_chunk' => 23,
+			'varref' => 14,
+			'p11' => 16,
 			'c_set' => 24,
-			'c_fn' => 25,
-			'exp' => 34,
-			'c_if' => 36,
-			'varref' => 15
+			'p10' => 19,
+			'c_if' => 25,
+			'fn_def' => 26,
+			'c_for' => 34,
+			'c_fn' => 35,
+			'fn' => 28
 		}
 	},
 	{#State 173
@@ -2106,7 +2106,7 @@ sub new
 sub
 #line 74 "template.yp"
 {
-    $_[0]->{functions}->{main}->{body} = "sub fn_main {\nmy \$self = shift;\nmy \$stack = [];\nmy \$t = '';\n".$_[1]."\nreturn \$t;\n}\n";
+    $_[0]->{functions}->{':main'}->{body} = "sub {\nmy \$self = shift;\nmy \$stack = [];\nmy \$t = '';\n".$_[1]."\nreturn \$t;\n}\n";
     '';
   }
 	],
@@ -2257,7 +2257,7 @@ sub
       args => $_[4],
       line => $_[0]->{lexer}->line,
       pos => $_[0]->{lexer}->pos,
-      body => 'sub fn_'.$_[2],
+      body => '',
     };
   }
 	],
@@ -2266,7 +2266,7 @@ sub
 sub
 #line 145 "template.yp"
 {
-    $_[1]->{body} .= " {\nmy \$self = shift;\nreturn ".$_[3].";\n}\n";
+    $_[1]->{body} = "sub {\nmy \$self = shift;\nreturn ".$_[3].";\n}\n";
     '';
   }
 	],
@@ -2275,7 +2275,7 @@ sub
 sub
 #line 149 "template.yp"
 {
-    $_[1]->{body} .= " {\nmy \$self = shift;\nmy \$stack = [];\nmy \$t = '';\n".$_[3]."\nreturn \$t;\n}\n";
+    $_[1]->{body} = "sub {\nmy \$self = shift;\nmy \$stack = [];\nmy \$t = '';\n".$_[3]."\nreturn \$t;\n}\n";
     '';
   }
 	],
@@ -2285,7 +2285,7 @@ sub
 #line 154 "template.yp"
 {
     my @varref = @{$_[2]};
-    my @exp = @_{$_[4]};
+    my @exp = @{$_[4]};
     my $cs = $_[6];
     #{
     my $varref_index = substr($varref[0], 0, -1) . ".'_index'}";
@@ -2544,7 +2544,7 @@ sub
 sub
 #line 260 "template.yp"
 {
-    [ "\$self->{template}->call_block('".addcslashes($_[1], "'")."', { ".$_[3]." }, '".addcslashes($_[0]->{lexer}->errorinfo(), "'")."')", 1 ];
+    [ "\$self->_call_block('".addcslashes($_[1], "'")."', { ".$_[3]." }, '".addcslashes($_[0]->{lexer}->errorinfo(), "'")."')", 1 ];
   }
 	],
 	[#Rule 64
diff --git a/template.yp b/template.yp
index 0fe4bd0..009e4e8 100644
--- a/template.yp
+++ b/template.yp
@@ -72,7 +72,7 @@
 %%
 
 template: chunks {
-    $_[0]->{functions}->{main}->{body} = "sub {\nmy \$self = shift;\nmy \$stack = [];\nmy \$t = '';\n".$_[1]."\nreturn \$t;\n}\n";
+    $_[0]->{functions}->{':main'}->{body} = "sub {\nmy \$self = shift;\nmy \$stack = [];\nmy \$t = '';\n".$_[1]."\nreturn \$t;\n}\n";
     '';
   }
 ;
@@ -153,7 +153,7 @@ c_fn: fn_def '=' exp {
 ;
 c_for: for varref '=' exp '-->' chunks '<!--' 'END' {
     my @varref = @{$_[2]};
-    my @exp = @_{$_[4]};
+    my @exp = @{$_[4]};
     my $cs = $_[6];
     #{
     my $varref_index = substr($varref[0], 0, -1) . ".'_index'}";