brakeman 5.0.1 → 5.0.2

data/bundle/ruby/2.7.0/gems/parallel-1.20.1/lib/parallel/processor_count.rb

@@ -0,0 +1,42 @@
+require 'etc'
+
+module Parallel
+  # TODO: inline this method into parallel.rb and kill physical_processor_count in next major release
+  module ProcessorCount
+    # Number of processors seen by the OS, used for process scheduling
+    def processor_count
+      @processor_count ||= Integer(ENV['PARALLEL_PROCESSOR_COUNT'] || Etc.nprocessors)
+    end
+
+    # Number of physical processor cores on the current system.
+    def physical_processor_count
+      @physical_processor_count ||= begin
+        ppc = case RbConfig::CONFIG["target_os"]
+        when /darwin1/
+          IO.popen("/usr/sbin/sysctl -n hw.physicalcpu").read.to_i
+        when /linux/
+          cores = {}  # unique physical ID / core ID combinations
+          phy = 0
+          IO.read("/proc/cpuinfo").scan(/^physical id.*|^core id.*/) do |ln|
+            if ln.start_with?("physical")
+              phy = ln[/\d+/]
+            elsif ln.start_with?("core")
+              cid = phy + ":" + ln[/\d+/]
+              cores[cid] = true if not cores[cid]
+            end
+          end
+          cores.count
+        when /mswin|mingw/
+          require 'win32ole'
+          result_set = WIN32OLE.connect("winmgmts://").ExecQuery(
+            "select NumberOfCores from Win32_Processor")
+          result_set.to_enum.collect(&:NumberOfCores).reduce(:+)
+        else
+          processor_count
+        end
+        # fall back to logical count if physical info is invalid
+        ppc > 0 ? ppc : processor_count
+      end
+    end
+  end
+end

data/bundle/ruby/2.7.0/gems/parallel-1.20.1/lib/parallel/version.rb

@@ -0,0 +1,3 @@
+module Parallel
+  VERSION = Version = '1.20.1'
+end

data/bundle/ruby/2.7.0/gems/{ruby_parser-3.15.1 → ruby_parser-3.16.0}/History.rdoc

@@ -1,3 +1,22 @@
+=== 3.16.0 / 2021-05-15
+
+* 1 major enhancement:
+
+  * Added tentative 3.0 support.
+
+* 3 minor enhancements:
+
+  * Added lexing for "beginless range" (bdots).
+  * Added parsing for bdots.
+  * Updated rake compare task to download xz files, bumped versions, etc
+
+* 4 bug fixes:
+
+  * Bump rake dependency to >= 10, < 15. (presidentbeef)
+  * Bump sexp_processor dependency to 4.15.1+. (pravi)
+  * Fixed minor state mismatch at the end of parsing to make diffing a little cleaner.
+  * Fixed normalizer to deal with new bison token syntax
+
 === 3.15.1 / 2021-01-10
 
 * 1 bug fix:

data/bundle/ruby/2.7.0/gems/{ruby_parser-3.15.1 → ruby_parser-3.16.0}/Manifest.txt

@@ -26,6 +26,8 @@ lib/ruby26_parser.rb
 lib/ruby26_parser.y
 lib/ruby27_parser.rb
 lib/ruby27_parser.y
+lib/ruby30_parser.rb
+lib/ruby30_parser.y
 lib/ruby_lexer.rb
 lib/ruby_lexer.rex
 lib/ruby_lexer.rex.rb

data/bundle/ruby/2.7.0/gems/{ruby_parser-3.15.1 → ruby_parser-3.16.0}/compare/normalize.rb

@@ -174,7 +174,7 @@ ARGF.each_line do |line|
 
   case line.strip
   when /^$/ then
-  when /^(\d+) (\$?\w+): (.*)/ then    # yacc
+  when /^(\d+) (\$?[@\w]+): (.*)/ then    # yacc
     rule = $2
     order << rule unless rules.has_key? rule
     rules[rule] << munge($3)
@@ -199,7 +199,7 @@ ARGF.each_line do |line|
   when /^\cL/ then                     # byacc
     break
   else
-    warn "unparsed: #{$.}: #{line.chomp}"
+    warn "unparsed: #{$.}: #{line.strip.inspect}"
   end
 end
 

data/bundle/ruby/2.7.0/gems/{ruby_parser-3.15.1 → ruby_parser-3.16.0}/lib/ruby20_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.16
+# This file is automatically generated by Racc 1.5.1
 # from Racc grammar file "".
 #
 
