Skip to content

Commit 298dbac

Browse files
eregonandrykonchin
authored andcommitted
Allow Prism syntax error message for duplicated parameters in test_syntax.rb
* See ruby/prism#2287
1 parent 9b6f02f commit 298dbac

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

test/mri/tests/ruby/test_syntax.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -566,40 +566,40 @@ def test_cmdarg_kwarg_lvar_clashing_method
566566
end
567567

568568
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/)
570570
assert_valid_syntax("def foo(_, _) end")
571571
(obj = Object.new).instance_eval("def foo(_, x, _) x end")
572572
assert_equal(2, obj.foo(1, 2, 3))
573573
end
574574

575575
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/)
577577
assert_valid_syntax("def foo(_, *_) end")
578578
(obj = Object.new).instance_eval("def foo(_, x, *_) x end")
579579
assert_equal(2, obj.foo(1, 2, 3))
580580
end
581581

582582
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/)
584584
assert_valid_syntax("def foo(_, _=1) end")
585585
(obj = Object.new).instance_eval("def foo(_, x, _=42) x end")
586586
assert_equal(2, obj.foo(1, 2))
587587
end
588588

589589
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/)
591591
assert_valid_syntax("def foo(_=1, *_) end")
592592
(obj = Object.new).instance_eval("def foo(_, x=42, *_) x end")
593593
assert_equal(42, obj.foo(1))
594594
assert_equal(2, obj.foo(1, 2))
595595
end
596596

597597
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/)
599599
end
600600

601601
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/)
603603
assert_valid_syntax("def foo(*_, _) end")
604604
(obj = Object.new).instance_eval("def foo(*_, x, _) x end")
605605
assert_equal(2, obj.foo(1, 2, 3))
@@ -610,7 +610,7 @@ def test_duplicated_rest_post
610610
end
611611

612612
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/)
614614
assert_valid_syntax("def foo(_=1, _) end")
615615
(obj = Object.new).instance_eval("def foo(_=1, x, _) x end")
616616
assert_equal(2, obj.foo(1, 2, 3))
@@ -621,7 +621,7 @@ def test_duplicated_opt_post
621621
end
622622

623623
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/)
625625
assert_valid_syntax("def foo(_, _: 1) end")
626626
(obj = Object.new).instance_eval("def foo(_, x, _: 1) x end")
627627
assert_equal(3, obj.foo(2, 3))
@@ -632,7 +632,7 @@ def test_duplicated_kw
632632
end
633633

634634
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/)
636636
assert_nothing_raised {def foo(*_, _: 1) end}
637637
(obj = Object.new).instance_eval("def foo(*_, x: 42, _: 1) x end")
638638
assert_equal(42, obj.foo(42))
@@ -641,15 +641,15 @@ def test_duplicated_rest_kw
641641
end
642642

643643
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/)
645645
assert_valid_syntax("def foo(_=1, _: 1) end")
646646
(obj = Object.new).instance_eval("def foo(_=42, x, _: 1) x end")
647647
assert_equal(0, obj.foo(0))
648648
assert_equal(0, obj.foo(0, _: 3))
649649
end
650650

651651
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/)
653653
assert_valid_syntax("def foo(_: 1, **_) end")
654654
(obj = Object.new).instance_eval("def foo(_: 1, x: 42, **_) x end")
655655
assert_equal(42, obj.foo())
@@ -659,7 +659,7 @@ def test_duplicated_kw_kwrest
659659
end
660660

661661
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/)
663663
assert_valid_syntax("def foo(*_, **_) end")
664664
(obj = Object.new).instance_eval("def foo(*_, x, **_) x end")
665665
assert_equal(1, obj.foo(1))
@@ -668,7 +668,7 @@ def test_duplicated_rest_kwrest
668668
end
669669

670670
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/)
672672
assert_valid_syntax("def foo(_=1, **_) end")
673673
(obj = Object.new).instance_eval("def foo(_=42, x, **_) x end")
674674
assert_equal(1, obj.foo(1))

0 commit comments

Comments
 (0)