main: rework preprocessor invocation

[cparser] / entity_t.h

diff --git a/entity_t.h b/entity_t.h
index 58604dd..e1a26ed 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 {
@@ -172,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 {
@@ -245,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 */