puppet 3.1.1 → 3.2.0.rc1

data/lib/puppet/parser/lexer.rb

@@ -20,6 +20,15 @@ class Puppet::Parser::Lexer
   attr_accessor :line, :indefine
   alias :indefine? :indefine
 
+  # Returns the position on the line.
+  # This implementation always returns nil. It is here for API reasons in Puppet::Error
+  # which needs to support both --parser current, and --parser future.
+  #
+  def pos
+    # Make the lexer comply with newer API. It does not produce a pos...
+    nil
+  end
+  
   def lex_error msg
     raise Puppet::LexError.new(msg)
   end
@@ -155,6 +164,7 @@ class Puppet::Parser::Lexer
     '-'   => :MINUS,
     '/'   => :DIV,
     '*'   => :TIMES,
+    '%'   => :MODULO,
     '<<'  => :LSHIFT,
     '>>'  => :RSHIFT,
     '=~'  => :MATCH,

data/lib/puppet/parser/methods.rb

@@ -0,0 +1,69 @@
+require 'puppet/util/autoload'
+require 'puppet/parser/scope'
+require 'puppet/parser/functions'
+require 'monitor'
+
+# A module for handling finding and invoking methods (functions invokable as a method).
+# A method call on the form:
+#
+#  $a.meth(1,2,3] {|...| ...}
+#
+# will lookup a function called 'meth' and call it with the arguments ($a, 1, 2, 3, <lambda>)
+#
+# @see Puppet::Parser::AST::Lambda
+# @see Puppet::Parser::AST::MethodCall
+#
+# @api public
+# @since 3.2
+#
+module Puppet::Parser::Methods
+  Environment = Puppet::Node::Environment
+  # Represents an invokable method configured to be invoked for a given object.
+  #
+  class Method
+    def initialize(receiver, obj, method_name, rvalue)
+      @receiver = receiver
+      @o = obj
+      @method_name = method_name
+      @rvalue = rvalue
+    end
+
+    # Invoke this method's function in the given scope with the given arguments and parameterized block.
+    # A method call on the form:
+    #
+    #  $a.meth(1,2,3) {|...| ...}
+    #
+    # results in the equivalent:
+    #
+    #  meth($a, 1, 2, 3, {|...| ... })
+    #
+    # @param scope [Puppet::Parser::Scope] the scope the call takes place in
+    # @param args [Array<Object>] arguments 1..n to pass to the function
+    # @param pblock [Puppet::Parser::AST::Lambda] optional parameterized block to pass as the last argument
+    #   to the called function
+    #
+    def invoke(scope, args=[], pblock=nil)
+      arguments = [@o] + args
+      arguments << pblock if pblock
+      @receiver.send(@method_name, arguments)
+    end
+
+    # @return [Boolean] whether the method function produces an rvalue or not.
+    def is_rvalue?
+      @rvalue
+    end
+  end
+
+  class << self
+    include Puppet::Util
+  end
+
+  # Finds a function and returns an instance of Method configured to perform invocation.
+  # @return [Method, nil] configured method or nil if method not found
+  def self.find_method(scope, receiver, name)
+    fname = Puppet::Parser::Functions.function(name)
+    rvalue = Puppet::Parser::Functions.rvalue?(name)
+    return Method.new(scope, receiver, fname, rvalue) if fname
+    nil
+  end
+end

data/lib/puppet/parser/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.9
 # 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', 794)
