use functions instead of macros, reformat/reindent

[cparser] / entity_t.h

diff --git a/entity_t.h b/entity_t.h
index ee19b7b..c0142ea 100644 (file)
--- a/entity_t.h
+++ b/entity_t.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * 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
@@ -33,6 +33,7 @@ typedef enum {
        ENTITY_PARAMETER,
        ENTITY_FUNCTION,
        ENTITY_TYPEDEF,
+       ENTITY_CLASS,
        ENTITY_STRUCT,
        ENTITY_UNION,
        ENTITY_ENUM,
@@ -97,9 +98,9 @@ typedef enum decl_modifier_t {
  */
 struct scope_t {
        entity_t *entities;
-       entity_t *last_entity;
-       unsigned  depth;        /**< while parsing, the depth of this scope in the
-                                    scope stack. */
+       entity_t *last_entity; /**< pointer to last entity (so appending is fast) */
+       unsigned  depth;       /**< while parsing, the depth of this scope in the
+                                   scope stack. */
 };
 
 /**
@@ -303,7 +304,7 @@ struct function_t {
        statement_t   *statement;
 
        /* ast2firm info */
-       ir_entity     *entity;
+       ir_entity     *irentity;
        ir_node       *static_link;        /**< if need_closure is set, the node representing
                                                                                    the static link. */
 };