rbs 1.2.0 → 1.3.2

data/docs/sigs.md

@@ -131,9 +131,11 @@ You may need to specify `-r` or `-I` to load signatures.
 The default is `-I sig`.
 
 ```
-RBS_TEST_OPT='-r set -r pathname -I sig'
+RBS_TEST_OPT='-r pathname -I sig'
 ```
 
+Replacing `pathname` with the `stdlib` you want to include. For example, if you need to load `Set` and `BigDecimal` in `stdlib`, you would need to have `RBS_TEST_OPT='-r set -r bigdecimal -I sig'`
+
 `RBS_TEST_LOGLEVEL` can be used to configure log level. Defaults to `info`.
 
 `RBS_TEST_RAISE` may help to debug the type signatures.

data/docs/stdlib.md

@@ -57,7 +57,7 @@ But it will help you to have an overview of the signatures you are trying to wri
 
 ### What to do with existing RBS files
 
-Generating prototypes will override everything, so the problem is if there is a RBS files already.
+Generating prototypes will overwrite existing RBS files, which might be undesirable.
 You can try to find missing parts, or you can start from the scratch.
 
 One non-trivial but absolutely better solution is to make a tool:

data/docs/syntax.md

@@ -352,9 +352,6 @@ def +: (Float | Integer) -> (Float | Integer)
      | (Numeric) -> Numeric
 ```
 
-Method types can end with `super` which means the methods from existing definitions.
-This is useful to define an _extension_, which adds a new variation to the existing method preserving the original behavior.
-
 ### Attribute definition
 
 Attribute definitions help to define methods and instance variables based on the convention of `attr_reader`, `attr_writer` and `attr_accessor` methods in Ruby.

data/lib/rbs/definition_builder.rb

@@ -774,26 +774,10 @@ module RBS
     end
 
     def try_cache(type_name, cache:, key: type_name)
-      # @type var cc: Hash[untyped, Definition | false | nil]
+      # @type var cc: Hash[untyped, Definition | nil]
       cc = _ = cache
-      cached = cc[key]
 
-      case cached
-      when Definition
-        cached
-      when false
-        raise
-      when nil
-        cc[key] = false
-        begin
-          cc[key] = yield
-        rescue => ex
-          cc.delete(key)
-          raise ex
-        end
-      else
-        raise
-      end
+      cc[key] ||= yield
     end
 
     def expand_alias(type_name)

data/lib/rbs/definition_builder/ancestor_builder.rb

@@ -237,6 +237,7 @@ module RBS
         end
 
         mixin_ancestors(entry,
+                        type_name,
                         included_modules: ancestors.included_modules,
                         included_interfaces: ancestors.included_interfaces,
                         prepended_modules: ancestors.prepended_modules,
@@ -284,6 +285,7 @@ module RBS
         end
 
         mixin_ancestors(entry,
+                        type_name,
                         included_modules: nil,
                         included_interfaces: nil,
                         prepended_modules: nil,
@@ -301,6 +303,7 @@ module RBS
 
             OneAncestors.interface(type_name: type_name, params: params).tap do |ancestors|
               mixin_ancestors0(entry.decl,
+                               type_name,
                                align_params: nil,
                                included_modules: nil,
                                included_interfaces: ancestors.included_interfaces,
@@ -311,7 +314,7 @@ module RBS
           end
       end
 
-      def mixin_ancestors0(decl, align_params:, included_modules:, included_interfaces:, extended_modules:, prepended_modules:, extended_interfaces:)
+      def mixin_ancestors0(decl, type_name, align_params:, included_modules:, included_interfaces:, extended_modules:, prepended_modules:, extended_interfaces:)
         decl.each_mixin do |member|
           case member
           when AST::Members::Include
@@ -321,6 +324,7 @@ module RBS
 
             case
             when member.name.class? && included_modules
+              MixinClassError.check!(type_name: type_name, env: env, member: member)
               NoMixinFoundError.check!(member.name, env: env, member: member)
               included_modules << ancestor
             when member.name.interface? && included_interfaces
@@ -330,6 +334,7 @@ module RBS
 
           when AST::Members::Prepend
             if prepended_modules
+              MixinClassError.check!(type_name: type_name, env: env, member: member)
               NoMixinFoundError.check!(member.name, env: env, member: member)
 
               module_name = member.name
@@ -345,6 +350,7 @@ module RBS
 
             case
             when member.name.class? && extended_modules
+              MixinClassError.check!(type_name: type_name, env: env, member: member)
               NoMixinFoundError.check!(member.name, env: env, member: member)
               extended_modules << ancestor
             when member.name.interface? && extended_interfaces
@@ -355,7 +361,7 @@ module RBS
         end
       end
 
-      def mixin_ancestors(entry, included_modules:, included_interfaces:, extended_modules:, prepended_modules:, extended_interfaces:)
+      def mixin_ancestors(entry, type_name, included_modules:, included_interfaces:, extended_modules:, prepended_modules:, extended_interfaces:)
         entry.decls.each do |d|
           decl = d.decl
 
@@ -365,6 +371,7 @@ module RBS
           )
 
           mixin_ancestors0(decl,
+                           type_name,
                            align_params: align_params,
                            included_modules: included_modules,
                            included_interfaces: included_interfaces,

data/lib/rbs/errors.rb

@@ -350,4 +350,40 @@ module RBS
       original.location
     end
   end
+
+  class MixinClassError < DefinitionError
+    attr_reader :type_name
+    attr_reader :member
+
+    def initialize(type_name:, member:)
+      @type_name = type_name
+      @member = member
+
+      super "#{Location.to_string member.location}: Cannot #{mixin_name} a class `#{member.name}` in the definition of `#{type_name}`"
+    end
+
+    def location
+      member.location
+    end
+
+    def self.check!(type_name:, env:, member:)
+      case env.class_decls[member.name]
+      when Environment::ClassEntry
+        raise new(type_name: type_name, member: member)
+      end
+    end
+
+    private
+
+    def mixin_name
+      case member
+      when AST::Members::Prepend
+        "prepend"
+      when AST::Members::Include
+        "include"
+      when AST::Members::Extend
+        "extend"
+      end
+    end
+  end
 end

data/lib/rbs/parser.rb

@@ -332,12 +332,16 @@ def next_token
     new_token(:tIVAR, input.matched.to_sym)
   when input.scan(/@@[a-zA-Z_]\w*/)
     new_token(:tCLASSVAR, input.matched.to_sym)
-  when input.scan(/_[a-zA-Z]\w*\b/)
+  when input.scan(/_[A-Z]\w*\b/)
     new_token(:tINTERFACEIDENT)
   when input.scan(/[A-Z]\w*\b/)
     new_token(:tUIDENT)
-  when input.scan(/[a-z_]\w*\b/)
+  when input.scan(/[a-z]\w*\b/)
     new_token(:tLIDENT)
