enumerator, rational, and complex are considered loaded at boot.

jruby · Dec 30, 2014 · 9a73dec · 9a73dec
1 parent da135d7
commit 9a73dec
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -1694,7 +1694,6 @@ private void initBuiltins() {
         addLazyBuiltin("stringio.jar", "stringio", "org.jruby.ext.stringio.StringIOLibrary");
         addLazyBuiltin("strscan.jar", "strscan", "org.jruby.ext.strscan.StringScannerLibrary");
         addLazyBuiltin("zlib.jar", "zlib", "org.jruby.ext.zlib.ZlibLibrary");
-        addLazyBuiltin("enumerator.jar", "enumerator", "org.jruby.ext.enumerator.EnumeratorLibrary");
         addLazyBuiltin("thread.jar", "thread", "org.jruby.ext.thread.ThreadLibrary");
         addLazyBuiltin("thread.rb", "thread", "org.jruby.ext.thread.ThreadLibrary");
         addLazyBuiltin("digest.jar", "digest.so", "org.jruby.ext.digest.DigestLibrary");
@@ -1731,6 +1730,14 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
         addBuiltinIfAllowed("continuation.rb", dummy);
         addBuiltinIfAllowed("io/nonblock.rb", dummy);
 
+        // rb_provide logic, in a roundabout way
+        addLazyBuiltin("enumerator.jar", "enumerator", "org.jruby.ext.enumerator.EnumeratorLibrary");
+        loadService.require("enumerator.jar");
+        addBuiltinIfAllowed("rational.jar", dummy);
+        loadService.require("rational.jar");
+        addBuiltinIfAllowed("complex.jar", dummy);
+        loadService.require("complex.jar");
+
         if(RubyInstanceConfig.NATIVE_NET_PROTOCOL) {
             addLazyBuiltin("net/protocol.rb", "net/protocol", "org.jruby.ext.net.protocol.NetProtocolBufferedIOLibrary");
         }