RubyGems - rbs - Versions diffs - 0.19.0 → 0.20.0 - Mend

rbs 0.19.0 → 0.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +8 -0
data/core/hash.rbs +1 -3
data/core/time.rbs +0 -12
data/lib/rbs/ast/members.rb +9 -3
data/lib/rbs/definition_builder.rb +80 -61
data/lib/rbs/environment.rb +3 -0
data/lib/rbs/method_type.rb +1 -31
data/lib/rbs/parser.rb +966 -906
data/lib/rbs/parser.y +95 -55
data/lib/rbs/prototype/rb.rb +13 -2
data/lib/rbs/prototype/rbi.rb +5 -5
data/lib/rbs/prototype/runtime.rb +1 -1
data/lib/rbs/test/hook.rb +5 -2
data/lib/rbs/types.rb +63 -6
data/lib/rbs/version.rb +1 -1
data/lib/rbs/writer.rb +9 -1
data/schema/members.json +5 -1
data/sig/definition_builder.rbs +3 -0
data/sig/members.rbs +4 -1
data/sig/method_types.rbs +3 -16
data/sig/types.rbs +17 -1
data/stdlib/dbm/0/dbm.rbs +0 -2
data/stdlib/tsort/0/tsort.rbs +8 -0
data/steep/Gemfile.lock +7 -7
metadata +3 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8305afa064e98cd22b78a49fb402692abed204c735a7ce05d90f6a48d7bd6b96
-  data.tar.gz: 7840d67b2bbd54eb041342e093892b6d1046b21b6655b80eba109df6b773451d
+  metadata.gz: 5c422fed696c791b7cd4cbaa9c78cbdf28634d6152a1bd4496f801c539d74ac6
+  data.tar.gz: 46012d3a5b09cb2a529620813c71d6a730b26078d409565320a60297e4153bb4
 SHA512:
-  metadata.gz: 4919d1fd1323fa5cb2c40f89f5338d2168d3ae4fcabed2e2c428b3e5b4bacda2e395e9dfb2fc52a6517e75137358118b4142b330f607f77c162f259485ac0b13
-  data.tar.gz: dc36b905d8c746eb5e976f6f3fc4a06ba8ed2b037d15d73e8bfa4360497c9c814f44dd604981f7c3622002ef0bb603b1b9374e2f49ab0af67bc35ecbe2d7b26e
+  metadata.gz: 59f566eba0bb6398ee0cd4432403750ee8d3ce7e5916c61089c5c5032fff723259be3880aac88aec22d4ecaffff96c1190b18483a60feac517b3b6845bc8dae9
+  data.tar.gz: a12d3d389eead680ff98886eff428a6b2fe4e1c3cab408866be1aa34e6a5cd3737391f370655a9798c04e73062bb0170c5be2525c66c4bf3b8aa69d21dc17750

data/CHANGELOG.md CHANGED

@@ -2,6 +2,14 @@
 ## master
