X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftr_inheritance.h;h=5395966b3f49e890b00de00e4eabb640ff90f1ea;hb=419d4833c299521e4a07efd0037a3a5c576af02e;hp=6e95be699e8c534fefcaa91007fae5ceb4487f36;hpb=4cf0c5c8ec41728cb11f462a0b9cb9acc53613dc;p=libfirm

diff --git a/ir/tr/tr_inheritance.h b/ir/tr/tr_inheritance.h
index 6e95be699..5395966b3 100644
--- a/ir/tr/tr_inheritance.h
+++ b/ir/tr/tr_inheritance.h
@@ -24,9 +24,8 @@
  *
  *  @see  type.h entity.h
  */
-
-#ifndef _TR_INHERITANCE_H_
-#define _TR_INHERITANCE_H_
+#ifndef _FIRM_TR_INHERITANCE_H_
+#define _FIRM_TR_INHERITANCE_H_
 
 #include "firm_types.h"
 #include "type.h"
@@ -42,7 +41,7 @@
  *  a subclass of high.  I.e, we search in all subtypes of high for low.
  *  @@@ this can be implemented more efficient if we know the set of all
  *  subclasses of high.  */
-int is_SubClass_of(type *low, type *high);
+int is_SubClass_of(ir_type *low, ir_type *high);
 
 /** Subclass check for pointers to classes.
  *
@@ -50,7 +49,7 @@ int is_SubClass_of(type *low, type *high);
  *  many as possible).  If the remaining types are both class types
  *  and subclasses, returns true, else false.  Can also be called with
  *  two class types.  */
-int is_SubClass_ptr_of(type *low, type *high);
+int is_SubClass_ptr_of(ir_type *low, ir_type *high);
 
 /** Returns true if high is superclass of low.
  *
@@ -78,7 +77,7 @@ int is_overwritten_by(entity *high, entity *low);
  *  Returns the dynamically referenced entity if the static entity and the
  *  dynamic type are given.
  *  Searches downwards in overwritten tree. */
-entity *resolve_ent_polymorphy(type *dynamic_class, entity* static_ent);
+entity *resolve_ent_polymorphy(ir_type *dynamic_class, entity* static_ent);
 
 /* ----------------------------------------------------------------------- */
 /* Resolve implicit inheritance.                                           */
@@ -88,16 +87,16 @@ entity *resolve_ent_polymorphy(type *dynamic_class, entity* static_ent);
  *
  *  Returns an ident that consists of the name of type followed by an
  *  underscore and the name (not ld_name) of the entity. */
-ident *default_mangle_inherited_name(entity *super, type *clss);
+ident *default_mangle_inherited_name(entity *ent, ir_type *clss);
 
 /** Type of argument functions for inheritance resolver.
  *
- * @param super   The entity in the super type that will be overwritten
+ * @param ent     The entity in the super type that will be overwritten
  *                by the newly generated entity, for which this name is
  *                used.
  * @param clss    The class type in which the new entity will be placed.
  */
-typedef ident *mangle_inherited_name_func(entity *super, type *clss);
+typedef ident *mangle_inherited_name_func(entity *ent, ir_type *clss);
 
 /** Resolve implicit inheritance.
  *
@@ -163,15 +162,15 @@ void free_inh_transitive_closure(void);
 /* - subtype ------------------------------------------------------------- */
 
 /** Iterate over all transitive subtypes. */
-type *get_class_trans_subtype_first(type *tp);
-type *get_class_trans_subtype_next (type *tp);
-int   is_class_trans_subtype (type *tp, type *subtp);
+ir_type *get_class_trans_subtype_first(ir_type *tp);
+ir_type *get_class_trans_subtype_next (ir_type *tp);
+int   is_class_trans_subtype (ir_type *tp, ir_type *subtp);
 
 /* - supertype ----------------------------------------------------------- */
 
 /** Iterate over all transitive supertypes. */
-type *get_class_trans_supertype_first(type *tp);
-type *get_class_trans_supertype_next (type *tp);
+ir_type *get_class_trans_supertype_first(ir_type *tp);
+ir_type *get_class_trans_supertype_next (ir_type *tp);
 
 /* - overwrittenby ------------------------------------------------------- */
 
@@ -235,4 +234,4 @@ ir_class_cast_state get_irp_class_cast_state(void);
  *  and firm verbosity is set.
  */
 void verify_irg_class_cast_state(ir_graph *irg);
-#endif  /* _TR_INHERITANCE_H_ */
+#endif  /* _FIRM_TR_INHERITANCE_H_ */