ruby_parser 3.8.2 → 3.8.3

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