eat() the ':' token of a label statement instead of expect()ing it, because the looka...

[cparser] / ast_t.h

diff --git a/ast_t.h b/ast_t.h
index 5860cc1..d19147a 100644 (file)
--- a/ast_t.h
+++ b/ast_t.h
@@ -25,10 +25,13 @@ typedef enum {
        EXPR_ARRAY_ACCESS,
        EXPR_SIZEOF,
        EXPR_CLASSIFY_TYPE,
+       EXPR_ALIGNOF,
 
        EXPR_FUNCTION,
        EXPR_PRETTY_FUNCTION,
        EXPR_BUILTIN_SYMBOL,
+       EXPR_BUILTIN_CONSTANT_P,
+       EXPR_BUILTIN_PREFETCH,
        EXPR_OFFSETOF,
        EXPR_VA_START,
        EXPR_VA_ARG,
@@ -48,7 +51,8 @@ typedef enum {
        EXPR_UNARY_CAST,
        EXPR_UNARY_CAST_IMPLICIT, /**< compiler generated cast */
        EXPR_UNARY_ASSUME,        /**< MS __assume() */
-       EXPR_UNARY_LAST = EXPR_UNARY_ASSUME,
+       EXPR_UNARY_BITFIELD_EXTRACT,
+       EXPR_UNARY_LAST = EXPR_UNARY_BITFIELD_EXTRACT,
 
        EXPR_BINARY_FIRST,
        EXPR_BINARY_ADD = EXPR_BINARY_FIRST,
@@ -145,10 +149,11 @@ typedef enum {
        case EXPR_UNARY_PREFIX_DECREMENT:      \
        case EXPR_UNARY_CAST:                  \
        case EXPR_UNARY_CAST_IMPLICIT:         \
-       case EXPR_UNARY_ASSUME:
+       case EXPR_UNARY_ASSUME:                \
+       case EXPR_UNARY_BITFIELD_EXTRACT:
 
 struct context_t {
-       declaration_t *declarations;
+       declaration_t *declarations;  /**< List of declarations in this context. */
 };
 
 struct expression_base_t {
@@ -180,6 +185,18 @@ struct builtin_symbol_expression_t {
        symbol_t          *symbol;
 };
 
+struct builtin_constant_expression_t {
+       expression_base_t  expression;
+       expression_t      *value;
+};
+
+struct builtin_prefetch_expression_t {
+       expression_base_t  expression;
+       expression_t      *adr;
+       expression_t      *rw;
+       expression_t      *locality;
+};
+
 struct reference_expression_t {
        expression_base_t  expression;
        symbol_t          *symbol;
@@ -229,6 +246,11 @@ struct sizeof_expression_t {
        expression_t      *size_expression;
 };
 
+struct alignof_expression_t {
+       expression_base_t  expression;
+       type_t            *type;
+};
+
 struct designator_t {
        symbol_t     *symbol;
        expression_t *array_access;
@@ -276,6 +298,8 @@ union expression_t {
        string_literal_expression_t      string;
        wide_string_literal_expression_t wide_string;
        builtin_symbol_expression_t      builtin_symbol;
+       builtin_constant_expression_t    builtin_constant;
+       builtin_prefetch_expression_t    builtin_prefetch;
        reference_expression_t           reference;
        call_expression_t                call;
        unary_expression_t               unary;
@@ -289,6 +313,7 @@ union expression_t {
        conditional_expression_t         conditional;
        statement_expression_t           statement;
        classify_type_expression_t       classify_type;
+       alignof_expression_t             alignofe;
 };
 
 typedef enum {
@@ -369,7 +394,7 @@ typedef unsigned short decl_modifiers_t;
 struct declaration_t {
        unsigned char       namespc;
        unsigned char       storage_class;
-       decl_modifiers_t    decl_modifiers;
+       decl_modifiers_t    modifiers;
        unsigned int        address_taken : 1;
        unsigned int        is_inline     : 1;
        type_t             *type;
@@ -390,7 +415,7 @@ struct declaration_t {
        declaration_t      *symbol_next;
 
        /* the following fields are used in ast2firm module */
-       unsigned char       declaration_type;
+       unsigned char       declaration_kind;
        union {
                unsigned int    value_number;
                ir_entity      *entity;