parser: Remove the unused attribute alignment from struct declaration_specifiers_t.

[cparser] / entity_t.h

diff --git a/entity_t.h b/entity_t.h
index b570f1a..f2ee603 100644 (file)
--- a/entity_t.h
+++ b/entity_t.h
@@ -1,30 +1,17 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #ifndef ENTITY_T_H
 #define ENTITY_T_H
 
+#include "ast.h"
 #include "symbol.h"
 #include "entity.h"
 #include "attribute.h"
 #include <libfirm/firm_types.h>
 #include "builtins.h"
+#include "jump_target.h"
 #include "token_t.h"
 
 typedef enum {
@@ -120,7 +107,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;
@@ -154,9 +141,6 @@ struct enum_t {
        entity_base_t  base;
        entity_t      *alias; /* used for name mangling of anonymous types */
        bool           complete : 1;
-
-       /* ast2firm info */
-       ir_type       *irtype;
 };
 
 struct enum_value_t {
@@ -176,7 +160,8 @@ struct label_t {
        statement_t   *statement;
 
        /* ast2firm info */
-       ir_node       *block;
+       jump_target    target;
+       ir_node       *indirect_block;
 };
 
 struct namespace_t {
@@ -282,7 +267,7 @@ union entity_t {
 
 static inline bool is_declaration(const entity_t *entity)
 {
-       switch(entity->kind) {
+       switch (entity->kind) {
        case DECLARATION_KIND_CASES:
                return true;
        default:
@@ -292,7 +277,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);