Adopt splitting KeywordParameterNode class into Required and Optional

Author: andrykonchin

src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java

@@ -119,7 +119,7 @@ private RubyNode translateWithParameters() {
 
         if (hasKeywordArguments()) {
             for (var node : parametersNode.keywords) {
-                sequence.add(node.accept(this)); // Nodes.KeywordParameterNode is expected here
+                sequence.add(node.accept(this)); // Nodes.RequiredKeywordParameterNode/Nodes.OptionalKeywordParameterNode are expected here
             }
         }
 
@@ -173,6 +173,14 @@ public RubyNode visitMultiTargetNode(Nodes.MultiTargetNode node) {
         return rubyNode;
     }
 
+    public RubyNode visitRequiredKeywordParameterNode(Nodes.RequiredKeywordParameterNode node) {
+        final int slot = environment.declareVar(node.name);
+        final var name = language.getSymbol(node.name);
+        final var readNode = ReadKeywordArgumentNode.create(name, null);
+
+        return new WriteLocalVariableNode(slot, readNode);
+    }
+
     public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
         final RubyNode readNode;
 
@@ -194,6 +202,15 @@ public RubyNode visitRequiredParameterNode(Nodes.RequiredParameterNode node) {
         return new WriteLocalVariableNode(slot, readNode);
     }
 
+    public RubyNode visitOptionalKeywordParameterNode(Nodes.OptionalKeywordParameterNode node) {
+        final int slot = environment.declareVar(node.name);
+        final var name = language.getSymbol(node.name);
+        final var value = node.value.accept(this);
+        final var readNode = ReadKeywordArgumentNode.create(name, value);
+
+        return new WriteLocalVariableNode(slot, readNode);
+    }
+
     public RubyNode visitOptionalParameterNode(Nodes.OptionalParameterNode node) {
         final RubyNode readNode;
         final RubyNode defaultValue = node.value.accept(this);
@@ -221,20 +238,6 @@ public RubyNode visitRestParameterNode(Nodes.RestParameterNode node) {
         return new WriteLocalVariableNode(slot, readNode);
     }
 
-    public RubyNode visitKeywordParameterNode(Nodes.KeywordParameterNode node) {
-        final int slot = environment.declareVar(node.name);
-        final RubyNode defaultValue;
-
-        if (node.value != null) {
-            defaultValue = yarpTranslator.translateNodeOrNil(node.value);
-        } else {
-            defaultValue = null;
-        }
-
-        final RubyNode readNode = ReadKeywordArgumentNode.create(language.getSymbol(node.name), defaultValue);
-        return new WriteLocalVariableNode(slot, readNode);
-    }
-
     public RubyNode visitKeywordRestParameterNode(Nodes.KeywordRestParameterNode node) {
         final RubyNode readNode = new ReadKeywordRestArgumentNode(language, arity);
         final String name = (node.name != null) ? node.name : YARPDefNodeTranslator.DEFAULT_KEYWORD_REST_NAME;

src/main/java/org/truffleruby/parser/YARPTranslator.java

@@ -2272,9 +2272,15 @@ private ArgumentDescriptor[] parametersNodeToArgumentDescriptors(Nodes.Parameter
         }
 
         for (var node : parametersNode.keywords) {
-            var keywordParameterNode = (Nodes.KeywordParameterNode) node;
-            var type = (keywordParameterNode.value == null) ? ArgumentType.keyreq : ArgumentType.key;
-            var descriptor = new ArgumentDescriptor(type, keywordParameterNode.name);
+            final ArgumentDescriptor descriptor;
+
+            if (node instanceof Nodes.RequiredKeywordParameterNode required) {
+                descriptor = new ArgumentDescriptor(ArgumentType.keyreq, required.name);
+            } else if (node instanceof Nodes.OptionalKeywordParameterNode optional) {
+                descriptor = new ArgumentDescriptor(ArgumentType.key, optional.name);
+            } else {
+                throw CompilerDirectives.shouldNotReachHere();
+            }
 
             descriptors.add(descriptor);
         }
@@ -2319,13 +2325,12 @@ private Arity createArity(Nodes.ParametersNode parametersNode) {
             final List<String> optionalKeywords = new ArrayList<>();
 
             for (var node : parametersNode.keywords) {
-                final var keywordParameterNode = (Nodes.KeywordParameterNode) node;
-                final String name = keywordParameterNode.name;
-
-                if (keywordParameterNode.value == null) {
-                    requiredKeywords.add(name);
+                if (node instanceof Nodes.RequiredKeywordParameterNode required) {
+                    requiredKeywords.add(required.name);
+                } else if (node instanceof Nodes.OptionalKeywordParameterNode optional) {
+                    optionalKeywords.add(optional.name);
                 } else {
-                    optionalKeywords.add(name);
+                    throw CompilerDirectives.shouldNotReachHere();
                 }
             }