ruby_parser 3.20.0 → 3.20.1

data/lib/ruby26_parser.rb

@@ -111,7 +111,7 @@ racc_action_table = [
    553,   717,   722,  -303,  -303,  -303,  -303,  -303,  -303,  -303,
   -303,  -303,  -303,  -303,  -303,  -303,  -303,   231,   725,  -303,
   -303,  -303,   611,   674,   608,   607,   606,  -303,   609,   782,
-  -303,   231,   235,   732,   733,  -303,   522,  -303,   786,  -303,
+  -303,   231,   235,   235,   733,  -303,   522,  -303,   786,  -303,
   -303,  -303,  -303,  -303,  -303,  -303,   231,  -303,   736,  -303,
    725,   725,   611,   575,   608,   607,   606,   616,   609,   725,
    782,   759,  -303,  -303,   764,  -303,   770,  -303,   619,   786,
@@ -5328,7 +5328,7 @@ racc_action_pointer = [
    754,   742,   741,   nil,   nil,   743, 17201,   750, 17340, 25150,
  25218,   620,   790,   nil, 17479,   752,   nil, 17618, 17757, 25286,
  25354,  1038,  2722, 17896,   875,   889,   786,   nil,   nil,   436,
-   450,   818,   801,   nil,   507,   828,  3282,   916,   nil,  3422,
+   450,   787,   801,   nil,   507,   828,  3282,   916,   nil,  3422,
     63,   921,   922,   917,   930,   nil,   nil, 18035, 25422, 25490,
     26,   nil,   347,   483,   -20,   nil,   640,   nil,   834, 18174,
    nil,   854,   nil,   nil,   nil, 18313,   nil,   881,   nil,   817,
@@ -5440,7 +5440,7 @@ racc_action_default = [
   -651,  -639,   -81,  -302,   -97,   -86,  -651,  -639,  -650,  -651,
   -651,  -107,  -651,  -521,  -651,   -93,   -98,  -651,  -651,  -651,
   -651,  -250,  -242,  -651,  -460,  -651,  -639,  -299,  -252,  -643,
-  -643,  -651,  -651,  -613,  -643,  -651,  -650,  -366,  -367,  -650,
+  -643,  -639,  -651,  -613,  -643,  -651,  -650,  -366,  -367,  -650,
   -651,  -651,  -651,  -651,  -651,  -361,  -455,  -650,  -651,  -651,
   -304,   -59,  -118,  -119,  -651,  -121,  -651,  -294,  -650,  -651,
   -335,  -548,  -339,  -631,  -632,  -651,  -421,  -570,  -424,  -609,
@@ -5513,17 +5513,17 @@ racc_goto_table = [
    368,   429,     9,   422,   738,   545,   865,   293,   306,   307,
    278,   419,   929,   690,   654,   343,   561,   689,   385,   562,
    366,   758,   382,   775,   777,   779,   592,   346,   348,   556,
-   349,   350,    19,   369,   447,   876,   589,   878,    19,  1010,
-   468,   371,   762,   591,   352,   352,   352,   352,  1031,   766,
-   960,   519,   977,   237,   928,   930,  1014,   596,  1079,   295,
-   885,   387,   237,   237,   237,   700,    19,   323,   323,   768,
-   512,  1017,   513,   697,   697,   838,   869,   687,  1045,   613,
-   745,   427,   854,   940,   388,   450,   466,   781,   473,   413,
-  1057,   906,    19,   976,   391,   393,   903,   237,   237,   743,
-   396,   237,   363,   399,  1027,   937,   317,   402,   405,   684,
-   769,   991,   908,   866,   295,   295,   874,   456,   462,   792,
-   793,   836,   408,   877,   295,   894,   891,   899,  1025,   700,
-   595,   nil,   nil,   605,   nil,   444,   445,   457,   896,   nil,
+   349,   350,    19,   732,   447,   369,   876,   589,    19,   878,
+   468,  1010,   371,   762,   352,   352,   352,   352,  1031,   591,
+   766,   519,   960,   237,   977,   928,   930,  1014,  1079,   295,
+   596,   885,   237,   237,   237,   700,    19,   323,   323,   387,
+   768,  1017,   512,   697,   697,   513,   838,   869,   687,   613,
+  1045,   427,   745,   854,   940,   450,   466,   781,   473,   413,
+  1057,   906,    19,   976,   388,   391,   903,   237,   237,   743,
+   393,   237,   363,   396,  1027,   937,   317,   399,   402,   684,
+   769,   991,   405,   866,   295,   295,   874,   456,   462,   908,
+   792,   836,   793,   408,   295,   877,   894,   899,   891,   700,
+  1025,   595,   nil,   605,   nil,   444,   445,   457,   896,   nil,
    450,   nil,   nil,   nil,   469,   470,   nil,   nil,   nil,   896,
    nil,   nil,   nil,   nil,   518,   518,   827,   nil,    19,   nil,
    390,   546,   nil,   237,   237,   237,   237,    19,   570,   542,
@@ -5550,7 +5550,7 @@ racc_goto_table = [
    295,   677,   nil,   nil,   nil,   843,    19,   nil,   nil,   nil,
    nil,   688,   457,   nil,   nil,   237,    19,    19,   nil,   nil,
    332,   875,   nil,   nil,   855,   nil,   450,   466,   332,   586,
-   712,   586,   nil,   nil,   950,   953,   nil,   466,   nil,   295,
+   712,   586,   665,   nil,   950,   953,   nil,   466,   nil,   295,
    840,   nil,   nil,   nil,   672,   751,   962,   nil,  1077,  1078,
    nil,   nil,   nil,   nil,   nil,   nil,   735,   nil,   nil,   737,
    nil,   nil,   739,   nil,   nil,   450,   466,   nil,   nil,  1053,
@@ -5912,17 +5912,17 @@ racc_goto_check = [
     26,    30,     9,    32,    43,    65,    45,    58,    58,    58,
     49,     9,   162,    55,    74,    79,    81,    86,    98,   101,
    115,   117,   122,   207,   207,   207,   123,   124,   125,   126,
-   127,   128,    35,   129,    75,   130,   131,   132,    35,   133,
-    75,   134,   135,   136,    31,    31,    31,    31,   216,   137,
-   138,    87,   149,    35,   150,   156,   163,   166,   164,    46,
-   167,   168,    35,    35,    35,   220,    35,    35,    35,   169,
-   174,   165,   175,    88,    88,   177,   178,   180,   181,   209,
-   182,    14,   183,   184,   187,     6,    71,   146,    38,     7,
-   148,   146,    35,   145,   189,   190,   147,    35,    35,   113,
-   191,    35,    35,   194,   158,   160,    14,   195,   196,    36,
-   170,   162,   197,   100,    46,    46,    68,    50,    50,   198,
-   199,    53,   202,   203,    46,   208,   212,   215,   213,   220,
-   219,   nil,   nil,   204,   nil,    31,    31,    85,   210,   nil,
+   127,   128,    35,    37,    75,   129,   130,   131,    35,   132,
+    75,   133,   134,   135,    31,    31,    31,    31,   216,   136,
+   137,    87,   138,    35,   149,   150,   156,   163,   164,    46,
+   166,   167,    35,    35,    35,   220,    35,    35,    35,   168,
+   169,   165,   174,    88,    88,   175,   177,   178,   180,   209,
+   181,    14,   182,   183,   184,     6,    71,   146,    38,     7,
+   148,   146,    35,   145,   187,   189,   147,    35,    35,   113,
+   190,    35,    35,   191,   158,   160,    14,   194,   195,    36,
+   170,   162,   196,   100,    46,    46,    68,    50,    50,   197,
+   198,    53,   199,   202,    46,   203,   208,   215,   212,   220,
+   213,   219,   nil,   204,   nil,    31,    31,    85,   210,   nil,
      6,   nil,   nil,   nil,    31,    31,   nil,   nil,   nil,   210,
    nil,   nil,   nil,   nil,     6,     6,    37,   nil,    35,   nil,
      6,    63,   nil,    35,    35,    35,    35,    35,    24,    40,
@@ -5949,7 +5949,7 @@ racc_goto_check = [
     46,    85,   nil,   nil,   nil,    65,    35,   nil,   nil,   nil,
    nil,    51,    85,   nil,   nil,    35,    35,    35,   nil,   nil,
     78,    36,   nil,   nil,    29,   nil,     6,    71,    78,    35,
-    50,    35,   nil,   nil,   106,    12,   nil,    71,   nil,    46,
+    50,    35,    40,   nil,   106,    12,   nil,    71,   nil,    46,
     87,   nil,   nil,   nil,    85,    42,    12,   nil,   100,   100,
    nil,   nil,   nil,   nil,   nil,   nil,    14,   nil,   nil,    14,
    nil,   nil,   118,   nil,   nil,     6,    71,   nil,   nil,   207,
@@ -6306,16 +6306,16 @@ racc_goto_pointer = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    83,   nil,
   -490,  -191,   -46,   nil,   nil,   nil,  -325,  -664,   nil,  -646,
    nil,   nil,   nil,  -334,   nil,    88,   nil,  -427,     2,   nil,
-   nil,  -549,    87,  -216,   106,   106,  -178,   107,   107,   100,
-  -583,  -194,  -584,  -776,   107,  -408,  -198,  -403,  -693,   nil,
-   nil,   nil,   nil,   nil,   nil,  -790,  -555,  -546,  -792,  -712,
-  -637,   nil,  -362,  -547,   244,   109,  -636,  -167,  -739,  -189,
-  -593,   nil,  -679,  -767,  -853,  -840,  -190,  -568,   112,  -387,
-  -347,   -11,  -202,   nil,   -77,   -76,   nil,  -478,  -529,   nil,
-  -287,  -789,  -356,  -501,  -631,   nil,   nil,   132,    16,   137,
-   137,   141,  -279,   214,   143,   146,   146,  -540,  -373,  -373,
-   nil,   nil,   157,  -496,  -324,   nil,   nil,  -439,  -509,  -168,
-  -694,  -119,  -504,  -712,   nil,  -699,  -871,   nil,   nil,  -116,
+   nil,  -549,    87,  -216,   106,   106,  -178,   107,   107,   102,
+  -582,  -193,  -582,  -774,   108,  -407,  -192,  -402,  -691,   nil,
+   nil,   nil,   nil,   nil,   nil,  -790,  -555,  -546,  -792,  -710,
+  -636,   nil,  -362,  -547,   244,   109,  -635,  -167,  -739,  -189,
+  -593,   nil,  -679,  -766,  -853,  -840,  -187,  -567,   120,  -386,
+  -347,   -11,  -202,   nil,   -75,   -73,   nil,  -477,  -528,   nil,
+  -286,  -787,  -354,  -500,  -630,   nil,   nil,   142,    16,   138,
+   142,   144,  -279,   214,   147,   147,   150,  -533,  -372,  -371,
+   nil,   nil,   158,  -494,  -324,   nil,   nil,  -439,  -508,  -168,
+  -694,  -119,  -502,  -710,   nil,  -699,  -871,   nil,   nil,  -115,
   -462 ]
 
 racc_goto_default = [
@@ -6985,8 +6985,8 @@ racc_reduce_table = [
   1, 152, :_reduce_none,
   0, 187, :_reduce_none,
   1, 187, :_reduce_none,
-  2, 208, :_reduce_none,
-  2, 184, :_reduce_none,
+  2, 208, :_reduce_641,
+  2, 184, :_reduce_642,
   0, 230, :_reduce_none,
   1, 230, :_reduce_none,
   1, 230, :_reduce_none,
@@ -7776,6 +7776,7 @@ end
 
 def _reduce_38(val, _values, result)
                       lhs, _, rhs = val
+
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
 
     result
@@ -8917,8 +8918,10 @@ def _reduce_257(val, _values, result)
 end
 
 def _reduce_258(val, _values, result)
-                      _, args, _ = val
+                      _, args, (_, line_max) = val
+
                       result = args
+                      result.line_max = line_max if args
 
     result
 end
@@ -9199,10 +9202,12 @@ def _reduce_305(val, _values, result)
 end
 
 def _reduce_306(val, _values, result)
-                      _, line, args, _ = val
+                      _, line, args, (_, line_max) = val
+
                       result = args || s(:array)
                       result.sexp_type = :array # aref_args is :args
                       result.line line
+                      result.line_max = line_max
 
     result
 end
@@ -9988,15 +9993,21 @@ end
 def _reduce_432(val, _values, result)
                       call, args = val
 
-                      result = call.concat args.sexp_body if args
+                      result = call
+
+                      if args then
+                        call.concat args.sexp_body
+                        result.line_max = args.line_max
+                      end
 
     result
 end
 
 def _reduce_433(val, _values, result)
-                      recv, call_op, (op, _line), args = val
+                      recv, call_op, (op, op_line), args = val
 
                       result = new_call recv, op.to_sym, args, call_op
+                      result.line_max = op_line unless args
 
     result
 end
@@ -10283,17 +10294,19 @@ def _reduce_477(val, _values, result)
 end
 
 def _reduce_478(val, _values, result)
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_479(val, _values, result)
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
 
     result
 end
@@ -10319,17 +10332,19 @@ def _reduce_483(val, _values, result)
 end
 
 def _reduce_484(val, _values, result)
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_485(val, _values, result)
-                      (_, line), list, _, = val
-                      list.line line
-                      result = list
+                      (_, line), list, (_, line_max), = val
+
+                      result = list.line line
+                      result.line_max = line_max
 
     result
 end
@@ -10348,33 +10363,37 @@ def _reduce_487(val, _values, result)
 end
 
 def _reduce_488(val, _values, result)
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_489(val, _values, result)
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_490(val, _values, result)
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_491(val, _values, result)
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
 
     result
 end
@@ -10923,7 +10942,14 @@ def _reduce_581(val, _values, result)
                         result = s(:args, list).line list.line
                       end
 
-                      result << (Sexp === item ? item : item.first)
+                      if Sexp === item then
+                        line_max = item.line_max
+                      else
+                        item, line_max = item
+                      end
+
+                      result << item
+                      result.line_max = line_max
 
     result
 end
@@ -11217,9 +11243,19 @@ end
 
 # reduce 640 omitted
 
-# reduce 641 omitted
+def _reduce_641(val, _values, result)
+                      _, close = val
+                      result = [close, lexer.lineno]
+
+    result
+end
+
+def _reduce_642(val, _values, result)
+                      _, close = val
+                      result = [close, lexer.lineno]
 
-# reduce 642 omitted
+    result
+end
 
 # reduce 643 omitted
 

data/lib/ruby26_parser.y

@@ -223,6 +223,7 @@ rule
                 | lhs tEQL mrhs
                     {
                       lhs, _, rhs = val
+
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
                     }
                 | mlhs tEQL mrhs_arg
@@ -998,8 +999,10 @@ rule
 
       paren_args: tLPAREN2 opt_call_args rparen
                     {
-                      _, args, _ = val
+                      _, args, (_, line_max) = val
+
                       result = args
+                      result.line_max = line_max if args
                     }
 
   opt_paren_args: none
@@ -1204,12 +1207,14 @@ rule
                     {
                       result = wrap :colon3, val[1]
                     }
-                | tLBRACK { result = lexer.lineno } aref_args tRBRACK
+                | tLBRACK { result = lexer.lineno } aref_args rbracket
                     {
-                      _, line, args, _ = val
+                      _, line, args, (_, line_max) = val
+
                       result = args || s(:array)
                       result.sexp_type = :array # aref_args is :args
                       result.line line
+                      result.line_max = line_max
                     }
                 | tLBRACE
                     {
@@ -1797,13 +1802,19 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       call, args = val
 
-                      result = call.concat args.sexp_body if args
+                      result = call
+
+                      if args then
+                        call.concat args.sexp_body
+                        result.line_max = args.line_max
+                      end
                     }
                 | primary_value call_op operation2 opt_paren_args
                     {
-                      recv, call_op, (op, _line), args = val
+                      recv, call_op, (op, op_line), args = val
 
                       result = new_call recv, op.to_sym, args, call_op
+                      result.line_max = op_line unless args
                     }
                 | primary_value tCOLON2 operation2 paren_args
                     {
@@ -2017,15 +2028,17 @@ opt_block_args_tail: tCOMMA block_args_tail
 
            words: tWORDS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tWORDS_BEG word_list tSTRING_END
                     {
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
                     }
 
        word_list: none
@@ -2045,15 +2058,17 @@ opt_block_args_tail: tCOMMA block_args_tail
 
          symbols: tSYMBOLS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tSYMBOLS_BEG symbol_list tSTRING_END
                     {
-                      (_, line), list, _, = val
-                      list.line line
-                      result = list
+                      (_, line), list, (_, line_max), = val
+
+                      result = list.line line
+                      result.line_max = line_max
                     }
 
      symbol_list: none
@@ -2068,28 +2083,32 @@ opt_block_args_tail: tCOMMA block_args_tail
 
           qwords: tQWORDS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tQWORDS_BEG qword_list tSTRING_END
                     {
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
                     }
 
         qsymbols: tQSYMBOLS_BEG tSPACE tSTRING_END
                     {
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
                     }
                 | tQSYMBOLS_BEG qsym_list tSTRING_END
                     {
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
                     }
 
       qword_list: none
@@ -2493,7 +2512,14 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                         result = s(:args, list).line list.line
                       end
 
-                      result << (Sexp === item ? item : item.first)
+                      if Sexp === item then
+                        line_max = item.line_max
+                      else
+                        item, line_max = item
+                      end
+
+                      result << item
+                      result.line_max = line_max
                     }
 
          f_label: tLABEL
@@ -2711,7 +2737,15 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
        opt_terms:  | terms
           opt_nl:  | tNL
           rparen: opt_nl tRPAREN
+                    {
+                      _, close = val
+                      result = [close, lexer.lineno]
+                    }
         rbracket: opt_nl tRBRACK
+                    {
+                      _, close = val
+                      result = [close, lexer.lineno]
+                    }
          trailer:  | tNL | tCOMMA
 
             term: tSEMI { yyerrok }