+module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 797)
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -34,101 +34,109 @@ require 'puppet/parser/parser_support'
 ##### State transition tables begin ###
 
 clist = [
-'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)
+'35,36,199,198,246,159,-130,86,-112,82,277,357,361,379,356,215,210,159',
+'276,-197,360,158,85,158,211,213,212,214,39,248,48,49,267,33,50,158,51',
+'37,26,-129,40,46,30,35,36,32,84,217,216,31,398,203,204,206,205,208,209',
+'-122,201,202,52,-130,-130,-130,-130,200,38,207,35,36,278,39,86,48,49',
+'350,33,50,90,51,37,26,89,40,46,30,35,36,32,-178,94,253,31,257,280,257',
+'364,274,273,92,93,215,210,52,257,255,226,336,62,38,211,213,212,214,39',
+'338,48,49,254,33,50,339,51,37,26,347,40,46,30,35,36,32,-180,217,216',
+'31,310,203,204,206,205,208,209,341,201,202,52,35,36,274,273,200,38,207',
+'223,303,-178,39,304,48,49,-177,33,50,185,51,37,26,95,40,46,30,35,36',
+'32,190,-184,281,31,397,189,344,90,201,202,226,89,215,210,52,200,357',
+'250,32,356,38,211,213,212,214,39,-179,48,49,268,33,50,90,51,37,26,89',
+'40,46,30,35,36,32,185,217,216,31,395,203,204,206,205,208,209,190,201',
+'202,52,119,189,201,202,200,38,207,201,202,200,39,119,48,49,200,33,50',
+'185,51,37,26,267,40,46,30,35,36,32,190,185,90,31,392,189,89,119,265',
+'375,118,337,190,120,52,257,280,189,302,-96,38,118,257,263,120,39,-185',
+'48,49,52,33,50,52,51,37,26,-123,40,46,30,35,36,32,52,103,118,31,252',
+'120,279,206,205,251,257,280,201,202,52,250,243,243,262,200,38,207,257',
+'263,52,137,135,139,134,136,80,132,140,141,177,168,240,131,162,35,36',
+'82,32,180,142,130,163,271,94,-184,274,273,203,204,206,205,-183,52,-181',
+'201,202,62,138,144,-180,353,200,39,207,48,49,354,33,50,330,51,37,26',
+'-182,40,46,30,35,36,32,-177,52,-179,31,367,203,204,206,205,157,368,370',
+'201,202,52,35,36,371,372,200,38,207,122,327,326,39,110,48,49,109,33',
+'50,267,51,37,26,334,40,46,30,35,36,32,91,81,62,31,377,80,90,323,-179',
+'37,128,382,40,46,52,35,36,32,383,-180,38,31,385,61,-228,39,387,48,49',
+'388,33,50,52,51,37,26,323,40,46,30,35,36,32,319,110,393,31,308,80,90',
+'317,305,37,128,158,40,46,52,53,399,32,400,,38,31,,,,39,,48,49,,33,50',
+'52,51,37,26,,40,46,30,230,,32,,,,31,,,215,210,56,57,58,59,,,52,211,213',
+'212,214,,38,203,204,206,205,208,209,,201,202,56,57,58,59,,200,,207,217',
+'216,210,,203,204,206,205,208,209,211,201,202,228,-38,-38,-38,-38,200',
+',207,,215,210,-44,-44,-44,-44,,,,211,213,212,214,,,203,204,206,205,208',
+'209,,201,202,-40,-40,-40,-40,,200,,207,217,216,,,203,204,206,205,208',
+'209,,201,202,229,,,,,200,,207,,215,210,206,205,,,,201,202,211,213,212',
+'214,,200,,207,,,,35,36,,,103,,104,,,,,,217,216,,,203,204,206,205,208',
+'209,102,201,202,35,36,,,103,200,104,207,80,,,,37,77,,,46,,,,32,101,102',
+',31,35,36,100,,103,,104,,80,,52,,37,77,,,46,,,,32,101,102,,31,35,36',
+'100,,103,,104,,80,,52,,37,77,,,46,,,,32,101,102,,31,35,36,100,,103,',
+'104,,80,,52,,37,77,,,46,,,,32,101,102,,31,35,36,100,,103,,104,,80,,52',
+',37,77,,,46,,,,32,101,102,,31,35,36,100,,103,,104,,80,,52,,37,77,,,46',
+',,,32,101,102,,31,35,36,100,,103,,104,,80,,52,,37,77,,,46,,,,32,101',
+'102,,31,35,36,100,,103,,104,,80,,52,,37,77,,,46,,,,32,101,102,,31,35',
+'36,100,,103,,104,,80,,52,,37,77,,,46,,,,32,101,102,,31,35,36,100,,103',
+',104,,80,,52,,37,77,,,46,,,,32,101,102,,31,35,36,100,,103,,104,,80,',
+'52,,37,77,,,46,,,,32,101,102,,31,35,36,100,,103,,104,,80,,52,,37,77',
+',,46,35,36,,32,101,102,155,31,,,100,,,35,36,,80,103,52,,37,77,,,46,',
+',,32,101,35,36,31,80,103,100,104,37,231,,,46,,52,,32,80,,,31,37,77,102',
+',46,35,36,,32,103,52,104,31,80,,35,36,37,77,,,46,358,52,,32,101,102',
+',31,,,100,35,36,,,,80,,52,,37,77,,,46,,80,,32,101,37,231,31,,46,100',
+',,32,,,,31,52,80,,,,37,231,,,46,52,,,32,35,36,,31,103,,104,,,,,,,,52',
+',,35,36,,,103,102,104,,,,,,,,,,80,,,,37,77,102,,46,,,,32,101,,,31,80',
+',100,,37,77,,,46,,52,,32,101,35,36,31,,103,100,104,,,,35,36,,52,103',
+',104,,,,35,36,102,,103,161,104,,,,,,102,80,,,,37,77,,,46,102,80,,32',
+'101,37,77,31,,46,100,80,,32,101,37,77,31,52,46,100,,,32,101,35,36,31',
+'52,103,100,104,,,,35,36,,52,103,,104,,,,35,36,102,,103,,104,,,,,,102',
+'80,,,,37,77,,,46,102,80,,32,101,37,77,31,,46,100,80,,32,101,37,77,31',
+'52,46,100,,,32,101,35,36,31,52,103,100,104,,,,35,36,,52,78,,-197,,,',
+'35,36,102,,103,,104,,,,,,63,80,,,,37,77,,,46,102,80,,32,101,37,77,31',
+',46,100,80,,32,,37,77,31,52,46,,,,32,101,35,36,31,52,103,100,104,,,',
+'35,36,,52,103,,104,,,,35,36,102,,103,,104,,,,,,102,80,,,,37,77,,,46',
+'102,80,,32,101,37,77,31,,46,100,80,,32,101,37,77,31,52,46,100,,,32,101',
+'35,36,31,52,103,100,104,,,,35,36,,52,103,,104,,,,35,36,102,,103,,104',
+',,,,,102,80,,,,37,77,,,46,102,80,,32,101,37,77,31,,46,100,80,,32,101',
+'37,77,31,52,46,100,,,32,101,35,36,31,52,103,100,104,,,,35,36,,52,103',
+',104,,,,35,36,102,,103,,104,,,,,,102,80,,,,37,77,,,46,102,80,,32,101',
+'37,77,31,,46,100,80,,32,101,37,77,31,52,46,100,,,32,101,35,36,31,52',
+'103,100,104,,,,35,36,,52,103,161,104,,,,35,36,102,,103,,104,,,,,,102',
+'80,,,,37,77,,,46,102,80,,32,101,37,77,31,,46,100,80,,32,101,37,77,31',
+'52,46,100,,,32,101,35,36,31,52,103,100,104,,,,35,36,,52,,,,,,,35,36',
+'102,,,,234,,,,35,36,,80,103,,,37,77,,,46,,80,,32,101,37,231,31,,46,100',
+'80,,32,,37,231,31,52,46,,80,,32,,37,231,31,52,46,35,36,,32,103,,104',
+'31,52,,35,36,,,103,,104,,52,,35,36,102,,,,,,,,,,102,80,,,,37,77,,,46',
+',80,,32,101,37,77,31,,46,100,80,,32,101,37,231,31,52,46,100,,,32,,35',
+'36,31,52,103,,104,,,,,,,52,,,,35,36,,,103,102,104,,,,,,,,,,80,,,,37',
+'77,102,260,46,,35,36,32,101,103,,31,80,,100,,37,77,,,46,,52,,32,101',
+'35,36,31,,103,100,104,,,,,,80,52,,,37,77,,,46,,102,,32,,210,,31,,,,',
+'80,211,,,37,77,52,,46,,,,32,101,215,210,31,,,100,,,,211,213,212,214',
+'52,203,204,206,205,208,209,,201,202,210,,,,,200,,207,211,217,216,,,203',
+'204,206,205,208,209,,201,202,215,210,,,,200,,207,,211,213,212,214,203',
+'204,206,205,208,209,,201,202,,210,,,,200,,207,,211,217,216,,,203,204',
+'206,205,208,209,,201,202,215,210,,,,200,,207,,211,213,212,214,203,204',
+'206,205,208,209,,201,202,,,,,,200,,207,,,217,216,,,203,204,206,205,208',
+'209,,201,202,215,210,,,,200,,207,,211,213,212,214,203,204,206,205,208',
+'209,,201,202,,,,,,200,,207,,,217,216,,,203,204,206,205,208,209,,201',
+'202,215,210,,,,200,,207,301,211,213,212,214,,,,,215,210,,,,,,,,211,213',
+'212,214,,,217,216,,,203,204,206,205,208,209,,201,202,,,,,,200,,207,203',
+'204,206,205,208,209,,201,202,215,210,,,,200,,207,,211,213,212,214,,',
+',,,,,,215,210,,,,,,,,211,213,212,214,,,203,204,206,205,208,209,,201',
+'202,,,,,,200,,207,217,216,,,203,204,206,205,208,209,,201,202,215,210',
+',,,200,,207,,211,213,212,214,,,,,,,,,,,,,,,,,,,,,216,,,203,204,206,205',
+'208,209,,201,202,215,210,,,,200,,207,,211,213,212,214,,,,,,,,,,,,,,',
+',,,,,217,216,,,203,204,206,205,208,209,,201,202,215,210,,,,200,,207',
+',211,213,212,214,,,,,215,210,,,,,,,,211,213,212,214,,,217,216,,,203',
+'204,206,205,208,209,,201,202,,,,,,200,,207,203,204,206,205,208,209,',
+'201,202,215,210,,,,200,,207,,211,213,212,214,,,,,,,,,,,,,,,,,,,,217',
+'216,,,203,204,206,205,208,209,,201,202,215,210,,,,200,,207,,211,213',
+'212,214,,,,,,,,,,,,,,,,,,,,217,216,,,203,204,206,205,208,209,,201,202',
+',,,,,200,,207,137,135,139,134,136,,132,140,141,148,179,,131,133,,,,',
+',142,130,143,137,135,139,134,136,,132,140,141,148,146,,131,133,,138',
+'144,,,142,130,143,137,135,139,134,136,,132,140,141,148,146,,131,133',
+',138,144,,,142,130,143,137,135,139,134,136,,132,140,141,148,179,,131',
+'133,,138,144,,,142,130,143,137,135,139,134,136,,132,140,141,148,179',
+',131,133,,138,144,,,142,130,143,137,135,139,134,136,,132,140,141,148',
+'146,,131,133,,138,144,,,142,130,143,,,,,,,,,,,,,,,,138,144' ]
+        racc_action_table = arr = ::Array.new(2588, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -138,109 +146,113 @@ clist = [
         end
 
 clist = [
-'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)
+'0,0,97,97,115,77,262,28,168,28,186,354,313,345,354,97,97,128,186,128',
+'313,168,28,77,97,97,97,97,0,115,0,0,178,0,0,128,0,0,0,177,0,0,0,391',
+'391,0,28,97,97,0,391,97,97,97,97,97,97,254,97,97,0,262,262,262,262,97',
+'0,97,304,304,191,391,68,391,391,304,391,391,49,391,391,391,49,391,391',
+'391,2,2,391,68,33,153,391,259,259,315,315,191,191,33,33,153,153,391',
+'154,154,304,259,175,391,153,153,153,153,2,263,2,2,154,2,2,264,2,2,2',
+'275,2,2,2,229,229,2,173,153,153,2,229,153,153,153,153,153,153,266,153',
+'153,2,104,104,275,275,153,2,153,104,222,171,229,222,229,229,170,229',
+'229,84,229,229,229,34,229,229,229,383,383,229,84,34,195,229,383,84,269',
+'29,288,288,104,29,195,195,229,288,310,270,29,310,229,195,195,195,195',
+'383,169,383,383,166,383,383,50,383,383,383,50,383,383,383,382,382,383',
+'185,195,195,383,382,195,195,195,195,195,195,185,195,195,383,51,185,290',
+'290,195,383,195,289,289,290,382,248,382,382,289,382,382,272,382,382',
+'382,165,382,382,382,372,372,382,272,85,326,382,372,272,326,246,164,326',
+'51,261,85,51,382,261,261,85,221,163,382,248,221,221,248,372,162,372',
+'372,201,372,372,51,372,372,372,155,372,372,372,81,81,372,248,81,246',
+'372,149,246,192,287,287,146,192,192,287,287,372,145,114,113,160,287',
+'372,287,160,160,246,81,81,81,81,81,81,81,81,81,81,81,112,81,81,306,306',
+'87,81,83,81,81,81,181,80,79,181,181,292,292,292,292,76,81,75,292,292',
+'73,81,81,71,307,292,306,292,306,306,309,306,306,249,306,306,306,69,306',
+'306,306,319,319,306,67,202,66,306,319,291,291,291,291,64,320,321,291',
+'291,306,55,55,323,324,291,306,291,53,245,244,319,48,319,319,41,319,319',
+'343,319,319,319,255,319,319,319,327,327,319,30,27,25,319,327,55,55,243',
+'23,55,55,357,55,55,319,60,60,55,360,22,319,55,362,21,364,327,366,327',
+'327,369,327,327,55,327,327,327,370,327,327,327,228,228,327,241,240,376',
+'327,228,60,60,235,225,60,60,231,60,60,327,1,394,60,396,,327,60,,,,228',
+',228,228,,228,228,60,228,228,228,,228,228,228,108,,228,,,,228,,,108',
+'108,20,20,20,20,,,228,108,108,108,108,,228,294,294,294,294,294,294,',
+'294,294,19,19,19,19,,294,,294,108,108,296,,108,108,108,108,108,108,296',
+'108,108,105,5,5,5,5,108,,108,,105,105,9,9,9,9,,,,105,105,105,105,,,296',
+'296,296,296,296,296,,296,296,7,7,7,7,,296,,296,105,105,,,105,105,105',
+'105,105,105,,105,105,107,,,,,105,,105,,107,107,286,286,,,,286,286,107',
+'107,107,107,,286,,286,,,,204,204,,,204,,204,,,,,,107,107,,,107,107,107',
+'107,107,107,204,107,107,36,36,,,36,107,36,107,204,,,,204,204,,,204,',
+',,204,204,36,,204,38,38,204,,38,,38,,36,,204,,36,36,,,36,,,,36,36,38',
+',36,39,39,36,,39,,39,,38,,36,,38,38,,,38,,,,38,38,39,,38,40,40,38,,40',
+',40,,39,,38,,39,39,,,39,,,,39,39,40,,39,214,214,39,,214,,214,,40,,39',
+',40,40,,,40,,,,40,40,214,,40,213,213,40,,213,,213,,214,,40,,214,214',
+',,214,,,,214,214,213,,214,212,212,214,,212,,212,,213,,214,,213,213,',
+',213,,,,213,213,212,,213,211,211,213,,211,,211,,212,,213,,212,212,,',
+'212,,,,212,212,211,,212,210,210,212,,210,,210,,211,,212,,211,211,,,211',
+',,,211,211,210,,211,209,209,211,,209,,209,,210,,211,,210,210,,,210,',
+',,210,210,209,,210,356,356,210,,356,,356,,209,,210,,209,209,,,209,,',
+',209,209,356,,209,63,63,209,,63,,63,,356,,209,,356,356,,,356,361,361',
+',356,356,63,63,356,,,356,,,317,317,,63,317,356,,63,63,,,63,,,,63,63',
+'208,208,63,361,208,63,208,361,361,,,361,,63,,361,317,,,361,317,317,208',
+',317,207,207,,317,207,361,207,317,208,,311,311,208,208,,,208,311,317',
+',208,208,207,,208,,,208,363,363,,,,207,,208,,207,207,,,207,,311,,207',
+'207,311,311,207,,311,207,,,311,,,,311,207,363,,,,363,363,,,363,311,',
+',363,305,305,,363,305,,305,,,,,,,,363,,,206,206,,,206,305,206,,,,,,',
+',,,305,,,,305,305,206,,305,,,,305,305,,,305,206,,305,,206,206,,,206',
+',305,,206,206,205,205,206,,205,206,205,,,,215,215,,206,215,,215,,,,78',
+'78,205,,78,78,78,,,,,,215,205,,,,205,205,,,205,78,215,,205,205,215,215',
+'205,,215,205,78,,215,215,78,78,215,205,78,215,,,78,78,203,203,78,215',
+'203,78,203,,,,371,371,,78,371,,371,,,,200,200,203,,200,,200,,,,,,371',
+'203,,,,203,203,,,203,200,371,,203,203,371,371,203,,371,203,200,,371',
+'371,200,200,371,203,200,371,,,200,200,199,199,200,371,199,200,199,,',
+',26,26,,200,26,,26,,,,251,251,199,,251,,251,,,,,,26,199,,,,199,199,',
+',199,251,26,,199,199,26,26,199,,26,199,251,,26,,251,251,26,199,251,',
+',,251,251,86,86,251,26,86,251,86,,,,252,252,,251,252,,252,,,,92,92,86',
+',92,,92,,,,,,252,86,,,,86,86,,,86,92,252,,86,86,252,252,86,,252,86,92',
+',252,252,92,92,252,86,92,252,,,92,92,93,93,92,252,93,92,93,,,,94,94',
+',92,94,,94,,,,95,95,93,,95,,95,,,,,,94,93,,,,93,93,,,93,95,94,,93,93',
+'94,94,93,,94,93,95,,94,94,95,95,94,93,95,94,,,95,95,216,216,95,94,216',
+'95,216,,,,100,100,,95,100,,100,,,,101,101,216,,101,,101,,,,,,100,216',
+',,,216,216,,,216,101,100,,216,216,100,100,216,,100,216,101,,100,100',
+'101,101,100,216,101,100,,,101,101,102,102,101,100,102,101,102,,,,103',
+'103,,101,103,103,103,,,,256,256,102,,256,,256,,,,,,103,102,,,,102,102',
+',,102,256,103,,102,102,103,103,102,,103,102,256,,103,103,256,256,103',
+'102,256,103,,,256,256,217,217,256,103,217,256,217,,,,234,234,,256,,',
+',,,,109,109,217,,,,109,,,,265,265,,217,265,,,217,217,,,217,,234,,217',
+'217,234,234,217,,234,217,109,,234,,109,109,234,217,109,,265,,109,,265',
+'265,109,234,265,276,276,,265,276,,276,265,109,,277,277,,,277,,277,,265',
+',230,230,276,,,,,,,,,,277,276,,,,276,276,,,276,,277,,276,276,277,277',
+'276,,277,276,230,,277,277,230,230,277,276,230,277,,,230,,159,159,230',
+'277,159,,159,,,,,,,230,,,,158,158,,,158,159,158,,,,,,,,,,159,,,,159',
+'159,158,158,159,,157,157,159,159,157,,159,158,,159,,158,158,,,158,,159',
+',158,158,62,62,158,,62,158,62,,,,,,157,158,,,157,157,,,157,,62,,157',
+',298,,157,,,,,62,298,,,62,62,157,,62,,,,62,62,335,335,62,,,62,,,,335',
+'335,335,335,62,298,298,298,298,298,298,,298,298,295,,,,,298,,298,295',
+'335,335,,,335,335,335,335,335,335,,335,335,390,390,,,,335,,335,,390',
+'390,390,390,295,295,295,295,295,295,,295,295,,297,,,,295,,295,,297,390',
+'390,,,390,390,390,390,390,390,,390,390,156,156,,,,390,,390,,156,156',
+'156,156,297,297,297,297,297,297,,297,297,,,,,,297,,297,,,156,156,,,156',
+'156,156,156,156,156,,156,156,194,194,,,,156,,156,,194,194,194,194,293',
+'293,293,293,293,293,,293,293,,,,,,293,,293,,,194,194,,,194,194,194,194',
+'194,194,,194,194,220,220,,,,194,,194,220,220,220,220,220,,,,,348,348',
+',,,,,,,348,348,348,348,,,220,220,,,220,220,220,220,220,220,,220,220',
+',,,,,220,,220,348,348,348,348,348,348,,348,348,349,349,,,,348,,348,',
+'349,349,349,349,,,,,,,,,333,333,,,,,,,,333,333,333,333,,,349,349,349',
+'349,349,349,,349,349,,,,,,349,,349,333,333,,,333,333,333,333,333,333',
+',333,333,300,300,,,,333,,333,,300,300,300,300,,,,,,,,,,,,,,,,,,,,,300',
+',,300,300,300,300,300,300,,300,300,352,352,,,,300,,300,,352,352,352',
+'352,,,,,,,,,,,,,,,,,,,,352,352,,,352,352,352,352,352,352,,352,352,196',
+'196,,,,352,,352,,196,196,196,196,,,,,299,299,,,,,,,,299,299,299,299',
+',,196,196,,,196,196,196,196,196,196,,196,196,,,,,,196,,196,299,299,299',
+'299,299,299,,299,299,193,193,,,,299,,299,,193,193,193,193,,,,,,,,,,',
+',,,,,,,,,193,193,,,193,193,193,193,193,193,,193,193,332,332,,,,193,',
+'193,,332,332,332,332,,,,,,,,,,,,,,,,,,,,332,332,,,332,332,332,332,332',
+'332,,332,332,,,,,,332,,332,268,268,268,268,268,,268,268,268,268,268',
+',268,268,,,,,,268,268,268,180,180,180,180,180,,180,180,180,180,180,',
+'180,180,,268,268,,,180,180,180,61,61,61,61,61,,61,61,61,61,61,,61,61',
+',180,180,,,61,61,61,267,267,267,267,267,,267,267,267,267,267,,267,267',
+',61,61,,,267,267,267,82,82,82,82,82,,82,82,82,82,82,,82,82,,267,267',
+',,82,82,82,250,250,250,250,250,,250,250,250,250,250,,250,250,,82,82',
+',,250,250,250,,,,,,,,,,,,,,,,250,250' ]
+        racc_action_check = arr = ::Array.new(2588, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -250,328 +262,338 @@ clist = [
         end
 
 racc_action_pointer = [
-    -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,
+    -2,   490,    84,   nil,   nil,   507,   nil,   539,   nil,   517,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   485,
+   463,   447,   428,   417,   nil,   428,  1304,   425,     1,   146,
+   388,   nil,   nil,    84,   153,   nil,   675,   nil,   700,   725,
+   750,   395,   nil,   nil,   nil,   nil,   nil,   nil,   413,    42,
+   171,   231,   nil,   411,   nil,   402,   nil,   nil,   nil,   nil,
+   445,  2453,  1832,   950,   386,   nil,   368,   366,    66,   359,
+   nil,   345,   nil,   359,   nil,   339,   337,    -1,  1180,   330,
+   346,   299,  2497,   339,   140,   238,  1361,   337,   nil,   nil,
+   nil,   nil,  1381,  1428,  1438,  1448,   nil,    -2,   nil,   nil,
+  1505,  1515,  1562,  1572,   145,   561,   nil,   615,   507,  1649,
+   nil,   nil,   328,   297,   296,    -8,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    11,   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 ]
+   nil,   nil,   nil,   nil,   nil,   307,   261,   nil,   nil,   297,
+   nil,   nil,   nil,    84,    93,   274,  1954,  1811,  1785,  1768,
+   315,   nil,   264,   257,   228,   242,   184,   nil,    -3,   178,
+   138,   133,   nil,   109,   nil,   102,   nil,    16,    20,   nil,
+  2431,   305,   nil,   nil,   nil,   194,    -8,   nil,   nil,   nil,
+   nil,    48,   303,  2324,  1999,   170,  2262,   nil,   nil,  1294,
+  1247,   228,   328,  1227,   650,  1160,  1113,  1022,   997,   900,
+   875,   850,   825,   800,   775,  1170,  1495,  1629,   nil,   nil,
+  2044,   272,   146,   nil,   nil,   472,   nil,   nil,   470,   127,
+  1721,   462,   nil,   nil,  1639,   471,   nil,   nil,   nil,   nil,
+   474,   467,   nil,   404,   376,   404,   266,   nil,   242,   369,
+  2519,  1314,  1371,   nil,    34,   400,  1582,   nil,   nil,    82,
+   nil,   265,    -2,   108,   112,  1659,   134,  2475,  2409,   172,
+   180,   nil,   226,   nil,   nil,   100,  1701,  1711,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   579,   256,   123,   180,
+   175,   341,   303,  1976,   486,  1886,   540,  1931,  1842,  2279,
+  2172,   nil,   nil,   nil,    66,  1096,   341,   360,   nil,   366,
+   160,  1032,   nil,     0,   nil,    84,   nil,   980,   nil,   384,
+   374,   388,   nil,   391,   399,   nil,   227,   427,   nil,   nil,
+   nil,   nil,  2369,  2127,   nil,  1864,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   409,   nil,     4,   nil,   nil,  2061,  2106,
+   nil,   nil,  2217,   nil,   -20,   nil,   925,   435,   nil,   nil,
+   442,   967,   445,  1050,   447,   nil,   449,   nil,   nil,   436,
+   433,  1237,   256,   nil,   nil,   nil,   468,   nil,   nil,   nil,
+   nil,   nil,   213,   170,   nil,   nil,   nil,   nil,   nil,   nil,
+  1909,    41,   nil,   nil,   482,   nil,   484,   nil,   nil,   nil,
+   nil ]
 
 racc_action_default = [
-  -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 ]
+  -206,  -241,    -1,    -2,    -3,    -6,    -7,    -8,    -9,   -10,
+   -11,   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -19,   -20,
+  -241,   -39,   -41,   -42,   -43,   -45,   -97,  -241,  -178,  -241,
+   -74,   -96,   -98,  -221,  -239,  -124,  -241,  -129,  -241,  -241,
+  -241,  -241,  -177,  -181,  -182,  -183,  -185,  -186,  -241,  -241,
+  -198,  -241,  -229,  -241,    -4,  -241,   -46,   -47,   -48,   -49,
+  -241,  -119,  -241,  -241,   -53,   -54,   -58,   -59,   -60,   -61,
+   -62,   -63,   -64,   -65,   -66,   -67,   -68,   -97,  -241,  -239,
+  -221,  -109,  -109,   -77,  -206,  -206,  -241,  -241,   -73,  -197,
+  -198,   -75,  -241,  -241,  -241,  -241,  -125,  -241,  -141,  -142,
+  -241,  -241,  -241,  -241,  -241,  -241,  -134,  -241,  -241,  -241,
+  -187,  -188,  -190,  -206,  -206,  -206,  -199,  -201,  -202,  -203,
+  -204,  -205,   401,   -37,   -38,   -39,   -40,   -44,   -97,   -36,
+   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -28,   -29,   -30,
+   -31,   -32,   -33,   -34,   -35,  -227,  -112,  -113,  -114,  -241,
+  -117,  -118,  -120,  -241,  -241,   -52,   -56,  -241,  -241,  -241,
+  -241,  -224,   -24,   -34,   -94,  -227,  -241,   -92,   -97,   -99,
+  -100,  -101,  -102,  -103,  -104,  -105,  -110,  -114,  -227,  -112,
+  -119,  -241,   -80,   -81,   -83,  -206,  -241,   -89,   -90,   -97,
+  -221,  -241,  -241,  -106,  -108,  -241,  -107,  -126,  -127,  -241,
+  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,
+  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -153,  -160,
+  -241,  -241,  -241,  -232,  -233,  -241,  -236,  -237,  -241,  -241,
+  -241,   -97,  -171,  -172,  -241,  -241,  -178,  -179,  -180,  -184,
+  -241,  -241,  -208,  -207,  -206,  -241,  -241,  -215,  -241,  -241,
+  -228,  -241,  -241,  -240,   -50,  -226,  -241,  -225,   -55,  -241,
+  -123,  -241,  -222,  -226,  -241,   -95,  -241,  -228,  -109,  -241,
+  -227,   -78,  -241,   -85,   -86,  -241,  -241,  -241,   -79,  -131,
+  -226,  -238,  -128,  -143,  -144,  -145,  -146,  -147,  -148,  -149,
+  -150,  -151,  -152,  -154,  -155,  -156,  -157,  -158,  -159,  -161,
+  -162,  -163,  -222,  -230,  -241,  -241,    -5,  -241,  -133,  -241,
+  -137,  -241,  -165,  -241,  -169,  -227,  -174,  -241,  -189,  -241,
+  -241,  -227,  -211,  -214,  -241,  -217,  -241,  -241,  -200,  -216,
+   -72,  -121,  -116,  -115,   -51,   -57,  -122,  -130,  -223,   -69,
+   -93,   -70,  -111,  -227,   -71,  -241,   -82,   -84,   -87,   -88,
+  -231,  -234,  -235,  -132,  -137,  -136,  -241,  -241,  -164,  -166,
+  -241,  -241,  -241,  -241,  -226,  -176,  -241,  -192,  -209,  -241,
+  -228,  -241,  -241,  -218,  -219,  -220,  -241,  -196,   -91,   -76,
+  -135,  -138,  -241,  -241,  -170,  -173,  -175,  -191,  -210,  -212,
+  -213,  -241,  -194,  -195,  -241,  -140,  -241,  -168,  -193,  -139,
+  -167 ]
 
 racc_goto_table = [
-    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,
+    28,     2,    28,    42,   224,    42,    54,    65,   106,   233,
+   113,   114,   235,   121,   116,    44,   174,    44,    43,   111,
+    43,   249,   167,    96,   307,   309,     3,   322,   145,    87,
+    25,    88,    25,   165,   178,   176,   176,    83,   312,   355,
+   123,   266,   181,   191,   311,   129,   127,   331,   126,   154,
+    24,   127,    24,   126,   269,    28,   346,   124,    42,   232,
+    28,   197,   124,    42,   160,    55,    60,   241,   244,   315,
+    44,   264,   192,    43,   112,    44,   164,   324,    43,   115,
+   245,   171,   363,   380,   170,    25,   329,   188,   188,   221,
+    25,   320,   321,    64,   373,   222,    44,     1,   nil,    43,
+   nil,   nil,   nil,   nil,   nil,    24,   nil,   nil,   nil,   236,
+    24,   175,    42,   nil,   nil,   366,   nil,   nil,    34,   359,
+    34,   nil,   nil,   376,    44,   nil,   nil,    43,   nil,   nil,
+   nil,   172,   nil,   314,   316,   nil,   nil,   235,   258,   242,
+   242,   247,   nil,   275,   259,   261,   345,   270,   nil,   nil,
+   nil,   nil,   nil,   nil,   389,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   284,   285,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   394,   396,
+   nil,   nil,   nil,   nil,   nil,   nil,   282,   nil,   188,   nil,
+   nil,   362,   nil,   nil,   nil,   nil,   nil,   369,   nil,   nil,
+   174,   nil,   nil,   nil,   351,   nil,   340,   nil,   121,   328,
+   121,   318,   nil,   nil,   314,   nil,   nil,   nil,   nil,   378,
+   343,   342,   176,   nil,   nil,   nil,   nil,   239,    28,    28,
+   236,    42,    42,    42,   236,   nil,   nil,    42,   nil,   nil,
+   nil,   nil,   nil,    44,    44,    44,    43,    43,    43,    44,
+   nil,   nil,    43,   nil,   nil,   nil,   nil,   nil,    25,    25,
+   nil,   nil,   nil,   386,   384,   171,   235,   nil,   170,   nil,
+   325,   nil,   nil,   nil,   nil,   188,   nil,   nil,    24,    24,
+    44,   nil,   nil,    43,    23,   nil,    23,   374,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   175,   nil,   nil,   365,    45,
+   nil,    45,   nil,   nil,   nil,   nil,    28,   nil,   nil,    42,
+    54,   236,   nil,   nil,    42,   172,   nil,   nil,   nil,    28,
+   nil,    44,    42,   nil,    43,   381,    44,    28,   nil,    43,
+    42,   nil,   nil,   nil,    44,   nil,    25,    43,   nil,    23,
+   nil,   nil,    44,   nil,    23,    43,    34,    34,   239,    25,
+   nil,   nil,   239,   nil,    45,   nil,    24,    25,   nil,    45,
+   nil,   236,   nil,   236,    42,   169,    42,   nil,    22,    24,
+    22,   nil,    28,   391,   nil,    42,    44,    24,    44,    43,
+    45,    43,    28,    28,   nil,    42,    42,    44,   227,   nil,
+    43,    28,   nil,   237,    42,    54,   nil,    44,    44,   nil,
+    43,    43,    25,    21,   nil,    21,    44,   nil,    45,    43,
+   nil,   nil,    25,    25,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    25,    24,    22,    34,   nil,   nil,   nil,    22,   239,
+   nil,   nil,    24,    24,   nil,   nil,   nil,    34,   nil,   nil,
+   nil,    24,   nil,   nil,   nil,    34,   nil,   nil,   nil,   173,
+   nil,   nil,   187,   187,   nil,   nil,   nil,   nil,   125,   nil,
+   nil,   nil,   nil,   125,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   238,   nil,   239,
+   nil,   239,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    34,    34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    34,
+   nil,   nil,    23,    23,   237,   nil,   nil,   nil,   237,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    45,    45,    45,
+   nil,   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   169,
+   nil,   nil,   nil,   187,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,   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,   227,   nil,
+    23,   nil,   nil,   nil,   nil,   237,    22,    22,   238,   nil,
+   nil,   nil,   238,    23,   nil,    45,   nil,   nil,   nil,   nil,
+    45,    23,   nil,   nil,   nil,   nil,   nil,   nil,    45,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,
+   nil,    21,    21,   173,   nil,    97,   nil,   105,   107,   108,
+   187,   nil,   nil,   nil,   nil,   237,   nil,   237,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,   nil,   nil,
+    45,   153,    45,   nil,   nil,   nil,    23,    23,   nil,   nil,
+   nil,    45,   nil,   nil,    22,    23,   nil,   nil,   nil,   238,
+   nil,    45,    45,   nil,   nil,   nil,   nil,    22,   nil,   nil,
+    45,   193,   194,   195,   196,    22,   nil,   nil,   nil,   218,
+   219,   220,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   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,    21,   nil,   nil,   nil,   nil,   nil,   nil,   238,
+    21,   238,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    22,    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
    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,    21,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    21,    21,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,    97,   283,
+   nil,   nil,   286,   287,   288,   289,   290,   291,   292,   293,
+   294,   295,   296,   297,   298,   299,   300,   nil,   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,   nil,   nil,
+   332,   333,   nil,   nil,   nil,   335,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   114 ]
+   nil,   nil,   nil,   nil,   nil,   348,   349,   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,   352,   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,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   107,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   390 ]
 
 racc_goto_check = [
-    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,
+    35,     2,    35,    34,    86,    34,     4,    31,    62,    71,
+    40,    40,    69,    65,    79,    36,    37,    36,    38,    73,
+    38,    44,    53,    60,     5,     5,     3,    83,    45,    35,
+    28,     6,    28,    43,    43,    56,    56,    47,    67,    63,
+    22,    44,    48,    48,    66,    22,    10,    59,     8,    29,
+    27,    10,    27,     8,    44,    35,    49,     6,    34,    70,
+    35,    61,     6,    34,    29,    23,    23,    75,    75,    72,
+    36,    42,    29,    38,    74,    36,    41,    76,    38,    77,
+    78,    35,    33,    63,    34,    28,    80,    34,    34,    29,
+    28,    81,    82,    30,    84,    85,    36,     1,   nil,    38,
+   nil,   nil,   nil,   nil,   nil,    27,   nil,   nil,   nil,    35,
+    27,    28,    34,   nil,   nil,     5,   nil,   nil,    55,    67,
+    55,   nil,   nil,     5,    36,   nil,   nil,    38,   nil,   nil,
+   nil,    27,   nil,    69,    71,   nil,   nil,    69,    31,     3,
+     3,     3,   nil,    48,    29,    29,    44,    45,   nil,   nil,
+   nil,   nil,   nil,   nil,    83,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    65,    65,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     5,     5,
+   nil,   nil,   nil,   nil,   nil,   nil,    60,   nil,    34,   nil,
+   nil,    44,   nil,   nil,   nil,   nil,   nil,    44,   nil,   nil,
+    37,   nil,   nil,   nil,    86,   nil,    53,   nil,    65,    79,
+    65,    73,   nil,   nil,    69,   nil,   nil,   nil,   nil,    44,
+    43,    56,    56,   nil,   nil,   nil,   nil,    55,    35,    35,
+    35,    34,    34,    34,    35,   nil,   nil,    34,   nil,   nil,
+   nil,   nil,   nil,    36,    36,    36,    38,    38,    38,    36,
+   nil,   nil,    38,   nil,   nil,   nil,   nil,   nil,    28,    28,
+   nil,   nil,   nil,    71,    69,    35,    69,   nil,    34,   nil,
+     3,   nil,   nil,   nil,   nil,    34,   nil,   nil,    27,    27,
+    36,   nil,   nil,    38,    26,   nil,    26,    40,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    28,   nil,   nil,    31,    39,
+   nil,    39,   nil,   nil,   nil,   nil,    35,   nil,   nil,    34,
+     4,    35,   nil,   nil,    34,    27,   nil,   nil,   nil,    35,
+   nil,    36,    34,   nil,    38,    62,    36,    35,   nil,    38,
+    34,   nil,   nil,   nil,    36,   nil,    28,    38,   nil,    26,
+   nil,   nil,    36,   nil,    26,    38,    55,    55,    55,    28,
+   nil,   nil,    55,   nil,    39,   nil,    27,    28,   nil,    39,
+   nil,    35,   nil,    35,    34,    26,    34,   nil,    25,    27,
+    25,   nil,    35,     2,   nil,    34,    36,    27,    36,    38,
+    39,    38,    35,    35,   nil,    34,    34,    36,    26,   nil,
+    38,    35,   nil,    26,    34,     4,   nil,    36,    36,   nil,
+    38,    38,    28,    24,   nil,    24,    36,   nil,    39,    38,
+   nil,   nil,    28,    28,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    28,    27,    25,    55,   nil,   nil,   nil,    25,    55,
+   nil,   nil,    27,    27,   nil,   nil,   nil,    55,   nil,   nil,
+   nil,    27,   nil,   nil,   nil,    55,   nil,   nil,   nil,    25,
+   nil,   nil,    25,    25,   nil,   nil,   nil,   nil,    24,   nil,
+   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,    55,
+   nil,    55,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    55,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    55,    55,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    55,
+   nil,   nil,    26,    26,    26,   nil,   nil,   nil,    26,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    39,    39,    39,
+   nil,   nil,   nil,    39,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,
+   nil,   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    39,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,   nil,
+    26,   nil,   nil,   nil,   nil,    26,    25,    25,    25,   nil,
+   nil,   nil,    25,    26,   nil,    39,   nil,   nil,   nil,   nil,
+    39,    26,   nil,   nil,   nil,   nil,   nil,   nil,    39,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    39,   nil,   nil,   nil,
+   nil,    24,    24,    25,   nil,    32,   nil,    32,    32,    32,
+    25,   nil,   nil,   nil,   nil,    26,   nil,    26,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    26,   nil,   nil,   nil,
+    39,    32,    39,   nil,   nil,   nil,    26,    26,   nil,   nil,
+   nil,    39,   nil,   nil,    25,    26,   nil,   nil,   nil,    25,
+   nil,    39,    39,   nil,   nil,   nil,   nil,    25,   nil,   nil,
+    39,    32,    32,    32,    32,    25,   nil,   nil,   nil,    32,
+    32,    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,    25,
+    24,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    25,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    24,    24,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    24,   nil,   nil,   nil,    32,    32,
+   nil,   nil,    32,    32,    32,    32,    32,    32,    32,    32,
+    32,    32,    32,    32,    32,    32,    32,   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,    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,
+    32,    32,   nil,   nil,   nil,    32,   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,    32,    32,   nil,   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,    32,   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,    32 ]
+   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,    32,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    32 ]
 
 racc_goto_pointer = [
-   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 ]
+   nil,    97,     1,    26,     4,  -204,     2,   nil,    -7,   nil,
+    -9,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   -15,    46,   403,   368,   284,    50,    30,   -14,
+    67,   -19,   599,  -233,     3,     0,    15,   -65,    18,   299,
+   -39,    -5,   -93,   -48,  -124,   -33,   nil,     9,   -42,  -216,
+   nil,   nil,   nil,   -59,   nil,   118,   -46,   nil,   nil,  -203,
+   -13,   -36,   -31,  -271,   nil,   -38,  -186,  -192,   nil,   -97,
+   -50,  -100,  -165,   -29,    26,   -46,  -167,    28,   -35,   -37,
+  -162,  -152,  -151,  -216,  -232,    -9,  -100,   nil ]
 
 racc_goto_default = [
-   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,   306,   182,     4,   nil,     5,     6,     7,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,   147,    20,   nil,    74,    71,    66,    70,    73,   nil,
+   nil,    98,   156,   256,    67,    68,    69,    72,    75,    76,
+    27,   nil,   nil,   nil,   nil,   nil,    29,   nil,   nil,   183,
+   272,   184,   186,   nil,   166,    79,   150,   149,   151,   152,
+   nil,   nil,   nil,   nil,    99,    47,   nil,   nil,   313,    41,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    97,   nil,   nil,   nil,   nil,   nil,   nil,   158 ]
+   117,   nil,   nil,   nil,   nil,   nil,   nil,   225 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  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, 71, :_reduce_none,
+  1, 71, :_reduce_none,
+  1, 72, :_reduce_3,
+  2, 72, :_reduce_4,
+  1, 75, :_reduce_5,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_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,
@@ -580,204 +602,219 @@ racc_reduce_table = [
   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,
+  3, 90, :_reduce_36,
+  3, 90, :_reduce_37,
   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,
-  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, 92, :_reduce_none,
+  1, 92, :_reduce_none,
+  1, 92, :_reduce_none,
+  1, 92, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  1, 93, :_reduce_none,
+  4, 84, :_reduce_50,
+  5, 84, :_reduce_51,
+  3, 84, :_reduce_52,
+  2, 84, :_reduce_53,
+  1, 100, :_reduce_54,
+  3, 100, :_reduce_55,
+  1, 99, :_reduce_56,
+  3, 99, :_reduce_57,
+  1, 101, :_reduce_none,
+  1, 101, :_reduce_none,
+  1, 101, :_reduce_none,
+  1, 101, :_reduce_none,
+  1, 101, :_reduce_none,
+  1, 101, :_reduce_none,
+  1, 101, :_reduce_none,
   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, 101, :_reduce_none,
+  1, 101, :_reduce_none,
+  5, 76, :_reduce_69,
+  5, 76, :_reduce_70,
+  5, 76, :_reduce_71,
+  5, 88, :_reduce_72,
+  2, 77, :_reduce_73,
+  1, 116, :_reduce_74,
+  2, 116, :_reduce_75,
+  6, 78, :_reduce_76,
+  2, 78, :_reduce_77,
+  3, 117, :_reduce_78,
+  3, 117, :_reduce_79,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  3, 118, :_reduce_82,
+  1, 119, :_reduce_none,
+  3, 119, :_reduce_84,
+  1, 120, :_reduce_85,
+  1, 120, :_reduce_86,
+  3, 121, :_reduce_87,
+  3, 121, :_reduce_88,
+  1, 122, :_reduce_none,
+  1, 122, :_reduce_none,
+  4, 123, :_reduce_91,
+  1, 111, :_reduce_92,
+  3, 111, :_reduce_93,
+  0, 112, :_reduce_none,
+  1, 112, :_reduce_none,
+  1, 109, :_reduce_96,
+  1, 104, :_reduce_97,
+  1, 105, :_reduce_98,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  3, 79, :_reduce_106,
+  3, 79, :_reduce_107,
+  3, 89, :_reduce_108,
+  0, 113, :_reduce_109,
+  1, 113, :_reduce_110,
+  3, 113, :_reduce_111,
+  1, 127, :_reduce_none,
+  1, 127, :_reduce_none,
+  1, 127, :_reduce_none,
+  3, 126, :_reduce_115,
+  3, 128, :_reduce_116,
+  1, 129, :_reduce_none,
+  1, 129, :_reduce_none,
+  0, 115, :_reduce_119,
+  1, 115, :_reduce_120,
+  3, 115, :_reduce_121,
+  4, 108, :_reduce_122,
+  3, 108, :_reduce_123,
+  1, 96, :_reduce_124,
+  2, 96, :_reduce_125,
+  2, 130, :_reduce_126,
+  1, 131, :_reduce_127,
+  2, 131, :_reduce_128,
+  1, 106, :_reduce_129,
+  4, 94, :_reduce_130,
+  4, 94, :_reduce_131,
+  5, 82, :_reduce_132,
+  4, 82, :_reduce_133,
+  2, 81, :_reduce_134,
+  5, 132, :_reduce_135,
+  4, 132, :_reduce_136,
+  0, 133, :_reduce_none,
+  2, 133, :_reduce_138,
+  4, 133, :_reduce_139,
+  3, 133, :_reduce_140,
+  1, 102, :_reduce_none,
+  1, 102, :_reduce_none,
+  3, 102, :_reduce_143,
+  3, 102, :_reduce_144,
+  3, 102, :_reduce_145,
+  3, 102, :_reduce_146,
+  3, 102, :_reduce_147,
+  3, 102, :_reduce_148,
+  3, 102, :_reduce_149,
+  3, 102, :_reduce_150,
+  3, 102, :_reduce_151,
+  3, 102, :_reduce_152,
+  2, 102, :_reduce_153,
+  3, 102, :_reduce_154,
+  3, 102, :_reduce_155,
+  3, 102, :_reduce_156,
+  3, 102, :_reduce_157,
+  3, 102, :_reduce_158,
+  3, 102, :_reduce_159,
+  2, 102, :_reduce_160,
+  3, 102, :_reduce_161,
+  3, 102, :_reduce_162,
+  3, 102, :_reduce_163,
+  5, 80, :_reduce_164,
+  1, 136, :_reduce_165,
+  2, 136, :_reduce_166,
+  5, 137, :_reduce_167,
+  4, 137, :_reduce_168,
+  1, 138, :_reduce_169,
+  3, 138, :_reduce_170,
+  3, 97, :_reduce_171,
+  1, 140, :_reduce_none,
+  4, 140, :_reduce_173,
+  1, 142, :_reduce_none,
+  3, 142, :_reduce_175,
+  3, 141, :_reduce_176,
+  1, 139, :_reduce_none,
+  1, 139, :_reduce_none,
+  1, 139, :_reduce_none,
+  1, 139, :_reduce_none,
   1, 139, :_reduce_none,
-  4, 139, :_reduce_172,
-  1, 141, :_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,
+  1, 139, :_reduce_none,
+  1, 139, :_reduce_none,
+  1, 139, :_reduce_none,
+  1, 139, :_reduce_185,
+  1, 139, :_reduce_none,
+  1, 143, :_reduce_187,
+  1, 144, :_reduce_none,
+  3, 144, :_reduce_189,
+  2, 83, :_reduce_190,
+  6, 85, :_reduce_191,
+  5, 85, :_reduce_192,
+  7, 86, :_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,
+  6, 87, :_reduce_195,
+  5, 87, :_reduce_196,
+  1, 110, :_reduce_197,
+  1, 110, :_reduce_198,
+  1, 147, :_reduce_199,
+  3, 147, :_reduce_200,
   1, 149, :_reduce_201,
-  1, 149, :_reduce_202,
-  1, 149, :_reduce_203,
-  1, 149, :_reduce_none,
-  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, 150, :_reduce_202,
+  1, 150, :_reduce_203,
+  1, 150, :_reduce_204,
+  1, 150, :_reduce_none,
+  0, 73, :_reduce_206,
+  0, 151, :_reduce_207,
   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,
+  3, 145, :_reduce_209,
+  4, 145, :_reduce_210,
+  1, 152, :_reduce_none,
+  3, 152, :_reduce_212,
+  3, 153, :_reduce_213,
+  1, 153, :_reduce_214,
+  1, 148, :_reduce_none,
+  2, 148, :_reduce_216,
+  1, 146, :_reduce_none,
+  2, 146, :_reduce_218,
+  1, 154, :_reduce_none,
   1, 154, :_reduce_none,
-  3, 154, :_reduce_233,
+  1, 95, :_reduce_221,
+  3, 107, :_reduce_222,
+  4, 107, :_reduce_223,
+  2, 107, :_reduce_224,
+  1, 103, :_reduce_none,
+  1, 103, :_reduce_none,
+  0, 114, :_reduce_none,
+  1, 114, :_reduce_228,
+  1, 135, :_reduce_229,
+  3, 134, :_reduce_230,
+  4, 134, :_reduce_231,
+  2, 134, :_reduce_232,
+  1, 155, :_reduce_none,
   3, 155, :_reduce_234,
-  1, 156, :_reduce_235,
-  1, 156, :_reduce_236,
-  4, 124, :_reduce_237,
-  1, 97, :_reduce_none,
-  4, 97, :_reduce_239 ]
+  3, 156, :_reduce_235,
+  1, 157, :_reduce_236,
+  1, 157, :_reduce_237,
+  4, 125, :_reduce_238,
+  1, 98, :_reduce_none,
+  4, 98, :_reduce_240 ]
 
