[GR-20446] Implement rb_backref_set

PullRequest: truffleruby/2694

Author: bjfish

CHANGELOG.md

@@ -33,6 +33,7 @@ Compatibility:
 * Implemented `Enumerator::Lazy#filter_map` (#2356).
 * Fix LLVM toolchain issue on macOS 10.13 (#2352, [oracle/graal#3383](https://github.com/oracle/graal/issues/3383)).
 * Implemented `Enumerator::Lazy#with_index` (#2356).
+* Implement `rb_backref_set`.
 
 Performance:
 

lib/cext/ABI_version.txt

@@ -1 +1 @@
-1
+2

lib/truffle/truffle/cext.rb

@@ -1738,6 +1738,10 @@ def rb_backref_get
     Primitive.regexp_last_match_get(Truffle::ThreadOperations.ruby_caller_special_variables([Truffle::CExt, Truffle::Interop.singleton_class]))
   end
 
+  def rb_backref_set(value)
+    Truffle::RegexpOperations::LAST_MATCH_SET.call(value, Truffle::ThreadOperations.ruby_caller_special_variables([Truffle::CExt, Truffle::Interop.singleton_class]))
+  end
+
   def rb_gv_set(name, value)
     binding.eval("#{name} = value")
   end

spec/ruby/optional/capi/ext/regexp_spec.c

@@ -35,6 +35,11 @@ VALUE regexp_spec_backref_get(VALUE self) {
   return rb_backref_get();
 }
 
+static VALUE regexp_spec_backref_set(VALUE self, VALUE backref) {
+  rb_backref_set(backref);
+  return Qnil;
+}
+
 VALUE regexp_spec_reg_match_backref_get(VALUE self, VALUE re, VALUE str) {
   rb_reg_match(re, str);
   return rb_backref_get();
@@ -51,6 +56,7 @@ void Init_regexp_spec(void) {
   rb_define_method(cls, "a_re_1st_match", regexp_spec_reg_1st_match, 1);
   rb_define_method(cls, "rb_reg_match", regexp_spec_reg_match, 2);
   rb_define_method(cls, "rb_backref_get", regexp_spec_backref_get, 0);
+  rb_define_method(cls, "rb_backref_set", regexp_spec_backref_set, 1);
   rb_define_method(cls, "rb_reg_match_backref_get", regexp_spec_reg_match_backref_get, 2);
   rb_define_method(cls, "rb_reg_options", regexp_spec_rb_reg_options, 1);
   rb_define_method(cls, "rb_reg_regcomp", regexp_spec_rb_reg_regcomp, 1);

spec/ruby/optional/capi/regexp_spec.rb

@@ -80,4 +80,33 @@
        @p.rb_reg_match_backref_get(/a/, 'ab')[0].should == 'a'
     end
   end
+
+  describe "rb_backref_set" do
+    before :each do
+      @md = "foo".match(/foo/)
+      $~ = nil
+    end
+
+    it "sets the value of $~" do
+      @p.rb_backref_set(@md)
+      @p.rb_backref_get.should == @md
+      $~.should == @md
+    end
+
+    it "sets a Thread-local value" do
+      running = false
+
+      thr = Thread.new do
+        @p.rb_backref_set(@md)
+        @p.rb_backref_get.should == @md
+        $~.should == @md
+        running = true
+      end
+
+      Thread.pass while thr.status and !running
+      $~.should be_nil
+
+      thr.join
+    end
+  end
 end

src/main/c/cext/regexp.c

@@ -15,6 +15,10 @@ VALUE rb_backref_get(void) {
   return RUBY_CEXT_INVOKE("rb_backref_get");
 }
 
+void rb_backref_set(VALUE str) {
+  RUBY_CEXT_INVOKE("rb_backref_set", str);
+}
+
 VALUE rb_reg_match_pre(VALUE match) {
   return RUBY_CEXT_INVOKE("rb_reg_match_pre", match);
 }

src/main/ruby/truffleruby/core/regexp.rb

@@ -363,12 +363,7 @@ def to_s
 Truffle::KernelOperations.define_hooked_variable(
   :$~,
   -> s { Primitive.regexp_last_match_get(s) },
-  -> v, s {
-    unless Primitive.nil?(v) || Primitive.object_kind_of?(v, MatchData)
-      raise TypeError, "Wrong argument type #{v} (expected MatchData)"
-    end
-    Primitive.regexp_last_match_set(s, v)
-  })
+  Truffle::RegexpOperations::LAST_MATCH_SET)
 
 Truffle::KernelOperations.define_hooked_variable(
   :'$`',

src/main/ruby/truffleruby/core/truffle/regexp_operations.rb

@@ -11,6 +11,14 @@
 module Truffle
   module RegexpOperations
 
+    LAST_MATCH_SET = -> v, s {
+      unless Primitive.nil?(v) || Primitive.object_kind_of?(v, MatchData)
+        raise TypeError, "Wrong argument type #{v} (expected MatchData)"
+      end
+      Primitive.regexp_last_match_set(s, v)
+    }
+
+
     def self.search_region(re, str, start_index, end_index, forward)
       raise TypeError, 'uninitialized regexp' unless Primitive.regexp_initialized?(re)
       raise ArgumentError, "invalid byte sequence in #{str.encoding}" unless str.valid_encoding?