qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename is_id to obj_is_id. 

Better naming convenion.
This commit is contained in:
Bill Currie 2012-12-18 21:14:13 +09:00
parent 686858a59d
commit 64c98bd4c3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ struct expr_s;
struct method_s;
struct symbol_s;
int is_id (const struct type_s *type);
int obj_is_id (const struct type_s *type);
class_t *extract_class (class_type_t *class_type);
const char *get_class_name (class_type_t *class_type, int pretty);

2
tools/qfcc/source/class.c
View File

@ -174,7 +174,7 @@ static struct_def_t object_struct[] = {
};
int
is_id (const type_t *type)
obj_is_id (const type_t *type)
{
if (type == &type_id)
return 1;

6
tools/qfcc/source/type.c
View File

@ -443,7 +443,7 @@ print_type_str (dstring_t *str, const type_t *type)
}
break;
case ev_pointer:
if (is_id (type)) {
if (obj_is_id (type)) {
dasprintf (str, "id");
if (type->t.fldptr.type->protos)
print_protocollist (str, type->t.fldptr.type->protos);
@ -724,11 +724,11 @@ type_assignable (const type_t *dst, const type_t *src)
if (dst->type == ev_field && src->type == ev_field)
return 1;
// id = any class pointer
if (is_id (dst) && src->type == ev_pointer
if (obj_is_id (dst) && src->type == ev_pointer
&& (is_class (src->t.fldptr.type) || src == &type_Class))
return 1;
// any class pointer = id
if (is_id (src) && dst->type == ev_pointer
if (obj_is_id (src) && dst->type == ev_pointer
&& (is_class (dst->t.fldptr.type) || dst == &type_Class))
return 1;
// pointer = array