Remove keywordAsOptional functionality

Author: chrisseaton

src/annotations/java/org/truffleruby/builtins/CoreMethod.java

@@ -47,10 +47,6 @@
 
     int optional() default 0;
 
-    /** Declares that a keyword argument with this name will be passed into the method as if it was an extra trailing
-     * positional optional argument. */
-    String keywordAsOptional() default "";
-
     boolean rest() default false;
 
     boolean needsBlock() default false;

src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java

@@ -36,9 +36,7 @@
 import org.truffleruby.language.methods.Split;
 import org.truffleruby.language.Visibility;
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
-import org.truffleruby.language.arguments.NotProvidedNode;
 import org.truffleruby.language.arguments.ReadBlockFromCurrentFrameArgumentsNode;
-import org.truffleruby.language.arguments.ReadKeywordArgumentNode;
 import org.truffleruby.language.arguments.ReadPreArgumentNode;
 import org.truffleruby.language.arguments.ReadRemainingArgumentsNode;
 import org.truffleruby.language.arguments.ReadSelfNode;
@@ -132,14 +130,7 @@ private void addCoreMethod(RubyModule module, MethodDetails methodDetails) {
         final Visibility visibility = annotation.visibility();
         verifyUsage(module, methodDetails, annotation, visibility);
 
-        final String keywordAsOptional = annotation.keywordAsOptional().isEmpty()
-                ? null
-                : annotation.keywordAsOptional();
-        final Arity arity = createArity(
-                annotation.required(),
-                annotation.optional(),
-                annotation.rest(),
-                keywordAsOptional);
+        final Arity arity = new Arity(annotation.required(), annotation.optional(), annotation.rest());
         final NodeFactory<? extends RubyBaseNode> nodeFactory = methodDetails.getNodeFactory();
         final boolean onSingleton = annotation.onSingleton() || annotation.constructor();
         final boolean isModuleFunc = annotation.isModuleFunction();
@@ -173,11 +164,10 @@ public void addLazyCoreMethod(
             int required,
             int optional,
             boolean rest,
-            String keywordAsOptional,
             String... names) {
 
         final RubyModule module = getModule(moduleName, isClass);
-        final Arity arity = createArity(required, optional, rest, keywordAsOptional);
+        final Arity arity = new Arity(required, optional, rest);
         final Split finalSplit;
         if (alwaysInlined) {
             finalSplit = Split.NEVER;
@@ -317,12 +307,6 @@ private static SharedMethodInfo makeSharedMethodInfo(String moduleName, boolean
                 null);
     }
 
-    private static Arity createArity(int required, int optional, boolean rest, String keywordAsOptional) {
-        return keywordAsOptional == null
-                ? new Arity(required, optional, rest)
-                : new Arity(required, optional, rest, 0, new String[]{ keywordAsOptional }, true, false);
-    }
-
     public RootCallTarget createCoreMethodRootNode(NodeFactory<? extends RubyBaseNode> nodeFactory,
             RubyLanguage language, SharedMethodInfo sharedMethodInfo, Split split, CoreMethod method) {
 
@@ -372,18 +356,6 @@ public RootCallTarget createCoreMethodRootNode(NodeFactory<? extends RubyBaseNod
             argumentsNodes[i++] = new ReadBlockFromCurrentFrameArgumentsNode();
         }
 
-        if (!method.keywordAsOptional().isEmpty()) {
-            if (optional > 0) {
-                throw new UnsupportedOperationException(
-                        "core method has been declared with both optional arguments and a keyword-as-optional argument");
-            }
-
-            argumentsNodes[i++] = ReadKeywordArgumentNode.create(
-                    required,
-                    language.getSymbol(method.keywordAsOptional()),
-                    new NotProvidedNode());
-        }
-
         RubyNode node = (RubyNode) createNodeFromFactory(nodeFactory, argumentsNodes);
         RubyNode methodNode = transformResult(method, node);
 

src/processor/java/org/truffleruby/processor/CoreModuleProcessor.java

@@ -285,10 +285,6 @@ private void processCoreMethod(
                 coreMethod.required() + ", " +
                 coreMethod.optional() + ", " +
                 coreMethod.rest() + ", " +
-                (coreMethod.keywordAsOptional().isEmpty()
-                        ? "null"
-                        : quote(coreMethod.keywordAsOptional())) +
-                ", " +
                 names + ");");
 
         final boolean hasSelfArgument = !coreMethod.onSingleton() && !coreMethod.constructor() &&
@@ -338,10 +334,6 @@ private void processCoreMethod(
                 args.add("*" + argumentNames.get(index));
                 index++;
             }
-            if (!coreMethod.keywordAsOptional().isEmpty()) {
-                // TODO (pitr-ch 03-Oct-2019): check interaction with names, or remove it
-                args.add(coreMethod.keywordAsOptional() + ": :unknown_default_value");
-            }
             if (coreMethod.needsBlock()) {
                 args.add("&" + argumentNames.get(index));
             }