ruby_parser 3.14.1 → 3.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b91fff73fd2b78aa0e9218f7f975247d0f281c04820b28c99f3b2b378d85c7
-  data.tar.gz: 85fee306db91c8f29cfe45728dea537ef068bf1dee3055c5f88395adc335eb71
+  metadata.gz: 397471879b6b8dc9138464e3c08e585fbbf6c314c664573c660d9f9853e8b503
+  data.tar.gz: e90bc3750fac22cefb540a1d847cd8f07af611096b8095feaa17885fe040dff7
 SHA512:
-  metadata.gz: ac46d9e8261e7ad6e182e4fd81551ce357b5b4d39ba3a361f19d8a86f67e40d5645b3fe4fffe47ecf544eb2c8b66fa92aba032ff8663def56490e337a192ffa6
-  data.tar.gz: 1070b7d4b64dc73e551ea1d0a0de17f75e21f313e549ac6e735bdf235777e17ec67373c67fec2f31413224c1182eb5ca797fecdd2c1d36219b9586b9c960d838
+  metadata.gz: 54edcdda388c8ad13123ae58484e2ab9c0f3eb49893de14f947751cd65133d6dbb5805eb9baa22f6c91f18e20c759053d98265415128b13a107f6a652b1459a7
+  data.tar.gz: c59425b19b4017e420963aaf37a27bfa7ae31e15d2824efd3bbc0dcf3590f6f3a76cbeee22c62204e1d45fc1fa4759d478dde8cd5f1984007071217659450f42

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 3.14.2 / 2020-02-06
+
+* 1 minor enhancement:
+
+  * Cleaned up call_args and removed arg_blk_pass from ruby_parser_extras.rb! Yay!
+
 === 3.14.1 / 2019-10-29
 
 * 1 minor enhancement:

data/lib/ruby20_parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.15
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.4.16
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -3473,20 +3473,20 @@ Racc_debug_parser = false
 
 def _reduce_1(val, _values, result)
                       self.lexer.lex_state = EXPR_BEG
-                    
+
     result
 end
 
 def _reduce_2(val, _values, result)
                       result = new_compstmt val
-                    
+
     result
 end
 
 def _reduce_3(val, _values, result)
                       stmt, _ = val
                       result = stmt
-                    
+
     result
 end
 
@@ -3496,7 +3496,7 @@ end
 
 def _reduce_6(val, _values, result)
                       result = self.block_append val[0], val[2]
-                    
+
     result
 end
 
@@ -3510,7 +3510,7 @@ def _reduce_9(val, _values, result)
                         yyerror "BEGIN in method"
                       end
                       self.env.extend
-                    
+
     result
 end
 
@@ -3522,26 +3522,26 @@ def _reduce_10(val, _values, result)
                       preexe.line lineno
 
                       result = iter
-                    
+
     result
 end
 
 def _reduce_11(val, _values, result)
- result = lexer.lineno 
+ result = lexer.lineno
     result
 end
 
 def _reduce_12(val, _values, result)
                       _, line, stmt, _ = val
                       result = new_iter s(:preexe).line(line), 0, stmt
-                    
+
     result
 end
 
 def _reduce_13(val, _values, result)
                       res = _values[-2]
                       yyerror "else without rescue is useless" unless res
-                    
+
     result
 end
 
@@ -3549,7 +3549,7 @@ def _reduce_14(val, _values, result)
                       body, resc, _, _, els, ens = val
 
                       result = new_body [body, resc, els, ens]
-                    
+
     result
 end
 
@@ -3557,13 +3557,13 @@ def _reduce_15(val, _values, result)
                       body, resc, ens = val
 
                       result = new_body [body, resc, nil, ens]
-                    
+
     result
 end
 
 def _reduce_16(val, _values, result)
                       result = new_compstmt val
-                    
+
     result
 end
 
@@ -3573,14 +3573,14 @@ end
 
 def _reduce_19(val, _values, result)
                       result = self.block_append val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_20(val, _values, result)
                       result = val[1]
                       debug20 2, val, result
-                    
+
     result
 end
 
@@ -3588,74 +3588,74 @@ end
 
 def _reduce_22(val, _values, result)
                       yyerror "BEGIN is permitted only at toplevel"
-                    
+
     result
 end
 
 def _reduce_23(val, _values, result)
                       lexer.lex_state = EXPR_FNAME
-                    
+
     result
 end
 
 def _reduce_24(val, _values, result)
                       (_, line), lhs, _, rhs = val
                       result = s(:alias, lhs, rhs).line(line).line line
-                    
+
     result
 end
 
 def _reduce_25(val, _values, result)
                       (_, line), lhs, rhs = val
                       result = s(:valias, lhs.to_sym, rhs.to_sym).line line
-                    
+
     result
 end
 
 def _reduce_26(val, _values, result)
                       (_, line), lhs, rhs = val
                       result = s(:valias, lhs.to_sym, :"$#{rhs}").line line
-                    
+
     result
 end
 
 def _reduce_27(val, _values, result)
                       yyerror "can't make alias for the number variables"
