<!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>[2128] 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/2128">2128</a></dd>
<dt>Author</dt> <dd>lsansonetti@apple.com</dd>
<dt>Date</dt> <dd>2009-07-31 22:21:26 -0700 (Fri, 31 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>optimize numeric coerce dispatch calls</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalincluderubyinternh">MacRuby/branches/experimental/include/ruby/intern.h</a></li>
<li><a href="#MacRubybranchesexperimentalnumericc">MacRuby/branches/experimental/numeric.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalincluderubyinternh"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/include/ruby/intern.h (2127 => 2128)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/include/ruby/intern.h 2009-08-01 04:01:30 UTC (rev 2127)
+++ MacRuby/branches/experimental/include/ruby/intern.h 2009-08-01 05:21:26 UTC (rev 2128)
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> void rb_num_zerodiv(void);
</span><span class="cx"> VALUE rb_num_coerce_bin(VALUE, VALUE, ID);
</span><span class="cx"> VALUE rb_num_coerce_cmp(VALUE, VALUE, ID);
</span><del>-VALUE rb_num_coerce_relop(VALUE, VALUE, ID);
</del><ins>+VALUE rb_num_coerce_relop(VALUE, VALUE, SEL);
</ins><span class="cx"> VALUE rb_float_new(double);
</span><span class="cx"> VALUE rb_num2fix(VALUE);
</span><span class="cx"> VALUE rb_fix2str(VALUE, int);
</span></span></pre></div>
<a id="MacRubybranchesexperimentalnumericc"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/numeric.c (2127 => 2128)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/numeric.c 2009-08-01 04:01:30 UTC (rev 2127)
+++ MacRuby/branches/experimental/numeric.c 2009-08-01 05:21:26 UTC (rev 2128)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> #include "objc.h"
</span><span class="cx"> #include <ruby/node.h>
</span><span class="cx"> #include "vm.h"
</span><ins>+#include "id.h"
</ins><span class="cx">
</span><span class="cx"> #ifdef HAVE_FLOAT_H
</span><span class="cx"> #include <float.h>
</span><span class="lines">@@ -80,7 +81,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static ID id_coerce, id_to_i, id_eq;
</del><ins>+static SEL sel_coerce;
+static ID id_to_i, id_eq;
</ins><span class="cx">
</span><span class="cx"> VALUE rb_cNumeric;
</span><span class="cx"> VALUE rb_cCFNumber;
</span><span class="lines">@@ -178,7 +180,7 @@
</span><span class="cx"> static VALUE
</span><span class="cx"> coerce_body(VALUE *x)
</span><span class="cx"> {
</span><del>- return rb_funcall(x[1], id_coerce, 1, x[0]);
</del><ins>+ return rb_vm_call(x[1], sel_coerce, 1, &x[0], false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static VALUE
</span><span class="lines">@@ -231,12 +233,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VALUE
</span><del>-rb_num_coerce_relop(VALUE x, VALUE y, ID func)
</del><ins>+rb_num_coerce_relop(VALUE x, VALUE y, SEL sel)
</ins><span class="cx"> {
</span><span class="cx"> VALUE c, x0 = x, y0 = y;
</span><span class="cx">
</span><span class="cx"> if (!do_coerce(&x, &y, Qfalse) ||
</span><del>- NIL_P(c = rb_funcall(x, func, 1, y))) {
</del><ins>+ NIL_P(c = rb_vm_call(x, sel, 1, &y, false))) {
</ins><span class="cx"> rb_cmperr(x0, y0);
</span><span class="cx"> return Qnil; /* not reached */
</span><span class="cx"> }
</span><span class="lines">@@ -1032,7 +1034,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, '>');
</del><ins>+ return rb_num_coerce_relop(x, y, selGT);
</ins><span class="cx"> }
</span><span class="cx"> if (isnan(a)) return Qfalse;
</span><span class="cx"> return (a > b)?Qtrue:Qfalse;
</span><span class="lines">@@ -1067,7 +1069,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, rb_intern(">="));
</del><ins>+ return rb_num_coerce_relop(x, y, selGE);
</ins><span class="cx"> }
</span><span class="cx"> if (isnan(a)) return Qfalse;
</span><span class="cx"> return (a >= b)?Qtrue:Qfalse;
</span><span class="lines">@@ -1101,7 +1103,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, '<');
</del><ins>+ return rb_num_coerce_relop(x, y, selLT);
</ins><span class="cx"> }
</span><span class="cx"> if (isnan(a)) return Qfalse;
</span><span class="cx"> return (a < b)?Qtrue:Qfalse;
</span><span class="lines">@@ -1136,7 +1138,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, rb_intern("<="));
</del><ins>+ return rb_num_coerce_relop(x, y, selLE);
</ins><span class="cx"> }
</span><span class="cx"> if (isnan(a)) return Qfalse;
</span><span class="cx"> return (a <= b)?Qtrue:Qfalse;
</span><span class="lines">@@ -2615,7 +2617,7 @@
</span><span class="cx"> case T_FLOAT:
</span><span class="cx"> return (double)FIX2LONG(x) > RFLOAT_VALUE(y) ? Qtrue : Qfalse;
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, '>');
</del><ins>+ return rb_num_coerce_relop(x, y, selGT);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2640,7 +2642,7 @@
</span><span class="cx"> case T_FLOAT:
</span><span class="cx"> return (double)FIX2LONG(x) >= RFLOAT_VALUE(y) ? Qtrue : Qfalse;
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, rb_intern(">="));
</del><ins>+ return rb_num_coerce_relop(x, y, selGE);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2665,7 +2667,7 @@
</span><span class="cx"> case T_FLOAT:
</span><span class="cx"> return (double)FIX2LONG(x) < RFLOAT_VALUE(y) ? Qtrue : Qfalse;
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, '<');
</del><ins>+ return rb_num_coerce_relop(x, y, selLT);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2690,7 +2692,7 @@
</span><span class="cx"> case T_FLOAT:
</span><span class="cx"> return (double)FIX2LONG(x) <= RFLOAT_VALUE(y) ? Qtrue : Qfalse;
</span><span class="cx"> default:
</span><del>- return rb_num_coerce_relop(x, y, rb_intern("<="));
</del><ins>+ return rb_num_coerce_relop(x, y, selLE);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3255,7 +3257,7 @@
</span><span class="cx"> void
</span><span class="cx"> Init_Numeric(void)
</span><span class="cx"> {
</span><del>- id_coerce = rb_intern("coerce");
</del><ins>+ sel_coerce = sel_registerName("coerce:");
</ins><span class="cx"> id_to_i = rb_intern("to_i");
</span><span class="cx"> id_eq = rb_intern("==");
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>