rbs 0.14.0 → 0.18.1

data/lib/rbs/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.5.0
+# This file is automatically generated by Racc 1.5.1
 # from Racc grammar file "".
 #
 
@@ -8,7 +8,7 @@ require 'racc/parser.rb'
 module RBS
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 1042)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 1044)
 
 Types = RBS::Types
 Namespace = RBS::Namespace
@@ -136,14 +136,21 @@ end
 
 def new_token(type, value = input.matched)
   charpos = charpos(input)
-  start_index = charpos - input.matched.size
-  end_index = charpos
+  matched = input.matched
 
-  location = RBS::Location.new(buffer: buffer,
-                                           start_pos: start_index,
-                                           end_pos: end_index)
+  if matched
+    start_index = charpos - matched.size
+    end_index = charpos
 
-  [type, LocatedValue.new(location: location, value: value)]
+    location = RBS::Location.new(buffer: buffer,
+                                 start_pos: start_index,
+                                 end_pos: end_index)
+
+    [type, LocatedValue.new(location: location, value: value)]
+  else
+    # scanner hasn't matched yet
+    [false, nil]
+  end
 end
 
 def charpos(scanner)
@@ -262,10 +269,10 @@ def next_token
     return [:"type_#{type}", nil]
   end
 
-  return if @eof
+  return new_token(false, '') if @eof
 
   while true
-    return if input.eos?
+    return new_token(false, '') if input.eos?
 
     case
     when input.scan(/\s+/)