+## 0.20.0 (2020-12-06)
+* Signature updates for `TSort`, `DBM`, `Time`, and `Hash` ([#496](https://github.com/ruby/rbs/pull/496), [#497](https://github.com/ruby/rbs/pull/497), [#499](https://github.com/ruby/rbs/pull/499), [#507](https://github.com/ruby/rbs/pull/507))
+* Add _singleton attribute_ syntax ([#502](https://github.com/ruby/rbs/pull/502), [#506](https://github.com/ruby/rbs/pull/506), [#505](https://github.com/ruby/rbs/pull/505))
+* Proc types with blocks ([#503](https://github.com/ruby/rbs/pull/503))
+* Add support for escape sequences in string literal types ([#501](https://github.com/ruby/rbs/pull/501))
+* Fix runtime type checking of blocks with keyword args ([#500](https://github.com/ruby/rbs/pull/500))
 ## 0.19.0 (2020-12-02)
 * Signature updates for `Monitor` and File ([#485](https://github.com/ruby/rbs/pull/485), [#495](https://github.com/ruby/rbs/pull/495))

data/core/hash.rbs CHANGED

@@ -563,8 +563,6 @@ class Hash[unchecked out K, unchecked out V] < Object
   #
   alias include? has_key?
-  def index: (V) -> K?
   # Return the contents of this hash as a string.
   #
   #     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
@@ -615,7 +613,7 @@ class Hash[unchecked out K, unchecked out V] < Object
   #     h.key(300)   #=> "c"
   #     h.key(999)   #=> nil
   #
-  alias key index
+  def key: (V) -> K?
   # Returns `true` if the given key is present in *hsh*.
   #

data/core/time.rbs CHANGED

@@ -757,18 +757,6 @@ class Time < Object
   #
   def subsec: () -> Numeric
-  # Returns a new Time object, one second later than *time*. Time#succ is obsolete
-  # since 1.9.2 for time is not a discrete value.
-  #
-  #     t = Time.now       #=> 2007-11-19 08:23:57 -0600
-  #     t.succ             #=> 2007-11-19 08:23:58 -0600
-  #
-  # Use instead `time + 1`
-  #
-  #     t + 1              #=> 2007-11-19 08:23:58 -0600
-  #
-  def succ: () -> Time
   # Returns `true` if *time* represents Sunday.
   #
   #     t = Time.local(1990, 4, 1)       #=> 1990-04-01 00:00:00 -0600

data/lib/rbs/ast/members.rb CHANGED

@@ -216,31 +216,34 @@ module RBS
       module Attribute
         attr_reader :name
         attr_reader :type
+        attr_reader :kind
         attr_reader :ivar_name
         attr_reader :annotations
         attr_reader :location
         attr_reader :comment
-        def initialize(name:, type:, ivar_name:, annotations:, location:, comment:)
+        def initialize(name:, type:, ivar_name:, kind:, annotations:, location:, comment:)
           @name = name
           @type = type
           @ivar_name = ivar_name
           @annotations = annotations
           @location = location
           @comment = comment
+          @kind = kind
         end
         def ==(other)
           other.is_a?(self.class) &&
             other.name == name &&
             other.type == type &&
-            other.ivar_name == ivar_name
+            other.ivar_name == ivar_name &&
+            other.kind == kind
         end
         alias eql? ==
         def hash
-          self.class.hash ^ name.hash ^ type.hash ^ ivar_name.hash
+          self.class.hash ^ name.hash ^ type.hash ^ ivar_name.hash ^ kind.hash
         end
       end
@@ -253,6 +256,7 @@ module RBS
             name: name,
             type: type,
             ivar_name: ivar_name,
+            kind: kind,
             annotations: annotations,
             location: location,
             comment: comment
@@ -269,6 +273,7 @@ module RBS
             name: name,
             type: type,
             ivar_name: ivar_name,
+            kind: kind,
             annotations: annotations,
             location: location,
             comment: comment
@@ -285,6 +290,7 @@ module RBS
             name: name,
             type: type,
             ivar_name: ivar_name,
+            kind: kind,
             annotations: annotations,
             location: location,
             comment: comment

data/lib/rbs/definition_builder.rb CHANGED

@@ -558,7 +558,7 @@ module RBS
             )
           end
-          unless array.all? {|pair| pair[1] == :public}
+          unless array.all? {|pair| pair[1] == :public }
             raise InconsistentMethodVisibilityError.new(
               type_name: type_name,
               method_name: method_name,
@@ -658,65 +658,12 @@ module RBS
             each_member_with_accessibility(d.decl.members) do |member, accessibility|
               case member
               when AST::Members::AttrReader, AST::Members::AttrAccessor, AST::Members::AttrWriter
-                name = member.name
-                type = member.type
-                ivar_name = case member.ivar_name
-                            when false
-                              nil
-                            else
-                              member.ivar_name || :"@#{member.name}"
-                            end
-                if member.is_a?(AST::Members::AttrReader) || member.is_a?(AST::Members::AttrAccessor)
-                  definition.methods[name] = Definition::Method.new(
-                    super_method: nil,
-                    defs: [
-                      Definition::Method::TypeDef.new(
-                        type: MethodType.new(
-                          type_params: [],
-                          type: Types::Function.empty(type),
-                          block: nil,
-                          location: nil
-                        ),
-                        member: member,
-                        defined_in: type_name,
-                        implemented_in: type_name
-                      )
-                    ],
-                    accessibility: accessibility,
-                    alias_of: nil
-                  )
-                end
-                if member.is_a?(AST::Members::AttrWriter) || member.is_a?(AST::Members::AttrAccessor)
-                  definition.methods[:"#{name}="] = Definition::Method.new(
-                    super_method: nil,
-                    defs: [
-                      Definition::Method::TypeDef.new(
-                        type: MethodType.new(
-                          type_params: [],
-                          type: Types::Function.empty(type).update(
-                            required_positionals: [Types::Function::Param.new(name: name, type: type)]
-                          ),
-                          block: nil,
-                          location: nil
-                        ),
-                        member: member,
-                        defined_in: type_name,
-                        implemented_in: type_name
-                      ),
-                    ],
-                    accessibility: accessibility,
-                    alias_of: nil
-                  )
-                end
-                if ivar_name
-                  definition.instance_variables[ivar_name] = Definition::Variable.new(
-                    parent_variable: nil,
-                    type: type,
-                    declared_in: type_name
+                if member.kind == :instance
+                  build_attribute(
+                    type_name: type_name,
+                    definition: definition,
+                    member: member,
+                    accessibility: accessibility
                   )
                 end
@@ -982,8 +929,16 @@ module RBS
           end
           entry.decls.each do |d|
-            each_member_with_accessibility(d.decl.members) do |member, _|
+            each_member_with_accessibility(d.decl.members) do |member, accessibility|
               case member
+              when AST::Members::AttrReader, AST::Members::AttrAccessor, AST::Members::AttrWriter
+                if member.kind == :singleton
+                  build_attribute(type_name: type_name,
+                                  definition: definition,
+                                  member: member,
+                                  accessibility: accessibility)
+                end
               when AST::Members::ClassInstanceVariable
                 definition.instance_variables[member.name] = Definition::Variable.new(
                   parent_variable: nil,
@@ -1004,6 +959,70 @@ module RBS
       end
     end
+    def build_attribute(type_name:, definition:, member:, accessibility:)
+      name = member.name
+      type = member.type
+      ivar_name = case member.ivar_name
+                  when false
+                    nil
+                  else
+                    member.ivar_name || :"@#{member.name}"
+                  end
+      if member.is_a?(AST::Members::AttrReader) || member.is_a?(AST::Members::AttrAccessor)
+        definition.methods[name] = Definition::Method.new(
+          super_method: nil,
+          defs: [
+            Definition::Method::TypeDef.new(
+              type: MethodType.new(
+                type_params: [],
+                type: Types::Function.empty(type),
+                block: nil,
+                location: nil
+              ),
+              member: member,
+              defined_in: type_name,
+              implemented_in: type_name
+            )
+          ],
+          accessibility: accessibility,
+          alias_of: nil
+        )
+      end
+      if member.is_a?(AST::Members::AttrWriter) || member.is_a?(AST::Members::AttrAccessor)
+        definition.methods[:"#{name}="] = Definition::Method.new(
+          super_method: nil,
+          defs: [
+            Definition::Method::TypeDef.new(
+              type: MethodType.new(
+                type_params: [],
+                type: Types::Function.empty(type).update(
+                  required_positionals: [Types::Function::Param.new(name: name, type: type)]
+                ),
+                block: nil,
+                location: nil
+              ),
+              member: member,
+              defined_in: type_name,
+              implemented_in: type_name
+            ),
+          ],
+          accessibility: accessibility,
+          alias_of: nil
+        )
+      end
+      if ivar_name
+        definition.instance_variables[ivar_name] = Definition::Variable.new(
+          parent_variable: nil,
+          type: type,
+          declared_in: type_name
+        )
+      end
+    end
     def merge_definitions(type_name, pairs, entry:, self_type:, ancestors:)
       Definition.new(type_name: type_name, entry: entry, self_type: self_type, ancestors: ancestors).tap do |definition|
         pairs.reverse_each do |ancestor, current_definition|

data/lib/rbs/environment.rb CHANGED

@@ -349,6 +349,7 @@ module RBS
         AST::Members::AttrAccessor.new(
           name: member.name,
           type: absolute_type(resolver, member.type, context: context),
+          kind: member.kind,
           annotations: member.annotations,
           comment: member.comment,
           location: member.location,
@@ -358,6 +359,7 @@ module RBS
         AST::Members::AttrReader.new(
           name: member.name,
           type: absolute_type(resolver, member.type, context: context),
+          kind: member.kind,
           annotations: member.annotations,
           comment: member.comment,
           location: member.location,
@@ -367,6 +369,7 @@ module RBS
         AST::Members::AttrWriter.new(
           name: member.name,
           type: absolute_type(resolver, member.type, context: context),
+          kind: member.kind,
           annotations: member.annotations,
           comment: member.comment,
           location: member.location,

data/lib/rbs/method_type.rb CHANGED

@@ -1,35 +1,5 @@
 module RBS
   class MethodType
-    class Block
-      attr_reader :type
-      attr_reader :required
-      def initialize(type:, required:)
-        @type = type
-        @required = required
-      end
-      def ==(other)
-        other.is_a?(Block) &&
-          other.type == type &&
-          other.required == required
-      end
-      def to_json(*a)
-        {
-          type: type,
-          required: required
-        }.to_json(*a)
-      end
-      def sub(s)
-        self.class.new(
-          type: type.sub(s),
-          required: required
-        )
-      end
-    end
     attr_reader :type_params
     attr_reader :type
     attr_reader :block
@@ -86,7 +56,7 @@ module RBS
         type_params: type_params,
         type: type.map_type(&block),
         block: self.block&.yield_self do |b|
-          Block.new(type: b.type.map_type(&block), required: b.required)
+          Types::Block.new(type: b.type.map_type(&block), required: b.required)
         end,
         location: location
       )

data/lib/rbs/parser.rb CHANGED

@@ -8,7 +8,7 @@ require 'racc/parser.rb'
 module RBS
   class Parser < Racc::Parser
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 1044)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 1066)
 Types = RBS::Types
 Namespace = RBS::Namespace
@@ -262,6 +262,10 @@ ANNOTATION_RE = Regexp.union(/%a\{.*?\}/,
                              /%a\(.*?\)/,
                              /%a\<.*?\>/,
                              /%a\|.*?\|/)
+escape_sequences = %w[a b e f n r s t v "].map { |l| "\\\\#{l}" }
+DBL_QUOTE_STR_ESCAPE_SEQUENCES_RE = /(#{escape_sequences.join("|")})/
 def next_token
   if @type
     type = @type
@@ -341,7 +345,21 @@ def next_token
   when input.scan(/[a-z_]\w*\b/)
     new_token(:tLIDENT)
   when input.scan(/"(\\"|[^"])*"/)
-    s = input.matched.yield_self {|s| s[1, s.length - 2] }.gsub(/\\"/, '"')
+    s = input.matched.yield_self {|s| s[1, s.length - 2] }
+                     .gsub(DBL_QUOTE_STR_ESCAPE_SEQUENCES_RE) do |match|
+                       case match
+                       when '\\a' then "\a"
+                       when '\\b' then "\b"
+                       when '\\e' then "\e"
+                       when '\\f' then "\f"
+                       when '\\n' then "\n"
+                       when '\\r' then "\r"
+                       when '\\s' then "\s"
+                       when '\\t' then "\t"
+                       when '\\v' then "\v"
+                       when '\\"' then '"'
+                       end
+                     end
     new_token(:tSTRING, s)
   when input.scan(/'(\\'|[^'])*'/)
     s = input.matched.yield_self {|s| s[1, s.length - 2] }.gsub(/\\'/, "'")
@@ -383,118 +401,118 @@ end
 ##### State transition tables begin ###
 clist = [
-'341,342,33,343,5,58,59,60,61,37,354,380,33,33,33,340,42,50,352,379,40',
-'41,209,210,211,212,213,214,215,216,220,33,217,208,218,219,104,115,105',
-'106,107,121,76,32,196,336,330,331,33,51,334,332,335,32,32,32,33,333',
-'120,108,109,110,112,114,113,329,338,339,111,116,118,43,32,197,48,122',
-'123,119,124,341,342,33,343,66,58,59,60,61,39,32,301,33,33,33,340,231',
-'50,32,40,41,83,209,210,211,212,213,214,215,216,220,33,217,208,218,219',
-'104,115,105,106,107,121,33,32,144,336,330,331,39,51,334,332,335,32,32',
-'32,50,333,120,108,109,110,112,114,113,329,338,339,111,116,118,89,32',
-'87,320,122,123,119,124,341,342,145,343,32,58,59,60,61,51,158,2,3,4,316',
-'340,157,164,199,88,40,41,209,210,211,212,213,214,215,216,220,276,217',
-'208,218,219,104,115,105,106,107,121,88,200,146,336,330,331,324,147,334',
-'332,335,40,41,361,277,333,120,108,109,110,112,114,113,329,338,339,111',
-'116,118,341,342,88,343,122,123,119,124,-4,88,-239,148,33,76,80,340,-239',
-'395,396,397,156,76,209,210,211,212,213,214,215,216,355,159,217,208,218',
-'219,104,115,105,106,107,121,88,88,88,336,330,331,40,41,334,332,335,32',
-'40,41,161,333,120,108,109,110,112,114,113,329,338,339,111,116,118,341',
-'342,163,343,122,123,119,124,41,58,59,60,61,39,166,340,55,54,56,40,41',
-'158,209,210,211,212,213,214,215,216,220,-107,217,208,218,219,104,115',
-'105,106,107,121,40,41,-108,336,330,331,40,41,334,332,335,63,64,-109',
-'65,333,120,108,109,110,112,114,113,329,338,339,111,116,118,341,342,-110',
-'343,122,123,119,124,-111,58,59,60,61,40,41,340,55,54,56,40,41,-112,209',
-'210,211,212,213,214,215,216,220,-113,217,208,218,219,104,115,105,106',
-'107,121,40,41,-114,336,330,331,272,273,334,332,335,279,280,365,366,333',
-'120,108,109,110,112,114,113,329,338,339,111,116,118,40,41,40,41,122',
-'123,119,124,341,342,-115,343,-116,58,59,60,61,40,41,40,41,40,41,340',
-'387,388,40,41,40,41,209,210,211,212,213,214,215,216,220,-117,217,208',
-'218,219,104,115,105,106,107,121,40,41,48,336,330,331,40,41,334,332,335',
-'-132,171,172,173,333,120,108,109,110,112,114,113,329,338,339,111,116',
-'118,341,342,174,343,122,123,119,124,175,176,177,42,201,234,235,340,237',
-'238,239,241,83,245,209,210,211,212,213,214,215,216,220,245,217,208,218',
-'219,104,115,105,106,107,121,245,251,254,336,330,331,42,257,334,332,335',
-'259,263,265,267,333,120,108,109,110,112,114,113,329,338,339,111,116',
-'118,268,42,270,307,122,123,119,124,33,309,263,58,59,60,61,311,267,321',
-'22,23,21,322,26,-217,25,323,30,359,93,94,95,96,97,98,99,100,117,16,101',
-'92,102,103,104,115,105,106,107,121,364,32,364,364,371,28,372,139,373',
-'140,142,374,375,377,378,381,120,108,109,110,112,114,113,382,392,401',
-'111,116,118,402,403,406,407,122,123,119,124,33,408,409,58,59,60,61,406',
-',,22,23,21,,26,,25,,30,,93,94,95,96,97,98,99,100,117,16,101,92,102,103',
-'104,115,105,106,107,121,,32,,,,28,,,,,,,,,,,120,108,109,110,112,114',
-'113,,,,111,116,118,,,,,122,123,119,124,33,,,58,59,60,61,,,,22,23,21',
-',26,-217,25,,30,,93,94,95,96,97,98,99,100,117,16,101,92,102,103,104',
-'115,105,106,107,121,,32,,,,28,,139,,140,142,,,,,,120,108,109,110,112',
-'114,113,,,,111,116,118,,,,,122,123,119,124,33,,,58,59,60,61,,,,22,23',
-'21,,26,-217,25,,30,,93,94,95,96,97,98,99,100,117,16,101,92,102,103,104',
-'115,105,106,107,121,,32,,,,28,,139,,140,142,,,,,,120,108,109,110,112',
-'114,113,,,,111,116,118,,,,,122,123,119,124,33,,,58,59,60,61,,,,22,23',
-'21,,26,-217,25,,30,,93,94,95,96,97,98,99,100,117,16,101,92,102,103,104',
-'115,105,106,107,121,,32,,,,28,,139,,140,142,,,,,,120,108,109,110,112',
-'114,113,,,,111,116,118,,,,,122,123,119,124,33,,,58,59,60,61,,,,22,23',
-'21,,26,-217,25,,30,,93,94,95,96,97,98,99,100,117,16,101,92,102,103,104',
-'115,105,106,107,121,,32,,,,28,,207,,,142,,,,,,120,108,109,110,112,114',
-'113,,,,111,116,118,,,,,122,123,119,124,33,,,58,59,60,61,,,,22,23,21',
-',26,-217,25,,30,,93,94,95,96,97,98,99,100,117,16,101,92,102,103,104',
-'115,105,106,107,121,168,32,169,,,28,,207,,,142,,,,,,120,108,109,110',
-'112,114,113,168,,169,111,116,118,58,59,60,61,122,123,119,124,,,,,,,',
-'40,41,209,210,211,212,213,214,215,216,220,,217,208,218,219,104,115,105',
-'106,107,121,170,40,41,,,,,207,,,142,,,,,,120,108,109,110,112,114,113',
-'170,,,111,116,118,58,59,60,61,122,123,119,124,,,,,,,,,,209,210,211,212',
-'213,214,215,216,220,,217,208,218,219,104,115,105,106,107,121,168,,169',
-',,,,207,,,142,,,,,,120,108,109,110,112,114,113,168,,169,111,116,118',
-'58,59,60,61,122,123,119,124,,,,,,,,40,41,209,210,211,212,213,214,215',
-'216,220,,217,208,218,219,104,115,105,106,107,121,170,40,41,168,152,169',
-'168,155,169,153,,,,,,,120,108,109,110,112,114,113,170,,,111,116,118',
-'154,,,,122,123,119,124,,,,151,,,,,,,40,41,,40,41,-239,,33,,80,,-239',
-',,296,297,76,-239,,33,,80,170,-239,,170,296,297,76,,,,-239,,33,298,80',
-',-239,,,296,297,76,293,292,,298,32,,,,,,,,293,292,,-239,32,33,298,80',
-'284,-239,,,296,297,76,293,292,,,32,308,,,,,,,,,,,,,298,,312,,,,,,,293',
-'292,,33,32,,,,,,,,,22,23,21,,26,,25,360,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,,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,152,,,155,,153,,32,320,,,28,,,,,,,,,,,,,,154,,316,317,313,314',
-'315,,,,318,151' ]
-        racc_action_table = arr = ::Array.new(2779, nil)
+'351,352,33,353,163,78,5,33,33,338,162,395,49,33,33,350,37,336,239,394',
+'40,41,213,214,215,216,217,218,219,220,355,33,221,212,222,223,107,118',
+'108,109,110,124,33,32,53,346,340,341,32,32,344,342,345,303,32,32,33',
+'343,123,111,112,113,115,117,116,339,348,349,114,119,121,91,32,89,42',
+'125,126,122,127,351,352,33,353,32,60,61,62,63,43,49,48,33,33,33,350',
+'188,188,32,90,40,41,213,214,215,216,217,218,219,220,224,33,221,212,222',
+'223,107,118,108,109,110,124,53,32,145,346,340,341,53,53,344,342,345',
+'32,32,32,168,343,123,111,112,113,115,117,116,339,348,349,114,119,121',
+'203,32,146,278,125,126,122,127,351,352,90,353,68,60,61,62,63,65,66,39',
+'67,40,41,350,85,204,326,361,279,149,213,214,215,216,217,218,219,220',
+'224,398,221,212,222,223,107,118,108,109,110,124,39,90,90,346,340,341',
+'399,400,344,342,345,322,40,41,90,343,123,111,112,113,115,117,116,339',
+'348,349,114,119,121,150,318,90,90,125,126,122,127,351,352,151,353,152',
+'60,61,62,63,60,61,62,63,40,41,350,57,56,58,2,3,4,213,214,215,216,217',
+'218,219,220,224,153,221,212,222,223,107,118,108,109,110,124,40,41,78',
+'346,340,341,40,41,344,342,345,40,41,40,41,343,123,111,112,113,115,117',
+'116,339,348,349,114,119,121,351,352,161,353,125,126,122,127,-4,164,-242',
+'167,33,41,82,350,-242,40,41,40,41,78,213,214,215,216,217,218,219,220',
+'224,170,221,212,222,223,107,118,108,109,110,124,40,41,163,346,340,341',
+'274,275,344,342,345,32,281,282,171,343,123,111,112,113,115,117,116,339',
+'348,349,114,119,121,351,352,-108,353,125,126,122,127,-109,60,61,62,63',
+'39,-110,350,57,56,58,373,374,-111,213,214,215,216,217,218,219,220,224',
+'-112,221,212,222,223,107,118,108,109,110,124,40,41,-113,346,340,341',
+'40,41,344,342,345,389,390,40,41,343,123,111,112,113,115,117,116,339',
+'348,349,114,119,121,40,41,40,41,125,126,122,127,351,352,-114,353,-115',
+'60,61,62,63,40,41,40,41,40,41,350,40,41,-116,-117,-118,48,213,214,215',
+'216,217,218,219,220,224,-133,221,212,222,223,107,118,108,109,110,124',
+'176,177,178,346,340,341,179,180,344,342,345,181,189,190,42,343,123,111',
+'112,113,115,117,116,339,348,349,114,119,121,351,352,205,353,125,126',
+'122,127,232,242,243,245,247,248,42,350,85,251,251,251,257,42,213,214',
+'215,216,217,218,219,220,224,205,221,212,222,223,107,118,108,109,110',
+'124,260,262,266,346,340,341,268,270,344,342,345,271,309,311,266,343',
+'123,111,112,113,115,117,116,339,348,349,114,119,121,313,270,323,324',
+'125,126,122,127,33,325,329,60,61,62,63,329,329,359,22,23,21,362,26,-220',
+'25,369,30,370,96,97,98,99,100,101,102,103,120,16,104,95,105,106,107',
+'118,108,109,110,124,371,32,372,375,377,28,380,141,380,142,144,380,393',
+'396,397,404,123,111,112,113,115,117,116,405,406,408,114,119,121,413',
+'414,415,416,125,126,122,127,33,413,,60,61,62,63,,,,22,23,21,,26,,25',
+',30,,96,97,98,99,100,101,102,103,120,16,104,95,105,106,107,118,108,109',
+'110,124,,32,,,,28,,,,,,,,,,,123,111,112,113,115,117,116,,,,114,119,121',
+',,,,125,126,122,127,33,,,60,61,62,63,,,,22,23,21,,26,-220,25,,30,,96',
+'97,98,99,100,101,102,103,120,16,104,95,105,106,107,118,108,109,110,124',
+',32,,,,28,,141,,142,144,,,,,,123,111,112,113,115,117,116,,,,114,119',
+'121,,,,,125,126,122,127,33,,,60,61,62,63,,,,22,23,21,,26,-220,25,,30',
+',96,97,98,99,100,101,102,103,120,16,104,95,105,106,107,118,108,109,110',
+'124,,32,,,,28,,141,,142,144,,,,,,123,111,112,113,115,117,116,,,,114',
+'119,121,,,,,125,126,122,127,33,,,60,61,62,63,,,,22,23,21,,26,-220,25',
+',30,,96,97,98,99,100,101,102,103,120,16,104,95,105,106,107,118,108,109',
+'110,124,,32,,,,28,,211,,,144,,,,,,123,111,112,113,115,117,116,,,,114',
+'119,121,,,,,125,126,122,127,33,,,60,61,62,63,,,,22,23,21,,26,-220,25',
+',30,,96,97,98,99,100,101,102,103,120,16,104,95,105,106,107,118,108,109',
+'110,124,,32,,,,28,,141,,142,144,,,,,,123,111,112,113,115,117,116,,,',
+'114,119,121,,,,,125,126,122,127,33,,,60,61,62,63,,,,22,23,21,,26,-220',
+'25,,30,,96,97,98,99,100,101,102,103,120,16,104,95,105,106,107,118,108',
+'109,110,124,173,32,174,,,28,,211,,,144,,,,,,123,111,112,113,115,117',
+'116,173,,174,114,119,121,60,61,62,63,125,126,122,127,,,,,,,,40,41,213',
+'214,215,216,217,218,219,220,224,,221,212,222,223,107,118,108,109,110',
+'124,175,40,41,,,,,211,,,144,,,,,,123,111,112,113,115,117,116,175,,,114',
+'119,121,60,61,62,63,125,126,122,127,,,,,,,,,,213,214,215,216,217,218',
+'219,220,224,,221,212,222,223,107,118,108,109,110,124,173,,174,,,,,211',
+',,144,,,,,,123,111,112,113,115,117,116,173,,174,114,119,121,60,61,62',
+'63,125,126,122,127,,,,,,,,40,41,213,214,215,216,217,218,219,220,224',
+',221,212,222,223,107,118,108,109,110,124,175,40,41,173,157,174,173,160',
+'174,158,,,,,,,123,111,112,113,115,117,116,175,,,114,119,121,159,,,,125',
+'126,122,127,,,,156,,,,,,,40,41,,40,41,-242,,33,,82,,-242,,,298,299,78',
+'-242,,33,,82,175,-242,,175,298,299,78,,,,-242,,33,300,82,,-242,,,298',
+'299,78,295,294,,300,32,,,,,,,,295,294,,-242,32,33,300,82,286,-242,,',
+'298,299,78,295,294,,,32,310,,,,,,,,,,,,,300,,314,,,,,,,295,294,,33,32',
+',,,,,,,,22,23,21,,26,,25,360,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,,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,157,,,160',
+',158,,32,322,,,28,,,,,,,,,,,,,,159,,318,319,315,316,317,,,,320,156' ]
+        racc_action_table = arr = ::Array.new(2787, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -504,129 +522,130 @@ clist = [
         end
 clist = [
-'313,313,48,313,1,313,313,313,313,5,319,364,155,187,188,313,7,28,319',
-'364,44,44,313,313,313,313,313,313,313,313,313,190,313,313,313,313,313',
-'313,313,313,313,313,269,48,160,313,313,313,231,28,313,313,313,155,187',
-'188,259,313,313,313,313,313,313,313,313,313,313,313,313,313,313,24,190',
-'160,27,313,313,313,313,314,314,265,314,32,314,314,314,314,35,231,269',
-'189,267,316,314,189,196,259,6,6,36,314,314,314,314,314,314,314,314,314',
-'317,314,314,314,314,314,314,314,314,314,314,318,265,52,314,314,314,6',
-'196,314,314,314,189,267,316,237,314,314,314,314,314,314,314,314,314',
-'314,314,314,314,314,47,317,46,306,314,314,314,314,315,315,53,315,318',
-'315,315,315,315,237,79,0,0,0,306,315,79,86,162,46,47,47,315,315,315',
-'315,315,315,315,315,315,260,315,315,315,315,315,315,315,315,315,315',
-'86,162,54,315,315,315,300,55,315,315,315,149,149,326,260,315,315,315',
-'315,315,315,315,315,315,315,315,315,315,315,320,320,300,320,315,315',
-'315,315,34,326,34,56,34,76,34,320,34,383,384,385,78,34,320,320,320,320',
-'320,320,320,320,320,80,320,320,320,320,320,320,320,320,320,320,383,384',
-'385,320,320,320,165,165,320,320,320,34,184,184,82,320,320,320,320,320',
-'320,320,320,320,320,320,320,320,320,356,356,83,356,320,320,320,320,84',
-'30,30,30,30,34,90,356,30,30,30,185,185,91,356,356,356,356,356,356,356',
-'356,356,92,356,356,356,356,356,356,356,356,356,356,186,186,93,356,356',
-'356,192,192,356,356,356,31,31,94,31,356,356,356,356,356,356,356,356',
-'356,356,356,356,356,356,375,375,95,375,356,356,356,356,96,145,145,145',
-'145,193,193,375,145,145,145,194,194,97,375,375,375,375,375,375,375,375',
-'375,98,375,375,375,375,375,375,375,375,375,375,252,252,99,375,375,375',
-'257,257,375,375,375,262,262,337,337,375,375,375,375,375,375,375,375',
-'375,375,375,375,375,375,357,357,358,358,375,375,375,375,386,386,100',
-'386,101,386,386,386,386,362,362,367,367,369,369,386,374,374,390,390',
-'391,391,386,386,386,386,386,386,386,386,386,102,386,386,386,386,386',
-'386,386,386,386,386,393,393,103,386,386,386,394,394,386,386,386,117',
-'127,128,129,386,386,386,386,386,386,386,386,386,386,386,386,386,386',
-'408,408,131,408,386,386,386,386,133,136,137,143,172,191,195,408,197',
-'198,200,205,228,229,408,408,408,408,408,408,408,408,408,230,408,408',
-'408,408,408,408,408,408,408,408,232,233,236,408,408,408,240,243,408',
-'408,408,244,245,246,247,408,408,408,408,408,408,408,408,408,408,408',
-'408,408,408,249,253,255,271,408,408,408,408,50,275,277,50,50,50,50,278',
-'282,296,50,50,50,297,50,50,50,298,50,323,50,50,50,50,50,50,50,50,50',
-'50,50,50,50,50,50,50,50,50,50,50,328,50,346,348,349,50,350,50,351,50',
-'50,353,355,359,363,368,50,50,50,50,50,50,50,370,380,387,50,50,50,388',
-'389,398,400,50,50,50,50,139,403,405,139,139,139,139,409,,,139,139,139',
-',139,,139,,139,,139,139,139,139,139,139,139,139,139,139,139,139,139',
-'139,139,139,139,139,139,139,,139,,,,139,,,,,,,,,,,139,139,139,139,139',
-'139,139,,,,139,139,139,,,,,139,139,139,139,161,,,161,161,161,161,,,',
-'161,161,161,,161,161,161,,161,,161,161,161,161,161,161,161,161,161,161',
-'161,161,161,161,161,161,161,161,161,161,,161,,,,161,,161,,161,161,,',
-',,,161,161,161,161,161,161,161,,,,161,161,161,,,,,161,161,161,161,173',
-',,173,173,173,173,,,,173,173,173,,173,173,173,,173,,173,173,173,173',
-'173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,,173',
-',,,173,,173,,173,173,,,,,,173,173,173,173,173,173,173,,,,173,173,173',
-',,,,173,173,173,173,174,,,174,174,174,174,,,,174,174,174,,174,174,174',
-',174,,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174',
-'174,174,174,174,,174,,,,174,,174,,174,174,,,,,,174,174,174,174,174,174',
-'174,,,,174,174,174,,,,,174,174,174,174,175,,,175,175,175,175,,,,175',
-'175,175,,175,175,175,,175,,175,175,175,175,175,175,175,175,175,175,175',
-'175,175,175,175,175,175,175,175,175,,175,,,,175,,175,,,175,,,,,,175',
-'175,175,175,175,175,175,,,,175,175,175,,,,,175,175,175,175,241,,,241',
-'241,241,241,,,,241,241,241,,241,241,241,,241,,241,241,241,241,241,241',
-'241,241,241,241,241,241,241,241,241,241,241,241,241,241,125,241,125',
-',,241,,241,,,241,,,,,,241,241,241,241,241,241,241,178,,178,241,241,241',
-'176,176,176,176,241,241,241,241,,,,,,,,125,125,176,176,176,176,176,176',
-'176,176,176,,176,176,176,176,176,176,176,176,176,176,125,178,178,,,',
-',176,,,176,,,,,,176,176,176,176,176,176,176,178,,,176,176,176,177,177',
-'177,177,176,176,176,176,,,,,,,,,,177,177,177,177,177,177,177,177,177',
-',177,177,177,177,177,177,177,177,177,177,180,,180,,,,,177,,,177,,,,',
-',177,177,177,177,177,177,177,181,,181,177,177,177,207,207,207,207,177',
-'177,177,177,,,,,,,,180,180,207,207,207,207,207,207,207,207,207,,207',
-'207,207,207,207,207,207,207,207,207,180,181,181,182,77,182,224,77,224',
-'77,,,,,,,207,207,207,207,207,207,207,181,,,207,207,207,77,,,,207,207',
-'207,207,,,,77,,,,,,,182,182,,224,224,266,,266,,266,,266,,,266,266,266',
-'274,,274,,274,182,274,,224,274,274,274,,,,281,,281,266,281,,281,,,281',
-'281,281,266,266,,274,266,,,,,,,,274,274,,325,274,325,281,325,266,325',
-',,325,325,325,281,281,,,281,274,,,,,,,,,,,,,325,,281,,,,,,,325,325,',
-'2,325,,,,,,,,,2,2,2,,2,,2,325,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,,,51,,,,,43,',
-',,43,51,51,51,,51,,51,,51,,51,51,51,51,51,51,51,51,51,51,51,51,51,51',
-',,57,,,,,51,,,,51,57,57,57,,57,,57,,57,,57,57,57,57,57,57,57,57,57,57',
-'57,57,57,57,,,88,,,,,57,,,,57,88,88,88,,88,,88,,88,,88,88,88,88,88,88',
-'88,88,88,88,88,88,88,88,,,140,,,,,88,,,,88,140,140,140,,140,,140,,140',
-',140,140,140,140,140,140,140,140,140,140,140,140,140,140,,,141,,,,,140',
-',,,140,141,141,141,,141,,141,,141,,141,141,141,141,141,141,141,141,141',
-'141,141,141,141,141,,,142,,,,,141,,,,141,142,142,142,,142,,142,,142',
-',142,142,142,142,142,142,142,142,142,142,142,142,142,142,,,146,,,,,142',
-',,,142,146,146,146,,146,,146,,146,,146,146,146,146,146,146,146,146,146',
-'146,146,146,146,146,,,147,,,,,146,,,,146,147,147,147,,147,,147,,147',
-',147,147,147,147,147,147,147,147,147,147,147,147,147,147,,,148,,,,,147',
-',,,147,148,148,148,,148,,148,,148,,148,148,148,148,148,148,148,148,148',
-'148,148,148,148,148,,,156,,,,,148,,,,148,156,156,156,,156,,156,,156',
-',156,156,156,156,156,156,156,156,156,156,156,156,156,156,,,157,,,,,156',
-',,,156,157,157,157,,157,,157,,157,,157,157,157,157,157,157,157,157,157',
-'157,157,157,157,157,,,159,,,,,157,,,,157,159,159,159,,159,,159,,159',
-',159,159,159,159,159,159,159,159,159,159,159,159,159,159,,,179,,,,,159',
-',,,159,179,179,179,,179,,179,,179,,179,179,179,179,179,179,179,179,179',
-'179,179,179,179,179,,,201,,,,,179,,,,179,201,201,201,,201,,201,,201',
-',201,201,201,201,201,201,201,201,201,201,201,201,201,201,,,234,,,,,201',
-',,,201,234,234,234,,234,,234,,234,,234,234,234,234,234,234,234,234,234',
-'234,234,234,234,234,,,235,,,,,234,,,,234,235,235,235,,235,,235,,235',
-',235,235,235,235,235,235,235,235,235,235,235,235,235,235,,,268,,,,,235',
-',,,235,268,268,268,,268,,268,,268,,268,268,268,268,268,268,268,268,268',
-'268,268,268,268,268,,,309,,,,,268,,,,268,309,309,309,,309,,309,,309',
-',309,309,309,309,309,309,309,309,309,309,309,309,309,309,,,321,,,,,309',
-',,,309,321,321,321,,321,,321,,321,,321,321,321,321,321,321,321,321,321',
-'321,321,321,321,321,,,322,,,,,321,,,,321,322,322,322,,322,,322,,322',
-',322,322,322,322,322,322,322,322,322,322,322,322,322,322,,,327,,,,,322',
-',,,322,327,327,327,,327,,327,,327,,327,327,327,327,327,327,327,327,327',
-'327,327,327,327,327,,,345,,,,,327,,,,327,345,345,345,,345,,345,,345',
-',345,345,345,345,345,345,345,345,345,345,345,345,345,345,,,347,,,,,345',
-',,,345,347,347,347,,347,,347,,347,,347,347,347,347,347,347,347,347,347',
-'347,347,347,347,347,,,371,,,,,347,,,,347,371,371,371,,371,,371,,371',
-',371,371,371,371,371,371,371,371,371,371,371,371,371,371,,,372,,,,,371',
-',,,371,372,372,372,,372,,372,,372,,372,372,372,372,372,372,372,372,372',
-'372,372,372,372,372,,,373,,,,,372,,,,372,373,373,373,,373,,373,,373',
-',373,373,373,373,373,373,373,373,373,373,373,373,373,373,,,377,,,,,373',
-',,,373,377,377,377,,377,,377,,377,,377,377,377,377,377,377,377,377,377',
-'377,377,377,377,377,,,378,,,,,377,,,,377,378,378,378,,378,,378,,378',
-',378,378,378,378,378,378,378,378,378,378,378,378,378,378,,,381,,,,,378',
-',,,378,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,283,,,283,',
-'283,,382,283,,,382,,,,,,,,,,,,,,283,,283,283,283,283,283,,,,283,283' ]
-        racc_action_check = arr = ::Array.new(2779, nil)
+'322,322,48,322,81,272,1,160,195,321,81,380,28,196,197,322,5,321,197',
+'380,44,44,322,322,322,322,322,322,322,322,322,198,322,322,322,322,322',
+'322,322,322,322,322,239,48,28,322,322,322,160,195,322,322,322,272,196',
+'197,262,322,322,322,322,322,322,322,322,322,322,322,322,322,322,47,198',
+'46,7,322,322,322,322,330,330,268,330,239,330,330,330,330,24,84,27,270',
+'318,319,330,145,189,262,46,47,47,330,330,330,330,330,330,330,330,330',
+'320,330,330,330,330,330,330,330,330,330,330,84,268,51,330,330,330,145',
+'189,330,330,330,270,318,319,88,330,330,330,330,330,330,330,330,330,330',
+'330,330,330,330,166,320,51,263,330,330,330,330,331,331,88,331,32,331',
+'331,331,331,31,31,35,31,6,6,331,36,166,302,328,263,54,331,331,331,331',
+'331,331,331,331,331,385,331,331,331,331,331,331,331,331,331,331,6,302',
+'328,331,331,331,386,387,331,331,331,308,154,154,385,331,331,331,331',
+'331,331,331,331,331,331,331,331,331,331,55,308,386,387,331,331,331,331',
+'332,332,56,332,57,332,332,332,332,30,30,30,30,169,169,332,30,30,30,0',
+'0,0,332,332,332,332,332,332,332,332,332,58,332,332,332,332,332,332,332',
+'332,332,332,192,192,78,332,332,332,193,193,332,332,332,194,194,200,200',
+'332,332,332,332,332,332,332,332,332,332,332,332,332,332,356,356,80,356',
+'332,332,332,332,34,82,34,85,34,86,34,356,34,201,201,202,202,34,356,356',
+'356,356,356,356,356,356,356,92,356,356,356,356,356,356,356,356,356,356',
+'258,258,93,356,356,356,260,260,356,356,356,34,265,265,94,356,356,356',
+'356,356,356,356,356,356,356,356,356,356,356,375,375,95,375,356,356,356',
+'356,96,150,150,150,150,34,97,375,150,150,150,347,347,98,375,375,375',
+'375,375,375,375,375,375,99,375,375,375,375,375,375,375,375,375,375,357',
+'357,100,375,375,375,358,358,375,375,375,372,372,378,378,375,375,375',
+'375,375,375,375,375,375,375,375,375,375,375,381,381,383,383,375,375',
+'375,375,388,388,101,388,102,388,388,388,388,392,392,407,407,409,409',
+'388,410,410,103,104,105,106,388,388,388,388,388,388,388,388,388,120',
+'388,388,388,388,388,388,388,388,388,388,130,131,133,388,388,388,135',
+'138,388,388,388,139,146,147,148,388,388,388,388,388,388,388,388,388',
+'388,388,388,388,388,415,415,171,415,388,388,388,388,187,199,204,209',
+'233,234,235,415,236,237,238,240,241,244,415,415,415,415,415,415,415',
+'415,415,247,415,415,415,415,415,415,415,415,415,415,249,250,251,415',
+'415,415,252,253,415,415,415,255,273,277,279,415,415,415,415,415,415',
+'415,415,415,415,415,415,415,415,280,284,298,299,415,415,415,415,49,300',
+'315,49,49,49,49,316,317,325,49,49,49,329,49,49,49,333,49,334,49,49,49',
+'49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,335,49,337,355,359',
+'49,364,49,366,49,49,368,379,382,384,389,49,49,49,49,49,49,49,390,391',
+'395,49,49,49,401,403,406,412,49,49,49,49,141,416,,141,141,141,141,,',
+',141,141,141,,141,,141,,141,,141,141,141,141,141,141,141,141,141,141',
+'141,141,141,141,141,141,141,141,141,141,,141,,,,141,,,,,,,,,,,141,141',
+'141,141,141,141,141,,,,141,141,141,,,,,141,141,141,141,177,,,177,177',
+'177,177,,,,177,177,177,,177,177,177,,177,,177,177,177,177,177,177,177',
+'177,177,177,177,177,177,177,177,177,177,177,177,177,,177,,,,177,,177',
+',177,177,,,,,,177,177,177,177,177,177,177,,,,177,177,177,,,,,177,177',
+'177,177,178,,,178,178,178,178,,,,178,178,178,,178,178,178,,178,,178',
+'178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178',
+'178,178,,178,,,,178,,178,,178,178,,,,,,178,178,178,178,178,178,178,',
+',,178,178,178,,,,,178,178,178,178,179,,,179,179,179,179,,,,179,179,179',
+',179,179,179,,179,,179,179,179,179,179,179,179,179,179,179,179,179,179',
+'179,179,179,179,179,179,179,,179,,,,179,,179,,,179,,,,,,179,179,179',
+'179,179,179,179,,,,179,179,179,,,,,179,179,179,179,188,,,188,188,188',
+'188,,,,188,188,188,,188,188,188,,188,,188,188,188,188,188,188,188,188',
+'188,188,188,188,188,188,188,188,188,188,188,188,,188,,,,188,,188,,188',
+'188,,,,,,188,188,188,188,188,188,188,,,,188,188,188,,,,,188,188,188',
+'188,245,,,245,245,245,245,,,,245,245,245,,245,245,245,,245,,245,245',
+'245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,245',
+'245,128,245,128,,,245,,245,,,245,,,,,,245,245,245,245,245,245,245,182',
+',182,245,245,245,180,180,180,180,245,245,245,245,,,,,,,,128,128,180',
+'180,180,180,180,180,180,180,180,,180,180,180,180,180,180,180,180,180',
+'180,128,182,182,,,,,180,,,180,,,,,,180,180,180,180,180,180,180,182,',
+',180,180,180,181,181,181,181,180,180,180,180,,,,,,,,,,181,181,181,181',
+'181,181,181,181,181,,181,181,181,181,181,181,181,181,181,181,184,,184',
+',,,,181,,,181,,,,,,181,181,181,181,181,181,181,185,,185,181,181,181',
+'211,211,211,211,181,181,181,181,,,,,,,,184,184,211,211,211,211,211,211',
+'211,211,211,,211,211,211,211,211,211,211,211,211,211,184,185,185,186',
+'79,186,228,79,228,79,,,,,,,211,211,211,211,211,211,211,185,,,211,211',
+'211,79,,,,211,211,211,211,,,,79,,,,,,,186,186,,228,228,269,,269,,269',
+',269,,,269,269,269,276,,276,,276,186,276,,228,276,276,276,,,,283,,283',
+'269,283,,283,,,283,283,283,269,269,,276,269,,,,,,,,276,276,,327,276',
+'327,283,327,269,327,,,327,327,327,283,283,,,283,276,,,,,,,,,,,,,327',
+',283,,,,,,,327,327,,2,327,,,,,,,,,2,2,2,,2,,2,327,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,,,59,,,,,53,,,,53,59,59,59,,59,,59,,59,,59,59,59',
+'59,59,59,59,59,59,59,59,59,59,59,,,90,,,,,59,,,,59,90,90,90,,90,,90',
+',90,,90,90,90,90,90,90,90,90,90,90,90,90,90,90,,,142,,,,,90,,,,90,142',
+'142,142,,142,,142,,142,,142,142,142,142,142,142,142,142,142,142,142',
+'142,142,142,,,143,,,,,142,,,,142,143,143,143,,143,,143,,143,,143,143',
+'143,143,143,143,143,143,143,143,143,143,143,143,,,144,,,,,143,,,,143',
+'144,144,144,,144,,144,,144,,144,144,144,144,144,144,144,144,144,144',
+'144,144,144,144,,,151,,,,,144,,,,144,151,151,151,,151,,151,,151,,151',
+'151,151,151,151,151,151,151,151,151,151,151,151,151,,,152,,,,,151,,',
+',151,152,152,152,,152,,152,,152,,152,152,152,152,152,152,152,152,152',
+'152,152,152,152,152,,,153,,,,,152,,,,152,153,153,153,,153,,153,,153',
+',153,153,153,153,153,153,153,153,153,153,153,153,153,153,,,161,,,,,153',
+',,,153,161,161,161,,161,,161,,161,,161,161,161,161,161,161,161,161,161',
+'161,161,161,161,161,,,162,,,,,161,,,,161,162,162,162,,162,,162,,162',
+',162,162,162,162,162,162,162,162,162,162,162,162,162,162,,,164,,,,,162',
+',,,162,164,164,164,,164,,164,,164,,164,164,164,164,164,164,164,164,164',
+'164,164,164,164,164,,,183,,,,,164,,,,164,183,183,183,,183,,183,,183',
+',183,183,183,183,183,183,183,183,183,183,183,183,183,183,,,190,,,,,183',
+',,,183,190,190,190,,190,,190,,190,,190,190,190,190,190,190,190,190,190',
+'190,190,190,190,190,,,205,,,,,190,,,,190,205,205,205,,205,,205,,205',
+',205,205,205,205,205,205,205,205,205,205,205,205,205,205,,,242,,,,,205',
+',,,205,242,242,242,,242,,242,,242,,242,242,242,242,242,242,242,242,242',
+'242,242,242,242,242,,,271,,,,,242,,,,242,271,271,271,,271,,271,,271',
+',271,271,271,271,271,271,271,271,271,271,271,271,271,271,,,311,,,,,271',
+',,,271,311,311,311,,311,,311,,311,,311,311,311,311,311,311,311,311,311',
+'311,311,311,311,311,,,323,,,,,311,,,,311,323,323,323,,323,,323,,323',
+',323,323,323,323,323,323,323,323,323,323,323,323,323,323,,,324,,,,,323',
+',,,323,324,324,324,,324,,324,,324,,324,324,324,324,324,324,324,324,324',
+'324,324,324,324,324,,,363,,,,,324,,,,324,363,363,363,,363,,363,,363',
+',363,363,363,363,363,363,363,363,363,363,363,363,363,363,,,365,,,,,363',
+',,,363,365,365,365,,365,,365,,365,,365,365,365,365,365,365,365,365,365',
+'365,365,365,365,365,,,367,,,,,365,,,,365,367,367,367,,367,,367,,367',
+',367,367,367,367,367,367,367,367,367,367,367,367,367,367,,,369,,,,,367',
+',,,367,369,369,369,,369,,369,,369,,369,369,369,369,369,369,369,369,369',
+'369,369,369,369,369,,,370,,,,,369,,,,369,370,370,370,,370,,370,,370',
+',370,370,370,370,370,370,370,370,370,370,370,370,370,370,,,371,,,,,370',
+',,,370,371,371,371,,371,,371,,371,,371,371,371,371,371,371,371,371,371',
+'371,371,371,371,371,,,377,,,,,371,,,,371,377,377,377,,377,,377,,377',
+',377,377,377,377,377,377,377,377,377,377,377,377,377,377,,,393,,,,,377',
+',,,377,393,393,393,,393,,393,,393,,393,393,393,393,393,393,393,393,393',
+'393,393,393,393,393,,,396,,,,,393,,,,393,396,396,396,,396,,396,,396',
+',396,396,396,396,396,396,396,396,396,396,396,396,396,396,,,397,,,,,396',
+',,,396,397,397,397,,397,,397,,397,,397,397,397,397,397,397,397,397,397',
+'397,397,397,397,397,285,,,285,,285,,397,285,,,397,,,,,,,,,,,,,,285,',
+'285,285,285,285,285,,,,285,285' ]
+        racc_action_check = arr = ::Array.new(2787, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -636,194 +655,196 @@ clist = [
         end
 racc_action_pointer = [
-    96,     4,  1444,   nil,   nil,     9,    51,   -35,   nil,   nil,
+   183,     6,  1452,   nil,   nil,    16,   124,    23,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    51,  1480,  1516,    56,    -1,   nil,
-   302,   351,    79,   nil,   237,    12,    80,   nil,   nil,   nil,
-  1552,  1588,   nil,  1624,   -27,   nil,   131,   131,    -2,   nil,
-   596,  1660,   100,   114,   147,   152,   185,  1696,   nil,   nil,
+   nil,   nil,   nil,   nil,    68,  1488,  1524,    72,    -6,   nil,
+   239,   165,   158,   nil,   316,    93,   154,   nil,   nil,   nil,
+  1560,  1596,   nil,  1632,   -27,   nil,    52,    52,    -2,   604,
+   nil,   101,   nil,  1668,   156,   183,   184,   186,   213,  1704,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   229,  1269,   205,   166,
-   216,   nil,   267,   300,   260,   nil,   154,   nil,  1732,   nil,
-   295,   319,   287,   300,   311,   329,   335,   348,   358,   371,
-   408,   410,   437,   476,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   459,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,  1099,   nil,   460,   486,   460,
-   nil,   477,   nil,   483,   nil,   nil,   484,   485,   nil,   673,
-  1768,  1804,  1840,   481,   nil,   373,  1876,  1912,  1948,   164,
-   nil,   nil,   nil,   nil,   nil,     8,  1984,  2020,   nil,  2056,
-    22,   750,   155,   nil,   nil,   230,   nil,   nil,   nil,   nil,
-   nil,   nil,   483,   827,   904,   981,  1124,  1190,  1122,  2092,
-  1231,  1254,  1300,   nil,   236,   272,   295,     9,    10,    87,
-    27,   478,   301,   337,   343,   485,    78,   515,   519,   nil,
-   537,  2128,   nil,   nil,   nil,   494,   nil,  1256,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   268,  1277,
+   266,     2,   273,   nil,    71,   317,   273,   nil,   114,   nil,
+  1740,   nil,   320,   350,   345,   337,   343,   349,   356,   366,
+   379,   416,   418,   432,   433,   434,   461,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,  1303,   nil,   nil,   nil,   521,   522,
-   532,    44,   543,   559,  2164,  2200,   542,   117,   nil,   nil,
-   518,  1058,   nil,   552,   515,   496,   532,   531,   nil,   572,
-   nil,   nil,   366,   542,   nil,   571,   nil,   417,   nil,    52,
-   168,   nil,   347,   nil,   nil,    77,  1350,    88,  2236,    29,
-   nil,   576,   nil,   nil,  1362,   581,   nil,   523,   605,   nil,
-   nil,  1377,   562,  2707,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   565,   569,   560,   nil,
-   185,   nil,   nil,   nil,   nil,   nil,   110,   nil,   nil,  2272,
-   nil,   nil,   nil,    -2,    77,   156,    89,   106,   117,   -62,
-   227,  2308,  2344,   608,   nil,  1404,   192,  2380,   622,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   375,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,  2416,   624,  2452,   625,   624,
-   626,   628,   nil,   612,   nil,   595,   298,   395,   397,   609,
-   nil,   nil,   412,   610,     0,   nil,   nil,   414,   611,   416,
-   619,  2488,  2524,  2560,   434,   369,   nil,  2596,  2632,   nil,
-   645,  2668,  2704,   225,   226,   227,   448,   608,   612,   638,
-   421,   423,   nil,   445,   451,   nil,   nil,   nil,   613,   nil,
-   628,   nil,   nil,   621,   nil,   632,   nil,   nil,   519,   626,
-   nil,   nil ]
+   445,   nil,   nil,   nil,   nil,   nil,   nil,   nil,  1107,   nil,
+   456,   455,   nil,   456,   nil,   460,   nil,   nil,   461,   465,
+   nil,   681,  1776,  1812,  1848,    77,   490,   463,   463,   nil,
+   381,  1884,  1920,  1956,   165,   nil,   nil,   nil,   nil,   nil,
+     3,  1992,  2028,   nil,  2064,   nil,   129,   nil,   nil,   203,
+   nil,   481,   nil,   nil,   nil,   nil,   nil,   758,   835,   912,
+  1132,  1198,  1130,  2100,  1239,  1262,  1308,   514,   989,    78,
+  2136,   nil,   232,   238,   243,     4,     9,    10,    27,   482,
+   245,   278,   280,   nil,   537,  2172,   nil,   nil,   nil,   494,
+   nil,  1264,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,  1311,   nil,
+   nil,   nil,   nil,   522,   519,   492,   525,   526,   527,    38,
+   528,   544,  2208,   nil,   499,  1066,   nil,   510,   nil,   553,
+   513,   494,   533,   532,   nil,   562,   nil,   nil,   303,   nil,
+   354,   nil,    52,   132,   nil,   285,   nil,   nil,    77,  1358,
+    87,  2244,    -8,   564,   nil,   nil,  1370,   564,   nil,   506,
+   598,   nil,   nil,  1385,   555,  2715,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   558,   559,
+   552,   nil,   155,   nil,   nil,   nil,   nil,   nil,   168,   nil,
+   nil,  2280,   nil,   nil,   nil,   578,   583,   584,    88,    89,
+   106,   -63,    -2,  2316,  2352,   606,   nil,  1412,   156,   564,
+    77,   156,   235,   605,   607,   628,   nil,   611,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   347,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   594,   306,   374,   380,   608,
+   nil,   nil,   nil,  2388,   636,  2424,   638,  2460,   641,  2496,
+  2532,  2568,   400,   nil,   nil,   377,   nil,  2604,   387,   616,
+     0,   403,   617,   405,   618,   168,   185,   186,   456,   606,
+   614,   640,   420,  2640,   nil,   654,  2676,  2712,   nil,   nil,
+   nil,   619,   nil,   634,   nil,   nil,   622,   422,   nil,   424,
+   427,   nil,   633,   nil,   nil,   527,   628,   nil,   nil ]
 racc_action_default = [
-  -243,  -243,  -239,    -6,   -16,  -243,    -4,  -160,  -163,  -164,
-  -165,  -166,  -167,  -168,  -169,  -170,  -171,  -172,  -173,  -174,
-  -175,  -176,  -177,  -178,  -179,  -239,  -239,  -243,  -243,  -187,
-  -243,  -243,  -240,  -242,   -17,    -4,  -150,   412,    -1,    -5,
-  -239,  -239,  -186,  -239,  -188,  -181,  -243,  -243,  -239,  -185,
-  -239,  -239,  -243,  -191,  -243,  -243,  -243,  -239,  -199,  -200,
-  -201,  -202,  -233,  -234,  -235,  -236,  -241,    -2,    -7,    -8,
-    -9,   -10,   -11,   -12,   -13,   -14,   -17,  -243,  -243,  -243,
-  -243,    -3,   -82,  -243,  -161,  -162,  -243,  -182,  -239,  -183,
-  -243,  -243,  -173,  -163,  -167,  -174,  -175,  -164,  -165,  -168,
-  -169,  -172,  -166,  -118,  -119,  -120,  -121,  -122,  -123,  -124,
-  -125,  -126,  -127,  -128,  -129,  -130,  -131,  -170,  -133,  -134,
-  -135,  -136,  -137,  -138,  -139,  -229,  -197,  -243,  -243,  -206,
-  -207,  -209,  -210,  -212,  -213,  -216,  -219,  -221,  -222,  -239,
-  -239,  -239,  -239,  -204,  -190,  -243,  -239,  -239,  -239,  -196,
-   -18,   -15,   -15,   -15,   -15,  -239,  -239,  -239,  -238,  -239,
-   -84,  -239,  -243,  -152,  -180,  -189,  -184,  -223,  -230,  -231,
-  -232,  -198,  -243,  -239,  -239,  -239,  -217,  -217,  -229,  -239,
-  -229,  -229,  -229,  -192,  -193,  -194,  -195,  -239,  -239,  -239,
-  -239,  -243,  -157,  -158,  -159,  -243,  -243,  -243,  -243,  -151,
-  -243,  -239,  -205,  -213,  -208,  -215,  -211,  -243,  -107,  -108,
-  -109,  -110,  -111,  -112,  -113,  -114,  -115,  -116,  -117,  -118,
-  -132,  -218,  -220,  -224,  -229,  -225,  -226,  -228,  -150,  -140,
-  -140,  -239,  -140,  -243,  -239,  -239,  -243,  -243,   -83,  -153,
-  -203,  -239,  -227,  -243,   -23,  -148,   -28,   -34,   -30,   -33,
-   -59,  -237,  -156,   -81,   -85,  -243,  -214,  -243,   -34,  -239,
-  -243,  -142,  -145,  -149,   -34,  -239,   -17,  -239,  -239,   -17,
-   -86,  -243,   -20,   -21,   -17,   -24,  -141,  -148,  -243,  -146,
-  -147,   -17,   -29,   -73,   -27,   -35,   -36,   -37,   -38,   -39,
-   -40,   -41,   -42,   -43,   -44,   -45,  -243,  -243,  -243,   -31,
-  -243,   -58,   -60,   -61,   -62,   -63,   -73,   -34,   -22,  -239,
-  -143,  -144,   -26,  -243,  -243,  -243,  -239,  -239,  -239,   -70,
-  -243,  -239,  -239,  -243,   -32,   -17,  -243,  -239,   -52,   -89,
-   -90,   -91,   -92,   -93,   -94,   -95,   -96,   -97,  -100,  -101,
-  -102,  -103,  -104,  -105,  -106,  -239,   -52,  -239,   -52,   -64,
-   -66,   -68,   -71,  -243,   -74,  -132,  -243,   -55,   -56,  -243,
-   -19,   -25,   -46,  -243,  -243,   -98,   -99,   -48,  -243,   -50,
-  -243,  -239,  -239,  -239,   -75,  -243,  -154,  -239,  -239,   -53,
-  -243,  -239,  -239,  -243,  -243,  -243,  -243,  -243,  -243,  -243,
-   -57,   -47,   -54,   -49,   -51,   -65,   -67,   -69,   -16,   -87,
-  -243,   -76,   -77,  -243,   -72,   -78,   -79,   -88,  -243,   -16,
-  -155,   -80 ]
+  -246,  -246,  -242,    -6,   -16,  -246,    -4,  -161,  -164,  -165,
+  -166,  -167,  -168,  -169,  -170,  -171,  -172,  -173,  -174,  -175,
+  -176,  -177,  -178,  -179,  -180,  -242,  -242,  -246,   -84,  -188,
+  -246,  -246,  -243,  -245,   -17,    -4,  -151,   419,    -1,    -5,
+  -242,  -242,  -187,  -242,  -189,  -182,  -246,  -246,  -242,  -242,
+  -186,  -246,  -205,  -242,  -246,  -192,  -246,  -246,  -246,  -242,
+  -200,  -201,  -202,  -203,  -236,  -237,  -238,  -239,  -244,    -2,
+    -7,    -8,    -9,   -10,   -11,   -12,   -13,   -14,   -17,  -246,
+  -246,  -246,  -246,    -3,   -84,  -246,  -162,  -163,  -246,  -183,
+  -242,  -184,  -246,  -246,  -246,  -174,  -164,  -168,  -175,  -176,
+  -165,  -166,  -169,  -170,  -173,  -167,  -119,  -120,  -121,  -122,
+  -123,  -124,  -125,  -126,  -127,  -128,  -129,  -130,  -131,  -132,
+  -171,  -134,  -135,  -136,  -137,  -138,  -139,  -140,  -232,  -198,
+  -246,  -209,  -210,  -212,  -213,  -215,  -216,  -219,  -222,  -224,
+  -225,  -242,  -242,  -242,  -242,  -246,  -246,  -246,  -207,  -191,
+  -246,  -242,  -242,  -242,  -197,   -18,   -15,   -15,   -15,   -15,
+  -242,  -242,  -242,  -241,  -242,   -83,  -246,  -153,  -181,  -190,
+  -185,   -85,  -226,  -233,  -234,  -235,  -199,  -242,  -242,  -242,
+  -220,  -220,  -232,  -242,  -232,  -232,  -232,  -246,  -242,  -246,
+  -242,  -193,  -194,  -195,  -196,  -242,  -242,  -242,  -242,  -246,
+  -158,  -159,  -160,  -152,  -246,  -242,  -208,  -216,  -211,  -218,
+  -214,  -246,  -108,  -109,  -110,  -111,  -112,  -113,  -114,  -115,
+  -116,  -117,  -118,  -119,  -133,  -221,  -223,  -227,  -232,  -228,
+  -229,  -231,   -86,  -246,  -246,  -204,  -151,  -141,  -141,  -242,
+  -141,  -246,  -242,  -154,  -206,  -242,  -230,  -246,   -87,  -246,
+   -23,  -149,   -28,   -34,   -30,   -33,   -61,  -240,  -157,  -217,
+  -246,   -34,  -242,  -246,  -143,  -146,  -150,   -34,  -242,   -17,
+  -242,  -242,   -17,  -246,   -20,   -21,   -17,   -24,  -142,  -149,
+  -246,  -147,  -148,   -17,   -29,   -75,   -27,   -35,   -36,   -37,
+   -38,   -39,   -40,   -41,   -42,   -43,   -44,   -45,  -246,  -246,
+  -246,   -31,  -246,   -60,   -62,   -63,   -64,   -65,   -75,   -34,
+   -22,  -242,  -144,  -145,   -26,   -46,   -46,   -46,  -242,  -242,
+  -242,   -72,  -246,  -242,  -242,  -246,   -32,   -17,  -246,  -246,
+  -246,  -246,  -246,   -66,   -68,   -70,   -73,  -246,   -76,   -90,
+   -91,   -92,   -93,   -94,   -95,   -96,   -97,   -98,  -101,  -102,
+  -103,  -104,  -105,  -106,  -107,  -133,  -246,   -57,   -58,  -246,
+   -19,   -25,   -47,  -242,   -54,  -242,   -54,  -242,   -54,  -242,
+  -242,  -242,   -77,   -99,  -100,  -246,  -155,  -242,   -48,  -246,
+  -246,   -50,  -246,   -52,  -246,  -246,  -246,  -246,  -246,  -246,
+  -246,  -246,   -59,  -242,   -55,  -246,  -242,  -242,   -67,   -69,
+   -71,   -16,   -88,  -246,   -78,   -79,  -246,   -49,   -56,   -51,
+   -53,   -74,   -80,   -81,   -89,  -246,   -16,  -156,   -82 ]
 racc_goto_table = [
-     6,    57,    77,    46,    82,   191,    49,   128,    79,    90,
-   143,    52,   167,   247,   179,   203,     1,   206,   328,   346,
-   348,    86,    91,    38,    47,   356,   261,   344,   344,   344,
-   205,   205,   266,    34,   344,   404,   363,    35,    84,    85,
-   221,   222,    68,   274,   150,   271,   411,   282,   125,   281,
-   258,    67,    81,   264,   368,   149,   370,   299,   310,   244,
-   246,   376,   250,   303,   304,   223,   305,   225,   226,   227,
-   344,   187,   188,   189,   190,   232,   269,   302,   353,   386,
-   389,   249,   179,   256,   398,   160,   165,   195,   260,   344,
-   278,   400,   325,   162,   204,    62,   nil,   205,   nil,   nil,
-   344,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   242,   nil,   410,   nil,   249,    57,   249,   198,   nil,
-   nil,   nil,   344,   nil,   nil,   nil,   183,   nil,   nil,   nil,
-   202,   nil,   nil,   nil,   nil,   nil,   nil,   178,   180,   181,
-   182,   nil,   nil,   nil,   184,   185,   186,   nil,   228,   229,
-   230,   nil,   nil,   nil,   192,   193,   nil,   194,   nil,   125,
-   240,    91,    91,    91,   233,   nil,   349,   350,   351,   nil,
-   nil,   125,   125,   125,   236,   nil,   nil,   224,   nil,   nil,
+     6,    59,    46,    81,    79,    92,    84,    54,    94,   148,
+   199,   172,   183,   207,    50,   210,   264,    93,   187,   356,
+    88,    38,     1,   253,    47,   411,   354,   364,   366,   368,
+   209,   209,   225,   226,   354,   354,   354,   269,    86,    87,
+   418,   330,   331,   332,   312,   276,    34,   128,   155,    69,
+    83,   283,   284,   376,   379,    35,   382,   154,   384,    70,
+   354,   273,   234,   250,   252,   227,   256,   229,   230,   231,
+   165,   261,   391,   195,   196,   197,   198,   267,   301,   354,
+   305,   259,   183,   306,   307,   403,   240,   272,   169,   255,
+   304,   337,   354,   327,   388,   401,   147,   209,   263,   280,
+   166,   208,    64,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   246,   417,   nil,   nil,   nil,   nil,   nil,   255,   354,
+   255,    59,   nil,   nil,   nil,   nil,   nil,   191,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   206,   nil,   nil,   182,
+   184,   185,   186,   nil,   nil,   nil,   235,   233,   nil,   192,
+   193,   194,   236,   237,   238,   nil,   nil,   nil,   nil,   200,
+   201,   244,   202,   nil,    93,    93,    93,   241,   333,   334,
+   335,   nil,   nil,   nil,   nil,   128,   128,   128,   nil,   nil,
+   nil,   228,   nil,   nil,   nil,   nil,   128,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   253,   nil,   243,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   249,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   277,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   255,   nil,   nil,   nil,   nil,
-   275,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   252,    91,   nil,   nil,   nil,   306,   nil,   125,
-    79,   nil,   nil,   nil,   nil,   nil,   300,   nil,    79,   nil,
-   nil,   nil,   nil,   nil,   nil,    79,   nil,   nil,   nil,   nil,
+   nil,    93,   nil,   nil,   nil,   nil,   nil,   nil,    81,   nil,
+   258,   nil,   308,   128,   nil,    81,   nil,   nil,   302,   nil,
+   nil,   nil,    81,   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,   327,   345,   347,   326,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    79,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   328,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    81,   nil,   nil,   nil,
+   nil,   363,   365,   367,   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,   357,
-   358,   nil,   nil,   nil,   nil,   362,   nil,   nil,   nil,   nil,
+   nil,   357,   358,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   367,   nil,   369,   nil,   nil,   nil,   383,
-   384,   385,   nil,   nil,   nil,   nil,   nil,   399,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   385,   386,   387,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   402,
+   nil,   378,   nil,   381,   nil,   383,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   392,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   390,   391,   nil,   nil,   393,
-   394 ]
+   nil,   407,   nil,   nil,   409,   410 ]
 racc_goto_check = [
-     2,    36,    16,    23,    18,    27,    51,    50,    59,    17,
-    49,    61,    74,    25,    63,    69,     1,    69,    37,    37,
-    37,    23,    59,     3,     2,    37,    55,    53,    53,    53,
-    64,    64,    20,     4,    53,    46,    38,     5,     2,     2,
-    70,    70,     6,    20,    16,    19,    46,    25,     2,    20,
-    22,     3,     3,    24,    38,     2,    38,    26,    55,    21,
-    21,    37,    21,    29,    30,    74,    35,    74,    74,    74,
-    53,    14,    14,    14,    14,    39,    40,    41,    42,    44,
-    37,    27,    63,    69,    45,    47,     2,    48,    54,    53,
-    57,    37,    20,    58,    65,    75,   nil,    64,   nil,   nil,
-    53,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    74,   nil,    37,   nil,    27,    36,    27,    50,   nil,
-   nil,   nil,    53,   nil,   nil,   nil,    61,   nil,   nil,   nil,
-    50,   nil,   nil,   nil,   nil,   nil,   nil,     2,     2,     2,
-     2,   nil,   nil,   nil,     2,     2,     2,   nil,    17,    17,
-    17,   nil,   nil,   nil,     2,     2,   nil,     2,   nil,     2,
-    49,    59,    59,    59,    59,   nil,    27,    27,    27,   nil,
-   nil,     2,     2,     2,    51,   nil,   nil,     2,   nil,   nil,
+     2,    37,    23,    60,    16,    17,    18,    63,    50,    61,
+    27,    76,    65,    71,    48,    71,    56,    60,    52,    38,
+    23,     3,     1,    25,     2,    47,    54,    38,    38,    38,
+    66,    66,    72,    72,    54,    54,    54,    20,     2,     2,
+    47,    36,    36,    36,    56,    20,     4,     2,    16,     3,
+     3,    20,    25,    38,    39,     5,    39,     2,    39,     6,
+    54,    19,    52,    21,    21,    76,    21,    76,    76,    76,
+    48,    22,    38,    14,    14,    14,    14,    24,    26,    54,
+    29,    71,    65,    30,    35,    38,    40,    41,     2,    27,
+    42,    43,    54,    20,    45,    46,    51,    66,    55,    58,
+    59,    67,    77,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    76,    38,   nil,   nil,   nil,   nil,   nil,    27,    54,
+    27,    37,   nil,   nil,   nil,   nil,   nil,    63,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    50,   nil,   nil,     2,
+     2,     2,     2,   nil,   nil,   nil,    61,    50,   nil,     2,
+     2,     2,    17,    17,    17,   nil,   nil,   nil,   nil,     2,
+     2,    61,     2,   nil,    60,    60,    60,    60,    27,    27,
+    27,   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,   nil,   nil,    49,   nil,    18,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    17,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    51,   nil,   nil,   nil,   nil,
-    17,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     2,    59,   nil,   nil,   nil,    16,   nil,     2,
-    59,   nil,   nil,   nil,   nil,   nil,    23,   nil,    59,   nil,
-   nil,   nil,   nil,   nil,   nil,    59,   nil,   nil,   nil,   nil,
+   nil,    60,   nil,   nil,   nil,   nil,   nil,   nil,    60,   nil,
+     2,   nil,    16,     2,   nil,    60,   nil,   nil,    23,   nil,
+   nil,   nil,    60,   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,    36,    36,    36,    23,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    59,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    60,   nil,   nil,   nil,
+   nil,    37,    37,    37,   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,     2,
-     2,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
+   nil,     2,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     2,   nil,     2,   nil,   nil,   nil,    23,
-    23,    23,   nil,   nil,   nil,   nil,   nil,    36,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    23,    23,    23,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,
+   nil,     2,   nil,     2,   nil,     2,   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,   nil,   nil,   nil,   nil,     2,     2,   nil,   nil,     2,
-     2 ]
+   nil,     2,   nil,   nil,     2,     2 ]
 racc_goto_pointer = [
-   nil,    16,    -2,    17,    30,    33,     8,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   -80,   nil,   -32,   -39,   -32,  -212,
-  -215,  -170,  -194,   -22,  -193,  -218,  -210,  -150,   nil,  -206,
-  -205,   nil,   nil,   nil,   nil,  -203,   -29,  -295,  -292,  -115,
-  -174,  -192,  -241,   nil,  -295,  -302,  -363,     3,   -73,   -41,
-   -43,   -22,   nil,  -286,  -157,  -219,   nil,  -172,    10,   -26,
-   nil,   -19,   nil,  -125,  -144,   -80,   nil,   nil,   nil,  -158,
-  -136,   nil,   nil,   nil,  -113,    64 ]
+   nil,    22,    -2,    15,    43,    51,    25,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   -83,   nil,   -30,   -43,   -30,  -199,
+  -216,  -174,  -179,   -23,  -175,  -216,  -192,  -150,   nil,  -192,
+  -189,   nil,   nil,   nil,   nil,  -188,  -274,   -29,  -303,  -310,
+  -112,  -169,  -182,  -230,   nil,  -278,  -293,  -376,   -14,   nil,
+   -41,    45,  -127,   nil,  -296,  -153,  -235,   nil,  -166,    15,
+   -31,   -44,   nil,   -23,   nil,  -129,  -148,   -77,   nil,   nil,
+   nil,  -164,  -148,   nil,   nil,   nil,  -117,    71 ]
 racc_goto_default = [
-   nil,   nil,    44,   nil,   nil,   405,   295,    69,    70,    71,
-    72,    73,    74,    75,   nil,    36,   283,    78,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   248,    24,   285,   286,
-   287,   288,   289,   290,   291,   294,   126,   nil,   nil,   nil,
-   nil,   nil,   nil,   319,   nil,   nil,   nil,   nil,   nil,     7,
-   nil,   nil,   337,   127,   nil,   nil,   262,   nil,   nil,    31,
-    29,   nil,    53,   141,   129,   130,   131,   132,   133,   134,
-   135,   136,   137,   138,   nil,   nil ]
+   nil,   nil,    44,   nil,   nil,   412,   297,    71,    72,    73,
+    74,    75,    76,    77,   nil,    36,   285,    80,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   254,    24,   287,   288,
+   289,   290,   291,   292,   293,   296,   nil,   129,   nil,   nil,
+   nil,   nil,   nil,   nil,   321,   nil,   nil,   nil,   nil,    51,
+   nil,   nil,    52,   347,   130,   nil,   nil,   265,   nil,   nil,
+    31,     7,    29,   nil,    55,   143,   131,   132,   133,   134,
+   135,   136,   137,   138,   139,   140,   nil,   nil ]
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -872,207 +893,210 @@ racc_reduce_table = [
   1, 109, :_reduce_43,
   1, 109, :_reduce_none,
   1, 109, :_reduce_none,
-  4, 115, :_reduce_46,
-  6, 115, :_reduce_47,
-  4, 115, :_reduce_48,
-  6, 115, :_reduce_49,
-  4, 115, :_reduce_50,
-  6, 115, :_reduce_51,
-  0, 119, :_reduce_52,
-  2, 119, :_reduce_53,
-  3, 119, :_reduce_54,
-  3, 114, :_reduce_55,
-  3, 114, :_reduce_56,
-  5, 114, :_reduce_57,
-  7, 91, :_reduce_58,
-  0, 121, :_reduce_59,
-  2, 121, :_reduce_60,
-  1, 122, :_reduce_61,
-  1, 122, :_reduce_62,
-  1, 122, :_reduce_none,
-  3, 111, :_reduce_64,
-  6, 111, :_reduce_65,
-  3, 112, :_reduce_66,
-  6, 112, :_reduce_67,
-  3, 113, :_reduce_68,
-  6, 113, :_reduce_69,
-  0, 123, :_reduce_70,
-  1, 123, :_reduce_71,
-  7, 110, :_reduce_72,
-  0, 124, :_reduce_none,
-  2, 124, :_reduce_74,
-  0, 125, :_reduce_75,
+  0, 117, :_reduce_46,
+  2, 117, :_reduce_47,
+  5, 115, :_reduce_48,
+  7, 115, :_reduce_49,
+  5, 115, :_reduce_50,
+  7, 115, :_reduce_51,
+  5, 115, :_reduce_52,
+  7, 115, :_reduce_53,
+  0, 120, :_reduce_54,
+  2, 120, :_reduce_55,
+  3, 120, :_reduce_56,
+  3, 114, :_reduce_57,
+  3, 114, :_reduce_58,
+  5, 114, :_reduce_59,
+  7, 91, :_reduce_60,
+  0, 122, :_reduce_61,
+  2, 122, :_reduce_62,
+  1, 123, :_reduce_63,
+  1, 123, :_reduce_64,
+  1, 123, :_reduce_none,
+  3, 111, :_reduce_66,
+  6, 111, :_reduce_67,
+  3, 112, :_reduce_68,
+  6, 112, :_reduce_69,
+  3, 113, :_reduce_70,
+  6, 113, :_reduce_71,
+  0, 124, :_reduce_72,
+  1, 124, :_reduce_73,
+  7, 110, :_reduce_74,
+  0, 125, :_reduce_none,
   2, 125, :_reduce_76,
-  2, 125, :_reduce_77,
-  1, 127, :_reduce_78,
-  1, 127, :_reduce_79,
-  3, 127, :_reduce_80,
-  6, 86, :_reduce_81,
-  0, 128, :_reduce_82,
-  3, 128, :_reduce_83,
-  0, 129, :_reduce_84,
-  3, 129, :_reduce_85,
-  4, 129, :_reduce_86,
-  1, 126, :_reduce_none,
-  2, 126, :_reduce_88,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  2, 118, :_reduce_98,
-  2, 118, :_reduce_99,
-  1, 118, :_reduce_none,
-  1, 118, :_reduce_none,
-  1, 118, :_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,
+  0, 126, :_reduce_77,
+  2, 126, :_reduce_78,
+  2, 126, :_reduce_79,
+  1, 128, :_reduce_80,
+  1, 128, :_reduce_81,
+  3, 128, :_reduce_82,
+  3, 86, :_reduce_83,
+  0, 130, :_reduce_84,
+  3, 130, :_reduce_85,
+  3, 132, :_reduce_86,
+  4, 132, :_reduce_87,
+  1, 127, :_reduce_none,
+  2, 127, :_reduce_89,
+  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_99,
+  2, 119, :_reduce_100,
+  1, 119, :_reduce_none,
+  1, 119, :_reduce_none,
+  1, 119, :_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, 102, :_reduce_140,
-  3, 102, :_reduce_141,
-  1, 135, :_reduce_142,
-  3, 135, :_reduce_143,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  1, 135, :_reduce_none,
+  0, 102, :_reduce_141,
+  3, 102, :_reduce_142,
+  1, 136, :_reduce_143,
   3, 136, :_reduce_144,
-  0, 138, :_reduce_145,
-  1, 138, :_reduce_146,
-  1, 138, :_reduce_147,
-  0, 137, :_reduce_148,
-  1, 137, :_reduce_149,
-  0, 99, :_reduce_150,
-  3, 99, :_reduce_151,
-  1, 139, :_reduce_152,
-  3, 139, :_reduce_153,
-  4, 116, :_reduce_154,
-  8, 116, :_reduce_155,
-  5, 88, :_reduce_156,
-  3, 89, :_reduce_157,
+  3, 137, :_reduce_145,
+  0, 139, :_reduce_146,
+  1, 139, :_reduce_147,
+  1, 139, :_reduce_148,
+  0, 138, :_reduce_149,
+  1, 138, :_reduce_150,
+  0, 99, :_reduce_151,
+  3, 99, :_reduce_152,
+  1, 140, :_reduce_153,
+  3, 140, :_reduce_154,
+  4, 116, :_reduce_155,
+  8, 116, :_reduce_156,
+  5, 88, :_reduce_157,
   3, 89, :_reduce_158,
-  3, 90, :_reduce_159,
+  3, 89, :_reduce_159,
+  3, 90, :_reduce_160,
   1, 83, :_reduce_none,
-  3, 83, :_reduce_161,
   3, 83, :_reduce_162,
-  1, 130, :_reduce_163,
-  1, 130, :_reduce_164,
-  1, 130, :_reduce_165,
-  1, 130, :_reduce_166,
-  1, 130, :_reduce_167,
-  1, 130, :_reduce_168,
-  1, 130, :_reduce_169,
-  1, 130, :_reduce_170,
-  1, 130, :_reduce_171,
-  1, 130, :_reduce_172,
-  1, 130, :_reduce_173,
-  1, 130, :_reduce_174,
-  1, 130, :_reduce_175,
-  1, 130, :_reduce_176,
-  1, 130, :_reduce_177,
-  1, 130, :_reduce_178,
-  1, 130, :_reduce_179,
-  4, 130, :_reduce_180,
-  2, 130, :_reduce_181,
-  3, 130, :_reduce_182,
-  3, 130, :_reduce_183,
-  4, 130, :_reduce_184,
-  2, 130, :_reduce_185,
-  2, 130, :_reduce_186,
-  1, 130, :_reduce_none,
-  1, 104, :_reduce_188,
-  3, 104, :_reduce_189,
-  3, 141, :_reduce_190,
-  1, 142, :_reduce_191,
-  3, 142, :_reduce_192,
-  3, 143, :_reduce_193,
-  3, 143, :_reduce_194,
-  3, 143, :_reduce_195,
-  2, 143, :_reduce_196,
-  1, 144, :_reduce_none,
-  2, 144, :_reduce_198,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  1, 117, :_reduce_none,
-  5, 132, :_reduce_203,
-  2, 132, :_reduce_204,
-  3, 131, :_reduce_205,
-  1, 131, :_reduce_206,
-  1, 131, :_reduce_none,
-  3, 146, :_reduce_208,
-  1, 146, :_reduce_209,
+  3, 83, :_reduce_163,
+  1, 142, :_reduce_164,
+  1, 142, :_reduce_165,
+  1, 142, :_reduce_166,
+  1, 142, :_reduce_167,
+  1, 142, :_reduce_168,
+  1, 142, :_reduce_169,
+  1, 142, :_reduce_170,
+  1, 142, :_reduce_171,
+  1, 142, :_reduce_172,
+  1, 142, :_reduce_173,
+  1, 142, :_reduce_174,
+  1, 142, :_reduce_175,
+  1, 142, :_reduce_176,
+  1, 142, :_reduce_177,
+  1, 142, :_reduce_178,
+  1, 142, :_reduce_179,
+  1, 142, :_reduce_180,
+  4, 142, :_reduce_181,
+  2, 142, :_reduce_182,
+  3, 142, :_reduce_183,
+  3, 142, :_reduce_184,
+  4, 142, :_reduce_185,
+  2, 142, :_reduce_186,
+  2, 142, :_reduce_187,
+  1, 142, :_reduce_none,
+  1, 104, :_reduce_189,
+  3, 104, :_reduce_190,
+  3, 143, :_reduce_191,
+  1, 144, :_reduce_192,
+  3, 144, :_reduce_193,
+  3, 145, :_reduce_194,
+  3, 145, :_reduce_195,
+  3, 145, :_reduce_196,
+  2, 145, :_reduce_197,
   1, 146, :_reduce_none,
+  2, 146, :_reduce_199,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  4, 129, :_reduce_204,
+  1, 129, :_reduce_205,
+  5, 133, :_reduce_206,
+  2, 133, :_reduce_207,
+  3, 131, :_reduce_208,
+  1, 131, :_reduce_209,
+  1, 131, :_reduce_none,
   3, 148, :_reduce_211,
   1, 148, :_reduce_212,
   1, 148, :_reduce_none,
   3, 150, :_reduce_214,
   1, 150, :_reduce_215,
   1, 150, :_reduce_none,
-  0, 151, :_reduce_217,
-  3, 151, :_reduce_218,
-  1, 151, :_reduce_219,
-  3, 151, :_reduce_220,
-  1, 151, :_reduce_221,
-  1, 151, :_reduce_222,
-  2, 145, :_reduce_223,
-  3, 147, :_reduce_224,
-  3, 149, :_reduce_225,
-  3, 152, :_reduce_226,
-  4, 153, :_reduce_227,
-  3, 154, :_reduce_228,
-  0, 155, :_reduce_none,
-  1, 155, :_reduce_none,
-  1, 155, :_reduce_none,
-  1, 155, :_reduce_none,
-  2, 108, :_reduce_233,
-  1, 156, :_reduce_none,
-  1, 156, :_reduce_none,
-  1, 156, :_reduce_none,
-  2, 120, :_reduce_237,
-  2, 98, :_reduce_238,
-  0, 140, :_reduce_239,
-  1, 140, :_reduce_240,
-  2, 140, :_reduce_241,
-  1, 140, :_reduce_242 ]
-racc_reduce_n = 243
-racc_shift_n = 412
+  3, 152, :_reduce_217,
+  1, 152, :_reduce_218,
+  1, 152, :_reduce_none,
+  0, 153, :_reduce_220,
+  3, 153, :_reduce_221,
+  1, 153, :_reduce_222,
+  3, 153, :_reduce_223,
+  1, 153, :_reduce_224,
+  1, 153, :_reduce_225,
+  2, 147, :_reduce_226,
+  3, 149, :_reduce_227,
+  3, 151, :_reduce_228,
+  3, 154, :_reduce_229,
+  4, 155, :_reduce_230,
+  3, 156, :_reduce_231,
+  0, 157, :_reduce_none,
+  1, 157, :_reduce_none,
+  1, 157, :_reduce_none,
+  1, 157, :_reduce_none,
+  2, 108, :_reduce_236,
+  1, 158, :_reduce_none,
+  1, 158, :_reduce_none,
+  1, 158, :_reduce_none,
+  2, 121, :_reduce_240,
+  2, 98, :_reduce_241,
+  0, 141, :_reduce_242,
+  1, 141, :_reduce_243,
+  2, 141, :_reduce_244,
+  1, 141, :_reduce_245 ]
+racc_reduce_n = 246
+racc_shift_n = 419
 racc_token_table = {
   false => 0,
@@ -1295,6 +1319,7 @@ Racc_token_to_s_table = [
   "var_type_member",
   "attribute_member",
   "alias_member",
+  "attribute_kind",
   "keyword",
   "method_name",
   "attr_var_opt",
@@ -1306,11 +1331,11 @@ Racc_token_to_s_table = [
   "method_kind",
   "def_name",
   "method_types",
+  "proc_type",
   "params_opt",
-  "block_opt",
-  "simple_type",
   "params",
-  "function_type",
+  "block",
+  "simple_function_type",
   "method_name0",
   "identifier_keywords",
   "module_type_params0",
@@ -1319,6 +1344,7 @@ Racc_token_to_s_table = [
   "type_param_variance",
   "type_params0",
   "namespace",
+  "simple_type",
   "record_type",
   "record_fields",
   "record_field",
@@ -1649,12 +1675,27 @@ module_eval(<<'.,.,', 'parser.y', 199)
 # reduce 45 omitted
-module_eval(<<'.,.,', 'parser.y', 206)
+module_eval(<<'.,.,', 'parser.y', 205)
   def _reduce_46(val, _values, result)
-            location = val[1].location + val[3].location
-        result = Members::AttrReader.new(name: val[2].value,
+     result = :instance
+    result
+  end
+.,.,
+module_eval(<<'.,.,', 'parser.y', 206)
+  def _reduce_47(val, _values, result)
+     result = :singleton
+    result
+  end
+.,.,
+module_eval(<<'.,.,', 'parser.y', 210)
+  def _reduce_48(val, _values, result)
+            location = val[1].location + val[4].location
+        result = Members::AttrReader.new(name: val[3].value,
                                          ivar_name: nil,
-                                         type: val[3],
+                                         type: val[4],
+                                         kind: val[2],
                                          annotations: val[0],
                                          location: location,
                                          comment: leading_comment(val[0].first&.location || location))
@@ -1663,12 +1704,13 @@ module_eval(<<'.,.,', 'parser.y', 206)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 215)
-  def _reduce_47(val, _values, result)
-            location = val[1].location + val[5].location
-        result = Members::AttrReader.new(name: val[2].value.to_sym,
-                                         ivar_name: val[3],
-                                         type: val[5],
+module_eval(<<'.,.,', 'parser.y', 220)
+  def _reduce_49(val, _values, result)
+            location = val[1].location + val[6].location
+        result = Members::AttrReader.new(name: val[3].value.to_sym,
+                                         ivar_name: val[4],
+                                         type: val[6],
+                                         kind: val[2],
                                          annotations: val[0],
                                          location: location,
                                          comment: leading_comment(val[0].first&.location || location))
@@ -1677,12 +1719,13 @@ module_eval(<<'.,.,', 'parser.y', 215)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 224)
-  def _reduce_48(val, _values, result)
-            location = val[1].location + val[3].location
-        result = Members::AttrWriter.new(name: val[2].value,
+module_eval(<<'.,.,', 'parser.y', 230)
+  def _reduce_50(val, _values, result)
+            location = val[1].location + val[4].location
+        result = Members::AttrWriter.new(name: val[3].value,
                                          ivar_name: nil,
-                                         type: val[3],
+                                         kind: val[2],
+                                         type: val[4],
                                          annotations: val[0],
                                          location: location,
                                          comment: leading_comment(val[0].first&.location || location))
@@ -1691,12 +1734,13 @@ module_eval(<<'.,.,', 'parser.y', 224)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 233)
-  def _reduce_49(val, _values, result)
-            location = val[1].location + val[5].location
-        result = Members::AttrWriter.new(name: val[2].value.to_sym,
-                                         ivar_name: val[3],
-                                         type: val[5],
+module_eval(<<'.,.,', 'parser.y', 240)
+  def _reduce_51(val, _values, result)
+            location = val[1].location + val[6].location
+        result = Members::AttrWriter.new(name: val[3].value.to_sym,
+                                         ivar_name: val[4],
+                                         kind: val[2],
+                                         type: val[6],
                                          annotations: val[0],
                                          location: location,
                                          comment: leading_comment(val[0].first&.location || location))
@@ -1705,12 +1749,13 @@ module_eval(<<'.,.,', 'parser.y', 233)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 242)
-  def _reduce_50(val, _values, result)
-            location = val[1].location + val[3].location
-        result = Members::AttrAccessor.new(name: val[2].value,
+module_eval(<<'.,.,', 'parser.y', 250)
+  def _reduce_52(val, _values, result)
+            location = val[1].location + val[4].location
+        result = Members::AttrAccessor.new(name: val[3].value,
                                            ivar_name: nil,
-                                           type: val[3],
+                                           kind: val[2],
+                                           type: val[4],
                                            annotations: val[0],
                                            location: location,
                                            comment: leading_comment(val[0].first&.location || location))
@@ -1719,12 +1764,13 @@ module_eval(<<'.,.,', 'parser.y', 242)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 251)
-  def _reduce_51(val, _values, result)
-            location = val[1].location + val[5].location
-        result = Members::AttrAccessor.new(name: val[2].value.to_sym,
-                                           ivar_name: val[3],
-                                           type: val[5],
+module_eval(<<'.,.,', 'parser.y', 260)
+  def _reduce_53(val, _values, result)
+            location = val[1].location + val[6].location
+        result = Members::AttrAccessor.new(name: val[3].value.to_sym,
+                                           ivar_name: val[4],
+                                           kind: val[2],
+                                           type: val[6],
                                            annotations: val[0],
                                            location: location,
                                            comment: leading_comment(val[0].first&.location || location))
@@ -1733,29 +1779,29 @@ module_eval(<<'.,.,', 'parser.y', 251)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 261)
-  def _reduce_52(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 271)
+  def _reduce_54(val, _values, result)
      result = nil
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 262)
-  def _reduce_53(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 272)
+  def _reduce_55(val, _values, result)
      result = false
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 263)
-  def _reduce_54(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 273)
+  def _reduce_56(val, _values, result)
      result = val[1].value
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 267)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 277)
+  def _reduce_57(val, _values, result)
             location = val[0].location + val[2].location
         result = Members::InstanceVariable.new(
           name: val[0].value,
@@ -1768,8 +1814,8 @@ module_eval(<<'.,.,', 'parser.y', 267)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 276)
-  def _reduce_56(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 286)
+  def _reduce_58(val, _values, result)
             type = val[2]
         if type.is_a?(Types::Variable)
@@ -1792,8 +1838,8 @@ module_eval(<<'.,.,', 'parser.y', 276)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 295)
-  def _reduce_57(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 305)
+  def _reduce_59(val, _values, result)
           type = val[4]
       if type.is_a?(Types::Variable)
@@ -1816,8 +1862,8 @@ module_eval(<<'.,.,', 'parser.y', 295)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 316)
-  def _reduce_58(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 326)
+  def _reduce_60(val, _values, result)
             reset_variable_scope
         location = val[1].location + val[6].location
@@ -1834,23 +1880,23 @@ module_eval(<<'.,.,', 'parser.y', 316)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 330)
-  def _reduce_59(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 340)
+  def _reduce_61(val, _values, result)
      result = []
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 332)
-  def _reduce_60(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 342)
+  def _reduce_62(val, _values, result)
             result = val[0].push(val[1])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 337)
-  def _reduce_61(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 347)
+  def _reduce_63(val, _values, result)
             unless val[0].kind == :instance
           raise SemanticsError.new("Interface cannot have singleton method", subject: val[0], location: val[0].location)
         end
@@ -1865,8 +1911,8 @@ module_eval(<<'.,.,', 'parser.y', 337)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 348)
-  def _reduce_62(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 358)
+  def _reduce_64(val, _values, result)
             unless val[0].name.interface?
           raise SemanticsError.new("Interface should include an interface", subject: val[0], location: val[0].location)
         end
@@ -1877,10 +1923,10 @@ module_eval(<<'.,.,', 'parser.y', 348)
   end
 .,.,
-# reduce 63 omitted
+# reduce 65 omitted
-module_eval(<<'.,.,', 'parser.y', 358)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 368)
+  def _reduce_66(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should include module or interface", subject: val[2].value, location: val[2].location)
         end
@@ -1895,8 +1941,8 @@ module_eval(<<'.,.,', 'parser.y', 358)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 369)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 379)
+  def _reduce_67(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should include module or interface", subject: val[2].value, location: val[2].location)
         end
@@ -1911,8 +1957,8 @@ module_eval(<<'.,.,', 'parser.y', 369)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 382)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 392)
+  def _reduce_68(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should extend module or interface", subject: val[2].value, location: val[2].location)
         end
@@ -1927,8 +1973,8 @@ module_eval(<<'.,.,', 'parser.y', 382)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 393)
-  def _reduce_67(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 403)
+  def _reduce_69(val, _values, result)
             if val[2].value.alias?
           raise SemanticsError.new("Should extend module or interface", subject: val[2].value, location: val[2].location)
         end
@@ -1943,8 +1989,8 @@ module_eval(<<'.,.,', 'parser.y', 393)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 406)
-  def _reduce_68(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 416)
+  def _reduce_70(val, _values, result)
             unless val[2].value.class?
           raise SemanticsError.new("Should prepend module", subject: val[2].value, location: val[2].location)
         end
@@ -1959,8 +2005,8 @@ module_eval(<<'.,.,', 'parser.y', 406)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 417)
-  def _reduce_69(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 427)
+  def _reduce_71(val, _values, result)
             unless val[2].value.class?
           raise SemanticsError.new("Should prepend module", subject: val[2].value, location: val[2].location)
         end
@@ -1975,15 +2021,15 @@ module_eval(<<'.,.,', 'parser.y', 417)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 429)
-  def _reduce_70(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 439)
+  def _reduce_72(val, _values, result)
      result = nil
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 431)
-  def _reduce_71(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 441)
+  def _reduce_73(val, _values, result)
             RBS.logger.warn "`overload def` syntax is deprecated. Use `...` syntax instead."
         result = val[0]
@@ -1991,8 +2037,8 @@ module_eval(<<'.,.,', 'parser.y', 431)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 437)
-  def _reduce_72(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 447)
+  def _reduce_74(val, _values, result)
             location = val[3].location + val[6].last.location
         last_type = val[6].last
@@ -2017,80 +2063,67 @@ module_eval(<<'.,.,', 'parser.y', 437)
   end
 .,.,
-# reduce 73 omitted
+# reduce 75 omitted
-module_eval(<<'.,.,', 'parser.y', 460)
-  def _reduce_74(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 470)
+  def _reduce_76(val, _values, result)
             RBS.logger.warn "`incompatible` method attribute is deprecated and ignored."
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 464)
-  def _reduce_75(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 474)
+  def _reduce_77(val, _values, result)
      result = :instance
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 465)
-  def _reduce_76(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 475)
+  def _reduce_78(val, _values, result)
      result = :singleton
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 466)
-  def _reduce_77(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 476)
+  def _reduce_79(val, _values, result)
      result = :singleton_instance
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 469)
-  def _reduce_78(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 479)
+  def _reduce_80(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 470)
-  def _reduce_79(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 480)
+  def _reduce_81(val, _values, result)
      result = [LocatedValue.new(value: :dot3, location: val[0].location)]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 472)