-racc_reduce_n = 240
+racc_reduce_n = 241
 
-racc_shift_n = 399
+racc_shift_n = 401
 
 racc_token_table = {
   false => 0,
@@ -848,9 +885,10 @@ racc_token_table = {
   :IN_EDGE_SUB => 65,
   :OUT_EDGE_SUB => 66,
   :IN => 67,
-  :UNLESS => 68 }
+  :UNLESS => 68,
+  :MODULO => 69 }
 
-racc_nt_base = 69
+racc_nt_base = 70
 
 racc_use_result_var = true
 
@@ -940,6 +978,7 @@ Racc_token_to_s_table = [
   "OUT_EDGE_SUB",
   "IN",
   "UNLESS",
+  "MODULO",
   "$start",
   "program",
   "statements_and_declarations",
@@ -1041,7 +1080,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'grammar.ra', 34)
   def _reduce_3(val, _values, result)
-        result = ast AST::ASTArray, :children => (val[0] ? [val[0]] : [])
+        result = ast AST::BlockExpression, :children => (val[0] ? [val[0]] : [])
   
     result
   end
@@ -1899,7 +1938,7 @@ module_eval(<<'.,.,', 'grammar.ra', 495)
 
 module_eval(<<'.,.,', 'grammar.ra', 498)
   def _reduce_152(val, _values, result)