@@ -376,118 +383,118 @@ end
 ##### State transition tables begin ###
 
 clist = [
-'341,342,33,343,406,76,5,33,33,380,354,37,50,33,33,340,42,379,352,2,3',
-'4,209,210,211,212,213,214,215,216,220,33,217,208,218,219,104,115,105',
-'106,107,121,33,32,51,336,330,331,32,32,334,332,335,301,32,32,33,333',
-'120,108,109,110,112,114,113,329,338,339,111,116,118,196,32,199,87,122',
-'123,119,124,341,342,33,343,32,58,59,60,61,279,280,43,33,33,33,340,231',
-'50,32,200,88,197,209,210,211,212,213,214,215,216,220,361,217,208,218',
-'219,104,115,105,106,107,121,33,32,48,336,330,331,50,51,334,332,335,32',
-'32,32,88,333,120,108,109,110,112,114,113,329,338,339,111,116,118,341',
-'342,320,343,122,123,119,124,66,51,158,39,32,40,41,340,157,83,324,395',
-'89,316,209,210,211,212,213,214,215,216,355,276,217,208,218,219,104,115',
-'105,106,107,121,39,88,88,336,330,331,40,41,334,332,335,40,41,144,277',
-'333,120,108,109,110,112,114,113,329,338,339,111,116,118,164,397,396',
-'145,122,123,119,124,341,342,146,343,147,58,59,60,61,63,64,148,65,272',
-'273,340,76,88,88,88,40,41,209,210,211,212,213,214,215,216,220,156,217',
-'208,218,219,104,115,105,106,107,121,40,41,159,336,330,331,40,41,334',
-'332,335,40,41,387,388,333,120,108,109,110,112,114,113,329,338,339,111',
-'116,118,341,342,161,343,122,123,119,124,163,58,59,60,61,40,41,340,55',
-'54,56,40,41,41,209,210,211,212,213,214,215,216,220,166,217,208,218,219',
-'104,115,105,106,107,121,40,41,158,336,330,331,40,41,334,332,335,40,41',
-'40,41,333,120,108,109,110,112,114,113,329,338,339,111,116,118,40,41',
-'40,41,122,123,119,124,341,342,-107,343,-108,58,59,60,61,58,59,60,61',
-'40,41,340,55,54,56,40,41,-109,209,210,211,212,213,214,215,216,220,-110',
-'217,208,218,219,104,115,105,106,107,121,40,41,-111,336,330,331,40,41',
-'334,332,335,365,366,40,41,333,120,108,109,110,112,114,113,329,338,339',
-'111,116,118,341,342,-112,343,122,123,119,124,40,41,-113,-114,-115,-116',
-'-117,340,48,-132,171,172,173,174,209,210,211,212,213,214,215,216,220',
-'175,217,208,218,219,104,115,105,106,107,121,176,177,42,336,330,331,201',
-'234,334,332,335,235,237,238,239,333,120,108,109,110,112,114,113,329',
-'338,339,111,116,118,241,83,245,245,122,123,119,124,341,342,245,343,251',
-'58,59,60,61,254,42,257,259,263,265,340,267,268,42,270,307,309,209,210',
-'211,212,213,214,215,216,220,263,217,208,218,219,104,115,105,106,107',
-'121,311,267,321,336,330,331,322,323,334,332,335,359,364,364,364,333',
-'120,108,109,110,112,114,113,329,338,339,111,116,118,371,372,373,374',
-'122,123,119,124,33,375,377,58,59,60,61,378,381,382,22,23,21,392,26,-217',
-'25,401,30,402,93,94,95,96,97,98,99,100,117,16,101,92,102,103,104,115',
-'105,106,107,121,403,32,406,407,408,28,409,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,,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,,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,,32,,,,28,,207,,,142,,,,,,120,108,109,110,112,114',
+'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,-4,32,-239,,33,28,80,139,-239,140,142,,,76,,,120',
-'108,109,110,112,114,113,,,,111,116,118,,,,,122,123,119,124,,,,,,,,,32',
-',,,,,,,,,,168,33,169,,58,59,60,61,,,,22,23,21,,26,-217,25,,30,39,93',
-'94,95,96,97,98,99,100,117,16,101,92,102,103,104,115,105,106,107,121',
-'168,32,169,40,41,28,,139,,140,142,,,,,,120,108,109,110,112,114,113,',
-',170,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',
-',,,,,,207,,,142,,,,,,120,108,109,110,112,114,113,168,,169,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,,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,168,152,169,168,155,169,153,,,,,,,120',
-'108,109,110,112,114,113,,,,111,116,118,154,,,,122,123,119,124,,,,151',
-',,,40,41,,40,41,,40,41,-239,,33,,80,,-239,,,296,297,76,,,170,,,170,',
-',170,,-239,,33,,80,,-239,,298,296,297,76,,,,,,293,292,,,32,-239,,33',
-',80,,-239,,298,296,297,76,,,,284,,293,292,,,32,-239,,33,,80,,-239,,298',
-'296,297,76,,,,312,,293,292,,,32,,,,,,,,,298,,,,,,,360,,293,292,,33,32',
-',,,,,,,,22,23,21,,26,,25,308,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,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,152,,,155',
-',153,,32,320,,,28,,,,,,,,,,,,,,154,,316,317,313,314,315,,,,318,151' ]
-        racc_action_table = arr = ::Array.new(2819, nil)
+'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)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -497,131 +504,129 @@ clist = [
         end
 
 clist = [
-'375,375,317,375,409,269,1,259,267,364,319,5,28,265,231,375,7,364,319',
-'0,0,0,375,375,375,375,375,375,375,375,375,318,375,375,375,375,375,375',
-'375,375,375,375,316,317,28,375,375,375,259,267,375,375,375,269,265,231',
-'190,375,375,375,375,375,375,375,375,375,375,375,375,375,375,160,318',
-'162,46,375,375,375,375,314,314,188,314,316,314,314,314,314,262,262,24',
-'189,187,48,314,189,196,190,162,46,160,314,314,314,314,314,314,314,314',
-'314,326,314,314,314,314,314,314,314,314,314,314,155,188,27,314,314,314',
-'237,196,314,314,314,189,187,48,326,314,314,314,314,314,314,314,314,314',
-'314,314,314,314,314,320,320,306,320,314,314,314,314,32,237,79,35,155',
-'6,6,320,79,36,300,383,47,306,320,320,320,320,320,320,320,320,320,260',
-'320,320,320,320,320,320,320,320,320,320,6,300,383,320,320,320,47,47',
-'320,320,320,252,252,52,260,320,320,320,320,320,320,320,320,320,320,320',
-'320,320,320,86,385,384,53,320,320,320,320,386,386,54,386,55,386,386',
-'386,386,31,31,56,31,257,257,386,76,86,385,384,149,149,386,386,386,386',
-'386,386,386,386,386,78,386,386,386,386,386,386,386,386,386,386,391,391',
-'80,386,386,386,393,393,386,386,386,394,394,374,374,386,386,386,386,386',
-'386,386,386,386,386,386,386,386,386,408,408,82,408,386,386,386,386,83',
-'30,30,30,30,369,369,408,30,30,30,367,367,84,408,408,408,408,408,408',
-'408,408,408,90,408,408,408,408,408,408,408,408,408,408,184,184,91,408',
-'408,408,185,185,408,408,408,186,186,362,362,408,408,408,408,408,408',
-'408,408,408,408,408,408,408,408,165,165,358,358,408,408,408,408,315',
-'315,92,315,93,315,315,315,315,145,145,145,145,192,192,315,145,145,145',
-'193,193,94,315,315,315,315,315,315,315,315,315,95,315,315,315,315,315',
-'315,315,315,315,315,194,194,96,315,315,315,357,357,315,315,315,337,337',
-'390,390,315,315,315,315,315,315,315,315,315,315,315,315,315,315,356',
-'356,97,356,315,315,315,315,44,44,98,99,100,101,102,356,103,117,127,128',
-'129,131,356,356,356,356,356,356,356,356,356,133,356,356,356,356,356',
-'356,356,356,356,356,136,137,143,356,356,356,172,191,356,356,356,195',
-'197,198,200,356,356,356,356,356,356,356,356,356,356,356,356,356,356',
-'205,228,229,230,356,356,356,356,313,313,232,313,233,313,313,313,313',
-'236,240,243,244,245,246,313,247,249,253,255,271,275,313,313,313,313',
-'313,313,313,313,313,277,313,313,313,313,313,313,313,313,313,313,278',
-'282,296,313,313,313,297,298,313,313,313,323,328,346,348,313,313,313',
-'313,313,313,313,313,313,313,313,313,313,313,349,350,351,353,313,313',
-'313,313,174,355,359,174,174,174,174,363,368,370,174,174,174,380,174',
-'174,174,387,174,388,174,174,174,174,174,174,174,174,174,174,174,174',
-'174,174,174,174,174,174,174,174,389,174,398,400,403,174,405,174,,174',
-'174,,,,,,174,174,174,174,174,174,174,,,,174,174,174,,,,,174,174,174',
-'174,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,139,,,',
-',139,139,139,139,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,,241,,,,241,,241,,,241,,,,,,241,241,241,241,241,241',
-'241,,,,241,241,241,,,,,241,241,241,241,175,,,175,175,175,175,,,,175',
+'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,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,34,173,34,,34,173,34,173,34,173,173,,,34,,,173,173,173,173',
-'173,173,173,,,,173,173,173,,,,,173,173,173,173,,,,,,,,,34,,,,,,,,,,',
-'180,50,180,,50,50,50,50,,,,50,50,50,,50,50,50,,50,34,50,50,50,50,50',
-'50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,181,50,181,180,180,50,',
-'50,,50,50,,,,,,50,50,50,50,50,50,50,,,180,50,50,50,177,177,177,177,50',
-'50,50,50,,,,,,,,181,181,177,177,177,177,177,177,177,177,177,,177,177',
-'177,177,177,177,177,177,177,177,181,,,,,,,177,,,177,,,,,,177,177,177',
-'177,177,177,177,224,,224,177,177,177,176,176,176,176,177,177,177,177',
-',,,,,,,,,176,176,176,176,176,176,176,176,176,,176,176,176,176,176,176',
-'176,176,176,176,,224,224,,,,,176,,,176,,,,,,176,176,176,176,176,176',
-'176,224,,,176,176,176,207,207,207,207,176,176,176,176,,,,,,,,,,207,207',
-'207,207,207,207,207,207,207,,207,207,207,207,207,207,207,207,207,207',
-'125,,125,178,77,178,182,77,182,77,,,,,,,207,207,207,207,207,207,207',
-',,,207,207,207,77,,,,207,207,207,207,,,,77,,,,125,125,,178,178,,182',
-'182,266,,266,,266,,266,,,266,266,266,,,125,,,178,,,182,,281,,281,,281',
-',281,,266,281,281,281,,,,,,266,266,,,266,325,,325,,325,,325,,281,325',
-'325,325,,,,266,,281,281,,,281,274,,274,,274,,274,,325,274,274,274,,',
-',281,,325,325,,,325,,,,,,,,,274,,,,,,,325,,274,274,,156,274,,,,,,,,',
-'156,156,156,,156,,156,274,156,,156,156,156,156,156,156,156,156,156,156',
-'156,156,156,156,,,26,,,,,156,,,,156,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',
-',,88,,,,,43,,,,43,88,88,88,,88,,88,,88,,88,88,88,88,88,88,88,88,88,88',
-'88,88,88,88,,,25,,,,,88,,,,88,25,25,25,,25,,25,25,25,,25,25,25,25,25',
-'25,25,25,25,25,25,25,25,25,,,235,,,,,25,,,,25,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,,,140,,,,,268,,,,268,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,,,234',
-',,,,142,,,,142,234,234,234,,234,,234,,234,,234,234,234,234,234,234,234',
-'234,234,234,234,234,234,234,,,146,,,,,234,,,,234,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,,,57,,,,,147,,,,147,57,57,57,,57,,57,,57',
-',57,57,57,57,57,57,57,57,57,57,57,57,57,57,,,309,,,,,57,,,,57,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,,,148,,,,,322,,,,322,148,148,148,,148,,148,,148,,148,148',
-'148,148,148,148,148,148,148,148,148,148,148,148,,,327,,,,,148,,,,148',
-'327,327,327,,327,,327,,327,,327,327,327,327,327,327,327,327,327,327',
-'327,327,327,327,,,201,,,,,327,,,,327,201,201,201,,201,,201,,201,,201',
-'201,201,201,201,201,201,201,201,201,201,201,201,201,,,2,,,,,201,,,,201',
-'2,2,2,,2,,2,,2,,2,2,2,2,2,2,2,2,2,2,2,2,2,2,,,345,,,,,2,,,,2,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,,,157,,,,,347,,,,347,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,,,51,,,,,159,,,,159',
-'51,51,51,,51,,51,,51,,51,51,51,51,51,51,51,51,51,51,51,51,51,51,,,371',
-',,,,51,,,,51,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,,,179,,,,,382,,,,382,179,179,179,,179,,179',
-',179,,179,179,179,179,179,179,179,179,179,179,179,179,179,179,283,,',
-'283,,283,,179,283,,,179,,,,,,,,,,,,,,283,,283,283,283,283,283,,,,283',
-'283' ]
-        racc_action_check = arr = ::Array.new(2819, nil)
+'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)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -631,47 +636,47 @@ clist = [
         end
 
 racc_action_pointer = [
-   -54,     6,  2276,   nil,   nil,    11,   116,   -35,   nil,   nil,
+    96,     4,  1444,   nil,   nil,     9,    51,   -35,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    70,  1700,  1520,   105,    -6,   nil,
-   302,   236,   154,   nil,  1033,    85,   147,   nil,   nil,   nil,
-  1556,  1592,   nil,  1628,   411,   nil,    53,   151,    89,   nil,
-  1086,  2456,   182,   178,   176,   178,   185,  2024,   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,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   232,  1297,   216,   158,
-   229,   nil,   284,   306,   273,   nil,   200,   nil,  1664,   nil,
-   312,   342,   337,   339,   356,   366,   379,   408,   416,   417,
-   418,   419,   420,   448,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   423,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,  1325,   nil,   424,   450,   424,
-   nil,   425,   nil,   435,   nil,   nil,   446,   447,   nil,   681,
-  1808,  1844,  1880,   443,   nil,   381,  1952,  1988,  2168,   202,
-   nil,   nil,   nil,   nil,   nil,   117,  1484,  2384,   nil,  2420,
-    49,   912,    52,   nil,   nil,   324,   nil,   nil,   nil,   nil,
-   nil,   nil,   448,   989,   604,   835,  1218,  1152,  1328,  2744,
-  1086,  1127,  1331,   nil,   295,   301,   306,    88,    77,    87,
-    52,   443,   345,   351,   374,   453,    78,   482,   486,   nil,
-   504,  2240,   nil,   nil,   nil,   475,   nil,  1284,   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,   nil,   nil,
-   nil,   nil,   nil,   nil,  1216,   nil,   nil,   nil,   502,   503,
-   504,    10,   511,   528,  1916,  1736,   515,   109,   nil,   nil,
-   488,   758,   nil,   522,   482,   463,   499,   499,   nil,   526,
-   nil,   nil,   156,   496,   nil,   525,   nil,   240,   nil,     3,
-   160,   nil,    11,   nil,   nil,     9,  1378,     4,  1772,    -8,
-   nil,   530,   nil,   nil,  1444,   530,   nil,   481,   569,   nil,
-   nil,  1400,   526,  2747,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   529,   533,   521,   nil,
-   147,   nil,   nil,   nil,   nil,   nil,   109,   nil,   nil,  2060,
-   nil,   nil,   nil,   527,    77,   377,    38,    -2,    27,   -62,
-   148,  2096,  2132,   571,   nil,  1422,    89,  2204,   565,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   381,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,  2312,   566,  2348,   567,   580,
-   581,   582,   nil,   564,   nil,   552,   448,   380,   326,   566,
-   nil,   nil,   308,   571,    -2,   nil,   nil,   272,   572,   266,
-   573,  2492,  2528,  2564,   252,    -2,   nil,  2600,  2636,   nil,
-   602,  2672,  2708,   148,   202,   201,   227,   568,   570,   616,
-   387,   224,   nil,   230,   235,   nil,   nil,   nil,   592,   nil,
-   607,   nil,   nil,   595,   nil,   607,   nil,   nil,   298,   -54,
+   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 ]
 
 racc_action_default = [
@@ -720,18 +725,18 @@ racc_action_default = [
 
 racc_goto_table = [
      6,    57,    77,    46,    82,   191,    49,   128,    79,    90,
-   143,    52,   167,   247,   179,   203,    62,   206,   344,   344,
-   344,    86,    91,    38,    47,   344,   261,   328,   346,   348,
-   205,   205,   266,    34,   356,   404,   363,    35,    84,    85,
+   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,   344,   250,   303,   304,   223,   305,   225,   226,   227,
-   376,   187,   188,   189,   190,   232,   269,   302,   353,   386,
-   344,   249,   179,   256,   398,   160,   165,   195,   260,   389,
-   278,   344,   325,   162,   204,     1,   nil,   205,   nil,   nil,
-   400,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   242,   nil,   344,   nil,   249,    57,   249,   198,   nil,
-   nil,   nil,   410,   nil,   nil,   nil,   183,   nil,   nil,   nil,
+   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,
@@ -761,18 +766,18 @@ racc_goto_table = [
 
 racc_goto_check = [
      2,    36,    16,    23,    18,    27,    51,    50,    59,    17,
-    49,    61,    74,    25,    63,    69,    75,    69,    53,    53,
-    53,    23,    59,     3,     2,    53,    55,    37,    37,    37,
-    64,    64,    20,     4,    37,    46,    38,     5,     2,     2,
+    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,    53,    21,    29,    30,    74,    35,    74,    74,    74,
-    37,    14,    14,    14,    14,    39,    40,    41,    42,    44,
-    53,    27,    63,    69,    45,    47,     2,    48,    54,    37,
-    57,    53,    20,    58,    65,     1,   nil,    64,   nil,   nil,
-    37,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    74,   nil,    53,   nil,    27,    36,    27,    50,   nil,
-   nil,   nil,    37,   nil,   nil,   nil,    61,   nil,   nil,   nil,
+    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,
@@ -801,14 +806,14 @@ racc_goto_check = [
      2 ]
 
 racc_goto_pointer = [
-   nil,    95,    -2,    17,    30,    33,     8,   nil,   nil,   nil,
+   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,  -286,  -292,  -115,
+  -205,   nil,   nil,   nil,   nil,  -203,   -29,  -295,  -292,  -115,
   -174,  -192,  -241,   nil,  -295,  -302,  -363,     3,   -73,   -41,
-   -43,   -22,   nil,  -295,  -157,  -219,   nil,  -172,    10,   -26,
+   -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,   -15 ]
+  -136,   nil,   nil,   nil,  -113,    64 ]
 
 racc_goto_default = [
    nil,   nil,    44,   nil,   nil,   405,   295,    69,    70,    71,
@@ -2067,7 +2072,9 @@ module_eval(<<'.,.,', 'parser.y', 472)
 
 module_eval(<<'.,.,', 'parser.y', 477)
   def _reduce_81(val, _values, result)
-            location = (val[1] || val[2] || val[3] || val[4]).location + val[5].location
+            reset_variable_scope
+
+        location = (val[1] || val[2] || val[3] || val[4]).location + val[5].location
         type_params = val[1]&.value || []
 
         params = val[2]&.value || empty_params_result
@@ -2094,14 +2101,14 @@ module_eval(<<'.,.,', 'parser.y', 477)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 502)
+module_eval(<<'.,.,', 'parser.y', 504)
   def _reduce_82(val, _values, result)
      result = nil
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 504)
+module_eval(<<'.,.,', 'parser.y', 506)
   def _reduce_83(val, _values, result)
             result = LocatedValue.new(value: val[1], location: val[0].location + val[2].location)
 
@@ -2109,14 +2116,14 @@ module_eval(<<'.,.,', 'parser.y', 504)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 508)
+module_eval(<<'.,.,', 'parser.y', 510)
   def _reduce_84(val, _values, result)
      result = nil
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 510)
+module_eval(<<'.,.,', 'parser.y', 512)
   def _reduce_85(val, _values, result)
             block = MethodType::Block.new(type: val[1].value, required: true)
         result = LocatedValue.new(value: block, location: val[0].location + val[2].location)
@@ -2125,7 +2132,7 @@ module_eval(<<'.,.,', 'parser.y', 510)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 514)
+module_eval(<<'.,.,', 'parser.y', 516)
   def _reduce_86(val, _values, result)
             block = MethodType::Block.new(type: val[2].value, required: false)
         result = LocatedValue.new(value: block, location: val[0].location + val[3].location)
