(untested) support for global variables

[cparser] / type_t.h

diff --git a/type_t.h b/type_t.h
index e9b6618..de76857 100644 (file)
--- a/type_t.h
+++ b/type_t.h
@@ -3,6 +3,8 @@
 
 #include <stdbool.h>
 
+#include <libfirm/firm_types.h>
+
 #include "type.h"
 #include "symbol.h"
 #include "token_t.h"
@@ -17,14 +19,18 @@ typedef enum {
        TYPE_COMPOUND_STRUCT,
        TYPE_COMPOUND_UNION,
        TYPE_ENUM,
-       TYPE_METHOD,
+       TYPE_FUNCTION,
        TYPE_POINTER,
        TYPE_ARRAY,
-       TYPE_BUILTIN
+       TYPE_BUILTIN,
+       TYPE_TYPEDEF,
+       TYPE_TYPEOF
 } type_type_t;
 
+/* note that the constant values represent the rank of the types as defined
+ * in § 6.3.1 */
 typedef enum {
-       ATOMIC_TYPE_INVALID,
+       ATOMIC_TYPE_INVALID = 0,
        ATOMIC_TYPE_VOID,
        ATOMIC_TYPE_CHAR,
        ATOMIC_TYPE_SCHAR,
@@ -63,6 +69,8 @@ typedef enum {
 struct type_t {
        type_type_t       type;
        type_qualifier_t  qualifiers;
+
+       ir_type          *firm_type;
 };
 
 struct atomic_type_t {
@@ -73,16 +81,7 @@ struct atomic_type_t {
 struct builtin_type_t {
        type_t    type;
        symbol_t *symbol;
-};
-
-struct enum_type_t {
-       type_t             type;
-       symbol_t          *symbol;
-       source_position_t  source_position;
-       enum_type_t       *next;
-       declaration_t     *entries_begin;
-       declaration_t     *entries_end;
-       bool               defined;
+       type_t   *real_type;
 };
 
 struct pointer_type_t {
@@ -98,26 +97,43 @@ struct array_type_t {
        expression_t *size;
 };
 
-struct method_parameter_t {
-       type_t             *type;
-       method_parameter_t *next;
+struct function_parameter_t {
+       type_t               *type;
+       function_parameter_t *next;
 };
 
-struct method_type_t {
-       type_t              type;
-       type_t             *result_type;
-       method_parameter_t *parameters;
-       bool                variadic;
-       bool                unspecified_parameters;
+struct function_type_t {
+       type_t               type;
+       type_t              *result_type;
+       function_parameter_t *parameters;
+       bool                 variadic;
+       bool                 unspecified_parameters;
 };
 
 struct compound_type_t {
-       type_t             type;
-       symbol_t          *symbol;
-       context_t          context;
-       source_position_t  source_position;
-       bool               defined;
-       compound_type_t   *next;
+       type_t         type;
+       /** the declaration of the compound type, it's context field
+        * contains the compound entries. */
+       declaration_t *declaration;
+};
+
+struct enum_type_t {
+       type_t         type;
+       /** the declaration of the enum type. You can find the enum entries by
+        * walking the declaration->context_next list until you don't find
+        * STORAGE_CLASS_ENUM_ENTRY declarations anymore */
+       declaration_t *declaration;
+};
+
+struct typedef_type_t {
+       type_t         type;
+       declaration_t *declaration;
+};
+
+struct typeof_type_t {
+       type_t        type;
+       expression_t *expression;
+       type_t       *typeof_type;
 };
 
 type_t *make_atomic_type(atomic_type_type_t type, type_qualifier_t qualifiers);