@@ -566,40 +566,40 @@ def test_cmdarg_kwarg_lvar_clashing_method
566
566
end
567
567
568
568
def test_duplicated_arg
569
- assert_syntax_error ( "def foo(a, a) end" , /duplicated argument name/ )
569
+ assert_syntax_error ( "def foo(a, a) end" , /duplicated argument name|repeated parameter name / )
570
570
assert_valid_syntax ( "def foo(_, _) end" )
571
571
( obj = Object . new ) . instance_eval ( "def foo(_, x, _) x end" )
572
572
assert_equal ( 2 , obj . foo ( 1 , 2 , 3 ) )
573
573
end
574
574
575
575
def test_duplicated_rest
576
- assert_syntax_error ( "def foo(a, *a) end" , /duplicated argument name/ )
576
+ assert_syntax_error ( "def foo(a, *a) end" , /duplicated argument name|repeated parameter name / )
577
577
assert_valid_syntax ( "def foo(_, *_) end" )
578
578
( obj = Object . new ) . instance_eval ( "def foo(_, x, *_) x end" )
579
579
assert_equal ( 2 , obj . foo ( 1 , 2 , 3 ) )
580
580
end
581
581
582
582
def test_duplicated_opt
583
- assert_syntax_error ( "def foo(a, a=1) end" , /duplicated argument name/ )
583
+ assert_syntax_error ( "def foo(a, a=1) end" , /duplicated argument name|repeated parameter name / )
584
584
assert_valid_syntax ( "def foo(_, _=1) end" )
585
585
( obj = Object . new ) . instance_eval ( "def foo(_, x, _=42) x end" )
586
586
assert_equal ( 2 , obj . foo ( 1 , 2 ) )
587
587
end
588
588
589
589
def test_duplicated_opt_rest
590
- assert_syntax_error ( "def foo(a=1, *a) end" , /duplicated argument name/ )
590
+ assert_syntax_error ( "def foo(a=1, *a) end" , /duplicated argument name|repeated parameter name / )
591
591
assert_valid_syntax ( "def foo(_=1, *_) end" )
592
592
( obj = Object . new ) . instance_eval ( "def foo(_, x=42, *_) x end" )
593
593
assert_equal ( 42 , obj . foo ( 1 ) )
594
594
assert_equal ( 2 , obj . foo ( 1 , 2 ) )
595
595
end
596
596
597
597
def test_duplicated_rest_opt
598
- assert_syntax_error ( "def foo(*a, a=1) end" , /duplicated argument name/ )
598
+ assert_syntax_error ( "def foo(*a, a=1) end" , /duplicated argument name|unexpected parameter order / )
599
599
end
600
600
601
601
def test_duplicated_rest_post
602
- assert_syntax_error ( "def foo(*a, a) end" , /duplicated argument name/ )
602
+ assert_syntax_error ( "def foo(*a, a) end" , /duplicated argument name|repeated parameter name / )
603
603
assert_valid_syntax ( "def foo(*_, _) end" )
604
604
( obj = Object . new ) . instance_eval ( "def foo(*_, x, _) x end" )
605
605
assert_equal ( 2 , obj . foo ( 1 , 2 , 3 ) )
@@ -610,7 +610,7 @@ def test_duplicated_rest_post
610
610
end
611
611
612
612
def test_duplicated_opt_post
613
- assert_syntax_error ( "def foo(a=1, a) end" , /duplicated argument name/ )
613
+ assert_syntax_error ( "def foo(a=1, a) end" , /duplicated argument name|repeated parameter name / )
614
614
assert_valid_syntax ( "def foo(_=1, _) end" )
615
615
( obj = Object . new ) . instance_eval ( "def foo(_=1, x, _) x end" )
616
616
assert_equal ( 2 , obj . foo ( 1 , 2 , 3 ) )
@@ -621,7 +621,7 @@ def test_duplicated_opt_post
621
621
end
622
622
623
623
def test_duplicated_kw
624
- assert_syntax_error ( "def foo(a, a: 1) end" , /duplicated argument name/ )
624
+ assert_syntax_error ( "def foo(a, a: 1) end" , /duplicated argument name|repeated parameter name / )
625
625
assert_valid_syntax ( "def foo(_, _: 1) end" )
626
626
( obj = Object . new ) . instance_eval ( "def foo(_, x, _: 1) x end" )
627
627
assert_equal ( 3 , obj . foo ( 2 , 3 ) )
@@ -632,7 +632,7 @@ def test_duplicated_kw
632
632
end
633
633
634
634
def test_duplicated_rest_kw
635
- assert_syntax_error ( "def foo(*a, a: 1) end" , /duplicated argument name/ )
635
+ assert_syntax_error ( "def foo(*a, a: 1) end" , /duplicated argument name|repeated parameter name / )
636
636
assert_nothing_raised { def foo ( *_ , _ : 1 ) end }
637
637
( obj = Object . new ) . instance_eval ( "def foo(*_, x: 42, _: 1) x end" )
638
638
assert_equal ( 42 , obj . foo ( 42 ) )
@@ -641,15 +641,15 @@ def test_duplicated_rest_kw
641
641
end
642
642
643
643
def test_duplicated_opt_kw
644
- assert_syntax_error ( "def foo(a=1, a: 1) end" , /duplicated argument name/ )
644
+ assert_syntax_error ( "def foo(a=1, a: 1) end" , /duplicated argument name|repeated parameter name / )
645
645
assert_valid_syntax ( "def foo(_=1, _: 1) end" )
646
646
( obj = Object . new ) . instance_eval ( "def foo(_=42, x, _: 1) x end" )
647
647
assert_equal ( 0 , obj . foo ( 0 ) )
648
648
assert_equal ( 0 , obj . foo ( 0 , _ : 3 ) )
649
649
end
650
650
651
651
def test_duplicated_kw_kwrest
652
- assert_syntax_error ( "def foo(a: 1, **a) end" , /duplicated argument name/ )
652
+ assert_syntax_error ( "def foo(a: 1, **a) end" , /duplicated argument name|repeated parameter name / )
653
653
assert_valid_syntax ( "def foo(_: 1, **_) end" )
654
654
( obj = Object . new ) . instance_eval ( "def foo(_: 1, x: 42, **_) x end" )
655
655
assert_equal ( 42 , obj . foo ( ) )
@@ -659,7 +659,7 @@ def test_duplicated_kw_kwrest
659
659
end
660
660
661
661
def test_duplicated_rest_kwrest
662
- assert_syntax_error ( "def foo(*a, **a) end" , /duplicated argument name/ )
662
+ assert_syntax_error ( "def foo(*a, **a) end" , /duplicated argument name|repeated parameter name / )
663
663
assert_valid_syntax ( "def foo(*_, **_) end" )
664
664
( obj = Object . new ) . instance_eval ( "def foo(*_, x, **_) x end" )
665
665
assert_equal ( 1 , obj . foo ( 1 ) )
@@ -668,7 +668,7 @@ def test_duplicated_rest_kwrest
668
668
end
669
669
670
670
def test_duplicated_opt_kwrest
671
- assert_syntax_error ( "def foo(a=1, **a) end" , /duplicated argument name/ )
671
+ assert_syntax_error ( "def foo(a=1, **a) end" , /duplicated argument name|repeated parameter name / )
672
672
assert_valid_syntax ( "def foo(_=1, **_) end" )
673
673
( obj = Object . new ) . instance_eval ( "def foo(_=42, x, **_) x end" )
674
674
assert_equal ( 1 , obj . foo ( 1 ) )
0 commit comments