@@ -2136,7 +2143,7 @@ module_eval(<<'.,.,', 'parser.y', 514)
 
 # reduce 87 omitted
 
-module_eval(<<'.,.,', 'parser.y', 521)
+module_eval(<<'.,.,', 'parser.y', 523)
   def _reduce_88(val, _values, result)
             result = LocatedValue.new(value: val[0].value.to_sym,
                                   location: val[0].location + val[1].location)
@@ -2163,7 +2170,7 @@ module_eval(<<'.,.,', 'parser.y', 521)
 
 # reduce 97 omitted
 
-module_eval(<<'.,.,', 'parser.y', 530)
+module_eval(<<'.,.,', 'parser.y', 532)
   def _reduce_98(val, _values, result)
             unless val[0].location.pred?(val[1].location)
           raise SyntaxError.new(token_str: "kQUESTION", error_value: val[1])
@@ -2176,7 +2183,7 @@ module_eval(<<'.,.,', 'parser.y', 530)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 538)
+module_eval(<<'.,.,', 'parser.y', 540)
   def _reduce_99(val, _values, result)
             unless val[0].location.pred?(val[1].location)
           raise SyntaxError.new(token_str: "kEXCLAMATION", error_value: val[1])
@@ -2269,14 +2276,14 @@ module_eval(<<'.,.,', 'parser.y', 538)
 
 # reduce 139 omitted
 