-        result = ast AST::Minus, :value => val[1]
+        result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
@@ -1907,7 +1946,7 @@ module_eval(<<'.,.,', 'grammar.ra', 498)
 
 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 = ast AST::Minus, :value => val[1]
 
     result
   end
@@ -1955,7 +1994,7 @@ module_eval(<<'.,.,', 'grammar.ra', 516)
 
 module_eval(<<'.,.,', 'grammar.ra', 519)
   def _reduce_159(val, _values, result)
-        result = ast AST::Not, :value => val[1]
+        result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
@@ -1963,7 +2002,7 @@ module_eval(<<'.,.,', 'grammar.ra', 519)
 
 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 = ast AST::Not, :value => val[1]
 
     result
   end
@@ -1979,14 +2018,22 @@ module_eval(<<'.,.,', 'grammar.ra', 525)
 
 module_eval(<<'.,.,', 'grammar.ra', 528)
   def _reduce_162(val, _values, result)
-        result = val[1]
+        result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 532)
+module_eval(<<'.,.,', 'grammar.ra', 531)
   def _reduce_163(val, _values, result)
+        result = val[1]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 535)
+  def _reduce_164(val, _values, result)
       @lexer.commentpop
   result = ast AST::CaseStatement, :test => val[1], :options => val[3]
 
