[macruby-changes] [2219] MacRuby/branches/experimental/io.c

[source_changes at macosforge.org]

Revision: 2219
          http://trac.macosforge.org/projects/ruby/changeset/2219
Author:   lsansonetti at apple.com
Date:     2009-08-05 02:11:23 -0700 (Wed, 05 Aug 2009)
Log Message:
-----------
fixed the warning so that it only happens for pure IO subclasses

Modified Paths:
--------------
    MacRuby/branches/experimental/io.c

Modified: MacRuby/branches/experimental/io.c
===================================================================
--- MacRuby/branches/experimental/io.c	2009-08-05 05:46:43 UTC (rev 2218)
+++ MacRuby/branches/experimental/io.c	2009-08-05 09:11:23 UTC (rev 2219)
@@ -2970,10 +2970,21 @@
 rb_io_s_new(VALUE klass, SEL sel, int argc, VALUE *argv)
 {
     if (rb_block_given_p()) {
-	const char *cname = rb_class2name(klass);
+	VALUE k = klass;
+	bool is_io = true;
+	while (k != 0) {
+	    if (k == rb_cFile) {
+		is_io = false;
+		break;
+	    }
+	    k = RCLASS_SUPER(k);
+	}
+	if (is_io) {
+	    const char *cname = rb_class2name(klass);
 
-	rb_warn("%s::new() does not take block; use %s::open() instead",
-		cname, cname);
+	    rb_warn("%s::new() does not take block; use %s::open() instead",
+		    cname, cname);
+	}
     }
     return rb_class_new_instance(argc, argv, klass);
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090805/5e470c74/attachment.html>