-                    
+
     result
 end
 
 def _reduce_28(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_29(val, _values, result)
                       t, _, c = val
                       result = new_if c, t, nil
-                    
+
     result
 end
 
 def _reduce_30(val, _values, result)
                       f, _, c = val
                       result = new_if c, nil, f
-                    
+
     result
 end
 
 def _reduce_31(val, _values, result)
                       e, _, c = val
                       result = new_while e, c, true
-                    
+
     result
 end
 
 def _reduce_32(val, _values, result)
                       e, _, c = val
                       result = new_until e, c, true
-                    
+
     result
 end
 
@@ -3664,7 +3664,7 @@ def _reduce_33(val, _values, result)
 
                       resbody = new_resbody s(:array).line(resbody.line), resbody
                       result = new_rescue body, resbody
-                    
+
     result
 end
 
@@ -3677,7 +3677,7 @@ def _reduce_34(val, _values, result)
                       end
 
                       result = new_iter s(:postexe).line(line), 0, stmt
-                    
+
     result
 end
 
@@ -3685,26 +3685,26 @@ end
 
 def _reduce_36(val, _values, result)
                       result = new_masgn val[0], val[2], :wrap
-                    
+
     result
 end
 
 def _reduce_37(val, _values, result)
                       lhs, _, rhs = val
                       result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
-                    
+
     result
 end
 
 def _reduce_38(val, _values, result)
                       result = new_masgn val[0], val[2], :wrap
-                    
+
     result
 end
 
 def _reduce_39(val, _values, result)
                       result = new_masgn val[0], val[2]
-                    
+
     result
 end
 
@@ -3712,19 +3712,19 @@ end
 
 def _reduce_41(val, _values, result)
                       result = new_assign val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_42(val, _values, result)
                       result = new_op_asgn val
-                    
+
     result
 end
 
 def _reduce_43(val, _values, result)
                       result = new_op_asgn1 val
-                    
+
     result
 end
 
@@ -3735,7 +3735,7 @@ def _reduce_44(val, _values, result)
                         result.sexp_type = :safe_op_asgn
                       end
                       result.line = val[0].line
-                    
+
     result
 end
 
@@ -3745,34 +3745,34 @@ def _reduce_45(val, _values, result)
                         result.sexp_type = :safe_op_asgn
                       end
                       result.line = val[0].line
-                    
+
     result
 end
 
 def _reduce_46(val, _values, result)
                       result = s(:op_asgn, val[0], val[4], val[2], val[3])
                       debug20 4, val, result
-                    
+
     result
 end
 
 def _reduce_47(val, _values, result)
                       result = s(:op_asgn, val[0], val[4], val[2], val[3])
                       debug20 5, val, result
-                    
+
     result
 end
 
 def _reduce_48(val, _values, result)
                       self.backref_assign_error val[0]
-                    
+
     result
 end
 
 def _reduce_49(val, _values, result)
                       expr, = val
                       result = value_expr expr
-                    
+
     result
 end
 
@@ -3783,14 +3783,14 @@ end
 def _reduce_52(val, _values, result)
                       lhs, _, rhs = val
                       result = logical_op :and, lhs, rhs
-                    
+
     result
 end
 
 def _reduce_53(val, _values, result)
                       lhs, _, rhs = val
                       result = logical_op :or, lhs, rhs
-                    
+
     result
 end
 
@@ -3798,7 +3798,7 @@ def _reduce_54(val, _values, result)
                       (_, line), _, expr = val
                       result = new_call(expr, :"!").line line
                       # REFACTOR: call_uni_op
-                    
+
     result
 end
 
@@ -3807,7 +3807,7 @@ def _reduce_55(val, _values, result)
                       result = new_call(cmd, :"!").line cmd.line
                       # TODO: fix line number to tBANG... but causes BAD shift/reduce conflict
                       # REFACTOR: call_uni_op -- see parse26.y
-                    
+
     result
 end
 
@@ -3815,26 +3815,26 @@ end
 
 def _reduce_57(val, _values, result)
                       result = value_expr(val[0])
-                    
+
     result
 end
 
 def _reduce_58(val, _values, result)
                       lexer.cond.push true
-                    
+
     result
 end
 
 def _reduce_59(val, _values, result)
                       lexer.cond.pop
-                    
+
     result
 end
 
 def _reduce_60(val, _values, result)
                       _, expr, _, _ = val
                       result = expr
-                    
+
     result
 end
 
@@ -3847,14 +3847,14 @@ end
 def _reduce_64(val, _values, result)
                       blk, _, msg, args = val
                       result = new_call(blk, msg.to_sym, args).line blk.line
-                    
+
     result
 end
 
 def _reduce_65(val, _values, result)
                       # self.env.extend(:dynamic)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -3865,21 +3865,21 @@ def _reduce_66(val, _values, result)
                       result.line = line
 
                       # self.env.unextend
-                    
+
     result
 end
 
 def _reduce_67(val, _values, result)
                       msg, = val
                       result = new_call(nil, msg.to_sym).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_68(val, _values, result)
                       call, args = val
                       result = call.concat args.sexp_body
-                    
+
     result
 end
 
@@ -3894,14 +3894,14 @@ def _reduce_69(val, _values, result)
                         result, operation = block, result
                         result.insert 1, operation
                       end
-                    
+
     result
 end
 
 def _reduce_70(val, _values, result)
                       lhs, callop, op, args = val
                       result = new_call lhs, op.to_sym, args, callop
-                    
+
     result
 end
 
@@ -3913,13 +3913,13 @@ def _reduce_71(val, _values, result)
 
                       block.insert 1, call
                       result = block
-                    
+
     result
 end
 
 def _reduce_72(val, _values, result)
                       result = new_call val[0], val[2].to_sym, val[3]
-                    
+
     result
 end
 
@@ -3931,13 +3931,13 @@ def _reduce_73(val, _values, result)
 
                       block.insert 1, call
                       result = block
-                    
+
     result
 end
 
 def _reduce_74(val, _values, result)
                       result = new_super val[1]
-                    
+
     result
 end
 
@@ -3945,28 +3945,28 @@ def _reduce_75(val, _values, result)
                       (_, line), args = val
                       result = new_yield args
                       result.line line # TODO: push to new_yield
-                    
+
     result
 end
 
 def _reduce_76(val, _values, result)
                       line = val[0].last
                       result = s(:return, ret_args(val[1])).line(line)
-                    
+
     result
 end
 
 def _reduce_77(val, _values, result)
                       (_, line), args = val
                       result = s(:break, ret_args(args)).line line
-                    
+
     result
 end
 
 def _reduce_78(val, _values, result)
                       line = val[0].last
                       result = s(:next, ret_args(val[1])).line(line)
-                    
+
     result
 end
 
@@ -3974,7 +3974,7 @@ end
 
 def _reduce_80(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
@@ -3985,21 +3985,21 @@ def _reduce_82(val, _values, result)
                       l = arg.line
 
                       result = s(:masgn, s(:array, arg).line(l)).line l
-                    
+
     result
 end
 
 def _reduce_83(val, _values, result)
                       head, = val
                       result = s(:masgn, head).line head.line
-                    
+
     result
 end
 
 def _reduce_84(val, _values, result)
                       lhs, rhs = val
                       result = s(:masgn, lhs << rhs.compact).line lhs.line
-                    
+
     result
 end
 
@@ -4007,7 +4007,7 @@ def _reduce_85(val, _values, result)
                       head, _, tail = val
                       head << s(:splat, tail).line(tail.line)
                       result = s(:masgn, head).line head.line
-                    
+
     result
 end
 
@@ -4017,7 +4017,7 @@ def _reduce_86(val, _values, result)
                       result = list_append ary1, s(:splat, splat).line(splat.line)
                       result.concat ary2.sexp_body
                       result = s(:masgn, result).line result.line
-                    
+
     result
 end
 
@@ -4025,7 +4025,7 @@ def _reduce_87(val, _values, result)
                       head, _ = val
                       l = head.line
                       result = s(:masgn, head << s(:splat).line(l)).line l
-                    
+
     result
 end
 
@@ -4034,7 +4034,7 @@ def _reduce_88(val, _values, result)
                       ary = list_append head, s(:splat).line(head.line)
                       ary.concat post.sexp_body
                       result = s(:masgn, ary).line ary.line
-                    
+
     result
 end
 
@@ -4044,7 +4044,7 @@ def _reduce_89(val, _values, result)
                       splat  = s(:splat, node).line l
                       ary    = s(:array, splat).line l
                       result = s(:masgn, ary).line l
-                    
+
     result
 end
 
@@ -4055,14 +4055,14 @@ def _reduce_90(val, _values, result)
                       ary = s(:array, splat).line splat.line
                       ary.concat post.sexp_body
                       result = s(:masgn, ary).line ary.line
-                    
+
     result
 end
 
 def _reduce_91(val, _values, result)
                       l = lexer.lineno
                       result = s(:masgn, s(:array, s(:splat).line(l)).line(l)).line l
-                    
+
     result
 end
 
@@ -4073,7 +4073,7 @@ def _reduce_92(val, _values, result)
                       splat = s(:splat).line l
                       ary = s(:array, splat, *post.sexp_body).line l
                       result = s(:masgn, ary).line l
-                    
+
     result
 end
 
@@ -4081,70 +4081,70 @@ end
 
 def _reduce_94(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_95(val, _values, result)
                       lhs, _ = val
                       result = s(:array, lhs).line lhs.line
-                    
+
     result
 end
 
 def _reduce_96(val, _values, result)
                       result = val[0] << val[1].compact
-                    
+
     result
 end
 
 def _reduce_97(val, _values, result)
                       item, = val
                       result = s(:array, item).line item.line
-                    
+
     result
 end
 
 def _reduce_98(val, _values, result)
                       result = list_append val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_99(val, _values, result)
                       result = self.assignable val[0]
-                    
+
     result
 end
 
 def _reduce_100(val, _values, result)
                       result = self.assignable val[0]
-                    
+
     result
 end
 
 def _reduce_101(val, _values, result)
                       result = self.aryset val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_102(val, _values, result)
                       result = new_attrasgn val[0], val[2], val[1]
-                    
+
     result
 end
 
 def _reduce_103(val, _values, result)
                       recv, _, id = val
                       result = new_attrasgn recv, id
-                    
+
     result
 end
 
 def _reduce_104(val, _values, result)
                       result = new_attrasgn val[0], val[2], val[1]
-                    
+
     result
 end
 
@@ -4158,7 +4158,7 @@ def _reduce_105(val, _values, result)
                       l = expr.line
 
                       result = s(:const, s(:colon2, expr, id.to_sym).line(l), nil).line l
-                    
+
     result
 end
 
@@ -4172,13 +4172,13 @@ def _reduce_106(val, _values, result)
                       l = lexer.lineno
 
                       result = s(:const, nil, s(:colon3, id.to_sym).line(l)).line l
-                    
+
     result
 end
 
 def _reduce_107(val, _values, result)
                       self.backref_assign_error val[0]
-                    
+
     result
 end
 
@@ -4186,7 +4186,7 @@ def _reduce_108(val, _values, result)
                       line = lexer.lineno
                       result = self.assignable val[0]
                       result.line = line
-                    
+
     result
 end
 
@@ -4195,34 +4195,34 @@ def _reduce_109(val, _values, result)
                       result = self.assignable val[0]
                       result.line = line
                       debug20 9, val, result
-                    
+
     result
 end
 
 def _reduce_110(val, _values, result)
                       lhs, _, args, _ = val
                       result = self.aryset lhs, args
-                    
+
     result
 end
 
 def _reduce_111(val, _values, result)
                       lhs, op, id = val
                       result = new_attrasgn lhs, id, op
-                    
+
     result
 end
 
 def _reduce_112(val, _values, result)
                       lhs, _, id = val
                       result = new_attrasgn lhs, id
-                    
+
     result
 end
 
 def _reduce_113(val, _values, result)
                       result = new_attrasgn val[0], val[2], val[1]
-                    
+
     result
 end
 
@@ -4236,7 +4236,7 @@ def _reduce_114(val, _values, result)
 
                       l = expr.line
                       result = s(:const, s(:colon2, expr, id.to_sym).line(l)).line l
-                    
+
     result
 end
 
@@ -4250,19 +4250,19 @@ def _reduce_115(val, _values, result)
 
                       l = lexer.lineno
                       result = s(:const, s(:colon3, id.to_sym).line(l)).line l
-                    
+
     result
 end
 
 def _reduce_116(val, _values, result)
                       self.backref_assign_error val[0]
-                    
+
     result
 end
 
 def _reduce_117(val, _values, result)
                       yyerror "class/module name must be CONSTANT"
-                    
+
     result
 end
 
@@ -4271,13 +4271,13 @@ end
 def _reduce_119(val, _values, result)
                       _, name = val
                       result = s(:colon3, name.to_sym).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_120(val, _values, result)
                       result = val[0].to_sym
-                    
+
     result
 end
 
@@ -4286,7 +4286,7 @@ def _reduce_121(val, _values, result)
 
                       result = s(:colon2, pval, name.to_sym)
                       result.line pval.line
-                    
+
     result
 end
 
@@ -4299,7 +4299,7 @@ end
 def _reduce_125(val, _values, result)
                       lexer.lex_state = EXPR_END
                       result = val[0]
-                    
+
     result
 end
 
@@ -4307,7 +4307,7 @@ def _reduce_126(val, _values, result)
                       (sym, _line), = val
                       lexer.lex_state = EXPR_END
                       result = sym
-                    
+
     result
 end
 
@@ -4318,7 +4318,7 @@ end
 def _reduce_129(val, _values, result)
                       id, = val
                       result = s(:lit, id.to_sym).line lexer.lineno
-                    
+
     result
 end
 
@@ -4326,19 +4326,19 @@ end
 
 def _reduce_131(val, _values, result)
                       result = new_undef val[0]
-                    
+
     result
 end
 
 def _reduce_132(val, _values, result)
                       lexer.lex_state = EXPR_FNAME
-                    
+
     result
 end
 
 def _reduce_133(val, _values, result)
                       result = new_undef val[0], val[3]
-                    
+
     result
 end
 
@@ -4488,31 +4488,31 @@ end
 
 def _reduce_206(val, _values, result)
                       result = new_assign val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_207(val, _values, result)
                       result = new_op_asgn val
-                    
+
     result
 end
 
 def _reduce_208(val, _values, result)
                       result = new_op_asgn1 val
-                    
+
     result
 end
 
 def _reduce_209(val, _values, result)
                       result = new_op_asgn2 val
-                    
+
     result
 end
 
 def _reduce_210(val, _values, result)
                       result = new_op_asgn2 val
-                    
+
     result
 end
 
@@ -4520,7 +4520,7 @@ def _reduce_211(val, _values, result)
                       lhs, _, id, op, rhs = val
 
                       result = s(:op_asgn, lhs, rhs, id.to_sym, op.to_sym).line lhs.line
-                    
+
     result
 end
 
@@ -4529,13 +4529,13 @@ def _reduce_212(val, _values, result)
 
                       lhs = s(:colon2, lhs1, lhs2.to_sym).line lhs1.line
                       result = new_const_op_asgn [lhs, op, rhs]
-                    
+
     result
 end
 
 def _reduce_213(val, _values, result)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -4544,7 +4544,7 @@ def _reduce_214(val, _values, result)
 
                       lhs = s(:colon3, lhs.to_sym).line line
                       result = new_const_op_asgn [lhs, op, rhs]
-                    
+
     result
 end
 
@@ -4552,7 +4552,7 @@ def _reduce_215(val, _values, result)
                       # TODO: lhs = var_field val[0]
                       asgn = new_op_asgn val
                       result = self.backref_assign_error asgn
-                    
+
     result
 end
 
@@ -4563,7 +4563,7 @@ def _reduce_216(val, _values, result)
                       else
                         result = s(:dot2, v1, v2).line v1.line
                       end
-                    
+
     result
 end
 
@@ -4574,50 +4574,50 @@ def _reduce_217(val, _values, result)
                       else
                         result = s(:dot3, v1, v2).line v1.line
                       end
-                    
+
     result
 end
 
 def _reduce_218(val, _values, result)
                       result = new_call val[0], :+, argl(val[2])
-                    
+
     result
 end
 
 def _reduce_219(val, _values, result)
                       result = new_call val[0], :-, argl(val[2])
-                    
+
     result
 end
 
 def _reduce_220(val, _values, result)
                       result = new_call val[0], :*, argl(val[2])
-                    
+
     result
 end
 
 def _reduce_221(val, _values, result)
                       result = new_call val[0], :"/", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_222(val, _values, result)
                       result = new_call val[0], :"%", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_223(val, _values, result)
                       result = new_call val[0], :**, argl(val[2])
-                    
+
     result
 end
 
 def _reduce_224(val, _values, result)
                       lit = s(:lit, val[1]).line lexer.lineno
                       result = new_call(new_call(lit, :"**", argl(val[3])), :"-@")
-                    
+
     result
 end
 
@@ -4627,43 +4627,43 @@ def _reduce_225(val, _values, result)
 
                       ## TODO: why is this 2.0 only?
                       debug20 12, val, result
-                    
+
     result
 end
 
 def _reduce_226(val, _values, result)
                       result = new_call val[1], :"+@"
-                    
+
     result
 end
 
 def _reduce_227(val, _values, result)
                       result = new_call val[1], :"-@"
-                    
+
     result
 end
 
 def _reduce_228(val, _values, result)
                       result = new_call val[0], :"|", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_229(val, _values, result)
                       result = new_call val[0], :"^", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_230(val, _values, result)
                       result = new_call val[0], :"&", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_231(val, _values, result)
                       result = new_call val[0], :"<=>", argl(val[2])
-                    
+
     result
 end
 
@@ -4671,33 +4671,33 @@ end
 
 def _reduce_233(val, _values, result)
                       result = new_call val[0], :"==", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_234(val, _values, result)
                       result = new_call val[0], :"===", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_235(val, _values, result)
                       result = new_call val[0], :"!=", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_236(val, _values, result)
                       lhs, _, rhs = val
                       result = new_match lhs, rhs
-                    
+
     result
 end
 
 def _reduce_237(val, _values, result)
                       lhs, _, rhs = val
                       result = s(:not, new_match(lhs, rhs)).line lhs.line
-                    
+
     result
 end
 
@@ -4705,13 +4705,13 @@ def _reduce_238(val, _values, result)
                       _, arg = val
                       result = new_call arg, :"!"
                       result.line arg.line
-                    
+
     result
 end
 
 def _reduce_239(val, _values, result)
                       result = new_call value_expr(val[1]), :"~"
-                    
+
     result
 end
 
@@ -4719,7 +4719,7 @@ def _reduce_240(val, _values, result)
                       val[0] = value_expr val[0]
                       val[2] = value_expr val[2]
                       result = new_call val[0], :"\<\<", argl(val[2])
-                    
+
     result
 end
 
@@ -4727,33 +4727,33 @@ def _reduce_241(val, _values, result)
                       val[0] = value_expr val[0]
                       val[2] = value_expr val[2]
                       result = new_call val[0], :">>", argl(val[2])
-                    
+
     result
 end
 
 def _reduce_242(val, _values, result)
                       result = logical_op :and, val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_243(val, _values, result)
                       result = logical_op :or, val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_244(val, _values, result)
                       (_, line), _, arg = val
                       result = s(:defined, arg).line line
-                    
+
     result
 end
 
 def _reduce_245(val, _values, result)
                       c, _, t, _, _, f = val
                       result = s(:if, c, t, f).line c.line
-                    
+
     result
 end
 
@@ -4770,7 +4770,7 @@ end
 def _reduce_251(val, _values, result)
                       lhs, op, rhs = val
                       result = new_call lhs, op.to_sym, argl(rhs)
-                    
+
     result
 end
 
@@ -4778,13 +4778,13 @@ def _reduce_252(val, _values, result)
                       lhs, op, rhs = val
                       warn "comparison '%s' after comparison", op
                       result = new_call lhs, op.to_sym, argl(rhs)
-                    
+
     result
 end
 
 def _reduce_253(val, _values, result)
                       result = value_expr(val[0])
-                    
+
     result
 end
 
@@ -4792,19 +4792,19 @@ end
 
 def _reduce_255(val, _values, result)
                       result = args [val[0]]
-                    
+
     result
 end
 
 def _reduce_256(val, _values, result)
                       result = args [val[0], array_to_hash(val[2])]
-                    
+
     result
 end
 
 def _reduce_257(val, _values, result)
                       result = args [array_to_hash(val[0])]
-                    
+
     result
 end
 
@@ -4817,14 +4817,14 @@ def _reduce_259(val, _values, result)
 
                       ary = s(:array).line line
                       result  = new_rescue(body, new_resbody(ary, resbody))
-                    
+
     result
 end
 
 def _reduce_260(val, _values, result)
                       _, args, _ = val
                       result = args
-                    
+
     result
 end
 
@@ -4838,79 +4838,76 @@ end
 
 def _reduce_265(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_266(val, _values, result)
                       result = args [val[0], array_to_hash(val[2])]
-                    
+
     result
 end
 
 def _reduce_267(val, _values, result)
                       result = args [array_to_hash(val[0])]
-                    
+
     result
 end
 
 def _reduce_268(val, _values, result)
                       warning "parenthesize argument(s) for future version"
                       result = call_args val
-                    
+
     result
 end
 
 def _reduce_269(val, _values, result)
                       result = call_args val
-                      result = self.arg_blk_pass val[0], val[1]
-                    
+
     result
 end
 
 def _reduce_270(val, _values, result)
-                      result = call_args [array_to_hash(val[0])]
-                      result = self.arg_blk_pass result, val[1]
-                    
+                      result = call_args [array_to_hash(val[0]), val[1]]
+
     result
 end
 
 def _reduce_271(val, _values, result)
-                      result = call_args [val[0], array_to_hash(val[2])]
-                      result = self.arg_blk_pass result, val[3]
-                    
+                      result = call_args [val[0], array_to_hash(val[2]), val[3]]
+
     result
 end
 
 def _reduce_272(val, _values, result)
                       result = call_args val
-                    
+
     result
 end
 
 def _reduce_273(val, _values, result)
                       result = lexer.cmdarg.store true
-                    
+
     result
 end
 
 def _reduce_274(val, _values, result)
                       lexer.cmdarg.restore val[0]
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_275(val, _values, result)
                       _, arg = val
                       result = s(:block_pass, arg).line arg.line
-                    
+
     result
 end
 
 def _reduce_276(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
@@ -4920,39 +4917,39 @@ def _reduce_278(val, _values, result)
                       arg, = val
 
                       result = s(:array, arg).line arg.line
-                    
+
     result
 end
 
 def _reduce_279(val, _values, result)
                       _, arg = val
                       result = s(:array, s(:splat, arg).line(arg.line)).line arg.line
-                    
+
     result
 end
 
 def _reduce_280(val, _values, result)
                       args, _, id = val
                       result = self.list_append args, id
-                    
+
     result
 end
 
 def _reduce_281(val, _values, result)
- result = lexer.lineno 
+ result = lexer.lineno
     result
 end
 
 def _reduce_282(val, _values, result)
                       args, _, _, line, id = val
                       result = self.list_append args, s(:splat, id).line(line)
-                    
+
     result
 end
 
 def _reduce_283(val, _values, result)
                       result = val[0] << val[2]
-                    
+
     result
 end
 
@@ -4961,14 +4958,14 @@ def _reduce_284(val, _values, result)
                       # TODO: make all tXXXX terminals include lexer.lineno
                       arg, _, _, splat = val
                       result = self.arg_concat arg, splat
-                    
+
     result
 end
 
 def _reduce_285(val, _values, result)
                       _, arg = val
                       result = s(:splat, arg).line arg.line
-                    
+
     result
 end
 
@@ -4995,7 +4992,7 @@ end
 def _reduce_296(val, _values, result)
                       msg, = val
                       result = new_call nil, msg.to_sym
-                    
+
     result
 end
 
@@ -5004,7 +5001,7 @@ def _reduce_297(val, _values, result)
                       # TODO:
                       # $<val>1 = cmdarg_stack;
                       # CMDARG_SET(0);
-                    
+
     result
 end
 
@@ -5017,33 +5014,33 @@ def _reduce_298(val, _values, result)
                       end
 
                       result.line = val[1]
-                    
+
     result
 end
 
 def _reduce_299(val, _values, result)
                       lexer.lex_state = EXPR_ENDARG
                       result = lexer.lineno
-                    
+
     result
 end
 
 def _reduce_300(val, _values, result)
                       _, line, _ = val
                       result = s(:begin).line line
-                    
+
     result
 end
 
 def _reduce_301(val, _values, result)
                       result = lexer.cmdarg.store false
-                    
+
     result
 end
 
 def _reduce_302(val, _values, result)
                       lexer.lex_state = EXPR_ENDARG
-                    
+
     result
 end
 
@@ -5052,7 +5049,7 @@ def _reduce_303(val, _values, result)
                       warning "(...) interpreted as grouped expression"
                       lexer.cmdarg.restore cmdarg
                       result = stmt
-                    
+
     result
 end
 
@@ -5061,7 +5058,7 @@ def _reduce_304(val, _values, result)
                       result = stmt
                       result ||= s(:nil).line lexer.lineno
                       result.paren = true
-                    
+
     result
 end
 
@@ -5069,7 +5066,7 @@ def _reduce_305(val, _values, result)
                       expr, _, id = val
 
                       result = s(:colon2, expr, id.to_sym).line expr.line
-                    
+
     result
 end
 
@@ -5077,12 +5074,12 @@ def _reduce_306(val, _values, result)
                       _, id = val
 
                       result = s(:colon3, id.to_sym).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_307(val, _values, result)
- result = lexer.lineno 
+ result = lexer.lineno
     result
 end
 
@@ -5091,44 +5088,44 @@ def _reduce_308(val, _values, result)
                       result = args || s(:array)
                       result.sexp_type = :array # aref_args is :args
                       result.line line
-                    
+
     result
 end
 
 def _reduce_309(val, _values, result)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
 def _reduce_310(val, _values, result)
                       result = new_hash val
-                    
+
     result
 end
 
 def _reduce_311(val, _values, result)
                       (_, line), = val
                       result = s(:return).line line
-                    
+
     result
 end
 
 def _reduce_312(val, _values, result)
                       result = new_yield val[2]
-                    
+
     result
 end
 
 def _reduce_313(val, _values, result)
                       result = new_yield
-                    
+
     result
 end
 
 def _reduce_314(val, _values, result)
                       result = new_yield
-                    
+
     result
 end
 
@@ -5136,20 +5133,20 @@ def _reduce_315(val, _values, result)
                       (_, line), _, _, arg, _ = val
 
                       result = s(:defined, arg).line line
-                    
+
     result
 end
 
 def _reduce_316(val, _values, result)
                       _, _, lhs, _ = val
                       result = new_call lhs, :"!"
-                    
+
     result
 end
 
 def _reduce_317(val, _values, result)
                       debug20 14, val, result
-                    
+
     result
 end
 
@@ -5159,7 +5156,7 @@ def _reduce_318(val, _values, result)
                       iter.insert 1, call
                       result = iter
                       # FIX: probably not: call.line = iter.line
-                    
+
     result
 end
 
@@ -5170,68 +5167,68 @@ def _reduce_320(val, _values, result)
                       block_dup_check call, iter
                       iter.insert 1, call # FIX
                       result = iter
-                    
+
     result
 end
 
 def _reduce_321(val, _values, result)
                       result = val[1] # TODO: fix lineno
-                    
+
     result
 end
 
 def _reduce_322(val, _values, result)
                       _, c, _, t, f, _ = val
                       result = new_if c, t, f
-                    
+
     result
 end
 
 def _reduce_323(val, _values, result)
                       _, c, _, t, f, _ = val
                       result = new_if c, f, t
-                    
+
     result
 end
 
 def _reduce_324(val, _values, result)
                       _, cond, body, _ = val
                       result = new_while body, cond, true
-                    
+
     result
 end
 
 def _reduce_325(val, _values, result)
                       _, cond, body, _ = val
                       result = new_until body, cond, true
-                    
+
     result
 end
 
 def _reduce_326(val, _values, result)
                       (_, line), expr, _, body, _ = val
                       result = new_case expr, body, line
-                    
+
     result
 end
 
 def _reduce_327(val, _values, result)
                       (_, line), _, body, _ = val
                       result = new_case nil, body, line
-                    
+
     result
 end
 
 def _reduce_328(val, _values, result)
                       _, var, _, iter, body, _ = val
                       result = new_for iter, var, body
-                    
+
     result
 end
 
 def _reduce_329(val, _values, result)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -5241,7 +5238,7 @@ def _reduce_330(val, _values, result)
                         yyerror "class definition in method body"
                       end
                       self.env.extend
-                    
+
     result
 end
 
@@ -5249,20 +5246,20 @@ def _reduce_331(val, _values, result)
                       result = new_class val
                       self.env.unextend
                       self.lexer.comments # we don't care about comments in the body
-                    
+
     result
 end
 
 def _reduce_332(val, _values, result)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
 def _reduce_333(val, _values, result)
                       result = self.in_def
                       self.in_def = false
-                    
+
     result
 end
 
@@ -5270,7 +5267,7 @@ def _reduce_334(val, _values, result)
                       result = self.in_single
                       self.in_single = 0
                       self.env.extend
-                    
+
     result
 end
 
@@ -5278,13 +5275,13 @@ def _reduce_335(val, _values, result)
                       result = new_sclass val
                       self.env.unextend
                       self.lexer.comments # we don't care about comments in the body
-                    
+
     result
 end
 
 def _reduce_336(val, _values, result)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -5294,7 +5291,7 @@ def _reduce_337(val, _values, result)
                         self.in_def or self.in_single > 0
 
                       self.env.extend
-                    
+
     result
 end
 
@@ -5302,7 +5299,7 @@ def _reduce_338(val, _values, result)
                       result = new_module val
                       self.env.unextend
                       self.lexer.comments # we don't care about comments in the body
-                    
+
     result
 end
 
@@ -5315,12 +5312,12 @@ def _reduce_339(val, _values, result)
                       # TODO: local->cmdargs = cmdarg_stack;
                       # TODO: port local_push_gen and local_pop_gen
                       lexer.cmdarg.stack.replace [false]
-                    
+
     result
 end
 
 def _reduce_340(val, _values, result)
- result = lexer.lineno 
+ result = lexer.lineno
     result
 end
 
@@ -5333,14 +5330,14 @@ def _reduce_341(val, _values, result)
                       self.env.unextend
                       self.in_def = in_def
                       self.lexer.comments # we don't care about comments in the body
-                    
+
     result
 end
 
 def _reduce_342(val, _values, result)
                       self.comments.push self.lexer.comments
                       lexer.lex_state = EXPR_FNAME
-                    
+
     result
 end
 
@@ -5350,7 +5347,7 @@ def _reduce_343(val, _values, result)
                       lexer.lex_state = EXPR_ENDFN # force for args
                       result = [lexer.lineno, self.lexer.cmdarg.stack.dup]
                       lexer.cmdarg.stack.replace [false]
-                    
+
     result
 end
 
@@ -5363,41 +5360,41 @@ def _reduce_344(val, _values, result)
                       self.env.unextend
                       self.in_single -= 1
                       self.lexer.comments # we don't care about comments in the body
-                    
+
     result
 end
 
 def _reduce_345(val, _values, result)
                       (_, line), = val
                       result = s(:break).line line
-                    
+
     result
 end
 
 def _reduce_346(val, _values, result)
                       (_, line), = val
                       result = s(:next).line line
-                    
+
     result
 end
 
 def _reduce_347(val, _values, result)
                       (_, line), = val
                       result = s(:redo).line line
-                    
+
     result
 end
 
 def _reduce_348(val, _values, result)
                       (_, line), = val
                       result = s(:retry).line line
-                    
+
     result
 end
 
 def _reduce_349(val, _values, result)
                       result = value_expr(val[0])
-                    
+
     result
 end
 
@@ -5455,7 +5452,7 @@ def _reduce_375(val, _values, result)
                       (_, line), c, _, t, rest = val
 
                       result = s(:if, c, t, rest).line line
-                    
+
     result
 end
 
@@ -5463,7 +5460,7 @@ end
 
 def _reduce_377(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
@@ -5471,7 +5468,7 @@ end
 
 def _reduce_379(val, _values, result)
                       val[0].delete_at 1 if val[0][1].nil? # HACK
-                    
+
     result
 end
 
@@ -5479,7 +5476,7 @@ end
 
 def _reduce_381(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
@@ -5487,13 +5484,13 @@ def _reduce_382(val, _values, result)
                       sym, = val
 
                       result = s(:array, sym).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_383(val, _values, result)
                       result = list_append val[0], val[2]
-                    
+
     result
 end
 
@@ -5501,7 +5498,7 @@ def _reduce_384(val, _values, result)
                       args, = val
 
                       result = block_var args
-                    
+
     result
 end
 
@@ -5509,7 +5506,7 @@ def _reduce_385(val, _values, result)
                       args, _, _, splat = val
 
                       result = block_var args, "*#{splat}".to_sym
-                    
+
     result
 end
 
@@ -5517,7 +5514,7 @@ def _reduce_386(val, _values, result)
                       args, _, _, splat, _, args2 = val
 
                       result = block_var args, "*#{splat}".to_sym, args2
-                    
+
     result
 end
 
@@ -5525,7 +5522,7 @@ def _reduce_387(val, _values, result)
                       args, _, _ = val
 
                       result = block_var args, :*
-                    
+
     result
 end
 
@@ -5533,7 +5530,7 @@ def _reduce_388(val, _values, result)
                       args, _, _, _, args2 = val
 
                       result = block_var args, :*, args2
-                    
+
     result
 end
 
@@ -5541,7 +5538,7 @@ def _reduce_389(val, _values, result)
                       _, splat = val
 
                       result = block_var :"*#{splat}"
-                    
+
     result
 end
 
@@ -5549,13 +5546,13 @@ def _reduce_390(val, _values, result)
                       _, splat, _, args = val
 
                       result = block_var :"*#{splat}", args
-                    
+
     result
 end
 
 def _reduce_391(val, _values, result)
                       result = block_var :*
-                    
+
     result
 end
 
@@ -5563,25 +5560,25 @@ def _reduce_392(val, _values, result)
                       _, _, args = val
 
                       result = block_var :*, args
-                    
+
     result
 end
 
 def _reduce_393(val, _values, result)
                       result = call_args val
-                    
+
     result
 end
 
 def _reduce_394(val, _values, result)
                       result = call_args val
-                    
+
     result
 end
 
 def _reduce_395(val, _values, result)
                       result = call_args val
-                    
+
     result
 end
 
@@ -5589,13 +5586,13 @@ def _reduce_396(val, _values, result)
                       line = lexer.lineno
                       result = call_args val # TODO: push line down
                       result.line line
-                    
+
     result
 end
 
 def _reduce_397(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
@@ -5603,122 +5600,122 @@ end
 
 def _reduce_399(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_400(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_401(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_402(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_403(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_404(val, _values, result)
                       result = args(val) << nil
-                    
+
     result
 end
 
 def _reduce_405(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_406(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_407(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_408(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_409(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_410(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_411(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_412(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_413(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_414(val, _values, result)
- result = 0 
+ result = 0
     result
 end
 
 def _reduce_415(val, _values, result)
                       self.lexer.command_start = true
-                    
+
     result
 end
 
 def _reduce_416(val, _values, result)
                       # TODO: current_arg = 0
                       result = args val
-                    
+
     result
 end
 
 def _reduce_417(val, _values, result)
                       result = s(:args).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_418(val, _values, result)
                       # TODO: current_arg = 0
                       result = args val
-                    
+
     result
 end
 
@@ -5726,19 +5723,19 @@ end
 
 def _reduce_420(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_421(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_422(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
@@ -5746,7 +5743,7 @@ def _reduce_423(val, _values, result)
                       id, = val
                       line = lexer.lineno
                       result = s(:shadow, id.to_sym).line line
-                    
+
     result
 end
 
@@ -5757,13 +5754,13 @@ def _reduce_425(val, _values, result)
                       result = [lexer.lineno, lexer.lpar_beg]
                       lexer.paren_nest += 1
                       lexer.lpar_beg = lexer.paren_nest
-                    
+
     result
 end
 
 def _reduce_426(val, _values, result)
                       result = lexer.cmdarg.store(false)
-                    
+
     result
 end
 
@@ -5778,39 +5775,39 @@ def _reduce_427(val, _values, result)
                       result = new_iter call, args, body
                       result.line = line
                       self.env.unextend
-                    
+
     result
 end
 
 def _reduce_428(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_429(val, _values, result)
                       result = val[0]
                       result = 0 if result == s(:args)
-                    
+
     result
 end
 
 def _reduce_430(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_431(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_432(val, _values, result)
                       (_, line), iter, _ = val
                       result = iter.line line
-                    
+
     result
 end
 
@@ -5828,13 +5825,13 @@ def _reduce_433(val, _values, result)
 
                       result = blk
                       result.insert 1, cmd
-                    
+
     result
 end
 
 def _reduce_434(val, _values, result)
                       result = new_call val[0], val[2].to_sym, val[3]
-                    
+
     result
 end
 
@@ -5845,7 +5842,7 @@ def _reduce_435(val, _values, result)
                       iter2.insert 1, call
 
                       result = iter2
-                    
+
     result
 end
 
@@ -5856,13 +5853,13 @@ def _reduce_436(val, _values, result)
                       iter2.insert 1, call
 
                       result = iter2
-                    
+
     result
 end
 
 def _reduce_437(val, _values, result)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -5871,62 +5868,62 @@ def _reduce_438(val, _values, result)
 
                       result = call.concat args.sexp_body if args
                       result.line lineno
-                    
+
     result
 end
 
 def _reduce_439(val, _values, result)
                       result = new_call val[0], val[2].to_sym, val[3], val[1]
-                    
+
     result
 end
 
 def _reduce_440(val, _values, result)
                       result = new_call val[0], val[2].to_sym, val[3]
-                    
+
     result
 end
 
 def _reduce_441(val, _values, result)
                       result = new_call val[0], val[2].to_sym
-                    
+
     result
 end
 
 def _reduce_442(val, _values, result)
                       result = new_call val[0], :call, val[2], val[1]
-                    
+
     result
 end
 
 def _reduce_443(val, _values, result)
                       result = new_call val[0], :call, val[2]
-                    
+
     result
 end
 
 def _reduce_444(val, _values, result)
                       result = new_super val[1]
-                    
+
     result
 end
 
 def _reduce_445(val, _values, result)
                       result = s(:zsuper).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_446(val, _values, result)
                       result = new_aref val
-                    
+
     result
 end
 
 def _reduce_447(val, _values, result)
                       self.env.extend :dynamic
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -5937,14 +5934,14 @@ def _reduce_448(val, _values, result)
                       result.line = line
 
                       self.env.unextend
-                    
+
     result
 end
 
 def _reduce_449(val, _values, result)
                       self.env.extend :dynamic
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -5955,17 +5952,17 @@ def _reduce_450(val, _values, result)
                       result.line = line
 
                       self.env.unextend
-                    
+
     result
 end
 
 def _reduce_451(val, _values, result)
- self.env.extend :dynamic; result = self.lexer.lineno 
+ self.env.extend :dynamic; result = self.lexer.lineno
     result
 end
 
 def _reduce_452(val, _values, result)
- result = lexer.cmdarg.store(false) 
+ result = lexer.cmdarg.store(false)
     result
 end
 
@@ -5976,17 +5973,17 @@ def _reduce_453(val, _values, result)
                       self.env.unextend
                       lexer.cmdarg.restore cmdarg
                       lexer.cmdarg.pop # because of: cmdarg_stack >> 1 ?
-                    
+
     result
 end
 
 def _reduce_454(val, _values, result)
- self.env.extend :dynamic; result = self.lexer.lineno 
+ self.env.extend :dynamic; result = self.lexer.lineno
     result
 end
 
 def _reduce_455(val, _values, result)
- result = lexer.cmdarg.store(false) 
+ result = lexer.cmdarg.store(false)
     result
 end
 
@@ -5996,13 +5993,13 @@ def _reduce_456(val, _values, result)
                       result = new_do_body param, cmpstmt, line
                       self.env.unextend
                       lexer.cmdarg.restore cmdarg
-                    
+
     result
 end
 
 def _reduce_457(val, _values, result)
                       result = self.lexer.lineno
-                    
+
     result
 end
 
@@ -6010,7 +6007,7 @@ def _reduce_458(val, _values, result)
                       result = new_when(val[2], val[4])
                       result.line = val[1]
                       result << val[5] if val[5]
-                    
+
     result
 end
 
@@ -6027,20 +6024,20 @@ def _reduce_461(val, _values, result)
 
                       result = new_resbody(klasses, body)
                       result << rest if rest # UGH, rewritten above
-                    
+
     result
 end
 
 def _reduce_462(val, _values, result)
                       result = nil
-                    
+
     result
 end
 
 def _reduce_463(val, _values, result)
                       arg, = val
                       result = s(:array, arg).line arg.line
-                    
+
     result
 end
 
@@ -6050,7 +6047,7 @@ end
 
 def _reduce_466(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
@@ -6060,7 +6057,7 @@ def _reduce_468(val, _values, result)
                       (_, line), body = val
 
                       result = body || s(:nil).line(line)
-                    
+
     result
 end
 
@@ -6070,7 +6067,7 @@ def _reduce_470(val, _values, result)
                       line = lexer.lineno
                       result = s(:lit, val[0])
                       result.line = line
-                    
+
     result
 end
 
@@ -6078,7 +6075,7 @@ def _reduce_471(val, _values, result)
                       line = lexer.lineno
                       result = s(:lit, val[0])
                       result.line = line
-                    
+
     result
 end
 
@@ -6088,13 +6085,13 @@ def _reduce_473(val, _values, result)
                       str, = val
                       str = s(:dstr, str.value) if str.sexp_type == :evstr
                       result = str
-                    
+
     result
 end
 
 def _reduce_474(val, _values, result)
                       debug20 23, val, result
-                    
+
     result
 end
 
@@ -6102,7 +6099,7 @@ end
 
 def _reduce_476(val, _values, result)
                       result = self.literal_concat val[0], val[1]
-                    
+
     result
 end
 
@@ -6112,50 +6109,50 @@ def _reduce_477(val, _values, result)
                       str = dedent str if func =~ RubyLexer::STR_FUNC_ICNTNT
 
                       result = str
-                    
+
     result
 end
 
 def _reduce_478(val, _values, result)
                       result = new_string val
-                    
+
     result
 end
 
 def _reduce_479(val, _values, result)
                       result = new_xstring val[1]
                       # TODO: dedent?!?! SERIOUSLY?!?
-                    
+
     result
 end
 
 def _reduce_480(val, _values, result)
                       result = new_regexp val
-                    
+
     result
 end
 
 def _reduce_481(val, _values, result)
                       result = s(:array).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_482(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_483(val, _values, result)
                       result = new_word_list
-                    
+
     result
 end
 
 def _reduce_484(val, _values, result)
                       result = val[0].dup << new_word_list_entry(val)
-                    
+
     result
 end
 
@@ -6163,18 +6160,18 @@ end
 
 def _reduce_486(val, _values, result)
                       result = self.literal_concat val[0], val[1]
-                    
+
     result
 end
 
 def _reduce_487(val, _values, result)
                       result = s(:array).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_488(val, _values, result)
- result = lexer.lineno 
+ result = lexer.lineno
     result
 end
 
@@ -6182,113 +6179,113 @@ def _reduce_489(val, _values, result)
                       _, line, list, _, = val
                       list.line = line
                       result = list
-                    
+
     result
 end
 
 def _reduce_490(val, _values, result)
                       result = new_symbol_list.line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_491(val, _values, result)
                       list, * = val
                       result = list.dup << new_symbol_list_entry(val)
-                    
+
     result
 end
 
 def _reduce_492(val, _values, result)
                       result = s(:array).line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_493(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_494(val, _values, result)
                       result = s(:array).line lexer.lineno # FIX
-                    
+
     result
 end
 
 def _reduce_495(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_496(val, _values, result)
                       result = new_qword_list
-                    
+
     result
 end
 
 def _reduce_497(val, _values, result)
                       result = val[0].dup << new_qword_list_entry(val)
-                    
+
     result
 end
 
 def _reduce_498(val, _values, result)
                       result = new_qsym_list
-                    
+
     result
 end
 
 def _reduce_499(val, _values, result)
                       result = val[0].dup << new_qsym_list_entry(val)
-                    
+
     result
 end
 
 def _reduce_500(val, _values, result)
                       result = s(:str, "").line lexer.lineno
-                    
+
     result
 end
 
 def _reduce_501(val, _values, result)
                       v1, v2 = val
                       result = literal_concat v1, v2
-                    
+
     result
 end
 
 def _reduce_502(val, _values, result)
                       result = nil
-                    
+
     result
 end
 
 def _reduce_503(val, _values, result)
                       v1, v2 = val
                       result = literal_concat v1, v2
-                    
+
     result
 end
 
 def _reduce_504(val, _values, result)
                       result = nil
-                    
+
     result
 end
 
 def _reduce_505(val, _values, result)
                       v1, v2 = val
                       result = literal_concat v1, v2
-                    
+
     result
 end
 
 def _reduce_506(val, _values, result)
                       result = new_string val
-                    
+
     result
 end
 
@@ -6297,7 +6294,7 @@ def _reduce_507(val, _values, result)
 
                       lexer.lex_strterm = nil
                       lexer.lex_state = EXPR_BEG
-                    
+
     result
 end
 
@@ -6305,7 +6302,7 @@ def _reduce_508(val, _values, result)
                       _, strterm, str = val
                       lexer.lex_strterm = strterm
                       result = s(:evstr, str).line str.line
-                    
+
     result
 end
 
@@ -6324,7 +6321,7 @@ def _reduce_509(val, _values, result)
                       lexer.string_nest = 0
 
                       lexer.lex_state   = EXPR_BEG
-                    
+
     result
 end
 
@@ -6356,22 +6353,22 @@ def _reduce_510(val, _values, result)
                         debug20 25
                         raise "unknown string body: #{stmt.inspect}"
                       end
-                    
+
     result
 end
 
 def _reduce_511(val, _values, result)
- result = s(:gvar, val[0].to_sym).line lexer.lineno 
+ result = s(:gvar, val[0].to_sym).line lexer.lineno
     result
 end
 
 def _reduce_512(val, _values, result)
- result = s(:ivar, val[0].to_sym).line lexer.lineno 
+ result = s(:ivar, val[0].to_sym).line lexer.lineno
     result
 end
 
 def _reduce_513(val, _values, result)
- result = s(:cvar, val[0].to_sym).line lexer.lineno 
+ result = s(:cvar, val[0].to_sym).line lexer.lineno
     result
 end
 
@@ -6380,13 +6377,13 @@ end
 def _reduce_515(val, _values, result)
                       lexer.lex_state = EXPR_END
                       result = val[1].to_sym
-                    
+
     result
 end
 
 def _reduce_516(val, _values, result)
                       result = val[0].to_sym
-                    
+
     result
 end
 
@@ -6415,7 +6412,7 @@ def _reduce_521(val, _values, result)
                       else
                         debug20 26, val, result
                       end
-                    
+
     result
 end
 
@@ -6425,13 +6422,13 @@ end
 
 def _reduce_524(val, _values, result)
                       result = -val[1] # TODO: pt_testcase
-                    
+
     result
 end
 
 def _reduce_525(val, _values, result)
                       result = -val[1] # TODO: pt_testcase
-                    
+
     result
 end
 
@@ -6446,32 +6443,32 @@ end
 # reduce 530 omitted
 
 def _reduce_531(val, _values, result)
- result = s(:nil).line lexer.lineno 
+ result = s(:nil).line lexer.lineno
     result
 end
 
 def _reduce_532(val, _values, result)
- result = s(:self).line lexer.lineno 
+ result = s(:self).line lexer.lineno
     result
 end
 
 def _reduce_533(val, _values, result)
- result = s(:true).line lexer.lineno 
+ result = s(:true).line lexer.lineno
     result
 end
 
 def _reduce_534(val, _values, result)
- result = s(:false).line lexer.lineno 
+ result = s(:false).line lexer.lineno
     result
 end
 
 def _reduce_535(val, _values, result)
- result = s(:str, self.file).line lexer.lineno 
+ result = s(:str, self.file).line lexer.lineno
     result
 end
 
 def _reduce_536(val, _values, result)
- result = s(:lit, lexer.lineno).line lexer.lineno 
+ result = s(:lit, lexer.lineno).line lexer.lineno
     result
 end
 
@@ -6483,63 +6480,63 @@ def _reduce_537(val, _values, result)
                         else
                           s(:str, "Unsupported!").line l
                         end
-                    
+
     result
 end
 
 def _reduce_538(val, _values, result)
                       var = val[0]
                       result = Sexp === var ? var : self.gettable(var)
-                    
+
     result
 end
 
 def _reduce_539(val, _values, result)
                       var = val[0]
                       result = Sexp === var ? var : self.gettable(var)
-                    
+
     result
 end
 
 def _reduce_540(val, _values, result)
                       result = self.assignable val[0]
-                    
+
     result
 end
 
 def _reduce_541(val, _values, result)
                       result = self.assignable val[0]
                       debug20 29, val, result
-                    
+
     result
 end
 
 def _reduce_542(val, _values, result)
- result = s(:nth_ref,  val[0]).line lexer.lineno 
+ result = s(:nth_ref,  val[0]).line lexer.lineno
     result
 end
 
 def _reduce_543(val, _values, result)
- result = s(:back_ref, val[0]).line lexer.lineno 
+ result = s(:back_ref, val[0]).line lexer.lineno
     result
 end
 
 def _reduce_544(val, _values, result)
                       lexer.lex_state = EXPR_BEG
                       lexer.command_start = true
-                    
+
     result
 end
 
 def _reduce_545(val, _values, result)
                       result = val[2]
-                    
+
     result
 end
 
 def _reduce_546(val, _values, result)
                       result = nil
-                    
+
     result
 end
 
@@ -6547,7 +6544,7 @@ def _reduce_547(val, _values, result)
                       result = val[1]
                       self.lexer.lex_state = EXPR_BEG
                       self.lexer.command_start = true
-                    
+
     result
 end
 
@@ -6555,7 +6552,7 @@ def _reduce_548(val, _values, result)
                       result = self.in_kwarg
                       self.in_kwarg = true
                       self.lexer.lex_state |= EXPR_LABEL
-                    
+
     result
 end
 
@@ -6566,25 +6563,25 @@ def _reduce_549(val, _values, result)
                       result = args
                       lexer.lex_state     = EXPR_BEG
                       lexer.command_start = true
-                    
+
     result
 end
 
 def _reduce_550(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_551(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_552(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
@@ -6592,127 +6589,127 @@ end
 
 def _reduce_554(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_555(val, _values, result)
                       result = nil
-                    
+
     result
 end
 
 def _reduce_556(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_557(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_558(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_559(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_560(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_561(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_562(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_563(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_564(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_565(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_566(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_567(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_568(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_569(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_570(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
 def _reduce_571(val, _values, result)
                       yyerror "formal argument cannot be a constant"
-                    
+
     result
 end
 
 def _reduce_572(val, _values, result)
                       yyerror "formal argument cannot be an instance variable"
-                    
+
     result
 end
 
 def _reduce_573(val, _values, result)
                       yyerror "formal argument cannot be a global variable"
-                    
+
     result
 end
 
 def _reduce_574(val, _values, result)
                       yyerror "formal argument cannot be a class variable"
-                    
+
     result
 end
 
@@ -6723,7 +6720,7 @@ def _reduce_576(val, _values, result)
                       self.env[identifier] = :lvar
 
                       result = identifier
-                    
+
     result
 end
 
@@ -6731,7 +6728,7 @@ end
 
 def _reduce_578(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
@@ -6747,7 +6744,7 @@ def _reduce_579(val, _values, result)
                         debug20 32
                         raise "Unknown f_arg type: #{val.inspect}"
                       end
-                    
+
     result
 end
 
@@ -6761,7 +6758,7 @@ def _reduce_580(val, _values, result)
                       end
 
                       result << item
-                    
+
     result
 end
 
@@ -6774,7 +6771,7 @@ def _reduce_581(val, _values, result)
 
                       kwarg  = s(:kwarg, identifier, arg).line line
                       result = s(:array, kwarg).line line
-                    
+
     result
 end
 
@@ -6785,7 +6782,7 @@ def _reduce_582(val, _values, result)
                       self.env[id] = :lvar
 
                       result = s(:array, s(:kwarg, id, expr).line(line)).line line
-                    
+
     result
 end
 
@@ -6794,7 +6791,7 @@ end
 def _reduce_584(val, _values, result)
                       list, _, item = val
                       result = list << item.last
-                    
+
     result
 end
 
@@ -6802,7 +6799,7 @@ end
 
 def _reduce_586(val, _values, result)
                       result = args val
-                    
+
     result
 end
 
@@ -6814,33 +6811,33 @@ def _reduce_589(val, _values, result)
                       name = val[1].to_sym
                       self.assignable name
                       result = :"**#{name}"
-                    
+
     result
 end
 
 def _reduce_590(val, _values, result)
                       result = :"**"
-                    
+
     result
 end
 
 def _reduce_591(val, _values, result)
                       result = self.assignable val[0], val[2]
                       # TODO: detect duplicate names
-                    
+
     result
 end
 
 def _reduce_592(val, _values, result)
                       result = self.assignable val[0], val[2]
-                    
+
     result
 end
 
 def _reduce_593(val, _values, result)
                       optblk, = val
                       result = s(:block, optblk).line optblk.line
-                    
+
     result
 end
 
@@ -6848,20 +6845,20 @@ def _reduce_594(val, _values, result)
                       optarg, _, optblk = val
                       result = optarg
                       result << optblk
-                    
+
     result
 end
 
 def _reduce_595(val, _values, result)
                       opt, = val
                       result = s(:block, opt).line opt.line
-                    
+
     result
 end
 
 def _reduce_596(val, _values, result)
                       result = self.block_append val[0], val[2]
-                    
+
     result
 end
 
@@ -6874,7 +6871,7 @@ def _reduce_599(val, _values, result)
                       name = val[1].to_sym
                       self.assignable name
                       result = :"*#{name}"
-                    
+
     result
 end
 
@@ -6882,7 +6879,7 @@ def _reduce_600(val, _values, result)
                       name = :"*"
                       self.env[name] = :lvar
                       result = name
-                    
+
     result
 end
 
@@ -6895,19 +6892,19 @@ def _reduce_603(val, _values, result)
 
                       self.env[identifier] = :lvar
                       result = "&#{identifier}".to_sym
-                    
+
     result
 end
 
 def _reduce_604(val, _values, result)
                       result = val[1]
-                    
+
     result
 end
 
 def _reduce_605(val, _values, result)
                       result = nil
-                    
+
     result
 end
 
@@ -6915,7 +6912,7 @@ end
 
 def _reduce_607(val, _values, result)
                       lexer.lex_state = EXPR_BEG
-                    
+
     result
 end
 
@@ -6923,13 +6920,13 @@ def _reduce_608(val, _values, result)
                       result = val[2]
                       yyerror "Can't define single method for literals." if
                         result.sexp_type == :lit
-                    
+
     result
 end
 
 def _reduce_609(val, _values, result)
                       result = s(:array).line lexer.lineno
-                    
+
     result
 end
 
@@ -6943,14 +6940,14 @@ def _reduce_612(val, _values, result)
                       list.push(*more) unless more.empty?
                       result = list
                       result.sexp_type = :hash
-                    
+
     result
 end
 
 def _reduce_613(val, _values, result)
                       v1, _, v2 = val
                       result = s(:array, v1, v2).line v1.line
-                    
+
     result
 end
 
@@ -6959,7 +6956,7 @@ def _reduce_614(val, _values, result)
 
                       lit = s(:lit, label.to_sym).line line
                       result = s(:array, lit, arg).line line
-                    
+
     result
 end
 
@@ -6967,7 +6964,7 @@ def _reduce_615(val, _values, result)
                       _, arg = val
                       line = arg.line
                       result = s(:array, s(:kwsplat, arg).line(line)).line line
-                    
+
     result
 end
 
@@ -7020,7 +7017,7 @@ end
 # reduce 639 omitted
 
 def _reduce_640(val, _values, result)
- yyerrok 
+ yyerrok
     result
 end
 
@@ -7029,12 +7026,12 @@ end
 # reduce 642 omitted
 
 def _reduce_643(val, _values, result)
- yyerrok 
+ yyerrok
     result
 end
 
 def _reduce_644(val, _values, result)
- result = nil; 
+ result = nil;
     result
 end