renamed get_type_nameid to get_type_ident

[libfirm] / ir / tr / type.c

diff --git a/ir/tr/type.c b/ir/tr/type.c
index a3b42b4..5588894 100644 (file)
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -59,6 +59,7 @@ new_type(tp_op *type_op, ir_mode *mode, ident* name) {
   res->state = layout_undefined;
   res->size = -1;
   res->visit = 0;
+  res -> link = NULL;
 
   return res;
 }
@@ -77,6 +78,19 @@ void free_type_attrs(type *tp) {
   }
 }
 
+/* set/get the link field */
+void *get_type_link(type *tp)
+{
+  assert(tp);
+  return(tp -> link);
+}
+
+void set_type_link(type *tp, void *l)
+{
+  assert(tp);
+  tp -> link = l;
+}
+
 tp_op*      get_type_tpop(type *tp) {
   assert(tp);
   return tp->type_op;
@@ -86,18 +100,22 @@ ident*      get_type_tpop_nameid(type *tp) {
   assert(tp);
   return tp->type_op->name;
 }
+
 const char* get_type_tpop_name(type *tp) {
   assert(tp);
   return id_to_str(tp->type_op->name);
 }
+
 tp_opcode    get_type_tpop_code(type *tp) {
   assert(tp);
   return tp->type_op->code;
 }
+
 ir_mode*    get_type_mode(type *tp) {
   assert(tp);
   return tp->mode;
 }
+
 void        set_type_mode(type *tp, ir_mode* m) {
   assert(tp);
   tp->mode = m;
@@ -105,18 +123,22 @@ void        set_type_mode(type *tp, ir_mode* m) {
   if ((tp->type_op == type_pointer) || (tp->type_op == type_primitive))
     tp->size == get_mode_size(m);
 }
-ident*      get_type_nameid(type *tp) {
+
+ident*      get_type_ident(type *tp) {
   assert(tp);
   return tp->name;
 }
-void        set_type_nameid(type *tp, ident* id) {
+
+void        set_type_ident(type *tp, ident* id) {
   assert(tp);
   tp->name = id;
 }
+
 const char* get_type_name(type *tp) {
   assert(tp);
   return id_to_str(tp->name);
 }
+
 int         get_type_size(type *tp) {
   assert(tp);
   return tp->size;
@@ -220,8 +242,13 @@ void    remove_class_member(type *clss, entity *member) {
 }
 
 void    add_class_subtype   (type *clss, type *subtype) {
+  int i;
   assert(clss && (clss->type_op == type_class));
   ARR_APP1 (type *, clss->attr.ca.subtypes, subtype);
+  for (i = 0; i < get_class_n_supertype(subtype); i++)
+    if (get_class_supertype(subtype, i) == clss)
+      /* Class already registered */
+      return;
   ARR_APP1 (type *, subtype->attr.ca.supertypes, clss);
 }
 int     get_class_n_subtype (type *clss) {
@@ -249,8 +276,14 @@ void    remove_class_subtype(type *clss, type *subtype) {
 }
 
 void    add_class_supertype   (type *clss, type *supertype) {
+  int i;
   assert(clss && (clss->type_op == type_class));
+  assert(supertype && (supertype -> type_op == type_class));
   ARR_APP1 (type *, clss->attr.ca.supertypes, supertype);
+  for (i = 0; i < get_class_n_subtype(supertype); i++)
+    if (get_class_subtype(supertype, i) == clss)
+      /* Class already registered */
+      return;
   ARR_APP1 (type *, supertype->attr.ca.subtypes, clss);
 }
 int     get_class_n_supertype (type *clss) {