+  when input.scan(/_[a-z]\w*\b/)
+    new_token(:tUNDERSCOREIDENT)
+  when input.scan(/_\w*\b/)
+    new_token(:tPARAMNAME)
   when input.scan(/"(\\"|[^"])*"/)
     s = input.matched.yield_self {|s| s[1, s.length - 2] }
                      .gsub(DBL_QUOTE_STR_ESCAPE_SEQUENCES_RE) do |match|
@@ -420,120 +424,123 @@ end
 ##### State transition tables begin ###
 
 clist = [
-'349,350,33,351,-4,113,-242,33,33,5,117,336,-242,33,33,348,37,113,42',
-'334,40,41,55,56,57,58,59,60,61,62,353,43,63,54,64,65,66,77,67,68,69',
-'83,33,32,33,344,338,339,32,32,342,340,343,291,32,32,49,341,82,70,71',
-'72,74,76,75,337,346,347,73,78,80,349,350,33,351,84,85,81,86,33,39,405',
-'48,32,33,32,348,104,53,404,40,41,49,55,56,57,58,59,60,61,62,79,33,63',
-'54,64,65,66,77,67,68,69,83,33,32,160,344,338,339,33,32,342,340,343,53',
-'32,322,207,341,82,70,71,72,74,76,75,337,346,347,73,78,80,126,32,161',
-'320,84,85,81,86,349,350,39,351,32,96,97,98,99,53,32,207,180,40,41,348',
-'40,41,179,185,40,41,55,56,57,58,59,60,61,62,79,226,63,54,64,65,66,77',
-'67,68,69,83,39,53,186,344,338,339,281,332,342,340,343,2,3,4,227,341',
-'82,70,71,72,74,76,75,337,346,347,73,78,80,364,396,282,186,84,85,81,86',
-'349,350,120,351,180,96,97,98,99,125,262,101,102,165,103,348,166,186',
-'186,408,40,41,55,56,57,58,59,60,61,62,79,409,63,54,64,65,66,77,67,68',
-'69,83,40,41,186,344,338,339,40,41,342,340,343,40,41,167,186,341,82,70',
-'71,72,74,76,75,337,346,347,73,78,80,40,41,40,41,84,85,81,86,349,350',
-'168,351,170,96,97,98,99,40,41,40,41,40,41,348,40,41,284,285,367,368',
-'55,56,57,58,59,60,61,62,79,171,63,54,64,65,66,77,67,68,69,83,40,41,172',
-'344,338,339,40,41,342,340,343,383,384,40,41,341,82,70,71,72,74,76,75',
-'337,346,347,73,78,80,349,350,113,351,84,85,81,86,40,41,40,41,40,41,178',
-'348,40,41,40,41,40,41,55,56,57,58,59,60,61,62,79,181,63,54,64,65,66',
-'77,67,68,69,83,184,41,187,344,338,339,189,180,342,340,343,190,-104,-105',
-'-106,341,82,70,71,72,74,76,75,337,346,347,73,78,80,-107,-108,-109,-110',
-'84,85,81,86,349,350,-111,351,-112,96,97,98,99,-113,-114,48,-129,195',
-'196,348,197,198,199,200,208,209,55,56,57,58,59,60,61,62,79,42,63,54',
-'64,65,66,77,67,68,69,83,210,228,242,344,338,339,251,252,342,340,343',
-'253,255,257,258,341,82,70,71,72,74,76,75,337,346,347,73,78,80,349,350',
-'42,351,84,85,81,86,260,260,260,264,42,228,268,348,272,274,289,290,313',
-'272,55,56,57,58,59,60,61,62,79,315,63,54,64,65,66,77,67,68,69,83,289',
-'328,329,344,338,339,330,355,342,340,343,355,355,363,365,341,82,70,71',
-'72,74,76,75,337,346,347,73,78,80,366,369,371,378,84,85,81,86,33,379',
-'380,96,97,98,99,388,388,388,22,23,21,400,26,-219,25,401,30,402,131,132',
-'133,134,135,136,137,138,142,16,139,130,140,141,66,77,67,68,69,83,403',
-'32,406,407,412,28,413,156,414,157,159,416,419,412,,,82,70,71,72,74,76',
-'75,,,,73,78,80,,,,,84,85,81,86,33,,,96,97,98,99,,,,22,23,21,,26,,25',
-',30,,131,132,133,134,135,136,137,138,142,16,139,130,140,141,66,77,67',
-'68,69,83,,32,,,174,28,,177,,175,,,,,,,82,70,71,72,74,76,75,,,,73,78',
-'80,176,,,,84,85,81,86,33,,,96,97,98,99,,,,22,23,21,,26,-219,25,,30,',
-'131,132,133,134,135,136,137,138,142,16,139,130,140,141,66,77,67,68,69',
-'83,,32,,,,28,,156,,157,159,,,,,,82,70,71,72,74,76,75,,,,73,78,80,,,',
-',84,85,81,86,33,,,96,97,98,99,,,,22,23,21,,26,-219,25,,30,,131,132,133',
-'134,135,136,137,138,142,16,139,130,140,141,66,77,67,68,69,83,,32,,,',
-'28,,156,,157,159,,,,,,82,70,71,72,74,76,75,,,,73,78,80,,,,,84,85,81',
-'86,33,,,96,97,98,99,,,,22,23,21,,26,-219,25,,30,,131,132,133,134,135',
-'136,137,138,142,16,139,130,140,141,66,77,67,68,69,83,,32,,,,28,,234',
-',,159,,,,,,82,70,71,72,74,76,75,,,,73,78,80,,,,,84,85,81,86,33,,,96',
-'97,98,99,,,,22,23,21,,26,-219,25,,30,,131,132,133,134,135,136,137,138',
-'142,16,139,130,140,141,66,77,67,68,69,83,,32,,,,28,,156,,157,159,,,',
-',,82,70,71,72,74,76,75,,,,73,78,80,,,,,84,85,81,86,33,,,96,97,98,99',
-',,,22,23,21,,26,-219,25,,30,,131,132,133,134,135,136,137,138,142,16',
-'139,130,140,141,66,77,67,68,69,83,,32,,,,28,,234,,,159,,,,,,82,70,71',
-'72,74,76,75,,,,73,78,80,,,,,84,85,81,86,96,97,98,99,,,,90,89,91,,,,',
-',,,55,56,57,58,59,60,61,62,79,,63,54,64,65,66,77,67,68,69,83,,,,,,,',
-',192,,193,,,,,,82,70,71,72,74,76,75,,95,94,73,78,80,,,,,84,85,81,86',
-'96,97,98,99,,,,90,89,91,,,,,,40,41,55,56,57,58,59,60,61,62,79,,63,54',
-'64,65,66,77,67,68,69,83,194,,,,,,,,,,,,,,,,82,70,71,72,74,76,75,,95',
-'94,73,78,80,96,97,98,99,84,85,81,86,,,,,,,,,,55,56,57,58,59,60,61,62',
-'79,,63,54,64,65,66,77,67,68,69,83,192,,193,,,,,234,,,159,,,,,,82,70',
-'71,72,74,76,75,192,,193,73,78,80,96,97,98,99,84,85,81,86,,,,,,,,40,41',
-'55,56,57,58,59,60,61,62,79,,63,54,64,65,66,77,67,68,69,83,194,40,41',
-',,,,234,,,159,,,,,,82,70,71,72,74,76,75,194,,,73,78,80,96,97,98,99,84',
-'85,81,86,,,,,,,,,,55,56,57,58,59,60,61,62,79,,63,54,64,65,66,77,67,68',
-'69,83,192,,193,192,,193,192,,193,,,,,,,,82,70,71,72,74,76,75,,,,73,78',
-'80,,,,,84,85,81,86,,,,,,,,40,41,,40,41,,40,41,-242,,33,,117,,-242,,',
-'310,311,113,,,194,,,194,,,194,,-242,,33,,117,,-242,,312,310,311,113',
-',,,,,307,306,,,32,-242,,33,,117,,-242,,312,310,311,113,,,,298,,307,306',
-',174,32,,177,,175,,,322,,312,,,,,,,316,,307,306,,33,32,,176,,320,326',
-'323,324,325,22,23,21,327,26,,25,317,30,,8,12,19,20,9,10,13,14,15,16',
-'17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,45,30,,8,12,19,20,9,10',
+'192,195,33,193,192,195,33,193,192,195,33,193,113,192,195,33,193,192',
+'195,5,193,40,41,192,195,33,193,-4,160,-245,185,33,33,33,117,33,-245',
+'33,49,228,33,113,37,32,33,40,41,32,33,40,41,32,283,40,41,186,32,161',
+'40,41,293,334,40,41,229,42,32,194,40,41,53,194,32,32,32,194,32,284,32',
+'196,194,32,49,196,194,32,186,196,367,32,194,324,196,351,352,354,196',
+'353,40,41,399,43,196,338,39,209,209,40,41,350,322,336,48,186,53,104',
+'55,56,57,58,59,60,61,62,356,186,63,54,64,65,66,77,67,68,69,83,39,53',
+'53,346,340,341,411,412,344,342,345,2,3,4,126,343,82,70,71,72,74,76,75',
+'339,348,349,73,78,80,40,41,186,186,84,85,81,86,351,352,354,408,353,40',
+'41,174,180,39,177,407,175,180,120,179,350,101,102,125,264,103,165,55',
+'56,57,58,59,60,61,62,79,176,63,54,64,65,66,77,67,68,69,83,40,41,166',
+'346,340,341,40,41,344,342,345,40,41,40,41,343,82,70,71,72,74,76,75,339',
+'348,349,73,78,80,40,41,40,41,84,85,81,86,351,352,354,167,353,168,96',
+'97,98,99,40,41,40,41,40,41,350,40,41,286,287,370,371,55,56,57,58,59',
+'60,61,62,79,170,63,54,64,65,66,77,67,68,69,83,40,41,171,346,340,341',
+'40,41,344,342,345,386,387,40,41,343,82,70,71,72,74,76,75,339,348,349',
+'73,78,80,40,41,40,41,84,85,81,86,351,352,354,172,353,113,96,97,98,99',
+'40,41,40,41,40,41,350,40,41,178,181,184,41,55,56,57,58,59,60,61,62,79',
+'187,63,54,64,65,66,77,67,68,69,83,189,180,190,346,340,341,-105,-106',
+'344,342,345,-107,-108,-109,-110,343,82,70,71,72,74,76,75,339,348,349',
+'73,78,80,-111,-112,-113,-114,84,85,81,86,351,352,354,-115,353,48,96',
+'97,98,99,-130,197,198,199,200,201,350,202,210,211,42,212,230,55,56,57',
+'58,59,60,61,62,79,244,63,54,64,65,66,77,67,68,69,83,253,254,255,346',
+'340,341,257,259,344,342,345,260,42,262,262,343,82,70,71,72,74,76,75',
+'339,348,349,73,78,80,262,266,42,230,84,85,81,86,351,352,354,270,353',
+'274,276,291,292,315,274,317,291,330,331,332,350,358,358,358,366,368',
+'369,55,56,57,58,59,60,61,62,79,372,63,54,64,65,66,77,67,68,69,83,374',
+'381,382,346,340,341,383,391,344,342,345,391,391,403,404,343,82,70,71',
+'72,74,76,75,339,348,349,73,78,80,405,406,409,410,84,85,81,86,351,352',
+'354,415,353,416,96,97,98,99,417,419,422,415,,,350,,,,,,,55,56,57,58',
+'59,60,61,62,79,,63,54,64,65,66,77,67,68,69,83,,,,346,340,341,,,344,342',
+'345,,,,,343,82,70,71,72,74,76,75,339,348,349,73,78,80,,,,,84,85,81,86',
+'351,352,354,,353,,,,,,,,,,,,350,,,,,,,55,56,57,58,59,60,61,62,79,,63',
+'54,64,65,66,77,67,68,69,83,,,,346,340,341,,,344,342,345,,,,,343,82,70',
+'71,72,74,76,75,339,348,349,73,78,80,,,,,84,85,81,86,33,,,96,97,98,99',
+',,,22,23,21,,26,-220,25,,30,,131,132,133,134,135,136,137,138,142,16',
+'139,130,140,141,66,77,67,68,69,83,,32,,,,28,,156,,157,159,,,,,,82,70',
+'71,72,74,76,75,,,,73,78,80,,,,,84,85,81,86,33,,,96,97,98,99,,,,22,23',
+'21,,26,,25,,30,,131,132,133,134,135,136,137,138,142,16,139,130,140,141',
+'66,77,67,68,69,83,,32,,,,28,,,,,,,,,,,82,70,71,72,74,76,75,,,,73,78',
+'80,,,,,84,85,81,86,33,,,96,97,98,99,,,,22,23,21,,26,-220,25,,30,,131',
+'132,133,134,135,136,137,138,142,16,139,130,140,141,66,77,67,68,69,83',
+',32,,,,28,,156,,157,159,,,,,,82,70,71,72,74,76,75,,,,73,78,80,,,,,84',
+'85,81,86,33,,,96,97,98,99,,,,22,23,21,,26,-220,25,,30,,131,132,133,134',
+'135,136,137,138,142,16,139,130,140,141,66,77,67,68,69,83,,32,,,,28,',
+'156,,157,159,,,,,,82,70,71,72,74,76,75,,,,73,78,80,,,,,84,85,81,86,33',
+',,96,97,98,99,,,,22,23,21,,26,-220,25,,30,,131,132,133,134,135,136,137',
+'138,142,16,139,130,140,141,66,77,67,68,69,83,,32,,,,28,,236,,,159,,',
+',,,82,70,71,72,74,76,75,,,,73,78,80,,,,,84,85,81,86,33,,,96,97,98,99',
+',,,22,23,21,,26,-220,25,,30,,131,132,133,134,135,136,137,138,142,16',
+'139,130,140,141,66,77,67,68,69,83,,32,,,,28,,156,,157,159,,,,,,82,70',
+'71,72,74,76,75,,,,73,78,80,,,,,84,85,81,86,33,,,96,97,98,99,,,,22,23',
+'21,,26,-220,25,,30,,131,132,133,134,135,136,137,138,142,16,139,130,140',
+'141,66,77,67,68,69,83,,32,,,,28,,236,,,159,,,,,,82,70,71,72,74,76,75',
+',,,73,78,80,,,,,84,85,81,86,96,97,98,99,,,,90,89,91,,,,,,,,55,56,57',
+'58,59,60,61,62,79,,63,54,64,65,66,77,67,68,69,83,,,,,,,,,,,,,,,,,82',
+'70,71,72,74,76,75,,95,94,73,78,80,,,,,84,85,81,86,96,97,98,99,,,,90',
+'89,91,,,,,,,,55,56,57,58,59,60,61,62,79,,63,54,64,65,66,77,67,68,69',
+'83,,,,,,,,,,,,,,,,,82,70,71,72,74,76,75,,95,94,73,78,80,96,97,98,99',
+'84,85,81,86,,,,,,,,,,55,56,57,58,59,60,61,62,79,,63,54,64,65,66,77,67',
+'68,69,83,,,,,,,,236,,,159,,,,,,82,70,71,72,74,76,75,,,,73,78,80,96,97',
+'98,99,84,85,81,86,,,,,,,,,,55,56,57,58,59,60,61,62,79,,63,54,64,65,66',
+'77,67,68,69,83,,,,,,,,236,,,159,,,,,,82,70,71,72,74,76,75,,,,73,78,80',
+'96,97,98,99,84,85,81,86,,,,,,,,,,55,56,57,58,59,60,61,62,79,,63,54,64',
+'65,66,77,67,68,69,83,-245,,,33,,117,,-245,,,312,313,113,,,,82,70,71',
+'72,74,76,75,,,,73,78,80,,,314,,84,85,81,86,,,,309,308,-245,,32,33,,117',
+',-245,,,312,313,113,,-245,,,33,300,117,,-245,,,312,313,113,,,,,314,',
+',,,,,,,309,308,,,32,314,,,,,,,,,309,308,,33,32,,318,,,,,,,22,23,21,',
+'26,,25,319,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,',
+',,28,22,23,21,,26,,25,45,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27',
+',,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16',
+'17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10',
 '13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12',
 '19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25',
 ',30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23',
 '21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32',
 ',,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27',
-',,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16',
-'17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10',
-'13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,-246,30,',
-'8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,',
-'26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28',
-'22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,',
-',,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18',
-'11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14',
-'15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20',
-'9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30',
-',8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21',
-',26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,',
-'28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33',
-',,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18',
-'11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14',
-'15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20',
-'9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30',
-',8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21',
-',26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,',
-'28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33',
-',,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18',
-'11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14',
-'15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20',
-'9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30',
-',8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21',
-',26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,',
-'28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33',
-',,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18',
-'11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14',
-'15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20',
-'9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30',
-',8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21',
-',26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,',
-'28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33',
-',,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18',
-'11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14',
-'15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20',
-'9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30',
-',8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21',
-',26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,,,,,,32,,,,28' ]
-        racc_action_table = arr = ::Array.new(3044, nil)
+',,33,,,,,32,,,,28,22,23,21,,26,,25,-249,30,,8,12,19,20,9,10,13,14,15',
+'16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9',
+'10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8',
+'12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26',
+',25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22',
+'23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,',
+'32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11',
+'27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15',
+'16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9',
+'10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8',
+'12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26',
+',25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22',
+'23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,',
+'32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11',
+'27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15',
+'16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9',
+'10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8',
+'12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26',
+',25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22',
+'23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,',
+'32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11',
+'27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15',
+'16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9',
+'10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8',
+'12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26',
+',25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22',
+'23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,',
+'32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11',
+'27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15',
+'16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9',
+'10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8',
+'12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26',
+',25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,,32,,,,28,22',
+'23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11,27,,,33,,,,',
+'32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15,16,17,18,11',
+'27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9,10,13,14,15',
+'16,17,18,11,27,,,33,,,,,32,,,,28,22,23,21,,26,,25,,30,,8,12,19,20,9',
+'10,13,14,15,16,17,18,11,27,174,,,177,,175,,32,324,,,28,,,,,,,,,,,,,',
+'176,,322,328,325,326,327,,,,329' ]
+        racc_action_table = arr = ::Array.new(3154, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -543,141 +550,143 @@ clist = [
         end
 
 clist = [
-'322,322,48,322,34,278,34,177,34,1,34,321,34,218,219,322,5,34,7,321,44',
-'44,322,322,322,322,322,322,322,322,322,24,322,322,322,322,322,322,322',
-'322,322,322,220,48,262,322,322,322,177,34,322,322,322,278,218,219,28',
-'322,322,322,322,322,322,322,322,322,322,322,322,322,322,354,354,268',
-'354,322,322,322,322,274,34,388,27,220,289,262,354,32,28,388,169,169',
-'119,354,354,354,354,354,354,354,354,354,320,354,354,354,354,354,354',
-'354,354,354,354,326,268,51,354,354,354,327,274,354,354,354,119,289,296',
-'160,354,354,354,354,354,354,354,354,354,354,354,354,354,354,47,320,51',
-'296,354,354,354,354,356,356,35,356,326,356,356,356,356,160,327,208,116',
-'6,6,356,188,188,116,123,47,47,356,356,356,356,356,356,356,356,356,183',
-'356,356,356,356,356,356,356,356,356,356,6,208,123,356,356,356,269,319',
-'356,356,356,0,0,0,183,356,356,356,356,356,356,356,356,356,356,356,356',
-'356,356,331,381,269,319,356,356,356,356,357,357,36,357,248,357,357,357',
-'357,46,248,31,31,87,31,357,89,331,381,393,212,212,357,357,357,357,357',
-'357,357,357,357,394,357,357,357,357,357,357,357,357,357,357,213,213',
-'393,357,357,357,214,214,357,357,357,215,215,90,394,357,357,357,357,357',
-'357,357,357,357,357,357,357,357,357,216,216,217,217,357,357,357,357',
-'358,358,91,358,93,358,358,358,358,223,223,224,224,225,225,358,265,265',
-'271,271,345,345,358,358,358,358,358,358,358,358,358,94,358,358,358,358',
-'358,358,358,358,358,358,361,361,95,358,358,358,362,362,358,358,358,366',
-'366,386,386,358,358,358,358,358,358,358,358,358,358,358,358,358,358',
-'369,369,113,369,358,358,358,358,389,389,391,391,395,395,115,369,415',
-'415,417,417,418,418,369,369,369,369,369,369,369,369,369,117,369,369',
-'369,369,369,369,369,369,369,369,120,121,124,369,369,369,127,128,369',
-'369,369,129,130,131,132,369,369,369,369,369,369,369,369,369,369,369',
-'369,369,369,133,134,135,136,369,369,369,369,382,382,137,382,138,382',
-'382,382,382,139,140,141,142,145,146,382,148,150,153,154,161,162,382',
-'382,382,382,382,382,382,382,382,163,382,382,382,382,382,382,382,382',
-'382,382,164,190,206,382,382,382,221,222,382,382,382,227,232,243,244',
-'382,382,382,382,382,382,382,382,382,382,382,382,382,382,414,414,245',
-'414,382,382,382,382,246,247,249,250,254,257,259,414,260,261,275,277',
-'280,282,414,414,414,414,414,414,414,414,414,283,414,414,414,414,414',
-'414,414,414,414,414,287,310,311,414,414,414,312,323,414,414,414,324',
-'325,330,333,414,414,414,414,414,414,414,414,414,414,414,414,414,414',
-'335,353,355,359,414,414,414,414,49,360,363,49,49,49,49,373,375,377,49',
-'49,49,383,49,49,49,384,49,385,49,49,49,49,49,49,49,49,49,49,49,49,49',
-'49,49,49,49,49,49,49,387,49,390,392,397,49,399,49,402,49,49,405,411',
-'419,,,49,49,49,49,49,49,49,,,,49,49,49,,,,,49,49,49,49,156,,,156,156',
-'156,156,,,,156,156,156,,156,,156,,156,,156,156,156,156,156,156,156,156',
-'156,156,156,156,156,156,156,156,156,156,156,156,,156,,,114,156,,114',
-',114,,,,,,,156,156,156,156,156,156,156,,,,156,156,156,114,,,,156,156',
-'156,156,196,,,196,196,196,196,,,,196,196,196,,196,196,196,,196,,196',
-'196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196',
-'196,196,,196,,,,196,,196,,196,196,,,,,,196,196,196,196,196,196,196,',
-',,196,196,196,,,,,196,196,196,196,197,,,197,197,197,197,,,,197,197,197',
-',197,197,197,,197,,197,197,197,197,197,197,197,197,197,197,197,197,197',
-'197,197,197,197,197,197,197,,197,,,,197,,197,,197,197,,,,,,197,197,197',
-'197,197,197,197,,,,197,197,197,,,,,197,197,197,197,198,,,198,198,198',
-'198,,,,198,198,198,,198,198,198,,198,,198,198,198,198,198,198,198,198',
-'198,198,198,198,198,198,198,198,198,198,198,198,,198,,,,198,,198,,,198',
-',,,,,198,198,198,198,198,198,198,,,,198,198,198,,,,,198,198,198,198',
-'207,,,207,207,207,207,,,,207,207,207,,207,207,207,,207,,207,207,207',
-'207,207,207,207,207,207,207,207,207,207,207,207,207,207,207,207,207',
-',207,,,,207,,207,,207,207,,,,,,207,207,207,207,207,207,207,,,,207,207',
-'207,,,,,207,207,207,207,255,,,255,255,255,255,,,,255,255,255,,255,255',
-'255,,255,,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255',
-'255,255,255,255,255,,255,,,,255,,255,,,255,,,,,,255,255,255,255,255',
-'255,255,,,,255,255,255,,,,,255,255,255,255,30,30,30,30,,,,30,30,30,',
+'143,143,48,143,203,203,177,203,205,205,220,205,280,206,206,221,206,207',
+'207,1,207,44,44,240,240,222,240,34,51,34,123,264,34,270,34,276,34,291',
+'28,183,322,34,5,48,328,143,143,177,329,203,203,220,271,205,205,123,221',
+'51,206,206,280,321,207,207,183,7,222,143,240,240,28,203,264,34,270,205',
+'276,271,291,143,206,322,119,203,207,328,321,205,333,329,240,298,206',
+'324,324,324,207,324,169,169,384,24,240,323,34,160,210,6,6,324,298,323',
+'27,333,119,32,324,324,324,324,324,324,324,324,324,384,324,324,324,324',
+'324,324,324,324,324,324,6,160,210,324,324,324,396,397,324,324,324,0',
+'0,0,47,324,324,324,324,324,324,324,324,324,324,324,324,324,324,188,188',
+'396,397,324,324,324,324,357,357,357,391,357,47,47,114,116,35,114,391',
+'114,250,36,116,357,31,31,46,250,31,87,357,357,357,357,357,357,357,357',
+'357,114,357,357,357,357,357,357,357,357,357,357,214,214,89,357,357,357',
+'215,215,357,357,357,216,216,217,217,357,357,357,357,357,357,357,357',
+'357,357,357,357,357,357,218,218,219,219,357,357,357,357,359,359,359',
+'90,359,91,359,359,359,359,225,225,226,226,227,227,359,267,267,273,273',
+'347,347,359,359,359,359,359,359,359,359,359,93,359,359,359,359,359,359',
+'359,359,359,359,364,364,94,359,359,359,365,365,359,359,359,369,369,389',
+'389,359,359,359,359,359,359,359,359,359,359,359,359,359,359,392,392',
+'394,394,359,359,359,359,360,360,360,95,360,113,360,360,360,360,398,398',
+'418,418,420,420,360,421,421,115,117,120,121,360,360,360,360,360,360',
+'360,360,360,124,360,360,360,360,360,360,360,360,360,360,127,128,129',
+'360,360,360,130,131,360,360,360,132,133,134,135,360,360,360,360,360',
+'360,360,360,360,360,360,360,360,360,136,137,138,139,360,360,360,360',
+'361,361,361,140,361,141,361,361,361,361,142,145,146,148,150,153,361',
+'154,161,162,163,164,190,361,361,361,361,361,361,361,361,361,208,361',
+'361,361,361,361,361,361,361,361,361,223,224,229,361,361,361,234,245',
+'361,361,361,246,247,248,249,361,361,361,361,361,361,361,361,361,361',
+'361,361,361,361,251,252,256,259,361,361,361,361,372,372,372,261,372',
+'262,263,277,279,282,284,285,289,312,313,314,372,325,326,327,332,335',
+'337,372,372,372,372,372,372,372,372,372,356,372,372,372,372,372,372',
+'372,372,372,372,358,362,363,372,372,372,366,376,372,372,372,378,380',
+'386,387,372,372,372,372,372,372,372,372,372,372,372,372,372,372,388',
+'390,393,395,372,372,372,372,385,385,385,400,385,402,385,385,385,385',
+'405,408,414,422,,,385,,,,,,,385,385,385,385,385,385,385,385,385,,385',
+'385,385,385,385,385,385,385,385,385,,,,385,385,385,,,385,385,385,,,',
+',385,385,385,385,385,385,385,385,385,385,385,385,385,385,,,,,385,385',
+'385,385,417,417,417,,417,,,,,,,,,,,,417,,,,,,,417,417,417,417,417,417',
+'417,417,417,,417,417,417,417,417,417,417,417,417,417,,,,417,417,417',
+',,417,417,417,,,,,417,417,417,417,417,417,417,417,417,417,417,417,417',
+'417,,,,,417,417,417,417,49,,,49,49,49,49,,,,49,49,49,,49,49,49,,49,',
+'49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,,49,,,,49',
+',49,,49,49,,,,,,49,49,49,49,49,49,49,,,,49,49,49,,,,,49,49,49,49,156',
+',,156,156,156,156,,,,156,156,156,,156,,156,,156,,156,156,156,156,156',
+'156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,,156,,,',
+'156,,,,,,,,,,,156,156,156,156,156,156,156,,,,156,156,156,,,,,156,156',
+'156,156,198,,,198,198,198,198,,,,198,198,198,,198,198,198,,198,,198',
+'198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,198,198',
+'198,198,,198,,,,198,,198,,198,198,,,,,,198,198,198,198,198,198,198,',
+',,198,198,198,,,,,198,198,198,198,199,,,199,199,199,199,,,,199,199,199',
+',199,199,199,,199,,199,199,199,199,199,199,199,199,199,199,199,199,199',
+'199,199,199,199,199,199,199,,199,,,,199,,199,,199,199,,,,,,199,199,199',
+'199,199,199,199,,,,199,199,199,,,,,199,199,199,199,200,,,200,200,200',
+'200,,,,200,200,200,,200,200,200,,200,,200,200,200,200,200,200,200,200',
+'200,200,200,200,200,200,200,200,200,200,200,200,,200,,,,200,,200,,,200',
+',,,,,200,200,200,200,200,200,200,,,,200,200,200,,,,,200,200,200,200',
+'209,,,209,209,209,209,,,,209,209,209,,209,209,209,,209,,209,209,209',
+'209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209',
+',209,,,,209,,209,,209,209,,,,,,209,209,209,209,209,209,209,,,,209,209',
+'209,,,,,209,209,209,209,257,,,257,257,257,257,,,,257,257,257,,257,257',
+'257,,257,,257,257,257,257,257,257,257,257,257,257,257,257,257,257,257',
+'257,257,257,257,257,,257,,,,257,,257,,,257,,,,,,257,257,257,257,257',
+'257,257,,,,257,257,257,,,,,257,257,257,257,30,30,30,30,,,,30,30,30,',
 ',,,,,,30,30,30,30,30,30,30,30,30,,30,30,30,30,30,30,30,30,30,30,,,,',
-',,,,143,,143,,,,,,30,30,30,30,30,30,30,,30,30,30,30,30,,,,,30,30,30',
-'30,165,165,165,165,,,,165,165,165,,,,,,143,143,165,165,165,165,165,165',
-'165,165,165,,165,165,165,165,165,165,165,165,165,165,143,,,,,,,,,,,',
-',,,,165,165,165,165,165,165,165,,165,165,165,165,165,199,199,199,199',
-'165,165,165,165,,,,,,,,,,199,199,199,199,199,199,199,199,199,,199,199',
-'199,199,199,199,199,199,199,199,201,,201,,,,,199,,,199,,,,,,199,199',
-'199,199,199,199,199,203,,203,199,199,199,200,200,200,200,199,199,199',
-'199,,,,,,,,201,201,200,200,200,200,200,200,200,200,200,,200,200,200',
-'200,200,200,200,200,200,200,201,203,203,,,,,200,,,200,,,,,,200,200,200',
-'200,200,200,200,203,,,200,200,200,234,234,234,234,200,200,200,200,,',
-',,,,,,,234,234,234,234,234,234,234,234,234,,234,234,234,234,234,234',
-'234,234,234,234,204,,204,205,,205,238,,238,,,,,,,,234,234,234,234,234',
-'234,234,,,,234,234,234,,,,,234,234,234,234,,,,,,,,204,204,,205,205,',
-'238,238,279,,279,,279,,279,,,279,279,279,,,204,,,205,,,238,,286,,286',
-',286,,286,,279,286,286,286,,,,,,279,279,,,279,288,,288,,288,,288,,286',
-'288,288,288,,,,279,,286,286,,297,286,,297,,297,,,297,,288,,,,,,,286',
-',288,288,,2,288,,297,,297,297,297,297,297,2,2,2,297,2,,2,288,2,,2,2',
-'2,2,2,2,2,2,2,2,2,2,2,2,,,25,,,,,2,,,,2,25,25,25,,25,,25,25,25,,25,25',
-'25,25,25,25,25,25,25,25,25,25,25,25,,,26,,,,,25,,,,25,26,26,26,,26,',
-'26,,26,,26,26,26,26,26,26,26,26,26,26,26,26,26,26,,,40,,,,,26,,,,26',
-'40,40,40,,40,,40,,40,,40,40,40,40,40,40,40,40,40,40,40,40,40,40,,,41',
-',,,,40,,,,40,41,41,41,,41,,41,,41,,41,41,41,41,41,41,41,41,41,41,41',
-'41,41,41,,,43,,,,,41,,,,41,43,43,43,,43,,43,,43,,43,43,43,43,43,43,43',
-'43,43,43,43,43,43,43,,,53,,,,,43,,,,43,53,53,53,,53,,53,,53,,53,53,53',
-'53,53,53,53,53,53,53,53,53,53,53,,,92,,,,,53,,,,53,92,92,92,,92,,92',
-',92,,92,92,92,92,92,92,92,92,92,92,92,92,92,92,,,125,,,,,92,,,,92,125',
-'125,125,,125,,125,125,125,,125,125,125,125,125,125,125,125,125,125,125',
-'125,125,125,,,157,,,,,125,,,,125,157,157,157,,157,,157,,157,,157,157',
-'157,157,157,157,157,157,157,157,157,157,157,157,,,158,,,,,157,,,,157',
-'158,158,158,,158,,158,,158,,158,158,158,158,158,158,158,158,158,158',
-'158,158,158,158,,,159,,,,,158,,,,158,159,159,159,,159,,159,,159,,159',
-'159,159,159,159,159,159,159,159,159,159,159,159,159,,,166,,,,,159,,',
-',159,166,166,166,,166,,166,,166,,166,166,166,166,166,166,166,166,166',
-'166,166,166,166,166,,,167,,,,,166,,,,166,167,167,167,,167,,167,,167',
-',167,167,167,167,167,167,167,167,167,167,167,167,167,167,,,168,,,,,167',
-',,,167,168,168,168,,168,,168,,168,,168,168,168,168,168,168,168,168,168',
-'168,168,168,168,168,,,170,,,,,168,,,,168,170,170,170,,170,,170,,170',
-',170,170,170,170,170,170,170,170,170,170,170,170,170,170,,,171,,,,,170',
-',,,170,171,171,171,,171,,171,,171,,171,171,171,171,171,171,171,171,171',
-'171,171,171,171,171,,,172,,,,,171,,,,171,172,172,172,,172,,172,,172',
-',172,172,172,172,172,172,172,172,172,172,172,172,172,172,,,178,,,,,172',
-',,,172,178,178,178,,178,,178,,178,,178,178,178,178,178,178,178,178,178',
-'178,178,178,178,178,,,179,,,,,178,,,,178,179,179,179,,179,,179,,179',
-',179,179,179,179,179,179,179,179,179,179,179,179,179,179,,,181,,,,,179',
-',,,179,181,181,181,,181,,181,,181,,181,181,181,181,181,181,181,181,181',
-'181,181,181,181,181,,,186,,,,,181,,,,181,186,186,186,,186,,186,,186',
-',186,186,186,186,186,186,186,186,186,186,186,186,186,186,,,202,,,,,186',
-',,,186,202,202,202,,202,,202,,202,,202,202,202,202,202,202,202,202,202',
-'202,202,202,202,202,,,209,,,,,202,,,,202,209,209,209,,209,,209,,209',
-',209,209,209,209,209,209,209,209,209,209,209,209,209,209,,,228,,,,,209',
-',,,209,228,228,228,,228,,228,,228,,228,228,228,228,228,228,228,228,228',
-'228,228,228,228,228,,,251,,,,,228,,,,228,251,251,251,,251,,251,,251',
-',251,251,251,251,251,251,251,251,251,251,251,251,251,251,,,290,,,,,251',
-',,,251,290,290,290,,290,,290,,290,,290,290,290,290,290,290,290,290,290',
-'290,290,290,290,290,,,313,,,,,290,,,,290,313,313,313,,313,,313,,313',
-',313,313,313,313,313,313,313,313,313,313,313,313,313,313,,,328,,,,,313',
-',,,313,328,328,328,,328,,328,,328,,328,328,328,328,328,328,328,328,328',
-'328,328,328,328,328,,,329,,,,,328,,,,328,329,329,329,,329,,329,,329',
-',329,329,329,329,329,329,329,329,329,329,329,329,329,329,,,365,,,,,329',
-',,,329,365,365,365,,365,,365,,365,,365,365,365,365,365,365,365,365,365',
-'365,365,365,365,365,,,372,,,,,365,,,,365,372,372,372,,372,,372,,372',
-',372,372,372,372,372,372,372,372,372,372,372,372,372,372,,,374,,,,,372',
-',,,372,374,374,374,,374,,374,,374,,374,374,374,374,374,374,374,374,374',
-'374,374,374,374,374,,,376,,,,,374,,,,374,376,376,376,,376,,376,,376',
-',376,376,376,376,376,376,376,376,376,376,376,376,376,376,,,378,,,,,376',
-',,,376,378,378,378,,378,,378,,378,,378,378,378,378,378,378,378,378,378',
-'378,378,378,378,378,,,379,,,,,378,,,,378,379,379,379,,379,,379,,379',
-',379,379,379,379,379,379,379,379,379,379,379,379,379,379,,,380,,,,,379',
-',,,379,380,380,380,,380,,380,,380,,380,380,380,380,380,380,380,380,380',
-'380,380,380,380,380,,,403,,,,,380,,,,380,403,403,403,,403,,403,,403',
-',403,403,403,403,403,403,403,403,403,403,403,403,403,403,,,406,,,,,403',
-',,,403,406,406,406,,406,,406,,406,,406,406,406,406,406,406,406,406,406',
-'406,406,406,406,406,,,407,,,,,406,,,,406,407,407,407,,407,,407,,407',
-',407,407,407,407,407,407,407,407,407,407,407,407,407,407,,,,,,,,407',
-',,,407' ]
-        racc_action_check = arr = ::Array.new(3044, nil)
+',,,,,,,,,,,,30,30,30,30,30,30,30,,30,30,30,30,30,,,,,30,30,30,30,165',
+'165,165,165,,,,165,165,165,,,,,,,,165,165,165,165,165,165,165,165,165',
+',165,165,165,165,165,165,165,165,165,165,,,,,,,,,,,,,,,,,165,165,165',
+'165,165,165,165,,165,165,165,165,165,201,201,201,201,165,165,165,165',
+',,,,,,,,,201,201,201,201,201,201,201,201,201,,201,201,201,201,201,201',
+'201,201,201,201,,,,,,,,201,,,201,,,,,,201,201,201,201,201,201,201,,',
+',201,201,201,202,202,202,202,201,201,201,201,,,,,,,,,,202,202,202,202',
+'202,202,202,202,202,,202,202,202,202,202,202,202,202,202,202,,,,,,,',
+'202,,,202,,,,,,202,202,202,202,202,202,202,,,,202,202,202,236,236,236',
+'236,202,202,202,202,,,,,,,,,,236,236,236,236,236,236,236,236,236,,236',
+'236,236,236,236,236,236,236,236,236,281,,,281,,281,,281,,,281,281,281',
+',,,236,236,236,236,236,236,236,,,,236,236,236,,,281,,236,236,236,236',
+',,,281,281,288,,281,288,,288,,288,,,288,288,288,,290,,,290,281,290,',
+'290,,,290,290,290,,,,,288,,,,,,,,,288,288,,,288,290,,,,,,,,,290,290',
+',2,290,,288,,,,,,,2,2,2,,2,,2,290,2,,2,2,2,2,2,2,2,2,2,2,2,2,2,2,,,25',
+',,,,2,,,,2,25,25,25,,25,,25,25,25,,25,25,25,25,25,25,25,25,25,25,25',
+'25,25,25,,,26,,,,,25,,,,25,26,26,26,,26,,26,,26,,26,26,26,26,26,26,26',
+'26,26,26,26,26,26,26,,,40,,,,,26,,,,26,40,40,40,,40,,40,,40,,40,40,40',
+'40,40,40,40,40,40,40,40,40,40,40,,,41,,,,,40,,,,40,41,41,41,,41,,41',
+',41,,41,41,41,41,41,41,41,41,41,41,41,41,41,41,,,43,,,,,41,,,,41,43',
+'43,43,,43,,43,,43,,43,43,43,43,43,43,43,43,43,43,43,43,43,43,,,53,,',
+',,43,,,,43,53,53,53,,53,,53,,53,,53,53,53,53,53,53,53,53,53,53,53,53',
+'53,53,,,92,,,,,53,,,,53,92,92,92,,92,,92,,92,,92,92,92,92,92,92,92,92',
+'92,92,92,92,92,92,,,125,,,,,92,,,,92,125,125,125,,125,,125,125,125,',
+'125,125,125,125,125,125,125,125,125,125,125,125,125,125,,,157,,,,,125',
+',,,125,157,157,157,,157,,157,,157,,157,157,157,157,157,157,157,157,157',
+'157,157,157,157,157,,,158,,,,,157,,,,157,158,158,158,,158,,158,,158',
+',158,158,158,158,158,158,158,158,158,158,158,158,158,158,,,159,,,,,158',
+',,,158,159,159,159,,159,,159,,159,,159,159,159,159,159,159,159,159,159',
+'159,159,159,159,159,,,166,,,,,159,,,,159,166,166,166,,166,,166,,166',
+',166,166,166,166,166,166,166,166,166,166,166,166,166,166,,,167,,,,,166',
+',,,166,167,167,167,,167,,167,,167,,167,167,167,167,167,167,167,167,167',
+'167,167,167,167,167,,,168,,,,,167,,,,167,168,168,168,,168,,168,,168',
+',168,168,168,168,168,168,168,168,168,168,168,168,168,168,,,170,,,,,168',
+',,,168,170,170,170,,170,,170,,170,,170,170,170,170,170,170,170,170,170',
+'170,170,170,170,170,,,171,,,,,170,,,,170,171,171,171,,171,,171,,171',
+',171,171,171,171,171,171,171,171,171,171,171,171,171,171,,,172,,,,,171',
+',,,171,172,172,172,,172,,172,,172,,172,172,172,172,172,172,172,172,172',
+'172,172,172,172,172,,,178,,,,,172,,,,172,178,178,178,,178,,178,,178',
+',178,178,178,178,178,178,178,178,178,178,178,178,178,178,,,179,,,,,178',
+',,,178,179,179,179,,179,,179,,179,,179,179,179,179,179,179,179,179,179',
+'179,179,179,179,179,,,181,,,,,179,,,,179,181,181,181,,181,,181,,181',
+',181,181,181,181,181,181,181,181,181,181,181,181,181,181,,,186,,,,,181',
+',,,181,186,186,186,,186,,186,,186,,186,186,186,186,186,186,186,186,186',
+'186,186,186,186,186,,,204,,,,,186,,,,186,204,204,204,,204,,204,,204',
+',204,204,204,204,204,204,204,204,204,204,204,204,204,204,,,211,,,,,204',
+',,,204,211,211,211,,211,,211,,211,,211,211,211,211,211,211,211,211,211',
+'211,211,211,211,211,,,230,,,,,211,,,,211,230,230,230,,230,,230,,230',
+',230,230,230,230,230,230,230,230,230,230,230,230,230,230,,,253,,,,,230',
+',,,230,253,253,253,,253,,253,,253,,253,253,253,253,253,253,253,253,253',
+'253,253,253,253,253,,,292,,,,,253,,,,253,292,292,292,,292,,292,,292',
+',292,292,292,292,292,292,292,292,292,292,292,292,292,292,,,315,,,,,292',
+',,,292,315,315,315,,315,,315,,315,,315,315,315,315,315,315,315,315,315',
+'315,315,315,315,315,,,330,,,,,315,,,,315,330,330,330,,330,,330,,330',
+',330,330,330,330,330,330,330,330,330,330,330,330,330,330,,,331,,,,,330',
+',,,330,331,331,331,,331,,331,,331,,331,331,331,331,331,331,331,331,331',
+'331,331,331,331,331,,,368,,,,,331,,,,331,368,368,368,,368,,368,,368',
+',368,368,368,368,368,368,368,368,368,368,368,368,368,368,,,375,,,,,368',
+',,,368,375,375,375,,375,,375,,375,,375,375,375,375,375,375,375,375,375',
+'375,375,375,375,375,,,377,,,,,375,,,,375,377,377,377,,377,,377,,377',
+',377,377,377,377,377,377,377,377,377,377,377,377,377,377,,,379,,,,,377',
+',,,377,379,379,379,,379,,379,,379,,379,379,379,379,379,379,379,379,379',
+'379,379,379,379,379,,,381,,,,,379,,,,379,381,381,381,,381,,381,,381',
+',381,381,381,381,381,381,381,381,381,381,381,381,381,381,,,382,,,,,381',
+',,,381,382,382,382,,382,,382,,382,,382,382,382,382,382,382,382,382,382',
+'382,382,382,382,382,,,383,,,,,382,,,,382,383,383,383,,383,,383,,383',
+',383,383,383,383,383,383,383,383,383,383,383,383,383,383,,,406,,,,,383',
+',,,383,406,406,406,,406,,406,,406,,406,406,406,406,406,406,406,406,406',
+'406,406,406,406,406,,,409,,,,,406,,,,406,409,409,409,,409,,409,,409',
+',409,409,409,409,409,409,409,409,409,409,409,409,409,409,,,410,,,,,409',
+',,,409,410,410,410,,410,,410,,410,,410,410,410,410,410,410,410,410,410',
+'410,410,410,410,410,299,,,299,,299,,410,299,,,410,,,,,,,,,,,,,,299,',
+'299,299,299,299,299,,,,299' ]
+        racc_action_check = arr = ::Array.new(3154, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -687,539 +696,544 @@ clist = [
         end
 
 racc_action_pointer = [
-   130,     9,  1590,   nil,   nil,    16,   116,   -33,   nil,   nil,
+    73,    19,  1675,   nil,   nil,    42,    59,    13,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    11,  1626,  1662,    64,    38,   nil,
-  1140,   238,    83,   nil,     4,    76,   211,   nil,   nil,   nil,
-  1698,  1734,   nil,  1770,   -27,   nil,   192,   123,    -2,   604,
-   nil,    93,   nil,  1806,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    80,  1711,  1747,    93,    19,   nil,
+  1264,   188,   110,   nil,    27,   105,   166,   nil,   nil,   nil,
+  1783,  1819,   nil,  1855,   -27,   nil,   145,   130,    -3,   728,
+   nil,     5,   nil,  1891,   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,   196,   nil,   190,
-   229,   255,  1842,   268,   295,   308,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   148,   nil,   162,
+   200,   202,  1927,   240,   253,   291,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   368,   694,   349,   160,   366,   nil,    74,
-   419,   374,   nil,   148,   402,  1878,   nil,   408,   426,   413,
-   389,   390,   391,   406,   407,   408,   409,   416,   418,   423,
-   424,   451,   426,  1189,   nil,   427,   426,   nil,   428,   nil,
-   429,   nil,   nil,   430,   431,   nil,   681,  1914,  1950,  1986,
-   109,   456,   429,   438,   477,  1214,  2022,  2058,  2094,    43,
-  2130,  2166,  2202,   nil,   nil,   nil,   nil,     3,  2238,  2274,
-   nil,  2310,   nil,   160,   nil,   nil,  2346,   nil,   119,   nil,
-   451,   nil,   nil,   nil,   nil,   nil,   758,   835,   912,  1280,
-  1346,  1321,  2382,  1344,  1453,  1456,   479,   989,   143,  2418,
-   nil,   nil,   202,   224,   230,   235,   253,   255,     9,    10,
-    38,   450,   504,   270,   272,   274,   nil,   509,  2454,   nil,
-   nil,   nil,   466,   nil,  1412,   nil,   nil,   nil,  1459,   nil,
-   nil,   nil,   nil,   494,   491,   480,   517,   518,   231,   519,
-   535,  2490,   nil,   nil,   490,  1066,   nil,   492,   nil,   484,
-   466,   502,    40,   nil,   nil,   277,   nil,   nil,    69,   177,
-   nil,   249,   nil,   nil,    75,   501,   nil,   528,    -8,  1506,
-   529,   nil,   471,   558,   nil,   nil,  1528,   525,  1550,    80,
-  2526,   nil,   nil,   nil,   nil,   nil,    83,  1537,   nil,   nil,
+   nil,   nil,   nil,   324,   144,   307,   179,   308,   nil,    63,
+   352,   306,   nil,     8,   343,  1963,   nil,   356,   375,   358,
+   337,   338,   342,   343,   344,   345,   360,   361,   362,   363,
+   371,   399,   378,    -3,   nil,   379,   378,   nil,   379,   nil,
+   380,   nil,   nil,   381,   383,   nil,   805,  1999,  2035,  2071,
+    86,   408,   381,   381,   410,  1338,  2107,  2143,  2179,    50,
+  2215,  2251,  2287,   nil,   nil,   nil,   nil,     1,  2323,  2359,
+   nil,  2395,   nil,    17,   nil,   nil,  2431,   nil,   117,   nil,
+   384,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   882,   959,
+  1036,  1404,  1470,     1,  2467,     5,    10,    14,   421,  1113,
+    87,  2503,   nil,   nil,   168,   174,   179,   181,   197,   199,
+     5,    10,    20,   399,   454,   215,   217,   219,   nil,   456,
+  2539,   nil,   nil,   nil,   415,   nil,  1536,   nil,   nil,   nil,
+    20,   nil,   nil,   nil,   nil,   443,   443,   416,   448,   449,
+   184,   464,   480,  2575,   nil,   nil,   435,  1190,   nil,   437,
+   nil,   436,   418,   454,    26,   nil,   nil,   222,   nil,   nil,
+    28,    30,   nil,   194,   nil,   nil,    30,   453,   nil,   480,
+    -2,  1579,   481,   nil,   423,   502,   nil,   nil,  1621,   458,
+  1635,    32,  2611,   nil,   nil,   nil,   nil,   nil,    47,  3082,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   528,   529,   520,  2562,   nil,   nil,   nil,   nil,   nil,   178,
-    98,   -61,    -2,   546,   550,   551,   109,   115,  2598,  2634,
-   573,   200,   nil,   565,   nil,   561,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   277,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   544,    69,   545,   148,   227,   306,   583,
-   589,   303,   309,   566,   nil,  2670,   329,   nil,   nil,   377,
-   nil,   nil,  2706,   597,  2742,   598,  2778,   599,  2814,  2850,
-  2886,   201,   456,   564,   568,   595,   316,   604,    70,   340,
-   606,   342,   607,   227,   239,   344,   nil,   594,   nil,   610,
-   nil,   nil,   599,  2922,   nil,   640,  2958,  2994,   nil,   nil,
-   nil,   613,   nil,   nil,   527,   348,   nil,   350,   352,   603,
-   nil,   nil ]
+   nil,   nil,   461,   462,   450,  2647,   nil,   nil,   nil,   nil,
+   nil,    39,    35,    30,    91,   477,   478,   479,    39,    43,
+  2683,  2719,   501,    66,   nil,   493,   nil,   475,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   222,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   467,   171,   478,   251,
+   331,   411,   516,   517,   248,   254,   497,   nil,  2755,   274,
+   nil,   nil,   491,   nil,   nil,  2791,   524,  2827,   528,  2863,
+   529,  2899,  2935,  2971,    78,   571,   491,   492,   532,   261,
+   521,   164,   277,   522,   279,   523,   120,   121,   295,   nil,
+   517,   nil,   533,   nil,   nil,   525,  3007,   nil,   564,  3043,
+  3079,   nil,   nil,   nil,   537,   nil,   nil,   651,   297,   nil,
+   299,   302,   527,   nil,   nil ]
 
 racc_action_default = [
-  -248,  -248,  -242,    -6,   -15,  -248,    -4,  -157,  -160,  -161,
-  -162,  -163,  -164,  -165,  -166,  -167,  -168,  -169,  -170,  -171,
-  -172,  -173,  -174,  -175,  -176,  -242,  -242,  -248,   -80,  -184,
-  -248,  -248,  -243,  -245,   -16,    -4,  -147,   422,    -1,    -5,
-  -242,  -242,  -183,  -242,  -185,  -178,  -247,  -248,  -242,  -242,
-  -182,  -248,  -204,  -242,  -104,  -105,  -106,  -107,  -108,  -109,
-  -110,  -111,  -112,  -113,  -114,  -115,  -116,  -117,  -118,  -119,
-  -120,  -121,  -122,  -123,  -124,  -125,  -126,  -127,  -128,  -129,
-  -130,  -131,  -132,  -133,  -134,  -135,  -136,  -247,  -188,  -248,
-  -248,  -248,  -242,  -248,  -248,  -248,  -199,  -200,  -201,  -202,
-  -235,  -236,  -237,  -238,  -244,    -2,    -7,    -8,    -9,   -10,
-   -11,   -12,   -13,   -16,  -248,  -248,  -248,  -248,    -3,   -80,
-  -248,  -158,  -159,  -248,  -248,  -242,  -180,  -248,  -248,  -248,
-  -170,  -160,  -164,  -171,  -172,  -161,  -162,  -165,  -166,  -169,
-  -163,  -115,  -167,  -231,  -197,  -248,  -208,  -209,  -211,  -212,
-  -214,  -215,  -218,  -221,  -223,  -224,  -242,  -242,  -242,  -242,
-  -248,  -248,  -248,  -206,  -248,  -246,  -242,  -242,  -242,  -193,
-  -242,  -242,  -242,   -17,   -14,   -14,   -14,  -242,  -242,  -242,
-  -240,  -242,   -79,  -248,  -149,  -177,  -242,  -179,  -186,  -181,
-   -81,  -225,  -232,  -233,  -234,  -198,  -242,  -242,  -242,  -219,
-  -219,  -231,  -242,  -231,  -231,  -231,  -248,  -242,  -248,  -242,
-  -187,  -189,  -190,  -191,  -192,  -194,  -195,  -196,  -242,  -242,
-  -242,  -248,  -248,  -154,  -155,  -156,  -148,  -248,  -242,  -207,
-  -215,  -210,  -217,  -213,  -248,  -220,  -222,  -226,  -231,  -227,
-  -228,  -230,   -82,  -248,  -248,  -203,  -137,  -137,  -248,  -137,
-  -248,  -242,  -241,  -150,  -205,  -242,  -229,  -248,   -83,   -19,
-  -145,   -24,  -242,   -57,  -239,  -153,  -216,   -30,  -242,  -248,
-  -139,  -142,  -146,   -30,  -242,   -30,   -26,   -29,   -16,   -16,
-   -20,  -138,  -145,  -248,  -143,  -144,   -16,   -25,   -16,  -242,
-  -242,   -56,   -58,   -59,   -60,   -61,   -71,   -71,   -18,   -31,
-   -32,   -33,   -34,   -35,   -36,   -37,   -38,   -39,   -40,   -41,
-  -248,  -248,  -248,  -242,  -140,  -141,   -22,   -23,   -27,  -248,
-  -242,   -68,  -248,   -42,   -42,   -42,  -242,  -242,  -242,  -242,
-  -248,  -248,   -28,   -62,   -69,  -248,   -72,   -86,   -87,   -88,
-   -89,   -90,   -91,   -92,   -93,   -94,   -97,   -98,   -99,  -100,
-  -101,  -102,  -103,  -129,  -248,  -248,  -248,  -248,  -248,   -64,
-   -66,   -53,   -54,  -248,   -21,  -242,   -73,   -95,   -96,  -248,
-  -151,   -43,  -242,   -50,  -242,   -50,  -242,   -50,  -242,  -242,
-  -242,  -248,  -248,  -248,  -248,  -248,   -44,  -248,  -248,   -46,
-  -248,   -48,  -248,  -248,  -248,   -55,   -63,   -15,   -84,  -248,
-   -74,   -75,  -248,  -242,   -51,  -248,  -242,  -242,   -65,   -67,
-   -70,   -76,   -77,   -85,  -248,   -45,   -52,   -47,   -49,   -15,
-  -152,   -78 ]
+  -251,  -251,  -245,    -6,   -15,  -251,    -4,  -158,  -161,  -162,
+  -163,  -164,  -165,  -166,  -167,  -168,  -169,  -170,  -171,  -172,
+  -173,  -174,  -175,  -176,  -177,  -245,  -245,  -251,   -80,  -185,
+  -251,  -251,  -246,  -248,   -16,    -4,  -148,   425,    -1,    -5,
+  -245,  -245,  -184,  -245,  -186,  -179,  -250,  -251,  -245,  -245,
+  -183,  -251,  -205,  -245,  -105,  -106,  -107,  -108,  -109,  -110,
+  -111,  -112,  -113,  -114,  -115,  -116,  -117,  -118,  -119,  -120,
+  -121,  -122,  -123,  -124,  -125,  -126,  -127,  -128,  -129,  -130,
+  -131,  -132,  -133,  -134,  -135,  -136,  -137,  -250,  -189,  -251,
+  -251,  -251,  -245,  -251,  -251,  -251,  -200,  -201,  -202,  -203,
+  -238,  -239,  -240,  -241,  -247,    -2,    -7,    -8,    -9,   -10,
+   -11,   -12,   -13,   -16,  -251,  -251,  -251,  -251,    -3,   -80,
+  -251,  -159,  -160,  -251,  -251,  -245,  -181,  -251,  -251,  -251,
+  -171,  -161,  -165,  -172,  -173,  -162,  -163,  -166,  -167,  -170,
+  -164,  -116,  -168,  -232,  -198,  -251,  -209,  -210,  -212,  -213,
+  -215,  -216,  -219,  -222,  -224,  -225,  -245,  -245,  -245,  -245,
+  -251,  -251,  -251,  -207,  -251,  -249,  -245,  -245,  -245,  -194,
+  -245,  -245,  -245,   -17,   -14,   -14,   -14,  -245,  -245,  -245,
+  -243,  -245,   -79,  -251,  -150,  -178,  -245,  -180,  -187,  -182,
+   -81,  -226,  -233,  -234,  -235,  -236,  -237,  -199,  -245,  -245,
+  -245,  -220,  -220,  -232,  -245,  -232,  -232,  -232,  -251,  -245,
+  -251,  -245,  -188,  -190,  -191,  -192,  -193,  -195,  -196,  -197,
+  -245,  -245,  -245,  -251,  -251,  -155,  -156,  -157,  -149,  -251,
+  -245,  -208,  -216,  -211,  -218,  -214,  -251,  -221,  -223,  -227,
+  -232,  -228,  -229,  -231,   -82,  -251,  -251,  -204,  -138,  -138,
+  -251,  -138,  -251,  -245,  -244,  -151,  -206,  -245,  -230,  -251,
+   -83,   -19,  -146,   -24,  -245,   -57,  -242,  -154,  -217,   -30,
+  -245,  -251,  -140,  -143,  -147,   -30,  -245,   -30,   -26,   -29,
+   -16,   -16,   -20,  -139,  -146,  -251,  -144,  -145,   -16,   -25,
+   -16,  -245,  -245,   -56,   -58,   -59,   -60,   -61,   -71,   -71,
+   -18,   -31,   -32,   -33,   -34,   -35,   -36,   -37,   -38,   -39,
+   -40,   -41,  -251,  -251,  -251,  -245,  -141,  -142,   -22,   -23,
+   -27,  -251,  -245,   -68,  -251,   -42,   -42,   -42,  -245,  -245,
+  -245,  -245,  -251,  -251,   -28,   -62,   -69,  -251,   -72,   -86,
+   -87,   -88,   -89,   -90,   -91,   -92,   -93,   -94,   -97,   -98,
+   -99,  -100,  -101,  -102,  -103,  -104,  -130,  -251,  -251,  -251,
+  -251,  -251,   -64,   -66,   -53,   -54,  -251,   -21,  -245,   -73,
+   -95,   -96,  -251,  -152,   -43,  -245,   -50,  -245,   -50,  -245,
+   -50,  -245,  -245,  -245,  -251,  -251,  -251,  -251,  -251,   -44,
+  -251,  -251,   -46,  -251,   -48,  -251,  -251,  -251,   -55,   -63,
+   -15,   -84,  -251,   -74,   -75,  -251,  -245,   -51,  -251,  -245,
+  -245,   -65,   -67,   -70,   -76,   -77,   -85,  -251,   -45,   -52,
+   -47,   -49,   -15,  -153,   -78 ]
 
 racc_goto_table = [
-     6,    46,   116,   127,    93,   163,   114,    92,    88,   191,
-    50,   202,   206,   129,   354,   277,   128,   124,   230,   123,
-   233,   410,   270,    38,    47,   232,   232,   277,   275,   279,
-   387,     1,   390,    34,   392,   286,    35,   288,   121,   122,
-   287,   106,   277,   421,   314,   267,   370,   143,   373,   375,
-   377,   105,   118,   259,   261,   273,   263,   318,   164,   293,
-   244,   385,   218,   219,   220,   235,   236,   237,   294,   239,
-   240,   241,   295,   333,   399,   249,   278,   266,   292,   359,
-   360,   335,   382,   232,   397,   173,   356,   357,   358,   202,
-   169,   119,   162,   269,   283,   183,   221,    87,   231,   100,
-   nil,   182,   nil,   nil,   256,   nil,   420,   nil,   nil,   nil,
+     6,   114,   116,    93,    46,   163,    88,    92,   127,   191,
+    50,   129,   204,   124,   208,   357,   128,   279,   232,   413,
+   235,   272,   123,   277,    47,   234,   234,    38,   281,   279,
+   261,   263,     1,   265,   288,   289,   290,    34,   121,   122,
+    35,   424,   106,   316,   279,   237,   238,   143,   373,   269,
+   376,   378,   380,   275,   164,   105,   118,   390,   320,   393,
+   295,   395,   296,   388,   246,   220,   221,   222,   297,   239,
+   251,   241,   242,   243,   280,   335,   402,   268,   294,   337,
+   173,   362,   363,   234,   359,   360,   361,   385,   400,   119,
+   169,   162,   204,   271,   285,   183,   223,    87,   233,   100,
+   nil,   182,   nil,   nil,   nil,   nil,   258,   nil,   423,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   188,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    93,
-   nil,   nil,    92,   211,   nil,   222,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   201,   203,   204,   205,   nil,   nil,
-   229,   245,   nil,   nil,   212,   213,   214,   nil,   215,   216,
-   217,   243,   nil,   246,   247,   nil,   223,   224,   nil,   225,
-   254,   nil,   nil,   nil,   188,   nil,   128,   248,   250,   nil,
-   nil,   nil,   nil,   nil,   143,   143,   143,   nil,   nil,   nil,
-   238,   nil,   nil,   nil,   nil,   143,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    93,   nil,
+   nil,   213,    92,   nil,   nil,   224,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   203,   205,   206,   207,   nil,   nil,
+   231,   nil,   nil,   247,   214,   215,   216,   nil,   217,   218,
+   219,   245,   nil,   nil,   nil,   nil,   225,   226,   nil,   227,
+   248,   249,   256,   nil,   188,   nil,   nil,   nil,   128,   250,
+   252,   nil,   nil,   nil,   nil,   nil,   143,   143,   143,   nil,
+   nil,   nil,   240,   nil,   nil,   nil,   nil,   143,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   280,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   128,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   116,   nil,   265,
-   296,   nil,   nil,   143,   116,   nil,   116,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   319,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   331,
-   nil,   nil,   nil,   nil,   nil,   nil,   352,   nil,   nil,   nil,
+   282,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   128,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   298,   nil,   116,
+   nil,   267,   nil,   nil,   nil,   143,   116,   nil,   116,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   321,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   361,   362,   352,   nil,
-   352,   352,   352,   372,   374,   376,   nil,   nil,   nil,   nil,
-   nil,   381,   nil,   352,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   393,   394,   352,   nil,   nil,   398,
+   nil,   nil,   nil,   nil,   333,   nil,   nil,   355,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   386,   nil,   389,   nil,   391,   nil,   nil,   nil,   395,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   352,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   415,   nil,   nil,   417,   418 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   364,   365,
+   355,   nil,   355,   355,   355,   nil,   375,   377,   379,   nil,
+   nil,   nil,   nil,   nil,   nil,   355,   nil,   384,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   355,   nil,
+   396,   397,   401,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   389,   nil,   392,   nil,   394,   nil,   nil,
+   nil,   398,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   355,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   418,   nil,   nil,   420,   421 ]
 
 racc_goto_check = [
-     2,    20,    22,    16,    53,    60,    15,    35,    64,    76,
-    47,    65,    51,    49,    36,    25,    22,    61,    71,    20,
-    71,    45,    55,     3,     2,    66,    66,    25,    23,    19,
-    37,     1,    37,     4,    37,    19,     5,    19,     2,     2,
-    23,     6,    25,    45,    55,    18,    36,     2,    36,    36,
-    36,     3,     3,    17,    17,    21,    17,    24,    61,    27,
-    51,    36,    13,    13,    13,    72,    72,    76,    28,    76,
-    76,    76,    33,    25,    36,    38,    39,    71,    40,    25,
-    25,    41,    43,    66,    44,    15,    34,    34,    34,    65,
-     2,    46,    50,    54,    57,    58,    59,    63,    67,    77,
-   nil,    47,   nil,   nil,    76,   nil,    36,   nil,   nil,   nil,
+     2,    15,    22,    53,    20,    60,    64,    35,    16,    76,
+    47,    49,    65,    61,    51,    36,    22,    25,    71,    45,
+    71,    55,    20,    23,     2,    66,    66,     3,    19,    25,
+    17,    17,     1,    17,    19,    23,    19,     4,     2,     2,
+     5,    45,     6,    55,    25,    72,    72,     2,    36,    18,
+    36,    36,    36,    21,    61,     3,     3,    37,    24,    37,
+    27,    37,    28,    36,    51,    13,    13,    13,    33,    76,
+    38,    76,    76,    76,    39,    25,    36,    71,    40,    41,
+    15,    25,    25,    66,    34,    34,    34,    43,    44,    46,
+     2,    50,    65,    54,    57,    58,    59,    63,    67,    77,
+   nil,    47,   nil,   nil,   nil,   nil,    76,   nil,    36,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
-   nil,   nil,    35,    64,   nil,    22,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,   nil,
+   nil,    64,    35,   nil,   nil,    22,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,     2,     2,     2,     2,   nil,   nil,
-    49,    60,   nil,   nil,     2,     2,     2,   nil,     2,     2,
-     2,    49,   nil,    16,    16,   nil,     2,     2,   nil,     2,
-    60,   nil,   nil,   nil,     2,   nil,    22,    22,    22,   nil,
-   nil,   nil,   nil,   nil,     2,     2,     2,   nil,   nil,   nil,
-     2,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
+    49,   nil,   nil,    60,     2,     2,     2,   nil,     2,     2,
+     2,    49,   nil,   nil,   nil,   nil,     2,     2,   nil,     2,
+    16,    16,    60,   nil,     2,   nil,   nil,   nil,    22,    22,
+    22,   nil,   nil,   nil,   nil,   nil,     2,     2,     2,   nil,
+   nil,   nil,     2,   nil,   nil,   nil,   nil,     2,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    16,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    22,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,   nil,     2,
-    15,   nil,   nil,     2,    22,   nil,    22,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    20,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    20,
-   nil,   nil,   nil,   nil,   nil,   nil,    53,   nil,   nil,   nil,
+    16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,   nil,    22,
+   nil,     2,   nil,   nil,   nil,     2,    22,   nil,    22,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    20,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     2,     2,    53,   nil,
-    53,    53,    53,    35,    35,    35,   nil,   nil,   nil,   nil,
-   nil,    20,   nil,    53,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    20,    20,    53,   nil,   nil,    35,
+   nil,   nil,   nil,   nil,    20,   nil,   nil,    53,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     2,   nil,     2,   nil,     2,   nil,   nil,   nil,     2,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,     2,   nil,   nil,     2,     2 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,     2,
+    53,   nil,    53,    53,    53,   nil,    35,    35,    35,   nil,
+   nil,   nil,   nil,   nil,   nil,    53,   nil,    20,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,   nil,
+    20,    20,    35,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     2,   nil,     2,   nil,     2,   nil,   nil,
+   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    53,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,     2,   nil,   nil,     2,     2 ]
 
 racc_goto_pointer = [
-   nil,    31,    -2,    17,    30,    32,     7,   nil,   nil,   nil,
-   nil,   nil,   nil,  -112,   nil,   -28,   -45,  -193,  -214,  -238,
-   -24,  -206,   -32,  -234,  -232,  -247,   nil,  -219,  -210,   nil,
-   nil,   nil,   nil,  -206,  -237,   -23,  -308,  -343,  -145,  -187,
-  -200,  -240,   nil,  -284,  -298,  -376,    55,   -18,   nil,   -36,
-    41,  -148,   nil,   -26,  -167,  -238,   nil,  -177,   -25,   -81,
-   -48,   -29,   nil,    67,   -22,  -145,  -172,   -99,   nil,   nil,
-   nil,  -178,  -134,   nil,   nil,   nil,  -134,    68 ]
+   nil,    32,    -2,    21,    34,    36,     8,   nil,   nil,   nil,
+   nil,   nil,   nil,  -109,   nil,   -33,   -40,  -218,  -212,  -241,
+   -21,  -210,   -32,  -241,  -233,  -247,   nil,  -220,  -218,   nil,
+   nil,   nil,   nil,  -212,  -241,   -23,  -309,  -319,  -152,  -191,
+  -202,  -244,   nil,  -282,  -297,  -381,    53,   -18,   nil,   -38,
+    40,  -146,   nil,   -27,  -169,  -241,   nil,  -179,   -25,   -81,
+   -48,   -33,   nil,    67,   -24,  -144,  -174,  -101,   nil,   nil,
+   nil,  -180,  -156,   nil,   nil,   nil,  -134,    68 ]
 
 racc_goto_default = [
-   nil,   nil,    44,   nil,   nil,   411,   309,   107,   108,   109,
-   110,   111,   112,   nil,    36,   297,   115,   nil,   nil,   nil,
-   nil,   nil,    31,   nil,   276,    24,   299,   300,   301,   302,
-   303,   304,   305,   308,   nil,   144,   nil,   nil,   nil,   nil,
-   nil,   nil,   321,   nil,   nil,   nil,   nil,   nil,    51,   nil,
-   nil,    52,   345,   145,   nil,   nil,   271,   nil,   nil,   nil,
+   nil,   nil,    44,   nil,   nil,   414,   311,   107,   108,   109,
+   110,   111,   112,   nil,    36,   299,   115,   nil,   nil,   nil,
+   nil,   nil,    31,   nil,   278,    24,   301,   302,   303,   304,
+   305,   306,   307,   310,   nil,   144,   nil,   nil,   nil,   nil,
+   nil,   nil,   323,   nil,   nil,   nil,   nil,   nil,    51,   nil,
+   nil,    52,   347,   145,   nil,   nil,   273,   nil,   nil,   nil,
      7,   nil,    29,   nil,   nil,   158,   146,   147,   148,   149,
    150,   151,   152,   153,   154,   155,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 82, :_reduce_1,
-  3, 82, :_reduce_2,
-  3, 82, :_reduce_3,
-  0, 84, :_reduce_none,
-  1, 84, :_reduce_none,
-  0, 85, :_reduce_6,
-  2, 85, :_reduce_7,
-  1, 87, :_reduce_none,
-  1, 87, :_reduce_none,
-  1, 87, :_reduce_none,
-  1, 87, :_reduce_none,
-  1, 87, :_reduce_none,
-  1, 87, :_reduce_none,
-  0, 94, :_reduce_14,
-  0, 95, :_reduce_15,
-  0, 96, :_reduce_16,
-  2, 96, :_reduce_17,
-  8, 93, :_reduce_18,
-  0, 99, :_reduce_19,
-  2, 99, :_reduce_20,
-  5, 99, :_reduce_21,
-  8, 92, :_reduce_22,
-  8, 92, :_reduce_23,
-  0, 102, :_reduce_24,
-  2, 102, :_reduce_25,
-  1, 104, :_reduce_26,
-  3, 104, :_reduce_27,
-  4, 105, :_reduce_28,
-  1, 105, :_reduce_29,
-  0, 100, :_reduce_30,
-  2, 100, :_reduce_31,
-  1, 107, :_reduce_none,
-  1, 107, :_reduce_none,
-  1, 107, :_reduce_none,
-  1, 107, :_reduce_none,
-  1, 107, :_reduce_none,
-  1, 107, :_reduce_none,
-  1, 107, :_reduce_38,
-  1, 107, :_reduce_39,
-  1, 107, :_reduce_none,
-  1, 107, :_reduce_none,
-  0, 115, :_reduce_42,
-  2, 115, :_reduce_43,
-  5, 113, :_reduce_44,
-  7, 113, :_reduce_45,
-  5, 113, :_reduce_46,
-  7, 113, :_reduce_47,
-  5, 113, :_reduce_48,
-  7, 113, :_reduce_49,
-  0, 118, :_reduce_50,
-  2, 118, :_reduce_51,
-  3, 118, :_reduce_52,
-  3, 112, :_reduce_53,
-  3, 112, :_reduce_54,
-  5, 112, :_reduce_55,
-  7, 91, :_reduce_56,
-  0, 120, :_reduce_57,
-  2, 120, :_reduce_58,
-  1, 121, :_reduce_59,
-  1, 121, :_reduce_60,
-  1, 121, :_reduce_none,
-  3, 109, :_reduce_62,
-  6, 109, :_reduce_63,
-  3, 110, :_reduce_64,
-  6, 110, :_reduce_65,
-  3, 111, :_reduce_66,
-  6, 111, :_reduce_67,
-  0, 122, :_reduce_68,
-  1, 122, :_reduce_69,
-  7, 108, :_reduce_70,
-  0, 123, :_reduce_none,
-  2, 123, :_reduce_72,
-  0, 124, :_reduce_73,
-  2, 124, :_reduce_74,
-  2, 124, :_reduce_75,
-  1, 126, :_reduce_76,
-  1, 126, :_reduce_77,
-  3, 126, :_reduce_78,
-  3, 86, :_reduce_79,
-  0, 129, :_reduce_80,
-  3, 129, :_reduce_81,
-  3, 131, :_reduce_82,
-  4, 131, :_reduce_83,
-  1, 125, :_reduce_84,
-  2, 125, :_reduce_85,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  2, 117, :_reduce_95,
-  2, 117, :_reduce_96,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 133, :_reduce_none,
-  1, 133, :_reduce_none,
-  1, 133, :_reduce_none,
-  1, 133, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  1, 134, :_reduce_none,
-  0, 98, :_reduce_137,
-  3, 98, :_reduce_138,
-  1, 135, :_reduce_139,
-  3, 135, :_reduce_140,
-  3, 136, :_reduce_141,
-  0, 138, :_reduce_142,
-  1, 138, :_reduce_143,
-  1, 138, :_reduce_144,
-  0, 137, :_reduce_145,
-  1, 137, :_reduce_146,
-  0, 127, :_reduce_147,
-  3, 127, :_reduce_148,
-  1, 139, :_reduce_149,
-  3, 139, :_reduce_150,
-  4, 114, :_reduce_151,
-  8, 114, :_reduce_152,
-  5, 88, :_reduce_153,
-  3, 89, :_reduce_154,
-  3, 89, :_reduce_155,
-  3, 90, :_reduce_156,
-  1, 83, :_reduce_none,
-  3, 83, :_reduce_158,
-  3, 83, :_reduce_159,
-  1, 141, :_reduce_160,
-  1, 141, :_reduce_161,
-  1, 141, :_reduce_162,
-  1, 141, :_reduce_163,
-  1, 141, :_reduce_164,
-  1, 141, :_reduce_165,
-  1, 141, :_reduce_166,
-  1, 141, :_reduce_167,
-  1, 141, :_reduce_168,
-  1, 141, :_reduce_169,
-  1, 141, :_reduce_170,
-  1, 141, :_reduce_171,
-  1, 141, :_reduce_172,
-  1, 141, :_reduce_173,
-  1, 141, :_reduce_174,
-  1, 141, :_reduce_175,
-  1, 141, :_reduce_176,
-  4, 141, :_reduce_177,
-  2, 141, :_reduce_178,
-  4, 141, :_reduce_179,
-  3, 141, :_reduce_180,
-  4, 141, :_reduce_181,
-  2, 141, :_reduce_182,
-  2, 141, :_reduce_183,
-  1, 141, :_reduce_none,
-  1, 101, :_reduce_185,
-  3, 101, :_reduce_186,
-  4, 143, :_reduce_187,
-  1, 144, :_reduce_188,
-  3, 144, :_reduce_189,
-  3, 145, :_reduce_190,
-  3, 145, :_reduce_191,
-  3, 145, :_reduce_192,
-  2, 145, :_reduce_193,
-  3, 145, :_reduce_194,
-  3, 145, :_reduce_195,
-  3, 145, :_reduce_196,
-  1, 146, :_reduce_none,
-  2, 146, :_reduce_198,
-  1, 116, :_reduce_none,
-  1, 116, :_reduce_none,
-  1, 116, :_reduce_none,
-  1, 116, :_reduce_none,
-  4, 128, :_reduce_203,
-  1, 128, :_reduce_204,
-  5, 132, :_reduce_205,
-  2, 132, :_reduce_206,
-  3, 130, :_reduce_207,
-  1, 130, :_reduce_208,
-  1, 130, :_reduce_none,
-  3, 148, :_reduce_210,
-  1, 148, :_reduce_211,
+  3, 84, :_reduce_1,
+  3, 84, :_reduce_2,
+  3, 84, :_reduce_3,
+  0, 86, :_reduce_none,
+  1, 86, :_reduce_none,
+  0, 87, :_reduce_6,
+  2, 87, :_reduce_7,
+  1, 89, :_reduce_none,
+  1, 89, :_reduce_none,
+  1, 89, :_reduce_none,
+  1, 89, :_reduce_none,
+  1, 89, :_reduce_none,
+  1, 89, :_reduce_none,
+  0, 96, :_reduce_14,
+  0, 97, :_reduce_15,
+  0, 98, :_reduce_16,
+  2, 98, :_reduce_17,
+  8, 95, :_reduce_18,
+  0, 101, :_reduce_19,
+  2, 101, :_reduce_20,
+  5, 101, :_reduce_21,
+  8, 94, :_reduce_22,
+  8, 94, :_reduce_23,
+  0, 104, :_reduce_24,
+  2, 104, :_reduce_25,
+  1, 106, :_reduce_26,
+  3, 106, :_reduce_27,
+  4, 107, :_reduce_28,
+  1, 107, :_reduce_29,
+  0, 102, :_reduce_30,
+  2, 102, :_reduce_31,
+  1, 109, :_reduce_none,
+  1, 109, :_reduce_none,
+  1, 109, :_reduce_none,
+  1, 109, :_reduce_none,
+  1, 109, :_reduce_none,
+  1, 109, :_reduce_none,
+  1, 109, :_reduce_38,
+  1, 109, :_reduce_39,
+  1, 109, :_reduce_none,
+  1, 109, :_reduce_none,
+  0, 117, :_reduce_42,
+  2, 117, :_reduce_43,
+  5, 115, :_reduce_44,
+  7, 115, :_reduce_45,
+  5, 115, :_reduce_46,
+  7, 115, :_reduce_47,
+  5, 115, :_reduce_48,
+  7, 115, :_reduce_49,
+  0, 120, :_reduce_50,
+  2, 120, :_reduce_51,
+  3, 120, :_reduce_52,
+  3, 114, :_reduce_53,
+  3, 114, :_reduce_54,
+  5, 114, :_reduce_55,
+  7, 93, :_reduce_56,
+  0, 122, :_reduce_57,
+  2, 122, :_reduce_58,
+  1, 123, :_reduce_59,
+  1, 123, :_reduce_60,
+  1, 123, :_reduce_none,
+  3, 111, :_reduce_62,
+  6, 111, :_reduce_63,
+  3, 112, :_reduce_64,
+  6, 112, :_reduce_65,
+  3, 113, :_reduce_66,
+  6, 113, :_reduce_67,
+  0, 124, :_reduce_68,
+  1, 124, :_reduce_69,
+  7, 110, :_reduce_70,
+  0, 125, :_reduce_none,
+  2, 125, :_reduce_72,
+  0, 126, :_reduce_73,
+  2, 126, :_reduce_74,
+  2, 126, :_reduce_75,
+  1, 128, :_reduce_76,
+  1, 128, :_reduce_77,
+  3, 128, :_reduce_78,
+  3, 88, :_reduce_79,
+  0, 131, :_reduce_80,
+  3, 131, :_reduce_81,
+  3, 133, :_reduce_82,
+  4, 133, :_reduce_83,
+  1, 127, :_reduce_84,
+  2, 127, :_reduce_85,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  2, 119, :_reduce_95,
+  2, 119, :_reduce_96,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  1, 136, :_reduce_none,
+  0, 100, :_reduce_138,
+  3, 100, :_reduce_139,
+  1, 137, :_reduce_140,
+  3, 137, :_reduce_141,
+  3, 138, :_reduce_142,
+  0, 140, :_reduce_143,
+  1, 140, :_reduce_144,
+  1, 140, :_reduce_145,
+  0, 139, :_reduce_146,
+  1, 139, :_reduce_147,
+  0, 129, :_reduce_148,
+  3, 129, :_reduce_149,
+  1, 141, :_reduce_150,
+  3, 141, :_reduce_151,
+  4, 116, :_reduce_152,
+  8, 116, :_reduce_153,
+  5, 90, :_reduce_154,
+  3, 91, :_reduce_155,
+  3, 91, :_reduce_156,
+  3, 92, :_reduce_157,
+  1, 85, :_reduce_none,
+  3, 85, :_reduce_159,
+  3, 85, :_reduce_160,
+  1, 143, :_reduce_161,
+  1, 143, :_reduce_162,
+  1, 143, :_reduce_163,
+  1, 143, :_reduce_164,
+  1, 143, :_reduce_165,
+  1, 143, :_reduce_166,
+  1, 143, :_reduce_167,
+  1, 143, :_reduce_168,
+  1, 143, :_reduce_169,
+  1, 143, :_reduce_170,
+  1, 143, :_reduce_171,
+  1, 143, :_reduce_172,
+  1, 143, :_reduce_173,
+  1, 143, :_reduce_174,
+  1, 143, :_reduce_175,
+  1, 143, :_reduce_176,
+  1, 143, :_reduce_177,
+  4, 143, :_reduce_178,
+  2, 143, :_reduce_179,
+  4, 143, :_reduce_180,
+  3, 143, :_reduce_181,
+  4, 143, :_reduce_182,
+  2, 143, :_reduce_183,
+  2, 143, :_reduce_184,
+  1, 143, :_reduce_none,
+  1, 103, :_reduce_186,
+  3, 103, :_reduce_187,
+  4, 145, :_reduce_188,
+  1, 146, :_reduce_189,
+  3, 146, :_reduce_190,
+  3, 147, :_reduce_191,
+  3, 147, :_reduce_192,
+  3, 147, :_reduce_193,
+  2, 147, :_reduce_194,
+  3, 147, :_reduce_195,
+  3, 147, :_reduce_196,
+  3, 147, :_reduce_197,
   1, 148, :_reduce_none,
-  3, 150, :_reduce_213,
-  1, 150, :_reduce_214,
+  2, 148, :_reduce_199,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  4, 130, :_reduce_204,
+  1, 130, :_reduce_205,
+  5, 134, :_reduce_206,
+  2, 134, :_reduce_207,
+  3, 132, :_reduce_208,
+  1, 132, :_reduce_209,
+  1, 132, :_reduce_none,
+  3, 150, :_reduce_211,
+  1, 150, :_reduce_212,
   1, 150, :_reduce_none,
-  3, 152, :_reduce_216,
-  1, 152, :_reduce_217,
+  3, 152, :_reduce_214,
+  1, 152, :_reduce_215,
   1, 152, :_reduce_none,
-  0, 153, :_reduce_219,
-  3, 153, :_reduce_220,
-  1, 153, :_reduce_221,
-  3, 153, :_reduce_222,
-  1, 153, :_reduce_223,
-  1, 153, :_reduce_224,
-  2, 147, :_reduce_225,
-  3, 149, :_reduce_226,
+  3, 154, :_reduce_217,
+  1, 154, :_reduce_218,
+  1, 154, :_reduce_none,
+  0, 155, :_reduce_220,
+  3, 155, :_reduce_221,
+  1, 155, :_reduce_222,
+  3, 155, :_reduce_223,
+  1, 155, :_reduce_224,
+  1, 155, :_reduce_225,
+  2, 149, :_reduce_226,
   3, 151, :_reduce_227,
-  3, 154, :_reduce_228,
-  4, 155, :_reduce_229,
-  3, 156, :_reduce_230,
-  0, 157, :_reduce_none,
-  1, 157, :_reduce_none,
-  1, 157, :_reduce_none,
-  1, 157, :_reduce_none,
-  2, 106, :_reduce_235,
-  1, 158, :_reduce_none,
-  1, 158, :_reduce_none,
-  1, 158, :_reduce_none,
-  2, 119, :_reduce_239,
-  2, 97, :_reduce_240,
-  2, 140, :_reduce_241,
-  0, 103, :_reduce_242,
-  1, 103, :_reduce_243,
-  2, 103, :_reduce_244,
-  1, 103, :_reduce_245,
-  1, 142, :_reduce_none,
-  0, 142, :_reduce_none ]
-
-racc_reduce_n = 248
-
-racc_shift_n = 422
+  3, 153, :_reduce_228,
+  3, 156, :_reduce_229,
+  4, 157, :_reduce_230,
+  3, 158, :_reduce_231,
+  0, 159, :_reduce_none,
+  1, 159, :_reduce_none,
+  1, 159, :_reduce_none,
+  1, 159, :_reduce_none,
+  1, 159, :_reduce_none,
+  1, 159, :_reduce_none,
+  2, 108, :_reduce_238,
+  1, 160, :_reduce_none,
+  1, 160, :_reduce_none,
+  1, 160, :_reduce_none,
+  2, 121, :_reduce_242,
+  2, 99, :_reduce_243,
+  2, 142, :_reduce_244,
+  0, 105, :_reduce_245,
+  1, 105, :_reduce_246,
+  2, 105, :_reduce_247,
+  1, 105, :_reduce_248,
+  1, 144, :_reduce_none,
+  0, 144, :_reduce_none ]
+
+racc_reduce_n = 251
+
+racc_shift_n = 425
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :tUIDENT => 2,
   :tLIDENT => 3,
