X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=aa5a8bb09e68eb9ac40a6aa804ea03e4eefd0731;hb=cc9c901984f246c14e4a5b84ddff9d5b93003048;hp=55f443d02db993f3e0c0b23a89d818ececd1b234;hpb=84f8f5bd135abbaf3d71a62b568af5b0e9bf6aaf;p=cparser

diff --git a/ast_t.h b/ast_t.h
index 55f443d..aa5a8bb 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -76,8 +76,7 @@ typedef enum {
 	EXPR_UNARY_CAST,
 	EXPR_UNARY_CAST_IMPLICIT, /**< compiler generated cast */
 	EXPR_UNARY_ASSUME,        /**< MS __assume() */
-	EXPR_UNARY_BITFIELD_EXTRACT,
-	EXPR_UNARY_LAST = EXPR_UNARY_BITFIELD_EXTRACT,
+	EXPR_UNARY_LAST = EXPR_UNARY_ASSUME,
 
 	EXPR_BINARY_FIRST,
 	EXPR_BINARY_ADD = EXPR_BINARY_FIRST,
@@ -181,8 +180,7 @@ typedef enum {
 	case EXPR_UNARY_PREFIX_DECREMENT:      \
 	case EXPR_UNARY_CAST:                  \
 	case EXPR_UNARY_CAST_IMPLICIT:         \
-	case EXPR_UNARY_ASSUME:                \
-	case EXPR_UNARY_BITFIELD_EXTRACT:
+	case EXPR_UNARY_ASSUME:
 
 /**
  * A scope containing declarations.
@@ -196,6 +194,9 @@ struct expression_base_t {
 	expression_kind_t   kind;
 	type_t             *type;
 	source_position_t   source_position;
+#ifndef NDEBUG
+	bool                transformed;
+#endif
 };
 
 struct const_expression_t {
@@ -509,29 +510,34 @@ typedef enum gnu_attribute_kind_t {
  * Extended microsoft modifier.
  */
 typedef enum {
-	DM_DLLIMPORT        = (1 <<  0),
-	DM_DLLEXPORT        = (1 <<  1),
-	DM_THREAD           = (1 <<  2),
-	DM_NAKED            = (1 <<  3),
-	DM_MICROSOFT_INLINE = (1 <<  4),
-	DM_FORCEINLINE      = (1 <<  5),
-	DM_SELECTANY        = (1 <<  6),
-	DM_NOTHROW          = (1 <<  7),
-	DM_NOVTABLE         = (1 <<  8),
-	DM_NORETURN         = (1 <<  9),
-	DM_NOINLINE         = (1 << 10),
-	DM_RESTRICT         = (1 << 11),
-	DM_NOALIAS          = (1 << 12)
+	DM_DLLIMPORT         = (1 <<  0),
+	DM_DLLEXPORT         = (1 <<  1),
+	DM_THREAD            = (1 <<  2),
+	DM_NAKED             = (1 <<  3),
+	DM_MICROSOFT_INLINE  = (1 <<  4),
+	DM_FORCEINLINE       = (1 <<  5),
+	DM_SELECTANY         = (1 <<  6),
+	DM_NOTHROW           = (1 <<  7),
+	DM_NOVTABLE          = (1 <<  8),
+	DM_NORETURN          = (1 <<  9),
+	DM_NOINLINE          = (1 << 10),
+	DM_RESTRICT          = (1 << 11),
+	DM_NOALIAS           = (1 << 12),
+	DM_PACKED            = (1 << 13),
+	DM_TRANSPARENT_UNION = (1 << 14),
+	DM_PURE              = (1 << 15),
+	DM_CONSTRUCTOR       = (1 << 16),
+	DM_DESTRUCTOR        = (1 << 17)
 } decl_modifier_t;
 
-typedef unsigned short decl_modifiers_t;
+typedef unsigned decl_modifiers_t;
 
 struct declaration_t {
 	unsigned char       namespc;
 	unsigned char       declared_storage_class;
 	unsigned char       storage_class;
 	unsigned char       alignment;          /**< Alignment of the declaration, 0 for default. */
-	decl_modifiers_t    decl_modifiers;     /**< MS __declspec modifiers. */
+	decl_modifiers_t    modifiers;          /**< modifiers. */
 	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. */
@@ -543,7 +549,7 @@ struct declaration_t {
 	symbol_t           *symbol;
 	source_position_t   source_position;
 	union {
-		bool            is_defined;
+		bool            complete;           /**< used to indicate wether struct/union types are already defined or if just the name is declared */
 		statement_t    *statement;
 		initializer_t  *initializer;
 		expression_t   *enum_value;
@@ -594,6 +600,9 @@ struct statement_base_t {
 	statement_kind_t   kind;
 	statement_t       *next;
 	source_position_t  source_position;
+#ifndef NDEBUG
+	bool               transformed;
+#endif
 };
 
 struct invalid_statement_t {
@@ -682,11 +691,11 @@ struct for_statement_t {
 	scope_t           scope;
 };
 
-struct asm_constraint_t {
-	string_t          constraints;
-	expression_t     *expression;
-	symbol_t         *symbol;
-	asm_constraint_t *next;
+struct asm_argument_t {
+	string_t        constraints;
+	expression_t   *expression;
+	symbol_t       *symbol;
+	asm_argument_t *next;
 };
 
 struct asm_clobber_t {
@@ -695,12 +704,12 @@ struct asm_clobber_t {
 };
 
 struct asm_statement_t {
-	statement_base_t  base;
-	string_t          asm_text;
-	asm_constraint_t *inputs;
-	asm_constraint_t *outputs;
-	asm_clobber_t    *clobbers;
-	bool              is_volatile;
+	statement_base_t base;
+	string_t         asm_text;
+	asm_argument_t  *inputs;
+	asm_argument_t  *outputs;
+	asm_clobber_t   *clobbers;
+	bool             is_volatile;
 };
 
 struct ms_try_statement_t {