one more

[cparser] / ast_t.h

diff --git a/ast_t.h b/ast_t.h
index 6b6b94e..b3b8bb9 100644 (file)
--- a/ast_t.h
+++ b/ast_t.h
@@ -29,8 +29,12 @@
 #include "type.h"
 #include "adt/obst.h"
 
+/** The AST obstack contains all data that must stay in the AST. */
 extern struct obstack ast_obstack;
 
+/**
+ * Expression kinds.
+ */
 typedef enum {
        EXPR_UNKNOWN = 0,
        EXPR_INVALID,
@@ -247,7 +251,6 @@ struct builtin_prefetch_expression_t {
 
 struct reference_expression_t {
        expression_base_t  base;
-       symbol_t          *symbol;
        declaration_t     *declaration;
 };
 
@@ -430,6 +433,78 @@ 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_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;
+
 /**
  * Extended microsoft modifier.
  */
@@ -456,25 +531,25 @@ struct declaration_t {
        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    decl_modifiers;     /**< MS __declspec 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. */
        unsigned int        address_taken : 1;
        unsigned int        is_inline     : 1;
        unsigned int        used          : 1;  /**< Set if the declaration is used. */
-       unsigned int        deprecated    : 1;  /**< Microsoft of GNU deprecated attribute. */
+       unsigned int        deprecated    : 1;  /**< Microsoft or GNU deprecated attribute. */
        type_t             *type;
        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;
@@ -510,7 +585,9 @@ typedef enum {
        STATEMENT_WHILE,
        STATEMENT_DO_WHILE,
        STATEMENT_FOR,
-       STATEMENT_ASM
+       STATEMENT_ASM,
+       STATEMENT_MS_TRY,
+       STATEMENT_LEAVE
 } statement_kind_t;
 
 struct statement_base_t {
@@ -626,6 +703,17 @@ struct asm_statement_t {
        bool              is_volatile;
 };
 
+struct ms_try_statement_t {
+       statement_base_t  base;
+       statement_t      *try_statement;
+       expression_t     *except_expression; /**< non-null for except, NULL for finally */
+       statement_t      *final_statement;
+};
+
+struct leave_statement_t {
+       statement_base_t  base;
+};
+
 union statement_t {
        statement_kind_t         kind;
        statement_base_t         base;
@@ -642,6 +730,8 @@ union statement_t {
        do_while_statement_t     do_while;
        for_statement_t          fors;
        asm_statement_t          asms;
+       ms_try_statement_t       ms_try;
+       leave_statement_t        leave;
 };
 
 struct translation_unit_t {