Merge fix PR#2946 Obj.tag
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6585 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02master
parent
c2ac86736b
commit
19203b2b1c
|
@ -66,11 +66,11 @@ CAMLprim value caml_obj_is_block(value arg)
|
|||
CAMLprim value caml_obj_tag(value arg)
|
||||
{
|
||||
if (Is_long (arg)){
|
||||
return 1000;
|
||||
}else if (Is_young (arg) || Is_in_heap (arg)){
|
||||
return Val_int (1000);
|
||||
}else if (Is_young (arg) || Is_in_heap (arg) || Is_atom (arg)){
|
||||
return Val_int(Tag_val(arg));
|
||||
}else{
|
||||
return 1001;
|
||||
return Val_int (1001);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -169,15 +169,6 @@ CAMLprim value caml_obj_truncate (value v, value newsize)
|
|||
to the GC.
|
||||
*/
|
||||
|
||||
/* [lazy_is_forward] is obsolete. Stays here to make bootstrapping
|
||||
easier for patched versions of 3.07. To be removed before 3.08. FIXME */
|
||||
/*
|
||||
CAMLxxprim value lazy_is_forward (value v)
|
||||
{
|
||||
return Val_bool (Is_block (v) && Tag_val (v) == Forward_tag);
|
||||
}
|
||||
*/
|
||||
|
||||
CAMLprim value caml_lazy_follow_forward (value v)
|
||||
{
|
||||
if (Is_block (v) && (Is_young (v) || Is_in_heap (v))
|
||||
|
|
Loading…
Reference in New Issue