-  def _reduce_80(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 482)
+  def _reduce_82(val, _values, result)
             result = val[2].unshift(val[0])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 477)
-  def _reduce_81(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 487)
+  def _reduce_83(val, _values, result)
             reset_variable_scope
-        location = (val[1] || val[2] || val[3] || val[4]).location + val[5].location
+        location = (val[1] || val[2]).location + val[2].location
         type_params = val[1]&.value || []
-        params = val[2]&.value || empty_params_result
-        type = Types::Function.new(
-          required_positionals: params[0],
-          optional_positionals: params[1],
-          rest_positionals: params[2],
-          trailing_positionals: params[3],
-          required_keywords: params[4],
-          optional_keywords: params[5],
-          rest_keywords: params[6],
-          return_type: val[5]
-        )
-        block = val[3]&.value
+        type, block = val[2].value
         result = MethodType.new(type_params: type_params,
                                 type: type,
@@ -2101,50 +2134,43 @@ module_eval(<<'.,.,', 'parser.y', 477)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 504)
-  def _reduce_82(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 501)
+  def _reduce_84(val, _values, result)
      result = nil
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 506)
-  def _reduce_83(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 503)
+  def _reduce_85(val, _values, result)
             result = LocatedValue.new(value: val[1], location: val[0].location + val[2].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 510)