-module_eval(<<'.,.,', 'parser.y', 558)
+module_eval(<<'.,.,', 'parser.y', 560)
   def _reduce_140(val, _values, result)
      result = nil
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 560)
+module_eval(<<'.,.,', 'parser.y', 562)
   def _reduce_141(val, _values, result)
             val[1].each {|p| insert_bound_variable(p.name) }
 
@@ -2286,7 +2293,7 @@ module_eval(<<'.,.,', 'parser.y', 560)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 567)
+module_eval(<<'.,.,', 'parser.y', 569)
   def _reduce_142(val, _values, result)
             result = Declarations::ModuleTypeParams.new()
         result.add(val[0])
@@ -2295,7 +2302,7 @@ module_eval(<<'.,.,', 'parser.y', 567)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 571)
+module_eval(<<'.,.,', 'parser.y', 573)
   def _reduce_143(val, _values, result)
             result = val[0].add(val[2])
 
@@ -2303,7 +2310,7 @@ module_eval(<<'.,.,', 'parser.y', 571)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 576)
+module_eval(<<'.,.,', 'parser.y', 578)
   def _reduce_144(val, _values, result)
             result = Declarations::ModuleTypeParams::TypeParam.new(name: val[2].value.to_sym,
                                                                variance: val[1],
@@ -2313,49 +2320,49 @@ module_eval(<<'.,.,', 'parser.y', 576)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 582)
+module_eval(<<'.,.,', 'parser.y', 584)
   def _reduce_145(val, _values, result)
      result = :invariant
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 583)
+module_eval(<<'.,.,', 'parser.y', 585)
   def _reduce_146(val, _values, result)
      result = :covariant
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 584)
+module_eval(<<'.,.,', 'parser.y', 586)
   def _reduce_147(val, _values, result)
      result = :contravariant
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 587)
+module_eval(<<'.,.,', 'parser.y', 589)
   def _reduce_148(val, _values, result)
      result = false
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 588)
+module_eval(<<'.,.,', 'parser.y', 590)
   def _reduce_149(val, _values, result)
      result = true
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 591)
+module_eval(<<'.,.,', 'parser.y', 593)
   def _reduce_150(val, _values, result)
      result = nil
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 593)
+module_eval(<<'.,.,', 'parser.y', 595)
   def _reduce_151(val, _values, result)
             val[1].each {|var| insert_bound_variable(var) }
 
