Add EXPR_LITERAL_BOOLEAN to get_expression_struct_size().
[cparser] / ast_t.h
diff --git a/ast_t.h b/ast_t.h
index af807be..601d578 100644 (file)
--- a/ast_t.h
+++ b/ast_t.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -66,9 +66,15 @@ typedef enum expression_kind_t {
        EXPR_INVALID,
        EXPR_REFERENCE,
        EXPR_REFERENCE_ENUM_VALUE,
-       EXPR_CONST,
-       EXPR_CHARACTER_CONSTANT,
-       EXPR_WIDE_CHARACTER_CONSTANT,
+       EXPR_LITERAL_BOOLEAN,
+       EXPR_LITERAL_INTEGER,
+       EXPR_LITERAL_INTEGER_OCTAL,
+       EXPR_LITERAL_INTEGER_HEXADECIMAL,
+       EXPR_LITERAL_FLOATINGPOINT,
+       EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL,
+       EXPR_LITERAL_CHARACTER,
+       EXPR_LITERAL_WIDE_CHARACTER,
+       EXPR_LITERAL_MS_NOOP, /**< MS __noop extension */
        EXPR_STRING_LITERAL,
        EXPR_WIDE_STRING_LITERAL,
        EXPR_COMPOUND_LITERAL,
@@ -226,6 +232,17 @@ typedef enum funcname_kind_t {
        EXPR_UNARY_CASES_MANDATORY \
        EXPR_UNARY_CASES_OPTIONAL
 
+#define EXPR_LITERAL_CASES                        \
+       case EXPR_LITERAL_BOOLEAN:                    \
+       case EXPR_LITERAL_INTEGER:                    \
+       case EXPR_LITERAL_INTEGER_OCTAL:              \
+       case EXPR_LITERAL_INTEGER_HEXADECIMAL:        \
+       case EXPR_LITERAL_FLOATINGPOINT:              \
+       case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL:  \
+       case EXPR_LITERAL_CHARACTER:                  \
+       case EXPR_LITERAL_WIDE_CHARACTER:             \
+       case EXPR_LITERAL_MS_NOOP:
+
 /**
  * The base class of every expression.
  */
@@ -233,25 +250,22 @@ struct expression_base_t {
        expression_kind_t   kind;            /**< The expression kind. */
        type_t             *type;            /**< The type of the expression. */
        source_position_t   source_position; /**< The source position of this expression. */
-       bool                parenthesized;
+       bool                parenthesized : 1;
 #ifndef NDEBUG
-       bool                transformed;     /**< Set if this expression was transformed. */
+       bool                transformed : 1;     /**< Set if this expression was transformed. */
 #endif
 };
 
 /**
- * A constant.
+ * integer/float constants, character and string literals
  */
-struct const_expression_t {
+struct literal_expression_t {
        expression_base_t  base;
-       union {
-               long long      int_value;
-               long double    float_value;
-               string_t       character;
-               wide_string_t  wide_character;
-       } v;
-       bool               is_ms_noop;  /**< True, if this constant is the result
-                                            of an microsoft __noop operator */
+       string_t           value;
+       symbol_t          *suffix;
+
+       /* ast2firm data */
+       ir_tarval         *target_value;
 };
 
 struct string_literal_expression_t {
@@ -265,11 +279,6 @@ struct funcname_expression_t {
        string_t           value;     /**< the value once assigned. */
 };
 
-struct wide_string_literal_expression_t {
-       expression_base_t  base;
-       wide_string_t      value;
-};
-
 struct compound_literal_expression_t {
        expression_base_t  base;
        type_t            *type;
@@ -323,6 +332,8 @@ struct select_expression_t {
        expression_base_t  base;
        expression_t      *compound;
        entity_t          *compound_entry;
+       bool               implicit : 1; /**< compiler generated select
+                                             (for anonymous struct/union) */
 };
 
 struct array_access_expression_t {
@@ -393,10 +404,9 @@ struct label_address_expression_t {
 union expression_t {
        expression_kind_t                     kind;
        expression_base_t                     base;
-       const_expression_t                    conste;
+       literal_expression_t                  literal;
+       string_literal_expression_t           string_literal;
        funcname_expression_t                 funcname;
-       string_literal_expression_t           string;
-       wide_string_literal_expression_t      wide_string;
        compound_literal_expression_t         compound_literal;
        builtin_constant_expression_t         builtin_constant;
        builtin_types_compatible_expression_t builtin_types_compatible;
@@ -447,7 +457,7 @@ struct initializer_string_t {
 
 struct initializer_wide_string_t {
        initializer_base_t  base;
-       wide_string_t       string;
+       string_t            string;
 };
 
 struct initializer_designator_t {
@@ -465,79 +475,6 @@ union initializer_t {
        initializer_designator_t  designator;
 };
 
-/**
- * GNU attributes.
- */
-typedef enum gnu_attribute_kind_t {
-       GNU_AK_CONST,
-       GNU_AK_VOLATILE,
-       GNU_AK_CDECL,
-       GNU_AK_STDCALL,
-       GNU_AK_FASTCALL,
-       GNU_AK_DEPRECATED,
-       GNU_AK_NOINLINE,
-       GNU_AK_RETURNS_TWICE,
-       GNU_AK_NORETURN,
-       GNU_AK_NAKED,
-       GNU_AK_PURE,
-       GNU_AK_ALWAYS_INLINE,
-       GNU_AK_MALLOC,
-       GNU_AK_WEAK,
-       GNU_AK_CONSTRUCTOR,
-       GNU_AK_DESTRUCTOR,
-       GNU_AK_NOTHROW,
-       GNU_AK_TRANSPARENT_UNION,
-       GNU_AK_COMMON,
-       GNU_AK_NOCOMMON,
-       GNU_AK_PACKED,
-       GNU_AK_SHARED,
-       GNU_AK_NOTSHARED,
-       GNU_AK_USED,
-       GNU_AK_UNUSED,
-       GNU_AK_NO_INSTRUMENT_FUNCTION,
-       GNU_AK_WARN_UNUSED_RESULT,
-       GNU_AK_LONGCALL,
-       GNU_AK_SHORTCALL,
-       GNU_AK_LONG_CALL,
-       GNU_AK_SHORT_CALL,
-       GNU_AK_FUNCTION_VECTOR,
-       GNU_AK_INTERRUPT,
-       GNU_AK_INTERRUPT_HANDLER,
-       GNU_AK_NMI_HANDLER,
-       GNU_AK_NESTING,
-       GNU_AK_NEAR,
-       GNU_AK_FAR,
-       GNU_AK_SIGNAL,
-       GNU_AK_EIGTHBIT_DATA,
-       GNU_AK_TINY_DATA,
-       GNU_AK_SAVEALL,
-       GNU_AK_FLATTEN,
-       GNU_AK_SSEREGPARM,
-       GNU_AK_EXTERNALLY_VISIBLE,
-       GNU_AK_RETURN_TWICE,
-       GNU_AK_MAY_ALIAS,
-       GNU_AK_MS_STRUCT,
-       GNU_AK_GCC_STRUCT,
-       GNU_AK_DLLIMPORT,
-       GNU_AK_DLLEXPORT,
-       GNU_AK_ALIGNED,
-       GNU_AK_ALIAS,
-       GNU_AK_SECTION,
-       GNU_AK_FORMAT,
-       GNU_AK_FORMAT_ARG,
-       GNU_AK_WEAKREF,
-       GNU_AK_NONNULL,
-       GNU_AK_TLS_MODEL,
-       GNU_AK_VISIBILITY,
-       GNU_AK_REGPARM,
-       GNU_AK_MODEL,
-       GNU_AK_MODE,
-       GNU_AK_TRAP_EXIT,
-       GNU_AK_SP_SWITCH,
-       GNU_AK_SENTINEL,
-       GNU_AK_LAST
-} gnu_attribute_kind_t;
-
 /**
  * The statement kinds.
  */
@@ -730,25 +667,35 @@ struct translation_unit_t {
        statement_t *global_asm;
 };
 
-static inline
-void *_allocate_ast(size_t size)
+static inline void *allocate_ast(size_t size)
 {
        return obstack_alloc(&ast_obstack, size);
 }
 
-static inline
-bool is_invalid_expression(expression_t *expression)
+static inline bool is_invalid_expression(expression_t *expression)
 {
        return expression->base.kind == EXPR_INVALID;
 }
 
-static inline
-bool is_invalid_statement(statement_t *statement)
+static inline bool is_invalid_statement(statement_t *statement)
 {
        return statement->base.kind == STATEMENT_INVALID;
 }
 
+/**
+ * Allocate an AST node with given size and
+ * initialize all fields with zero.
+ */
+static inline void *allocate_ast_zero(size_t size)
+{
+       void *res = allocate_ast(size);
+       memset(res, 0, size);
+       return res;
+}
 
-#define allocate_ast(size)                 _allocate_ast(size)
+/** If set, implicit casts are printed. */
+extern bool print_implicit_casts;
+/** If set parenthesis are printed to indicate operator precedence. */
+extern bool print_parenthesis;
 
 #endif