-  def _reduce_84(val, _values, result)
-     result = nil
-    result
-  end
-.,.,
-module_eval(<<'.,.,', 'parser.y', 512)
-  def _reduce_85(val, _values, result)
-            block = MethodType::Block.new(type: val[1].value, required: true)
+module_eval(<<'.,.,', 'parser.y', 508)
+  def _reduce_86(val, _values, result)
+            block = Types::Block.new(type: val[1].value, required: true)
         result = LocatedValue.new(value: block, location: val[0].location + val[2].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 516)
-  def _reduce_86(val, _values, result)
-            block = MethodType::Block.new(type: val[2].value, required: false)
+module_eval(<<'.,.,', 'parser.y', 512)
+  def _reduce_87(val, _values, result)
+            block = Types::Block.new(type: val[2].value, required: false)
         result = LocatedValue.new(value: block, location: val[0].location + val[3].location)
     result
   end
 .,.,
-# reduce 87 omitted
+# reduce 88 omitted
-module_eval(<<'.,.,', 'parser.y', 523)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 519)
+  def _reduce_89(val, _values, result)
             result = LocatedValue.new(value: val[0].value.to_sym,
                                   location: val[0].location + val[1].location)
@@ -2152,8 +2178,6 @@ module_eval(<<'.,.,', 'parser.y', 523)
   end
 .,.,
