[GR-26781] Cleanups related to passing keyword arguments

eregon · eregon · commit fde88d4019ab · 2020-11-27T12:04:47.000Z
PullRequest: truffleruby/2223
diff --git a/spec/ruby/language/hash_spec.rb b/spec/ruby/language/hash_spec.rb
@@ -149,6 +149,12 @@ def h.to_hash; {:b => 2, :c => 3}; end
     -> { {**obj} }.should raise_error(TypeError)
   end
 
+  it "raises a TypeError if the object does not respond to #to_hash" do
+    obj = 42
+    -> { {**obj} }.should raise_error(TypeError)
+    -> { {a: 1, **obj} }.should raise_error(TypeError)
+  end
+
   it "does not change encoding of literal string keys during creation" do
     binary_hash = HashStringsBinary.literal_hash
     utf8_hash = HashStringsUTF8.literal_hash
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -115,7 +115,6 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-
 @CoreModule("Truffle::CExt")
 public class CExtNodes {
 
diff --git a/src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java b/src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java
@@ -84,7 +84,6 @@
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "BasicObject", isClass = true)
 public abstract class BasicObjectNodes {
 
diff --git a/src/main/java/org/truffleruby/core/cast/ArrayCastNode.java b/src/main/java/org/truffleruby/core/cast/ArrayCastNode.java
@@ -25,7 +25,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE_RETURN_MISSING;
 
 /*
  * TODO(CS): could probably unify this with SplatCastNode with some final configuration getContext().getOptions().
@@ -37,8 +36,6 @@ public abstract class ArrayCastNode extends RubyContextSourceNode {
 
     private final SplatCastNode.NilBehavior nilBehavior;
 
-    @Child private DispatchNode toArrayNode = DispatchNode.create(PRIVATE_RETURN_MISSING);
-
     public static ArrayCastNode create() {
         return ArrayCastNodeGen.create(null);
     }
@@ -104,9 +101,10 @@ protected Object cast(Nil nil) {
 
     @Specialization(guards = { "!isRubyBignum(object)", "!isRubyArray(object)" })
     protected Object cast(RubyDynamicObject object,
-            @Cached BranchProfile errorProfile) {
-        final Object result = toArrayNode.call(object, "to_ary");
+            @Cached BranchProfile errorProfile,
+            @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode toArrayNode) {
 
+        final Object result = toArrayNode.call(object, "to_ary");
         if (result == nil) {
             return nil;
         }
diff --git a/src/main/java/org/truffleruby/core/cast/HashCastNode.java b/src/main/java/org/truffleruby/core/cast/HashCastNode.java
@@ -10,10 +10,7 @@
 package org.truffleruby.core.cast;
 
 import org.truffleruby.core.hash.RubyHash;
-import org.truffleruby.core.numeric.RubyBignum;
-import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyContextSourceNode;
-import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.control.RaiseException;
@@ -24,59 +21,27 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE_RETURN_MISSING;
-
-// TODO(CS): copy and paste of ArrayCastNode
-
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class HashCastNode extends RubyContextSourceNode {
 
-    @Child private DispatchNode toHashNode = DispatchNode.create(PRIVATE_RETURN_MISSING);
-
     protected abstract RubyNode getChild();
 
     @Specialization
-    protected Object cast(boolean value) {
-        return nil;
-    }
-
-    @Specialization
-    protected Object cast(int value) {
-        return nil;
-    }
-
-    @Specialization
-    protected Object cast(long value) {
-        return nil;
-    }
-
-    @Specialization
-    protected Object cast(double value) {
-        return nil;
-    }
-
-    @Specialization
-    protected Object castNil(Nil nil) {
-        return nil;
-    }
-
-    @Specialization
-    protected Object castBignum(RubyBignum value) {
-        return nil;
-    }
-
-    @Specialization
-    protected Object castHash(RubyHash hash) {
+    protected RubyHash castHash(RubyHash hash) {
         return hash;
     }
 
-    @Specialization(guards = { "!isRubyBignum(object)", "!isRubyHash(object)" })
-    protected Object cast(RubyDynamicObject object,
-            @Cached BranchProfile errorProfile) {
+    @Specialization(guards = "!isRubyHash(object)")
+    protected RubyHash cast(Object object,
+            @Cached BranchProfile errorProfile,
+            @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode toHashNode) {
         final Object result = toHashNode.call(object, "to_hash");
 
         if (result == DispatchNode.MISSING) {
-            return nil;
+            errorProfile.enter();
+            throw new RaiseException(
+                    getContext(),
+                    coreExceptions().typeErrorNoImplicitConversion(object, "Hash", this));
         }
 
         if (!RubyGuards.isRubyHash(result)) {
@@ -86,7 +51,7 @@ protected Object cast(RubyDynamicObject object,
                     coreExceptions().typeErrorCantConvertTo(object, "Hash", "to_hash", result, this));
         }
 
-        return result;
+        return (RubyHash) result;
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/core/cast/NumericToFloatNode.java b/src/main/java/org/truffleruby/core/cast/NumericToFloatNode.java
@@ -21,7 +21,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 /** Casts a value into a Ruby Float (double). */
 public abstract class NumericToFloatNode extends RubyContextNode {
 
diff --git a/src/main/java/org/truffleruby/core/cast/ToAryNode.java b/src/main/java/org/truffleruby/core/cast/ToAryNode.java
@@ -15,18 +15,14 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class ToAryNode extends RubyContextSourceNode {
 
-    @Child private DispatchNode toAryNode;
-
     public static ToAryNode createInternal() {
         return ToAryNodeGen.create(null);
     }
@@ -40,12 +36,8 @@ protected RubyArray coerceRubyArray(RubyArray array) {
 
     @Specialization(guards = "!isRubyArray(object)")
     protected RubyArray coerceObject(Object object,
-            @Cached BranchProfile errorProfile) {
-        if (toAryNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            toAryNode = insert(DispatchNode.create());
-        }
-
+            @Cached BranchProfile errorProfile,
+            @Cached DispatchNode toAryNode) {
         final Object coerced;
         try {
             coerced = toAryNode.call(object, "to_ary");
diff --git a/src/main/java/org/truffleruby/core/cast/ToStringOrSymbolNode.java b/src/main/java/org/truffleruby/core/cast/ToStringOrSymbolNode.java
@@ -25,7 +25,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import org.truffleruby.language.library.RubyStringLibrary;
 
-
 /** Convert objects to a String by calling #to_str, but leave existing Strings or Symbols as they are. */
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class ToStringOrSymbolNode extends RubyContextSourceNode {
diff --git a/src/main/java/org/truffleruby/core/format/convert/ToDoubleWithCoercionNode.java b/src/main/java/org/truffleruby/core/format/convert/ToDoubleWithCoercionNode.java
@@ -17,7 +17,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-
 @NodeChild("value")
 public abstract class ToDoubleWithCoercionNode extends FormatNode {
 
diff --git a/src/main/java/org/truffleruby/core/format/convert/ToIntegerNode.java b/src/main/java/org/truffleruby/core/format/convert/ToIntegerNode.java
@@ -18,7 +18,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-
 @NodeChild("value")
 public abstract class ToIntegerNode extends FormatNode {
 
diff --git a/src/main/java/org/truffleruby/core/format/read/array/ReadHashValueNode.java b/src/main/java/org/truffleruby/core/format/read/array/ReadHashValueNode.java
@@ -22,7 +22,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @NodeChild(value = "source", type = SourceNode.class)
 public abstract class ReadHashValueNode extends FormatNode {
 
diff --git a/src/main/java/org/truffleruby/core/hash/HashNodes.java b/src/main/java/org/truffleruby/core/hash/HashNodes.java
@@ -53,7 +53,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "Hash", isClass = true)
 public abstract class HashNodes {
 
diff --git a/src/main/java/org/truffleruby/core/klass/ClassNodes.java b/src/main/java/org/truffleruby/core/klass/ClassNodes.java
@@ -41,7 +41,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-
 @CoreModule(value = "Class", isClass = true)
 public abstract class ClassNodes {
 
diff --git a/src/main/java/org/truffleruby/core/module/ModuleNodes.java b/src/main/java/org/truffleruby/core/module/ModuleNodes.java
@@ -126,7 +126,6 @@
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-
 @CoreModule(value = "Module", isClass = true)
 public abstract class ModuleNodes {
 
diff --git a/src/main/java/org/truffleruby/core/numeric/FloatNodes.java b/src/main/java/org/truffleruby/core/numeric/FloatNodes.java
@@ -41,7 +41,6 @@
 
 import java.util.Locale;
 
-
 @CoreModule(value = "Float", isClass = true)
 public abstract class FloatNodes {
 
diff --git a/src/main/java/org/truffleruby/core/numeric/IntegerNodes.java b/src/main/java/org/truffleruby/core/numeric/IntegerNodes.java
@@ -58,7 +58,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "Integer", isClass = true)
 public abstract class IntegerNodes {
 
diff --git a/src/main/java/org/truffleruby/core/objectspace/ObjectSpaceNodes.java b/src/main/java/org/truffleruby/core/objectspace/ObjectSpaceNodes.java
@@ -42,7 +42,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 @CoreModule("ObjectSpace")
 public abstract class ObjectSpaceNodes {
 
diff --git a/src/main/java/org/truffleruby/core/range/RangeNodes.java b/src/main/java/org/truffleruby/core/range/RangeNodes.java
@@ -47,7 +47,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "Range", isClass = true)
 public abstract class RangeNodes {
 
diff --git a/src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java b/src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java
@@ -59,7 +59,6 @@
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.objects.AllocationTracing;
 
-
 @CoreModule("Truffle::RegexpOperations")
 public class TruffleRegexpNodes {
 
diff --git a/src/main/java/org/truffleruby/core/string/StringNodes.java b/src/main/java/org/truffleruby/core/string/StringNodes.java
@@ -199,7 +199,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "String", isClass = true)
 public abstract class StringNodes {
 
diff --git a/src/main/java/org/truffleruby/language/TruffleBootNodes.java b/src/main/java/org/truffleruby/language/TruffleBootNodes.java
@@ -52,7 +52,6 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.llvm.api.Toolchain;
 
-
 @CoreModule("Truffle::Boot")
 public abstract class TruffleBootNodes {
 
diff --git a/src/main/java/org/truffleruby/language/exceptions/RescueNode.java b/src/main/java/org/truffleruby/language/exceptions/RescueNode.java
@@ -26,7 +26,6 @@
 import com.oracle.truffle.api.instrumentation.ProbeNode;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 @GenerateWrapper
 public abstract class RescueNode extends RubyContextSourceNode {
 
diff --git a/src/main/java/org/truffleruby/parser/BodyTranslator.java b/src/main/java/org/truffleruby/parser/BodyTranslator.java
@@ -692,7 +692,7 @@ protected ArgumentsAndBlockTranslation translateArgumentsAndBlock(SourceIndexLen
         }
 
         // If the last argument is a splat, do not copy the array, to support m(*args, &args.pop)
-        if (isSplatted && argumentsTranslated.length > 0) {
+        if (isSplatted) {
             final RubyNode last = argumentsTranslated[argumentsTranslated.length - 1];
             if (last instanceof SplatCastNode) {
                 ((SplatCastNode) last).doNotCopy();
@@ -716,8 +716,8 @@ protected ArgumentsAndBlockTranslation translateArgumentsAndBlock(SourceIndexLen
             frameOnStackMarkerSlot = null;
         } else if (iterNode != null) {
             frameOnStackMarkerSlot = environment.declareVar(environment.allocateLocalTemp("frame_on_stack_marker"));
-            frameOnStackMarkerSlotStack.push(frameOnStackMarkerSlot);
 
+            frameOnStackMarkerSlotStack.push(frameOnStackMarkerSlot);
             try {
                 blockTranslated = iterNode.accept(this);
             } finally {
@@ -1614,16 +1614,23 @@ public RubyNode visitGlobalVarNode(GlobalVarParseNode node) {
     public RubyNode visitHashNode(HashParseNode node) {
         final SourceIndexLength sourceSection = node.getPosition();
 
-        final List<RubyNode> hashConcats = new ArrayList<>();
+        if (node.isEmpty()) { // an empty Hash literal like h = {}
+            final RubyNode ret = HashLiteralNode.create(language, RubyNode.EMPTY_ARRAY);
+            ret.unsafeSetSourceSection(sourceSection);
+            return addNewlineIfNeeded(node, ret);
+        }
 
+        final List<RubyNode> hashConcats = new ArrayList<>();
         final List<RubyNode> keyValues = new ArrayList<>();
 
         for (ParseNodeTuple pair : node.getPairs()) {
             if (pair.getKey() == null) {
                 // This null case is for splats {a: 1, **{b: 2}, c: 3}
-                final RubyNode hashLiteralSoFar = HashLiteralNode
-                        .create(language, keyValues.toArray(RubyNode.EMPTY_ARRAY));
-                hashConcats.add(hashLiteralSoFar);
+                if (!keyValues.isEmpty()) {
+                    final RubyNode hashLiteralSoFar = HashLiteralNode
+                            .create(language, keyValues.toArray(RubyNode.EMPTY_ARRAY));
+                    hashConcats.add(hashLiteralSoFar);
+                }
                 hashConcats.add(HashCastNodeGen.create(pair.getValue().accept(this)));
                 keyValues.clear();
             } else {
@@ -1637,8 +1644,10 @@ public RubyNode visitHashNode(HashParseNode node) {
             }
         }
 
-        final RubyNode hashLiteralSoFar = HashLiteralNode.create(language, keyValues.toArray(RubyNode.EMPTY_ARRAY));
-        hashConcats.add(hashLiteralSoFar);
+        if (!keyValues.isEmpty()) {
+            final RubyNode hashLiteralSoFar = HashLiteralNode.create(language, keyValues.toArray(RubyNode.EMPTY_ARRAY));
+            hashConcats.add(hashLiteralSoFar);
+        }
 
         if (hashConcats.size() == 1) {
             final RubyNode ret = hashConcats.get(0);
diff --git a/src/main/java/org/truffleruby/parser/ast/HashParseNode.java b/src/main/java/org/truffleruby/parser/ast/HashParseNode.java
@@ -39,8 +39,8 @@
 import org.truffleruby.parser.ast.visitor.NodeVisitor;
 import org.truffleruby.parser.parser.ParseNodeTuple;
 
-/** A Literal Hash that can represent either a {a=&amp;b, c=&amp;d} type expression or the list of default values in a
- * method call. */
+/** A Literal Hash that can represent either a {a=&amp;b, c=&amp;d} type expression or keyword arguments passed in a
+ * method call (foo(k: value), foo(**kw) or a mix of both). */
 public class HashParseNode extends ParseNode implements ILiteralNode {
     private final List<ParseNodeTuple> pairs;
 
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -2444,7 +2444,7 @@ def format_imports
       each_file do |content|
         content
           .sub(/\n{3,}import /, "\n\nimport ")
-          .sub(/^(import .+;)\n{3,}public/, "\\1\n\npublic")
+          .sub(/^(import .+;)\n{3,}((?:(?:@|\/\/|\/\*).+\n)*)public/, "\\1\n\n\\2public")
       end
     end
 