@@ -1994,15 +2041,15 @@ module_eval(<<'.,.,', 'grammar.ra', 532)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 536)
-  def _reduce_164(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 539)
+  def _reduce_165(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 538)
-  def _reduce_165(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 541)
+  def _reduce_166(val, _values, result)
         val[0].push val[1]
     result = val[0]
 
@@ -2010,8 +2057,8 @@ module_eval(<<'.,.,', 'grammar.ra', 538)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 543)
-  def _reduce_166(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 546)
+  def _reduce_167(val, _values, result)
       @lexer.commentpop
   result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
 
@@ -2019,30 +2066,30 @@ module_eval(<<'.,.,', 'grammar.ra', 543)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 546)
-  def _reduce_167(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 549)
+  def _reduce_168(val, _values, result)
       @lexer.commentpop
 
     result = ast(
     AST::CaseOpt,
     :value => val[0],
 
-    :statements => ast(AST::ASTArray)
+    :statements => ast(AST::BlockExpression)
   )
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 556)
-  def _reduce_168(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 559)
+  def _reduce_169(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 558)
-  def _reduce_169(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 561)
+  def _reduce_170(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -2050,18 +2097,18 @@ module_eval(<<'.,.,', 'grammar.ra', 558)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 563)
-  def _reduce_170(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 566)
+  def _reduce_171(val, _values, result)
       result = ast AST::Selector, :param => val[0], :values => val[2]
 
     result
   end
 .,.,
 