-# reduce 89 omitted
 # reduce 90 omitted
 # reduce 91 omitted
@@ -2170,8 +2194,10 @@ module_eval(<<'.,.,', 'parser.y', 523)
 # reduce 97 omitted
-module_eval(<<'.,.,', 'parser.y', 532)
-  def _reduce_98(val, _values, result)
+# reduce 98 omitted
+module_eval(<<'.,.,', 'parser.y', 528)
+  def _reduce_99(val, _values, result)
             unless val[0].location.pred?(val[1].location)
           raise SyntaxError.new(token_str: "kQUESTION", error_value: val[1])
         end
@@ -2183,8 +2209,8 @@ module_eval(<<'.,.,', 'parser.y', 532)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 540)
-  def _reduce_99(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 536)
+  def _reduce_100(val, _values, result)
             unless val[0].location.pred?(val[1].location)
           raise SyntaxError.new(token_str: "kEXCLAMATION", error_value: val[1])
         end
@@ -2196,8 +2222,6 @@ module_eval(<<'.,.,', 'parser.y', 540)
   end
 .,.,
-# reduce 100 omitted
 # reduce 101 omitted
 # reduce 102 omitted
@@ -2276,15 +2300,17 @@ module_eval(<<'.,.,', 'parser.y', 540)
 # reduce 139 omitted
