remove more unnecessary XXX_INVALID constants

[cparser] / entity_t.h

diff --git a/entity_t.h b/entity_t.h
index eca43dd..8c770ea 100644 (file)
--- a/entity_t.h
+++ b/entity_t.h
@@ -28,8 +28,7 @@
 #include "builtins.h"
 
 typedef enum {
-       ENTITY_INVALID,
-       ENTITY_VARIABLE,
+       ENTITY_VARIABLE = 1,
        ENTITY_COMPOUND_MEMBER,
        ENTITY_PARAMETER,
        ENTITY_FUNCTION,
@@ -46,8 +45,7 @@ typedef enum {
 typedef unsigned char entity_kind_t;
 
 typedef enum namespace_tag_t {
-       NAMESPACE_INVALID,
-       NAMESPACE_NORMAL,
+       NAMESPACE_NORMAL = 1,
        NAMESPACE_TAG,
        NAMESPACE_LABEL
 } namespace_tag_t;
@@ -95,6 +93,14 @@ typedef enum decl_modifier_t {
        DM_WEAK              = 1 << 27,
 } decl_modifier_t;
 
+typedef enum elf_visibility_tag_t {
+       ELF_VISIBILITY_DEFAULT,
+       ELF_VISIBILITY_HIDDEN,
+       ELF_VISIBILITY_INTERNAL,
+       ELF_VISIBILITY_PROTECTED,
+       ELF_VISIBILITY_ERROR
+} elf_visibility_tag_t;
+
 /**
  * A scope containing entities.
  */
@@ -157,7 +163,7 @@ struct enum_value_t {
        type_t        *enum_type;
 
        /* ast2firm info */
-       tarval        *tv;
+       ir_tarval     *tv;
 };
 
 struct label_t {
@@ -200,10 +206,13 @@ struct declaration_t {
 
 struct compound_member_t {
        declaration_t  base;
-       bool           read          : 1;
-       bool           address_taken : 1;  /**< Set if the address of this declaration was taken. */
        il_size_t      offset;     /**< the offset of this member in the compound */
        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;
@@ -211,13 +220,14 @@ struct compound_member_t {
 
 struct variable_t {
        declaration_t     base;
-       bool              thread_local  : 1;  /**< GCC __thread */
-       bool              restricta     : 1;
-       bool              deprecated    : 1;
-       bool              noalias       : 1;
+       bool              thread_local   : 1;  /**< GCC __thread */
+       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;
+       bool              address_taken  : 1;  /**< Set if the address of this declaration was taken. */
+       bool              read           : 1;
+       unsigned          elf_visibility : 2;
 
        initializer_t    *initializer;
 
@@ -243,14 +253,16 @@ struct parameter_t {
 
 struct function_t {
        declaration_t  base;
-       bool           is_inline     : 1;
+       bool           is_inline      : 1;
 
-       bool           need_closure  : 1;  /**< Inner function needs closure. */
-       bool           goto_to_outer : 1;  /**< Inner function has goto to outer function. */
+       bool           need_closure   : 1;  /**< Inner function needs closure. */
+       bool           goto_to_outer  : 1;  /**< Inner function has goto to outer function. */
+       unsigned       elf_visibility : 2;
 
        builtin_kind_t btk;
        scope_t        parameters;
        statement_t   *statement;
+       symbol_t      *actual_name;        /**< gnu extension __REDIRECT */
 
        /* ast2firm info */
        ir_entity     *irentity;
@@ -261,8 +273,6 @@ struct function_t {
 union entity_t {
        entity_kind_t      kind;
        entity_base_t      base;
-       compound_t         structe;
-       compound_t         unione;
        compound_t         compound;
        enum_t             enume;
        enum_value_t       enum_value;
@@ -294,6 +304,8 @@ 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 kind);
+entity_t *allocate_entity_zero(entity_kind_t, entity_namespace_t, symbol_t*);
+
+elf_visibility_tag_t get_elf_visibility_from_string(const char *string);
 
 #endif