[GR-45621] Implement the Data class from Ruby 3.2 (#3341)

PullRequest: truffleruby/4081

Author: eregon

CHANGELOG.md

@@ -27,6 +27,7 @@ Compatibility:
 * Display "unhandled exception" as the message for `RuntimeError` instances with an empty message (#3255, @nirvdrum).
 * Set `RbConfig::CONFIG['configure_args']` for openssl and libyaml (#3170, #3303, @eregon).
 * Support `Socket.sockaddr_in(port, Socket::INADDR_ANY)` (#3361, @mtortonesi).
+* Implement the `Data` class from Ruby 3.2 (#3039, @moste00, @eregon).
 
 Performance:
 

lib/mri/pp.rb

@@ -419,7 +419,7 @@ def pretty_print_cycle(q) # :nodoc:
 class Data # :nodoc:
   def pretty_print(q) # :nodoc:
     q.group(1, sprintf("#<data %s", PP.mcall(self, Kernel, :class).name), '>') {
-      q.seplist(PP.mcall(self, Data, :members), lambda { q.text "," }) {|member|
+      q.seplist(PP.mcall(self, Kernel, :class).members, lambda { q.text "," }) {|member|
         q.breakable
         q.text member.to_s
         q.text '='

lib/truffle/socket/ifaddr.rb

@@ -28,7 +28,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class Socket < BasicSocket
-  class Ifaddr < Data
+  class Ifaddr
     attr_reader :addr, :broadaddr, :dstaddr, :flags, :ifindex, :name, :netmask
 
     def initialize(addr: nil, broadaddr: nil, dstaddr: nil, flags: nil, ifindex: nil, name: nil, netmask: nil)

lib/truffle/truffle/cext.rb

@@ -107,6 +107,7 @@ module Truffle::CExt
   RUBY_FIXNUM_MAX = (1 << 62) - 1
 
   # This list of types is derived from MRI's error.c builtin_types array.
+  # It has the same indices as the ruby_value_type enum.
   BUILTIN_TYPES = [
     '',
     'Object',
@@ -342,8 +343,6 @@ def rb_tr_find_type(value)
       T_FIXNUM
     when Time
       T_DATA
-    when Data
-      T_DATA
     when BasicObject
       # See #rb_tr_cached_type, the final type must be calculated for each object.
       T_NONE

spec/ruby/core/data/initialize_spec.rb

@@ -31,6 +31,13 @@
       data.unit.should == "km"
     end
 
+    it "accepts String keyword arguments" do
+      data = DataSpecs::Measure.new("amount" => 42, "unit" => "km")
+
+      data.amount.should == 42
+      data.unit.should == "km"
+    end
+
     it "raises ArgumentError if no arguments are given" do
       -> {
         DataSpecs::Measure.new

spec/ruby/core/data/with_spec.rb

@@ -0,0 +1,35 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+ruby_version_is "3.2" do
+  describe "Data#with" do
+    it "returns self if given no arguments" do
+      data = DataSpecs::Measure.new(amount: 42, unit: "km")
+      data = data.with.should.equal?(data)
+    end
+
+    it "accepts keyword arguments" do
+      data = DataSpecs::Measure.new(amount: 42, unit: "km")
+      data = data.with(amount: 4, unit: "m")
+
+      data.amount.should == 4
+      data.unit.should == "m"
+    end
+
+    it "accepts String keyword arguments" do
+      data = DataSpecs::Measure.new(amount: 42, unit: "km")
+      data = data.with("amount" => 4, "unit" => "m")
+
+      data.amount.should == 4
+      data.unit.should == "m"
+    end
+
+    it "raises ArgumentError if no keyword arguments are given" do
+      data = DataSpecs::Measure.new(amount: 42, unit: "km")
+
+      -> {
+        data.with(4, "m")
+      }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 0)")
+    end
+  end
+end

spec/tags/core/data/define_tags.txt

@@ -1188,6 +1188,16 @@ int sourceLine() {
 
     }
 
+    @CoreMethod(names = "rb_is_local_id", onSingleton = true, required = 1)
+    public abstract static class IsLocalIdNode extends CoreMethodArrayArgumentsNode {
+
+        @Specialization
+        boolean isLocalId(RubySymbol symbol) {
+            return symbol.getType() == IdentifierType.LOCAL;
+        }
+
+    }
+
     @CoreMethod(names = "rb_is_instance_id", onSingleton = true, required = 1)
     public abstract static class IsInstanceIdNode extends CoreMethodArrayArgumentsNode {
 

spec/tags/core/data/initialize_tags.txt

@@ -389,7 +389,6 @@ public CoreLibrary(RubyContext context, RubyLanguage language) {
         arrayClass = defineClass("Array");
         bindingClass = defineClass("Binding");
         defineClass("ConditionVariable");
-        defineClass("Data"); // Needed by Socket::Ifaddr and defined in core MRI
         dirClass = defineClass("Dir");
         encodingClass = defineClass("Encoding");
         enumeratorClass = defineClass("Enumerator");
@@ -1048,9 +1047,10 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
             "/core/truffle/polyglot.rb",
             "/core/truffle/polyglot_methods.rb",
             "/core/posix.rb",
+            "/core/data.rb",
+            "/core/truffle/queue_operations.rb",
             "/core/main.rb",
             "/core/post.rb",
-            "/core/truffle/queue_operations.rb",
             POST_BOOT_FILE
     };