X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=ef20c902984daea0c1bba0bd08a43c1365c0c49e;hb=f017f4f5080052f95185056b3af472ab737bc64a;hp=dac621559d890c40b88abd6662e80ee103d20de0;hpb=cbb685efb1bc71587b73d29bc688eff26c345c11;p=cparser diff --git a/ast_t.h b/ast_t.h index dac6215..ef20c90 100644 --- a/ast_t.h +++ b/ast_t.h @@ -17,8 +17,10 @@ typedef enum { EXPR_INVALID, EXPR_REFERENCE, EXPR_CONST, + EXPR_CHAR_CONST, EXPR_STRING_LITERAL, EXPR_WIDE_STRING_LITERAL, + EXPR_COMPOUND_LITERAL, EXPR_CALL, EXPR_CONDITIONAL, EXPR_SELECT, @@ -51,7 +53,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, @@ -148,55 +151,64 @@ 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. */ + declaration_t *last_declaration; }; struct expression_base_t { expression_kind_t kind; - type_t *datatype; + type_t *type; source_position_t source_position; }; struct const_expression_t { - expression_base_t expression; + expression_base_t base; union { - long long int_value; - long double float_value; + long long int_value; + long double float_value; + string_t chars; } v; }; struct string_literal_expression_t { - expression_base_t expression; - const char *value; + expression_base_t base; + string_t value; }; struct wide_string_literal_expression_t { - expression_base_t expression; + expression_base_t base; wide_string_t value; }; +struct compound_literal_expression_t { + expression_base_t base; + type_t *type; + initializer_t *initializer; +}; + struct builtin_symbol_expression_t { - expression_base_t expression; + expression_base_t base; symbol_t *symbol; }; struct builtin_constant_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *value; }; struct builtin_prefetch_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *adr; expression_t *rw; expression_t *locality; }; struct reference_expression_t { - expression_base_t expression; + expression_base_t base; symbol_t *symbol; declaration_t *declaration; }; @@ -207,24 +219,24 @@ struct call_argument_t { }; struct call_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *function; call_argument_t *arguments; }; struct unary_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *value; }; struct binary_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *left; expression_t *right; }; struct select_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *compound; symbol_t *symbol; @@ -232,60 +244,56 @@ struct select_expression_t { }; struct array_access_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *array_ref; expression_t *index; bool flipped; /* index/ref was written in a 5[a] way */ }; -struct sizeof_expression_t { - expression_base_t expression; - type_t *type; - expression_t *size_expression; -}; - -struct alignof_expression_t { - expression_base_t expression; +struct typeprop_expression_t { + expression_base_t base; type_t *type; + expression_t *tp_expression; }; struct designator_t { - symbol_t *symbol; - expression_t *array_access; - designator_t *next; + source_position_t source_position; + symbol_t *symbol; + expression_t *array_index; + designator_t *next; }; struct offsetof_expression_t { - expression_base_t expression; + expression_base_t base; type_t *type; designator_t *designator; }; struct va_start_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *ap; declaration_t *parameter; }; struct va_arg_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *ap; }; struct conditional_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *condition; expression_t *true_expression; expression_t *false_expression; }; struct statement_expression_t { - expression_base_t expression; + expression_base_t base; statement_t *statement; }; struct classify_type_expression_t { - expression_base_t expression; + expression_base_t base; expression_t *type_expression; }; @@ -295,6 +303,7 @@ union expression_t { const_expression_t conste; string_literal_expression_t string; wide_string_literal_expression_t wide_string; + compound_literal_expression_t compound_literal; builtin_symbol_expression_t builtin_symbol; builtin_constant_expression_t builtin_constant; builtin_prefetch_expression_t builtin_prefetch; @@ -304,27 +313,26 @@ union expression_t { binary_expression_t binary; select_expression_t select; array_access_expression_t array_access; - sizeof_expression_t sizeofe; + typeprop_expression_t typeprop; offsetof_expression_t offsetofe; va_start_expression_t va_starte; va_arg_expression_t va_arge; conditional_expression_t conditional; statement_expression_t statement; classify_type_expression_t classify_type; - alignof_expression_t alignofe; }; typedef enum { STORAGE_CLASS_NONE, - STORAGE_CLASS_TYPEDEF, STORAGE_CLASS_EXTERN, STORAGE_CLASS_STATIC, + STORAGE_CLASS_TYPEDEF, STORAGE_CLASS_AUTO, STORAGE_CLASS_REGISTER, STORAGE_CLASS_ENUM_ENTRY, STORAGE_CLASS_THREAD, STORAGE_CLASS_THREAD_EXTERN, - STORAGE_CLASS_THREAD_STATIC + STORAGE_CLASS_THREAD_STATIC, } storage_class_tag_t; typedef enum { @@ -339,7 +347,8 @@ typedef enum { INITIALIZER_VALUE, INITIALIZER_LIST, INITIALIZER_STRING, - INITIALIZER_WIDE_STRING + INITIALIZER_WIDE_STRING, + INITIALIZER_DESIGNATOR } initializer_kind_t; struct initializer_base_t { @@ -347,26 +356,31 @@ struct initializer_base_t { }; struct initializer_value_t { - initializer_base_t initializer; + initializer_base_t base; expression_t *value; }; struct initializer_list_t { - initializer_base_t initializer; + initializer_base_t base; size_t len; initializer_t *initializers[]; }; struct initializer_string_t { - initializer_base_t initializer; - const char *string; + initializer_base_t base; + string_t string; }; struct initializer_wide_string_t { - initializer_base_t initializer; + initializer_base_t base; wide_string_t string; }; +struct initializer_designator_t { + initializer_base_t base; + designator_t *designator; +}; + union initializer_t { initializer_kind_t kind; initializer_base_t base; @@ -374,6 +388,7 @@ union initializer_t { initializer_list_t list; initializer_string_t string; initializer_wide_string_t wide_string; + initializer_designator_t designator; }; typedef enum { @@ -391,10 +406,12 @@ typedef unsigned short decl_modifiers_t; struct declaration_t { unsigned char namespc; + unsigned char declared_storage_class; 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; @@ -404,10 +421,10 @@ 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; @@ -419,6 +436,7 @@ struct declaration_t { ir_entity *entity; ir_node *block; tarval *enum_val; + ir_type *irtype; } v; }; @@ -448,93 +466,98 @@ struct statement_base_t { }; struct return_statement_t { - statement_base_t statement; - expression_t *return_value; + statement_base_t base; + expression_t *value; }; struct compound_statement_t { - statement_base_t statement; + statement_base_t base; statement_t *statements; - context_t context; + scope_t scope; }; struct declaration_statement_t { - statement_base_t statement; + statement_base_t base; declaration_t *declarations_begin; declaration_t *declarations_end; }; struct if_statement_t { - statement_base_t statement; + statement_base_t base; expression_t *condition; statement_t *true_statement; statement_t *false_statement; }; struct switch_statement_t { - statement_base_t statement; - expression_t *expression; - statement_t *body; + statement_base_t base; + 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; + statement_base_t base; + 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 base; + expression_t *expression; /**< The case label expression, NULL for default label. */ + expression_t *end_range; /**< For GNUC case a .. b: the end range expression, NULL else. */ + statement_t *statement; + case_label_statement_t *next; /**< link to the next case label in switch */ }; struct label_statement_t { - statement_base_t statement; - declaration_t *label; - statement_t *label_statement; + statement_base_t base; + declaration_t *label; + statement_t *statement; + label_statement_t *next; /**< links all label statements of a function */ }; struct expression_statement_t { - statement_base_t statement; + statement_base_t base; expression_t *expression; }; struct while_statement_t { - statement_base_t statement; + statement_base_t base; expression_t *condition; statement_t *body; }; struct do_while_statement_t { - statement_base_t statement; + statement_base_t base; expression_t *condition; statement_t *body; }; struct for_statement_t { - statement_base_t statement; + statement_base_t base; expression_t *initialisation; 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; + statement_base_t base; + string_t asm_text; asm_constraint_t *inputs; asm_constraint_t *outputs; asm_clobber_t *clobbers; @@ -560,7 +583,7 @@ union statement_t { }; struct translation_unit_t { - context_t context; + scope_t scope; }; static inline