@@ -2366,7 +2373,7 @@ module_eval(<<'.,.,', 'parser.y', 593)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 601)
+module_eval(<<'.,.,', 'parser.y', 603)
   def _reduce_152(val, _values, result)
             result = [val[0].value.to_sym]
 
@@ -2374,7 +2381,7 @@ module_eval(<<'.,.,', 'parser.y', 601)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 604)
+module_eval(<<'.,.,', 'parser.y', 606)
   def _reduce_153(val, _values, result)
             result = val[0].push(val[2].value.to_sym)
 
@@ -2382,7 +2389,7 @@ module_eval(<<'.,.,', 'parser.y', 604)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 609)
+module_eval(<<'.,.,', 'parser.y', 611)
   def _reduce_154(val, _values, result)
             location = val[1].location + val[3].location
         result = Members::Alias.new(
@@ -2398,7 +2405,7 @@ module_eval(<<'.,.,', 'parser.y', 609)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 620)
+module_eval(<<'.,.,', 'parser.y', 622)
   def _reduce_155(val, _values, result)
             location = val[1].location + val[7].location
         result = Members::Alias.new(
@@ -2414,7 +2421,7 @@ module_eval(<<'.,.,', 'parser.y', 620)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 633)
+module_eval(<<'.,.,', 'parser.y', 635)
   def _reduce_156(val, _values, result)
             location = val[1].location + val[4].location
         result = Declarations::Alias.new(name: val[2].value,
@@ -2427,7 +2434,7 @@ module_eval(<<'.,.,', 'parser.y', 633)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 643)
+module_eval(<<'.,.,', 'parser.y', 645)
   def _reduce_157(val, _values, result)
             location = val[0].location + val[2].location
         result = Declarations::Constant.new(name: val[0].value,
@@ -2439,7 +2446,7 @@ module_eval(<<'.,.,', 'parser.y', 643)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 650)
+module_eval(<<'.,.,', 'parser.y', 652)
   def _reduce_158(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)
@@ -2452,7 +2459,7 @@ module_eval(<<'.,.,', 'parser.y', 650)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 660)
+module_eval(<<'.,.,', 'parser.y', 662)
   def _reduce_159(val, _values, result)
             location = val[0].location + val[2].location
         result = Declarations::Global.new(name: val[0].value.to_sym,
@@ -2466,7 +2473,7 @@ module_eval(<<'.,.,', 'parser.y', 660)
 
 # reduce 160 omitted
 
-module_eval(<<'.,.,', 'parser.y', 670)
+module_eval(<<'.,.,', 'parser.y', 672)
   def _reduce_161(val, _values, result)
             types = case l = val[0]
                 when Types::Union
@@ -2481,7 +2488,7 @@ module_eval(<<'.,.,', 'parser.y', 670)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 680)
+module_eval(<<'.,.,', 'parser.y', 682)
   def _reduce_162(val, _values, result)
             types = case l = val[0]
                 when Types::Intersection
@@ -2497,7 +2504,7 @@ module_eval(<<'.,.,', 'parser.y', 680)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 693)
+module_eval(<<'.,.,', 'parser.y', 695)
   def _reduce_163(val, _values, result)
             result = Types::Bases::Void.new(location: val[0].location)
 
@@ -2505,7 +2512,7 @@ module_eval(<<'.,.,', 'parser.y', 693)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 696)
+module_eval(<<'.,.,', 'parser.y', 698)
   def _reduce_164(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)
@@ -2514,7 +2521,7 @@ module_eval(<<'.,.,', 'parser.y', 696)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 700)
+module_eval(<<'.,.,', 'parser.y', 702)
   def _reduce_165(val, _values, result)
             result = Types::Bases::Any.new(location: val[0].location)
 
