ruby_parser 3.8.2 → 3.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +1 -2
  4. data/History.txt +12 -0
  5. data/lib/ruby18_parser.rb +7 -8
  6. data/lib/ruby18_parser.y +7 -8
  7. data/lib/ruby19_parser.rb +8 -9
  8. data/lib/ruby19_parser.y +10 -11
  9. data/lib/ruby20_parser.rb +2594 -2632
  10. data/lib/ruby20_parser.y +14 -50
  11. data/lib/ruby21_parser.rb +2591 -2619
  12. data/lib/ruby21_parser.y +14 -48
  13. data/lib/ruby22_parser.rb +263 -286
  14. data/lib/ruby22_parser.y +14 -45
  15. data/lib/ruby23_parser.rb +269 -292
  16. data/lib/ruby23_parser.y +14 -45
  17. data/lib/ruby_lexer.rb +41 -8
  18. data/lib/ruby_lexer.rex +6 -6
  19. data/lib/ruby_lexer.rex.rb +17 -11
  20. data/lib/ruby_parser.yy +20 -33
  21. data/lib/ruby_parser_extras.rb +65 -3
  22. data/test/test_ruby_lexer.rb +88 -14
  23. data/test/test_ruby_parser.rb +102 -9
  24. data/test/test_ruby_parser_extras.rb +1 -1
  25. metadata +29 -28
  26. metadata.gz.sig +0 -0
data/lib/ruby21_parser.y CHANGED
@@ -19,12 +19,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
19
19
  tWORDS_BEG tQWORDS_BEG tSTRING_DBEG tSTRING_DVAR tSTRING_END
20
20
  tSTRING tSYMBOL tNL tEH tCOLON tCOMMA tSPACE tSEMI tLAMBDA
21
21
  tLAMBEG tDSTAR tCHAR tSYMBOLS_BEG tQSYMBOLS_BEG tSTRING_DEND tUBANG
22
- #if defined(RUBY21) || defined(RUBY22) || defined(RUBY23))
23
22
  tRATIONAL tIMAGINARY
24
- #endif
25
- #if defined(RUBY22 || defined(RUBY23))
26
- tLABEL_END
27
- #endif
28
23
 
29
24
  prechigh
30
25
  right tBANG tTILDE tUPLUS
@@ -694,9 +689,7 @@ rule
694
689
  {
695
690
  result = new_call val[0], :**, argl(val[2])
696
691
  }
697
- #if defined(RUBY21) || defined(RUBY22 || defined(RUBY23))
698
692
  | tUMINUS_NUM simple_numeric tPOW arg
699
- #endif
700
693
  {
701
694
  result = new_call(new_call(s(:lit, val[1]), :"**", argl(val[3])), :"-@")
702
695
  }
@@ -1728,12 +1721,11 @@ opt_block_args_tail: tCOMMA block_args_tail
1728
1721
 
1729
1722
  word_list: none
1730
1723
  {
1731
- result = s(:array)
1724
+ result = new_word_list
1732
1725
  }
1733
1726
  | word_list word tSPACE
1734
1727
  {
1735
- word = val[1][0] == :evstr ? s(:dstr, "", val[1]) : val[1]
1736
- result = val[0].dup << word
1728
+ result = val[0].dup << new_word_list_entry(val)
1737
1729
  }
1738
1730
 
1739
1731
  word: string_content
@@ -1753,23 +1745,11 @@ opt_block_args_tail: tCOMMA block_args_tail
1753
1745
 
1754
1746
  symbol_list: none
1755
1747
  {
1756
- result = s(:array)
1748
+ result = new_symbol_list
1757
1749
  }
1758
1750
  | symbol_list word tSPACE
1759
1751
  {
1760
- list, sym, _ = val
1761
-
1762
- case sym[0]
1763
- when :dstr then
1764
- sym[0] = :dsym
1765
- when :str then
1766
- sym = s(:lit, sym.last.to_sym)
1767
- else
1768
- debug20 24
1769
- sym = s(:dsym, "", result)
1770
- end
1771
-
1772
- result = list.dup << sym
1752
+ result = val[0].dup << new_symbol_list_entry(val)
1773
1753
  }
1774
1754
 
1775
1755
  qwords: tQWORDS_BEG tSPACE tSTRING_END
@@ -1792,20 +1772,20 @@ opt_block_args_tail: tCOMMA block_args_tail
1792
1772
 
1793
1773
  qword_list: none
1794
1774
  {
1795
- result = s(:array)
1775
+ result = new_qword_list
1796
1776
  }
1797
1777
  | qword_list tSTRING_CONTENT tSPACE
1798
1778
  {
1799
- result = val[0].dup << s(:str, val[1])
1779
+ result = val[0].dup << new_qword_list_entry(val)
1800
1780
  }
1801
1781
 
1802
1782
  qsym_list: none
1803
1783
  {
1804
- result = s(:array)
1784
+ result = new_qsym_list
1805
1785
  }
1806
1786
  | qsym_list tSTRING_CONTENT tSPACE
1807
1787
  {
1808
- result = val[0].dup << s(:lit, val[1].to_sym)
1788
+ result = val[0].dup << new_qsym_list_entry(val)
1809
1789
  }
1810
1790
 
1811
1791
  string_contents: none
@@ -1853,10 +1833,10 @@ regexp_contents: none
1853
1833
  }
1854
1834
  | tSTRING_DBEG
