kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c, gc.c, intern.h, variable.c: declare rb_gc_mark{,maybe}()

Browse source 
canonically in order not to confuse C++ compilers. (backported
  from 1.7, problem noted by ttate)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2002-05-04 12:04:52 +00:00
parent 733fdc06ba
commit 22dfcf9adb
5 changed files with 36 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat May 4 20:55:10 2002 Akinori MUSHA <knu@iDaemons.org>
* eval.c, gc.c, intern.h, variable.c: declare rb_gc_mark{,maybe}()
canonically in order not to confuse C++ compilers. (backported
from 1.7, problem noted by ttate)
Thu May 2 18:27:13 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/extmk.rb.in, lib/mkmf.rb: use 'do...end' instead of '{}' for

28
eval.c
View file

@ -5849,12 +5849,12 @@ rb_mark_end_proc()
link = end_procs;
while (link) {
rb_gc_mark(link->data);
rb_gc_mark((VALUE)link->data);
link = link->next;
}
link = ephemeral_end_procs;
while (link) {
rb_gc_mark(link->data);
rb_gc_mark((VALUE)link->data);
link = link->next;
}
/* static global mark */
@ -6081,14 +6081,14 @@ blk_mark(data)
{
while (data) {
rb_gc_mark_frame(&data->frame);
rb_gc_mark(data->scope);
rb_gc_mark(data->var);
rb_gc_mark(data->body);
rb_gc_mark(data->self);
rb_gc_mark(data->dyna_vars);
rb_gc_mark(data->klass);
rb_gc_mark(data->tag);
rb_gc_mark(data->wrapper);
rb_gc_mark((VALUE)data->scope);
rb_gc_mark((VALUE)data->var);
rb_gc_mark((VALUE)data->body);
rb_gc_mark((VALUE)data->self);
rb_gc_mark((VALUE)data->dyna_vars);
rb_gc_mark((VALUE)data->klass);
rb_gc_mark((VALUE)data->tag);
rb_gc_mark((VALUE)data->wrapper);
data = data->prev;
}
}
@ -6611,7 +6611,7 @@ bm_mark(data)
rb_gc_mark(data->oklass);
rb_gc_mark(data->klass);
rb_gc_mark(data->recv);
rb_gc_mark(data->body);
rb_gc_mark((VALUE)data->body);
}
static VALUE
@ -7147,10 +7147,10 @@ thread_mark(th)
rb_gc_mark(th->klass);
rb_gc_mark(th->wrapper);
rb_gc_mark(th->cref);
rb_gc_mark((VALUE)th->cref);
rb_gc_mark(th->scope);
rb_gc_mark(th->dyna_vars);
rb_gc_mark((VALUE)th->scope);
rb_gc_mark((VALUE)th->dyna_vars);
rb_gc_mark(th->errinfo);
rb_gc_mark(th->last_line);
rb_gc_mark(th->last_match);

22
gc.c
View file

@ -476,7 +476,7 @@ rb_mark_hash(tbl)
void
rb_gc_mark_maybe(obj)
void *obj;
VALUE obj;
{
if (is_pointer_to_heap(obj)) {
rb_gc_mark(obj);
@ -485,7 +485,7 @@ rb_gc_mark_maybe(obj)
void
rb_gc_mark(ptr)
void *ptr;
VALUE ptr;
{
register RVALUE *obj = RANY(ptr);
@ -517,7 +517,7 @@ rb_gc_mark(ptr)
case NODE_MASGN:
case NODE_RESCUE:
case NODE_RESBODY:
rb_gc_mark(obj->as.node.u2.node);
rb_gc_mark((VALUE)obj->as.node.u2.node);
/* fall through */
case NODE_BLOCK: /* 1,3 */
case NODE_ARRAY:
@ -531,7 +531,7 @@ rb_gc_mark(ptr)
case NODE_CALL:
case NODE_DEFS:
case NODE_OP_ASGN1:
rb_gc_mark(obj->as.node.u1.node);
rb_gc_mark((VALUE)obj->as.node.u1.node);
/* fall through */
case NODE_SUPER: /* 3 */
case NODE_FCALL:
@ -554,7 +554,7 @@ rb_gc_mark(ptr)
case NODE_MATCH3:
case NODE_OP_ASGN_OR:
case NODE_OP_ASGN_AND:
rb_gc_mark(obj->as.node.u1.node);
rb_gc_mark((VALUE)obj->as.node.u1.node);
/* fall through */
case NODE_METHOD: /* 2 */
case NODE_NOT:
@ -590,7 +590,7 @@ rb_gc_mark(ptr)
case NODE_SCOPE: /* 2,3 */
case NODE_CLASS:
case NODE_BLOCK_PASS:
rb_gc_mark(obj->as.node.u3.node);
rb_gc_mark((VALUE)obj->as.node.u3.node);
obj = RANY(obj->as.node.u2.node);
goto Top;
@ -628,10 +628,10 @@ rb_gc_mark(ptr)
default:
if (is_pointer_to_heap(obj->as.node.u1.node)) {
rb_gc_mark(obj->as.node.u1.node);
rb_gc_mark((VALUE)obj->as.node.u1.node);
}
if (is_pointer_to_heap(obj->as.node.u2.node)) {
rb_gc_mark(obj->as.node.u2.node);
rb_gc_mark((VALUE)obj->as.node.u2.node);
}
if (is_pointer_to_heap(obj->as.node.u3.node)) {
obj = RANY(obj->as.node.u3.node);
@ -745,7 +745,7 @@ gc_sweep()
p = heaps[i]; pend = p + heaps_limits[i];
while (p < pend) {
if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
rb_gc_mark(p);
rb_gc_mark((VALUE)p);
p++;
}
}
@ -1041,8 +1041,8 @@ rb_gc()
}
}
rb_gc_mark(ruby_class);
rb_gc_mark(ruby_scope);
rb_gc_mark(ruby_dyna_vars);
rb_gc_mark((VALUE)ruby_scope);
rb_gc_mark((VALUE)ruby_dyna_vars);
if (finalizer_table) {
rb_mark_tbl(finalizer_table);
}

4
intern.h
View file

@ -189,8 +189,8 @@ VALUE rb_find_file _((VALUE));
void rb_gc_mark_locations _((VALUE*, VALUE*));
void rb_mark_tbl _((struct st_table*));
void rb_mark_hash _((struct st_table*));
void rb_gc_mark_maybe();
void rb_gc_mark();
void rb_gc_mark_maybe _((VALUE));
void rb_gc_mark _((VALUE));
void rb_gc_force_recycle _((VALUE));
void rb_gc _((void));
char *rb_source_filename _((const char *));

6
variable.c
View file

@ -388,7 +388,7 @@ static void
val_marker(data)
void *data;
{
if (data) rb_gc_mark_maybe(data);
if (data) rb_gc_mark_maybe((VALUE)data);
}
static VALUE
@ -411,7 +411,7 @@ var_setter(val, id, var)
static void
var_marker(var)
VALUE **var;
VALUE *var;
{
if (var) rb_gc_mark_maybe(*var);
}
@ -435,7 +435,7 @@ mark_global_entry(key, entry)
(*entry->marker)(entry->data);
trace = entry->trace;
while (trace) {
if (trace->data) rb_gc_mark_maybe(trace->data);
if (trace->data) rb_gc_mark_maybe((VALUE)trace->data);
trace = trace->next;
}
return ST_CONTINUE;