@@ -2522,7 +2529,7 @@ module_eval(<<'.,.,', 'parser.y', 700)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 703)
+module_eval(<<'.,.,', 'parser.y', 705)
   def _reduce_166(val, _values, result)
             result = Types::Bases::Bool.new(location: val[0].location)
 
@@ -2530,7 +2537,7 @@ module_eval(<<'.,.,', 'parser.y', 703)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 706)
+module_eval(<<'.,.,', 'parser.y', 708)
   def _reduce_167(val, _values, result)
             result = Types::Bases::Nil.new(location: val[0].location)
 
@@ -2538,7 +2545,7 @@ module_eval(<<'.,.,', 'parser.y', 706)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 709)
+module_eval(<<'.,.,', 'parser.y', 711)
   def _reduce_168(val, _values, result)
             result = Types::Bases::Top.new(location: val[0].location)
 
@@ -2546,7 +2553,7 @@ module_eval(<<'.,.,', 'parser.y', 709)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 712)
+module_eval(<<'.,.,', 'parser.y', 714)
   def _reduce_169(val, _values, result)
             result = Types::Bases::Bottom.new(location: val[0].location)
 
@@ -2554,7 +2561,7 @@ module_eval(<<'.,.,', 'parser.y', 712)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 715)
+module_eval(<<'.,.,', 'parser.y', 717)
   def _reduce_170(val, _values, result)
             result = Types::Bases::Self.new(location: val[0].location)
 
@@ -2562,7 +2569,7 @@ module_eval(<<'.,.,', 'parser.y', 715)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 718)
+module_eval(<<'.,.,', 'parser.y', 720)
   def _reduce_171(val, _values, result)
             result = Types::Optional.new(type: Types::Bases::Self.new(location: val[0].location),
                                      location: val[0].location)
@@ -2571,7 +2578,7 @@ module_eval(<<'.,.,', 'parser.y', 718)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 722)
+module_eval(<<'.,.,', 'parser.y', 724)
   def _reduce_172(val, _values, result)
             result = Types::Bases::Instance.new(location: val[0].location)
 
@@ -2579,7 +2586,7 @@ module_eval(<<'.,.,', 'parser.y', 722)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 725)
+module_eval(<<'.,.,', 'parser.y', 727)
   def _reduce_173(val, _values, result)
             result = Types::Bases::Class.new(location: val[0].location)
 
@@ -2587,7 +2594,7 @@ module_eval(<<'.,.,', 'parser.y', 725)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 728)
+module_eval(<<'.,.,', 'parser.y', 730)
   def _reduce_174(val, _values, result)
             result = Types::Literal.new(literal: true, location: val[0].location)
 
@@ -2595,7 +2602,7 @@ module_eval(<<'.,.,', 'parser.y', 728)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 731)
+module_eval(<<'.,.,', 'parser.y', 733)
   def _reduce_175(val, _values, result)
             result = Types::Literal.new(literal: false, location: val[0].location)
 
@@ -2603,7 +2610,7 @@ module_eval(<<'.,.,', 'parser.y', 731)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 734)
+module_eval(<<'.,.,', 'parser.y', 736)
   def _reduce_176(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
 
@@ -2611,7 +2618,7 @@ module_eval(<<'.,.,', 'parser.y', 734)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 737)
+module_eval(<<'.,.,', 'parser.y', 739)
   def _reduce_177(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
 
@@ -2619,7 +2626,7 @@ module_eval(<<'.,.,', 'parser.y', 737)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 740)
+module_eval(<<'.,.,', 'parser.y', 742)
   def _reduce_178(val, _values, result)
             result = Types::Literal.new(literal: val[0].value, location: val[0].location)
 
@@ -2627,7 +2634,7 @@ module_eval(<<'.,.,', 'parser.y', 740)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 743)
+module_eval(<<'.,.,', 'parser.y', 745)
   def _reduce_179(val, _values, result)
             name = val[0].value
         args = []
@@ -2650,7 +2657,7 @@ module_eval(<<'.,.,', 'parser.y', 743)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 761)
+module_eval(<<'.,.,', 'parser.y', 763)
   def _reduce_180(val, _values, result)
             name = val[0].value
         args = val[2]
@@ -2672,7 +2679,7 @@ module_eval(<<'.,.,', 'parser.y', 761)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 778)
+module_eval(<<'.,.,', 'parser.y', 780)
   def _reduce_181(val, _values, result)
             location = val[0].location + val[1].location
         result = Types::Tuple.new(types: [], location: location)
@@ -2681,7 +2688,7 @@ module_eval(<<'.,.,', 'parser.y', 778)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 782)
+module_eval(<<'.,.,', 'parser.y', 784)
   def _reduce_182(val, _values, result)
             location = val[0].location + val[2].location
         types = val[1]
@@ -2691,7 +2698,7 @@ module_eval(<<'.,.,', 'parser.y', 782)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 787)
+module_eval(<<'.,.,', 'parser.y', 789)
   def _reduce_183(val, _values, result)
             type = val[1].dup
         type.instance_eval do
@@ -2703,7 +2710,7 @@ module_eval(<<'.,.,', 'parser.y', 787)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 794)
+module_eval(<<'.,.,', 'parser.y', 796)
   def _reduce_184(val, _values, result)
             result = Types::ClassSingleton.new(name: val[2].value,
                                            location: val[0].location + val[3].location)
@@ -2712,7 +2719,7 @@ module_eval(<<'.,.,', 'parser.y', 794)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 798)
+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)
 
@@ -2720,7 +2727,7 @@ module_eval(<<'.,.,', 'parser.y', 798)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 801)
+module_eval(<<'.,.,', 'parser.y', 803)
   def _reduce_186(val, _values, result)
             result = Types::Optional.new(type: val[0], location: val[0].location + val[1].location)
 
@@ -2730,7 +2737,7 @@ module_eval(<<'.,.,', 'parser.y', 801)
 
 # reduce 187 omitted
 
