Fiber ext was moved into core in 3.0

headius · Oct 25, 2023 · 2779806 · 2779806
1 parent fbce6e2
commit 2779806
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -591,6 +591,7 @@ private void initBootLibraries() {
         loadService.provide("rational.rb");
         loadService.provide("complex.rb");
         loadService.provide("thread.rb");
+        loadService.provide("fiber.rb");
         loadService.provide("ruby2_keywords.rb");
 
         // Load preludes

diff --git a/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java b/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
@@ -305,7 +305,7 @@ private static void handleExceptionDuringExchange(ThreadContext context, FiberDa
     }
 
     @JRubyMethod(rest = true)
-    public IRubyObject __transfer__(ThreadContext context, IRubyObject[] values) {
+    public IRubyObject transfer(ThreadContext context, IRubyObject[] values) {
         Ruby runtime = context.runtime;
 
         final FiberData data = this.data;
@@ -455,13 +455,13 @@ private static FiberData verifyCurrentFiber(ThreadContext context, Ruby runtime)
         return currentFiberData;
     }
 
-    @JRubyMethod
-    public IRubyObject __alive__(ThreadContext context) {
+    @JRubyMethod(name = "alive?")
+    public IRubyObject alive_p(ThreadContext context) {
         return RubyBoolean.newBoolean(context, alive());
     }
 
     @JRubyMethod(meta = true)
-    public static IRubyObject __current__(ThreadContext context, IRubyObject recv) {
+    public static IRubyObject current(ThreadContext context, IRubyObject recv) {
         return context.getFiber();
     }
 

diff --git a/core/src/main/ruby/jruby/kernel/enumerator.rb b/core/src/main/ruby/jruby/kernel/enumerator.rb
@@ -98,7 +98,7 @@ def next?
     end
 
     def next
-      reset unless @fiber&.__alive__
+      reset unless @fiber&.alive?
 
       val = @fiber.resume
 
@@ -109,7 +109,7 @@ def next
 
     def rewind
       fiber, @fiber = @fiber, nil
-      fiber.send(:__finalize__) if fiber&.__alive__
+      fiber.send(:__finalize__) if fiber&.alive?
       @state.done = false
     end
 

diff --git a/lib/ruby/stdlib/fiber.rb b/lib/ruby/stdlib/fiber.rb