-module_eval(<<'.,.,', 'parser.y', 560)
-  def _reduce_140(val, _values, result)
+# reduce 140 omitted
+module_eval(<<'.,.,', 'parser.y', 556)
+  def _reduce_141(val, _values, result)
      result = nil
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 562)
-  def _reduce_141(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 558)
+  def _reduce_142(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)
@@ -2293,8 +2319,8 @@ module_eval(<<'.,.,', 'parser.y', 562)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 569)
-  def _reduce_142(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 565)
+  def _reduce_143(val, _values, result)
             result = Declarations::ModuleTypeParams.new()
         result.add(val[0])
@@ -2302,16 +2328,16 @@ module_eval(<<'.,.,', 'parser.y', 569)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 573)
-  def _reduce_143(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 569)
+  def _reduce_144(val, _values, result)
             result = val[0].add(val[2])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 578)
-  def _reduce_144(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 574)
+  def _reduce_145(val, _values, result)
             result = Declarations::ModuleTypeParams::TypeParam.new(name: val[2].value.to_sym,
                                                                variance: val[1],
                                                                skip_validation: val[0])
@@ -2320,50 +2346,50 @@ module_eval(<<'.,.,', 'parser.y', 578)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 584)
-  def _reduce_145(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 580)
+  def _reduce_146(val, _values, result)
      result = :invariant
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 585)
-  def _reduce_146(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 581)
+  def _reduce_147(val, _values, result)
      result = :covariant
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 586)
-  def _reduce_147(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 582)
+  def _reduce_148(val, _values, result)
      result = :contravariant
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 589)
-  def _reduce_148(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 585)
+  def _reduce_149(val, _values, result)
      result = false
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 590)
-  def _reduce_149(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 586)
+  def _reduce_150(val, _values, result)
      result = true
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 593)
-  def _reduce_150(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 589)
+  def _reduce_151(val, _values, result)
      result = nil
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 595)
-  def _reduce_151(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 591)
+  def _reduce_152(val, _values, result)
             val[1].each {|var| insert_bound_variable(var) }
         result = LocatedValue.new(value: val[1],
@@ -2373,24 +2399,24 @@ module_eval(<<'.,.,', 'parser.y', 595)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 603)
-  def _reduce_152(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 599)
+  def _reduce_153(val, _values, result)
             result = [val[0].value.to_sym]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 606)
