Permalink
Browse files

rewrote the file loader (it was really time) + fixed a few minor things

git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@2557 23306eb0-4c56-4727-a40e-e92c0eb68959
  • Loading branch information...
lrz committed Sep 17, 2009
1 parent 3f83ae8 commit a3913dd8cbb64953a15114363c2ada30b13e3b8b
Showing with 131 additions and 364 deletions.
  1. +0 −2 enumerator.c
  2. +0 −2 include/ruby/intern.h
  3. +1 −0 lib/enumerator.rb
  4. +1 −0 lib/rubygems.rb
  5. +5 −3 lib/rubygems/source_index.rb
  6. +124 −357 load.c
View
@@ -469,6 +469,4 @@ Init_Enumerator(void)
rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
sym_each = ID2SYM(rb_intern("each"));
-
- rb_provide("enumerator.so"); /* for backward compatibility */
}
View
@@ -269,10 +269,8 @@ VALUE rb_apply(VALUE, ID, VALUE);
void rb_backtrace(void);
ID rb_frame_this_func(void);
void rb_load(VALUE, int);
-void rb_load_protect(VALUE, int, int*);
NORETURN(void rb_jump_tag(int));
int rb_provided(const char*);
-void rb_provide(const char*);
VALUE rb_f_require(VALUE, VALUE);
VALUE rb_require_safe(VALUE, int);
VALUE rb_obj_call_init(VALUE, int, VALUE*);
View
@@ -0,0 +1 @@
+# Enumerator is builtin in core, this file exists for backward compatibility.
View
@@ -882,6 +882,7 @@ def datadir(package_name)
require 'rubygems/config_file'
+# MacRuby requires this hack.
#if RUBY_VERSION < '1.9' then
require 'rubygems/custom_require'
#end
@@ -7,9 +7,11 @@
require 'rubygems'
require 'rubygems/user_interaction'
require 'rubygems/specification'
-module Gem
- autoload(:SpecFetcher, 'rubygems/spec_fetcher')
-end
+# MacRuby doesn't support autoload yet.
+#module Gem
+# autoload(:SpecFetcher, 'rubygems/spec_fetcher')
+#end
+require 'rubygems/spec_fetcher'
##
# The SourceIndex object indexes all the gems available from a
Oops, something went wrong.

0 comments on commit a3913dd

Please sign in to comment.