little cleanup

[libfirm] / ir / tr / tr_inheritance.h

diff --git a/ir/tr/tr_inheritance.h b/ir/tr/tr_inheritance.h
index 7c73d4f..6e95be6 100644 (file)
--- a/ir/tr/tr_inheritance.h
+++ b/ir/tr/tr_inheritance.h
@@ -28,17 +28,10 @@
 #ifndef _TR_INHERITANCE_H_
 #define _TR_INHERITANCE_H_
 
+#include "firm_types.h"
 #include "type.h"
-/*#include "entity.h"*/
 #include "ident.h"
 
-
-/* to resolve recursion between entity.h and irgraph.h */
-#ifndef _IR_GRAPH_TYPEDEF_
-#define _IR_GRAPH_TYPEDEF_
-typedef struct ir_graph ir_graph;
-#endif
-
 /* ----------------------------------------------------------------------- */
 /* Classify pairs of types/entities in the inheritance relations.          */
 /* ----------------------------------------------------------------------- */
@@ -49,7 +42,7 @@ typedef struct ir_graph ir_graph;
  *  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(type *low, type *high);
 
 /** Subclass check for pointers to classes.
  *
@@ -57,7 +50,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(type *low, type *high);
 
 /** Returns true if high is superclass of low.
  *
@@ -65,7 +58,7 @@ int is_subclass_ptr_of(type *low, type *high);
  *  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_superclass_of(type *high, type *low);
+#define is_SuperClass_of(high, low) is_SubClass_of(low, high)
 
 /** Superclass check for pointers to classes.
  *
@@ -73,14 +66,14 @@ int is_superclass_of(type *high, type *low);
  *  many as possible).  If the remaining types are both class types
  *  and superclasses, returns true, else false.  Can also be called with
  *  two class types.  */
-int is_superclass_ptr_of(type *low, type *high);
+#define is_SuperClass_ptr_of(low, high) is_SubClass_ptr_of(high, low)
 
 /** Returns true if high is (transitive) overwritten by low.
  *
  *  Returns false if high == low. */
 int is_overwritten_by(entity *high, entity *low);
 
-/** Resolve polymorphy in the inheritance relation.
+/** Resolve polymorphism in the inheritance relation.
  *
  *  Returns the dynamically referenced entity if the static entity and the
  *  dynamic type are given.
@@ -227,7 +220,7 @@ typedef enum {
                                      the class hierarchy.  @@@ So far this does not happen in Firm. */
   ir_class_casts_transitive = 1, /**< Class casts conform to transitive inheritance edges. Default. */
   ir_class_casts_normalized = 2, /**< Class casts conform to inheritance edges. */
-  ir_class_casts_state_max,
+  ir_class_casts_state_max
 } ir_class_cast_state;
 char *get_class_cast_state_string(ir_class_cast_state s);