qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add more convenience functions.

Browse source 
Cleans up obj_types_assignable a little.
This commit is contained in:
Bill Currie 2012-12-19 14:07:23 +09:00
parent 3af031c33d
commit 8c2af5cff7
2 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/include/class.h
View file

@ -109,6 +109,8 @@ struct symbol_s;
int obj_is_id (const struct type_s *type); int obj_is_id (const struct type_s *type);
int obj_is_class (const struct type_s *type); int obj_is_class (const struct type_s *type);
int obj_is_Class (const struct type_s *type);
int obj_is_classptr (const struct type_s *type);
int obj_types_assignable (const struct type_s *dst, const struct type_s *src); int obj_types_assignable (const struct type_s *dst, const struct type_s *src);
class_t *extract_class (class_type_t *class_type); class_t *extract_class (class_type_t *class_type);

50
tools/qfcc/source/class.c
View file

@ -198,28 +198,48 @@ obj_is_class (const type_t *type)
return 0; return 0;
} }
int
obj_is_Class (const type_t *type)
{
if (type == &type_Class)
return 1;
// type may be a qualified Class, in which case it will be a pointer to
// a qualified obj_class struct
if (type->type != ev_pointer)
return 0;
if (!is_struct (type->t.fldptr.type))
return 0;
// if the the symtabs match, then type is Class in disguise
if (type->t.fldptr.type->t.symtab == type_obj_class.t.symtab)
return 1;
return 0;
}
int
obj_is_classptr (const type_t *type)
{
// easy cases first :)
if (obj_is_id (type) || obj_is_Class (type))
return 1;
if (type->type != ev_pointer)
return 0;
type = type->t.fldptr.type;
if (obj_is_class (type))
return 1;
return 0;
}
int int
obj_types_assignable (const type_t *dst, const type_t *src) obj_types_assignable (const type_t *dst, const type_t *src)
{ {
class_t *dst_class, *src_class; class_t *dst_class, *src_class;
if (obj_is_id (dst) if (!obj_is_classptr (dst) || !obj_is_classptr (src))
&& (obj_is_id (src)
|| obj_is_class (src->t.fldptr.type)
|| src == &type_Class)) {
return 1;
}
if (obj_is_id (src)
&& (obj_is_id (dst)
|| obj_is_class (dst->t.fldptr.type)
|| dst == &type_Class)) {
return 1;
}
if (!obj_is_class (dst->t.fldptr.type)
|| !obj_is_class (src->t.fldptr.type))
return -1; return -1;
if (obj_is_id (dst) || obj_is_id (src))
return 1;
// check dst is a base class of src // check dst is a base class of src
dst_class = dst->t.fldptr.type->t.class; dst_class = dst->t.fldptr.type->t.class;
src_class = src->t.fldptr.type->t.class; src_class = src->t.fldptr.type->t.class;