fix problems with local anonymous declarations

[cparser] / ast_t.h

diff --git a/ast_t.h b/ast_t.h
index 5a10ce1..1debd43 100644 (file)
--- a/ast_t.h
+++ b/ast_t.h
@@ -158,12 +158,12 @@ struct scope_t {
 
 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;
@@ -171,34 +171,34 @@ struct const_expression_t {
 };
 
 struct string_literal_expression_t {
-       expression_base_t  expression;
+       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 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;
 };
@@ -209,24 +209,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;
 
@@ -234,14 +234,14 @@ 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 typeprop_expression_t {
-       expression_base_t  expression;
+       expression_base_t  base;
        type_t            *type;
        expression_t      *tp_expression;
 };
@@ -253,36 +253,36 @@ struct designator_t {
 };
 
 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;
 };
 
@@ -408,8 +408,6 @@ struct declaration_t {
        declaration_t      *next;
        /** next declaration with same symbol */
        declaration_t      *symbol_next;
-       /** next variable/parameter in function scope/global scope */
-       declaration_t      *next_var;
 
        /* the following fields are used in ast2firm module */
        unsigned char       declaration_kind;
@@ -447,75 +445,75 @@ 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;
        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;
+       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;
+       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;
+       statement_base_t        base;
        expression_t           *expression;
-       statement_t            *label_statement;
-       case_label_statement_t *next; /**< link to the next case label in the switch */
+       statement_t            *statement;
+       case_label_statement_t *next; /**< link to the next case label in switch */
 };
 
 struct label_statement_t {
-       statement_base_t   statement;
+       statement_base_t   base;
        declaration_t     *label;
-       statement_t       *label_statement;
-       label_statement_t *next;            /**< links all label statements of a function */
+       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;
@@ -536,7 +534,7 @@ struct asm_clobber_t {
 };
 
 struct asm_statement_t {
-       statement_base_t  statement;
+       statement_base_t  base;
        string_t          asm_text;
        asm_constraint_t *inputs;
        asm_constraint_t *outputs;