-module_eval(<<'.,.,', 'parser.y', 807)
+module_eval(<<'.,.,', 'parser.y', 809)
   def _reduce_188(val, _values, result)
             result = [val[0]]
 
@@ -2738,7 +2745,7 @@ module_eval(<<'.,.,', 'parser.y', 807)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 810)
+module_eval(<<'.,.,', 'parser.y', 812)
   def _reduce_189(val, _values, result)
             result = val[0] + [val[2]]
 
@@ -2746,7 +2753,7 @@ module_eval(<<'.,.,', 'parser.y', 810)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 815)
+module_eval(<<'.,.,', 'parser.y', 817)
   def _reduce_190(val, _values, result)
             result = Types::Record.new(
           fields: val[1],
@@ -2757,7 +2764,7 @@ module_eval(<<'.,.,', 'parser.y', 815)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 823)
+module_eval(<<'.,.,', 'parser.y', 825)
   def _reduce_191(val, _values, result)
             result = val[0]
 
@@ -2765,7 +2772,7 @@ module_eval(<<'.,.,', 'parser.y', 823)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 826)
+module_eval(<<'.,.,', 'parser.y', 828)
   def _reduce_192(val, _values, result)
             result = val[0].merge!(val[2])
 
@@ -2773,7 +2780,7 @@ module_eval(<<'.,.,', 'parser.y', 826)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 831)
+module_eval(<<'.,.,', 'parser.y', 833)
   def _reduce_193(val, _values, result)
             result = { val[0].value => val[2] }
 
@@ -2781,7 +2788,7 @@ module_eval(<<'.,.,', 'parser.y', 831)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 834)
+module_eval(<<'.,.,', 'parser.y', 836)
   def _reduce_194(val, _values, result)
             result = { val[0].value => val[2] }
 
@@ -2789,7 +2796,7 @@ module_eval(<<'.,.,', 'parser.y', 834)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 837)
+module_eval(<<'.,.,', 'parser.y', 839)
   def _reduce_195(val, _values, result)
             result = { val[0].value => val[2] }
 
@@ -2797,7 +2804,7 @@ module_eval(<<'.,.,', 'parser.y', 837)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 840)
+module_eval(<<'.,.,', 'parser.y', 842)
   def _reduce_196(val, _values, result)
             result = { val[0].value => val[1] }
 
@@ -2807,7 +2814,7 @@ module_eval(<<'.,.,', 'parser.y', 840)
 
 # reduce 197 omitted
 
-module_eval(<<'.,.,', 'parser.y', 846)
+module_eval(<<'.,.,', 'parser.y', 848)
   def _reduce_198(val, _values, result)
             result = val[0]
 
@@ -2823,7 +2830,7 @@ module_eval(<<'.,.,', 'parser.y', 846)
 
 # reduce 202 omitted
 
-module_eval(<<'.,.,', 'parser.y', 853)
+module_eval(<<'.,.,', 'parser.y', 855)
   def _reduce_203(val, _values, result)
             location = val[0].location + val[4].location
         type = Types::Function.new(
@@ -2843,7 +2850,7 @@ module_eval(<<'.,.,', 'parser.y', 853)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 868)
+module_eval(<<'.,.,', 'parser.y', 870)
   def _reduce_204(val, _values, result)
             location = val[0].location + val[1].location
         type = Types::Function.new(
@@ -2854,7 +2861,7 @@ module_eval(<<'.,.,', 'parser.y', 868)
           required_keywords: {},
           optional_keywords: {},
           rest_keywords: nil,
-          return_type: val[2]
+          return_type: val[1]
         )
 
         result = LocatedValue.new(value: type, location: location)
@@ -2863,7 +2870,7 @@ module_eval(<<'.,.,', 'parser.y', 868)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 885)
+module_eval(<<'.,.,', 'parser.y', 887)
   def _reduce_205(val, _values, result)
             result = val[2]
         result[0].unshift(val[0])
@@ -2872,7 +2879,7 @@ module_eval(<<'.,.,', 'parser.y', 885)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 889)
+module_eval(<<'.,.,', 'parser.y', 891)
   def _reduce_206(val, _values, result)
             result = empty_params_result
         result[0].unshift(val[0])
@@ -2883,7 +2890,7 @@ module_eval(<<'.,.,', 'parser.y', 889)
 
 # reduce 207 omitted
 
-module_eval(<<'.,.,', 'parser.y', 896)
+module_eval(<<'.,.,', 'parser.y', 898)
   def _reduce_208(val, _values, result)
             result = val[2]
         result[1].unshift(val[0])
@@ -2892,7 +2899,7 @@ module_eval(<<'.,.,', 'parser.y', 896)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 900)
+module_eval(<<'.,.,', 'parser.y', 902)
   def _reduce_209(val, _values, result)
             result = empty_params_result
         result[1].unshift(val[0])
@@ -2903,7 +2910,7 @@ module_eval(<<'.,.,', 'parser.y', 900)
 
 # reduce 210 omitted
 
-module_eval(<<'.,.,', 'parser.y', 907)
+module_eval(<<'.,.,', 'parser.y', 909)
   def _reduce_211(val, _values, result)
             result = val[2]
         result[2] = val[0]
@@ -2912,7 +2919,7 @@ module_eval(<<'.,.,', 'parser.y', 907)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 911)
+module_eval(<<'.,.,', 'parser.y', 913)
   def _reduce_212(val, _values, result)
             result = empty_params_result
         result[2] = val[0]
@@ -2923,7 +2930,7 @@ module_eval(<<'.,.,', 'parser.y', 911)
 
 # reduce 213 omitted
 
-module_eval(<<'.,.,', 'parser.y', 918)
+module_eval(<<'.,.,', 'parser.y', 920)
   def _reduce_214(val, _values, result)
             result = val[2]
         result[3].unshift(val[0])
