ruby_parser 3.20.0 → 3.20.1

data/lib/ruby23_parser.y

@@ -222,6 +222,7 @@ rule
                 | lhs tEQL mrhs
                     {
                       lhs, _, rhs = val
+
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
                     }
                 | mlhs tEQL mrhs_arg
@@ -975,8 +976,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
@@ -1181,12 +1184,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
                     {
@@ -1774,13 +1779,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
                     {
@@ -1994,15 +2005,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
@@ -2022,15 +2035,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
@@ -2045,28 +2060,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
@@ -2470,7 +2489,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
@@ -2688,7 +2714,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 }

data/lib/ruby24_parser.rb

@@ -106,7 +106,7 @@ racc_action_table = [
   -302,   230,   -95,   614,   706,   235,   553,  -302,   755,   717,
    722,  -302,   624,   623,   627,   626,  -302,   757,  -302,  -301,
   -301,  -301,  -301,  -301,  -301,  -301,  -301,  -302,  -301,  -301,
-   725,   235,   732,  -623,   733,   522,  -301,  -301,   736,   725,
+   725,   235,   235,  -623,   733,   522,  -301,  -301,   736,   725,
    611,  -623,   608,   607,   606,  -301,   609,   725,   620,   575,
   -301,  -301,  -301,  -301,  -301,  -301,  -301,  -301,  -301,  -301,
   -301,  -301,  -301,  -301,  -302,   231,  -301,  -301,  -301,   725,
@@ -5326,7 +5326,7 @@ racc_action_pointer = [
    712,   702,   703,   nil,   nil,   705, 17197,   709, 17336, 25146,
  25214,   752,   746,   nil, 17475,   710,   nil, 17614, 17753, 25282,
  25350,  1298,  2718, 17892,   833,   851,   735,   nil,   nil,   -80,
-   -68,   767,   751,   nil,   340,   777,  3278,   856,   nil,  3418,
+   -68,   736,   751,   nil,   340,   777,  3278,   856,   nil,  3418,
     30,   860,   868,   863,   890,   nil,   nil, 18031, 25418, 25486,
      5,   nil,   311,   342,   308,   nil,   753,   nil,   794, 18170,
    nil,   812,   nil,   nil,   nil, 18309,   nil,   744,   nil,   774,
@@ -5438,7 +5438,7 @@ racc_action_default = [
   -649,  -637,   -81,  -300,   -97,   -86,  -649,  -637,  -648,  -649,
   -649,  -107,  -649,  -519,  -649,   -93,   -98,  -649,  -649,  -649,
   -649,  -248,  -240,  -649,  -458,  -649,  -637,  -297,  -250,  -641,
-  -641,  -649,  -649,  -611,  -641,  -649,  -648,  -364,  -365,  -648,
+  -641,  -637,  -649,  -611,  -641,  -649,  -648,  -364,  -365,  -648,
   -649,  -649,  -649,  -649,  -649,  -359,  -453,  -648,  -649,  -649,
   -302,   -59,  -118,  -119,  -649,  -121,  -649,  -292,  -648,  -649,
   -333,  -546,  -337,  -629,  -630,  -649,  -419,  -568,  -422,  -607,
@@ -5505,23 +5505,23 @@ racc_goto_table = [
    389,   741,   742,   787,   744,   833,   415,   416,   417,   418,
    407,   864,   692,   390,   978,   392,   394,   397,   400,   403,
    406,   314,   144,   390,   297,   297,   297,   727,   730,   132,
-   926,   889,   734,  1015,   976,  1031,     1,   640,   352,   352,
-   643,  1017,   352,   588,     2,   590,   296,   296,   296,   138,
+   926,   976,   734,   889,   640,  1031,     1,   643,   352,   352,
+     2,  1015,   352,   588,  1017,   590,   296,   296,   296,   138,
    316,   652,   545,   847,   938,   236,   359,   703,   530,   219,
    368,   429,     9,   422,   896,   738,   865,   293,   306,   307,
    278,   419,   690,   654,   343,   561,   689,   385,   562,   366,
    758,   382,   592,   775,   777,   779,   346,   348,   556,   349,
-   350,   369,    19,   929,   447,   876,   589,   878,    19,  1010,
-   468,   371,   762,   591,   352,   352,   352,   352,  1031,   766,
-   960,   519,   977,   237,   928,   930,  1014,   596,   885,   295,
-   387,  1079,   237,   237,   237,   700,    19,   323,   323,  1017,
-   768,  1057,   512,   697,   697,   513,   838,   869,   687,   613,
-  1045,   427,   745,   854,   940,   450,   466,   781,   473,   413,
-   388,   906,    19,   976,   391,   393,   937,   237,   237,   743,
-   396,   237,   363,   399,   402,   405,   317,   908,   874,   684,
-   769,   903,   792,   866,   295,   295,   793,   456,   462,   408,
-   877,   899,  1027,   635,   295,   637,   894,   891,   641,   700,
-   836,   641,   991,   605,  1025,   444,   445,   457,   595,   nil,
+   350,   369,    19,   732,   447,   929,   876,   589,    19,   878,
+   468,  1010,   371,   762,   352,   352,   352,   352,  1031,   591,
+   766,   519,   960,   237,   977,   928,   930,  1014,   596,   295,
+   885,   387,   237,   237,   237,   700,    19,   323,   323,  1079,
+   768,  1057,  1017,   697,   697,   512,   513,   838,   869,   613,
+   687,   427,  1045,   745,   854,   450,   466,   781,   473,   413,
+   976,   906,    19,   940,   388,   391,   937,   237,   237,   743,
+   393,   237,   363,   396,   399,   402,   317,   405,   874,   684,
+   769,   903,   908,   866,   295,   295,   792,   456,   462,   793,
+   408,   899,  1027,   635,   295,   637,   877,   894,   641,   700,
+   836,   641,   891,   605,   991,   444,   445,   457,  1025,   595,
    450,   nil,   nil,   nil,   469,   470,   nil,   524,   nil,   nil,
    nil,   nil,   nil,   nil,   518,   518,   827,   nil,    19,   nil,
    390,   546,   nil,   237,   237,   237,   237,    19,   570,   542,
@@ -5548,7 +5548,7 @@ racc_goto_table = [
    295,   677,   795,   nil,   nil,   795,    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,
@@ -5904,23 +5904,23 @@ racc_goto_check = [
    188,   100,   100,   147,   100,   160,    24,    24,    24,    24,
    188,   109,    53,     6,   148,     6,     6,     6,     6,     6,
      6,    59,    71,     6,    84,    84,    84,    83,    83,     7,
-   158,   162,    83,   164,   145,   216,     1,   192,    31,    31,
-   192,   165,    31,    69,     3,    69,    82,    82,    82,    11,
+   158,   145,    83,   162,   192,   216,     1,   192,    31,    31,
+     3,   164,    31,    69,   165,    69,    82,    82,    82,    11,
     60,    13,    65,    16,    18,    27,     5,    20,    21,    23,
     26,    30,     9,    32,   210,    43,    45,    58,    58,    58,
     49,     9,    55,    74,    79,    81,    86,    98,   101,   115,
    117,   122,   123,   207,   207,   207,   124,   125,   126,   127,
-   128,   129,    35,   162,    75,   130,   131,   132,    35,   133,
-    75,   134,   135,   136,    31,    31,    31,    31,   216,   137,
-   138,    87,   149,    35,   150,   156,   163,   166,   167,    46,
-   168,   164,    35,    35,    35,   220,    35,    35,    35,   165,
-   169,   148,   174,    88,    88,   175,   177,   178,   180,   209,
-   181,    14,   182,   183,   184,     6,    71,   146,    38,     7,
-   187,   146,    35,   145,   189,   190,   160,    35,    35,   113,
-   191,    35,    35,   194,   195,   196,    14,   197,    68,    36,
-   170,   147,   198,   100,    46,    46,   199,    50,    50,   202,
-   203,   215,   158,   193,    46,   193,   208,   212,   193,   220,
-    53,   193,   162,   204,   213,    31,    31,    85,   219,   nil,
+   128,   129,    35,    37,    75,   162,   130,   131,    35,   132,
+    75,   133,   134,   135,    31,    31,    31,    31,   216,   136,
+   137,    87,   138,    35,   149,   150,   156,   163,   166,    46,
+   167,   168,    35,    35,    35,   220,    35,    35,    35,   164,
+   169,   148,   165,    88,    88,   174,   175,   177,   178,   209,
+   180,    14,   181,   182,   183,     6,    71,   146,    38,     7,
+   145,   146,    35,   184,   187,   189,   160,    35,    35,   113,
+   190,    35,    35,   191,   194,   195,    14,   196,    68,    36,
+   170,   147,   197,   100,    46,    46,   198,    50,    50,   199,
+   202,   215,   158,   193,    46,   193,   203,   208,   193,   220,
+    53,   193,   212,   204,   162,    31,    31,    85,   213,   219,
      6,   nil,   nil,   nil,    31,    31,   nil,   188,   nil,   nil,
    nil,   nil,   nil,   nil,     6,     6,    37,   nil,    35,   nil,
      6,    63,   nil,    35,    35,    35,    35,    35,    24,    40,
@@ -5947,7 +5947,7 @@ racc_goto_check = [
     46,    85,   193,   nil,   nil,   193,    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,
@@ -6292,7 +6292,7 @@ racc_goto_check = [
    nil,   nil,    67,   nil,   nil,   nil,   nil,   nil,    67,    67 ]
 
 racc_goto_pointer = [
-   nil,   116,    15,   124,   nil,    65,    -2,   101,    63,    14,
+   nil,   116,    15,   120,   nil,    65,    -2,   101,    63,    14,
    -88,   119,  -331,  -290,     0,  -531,  -588,  -667,  -713,   nil,
   -391,  -175,    15,   127,   -47,  -175,    68,   112,  1791,  -189,
    -81,    51,     4,  -177,  1930,   170,  -226,  -388,    -9,  2261,
@@ -6305,15 +6305,15 @@ racc_goto_pointer = [
   -490,  -192,   -46,   nil,   nil,   nil,  -325,  -698,   nil,  -646,
    nil,   nil,   nil,  -334,   nil,    87,   nil,  -428,     2,   nil,
    nil,  -549,    86,  -220,   105,   105,  -179,   106,   106,    98,
-  -583,  -194,  -584,  -776,   107,  -408,  -198,  -403,  -693,   nil,
-   nil,   nil,   nil,   nil,   nil,  -790,  -555,  -531,  -811,  -712,
-  -637,   nil,  -362,  -547,   244,   109,  -636,  -167,  -721,  -189,
-  -602,   nil,  -658,  -767,  -850,  -842,  -190,  -570,   111,  -386,
-  -347,   -11,  -202,   nil,   -75,   -73,   nil,  -477,  -528,   nil,
-  -286,  -787,  -354,  -500,  -630,   nil,   nil,   138,   -15,   137,
-   137,   141,  -279,  -128,   143,   143,   143,  -545,  -380,  -377,
-   nil,   nil,   154,  -499,  -324,   nil,   nil,  -439,  -508,  -168,
-  -630,  -119,  -503,  -706,   nil,  -705,  -871,   nil,   nil,  -108,
+  -582,  -193,  -582,  -774,   108,  -407,  -192,  -402,  -691,   nil,
+   nil,   nil,   nil,   nil,   nil,  -793,  -555,  -531,  -811,  -710,
+  -636,   nil,  -362,  -547,   244,   109,  -635,  -167,  -721,  -189,
+  -602,   nil,  -656,  -766,  -842,  -839,  -189,  -568,   112,  -386,
+  -347,   -11,  -202,   nil,   -72,   -72,   nil,  -476,  -527,   nil,
+  -284,  -785,  -353,  -499,  -621,   nil,   nil,   142,   -15,   138,
+   142,   144,  -282,  -128,   144,   144,   145,  -540,  -376,  -374,
+   nil,   nil,   155,  -493,  -324,   nil,   nil,  -439,  -507,  -168,
+  -630,  -119,  -498,  -702,   nil,  -705,  -871,   nil,   nil,  -107,
   -462 ]
 
 racc_goto_default = [
@@ -6981,8 +6981,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_639,
+  2, 184, :_reduce_640,
   0, 230, :_reduce_none,
   1, 230, :_reduce_none,
   1, 230, :_reduce_none,
@@ -7772,6 +7772,7 @@ end
 
 def _reduce_38(val, _values, result)
                       lhs, _, rhs = val
+
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
 
     result
@@ -8895,8 +8896,10 @@ def _reduce_255(val, _values, result)
 end
 
 def _reduce_256(val, _values, result)
-                      _, args, _ = val
+                      _, args, (_, line_max) = val
+
                       result = args
+                      result.line_max = line_max if args
 
     result
 end
@@ -9177,10 +9180,12 @@ def _reduce_303(val, _values, result)
 end
 
 def _reduce_304(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
@@ -9966,15 +9971,21 @@ end
 def _reduce_430(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_431(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
@@ -10261,17 +10272,19 @@ def _reduce_475(val, _values, result)
 end
 
 def _reduce_476(val, _values, result)
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_477(val, _values, result)
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
 
     result
 end
@@ -10297,17 +10310,19 @@ def _reduce_481(val, _values, result)
 end
 
 def _reduce_482(val, _values, result)
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_483(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
@@ -10326,33 +10341,37 @@ def _reduce_485(val, _values, result)
 end
 
 def _reduce_486(val, _values, result)
-                      (_, line), _, _ = val
+                      (_, line), _, (_, line_max) = val
 
                       result = s(:array).line line
+                      result.line_max = line_max
 
     result
 end
 
 def _reduce_487(val, _values, result)
-                      (_, line), list, _ = val
+                      (_, line), list, (_, line_max) = val
 
                       result = list.line line
+                      result.line_max = line_max
 
     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
@@ -10901,7 +10920,14 @@ def _reduce_579(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
@@ -11195,9 +11221,19 @@ end
 
 # reduce 638 omitted
 
-# reduce 639 omitted
+def _reduce_639(val, _values, result)
+                      _, close = val
+                      result = [close, lexer.lineno]
+
+    result
+end
+
+def _reduce_640(val, _values, result)
+                      _, close = val
+                      result = [close, lexer.lineno]
 
-# reduce 640 omitted
+    result
+end
 
 # reduce 641 omitted
 

data/lib/ruby24_parser.y

@@ -222,6 +222,7 @@ rule
                 | lhs tEQL mrhs
                     {
                       lhs, _, rhs = val
+
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
                     }
                 | mlhs tEQL mrhs_arg
@@ -983,8 +984,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
@@ -1189,12 +1192,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
                     {
@@ -1782,13 +1787,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
                     {
@@ -2002,15 +2013,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
@@ -2030,15 +2043,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
@@ -2053,28 +2068,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
@@ -2478,7 +2497,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
@@ -2696,7 +2722,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 }