-  :tNAMESPACE => 4,
-  :tINTERFACEIDENT => 5,
-  :tGLOBALIDENT => 6,
-  :tLKEYWORD => 7,
-  :tUKEYWORD => 8,
-  :tLKEYWORD_Q_E => 9,
-  :tUKEYWORD_Q_E => 10,
-  :tIVAR => 11,
-  :tCLASSVAR => 12,
-  :tANNOTATION => 13,
-  :tSTRING => 14,
-  :tSYMBOL => 15,
-  :tINTEGER => 16,
-  :tWRITE_ATTR => 17,
-  :kLPAREN => 18,
-  :kRPAREN => 19,
-  :kLBRACKET => 20,
-  :kRBRACKET => 21,
-  :kLBRACE => 22,
-  :kRBRACE => 23,
-  :kVOID => 24,
-  :kNIL => 25,
-  :kTRUE => 26,
-  :kFALSE => 27,
-  :kANY => 28,
-  :kUNTYPED => 29,
-  :kTOP => 30,
-  :kBOT => 31,
-  :kSELF => 32,
-  :kSELFQ => 33,
-  :kINSTANCE => 34,
-  :kCLASS => 35,
-  :kBOOL => 36,
-  :kSINGLETON => 37,
-  :kTYPE => 38,
-  :kDEF => 39,
-  :kMODULE => 40,
-  :kPRIVATE => 41,
-  :kPUBLIC => 42,
-  :kALIAS => 43,
-  :kCOLON => 44,
-  :kCOLON2 => 45,
-  :kCOMMA => 46,
-  :kBAR => 47,
-  :kAMP => 48,
-  :kHAT => 49,
-  :kARROW => 50,
-  :kQUESTION => 51,
-  :kEXCLAMATION => 52,
-  :kSTAR => 53,
-  :kSTAR2 => 54,
-  :kFATARROW => 55,
-  :kEQ => 56,
-  :kDOT => 57,
-  :kDOT3 => 58,
-  :kLT => 59,
-  :kINTERFACE => 60,
-  :kEND => 61,
-  :kINCLUDE => 62,
-  :kEXTEND => 63,
-  :kATTRREADER => 64,
-  :kATTRWRITER => 65,
-  :kATTRACCESSOR => 66,
-  :tOPERATOR => 67,
-  :tQUOTEDMETHOD => 68,
-  :tQUOTEDIDENT => 69,
-  :kPREPEND => 70,
-  :kEXTENSION => 71,
-  :kINCOMPATIBLE => 72,
-  :type_TYPE => 73,
-  :type_SIGNATURE => 74,
-  :type_METHODTYPE => 75,
-  :tEOF => 76,
-  :kOUT => 77,
-  :kIN => 78,
-  :kUNCHECKED => 79,
-  :kOVERLOAD => 80 }
-
-racc_nt_base = 81
+  :tUNDERSCOREIDENT => 4,
+  :tNAMESPACE => 5,
+  :tINTERFACEIDENT => 6,
+  :tGLOBALIDENT => 7,
+  :tLKEYWORD => 8,
+  :tUKEYWORD => 9,
+  :tLKEYWORD_Q_E => 10,
+  :tUKEYWORD_Q_E => 11,
+  :tIVAR => 12,
+  :tCLASSVAR => 13,
+  :tANNOTATION => 14,
+  :tSTRING => 15,
+  :tSYMBOL => 16,
+  :tINTEGER => 17,
+  :tWRITE_ATTR => 18,
+  :kLPAREN => 19,
+  :kRPAREN => 20,
+  :kLBRACKET => 21,
+  :kRBRACKET => 22,
+  :kLBRACE => 23,
+  :kRBRACE => 24,
+  :kVOID => 25,
+  :kNIL => 26,
+  :kTRUE => 27,
+  :kFALSE => 28,
+  :kANY => 29,
+  :kUNTYPED => 30,
+  :kTOP => 31,
+  :kBOT => 32,
+  :kSELF => 33,
+  :kSELFQ => 34,
+  :kINSTANCE => 35,
+  :kCLASS => 36,
+  :kBOOL => 37,
+  :kSINGLETON => 38,
+  :kTYPE => 39,
+  :kDEF => 40,
+  :kMODULE => 41,
+  :kPRIVATE => 42,
+  :kPUBLIC => 43,
+  :kALIAS => 44,
+  :kCOLON => 45,
+  :kCOLON2 => 46,
+  :kCOMMA => 47,
+  :kBAR => 48,
+  :kAMP => 49,
+  :kHAT => 50,
+  :kARROW => 51,
+  :kQUESTION => 52,
+  :kEXCLAMATION => 53,
+  :kSTAR => 54,
+  :kSTAR2 => 55,
+  :kFATARROW => 56,
+  :kEQ => 57,
+  :kDOT => 58,
+  :kDOT3 => 59,
+  :kLT => 60,
+  :kINTERFACE => 61,
+  :kEND => 62,
+  :kINCLUDE => 63,
+  :kEXTEND => 64,
+  :kATTRREADER => 65,
+  :kATTRWRITER => 66,
+  :kATTRACCESSOR => 67,
+  :tOPERATOR => 68,
+  :tQUOTEDMETHOD => 69,
+  :tQUOTEDIDENT => 70,
+  :kPREPEND => 71,
+  :kEXTENSION => 72,
+  :kINCOMPATIBLE => 73,
+  :type_TYPE => 74,
+  :type_SIGNATURE => 75,
+  :type_METHODTYPE => 76,
+  :tEOF => 77,
+  :kOUT => 78,
+  :kIN => 79,
+  :kUNCHECKED => 80,
+  :kOVERLOAD => 81,
+  :tPARAMNAME => 82 }
+
+racc_nt_base = 83
 
 racc_use_result_var = true
 
