implement K&R style function definitions, code cleanup here and there

[cparser] / type_t.h

diff --git a/type_t.h b/type_t.h
index 5fc4a3e..a45997d 100644 (file)
--- a/type_t.h
+++ b/type_t.h
@@ -1,6 +1,11 @@
 #ifndef TYPE_T_H
 #define TYPE_T_H
 
+#include <stdbool.h>
+#include <assert.h>
+
+#include <libfirm/firm_types.h>
+
 #include "type.h"
 #include "symbol.h"
 #include "token_t.h"
@@ -15,13 +20,18 @@ typedef enum {
        TYPE_COMPOUND_STRUCT,
        TYPE_COMPOUND_UNION,
        TYPE_ENUM,
-       TYPE_METHOD,
+       TYPE_FUNCTION,
        TYPE_POINTER,
-       TYPE_BUILTIN
+       TYPE_ARRAY,
+       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,
@@ -42,8 +52,6 @@ typedef enum {
        ATOMIC_TYPE_FLOAT_COMPLEX,
        ATOMIC_TYPE_DOUBLE_COMPLEX,
        ATOMIC_TYPE_LONG_DOUBLE_COMPLEX,
-#endif
-#ifdef PROVIDE_IMAGINARY
        ATOMIC_TYPE_FLOAT_IMAGINARY,
        ATOMIC_TYPE_DOUBLE_IMAGINARY,
        ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY,
@@ -51,66 +59,133 @@ typedef enum {
 } atomic_type_type_t;
 
 typedef enum {
+       TYPE_QUALIFIER_NONE     = 0,
        TYPE_QUALIFIER_CONST    = 1 << 0,
        TYPE_QUALIFIER_RESTRICT = 1 << 1,
        TYPE_QUALIFIER_VOLATILE = 1 << 2,
-       TYPE_QUALIFIER_INLINE   = 1 << 3,
 } type_qualifier_t;
 
-struct type_t {
-       type_type_t  type;
-       unsigned     qualifiers;
+typedef unsigned int type_qualifiers_t;
+
+struct type_base_t {
+       type_type_t       type;
+       type_qualifiers_t qualifiers;
+
+       ir_type          *firm_type;
 };
 
 struct atomic_type_t {
-       type_t              type;
+       type_base_t         type;
        atomic_type_type_t  atype;
 };
 
 struct builtin_type_t {
-       type_t    type;
-       symbol_t *symbol;
+       type_base_t  type;
+       symbol_t    *symbol;
+       type_t      *real_type;
 };
 
-struct enum_entry_t {
-       symbol_t     *symbol;
-       expression_t *value;
-       enum_entry_t *next;
+struct pointer_type_t {
+       type_base_t  type;
+       type_t      *points_to;
 };
 
-struct enum_type_t {
-       type_t             type;
-       symbol_t          *symbol;
-       enum_entry_t      *entries;
-       source_position_t  source_position;
-       enum_type_t       *next;
+struct array_type_t {
+       type_base_t   type;
+       type_t       *element_type;
+       expression_t *size;
+       bool          is_static;
+       bool          is_variable;
 };
 
-struct pointer_type_t {
-       type_t   type;
-       type_t  *points_to;
+struct function_parameter_t {
+       type_t               *type;
+       function_parameter_t *next;
 };
 
-struct method_parameter_t {
-       type_t             *type;
-       method_parameter_t *next;
+struct function_type_t {
+       type_base_t           type;
+       type_t               *result_type;
+       function_parameter_t *parameters;
+       unsigned              variadic : 1;
+       unsigned              unspecified_parameters : 1;
+       unsigned              kr_style_parameters : 1;
 };
 
-struct method_type_t {
-       type_t              type;
-       type_t             *result_type;
-       method_parameter_t *parameters;
-       int                 variadic;
-       int                 unspecified_parameters;
+struct compound_type_t {
+       type_base_t    type;
+       /** the declaration of the compound type, its context field
+        *  contains the compound entries. */
+       declaration_t *declaration;
 };
 
-struct compound_type_t {
-       type_t             type;
-       symbol_t          *symbol;
-       context_t          context;
-       source_position_t  source_position;
-       int                defined;
-       compound_type_t   *next;
+struct enum_type_t {
+       type_base_t    type;
+       /** the declaration of the enum type. You can find the enum entries by
+        *  walking the declaration->next list until you don't find
+        *  STORAGE_CLASS_ENUM_ENTRY declarations anymore */
+       declaration_t *declaration;
+};
+
+struct typedef_type_t {
+       type_base_t    type;
+       declaration_t *declaration;
+       type_t        *resolved_type;
 };
 
+struct typeof_type_t {
+       type_base_t   type;
+       expression_t *expression;
+       type_t       *typeof_type;
+       type_t       *resolved_type;
+};
+
+union type_t {
+       type_type_t      type;
+       type_base_t      base;
+       atomic_type_t    atomic;
+       builtin_type_t   builtin;
+       pointer_type_t   pointer;
+       array_type_t     array;
+       function_type_t  function;
+       compound_type_t  compound;
+       enum_type_t      enumt;
+       typedef_type_t   typedeft;
+       typeof_type_t    typeoft;
+};
+
+type_t *make_atomic_type(atomic_type_type_t type, type_qualifiers_t qualifiers);
+type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers);
+
+type_t *duplicate_type(type_t *type);
+
+static inline bool is_typeref(const type_t *type)
+{
+       return type->type == TYPE_TYPEDEF || type->type == TYPE_TYPEOF;
+}
+
+static inline bool is_type_atomic(const type_t *type, atomic_type_type_t atype)
+{
+       assert(!is_typeref(type));
+
+       if(type->type != TYPE_ATOMIC)
+               return false;
+       const atomic_type_t *atomic_type = &type->atomic;
+
+       return atomic_type->atype == atype;
+}
+
+static inline bool is_type_pointer(const type_t *type)
+{
+       assert(!is_typeref(type));
+       return type->type == TYPE_POINTER;
+}
+
+static inline bool is_type_compound(const type_t *type)
+{
+       assert(!is_typeref(type));
+       return type->type == TYPE_COMPOUND_STRUCT
+               || type->type == TYPE_COMPOUND_UNION;
+}
+
 #endif