puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/parser/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 
@@ -21,7 +21,7 @@ module Puppet
   module Parser
     class Parser < Racc::Parser
 
-module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 764)
+module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 794)
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -34,94 +34,101 @@ require 'puppet/parser/parser_support'
 ##### State transition tables begin ###
 
 clist = [
-'183,187,245,69,248,70,241,290,169,9,17,69,351,190,194,199,333,169,71',
-'-175,291,305,182,185,191,193,168,100,-156,9,17,235,236,9,17,168,175',
-'88,166,92,200,345,67,251,343,184,189,171,100,195,196,177,178,180,181',
-'77,186,192,9,17,245,143,88,179,92,102,76,171,104,303,31,91,142,168,48',
-'241,312,148,18,82,77,313,36,9,17,95,102,35,302,104,371,76,346,35,51',
-'31,91,-111,52,48,347,9,17,18,82,235,236,36,35,345,95,40,343,47,1,143',
-'10,15,35,25,31,38,100,44,48,3,142,115,18,9,17,148,36,88,76,92,51,54',
-'31,136,52,239,48,35,51,-162,18,18,52,238,36,77,-111,-111,-111,-111,262',
-'9,17,261,102,35,76,104,369,250,31,91,143,-104,48,247,241,243,18,82,51',
-'320,36,142,52,95,35,327,148,40,330,47,1,35,10,15,143,25,31,38,155,44',
-'48,3,9,17,18,142,223,322,36,296,148,227,9,17,234,64,88,235,236,35,195',
-'196,177,178,62,63,223,186,192,162,40,227,47,1,179,10,15,288,25,31,38',
-'286,44,48,3,76,328,18,329,31,91,36,106,48,9,17,-157,18,88,-158,92,36',
-'35,195,196,177,178,180,181,-156,186,192,35,-155,186,192,77,179,282,9',
-'17,179,195,196,177,178,367,76,35,186,192,31,91,35,263,48,179,186,192',
-'18,82,252,250,36,179,247,95,40,245,47,1,162,10,15,35,25,31,38,244,44',
-'48,3,241,243,18,9,17,168,36,88,257,92,177,178,241,256,331,186,192,35',
-'241,243,9,17,179,229,88,77,92,177,178,228,292,221,186,192,241,256,76',
-'218,197,179,31,91,77,338,48,155,340,341,18,82,-103,106,36,76,-161,95',
-'342,31,91,-159,-157,48,-160,35,-158,18,82,9,17,36,306,88,95,92,64,-155',
-'354,9,17,-162,35,88,356,92,-208,119,162,9,17,77,-28,-28,-28,-28,58,59',
-'60,56,357,77,76,155,151,70,31,91,119,115,48,360,76,247,18,82,31,91,36',
-'107,48,95,76,106,18,82,31,136,36,35,48,95,9,17,18,364,-157,366,36,35',
-'97,-158,9,17,72,61,88,55,92,35,-24,-24,-24,-24,58,59,60,56,372,373,40',
-',47,1,77,10,15,,25,31,38,,44,48,3,76,,18,,31,91,36,,48,,285,,18,82,',
-',36,35,,95,190,194,-22,-22,-22,-22,,35,,182,185,191,193,,,,,,,,9,17',
-',,109,,-175,,,,,,184,189,,,195,196,177,178,180,181,108,186,192,9,17',
-',,88,179,92,,76,,,,31,91,,,48,9,17,,18,88,77,92,36,,,,,,,,,76,,35,,31',
-'91,77,,48,,,,18,82,,,36,76,,95,,31,91,,,48,,35,,18,82,9,17,36,,88,95',
-'92,,,,9,17,,35,88,,92,,,,,,77,,,,,,,,,,77,76,,9,17,31,91,,,48,359,76',
-',18,82,31,91,36,,48,95,,,18,82,,,36,35,,95,40,,47,1,,10,15,35,25,31',
-'38,,44,48,3,,,18,9,17,,36,88,,92,,,,9,17,,,35,,,,,,9,17,77,,,,137,,',
-',,,,76,,,,31,91,,,48,,76,51,18,82,31,126,36,44,48,95,76,,18,,31,136',
-'36,35,48,9,17,,18,88,,92,36,35,,9,17,,,88,,92,,35,,9,17,77,,88,,92,',
-',,,,77,76,,,,31,91,,,48,77,76,,18,82,31,91,36,,48,95,76,,18,82,31,91',
-'36,35,48,95,,,18,82,9,17,36,35,88,95,92,,,,9,17,,35,,,,,,,9,17,77,,88',
-',92,,,,,,,76,,,,31,91,,,48,77,76,,18,82,31,136,36,,48,95,76,,18,,31',
-'91,36,35,48,,,,18,82,9,17,36,35,88,95,92,,,,9,17,,35,88,,92,,,,9,17',
-'77,,88,,92,,,,,,77,76,,,,31,91,,,48,77,76,,18,82,31,91,36,,48,95,76',
-',18,82,31,91,36,35,48,95,,,18,82,9,17,36,35,88,95,92,,,,9,17,,35,88',
-',92,,,,9,17,77,,,,,,,,,,77,76,,,,31,91,,,48,,76,,18,82,31,91,36,,48',
-'95,76,,18,82,31,136,36,35,48,95,,,18,,9,17,36,35,88,,92,,,,9,17,,35',
-'88,,92,,,,9,17,77,,88,,92,,,,,,77,76,,,,31,91,,,48,77,76,,18,82,31,91',
-'36,,48,95,76,,18,82,31,91,36,35,48,95,,,18,82,9,17,36,35,88,95,92,,',
-',9,17,,35,88,,92,,,,9,17,77,,,,,349,,,,,77,76,,,,31,91,,,48,,76,,18',
-'82,31,91,36,,48,95,76,,18,82,31,136,36,35,48,95,,,18,,9,17,36,35,88',
-',92,,,,9,17,,35,88,,92,,,,9,17,77,,88,,92,,,,,,77,76,,,,31,91,,,48,77',
-'76,,18,82,31,91,36,,48,95,76,,18,82,31,91,36,35,48,95,,,18,82,9,17,36',
-'35,,95,,308,,,,,,35,,195,196,177,178,180,181,,186,192,,9,17,,40,179',
-'47,1,,10,15,,25,31,38,,44,48,3,,,18,9,17,,36,88,,92,40,,47,1,,10,15',
-'35,25,31,38,,44,48,3,77,,18,9,17,,36,88,,92,,76,,,,31,91,35,,48,,,,18',
-'82,77,,36,9,17,95,,88,,92,,76,,35,,31,91,,,48,,,,18,82,77,,36,9,17,95',
-',88,,92,,76,,35,,31,91,,,48,,,,18,82,77,,36,9,17,95,,,,,,76,,35,,31',
-'91,9,17,48,,88,,18,82,,,36,,,95,40,,47,1,,10,15,35,25,31,38,,44,48,3',
-',,18,,76,,36,,31,136,,,48,,,,18,35,9,17,36,,88,,92,,,,9,17,,35,88,,92',
-',,,9,17,77,,88,,,,,,,,77,76,,,,31,91,,,48,,76,,18,82,31,91,36,,48,95',
-'76,,18,82,31,210,36,35,48,95,,,18,,9,17,36,35,88,,92,,,,9,17,,35,88',
-'166,92,,,,,,77,215,,,,,,,,,77,76,,9,17,31,91,,,48,336,76,,18,82,31,91',
-'36,,48,95,,,18,82,,,36,35,,95,40,,47,1,,10,15,35,25,31,38,,44,48,3,',
-',18,9,17,,36,88,,92,,,,,,,,35,,,9,17,,,88,77,92,,,,,,,,,,76,,,,31,91',
-'77,258,48,,,,18,82,,,36,76,,95,,31,91,9,17,48,,35,232,18,82,,,36,,,95',
-',190,194,,,,,35,,,182,185,191,193,,,,9,17,76,51,88,,31,126,,44,48,,',
-',18,,184,189,36,,195,196,177,178,180,181,,186,192,35,,,,76,179,,,31',
-'91,,,48,,219,,18,,,,36,,,190,194,,,,,220,,35,182,185,191,193,,,190,194',
-',,,,,,,182,185,191,193,,,,,184,189,,,195,196,177,178,180,181,,186,192',
-',,184,189,,179,195,196,177,178,180,181,,186,192,190,194,,,,179,,,,182',
-'185,191,193,,,190,194,,,,,,,,182,185,191,193,,,,,,,,,195,196,177,178',
-'180,181,,186,192,,,184,189,,179,195,196,177,178,180,181,,186,192,190',
-'194,,,,179,,,,182,185,191,193,,,190,194,,,,,,,,182,185,191,193,,,,,184',
-'189,,,195,196,177,178,180,181,,186,192,,,184,189,,179,195,196,177,178',
-'180,181,,186,192,190,194,,,,179,,,,182,185,191,193,,,190,194,,,,,,,',
-'182,185,191,193,,,,,184,189,,,195,196,177,178,180,181,,186,192,,,184',
-'189,,179,195,196,177,178,180,181,,186,192,190,194,,,,179,,,,182,185',
-'191,193,,,190,194,,,,,,,,182,185,191,193,,,,,184,189,,,195,196,177,178',
-'180,181,,186,192,,,184,189,,179,195,196,177,178,180,181,,186,192,190',
-'194,,,,179,,,,182,185,191,193,,,190,194,,,,,,,255,182,185,191,193,,',
-',,184,189,,,195,196,177,178,180,181,,186,192,,,184,189,,179,195,196',
-'177,178,180,181,,186,192,190,194,,,,179,,,,182,185,191,193,,,190,194',
-',,,,,,,182,185,191,193,,,,,184,189,,,195,196,177,178,180,181,,186,192',
-',,184,189,,179,195,196,177,178,180,181,,186,192,190,194,,,,179,,,,182',
-'185,191,193,,,190,194,,,,,,,,182,185,191,193,,,,,,189,,,195,196,177',
-'178,180,181,,186,192,,,,,,179,195,196,177,178,180,181,,186,192,190,194',
-',,,179,,,,182,185,191,193,,,,194,,,,,,,,182,,,,,,,,,,194,,195,196,177',
-'178,180,181,182,186,192,,,,,194,179,195,196,177,178,180,181,182,186',
-'192,,,,,,179,,194,,195,196,177,178,180,181,182,186,192,,,,,,179,195',
-'196,177,178,180,181,,186,192,,,,,,179,,,,195,196,177,178,180,181,,186',
-'192,,,,,,179' ]
-        racc_action_table = arr = Array.new(2325, nil)
+'9,13,167,168,103,155,370,103,282,105,173,281,293,53,371,142,146,54,274',
+'313,292,-177,106,154,137,139,143,145,40,94,48,1,314,10,12,174,21,29',
+'35,357,44,49,2,9,13,15,102,138,141,34,317,148,149,132,133,135,136,-176',
+'140,144,33,9,13,305,302,134,8,98,274,299,99,40,350,48,1,367,10,12,366',
+'21,29,35,337,44,49,2,9,13,15,33,296,297,34,396,64,326,296,297,29,222',
+'9,13,49,33,9,13,15,161,72,8,34,53,-112,325,40,54,48,1,343,10,12,33,21',
+'29,35,154,44,49,2,9,13,15,155,119,-196,34,394,64,160,90,179,29,75,-123',
+'94,49,33,-183,154,15,154,178,8,34,9,13,183,40,309,48,1,340,10,12,33',
+'21,29,35,308,44,49,2,9,13,15,179,277,322,34,392,274,275,98,306,86,99',
+'178,142,146,33,304,183,160,84,85,8,137,139,143,145,40,94,48,1,33,10',
+'12,53,21,29,35,54,44,49,2,9,13,15,15,138,141,34,302,148,149,132,133',
+'135,136,334,140,144,33,9,13,132,133,134,8,98,140,144,99,40,291,48,1',
+'134,10,12,286,21,29,35,-130,44,49,2,9,13,15,33,335,53,34,271,64,54,179',
+'179,29,222,274,360,49,33,140,144,15,178,178,8,34,134,183,183,40,367',
+'48,1,366,10,12,33,21,29,35,283,44,49,2,9,13,15,-178,72,33,34,33,-130',
+'-130,-130,-130,249,148,149,132,133,33,9,13,140,144,295,8,342,296,297',
+'134,205,206,208,189,191,64,195,197,200,239,243,248,207,247,232,9,13',
+'15,225,199,202,244,347,64,132,133,188,29,222,140,144,49,33,9,13,15,134',
+'190,194,34,140,144,105,40,172,48,1,134,10,12,33,21,29,35,306,44,49,2',
+'9,13,15,123,354,315,34,117,64,274,275,-182,29,222,-177,-180,49,33,9',
+'13,15,300,72,8,34,274,299,-178,40,332,48,1,363,10,12,33,21,29,35,-122',
+'44,49,2,9,13,15,-181,364,338,34,381,64,274,299,331,29,75,-179,-176,49',
+'33,372,-183,15,86,375,8,34,376,123,249,40,379,48,1,121,10,12,33,21,29',
+'35,119,44,49,2,9,13,15,330,382,117,34,329,-178,383,9,13,-179,109,113',
+'-227,-196,33,-40,-40,-40,-40,107,8,59,60,61,57,40,385,48,1,112,10,12',
+'-129,21,29,35,92,44,49,2,64,388,15,-184,29,75,34,390,49,9,13,302,15',
+'72,117,78,34,33,-96,9,13,-179,56,8,397,398,,33,,9,13,65,,72,,78,-44',
+'-44,-44,-44,,,64,,,,29,75,,,49,65,64,53,15,68,29,129,34,44,49,83,64',
+',15,,29,75,34,33,49,,,,15,68,9,13,34,33,72,83,78,,,,9,13,,33,72,,78',
+',,,9,13,65,,72,,78,-38,-38,-38,-38,,65,64,,,,29,75,,,49,65,64,,15,68',
+'29,75,34,,49,83,64,,15,68,29,75,34,33,49,83,,,15,68,9,13,34,33,72,83',
+'78,,284,148,149,132,133,33,,,140,144,142,146,,,65,134,,,,137,139,143',
+'145,,,64,,,,29,75,,,49,,9,13,15,68,72,,34,138,141,83,,148,149,132,133',
+'135,136,33,140,144,9,13,,,72,134,78,,,,9,13,,64,72,,78,29,222,,,49,65',
+',,15,,,,34,,,65,64,,,,29,75,,33,49,,64,,15,68,29,75,34,,49,83,,,15,68',
+'9,13,34,33,72,83,78,,,,9,13,,33,72,,78,59,60,61,57,,65,,,,,,,,,,65,64',
+',,,29,75,,,49,,64,,15,68,29,75,34,,49,83,,,15,68,9,13,34,33,72,83,78',
+',,,9,13,,33,72,152,78,,,,9,13,65,278,,,,369,,,,,65,64,,,,29,75,,,49',
+',64,,15,68,29,75,34,,49,83,64,,15,68,29,222,34,33,49,83,,,15,,9,13,34',
+'33,72,,78,,,,9,13,,33,72,,78,,,,9,13,65,,72,,78,,,,,,65,64,,,,29,75',
+',,49,65,64,,15,68,29,75,34,,49,83,64,,15,68,29,75,34,33,49,83,,,15,68',
+'9,13,34,33,72,83,78,,,,9,13,,33,72,,78,,,,9,13,65,,72,,78,,,,,,65,64',
+',,,29,75,,,49,65,64,,15,68,29,75,34,,49,83,64,,15,68,29,75,34,33,49',
+'83,,,15,68,9,13,34,33,72,83,78,,,,9,13,,33,72,,78,,,,9,13,65,,72,,78',
+',,,,,65,64,,,,29,75,,,49,65,64,,15,68,29,75,34,,49,83,64,,15,68,29,75',
+'34,33,49,83,,,15,68,9,13,34,33,72,83,78,,,,9,13,,33,72,,78,,,,9,13,65',
+',72,,78,,,,,,65,64,,,,29,75,,,49,65,64,,15,68,29,75,34,,49,83,64,,15',
+'68,29,75,34,33,49,83,,,15,68,9,13,34,33,72,83,78,,,,9,13,,33,,,,,,,9',
+'13,65,,72,,78,,,,,,,64,,,,29,75,,,49,65,64,53,15,68,29,129,34,44,49',
+'83,64,,15,,29,75,34,33,49,,,,15,68,9,13,34,33,72,83,78,,,,9,13,,33,72',
+',78,,,,9,13,65,,72,,78,,,,,,65,64,,,,29,75,,,49,65,64,,15,68,29,75,34',
+',49,83,64,,15,68,29,75,34,33,49,83,,,15,68,9,13,34,33,72,83,78,,,,9',
+'13,,33,72,,78,,,,9,13,65,,72,,78,,,,,,65,64,,,,29,75,,,49,65,64,,15',
+'68,29,75,34,,49,83,64,,15,68,29,75,34,33,49,83,,,15,68,9,13,34,33,72',
+'83,78,,,,9,13,,33,72,,78,,,,9,13,65,,,,223,,,,,,65,64,,,,29,75,,,49',
+',64,,15,68,29,75,34,,49,83,64,,15,68,29,222,34,33,49,83,,,15,,9,13,34',
+'33,72,,78,,,,,,,33,,,,9,13,,,72,65,78,,,,,,,,,,64,,,,29,75,65,226,49',
+',,,15,68,,,34,64,,83,,29,75,,,49,,33,,15,68,,,34,9,13,83,,72,152,78',
+',,,33,,,,,,,9,13,,,72,65,78,,,,,,,,,,64,,,,29,75,65,,49,,,,15,68,,,34',
+'64,,83,,29,75,,,49,,33,,15,68,9,13,34,,72,83,78,,,,9,13,,33,72,,78,',
+',,9,13,65,,72,,78,,,,,,65,64,,,,29,75,,,49,65,64,,15,68,29,75,34,,49',
+'83,64,,15,68,29,75,34,33,49,83,,,15,68,9,13,34,33,72,83,78,,,230,,,',
+'33,,,,,142,146,,,65,,,,,137,139,143,145,,,64,,,,29,75,,,49,,,,15,68',
+',,34,138,141,83,,148,149,132,133,135,136,33,140,144,147,,,,,134,,,,142',
+'146,,,,,229,,,137,139,143,145,,,142,146,,,,,,,,137,139,143,145,,,,,138',
+'141,,,148,149,132,133,135,136,,140,144,,,138,141,,134,148,149,132,133',
+'135,136,,140,144,142,146,,,,134,,,,137,139,143,145,,,142,146,,,,,,,253',
+'137,139,143,145,,,,,138,141,,,148,149,132,133,135,136,,140,144,,,138',
+'141,,134,148,149,132,133,135,136,,140,144,142,146,,,,134,,,,137,139',
+'143,145,,,142,146,,,,,,,,137,139,143,145,,,,,,141,,,148,149,132,133',
+'135,136,,140,144,,,138,141,,134,148,149,132,133,135,136,,140,144,142',
+'146,,,,134,,,,137,139,143,145,,,142,146,,,,,,,,137,139,143,145,,,,,138',
+'141,,,148,149,132,133,135,136,,140,144,,,,,,134,148,149,132,133,135',
+'136,,140,144,142,146,,,,134,,,,137,139,143,145,,,142,146,,,,,,,,137',
+'139,143,145,,,,,,,,,148,149,132,133,135,136,,140,144,,,138,141,,134',
+'148,149,132,133,135,136,,140,144,142,146,,,,134,,,,137,139,143,145,',
+',142,146,,,,,,,,137,139,143,145,,,,,138,141,,,148,149,132,133,135,136',
+',140,144,,,138,141,,134,148,149,132,133,135,136,,140,144,142,146,,,',
+'134,,,,137,139,143,145,,,142,146,,,,,,,,137,139,143,145,,,,,138,141',
+',,148,149,132,133,135,136,,140,144,,,138,141,,134,148,149,132,133,135',
+'136,,140,144,142,146,,,,134,,,,137,139,143,145,,,142,146,,,,,,,,137',
+'139,143,145,,,,,138,141,146,,148,149,132,133,135,136,137,140,144,,,',
+',146,134,148,149,132,133,135,136,137,140,144,,,,,,134,,146,,148,149',
+'132,133,135,136,137,140,144,,,,,146,134,148,149,132,133,135,136,137',
+'140,144,,,,,,134,,,,148,149,132,133,135,136,,140,144,,,,,,134,148,149',
+'132,133,135,136,,140,144,205,206,208,189,191,134,195,197,200,201,215',
+',207,209,,,,,,199,202,204,205,206,208,189,191,,195,197,200,201,215,',
+'207,209,,190,194,,,199,202,204,205,206,208,189,191,,195,197,200,201',
+'203,,207,209,,190,194,,,199,202,204,205,206,208,189,191,,195,197,200',
+'201,203,,207,209,,190,194,,,199,202,204,205,206,208,189,191,,195,197',
+'200,201,203,,207,209,,190,194,,,199,202,204,205,206,208,189,191,,195',
+'197,200,201,215,,207,209,,190,194,,,199,202,204,148,149,132,133,135',
+'136,,140,144,,,,,,134,190,194,148,149,132,133,135,136,,140,144,,,,,',
+'134' ]
+        racc_action_table = arr = ::Array.new(2419, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -131,102 +138,109 @@ clist = [
         end
 
 clist = [
-'96,96,162,12,157,12,216,216,91,261,261,79,304,96,96,105,261,126,12,126',
-'216,225,96,96,96,96,91,25,79,92,92,157,157,88,88,126,92,88,88,88,105',
-'296,12,162,296,96,96,261,200,96,96,96,96,96,96,88,96,96,238,238,210',
-'71,238,96,238,25,88,92,25,224,88,88,71,210,88,231,231,71,88,88,238,233',
-'88,366,366,88,200,25,223,200,366,238,298,88,1,238,238,292,1,238,298',
-'220,220,238,238,233,233,238,200,342,238,366,342,366,366,143,366,366',
-'238,366,366,366,199,366,366,366,143,221,366,239,239,143,366,239,220',
-'239,11,2,220,220,11,150,220,366,15,2,220,11,15,150,220,239,292,292,292',
-'292,172,364,364,172,199,220,239,199,364,240,239,239,237,215,239,214',
-'259,259,239,239,252,246,239,237,252,239,199,252,237,364,259,364,364',
-'239,364,364,67,364,364,364,247,364,364,364,219,219,364,67,119,249,364',
-'219,67,119,218,218,145,10,218,145,145,364,268,268,268,268,10,10,305',
-'268,268,250,219,305,219,219,268,219,219,213,219,219,219,211,219,219',
-'219,218,254,219,256,218,218,219,209,218,242,242,207,218,242,205,242',
-'218,219,279,279,279,279,279,279,204,279,279,218,203,264,264,242,279',
-'198,358,358,264,267,267,267,267,358,242,192,267,267,242,242,186,174',
-'242,267,265,265,242,242,163,159,242,265,156,242,358,155,358,358,151',
-'358,358,242,358,358,358,152,358,358,358,152,152,358,245,245,136,358',
-'245,167,245,280,280,167,167,260,280,280,358,260,260,17,17,280,131,17',
-'245,17,281,281,121,217,117,281,281,217,217,245,110,97,281,245,245,17',
-'287,245,288,289,290,245,245,291,90,245,17,89,245,295,17,17,86,85,17',
-'81,245,80,17,17,251,251,17,227,251,17,251,76,75,307,263,263,74,17,263',
-'311,263,312,73,72,346,346,251,7,7,7,7,4,4,4,4,317,263,251,70,68,65,251',
-'251,53,47,251,335,263,339,251,251,263,263,251,37,263,251,346,32,263',
-'263,346,346,263,251,346,263,24,24,346,345,22,347,346,263,21,19,343,343',
-'13,8,343,3,343,346,50,50,50,50,49,49,49,49,368,370,24,,24,24,343,24',
-'24,,24,24,24,,24,24,24,343,,24,,343,343,24,,343,,202,,343,343,,,343',
-'24,,343,202,202,42,42,42,42,,343,,202,202,202,202,,,,,,,,38,38,,,38',
-',38,,,,,,202,202,,,202,202,202,202,202,202,38,202,202,40,40,,,40,202',
-'40,,38,,,,38,38,,,38,44,44,,38,44,40,44,38,,,,,,,,,40,,38,,40,40,44',
-',40,,,,40,40,,,40,44,,40,,44,44,,,44,,40,,44,44,196,196,44,,196,44,196',
-',,,195,195,,44,195,,195,,,,,,196,,,,,,,,,,195,196,,328,328,196,196,',
-',196,328,195,,196,196,195,195,196,,195,196,,,195,195,,,195,196,,195',
-'328,,328,328,,328,328,195,328,328,328,,328,328,328,,,328,54,54,,328',
-'54,,54,,,,57,57,,,328,,,,,,61,61,54,,,,61,,,,,,,54,,,,54,54,,,54,,57',
-'57,54,54,57,57,54,57,57,54,61,,57,,61,61,57,54,61,62,62,,61,62,,62,61',
-'57,,63,63,,,63,,63,,61,,64,64,62,,64,,64,,,,,,63,62,,,,62,62,,,62,64',
-'63,,62,62,63,63,62,,63,62,64,,63,63,64,64,63,62,64,63,,,64,64,194,194',
-'64,63,194,64,194,,,,137,137,,64,,,,,,,193,193,194,,193,,193,,,,,,,194',
-',,,194,194,,,194,193,137,,194,194,137,137,194,,137,194,193,,137,,193',
-'193,137,194,193,,,,193,193,69,69,193,137,69,193,69,,,,191,191,,193,191',
-',191,,,,190,190,69,,190,,190,,,,,,191,69,,,,69,69,,,69,190,191,,69,69',
-'191,191,69,,191,69,190,,191,191,190,190,191,69,190,191,,,190,190,189',
-'189,190,191,189,190,189,,,,185,185,,190,185,,185,,,,310,310,189,,,,',
-',,,,,185,189,,,,189,189,,,189,,185,,189,189,185,185,189,,185,189,310',
-',185,185,310,310,185,189,310,185,,,310,,306,306,310,185,306,,306,,,',
-'184,184,,310,184,,184,,,,77,77,306,,77,,77,,,,,,184,306,,,,306,306,',
-',306,77,184,,306,306,184,184,306,,184,306,77,,184,184,77,77,184,306',
-'77,184,,,77,77,183,183,77,184,183,77,183,,,,302,302,,77,302,,302,,,',
-'300,300,183,,,,,300,,,,,302,183,,,,183,183,,,183,,302,,183,183,302,302',
-'183,,302,183,300,,302,302,300,300,302,183,300,302,,,300,,82,82,300,302',
-'82,,82,,,,182,182,,300,182,,182,,,,181,181,82,,181,,181,,,,,,182,82',
-',,,82,82,,,82,181,182,,82,82,182,182,82,,182,82,181,,182,182,181,181',
-'182,82,181,182,,,181,181,228,228,181,182,,181,,228,,,,,,181,,269,269',
-'269,269,269,269,,269,269,,294,294,,228,269,228,228,,228,228,,228,228',
-'228,,228,228,228,,,228,180,180,,228,180,,180,294,,294,294,,294,294,228',
-'294,294,294,,294,294,294,180,,294,179,179,,294,179,,179,,180,,,,180',
-'180,294,,180,,,,180,180,179,,180,178,178,180,,178,,178,,179,,180,,179',
-'179,,,179,,,,179,179,178,,179,95,95,179,,95,,95,,178,,179,,178,178,',
-',178,,,,178,178,95,,178,0,0,178,,,,,,95,,178,,95,95,286,286,95,,286',
-',95,95,,,95,,,95,0,,0,0,,0,0,95,0,0,0,,0,0,0,,,0,,286,,0,,286,286,,',
-'286,,,,286,0,177,177,286,,177,,177,,,,106,106,,286,106,,106,,,,107,107',
-'177,,107,,,,,,,,106,177,,,,177,177,,,177,,106,,177,177,106,106,177,',
-'106,177,107,,106,106,107,107,106,177,107,106,,,107,,108,108,107,106',
-'108,,108,,,,109,109,,107,109,109,109,,,,,,108,108,,,,,,,,,109,108,,282',
-'282,108,108,,,108,282,109,,108,108,109,109,108,,109,108,,,109,109,,',
-'109,108,,109,282,,282,282,,282,282,109,282,282,282,,282,282,282,,,282',
-'169,169,,282,169,,169,,,,,,,,282,,,168,168,,,168,169,168,,,,,,,,,,169',
-',,,169,169,168,168,169,,,,169,169,,,169,168,,169,,168,168,118,118,168',
-',169,140,168,168,,,168,,,168,,140,140,,,,,168,,,140,140,140,140,,,,229',
-'229,118,118,229,,118,118,,118,118,,,,118,,140,140,118,,140,140,140,140',
-'140,140,,140,140,118,,,,229,140,,,229,229,,,229,,113,,229,,,,229,,,113',
-'113,,,,,114,,229,113,113,113,113,,,114,114,,,,,,,,114,114,114,114,,',
-',,113,113,,,113,113,113,113,113,113,,113,113,,,114,114,,113,114,114',
-'114,114,114,114,,114,114,316,316,,,,114,,,,316,316,316,316,,,319,319',
-',,,,,,,319,319,319,319,,,,,,,,,316,316,316,316,316,316,,316,316,,,319',
-'319,,316,319,319,319,319,319,319,,319,319,324,324,,,,319,,,,324,324',
-'324,324,,,138,138,,,,,,,,138,138,138,138,,,,,324,324,,,324,324,324,324',
-'324,324,,324,324,,,138,138,,324,138,138,138,138,138,138,,138,138,139',
-'139,,,,138,,,,139,139,139,139,,,318,318,,,,,,,,318,318,318,318,,,,,139',
-'139,,,139,139,139,139,139,139,,139,139,,,318,318,,139,318,318,318,318',
-'318,318,,318,318,122,122,,,,318,,,,122,122,122,122,,,353,353,,,,,,,',
-'353,353,353,353,,,,,122,122,,,122,122,122,122,122,122,,122,122,,,353',
-'353,,122,353,353,353,353,353,353,,353,353,334,334,,,,353,,,,334,334',
-'334,334,,,164,164,,,,,,,164,164,164,164,164,,,,,334,334,,,334,334,334',
-'334,334,334,,334,334,,,164,164,,334,164,164,164,164,164,164,,164,164',
-'350,350,,,,164,,,,350,350,350,350,,,153,153,,,,,,,,153,153,153,153,',
-',,,350,350,,,350,350,350,350,350,350,,350,350,,,153,153,,350,153,153',
-'153,153,153,153,,153,153,271,271,,,,153,,,,271,271,271,271,,,274,274',
-',,,,,,,274,274,274,274,,,,,,271,,,271,271,271,271,271,271,,271,271,',
-',,,,271,274,274,274,274,274,274,,274,274,315,315,,,,274,,,,315,315,315',
-'315,,,,272,,,,,,,,272,,,,,,,,,,276,,315,315,315,315,315,315,276,315',
-'315,,,,,275,315,272,272,272,272,272,272,275,272,272,,,,,,272,,278,,276',
-'276,276,276,276,276,278,276,276,,,,,,276,275,275,275,275,275,275,,275',
-'275,,,,,,275,,,,278,278,278,278,278,278,,278,278,,,,,,278' ]
-        racc_action_check = arr = Array.new(2325, nil)
+'0,0,88,88,71,75,320,23,156,23,95,156,177,12,320,88,88,12,227,227,177',
+'71,23,75,88,88,88,88,0,174,0,0,227,0,0,95,0,0,0,307,0,0,0,229,229,0',
+'23,88,88,0,229,88,88,88,88,88,88,237,88,88,0,230,230,210,236,88,0,174',
+'279,279,174,229,294,229,229,317,229,229,317,229,229,229,279,229,229',
+'229,390,390,229,174,210,210,229,390,230,235,294,294,230,230,78,78,230',
+'229,309,309,230,78,309,229,230,286,243,233,390,286,390,390,286,390,390',
+'230,390,390,390,243,390,390,390,388,388,390,129,232,129,390,388,309',
+'78,14,179,309,309,226,173,309,390,14,222,309,129,179,390,309,281,281',
+'179,388,219,388,388,281,388,388,309,388,388,388,215,388,388,388,380',
+'380,388,106,153,231,388,380,153,153,173,212,10,173,106,231,231,388,198',
+'106,281,10,10,388,231,231,231,231,380,21,380,380,173,380,380,22,380',
+'380,380,22,380,380,380,269,269,380,22,231,231,380,193,231,231,231,231',
+'231,231,270,231,231,380,361,361,273,273,231,380,21,273,273,21,269,175',
+'269,269,273,269,269,166,269,269,269,315,269,269,269,147,147,269,21,275',
+'1,269,147,361,1,102,298,361,361,311,311,361,269,254,254,361,102,298',
+'269,361,254,102,298,147,364,147,147,364,147,147,361,147,147,147,158',
+'147,147,147,121,121,147,242,121,144,147,140,315,315,315,315,123,257',
+'257,257,257,147,370,370,257,257,184,147,285,184,184,257,121,121,121',
+'121,121,121,121,121,121,121,121,122,121,121,118,291,291,121,110,121',
+'121,121,291,370,272,272,104,370,370,272,272,370,121,223,223,370,272',
+'121,121,370,255,255,100,291,92,291,291,255,291,291,370,291,291,291,301',
+'291,291,291,26,26,291,87,303,228,291,82,223,228,228,81,223,223,238,79',
+'223,291,225,225,223,187,225,291,223,187,187,77,26,251,26,26,313,26,26',
+'223,26,26,26,314,26,26,26,342,342,26,74,316,280,26,342,225,280,280,250',
+'225,225,73,69,225,26,324,67,225,64,327,26,225,328,55,332,342,333,342',
+'342,50,342,342,225,342,342,342,48,342,342,342,248,248,342,249,346,45',
+'342,248,36,352,35,35,30,28,35,360,35,342,4,4,4,4,24,342,5,5,5,5,248',
+'362,248,248,35,248,248,239,248,248,248,20,248,248,248,35,367,248,247',
+'35,35,248,371,35,8,8,374,35,8,246,8,35,248,244,58,58,240,2,248,393,395',
+',35,,40,40,8,,40,,40,11,11,11,11,,,8,,,,8,8,,,8,40,58,58,8,8,58,58,8',
+'58,58,8,40,,58,,40,40,58,8,40,,,,40,40,44,44,40,58,44,40,44,,,,283,283',
+',40,283,,283,,,,167,167,44,,167,,167,47,47,47,47,,283,44,,,,44,44,,',
+'44,167,283,,44,44,283,283,44,,283,44,167,,283,283,167,167,283,44,167',
+'283,,,167,167,330,330,167,283,330,167,330,,165,258,258,258,258,167,',
+',258,258,165,165,,,330,258,,,,165,165,165,165,,,330,,,,330,330,,,330',
+',325,325,330,330,325,,330,165,165,330,,165,165,165,165,165,165,330,165',
+'165,65,65,,,65,165,65,,,,276,276,,325,276,,276,325,325,,,325,65,,,325',
+',,,325,,,276,65,,,,65,65,,325,65,,276,,65,65,276,276,65,,276,65,,,276',
+'276,13,13,276,65,13,276,13,,,,155,155,,276,155,,155,16,16,16,16,,13',
+',,,,,,,,,155,13,,,,13,13,,,13,,155,,13,13,155,155,13,,155,13,,,155,155',
+'154,154,155,13,154,155,154,,,,72,72,,155,72,72,72,,,,318,318,154,154',
+',,,318,,,,,72,154,,,,154,154,,,154,,72,,154,154,72,72,154,,72,154,318',
+',72,72,318,318,72,154,318,72,,,318,,149,149,318,72,149,,149,,,,148,148',
+',318,148,,148,,,,146,146,149,,146,,146,,,,,,148,149,,,,149,149,,,149',
+'146,148,,149,149,148,148,149,,148,149,146,,148,148,146,146,148,149,146',
+'148,,,146,146,308,308,146,148,308,146,308,,,,145,145,,146,145,,145,',
+',,304,304,308,,304,,304,,,,,,145,308,,,,308,308,,,308,304,145,,308,308',
+'145,145,308,,145,308,304,,145,145,304,304,145,308,304,145,,,304,304',
+'83,83,304,145,83,304,83,,,,84,84,,304,84,,84,,,,85,85,83,,85,,85,,,',
+',,84,83,,,,83,83,,,83,85,84,,83,83,84,84,83,,84,83,85,,84,84,85,85,84',
+'83,85,84,,,85,85,86,86,85,84,86,85,86,,,,143,143,,85,143,,143,,,,366',
+'366,86,,366,,366,,,,,,143,86,,,,86,86,,,86,366,143,,86,86,143,143,86',
+',143,86,366,,143,143,366,366,143,86,366,143,,,366,366,90,90,366,143',
+'90,366,90,,,,91,91,,366,,,,,,,142,142,90,,142,,142,,,,,,,90,,,,90,90',
+',,90,142,91,91,90,90,91,91,90,91,91,90,142,,91,,142,142,91,90,142,,',
+',142,142,141,141,142,91,141,142,141,,,,139,139,,142,139,,139,,,,138',
+'138,141,,138,,138,,,,,,139,141,,,,141,141,,,141,138,139,,141,141,139',
+'139,141,,139,141,138,,139,139,138,138,139,141,138,139,,,138,138,103',
+'103,138,139,103,138,103,,,,293,293,,138,293,,293,,,,137,137,103,,137',
+',137,,,,,,293,103,,,,103,103,,,103,137,293,,103,103,293,293,103,,293',
+'103,137,,293,293,137,137,293,103,137,293,,,137,137,136,136,137,293,136',
+'137,136,,,,135,135,,137,135,,135,,,,109,109,136,,,,109,,,,,,135,136',
+',,,136,136,,,136,,135,,136,136,135,135,136,,135,136,109,,135,135,109',
+'109,135,136,109,135,,,109,,292,292,109,135,292,,292,,,,,,,109,,,,112',
+'112,,,112,292,112,,,,,,,,,,292,,,,292,292,112,112,292,,,,292,292,,,292',
+'112,,292,,112,112,,,112,,292,,112,112,,,112,113,113,112,,113,113,113',
+',,,112,,,,,,,134,134,,,134,113,134,,,,,,,,,,113,,,,113,113,134,,113',
+',,,113,113,,,113,134,,113,,134,134,,,134,,113,,134,134,133,133,134,',
+'133,134,133,,,,117,117,,134,117,,117,,,,132,132,133,,132,,132,,,,,,117',
+'133,,,,133,133,,,133,132,117,,133,133,117,117,133,,117,133,132,,117',
+'117,132,132,117,133,132,117,,,132,132,68,68,132,117,68,132,68,,,116',
+',,,132,,,,,116,116,,,68,,,,,116,116,116,116,,,68,,,,68,68,,,68,,,,68',
+'68,,,68,116,116,68,,116,116,116,116,116,116,68,116,116,66,,,,,116,,',
+',66,66,,,,,114,,,66,66,66,66,,,114,114,,,,,,,,114,114,114,114,,,,,66',
+'66,,,66,66,66,66,66,66,,66,66,,,114,114,,66,114,114,114,114,114,114',
+',114,114,170,170,,,,114,,,,170,170,170,170,,,131,131,,,,,,,131,131,131',
+'131,131,,,,,170,170,,,170,170,170,170,170,170,,170,170,,,131,131,,170',
+'131,131,131,131,131,131,,131,131,260,260,,,,131,,,,260,260,260,260,',
+',355,355,,,,,,,,355,355,355,355,,,,,,260,,,260,260,260,260,260,260,',
+'260,260,,,355,355,,260,355,355,355,355,355,355,,355,355,358,358,,,,355',
+',,,358,358,358,358,,,349,349,,,,,,,,349,349,349,349,,,,,358,358,,,358',
+'358,358,358,358,358,,358,358,,,,,,358,349,349,349,349,349,349,,349,349',
+'348,348,,,,349,,,,348,348,348,348,,,341,341,,,,,,,,341,341,341,341,',
+',,,,,,,348,348,348,348,348,348,,348,348,,,341,341,,348,341,341,341,341',
+'341,341,,341,341,336,336,,,,341,,,,336,336,336,336,,,164,164,,,,,,,',
+'164,164,164,164,,,,,336,336,,,336,336,336,336,336,336,,336,336,,,164',
+'164,,336,164,164,164,164,164,164,,164,164,163,163,,,,164,,,,163,163',
+'163,163,,,377,377,,,,,,,,377,377,377,377,,,,,163,163,,,163,163,163,163',
+'163,163,,163,163,,,377,377,,163,377,377,377,377,377,377,,377,377,151',
+'151,,,,377,,,,151,151,151,151,,,263,263,,,,,,,,263,263,263,263,,,,,151',
+'151,265,,151,151,151,151,151,151,265,151,151,,,,,264,151,263,263,263',
+'263,263,263,264,263,263,,,,,,263,,267,,265,265,265,265,265,265,267,265',
+'265,,,,,261,265,264,264,264,264,264,264,261,264,264,,,,,,264,,,,267',
+'267,267,267,267,267,,267,267,,,,,,267,261,261,261,261,261,261,,261,261',
+'107,107,107,107,107,261,107,107,107,107,107,,107,107,,,,,,107,107,107',
+'306,306,306,306,306,,306,306,306,306,306,,306,306,,107,107,,,306,306',
+'306,105,105,105,105,105,,105,105,105,105,105,,105,105,,306,306,,,105',
+'105,105,302,302,302,302,302,,302,302,302,302,302,,302,302,,105,105,',
+',302,302,302,326,326,326,326,326,,326,326,326,326,326,,326,326,,302',
+'302,,,326,326,326,188,188,188,188,188,,188,188,188,188,188,,188,188',
+',326,326,,,188,188,188,259,259,259,259,259,259,,259,259,,,,,,259,188',
+'188,268,268,268,268,268,268,,268,268,,,,,,268' ]
+        racc_action_check = arr = ::Array.new(2419, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -236,509 +250,534 @@ clist = [
         end
 
 racc_action_pointer = [
-  1378,    58,   122,   421,   351,   nil,   nil,   347,   440,   nil,
-   207,   100,    -3,   454,   nil,   108,   nil,   338,   nil,   436,
-   nil,   458,   431,   nil,   448,    25,   nil,   nil,   nil,   nil,
-   nil,   nil,   435,   nil,   nil,   nil,   nil,   429,   531,   nil,
-   556,   nil,   452,   nil,   573,   nil,   nil,   425,   nil,   409,
-   405,   nil,   nil,   402,   701,   nil,   nil,   711,   nil,   nil,
-   nil,   721,   763,   773,   783,   415,   nil,   168,   414,   897,
-   381,    37,   366,   381,   376,   372,   388,  1051,   nil,     5,
-   361,   359,  1165,   nil,   nil,   357,   356,   nil,    31,   351,
-   365,     2,    27,   nil,   nil,  1353,    -4,   358,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,     3,  1449,  1459,  1506,  1516,
-   345,   nil,   nil,  1711,  1726,   nil,   nil,   339,  1643,   169,
-   nil,   341,  1951,   nil,   nil,   nil,    11,   nil,   nil,   nil,
-   nil,   332,   nil,   nil,   nil,   nil,   301,   840,  1846,  1891,
-  1643,   nil,   nil,    91,   nil,   166,   nil,   nil,   nil,   nil,
-   123,   269,   309,  2086,   nil,   295,   291,   -18,   nil,   288,
-   nil,   nil,    -9,   262,  2026,   nil,   nil,   321,  1604,  1587,
-   nil,   nil,   147,   nil,   281,   nil,   nil,  1439,  1328,  1303,
-  1278,  1185,  1175,  1098,  1041,   974,   229,   nil,   nil,   964,
-   917,   907,   224,   850,   830,   630,   620,   nil,   268,   120,
-    46,   nil,   496,   248,   244,   234,   nil,   231,   nil,   244,
-    49,   198,   nil,   215,   159,   146,    -5,   343,   208,   198,
-    99,   125,   nil,    73,    44,     9,   nil,   375,  1232,  1674,
-   nil,    64,   nil,    56,   nil,   nil,   nil,   144,    56,   127,
-   153,   nil,   250,   nil,   nil,   321,   168,   156,   nil,   196,
-   187,   385,   140,   nil,   236,   nil,   239,   nil,   nil,   161,
-   327,     7,   nil,   395,   212,   235,   nil,   227,   165,  1196,
-   nil,  2131,  2206,   nil,  2146,  2239,  2224,   nil,  2257,   208,
-   275,   292,  1541,   nil,   nil,   nil,  1392,   354,   325,   357,
-   342,   347,    89,   nil,  1257,   367,    10,   nil,    80,   nil,
-  1118,   nil,  1108,   nil,   -13,   189,  1031,   387,   nil,   nil,
-   984,   393,   395,   nil,   nil,  2191,  1771,   409,  1906,  1786,
-   nil,   nil,   nil,   nil,  1831,   nil,   nil,   nil,   655,   nil,
-   nil,   nil,   nil,   nil,  2011,   420,   nil,   nil,   nil,   419,
-   nil,   nil,    78,   458,   nil,   445,   405,   447,   nil,   nil,
-  2071,   nil,   nil,  1966,   nil,   nil,   nil,   nil,   275,   nil,
-   nil,   nil,   nil,   nil,   155,   nil,    81,   nil,   467,   nil,
-   468,   nil,   nil,   nil ]
+    -2,   227,   494,   nil,   428,   434,   nil,   nil,   523,   nil,
+   178,   489,   -23,   777,   124,   nil,   733,   nil,   nil,   nil,
+   512,   199,   171,     1,   487,   nil,   385,   nil,   463,   nil,
+   462,   nil,   nil,   nil,   nil,   481,   458,   nil,   nil,   nil,
+   543,   nil,   nil,   nil,   590,   472,   nil,   556,   467,   nil,
+   454,   nil,   nil,   nil,   nil,   432,   nil,   nil,   533,   nil,
+   nil,   nil,   nil,   nil,   445,   720,  1692,   426,  1635,   422,
+   nil,    -2,   844,   421,   410,    -1,   nil,   391,    98,   379,
+   nil,   375,   388,  1035,  1045,  1055,  1102,   366,    -2,   nil,
+  1169,  1179,   373,   nil,   nil,    -2,   nil,   nil,   nil,   nil,
+   363,   nil,   244,  1303,   347,  2269,   151,  2225,   nil,  1390,
+   335,   nil,  1454,  1504,  1707,   nil,  1638,  1578,   331,   nil,
+   nil,   299,   332,   278,   nil,   nil,   nil,   nil,   nil,   126,
+   nil,  1767,  1588,  1568,  1521,  1380,  1370,  1323,  1256,  1246,
+   246,  1236,  1189,  1112,   244,   978,   921,   256,   911,   901,
+   nil,  2112,   nil,   169,   834,   787,    -1,   nil,   286,   nil,
+   nil,   nil,   nil,  2052,  2007,   660,   213,   610,   nil,   nil,
+  1752,   nil,   nil,   142,    27,   236,   nil,    -6,   nil,   116,
+   nil,   nil,   nil,   nil,   277,   nil,   nil,   401,  2335,   nil,
+   nil,   nil,   nil,   210,   nil,   nil,   nil,   nil,   179,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    41,   nil,   171,   nil,   nil,   116,   nil,   nil,   nil,   147,
+   nil,   nil,   124,   360,   nil,   403,   120,     7,   385,    41,
+    59,   170,   131,    72,   nil,    75,    52,    34,   378,   485,
+   514,   nil,   281,   101,   511,   nil,   524,   496,   471,   461,
+   416,   404,   nil,   nil,   216,   309,   nil,   261,   615,  2334,
+  1812,  2193,   nil,  2127,  2160,  2145,   nil,  2178,  2351,   213,
+   220,   nil,   298,   180,   nil,   255,   730,   nil,   nil,    57,
+   428,   152,   nil,   600,   nil,   317,    75,   nil,   nil,   nil,
+   nil,   342,  1437,  1313,    47,   nil,   nil,   nil,   245,   nil,
+   nil,   371,  2291,   382,   988,   nil,  2247,    30,   968,   102,
+   nil,   261,   nil,   394,   403,   246,   425,    44,   854,   nil,
+    -6,   nil,   nil,   nil,   439,   700,  2313,   443,   446,   nil,
+   657,   nil,   422,   434,   nil,   nil,  1992,   nil,   nil,   nil,
+   nil,  1947,   428,   nil,   nil,   nil,   468,   nil,  1932,  1887,
+   nil,   nil,   473,   nil,   nil,  1827,   nil,   nil,  1872,   nil,
+   479,   231,   493,   nil,   256,   nil,  1122,   509,   nil,   nil,
+   317,   515,   nil,   nil,   515,   nil,   nil,  2067,   nil,   nil,
+   170,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   127,   nil,
+    84,   nil,   nil,   531,   nil,   532,   nil,   nil,   nil ]
 
 racc_action_default = [
-  -184,  -221,  -219,   -58,  -221,    -9,  -155,   -10,  -221,  -105,
-  -201,  -221,  -156,   -23,   -11,  -176,  -160,  -221,   -82,   -25,
-   -12,  -221,   -26,   -13,    -1,  -221,  -159,   -27,   -14,    -2,
-  -161,  -110,   -29,   -15,    -3,  -209,   -80,  -221,   -81,   -16,
-  -221,   -17,    -6,  -164,  -221,   -18,    -7,  -221,  -163,   -19,
-    -8,  -176,  -175,  -184,  -221,   -59,   -33,  -221,   -30,   -31,
-   -32,  -221,  -221,  -221,  -221,  -221,   -57,  -184,   -61,  -221,
-   -93,  -184,  -100,  -184,  -219,   -43,  -201,  -221,   -50,   -44,
-   -47,   -45,  -221,  -106,   -48,   -42,   -51,   -46,  -221,   -52,
-   -49,   -81,  -221,  -121,  -120,  -221,  -221,  -221,    -4,  -177,
-  -181,  -179,  -180,  -183,  -182,  -184,  -221,   -93,  -221,  -221,
-   -37,   -38,  -113,  -221,  -221,  -165,  -166,  -168,  -221,  -185,
-  -186,  -221,   -91,   -20,   -28,   -23,   -81,   -22,   -24,  -162,
-  -156,  -221,  -158,  -149,  -157,  -150,   -81,  -221,   -90,   -92,
-  -221,   -74,  -201,  -184,   -73,  -221,   -65,   -64,   -81,   -67,
-  -221,  -100,  -221,   -40,   -94,  -221,  -207,  -221,   -98,  -207,
-   -99,  -101,  -221,  -184,  -221,  -138,  -204,  -221,  -221,  -221,
-  -217,  -216,  -221,  -213,  -221,  -212,  -131,  -221,  -221,  -221,
-  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -108,  -107,  -221,
-  -221,  -221,  -221,  -221,  -221,  -221,  -221,   374,  -221,  -221,
-  -221,  -195,  -221,   -84,   -85,   -87,   -88,   -83,   -86,   -89,
-   -81,   -78,   -76,  -221,  -207,   -36,  -221,  -221,  -221,  -221,
-  -221,  -221,   -21,  -194,  -221,  -207,  -189,  -192,  -221,  -221,
-  -152,  -207,  -218,  -221,   -62,   -70,   -69,  -221,  -221,  -221,
-  -207,  -205,  -221,  -206,  -112,  -221,  -221,  -208,   -63,  -221,
-  -208,  -221,  -221,  -197,  -221,  -141,  -206,  -202,  -104,  -221,
-  -221,  -221,  -210,  -221,  -128,  -127,  -122,  -129,  -130,  -133,
-  -109,  -140,  -135,  -123,  -139,  -137,  -134,  -124,  -136,  -132,
-  -125,  -126,  -221,  -178,  -196,  -220,   -79,  -221,   -93,  -221,
-  -206,   -34,  -202,   -39,    -5,  -221,  -116,  -143,  -221,  -147,
-  -221,  -167,  -221,  -187,  -221,  -208,  -221,  -221,  -170,  -154,
-  -221,  -221,  -206,   -68,   -66,   -71,   -72,  -221,   -41,   -96,
-   -55,   -95,   -56,  -102,   -97,  -198,  -199,  -200,  -221,  -203,
-  -103,  -111,  -214,  -211,  -215,  -221,  -174,   -77,   -53,  -207,
-   -54,   -35,  -116,  -221,  -115,  -221,  -221,  -221,  -144,  -142,
-  -193,  -188,  -190,  -191,  -169,  -153,  -151,   -60,  -221,  -172,
-  -173,   -75,  -114,  -117,  -221,  -148,  -221,  -171,  -221,  -119,
-  -221,  -146,  -118,  -145 ]
+  -205,  -240,   -74,   -19,    -8,   -20,    -9,  -185,  -240,  -124,
+  -220,   -10,  -197,  -240,  -238,   -98,  -240,   -11,  -176,   -12,
+  -240,  -240,  -240,  -177,   -39,   -13,    -1,  -181,  -240,  -129,
+   -41,   -14,    -2,  -228,   -96,   -97,   -42,   -15,    -3,  -180,
+  -240,   -43,   -16,  -182,  -240,   -45,   -17,    -6,  -240,  -184,
+  -240,   -18,    -7,  -197,  -196,  -205,   -75,   -49,  -240,   -46,
+   -47,   -48,  -142,  -141,  -220,  -240,  -240,  -238,  -240,   -59,
+   -66,   -60,  -240,   -63,   -61,   -97,   -64,   -58,  -240,   -67,
+   -62,   -68,   -65,  -240,  -240,  -240,  -240,  -205,  -240,  -125,
+  -240,  -240,  -240,  -204,  -202,  -205,  -198,  -200,  -201,  -203,
+  -240,   -73,  -205,  -240,   -77,  -109,  -205,  -119,    -4,  -240,
+   -53,   -54,  -240,  -240,  -240,  -134,  -240,  -240,  -189,  -186,
+  -187,  -109,  -240,  -206,  -207,   -40,   -44,   -37,   -39,   -97,
+   -38,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,
+  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,  -240,
+  -159,   -56,  -223,  -240,  -240,  -240,  -240,  -232,  -240,  -236,
+  -235,  -231,  -152,  -106,  -108,  -240,  -205,  -240,  -127,  -126,
+  -107,   -36,   399,  -240,  -240,  -240,  -214,  -240,  -220,  -205,
+   -90,   -89,   -80,   -97,  -240,   -81,   -83,  -240,  -119,   -25,
+   -29,   -27,  -113,  -226,   -35,   -23,  -110,   -31,  -240,   -33,
+   -32,  -114,   -21,  -112,   -34,   -28,   -26,   -22,   -30,   -24,
+  -240,  -117,  -226,  -118,  -120,  -112,  -183,  -177,  -179,  -240,
+  -178,  -170,   -97,  -240,  -171,  -240,   -52,  -240,  -240,  -240,
+  -240,  -240,  -240,   -94,   -92,  -240,  -226,  -100,  -101,  -114,
+  -103,  -104,   -99,   -97,   -34,  -102,  -105,   -24,  -240,  -213,
+  -240,  -226,  -210,  -162,  -149,  -148,  -143,  -150,  -151,  -154,
+  -161,  -156,  -144,  -160,  -158,  -155,  -145,  -157,  -153,    -5,
+  -240,  -133,  -146,  -147,  -224,  -225,  -240,  -221,  -123,  -240,
+  -240,  -240,  -229,  -240,  -237,  -240,  -240,  -216,  -128,  -199,
+  -215,  -240,  -240,  -240,  -240,   -78,   -86,   -85,  -240,  -225,
+  -131,  -226,  -227,  -240,  -240,   -79,  -227,  -240,  -240,  -240,
+  -173,  -226,   -55,  -225,   -50,  -221,  -240,  -137,  -240,  -164,
+  -240,  -168,  -239,  -188,  -240,   -95,  -109,  -240,  -240,  -191,
+  -240,  -208,  -227,  -240,  -132,  -222,   -57,  -122,  -130,  -233,
+  -230,  -234,  -240,  -219,  -218,  -217,  -240,  -195,   -87,   -88,
+   -84,   -82,  -240,  -111,   -71,  -115,  -121,   -72,  -116,  -175,
+  -225,  -240,  -240,   -51,  -137,  -136,  -240,  -240,  -165,  -163,
+  -240,  -240,   -69,   -93,  -226,   -70,  -190,  -212,  -211,  -209,
+  -240,  -193,  -194,   -76,  -174,  -172,  -135,  -138,  -240,  -169,
+  -240,   -91,  -192,  -240,  -140,  -240,  -167,  -139,  -166 ]
 
 racc_goto_table = [
-    12,   112,    24,    30,    98,   135,   156,   131,    53,   111,
-   246,    65,   226,   249,    99,   212,   206,   173,   116,    83,
-    66,   297,    73,   159,    12,    26,   158,    30,   295,   123,
-   344,   124,    16,    57,   152,   145,   103,   307,   128,   157,
-    68,   300,    29,   214,   323,   121,   314,    13,   133,    26,
-   188,   231,   287,   167,   117,   211,    16,    12,   254,   105,
-    30,   130,   198,   310,    30,   163,   127,   284,   289,   224,
-   225,    13,   110,   216,   217,   325,   362,   172,   118,   304,
-    21,   230,    26,   131,   nil,   311,    26,   nil,   nil,    16,
-   222,   335,   124,    16,   317,   120,   nil,   nil,   nil,   128,
-   nil,   348,   240,   nil,   125,   158,   nil,   204,   nil,   nil,
-    30,   233,   nil,   nil,   nil,   120,   nil,   nil,    12,   nil,
-     6,    30,   nil,   nil,   nil,   nil,   nil,   127,   nil,   nil,
-   nil,   nil,    26,   259,   260,     2,   nil,   130,   nil,    16,
-    30,   nil,   nil,    26,     6,   nil,   nil,   201,   nil,   nil,
-    16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
-    27,   nil,    26,   nil,   nil,   125,   299,   nil,   nil,    16,
-   nil,   nil,   nil,   368,   nil,   370,   nil,     6,   nil,   nil,
-   nil,     6,   nil,   nil,    27,   270,   332,   141,   283,   293,
-   nil,   141,   301,   361,   337,   206,   129,   273,   352,   nil,
-   309,   321,   nil,   277,   158,   253,   nil,   nil,   nil,   nil,
-   103,   103,   nil,   nil,   nil,   nil,   nil,    27,   nil,    12,
-   130,   nil,    30,    30,   339,   nil,   nil,   203,    12,   nil,
-   nil,    30,   nil,   nil,   nil,   nil,   nil,   nil,     6,   nil,
-   nil,   nil,   nil,   nil,    26,    26,   299,   nil,   nil,   nil,
-   nil,    16,    16,    26,   355,    22,   131,     6,   nil,   326,
-    16,   nil,   nil,   141,   nil,   nil,    13,   208,   nil,   nil,
-   nil,   nil,   129,   nil,    98,    13,   nil,    32,    27,    22,
-   nil,   nil,    12,   nil,   nil,    30,   204,   nil,   nil,    30,
-   nil,   nil,   365,   nil,    12,   nil,   nil,    30,   nil,   nil,
-   130,    32,   nil,    30,   363,   nil,   nil,    26,   nil,   nil,
-   130,    26,    22,    30,    16,   nil,   134,   nil,    16,    26,
-   nil,   nil,   nil,   nil,   nil,    26,    16,   nil,    12,    13,
-   358,    30,    16,   nil,    32,    26,   nil,   nil,    98,     6,
-     6,    13,    16,   nil,   nil,   nil,   130,   170,     6,    30,
-   nil,   nil,   nil,    26,     2,   129,   nil,   141,    12,   nil,
-    16,    30,   207,     2,    12,   nil,    12,    30,   nil,    30,
-   nil,    26,   nil,    22,   nil,    13,   nil,   nil,    16,    27,
-    19,   nil,   nil,    26,   209,   nil,   nil,   nil,    27,    26,
-    16,    26,   134,   nil,   nil,    32,    16,   nil,    16,   nil,
-   nil,   nil,     6,   nil,    19,    13,   203,   nil,   nil,   nil,
-   nil,    13,   nil,    13,     6,   nil,   nil,     2,   nil,   nil,
-     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
-     6,   nil,   nil,   nil,   nil,   129,   nil,    19,   nil,   nil,
-   nil,   132,    27,   nil,   nil,   129,   208,   144,     6,   nil,
-   nil,   144,   nil,   nil,    27,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     2,   nil,   nil,     6,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    22,   134,   nil,   nil,     6,   nil,
-   nil,   129,   nil,    22,     6,   nil,     6,   205,    27,   nil,
-   nil,   nil,   nil,     2,   nil,   nil,    32,   nil,    19,     2,
-   nil,     2,   nil,   nil,   nil,    32,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   170,   132,    27,   nil,
-   nil,   nil,   nil,   144,    27,   nil,    27,   nil,   nil,   nil,
-   nil,   nil,   nil,    96,   nil,   nil,   nil,    22,   nil,   nil,
-   nil,   207,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
-   nil,   nil,   nil,   nil,   nil,   134,   113,   nil,   nil,    32,
-   114,   nil,   nil,   209,   nil,   134,   nil,   nil,   nil,   nil,
-   122,    32,   nil,   nil,   nil,   nil,   nil,   nil,   138,   139,
-   140,   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   164,   nil,   nil,   nil,   nil,   165,    19,
-   132,   134,   nil,   nil,   nil,    32,   nil,   nil,    19,   nil,
-   nil,   176,   nil,    22,   nil,   nil,   nil,   144,   nil,    22,
-   nil,    22,   202,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    32,   nil,   nil,   nil,   nil,
-   nil,    32,   nil,    32,   nil,   nil,   nil,   nil,   nil,   nil,
+    23,    26,    55,    27,   115,   111,   224,   252,   234,   108,
+   157,   241,   120,    87,    39,   193,   219,    89,   270,   153,
+   184,    32,   100,    96,   210,   211,    23,   319,   303,    27,
+   101,   236,    93,   212,   104,   365,   125,    58,   318,   356,
+    39,   127,   126,   351,    14,   122,   221,   307,    91,   169,
+   187,   311,   324,    45,   118,   233,   285,    95,    23,   227,
+   228,    27,   175,   361,   290,   250,   130,    18,   251,   125,
+    14,   327,    39,   110,   171,   126,   124,   166,   345,    45,
+   156,    43,   386,    20,   nil,   nil,   333,   nil,   nil,   nil,
+   nil,    23,   nil,    18,    27,   nil,   nil,   294,   nil,   130,
+   316,   279,   280,   nil,   nil,    39,   211,    43,   124,   217,
+   nil,    45,    27,   nil,   301,   368,   176,   nil,   nil,   328,
+   310,   238,   nil,    39,    27,    18,   nil,   nil,    41,   nil,
+   219,    24,   nil,   nil,   nil,    39,   352,   321,   nil,    43,
+   nil,   nil,   nil,   nil,    45,   nil,   362,    23,   nil,   nil,
+    27,   262,   nil,   216,    41,   266,   nil,    24,    18,   nil,
+   nil,    39,   346,   nil,   nil,   nil,   nil,   nil,   nil,   180,
+   nil,   288,    43,   180,   246,   289,    18,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    93,    93,    41,   287,   237,   128,
+    43,    14,   nil,   nil,   nil,   312,   323,   nil,   nil,   nil,
+    45,   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,   391,
+   nil,   nil,   373,   339,    18,   241,   378,   nil,   nil,    41,
+   353,   nil,   128,   217,   211,   321,    27,   nil,    43,    23,
+   217,   nil,    27,    27,   nil,   nil,   374,    39,   nil,   nil,
+   nil,   nil,   nil,    39,    39,   nil,   180,   nil,    23,   245,
+   nil,    27,   108,   nil,   nil,   nil,   nil,   nil,   384,   393,
+   nil,   395,    39,   nil,   nil,   nil,   nil,   216,   219,    23,
+   nil,   nil,    27,    14,   216,    41,   nil,   389,    24,   359,
+   nil,   nil,    45,    39,   nil,   nil,   nil,   344,   nil,   nil,
+    18,    23,    14,   nil,    27,   nil,    18,    18,   nil,   nil,
+   nil,    45,   nil,   nil,    43,    39,   nil,   nil,   nil,   nil,
+    43,    43,   nil,    14,   nil,    18,   nil,   nil,   217,   nil,
+   nil,    27,    45,   nil,   nil,   238,   nil,   nil,    27,    43,
+   387,   nil,    39,   nil,   nil,    14,    18,   nil,   nil,    39,
+   nil,   nil,    23,   380,    45,    27,   nil,   nil,   nil,   nil,
+    43,   nil,   nil,   nil,   nil,   nil,    39,    41,    18,   nil,
+    24,   217,   216,   108,    27,   180,   nil,   nil,   nil,   nil,
+   217,   nil,    43,    27,   nil,    39,    41,    30,   246,    24,
+    23,    36,   nil,    27,    39,    18,    14,   nil,    23,   nil,
+    23,    27,   237,    27,    39,    45,   nil,    41,   nil,    43,
+    24,   nil,    39,    30,    39,   216,    43,    36,   nil,    18,
+   nil,   nil,   nil,   nil,   216,   nil,   nil,   nil,   nil,    41,
+   nil,   nil,    24,    43,    14,   nil,   nil,   nil,    18,   nil,
+   nil,   nil,    14,    45,    14,    30,   nil,    18,   nil,    36,
+   nil,    45,    43,    45,   nil,   nil,   nil,    18,   nil,   nil,
+   nil,    43,   nil,   245,   nil,    18,   nil,    18,   nil,   159,
+   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,    30,    43,
+    41,    43,    36,    24,   nil,   nil,   nil,   nil,   nil,   181,
+   nil,   nil,   nil,   181,   nil,   nil,   218,   nil,   nil,   nil,
+   220,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   240,   nil,
+   nil,   nil,   242,   nil,   nil,   nil,   nil,    66,    41,   nil,
+   nil,    24,    88,   nil,   nil,   nil,    41,   nil,    41,    24,
+   nil,    24,   nil,   nil,    30,   nil,   nil,   nil,    36,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   114,
+   nil,   nil,   nil,   116,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   181,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   131,   nil,   nil,   150,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   162,   163,   164,   165,   nil,   nil,   nil,   170,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    19,   nil,   nil,   nil,   205,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    19,   nil,   nil,   nil,   nil,   nil,
-   132,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   132,   nil,   nil,   264,   265,   266,   267,   268,   269,    96,
-   271,   272,   nil,   nil,   nil,   274,   275,   276,    19,   278,
-   279,   280,   281,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   132,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    19,   nil,
-   nil,   nil,   nil,   nil,    19,   nil,    19,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   315,   316,   nil,   nil,   318,   nil,
-   nil,   319,   nil,   nil,   nil,   nil,   nil,   324,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   334,
+   218,   nil,   nil,   nil,   220,   nil,    30,   218,   nil,   nil,
+    36,   220,   nil,   nil,   nil,   nil,   231,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    30,   nil,   nil,   nil,    36,
+   nil,   254,   255,   256,   257,   258,   259,   260,   261,   nil,
+   263,   264,   265,   nil,   267,   268,    30,   272,   273,   nil,
+    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   159,   nil,   nil,   nil,    88,   nil,    30,   nil,
+   nil,   nil,    36,   nil,   nil,   181,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   218,   nil,   nil,   nil,   220,
+   nil,   nil,   240,   nil,   nil,   nil,   242,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30,
+   nil,   nil,   nil,    36,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   218,   nil,
+   nil,   nil,   220,   nil,   nil,   nil,   nil,   218,   nil,   nil,
+   nil,   220,   nil,   nil,   nil,   nil,   nil,    30,   nil,   nil,
+   nil,    36,   nil,   nil,   nil,    30,   nil,    30,   nil,    36,
+   nil,    36,   nil,   nil,   nil,   336,   nil,   nil,   nil,   nil,
+   nil,   nil,   341,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   348,   349,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   355,   nil,   nil,   nil,   358,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   377,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   350,   nil,
-   nil,   nil,   353,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   113 ]
+   nil,   nil,   nil,   nil,   nil,   114 ]
 
 racc_goto_check = [
-    33,    59,     2,    37,     4,    68,    41,    66,    38,    29,
-    42,    33,    80,    42,    76,    51,    35,    83,    70,    57,
-     6,    64,    38,    43,    33,    36,    54,    37,     5,    20,
-    60,    10,    34,    21,    27,    46,    62,     5,     8,    46,
-    45,    63,     3,    41,    56,    72,    47,    22,    67,    36,
-    58,    69,    40,    27,    71,    39,    34,    33,    73,    74,
-    37,    33,    75,    31,    37,    72,     6,    77,    42,    78,
-    79,    22,    28,    27,    27,    81,    60,    82,    21,    42,
-     1,    68,    36,    66,   nil,    42,    36,   nil,   nil,    34,
-    20,     5,    10,    34,    42,     3,   nil,   nil,   nil,     8,
-   nil,    64,    43,   nil,    22,    54,   nil,    33,   nil,   nil,
-    37,    46,   nil,   nil,   nil,     3,   nil,   nil,    33,   nil,
-    32,    37,   nil,   nil,   nil,   nil,   nil,     6,   nil,   nil,
-   nil,   nil,    36,    27,    27,    53,   nil,    33,   nil,    34,
-    37,   nil,   nil,    36,    32,   nil,   nil,     3,   nil,   nil,
-    34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
-    25,   nil,    36,   nil,   nil,    22,    66,   nil,   nil,    34,
-   nil,   nil,   nil,     5,   nil,     5,   nil,    32,   nil,   nil,
-   nil,    32,   nil,   nil,    25,    57,    83,    32,    76,    29,
-   nil,    32,    70,    42,    51,    35,    53,    62,    80,   nil,
-    29,    54,   nil,    62,    54,     3,   nil,   nil,   nil,   nil,
-    62,    62,   nil,   nil,   nil,   nil,   nil,    25,   nil,    33,
-    33,   nil,    37,    37,    41,   nil,   nil,    32,    33,   nil,
-   nil,    37,   nil,   nil,   nil,   nil,   nil,   nil,    32,   nil,
-   nil,   nil,   nil,   nil,    36,    36,    66,   nil,   nil,   nil,
-   nil,    34,    34,    36,    68,    24,    66,    32,   nil,    38,
-    34,   nil,   nil,    32,   nil,   nil,    22,    25,   nil,   nil,
-   nil,   nil,    53,   nil,     4,    22,   nil,    26,    25,    24,
-   nil,   nil,    33,   nil,   nil,    37,    33,   nil,   nil,    37,
-   nil,   nil,    66,   nil,    33,   nil,   nil,    37,   nil,   nil,
-    33,    26,   nil,    37,    59,   nil,   nil,    36,   nil,   nil,
-    33,    36,    24,    37,    34,   nil,    24,   nil,    34,    36,
-   nil,   nil,   nil,   nil,   nil,    36,    34,   nil,    33,    22,
-     2,    37,    34,   nil,    26,    36,   nil,   nil,     4,    32,
-    32,    22,    34,   nil,   nil,   nil,    33,    24,    32,    37,
-   nil,   nil,   nil,    36,    53,    53,   nil,    32,    33,   nil,
-    34,    37,    24,    53,    33,   nil,    33,    37,   nil,    37,
-   nil,    36,   nil,    24,   nil,    22,   nil,   nil,    34,    25,
-    23,   nil,   nil,    36,    26,   nil,   nil,   nil,    25,    36,
-    34,    36,    24,   nil,   nil,    26,    34,   nil,    34,   nil,
-   nil,   nil,    32,   nil,    23,    22,    32,   nil,   nil,   nil,
-   nil,    22,   nil,    22,    32,   nil,   nil,    53,   nil,   nil,
-    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
-    32,   nil,   nil,   nil,   nil,    53,   nil,    23,   nil,   nil,
-   nil,    23,    25,   nil,   nil,    53,    25,    23,    32,   nil,
-   nil,    23,   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    53,   nil,   nil,    32,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    24,    24,   nil,   nil,    32,   nil,
-   nil,    53,   nil,    24,    32,   nil,    32,    23,    25,   nil,
-   nil,   nil,   nil,    53,   nil,   nil,    26,   nil,    23,    53,
-   nil,    53,   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    24,    23,    25,   nil,
-   nil,   nil,   nil,    23,    25,   nil,    25,   nil,   nil,   nil,
-   nil,   nil,   nil,    30,   nil,   nil,   nil,    24,   nil,   nil,
-   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,
-   nil,   nil,   nil,   nil,   nil,    24,    30,   nil,   nil,    26,
-    30,   nil,   nil,    26,   nil,    24,   nil,   nil,   nil,   nil,
-    30,    26,   nil,   nil,   nil,   nil,   nil,   nil,    30,    30,
-    30,   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    30,   nil,   nil,   nil,   nil,    30,    23,
-    23,    24,   nil,   nil,   nil,    26,   nil,   nil,    23,   nil,
-   nil,    30,   nil,    24,   nil,   nil,   nil,    23,   nil,    24,
-   nil,    24,    30,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,
-   nil,    26,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
+    35,     2,    40,    36,    62,    31,    71,    83,    53,     4,
+    86,    37,    73,    40,    38,    43,    69,    60,     5,    29,
+    48,     3,    35,    79,    48,    56,    35,    67,    44,    36,
+     6,    43,    65,    45,    47,    63,     8,    23,    66,    59,
+    38,    22,    10,    49,    55,    75,    70,    44,    23,    61,
+    29,    72,    42,    28,    74,    41,    76,    77,    35,    29,
+    29,    36,    78,    33,    80,    81,     6,    34,    82,     8,
+    55,    44,    38,    30,    22,    10,     3,    75,    84,    28,
+    85,    39,    63,     1,   nil,   nil,    44,   nil,   nil,   nil,
+   nil,    35,   nil,    34,    36,   nil,   nil,    48,   nil,     6,
+     5,    29,    29,   nil,   nil,    38,    56,    39,     3,    35,
+   nil,    28,    36,   nil,    45,    67,     3,   nil,   nil,     5,
+    71,    35,   nil,    38,    36,    34,   nil,   nil,    27,   nil,
+    69,    24,   nil,   nil,   nil,    38,    44,    69,   nil,    39,
+   nil,   nil,   nil,   nil,    28,   nil,    44,    35,   nil,   nil,
+    36,    65,   nil,    55,    27,    65,   nil,    24,    34,   nil,
+   nil,    38,     5,   nil,   nil,   nil,   nil,   nil,   nil,    34,
+   nil,    60,    39,    34,    28,    79,    34,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    65,    65,    27,     3,    34,    24,
+    39,    55,   nil,   nil,   nil,    31,    73,   nil,   nil,   nil,
+    28,   nil,    39,   nil,   nil,   nil,   nil,   nil,   nil,    44,
+   nil,   nil,    53,    86,    34,    37,    83,   nil,   nil,    27,
+    56,   nil,    24,    35,    56,    69,    36,   nil,    39,    35,
+    35,   nil,    36,    36,   nil,   nil,    43,    38,   nil,   nil,
+   nil,   nil,   nil,    38,    38,   nil,    34,   nil,    35,    27,
+   nil,    36,     4,   nil,   nil,   nil,   nil,   nil,    71,     5,
+   nil,     5,    38,   nil,   nil,   nil,   nil,    55,    69,    35,
+   nil,   nil,    36,    55,    55,    27,   nil,    69,    24,    31,
+   nil,   nil,    28,    38,   nil,   nil,   nil,    40,   nil,   nil,
+    34,    35,    55,   nil,    36,   nil,    34,    34,   nil,   nil,
+   nil,    28,   nil,   nil,    39,    38,   nil,   nil,   nil,   nil,
+    39,    39,   nil,    55,   nil,    34,   nil,   nil,    35,   nil,
+   nil,    36,    28,   nil,   nil,    35,   nil,   nil,    36,    39,
+    62,   nil,    38,   nil,   nil,    55,    34,   nil,   nil,    38,
+   nil,   nil,    35,     2,    28,    36,   nil,   nil,   nil,   nil,
+    39,   nil,   nil,   nil,   nil,   nil,    38,    27,    34,   nil,
+    24,    35,    55,     4,    36,    34,   nil,   nil,   nil,   nil,
+    35,   nil,    39,    36,   nil,    38,    27,    25,    28,    24,
+    35,    26,   nil,    36,    38,    34,    55,   nil,    35,   nil,
+    35,    36,    34,    36,    38,    28,   nil,    27,   nil,    39,
+    24,   nil,    38,    25,    38,    55,    39,    26,   nil,    34,
+   nil,   nil,   nil,   nil,    55,   nil,   nil,   nil,   nil,    27,
+   nil,   nil,    24,    39,    55,   nil,   nil,   nil,    34,   nil,
+   nil,   nil,    55,    28,    55,    25,   nil,    34,   nil,    26,
+   nil,    28,    39,    28,   nil,   nil,   nil,    34,   nil,   nil,
+   nil,    39,   nil,    27,   nil,    34,   nil,    34,   nil,    26,
+   nil,    39,   nil,   nil,   nil,   nil,   nil,   nil,    25,    39,
+    27,    39,    26,    24,   nil,   nil,   nil,   nil,   nil,    25,
+   nil,   nil,   nil,    25,   nil,   nil,    25,   nil,   nil,   nil,
+    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,
+   nil,   nil,    26,   nil,   nil,   nil,   nil,    32,    27,   nil,
+   nil,    24,    32,   nil,   nil,   nil,    27,   nil,    27,    24,
+   nil,    24,   nil,   nil,    25,   nil,   nil,   nil,    26,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    32,
+   nil,   nil,   nil,    32,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    32,   nil,   nil,    32,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    23,   nil,   nil,   nil,    23,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    23,   nil,   nil,   nil,   nil,   nil,
-    23,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    23,   nil,   nil,    30,    30,    30,    30,    30,    30,    30,
-    30,    30,   nil,   nil,   nil,    30,    30,    30,    23,    30,
-    30,    30,    30,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,
-   nil,   nil,   nil,   nil,    23,   nil,    23,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    30,    30,   nil,   nil,    30,   nil,
-   nil,    30,   nil,   nil,   nil,   nil,   nil,    30,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30,
+   nil,   nil,    32,    32,    32,    32,   nil,   nil,   nil,    32,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    25,   nil,   nil,   nil,    26,   nil,    25,    25,   nil,   nil,
+    26,    26,   nil,   nil,   nil,   nil,    32,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,    26,
+   nil,    32,    32,    32,    32,    32,    32,    32,    32,   nil,
+    32,    32,    32,   nil,    32,    32,    25,    32,    32,   nil,
+    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    26,   nil,   nil,   nil,    32,   nil,    25,   nil,
+   nil,   nil,    26,   nil,   nil,    25,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,    26,
+   nil,   nil,    25,   nil,   nil,   nil,    26,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,
+   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,
+   nil,   nil,    26,   nil,   nil,   nil,   nil,    25,   nil,   nil,
+   nil,    26,   nil,   nil,   nil,   nil,   nil,    25,   nil,   nil,
+   nil,    26,   nil,   nil,   nil,    25,   nil,    25,   nil,    26,
+   nil,    26,   nil,   nil,   nil,    32,   nil,   nil,   nil,   nil,
+   nil,   nil,    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    32,    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    32,   nil,   nil,   nil,    32,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    32,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30,   nil,
-   nil,   nil,    30,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30 ]
+   nil,   nil,   nil,   nil,   nil,    32 ]
 
 racc_goto_pointer = [
-   nil,    80,     2,    42,   -20,  -191,     9,   nil,   -19,   nil,
-   -26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   -28,    29,    47,   380,   255,   160,   277,   -35,    34,   -29,
-   516,  -168,   120,     0,    32,   -91,    25,     3,     7,   -52,
-  -159,   -64,  -146,   -49,   nil,    28,   -32,  -191,   nil,   nil,
-   nil,   -92,   nil,   135,   -46,   nil,  -206,     2,   -46,   -39,
-  -266,   nil,    11,  -179,  -199,   nil,   -54,   -13,   -56,   -86,
-   -29,     7,    -8,  -105,    34,   -43,   -11,  -133,   -50,   -49,
-  -107,  -177,   -15,   -75,   nil ]
+   nil,    83,     1,    21,   -17,  -129,     8,   nil,   -22,   nil,
+   -16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   -17,    32,   131,   377,   381,   128,    53,   -53,
+    38,   -30,   499,  -248,    67,     0,     3,  -110,    14,    81,
+     1,   -66,  -181,   -90,  -165,   -74,   nil,    11,   -82,  -255,
+   nil,   nil,   nil,  -113,   nil,    44,   -82,   nil,   nil,  -267,
+     4,   -39,   -36,  -282,   nil,    11,  -192,  -203,   nil,   -93,
+   -63,  -103,  -172,   -36,     6,   -10,  -110,    36,   -33,     2,
+  -110,   -58,   -55,  -116,  -208,     2,   -68,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   294,   147,    34,   nil,    42,    46,    50,     5,
-     7,    14,    20,    23,    28,    33,    39,    41,    45,    49,
-     4,   nil,    78,    80,    85,    87,    90,   nil,   nil,    94,
-   153,   242,    75,    79,    81,    84,    86,    89,    37,   nil,
-   nil,   nil,   nil,   nil,    11,   nil,   nil,   146,   237,   149,
-   150,   nil,   213,    74,   154,   160,   161,   nil,   nil,   nil,
-   nil,    93,    43,   nil,   nil,   298,     8,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   101,   nil,   nil,
-   nil,   nil,   nil,   nil,   174 ]
+   nil,   nil,   269,   182,    38,   nil,    47,    52,     4,     6,
+    11,    17,    19,    25,    31,    37,    42,    46,    51,     3,
+     5,   192,    16,   nil,    70,    73,    77,    80,    82,   nil,
+   nil,    63,   151,   276,    69,    71,    74,    76,    79,    81,
+    50,   nil,   nil,   nil,   nil,   nil,    22,   nil,   nil,   185,
+   298,   186,   177,   nil,   235,    67,   196,   198,   213,   214,
+   nil,   nil,   nil,   nil,    62,     7,   nil,   nil,   320,    28,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    97,   nil,   nil,   nil,   nil,   nil,   nil,   158 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 69, :_reduce_none,
-  1, 69, :_reduce_none,
-  1, 70, :_reduce_3,
-  2, 70, :_reduce_4,
-  1, 73, :_reduce_5,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  1, 72, :_reduce_none,
-  3, 87, :_reduce_20,
-  3, 87, :_reduce_21,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 88, :_reduce_none,
-  1, 89, :_reduce_none,
-  1, 89, :_reduce_none,
-  1, 89, :_reduce_none,
-  1, 89, :_reduce_none,
-  4, 81, :_reduce_34,
-  5, 81, :_reduce_35,
-  3, 81, :_reduce_36,
-  2, 81, :_reduce_37,
-  1, 96, :_reduce_38,
-  3, 96, :_reduce_39,
-  1, 95, :_reduce_40,
-  3, 95, :_reduce_41,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  1, 97, :_reduce_none,
-  5, 74, :_reduce_53,
-  5, 74, :_reduce_54,
-  5, 74, :_reduce_55,
-  5, 85, :_reduce_56,
-  2, 75, :_reduce_57,
-  1, 112, :_reduce_58,
-  2, 112, :_reduce_59,
-  6, 76, :_reduce_60,
-  2, 76, :_reduce_61,
-  3, 113, :_reduce_62,
-  3, 113, :_reduce_63,
-  1, 114, :_reduce_none,
-  1, 114, :_reduce_none,
-  3, 114, :_reduce_66,
-  1, 115, :_reduce_none,
-  3, 115, :_reduce_68,
-  1, 116, :_reduce_69,
-  1, 116, :_reduce_70,
-  3, 117, :_reduce_71,
-  3, 117, :_reduce_72,
-  1, 118, :_reduce_none,
+  1, 70, :_reduce_none,
+  1, 70, :_reduce_none,
+  1, 71, :_reduce_3,
+  2, 71, :_reduce_4,
+  1, 74, :_reduce_5,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 73, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  1, 90, :_reduce_none,
+  3, 89, :_reduce_36,
+  3, 89, :_reduce_37,
+  1, 91, :_reduce_none,
+  1, 91, :_reduce_none,
+  1, 91, :_reduce_none,
+  1, 91, :_reduce_none,
+  1, 91, :_reduce_none,
+  1, 91, :_reduce_none,
+  1, 91, :_reduce_none,
+  1, 91, :_reduce_none,
+  1, 92, :_reduce_none,
+  1, 92, :_reduce_none,
+  1, 92, :_reduce_none,
+  1, 92, :_reduce_none,
+  4, 83, :_reduce_50,
+  5, 83, :_reduce_51,
+  3, 83, :_reduce_52,
+  2, 83, :_reduce_53,
+  1, 99, :_reduce_54,
+  3, 99, :_reduce_55,
+  1, 98, :_reduce_56,
+  3, 98, :_reduce_57,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  1, 100, :_reduce_none,
+  5, 75, :_reduce_69,
+  5, 75, :_reduce_70,
+  5, 75, :_reduce_71,
+  5, 87, :_reduce_72,
+  2, 76, :_reduce_73,
+  1, 115, :_reduce_74,
+  2, 115, :_reduce_75,
+  6, 77, :_reduce_76,
+  2, 77, :_reduce_77,
+  3, 116, :_reduce_78,
+  3, 116, :_reduce_79,
+  1, 117, :_reduce_none,
+  1, 117, :_reduce_none,
+  3, 117, :_reduce_82,
   1, 118, :_reduce_none,