-  def _reduce_153(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 602)
+  def _reduce_154(val, _values, result)
             result = val[0].push(val[2].value.to_sym)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 611)
-  def _reduce_154(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 607)
+  def _reduce_155(val, _values, result)
             location = val[1].location + val[3].location
         result = Members::Alias.new(
           new_name: val[2].value.to_sym,
@@ -2405,8 +2431,8 @@ module_eval(<<'.,.,', 'parser.y', 611)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 622)
-  def _reduce_155(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 618)
+  def _reduce_156(val, _values, result)
             location = val[1].location + val[7].location
         result = Members::Alias.new(
           new_name: val[4].value.to_sym,
@@ -2421,8 +2447,8 @@ module_eval(<<'.,.,', 'parser.y', 622)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 635)
-  def _reduce_156(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 631)
+  def _reduce_157(val, _values, result)
             location = val[1].location + val[4].location
         result = Declarations::Alias.new(name: val[2].value,
                                          type: val[4],
@@ -2434,8 +2460,8 @@ module_eval(<<'.,.,', 'parser.y', 635)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 645)
-  def _reduce_157(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 641)
+  def _reduce_158(val, _values, result)
             location = val[0].location + val[2].location
         result = Declarations::Constant.new(name: val[0].value,
                                             type: val[2],
@@ -2446,8 +2472,8 @@ module_eval(<<'.,.,', 'parser.y', 645)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 652)
-  def _reduce_158(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 648)
+  def _reduce_159(val, _values, result)
             location = (val[0] || val[1]).location + val[2].location
         name = TypeName.new(name: val[1].value, namespace: val[0]&.value || Namespace.empty)
         result = Declarations::Constant.new(name: name,
@@ -2459,8 +2485,8 @@ module_eval(<<'.,.,', 'parser.y', 652)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 662)
-  def _reduce_159(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 658)
+  def _reduce_160(val, _values, result)
             location = val[0].location + val[2].location
         result = Declarations::Global.new(name: val[0].value.to_sym,
                                           type: val[2],
@@ -2471,10 +2497,10 @@ module_eval(<<'.,.,', 'parser.y', 662)
   end
 .,.,
-# reduce 160 omitted
+# reduce 161 omitted
-module_eval(<<'.,.,', 'parser.y', 672)
-  def _reduce_161(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 668)
+  def _reduce_162(val, _values, result)
             types = case l = val[0]
                 when Types::Union
                   l.types + [val[2]]
@@ -2488,8 +2514,8 @@ module_eval(<<'.,.,', 'parser.y', 672)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 682)
-  def _reduce_162(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 678)
+  def _reduce_163(val, _values, result)
             types = case l = val[0]
                 when Types::Intersection
                   l.types + [val[2]]
