[macruby-changes] [5124] MacRuby/trunk/MacRuby.m

[source_changes at macosforge.org]

Revision: 5124
          http://trac.macosforge.org/projects/ruby/changeset/5124
Author:   lsansonetti at apple.com
Date:     2011-01-06 16:22:34 -0800 (Thu, 06 Jan 2011)
Log Message:
-----------
fix -[MacRuby evaluateFileAtPath:] to behave like #require, so that it can also handle .rbo or .bundle files

Modified Paths:
--------------
    MacRuby/trunk/MacRuby.m

Modified: MacRuby/trunk/MacRuby.m
===================================================================
--- MacRuby/trunk/MacRuby.m	2011-01-05 22:46:43 UTC (rev 5123)
+++ MacRuby/trunk/MacRuby.m	2011-01-07 00:22:34 UTC (rev 5124)
@@ -45,8 +45,7 @@
 
 - (id)evaluateFileAtPath:(NSString *)path
 {
-    return [self evaluateString:[NSString stringWithContentsOfFile:path
-	usedEncoding:nil error:nil]];
+    return RB2OC(rb_f_require(Qnil, (VALUE)path));
 }
 
 - (id)evaluateFileAtURL:(NSURL *)URL
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20110106/454703b4/attachment.html>