@@ -1244,6 +1258,7 @@ Racc_token_to_s_table = [
   "error",
   "tUIDENT",
   "tLIDENT",
+  "tUNDERSCOREIDENT",
   "tNAMESPACE",
   "tINTERFACEIDENT",
   "tGLOBALIDENT",
@@ -1321,6 +1336,7 @@ Racc_token_to_s_table = [
   "kIN",
   "kUNCHECKED",
   "kOVERLOAD",
+  "tPARAMNAME",
   "$start",
   "target",
   "type",
@@ -1406,7 +1422,7 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'parser.y', 28)
+module_eval(<<'.,.,', 'parser.y', 29)
   def _reduce_1(val, _values, result)
             result = val[1]
 
@@ -1414,7 +1430,7 @@ module_eval(<<'.,.,', 'parser.y', 28)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 31)
+module_eval(<<'.,.,', 'parser.y', 32)
   def _reduce_2(val, _values, result)
             result = val[1]
 
@@ -1422,7 +1438,7 @@ module_eval(<<'.,.,', 'parser.y', 31)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 34)
+module_eval(<<'.,.,', 'parser.y', 35)
   def _reduce_3(val, _values, result)
             result = val[1]
 
@@ -1434,14 +1450,14 @@ module_eval(<<'.,.,', 'parser.y', 34)
 
 # reduce 5 omitted
 