-# reduce 171 omitted
+# reduce 172 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 568)
-  def _reduce_172(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 571)
+  def _reduce_173(val, _values, result)
         @lexer.commentpop
     result = val[1]
 
@@ -2069,10 +2116,10 @@ module_eval(<<'.,.,', 'grammar.ra', 568)
   end
 .,.,
 
-# reduce 173 omitted
+# reduce 174 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 574)
-  def _reduce_174(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 577)
+  def _reduce_175(val, _values, result)
         if val[0].instance_of?(AST::ASTArray)
     val[0].push(val[2])
     result = val[0]
@@ -2084,16 +2131,14 @@ module_eval(<<'.,.,', 'grammar.ra', 574)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 583)
-  def _reduce_175(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 586)
+  def _reduce_176(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0], :value => val[2]
 
     result
   end
 .,.,
 
-# reduce 176 omitted
-
 # reduce 177 omitted
 
 # reduce 178 omitted
@@ -2108,34 +2153,36 @@ module_eval(<<'.,.,', 'grammar.ra', 583)
 
 # reduce 183 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 595)
-  def _reduce_184(val, _values, result)
+# reduce 184 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 598)
+  def _reduce_185(val, _values, result)
         result = ast AST::Default, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-# reduce 185 omitted
+# reduce 186 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 600)
-  def _reduce_186(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 603)
+  def _reduce_187(val, _values, result)
      result = [val[0][:value]] 
     result
   end
 .,.,
 
