X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=6b922bcd7ef6f3446f89f4f1a1a955733dade8f0;hb=338f98ae1cccaf00f2e3db2ba7b0589085ecaf3d;hp=5d40c578c9711a37b16fc6ce188530c9aed7d871;hpb=2f487005db774b00459937cc8e2aec5d381557cd;p=cparser

diff --git a/ast_t.h b/ast_t.h
index 5d40c57..6b922bc 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -73,7 +73,7 @@ struct call_argument_t {
 
 struct call_expression_t {
 	expression_t     expression;
-	expression_t    *method;
+	expression_t    *function;
 	call_argument_t *arguments;
 };
 
@@ -222,8 +222,9 @@ struct initializer_t {
 };
 
 struct declaration_t {
-	unsigned short      namespace;
-	unsigned short      storage_class;
+	unsigned char       namespace;
+	unsigned char       storage_class;
+	unsigned int        address_taken : 1;
 	type_t             *type;
 	symbol_t           *symbol;
 	source_position_t   source_position;
@@ -236,11 +237,15 @@ struct declaration_t {
 	context_t          *parent_context;
 
 	/** next declaration in a context */
-	declaration_t      *context_next;
-	/** next declaration with same symbol */
 	declaration_t      *next;
+	/** next declaration with same symbol */
+	declaration_t      *symbol_next;
 
-	ir_entity          *entity;
+	unsigned char       declaration_type; /* used in ast2firm module */
+	union {
+		unsigned int    value_number;     /* used in ast2firm module */
+		ir_entity      *entity;           /* used in ast2firm module */
+	} v;
 };
 
 typedef enum {
@@ -282,9 +287,6 @@ struct declaration_statement_t {
 	statement_t    statement;
 	declaration_t *declarations_begin;
 	declaration_t *declarations_end;
-
-	int            value_number; /**< filled in by semantic phase */
-	int            refs;
 };
 
 struct if_statement_t {