-  4, 119, :_reduce_75,
-  1, 107, :_reduce_76,
-  3, 107, :_reduce_77,
-  0, 108, :_reduce_none,
-  1, 108, :_reduce_none,
-  1, 105, :_reduce_80,
-  1, 100, :_reduce_81,
-  1, 101, :_reduce_82,
-  1, 120, :_reduce_none,
-  1, 120, :_reduce_none,
-  1, 120, :_reduce_none,
-  1, 120, :_reduce_none,
-  1, 120, :_reduce_none,
-  1, 120, :_reduce_none,
-  1, 120, :_reduce_none,
-  3, 77, :_reduce_90,
-  3, 77, :_reduce_91,
-  3, 86, :_reduce_92,
-  0, 109, :_reduce_93,
-  1, 109, :_reduce_94,
-  3, 109, :_reduce_95,
-  3, 122, :_reduce_96,
-  3, 123, :_reduce_97,
-  1, 124, :_reduce_none,
-  1, 124, :_reduce_none,
-  0, 111, :_reduce_100,
-  1, 111, :_reduce_101,
-  3, 111, :_reduce_102,
-  4, 104, :_reduce_103,
-  3, 104, :_reduce_104,
-  1, 92, :_reduce_105,
-  2, 92, :_reduce_106,
-  2, 125, :_reduce_107,
-  1, 126, :_reduce_108,
-  2, 126, :_reduce_109,
-  1, 102, :_reduce_110,
-  4, 90, :_reduce_111,
-  4, 90, :_reduce_112,
-  2, 79, :_reduce_113,
-  5, 127, :_reduce_114,
-  4, 127, :_reduce_115,
-  0, 128, :_reduce_none,
-  2, 128, :_reduce_117,
-  4, 128, :_reduce_118,
-  3, 128, :_reduce_119,
-  1, 98, :_reduce_none,
-  1, 98, :_reduce_none,
-  3, 98, :_reduce_122,
-  3, 98, :_reduce_123,
-  3, 98, :_reduce_124,
-  3, 98, :_reduce_125,
-  3, 98, :_reduce_126,
-  3, 98, :_reduce_127,
-  3, 98, :_reduce_128,
-  3, 98, :_reduce_129,
-  3, 98, :_reduce_130,
-  2, 98, :_reduce_131,
-  3, 98, :_reduce_132,
-  3, 98, :_reduce_133,
-  3, 98, :_reduce_134,
-  3, 98, :_reduce_135,
-  3, 98, :_reduce_136,
-  3, 98, :_reduce_137,
-  2, 98, :_reduce_138,
-  3, 98, :_reduce_139,
-  3, 98, :_reduce_140,
-  3, 98, :_reduce_141,
-  5, 78, :_reduce_142,
-  1, 131, :_reduce_143,
-  2, 131, :_reduce_144,
-  5, 132, :_reduce_145,
-  4, 132, :_reduce_146,
-  1, 133, :_reduce_147,
-  3, 133, :_reduce_148,
-  3, 93, :_reduce_149,
-  1, 135, :_reduce_none,
-  4, 135, :_reduce_151,
-  1, 137, :_reduce_none,
-  3, 137, :_reduce_153,
-  3, 136, :_reduce_154,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_163,
-  1, 134, :_reduce_none,
-  1, 138, :_reduce_165,
+  3, 118, :_reduce_84,
+  1, 119, :_reduce_85,
+  1, 119, :_reduce_86,
+  3, 120, :_reduce_87,
+  3, 120, :_reduce_88,
+  1, 121, :_reduce_none,
+  1, 121, :_reduce_none,
+  4, 122, :_reduce_91,
+  1, 110, :_reduce_92,
+  3, 110, :_reduce_93,
+  0, 111, :_reduce_none,
+  1, 111, :_reduce_none,
+  1, 108, :_reduce_96,
+  1, 103, :_reduce_97,
+  1, 104, :_reduce_98,
+  1, 123, :_reduce_none,
+  1, 123, :_reduce_none,
+  1, 123, :_reduce_none,
+  1, 123, :_reduce_none,
+  1, 123, :_reduce_none,
+  1, 123, :_reduce_none,
+  1, 123, :_reduce_none,
+  3, 78, :_reduce_106,
+  3, 78, :_reduce_107,
+  3, 88, :_reduce_108,
+  0, 112, :_reduce_109,
+  1, 112, :_reduce_110,
+  3, 112, :_reduce_111,
+  1, 126, :_reduce_none,
+  1, 126, :_reduce_none,
+  1, 126, :_reduce_none,
+  3, 125, :_reduce_115,
+  3, 127, :_reduce_116,
+  1, 128, :_reduce_none,
+  1, 128, :_reduce_none,
+  0, 114, :_reduce_119,
+  1, 114, :_reduce_120,
+  3, 114, :_reduce_121,
+  4, 107, :_reduce_122,
+  3, 107, :_reduce_123,
+  1, 95, :_reduce_124,
+  2, 95, :_reduce_125,
+  2, 129, :_reduce_126,
+  1, 130, :_reduce_127,
+  2, 130, :_reduce_128,
+  1, 105, :_reduce_129,
+  4, 93, :_reduce_130,
+  4, 93, :_reduce_131,
+  5, 81, :_reduce_132,
+  4, 81, :_reduce_133,
+  2, 80, :_reduce_134,
+  5, 131, :_reduce_135,
+  4, 131, :_reduce_136,
+  0, 132, :_reduce_none,
+  2, 132, :_reduce_138,
+  4, 132, :_reduce_139,
+  3, 132, :_reduce_140,
+  1, 101, :_reduce_none,
+  1, 101, :_reduce_none,
+  3, 101, :_reduce_143,
+  3, 101, :_reduce_144,
+  3, 101, :_reduce_145,
+  3, 101, :_reduce_146,
+  3, 101, :_reduce_147,
+  3, 101, :_reduce_148,
+  3, 101, :_reduce_149,
+  3, 101, :_reduce_150,
+  3, 101, :_reduce_151,
+  2, 101, :_reduce_152,
+  3, 101, :_reduce_153,
+  3, 101, :_reduce_154,
+  3, 101, :_reduce_155,
+  3, 101, :_reduce_156,
+  3, 101, :_reduce_157,
+  3, 101, :_reduce_158,
+  2, 101, :_reduce_159,
+  3, 101, :_reduce_160,
+  3, 101, :_reduce_161,
+  3, 101, :_reduce_162,
+  5, 79, :_reduce_163,
+  1, 135, :_reduce_164,
+  2, 135, :_reduce_165,
+  5, 136, :_reduce_166,
+  4, 136, :_reduce_167,
+  1, 137, :_reduce_168,
+  3, 137, :_reduce_169,
+  3, 96, :_reduce_170,
   1, 139, :_reduce_none,
