Parse C++ references.
authorChristoph Mallon <christoph.mallon@gmx.de>
Tue, 18 Nov 2008 14:39:59 +0000 (14:39 +0000)
committerChristoph Mallon <christoph.mallon@gmx.de>
Tue, 18 Nov 2008 14:39:59 +0000 (14:39 +0000)
[r23759]

ast2firm.c
mangle.c
parser.c
type.c
type.h
type_hash.c
type_t.h

index bffaed2..317f259 100644 (file)
@@ -259,6 +259,7 @@ static unsigned get_type_size_const(type_t *type)
                /* just a pointer to the function */
                return get_mode_size_bytes(mode_P_code);
        case TYPE_POINTER:
+       case TYPE_REFERENCE:
                return get_mode_size_bytes(mode_P_data);
        case TYPE_ARRAY:
                return get_array_type_size(&type->array);
@@ -438,6 +439,16 @@ static ir_type *create_pointer_type(pointer_type_t *type)
        return ir_type;
 }
 
+static ir_type *create_reference_type(reference_type_t *type)
+{
+       type_t  *refers_to    = type->refers_to;
+       ir_type *ir_refers_to = get_ir_type_incomplete(refers_to);
+       ir_type *ir_type      = new_type_pointer(id_unique("reference.%u"),
+                                                ir_refers_to, mode_P_data);
+
+       return ir_type;
+}
+
 static ir_type *create_array_type(array_type_t *type)
 {
        type_t  *element_type    = type->element_type;
@@ -834,6 +845,9 @@ ir_type *get_ir_type(type_t *type)
        case TYPE_POINTER:
                firm_type = create_pointer_type(&type->pointer);
                break;
+       case TYPE_REFERENCE:
+               firm_type = create_reference_type(&type->reference);
+               break;
        case TYPE_ARRAY:
                firm_type = create_array_type(&type->array);
                break;
@@ -2793,71 +2807,78 @@ typedef enum gcc_type_class
 
 static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr)
 {
-       const type_t *const type = skip_typeref(expr->type_expression->base.type);
+       type_t *type = expr->type_expression->base.type;
 
+       /* FIXME gcc returns different values depending on whether compiling C or C++
+        * e.g. int x[10] is pointer_type_class in C, but array_type_class in C++ */
        gcc_type_class tc;
-       switch (type->kind)
-       {
-               case TYPE_ATOMIC: {
-                       const atomic_type_t *const atomic_type = &type->atomic;
-                       switch (atomic_type->akind) {
-                               /* should not be reached */
-                               case ATOMIC_TYPE_INVALID:
-                                       tc = no_type_class;
-                                       goto make_const;
-
-                               /* gcc cannot do that */
-                               case ATOMIC_TYPE_VOID:
-                                       tc = void_type_class;
-                                       goto make_const;
-
-                               case ATOMIC_TYPE_CHAR:      /* gcc handles this as integer */
-                               case ATOMIC_TYPE_SCHAR:     /* gcc handles this as integer */
-                               case ATOMIC_TYPE_UCHAR:     /* gcc handles this as integer */
-                               case ATOMIC_TYPE_SHORT:
-                               case ATOMIC_TYPE_USHORT:
-                               case ATOMIC_TYPE_INT:
-                               case ATOMIC_TYPE_UINT:
-                               case ATOMIC_TYPE_LONG:
-                               case ATOMIC_TYPE_ULONG:
-                               case ATOMIC_TYPE_LONGLONG:
-                               case ATOMIC_TYPE_ULONGLONG:
-                               case ATOMIC_TYPE_BOOL:      /* gcc handles this as integer */
-                                       tc = integer_type_class;
-                                       goto make_const;
-
-                               case ATOMIC_TYPE_FLOAT:
-                               case ATOMIC_TYPE_DOUBLE:
-                               case ATOMIC_TYPE_LONG_DOUBLE:
-                                       tc = real_type_class;
-                                       goto make_const;
+       for (;;) {
+               type = skip_typeref(type);
+               switch (type->kind) {
+                       case TYPE_ATOMIC: {
+                               const atomic_type_t *const atomic_type = &type->atomic;
+                               switch (atomic_type->akind) {
+                                       /* should not be reached */
+                                       case ATOMIC_TYPE_INVALID:
+                                               tc = no_type_class;
+                                               goto make_const;
+
+                                       /* gcc cannot do that */
+                                       case ATOMIC_TYPE_VOID:
+                                               tc = void_type_class;
+                                               goto make_const;
+
+                                       case ATOMIC_TYPE_CHAR:      /* gcc handles this as integer */
+                                       case ATOMIC_TYPE_SCHAR:     /* gcc handles this as integer */
+                                       case ATOMIC_TYPE_UCHAR:     /* gcc handles this as integer */
+                                       case ATOMIC_TYPE_SHORT:
+                                       case ATOMIC_TYPE_USHORT:
+                                       case ATOMIC_TYPE_INT:
+                                       case ATOMIC_TYPE_UINT:
+                                       case ATOMIC_TYPE_LONG:
+                                       case ATOMIC_TYPE_ULONG:
+                                       case ATOMIC_TYPE_LONGLONG:
+                                       case ATOMIC_TYPE_ULONGLONG:
+                                       case ATOMIC_TYPE_BOOL:      /* gcc handles this as integer */
+                                               tc = integer_type_class;
+                                               goto make_const;
+
+                                       case ATOMIC_TYPE_FLOAT:
+                                       case ATOMIC_TYPE_DOUBLE:
+                                       case ATOMIC_TYPE_LONG_DOUBLE:
+                                               tc = real_type_class;
+                                               goto make_const;
+                               }
+                               panic("Unexpected atomic type in classify_type_to_firm().");
                        }
-                       panic("Unexpected atomic type in classify_type_to_firm().");
-               }
 
-               case TYPE_COMPLEX:         tc = complex_type_class; goto make_const;
-               case TYPE_IMAGINARY:       tc = complex_type_class; goto make_const;
-               case TYPE_BITFIELD:        tc = integer_type_class; goto make_const;
-               case TYPE_ARRAY:           /* gcc handles this as pointer */
-               case TYPE_FUNCTION:        /* gcc handles this as pointer */
-               case TYPE_POINTER:         tc = pointer_type_class; goto make_const;
-               case TYPE_COMPOUND_STRUCT: tc = record_type_class;  goto make_const;
-               case TYPE_COMPOUND_UNION:  tc = union_type_class;   goto make_const;
-
-               /* gcc handles this as integer */
-               case TYPE_ENUM:            tc = integer_type_class; goto make_const;
-
-               case TYPE_BUILTIN:
-               /* typedef/typeof should be skipped already */
-               case TYPE_TYPEDEF:
-               case TYPE_TYPEOF:
-               case TYPE_INVALID:
-               case TYPE_ERROR:
-                       break;
+                       case TYPE_COMPLEX:         tc = complex_type_class; goto make_const;
+                       case TYPE_IMAGINARY:       tc = complex_type_class; goto make_const;
+                       case TYPE_BITFIELD:        tc = integer_type_class; goto make_const;
+                       case TYPE_ARRAY:           /* gcc handles this as pointer */
+                       case TYPE_FUNCTION:        /* gcc handles this as pointer */
+                       case TYPE_POINTER:         tc = pointer_type_class; goto make_const;
+                       case TYPE_COMPOUND_STRUCT: tc = record_type_class;  goto make_const;
+                       case TYPE_COMPOUND_UNION:  tc = union_type_class;   goto make_const;
+
+                       /* gcc handles this as integer */
+                       case TYPE_ENUM:            tc = integer_type_class; goto make_const;
+
+                       /* gcc classifies the referenced type */
+                       case TYPE_REFERENCE: type = type->reference.refers_to; continue;
+
+                       case TYPE_BUILTIN:
+                       /* typedef/typeof should be skipped already */
+                       case TYPE_TYPEDEF:
+                       case TYPE_TYPEOF:
+                       case TYPE_INVALID:
+                       case TYPE_ERROR:
+                               break;
+               }
+               panic("unexpected TYPE classify_type_to_firm().");
        }
-       panic("unexpected TYPE classify_type_to_firm().");
 
-make_const: ;
+make_const:;
        dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
        ir_mode  *const mode = mode_int;
        tarval   *const tv   = new_tarval_from_long(tc, mode);
index 83fb373..f9ebe76 100644 (file)
--- a/mangle.c
+++ b/mangle.c
@@ -70,6 +70,12 @@ static void mangle_pointer_type(const pointer_type_t *type)
        mangle_type(type->points_to);
 }
 
+static void mangle_reference_type(const reference_type_t *type)
+{
+       obstack_1grow(&obst, 'R');
+       mangle_type(type->refers_to);
+}
+
 static void mangle_parameters(const function_type_t *type)
 {
        if (type->unspecified_parameters)
@@ -182,6 +188,9 @@ static void mangle_type(type_t *orig_type)
        case TYPE_POINTER:
                mangle_pointer_type(&type->pointer);
                return;
+       case TYPE_REFERENCE:
+               mangle_reference_type(&type->reference);
+               return;
        case TYPE_FUNCTION:
                mangle_function_type(&type->function);
                return;
index a706dc2..9af8486 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -3733,6 +3733,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                                        case T_inline:
                                        case T__forceinline: /* ^ DECLARATION_START except for __attribute__ */
                                        case T_IDENTIFIER:
+                                       case '&':
                                        case '*':
                                                errorf(HERE, "discarding stray %K in declaration specifier", &token);
                                                next_token();
@@ -3752,6 +3753,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                                switch (la1_type) {
                                        DECLARATION_START
                                        case T_IDENTIFIER:
+                                       case '&':
                                        case '*': {
                                                errorf(HERE, "%K does not name a type", &token);
 
@@ -3763,7 +3765,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 
                                                next_token();
                                                saw_error = true;
-                                               if (la1_type == '*')
+                                               if (la1_type == '&' || la1_type == '*')
                                                        goto finish_specifiers;
                                                continue;
                                        }
@@ -4169,6 +4171,7 @@ end_error:
 typedef enum construct_type_kind_t {
        CONSTRUCT_INVALID,
        CONSTRUCT_POINTER,
+       CONSTRUCT_REFERENCE,
        CONSTRUCT_FUNCTION,
        CONSTRUCT_ARRAY
 } construct_type_kind_t;
@@ -4185,6 +4188,11 @@ struct parsed_pointer_t {
        type_qualifiers_t type_qualifiers;
 };
 
+typedef struct parsed_reference_t parsed_reference_t;
+struct parsed_reference_t {
+       construct_type_t construct_type;
+};
+
 typedef struct construct_function_type_t construct_function_type_t;
 struct construct_function_type_t {
        construct_type_t  construct_type;
@@ -4218,6 +4226,17 @@ static construct_type_t *parse_pointer_declarator(void)
        return (construct_type_t*) pointer;
 }
 
+static construct_type_t *parse_reference_declarator(void)
+{
+       eat('&');
+
+       parsed_reference_t *reference = obstack_alloc(&temp_obst, sizeof(reference[0]));
+       memset(reference, 0, sizeof(reference[0]));
+       reference->construct_type.kind = CONSTRUCT_REFERENCE;
+
+       return (construct_type_t*)reference;
+}
+
 static construct_type_t *parse_array_declarator(void)
 {
        eat('[');
@@ -4304,9 +4323,22 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env,
 
        decl_modifiers_t modifiers = parse_attributes(&attributes);
 
-       /* pointers */
-       while (token.type == '*') {
-               construct_type_t *type = parse_pointer_declarator();
+       for (;;) {
+               construct_type_t *type;
+               switch (token.type) {
+                       case '&':
+                               if (!(c_mode & _CXX))
+                                       errorf(HERE, "references are only available for C++");
+                               type = parse_reference_declarator();
+                               break;
+
+                       case '*':
+                               type = parse_pointer_declarator();
+                               break;
+
+                       default:
+                               goto ptr_operator_end;
+               }
 
                if (last == NULL) {
                        first = type;
@@ -4319,6 +4351,7 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env,
                /* TODO: find out if this is correct */
                modifiers |= parse_attributes(&attributes);
        }
+ptr_operator_end:
 
        if (env != NULL) {
                modifiers      |= env->modifiers;
@@ -4511,12 +4544,25 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
                }
 
                case CONSTRUCT_POINTER: {
+                       if (is_type_reference(skip_typeref(type)))
+                               errorf(HERE, "cannot declare a pointer to reference");
+
                        parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter;
                        type = make_based_pointer_type(type, parsed_pointer->type_qualifiers, variable);
                        continue;
                }
 
+               case CONSTRUCT_REFERENCE:
+                       if (is_type_reference(skip_typeref(type)))
+                               errorf(HERE, "cannot declare a reference to reference");
+
+                       type = make_reference_type(type);
+                       continue;
+
                case CONSTRUCT_ARRAY: {
+                       if (is_type_reference(skip_typeref(type)))
+                               errorf(HERE, "cannot declare an array of references");
+
                        parsed_array_t *parsed_array  = (parsed_array_t*) iter;
                        type_t         *array_type    = allocate_type_zero(TYPE_ARRAY);
 
@@ -10283,6 +10329,7 @@ static statement_t *intern_parse_statement(void)
                         * declaration types, so we guess a bit here to improve robustness
                         * for incorrect programs */
                        switch (la1_type) {
+                       case '&':
                        case '*':
                                if (get_entity(token.v.symbol, NAMESPACE_NORMAL) != NULL)
                                        goto expression_statment;
diff --git a/type.c b/type.c
index 59876f6..f2e804e 100644 (file)
--- a/type.c
+++ b/type.c
@@ -403,6 +403,17 @@ static void print_pointer_type_pre(const pointer_type_t *type)
                fputc(' ', out);
 }
 
+/**
+ * Prints the prefix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_pre(const reference_type_t *type)
+{
+       intern_print_type_pre(type->refers_to, false);
+       fputc('&', out);
+}
+
 /**
  * Prints the postfix part of a pointer type.
  *
@@ -413,6 +424,16 @@ static void print_pointer_type_post(const pointer_type_t *type)
        intern_print_type_post(type->points_to, false);
 }
 
+/**
+ * Prints the postfix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_post(const reference_type_t *type)
+{
+       intern_print_type_post(type->refers_to, false);
+}
+
 /**
  * Prints the prefix part of an array type.
  *
@@ -631,6 +652,9 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
        case TYPE_POINTER:
                print_pointer_type_pre(&type->pointer);
                return;
+       case TYPE_REFERENCE:
+               print_reference_type_pre(&type->reference);
+               return;
        case TYPE_BITFIELD:
                intern_print_type_pre(type->bitfield.base_type, top);
                return;
@@ -662,6 +686,9 @@ static void intern_print_type_post(const type_t *const type, const bool top)
        case TYPE_POINTER:
                print_pointer_type_post(&type->pointer);
                return;
+       case TYPE_REFERENCE:
+               print_reference_type_post(&type->reference);
+               return;
        case TYPE_ARRAY:
                print_array_type_post(&type->array);
                return;
@@ -729,6 +756,7 @@ static size_t get_type_size(const type_t *type)
        case TYPE_ENUM:            return sizeof(enum_type_t);
        case TYPE_FUNCTION:        return sizeof(function_type_t);
        case TYPE_POINTER:         return sizeof(pointer_type_t);
+       case TYPE_REFERENCE:       return sizeof(reference_type_t);
        case TYPE_ARRAY:           return sizeof(array_type_t);
        case TYPE_BUILTIN:         return sizeof(builtin_type_t);
        case TYPE_TYPEDEF:         return sizeof(typedef_type_t);
@@ -1010,6 +1038,7 @@ bool is_type_incomplete(const type_t *type)
        case TYPE_BITFIELD:
        case TYPE_FUNCTION:
        case TYPE_POINTER:
+       case TYPE_REFERENCE:
        case TYPE_BUILTIN:
        case TYPE_ERROR:
                return false;
@@ -1131,6 +1160,12 @@ bool types_compatible(const type_t *type1, const type_t *type2)
                return types_compatible(to1, to2);
        }
 
+       case TYPE_REFERENCE: {
+               const type_t *const to1 = skip_typeref(type1->reference.refers_to);
+               const type_t *const to2 = skip_typeref(type2->reference.refers_to);
+               return types_compatible(to1, to2);
+       }
+
        case TYPE_COMPOUND_STRUCT:
        case TYPE_COMPOUND_UNION:
        case TYPE_ENUM:
@@ -1441,6 +1476,24 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)
        return identify_new_type(type);
 }
 
+/**
+ * Creates a new reference type.
+ *
+ * @param refers_to   The referred-to type for the new type.
+ */
+type_t *make_reference_type(type_t *refers_to)
+{
+       type_t *type = obstack_alloc(type_obst, sizeof(reference_type_t));
+       memset(type, 0, sizeof(reference_type_t));
+
+       type->kind                = TYPE_REFERENCE;
+       type->base.qualifiers     = 0;
+       type->base.alignment      = 0;
+       type->reference.refers_to = refers_to;
+
+       return identify_new_type(type);
+}
+
 /**
  * Creates a new based pointer type.
  *
diff --git a/type.h b/type.h
index 19eef45..fc0e183 100644 (file)
--- a/type.h
+++ b/type.h
@@ -81,6 +81,7 @@ typedef struct atomic_type_t         atomic_type_t;
 typedef struct complex_type_t        complex_type_t;
 typedef struct imaginary_type_t      imaginary_type_t;
 typedef struct pointer_type_t        pointer_type_t;
+typedef struct reference_type_t      reference_type_t;
 typedef struct function_parameter_t  function_parameter_t;
 typedef struct function_type_t       function_type_t;
 typedef struct compound_type_t       compound_type_t;
index 046e6af..aa5aa21 100644 (file)
@@ -77,6 +77,11 @@ static unsigned hash_pointer_type(const pointer_type_t *type)
        return hash_ptr(type->points_to);
 }
 
+static unsigned hash_reference_type(const reference_type_t *type)
+{
+       return hash_ptr(type->refers_to);
+}
+
 static unsigned hash_array_type(const array_type_t *type)
 {
        return hash_ptr(type->element_type);
@@ -157,6 +162,9 @@ static unsigned hash_type(const type_t *type)
        case TYPE_POINTER:
                hash = hash_pointer_type(&type->pointer);
                break;
+       case TYPE_REFERENCE:
+               hash = hash_reference_type(&type->reference);
+               break;
        case TYPE_ARRAY:
                hash = hash_array_type(&type->array);
                break;
@@ -235,6 +243,12 @@ static bool pointer_types_equal(const pointer_type_t *type1,
               type1->base_variable == type2->base_variable;
 }
 
+static bool reference_types_equal(const reference_type_t *type1,
+                                  const reference_type_t *type2)
+{
+       return type1->refers_to == type2->refers_to;
+}
+
 static bool array_types_equal(const array_type_t *type1,
                               const array_type_t *type2)
 {
@@ -333,6 +347,8 @@ static bool types_equal(const type_t *type1, const type_t *type2)
                return function_types_equal(&type1->function, &type2->function);
        case TYPE_POINTER:
                return pointer_types_equal(&type1->pointer, &type2->pointer);
+       case TYPE_REFERENCE:
+               return reference_types_equal(&type1->reference, &type2->reference);
        case TYPE_ARRAY:
                return array_types_equal(&type1->array, &type2->array);
        case TYPE_BUILTIN:
index b0b02b8..63d7300 100644 (file)
--- a/type_t.h
+++ b/type_t.h
@@ -44,6 +44,7 @@ typedef enum type_kind_t {
        TYPE_ENUM,
        TYPE_FUNCTION,
        TYPE_POINTER,
+       TYPE_REFERENCE,
        TYPE_ARRAY,
        TYPE_BITFIELD,
        TYPE_BUILTIN,
@@ -94,6 +95,11 @@ struct pointer_type_t {
        variable_t  *base_variable;  /**< Microsoft __based() extension */
 };
 
+struct reference_type_t {
+       type_base_t  base;
+       type_t      *refers_to;
+};
+
 struct array_type_t {
        type_base_t   base;
        type_t       *element_type;
@@ -191,6 +197,7 @@ union type_t {
        imaginary_type_t imaginary;
        builtin_type_t   builtin;
        pointer_type_t   pointer;
+       reference_type_t reference;
        array_type_t     array;
        function_type_t  function;
        compound_type_t  compound;
@@ -204,6 +211,7 @@ type_t *make_atomic_type(atomic_type_kind_t type, type_qualifiers_t qualifiers);
 type_t *make_complex_type(atomic_type_kind_t type, type_qualifiers_t qualifiers);
 type_t *make_imaginary_type(atomic_type_kind_t type, type_qualifiers_t qualifiers);
 type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers);
+type_t *make_reference_type(type_t *refers_to);
 type_t *make_based_pointer_type(type_t *points_to,
                                                                type_qualifiers_t qualifiers, variable_t *variable);
 type_t *make_array_type(type_t *element_type, size_t size,
@@ -233,6 +241,12 @@ static inline bool is_type_pointer(const type_t *type)
        return type->kind == TYPE_POINTER;
 }
 
+static inline bool is_type_reference(const type_t *type)
+{
+       assert(!is_typeref(type));
+       return type->kind == TYPE_REFERENCE;
+}
+
 static inline bool is_type_array(const type_t *type)
 {
        assert(!is_typeref(type));