<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2097] MacRuby/branches/experimental</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/ruby/changeset/2097">2097</a></dd>
<dt>Author</dt> <dd>lsansonetti@apple.com</dd>
<dt>Date</dt> <dd>2009-07-26 23:10:21 -0700 (Sun, 26 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>IO#write: if the receiver isn't an IO object, dispatches the write: selector on it instead</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalidc">MacRuby/branches/experimental/id.c</a></li>
<li><a href="#MacRubybranchesexperimentalidh">MacRuby/branches/experimental/id.h</a></li>
<li><a href="#MacRubybranchesexperimentalioc">MacRuby/branches/experimental/io.c</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalidc"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/id.c (2096 => 2097)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/id.c        2009-07-27 06:09:53 UTC (rev 2096)
+++ MacRuby/branches/experimental/id.c        2009-07-27 06:10:21 UTC (rev 2097)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx">     selMethodAdded = sel_registerName(&quot;method_added:&quot;);
</span><span class="cx">     selSingletonMethodAdded = sel_registerName(&quot;singleton_method_added:&quot;);
</span><span class="cx">     selIsEqual = sel_registerName(&quot;isEqual:&quot;);
</span><ins>+    selWrite = sel_registerName(&quot;write:&quot;);
</ins><span class="cx"> 
</span><span class="cx">     cacheEach = rb_vm_get_call_cache(selEach);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="MacRubybranchesexperimentalidh"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/id.h (2096 => 2097)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/id.h        2009-07-27 06:09:53 UTC (rev 2096)
+++ MacRuby/branches/experimental/id.h        2009-07-27 06:10:21 UTC (rev 2097)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> extern SEL selMethodAdded;
</span><span class="cx"> extern SEL selSingletonMethodAdded;
</span><span class="cx"> extern SEL selIsEqual;
</span><ins>+extern SEL selWrite;
</ins><span class="cx"> extern ID idIncludedModules;
</span><span class="cx"> extern ID idIncludedInClasses;
</span><span class="cx"> extern ID idAncestors;
</span></span></pre></div>
<a id="MacRubybranchesexperimentalioc"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/io.c (2096 => 2097)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/io.c        2009-07-27 06:09:53 UTC (rev 2096)
+++ MacRuby/branches/experimental/io.c        2009-07-27 06:10:21 UTC (rev 2097)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> #include &quot;ruby/node.h&quot;
</span><span class="cx"> #include &quot;vm.h&quot;
</span><span class="cx"> #include &quot;objc.h&quot;
</span><ins>+#include &quot;id.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> #include &lt;errno.h&gt;
</span><span class="cx"> #include &lt;paths.h&gt;
</span><span class="lines">@@ -85,6 +86,12 @@
</span><span class="cx">     return rb_convert_type(io, T_FILE, &quot;IO&quot;, &quot;to_io&quot;);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static inline VALUE
+rb_io_check_io(VALUE io)
+{
+    return rb_check_convert_type(io, T_FILE, &quot;IO&quot;, &quot;to_io&quot;);
+}
+
</ins><span class="cx"> static int
</span><span class="cx"> convert_mode_string_to_fmode(VALUE rstr)
</span><span class="cx"> {
</span><span class="lines">@@ -474,7 +481,6 @@
</span><span class="cx">  *     That was 15 bytes of data
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> static VALUE
</span><span class="cx"> io_write(VALUE io, SEL sel, VALUE to_write)
</span><span class="cx"> {
</span><span class="lines">@@ -483,6 +489,13 @@
</span><span class="cx">     CFIndex length;
</span><span class="cx">     
</span><span class="cx">     rb_secure(4);
</span><ins>+
+    VALUE tmp = rb_io_check_io(io);
+    if (NIL_P(tmp)) {
+        // receiver is not IO, dispatch the write method on it
+        return rb_vm_call(io, selWrite, 1, &amp;to_write, false);
+    }
+    io = tmp;
</ins><span class="cx">     
</span><span class="cx">     io_struct = ExtractIOStruct(io);
</span><span class="cx">     rb_io_assert_writable(io_struct);
</span><span class="lines">@@ -2711,7 +2724,8 @@
</span><span class="cx">     rb_io_write(rb_stdout, 0, rb_default_rs);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VALUE rb_io_write(VALUE v, SEL sel, VALUE i)
</del><ins>+VALUE
+rb_io_write(VALUE v, SEL sel, VALUE i)
</ins><span class="cx"> {
</span><span class="cx">     io_write(v, 0, i);
</span><span class="cx">     return Qnil;
</span></span></pre>
</div>
</div>

</body>
</html>