-# reduce 187 omitted
+# reduce 188 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 602)
-  def _reduce_188(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 605)
+  def _reduce_189(val, _values, result)
      result = val[0] += val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 605)
-  def _reduce_189(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 608)
+  def _reduce_190(val, _values, result)
       val[1].each do |file|
     import(file)
   end
@@ -2146,8 +2193,8 @@ module_eval(<<'.,.,', 'grammar.ra', 605)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 615)
-  def _reduce_190(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 618)
+  def _reduce_191(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Definition.new(classname(val[1]),
                                                ast_context(true).merge(:arguments => val[2], :code => val[4],
@@ -2160,8 +2207,8 @@ module_eval(<<'.,.,', 'grammar.ra', 615)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 623)
-  def _reduce_191(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 626)
+  def _reduce_192(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]))
@@ -2171,8 +2218,8 @@ module_eval(<<'.,.,', 'grammar.ra', 623)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 631)
-  def _reduce_192(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 634)
+  def _reduce_193(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
@@ -2184,8 +2231,8 @@ module_eval(<<'.,.,', 'grammar.ra', 631)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 638)
-  def _reduce_193(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 641)
+  def _reduce_194(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
@@ -2197,8 +2244,8 @@ module_eval(<<'.,.,', 'grammar.ra', 638)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 647)
-  def _reduce_194(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 650)
+  def _reduce_195(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Node.new(val[1],
                                          ast_context(true).merge(:parent => val[2], :code => val[4],
@@ -2208,8 +2255,8 @@ module_eval(<<'.,.,', 'grammar.ra', 647)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 652)
-  def _reduce_195(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 655)
+  def _reduce_196(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Node.new(val[1], ast_context(true).merge(:parent => val[2], :line => val[0][:line]))
 
@@ -2217,30 +2264,30 @@ module_eval(<<'.,.,', 'grammar.ra', 652)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 656)
-  def _reduce_196(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 659)
+  def _reduce_197(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 657)
-  def _reduce_197(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 660)
+  def _reduce_198(val, _values, result)
      result = "class" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 662)
-  def _reduce_198(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 665)
+  def _reduce_199(val, _values, result)
         result = [result]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 665)
