Fix comment.

[cparser] / ast_t.h

diff --git a/ast_t.h b/ast_t.h
index 3bc1974..aa5a8bb 100644 (file)
--- 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 {
@@ -251,7 +252,6 @@ struct builtin_prefetch_expression_t {
 
 struct reference_expression_t {
        expression_base_t  base;
-       symbol_t          *symbol;
        declaration_t     *declaration;
 };
 
@@ -499,6 +499,7 @@ typedef enum gnu_attribute_kind_t {
        GNU_AK_VISIBILITY,
        GNU_AK_REGPARM,
        GNU_AK_MODEL,
+       GNU_AK_MODE,
        GNU_AK_TRAP_EXIT,
        GNU_AK_SP_SWITCH,
        GNU_AK_SENTINEL,
@@ -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    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,13 +549,13 @@ 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;
        } init;
        scope_t             scope;              /**< The scope that this declaration opens. */
-       scope_t            *parent_scope;       /**< The parant scope where this declaration lives. */
+       scope_t            *parent_scope;       /**< The parent scope where this declaration lives. */
 
        /** next declaration in a scope */
        declaration_t      *next;
@@ -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 {