@@ -30,41 +30,41 @@ clist = [
 '-524,-524,-524,221,-524,232,-524,224,125,125,-102,125,125,124,124,958',
 '124,124,125,-524,-524,-524,-524,124,-524,-111,-524,-113,-527,232,-111',
 '-524,-113,-99,-524,-527,-527,-527,-110,232,-527,-527,-527,-110,-527',
-'-102,-100,-104,-102,-107,-106,852,-527,-618,-527,-527,-527,125,-102',
+'-102,-100,-104,-102,-107,-106,852,-527,-617,-527,-527,-527,125,-102',
 '-104,-102,-101,124,281,-527,-527,-538,-527,-527,-527,-527,-527,272,-527',
 '269,270,-112,-114,-94,746,-527,575,574,573,-539,576,473,125,333,-112',
-'-80,-444,124,-615,-112,-527,-527,-527,-527,-527,-527,-527,-527,-527',
+'-80,-444,124,-614,-112,-527,-527,-527,-527,-527,-527,-527,-527,-527',
 '-527,-527,-527,-527,-527,268,267,-527,-527,-527,-104,-527,-527,742,842',
 '-527,-108,334,-527,-527,843,-527,626,-527,-435,-527,229,-527,-527,-527',
-'-527,-527,-527,-527,-109,-527,-116,-527,-618,-619,-444,722,-524,-538',
-'721,-104,283,-444,-104,-524,-527,-527,-527,-527,-615,-527,-444,-527',
+'-527,-527,-527,-527,-109,-527,-116,-527,-617,-618,-444,722,-524,-538',
+'721,-104,283,-444,-104,-524,-527,-527,-527,-527,-614,-527,-444,-527',
 '-524,-303,-104,878,-527,603,125,-527,-303,-303,-303,124,582,-539,-303',
-'-303,-444,-303,-615,-103,-105,-534,-116,584,-533,628,627,-99,-534,-616',
+'-303,-444,-303,-614,-103,-105,-534,-116,584,-533,628,627,-99,-534,-615',
 '420,-533,232,-213,787,422,421,-303,-303,-108,-303,-303,-303,-303,-303',
-'746,-535,575,574,573,369,576,393,-535,396,-100,592,591,398,746,-622',
-'575,574,573,816,576,-622,-109,-303,-303,-303,-303,-303,-303,-303,-303',
+'746,-535,575,574,573,369,576,393,-535,396,-100,592,591,398,746,-621',
+'575,574,573,816,576,-621,-109,-303,-303,-303,-303,-303,-303,-303,-303',
 '-303,-303,-303,-303,-303,-303,-527,401,-303,-303,-303,-115,668,-527',
-'585,418,-303,423,-616,-303,626,817,-527,472,-303,626,-303,474,-303,-303',
-'-303,-303,-303,-303,-303,923,-303,-622,-303,662,-616,-213,-111,-622',
-'-622,626,584,871,626,-618,-622,-303,-303,-622,-105,-618,-303,626,663',
-'-622,-622,1006,626,-303,475,125,-114,-622,-622,-622,124,-622,662,-622',
-'-622,-113,-622,-622,231,592,591,628,627,-106,125,-622,628,627,624,124',
-'904,626,504,-111,631,-115,-622,-622,-532,-622,-622,-622,-622,-622,663',
+'585,418,-303,423,-615,-303,626,817,-527,472,-303,626,-303,474,-303,-303',
+'-303,-303,-303,-303,-303,923,-303,-621,-303,662,-615,-213,-111,-621',
+'-621,626,584,871,626,-617,-621,-303,-303,-621,-105,-617,-303,626,663',
+'-621,-621,1006,626,-303,475,125,-114,-621,-621,-621,124,-621,662,-621',
+'-621,-113,-621,-621,231,592,591,628,627,-106,125,-621,628,627,624,124',
+'904,626,504,-111,631,-115,-621,-621,-532,-621,-621,-621,-621,-621,663',
 '-532,628,627,629,628,627,634,-113,585,-102,-529,911,286,628,627,646',
-'803,-529,628,627,790,-111,-622,-622,-622,-622,-622,-622,-622,-622,-622',
-'-622,-622,-622,-622,-622,-347,803,-622,-622,-622,-104,669,-347,-530',
-'514,-622,628,627,-622,-531,-530,-347,-113,-622,517,-622,-531,-622,-622',
-'-622,-622,-622,-622,-622,-110,-622,-622,-622,519,-110,-79,578,228,575',
-'574,573,582,576,-101,470,-622,-622,232,-103,-536,-622,621,584,471,-622',
-'-110,-536,-622,622,125,-112,-622,-622,-622,124,-536,-622,-622,-622,722',
-'-622,125,724,528,580,564,124,529,252,-622,-622,-622,-622,589,588,592',
-'591,222,223,722,-622,-622,724,-622,-622,-622,-622,-622,746,536,575,574',
+'803,-529,628,627,790,-111,-621,-621,-621,-621,-621,-621,-621,-621,-621',
+'-621,-621,-621,-621,-621,-347,803,-621,-621,-621,-104,669,-347,-530',
+'514,-621,628,627,-621,-531,-530,-347,-113,-621,517,-621,-531,-621,-621',
+'-621,-621,-621,-621,-621,-110,-621,-621,-621,519,-110,-79,578,228,575',
+'574,573,582,576,-101,470,-621,-621,232,-103,-536,-621,621,584,471,-621',
+'-110,-536,-621,622,125,-112,-621,-621,-621,124,-536,-621,-621,-621,722',
+'-621,125,724,528,580,564,124,529,252,-621,-621,-621,-621,589,588,592',
+'591,222,223,722,-621,-621,724,-621,-621,-621,-621,-621,746,536,575,574',
 '573,722,576,746,724,575,574,573,249,576,335,336,251,250,247,248,289',
-'585,232,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622',
-'-622,-622,286,742,-622,-622,-622,-537,818,-622,742,540,-622,544,-537',
-'-622,-622,545,-622,745,-622,252,-622,-537,-622,-622,-622,-622,-622,-622',
-'-622,252,-622,-622,-622,232,538,539,1037,578,232,575,574,573,582,576',
-'603,-622,-622,-622,-622,411,-622,249,-622,584,-303,251,250,-622,228',
+'585,232,-621,-621,-621,-621,-621,-621,-621,-621,-621,-621,-621,-621',
+'-621,-621,286,742,-621,-621,-621,-537,818,-621,742,540,-621,544,-537',
+'-621,-621,545,-621,745,-621,252,-621,-537,-621,-621,-621,-621,-621,-621',
+'-621,252,-621,-621,-621,232,538,539,1037,578,232,575,574,573,582,576',
+'603,-621,-621,-621,-621,411,-621,249,-621,584,-303,251,250,-621,228',
 '608,-112,-303,-303,-303,609,535,-303,-303,-303,633,-303,637,-294,640',
 '533,580,228,643,252,-294,-303,-303,-303,547,589,588,592,591,-294,650',
 '-303,-303,471,-303,-303,-303,-303,-303,746,-278,575,574,573,652,576',
@@ -81,16 +81,16 @@ clist = [
 '-303,-303,-303,-303,-303,-303,-303,519,730,-303,-303,-303,746,668,575',
 '574,573,-303,576,733,-303,734,736,738,740,-303,749,-303,750,-303,-303',
 '-303,-303,-303,-303,-303,751,-303,753,-303,578,718,575,574,573,582,576',
-'-304,718,603,742,718,-303,-303,-304,-303,584,-303,776,781,791,-622,792',
-'-304,-303,-279,804,-114,-622,-622,-622,504,504,232,-622,-622,252,-622',
-'580,746,821,575,574,573,272,576,-622,589,588,592,591,830,262,263,832',
-'517,519,-622,-622,709,-622,-622,-622,-622,-622,232,286,286,249,228,255',
+'-304,718,603,742,718,-303,-303,-304,-303,584,-303,776,781,791,-621,792',
+'-304,-303,-279,804,-114,-621,-621,-621,504,504,232,-621,-621,252,-621',
+'580,746,821,575,574,573,272,576,-621,589,588,592,591,830,262,263,832',
+'517,519,-621,-621,709,-621,-621,-621,-621,-621,232,286,286,249,228,255',
 '709,251,250,247,248,772,742,253,252,254,252,232,585,869,774,232,878',
-'-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622',
-'-303,-304,-622,-622,-622,718,669,-303,-304,232,-622,905,-619,-622,-280',
-'232,-303,-304,-622,910,-622,927,-622,-622,-622,-622,-622,-622,-622,709',
-'-622,-622,-622,746,-278,575,574,573,582,576,-303,932,937,232,733,-622',
-'-622,-303,-622,584,-622,940,-619,942,-443,944,-303,-622,228,946,-112',
+'-621,-621,-621,-621,-621,-621,-621,-621,-621,-621,-621,-621,-621,-621',
+'-303,-304,-621,-621,-621,718,669,-303,-304,232,-621,905,-618,-621,-280',
+'232,-303,-304,-621,910,-621,927,-621,-621,-621,-621,-621,-621,-621,709',
+'-621,-621,-621,746,-278,575,574,573,582,576,-303,932,937,232,733,-621',
+'-621,-303,-621,584,-621,940,-618,942,-443,944,-303,-621,228,946,-112',
 '-443,-443,-443,946,1028,-443,-443,-443,252,-443,580,899,900,774,232',
 '901,119,120,-443,-443,-443,592,591,952,262,263,718,718,718,-443,-443',
 '232,-443,-443,-443,-443,-443,718,232,970,249,-536,255,-537,251,250,247',
@@ -101,8 +101,8 @@ clist = [
 '-443,228,718,-304,781,1026,1029,842,1028,1035,-304,1038,946,-443,-443',
 '-312,-443,774,-443,-304,946,946,-312,-312,-312,-443,1043,-312,-312,-312',
 '578,-312,575,574,573,582,576,-303,1008,733,1052,-312,-312,1054,-303',
-'1056,584,1058,1058,-619,715,-312,-312,-303,-312,-312,-312,-312,-312',
-'999,1008,575,574,573,718,576,718,999,580,575,574,573,-619,576,-618,232',
+'1056,584,1058,1058,-618,715,-312,-312,-303,-312,-312,-312,-312,-312',
+'999,1008,575,574,573,718,576,718,999,580,575,574,573,-618,576,-617,232',
 '946,589,588,592,591,1008,-312,-312,-312,-312,-312,-312,-312,-312,-312',
 '-312,-312,-312,-312,-312,1081,1058,-312,-312,-312,1058,1058,-312,1058',
 '289,-312,,,-312,-312,,-312,585,-312,,-312,,-312,-312,-312,-312,-312',
@@ -113,30 +113,30 @@ clist = [
 '-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,-295',
 ',,-295,-295,-295,,,-295,,,-295,,,-295,-295,,-295,585,-295,,-295,,-295',
 '-295,-295,-295,-295,-295,-295,,-295,,-295,922,,575,574,573,923,576,',
-',,,,-295,-295,-295,-295,584,-295,-643,-295,,,,,-295,-643,-643,-643,',
-',-643,-643,-643,,-643,252,,,580,,,,,-643,-643,-643,,589,588,592,591',
-'262,263,,-643,-643,,-643,-643,-643,-643,-643,,,,,,249,,255,,251,250',
-'247,248,232,,,,,,,,585,,-643,-643,-643,-643,-643,-643,-643,-643,-643',
-'-643,-643,-643,-643,-643,,,-643,-643,-643,,,-643,,286,-643,,,-643,-643',
-',-643,,-643,,-643,,-643,-643,-643,-643,-643,-643,-643,,-643,-643,-643',
-',,,,,,,,,,,,-643,-643,-623,-643,,-643,,,,-623,-623,-623,-643,,-623,-623',
-'-623,578,-623,575,574,573,582,576,,,,-623,-623,-623,-623,,,584,,,,,-623',
-'-623,,-623,-623,-623,-623,-623,,,,,,,,,,580,,,,,,,,,589,588,592,591',
-',-623,-623,-623,-623,-623,-623,-623,-623,-623,-623,-623,-623,-623,-623',
-',,-623,-623,-623,,,-623,,,-623,,,-623,-623,,-623,585,-623,,-623,,-623',
-'-623,-623,-623,-623,-623,-623,,-623,-623,-623,746,,575,574,573,582,576',
-',,,,,-623,-623,-623,-623,584,-623,-624,-623,,,,,-623,-624,-624,-624',
-',,-624,-624,-624,,-624,252,,,580,,,,,-624,-624,-624,-624,,,592,591,262',
-'263,,-624,-624,,-624,-624,-624,-624,-624,,,,,,249,,,,251,250,247,248',
-',,,,,,,,585,,-624,-624,-624,-624,-624,-624,-624,-624,-624,-624,-624',
-'-624,-624,-624,,,-624,-624,-624,,,-624,,,-624,,,-624,-624,,-624,,-624',
-',-624,,-624,-624,-624,-624,-624,-624,-624,,-624,-624,-624,746,,575,574',
-'573,582,576,,,,,,-624,-624,-624,-624,584,-624,-643,-624,,,,,-624,-643',
-'-643,-643,,,-643,-643,-643,,-643,,,,580,,,,,-643,-643,,,,,592,591,,',
-',-643,-643,,-643,-643,-643,-643,-643,746,,575,574,573,582,576,922,,575',
-'574,573,923,576,,,584,,,,,585,,584,,,,,,,,,,,-643,,,,580,,,-643,,,,580',
-'286,-643,,592,591,,,,589,588,592,591,,,,,,,,,,,-643,-643,,,,,,,,,,,',
-',-643,585,,,,-643,,,585,,,,-643,186,197,187,210,183,203,193,192,213',
+',,,,-295,-295,-295,-295,584,-295,-642,-295,,,,,-295,-642,-642,-642,',
+',-642,-642,-642,,-642,252,,,580,,,,,-642,-642,-642,,589,588,592,591',
+'262,263,,-642,-642,,-642,-642,-642,-642,-642,,,,,,249,,255,,251,250',
+'247,248,232,,,,,,,,585,,-642,-642,-642,-642,-642,-642,-642,-642,-642',
+'-642,-642,-642,-642,-642,,,-642,-642,-642,,,-642,,286,-642,,,-642,-642',
+',-642,,-642,,-642,,-642,-642,-642,-642,-642,-642,-642,,-642,-642,-642',
+',,,,,,,,,,,,-642,-642,-622,-642,,-642,,,,-622,-622,-622,-642,,-622,-622',
+'-622,578,-622,575,574,573,582,576,,,,-622,-622,-622,-622,,,584,,,,,-622',
+'-622,,-622,-622,-622,-622,-622,,,,,,,,,,580,,,,,,,,,589,588,592,591',
+',-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622,-622',
+',,-622,-622,-622,,,-622,,,-622,,,-622,-622,,-622,585,-622,,-622,,-622',
+'-622,-622,-622,-622,-622,-622,,-622,-622,-622,746,,575,574,573,582,576',
+',,,,,-622,-622,-622,-622,584,-622,-623,-622,,,,,-622,-623,-623,-623',
+',,-623,-623,-623,,-623,252,,,580,,,,,-623,-623,-623,-623,,,592,591,262',
+'263,,-623,-623,,-623,-623,-623,-623,-623,,,,,,249,,,,251,250,247,248',
+',,,,,,,,585,,-623,-623,-623,-623,-623,-623,-623,-623,-623,-623,-623',
+'-623,-623,-623,,,-623,-623,-623,,,-623,,,-623,,,-623,-623,,-623,,-623',
+',-623,,-623,-623,-623,-623,-623,-623,-623,,-623,-623,-623,746,,575,574',
+'573,582,576,,,,,,-623,-623,-623,-623,584,-623,-642,-623,,,,,-623,-642',
+'-642,-642,,,-642,-642,-642,,-642,,,,580,,,,,-642,-642,,,,,592,591,,',
+',-642,-642,,-642,-642,-642,-642,-642,746,,575,574,573,582,576,922,,575',
+'574,573,923,576,,,584,,,,,585,,584,,,,,,,,,,,-642,,,,580,,,-642,,,,580',
+'286,-642,,592,591,,,,589,588,592,591,,,,,,,,,,,-642,-642,,,,,,,,,,,',
+',-642,585,,,,-642,,,585,,,,-642,186,197,187,210,183,203,193,192,213',
 '214,208,191,190,185,211,215,216,195,184,198,202,204,196,189,,,,205,212',
 '207,206,199,209,194,182,201,200,,,,,,181,188,179,180,176,177,178,136',
 '138,135,,137,,,,,,,,,170,171,,166,148,149,150,157,154,156,,,151,152',
@@ -219,43 +219,43 @@ clist = [
 '307,85,86,87,12,78,,,,79,80,,,,83,,81,82,84,33,34,76,77,,,,,,88,31,30',
 '113,112,114,115,,,22,,,,,,11,49,309,13,117,116,118,107,60,109,108,110',
 ',111,119,120,,105,106,,45,46,44,252,256,257,258,259,269,270,264,265',
-'260,261,,-644,-644,,,262,263,,43,,,36,,,62,63,,,64,,38,249,,255,48,251',
+'260,261,,-643,-643,,,262,263,,43,,,36,,,62,63,,,64,,38,249,,255,48,251',
 '250,247,248,268,267,253,23,254,,,,103,95,97,98,99,101,,,,96,104,,,,',
 ',,66,,,93,100,102,307,85,86,87,12,78,,,,79,80,,,,83,,81,82,84,33,34',
 '76,77,,,,,,88,31,30,113,112,114,115,,,22,,,,,,11,49,309,13,117,116,118',
 '107,60,109,108,110,,111,119,120,,105,106,,45,46,44,252,256,257,258,259',
-'269,270,264,265,260,261,,-644,-644,,,262,263,,43,,,36,,,62,63,,,64,',
+'269,270,264,265,260,261,,-643,-643,,,262,263,,43,,,36,,,62,63,,,64,',
 '38,249,,255,48,251,250,247,248,268,267,253,23,254,,,,103,95,97,98,99',
 '101,,,,96,104,,,,,,,66,,,93,100,102,307,85,86,87,12,78,,,,79,80,,,,83',
 ',81,82,84,33,34,76,77,,,,,,88,31,30,113,112,114,115,,,22,,,,,,11,49',
 '309,13,117,116,118,107,60,109,108,110,,111,119,120,,105,106,,45,46,44',
-'252,-644,-644,-644,-644,269,270,,,-644,-644,,,,,,262,263,,43,,,36,,',
+'252,-643,-643,-643,-643,269,270,,,-643,-643,,,,,,262,263,,43,,,36,,',
 '62,63,,,64,,38,249,,255,48,251,250,247,248,268,267,253,23,254,,,,103',
 '95,97,98,99,101,,,,96,104,,,,,,,66,,,93,100,102,8,85,86,87,12,78,,,',
 '79,80,,,,83,,81,82,84,33,34,76,77,,,,,,88,31,30,113,112,114,115,,,22',
 ',,,,,11,49,10,13,117,116,118,107,60,109,108,110,,111,119,120,,105,106',
-',45,46,44,252,-644,-644,-644,-644,269,270,,,-644,-644,,,,,,262,263,',
+',45,46,44,252,-643,-643,-643,-643,269,270,,,-643,-643,,,,,,262,263,',
 '43,,,36,,,62,63,,,64,,38,249,,255,48,251,250,247,248,268,267,253,23',
 '254,,,,103,95,97,98,99,101,,,,96,104,,,,,,,66,,,93,100,102,307,85,86',
 '87,12,78,,,,79,80,,,,83,,81,82,84,33,34,76,77,,,,,,88,31,30,113,112',
 '114,115,,,22,,,,,,11,49,309,13,117,116,118,107,60,109,108,110,,111,119',
-'120,,105,106,,45,46,44,252,-644,-644,-644,-644,269,270,,,-644,-644,',
+'120,,105,106,,45,46,44,252,-643,-643,-643,-643,269,270,,,-643,-643,',
 ',,,,262,263,,43,,,36,,,62,63,,,64,,38,249,,255,48,251,250,247,248,268',
 '267,253,23,254,,,,103,95,97,98,99,101,,,,96,104,,,,,,,66,,,93,100,102',
 '307,85,86,87,12,78,,,,79,80,,,,83,,81,82,84,33,34,76,77,,,,,,88,31,30',
 '113,112,114,115,,,22,,,,,,11,49,309,13,117,116,118,107,60,109,108,110',
-',111,119,120,,105,106,,45,46,44,252,-644,-644,-644,-644,269,270,,,-644',
-'-644,,,,,,262,263,,43,,,36,,,62,63,,,64,,38,249,,255,48,251,250,247',
+',111,119,120,,105,106,,45,46,44,252,-643,-643,-643,-643,269,270,,,-643',
+'-643,,,,,,262,263,,43,,,36,,,62,63,,,64,,38,249,,255,48,251,250,247',
 '248,268,267,253,23,254,,,,103,95,97,98,99,101,,,,96,104,,,,,,,66,,,93',
 '100,102,307,85,86,87,12,78,,,,79,80,,,,83,,81,82,84,33,34,76,77,,,,',
 ',88,31,30,113,112,114,115,,,22,,,,,,11,49,309,13,117,116,118,107,60',
-'109,108,110,,111,119,120,,105,106,,45,46,44,252,-644,-644,-644,-644',
-'269,270,,,-644,-644,,,,,,262,263,,43,,,36,,,62,63,,,64,,38,249,,255',
+'109,108,110,,111,119,120,,105,106,,45,46,44,252,-643,-643,-643,-643',
+'269,270,,,-643,-643,,,,,,262,263,,43,,,36,,,62,63,,,64,,38,249,,255',
 '48,251,250,247,248,268,267,253,23,254,,,,103,95,97,98,99,101,,,,96,104',
 ',,,,,,66,,,93,100,102,307,85,86,87,12,78,,,,79,80,,,,83,,81,82,84,33',
 '34,76,77,,,,,,88,31,30,113,112,114,115,,,22,,,,,,11,49,309,13,117,116',
-'118,107,60,109,108,110,,111,119,120,,105,106,,45,46,44,252,-644,-644',
-'-644,-644,269,270,,,-644,-644,,,,,,262,263,,43,,,36,,,62,63,,,64,,38',
+'118,107,60,109,108,110,,111,119,120,,105,106,,45,46,44,252,-643,-643',
+'-643,-643,269,270,,,-643,-643,,,,,,262,263,,43,,,36,,,62,63,,,64,,38',
 '249,,255,48,251,250,247,248,268,267,253,23,254,,,,103,95,97,98,99,101',
 ',,,96,104,,,,,,,66,,,93,100,102,307,85,86,87,12,78,,,,79,80,,,,83,,81',
 '82,84,33,34,76,77,,,,,,88,31,30,113,112,114,115,,,22,,,,,,11,49,309',
@@ -1909,20 +1909,20 @@ racc_action_pointer = [
    nil,  8462,   nil,   nil,   nil,   nil,  1168,   nil ]
 
 racc_action_default = [
-    -1,  -644,  -643,  -644,    -2,  -630,    -4,    -5,  -644,    -8,
-    -9,  -644,  -644,  -644,   -35,  -644,  -644,   -40,  -644,  -644,
-  -294,   -51,  -632,  -644,   -56,   -61,   -62,   -63,   -67,  -273,
-  -273,  -273,  -309,  -343,  -344,   -79,  -643,   -83,   -91,   -93,
-  -644,  -536,  -537,  -644,  -644,  -644,  -644,  -232,  -644,  -632,
+    -1,  -643,  -642,  -643,    -2,  -629,    -4,    -5,  -643,    -8,
+    -9,  -643,  -643,  -643,   -35,  -643,  -643,   -40,  -643,  -643,
+  -294,   -51,  -631,  -643,   -56,   -61,   -62,   -63,   -67,  -273,
+  -273,  -273,  -309,  -343,  -344,   -79,  -642,   -83,   -91,   -93,
+  -643,  -536,  -537,  -643,  -643,  -643,  -643,  -232,  -643,  -631,
   -246,  -285,  -286,  -287,  -288,  -289,  -290,  -291,  -292,  -293,
-  -617,  -296,  -298,  -305,  -307,  -317,  -423,  -644,  -644,   -58,
-   -58,  -630,  -644,  -327,  -334,  -644,  -345,  -346,  -348,  -349,
+  -616,  -296,  -298,  -305,  -307,  -317,  -423,  -643,  -643,   -58,
+   -58,  -629,  -643,  -327,  -334,  -643,  -345,  -346,  -348,  -349,
   -350,  -351,  -352,  -353,  -354,  -355,  -356,  -357,  -366,  -468,
-  -469,  -470,  -471,  -472,  -473,  -643,  -476,  -643,  -643,  -643,
-  -486,  -643,  -643,  -643,  -514,  -520,  -521,  -615,  -525,  -526,
-  -616,  -528,  -529,  -530,  -531,  -532,  -533,  -534,  -535,  -540,
-  -541,  1088,    -3,  -631,  -639,  -640,  -641,    -7,  -644,  -644,
-  -644,  -644,  -644,  -644,   -23,  -644,  -122,  -123,  -124,  -125,
+  -469,  -470,  -471,  -472,  -473,  -642,  -476,  -642,  -642,  -642,
+  -486,  -642,  -642,  -642,  -514,  -520,  -521,  -614,  -525,  -526,
+  -615,  -528,  -529,  -530,  -531,  -532,  -533,  -534,  -535,  -540,
+  -541,  1088,    -3,  -630,  -638,  -639,  -640,    -7,  -643,  -643,
+  -643,  -643,  -643,  -643,   -23,  -643,  -122,  -123,  -124,  -125,
   -126,  -127,  -128,  -129,  -130,  -134,  -135,  -136,  -137,  -138,
   -139,  -140,  -141,  -142,  -143,  -144,  -145,  -146,  -147,  -148,
   -149,  -150,  -151,  -152,  -153,  -154,  -155,  -156,  -157,  -158,
@@ -1930,94 +1930,94 @@ racc_action_default = [
   -169,  -170,  -171,  -172,  -173,  -174,  -175,  -176,  -177,  -178,
   -179,  -180,  -181,  -182,  -183,  -184,  -185,  -186,  -187,  -188,
   -189,  -190,  -191,  -192,  -193,  -194,  -195,  -196,  -197,  -198,
-  -199,  -200,  -201,  -202,  -203,  -204,  -205,   -28,  -131,  -643,
-  -644,  -644,  -644,  -644,  -644,  -643,  -644,  -644,  -627,  -644,
-  -644,  -632,  -633,   -55,  -644,  -536,  -537,  -644,  -294,  -644,
-  -644,  -238,  -644,  -643,  -644,  -644,  -644,  -644,  -644,  -644,
-  -644,  -644,  -644,  -644,  -644,  -644,  -644,  -644,  -644,  -644,
-  -644,  -644,  -644,  -644,  -644,  -644,  -644,  -247,  -248,  -249,
-  -250,  -644,  -359,  -452,  -431,  -644,  -628,  -629,   -68,  -644,
-  -316,  -358,  -644,  -445,  -447,   -74,  -643,  -442,   -75,  -632,
-   -76,  -253,  -268,  -643,  -643,  -272,  -644,  -278,  -644,  -610,
-  -644,  -644,   -77,   -78,  -630,   -17,   -18,  -644,   -21,   -22,
-   -81,  -643,  -632,  -644,   -84,   -87,  -643,   -99,  -100,  -644,
-  -644,  -107,  -309,  -312,  -632,  -435,  -343,  -344,  -347,  -443,
-  -644,   -89,  -644,   -95,  -304,  -522,  -523,  -644,  -226,  -227,
-  -644,  -239,  -644,  -643,  -300,  -632,  -643,  -643,  -318,  -319,
-  -568,   -57,  -644,  -644,  -644,  -643,  -643,  -630,  -644,  -631,
-  -536,  -537,  -644,  -644,  -294,  -644,  -376,  -377,  -644,  -330,
-  -644,  -122,  -123,  -165,  -166,  -167,  -183,  -188,  -195,  -198,
-  -337,  -644,  -536,  -537,  -605,  -606,  -474,  -644,  -498,  -644,
-  -500,  -644,  -502,  -644,  -644,  -481,  -644,  -643,  -644,  -644,
-  -494,  -644,  -644,  -496,  -644,  -513,  -515,  -516,  -517,  -518,
-    -6,  -642,   -29,   -30,   -31,   -32,   -33,   -10,   -11,  -644,
-   -25,   -26,   -27,  -132,  -644,   -36,   -38,   -39,  -644,  -644,
-   -37,  -644,   -41,  -644,  -294,   -49,   -50,  -206,  -258,  -278,
-   -52,   -53,   -42,  -207,  -258,  -632,  -263,  -264,  -643,  -643,
-  -618,  -619,  -273,  -440,  -620,  -621,  -619,  -618,  -273,  -439,
-  -441,  -620,  -621,   -48,  -215,   -54,  -632,  -315,  -644,  -644,
-  -644,  -643,  -304,  -644,  -644,  -644,  -216,  -217,  -218,  -219,
+  -199,  -200,  -201,  -202,  -203,  -204,  -205,   -28,  -131,  -642,
+  -643,  -643,  -643,  -643,  -643,  -642,  -643,  -643,  -626,  -643,
+  -643,  -631,  -632,   -55,  -643,  -536,  -537,  -643,  -294,  -643,
+  -643,  -238,  -643,  -642,  -643,  -643,  -643,  -643,  -643,  -643,
+  -643,  -643,  -643,  -643,  -643,  -643,  -643,  -643,  -643,  -643,
+  -643,  -643,  -643,  -643,  -643,  -643,  -643,  -247,  -248,  -249,
+  -250,  -643,  -359,  -452,  -431,  -643,  -627,  -628,   -68,  -643,
+  -316,  -358,  -643,  -445,  -447,   -74,  -642,  -442,   -75,  -631,
+   -76,  -253,  -268,  -642,  -642,  -272,  -643,  -278,  -643,  -609,
+  -643,  -643,   -77,   -78,  -629,   -17,   -18,  -643,   -21,   -22,
+   -81,  -642,  -631,  -643,   -84,   -87,  -642,   -99,  -100,  -643,
+  -643,  -107,  -309,  -312,  -631,  -435,  -343,  -344,  -347,  -443,
+  -643,   -89,  -643,   -95,  -304,  -522,  -523,  -643,  -226,  -227,
+  -643,  -239,  -643,  -642,  -300,  -631,  -642,  -642,  -318,  -319,
+  -568,   -57,  -643,  -643,  -643,  -642,  -642,  -629,  -643,  -630,
+  -536,  -537,  -643,  -643,  -294,  -643,  -376,  -377,  -643,  -330,
+  -643,  -122,  -123,  -165,  -166,  -167,  -183,  -188,  -195,  -198,
+  -337,  -643,  -536,  -537,  -604,  -605,  -474,  -643,  -498,  -643,
+  -500,  -643,  -502,  -643,  -643,  -481,  -643,  -642,  -643,  -643,
+  -494,  -643,  -643,  -496,  -643,  -513,  -515,  -516,  -517,  -518,
+    -6,  -641,   -29,   -30,   -31,   -32,   -33,   -10,   -11,  -643,
+   -25,   -26,   -27,  -132,  -643,   -36,   -38,   -39,  -643,  -643,
+   -37,  -643,   -41,  -643,  -294,   -49,   -50,  -206,  -258,  -278,
+   -52,   -53,   -42,  -207,  -258,  -631,  -263,  -264,  -642,  -642,
+  -617,  -618,  -273,  -440,  -619,  -620,  -618,  -617,  -273,  -439,
+  -441,  -619,  -620,   -48,  -215,   -54,  -631,  -315,  -643,  -643,
+  -643,  -642,  -304,  -643,  -643,  -643,  -216,  -217,  -218,  -219,
   -220,  -221,  -222,  -223,  -228,  -229,  -230,  -231,  -233,  -234,
-  -235,  -236,  -237,  -240,  -241,  -242,  -243,  -632,  -251,  -644,
-  -453,  -273,  -618,  -619,   -65,   -69,  -274,  -436,  -449,  -452,
-  -632,  -632,  -311,  -269,  -644,  -277,  -270,  -644,  -275,  -644,
-  -279,  -613,  -614,   -16,  -631,   -20,  -632,   -80,  -302,   -96,
-   -85,  -644,  -632,  -643,  -644,  -644,  -106,  -644,  -522,  -523,
-  -644,   -92,   -97,  -644,  -644,  -644,  -644,  -644,  -252,  -244,
-  -644,  -460,  -644,  -632,  -299,  -254,  -636,  -636,  -644,  -644,
-  -608,  -636,  -644,  -424,  -568,  -427,  -604,  -604,  -551,  -553,
-  -553,  -553,  -567,  -570,  -571,  -572,  -573,  -574,  -575,  -576,
-  -644,  -578,  -644,  -584,  -586,  -587,  -589,  -594,  -596,  -597,
-  -599,  -600,  -601,  -644,  -643,  -367,  -368,  -643,  -644,  -644,
-  -644,  -644,  -644,  -362,  -455,  -643,  -644,  -644,  -304,   -58,
-  -117,  -118,  -644,  -120,  -644,  -294,  -643,  -644,  -335,  -546,
-  -340,  -625,  -626,  -644,  -475,  -499,  -504,  -505,  -507,  -477,
-  -501,  -478,  -503,  -479,  -480,  -644,  -483,  -485,  -644,  -488,
-  -490,  -491,  -644,  -492,  -493,  -644,  -519,  -643,   -24,  -644,
-   -34,  -284,  -644,  -644,  -643,  -644,  -644,  -644,  -444,  -644,
-  -265,  -267,  -644,  -644,   -70,  -261,  -262,  -437,  -644,  -644,
-   -72,  -438,  -314,  -634,  -618,  -619,  -618,  -619,  -632,  -644,
-  -430,  -643,   -64,  -432,  -449,  -644,  -450,  -644,  -260,  -310,
-  -643,  -276,  -280,  -644,  -611,  -612,   -19,   -82,  -644,   -88,
-   -94,  -632,  -618,  -619,  -643,  -103,  -105,  -644,   -90,  -644,
-  -644,  -224,  -225,  -632,  -643,  -360,  -643,  -297,  -365,  -301,
-  -255,  -638,  -637,  -257,  -638,  -306,  -308,  -609,  -644,  -632,
-  -644,  -549,  -550,  -644,  -644,  -560,  -644,  -563,  -644,  -565,
-  -644,  -378,  -644,  -380,  -382,  -389,  -575,  -632,  -580,  -588,
-  -598,  -602,  -643,  -369,  -643,   -59,  -370,  -371,  -322,  -323,
-  -644,  -325,  -644,  -632,  -618,  -619,  -622,  -303,  -643,  -117,
-  -118,  -119,  -644,  -644,  -643,  -328,  -542,  -544,  -331,  -643,
-  -643,  -568,  -568,  -644,  -632,  -644,  -643,  -482,  -484,  -644,
-  -487,  -495,  -497,  -644,  -133,  -282,  -644,  -632,  -618,  -619,
-  -619,  -618,  -259,  -644,  -635,  -643,   -44,  -209,   -45,  -210,
-   -71,   -46,  -212,   -47,  -211,   -73,  -644,  -644,  -644,  -644,
-  -444,  -644,  -412,  -413,  -632,  -415,  -643,  -434,  -433,  -644,
-  -446,  -643,  -448,  -271,  -281,   -86,  -101,   -98,  -214,  -313,
-   -13,   -15,  -361,  -363,  -643,  -467,  -461,  -643,  -462,  -463,
-  -636,  -425,  -643,  -643,  -417,  -632,  -604,  -585,  -603,  -552,
-  -553,  -553,  -579,  -553,  -553,  -595,  -553,  -590,  -632,  -644,
-  -387,  -644,  -577,  -644,  -364,  -372,  -644,  -374,  -643,  -644,
-   -60,  -324,  -644,  -444,  -644,  -117,  -118,  -121,  -632,  -643,
-  -644,  -644,  -644,  -338,  -632,  -644,  -341,  -607,  -506,  -509,
-  -510,  -511,  -512,  -644,  -489,   -12,  -283,  -444,   -43,  -208,
-  -266,  -644,  -245,  -604,  -604,  -394,  -643,  -643,  -643,  -411,
-  -644,  -632,  -575,  -644,  -582,  -592,  -454,   -66,  -643,  -643,
-  -466,  -644,  -644,  -465,  -256,  -644,  -644,  -644,  -426,  -548,
-  -644,  -556,  -644,  -558,  -644,  -561,  -644,  -564,  -566,  -379,
-  -381,  -385,  -644,  -390,  -320,  -644,  -375,  -321,  -644,  -643,
-  -326,  -444,  -644,  -644,  -332,  -336,  -644,  -545,  -547,  -546,
-  -508,  -644,  -392,  -393,  -402,  -396,  -404,  -644,  -407,  -644,
-  -409,  -414,  -644,  -644,  -581,  -644,  -451,  -643,  -643,  -108,
-  -109,  -644,  -644,  -116,  -464,  -428,  -429,  -632,  -419,  -421,
-  -422,  -553,  -553,  -553,  -553,  -383,  -644,  -388,  -644,  -643,
-  -280,  -643,  -329,  -543,  -643,  -339,  -643,  -604,  -583,  -395,
-  -643,  -643,  -643,  -643,  -593,  -643,  -416,  -591,  -644,  -304,
-   -14,  -460,  -643,  -644,  -644,  -115,  -418,  -644,  -644,  -554,
-  -557,  -559,  -562,  -644,  -386,  -643,  -456,  -457,  -458,  -644,
-  -644,  -391,  -644,  -399,  -644,  -401,  -644,  -405,  -644,  -408,
-  -410,  -303,  -622,  -459,  -632,  -618,  -619,  -622,  -114,  -420,
-  -553,  -384,  -373,  -333,  -342,  -643,  -643,  -643,  -643,  -444,
-  -555,  -644,  -397,  -400,  -403,  -406,  -643,  -398 ]
+  -235,  -236,  -237,  -240,  -241,  -242,  -243,  -631,  -251,  -643,
+  -453,  -273,  -617,  -618,   -65,   -69,  -274,  -436,  -449,  -452,
+  -631,  -631,  -311,  -269,  -643,  -277,  -270,  -643,  -275,  -643,
+  -279,  -612,  -613,   -16,  -630,   -20,  -631,   -80,  -302,   -96,
+   -85,  -643,  -631,  -642,  -643,  -643,  -106,  -643,  -522,  -523,
+  -643,   -92,   -97,  -643,  -643,  -643,  -643,  -643,  -252,  -244,
+  -643,  -460,  -643,  -631,  -299,  -254,  -635,  -635,  -643,  -643,
+  -607,  -635,  -643,  -424,  -568,  -427,  -603,  -603,  -551,  -553,
+  -553,  -553,  -567,  -569,  -570,  -571,  -572,  -573,  -574,  -575,
+  -643,  -577,  -643,  -583,  -585,  -586,  -588,  -593,  -595,  -596,
+  -598,  -599,  -600,  -643,  -642,  -367,  -368,  -642,  -643,  -643,
+  -643,  -643,  -643,  -362,  -455,  -642,  -643,  -643,  -304,   -58,
+  -117,  -118,  -643,  -120,  -643,  -294,  -642,  -643,  -335,  -546,
+  -340,  -624,  -625,  -643,  -475,  -499,  -504,  -505,  -507,  -477,
+  -501,  -478,  -503,  -479,  -480,  -643,  -483,  -485,  -643,  -488,
+  -490,  -491,  -643,  -492,  -493,  -643,  -519,  -642,   -24,  -643,
+   -34,  -284,  -643,  -643,  -642,  -643,  -643,  -643,  -444,  -643,
+  -265,  -267,  -643,  -643,   -70,  -261,  -262,  -437,  -643,  -643,
+   -72,  -438,  -314,  -633,  -617,  -618,  -617,  -618,  -631,  -643,
+  -430,  -642,   -64,  -432,  -449,  -643,  -450,  -643,  -260,  -310,
+  -642,  -276,  -280,  -643,  -610,  -611,   -19,   -82,  -643,   -88,
+   -94,  -631,  -617,  -618,  -642,  -103,  -105,  -643,   -90,  -643,
+  -643,  -224,  -225,  -631,  -642,  -360,  -642,  -297,  -365,  -301,
+  -255,  -637,  -636,  -257,  -637,  -306,  -308,  -608,  -643,  -631,
+  -643,  -549,  -550,  -643,  -643,  -560,  -643,  -563,  -643,  -565,
+  -643,  -378,  -643,  -380,  -382,  -389,  -574,  -631,  -579,  -587,
+  -597,  -601,  -642,  -369,  -642,   -59,  -370,  -371,  -322,  -323,
+  -643,  -325,  -643,  -631,  -617,  -618,  -621,  -303,  -642,  -117,
+  -118,  -119,  -643,  -643,  -642,  -328,  -542,  -544,  -331,  -642,
+  -642,  -568,  -568,  -643,  -631,  -643,  -642,  -482,  -484,  -643,
+  -487,  -495,  -497,  -643,  -133,  -282,  -643,  -631,  -617,  -618,
+  -618,  -617,  -259,  -643,  -634,  -642,   -44,  -209,   -45,  -210,
+   -71,   -46,  -212,   -47,  -211,   -73,  -643,  -643,  -643,  -643,
+  -444,  -643,  -412,  -413,  -631,  -415,  -642,  -434,  -433,  -643,
+  -446,  -642,  -448,  -271,  -281,   -86,  -101,   -98,  -214,  -313,
+   -13,   -15,  -361,  -363,  -642,  -467,  -461,  -642,  -462,  -463,
+  -635,  -425,  -642,  -642,  -417,  -631,  -603,  -584,  -602,  -552,
+  -553,  -553,  -578,  -553,  -553,  -594,  -553,  -589,  -631,  -643,
+  -387,  -643,  -576,  -643,  -364,  -372,  -643,  -374,  -642,  -643,
+   -60,  -324,  -643,  -444,  -643,  -117,  -118,  -121,  -631,  -642,
+  -643,  -643,  -643,  -338,  -631,  -643,  -341,  -606,  -506,  -509,
+  -510,  -511,  -512,  -643,  -489,   -12,  -283,  -444,   -43,  -208,
+  -266,  -643,  -245,  -603,  -603,  -394,  -642,  -642,  -642,  -411,
+  -643,  -631,  -574,  -643,  -581,  -591,  -454,   -66,  -642,  -642,
+  -466,  -643,  -643,  -465,  -256,  -643,  -643,  -643,  -426,  -548,
+  -643,  -556,  -643,  -558,  -643,  -561,  -643,  -564,  -566,  -379,
+  -381,  -385,  -643,  -390,  -320,  -643,  -375,  -321,  -643,  -642,
+  -326,  -444,  -643,  -643,  -332,  -336,  -643,  -545,  -547,  -546,
+  -508,  -643,  -392,  -393,  -402,  -396,  -404,  -643,  -407,  -643,
+  -409,  -414,  -643,  -643,  -580,  -643,  -451,  -642,  -642,  -108,
+  -109,  -643,  -643,  -116,  -464,  -428,  -429,  -631,  -419,  -421,
+  -422,  -553,  -553,  -553,  -553,  -383,  -643,  -388,  -643,  -642,
+  -280,  -642,  -329,  -543,  -642,  -339,  -642,  -603,  -582,  -395,
+  -642,  -642,  -642,  -642,  -592,  -642,  -416,  -590,  -643,  -304,
+   -14,  -460,  -642,  -643,  -643,  -115,  -418,  -643,  -643,  -554,
+  -557,  -559,  -562,  -643,  -386,  -642,  -456,  -457,  -458,  -643,
+  -643,  -391,  -643,  -399,  -643,  -401,  -643,  -405,  -643,  -408,
+  -410,  -303,  -621,  -459,  -631,  -617,  -618,  -621,  -114,  -420,
+  -553,  -384,  -373,  -333,  -342,  -642,  -642,  -642,  -642,  -444,
+  -555,  -643,  -397,  -400,  -403,  -406,  -642,  -398 ]
 
 clist = [
 '6,287,230,226,233,292,292,292,445,274,19,276,452,458,602,380,19,443',
@@ -2138,24 +2138,24 @@ clist = [
 '6,85,39,37,26,45,45,45,35,171,34,37,49,49,113,69,34,76,2,70,70,102,76',
 '118,23,23,58,12,23,39,15,34,5,62,41,41,82,82,82,87,34,34,34,69,34,34',
 '34,51,121,21,21,109,84,84,84,8,9,73,73,74,74,49,9,59,28,28,50,50,50',
-'35,34,172,64,100,88,34,34,88,218,34,34,147,170,70,203,23,23,23,23,118',
+'35,34,172,64,100,88,34,34,88,217,34,34,147,170,70,203,23,23,23,23,118',
 '106,106,107,6,63,6,6,6,5,6,6,6,36,83,83,192,17,148,83,30,30,70,52,30',
-'213,67,9,164,162,146,100,100,1,100,158,209,193,160,153,153,193,34,7',
-'193,165,3,34,34,34,34,34,214,189,24,10,68,24,68,189,11,159,24,159,78',
+'212,67,9,164,162,146,100,100,1,100,158,208,193,160,153,153,193,34,7',
+'193,165,3,34,34,34,34,34,213,189,24,10,68,24,68,189,11,159,24,159,78',
 '78,32,13,57,57,57,32,16,18,20,22,25,31,149,42,44,30,30,30,30,48,54,75',
 '9,79,81,86,98,101,104,115,117,9,122,78,123,124,125,126,127,87,128,129',
 '85,45,130,131,26,26,132,133,26,134,135,136,137,26,138,139,162,150,156',
-'214,164,37,163,88,88,218,6,82,82,166,34,34,34,34,34,34,34,165,70,167',
+'213,164,37,163,88,88,217,6,82,82,166,34,34,34,34,34,34,34,165,70,167',
 '34,34,34,159,168,169,147,175,176,147,7,149,178,180,34,45,85,35,49,49',
 '113,146,45,181,182,45,183,30,30,76,60,76,148,184,64,30,30,158,67,187',
-'160,188,190,64,100,191,82,6,218,194,34,52,195,196,6,6,82,34,197,170',
+'160,188,190,64,100,191,82,6,217,194,34,52,195,196,6,6,82,34,197,170',
 '34,203,84,85,58,149,37,39,198,58,172,109,84,162,23,199,200,201,34,35',
-'202,213,34,49,37,118,34,34,60,207,210,62,211,217,5,49,,,36,,209,59,149',
-'34,,,59,6,6,37,,60,192,82,34,,,8,,159,,36,,,9,34,34,34,209,84,84,,,147',
+'202,212,34,49,37,118,34,34,60,207,209,62,210,216,5,49,,,36,,208,59,149',
+'34,,,59,6,6,37,,60,192,82,34,,,8,,159,,36,,,9,34,34,34,208,84,84,,,147',
 '63,147,,193,118,34,193,34,17,,60,,,5,107,,,35,,159,,49,159,100,6,30',
 '83,121,,100,,,,57,100,,,,,,,,100,57,,,37,153,,36,,,85,,39,,70,,85,,78',
-',51,,87,,35,64,51,85,49,49,,45,,6,6,78,209,6,,147,147,36,76,76,21,,',
-',76,76,12,12,73,,74,159,6,88,218,85,,,153,153,39,70,34,,,,100,78,,78',
+',51,,87,,35,64,51,85,49,49,,45,,6,6,78,208,6,,147,147,36,76,76,21,,',
+',76,76,12,12,73,,74,159,6,88,217,85,,,153,153,39,70,34,,,,100,78,,78',
 '100,,50,,,,,,50,,,,6,,,60,76,152,85,45,147,,147,15,,,170,170,203,203',
 '85,,,,,,,,,,62,193,,,6,34,,84,,62,12,50,34,,34,,70,147,36,60,60,34,',
 '87,,,,,70,,35,34,49,28,,60,,,,,,60,,100,100,,12,41,24,,85,45,153,,,',
@@ -2259,8 +2259,8 @@ racc_goto_pointer = [
   -268,   -16,  -202,   nil,   nil,   -39,   -39,   nil,  -437,   nil,
   -250,  -751,  -343,  -453,  -577,   nil,   nil,   184,   183,    45,
    181,   183,  -289,  -261,  -111,   189,   189,   193,  -480,  -315,
-  -315,   211,  -459,  -266,   nil,   nil,   247,  -408,   nil,  -609,
-  -403,  -642,   nil,  -622,  -836,   nil,   nil,   -55,  -439 ]
+  -315,   211,  -459,  -266,   nil,   nil,   247,  -408,  -609,  -403,
+  -642,   nil,  -622,  -836,   nil,   nil,   -55,  -439 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,     5,   nil,   305,     7,   359,   308,
@@ -2283,8 +2283,8 @@ racc_goto_default = [
    nil,   nil,   nil,   459,   282,   nil,   nil,   686,   nil,   500,
    nil,   nil,   nil,   nil,   nil,    89,    92,    94,   nil,   nil,
    nil,   nil,   nil,   630,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   859,   782,   566,   nil,   570,   nil,   581,
-   583,   924,   586,   587,   925,   590,   593,   nil,   299 ]
+   nil,   nil,   nil,   859,   782,   566,   nil,   570,   581,   583,
+   924,   586,   587,   925,   590,   593,   nil,   299 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -2856,52 +2856,51 @@ racc_reduce_table = [
   4, 314, :_reduce_566,
   1, 314, :_reduce_567,
   0, 314, :_reduce_568,
-  1, 352, :_reduce_none,
+  1, 309, :_reduce_569,
   1, 309, :_reduce_570,
   1, 309, :_reduce_571,
   1, 309, :_reduce_572,
-  1, 309, :_reduce_573,
   1, 291, :_reduce_none,
-  1, 291, :_reduce_575,
-  1, 353, :_reduce_none,
-  3, 353, :_reduce_577,
-  1, 301, :_reduce_578,
-  3, 301, :_reduce_579,
+  1, 291, :_reduce_574,
+  1, 352, :_reduce_none,
+  3, 352, :_reduce_576,
+  1, 301, :_reduce_577,
+  3, 301, :_reduce_578,
+  2, 353, :_reduce_579,
   2, 354, :_reduce_580,
-  2, 355, :_reduce_581,
   1, 295, :_reduce_none,
-  3, 295, :_reduce_583,
+  3, 295, :_reduce_582,
   1, 349, :_reduce_none,
-  3, 349, :_reduce_585,
-  1, 356, :_reduce_none,
-  1, 356, :_reduce_none,
-  2, 296, :_reduce_588,
-  1, 296, :_reduce_589,
+  3, 349, :_reduce_584,
+  1, 355, :_reduce_none,
+  1, 355, :_reduce_none,
+  2, 296, :_reduce_587,
+  1, 296, :_reduce_588,
+  3, 356, :_reduce_589,
   3, 357, :_reduce_590,
-  3, 358, :_reduce_591,
-  1, 302, :_reduce_592,
-  3, 302, :_reduce_593,
-  1, 351, :_reduce_594,
-  3, 351, :_reduce_595,
+  1, 302, :_reduce_591,
+  3, 302, :_reduce_592,
+  1, 351, :_reduce_593,
+  3, 351, :_reduce_594,
+  1, 358, :_reduce_none,
+  1, 358, :_reduce_none,
+  2, 303, :_reduce_597,
+  1, 303, :_reduce_598,
   1, 359, :_reduce_none,
   1, 359, :_reduce_none,
-  2, 303, :_reduce_598,
-  1, 303, :_reduce_599,
-  1, 360, :_reduce_none,
-  1, 360, :_reduce_none,
-  2, 298, :_reduce_602,
-  2, 297, :_reduce_603,
-  0, 297, :_reduce_604,
+  2, 298, :_reduce_601,
+  2, 297, :_reduce_602,
+  0, 297, :_reduce_603,
   1, 266, :_reduce_none,
-  0, 361, :_reduce_606,
-  4, 266, :_reduce_607,
-  1, 245, :_reduce_608,
+  0, 360, :_reduce_605,
+  4, 266, :_reduce_606,
+  1, 245, :_reduce_607,
   2, 245, :_reduce_none,
   1, 228, :_reduce_none,
-  3, 228, :_reduce_611,
-  3, 362, :_reduce_612,
-  2, 362, :_reduce_613,
-  2, 362, :_reduce_614,
+  3, 228, :_reduce_610,
+  3, 361, :_reduce_611,
+  2, 361, :_reduce_612,
+  2, 361, :_reduce_613,
   1, 199, :_reduce_none,
   1, 199, :_reduce_none,
   1, 199, :_reduce_none,
@@ -2926,13 +2925,13 @@ racc_reduce_table = [
   0, 227, :_reduce_none,
   1, 227, :_reduce_none,
   1, 227, :_reduce_none,
-  1, 262, :_reduce_639,
+  1, 262, :_reduce_638,
   1, 262, :_reduce_none,
   1, 152, :_reduce_none,
-  2, 152, :_reduce_642,
-  0, 150, :_reduce_643 ]
+  2, 152, :_reduce_641,
+  0, 150, :_reduce_642 ]
 
-racc_reduce_n = 644
+racc_reduce_n = 643
 
 racc_shift_n = 1088
 
@@ -3455,7 +3454,6 @@ Racc_token_to_s_table = [
   "f_kwarg",
   "opt_args_tail",
   "f_optarg",
-  "args_forward",
   "f_arg_item",
   "f_kw",
   "f_block_kw",
@@ -6719,35 +6717,33 @@ def _reduce_568(val, _values, result)
     result
 end
 
-# reduce 569 omitted
-
-def _reduce_570(val, _values, result)
+def _reduce_569(val, _values, result)
                       yyerror "formal argument cannot be a constant"
 
     result
 end
 
-def _reduce_571(val, _values, result)
+def _reduce_570(val, _values, result)
                       yyerror "formal argument cannot be an instance variable"
 
     result
 end
 
-def _reduce_572(val, _values, result)
+def _reduce_571(val, _values, result)
                       yyerror "formal argument cannot be a global variable"
 
     result
 end
 
-def _reduce_573(val, _values, result)
+def _reduce_572(val, _values, result)
                       yyerror "formal argument cannot be a class variable"
 
     result
 end
 
-# reduce 574 omitted
+# reduce 573 omitted
 
-def _reduce_575(val, _values, result)
+def _reduce_574(val, _values, result)
                       identifier = val[0].to_sym
                       self.env[identifier] = :lvar
 
@@ -6756,15 +6752,15 @@ def _reduce_575(val, _values, result)
     result
 end
 
-# reduce 576 omitted
+# reduce 575 omitted
 
-def _reduce_577(val, _values, result)
+def _reduce_576(val, _values, result)
                       result = val[1]
 
     result
 end
 
-def _reduce_578(val, _values, result)
+def _reduce_577(val, _values, result)
                       arg, = val
 
                       case arg
@@ -6780,7 +6776,7 @@ def _reduce_578(val, _values, result)
     result
 end
 
-def _reduce_579(val, _values, result)
+def _reduce_578(val, _values, result)
                       list, _, item = val
 
                       if list.sexp_type == :args then
@@ -6794,7 +6790,7 @@ def _reduce_579(val, _values, result)
     result
 end
 
-def _reduce_580(val, _values, result)
+def _reduce_579(val, _values, result)
                       # TODO: new_kw_arg
                       (label, line), arg = val
 
@@ -6807,7 +6803,7 @@ def _reduce_580(val, _values, result)
     result
 end
 
-def _reduce_581(val, _values, result)
+def _reduce_580(val, _values, result)
                       # TODO: new_kw_arg
                       (label, line), expr = val
                       id = label.to_sym
@@ -6818,28 +6814,28 @@ def _reduce_581(val, _values, result)
     result
 end
 
-# reduce 582 omitted
+# reduce 581 omitted
 
-def _reduce_583(val, _values, result)
+def _reduce_582(val, _values, result)
                       list, _, item = val
                       result = list << item.last
 
     result
 end
 
-# reduce 584 omitted
+# reduce 583 omitted
 
-def _reduce_585(val, _values, result)
+def _reduce_584(val, _values, result)
                       result = args val
 
     result
 end
 
-# reduce 586 omitted
+# reduce 585 omitted
 
-# reduce 587 omitted
+# reduce 586 omitted
 
-def _reduce_588(val, _values, result)
+def _reduce_587(val, _values, result)
                       name = val[1].to_sym
                       self.assignable name
                       result = :"**#{name}"
@@ -6847,34 +6843,33 @@ def _reduce_588(val, _values, result)
     result
 end
 
-def _reduce_589(val, _values, result)
+def _reduce_588(val, _values, result)
                       result = :"**"
-                      self.env[result] = :lvar
 
     result
 end
 
-def _reduce_590(val, _values, result)
+def _reduce_589(val, _values, result)
                       result = self.assignable val[0], val[2]
                       # TODO: detect duplicate names
 
     result
 end
 
-def _reduce_591(val, _values, result)
+def _reduce_590(val, _values, result)
                       result = self.assignable val[0], val[2]
 
     result
 end
 
-def _reduce_592(val, _values, result)
+def _reduce_591(val, _values, result)
                       optblk, = val
                       result = s(:block, optblk).line optblk.line
 
     result
 end
 
-def _reduce_593(val, _values, result)
+def _reduce_592(val, _values, result)
                       optarg, _, optblk = val
                       result = optarg
                       result << optblk
@@ -6882,24 +6877,24 @@ def _reduce_593(val, _values, result)
     result
 end
 
-def _reduce_594(val, _values, result)
+def _reduce_593(val, _values, result)
                       opt, = val
                       result = s(:block, opt).line opt.line
 
     result
 end
 
-def _reduce_595(val, _values, result)
+def _reduce_594(val, _values, result)
                       result = self.block_append val[0], val[2]
 
     result
 end
 
-# reduce 596 omitted
+# reduce 595 omitted
 
-# reduce 597 omitted
+# reduce 596 omitted
 
-def _reduce_598(val, _values, result)
+def _reduce_597(val, _values, result)
                       # TODO: differs from parse.y - needs tests
                       name = val[1].to_sym
                       self.assignable name
@@ -6908,7 +6903,7 @@ def _reduce_598(val, _values, result)
     result
 end
 
-def _reduce_599(val, _values, result)
+def _reduce_598(val, _values, result)
                       name = :"*"
                       self.env[name] = :lvar
                       result = name
@@ -6916,11 +6911,11 @@ def _reduce_599(val, _values, result)
     result
 end
 
-# reduce 600 omitted
+# reduce 599 omitted
 
-# reduce 601 omitted
+# reduce 600 omitted
 
-def _reduce_602(val, _values, result)
+def _reduce_601(val, _values, result)
                       identifier = val[1].to_sym
 
                       self.env[identifier] = :lvar
@@ -6929,27 +6924,27 @@ def _reduce_602(val, _values, result)
     result
 end
 
-def _reduce_603(val, _values, result)
+def _reduce_602(val, _values, result)
                       result = val[1]
 
     result
 end
 
-def _reduce_604(val, _values, result)
+def _reduce_603(val, _values, result)
                       result = nil
 
     result
 end
 
-# reduce 605 omitted
+# reduce 604 omitted
 
-def _reduce_606(val, _values, result)
+def _reduce_605(val, _values, result)
                       lexer.lex_state = EXPR_BEG
 
     result
 end
 
-def _reduce_607(val, _values, result)
+def _reduce_606(val, _values, result)
                       result = val[2]
                       yyerror "Can't define single method for literals." if
                         result.sexp_type == :lit
@@ -6957,17 +6952,17 @@ def _reduce_607(val, _values, result)
     result
 end
 
-def _reduce_608(val, _values, result)
+def _reduce_607(val, _values, result)
                       result = s(:array).line lexer.lineno
 
     result
 end
 
-# reduce 609 omitted
+# reduce 608 omitted
 
-# reduce 610 omitted
+# reduce 609 omitted
 
-def _reduce_611(val, _values, result)
+def _reduce_610(val, _values, result)
                       list = val[0].dup
                       more = val[2].sexp_body
                       list.push(*more) unless more.empty?
@@ -6977,14 +6972,14 @@ def _reduce_611(val, _values, result)
     result
 end
 
-def _reduce_612(val, _values, result)
+def _reduce_611(val, _values, result)
                       v1, _, v2 = val
                       result = s(:array, v1, v2).line v1.line
 
     result
 end
 
-def _reduce_613(val, _values, result)
+def _reduce_612(val, _values, result)
                       (label, line), arg = val
 
                       lit = s(:lit, label.to_sym).line line
@@ -6993,7 +6988,7 @@ def _reduce_613(val, _values, result)
     result
 end
 
-def _reduce_614(val, _values, result)
+def _reduce_613(val, _values, result)
                       _, arg = val
                       line = arg.line
                       result = s(:array, s(:kwsplat, arg).line(line)).line line
@@ -7001,6 +6996,8 @@ def _reduce_614(val, _values, result)
     result
 end
 
+# reduce 614 omitted
+
 # reduce 615 omitted
 
 # reduce 616 omitted
@@ -7047,23 +7044,21 @@ end
 
 # reduce 637 omitted
 
-# reduce 638 omitted
-
-def _reduce_639(val, _values, result)
+def _reduce_638(val, _values, result)
  yyerrok
     result
 end
 
-# reduce 640 omitted
+# reduce 639 omitted
 
-# reduce 641 omitted
+# reduce 640 omitted
 
-def _reduce_642(val, _values, result)
+def _reduce_641(val, _values, result)
  yyerrok
     result
 end
 
-def _reduce_643(val, _values, result)
+def _reduce_642(val, _values, result)
  result = nil;
     result
 end