Change string for duplicated when warning

Author: enebo

core/src/main/java/org/jruby/ir/builder/IRBuilder.java

@@ -53,6 +53,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
+import static org.jruby.api.Warn.warning;
 import static org.jruby.ir.IRFlags.*;
 import static org.jruby.ir.builder.StringStyle.Frozen;
 import static org.jruby.ir.builder.StringStyle.Mutable;
@@ -2838,8 +2839,9 @@ protected boolean literalWhenCheck(U value, Set<IRubyObject> seenLiterals, Map<I
 
         if (literal != null) {
             if (seenLiterals.contains(literal)) {
-                getManager().getRuntime().getWarnings().warning(IRubyWarnings.ID.MISCELLANEOUS, getFileName(), getLine(value),
-                        "duplicated 'when' clause with line " + (origLocs.get(literal) + 1) + " is ignored");
+                var context = manager.getRuntime().getCurrentContext();
+                warning(context, "'when' clause on line " + getLine(value) +
+                        " duplicates 'when' clause on line " + (origLocs.get(literal) + 1) + " and is ignored");
                 return false;
             } else {
                 seenLiterals.add(literal);

core/src/main/java/org/jruby/ir/builder/IRBuilderAST.java

@@ -68,6 +68,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.jruby.api.Warn.warning;
 import static org.jruby.ir.builder.StringStyle.Frozen;
 import static org.jruby.ir.instructions.RuntimeHelperCall.Methods.*;
 
@@ -1195,8 +1196,9 @@ private <T extends Node & ILiteralNode> Map<java.lang.Integer, Tuple<Operand, La
                 origTable.put((int) exprLong, whenNode);
                 nodeBodies.put(whenNode, bodyLabel);
             } else {
-                getManager().getRuntime().getWarnings().warning(IRubyWarnings.ID.MISCELLANEOUS, getFileName(), expr.getLine() + 1,
-                        "duplicated 'when' clause with line " + (origTable.get((int) exprLong).getLine() + 1) + " is ignored");
+                var context = getManager().getRuntime().getCurrentContext();
+                warning(context, "'when' clause on line " + (getLine(expr) + 1) +
+                        " duplicates 'when' clause on line " + (origTable.get((int) exprLong).getLine() + 1) + " and is ignored");
             }
         }
 

core/src/main/java/org/jruby/parser/RubyParserBase.java

@@ -286,9 +286,6 @@ public Node gettable2(Node node) {
 
             if (currentScope.isBlockScope() && slot != -1) {
                 if (isNumParamId(id) && isNumParamNested()) return null;
-                if (name.getBytes().equals(lexer.getCurrentArg())) {
-                    compile_error(str(getRuntime(), "circular argument reference - ", name));
-                }
 
                 Node newNode = new DVarNode(node.getLine(), slot, name);
 
@@ -300,9 +297,6 @@ public Node gettable2(Node node) {
 
             StaticScope.Type type = currentScope.getType();
             if (type == StaticScope.Type.LOCAL) {
-                if (name.getBytes().equals(lexer.getCurrentArg())) {
-                    compile_error(str(getRuntime(), "circular argument reference - ", name));
-                }
 
                 Node newNode = new LocalVarNode(node.getLine(), slot, name);
 
@@ -388,9 +382,6 @@ public void numparam_name(ByteList name) {
 
     public Node declareIdentifier(ByteList byteName) {
         RubySymbol name = symbolID(byteName);
-        if (byteName.equals(lexer.getCurrentArg())) {
-            compile_error(str(getRuntime(), "circular argument reference - ", name));
-        }
 
         String id = name.idString();
         boolean isNumParam = isNumParamId(id);