@@ -2504,16 +2530,16 @@ module_eval(<<'.,.,', 'parser.y', 682)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 695)
-  def _reduce_163(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 691)
+  def _reduce_164(val, _values, result)
             result = Types::Bases::Void.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 698)
-  def _reduce_164(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 694)
+  def _reduce_165(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)
@@ -2521,56 +2547,56 @@ module_eval(<<'.,.,', 'parser.y', 698)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 702)
-  def _reduce_165(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 698)
+  def _reduce_166(val, _values, result)
             result = Types::Bases::Any.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 705)
-  def _reduce_166(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 701)
+  def _reduce_167(val, _values, result)
             result = Types::Bases::Bool.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 708)
-  def _reduce_167(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 704)
+  def _reduce_168(val, _values, result)
             result = Types::Bases::Nil.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 711)
-  def _reduce_168(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 707)
+  def _reduce_169(val, _values, result)
             result = Types::Bases::Top.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 714)
-  def _reduce_169(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 710)
+  def _reduce_170(val, _values, result)
             result = Types::Bases::Bottom.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 717)
-  def _reduce_170(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 713)
+  def _reduce_171(val, _values, result)
             result = Types::Bases::Self.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 720)
-  def _reduce_171(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 716)
+  def _reduce_172(val, _values, result)
             result = Types::Optional.new(type: Types::Bases::Self.new(location: val[0].location),
                                      location: val[0].location)
@@ -2578,64 +2604,64 @@ module_eval(<<'.,.,', 'parser.y', 720)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 724)
-  def _reduce_172(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 720)
+  def _reduce_173(val, _values, result)
             result = Types::Bases::Instance.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 727)
-  def _reduce_173(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 723)
+  def _reduce_174(val, _values, result)
             result = Types::Bases::Class.new(location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 730)
-  def _reduce_174(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 726)
+  def _reduce_175(val, _values, result)
             result = Types::Literal.new(literal: true, location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 733)
-  def _reduce_175(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 729)
+  def _reduce_176(val, _values, result)
             result = Types::Literal.new(literal: false, location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 736)
-  def _reduce_176(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 732)
+  def _reduce_177(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 739)
-  def _reduce_177(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 735)
+  def _reduce_178(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 742)
-  def _reduce_178(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 738)
+  def _reduce_179(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 745)
-  def _reduce_179(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 741)
+  def _reduce_180(val, _values, result)
             name = val[0].value
         args = []
         location = val[0].location
@@ -2657,8 +2683,8 @@ module_eval(<<'.,.,', 'parser.y', 745)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 763)
-  def _reduce_180(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 759)
+  def _reduce_181(val, _values, result)
             name = val[0].value
         args = val[2]
         location = val[0].location + val[3].location
@@ -2679,8 +2705,8 @@ module_eval(<<'.,.,', 'parser.y', 763)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 780)
-  def _reduce_181(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 776)
+  def _reduce_182(val, _values, result)
             location = val[0].location + val[1].location
         result = Types::Tuple.new(types: [], location: location)
@@ -2688,8 +2714,8 @@ module_eval(<<'.,.,', 'parser.y', 780)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 784)
-  def _reduce_182(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 780)
+  def _reduce_183(val, _values, result)
             location = val[0].location + val[2].location
         types = val[1]
         result = Types::Tuple.new(types: types, location: location)
@@ -2698,8 +2724,8 @@ module_eval(<<'.,.,', 'parser.y', 784)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 789)
-  def _reduce_183(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 785)
+  def _reduce_184(val, _values, result)
             type = val[1].dup
         type.instance_eval do
           @location = val[0].location + val[2].location
@@ -2710,8 +2736,8 @@ module_eval(<<'.,.,', 'parser.y', 789)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 796)
-  def _reduce_184(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 792)
+  def _reduce_185(val, _values, result)
             result = Types::ClassSingleton.new(name: val[2].value,
                                            location: val[0].location + val[3].location)
@@ -2719,42 +2745,43 @@ module_eval(<<'.,.,', 'parser.y', 796)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 800)
-  def _reduce_185(val, _values, result)
-            result = Types::Proc.new(type: val[1].value, location: val[0].location + val[1].location)
+module_eval(<<'.,.,', 'parser.y', 796)
+  def _reduce_186(val, _values, result)
+            type, block = val[1].value
+        result = Types::Proc.new(type: type, block: block, location: val[0].location + val[1].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 803)
-  def _reduce_186(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 800)
+  def _reduce_187(val, _values, result)
             result = Types::Optional.new(type: val[0], location: val[0].location + val[1].location)
     result
   end
 .,.,
-# reduce 187 omitted
+# reduce 188 omitted
-module_eval(<<'.,.,', 'parser.y', 809)
-  def _reduce_188(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 806)
+  def _reduce_189(val, _values, result)
             result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 812)
-  def _reduce_189(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 809)
+  def _reduce_190(val, _values, result)
             result = val[0] + [val[2]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 817)
-  def _reduce_190(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 814)
+  def _reduce_191(val, _values, result)
             result = Types::Record.new(
           fields: val[1],
           location: val[0].location + val[2].location
@@ -2764,74 +2791,107 @@ module_eval(<<'.,.,', 'parser.y', 817)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 825)
-  def _reduce_191(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 822)
+  def _reduce_192(val, _values, result)
             result = val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 828)
-  def _reduce_192(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 825)
+  def _reduce_193(val, _values, result)
             result = val[0].merge!(val[2])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 833)
-  def _reduce_193(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 830)
+  def _reduce_194(val, _values, result)
             result = { val[0].value => val[2] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 836)
-  def _reduce_194(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 833)
+  def _reduce_195(val, _values, result)
             result = { val[0].value => val[2] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 839)
-  def _reduce_195(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 836)
+  def _reduce_196(val, _values, result)
             result = { val[0].value => val[2] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 842)
-  def _reduce_196(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 839)
+  def _reduce_197(val, _values, result)
             result = { val[0].value => val[1] }
     result
   end
 .,.,
-# reduce 197 omitted
+# reduce 198 omitted
-module_eval(<<'.,.,', 'parser.y', 848)
-  def _reduce_198(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 845)
+  def _reduce_199(val, _values, result)
             result = val[0]
     result
   end
 .,.,
-# reduce 199 omitted
 # reduce 200 omitted
 # reduce 201 omitted
 # reduce 202 omitted
-module_eval(<<'.,.,', 'parser.y', 855)
-  def _reduce_203(val, _values, result)
+# reduce 203 omitted
+module_eval(<<'.,.,', 'parser.y', 852)
+  def _reduce_204(val, _values, result)
+            location = (val[0] || val[1] || val[2]).location + val[3].location
+        params = val[0]&.value || [[], [], nil, [], {}, {}, nil]
+        type = Types::Function.new(
+          required_positionals: params[0],
+          optional_positionals: params[1],
+          rest_positionals: params[2],
+          trailing_positionals: params[3],
+          required_keywords: params[4],
+          optional_keywords: params[5],
+          rest_keywords: params[6],
+          return_type: val[3]
+        )
+        block = val[1].value
+        result = LocatedValue.new(value: [type, block], location: location)
+    result
+  end
+.,.,
+module_eval(<<'.,.,', 'parser.y', 872)
+  def _reduce_205(val, _values, result)
+            result = LocatedValue.new(value: [val[0].value, nil], location: val[0].location)
+    result
+  end
+.,.,
+module_eval(<<'.,.,', 'parser.y', 877)
+  def _reduce_206(val, _values, result)
             location = val[0].location + val[4].location
         type = Types::Function.new(
           required_positionals: val[1][0],
@@ -2850,8 +2910,8 @@ module_eval(<<'.,.,', 'parser.y', 855)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 870)
-  def _reduce_204(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 892)
+  def _reduce_207(val, _values, result)
             location = val[0].location + val[1].location
         type = Types::Function.new(
           required_positionals: [],
@@ -2870,8 +2930,8 @@ module_eval(<<'.,.,', 'parser.y', 870)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 887)
-  def _reduce_205(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 909)
+  def _reduce_208(val, _values, result)
             result = val[2]
         result[0].unshift(val[0])
@@ -2879,8 +2939,8 @@ module_eval(<<'.,.,', 'parser.y', 887)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 891)
-  def _reduce_206(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 913)
+  def _reduce_209(val, _values, result)
             result = empty_params_result
         result[0].unshift(val[0])
@@ -2888,10 +2948,10 @@ module_eval(<<'.,.,', 'parser.y', 891)
   end
 .,.,
-# reduce 207 omitted
+# reduce 210 omitted
-module_eval(<<'.,.,', 'parser.y', 898)
-  def _reduce_208(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 920)
+  def _reduce_211(val, _values, result)
             result = val[2]
         result[1].unshift(val[0])
@@ -2899,8 +2959,8 @@ module_eval(<<'.,.,', 'parser.y', 898)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 902)
-  def _reduce_209(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 924)
+  def _reduce_212(val, _values, result)
             result = empty_params_result
         result[1].unshift(val[0])
@@ -2908,10 +2968,10 @@ module_eval(<<'.,.,', 'parser.y', 902)
   end
 .,.,
-# reduce 210 omitted
+# reduce 213 omitted
-module_eval(<<'.,.,', 'parser.y', 909)
-  def _reduce_211(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 931)
+  def _reduce_214(val, _values, result)
             result = val[2]
         result[2] = val[0]
@@ -2919,8 +2979,8 @@ module_eval(<<'.,.,', 'parser.y', 909)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 913)
-  def _reduce_212(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 935)
+  def _reduce_215(val, _values, result)
             result = empty_params_result
         result[2] = val[0]
@@ -2928,10 +2988,10 @@ module_eval(<<'.,.,', 'parser.y', 913)
   end
 .,.,
-# reduce 213 omitted
+# reduce 216 omitted
-module_eval(<<'.,.,', 'parser.y', 920)
-  def _reduce_214(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 942)
+  def _reduce_217(val, _values, result)
             result = val[2]
         result[3].unshift(val[0])
@@ -2939,8 +2999,8 @@ module_eval(<<'.,.,', 'parser.y', 920)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 924)
-  def _reduce_215(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 946)
+  def _reduce_218(val, _values, result)
             result = empty_params_result
         result[3].unshift(val[0])
@@ -2948,18 +3008,18 @@ module_eval(<<'.,.,', 'parser.y', 924)
   end
 .,.,
-# reduce 216 omitted
+# reduce 219 omitted
-module_eval(<<'.,.,', 'parser.y', 931)
-  def _reduce_217(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 953)
+  def _reduce_220(val, _values, result)
             result = empty_params_result
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 934)
-  def _reduce_218(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 956)
+  def _reduce_221(val, _values, result)
             result = val[2]
         result[4].merge!(val[0])
@@ -2967,8 +3027,8 @@ module_eval(<<'.,.,', 'parser.y', 934)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 938)
-  def _reduce_219(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 960)
+  def _reduce_222(val, _values, result)
             result = empty_params_result
         result[4].merge!(val[0])
@@ -2976,8 +3036,8 @@ module_eval(<<'.,.,', 'parser.y', 938)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 942)
-  def _reduce_220(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 964)
+  def _reduce_223(val, _values, result)
             result = val[2]
         result[5].merge!(val[0])
@@ -2985,8 +3045,8 @@ module_eval(<<'.,.,', 'parser.y', 942)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 946)
-  def _reduce_221(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 968)
+  def _reduce_224(val, _values, result)
             result = empty_params_result
         result[5].merge!(val[0])
@@ -2994,8 +3054,8 @@ module_eval(<<'.,.,', 'parser.y', 946)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 950)
-  def _reduce_222(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 972)
+  def _reduce_225(val, _values, result)
             result = empty_params_result
         result[6] = val[0]
@@ -3003,8 +3063,8 @@ module_eval(<<'.,.,', 'parser.y', 950)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 956)
-  def _reduce_223(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 978)
+  def _reduce_226(val, _values, result)
             result = Types::Function::Param.new(type: val[0],
                                             name: val[1]&.value&.to_sym)
@@ -3012,8 +3072,8 @@ module_eval(<<'.,.,', 'parser.y', 956)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 962)
-  def _reduce_224(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 984)
+  def _reduce_227(val, _values, result)
             result = Types::Function::Param.new(type: val[1],
                                             name: val[2]&.value&.to_sym)
@@ -3021,8 +3081,8 @@ module_eval(<<'.,.,', 'parser.y', 962)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 968)
-  def _reduce_225(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 990)
+  def _reduce_228(val, _values, result)
             result = Types::Function::Param.new(type: val[1],
                                             name: val[2]&.value&.to_sym)
@@ -3030,8 +3090,8 @@ module_eval(<<'.,.,', 'parser.y', 968)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 974)
-  def _reduce_226(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 996)
+  def _reduce_229(val, _values, result)
             param = Types::Function::Param.new(type: val[1],
                                            name: val[2]&.value&.to_sym)
         result = { val[0].value => param }
@@ -3040,8 +3100,8 @@ module_eval(<<'.,.,', 'parser.y', 974)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 981)
-  def _reduce_227(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1003)
+  def _reduce_230(val, _values, result)
             param = Types::Function::Param.new(type: val[2],
                                            name: val[3]&.value&.to_sym)
         result = { val[1].value => param }
@@ -3050,8 +3110,8 @@ module_eval(<<'.,.,', 'parser.y', 981)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 988)
-  def _reduce_228(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1010)
+  def _reduce_231(val, _values, result)
             result = Types::Function::Param.new(type: val[1],
                                             name: val[2]&.value&.to_sym)
@@ -3059,16 +3119,16 @@ module_eval(<<'.,.,', 'parser.y', 988)
   end
 .,.,
-# reduce 229 omitted
+# reduce 232 omitted
-# reduce 230 omitted
+# reduce 233 omitted
-# reduce 231 omitted
+# reduce 234 omitted
-# reduce 232 omitted
+# reduce 235 omitted
-module_eval(<<'.,.,', 'parser.y', 997)
-  def _reduce_233(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1019)
+  def _reduce_236(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
         type_name = TypeName.new(namespace: namespace, name: name)
@@ -3079,14 +3139,14 @@ module_eval(<<'.,.,', 'parser.y', 997)
   end
 .,.,
-# reduce 234 omitted
+# reduce 237 omitted
-# reduce 235 omitted
+# reduce 238 omitted
-# reduce 236 omitted
+# reduce 239 omitted
-module_eval(<<'.,.,', 'parser.y', 1009)
-  def _reduce_237(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1031)
+  def _reduce_240(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
         type_name = TypeName.new(namespace: namespace, name: name)
@@ -3097,8 +3157,8 @@ module_eval(<<'.,.,', 'parser.y', 1009)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 1018)
-  def _reduce_238(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1040)
+  def _reduce_241(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
         type_name = TypeName.new(namespace: namespace, name: name)
@@ -3109,24 +3169,24 @@ module_eval(<<'.,.,', 'parser.y', 1018)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 1027)
-  def _reduce_239(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1049)
+  def _reduce_242(val, _values, result)
             result = nil
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 1030)
-  def _reduce_240(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1052)
+  def _reduce_243(val, _values, result)
             result = LocatedValue.new(value: Namespace.root, location: val[0].location)
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 1033)
-  def _reduce_241(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1055)
+  def _reduce_244(val, _values, result)
             namespace = Namespace.parse(val[1].value).absolute!
         result = LocatedValue.new(value: namespace, location: val[0].location + val[1].location)
@@ -3134,8 +3194,8 @@ module_eval(<<'.,.,', 'parser.y', 1033)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 1037)
-  def _reduce_242(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 1059)
+  def _reduce_245(val, _values, result)
             namespace = Namespace.parse(val[0].value)
         result = LocatedValue.new(value: namespace, location: val[0].location)