@@ -2932,7 +2939,7 @@ module_eval(<<'.,.,', 'parser.y', 918)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 922)
+module_eval(<<'.,.,', 'parser.y', 924)
   def _reduce_215(val, _values, result)
             result = empty_params_result
         result[3].unshift(val[0])
@@ -2943,7 +2950,7 @@ module_eval(<<'.,.,', 'parser.y', 922)
 
 # reduce 216 omitted
 
-module_eval(<<'.,.,', 'parser.y', 929)
+module_eval(<<'.,.,', 'parser.y', 931)
   def _reduce_217(val, _values, result)
             result = empty_params_result
 
@@ -2951,7 +2958,7 @@ module_eval(<<'.,.,', 'parser.y', 929)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 932)
+module_eval(<<'.,.,', 'parser.y', 934)
   def _reduce_218(val, _values, result)
             result = val[2]
         result[4].merge!(val[0])
@@ -2960,7 +2967,7 @@ module_eval(<<'.,.,', 'parser.y', 932)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 936)
+module_eval(<<'.,.,', 'parser.y', 938)
   def _reduce_219(val, _values, result)
             result = empty_params_result
         result[4].merge!(val[0])
@@ -2969,7 +2976,7 @@ module_eval(<<'.,.,', 'parser.y', 936)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 940)
+module_eval(<<'.,.,', 'parser.y', 942)
   def _reduce_220(val, _values, result)
             result = val[2]
         result[5].merge!(val[0])
@@ -2978,7 +2985,7 @@ module_eval(<<'.,.,', 'parser.y', 940)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 944)
+module_eval(<<'.,.,', 'parser.y', 946)
   def _reduce_221(val, _values, result)
             result = empty_params_result
         result[5].merge!(val[0])
@@ -2987,7 +2994,7 @@ module_eval(<<'.,.,', 'parser.y', 944)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 948)
+module_eval(<<'.,.,', 'parser.y', 950)
   def _reduce_222(val, _values, result)
             result = empty_params_result
         result[6] = val[0]
@@ -2996,7 +3003,7 @@ module_eval(<<'.,.,', 'parser.y', 948)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 954)
+module_eval(<<'.,.,', 'parser.y', 956)
   def _reduce_223(val, _values, result)
             result = Types::Function::Param.new(type: val[0],
                                             name: val[1]&.value&.to_sym)
@@ -3005,7 +3012,7 @@ module_eval(<<'.,.,', 'parser.y', 954)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 960)
+module_eval(<<'.,.,', 'parser.y', 962)
   def _reduce_224(val, _values, result)
             result = Types::Function::Param.new(type: val[1],
                                             name: val[2]&.value&.to_sym)
@@ -3014,7 +3021,7 @@ module_eval(<<'.,.,', 'parser.y', 960)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 966)
+module_eval(<<'.,.,', 'parser.y', 968)
   def _reduce_225(val, _values, result)
             result = Types::Function::Param.new(type: val[1],
                                             name: val[2]&.value&.to_sym)
@@ -3023,7 +3030,7 @@ module_eval(<<'.,.,', 'parser.y', 966)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 972)
+module_eval(<<'.,.,', 'parser.y', 974)
   def _reduce_226(val, _values, result)
             param = Types::Function::Param.new(type: val[1],
                                            name: val[2]&.value&.to_sym)
@@ -3033,7 +3040,7 @@ module_eval(<<'.,.,', 'parser.y', 972)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 979)
+module_eval(<<'.,.,', 'parser.y', 981)
   def _reduce_227(val, _values, result)
             param = Types::Function::Param.new(type: val[2],
                                            name: val[3]&.value&.to_sym)
@@ -3043,7 +3050,7 @@ module_eval(<<'.,.,', 'parser.y', 979)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 986)
+module_eval(<<'.,.,', 'parser.y', 988)
   def _reduce_228(val, _values, result)
             result = Types::Function::Param.new(type: val[1],
                                             name: val[2]&.value&.to_sym)
@@ -3060,7 +3067,7 @@ module_eval(<<'.,.,', 'parser.y', 986)
 
 # reduce 232 omitted
 
-module_eval(<<'.,.,', 'parser.y', 995)
+module_eval(<<'.,.,', 'parser.y', 997)
   def _reduce_233(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
@@ -3078,7 +3085,7 @@ module_eval(<<'.,.,', 'parser.y', 995)
 
 # reduce 236 omitted
 
-module_eval(<<'.,.,', 'parser.y', 1007)
+module_eval(<<'.,.,', 'parser.y', 1009)
   def _reduce_237(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
@@ -3090,7 +3097,7 @@ module_eval(<<'.,.,', 'parser.y', 1007)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1016)
+module_eval(<<'.,.,', 'parser.y', 1018)
   def _reduce_238(val, _values, result)
             namespace = val[0]&.value || Namespace.empty
         name = val[1].value.to_sym
@@ -3102,7 +3109,7 @@ module_eval(<<'.,.,', 'parser.y', 1016)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1025)
+module_eval(<<'.,.,', 'parser.y', 1027)
   def _reduce_239(val, _values, result)
             result = nil
 
@@ -3110,7 +3117,7 @@ module_eval(<<'.,.,', 'parser.y', 1025)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1028)
+module_eval(<<'.,.,', 'parser.y', 1030)
   def _reduce_240(val, _values, result)
             result = LocatedValue.new(value: Namespace.root, location: val[0].location)
 
@@ -3118,7 +3125,7 @@ module_eval(<<'.,.,', 'parser.y', 1028)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1031)
+module_eval(<<'.,.,', 'parser.y', 1033)
   def _reduce_241(val, _values, result)
             namespace = Namespace.parse(val[1].value).absolute!
         result = LocatedValue.new(value: namespace, location: val[0].location + val[1].location)
@@ -3127,7 +3134,7 @@ module_eval(<<'.,.,', 'parser.y', 1031)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 1035)
+module_eval(<<'.,.,', 'parser.y', 1037)
   def _reduce_242(val, _values, result)
             namespace = Namespace.parse(val[0].value)
         result = LocatedValue.new(value: namespace, location: val[0].location)