X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=0c64846143fe46fbfd42593c29fad9092dc8ae97;hb=619e8bbd734140dd6562c9f10c43c029eaa3f52d;hp=0b36f28592711324bb42e55590326d9a94c4aff7;hpb=05dbb10d24382cce46842d47c7eab8471a8c8834;p=cparser

diff --git a/ast_t.h b/ast_t.h
index 0b36f28..0c64846 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -3,7 +3,7 @@
 
 #include "ast.h"
 #include "symbol.h"
-#include "lexer_t.h"
+#include "token_t.h"
 #include "type.h"
 #include "adt/obst.h"
 
@@ -22,6 +22,10 @@ typedef enum {
 	EXPR_SIZEOF,
 } expresion_type_t;
 
+struct context_t {
+	declaration_t *declarations;
+};
+
 struct expression_t {
 	expresion_type_t   type;
 	type_t            *datatype;
@@ -39,11 +43,9 @@ struct string_literal_t {
 };
 
 struct reference_expression_t {
-	expression_t                      expression;
-	symbol_t                         *symbol;
-	union {
-		declaration_t    *declaration;
-	} r;
+	expression_t   expression;
+	symbol_t      *symbol;
+	declaration_t *declaration;
 };
 
 struct call_argument_t {
@@ -119,11 +121,11 @@ struct binary_expression_t {
 };
 
 struct select_expression_t {
-	expression_t      expression;
-	expression_t     *compound;
-	symbol_t         *symbol;
+	expression_t   expression;
+	expression_t  *compound;
+	symbol_t      *symbol;
 
-	compound_entry_t *compound_entry;
+	declaration_t *compound_entry;
 };
 
 struct array_access_expression_t {
@@ -177,11 +179,14 @@ struct declaration_t {
 	method_parameter_t *parameters;
 	statement_t        *statement;
 	source_position_t   source_position;
+	context_t           context;
+
+	declaration_t      *next;
 };
 
 typedef enum {
 	STATEMENT_INVALID,
-	STATEMENT_BLOCK,
+	STATEMENT_COMPOUND,
 	STATEMENT_RETURN,
 	STATEMENT_DECLARATION,
 	STATEMENT_IF,
@@ -201,9 +206,10 @@ struct return_statement_t {
 	expression_t *return_value;
 };
 
-struct block_statement_t {
+struct compound_statement_t {
 	statement_t  statement;
 	statement_t *first_statement;
+	context_t    context;
 };
 
 struct declaration_statement_t {
@@ -237,13 +243,8 @@ struct expression_statement_t {
 	expression_t *expression;
 };
 
-struct unit_entry_t {
-	declaration_t  declaration;
-	unit_entry_t  *next;
-};
-
 struct translation_unit_t {
-	unit_entry_t *entries;
+	context_t context;
 };
 
 static inline