X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_t.h;h=9015589862e7ed286282a2bf33322028384fa304;hb=9fc5a3152558711a37406f79913f77cab1dc9db7;hp=4df727e7c068d6ef422230301bbe7a8f18ae0d8c;hpb=058328c716b73d02e008199153059ba6e8575d05;p=cparser diff --git a/type_t.h b/type_t.h index 4df727e..9015589 100644 --- a/type_t.h +++ b/type_t.h @@ -44,6 +44,7 @@ typedef enum type_kind_t { TYPE_ENUM, TYPE_FUNCTION, TYPE_POINTER, + TYPE_REFERENCE, TYPE_ARRAY, TYPE_BITFIELD, TYPE_BUILTIN, @@ -59,10 +60,10 @@ typedef unsigned short type_modifiers_t; struct type_base_t { type_kind_t kind; + il_size_t size; /**< The size of this type. */ type_qualifiers_t qualifiers; type_modifiers_t modifiers; - unsigned char alignment; /**< The extra alignment of the type, 0 for default. */ - source_position_t source_position; + il_alignment_t alignment; /**< The extra alignment of the type, 0 for default. */ ir_type *firm_type; }; @@ -91,6 +92,12 @@ struct builtin_type_t { struct pointer_type_t { type_base_t base; type_t *points_to; + variable_t *base_variable; /**< Microsoft __based() extension */ +}; + +struct reference_type_t { + type_base_t base; + type_t *refers_to; }; struct array_type_t { @@ -101,11 +108,11 @@ struct array_type_t { ir_node *size_node; /**< used by ast2firm phase */ - unsigned is_static : 1; /**< a [static] type */ - unsigned is_variable : 1; /**< a [*] type */ - unsigned has_implicit_size : 1; - unsigned size_constant : 1; /**< size expression is constant */ - unsigned is_vla : 1; /**< it's a variable length array */ + bool is_static : 1; /**< a [static] type */ + bool is_variable : 1; /**< a [*] type */ + bool has_implicit_size : 1; + bool size_constant : 1; /**< size expression is constant */ + bool is_vla : 1; /**< it's a variable length array */ }; /** @@ -113,9 +120,16 @@ struct array_type_t { */ struct function_parameter_t { type_t *type; /**< The parameter type. */ - function_parameter_t *next; /**< Points to the next type inthe parameter list.*/ + function_parameter_t *next; /**< Points to the next type in the parameter list.*/ }; +/** Linkage specifications. */ +typedef enum linkage_kind_t { + LINKAGE_INVALID, + LINKAGE_C, /**< C linkage. */ + LINKAGE_CXX /**< C++ linkage. */ +} linkage_kind_t; + /** Calling conventions. */ typedef enum cc_kind_t { CC_DEFAULT, /**< default calling convention. */ @@ -132,31 +146,34 @@ struct function_type_t { type_base_t base; type_t *return_type; /**< The return type. */ function_parameter_t *parameters; /**< A list of the parameter types. */ + linkage_kind_t linkage; cc_kind_t calling_convention; /**< The specified calling convention. */ - unsigned variadic : 1; - unsigned unspecified_parameters : 1; - unsigned kr_style_parameters : 1; + bool variadic : 1; + bool unspecified_parameters : 1; + bool kr_style_parameters : 1; }; struct compound_type_t { - type_base_t base; + type_base_t base; + bool packed : 1; /**< Set if packed was specified. */ /** the declaration of the compound type, the scope of the declaration * contains the compound entries. */ - declaration_t *declaration; + compound_t *compound; }; struct enum_type_t { - type_base_t base; - /** the declaration of the enum type. You can find the enum entries by - * walking the declaration->next list until you don't find - * STORAGE_CLASS_ENUM_ENTRY declarations anymore */ - declaration_t *declaration; + type_base_t base; + atomic_type_kind_t akind; /**< underlying atomic type */ + /** the enum entity. You can find the enum entries by walking the + * enum->base.next list until you don't find ENTITY_ENUM_VALUE entities + * anymore */ + enum_t *enume; }; struct typedef_type_t { - type_base_t base; - declaration_t *declaration; - type_t *resolved_type; + type_base_t base; + typedef_t *typedefe; + type_t *resolved_type; }; struct typeof_type_t { @@ -169,7 +186,8 @@ struct typeof_type_t { struct bitfield_type_t { type_base_t base; type_t *base_type; - expression_t *size; + expression_t *size_expression; /**< The expression for the bit size. */ + il_size_t bit_size; /**< Size of this bitfield in bits. */ }; union type_t { @@ -180,6 +198,7 @@ union type_t { imaginary_type_t imaginary; builtin_type_t builtin; pointer_type_t pointer; + reference_type_t reference; array_type_t array; function_type_t function; compound_type_t compound; @@ -193,10 +212,14 @@ type_t *make_atomic_type(atomic_type_kind_t type, type_qualifiers_t qualifiers); type_t *make_complex_type(atomic_type_kind_t type, type_qualifiers_t qualifiers); type_t *make_imaginary_type(atomic_type_kind_t type, type_qualifiers_t qualifiers); type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers); +type_t *make_reference_type(type_t *refers_to); +type_t *make_based_pointer_type(type_t *points_to, + type_qualifiers_t qualifiers, variable_t *variable); type_t *make_array_type(type_t *element_type, size_t size, type_qualifiers_t qualifiers); type_t *duplicate_type(const type_t *type); +type_t *identify_new_type(type_t *type); static inline bool is_typeref(const type_t *type) { @@ -220,6 +243,12 @@ static inline bool is_type_pointer(const type_t *type) return type->kind == TYPE_POINTER; } +static inline bool is_type_reference(const type_t *type) +{ + assert(!is_typeref(type)); + return type->kind == TYPE_REFERENCE; +} + static inline bool is_type_array(const type_t *type) { assert(!is_typeref(type)); @@ -259,6 +288,7 @@ static inline bool is_type_compound(const type_t *type) static inline bool is_type_valid(const type_t *type) { + assert(!is_typeref(type)); return type->kind != TYPE_ERROR; }