-  3, 139, :_reduce_167,
-  2, 80, :_reduce_168,
-  6, 82, :_reduce_169,
-  5, 82, :_reduce_170,
-  7, 83, :_reduce_171,
-  6, 83, :_reduce_172,
-  6, 84, :_reduce_173,
-  5, 84, :_reduce_174,
-  1, 106, :_reduce_175,
-  1, 106, :_reduce_176,
-  1, 142, :_reduce_177,
-  3, 142, :_reduce_178,
-  1, 144, :_reduce_179,
-  1, 145, :_reduce_180,
-  1, 145, :_reduce_181,
-  1, 145, :_reduce_182,
-  1, 145, :_reduce_none,
-  0, 71, :_reduce_184,
-  0, 146, :_reduce_185,
-  1, 140, :_reduce_none,
-  3, 140, :_reduce_187,
-  4, 140, :_reduce_188,
-  1, 147, :_reduce_none,
-  3, 147, :_reduce_190,
-  3, 148, :_reduce_191,
-  1, 148, :_reduce_192,
-  3, 148, :_reduce_193,
-  1, 148, :_reduce_194,
-  1, 143, :_reduce_none,
-  2, 143, :_reduce_196,
+  4, 139, :_reduce_172,
   1, 141, :_reduce_none,
-  2, 141, :_reduce_198,
-  1, 149, :_reduce_none,
+  3, 141, :_reduce_174,
+  3, 140, :_reduce_175,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_none,
+  1, 138, :_reduce_184,
+  1, 138, :_reduce_none,
+  1, 142, :_reduce_186,
+  1, 143, :_reduce_none,
+  3, 143, :_reduce_188,
+  2, 82, :_reduce_189,
+  6, 84, :_reduce_190,
+  5, 84, :_reduce_191,
+  7, 85, :_reduce_192,
+  6, 85, :_reduce_193,
+  6, 86, :_reduce_194,
+  5, 86, :_reduce_195,
+  1, 109, :_reduce_196,
+  1, 109, :_reduce_197,
+  1, 146, :_reduce_198,
+  3, 146, :_reduce_199,
+  1, 148, :_reduce_200,
+  1, 149, :_reduce_201,
+  1, 149, :_reduce_202,
+  1, 149, :_reduce_203,
   1, 149, :_reduce_none,
