<!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>[2102] 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/2102">2102</a></dd>
<dt>Author</dt> <dd>lsansonetti@apple.com</dd>
<dt>Date</dt> <dd>2009-07-27 16:20:14 -0700 (Mon, 27 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixed GC problems in oniguruma: make sure st.c tables are retained/released appropriately since they use GC memory</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalgcc">MacRuby/branches/experimental/gc.c</a></li>
<li><a href="#MacRubybranchesexperimentalincluderubyinternh">MacRuby/branches/experimental/include/ruby/intern.h</a></li>
<li><a href="#MacRubybranchesexperimentalonigreginth">MacRuby/branches/experimental/onig/regint.h</a></li>
<li><a href="#MacRubybranchesexperimentalspecmacrubymspec">MacRuby/branches/experimental/spec/macruby.mspec</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalgcc"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/gc.c (2101 => 2102)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/gc.c 2009-07-27 23:17:31 UTC (rev 2101)
+++ MacRuby/branches/experimental/gc.c 2009-07-27 23:20:14 UTC (rev 2102)
</span><span class="lines">@@ -274,20 +274,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void
</del><ins>+const void *
</ins><span class="cx"> rb_objc_retain(const void *addr)
</span><span class="cx"> {
</span><span class="cx"> if (addr != NULL && !SPECIAL_CONST_P(addr)) {
</span><span class="cx"> auto_zone_retain(__auto_zone, (void *)addr);
</span><span class="cx"> }
</span><ins>+ return addr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void
</del><ins>+const void *
</ins><span class="cx"> rb_objc_release(const void *addr)
</span><span class="cx"> {
</span><span class="cx"> if (addr != NULL && !SPECIAL_CONST_P(addr)) {
</span><span class="cx"> auto_zone_release(__auto_zone, (void *)addr);
</span><span class="cx"> }
</span><ins>+ return addr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span></span></pre></div>
<a id="MacRubybranchesexperimentalincluderubyinternh"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/include/ruby/intern.h (2101 => 2102)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/include/ruby/intern.h 2009-07-27 23:17:31 UTC (rev 2101)
+++ MacRuby/branches/experimental/include/ruby/intern.h 2009-07-27 23:20:14 UTC (rev 2102)
</span><span class="lines">@@ -329,8 +329,8 @@
</span><span class="cx"> void rb_objc_gc_unregister_thread(void);
</span><span class="cx"> void rb_objc_set_associative_ref(void *, void *, void *);
</span><span class="cx"> void *rb_objc_get_associative_ref(void *, void *);
</span><del>-void rb_objc_retain(const void *);
-void rb_objc_release(const void *);
</del><ins>+const void *rb_objc_retain(const void *);
+const void *rb_objc_release(const void *);
</ins><span class="cx"> # define rb_gc_mark_locations(x,y)
</span><span class="cx"> # define rb_mark_tbl(x)
</span><span class="cx"> # define rb_mark_set(x)
</span></span></pre></div>
<a id="MacRubybranchesexperimentalonigreginth"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/onig/regint.h (2101 => 2102)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/onig/regint.h 2009-07-27 23:17:31 UTC (rev 2101)
+++ MacRuby/branches/experimental/onig/regint.h 2009-07-27 23:20:14 UTC (rev 2102)
</span><span class="lines">@@ -113,21 +113,32 @@
</span><span class="cx">
</span><span class="cx"> /* Ruby-specific defines... */
</span><span class="cx">
</span><del>-#define onig_st_init_table st_init_table
-#define onig_st_init_table_with_size st_init_table_with_size
-#define onig_st_init_numtable st_init_numtable
-#define onig_st_init_numtable_with_size st_init_numtable_with_size
-#define onig_st_init_strtable st_init_strtable
-#define onig_st_init_strtable_with_size st_init_strtable_with_size
</del><ins>+const void *rb_objc_retain(const void *addr);
+const void *rb_objc_release(const void *addr);
+
+#define onig_st_init_table(t) \
+ ((st_table *)rb_objc_retain(st_init_table(t)))
+#define onig_st_init_table_with_size(t, s) \
+ ((st_table *)rb_objc_retain(st_init_table_with_size(t, s)))
+#define onig_st_init_numtable() \
+ ((st_table *)rb_objc_retain(st_init_numtable()))
+#define onig_st_init_numtable_with_size(s) \
+ ((st_table *)rb_objc_retain(st_init_numtable_with_size(s)))
+#define onig_st_init_strtable() \
+ ((st_table *)rb_objc_retain(st_init_strtable()))
+#define onig_st_init_strtable_with_size(s) \
+ ((st_table *)rb_objc_retain(st_init_strtable_with_size(s)))
+#define onig_st_copy(t) \
+ ((st_table *)rb_objc_retain(st_copy(t)))
+#define onig_st_free_table(t) \
+ (st_free_table((st_table *)rb_objc_release(t)))
</ins><span class="cx"> #define onig_st_delete st_delete
</span><span class="cx"> #define onig_st_delete_safe st_delete_safe
</span><span class="cx"> #define onig_st_insert st_insert
</span><span class="cx"> #define onig_st_lookup st_lookup
</span><span class="cx"> #define onig_st_foreach st_foreach
</span><span class="cx"> #define onig_st_add_direct st_add_direct
</span><del>-#define onig_st_free_table st_free_table
</del><span class="cx"> #define onig_st_cleanup_safe st_cleanup_safe
</span><del>-#define onig_st_copy st_copy
</del><span class="cx"> #define onig_st_nothing_key_clone st_nothing_key_clone
</span><span class="cx"> #define onig_st_nothing_key_free st_nothing_key_free
</span><span class="cx"> /* */
</span></span></pre></div>
<a id="MacRubybranchesexperimentalspecmacrubymspec"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/spec/macruby.mspec (2101 => 2102)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/spec/macruby.mspec 2009-07-27 23:17:31 UTC (rev 2101)
+++ MacRuby/branches/experimental/spec/macruby.mspec 2009-07-27 23:20:14 UTC (rev 2102)
</span><span class="lines">@@ -25,8 +25,11 @@
</span><span class="cx"> # Library specs
</span><span class="cx"> set :library, [
</span><span class="cx"> 'library/digest',
</span><ins>+ 'library/getoptlong',
</ins><span class="cx"> 'library/mutex',
</span><span class="cx"> 'library/queue',
</span><ins>+ 'library/observer',
+ 'library/pathname',
</ins><span class="cx"> 'library/readline',
</span><span class="cx"> 'library/stringscanner'
</span><span class="cx"> ]
</span></span></pre>
</div>
</div>
</body>
</html>