X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=53ea2327058f6add7b9ae0dfb219bb7c485aea19;hb=e66a2691d3291916ed2ec07ed1cdead2a95e1a9a;hp=cbd689af436566c698ba73324ea83a82d7ba3ace;hpb=9e29e9c33f6511c4583e5b8ed83194d433e82c45;p=cparser

diff --git a/ast_t.h b/ast_t.h
index cbd689a..53ea232 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,14 +43,9 @@ struct string_literal_t {
 };
 
 struct reference_expression_t {
-	expression_t                      expression;
-	symbol_t                         *symbol;
-	union {
-		variable_declaration_statement_t *variable;
-		method_t                         *method;
-		global_variable_t                *global_variable;
-		method_parameter_t               *method_parameter;
-	} r;
+	expression_t   expression;
+	symbol_t      *symbol;
+	declaration_t *declaration;
 };
 
 struct call_argument_t {
@@ -122,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 {
@@ -137,10 +136,7 @@ struct array_access_expression_t {
 
 struct sizeof_expression_t {
 	expression_t  expression;
-	union {
-		type_t       *type;
-		expression_t *size_expression;
-	} v;
+	type_t       *type;
 };
 
 struct conditional_expression_t {
@@ -160,13 +156,34 @@ struct comma_expression_t {
 	expression_list_element_t *expressions;
 };
 
+typedef enum {
+	STORAGE_CLASS_NONE,
+	STORAGE_CLASS_TYPEDEF,
+	STORAGE_CLASS_EXTERN,
+	STORAGE_CLASS_STATIC,
+	STORAGE_CLASS_AUTO,
+	STORAGE_CLASS_REGISTER
+} storage_class_t;
+
+struct declaration_t {
+	storage_class_t     storage_class;
+	type_t             *type;
+	symbol_t           *symbol;
+	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_VARIABLE_DECLARATION,
+	STATEMENT_DECLARATION,
 	STATEMENT_IF,
 	STATEMENT_EXPRESSION,
+	STATEMENT_CONTINUE,
 	STATEMENT_GOTO,
 	STATEMENT_LABEL
 } statement_type_t;
@@ -182,18 +199,18 @@ struct return_statement_t {
 	expression_t *return_value;
 };
 
-struct block_statement_t {
+struct compound_statement_t {
 	statement_t  statement;
-	statement_t *first_statement;
+	statement_t *statements;
+	context_t    context;
 };
 
-struct variable_declaration_statement_t {
-	statement_t  statement;
-	type_t      *type;
-	symbol_t    *symbol;
+struct declaration_statement_t {
+	statement_t    statement;
+	declaration_t  declaration;
 
-	int          value_number; /**< filled in by semantic phase */
-	int          refs;
+	int            value_number; /**< filled in by semantic phase */
+	int            refs;
 };
 
 struct if_statement_t {
@@ -219,42 +236,8 @@ struct expression_statement_t {
 	expression_t *expression;
 };
 
-enum namespace_entry_type_t {
-	NAMESPACE_ENTRY_INVALID,
-	NAMESPACE_ENTRY_METHOD,
-	NAMESPACE_ENTRY_VARIABLE,
-};
-
-struct namespace_entry_t {
-	namespace_entry_type_t  type;
-	namespace_entry_t      *next;
-	source_position_t       source_position;
-};
-
-struct method_parameter_t {
-	method_parameter_t *next;
-	symbol_t           *symbol;
-	type_t             *type;
-	int                 num;
-};
-
-struct method_t {
-	namespace_entry_t   namespace_entry;
-	symbol_t           *symbol;
-	method_type_t      *type;
-	method_parameter_t *parameters;
-
-	statement_t        *statement;
-};
-
-struct global_variable_t {
-	namespace_entry_t  namespace_entry;
-	symbol_t          *symbol;
-	type_t            *type;
-};
-
-struct namespace_t {
-	namespace_entry_t *entries;
+struct translation_unit_t {
+	context_t context;
 };
 
 static inline