-module_eval(<<'.,.,', 'parser.y', 40)
+module_eval(<<'.,.,', 'parser.y', 41)
   def _reduce_6(val, _values, result)
      result = []
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 42)
+module_eval(<<'.,.,', 'parser.y', 43)
   def _reduce_7(val, _values, result)
             result = val[0].push(val[1])
 
@@ -1461,28 +1477,28 @@ module_eval(<<'.,.,', 'parser.y', 42)
 
 # reduce 13 omitted
 
-module_eval(<<'.,.,', 'parser.y', 53)
+module_eval(<<'.,.,', 'parser.y', 54)
   def _reduce_14(val, _values, result)
      start_new_variables_scope
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 54)
+module_eval(<<'.,.,', 'parser.y', 55)
   def _reduce_15(val, _values, result)
      start_merged_variables_scope
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 57)
+module_eval(<<'.,.,', 'parser.y', 58)
   def _reduce_16(val, _values, result)
      result = []
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 59)
+module_eval(<<'.,.,', 'parser.y', 60)
   def _reduce_17(val, _values, result)
             result = val[1].unshift(Annotation.new(string: val[0].value, location: val[0].location))
 
@@ -1490,7 +1506,7 @@ module_eval(<<'.,.,', 'parser.y', 59)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 64)
+module_eval(<<'.,.,', 'parser.y', 65)
   def _reduce_18(val, _values, result)
             reset_variable_scope
 
