removed warnings

[libfirm] / ir / tr / typewalk.c

diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c
index a5ce1a5..bd8e83f 100644 (file)
--- a/ir/tr/typewalk.c
+++ b/ir/tr/typewalk.c
@@ -1,12 +1,12 @@
 /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Author: Goetz Lindenmaier
-**
-** traverse the type information.  The walker walks the whole ir graph
-** to find the distinct type trees in the type graph forest.
-** - execute the pre function before recursion
-** - execute the post function after recursion
+* All rights reserved.
+*
+* Author: Goetz Lindenmaier
+*
+* traverse the type information.  The walker walks the whole ir graph
+* to find the distinct type trees in the type graph forest.
+* - execute the pre function before recursion
+* - execute the post function after recursion
 */
 
 /* $Id$ */
@@ -35,9 +35,9 @@ typedef struct type_walk_env {
 } type_walk_env;
 
 
-void type_walk_2(type_or_ent *tore,
-              void (pre)(type_or_ent*, void*),
-              void (post)(type_or_ent*, void*),
+static void type_walk_2(type_or_ent *tore,
+              void (*pre)(type_or_ent*, void*),
+              void (*post)(type_or_ent*, void*),
               void *env)
 {
   int i;
@@ -142,7 +142,7 @@ void type_walk_2(type_or_ent *tore,
   return;
 }
 
-void start_type_walk(ir_node *node, void *env) {
+static void start_type_walk(ir_node *node, void *env) {
   void *pre  = ((type_walk_env *)env)->pre;
   void *post = ((type_walk_env *)env)->post;
   void *envi = ((type_walk_env *)env)->env;
@@ -182,6 +182,7 @@ void type_walk(void (pre)(type_or_ent*, void*),
   for (i = 0; i < get_irp_n_types(); i++) {
     type_walk_2((type_or_ent *)get_irp_type(i), pre, post, env);
   }
+  type_walk_2((type_or_ent *)get_glob_type(), pre, post, env);
 }
 
 void type_walk_irg (ir_graph *irg,
@@ -206,10 +207,10 @@ void type_walk_irg (ir_graph *irg,
   return;
 }
 
-void type_walk_s2s_2(type_or_ent *tore,
-                    void (pre)(type_or_ent*, void*),
-                    void (post)(type_or_ent*, void*),
-                    void *env)
+static void type_walk_s2s_2(type_or_ent *tore,
+                           void (*pre)(type_or_ent*, void*),
+                           void (*post)(type_or_ent*, void*),
+                           void *env)
 {
   int i;
 
@@ -282,9 +283,11 @@ void type_walk_s2s_2(type_or_ent *tore,
   return;
 }
 
-void type_walk_super2sub(void (pre)(type_or_ent*, void*),
-                        void (post)(type_or_ent*, void*),
-                        void *env) {
+void type_walk_super2sub(
+                 void (*pre)(type_or_ent*, void*),
+                 void (*post)(type_or_ent*, void*),
+                 void *env)
+{
   int i;
   type *tp;
   ++type_visited;
@@ -297,11 +300,11 @@ void type_walk_super2sub(void (pre)(type_or_ent*, void*),
 
 /*****************************************************************************/
 
-static
-void type_walk_super_2(type_or_ent *tore,
-                      void (pre)(type_or_ent*, void*),
-                      void (post)(type_or_ent*, void*),
-                      void *env)
+static void
+type_walk_super_2(type_or_ent *tore,
+                 void (*pre)(type_or_ent*, void*),
+                 void (*post)(type_or_ent*, void*),
+                 void *env)
 {
   int i;
 
@@ -370,9 +373,10 @@ void type_walk_super_2(type_or_ent *tore,
   return;
 }
 
-void type_walk_super(void (pre)(type_or_ent*, void*),
-                    void (post)(type_or_ent*, void*),
-                    void *env) {
+void type_walk_super(
+                 void (*pre)(type_or_ent*, void*),
+                 void (*post)(type_or_ent*, void*),
+                 void *env) {
   int i;
   type *tp;
   ++type_visited;
@@ -386,10 +390,11 @@ void type_walk_super(void (pre)(type_or_ent*, void*),
 /*****************************************************************************/
 
 
-void class_walk_s2s_2(type *tp,
-                    void (pre)(type*, void*),
-                    void (post)(type*, void*),
-                    void *env)
+static void
+class_walk_s2s_2(type *tp,
+                void (*pre)(type*, void*),
+                void (*post)(type*, void*),
+                void *env)
 {
   int i;
 
@@ -421,9 +426,11 @@ void class_walk_s2s_2(type *tp,
 }
 
 #if 0
-void class_walk_super2sub(void (pre)(type*, void*),
-                         void (post)(type*, void*),
-                         void *env) {
+void class_walk_super2sub(
+                 void (*pre)(type*, void*),
+                 void (*post)(type*, void*),
+                 void *env)
+{
   int i;
   type *tp;
 
@@ -440,9 +447,11 @@ void class_walk_super2sub(void (pre)(type*, void*),
   }
 }
 #endif
-void class_walk_super2sub(void (pre)(type*, void*),
-                         void (post)(type*, void*),
-                         void *env) {
+void class_walk_super2sub(
+                 void (*pre)(type*, void*),
+                 void (post)(type*, void*),
+                 void *env)
+{
   int i;
   type *tp;
 
@@ -458,3 +467,37 @@ void class_walk_super2sub(void (pre)(type*, void*),
     }
   }
 }
+
+
+/* Walks over all entities in the type */
+void walk_types_entities(
+                 type *tp,
+                 void (*doit)(entity*, void*),
+                 void *env)
+{
+  int i;
+  switch(get_type_tpop_code(tp)) {
+  case tpo_class: {
+    for (i=0; i<get_class_n_members(tp); i++)
+      doit(get_class_member(tp, i), env);
+  } break;
+  case tpo_struct: {
+    for (i=0; i<get_struct_n_members(tp); i++)
+      doit(get_struct_member(tp, i), env);
+  } break;
+  case tpo_union: {
+    for (i = 0; i < get_union_n_members(tp); i++)
+      doit(get_union_member(tp, i), env);
+  } break;
+  case tpo_array: {
+      doit(get_array_element_entity(tp), env);
+  } break;
+  case tpo_method:
+  case tpo_enumeration:
+  case tpo_pointer:
+  case tpo_primitive:
+  case tpo_id:
+  default:
+    break;
+  }
+}