X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=652909087298be0cba18232f51b9f575a1fff182;hb=6c0cf065657863296355786c99aac830b85e2d9b;hp=f51f8406a7a67dbb555cb1f6ee65e5d102bca1e1;hpb=33d0f22f0bf12126044af3fe008f35becda774e6;p=cparser

diff --git a/ast_t.h b/ast_t.h
index f51f840..6529090 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -61,6 +61,7 @@ typedef enum expression_kind_t {
 	EXPR_VA_START,
 	EXPR_VA_ARG,
 	EXPR_STATEMENT,
+	EXPR_LABEL_ADDRESS, /**< GCC extension &&label operator */
 
 	EXPR_UNARY_FIRST,
 	EXPR_UNARY_NEGATE = EXPR_UNARY_FIRST,
@@ -280,8 +281,6 @@ struct binary_expression_t {
 struct select_expression_t {
 	expression_base_t  base;
 	expression_t      *compound;
-	symbol_t          *symbol;
-
 	declaration_t     *compound_entry;
 };
 
@@ -339,6 +338,11 @@ struct classify_type_expression_t {
 	expression_t      *type_expression;
 };
 
+struct label_address_expression_t {
+	expression_base_t  base;
+	declaration_t     *declaration;
+};
+
 union expression_t {
 	expression_kind_t                kind;
 	expression_base_t                base;
@@ -363,6 +367,7 @@ union expression_t {
 	conditional_expression_t         conditional;
 	statement_expression_t           statement;
 	classify_type_expression_t       classify_type;
+	label_address_expression_t       label_address;
 };
 
 typedef enum storage_class_tag_t {
@@ -384,6 +389,7 @@ typedef enum namespace_t {
 	NAMESPACE_UNION,
 	NAMESPACE_ENUM,
 	NAMESPACE_LABEL,
+	NAMESPACE_LOCAL_LABEL
 } namespace_t;
 
 typedef enum initializer_kind_t {
@@ -533,7 +539,8 @@ typedef enum decl_modifier_t {
 	DM_CDECL             = 1 << 20,
 	DM_FASTCALL          = 1 << 21,
 	DM_STDCALL           = 1 << 22,
-	DM_THISCALL          = 1 << 23
+	DM_THISCALL          = 1 << 23,
+	DM_DEPRECATED        = 1 << 24
 } decl_modifier_t;
 
 typedef unsigned decl_modifiers_t;
@@ -547,15 +554,17 @@ struct declaration_t {
 	const char         *deprecated_string;  /**< MS deprecated string if any. */
 	symbol_t           *get_property_sym;   /**< MS get property. */
 	symbol_t           *put_property_sym;   /**< MS put property. */
-	unsigned int        address_taken : 1;
+	unsigned int        address_taken : 1;  /**< Set if the address of this declaration was taken. */
 	unsigned int        is_inline     : 1;
 	unsigned int        used          : 1;  /**< Set if the declaration is used. */
-	unsigned int        deprecated    : 1;  /**< Microsoft or GNU deprecated attribute. */
+	unsigned int        implicit      : 1;  /**< Set for implicit (not found in source code) declarations. */
 	type_t             *type;
+	il_size_t           offset;             /**< The offset of this member inside a compound. */
 	symbol_t           *symbol;
+	string_t           *asm_name;           /**< GCC extension: ASM label. */
 	source_position_t   source_position;
 	union {
-		bool            complete;           /**< used to indicate wether struct/union types are already defined or if just the name is declared */
+		bool            complete;           /**< used to indicate whether struct/union types are already defined or if just the name is declared */
 		statement_t    *statement;
 		initializer_t  *initializer;
 		expression_t   *enum_value;
@@ -598,8 +607,8 @@ typedef enum statement_kind_t {
 	STATEMENT_DO_WHILE,
 	STATEMENT_FOR,
 	STATEMENT_ASM,
-	STATEMENT_MS_TRY,
-	STATEMENT_LEAVE
+	STATEMENT_MS_TRY,          /**< MS __try/__finally or __try/__except */
+	STATEMENT_LEAVE            /**< MS __leave */
 } statement_kind_t;
 
 struct statement_base_t {
@@ -646,24 +655,31 @@ struct if_statement_t {
 };
 
 struct switch_statement_t {
-	statement_base_t       base;
+	statement_base_t        base;
 	expression_t           *expression;
 	statement_t            *body;
-	case_label_statement_t *first_case, *last_case;
+	case_label_statement_t *first_case, *last_case;  /**< List of all cases, including default. */
+	case_label_statement_t *default_label;           /**< The default label if existent. */
+	unsigned long           default_proj_nr;         /**< The Proj-number for the default Proj. */
 };
 
 struct goto_statement_t {
 	statement_base_t  base;
-	declaration_t    *label;     /**< The destination label. */
-	goto_statement_t *next;      /**< links all goto statements of a function */
+	declaration_t    *label;      /**< The destination label. */
+	expression_t     *expression; /**< The expression for an assigned goto. */
+	goto_statement_t *next;       /**< links all goto statements of a function */
 };
 
 struct case_label_statement_t {
 	statement_base_t        base;
-	expression_t           *expression;  /**< The case label expression, NULL for default label. */
-	expression_t           *end_range;   /**< For GNUC case a .. b: the end range expression, NULL else. */
+	expression_t           *expression;    /**< The case label expression, NULL for default label. */
+	expression_t           *end_range;     /**< For GNUC case a .. b: the end range expression, NULL else. */
+	case_label_statement_t *next;          /**< link to the next case label in switch */
 	statement_t            *statement;
-	case_label_statement_t *next; /**< link to the next case label in switch */
+	long                   first_case;     /**< The folded value of expression. */
+	long                   last_case;      /**< The folded value of end_range. */
+	bool                   is_bad;         /**< If set marked as bad to suppress warnings. */
+	bool                   is_empty_range; /**< If set marked this as an empty range. */
 };
 
 struct label_statement_t {