@@ -1520,14 +1536,14 @@ module_eval(<<'.,.,', 'parser.y', 64)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 90)
+module_eval(<<'.,.,', 'parser.y', 91)
   def _reduce_19(val, _values, result)
      result = nil
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 92)
+module_eval(<<'.,.,', 'parser.y', 93)
   def _reduce_20(val, _values, result)
             loc = val[1].location.with_children(
           required: { name: val[1].location },
@@ -1540,7 +1556,7 @@ module_eval(<<'.,.,', 'parser.y', 92)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 100)
+module_eval(<<'.,.,', 'parser.y', 101)
   def _reduce_21(val, _values, result)
             loc = (val[1].location + val[4].location).with_children(
           required: { name: val[1].location },
@@ -1553,7 +1569,7 @@ module_eval(<<'.,.,', 'parser.y', 100)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 110)
+module_eval(<<'.,.,', 'parser.y', 111)
   def _reduce_22(val, _values, result)
             reset_variable_scope
 
@@ -1596,7 +1612,7 @@ module_eval(<<'.,.,', 'parser.y', 110)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 148)
+module_eval(<<'.,.,', 'parser.y', 149)
   def _reduce_23(val, _values, result)
             reset_variable_scope
 
@@ -1629,14 +1645,14 @@ module_eval(<<'.,.,', 'parser.y', 148)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 177)
+module_eval(<<'.,.,', 'parser.y', 178)
   def _reduce_24(val, _values, result)
      result = LocatedValue.new(value: [], location: nil)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 179)
+module_eval(<<'.,.,', 'parser.y', 180)
   def _reduce_25(val, _values, result)
             result = LocatedValue.new(value: val[1], location: val[0].location)
 
@@ -1644,7 +1660,7 @@ module_eval(<<'.,.,', 'parser.y', 179)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 184)
+module_eval(<<'.,.,', 'parser.y', 185)
   def _reduce_26(val, _values, result)
             result = [val[0]]
 
@@ -1652,7 +1668,7 @@ module_eval(<<'.,.,', 'parser.y', 184)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 187)
+module_eval(<<'.,.,', 'parser.y', 188)
   def _reduce_27(val, _values, result)
             result = val[0].push(val[2])
 
@@ -1660,7 +1676,7 @@ module_eval(<<'.,.,', 'parser.y', 187)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 192)
+module_eval(<<'.,.,', 'parser.y', 193)
   def _reduce_28(val, _values, result)
             name = val[0].value
         args = val[2]
@@ -1683,7 +1699,7 @@ module_eval(<<'.,.,', 'parser.y', 192)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 210)
+module_eval(<<'.,.,', 'parser.y', 211)
   def _reduce_29(val, _values, result)
             name = val[0].value
         args = []
