Change ptrfld to fldptr for consistency with type.h.

This commit is contained in:
Bill Currie 2011-02-28 23:12:32 +09:00
parent 8b661bbb89
commit b544196c21
2 changed files with 8 additions and 8 deletions

View file

@ -43,10 +43,10 @@
#include "type.h"
typedef struct qfot_ptrfld_s {
typedef struct qfot_fldptr_s {
pr_int_t type; ///< ev_field or ev_pointer
pointer_t aux_type; ///< referenced type
} qfot_ptrfld_t;
} qfot_fldptr_t;
typedef struct qfot_func_s {
pr_int_t type; ///< always ev_func
@ -92,7 +92,7 @@ typedef struct qfot_type_s {
string_t encoding; ///< Objective-QC encoding
union {
pr_int_t type; ///< basic type: etype_t
qfot_ptrfld_t ptrfld; ///< ty_none, ev_pointer/ev_field
qfot_fldptr_t fldptr; ///< ty_none, ev_pointer/ev_field
qfot_func_t func; ///< ty_none, ev_func
qfot_struct_t strct; ///< ty_struct/ty_union/ty_enum
qfot_array_t array; ///< ty_array

View file

@ -128,17 +128,17 @@ qfo_encode_func (type_t *type)
}
static def_t *
qfo_encode_ptrfld (type_t *type)
qfo_encode_fldptr (type_t *type)
{
qfot_type_t *enc;
def_t *def;
def_t *type_def;
type_def = qfo_encode_type (type->t.fldptr.type);
def = qfo_new_encoding (type, sizeof (enc->t.ptrfld));
def = qfo_new_encoding (type, sizeof (enc->t.fldptr));
enc = D_POINTER (qfot_type_t, def);
enc->t.ptrfld.type = type->type;
ENC_DEF (enc->t.ptrfld.aux_type, type_def);
enc->t.fldptr.type = type->type;
ENC_DEF (enc->t.fldptr.aux_type, type_def);
return def;
}
@ -151,7 +151,7 @@ qfo_encode_none (type_t *type)
if (type->type == ev_func)
return qfo_encode_func (type);
else if (type->type == ev_pointer || type->type == ev_field)
return qfo_encode_ptrfld (type);
return qfo_encode_fldptr (type);
def = qfo_new_encoding (type, sizeof (enc->t.type));
enc = D_POINTER (qfot_type_t, def);