-  1, 91, :_reduce_201,
-  3, 103, :_reduce_202,
-  4, 103, :_reduce_203,
-  2, 103, :_reduce_204,
-  1, 99, :_reduce_none,
-  1, 99, :_reduce_none,
-  0, 110, :_reduce_none,
-  1, 110, :_reduce_208,
-  1, 130, :_reduce_209,
-  3, 129, :_reduce_210,
-  4, 129, :_reduce_211,
-  2, 129, :_reduce_212,
-  1, 150, :_reduce_none,
-  3, 150, :_reduce_214,
-  3, 151, :_reduce_215,
-  1, 152, :_reduce_216,
-  1, 152, :_reduce_217,
-  4, 121, :_reduce_218,
-  1, 94, :_reduce_none,
-  4, 94, :_reduce_220 ]
-
-racc_reduce_n = 221
-
-racc_shift_n = 374
+  0, 72, :_reduce_205,
+  0, 150, :_reduce_206,
+  1, 144, :_reduce_none,
+  3, 144, :_reduce_208,
+  4, 144, :_reduce_209,
+  1, 151, :_reduce_none,
+  3, 151, :_reduce_211,
+  3, 152, :_reduce_212,
+  1, 152, :_reduce_213,
+  1, 147, :_reduce_none,
+  2, 147, :_reduce_215,
+  1, 145, :_reduce_none,
+  2, 145, :_reduce_217,
+  1, 153, :_reduce_none,
+  1, 153, :_reduce_none,
+  1, 94, :_reduce_220,
+  3, 106, :_reduce_221,
+  4, 106, :_reduce_222,
+  2, 106, :_reduce_223,
+  1, 102, :_reduce_none,
+  1, 102, :_reduce_none,
+  0, 113, :_reduce_none,
+  1, 113, :_reduce_227,
+  1, 134, :_reduce_228,
+  3, 133, :_reduce_229,
+  4, 133, :_reduce_230,
+  2, 133, :_reduce_231,
+  1, 154, :_reduce_none,
+  3, 154, :_reduce_233,
+  3, 155, :_reduce_234,
+  1, 156, :_reduce_235,
+  1, 156, :_reduce_236,
+  4, 124, :_reduce_237,
+  1, 97, :_reduce_none,
+  4, 97, :_reduce_239 ]
+
+racc_reduce_n = 240
+
+racc_shift_n = 399
 
 racc_token_table = {
   false => 0,
@@ -808,9 +847,10 @@ racc_token_table = {
   :OUT_EDGE => 64,
   :IN_EDGE_SUB => 65,
   :OUT_EDGE_SUB => 66,
-  :IN => 67 }
+  :IN => 67,
+  :UNLESS => 68 }
 
