<!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>[1994] MacRuby/branches/experimental/variable.c</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/1994">1994</a></dd>
<dt>Author</dt> <dd>lsansonetti@apple.com</dd>
<dt>Date</dt> <dd>2009-07-05 16:17:30 -0700 (Sun, 05 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>try the ivar slot logic for any object type</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalvariablec">MacRuby/branches/experimental/variable.c</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalvariablec"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/variable.c (1993 => 1994)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/variable.c        2009-07-05 23:16:58 UTC (rev 1993)
+++ MacRuby/branches/experimental/variable.c        2009-07-05 23:17:30 UTC (rev 1994)
</span><span class="lines">@@ -1018,23 +1018,22 @@
</span><span class="cx"> {
</span><span class="cx">     VALUE val;
</span><span class="cx"> 
</span><ins>+    const int slot = rb_vm_find_class_ivar_slot(CLASS_OF(obj), id);
+    if (slot != -1) {
+        return rb_vm_get_ivar_from_slot(obj, slot);
+    }
+
</ins><span class="cx">     switch (TYPE(obj)) {
</span><span class="cx">         case T_OBJECT:
</span><span class="cx">             {
</span><span class="cx">                 val = Qundef;
</span><span class="cx"> 
</span><del>-                int slot = rb_vm_find_class_ivar_slot(CLASS_OF(obj), id);
-                if (slot != -1) {
-                    val = rb_vm_get_ivar_from_slot(obj, slot);
-                }
-                else {
-                    if (ROBJECT(obj)-&gt;tbl != NULL) {
-                        if (!CFDictionaryGetValueIfPresent(
-                                    (CFDictionaryRef)ROBJECT(obj)-&gt;tbl,
-                                    (const void *)id,
-                                    (const void **)&amp;val)) {
-                            val = Qundef;
-                        }
</del><ins>+                if (ROBJECT(obj)-&gt;tbl != NULL) {
+                    if (!CFDictionaryGetValueIfPresent(
+                                (CFDictionaryRef)ROBJECT(obj)-&gt;tbl,
+                                (const void *)id,
+                                (const void **)&amp;val)) {
+                        val = Qundef;
</ins><span class="cx">                     }
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="lines">@@ -1092,27 +1091,28 @@
</span><span class="cx">     if (OBJ_FROZEN(obj)) {
</span><span class="cx">         rb_error_frozen(&quot;object&quot;);
</span><span class="cx">     }
</span><ins>+
+    const int slot = rb_vm_find_class_ivar_slot(CLASS_OF(obj), id);
+    if (slot != -1) {
+        rb_vm_set_ivar_from_slot(obj, val, slot);
+        return val;
+    }
+
</ins><span class="cx">     switch (TYPE(obj)) {
</span><span class="cx">         case T_OBJECT:
</span><span class="cx">             {
</span><del>-                int slot = rb_vm_find_class_ivar_slot(CLASS_OF(obj), id);
-                if (slot != -1) {
-                    rb_vm_set_ivar_from_slot(obj, val, slot);
-                }
-                else {
-                    if (ROBJECT(obj)-&gt;tbl == NULL) {
-                        CFMutableDictionaryRef tbl;
</del><ins>+                if (ROBJECT(obj)-&gt;tbl == NULL) {
+                    CFMutableDictionaryRef tbl;
</ins><span class="cx"> 
</span><del>-                        tbl = CFDictionaryCreateMutable(NULL, 0, NULL, 
-                                &amp;rb_cfdictionary_value_cb);
</del><ins>+                    tbl = CFDictionaryCreateMutable(NULL, 0, NULL, 
+                            &amp;rb_cfdictionary_value_cb);
</ins><span class="cx"> 
</span><del>-                        GC_WB(&amp;ROBJECT(obj)-&gt;tbl, tbl);
-                        CFMakeCollectable(tbl);
-                    }
</del><ins>+                    GC_WB(&amp;ROBJECT(obj)-&gt;tbl, tbl);
+                    CFMakeCollectable(tbl);
+                }
</ins><span class="cx"> 
</span><del>-                    CFDictionarySetValue(ROBJECT(obj)-&gt;tbl, 
-                            (const void *)id, (const void *)val);
-                }
</del><ins>+                CFDictionarySetValue(ROBJECT(obj)-&gt;tbl, 
+                        (const void *)id, (const void *)val);
</ins><span class="cx">             }
</span><span class="cx">             break;
</span><span class="cx"> 
</span><span class="lines">@@ -1142,22 +1142,23 @@
</span><span class="cx"> {
</span><span class="cx">     VALUE val;
</span><span class="cx"> 
</span><ins>+    const int slot = rb_vm_find_class_ivar_slot(CLASS_OF(obj), id);
+    if (slot != -1) {
+        if (rb_vm_get_ivar_from_slot(obj, slot) != Qundef) {
+            return Qtrue;
+        }
+    }
+
</ins><span class="cx">     switch (TYPE(obj)) {
</span><span class="cx">         case T_OBJECT:
</span><span class="cx">             {
</span><span class="cx">                 val = Qundef;
</span><span class="cx"> 
</span><del>-                int slot = rb_vm_find_class_ivar_slot(CLASS_OF(obj), id);
-                if (slot != -1) {
-                    val = rb_vm_get_ivar_from_slot(obj, slot);
-                }
-                else {
-                    if (ROBJECT(obj)-&gt;tbl != NULL) {
-                        if (CFDictionaryGetValueIfPresent(
-                                    (CFDictionaryRef)ROBJECT(obj)-&gt;tbl,
-                                    (const void *)id, NULL)) {
-                            val = Qtrue;
-                        }
</del><ins>+                if (ROBJECT(obj)-&gt;tbl != NULL) {
+                    if (CFDictionaryGetValueIfPresent(
+                                (CFDictionaryRef)ROBJECT(obj)-&gt;tbl,
+                                (const void *)id, NULL)) {
+                        val = Qtrue;
</ins><span class="cx">                     }
</span><span class="cx">                 }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>