adapt to latest libfirm

[cparser] / entity_t.h

diff --git a/entity_t.h b/entity_t.h
index 2c429c1..21c332f 100644 (file)
--- a/entity_t.h
+++ b/entity_t.h
@@ -25,6 +25,7 @@
 #include "attribute.h"
 #include <libfirm/firm_types.h>
 #include "builtins.h"
+#include "jump_target.h"
 #include "token_t.h"
 
 typedef enum {
@@ -120,7 +121,7 @@ struct entity_base_t {
        entity_kind_t       kind;
        entity_namespace_t  namespc;
        symbol_t           *symbol;
-       source_position_t   source_position;
+       position_t          pos;
        scope_t            *parent_scope;    /**< The scope where this entity
                                                                                      is contained in */
        entity_t           *parent_entity;
@@ -136,6 +137,7 @@ struct compound_t {
        entity_t         *alias; /* used for name mangling of anonymous types */
        scope_t           members;
        decl_modifiers_t  modifiers;
+       attribute_t      *attributes;
        bool              layouted          : 1;
        bool              complete          : 1;
        bool              transparent_union : 1;
@@ -171,10 +173,12 @@ struct label_t {
        entity_base_t  base;
        bool           used : 1;
        bool           address_taken : 1;
+       unsigned       n_users; /* Reference counter to mature the label block as early as possible. */
        statement_t   *statement;
 
        /* ast2firm info */
-       ir_node       *block;
+       jump_target    target;
+       ir_node       *indirect_block;
 };
 
 struct namespace_t {
@@ -211,9 +215,6 @@ struct compound_member_t {
        unsigned char  bit_offset; /**< extra bit offset for bitfield members */
        unsigned char  bit_size;   /**< bitsize for bitfield members */
        bool           bitfield      : 1;  /**< member is (part of) a bitfield */
-       bool           read          : 1;
-       bool           address_taken : 1;  /**< Set if the address of this
-                                               declaration was taken. */
 
        /* ast2firm info */
        ir_entity *entity;
@@ -222,9 +223,6 @@ struct compound_member_t {
 struct variable_t {
        declaration_t     base;
        bool              thread_local   : 1;
-       bool              restricta      : 1;
-       bool              deprecated     : 1;
-       bool              noalias        : 1;
 
        bool              address_taken  : 1;  /**< Set if the address of this declaration was taken. */
        bool              read           : 1;
@@ -250,7 +248,7 @@ struct function_t {
 
        builtin_kind_t btk;
        scope_t        parameters;
-       statement_t   *statement;
+       statement_t   *body;
        symbol_t      *actual_name;        /**< gnu extension __REDIRECT */
 
        /* ast2firm info */
@@ -296,7 +294,7 @@ static inline bool is_declaration(const entity_t *entity)
 
 const char *get_entity_kind_name(entity_kind_t kind);
 
-entity_t *allocate_entity_zero(entity_kind_t, entity_namespace_t, symbol_t*, source_position_t const*);
+entity_t *allocate_entity_zero(entity_kind_t, entity_namespace_t, symbol_t*, position_t const*);
 
 elf_visibility_tag_t get_elf_visibility_from_string(const char *string);