X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=614dd069cbd3bd974e8b76271f4d042fe93eaea4;hb=03955def1ca0b6eb328351ae011249d27741aac5;hp=cbb1c2ea9bf93982945b6fca9b20aeb93fd484ad;hpb=dc80433e9208fb190af9b5a466b484036cfb8335;p=cparser diff --git a/ast_t.h b/ast_t.h index cbb1c2e..614dd06 100644 --- a/ast_t.h +++ b/ast_t.h @@ -35,7 +35,7 @@ extern struct obstack ast_obstack; /** * Expression kinds. */ -typedef enum { +typedef enum expression_kind_t { EXPR_UNKNOWN = 0, EXPR_INVALID, EXPR_REFERENCE, @@ -76,8 +76,7 @@ typedef enum { EXPR_UNARY_CAST, EXPR_UNARY_CAST_IMPLICIT, /**< compiler generated cast */ EXPR_UNARY_ASSUME, /**< MS __assume() */ - EXPR_UNARY_BITFIELD_EXTRACT, - EXPR_UNARY_LAST = EXPR_UNARY_BITFIELD_EXTRACT, + EXPR_UNARY_LAST = EXPR_UNARY_ASSUME, EXPR_BINARY_FIRST, EXPR_BINARY_ADD = EXPR_BINARY_FIRST, @@ -121,7 +120,7 @@ typedef enum { EXPR_BINARY_LAST = EXPR_BINARY_ISUNORDERED, } expression_kind_t; -typedef enum { +typedef enum funcname_kind_t { FUNCNAME_FUNCTION, /**< C99 __func__, older __FUNCTION__ */ FUNCNAME_PRETTY_FUNCTION, /**< GNUC __PRETTY_FUNCTION__ */ FUNCNAME_FUNCSIG, /**< MS __FUNCSIG__ */ @@ -181,8 +180,7 @@ typedef enum { case EXPR_UNARY_PREFIX_DECREMENT: \ case EXPR_UNARY_CAST: \ case EXPR_UNARY_CAST_IMPLICIT: \ - case EXPR_UNARY_ASSUME: \ - case EXPR_UNARY_BITFIELD_EXTRACT: + case EXPR_UNARY_ASSUME: /** * A scope containing declarations. @@ -196,6 +194,9 @@ struct expression_base_t { expression_kind_t kind; type_t *type; source_position_t source_position; +#ifndef NDEBUG + bool transformed; +#endif }; struct const_expression_t { @@ -364,7 +365,7 @@ union expression_t { classify_type_expression_t classify_type; }; -typedef enum { +typedef enum storage_class_tag_t { STORAGE_CLASS_NONE, STORAGE_CLASS_EXTERN, STORAGE_CLASS_STATIC, @@ -377,7 +378,7 @@ typedef enum { STORAGE_CLASS_THREAD_STATIC, } storage_class_tag_t; -typedef enum { +typedef enum namespace_t { NAMESPACE_NORMAL, NAMESPACE_STRUCT, NAMESPACE_UNION, @@ -385,7 +386,7 @@ typedef enum { NAMESPACE_LABEL, } namespace_t; -typedef enum { +typedef enum initializer_kind_t { INITIALIZER_VALUE, INITIALIZER_LIST, INITIALIZER_STRING, @@ -498,6 +499,7 @@ typedef enum gnu_attribute_kind_t { GNU_AK_VISIBILITY, GNU_AK_REGPARM, GNU_AK_MODEL, + GNU_AK_MODE, GNU_AK_TRAP_EXIT, GNU_AK_SP_SWITCH, GNU_AK_SENTINEL, @@ -507,30 +509,41 @@ typedef enum gnu_attribute_kind_t { /** * Extended microsoft modifier. */ -typedef enum { - DM_DLLIMPORT = (1 << 0), - DM_DLLEXPORT = (1 << 1), - DM_THREAD = (1 << 2), - DM_NAKED = (1 << 3), - DM_MICROSOFT_INLINE = (1 << 4), - DM_FORCEINLINE = (1 << 5), - DM_SELECTANY = (1 << 6), - DM_NOTHROW = (1 << 7), - DM_NOVTABLE = (1 << 8), - DM_NORETURN = (1 << 9), - DM_NOINLINE = (1 << 10), - DM_RESTRICT = (1 << 11), - DM_NOALIAS = (1 << 12) +typedef enum decl_modifier_t { + DM_DLLIMPORT = 1 << 0, + DM_DLLEXPORT = 1 << 1, + DM_THREAD = 1 << 2, + DM_NAKED = 1 << 3, + DM_MICROSOFT_INLINE = 1 << 4, + DM_FORCEINLINE = 1 << 5, + DM_SELECTANY = 1 << 6, + DM_NOTHROW = 1 << 7, + DM_NOVTABLE = 1 << 8, + DM_NORETURN = 1 << 9, + DM_NOINLINE = 1 << 10, + DM_RESTRICT = 1 << 11, + DM_NOALIAS = 1 << 12, + DM_PACKED = 1 << 13, + DM_TRANSPARENT_UNION = 1 << 14, + DM_PURE = 1 << 15, + DM_CONSTRUCTOR = 1 << 16, + DM_DESTRUCTOR = 1 << 17, + DM_UNUSED = 1 << 18, + DM_USED = 1 << 19, + DM_CDECL = 1 << 20, + DM_FASTCALL = 1 << 21, + DM_STDCALL = 1 << 22, + DM_THISCALL = 1 << 23 } decl_modifier_t; -typedef unsigned short decl_modifiers_t; +typedef unsigned decl_modifiers_t; struct declaration_t { unsigned char namespc; unsigned char declared_storage_class; unsigned char storage_class; unsigned char alignment; /**< Alignment of the declaration, 0 for default. */ - decl_modifiers_t decl_modifiers; /**< MS __declspec modifiers. */ + decl_modifiers_t modifiers; /**< modifiers. */ const char *deprecated_string; /**< MS deprecated string if any. */ symbol_t *get_property_sym; /**< MS get property. */ symbol_t *put_property_sym; /**< MS put property. */ @@ -542,7 +555,7 @@ struct declaration_t { symbol_t *symbol; source_position_t source_position; union { - bool is_defined; + bool complete; /**< used to indicate wether struct/union types are already defined or if just the name is declared */ statement_t *statement; initializer_t *initializer; expression_t *enum_value; @@ -567,7 +580,7 @@ struct declaration_t { } v; }; -typedef enum { +typedef enum statement_kind_t { STATEMENT_INVALID, STATEMENT_EMPTY, STATEMENT_COMPOUND, @@ -593,6 +606,9 @@ struct statement_base_t { statement_kind_t kind; statement_t *next; source_position_t source_position; +#ifndef NDEBUG + bool transformed; +#endif }; struct invalid_statement_t { @@ -681,11 +697,11 @@ struct for_statement_t { scope_t scope; }; -struct asm_constraint_t { - string_t constraints; - expression_t *expression; - symbol_t *symbol; - asm_constraint_t *next; +struct asm_argument_t { + string_t constraints; + expression_t *expression; + symbol_t *symbol; + asm_argument_t *next; }; struct asm_clobber_t { @@ -694,12 +710,12 @@ struct asm_clobber_t { }; struct asm_statement_t { - statement_base_t base; - string_t asm_text; - asm_constraint_t *inputs; - asm_constraint_t *outputs; - asm_clobber_t *clobbers; - bool is_volatile; + statement_base_t base; + string_t asm_text; + asm_argument_t *inputs; + asm_argument_t *outputs; + asm_clobber_t *clobbers; + bool is_volatile; }; struct ms_try_statement_t { @@ -734,7 +750,8 @@ union statement_t { }; struct translation_unit_t { - scope_t scope; + scope_t scope; + statement_t *global_asm; }; static inline