-racc_nt_base = 68
+racc_nt_base = 69
 
 racc_use_result_var = true
 
@@ -899,6 +939,7 @@ Racc_token_to_s_table = [
   "IN_EDGE_SUB",
   "OUT_EDGE_SUB",
   "IN",
+  "UNLESS",
   "$start",
   "program",
   "statements_and_declarations",
@@ -911,6 +952,7 @@ Racc_token_to_s_table = [
   "assignment",
   "casestatement",
   "ifstatement_begin",
+  "unlessstatement",
   "import",
   "fstatement",
   "definition",
@@ -919,6 +961,7 @@ Racc_token_to_s_table = [
   "resourceoverride",
   "append",
   "relationship",
+  "keyword",
   "relationship_side",
   "edge",
   "resourceref",
@@ -954,6 +997,7 @@ Racc_token_to_s_table = [
   "resourcename",
   "hasharrayaccess",
   "param",
+  "param_name",
   "addparam",
   "anyparam",
   "dqrval",
@@ -1056,21 +1100,9 @@ module_eval(<<'.,.,', 'grammar.ra', 46)
 
 # reduce 19 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 72)
-  def _reduce_20(val, _values, result)
-      result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
-
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.ra', 75)
-  def _reduce_21(val, _values, result)
-        result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
+# reduce 20 omitted
 
-    result
-  end
-.,.,
+# reduce 21 omitted
 
 # reduce 22 omitted
 
@@ -1096,8 +1128,52 @@ module_eval(<<'.,.,', 'grammar.ra', 75)
 
 # reduce 33 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 90)
-  def _reduce_34(val, _values, result)
+# reduce 34 omitted
+
+# reduce 35 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 89)
+  def _reduce_36(val, _values, result)
+      result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 92)
+  def _reduce_37(val, _values, result)
+        result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
+
+    result
+  end
+.,.,
+
+# reduce 38 omitted
+
+# reduce 39 omitted
+
+# reduce 40 omitted
+
+# reduce 41 omitted
+
+# reduce 42 omitted
+
+# reduce 43 omitted
+
+# reduce 44 omitted
+
+# reduce 45 omitted
+
+# reduce 46 omitted
+
+# reduce 47 omitted
+
+# reduce 48 omitted
+
+# reduce 49 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 107)
+  def _reduce_50(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1108,8 +1184,8 @@ module_eval(<<'.,.,', 'grammar.ra', 90)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 97)
-  def _reduce_35(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 114)
+  def _reduce_51(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1120,8 +1196,8 @@ module_eval(<<'.,.,', 'grammar.ra', 97)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 103)
-  def _reduce_36(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 120)
+  def _reduce_52(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1132,8 +1208,8 @@ module_eval(<<'.,.,', 'grammar.ra', 103)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 110)
-  def _reduce_37(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 127)
+  def _reduce_53(val, _values, result)
         result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1144,15 +1220,15 @@ module_eval(<<'.,.,', 'grammar.ra', 110)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 117)
-  def _reduce_38(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 134)
+  def _reduce_54(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 120)
-  def _reduce_39(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 137)
+  def _reduce_55(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1160,44 +1236,44 @@ module_eval(<<'.,.,', 'grammar.ra', 120)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 124)
-  def _reduce_40(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 141)
+  def _reduce_56(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 125)
-  def _reduce_41(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 142)
+  def _reduce_57(val, _values, result)
      result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-# reduce 42 omitted
+# reduce 58 omitted
 
-# reduce 43 omitted
+# reduce 59 omitted
 
-# reduce 44 omitted
+# reduce 60 omitted
 
-# reduce 45 omitted
+# reduce 61 omitted
 
-# reduce 46 omitted
+# reduce 62 omitted
 
-# reduce 47 omitted
+# reduce 63 omitted
 
-# reduce 48 omitted
+# reduce 64 omitted
 
-# reduce 49 omitted
+# reduce 65 omitted
 
-# reduce 50 omitted
+# reduce 66 omitted
 
-# reduce 51 omitted
+# reduce 67 omitted
 
-# reduce 52 omitted
+# reduce 68 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 140)
-  def _reduce_53(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 157)
+  def _reduce_69(val, _values, result)
       @lexer.commentpop
   result = ast(AST::Resource, :type => val[0], :instances => val[2])
 
@@ -1205,8 +1281,8 @@ module_eval(<<'.,.,', 'grammar.ra', 140)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 143)
-  def _reduce_54(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 160)
+  def _reduce_70(val, _values, result)
       # This is a deprecated syntax.
   error "All resource specifications require names"
 
@@ -1214,8 +1290,8 @@ module_eval(<<'.,.,', 'grammar.ra', 143)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 146)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 163)
+  def _reduce_71(val, _values, result)
       # a defaults setting for a type
   @lexer.commentpop
   result = ast(AST::ResourceDefaults, :type => val[0].value, :parameters => val[2])