-  def _reduce_199(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 668)
+  def _reduce_200(val, _values, result)
         result = val[0]
     result << val[2]
 
@@ -2248,65 +2295,65 @@ module_eval(<<'.,.,', 'grammar.ra', 665)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 670)
-  def _reduce_200(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 673)
+  def _reduce_201(val, _values, result)
       result = ast AST::HostName, :value => val[0]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 673)
-  def _reduce_201(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 676)
+  def _reduce_202(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 674)
-  def _reduce_202(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 677)
+  def _reduce_203(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 675)
-  def _reduce_203(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 678)
+  def _reduce_204(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-# reduce 204 omitted
+# reduce 205 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 679)
-  def _reduce_205(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 682)
+  def _reduce_206(val, _values, result)
       result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 683)
-  def _reduce_206(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 686)
+  def _reduce_207(val, _values, result)
       result = ast AST::ASTArray, :children => []
 
     result
   end
 .,.,
 
-# reduce 207 omitted
+# reduce 208 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 688)
-  def _reduce_208(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 691)
+  def _reduce_209(val, _values, result)
         result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 691)
-  def _reduce_209(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 694)
+  def _reduce_210(val, _values, result)
         result = val[1]
     result = [result] unless result[0].is_a?(Array)
 
@@ -2314,10 +2361,10 @@ module_eval(<<'.,.,', 'grammar.ra', 691)
   end
 .,.,
 
-# reduce 210 omitted
+# reduce 211 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 697)
-  def _reduce_211(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 700)
+  def _reduce_212(val, _values, result)
         result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -2326,96 +2373,96 @@ module_eval(<<'.,.,', 'grammar.ra', 697)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 703)
-  def _reduce_212(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 706)
+  def _reduce_213(val, _values, result)
      result = [val[0][:value], val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 704)
-  def _reduce_213(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 707)
+  def _reduce_214(val, _values, result)
      result = [val[0][:value]] 
     result
   end
 .,.,
 
-# reduce 214 omitted
+# reduce 215 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 708)
-  def _reduce_215(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 711)
+  def _reduce_216(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 216 omitted
+# reduce 217 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 713)
-  def _reduce_217(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 716)
+  def _reduce_218(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 218 omitted
-
 # reduce 219 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 719)
-  def _reduce_220(val, _values, result)
+# reduce 220 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 722)
+  def _reduce_221(val, _values, result)
       result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 722)
-  def _reduce_221(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 725)
+  def _reduce_222(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 723)
-  def _reduce_222(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 726)
+  def _reduce_223(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 724)
-  def _reduce_223(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 727)
+  def _reduce_224(val, _values, result)
      result = ast AST::ASTArray 
     result
   end
 .,.,
 
-# reduce 224 omitted
-
 # reduce 225 omitted
 
 # reduce 226 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 730)
-  def _reduce_227(val, _values, result)
+# reduce 227 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 733)
+  def _reduce_228(val, _values, result)
      result = nil 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 733)
-  def _reduce_228(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 736)
+  def _reduce_229(val, _values, result)
       result = ast AST::Regex, :value => val[0][:value]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 737)
-  def _reduce_229(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 740)
+  def _reduce_230(val, _values, result)
       if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2426,8 +2473,8 @@ module_eval(<<'.,.,', 'grammar.ra', 737)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 744)
-  def _reduce_230(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 747)
+  def _reduce_231(val, _values, result)
         if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2438,18 +2485,18 @@ module_eval(<<'.,.,', 'grammar.ra', 744)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 750)
-  def _reduce_231(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 753)
+  def _reduce_232(val, _values, result)
       result = ast AST::ASTHash
 
     result
   end
 .,.,
 
-# reduce 232 omitted
+# reduce 233 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 755)
-  def _reduce_233(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 758)
+  def _reduce_234(val, _values, result)
         if val[0].instance_of?(AST::ASTHash)
     result = val[0].merge(val[2])
   else
@@ -2461,40 +2508,40 @@ module_eval(<<'.,.,', 'grammar.ra', 755)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 764)
-  def _reduce_234(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 767)
+  def _reduce_235(val, _values, result)
       result = ast AST::ASTHash, { :value => { val[0] => val[2] } }
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 767)
-  def _reduce_235(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 770)
+  def _reduce_236(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 768)
-  def _reduce_236(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 771)
+  def _reduce_237(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 771)
-  def _reduce_237(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 774)
+  def _reduce_238(val, _values, result)
       result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2]
 
     result
   end
 .,.,
 
-# reduce 238 omitted
+# reduce 239 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 776)
-  def _reduce_239(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 779)
+  def _reduce_240(val, _values, result)
         result = ast AST::HashOrArrayAccess, :variable => val[0], :key => val[2]
 
     result