X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=7efa19480c6d4914325e145e4e8c4274e7015bcf;hb=78cc65b14fc5c53a16368fe5975c70c83e969b19;hp=5860cc1e0de6c58648104ae0fc6257bf94cba9ce;hpb=c8fc7380fec1a14d8bb748ebe5fa5d07a02fb5fb;p=cparser diff --git a/ast_t.h b/ast_t.h index 5860cc1..7efa194 100644 --- a/ast_t.h +++ b/ast_t.h @@ -25,10 +25,13 @@ typedef enum { EXPR_ARRAY_ACCESS, EXPR_SIZEOF, EXPR_CLASSIFY_TYPE, + EXPR_ALIGNOF, EXPR_FUNCTION, EXPR_PRETTY_FUNCTION, EXPR_BUILTIN_SYMBOL, + EXPR_BUILTIN_CONSTANT_P, + EXPR_BUILTIN_PREFETCH, EXPR_OFFSETOF, EXPR_VA_START, EXPR_VA_ARG, @@ -48,7 +51,8 @@ typedef enum { EXPR_UNARY_CAST, EXPR_UNARY_CAST_IMPLICIT, /**< compiler generated cast */ EXPR_UNARY_ASSUME, /**< MS __assume() */ - EXPR_UNARY_LAST = EXPR_UNARY_ASSUME, + EXPR_UNARY_BITFIELD_EXTRACT, + EXPR_UNARY_LAST = EXPR_UNARY_BITFIELD_EXTRACT, EXPR_BINARY_FIRST, EXPR_BINARY_ADD = EXPR_BINARY_FIRST, @@ -145,10 +149,11 @@ typedef enum { case EXPR_UNARY_PREFIX_DECREMENT: \ case EXPR_UNARY_CAST: \ case EXPR_UNARY_CAST_IMPLICIT: \ - case EXPR_UNARY_ASSUME: + case EXPR_UNARY_ASSUME: \ + case EXPR_UNARY_BITFIELD_EXTRACT: -struct context_t { - declaration_t *declarations; +struct scope_t { + declaration_t *declarations; /**< List of declarations in this scope. */ }; struct expression_base_t { @@ -167,7 +172,7 @@ struct const_expression_t { struct string_literal_expression_t { expression_base_t expression; - const char *value; + string_t value; }; struct wide_string_literal_expression_t { @@ -180,6 +185,18 @@ struct builtin_symbol_expression_t { symbol_t *symbol; }; +struct builtin_constant_expression_t { + expression_base_t expression; + expression_t *value; +}; + +struct builtin_prefetch_expression_t { + expression_base_t expression; + expression_t *adr; + expression_t *rw; + expression_t *locality; +}; + struct reference_expression_t { expression_base_t expression; symbol_t *symbol; @@ -229,6 +246,11 @@ struct sizeof_expression_t { expression_t *size_expression; }; +struct alignof_expression_t { + expression_base_t expression; + type_t *type; +}; + struct designator_t { symbol_t *symbol; expression_t *array_access; @@ -276,6 +298,8 @@ union expression_t { string_literal_expression_t string; wide_string_literal_expression_t wide_string; builtin_symbol_expression_t builtin_symbol; + builtin_constant_expression_t builtin_constant; + builtin_prefetch_expression_t builtin_prefetch; reference_expression_t reference; call_expression_t call; unary_expression_t unary; @@ -289,6 +313,7 @@ union expression_t { conditional_expression_t conditional; statement_expression_t statement; classify_type_expression_t classify_type; + alignof_expression_t alignofe; }; typedef enum { @@ -335,8 +360,8 @@ struct initializer_list_t { }; struct initializer_string_t { - initializer_base_t initializer; - const char *string; + initializer_base_t initializer; + string_t string; }; struct initializer_wide_string_t { @@ -369,9 +394,10 @@ typedef unsigned short decl_modifiers_t; struct declaration_t { unsigned char namespc; unsigned char storage_class; - decl_modifiers_t decl_modifiers; + decl_modifiers_t modifiers; unsigned int address_taken : 1; unsigned int is_inline : 1; + unsigned int used : 1; /**< Set if the declaration is used. */ type_t *type; symbol_t *symbol; source_position_t source_position; @@ -381,16 +407,16 @@ struct declaration_t { initializer_t *initializer; expression_t *enum_value; } init; - context_t context; - context_t *parent_context; + scope_t scope; + scope_t *parent_scope; - /** next declaration in a context */ + /** next declaration in a scope */ declaration_t *next; /** next declaration with same symbol */ declaration_t *symbol_next; /* the following fields are used in ast2firm module */ - unsigned char declaration_type; + unsigned char declaration_kind; union { unsigned int value_number; ir_entity *entity; @@ -432,7 +458,7 @@ struct return_statement_t { struct compound_statement_t { statement_base_t statement; statement_t *statements; - context_t context; + scope_t scope; }; struct declaration_statement_t { @@ -449,26 +475,30 @@ struct if_statement_t { }; struct switch_statement_t { - statement_base_t statement; - expression_t *expression; - statement_t *body; + statement_base_t statement; + expression_t *expression; + statement_t *body; + case_label_statement_t *first_case, *last_case; }; struct goto_statement_t { statement_base_t statement; - declaration_t *label; + declaration_t *label; /**< The destination label. */ + goto_statement_t *next; /**< links all goto statements of a function */ }; struct case_label_statement_t { - statement_base_t statement; - expression_t *expression; - statement_t *label_statement; + statement_base_t statement; + expression_t *expression; + statement_t *label_statement; + case_label_statement_t *next; /**< link to the next case label in the switch */ }; struct label_statement_t { - statement_base_t statement; - declaration_t *label; - statement_t *label_statement; + statement_base_t statement; + declaration_t *label; + statement_t *label_statement; + label_statement_t *next; /**< links all label statements of a function */ }; struct expression_statement_t { @@ -494,24 +524,24 @@ struct for_statement_t { expression_t *condition; expression_t *step; statement_t *body; - context_t context; + scope_t scope; }; struct asm_constraint_t { - const char *constraints; + string_t constraints; expression_t *expression; symbol_t *symbol; asm_constraint_t *next; }; struct asm_clobber_t { - const char *clobber; + string_t clobber; asm_clobber_t *next; }; struct asm_statement_t { statement_base_t statement; - const char *asm_text; + string_t asm_text; asm_constraint_t *inputs; asm_constraint_t *outputs; asm_clobber_t *clobbers; @@ -537,7 +567,7 @@ union statement_t { }; struct translation_unit_t { - context_t context; + scope_t scope; }; static inline