@@ -1224,8 +1300,8 @@ module_eval(<<'.,.,', 'grammar.ra', 146)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 153)
-  def _reduce_56(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 170)
+  def _reduce_72(val, _values, result)
       @lexer.commentpop
   result = ast AST::ResourceOverride, :object => val[0], :parameters => val[2]
 
@@ -1233,8 +1309,8 @@ module_eval(<<'.,.,', 'grammar.ra', 153)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 160)
-  def _reduce_57(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 177)
+  def _reduce_73(val, _values, result)
       type = val[0]
 
   if (type == :exported and ! Puppet[:storeconfigs])
@@ -1254,22 +1330,22 @@ module_eval(<<'.,.,', 'grammar.ra', 160)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 176)
-  def _reduce_58(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 193)
+  def _reduce_74(val, _values, result)
      result = :virtual 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 177)
-  def _reduce_59(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 194)
+  def _reduce_75(val, _values, result)
      result = :exported 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 182)
-  def _reduce_60(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 199)
+  def _reduce_76(val, _values, result)
       @lexer.commentpop
   type = val[0].value.downcase
   args = {:type => type}
@@ -1291,8 +1367,8 @@ module_eval(<<'.,.,', 'grammar.ra', 182)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 200)
-  def _reduce_61(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 217)
+  def _reduce_77(val, _values, result)
       type = val[0].value.downcase
   args = {:type => type }
 