@@ -1705,14 +1721,14 @@ module_eval(<<'.,.,', 'parser.y', 210)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 228)
+module_eval(<<'.,.,', 'parser.y', 229)
   def _reduce_30(val, _values, result)
      result = []
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 230)
+module_eval(<<'.,.,', 'parser.y', 231)
   def _reduce_31(val, _values, result)
             result = val[0].push(val[1])
 
@@ -1732,7 +1748,7 @@ module_eval(<<'.,.,', 'parser.y', 230)
 
 # reduce 37 omitted
 
-module_eval(<<'.,.,', 'parser.y', 241)
+module_eval(<<'.,.,', 'parser.y', 242)
   def _reduce_38(val, _values, result)
             result = Members::Public.new(location: val[0].location)
 
@@ -1740,7 +1756,7 @@ module_eval(<<'.,.,', 'parser.y', 241)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 244)
+module_eval(<<'.,.,', 'parser.y', 245)
   def _reduce_39(val, _values, result)
             result = Members::Private.new(location: val[0].location)
 
@@ -1752,21 +1768,21 @@ module_eval(<<'.,.,', 'parser.y', 244)
 
 # reduce 41 omitted
 
-module_eval(<<'.,.,', 'parser.y', 250)
+module_eval(<<'.,.,', 'parser.y', 251)
   def _reduce_42(val, _values, result)
      result = LocatedValue.new(value: :instance, location: nil)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 251)
+module_eval(<<'.,.,', 'parser.y', 252)
   def _reduce_43(val, _values, result)
      result = LocatedValue.new(value: :singleton, location: val[0].location + val[1].location)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 255)
+module_eval(<<'.,.,', 'parser.y', 256)
   def _reduce_44(val, _values, result)
             location = val[1].location + val[4].location
         name_loc, colon_loc = split_kw_loc(val[3].location)
@@ -1786,7 +1802,7 @@ module_eval(<<'.,.,', 'parser.y', 255)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 270)
+module_eval(<<'.,.,', 'parser.y', 271)
   def _reduce_45(val, _values, result)
             location = val[1].location + val[6].location
         ivar_loc = val[4]&.location
@@ -1817,7 +1833,7 @@ module_eval(<<'.,.,', 'parser.y', 270)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 296)
+module_eval(<<'.,.,', 'parser.y', 297)
   def _reduce_46(val, _values, result)
             location = val[1].location + val[4].location
         name_loc, colon_loc = split_kw_loc(val[3].location)
@@ -1837,7 +1853,7 @@ module_eval(<<'.,.,', 'parser.y', 296)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 311)
+module_eval(<<'.,.,', 'parser.y', 312)
   def _reduce_47(val, _values, result)
             location = val[1].location + val[6].location
         ivar_loc = val[4]&.location
@@ -1869,7 +1885,7 @@ module_eval(<<'.,.,', 'parser.y', 311)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 338)
+module_eval(<<'.,.,', 'parser.y', 339)
   def _reduce_48(val, _values, result)
             location = val[1].location + val[4].location
         name_loc, colon_loc = split_kw_loc(val[3].location)
@@ -1890,7 +1906,7 @@ module_eval(<<'.,.,', 'parser.y', 338)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 354)
+module_eval(<<'.,.,', 'parser.y', 355)
   def _reduce_49(val, _values, result)
             location = val[1].location + val[6].location
         ivar_loc = val[4]&.location
@@ -1922,21 +1938,21 @@ module_eval(<<'.,.,', 'parser.y', 354)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 382)
+module_eval(<<'.,.,', 'parser.y', 383)
   def _reduce_50(val, _values, result)
      result = nil
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 383)
+module_eval(<<'.,.,', 'parser.y', 384)
   def _reduce_51(val, _values, result)
      result = LocatedValue.new(value: false, location: val[0].location + val[1].location)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 385)
+module_eval(<<'.,.,', 'parser.y', 386)
   def _reduce_52(val, _values, result)
             result = LocatedValue.new(
           value: val[1],
@@ -1947,7 +1963,7 @@ module_eval(<<'.,.,', 'parser.y', 385)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 393)
+module_eval(<<'.,.,', 'parser.y', 394)
   def _reduce_53(val, _values, result)
             location = (val[0].location + val[2].location).with_children(
           required: { name: val[0].location, colon: val[1].location },
@@ -1965,7 +1981,7 @@ module_eval(<<'.,.,', 'parser.y', 393)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 406)
+module_eval(<<'.,.,', 'parser.y', 407)
   def _reduce_54(val, _values, result)
             type = val[2]
 
@@ -1993,7 +2009,7 @@ module_eval(<<'.,.,', 'parser.y', 406)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 429)
+module_eval(<<'.,.,', 'parser.y', 430)
   def _reduce_55(val, _values, result)
           type = val[4]
 
@@ -2021,7 +2037,7 @@ module_eval(<<'.,.,', 'parser.y', 429)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 454)
+module_eval(<<'.,.,', 'parser.y', 455)
   def _reduce_56(val, _values, result)
             reset_variable_scope
 
@@ -2043,14 +2059,14 @@ module_eval(<<'.,.,', 'parser.y', 454)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 472)
+module_eval(<<'.,.,', 'parser.y', 473)
   def _reduce_57(val, _values, result)
      result = []
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 474)
+module_eval(<<'.,.,', 'parser.y', 475)
   def _reduce_58(val, _values, result)
             result = val[0].push(val[1])
 
@@ -2058,7 +2074,7 @@ module_eval(<<'.,.,', 'parser.y', 474)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 479)
+module_eval(<<'.,.,', 'parser.y', 480)
   def _reduce_59(val, _values, result)
             unless val[0].kind == :instance
           raise SemanticsError.new("Interface cannot have singleton method", subject: val[0], location: val[0].location)
@@ -2074,7 +2090,7 @@ module_eval(<<'.,.,', 'parser.y', 479)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 490)
+module_eval(<<'.,.,', 'parser.y', 491)
   def _reduce_60(val, _values, result)
             unless val[0].name.interface?
           raise SemanticsError.new("Interface should include an interface", subject: val[0], location: val[0].location)
@@ -2088,7 +2104,7 @@ module_eval(<<'.,.,', 'parser.y', 490)
 
 # reduce 61 omitted
 
-module_eval(<<'.,.,', 'parser.y', 500)
+module_eval(<<'.,.,', 'parser.y', 501)
   def _reduce_62(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should include module or interface", subject: val[2].value, location: val[2].location)
@@ -2109,7 +2125,7 @@ module_eval(<<'.,.,', 'parser.y', 500)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 516)
+module_eval(<<'.,.,', 'parser.y', 517)
   def _reduce_63(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should include module or interface", subject: val[2].value, location: val[2].location)
@@ -2130,7 +2146,7 @@ module_eval(<<'.,.,', 'parser.y', 516)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 534)
+module_eval(<<'.,.,', 'parser.y', 535)
   def _reduce_64(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should extend module or interface", subject: val[2].value, location: val[2].location)
@@ -2151,7 +2167,7 @@ module_eval(<<'.,.,', 'parser.y', 534)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 550)
+module_eval(<<'.,.,', 'parser.y', 551)
   def _reduce_65(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should extend module or interface", subject: val[2].value, location: val[2].location)
@@ -2172,7 +2188,7 @@ module_eval(<<'.,.,', 'parser.y', 550)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 568)
+module_eval(<<'.,.,', 'parser.y', 569)
   def _reduce_66(val, _values, result)
             unless val[2].value.class?
           raise SemanticsError.new("Should prepend module", subject: val[2].value, location: val[2].location)
@@ -2193,7 +2209,7 @@ module_eval(<<'.,.,', 'parser.y', 568)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 584)
+module_eval(<<'.,.,', 'parser.y', 585)
   def _reduce_67(val, _values, result)
             unless val[2].value.class?
           raise SemanticsError.new("Should prepend module", subject: val[2].value, location: val[2].location)
@@ -2214,14 +2230,14 @@ module_eval(<<'.,.,', 'parser.y', 584)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 601)
+module_eval(<<'.,.,', 'parser.y', 602)
   def _reduce_68(val, _values, result)
      result = nil
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 603)
+module_eval(<<'.,.,', 'parser.y', 604)
   def _reduce_69(val, _values, result)
             RBS.logger.warn "`overload def` syntax is deprecated. Use `...` syntax instead."
         result = val[0]
@@ -2230,10 +2246,9 @@ module_eval(<<'.,.,', 'parser.y', 603)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 609)
+module_eval(<<'.,.,', 'parser.y', 610)
   def _reduce_70(val, _values, result)
             location = val[3].location + val[6].last.location
-        children = {}
 
         required_children = { keyword: val[3].location, name: val[5].location }
         optional_children = { kind: nil, overload: nil }
@@ -2518,15 +2533,17 @@ module_eval(<<'.,.,', 'parser.y', 717)
 
 # reduce 136 omitted
 
+# reduce 137 omitted
+
 module_eval(<<'.,.,', 'parser.y', 737)
-  def _reduce_137(val, _values, result)
+  def _reduce_138(val, _values, result)
      result = nil
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 739)
-  def _reduce_138(val, _values, result)
+  def _reduce_139(val, _values, result)
             val[1].each {|p| insert_bound_variable(p.name) }
 
         result = LocatedValue.new(value: val[1], location: val[0].location + val[2].location)
@@ -2536,7 +2553,7 @@ module_eval(<<'.,.,', 'parser.y', 739)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 746)
-  def _reduce_139(val, _values, result)
+  def _reduce_140(val, _values, result)
             result = Declarations::ModuleTypeParams.new()
         result.add(val[0])
 
@@ -2545,7 +2562,7 @@ module_eval(<<'.,.,', 'parser.y', 746)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 750)
-  def _reduce_140(val, _values, result)
+  def _reduce_141(val, _values, result)
             result = val[0].add(val[2])
 
     result
@@ -2553,7 +2570,7 @@ module_eval(<<'.,.,', 'parser.y', 750)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 755)
-  def _reduce_141(val, _values, result)
+  def _reduce_142(val, _values, result)
             loc = case
               when l0 = val[0].location
                 l0 + val[2].location
@@ -2578,49 +2595,49 @@ module_eval(<<'.,.,', 'parser.y', 755)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 776)
-  def _reduce_142(val, _values, result)
+  def _reduce_143(val, _values, result)
      result = LocatedValue.new(value: :invariant, location: nil)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 777)
-  def _reduce_143(val, _values, result)
+  def _reduce_144(val, _values, result)
      result = LocatedValue.new(value: :covariant, location: val[0].location)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 778)
-  def _reduce_144(val, _values, result)
+  def _reduce_145(val, _values, result)
      result = LocatedValue.new(value: :contravariant, location: val[0].location)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 781)
-  def _reduce_145(val, _values, result)
+  def _reduce_146(val, _values, result)
      result = LocatedValue.new(value: false, location: nil)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 782)
-  def _reduce_146(val, _values, result)
+  def _reduce_147(val, _values, result)
      result = LocatedValue.new(value: true, location: val[0].location)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 785)
-  def _reduce_147(val, _values, result)
+  def _reduce_148(val, _values, result)
      result = nil
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 787)
-  def _reduce_148(val, _values, result)
+  def _reduce_149(val, _values, result)
             val[1].each {|var| insert_bound_variable(var) }
 
         result = LocatedValue.new(value: val[1],
@@ -2631,7 +2648,7 @@ module_eval(<<'.,.,', 'parser.y', 787)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 795)
-  def _reduce_149(val, _values, result)
+  def _reduce_150(val, _values, result)
             result = [val[0].value.to_sym]
 
     result
@@ -2639,7 +2656,7 @@ module_eval(<<'.,.,', 'parser.y', 795)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 798)
-  def _reduce_150(val, _values, result)
+  def _reduce_151(val, _values, result)
             result = val[0].push(val[2].value.to_sym)
 
     result
@@ -2647,7 +2664,7 @@ module_eval(<<'.,.,', 'parser.y', 798)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 803)
-  def _reduce_151(val, _values, result)
+  def _reduce_152(val, _values, result)
             location = val[1].location + val[3].location
         location = location.with_children(
           required: { keyword: val[1].location, new_name: val[2].location, old_name: val[3].location },
@@ -2667,7 +2684,7 @@ module_eval(<<'.,.,', 'parser.y', 803)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 818)
-  def _reduce_152(val, _values, result)
+  def _reduce_153(val, _values, result)
             location = val[1].location + val[7].location
         location = location.with_children(
           required: { keyword: val[1].location, new_name: val[4].location, old_name: val[7].location },
@@ -2690,7 +2707,7 @@ module_eval(<<'.,.,', 'parser.y', 818)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 838)
-  def _reduce_153(val, _values, result)
+  def _reduce_154(val, _values, result)
             location = val[1].location + val[4].location
         location = location.with_children(
           required: { keyword: val[1].location, name: val[2].location, eq: val[3].location }
@@ -2708,7 +2725,7 @@ module_eval(<<'.,.,', 'parser.y', 838)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 853)
-  def _reduce_154(val, _values, result)
+  def _reduce_155(val, _values, result)
             location = val[0].location + val[2].location
         location = location.with_children(
           required: { name: val[0].location, colon: val[1].location }
@@ -2723,7 +2740,7 @@ module_eval(<<'.,.,', 'parser.y', 853)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 863)
-  def _reduce_155(val, _values, result)
+  def _reduce_156(val, _values, result)
             location = (val[0] || val[1]).location + val[2].location
 
         lhs_loc = (val[0] || val[1]).location + val[1].location
@@ -2743,7 +2760,7 @@ module_eval(<<'.,.,', 'parser.y', 863)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 880)
-  def _reduce_156(val, _values, result)
+  def _reduce_157(val, _values, result)
             location = val[0].location + val[2].location
         location = location.with_children(
           required: { name: val[0].location, colon: val[1].location }
@@ -2757,10 +2774,10 @@ module_eval(<<'.,.,', 'parser.y', 880)
   end
 .,.,
 
-# reduce 157 omitted
+# reduce 158 omitted
 
 module_eval(<<'.,.,', 'parser.y', 893)
-  def _reduce_158(val, _values, result)
+  def _reduce_159(val, _values, result)
             types = case l = val[0]
                 when Types::Union
                   l.types + [val[2]]
@@ -2775,7 +2792,7 @@ module_eval(<<'.,.,', 'parser.y', 893)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 903)
-  def _reduce_159(val, _values, result)
+  def _reduce_160(val, _values, result)
             types = case l = val[0]
                 when Types::Intersection
                   l.types + [val[2]]
@@ -2791,7 +2808,7 @@ module_eval(<<'.,.,', 'parser.y', 903)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 916)
-  def _reduce_160(val, _values, result)
+  def _reduce_161(val, _values, result)
             result = Types::Bases::Void.new(location: val[0].location)
 
     result
@@ -2799,7 +2816,7 @@ module_eval(<<'.,.,', 'parser.y', 916)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 919)
-  def _reduce_161(val, _values, result)
+  def _reduce_162(val, _values, result)
             RBS.logger.warn "`any` type is deprecated. Use `untyped` instead. (#{val[0].location.to_s})"
         result = Types::Bases::Any.new(location: val[0].location)
 
@@ -2808,7 +2825,7 @@ module_eval(<<'.,.,', 'parser.y', 919)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 923)
-  def _reduce_162(val, _values, result)
+  def _reduce_163(val, _values, result)
             result = Types::Bases::Any.new(location: val[0].location)
 
     result
@@ -2816,7 +2833,7 @@ module_eval(<<'.,.,', 'parser.y', 923)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 926)
-  def _reduce_163(val, _values, result)
+  def _reduce_164(val, _values, result)
             result = Types::Bases::Bool.new(location: val[0].location)
 
     result
@@ -2824,7 +2841,7 @@ module_eval(<<'.,.,', 'parser.y', 926)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 929)
-  def _reduce_164(val, _values, result)
+  def _reduce_165(val, _values, result)
             result = Types::Bases::Nil.new(location: val[0].location)
 
     result
@@ -2832,7 +2849,7 @@ module_eval(<<'.,.,', 'parser.y', 929)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 932)
-  def _reduce_165(val, _values, result)
+  def _reduce_166(val, _values, result)
             result = Types::Bases::Top.new(location: val[0].location)
 
     result
@@ -2840,7 +2857,7 @@ module_eval(<<'.,.,', 'parser.y', 932)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 935)
-  def _reduce_166(val, _values, result)
+  def _reduce_167(val, _values, result)
             result = Types::Bases::Bottom.new(location: val[0].location)
 
     result
@@ -2848,7 +2865,7 @@ module_eval(<<'.,.,', 'parser.y', 935)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 938)
-  def _reduce_167(val, _values, result)
+  def _reduce_168(val, _values, result)
             result = Types::Bases::Self.new(location: val[0].location)
 
     result
@@ -2856,7 +2873,7 @@ module_eval(<<'.,.,', 'parser.y', 938)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 941)
-  def _reduce_168(val, _values, result)
+  def _reduce_169(val, _values, result)
             result = Types::Optional.new(type: Types::Bases::Self.new(location: val[0].location),
                                      location: val[0].location)
 
@@ -2865,7 +2882,7 @@ module_eval(<<'.,.,', 'parser.y', 941)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 945)
-  def _reduce_169(val, _values, result)
+  def _reduce_170(val, _values, result)
             result = Types::Bases::Instance.new(location: val[0].location)
 
     result
@@ -2873,7 +2890,7 @@ module_eval(<<'.,.,', 'parser.y', 945)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 948)
-  def _reduce_170(val, _values, result)
+  def _reduce_171(val, _values, result)
             result = Types::Bases::Class.new(location: val[0].location)
 
     result
