X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=7efa19480c6d4914325e145e4e8c4274e7015bcf;hb=78cc65b14fc5c53a16368fe5975c70c83e969b19;hp=d19147a3c1051b96a7bebadf2e1d551a230b2fcf;hpb=99fd093374df15b5aaf15f48a900d1a9a012dbd4;p=cparser

diff --git a/ast_t.h b/ast_t.h
index d19147a..7efa194 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -152,8 +152,8 @@ typedef enum {
 	case EXPR_UNARY_ASSUME:                \
 	case EXPR_UNARY_BITFIELD_EXTRACT:
 
-struct context_t {
-	declaration_t *declarations;  /**< List of declarations in this context. */
+struct scope_t {
+	declaration_t *declarations;  /**< List of declarations in this scope. */
 };
 
 struct expression_base_t {
@@ -172,7 +172,7 @@ struct const_expression_t {
 
 struct string_literal_expression_t {
 	expression_base_t  expression;
-	const char        *value;
+	string_t           value;
 };
 
 struct wide_string_literal_expression_t {
@@ -360,8 +360,8 @@ struct initializer_list_t {
 };
 
 struct initializer_string_t {
-	initializer_base_t  initializer;
-	const char         *string;
+	initializer_base_t initializer;
+	string_t           string;
 };
 
 struct initializer_wide_string_t {
@@ -397,6 +397,7 @@ struct declaration_t {
 	decl_modifiers_t    modifiers;
 	unsigned int        address_taken : 1;
 	unsigned int        is_inline     : 1;
+	unsigned int        used          : 1;  /**< Set if the declaration is used. */
 	type_t             *type;
 	symbol_t           *symbol;
 	source_position_t   source_position;
@@ -406,10 +407,10 @@ struct declaration_t {
 		initializer_t  *initializer;
 		expression_t   *enum_value;
 	} init;
-	context_t           context;
-	context_t          *parent_context;
+	scope_t             scope;
+	scope_t            *parent_scope;
 
-	/** next declaration in a context */
+	/** next declaration in a scope */
 	declaration_t      *next;
 	/** next declaration with same symbol */
 	declaration_t      *symbol_next;
@@ -457,7 +458,7 @@ struct return_statement_t {
 struct compound_statement_t {
 	statement_base_t  statement;
 	statement_t      *statements;
-	context_t         context;
+	scope_t           scope;
 };
 
 struct declaration_statement_t {
@@ -474,26 +475,30 @@ struct if_statement_t {
 };
 
 struct switch_statement_t {
-	statement_base_t  statement;
-	expression_t     *expression;
-	statement_t      *body;
+	statement_base_t       statement;
+	expression_t           *expression;
+	statement_t            *body;
+	case_label_statement_t *first_case, *last_case;
 };
 
 struct goto_statement_t {
 	statement_base_t  statement;
-	declaration_t    *label;
+	declaration_t    *label;     /**< The destination label. */
+	goto_statement_t *next;      /**< links all goto statements of a function */
 };
 
 struct case_label_statement_t {
-	statement_base_t  statement;
-	expression_t     *expression;
-	statement_t      *label_statement;
+	statement_base_t        statement;
+	expression_t           *expression;
+	statement_t            *label_statement;
+	case_label_statement_t *next; /**< link to the next case label in the switch */
 };
 
 struct label_statement_t {
-	statement_base_t  statement;
-	declaration_t    *label;
-	statement_t      *label_statement;
+	statement_base_t   statement;
+	declaration_t     *label;
+	statement_t       *label_statement;
+	label_statement_t *next;            /**< links all label statements of a function */
 };
 
 struct expression_statement_t {
@@ -519,24 +524,24 @@ struct for_statement_t {
 	expression_t     *condition;
 	expression_t     *step;
 	statement_t      *body;
-	context_t         context;
+	scope_t           scope;
 };
 
 struct asm_constraint_t {
-	const char       *constraints;
+	string_t          constraints;
 	expression_t     *expression;
 	symbol_t         *symbol;
 	asm_constraint_t *next;
 };
 
 struct asm_clobber_t {
-	const char    *clobber;
+	string_t       clobber;
 	asm_clobber_t *next;
 };
 
 struct asm_statement_t {
 	statement_base_t  statement;
-	const char       *asm_text;
+	string_t          asm_text;
 	asm_constraint_t *inputs;
 	asm_constraint_t *outputs;
 	asm_clobber_t    *clobbers;
@@ -562,7 +567,7 @@ union statement_t {
 };
 
 struct translation_unit_t {
-	context_t context;
+	scope_t scope;
 };
 
 static inline