@@ -1312,8 +1388,8 @@ module_eval(<<'.,.,', 'grammar.ra', 200)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 218)
-  def _reduce_62(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 235)
+  def _reduce_78(val, _values, result)
       if val[1]
     result = val[1]
     result.form = :virtual
@@ -1325,8 +1401,8 @@ module_eval(<<'.,.,', 'grammar.ra', 218)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 226)
-  def _reduce_63(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 243)
+  def _reduce_79(val, _values, result)
         if val[1]
     result = val[1]
     result.form = :exported
@@ -1338,22 +1414,22 @@ module_eval(<<'.,.,', 'grammar.ra', 226)
   end
 .,.,
 
-# reduce 64 omitted
+# reduce 80 omitted
 
-# reduce 65 omitted
+# reduce 81 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 239)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 256)
+  def _reduce_82(val, _values, result)
         result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
 
     result
   end
 .,.,
 
-# reduce 67 omitted
+# reduce 83 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 244)
-  def _reduce_68(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 261)
+  def _reduce_84(val, _values, result)
         result = val[1]
     result.parens = true
 
@@ -1361,22 +1437,22 @@ module_eval(<<'.,.,', 'grammar.ra', 244)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 248)
-  def _reduce_69(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 265)
+  def _reduce_85(val, _values, result)
      result=val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 249)
-  def _reduce_70(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 266)
+  def _reduce_86(val, _values, result)
      result=val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 252)
-  def _reduce_71(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 269)
+  def _reduce_87(val, _values, result)
       result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
   #result = ast AST::CollExpr
   #result.push *val
@@ -1385,8 +1461,8 @@ module_eval(<<'.,.,', 'grammar.ra', 252)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 257)
-  def _reduce_72(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 274)
+  def _reduce_88(val, _values, result)
         result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1395,27 +1471,27 @@ module_eval(<<'.,.,', 'grammar.ra', 257)
   end
 .,.,
 
-# reduce 73 omitted
+# reduce 89 omitted
 
-# reduce 74 omitted
+# reduce 90 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 266)
-  def _reduce_75(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 283)
+  def _reduce_91(val, _values, result)
       result = ast AST::ResourceInstance, :title => val[0], :parameters => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 269)
-  def _reduce_76(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 286)
+  def _reduce_92(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 271)
-  def _reduce_77(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 288)
+  def _reduce_93(val, _values, result)
         val[0].push val[2]
     result = val[0]
 
@@ -1423,50 +1499,50 @@ module_eval(<<'.,.,', 'grammar.ra', 271)
   end
 .,.,
 
-# reduce 78 omitted
+# reduce 94 omitted
 
-# reduce 79 omitted
+# reduce 95 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 279)
-  def _reduce_80(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 296)
+  def _reduce_96(val, _values, result)
       result = ast AST::Undef, :value => :undef
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 283)
-  def _reduce_81(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 300)
+  def _reduce_97(val, _values, result)
       result = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 287)
-  def _reduce_82(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 304)
+  def _reduce_98(val, _values, result)
       result = ast AST::Type, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-# reduce 83 omitted
+# reduce 99 omitted
 
-# reduce 84 omitted
+# reduce 100 omitted
 
-# reduce 85 omitted
+# reduce 101 omitted
 
-# reduce 86 omitted
+# reduce 102 omitted
 
-# reduce 87 omitted
+# reduce 103 omitted
 
-# reduce 88 omitted
+# reduce 104 omitted
 
-# reduce 89 omitted
+# reduce 105 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 299)
-  def _reduce_90(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 316)
+  def _reduce_106(val, _values, result)
       raise Puppet::ParseError, "Cannot assign to variables in other namespaces" if val[0][:value] =~ /::/
   # this is distinct from referencing a variable
   variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
@@ -1476,16 +1552,16 @@ module_eval(<<'.,.,', 'grammar.ra', 299)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 305)
-  def _reduce_91(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 322)
+  def _reduce_107(val, _values, result)
         result = ast AST::VarDef, :name => val[0], :value => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 309)
-  def _reduce_92(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 326)
+  def _reduce_108(val, _values, result)
       variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
   result = ast AST::VarDef, :name => variable, :value => val[2], :append => true, :line => val[0][:line]
 
@@ -1493,23 +1569,23 @@ module_eval(<<'.,.,', 'grammar.ra', 309)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 315)
-  def _reduce_93(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 332)
+  def _reduce_109(val, _values, result)
       result = ast AST::ASTArray
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 317)
-  def _reduce_94(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 334)
+  def _reduce_110(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 319)
-  def _reduce_95(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 336)
+  def _reduce_111(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1517,16 +1593,22 @@ module_eval(<<'.,.,', 'grammar.ra', 319)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 324)
-  def _reduce_96(val, _values, result)
+# reduce 112 omitted
+
+# reduce 113 omitted
+
+# reduce 114 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 345)
+  def _reduce_115(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 328)
-  def _reduce_97(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 349)
+  def _reduce_116(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2],
     :add => true
 
@@ -1534,27 +1616,27 @@ module_eval(<<'.,.,', 'grammar.ra', 328)
   end
 .,.,
 
-# reduce 98 omitted
+# reduce 117 omitted
 
-# reduce 99 omitted
+# reduce 118 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 337)
-  def _reduce_100(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 358)
+  def _reduce_119(val, _values, result)
       result = ast AST::ASTArray
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 339)
-  def _reduce_101(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 360)
+  def _reduce_120(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 341)
-  def _reduce_102(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 362)
+  def _reduce_121(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1562,8 +1644,8 @@ module_eval(<<'.,.,', 'grammar.ra', 341)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 347)
-  def _reduce_103(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 368)
+  def _reduce_122(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
     :arguments => val[2],
@@ -1573,8 +1655,8 @@ module_eval(<<'.,.,', 'grammar.ra', 347)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 352)
-  def _reduce_104(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 373)
+  def _reduce_123(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
     :arguments => AST::ASTArray.new({}),
@@ -1584,51 +1666,51 @@ module_eval(<<'.,.,', 'grammar.ra', 352)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 358)
-  def _reduce_105(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 379)
+  def _reduce_124(val, _values, result)
      result = ast AST::String, :value => val[0][:value],                  :line => val[0][:line] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 359)