@@ -2881,7 +2898,7 @@ module_eval(<<'.,.,', 'parser.y', 948)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 951)
-  def _reduce_171(val, _values, result)
+  def _reduce_172(val, _values, result)
             result = Types::Literal.new(literal: true, location: val[0].location)
 
     result
@@ -2889,7 +2906,7 @@ module_eval(<<'.,.,', 'parser.y', 951)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 954)
-  def _reduce_172(val, _values, result)
+  def _reduce_173(val, _values, result)
             result = Types::Literal.new(literal: false, location: val[0].location)
 
     result
@@ -2897,7 +2914,7 @@ module_eval(<<'.,.,', 'parser.y', 954)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 957)
-  def _reduce_173(val, _values, result)
+  def _reduce_174(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
 
     result
@@ -2905,7 +2922,7 @@ module_eval(<<'.,.,', 'parser.y', 957)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 960)
-  def _reduce_174(val, _values, result)
+  def _reduce_175(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
 
     result
@@ -2913,7 +2930,7 @@ module_eval(<<'.,.,', 'parser.y', 960)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 963)
-  def _reduce_175(val, _values, result)
+  def _reduce_176(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
 
     result
@@ -2921,7 +2938,7 @@ module_eval(<<'.,.,', 'parser.y', 963)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 966)
-  def _reduce_176(val, _values, result)
+  def _reduce_177(val, _values, result)
             name = val[0].value
         args = []
         location = val[0].location
@@ -2956,7 +2973,7 @@ module_eval(<<'.,.,', 'parser.y', 966)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 996)
-  def _reduce_177(val, _values, result)
+  def _reduce_178(val, _values, result)
             name = val[0].value
         args = val[2]
         location = val[0].location + val[3].location
@@ -2986,7 +3003,7 @@ module_eval(<<'.,.,', 'parser.y', 996)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1021)
-  def _reduce_178(val, _values, result)
+  def _reduce_179(val, _values, result)
             location = val[0].location + val[1].location
         result = Types::Tuple.new(types: [], location: location)
 
@@ -2995,7 +3012,7 @@ module_eval(<<'.,.,', 'parser.y', 1021)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1025)
-  def _reduce_179(val, _values, result)
+  def _reduce_180(val, _values, result)
             location = val[0].location + val[3].location
         types = val[1]
         result = Types::Tuple.new(types: types, location: location)
@@ -3005,7 +3022,7 @@ module_eval(<<'.,.,', 'parser.y', 1025)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1030)
-  def _reduce_180(val, _values, result)
+  def _reduce_181(val, _values, result)
             type = val[1].dup
         type.instance_eval do
           @location = val[0].location + val[2].location
@@ -3017,7 +3034,7 @@ module_eval(<<'.,.,', 'parser.y', 1030)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1037)
-  def _reduce_181(val, _values, result)
+  def _reduce_182(val, _values, result)
             location = val[0].location + val[3].location
         location = location.with_children(
           required: { name: val[2].location }
@@ -3029,7 +3046,7 @@ module_eval(<<'.,.,', 'parser.y', 1037)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1044)
-  def _reduce_182(val, _values, result)
+  def _reduce_183(val, _values, result)
             type, block = val[1].value
         result = Types::Proc.new(type: type, block: block, location: val[0].location + val[1].location)
 
@@ -3038,17 +3055,17 @@ module_eval(<<'.,.,', 'parser.y', 1044)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1048)
-  def _reduce_183(val, _values, result)
+  def _reduce_184(val, _values, result)
             result = Types::Optional.new(type: val[0], location: val[0].location + val[1].location)
 
     result
   end
 .,.,
 
-# reduce 184 omitted
+# reduce 185 omitted
 
 module_eval(<<'.,.,', 'parser.y', 1054)
-  def _reduce_185(val, _values, result)
+  def _reduce_186(val, _values, result)
             result = [val[0]]
 
     result
@@ -3056,7 +3073,7 @@ module_eval(<<'.,.,', 'parser.y', 1054)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1057)
-  def _reduce_186(val, _values, result)
+  def _reduce_187(val, _values, result)
             result = val[0] + [val[2]]
 
     result
@@ -3064,7 +3081,7 @@ module_eval(<<'.,.,', 'parser.y', 1057)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1062)
-  def _reduce_187(val, _values, result)
+  def _reduce_188(val, _values, result)
             result = Types::Record.new(
           fields: val[1],
           location: val[0].location + val[3].location
@@ -3075,7 +3092,7 @@ module_eval(<<'.,.,', 'parser.y', 1062)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1070)
-  def _reduce_188(val, _values, result)
+  def _reduce_189(val, _values, result)
             result = val[0]
 
     result
@@ -3083,7 +3100,7 @@ module_eval(<<'.,.,', 'parser.y', 1070)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1073)
-  def _reduce_189(val, _values, result)
+  def _reduce_190(val, _values, result)
             result = val[0].merge!(val[2])
 
     result
@@ -3091,7 +3108,7 @@ module_eval(<<'.,.,', 'parser.y', 1073)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1078)
-  def _reduce_190(val, _values, result)
+  def _reduce_191(val, _values, result)
             result = { val[0].value => val[2] }
 
     result
@@ -3099,7 +3116,7 @@ module_eval(<<'.,.,', 'parser.y', 1078)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1081)
-  def _reduce_191(val, _values, result)
+  def _reduce_192(val, _values, result)
             result = { val[0].value => val[2] }
 
     result
@@ -3107,7 +3124,7 @@ module_eval(<<'.,.,', 'parser.y', 1081)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1084)
-  def _reduce_192(val, _values, result)
+  def _reduce_193(val, _values, result)
             result = { val[0].value => val[2] }
 
     result
@@ -3115,7 +3132,7 @@ module_eval(<<'.,.,', 'parser.y', 1084)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1087)
-  def _reduce_193(val, _values, result)
+  def _reduce_194(val, _values, result)
             result = { val[0].value => val[1] }
 
     result
@@ -3123,7 +3140,7 @@ module_eval(<<'.,.,', 'parser.y', 1087)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1090)
-  def _reduce_194(val, _values, result)
+  def _reduce_195(val, _values, result)
             result = { val[0].value => val[2] }
 
     result
@@ -3131,7 +3148,7 @@ module_eval(<<'.,.,', 'parser.y', 1090)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1093)
-  def _reduce_195(val, _values, result)
+  def _reduce_196(val, _values, result)
             result = { val[0].value => val[2] }
 
     result
@@ -3139,33 +3156,33 @@ module_eval(<<'.,.,', 'parser.y', 1093)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1096)
-  def _reduce_196(val, _values, result)
+  def _reduce_197(val, _values, result)
             result = { val[0].value => val[2] }
 
     result
   end
 .,.,
 
-# reduce 197 omitted
+# reduce 198 omitted
 
 module_eval(<<'.,.,', 'parser.y', 1102)
-  def _reduce_198(val, _values, result)
+  def _reduce_199(val, _values, result)
             result = val[0]
 
     result
   end
 .,.,
 
-# reduce 199 omitted
-
 # reduce 200 omitted
 
 # reduce 201 omitted
 
 # reduce 202 omitted
 
+# reduce 203 omitted
+
 module_eval(<<'.,.,', 'parser.y', 1109)
-  def _reduce_203(val, _values, result)
+  def _reduce_204(val, _values, result)
             location = (val[0] || val[1] || val[2]).location + val[3].location
 
         params = val[0]&.value || [[], [], nil, [], {}, {}, nil]
@@ -3190,7 +3207,7 @@ module_eval(<<'.,.,', 'parser.y', 1109)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1129)
-  def _reduce_204(val, _values, result)
+  def _reduce_205(val, _values, result)
             result = LocatedValue.new(value: [val[0].value, nil], location: val[0].location)
 
     result
@@ -3198,7 +3215,7 @@ module_eval(<<'.,.,', 'parser.y', 1129)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1134)
-  def _reduce_205(val, _values, result)
+  def _reduce_206(val, _values, result)
             location = val[0].location + val[4].location
         type = Types::Function.new(
           required_positionals: val[1][0],
@@ -3218,7 +3235,7 @@ module_eval(<<'.,.,', 'parser.y', 1134)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1149)
-  def _reduce_206(val, _values, result)
+  def _reduce_207(val, _values, result)
             location = val[0].location + val[1].location
         type = Types::Function.new(
           required_positionals: [],
@@ -3238,7 +3255,7 @@ module_eval(<<'.,.,', 'parser.y', 1149)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1166)
-  def _reduce_207(val, _values, result)
+  def _reduce_208(val, _values, result)
             result = val[2]
         result[0].unshift(val[0])
 
@@ -3247,7 +3264,7 @@ module_eval(<<'.,.,', 'parser.y', 1166)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1170)
-  def _reduce_208(val, _values, result)
+  def _reduce_209(val, _values, result)
             result = empty_params_result
         result[0].unshift(val[0])
 
@@ -3255,10 +3272,10 @@ module_eval(<<'.,.,', 'parser.y', 1170)
   end
 .,.,
 
-# reduce 209 omitted
+# reduce 210 omitted
 
 module_eval(<<'.,.,', 'parser.y', 1177)
-  def _reduce_210(val, _values, result)
+  def _reduce_211(val, _values, result)
             result = val[2]
         result[1].unshift(val[0])
 
@@ -3267,7 +3284,7 @@ module_eval(<<'.,.,', 'parser.y', 1177)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1181)
-  def _reduce_211(val, _values, result)
+  def _reduce_212(val, _values, result)
             result = empty_params_result
         result[1].unshift(val[0])
 
@@ -3275,10 +3292,10 @@ module_eval(<<'.,.,', 'parser.y', 1181)
   end
 .,.,
 
-# reduce 212 omitted
+# reduce 213 omitted
 
 module_eval(<<'.,.,', 'parser.y', 1188)
-  def _reduce_213(val, _values, result)
+  def _reduce_214(val, _values, result)
             result = val[2]
         result[2] = val[0]
 
@@ -3287,7 +3304,7 @@ module_eval(<<'.,.,', 'parser.y', 1188)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1192)
-  def _reduce_214(val, _values, result)
+  def _reduce_215(val, _values, result)
             result = empty_params_result
         result[2] = val[0]
 
@@ -3295,10 +3312,10 @@ module_eval(<<'.,.,', 'parser.y', 1192)
   end
 .,.,
 
-# reduce 215 omitted
+# reduce 216 omitted
 
 module_eval(<<'.,.,', 'parser.y', 1199)
-  def _reduce_216(val, _values, result)
+  def _reduce_217(val, _values, result)
             result = val[2]
         result[3].unshift(val[0])
 
@@ -3307,7 +3324,7 @@ module_eval(<<'.,.,', 'parser.y', 1199)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1203)
-  def _reduce_217(val, _values, result)
+  def _reduce_218(val, _values, result)
             result = empty_params_result
         result[3].unshift(val[0])
 
@@ -3315,10 +3332,10 @@ module_eval(<<'.,.,', 'parser.y', 1203)
   end
 .,.,
 
-# reduce 218 omitted
+# reduce 219 omitted
 
 module_eval(<<'.,.,', 'parser.y', 1210)
-  def _reduce_219(val, _values, result)
+  def _reduce_220(val, _values, result)
             result = empty_params_result
 
     result
@@ -3326,7 +3343,7 @@ module_eval(<<'.,.,', 'parser.y', 1210)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1213)
-  def _reduce_220(val, _values, result)
+  def _reduce_221(val, _values, result)
             result = val[2]
         result[4].merge!(val[0])
 
@@ -3335,7 +3352,7 @@ module_eval(<<'.,.,', 'parser.y', 1213)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1217)
-  def _reduce_221(val, _values, result)
+  def _reduce_222(val, _values, result)
             result = empty_params_result
         result[4].merge!(val[0])
 
@@ -3344,7 +3361,7 @@ module_eval(<<'.,.,', 'parser.y', 1217)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1221)
-  def _reduce_222(val, _values, result)
+  def _reduce_223(val, _values, result)
             result = val[2]
         result[5].merge!(val[0])
 
@@ -3353,7 +3370,7 @@ module_eval(<<'.,.,', 'parser.y', 1221)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1225)
-  def _reduce_223(val, _values, result)
+  def _reduce_224(val, _values, result)
             result = empty_params_result
         result[5].merge!(val[0])
 
@@ -3362,7 +3379,7 @@ module_eval(<<'.,.,', 'parser.y', 1225)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1229)
-  def _reduce_224(val, _values, result)
+  def _reduce_225(val, _values, result)
             result = empty_params_result
         result[6] = val[0]
 
@@ -3371,7 +3388,7 @@ module_eval(<<'.,.,', 'parser.y', 1229)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1235)
-  def _reduce_225(val, _values, result)
+  def _reduce_226(val, _values, result)
             loc = val[0].location
         if var_name = val[1]
           loc = loc + var_name.location
@@ -3389,7 +3406,7 @@ module_eval(<<'.,.,', 'parser.y', 1235)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1250)
-  def _reduce_226(val, _values, result)
+  def _reduce_227(val, _values, result)
             loc = val[0].location + val[1].location
         if var_name = val[2]
           loc = loc + var_name.location
@@ -3407,7 +3424,7 @@ module_eval(<<'.,.,', 'parser.y', 1250)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1265)
-  def _reduce_227(val, _values, result)
+  def _reduce_228(val, _values, result)
             loc = val[0].location + val[1].location
         if var_name = val[2]
           loc = loc + var_name.location
@@ -3425,7 +3442,7 @@ module_eval(<<'.,.,', 'parser.y', 1265)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1280)
-  def _reduce_228(val, _values, result)
+  def _reduce_229(val, _values, result)
             loc = val[0].location + val[1].location
         if var_name = val[2]
           loc = loc + var_name.location
@@ -3445,7 +3462,7 @@ module_eval(<<'.,.,', 'parser.y', 1280)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1297)
-  def _reduce_229(val, _values, result)
+  def _reduce_230(val, _values, result)
             loc = val[0].location + val[2].location
         if var_name = val[3]
           loc = loc + var_name.location
@@ -3465,7 +3482,7 @@ module_eval(<<'.,.,', 'parser.y', 1297)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1314)
-  def _reduce_230(val, _values, result)
+  def _reduce_231(val, _values, result)
             loc = val[0].location + val[1].location
         if var_name = val[2]
           loc = loc + var_name.location
@@ -3483,16 +3500,20 @@ module_eval(<<'.,.,', 'parser.y', 1314)
   end
 .,.,
 
-# reduce 231 omitted
-
 # reduce 232 omitted
 
 # reduce 233 omitted
 
 # reduce 234 omitted
 
+# reduce 235 omitted
+
+# reduce 236 omitted
+
+# reduce 237 omitted
+
 module_eval(<<'.,.,', 'parser.y', 1333)
-  def _reduce_235(val, _values, result)
+  def _reduce_238(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
         type_name = TypeName.new(namespace: namespace, name: name)
@@ -3503,14 +3524,14 @@ module_eval(<<'.,.,', 'parser.y', 1333)
   end
 .,.,
 
-# reduce 236 omitted
+# reduce 239 omitted
 
-# reduce 237 omitted
+# reduce 240 omitted
 
-# reduce 238 omitted
+# reduce 241 omitted
 
 module_eval(<<'.,.,', 'parser.y', 1345)
-  def _reduce_239(val, _values, result)
+  def _reduce_242(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
         type_name = TypeName.new(namespace: namespace, name: name)
@@ -3522,7 +3543,7 @@ module_eval(<<'.,.,', 'parser.y', 1345)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1354)
-  def _reduce_240(val, _values, result)
+  def _reduce_243(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
         type_name = TypeName.new(namespace: namespace, name: name)
@@ -3534,7 +3555,7 @@ module_eval(<<'.,.,', 'parser.y', 1354)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1363)
-  def _reduce_241(val, _values, result)
+  def _reduce_244(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
         type_name = TypeName.new(namespace: namespace, name: name)
@@ -3546,7 +3567,7 @@ module_eval(<<'.,.,', 'parser.y', 1363)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1373)
-  def _reduce_242(val, _values, result)
+  def _reduce_245(val, _values, result)
             result = nil
 
     result
@@ -3554,7 +3575,7 @@ module_eval(<<'.,.,', 'parser.y', 1373)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1376)
-  def _reduce_243(val, _values, result)
+  def _reduce_246(val, _values, result)
             result = LocatedValue.new(value: Namespace.root, location: val[0].location)
 
     result
@@ -3562,7 +3583,7 @@ module_eval(<<'.,.,', 'parser.y', 1376)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1379)
-  def _reduce_244(val, _values, result)
+  def _reduce_247(val, _values, result)
             namespace = Namespace.parse(val[1].value).absolute!
         result = LocatedValue.new(value: namespace, location: val[0].location + val[1].location)
 
@@ -3571,7 +3592,7 @@ module_eval(<<'.,.,', 'parser.y', 1379)
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 1383)
-  def _reduce_245(val, _values, result)
+  def _reduce_248(val, _values, result)
             namespace = Namespace.parse(val[0].value)
         result = LocatedValue.new(value: namespace, location: val[0].location)
 
@@ -3579,9 +3600,9 @@ module_eval(<<'.,.,', 'parser.y', 1383)
   end
 .,.,
 
-# reduce 246 omitted
+# reduce 249 omitted
 
-# reduce 247 omitted
+# reduce 250 omitted
 
 def _reduce_none(val, _values, result)
   val[0]