1855
1835
  {
1856
- result = [lexer.lex_strterm,
1857
- lexer.brace_nest,
1836
+ result = [lexer.lex_strterm,
1837
+ lexer.brace_nest,
1858
1838
  lexer.string_nest, # TODO: remove
1859
- lexer.cond.store,
1839
+ lexer.cond.store,
1860
1840
  lexer.cmdarg.store,
1861
1841
  lexer.lex_state,
1862
1842
  ]
@@ -1937,21 +1917,17 @@ regexp_contents: none
1937
1917
  end
1938
1918
  }
1939
1919
 
1940
- #if defined(RUBY21) || defined(RUBY22 || defined(RUBY23))
1941
1920
  numeric: simple_numeric
1942
1921
  | tUMINUS_NUM simple_numeric
1943
- #endif
1944
1922
  {
1945
1923
  result = -val[1] # TODO: pt_testcase
1946
1924
  }
1947
1925
 
1948
- #if defined(RUBY21) || defined(RUBY22) || defined(RUBY23))
1949
1926
  simple_numeric: tINTEGER
1950
1927
  | tFLOAT
1951
1928
  | tRATIONAL
1952
1929
  | tIMAGINARY
1953
1930
 
1954
- #endif
1955
1931
  user_variable: tIDENTIFIER
1956
1932
  | tIVAR
1957
1933
  | tGVAR
@@ -2038,15 +2014,15 @@ keyword_variable: kNIL { result = s(:nil) }
2038
2014
  {
2039
2015
  result = args val
2040
2016
  }
2041
- | f_kwarg opt_f_block_arg
2017
+ | f_kwarg opt_f_block_arg
2042
2018
  {
2043
2019
  result = args val
2044
2020
  }
2045
- | f_kwrest opt_f_block_arg
2021
+ | f_kwrest opt_f_block_arg
2046
2022
  {
2047
2023
  result = args val
2048
2024
  }
2049
- | f_block_arg
2025
+ | f_block_arg
2050
2026
 
2051
2027
  opt_args_tail: tCOMMA args_tail
2052
2028
  {
@@ -2144,21 +2120,11 @@ keyword_variable: kNIL { result = s(:nil) }
2144
2120
  result = identifier
2145
2121
  }
2146
2122
 
2147
- #if defined(RUBY22) || defined(RUBY23))
2148
- f_arg_asgn: f_norm_arg
2149
-
2150
- f_arg_item: f_arg_asgn
2151
- | tLPAREN f_margs rparen
2152
- {
2153
- result = val[1]
2154
- }
2155
- #else
2156
2123
  f_arg_item: f_norm_arg
2157
2124
  | tLPAREN f_margs rparen
2158
2125
  {
2159
2126
  result = val[1]
2160
2127
  }
2161
- #endif
2162
2128
 
2163
2129
  f_arg: f_arg_item
2164
2130
  {
data/lib/ruby22_parser.rb CHANGED
@@ -19,39 +19,39 @@ require "ruby_parser_extras"
19
19
  ##### State transition tables begin ###
20
20
 
21
21
  clist = [
22
- '-607,585,611,585,3,218,219,-607,-607,-607,754,271,221,-607,-607,570',
23
- '-607,-510,-99,-106,856,242,666,-101,-510,-607,573,271,666,823,-103,585',
24
- '-102,585,271,611,-607,-607,616,-607,-607,-607,-607,-607,-100,745,218',
22
+ '-605,585,611,585,3,218,219,-605,-605,-605,754,271,221,-605,-605,570',
23
+ '-605,-510,-99,-106,856,242,666,-101,-510,-605,573,271,666,823,-103,585',
24
+ '-102,585,271,611,-605,-605,616,-605,-605,-605,-605,-605,-100,745,218',
25
25
  '219,222,746,706,-94,-92,239,-100,585,665,241,240,581,580,222,665,613',
26
- '612,624,666,-607,-607,-607,-607,-607,-607,-607,-607,-607,-607,-607,-607',
27
- '-607,-607,734,-104,-607,-607,-607,-105,650,218,219,271,-607,-416,574',
28
- '-607,222,613,612,270,-607,665,-607,-101,-607,-607,-607,-607,-607,-607',
29
- '-607,-603,-607,-607,-607,270,116,753,116,-94,-92,115,270,115,-90,-97',
30
- '-288,-607,-607,846,-93,-98,-607,-288,-288,-288,116,222,-101,-288,-288',
31
- '115,-288,-101,-102,-103,116,-102,116,-604,-103,115,-102,115,-94,-92',
26
+ '612,624,666,-605,-605,-605,-605,-605,-605,-605,-605,-605,-605,-605,-605',
27
+ '-605,-605,734,-104,-605,-605,-605,-105,650,218,219,271,-605,-416,574',
28
+ '-605,222,613,612,270,-605,665,-605,-101,-605,-605,-605,-605,-605,-605',
29
+ '-605,-601,-605,-605,-605,270,116,753,116,-94,-92,115,270,115,-90,-97',
30
+ '-288,-605,-605,846,-93,-98,-605,-288,-288,-288,116,222,-101,-288,-288',
31
+ '115,-288,-101,-102,-103,116,-102,116,-602,-103,115,-102,115,-94,-92',
32
32
  '705,-94,-92,-100,-91,734,-288,-288,-100,-288,-288,-288,-288,-288,116',
33
33
  '-94,-92,936,222,115,-102,-103,270,222,734,630,116,83,884,-425,611,115',
34
34
  '-95,666,823,84,-96,-288,-288,-288,-288,-288,-288,-288,-288,-288,-288',
35
35
  '-288,-288,-288,-288,627,-92,-288,-288,-288,-84,649,823,532,591,-288',
36
36
  '94,95,-288,94,95,665,242,-288,-70,-288,695,-288,-288,-288,-288,-288',
37
- '-288,-288,-89,-288,-425,-288,-100,273,-603,611,629,-425,-607,613,612',
37
+ '-288,-288,-89,-288,-425,-288,-100,273,-601,611,629,-425,-605,613,612',
38
38
  '609,273,-502,-288,-288,-425,-95,789,-288,-502,-502,-502,116,222,-502',
39
39
  '-502,-502,115,-502,681,-104,626,-105,-425,852,823,-502,788,-502,-502',
40
- '-502,116,-93,-94,544,-601,115,546,-502,-502,695,-502,-502,-502,-502',
41
- '-502,-511,570,96,97,-607,96,97,-511,116,613,612,-607,573,115,-517,-516',
42
- '-603,-103,766,459,-607,-607,-517,-502,-502,-502,-502,-502,-502,-502',
43
- '-502,-502,-502,-502,-502,-502,-502,-101,-607,-502,-502,-502,-505,-502',
44
- '-502,581,580,-502,611,-505,-502,-502,222,-502,-601,-502,-90,-502,-505',
40
+ '-502,116,-93,-94,544,-599,115,546,-502,-502,695,-502,-502,-502,-502',
41
+ '-502,-511,570,96,97,-605,96,97,-511,116,613,612,-605,573,115,-517,-516',
42
+ '-601,-103,766,459,-605,-605,-517,-502,-502,-502,-502,-502,-502,-502',
43
+ '-502,-502,-502,-502,-502,-502,-502,-101,-605,-502,-502,-502,-505,-502',
44
+ '-502,581,580,-502,611,-505,-502,-502,222,-502,-599,-502,-90,-502,-505',
45
45
  '-502,-502,-502,-502,-502,-502,-502,-502,-502,507,-502,-99,-98,505,-502',
46
- '-607,-106,-601,532,-99,574,261,-607,-502,-502,-502,-502,-603,-502,-505',
47
- '-502,-607,611,218,219,-264,-505,-505,-505,-513,-502,-505,-505,-505,793',
48
- '-505,-513,-280,222,-607,613,612,492,-505,-280,-505,-505,-505,544,764',
49
- '-96,543,-600,-280,544,-505,-505,546,-505,-505,-505,-505,-505,565,-105',
46
+ '-605,-106,-599,532,-99,574,261,-605,-502,-502,-502,-502,-601,-502,-505',
47
+ '-502,-605,611,218,219,-264,-505,-505,-505,-513,-502,-505,-505,-505,793',
48
+ '-505,-513,-280,222,-605,613,612,492,-505,-280,-505,-505,-505,544,764',
49
+ '-96,543,-598,-280,544,-505,-505,546,-505,-505,-505,-505,-505,565,-105',
50
50
  '562,561,560,883,563,492,565,611,562,561,560,960,563,562,561,560,611',
51
51
  '563,613,612,619,-505,-505,-505,-505,-505,-505,-505,-505,-505,-505,-505',
52
52
  '-505,-505,-505,775,-505,-505,-505,-505,-502,-505,-505,-505,-263,-505',
53
- '769,-502,-505,-505,768,-505,-600,-505,644,-505,-502,-505,-505,-505,-505',
54
- '-505,-505,-505,767,-505,-507,-505,613,612,631,611,544,-507,-600,546',
53
+ '769,-502,-505,-505,768,-505,-598,-505,644,-505,-502,-505,-505,-505,-505',
54
+ '-505,-505,-505,767,-505,-507,-505,613,612,631,611,544,-507,-598,546',
55
55
  '848,613,612,614,-505,-505,-505,-505,982,-505,-288,-505,-516,774,581',
56
56
  '580,737,-288,-288,-288,-94,-505,-288,-288,-288,565,-288,562,561,560',
57
57
  '570,563,215,-508,-103,-509,-288,-288,-288,535,-508,573,-509,218,219',
@@ -61,20 +61,20 @@ clist = [
61
61
  '264,-288,-288,-288,-289,791,-288,265,730,-288,728,-289,-288,-288,-97',
62
62
  '-288,574,-288,727,-288,-289,-288,-288,-288,-288,-288,-288,-288,-106',
63
63
  '-288,886,-288,565,-512,562,561,560,570,563,222,-512,-92,1006,711,-288',
64
- '-288,-288,-288,573,-288,-607,-288,218,219,889,-101,892,-607,-607,-607',
65
- '894,-104,-607,-607,-607,565,-607,562,561,560,568,563,852,823,896,-607',
66
- '-607,-607,-607,578,577,581,580,116,222,898,-607,-607,115,-607,-607,-607',
67
- '-607,-607,116,899,726,718,565,115,562,561,560,720,563,565,716,562,561',
68
- '560,714,563,723,695,712,574,907,-607,-607,-607,-607,-607,-607,-607,-607',
69
- '-607,-607,-607,-607,-607,-607,711,242,-607,-607,-607,720,790,-607,-262',
70
- '911,-607,913,720,-607,-607,914,-607,222,-607,711,-607,723,-607,-607',
71
- '-607,-607,-607,-607,-607,242,-607,-607,-607,239,917,215,116,241,240',
72
- '237,238,115,594,919,116,-607,-607,-607,-607,115,-607,592,-607,215,296',
64
+ '-288,-288,-288,573,-288,-605,-288,218,219,889,-101,892,-605,-605,-605',
65
+ '894,-104,-605,-605,-605,565,-605,562,561,560,568,563,852,823,896,-605',
66
+ '-605,-605,-605,578,577,581,580,116,222,898,-605,-605,115,-605,-605,-605',
67
+ '-605,-605,116,899,726,718,565,115,562,561,560,720,563,565,716,562,561',
68
+ '560,714,563,723,695,712,574,907,-605,-605,-605,-605,-605,-605,-605,-605',
69
+ '-605,-605,-605,-605,-605,-605,711,242,-605,-605,-605,720,790,-605,-262',
70
+ '911,-605,913,720,-605,-605,914,-605,222,-605,711,-605,723,-605,-605',
71
+ '-605,-605,-605,-605,-605,242,-605,-605,-605,239,917,215,116,241,240',
72
+ '237,238,115,594,919,116,-605,-605,-605,-605,115,-605,592,-605,215,296',
73
73
  '72,73,74,12,60,748,239,-102,66,67,241,240,921,70,750,68,69,71,33,34',
74
74
  '75,76,119,120,121,122,123,32,31,30,104,103,105,106,875,876,22,923,877',
75
75
  '110,111,654,11,48,923,13,108,107,109,98,59,100,99,101,222,102,110,111',
76
76
  '708,94,95,929,45,46,44,242,246,251,252,253,248,250,258,259,254,255,-288',
77
- '235,236,215,116,256,257,-288,43,115,963,36,-604,222,61,62,-288,116,63',
77
+ '235,236,215,116,256,257,-288,43,115,963,36,-602,222,61,62,-288,116,63',
78
78
  '750,38,239,115,245,47,241,240,237,238,249,247,243,23,244,931,701,215',
79
79
  '91,83,85,86,87,89,214,933,700,84,92,695,260,537,-239,212,222,65,684',
80
80
  '-84,81,88,90,222,222,96,97,296,72,73,74,12,60,222,222,215,66,67,242',
@@ -82,7 +82,7 @@ clist = [
82
82
  '103,105,106,242,242,22,653,273,642,641,638,11,48,222,13,108,107,109',
83
83
  '98,59,100,99,101,957,102,110,111,637,94,95,-262,45,46,44,242,246,251',
84
84
  '252,253,248,250,258,259,254,255,-288,235,236,-289,635,256,257,-288,43',
85
- '964,-289,298,-604,965,61,62,-288,628,63,-289,38,239,967,245,47,241,240',
85
+ '964,-289,298,-602,965,61,62,-288,628,63,-289,38,239,967,245,47,241,240',
86
86
  '237,238,249,247,243,23,244,968,625,-515,91,83,85,86,87,89,-515,-335',
87
87
  '622,84,92,618,260,596,-335,-515,595,65,403,591,81,88,90,-335,507,96',
88
88
  '97,296,72,73,74,12,60,548,984,-289,66,67,547,986,987,70,-289,68,69,71',
@@ -94,10 +94,10 @@ clist = [
94
94
  '23,244,-69,1015,215,91,83,85,86,87,89,1013,-280,923,84,92,923,260,923',
95
95
  '-280,1011,1020,65,507,984,81,88,90,-280,505,96,97,296,72,73,74,12,60',
96
96
  '502,273,215,66,67,492,221,461,70,456,68,69,71,33,34,75,76,460,457,458',
97
- '414,409,32,31,30,104,103,105,106,393,960,22,562,561,560,-604,563,11',
98
- '48,-603,13,108,107,109,98,59,100,99,101,700,102,110,111,390,94,95,387',
97
+ '414,409,32,31,30,104,103,105,106,393,960,22,562,561,560,-602,563,11',
98
+ '48,-601,13,108,107,109,98,59,100,99,101,700,102,110,111,390,94,95,387',
99
99
  '45,46,44,242,246,251,252,253,248,250,258,259,254,255,-288,235,236,-514',
100
- '384,256,257,-288,43,360,-514,36,-604,222,61,62,-288,321,63,-514,38,239',
100
+ '384,256,257,-288,43,360,-514,36,-602,222,61,62,-288,321,63,-514,38,239',
101
101
  '984,245,47,241,240,237,238,249,247,243,23,244,320,1043,1044,91,83,85',
102
102
  '86,87,89,1045,1046,1002,84,92,222,260,1002,1002,222,261,65,217,211,81',
103
103
  '88,90,210,923,96,97,296,72,73,74,12,60,984,209,112,66,67,1002,,,70,',
@@ -177,13 +177,13 @@ clist = [
177
177
  '84,92,241,240,237,238,,,65,,,81,88,90,,,96,97,296,72,73,74,12,60,,,',
178
178
  '66,67,,,,70,,68,69,71,33,34,75,76,,,,,,32,31,30,104,103,105,106,,,22',
179
179
  ',,,,,11,48,,13,108,107,109,98,59,100,99,101,,102,110,111,,94,95,,45',
180
- '46,44,242,246,251,252,253,248,250,258,259,254,255,,-627,-627,,,256,257',
180
+ '46,44,242,246,251,252,253,248,250,258,259,254,255,,-625,-625,,,256,257',
181
181
  ',43,,,36,,,61,62,,,63,,38,239,,245,47,241,240,237,238,249,247,243,23',
182
182
  '244,,,,91,83,85,86,87,89,,,,84,92,,565,,562,561,560,65,563,,81,88,90',
183
183
  ',,96,97,8,72,73,74,12,60,,,,66,67,,,,70,,68,69,71,33,34,75,76,720,,',
184
184
  ',,32,31,30,104,103,105,106,,565,22,562,561,560,,563,11,48,10,13,108',
185
- '107,109,98,59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-627,-627',
186
- '-627,-627,248,250,,720,-627,-627,,,,,,256,257,,43,,,36,,,61,62,,,63',
185
+ '107,109,98,59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-625,-625',
186
+ '-625,-625,248,250,,720,-625,-625,,,,,,256,257,,43,,,36,,,61,62,,,63',
187
187
  ',38,239,,245,47,241,240,237,238,249,247,243,23,244,,,,91,83,85,86,87',
188
188
  '89,,,,84,92,,565,,562,561,560,65,563,,81,88,90,,,96,97,296,72,73,74',
189
189
  '12,60,,,,66,67,,,,70,,68,69,71,33,34,75,76,720,,,,,32,31,30,104,103',
@@ -202,13 +202,13 @@ clist = [
202
202
  '237,238,249,247,243,23,244,,,,91,83,85,86,87,89,,,,84,92,,,,,,,65,,',
203
203
  '81,88,90,,,96,97,296,72,73,74,12,60,,,,66,67,,,,70,,68,69,71,33,34,75',
204
204
  '76,,,,,,32,31,30,104,103,105,106,,,22,,,,,,11,48,,13,108,107,109,98',
205
- '59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-627,-627,-627,-627',
206
- '248,250,,,-627,-627,,,,,,256,257,,43,,,36,,,61,62,,,63,,38,239,,245',
205
+ '59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-625,-625,-625,-625',
206
+ '248,250,,,-625,-625,,,,,,256,257,,43,,,36,,,61,62,,,63,,38,239,,245',
207
207
  '47,241,240,237,238,249,247,243,23,244,,,,91,83,85,86,87,89,,,,84,92',
208
208
  ',,,,,,65,,,81,88,90,,,96,97,296,72,73,74,12,60,,,,66,67,,,,70,,68,69',
209
209
  '71,33,34,75,76,,,,,,32,31,30,104,103,105,106,,,22,,,,,,11,48,,13,108',
210
- '107,109,98,59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-627,-627',
211
- '-627,-627,248,250,,,-627,-627,,,,,,256,257,,43,,,36,,,61,62,,,63,,38',
210
+ '107,109,98,59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-625,-625',
211
+ '-625,-625,248,250,,,-625,-625,,,,,,256,257,,43,,,36,,,61,62,,,63,,38',
212
212
  '239,,245,47,241,240,237,238,249,247,243,23,244,,,,91,83,85,86,87,89',
213
213
  ',,,84,92,,,,,,,65,,,81,88,90,,,96,97,296,72,73,74,12,60,,,,66,67,,,',
214
214
  '70,,68,69,71,33,34,75,76,,,,,,32,31,30,104,103,105,106,,,22,,,,,,11',
@@ -222,23 +222,23 @@ clist = [
222
222
  '249,247,243,23,244,,,,91,83,85,86,87,89,,,,84,92,,,,,,,65,,,81,88,90',
223
223
  ',,96,97,296,72,73,74,12,60,,,,66,67,,,,70,,68,69,71,33,34,75,76,,,,',
224
224
  ',32,31,30,104,103,105,106,,,22,,,,,,11,48,,13,108,107,109,98,59,100',
225
- '99,101,,102,110,111,,94,95,,45,46,44,242,-627,-627,-627,-627,248,250',
226
- ',,-627,-627,,,,,,256,257,,43,,,36,,,61,62,,,63,,38,239,,245,47,241,240',
225
+ '99,101,,102,110,111,,94,95,,45,46,44,242,-625,-625,-625,-625,248,250',
226
+ ',,-625,-625,,,,,,256,257,,43,,,36,,,61,62,,,63,,38,239,,245,47,241,240',
227
227
  '237,238,249,247,243,23,244,,,,91,83,85,86,87,89,,,,84,92,,,,,,,65,,',
228
228
  '81,88,90,,,96,97,296,72,73,74,12,60,,,,66,67,,,,70,,68,69,71,33,34,75',
229
229
  '76,,,,,,32,31,30,104,103,105,106,,,22,,,,,,11,48,,13,108,107,109,98',
230
- '59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-627,-627,-627,-627',
231
- '248,250,,,-627,-627,,,,,,256,257,,43,,,36,,,61,62,,,63,,38,239,,245',
230
+ '59,100,99,101,,102,110,111,,94,95,,45,46,44,242,-625,-625,-625,-625',
231
+ '248,250,,,-625,-625,,,,,,256,257,,43,,,36,,,61,62,,,63,,38,239,,245',
232
232
  '47,241,240,237,238,249,247,243,23,244,,,,91,83,85,86,87,89,,,,84,92',
233
233
  ',,,,,,65,,,81,88,90,,,96,97,8,72,73,74,12,60,,,,66,67,,,,70,,68,69,71',
234
234
  '33,34,75,76,,,,,,32,31,30,104,103,105,106,,,22,,,,,,11,48,10,13,108',
235
235
  '107,109,98,59,100,99,101,,102,110,111,,94,95,,45,46,44,242,246,251,252',
236
- '253,248,250,258,259,254,255,,-627,-627,,,256,257,,43,,,36,,,61,62,,',
236
+ '253,248,250,258,259,254,255,,-625,-625,,,256,257,,43,,,36,,,61,62,,',
237
237
  '63,,38,239,,245,47,241,240,237,238,249,247,243,23,244,,,,91,83,85,86',
238
238
  '87,89,,,,84,92,,,,,,,65,,,81,88,90,,,96,97,72,73,74,,60,,,,66,67,,,',
239
239
  '70,,68,69,71,313,314,75,76,,,,,,309,310,316,104,103,105,106,,,234,,',
240
240
  ',,,,48,,,108,107,109,98,59,100,99,101,,102,110,111,,94,95,,45,46,44',
241
- '242,-627,-627,-627,-627,248,250,,,-627,-627,,,,,,256,257,,227,,,233',
241
+ '242,-625,-625,-625,-625,248,250,,,-625,-625,,,,,,256,257,,227,,,233',
242
242
  ',,61,62,,,63,,,239,,245,47,241,240,237,238,249,247,243,232,244,,,,91',
243
243
  '83,85,86,87,89,,,,84,92,,,,,,,65,,,81,88,90,,,96,97,72,73,74,,60,,,',
244
244
  '66,67,,,,70,,68,69,71,33,34,75,76,,,,,,32,31,30,104,103,105,106,,,22',
@@ -778,18 +778,18 @@ clist = [
778
778
  ',-281,-281,-281,-281,-281,-281,-281,-281,-281,-281,-281,-281,-281,-281',
779
779
  ',,-281,-281,-281,,,-281,,,-281,,,-281,-281,,-281,574,-281,,-281,,-281',
780
780
  '-281,-281,-281,-281,-281,-281,,-281,,-281,,,,,,,,,,,,,-281,-281,-281',
781
- '-281,-608,-281,,-281,,,,-608,-608,-608,,,-608,-608,-608,565,-608,562',
782
- '561,560,570,563,,,,-608,-608,-608,-608,,,573,,,,,-608,-608,,-608,-608',
783
- '-608,-608,-608,,,,,,,,,,568,,,,,,,,,,,581,580,,-608,-608,-608,-608,-608',
784
- '-608,-608,-608,-608,-608,-608,-608,-608,-608,,,-608,-608,-608,,,-608',
785
- ',,-608,,,-608,-608,,-608,574,-608,,-608,,-608,-608,-608,-608,-608,-608',
786
- '-608,,-608,-608,-608,,,,,,,,,,,,,-608,-608,-608,-608,-609,-608,,-608',
787
- ',,,-609,-609,-609,,,-609,-609,-609,565,-609,562,561,560,570,563,,,,-609',
788
- '-609,-609,-609,,,573,,,,,-609,-609,,-609,-609,-609,-609,-609,,,,,,,',
789
- ',,568,,,,,,,,,,,581,580,,-609,-609,-609,-609,-609,-609,-609,-609,-609',
790
- '-609,-609,-609,-609,-609,,,-609,-609,-609,,,-609,,,-609,,,-609,-609',
791
- ',-609,574,-609,,-609,,-609,-609,-609,-609,-609,-609,-609,,-609,-609',
792
- '-609,,,,,,,,,,,,,-609,-609,-609,-609,,-609,,-609,176,187,177,200,173',
781
+ '-281,-606,-281,,-281,,,,-606,-606,-606,,,-606,-606,-606,565,-606,562',
782
+ '561,560,570,563,,,,-606,-606,-606,-606,,,573,,,,,-606,-606,,-606,-606',
783
+ '-606,-606,-606,,,,,,,,,,568,,,,,,,,,,,581,580,,-606,-606,-606,-606,-606',
784
+ '-606,-606,-606,-606,-606,-606,-606,-606,-606,,,-606,-606,-606,,,-606',
785
+ ',,-606,,,-606,-606,,-606,574,-606,,-606,,-606,-606,-606,-606,-606,-606',
786
+ '-606,,-606,-606,-606,,,,,,,,,,,,,-606,-606,-606,-606,-607,-606,,-606',
787
+ ',,,-607,-607,-607,,,-607,-607,-607,565,-607,562,561,560,570,563,,,,-607',
788
+ '-607,-607,-607,,,573,,,,,-607,-607,,-607,-607,-607,-607,-607,,,,,,,',
789
+ ',,568,,,,,,,,,,,581,580,,-607,-607,-607,-607,-607,-607,-607,-607,-607',
790
+ '-607,-607,-607,-607,-607,,,-607,-607,-607,,,-607,,,-607,,,-607,-607',
791
+ ',-607,574,-607,,-607,,-607,-607,-607,-607,-607,-607,-607,,-607,-607',
792
+ '-607,,,,,,,,,,,,,-607,-607,-607,-607,,-607,,-607,176,187,177,200,173',
793
793
  '193,183,182,203,204,198,181,180,175,201,205,206,185,174,188,192,194',
794
794
  '186,179,,,,195,202,197,196,189,199,184,172,191,190,,,,,,171,178,169',
795
795
  '170,166,167,168,127,129,,,128,,,,,,,,,161,162,,157,139,140,141,148,145',
@@ -836,16 +836,16 @@ clist = [
836
836
  ',-295,-295,-295,-295,-295,,,,,,,,,,568,,,,,,,,,578,577,581,580,,-295',
837
837
  '-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,-295,,,-295',
838
838
  '-295,-295,,,-295,,276,-295,,,-295,-295,,-295,574,-295,,-295,,-295,-295',
839
- '-295,-295,-295,-295,-295,,-295,,-295,,,,,,,,,,,,-626,-295,-295,,-295',
840
- ',-295,-626,-626,-626,,,-626,-626,-626,565,-626,562,561,560,570,563,',
841
- ',,-626,-626,,,,,573,,,,,-626,-626,,-626,-626,-626,-626,-626,,,565,,562',
842
- '561,560,570,563,568,,,,,,,,,573,,581,580,,-626,,,,,,,-626,-626,-626',
843
- ',-626,-626,-626,-626,,-626,568,-626,,,,,273,-626,-626,-626,-626,581',
844
- '580,,574,,,,,-626,-626,,-626,-626,-626,-626,-626,,-626,-626,,,,,,,,',
845
- ',,,,-626,,,574,,-626,,,-626,-626,-626,-626,-626,-626,-626,-626,-626',
846
- '-626,-626,-626,-626,-626,,,-626,-626,-626,,,-626,,273,-626,,,-626,-626',
847
- ',-626,,-626,,-626,,-626,-626,-626,-626,-626,-626,-626,,-626,-626,-626',
848
- ',,,,,1038,440,,,1039,,,-626,-626,,-626,,-626,161,162,,157,139,140,141',
839
+ '-295,-295,-295,-295,-295,,-295,,-295,,,,,,,,,,,,-624,-295,-295,,-295',
840
+ ',-295,-624,-624,-624,,,-624,-624,-624,565,-624,562,561,560,570,563,',
841
+ ',,-624,-624,,,,,573,,,,,-624,-624,,-624,-624,-624,-624,-624,,,565,,562',
842
+ '561,560,570,563,568,,,,,,,,,573,,581,580,,-624,,,,,,,-624,-624,-624',
843
+ ',-624,-624,-624,-624,,-624,568,-624,,,,,273,-624,-624,-624,-624,581',
844
+ '580,,574,,,,,-624,-624,,-624,-624,-624,-624,-624,,-624,-624,,,,,,,,',
845
+ ',,,,-624,,,574,,-624,,,-624,-624,-624,-624,-624,-624,-624,-624,-624',
846
+ '-624,-624,-624,-624,-624,,,-624,-624,-624,,,-624,,273,-624,,,-624,-624',
847
+ ',-624,,-624,,-624,,-624,-624,-624,-624,-624,-624,-624,,-624,-624,-624',
848
+ ',,,,,1038,440,,,1039,,,-624,-624,,-624,,-624,161,162,,157,139,140,141',
849
849
  '148,145,147,,,142,143,,,,163,164,149,150,,,,,,273,,,,,,,,154,153,,138',
850
850
  '160,156,155,151,152,146,144,136,159,137,,,165,,,,,1036,433,,,1037,,',
851
851
  ',,,,,,161,162,158,157,139,140,141,148,145,147,,,142,143,,,,163,164,149',
@@ -1963,19 +1963,19 @@ racc_action_pointer = [
1963
1963
  nil, 32, nil, 1227, nil ]
1964
1964
 
1965
1965
  racc_action_default = [
1966
- -1, -627, -626, -627, -2, -613, -4, -5, -627, -8,
1967
- -9, -627, -627, -627, -29, -627, -627, -627, -280, -627,
1968
- -40, -43, -615, -627, -48, -50, -51, -52, -57, -257,
1969
- -257, -257, -292, -331, -332, -69, -626, -73, -81, -83,
1970
- -627, -514, -515, -627, -627, -627, -627, -627, -615, -238,
1971
- -271, -272, -273, -274, -275, -276, -277, -278, -279, -602,
1972
- -282, -615, -626, -626, -300, -403, -627, -627, -305, -308,
1973
- -613, -627, -316, -323, -627, -333, -334, -445, -446, -447,
1974
- -448, -449, -450, -626, -453, -626, -626, -626, -626, -626,
1975
- -626, -626, -490, -496, -498, -499, -500, -501, -600, -503,
1976
- -504, -601, -506, -507, -508, -509, -510, -511, -512, -513,
1977
- -518, -519, 1055, -3, -614, -622, -623, -624, -7, -627,
1978
- -627, -627, -627, -627, -627, -17, -627, -112, -113, -114,
1966
+ -1, -625, -624, -625, -2, -611, -4, -5, -625, -8,
1967
+ -9, -625, -625, -625, -29, -625, -625, -625, -280, -625,
1968
+ -40, -43, -613, -625, -48, -50, -51, -52, -57, -257,
1969
+ -257, -257, -292, -331, -332, -69, -624, -73, -81, -83,
1970
+ -625, -514, -515, -625, -625, -625, -625, -625, -613, -238,
1971
+ -271, -272, -273, -274, -275, -276, -277, -278, -279, -600,
1972
+ -282, -613, -624, -624, -300, -403, -625, -625, -305, -308,
1973
+ -611, -625, -316, -323, -625, -333, -334, -445, -446, -447,
1974
+ -448, -449, -450, -624, -453, -624, -624, -624, -624, -624,
1975
+ -624, -624, -490, -496, -498, -499, -500, -501, -598, -503,
1976
+ -504, -599, -506, -507, -508, -509, -510, -511, -512, -513,
1977
+ -518, -519, 1055, -3, -612, -620, -621, -622, -7, -625,
1978
+ -625, -625, -625, -625, -625, -17, -625, -112, -113, -114,
1979
1979
  -115, -116, -117, -118, -119, -120, -124, -125, -126, -127,
1980
1980
  -128, -129, -130, -131, -132, -133, -134, -135, -136, -137,
1981
1981
  -138, -139, -140, -141, -142, -143, -144, -145, -146, -147,
@@ -1983,92 +1983,92 @@ racc_action_default = [
1983
1983
  -158, -159, -160, -161, -162, -163, -164, -165, -166, -167,
1984
1984
  -168, -169, -170, -171, -172, -173, -174, -175, -176, -177,
1985
1985
  -178, -179, -180, -181, -182, -183, -184, -185, -186, -187,
1986
- -188, -189, -190, -191, -192, -193, -194, -22, -121, -626,
1987
- -627, -627, -626, -627, -627, -612, -627, -627, -627, -627,
1988
- -627, -615, -616, -47, -627, -514, -515, -627, -280, -627,
1989
- -627, -230, -627, -626, -627, -627, -627, -627, -627, -627,
1990
- -627, -627, -627, -627, -627, -627, -627, -627, -627, -627,
1991
- -627, -627, -627, -627, -627, -627, -627, -627, -627, -627,
1992
- -627, -409, -412, -627, -610, -611, -58, -627, -299, -627,
1993
- -426, -429, -64, -626, -423, -65, -615, -66, -239, -252,
1994
- -626, -626, -256, -627, -262, -627, -626, -490, -593, -627,
1995
- -627, -67, -68, -613, -13, -14, -627, -71, -626, -615,
1996
- -627, -74, -77, -626, -89, -90, -627, -627, -97, -292,
1997
- -295, -615, -416, -331, -332, -335, -424, -627, -79, -627,
1998
- -85, -289, -497, -627, -215, -216, -231, -627, -626, -285,
1999
- -284, -627, -240, -619, -619, -627, -627, -591, -619, -627,
2000
- -301, -302, -546, -49, -627, -627, -627, -627, -613, -627,
2001
- -614, -514, -515, -627, -627, -280, -627, -356, -357, -627,
2002
- -319, -627, -112, -113, -154, -155, -156, -172, -177, -184,
2003
- -187, -326, -627, -514, -515, -588, -589, -451, -627, -474,
2004
- -627, -476, -627, -478, -627, -627, -458, -627, -627, -464,
2005
- -627, -627, -470, -627, -627, -472, -627, -489, -491, -492,
2006
- -493, -494, -6, -625, -23, -24, -25, -26, -27, -626,
2007
- -627, -19, -20, -21, -122, -627, -30, -39, -267, -627,
2008
- -627, -266, -31, -197, -615, -247, -248, -626, -626, -603,
2009
- -604, -257, -421, -605, -606, -604, -603, -257, -420, -422,
2010
- -605, -606, -37, -205, -38, -627, -41, -42, -195, -262,
2011
- -44, -45, -46, -615, -298, -627, -627, -626, -289, -627,
2012
- -627, -627, -206, -207, -208, -209, -210, -211, -212, -213,
1986
+ -188, -189, -190, -191, -192, -193, -194, -22, -121, -624,
1987
+ -625, -625, -624, -625, -625, -610, -625, -625, -625, -625,
1988
+ -625, -613, -614, -47, -625, -514, -515, -625, -280, -625,
1989
+ -625, -230, -625, -624, -625, -625, -625, -625, -625, -625,
1990
+ -625, -625, -625, -625, -625, -625, -625, -625, -625, -625,
1991
+ -625, -625, -625, -625, -625, -625, -625, -625, -625, -625,
1992
+ -625, -409, -412, -625, -608, -609, -58, -625, -299, -625,
1993
+ -426, -429, -64, -624, -423, -65, -613, -66, -239, -252,
1994
+ -624, -624, -256, -625, -262, -625, -624, -490, -591, -625,
1995
+ -625, -67, -68, -611, -13, -14, -625, -71, -624, -613,
1996
+ -625, -74, -77, -624, -89, -90, -625, -625, -97, -292,
1997
+ -295, -613, -416, -331, -332, -335, -424, -625, -79, -625,
1998
+ -85, -289, -497, -625, -215, -216, -231, -625, -624, -285,
1999
+ -284, -625, -240, -617, -617, -625, -625, -589, -617, -625,
2000
+ -301, -302, -546, -49, -625, -625, -625, -625, -611, -625,
2001
+ -612, -514, -515, -625, -625, -280, -625, -356, -357, -625,
2002
+ -319, -625, -112, -113, -154, -155, -156, -172, -177, -184,
2003
+ -187, -326, -625, -514, -515, -586, -587, -451, -625, -474,
2004
+ -625, -476, -625, -478, -625, -625, -458, -625, -625, -464,
2005
+ -625, -625, -470, -625, -625, -472, -625, -489, -491, -492,
2006
+ -493, -494, -6, -623, -23, -24, -25, -26, -27, -624,
2007
+ -625, -19, -20, -21, -122, -625, -30, -39, -267, -625,
2008
+ -625, -266, -31, -197, -613, -247, -248, -624, -624, -601,
2009
+ -602, -257, -421, -603, -604, -602, -601, -257, -420, -422,
2010
+ -603, -604, -37, -205, -38, -625, -41, -42, -195, -262,
2011
+ -44, -45, -46, -613, -298, -625, -625, -624, -289, -625,
2012
+ -625, -625, -206, -207, -208, -209, -210, -211, -212, -213,
2013
2013
  -217, -218, -219, -220, -221, -222, -223, -224, -225, -226,
2014
- -227, -228, -229, -232, -233, -234, -235, -615, -626, -257,
2015
- -603, -604, -54, -59, -258, -417, -626, -626, -615, -615,
2016
- -294, -253, -627, -261, -254, -627, -259, -627, -263, -627,
2017
- -598, -596, -599, -12, -614, -16, -615, -70, -287, -86,
2018
- -75, -627, -615, -626, -627, -627, -96, -627, -497, -627,
2019
- -82, -87, -627, -627, -627, -627, -236, -627, -437, -627,
2020
- -615, -617, -241, -621, -620, -243, -621, -290, -291, -592,
2021
- -627, -546, -406, -587, -587, -529, -531, -531, -531, -545,
2022
- -547, -548, -549, -550, -551, -552, -553, -554, -627, -558,
2023
- -560, -562, -567, -569, -570, -572, -577, -579, -580, -582,
2024
- -583, -584, -627, -626, -347, -348, -626, -627, -627, -627,
2025
- -627, -432, -626, -627, -627, -289, -313, -107, -108, -627,
2026
- -110, -627, -280, -627, -627, -324, -546, -328, -627, -452,
2014
+ -227, -228, -229, -232, -233, -234, -235, -613, -624, -257,
2015
+ -601, -602, -54, -59, -258, -417, -624, -624, -613, -613,
2016
+ -294, -253, -625, -261, -254, -625, -259, -625, -263, -625,
2017
+ -596, -594, -597, -12, -612, -16, -613, -70, -287, -86,
2018
+ -75, -625, -613, -624, -625, -625, -96, -625, -497, -625,
2019
+ -82, -87, -625, -625, -625, -625, -236, -625, -437, -625,
2020
+ -613, -615, -241, -619, -618, -243, -619, -290, -291, -590,
2021
+ -625, -546, -406, -585, -585, -529, -531, -531, -531, -545,
2022
+ -547, -548, -549, -550, -551, -552, -553, -554, -625, -556,
2023
+ -558, -560, -565, -567, -568, -570, -575, -577, -578, -580,
2024
+ -581, -582, -625, -624, -347, -348, -624, -625, -625, -625,
2025
+ -625, -432, -624, -625, -625, -289, -313, -107, -108, -625,
2026
+ -110, -625, -280, -625, -625, -324, -546, -328, -625, -452,
2027
2027
  -475, -480, -481, -483, -454, -477, -455, -479, -456, -457,
2028
- -627, -460, -462, -627, -463, -466, -467, -627, -468, -469,
2029
- -627, -495, -627, -18, -627, -28, -270, -627, -627, -425,
2030
- -627, -249, -251, -627, -627, -60, -245, -246, -418, -627,
2031
- -627, -62, -419, -627, -627, -297, -603, -604, -603, -604,
2032
- -615, -195, -627, -392, -393, -615, -395, -410, -53, -413,
2033
- -626, -427, -430, -244, -293, -626, -260, -264, -627, -594,
2034
- -595, -627, -15, -72, -627, -78, -84, -615, -603, -604,
2035
- -626, -93, -95, -627, -80, -627, -204, -214, -615, -626,
2036
- -626, -283, -286, -619, -404, -626, -626, -615, -627, -527,
2037
- -528, -627, -627, -538, -627, -541, -627, -543, -627, -358,
2038
- -627, -360, -362, -369, -615, -561, -571, -581, -585, -626,
2039
- -349, -626, -306, -350, -351, -309, -627, -312, -627, -615,
2040
- -603, -604, -607, -288, -627, -107, -108, -109, -627, -627,
2041
- -626, -317, -520, -521, -627, -320, -626, -626, -546, -627,
2042
- -627, -615, -627, -626, -459, -461, -465, -471, -473, -10,
2043
- -123, -268, -627, -198, -627, -618, -626, -33, -200, -34,
2044
- -201, -61, -35, -203, -36, -202, -63, -196, -627, -627,
2045
- -627, -627, -425, -627, -587, -587, -374, -626, -626, -626,
2046
- -391, -627, -615, -397, -554, -564, -565, -575, -626, -415,
2047
- -414, -55, -626, -626, -255, -265, -597, -76, -91, -88,
2048
- -296, -626, -354, -626, -438, -626, -439, -440, -242, -627,
2049
- -627, -615, -587, -568, -586, -530, -531, -531, -559, -531,
2050
- -531, -578, -531, -554, -573, -615, -627, -367, -627, -555,
2051
- -627, -352, -627, -627, -626, -626, -311, -627, -425, -627,
2052
- -107, -108, -111, -615, -626, -627, -523, -627, -627, -627,
2053
- -615, -525, -329, -590, -482, -485, -486, -487, -488, -627,
2054
- -269, -32, -199, -250, -627, -237, -627, -372, -373, -382,
2055
- -376, -384, -627, -387, -627, -389, -394, -627, -627, -627,
2056
- -563, -627, -627, -626, -627, -627, -11, -626, -444, -355,
2057
- -627, -627, -442, -407, -408, -405, -526, -627, -534, -627,
2058
- -536, -627, -539, -627, -542, -544, -359, -361, -365, -627,
2059
- -370, -303, -627, -304, -627, -627, -627, -626, -314, -425,
2060
- -627, -627, -321, -325, -327, -524, -546, -484, -587, -566,
2061
- -375, -626, -626, -626, -626, -576, -626, -396, -615, -399,
2062
- -401, -402, -574, -627, -289, -411, -627, -428, -431, -443,
2063
- -626, -98, -99, -627, -627, -106, -441, -531, -531, -531,
2064
- -531, -363, -627, -368, -627, -626, -307, -310, -264, -626,
2065
- -626, -318, -522, -626, -626, -371, -627, -379, -627, -381,
2066
- -627, -385, -627, -388, -390, -398, -627, -288, -607, -56,
2067
- -437, -626, -627, -627, -105, -627, -532, -535, -537, -540,
2068
- -627, -366, -626, -433, -434, -435, -627, -627, -627, -626,
2069
- -626, -626, -626, -400, -436, -615, -603, -604, -607, -104,
2070
- -531, -364, -353, -315, -322, -330, -627, -377, -380, -383,
2071
- -386, -425, -533, -626, -378 ]
2028
+ -625, -460, -462, -625, -463, -466, -467, -625, -468, -469,
2029
+ -625, -495, -625, -18, -625, -28, -270, -625, -625, -425,
2030
+ -625, -249, -251, -625, -625, -60, -245, -246, -418, -625,
2031
+ -625, -62, -419, -625, -625, -297, -601, -602, -601, -602,
2032
+ -613, -195, -625, -392, -393, -613, -395, -410, -53, -413,
2033
+ -624, -427, -430, -244, -293, -624, -260, -264, -625, -592,
2034
+ -593, -625, -15, -72, -625, -78, -84, -613, -601, -602,
2035
+ -624, -93, -95, -625, -80, -625, -204, -214, -613, -624,
2036
+ -624, -283, -286, -617, -404, -624, -624, -613, -625, -527,
2037
+ -528, -625, -625, -538, -625, -541, -625, -543, -625, -358,
2038
+ -625, -360, -362, -369, -613, -559, -569, -579, -583, -624,
2039
+ -349, -624, -306, -350, -351, -309, -625, -312, -625, -613,
2040
+ -601, -602, -605, -288, -625, -107, -108, -109, -625, -625,
2041
+ -624, -317, -520, -521, -625, -320, -624, -624, -546, -625,
2042
+ -625, -613, -625, -624, -459, -461, -465, -471, -473, -10,
2043
+ -123, -268, -625, -198, -625, -616, -624, -33, -200, -34,
2044
+ -201, -61, -35, -203, -36, -202, -63, -196, -625, -625,
2045
+ -625, -625, -425, -625, -585, -585, -374, -624, -624, -624,
2046
+ -391, -625, -613, -397, -554, -562, -563, -573, -624, -415,
2047
+ -414, -55, -624, -624, -255, -265, -595, -76, -91, -88,
2048
+ -296, -624, -354, -624, -438, -624, -439, -440, -242, -625,
2049
+ -625, -613, -585, -566, -584, -530, -531, -531, -557, -531,
2050
+ -531, -576, -531, -554, -571, -613, -625, -367, -625, -555,
2051
+ -625, -352, -625, -625, -624, -624, -311, -625, -425, -625,
2052
+ -107, -108, -111, -613, -624, -625, -523, -625, -625, -625,
2053
+ -613, -525, -329, -588, -482, -485, -486, -487, -488, -625,
2054
+ -269, -32, -199, -250, -625, -237, -625, -372, -373, -382,
2055
+ -376, -384, -625, -387, -625, -389, -394, -625, -625, -625,
2056
+ -561, -625, -625, -624, -625, -625, -11, -624, -444, -355,
2057
+ -625, -625, -442, -407, -408, -405, -526, -625, -534, -625,
2058
+ -536, -625, -539, -625, -542, -544, -359, -361, -365, -625,
2059
+ -370, -303, -625, -304, -625, -625, -625, -624, -314, -425,
2060
+ -625, -625, -321, -325, -327, -524, -546, -484, -585, -564,
2061
+ -375, -624, -624, -624, -624, -574, -624, -396, -613, -399,
2062
+ -401, -402, -572, -625, -289, -411, -625, -428, -431, -443,
2063
+ -624, -98, -99, -625, -625, -106, -441, -531, -531, -531,
2064
+ -531, -363, -625, -368, -625, -624, -307, -310, -264, -624,
2065
+ -624, -318, -522, -624, -624, -371, -625, -379, -625, -381,
2066
+ -625, -385, -625, -388, -390, -398, -625, -288, -605, -56,
2067
+ -437, -624, -625, -625, -105, -625, -532, -535, -537, -540,
2068
+ -625, -366, -624, -433, -434, -435, -625, -625, -625, -624,
2069
+ -624, -624, -624, -400, -436, -613, -601, -602, -605, -104,
2070
+ -531, -364, -353, -315, -322, -330, -625, -377, -380, -383,
2071
+ -386, -425, -533, -624, -378 ]
2072
2072
 
2073
2073
  clist = [
2074
2074
  '6,220,213,371,431,437,262,699,424,340,590,19,504,130,130,447,274,19',
@@ -2864,50 +2864,48 @@ racc_reduce_table = [
2864
2864
  1, 332, :_reduce_none,
2865
2865
  1, 333, :_reduce_none,
2866
2866
  3, 333, :_reduce_555,
2867
- 1, 333, :_reduce_none,
2868
- 3, 333, :_reduce_557,
2869
- 1, 286, :_reduce_558,
2870
- 3, 286, :_reduce_559,
2867
+ 1, 286, :_reduce_556,
2868
+ 3, 286, :_reduce_557,
2871
2869
  1, 334, :_reduce_none,
2872
- 2, 335, :_reduce_561,
2873
- 1, 335, :_reduce_562,
2874
- 2, 336, :_reduce_563,
2875
- 1, 336, :_reduce_564,
2870
+ 2, 335, :_reduce_559,
2871
+ 1, 335, :_reduce_560,
2872
+ 2, 336, :_reduce_561,
2873
+ 1, 336, :_reduce_562,
2876
2874
  1, 280, :_reduce_none,
2877
- 3, 280, :_reduce_566,
2875
+ 3, 280, :_reduce_564,
2878
2876
  1, 329, :_reduce_none,
2879
- 3, 329, :_reduce_568,
2877
+ 3, 329, :_reduce_566,
2880
2878
  1, 337, :_reduce_none,
2881
2879
  1, 337, :_reduce_none,
2882
- 2, 281, :_reduce_571,
2883
- 1, 281, :_reduce_572,
2884
- 3, 338, :_reduce_573,
2885
- 3, 339, :_reduce_574,
2886
- 1, 287, :_reduce_575,
2887
- 3, 287, :_reduce_576,
2888
- 1, 331, :_reduce_577,
2889
- 3, 331, :_reduce_578,
2880
+ 2, 281, :_reduce_569,
2881
+ 1, 281, :_reduce_570,
2882
+ 3, 338, :_reduce_571,
2883
+ 3, 339, :_reduce_572,
2884
+ 1, 287, :_reduce_573,
2885
+ 3, 287, :_reduce_574,
2886
+ 1, 331, :_reduce_575,
2887
+ 3, 331, :_reduce_576,
2890
2888
  1, 340, :_reduce_none,
2891
2889
  1, 340, :_reduce_none,
2892
- 2, 288, :_reduce_581,
2893
- 1, 288, :_reduce_582,
2890
+ 2, 288, :_reduce_579,
2891
+ 1, 288, :_reduce_580,
2894
2892
  1, 341, :_reduce_none,
2895
2893
  1, 341, :_reduce_none,
2896
- 2, 283, :_reduce_585,
2897
- 2, 282, :_reduce_586,
2898
- 0, 282, :_reduce_587,
2894
+ 2, 283, :_reduce_583,
2895
+ 2, 282, :_reduce_584,
2896
+ 0, 282, :_reduce_585,
2899
2897
  1, 245, :_reduce_none,
2900
- 0, 342, :_reduce_589,
2901
- 4, 245, :_reduce_590,
2902
- 1, 233, :_reduce_591,
2903
- 2, 233, :_reduce_592,
2898
+ 0, 342, :_reduce_587,
2899
+ 4, 245, :_reduce_588,
2900
+ 1, 233, :_reduce_589,
2901
+ 2, 233, :_reduce_590,
2904
2902
  1, 218, :_reduce_none,
2905
- 3, 218, :_reduce_594,
2906
- 3, 343, :_reduce_595,
2903
+ 3, 218, :_reduce_592,
2904
+ 3, 343, :_reduce_593,
2905
+ 2, 343, :_reduce_594,
2906
+ 4, 343, :_reduce_595,
2907
2907
  2, 343, :_reduce_596,
2908
- 4, 343, :_reduce_597,
2909
- 2, 343, :_reduce_598,
2910
- 2, 343, :_reduce_599,
2908
+ 2, 343, :_reduce_597,
2911
2909
  1, 192, :_reduce_none,
2912
2910
  1, 192, :_reduce_none,
2913
2911
  1, 192, :_reduce_none,
@@ -2930,13 +2928,13 @@ racc_reduce_table = [
2930
2928
  0, 217, :_reduce_none,
2931
2929
  1, 217, :_reduce_none,
2932
2930
  1, 217, :_reduce_none,
2933
- 1, 243, :_reduce_622,
2931
+ 1, 243, :_reduce_620,
2934
2932
  1, 243, :_reduce_none,
2935
2933
  1, 153, :_reduce_none,
2936
- 2, 153, :_reduce_625,
2937
- 0, 151, :_reduce_626 ]
2934
+ 2, 153, :_reduce_623,
2935
+ 0, 151, :_reduce_624 ]
2938
2936
 
2939
- racc_reduce_n = 627
2937
+ racc_reduce_n = 625
2940
2938
 
2941
2939
  racc_shift_n = 1055
2942
2940
 
@@ -5879,14 +5877,13 @@ def _reduce_457(val, _values, result)
5879
5877
  end
5880
5878
 
5881
5879
  def _reduce_458(val, _values, result)
5882
- result = s(:array)
5880
+ result = new_word_list
5883
5881
 
5884
5882
  result
5885
5883
  end
5886
5884
 
5887
5885
  def _reduce_459(val, _values, result)
5888
- word = val[1][0] == :evstr ? s(:dstr, "", val[1]) : val[1]
5889
- result = val[0].dup << word
5886
+ result = val[0].dup << new_word_list_entry(val)
5890
5887
 
5891
5888
  result
5892
5889
  end
@@ -5912,25 +5909,13 @@ def _reduce_463(val, _values, result)
5912
5909
  end
5913
5910
 
5914
5911
  def _reduce_464(val, _values, result)
5915
- result = s(:array)
5912
+ result = new_symbol_list
5916
5913
 
5917
5914
  result
5918
5915
  end
5919
5916
 
5920
5917
  def _reduce_465(val, _values, result)
5921
- list, sym, _ = val
5922
-
5923
- case sym[0]
5924
- when :dstr then
5925
- sym[0] = :dsym
5926
- when :str then
5927
- sym = s(:lit, sym.last.to_sym)
5928
- else
5929
- debug20 24
5930
- sym = s(:dsym, "", result)
5931
- end
5932
-
5933
- result = list.dup << sym
5918
+ result = val[0].dup << new_symbol_list_entry(val)
5934
5919
 
5935
5920
  result
5936
5921
  end
@@ -5960,25 +5945,25 @@ def _reduce_469(val, _values, result)
5960
5945
  end
5961
5946
 
5962
5947
  def _reduce_470(val, _values, result)
5963
- result = s(:array)
5948
+ result = new_qword_list
5964
5949
 
5965
5950
  result
5966
5951
  end
5967
5952
 
5968
5953
  def _reduce_471(val, _values, result)
5969
- result = val[0].dup << s(:str, val[1])
5954
+ result = val[0].dup << new_qword_list_entry(val)
5970
5955
 
5971
5956
  result
5972
5957
  end
5973
5958
 
5974
5959
  def _reduce_472(val, _values, result)
5975
- result = s(:array)
5960
+ result = new_qsym_list
5976
5961
 
5977
5962
  result
5978
5963
  end
5979
5964
 
5980
5965
  def _reduce_473(val, _values, result)
5981
- result = val[0].dup << s(:lit, val[1].to_sym)
5966
+ result = val[0].dup << new_qsym_list_entry(val)
5982
5967
 
5983
5968
  result
5984
5969
  end
@@ -6042,10 +6027,10 @@ def _reduce_482(val, _values, result)
6042
6027
  end
6043
6028
 
6044
6029
  def _reduce_483(val, _values, result)
6045
- result = [lexer.lex_strterm,
6046
- lexer.brace_nest,
6030
+ result = [lexer.lex_strterm,
6031
+ lexer.brace_nest,
6047
6032
  lexer.string_nest, # TODO: remove
6048
- lexer.cond.store,
6033
+ lexer.cond.store,
6049
6034
  lexer.cmdarg.store,
6050
6035
  lexer.lex_state,
6051
6036
  ]
@@ -6469,15 +6454,7 @@ def _reduce_555(val, _values, result)
6469
6454
  result
6470
6455
  end
6471
6456
 
6472
- # reduce 556 omitted
6473
-
6474
- def _reduce_557(val, _values, result)
6475
- result = val[1]
6476
-
6477
- result
6478
- end
6479
-
6480
- def _reduce_558(val, _values, result)
6457
+ def _reduce_556(val, _values, result)
6481
6458
  case val[0]
6482
6459
  when Symbol then
6483
6460
  result = s(:args)
@@ -6492,7 +6469,7 @@ def _reduce_558(val, _values, result)
6492
6469
  result
6493
6470
  end
6494
6471
 
6495
- def _reduce_559(val, _values, result)
6472
+ def _reduce_557(val, _values, result)
6496
6473
  list, _, item = val
6497
6474
 
6498
6475
  if list.sexp_type == :args then
@@ -6506,9 +6483,9 @@ def _reduce_559(val, _values, result)
6506
6483
  result
6507
6484
  end
6508
6485
 
6509
- # reduce 560 omitted
6486
+ # reduce 558 omitted
6510
6487
 
6511
- def _reduce_561(val, _values, result)
6488
+ def _reduce_559(val, _values, result)
6512
6489
  # TODO: call_args
6513
6490
  label, _ = val[0] # TODO: fix lineno?
6514
6491
  identifier = label.to_sym
@@ -6519,7 +6496,7 @@ def _reduce_561(val, _values, result)
6519
6496
  result
6520
6497
  end
6521
6498
 
6522
- def _reduce_562(val, _values, result)
6499
+ def _reduce_560(val, _values, result)
6523
6500
  label, _ = val[0] # TODO: fix lineno?
6524
6501
  identifier = label.to_sym
6525
6502
  self.env[identifier] = :lvar
@@ -6529,7 +6506,7 @@ def _reduce_562(val, _values, result)
6529
6506
  result
6530
6507
  end
6531
6508
 
6532
- def _reduce_563(val, _values, result)
6509
+ def _reduce_561(val, _values, result)
6533
6510
  # TODO: call_args
6534
6511
  label, _ = val[0] # TODO: fix lineno?
6535
6512
  identifier = label.to_sym
@@ -6540,7 +6517,7 @@ def _reduce_563(val, _values, result)
6540
6517
  result
6541
6518
  end
6542
6519
 
6543
- def _reduce_564(val, _values, result)
6520
+ def _reduce_562(val, _values, result)
6544
6521
  label, _ = val[0] # TODO: fix lineno?
6545
6522
  identifier = label.to_sym
6546
6523
  self.env[identifier] = :lvar
@@ -6550,82 +6527,82 @@ def _reduce_564(val, _values, result)
6550
6527
  result
6551
6528
  end
6552
6529
 
6553
- # reduce 565 omitted
6530
+ # reduce 563 omitted
6554
6531
 
6555
- def _reduce_566(val, _values, result)
6532
+ def _reduce_564(val, _values, result)
6556
6533
  list, _, item = val
6557
6534
  result = list << item.last
6558
6535
 
6559
6536
  result
6560
6537
  end
6561
6538
 
6562
- # reduce 567 omitted
6539
+ # reduce 565 omitted
6563
6540
 
6564
- def _reduce_568(val, _values, result)
6541
+ def _reduce_566(val, _values, result)
6565
6542
  result = args val
6566
6543
 
6567
6544
  result
6568
6545
  end
6569
6546
 
6570
- # reduce 569 omitted
6547
+ # reduce 567 omitted
6571
6548
 
6572
- # reduce 570 omitted
6549
+ # reduce 568 omitted
6573
6550
 
6574
- def _reduce_571(val, _values, result)
6551
+ def _reduce_569(val, _values, result)
6575
6552
  result = :"**#{val[1]}"
6576
6553
 
6577
6554
  result
6578
6555
  end
6579
6556
 
6580
- def _reduce_572(val, _values, result)
6557
+ def _reduce_570(val, _values, result)
6581
6558
  debug20 36, val, result
6582
6559
 
6583
6560
  result
6584
6561
  end
6585
6562
 
6586
- def _reduce_573(val, _values, result)
6563
+ def _reduce_571(val, _values, result)
6587
6564
  result = self.assignable val[0], val[2]
6588
6565
  # TODO: detect duplicate names
6589
6566
 
6590
6567
  result
6591
6568
  end
6592
6569
 
6593
- def _reduce_574(val, _values, result)
6570
+ def _reduce_572(val, _values, result)
6594
6571
  result = self.assignable val[0], val[2]
6595
6572
 
6596
6573
  result
6597
6574
  end
6598
6575
 
6599
- def _reduce_575(val, _values, result)
6576
+ def _reduce_573(val, _values, result)
6600
6577
  result = s(:block, val[0])
6601
6578
 
6602
6579
  result
6603
6580
  end
6604
6581
 
6605
- def _reduce_576(val, _values, result)
6582
+ def _reduce_574(val, _values, result)
6606
6583
  result = val[0]
6607
6584
  result << val[2]
6608
6585
 
6609
6586
  result
6610
6587
  end
6611
6588
 
6612
- def _reduce_577(val, _values, result)
6589
+ def _reduce_575(val, _values, result)
6613
6590
  result = s(:block, val[0])
6614
6591
 
6615
6592
  result
6616
6593
  end
6617
6594
 
6618
- def _reduce_578(val, _values, result)
6595
+ def _reduce_576(val, _values, result)
6619
6596
  result = self.block_append val[0], val[2]
6620
6597
 
6621
6598
  result
6622
6599
  end
6623
6600
 
6624
- # reduce 579 omitted
6601
+ # reduce 577 omitted
6625
6602
 
6626
- # reduce 580 omitted
6603
+ # reduce 578 omitted
6627
6604
 
6628
- def _reduce_581(val, _values, result)
6605
+ def _reduce_579(val, _values, result)
6629
6606
  # TODO: differs from parse.y - needs tests
6630
6607
  name = val[1].to_sym
6631
6608
  self.assignable name
@@ -6634,7 +6611,7 @@ def _reduce_581(val, _values, result)
6634
6611
  result
6635
6612
  end
6636
6613
 
6637
- def _reduce_582(val, _values, result)
6614
+ def _reduce_580(val, _values, result)
6638
6615
  name = :"*"
6639
6616
  self.env[name] = :lvar
6640
6617
  result = name
@@ -6642,11 +6619,11 @@ def _reduce_582(val, _values, result)
6642
6619
  result
6643
6620
  end
6644
6621
 
6645
- # reduce 583 omitted
6622
+ # reduce 581 omitted
6646
6623
 
6647
- # reduce 584 omitted
6624
+ # reduce 582 omitted
6648
6625
 
6649
- def _reduce_585(val, _values, result)
6626
+ def _reduce_583(val, _values, result)
6650
6627
  identifier = val[1].to_sym
6651
6628
 
6652
6629
  self.env[identifier] = :lvar
@@ -6655,27 +6632,27 @@ def _reduce_585(val, _values, result)
6655
6632
  result
6656
6633
  end
6657
6634
 
6658
- def _reduce_586(val, _values, result)
6635
+ def _reduce_584(val, _values, result)
6659
6636
  result = val[1]
6660
6637
 
6661
6638
  result
6662
6639
  end
6663
6640
 
6664
- def _reduce_587(val, _values, result)
6641
+ def _reduce_585(val, _values, result)
6665
6642
  result = nil
6666
6643
 
6667
6644
  result
6668
6645
  end
6669
6646
 
6670
- # reduce 588 omitted
6647
+ # reduce 586 omitted
6671
6648
 
6672
- def _reduce_589(val, _values, result)
6649
+ def _reduce_587(val, _values, result)
6673
6650
  lexer.lex_state = :expr_beg
6674
6651
 
6675
6652
  result
6676
6653
  end
6677
6654
 
6678
- def _reduce_590(val, _values, result)
6655
+ def _reduce_588(val, _values, result)
6679
6656
  result = val[2]
6680
6657
  yyerror "Can't define single method for literals." if
6681
6658
  result[0] == :lit
@@ -6683,21 +6660,21 @@ def _reduce_590(val, _values, result)
6683
6660
  result
6684
6661
  end
6685
6662
 
6686
- def _reduce_591(val, _values, result)
6663
+ def _reduce_589(val, _values, result)
6687
6664
  result = s(:array)
6688
6665
 
6689
6666
  result
6690
6667
  end
6691
6668
 
6692
- def _reduce_592(val, _values, result)
6669
+ def _reduce_590(val, _values, result)
6693
6670
  result = val[0]
6694
6671
 
6695
6672
  result
6696
6673
  end
6697
6674
 
6698
- # reduce 593 omitted
6675
+ # reduce 591 omitted
6699
6676
 
6700
- def _reduce_594(val, _values, result)
6677
+ def _reduce_592(val, _values, result)
6701
6678
  list = val[0].dup
6702
6679
  more = val[2][1..-1]
6703
6680
  list.push(*more) unless more.empty?
@@ -6708,19 +6685,19 @@ def _reduce_594(val, _values, result)
6708
6685
  result
6709
6686
  end
6710
6687
 
6711
- def _reduce_595(val, _values, result)
6688
+ def _reduce_593(val, _values, result)
6712
6689
  result = s(:array, val[0], val[2])
6713
6690
 
6714
6691
  result
6715
6692
  end
6716
6693
 
6717
- def _reduce_596(val, _values, result)
6694
+ def _reduce_594(val, _values, result)
6718
6695
  result = s(:array, s(:lit, val[0][0].to_sym), val[1])
6719
6696
 
6720
6697
  result
6721
6698
  end
6722
6699
 
6723
- def _reduce_597(val, _values, result)
6700
+ def _reduce_595(val, _values, result)
6724
6701
  _, sym, _, value = val
6725
6702
  sym[0] = :dsym
6726
6703
  result = s(:array, sym, value)
@@ -6728,19 +6705,23 @@ def _reduce_597(val, _values, result)
6728
6705
  result
6729
6706
  end
6730
6707
 
6731
- def _reduce_598(val, _values, result)
6708
+ def _reduce_596(val, _values, result)
6732
6709
  raise "not yet: #{val.inspect}"
6733
6710
  # result = s(:array, s(:lit, val[1].to_sym), val[1])
6734
6711
 
6735
6712
  result
6736
6713
  end
6737
6714
 
6738
- def _reduce_599(val, _values, result)
6715
+ def _reduce_597(val, _values, result)
6739
6716
  result = s(:array, s(:kwsplat, val[1]))
6740
6717
 
6741
6718
  result
6742
6719
  end
6743
6720
 
6721
+ # reduce 598 omitted
6722
+
6723
+ # reduce 599 omitted
6724
+
6744
6725
  # reduce 600 omitted
6745
6726
 
6746
6727
  # reduce 601 omitted
@@ -6781,25 +6762,21 @@ end
6781
6762
 
6782
6763
  # reduce 619 omitted
6783
6764
 
6784
- # reduce 620 omitted
6785
-
6786
- # reduce 621 omitted
6787
-
6788
- def _reduce_622(val, _values, result)
6765
+ def _reduce_620(val, _values, result)
6789
6766
  yyerrok
6790
6767
  result
6791
6768
  end
6792
6769
 
6793
- # reduce 623 omitted
6770
+ # reduce 621 omitted
6794
6771
 
6795
- # reduce 624 omitted
6772
+ # reduce 622 omitted
6796
6773
 
6797
- def _reduce_625(val, _values, result)
6774
+ def _reduce_623(val, _values, result)
6798
6775
  yyerrok
6799
6776
  result
6800
6777
  end
6801
6778
 
6802
- def _reduce_626(val, _values, result)
6779
+ def _reduce_624(val, _values, result)
6803
6780
  result = nil;
6804
6781
  result
6805
6782
  end