-  def _reduce_106(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 380)
+  def _reduce_125(val, _values, result)
      result = ast AST::Concat, :value => [ast(AST::String,val[0])]+val[1], :line => val[0][:line] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 361)
-  def _reduce_107(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 382)
+  def _reduce_126(val, _values, result)
      result = [val[0]] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 363)
-  def _reduce_108(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 384)
+  def _reduce_127(val, _values, result)
      result = [ast(AST::String,val[0])]          
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 364)
-  def _reduce_109(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 385)
+  def _reduce_128(val, _values, result)
      result = [ast(AST::String,val[0])] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 367)
-  def _reduce_110(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 388)
+  def _reduce_129(val, _values, result)
       result = ast AST::Boolean, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 371)
-  def _reduce_111(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 392)
+  def _reduce_130(val, _values, result)
       Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
   result = ast AST::ResourceReference, :type => val[0][:value], :line => val[0][:line], :title => val[2]
 
@@ -1636,24 +1718,51 @@ module_eval(<<'.,.,', 'grammar.ra', 371)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 374)
-  def _reduce_112(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 395)
+  def _reduce_131(val, _values, result)
       result = ast AST::ResourceReference, :type => val[0].value, :title => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 378)
-  def _reduce_113(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 399)
+  def _reduce_132(val, _values, result)
+      @lexer.commentpop
+  args = {
+    :test => ast(AST::Not, :value => val[1]),
+    :statements => val[3]
+  }
+
+  result = ast AST::IfStatement, args
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 408)
+  def _reduce_133(val, _values, result)
+        @lexer.commentpop
+    args = {
+      :test => ast(AST::Not, :value => val[1]), 
+      :statements => ast(AST::Nop)
+    }
+    result = ast AST::IfStatement, args
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 417)
+  def _reduce_134(val, _values, result)
       result = val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 382)
-  def _reduce_114(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 421)
+  def _reduce_135(val, _values, result)
       @lexer.commentpop
   args = {
     :test => val[0],
@@ -1668,8 +1777,8 @@ module_eval(<<'.,.,', 'grammar.ra', 382)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 393)
-  def _reduce_115(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 432)
+  def _reduce_136(val, _values, result)
         @lexer.commentpop
     args = {
       :test => val[0],
@@ -1684,18 +1793,18 @@ module_eval(<<'.,.,', 'grammar.ra', 393)
   end
 .,.,
 
-# reduce 116 omitted
+# reduce 137 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 406)
-  def _reduce_117(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 445)
+  def _reduce_138(val, _values, result)
         result = ast AST::Else, :statements => val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 409)
-  def _reduce_118(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 448)
+  def _reduce_139(val, _values, result)
         @lexer.commentpop
     result = ast AST::Else, :statements => val[2]
 
@@ -1703,8 +1812,8 @@ module_eval(<<'.,.,', 'grammar.ra', 409)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 413)
-  def _reduce_119(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 452)
+  def _reduce_140(val, _values, result)
         @lexer.commentpop
     result = ast AST::Else, :statements => ast(AST::Nop)
 
@@ -1712,172 +1821,172 @@ module_eval(<<'.,.,', 'grammar.ra', 413)
   end
 .,.,
 
-# reduce 120 omitted
+# reduce 141 omitted
 
-# reduce 121 omitted
+# reduce 142 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 432)
-  def _reduce_122(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 471)
+  def _reduce_143(val, _values, result)
         result = ast AST::InOperator, :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 435)
-  def _reduce_123(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 474)
+  def _reduce_144(val, _values, result)
         result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 438)
-  def _reduce_124(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 477)
+  def _reduce_145(val, _values, result)
         result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 441)
-  def _reduce_125(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 480)
+  def _reduce_146(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 444)
-  def _reduce_126(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 483)
+  def _reduce_147(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 447)
-  def _reduce_127(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 486)
+  def _reduce_148(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 450)
-  def _reduce_128(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 489)
+  def _reduce_149(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 453)
-  def _reduce_129(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 492)
+  def _reduce_150(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 456)
-  def _reduce_130(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 495)
+  def _reduce_151(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 459)
-  def _reduce_131(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 498)
+  def _reduce_152(val, _values, result)
         result = ast AST::Minus, :value => val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 462)
-  def _reduce_132(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 501)
+  def _reduce_153(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 465)
-  def _reduce_133(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 504)
+  def _reduce_154(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 468)
-  def _reduce_134(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 507)
+  def _reduce_155(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 471)
-  def _reduce_135(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 510)
+  def _reduce_156(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 474)
-  def _reduce_136(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 513)
+  def _reduce_157(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 477)
-  def _reduce_137(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 516)
+  def _reduce_158(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 480)
-  def _reduce_138(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 519)
+  def _reduce_159(val, _values, result)
         result = ast AST::Not, :value => val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 483)
-  def _reduce_139(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 522)
+  def _reduce_160(val, _values, result)
         result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 486)
-  def _reduce_140(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 525)
+  def _reduce_161(val, _values, result)
         result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 489)
-  def _reduce_141(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 528)
+  def _reduce_162(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 493)
-  def _reduce_142(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 532)
+  def _reduce_163(val, _values, result)
       @lexer.commentpop
   result = ast AST::CaseStatement, :test => val[1], :options => val[3]
 
@@ -1885,15 +1994,15 @@ module_eval(<<'.,.,', 'grammar.ra', 493)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 497)
-  def _reduce_143(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 536)
+  def _reduce_164(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 499)
-  def _reduce_144(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 538)
+  def _reduce_165(val, _values, result)
         val[0].push val[1]
     result = val[0]
 
@@ -1901,8 +2010,8 @@ module_eval(<<'.,.,', 'grammar.ra', 499)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 504)
-  def _reduce_145(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 543)
+  def _reduce_166(val, _values, result)
       @lexer.commentpop
   result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
 
@@ -1910,8 +2019,8 @@ module_eval(<<'.,.,', 'grammar.ra', 504)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 507)
-  def _reduce_146(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 546)
+  def _reduce_167(val, _values, result)
       @lexer.commentpop
 
     result = ast(
@@ -1925,15 +2034,15 @@ module_eval(<<'.,.,', 'grammar.ra', 507)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 517)
-  def _reduce_147(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 556)
+  def _reduce_168(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 519)
-  def _reduce_148(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 558)
+  def _reduce_169(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1941,18 +2050,18 @@ module_eval(<<'.,.,', 'grammar.ra', 519)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 524)
-  def _reduce_149(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 563)
+  def _reduce_170(val, _values, result)
       result = ast AST::Selector, :param => val[0], :values => val[2]
 
     result
   end
 .,.,
 
-# reduce 150 omitted
+# reduce 171 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 529)
-  def _reduce_151(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 568)
+  def _reduce_172(val, _values, result)
         @lexer.commentpop
     result = val[1]
 
@@ -1960,10 +2069,10 @@ module_eval(<<'.,.,', 'grammar.ra', 529)
   end
 .,.,
 
-# reduce 152 omitted
+# reduce 173 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 535)
-  def _reduce_153(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 574)
+  def _reduce_174(val, _values, result)
         if val[0].instance_of?(AST::ASTArray)
     val[0].push(val[2])
     result = val[0]
@@ -1975,58 +2084,58 @@ module_eval(<<'.,.,', 'grammar.ra', 535)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 544)
-  def _reduce_154(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 583)
+  def _reduce_175(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0], :value => val[2]
 
     result
   end
 .,.,
 
-# reduce 155 omitted
+# reduce 176 omitted
 
-# reduce 156 omitted
+# reduce 177 omitted
 
-# reduce 157 omitted
+# reduce 178 omitted
 
-# reduce 158 omitted
+# reduce 179 omitted
 
-# reduce 159 omitted
+# reduce 180 omitted
 
-# reduce 160 omitted
+# reduce 181 omitted
 
-# reduce 161 omitted
+# reduce 182 omitted
 
-# reduce 162 omitted
+# reduce 183 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 556)
-  def _reduce_163(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 595)
+  def _reduce_184(val, _values, result)
         result = ast AST::Default, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-# reduce 164 omitted
+# reduce 185 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 561)
-  def _reduce_165(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 600)
+  def _reduce_186(val, _values, result)
      result = [val[0][:value]] 
     result
   end
 .,.,
 
-# reduce 166 omitted
+# reduce 187 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 563)
-  def _reduce_167(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 602)
+  def _reduce_188(val, _values, result)
      result = val[0] += val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 566)
-  def _reduce_168(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 605)
+  def _reduce_189(val, _values, result)
       val[1].each do |file|
     import(file)
   end
@@ -2037,8 +2146,8 @@ module_eval(<<'.,.,', 'grammar.ra', 566)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 576)
-  def _reduce_169(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 615)
+  def _reduce_190(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Definition.new(classname(val[1]),
                                                ast_context(true).merge(:arguments => val[2], :code => val[4],
@@ -2051,8 +2160,8 @@ module_eval(<<'.,.,', 'grammar.ra', 576)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 584)
-  def _reduce_170(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 623)
+  def _reduce_191(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Definition.new(classname(val[1]),
                                                ast_context(true).merge(:arguments => val[2], :line => val[0][:line]))
@@ -2062,8 +2171,8 @@ module_eval(<<'.,.,', 'grammar.ra', 584)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 592)
-  def _reduce_171(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 631)
+  def _reduce_192(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
@@ -2075,8 +2184,8 @@ module_eval(<<'.,.,', 'grammar.ra', 592)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 599)
-  def _reduce_172(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 638)
+  def _reduce_193(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
@@ -2088,8 +2197,8 @@ module_eval(<<'.,.,', 'grammar.ra', 599)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 608)
-  def _reduce_173(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 647)
+  def _reduce_194(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Node.new(val[1],
                                          ast_context(true).merge(:parent => val[2], :code => val[4],
@@ -2099,8 +2208,8 @@ module_eval(<<'.,.,', 'grammar.ra', 608)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 613)
-  def _reduce_174(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 652)
+  def _reduce_195(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Node.new(val[1], ast_context(true).merge(:parent => val[2], :line => val[0][:line]))
 
@@ -2108,30 +2217,30 @@ module_eval(<<'.,.,', 'grammar.ra', 613)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 617)
-  def _reduce_175(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 656)
+  def _reduce_196(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 618)
-  def _reduce_176(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 657)
+  def _reduce_197(val, _values, result)
      result = "class" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 623)
-  def _reduce_177(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 662)
+  def _reduce_198(val, _values, result)
         result = [result]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 626)
-  def _reduce_178(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 665)
+  def _reduce_199(val, _values, result)
         result = val[0]
     result << val[2]
 
@@ -2139,65 +2248,65 @@ module_eval(<<'.,.,', 'grammar.ra', 626)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 631)
-  def _reduce_179(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 670)
+  def _reduce_200(val, _values, result)
       result = ast AST::HostName, :value => val[0]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 634)
-  def _reduce_180(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 673)
+  def _reduce_201(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 635)
-  def _reduce_181(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 674)
+  def _reduce_202(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 636)
-  def _reduce_182(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 675)
+  def _reduce_203(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-# reduce 183 omitted
+# reduce 204 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 640)
-  def _reduce_184(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 679)
+  def _reduce_205(val, _values, result)
       result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 644)
-  def _reduce_185(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 683)
+  def _reduce_206(val, _values, result)
       result = ast AST::ASTArray, :children => []
 
     result
   end
 .,.,
 
-# reduce 186 omitted
+# reduce 207 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 649)
-  def _reduce_187(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 688)
+  def _reduce_208(val, _values, result)
         result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 652)
-  def _reduce_188(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 691)
+  def _reduce_209(val, _values, result)
         result = val[1]
     result = [result] unless result[0].is_a?(Array)
 
@@ -2205,10 +2314,10 @@ module_eval(<<'.,.,', 'grammar.ra', 652)
   end
 .,.,
 
-# reduce 189 omitted
+# reduce 210 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 658)
-  def _reduce_190(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 697)
+  def _reduce_211(val, _values, result)
         result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -2217,116 +2326,96 @@ module_eval(<<'.,.,', 'grammar.ra', 658)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 664)
-  def _reduce_191(val, _values, result)
-      Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
-  result = [val[0][:value], val[2]]
-
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.ra', 668)
-  def _reduce_192(val, _values, result)
-        Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
-    result = [val[0][:value]]
-
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.ra', 671)
-  def _reduce_193(val, _values, result)
-      result = [val[0][:value], val[2]]
-
+module_eval(<<'.,.,', 'grammar.ra', 703)
+  def _reduce_212(val, _values, result)
+     result = [val[0][:value], val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 673)
-  def _reduce_194(val, _values, result)
-      result = [val[0][:value]]
-
+module_eval(<<'.,.,', 'grammar.ra', 704)
+  def _reduce_213(val, _values, result)
+     result = [val[0][:value]] 
     result
   end
 .,.,
 
-# reduce 195 omitted
+# reduce 214 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 678)
-  def _reduce_196(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 708)
+  def _reduce_215(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 197 omitted
+# reduce 216 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 683)
-  def _reduce_198(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 713)
+  def _reduce_217(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 199 omitted
+# reduce 218 omitted
 
-# reduce 200 omitted
+# reduce 219 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 689)
-  def _reduce_201(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 719)
+  def _reduce_220(val, _values, result)
       result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 692)
-  def _reduce_202(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 722)
+  def _reduce_221(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 693)
-  def _reduce_203(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 723)
+  def _reduce_222(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 694)
-  def _reduce_204(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 724)
+  def _reduce_223(val, _values, result)
      result = ast AST::ASTArray 
     result
   end
 .,.,
 
-# reduce 205 omitted
+# reduce 224 omitted
 
-# reduce 206 omitted
+# reduce 225 omitted
 
-# reduce 207 omitted
+# reduce 226 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 700)
-  def _reduce_208(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 730)
+  def _reduce_227(val, _values, result)
      result = nil 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 703)
-  def _reduce_209(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 733)
+  def _reduce_228(val, _values, result)
       result = ast AST::Regex, :value => val[0][:value]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 707)
-  def _reduce_210(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 737)
+  def _reduce_229(val, _values, result)
       if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2337,8 +2426,8 @@ module_eval(<<'.,.,', 'grammar.ra', 707)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 714)
-  def _reduce_211(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 744)
+  def _reduce_230(val, _values, result)
         if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2349,18 +2438,18 @@ module_eval(<<'.,.,', 'grammar.ra', 714)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 720)
-  def _reduce_212(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 750)
+  def _reduce_231(val, _values, result)
       result = ast AST::ASTHash
 
     result
   end
 .,.,
 
-# reduce 213 omitted
+# reduce 232 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 725)
-  def _reduce_214(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 755)
+  def _reduce_233(val, _values, result)
         if val[0].instance_of?(AST::ASTHash)
     result = val[0].merge(val[2])
   else
@@ -2372,40 +2461,40 @@ module_eval(<<'.,.,', 'grammar.ra', 725)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 734)
-  def _reduce_215(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 764)
+  def _reduce_234(val, _values, result)
       result = ast AST::ASTHash, { :value => { val[0] => val[2] } }
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 737)
-  def _reduce_216(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 767)
+  def _reduce_235(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 738)
-  def _reduce_217(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 768)
+  def _reduce_236(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 741)
-  def _reduce_218(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 771)
+  def _reduce_237(val, _values, result)
       result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2]
 
     result
   end
 .,.,
 
-# reduce 219 omitted
+# reduce 238 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 746)
-  def _reduce_220(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 776)
+  def _reduce_239(val, _values, result)
         result = ast AST::HashOrArrayAccess, :variable => val[0], :key => val[2]
 
     result