renamed get_type_nameid to get_type_ident

[r263]

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 2540040..519b5ca 100644 (file)
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -79,8 +79,8 @@ dump_node_opcode (ir_node *n)
       xfprintf (F, "%I", get_SymConst_ptrinfo(n));
     } else {
       assert(get_kind(get_SymConst_type(n)) == k_type);
-      assert(get_type_nameid(get_SymConst_type(n)));
-      xfprintf (F, "%s ", id_to_str(get_type_nameid(get_SymConst_type(n))));
+      assert(get_type_ident(get_SymConst_type(n)));
+      xfprintf (F, "%s ", id_to_str(get_type_ident(get_SymConst_type(n))));
       if (get_SymConst_kind == type_tag)
        xfprintf (F, "tag");
       else
@@ -323,7 +323,7 @@ dump_ir_node (ir_node *n)
     break;
   case iro_SymConst:
     assert(get_kind(get_SymConst_type(n)) == k_type);
-    assert(get_type_nameid(get_SymConst_type(n)));
+    assert(get_type_ident(get_SymConst_type(n)));
     xfprintf (F, "\"%s ", get_type_name(get_SymConst_type(n)));
     switch (n->attr.i.num){
     case type_tag:
@@ -512,7 +512,7 @@ dump_type_info (type_or_ent *tore, void *env) {
     {
       /* why can't I cast here??? @@@ */
       type *type = tore;
-      xfprintf (F, "\"%I %I", get_type_tpop_nameid(type), get_type_nameid(type));
+      xfprintf (F, "\"%I %I", get_type_tpop_nameid(type), get_type_ident(type));
 
       switch (get_type_tpop_code(type)) {
       case tpo_class:

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 0601822..3661d8a 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -147,7 +147,7 @@ ir_node_print (XP_PAR1, const xprintf_info *info ATTRIBUTE((unused)), XP_PARN)
     XPF1 ("%I", get_irn_mode(np)->name);
     XPC  (" ");
     XP   (symconst_name_arr[get_irn_symconst_attr(np).num]);
-    XPF1 (" %#N", get_type_nameid(get_SymConst_type(np)));
+    XPF1 (" %#N", get_type_ident(get_SymConst_type(np)));
     break;
   case iro_Start:              /* don't dump mode of these */
   case iro_Cond:

diff --git a/ir/ir/old_fctnames.h b/ir/ir/old_fctnames.h
index a7b61b4..28762ec 100644 (file)
--- a/ir/ir/old_fctnames.h
+++ b/ir/ir/old_fctnames.h
@@ -8,6 +8,9 @@
 */
 
 
+#ifndef __OLD_FCTNAMES_H__
+#define __OLD_FCTNAMES_H__
+
 /* irgraph */
 #define get_irg_params     get_irg_n_loc
 #define set_irg_params     set_irg_n_loc
@@ -23,7 +26,8 @@
 #define get_fsigned_of_mode   get_mode_fsigned
 #define get_ffloat_of_mode    get_mode_ffloat
 
+/* type.h */
+#define get_type_nameid(_t_)     get_type_ident(_t_)
+#define set_type_nameid(_t_,_i_) set_type_ident(_t_,_i_)
 
-
-#define
-#define
+#endif

diff --git a/ir/tr/type.c b/ir/tr/type.c
index f8dfbca..5588894 100644 (file)
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -100,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;
@@ -119,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;

diff --git a/ir/tr/type.h b/ir/tr/type.h
index acf76e4..e3a7013 100644 (file)
--- a/ir/tr/type.h
+++ b/ir/tr/type.h
@@ -102,8 +102,8 @@ tp_opcode   get_type_tpop_code(type *tp);
 ir_mode*    get_type_mode(type *tp);
 void        set_type_mode(type *tp, ir_mode* m);
 
-ident*      get_type_nameid(type *tp);
-void        set_type_nameid(type *tp, ident* id);
+ident*      get_type_ident(type *tp);
+void        set_type_ident(type *tp, ident* id);
 const char* get_type_name(type *tp);
 
 int         get_type_size(type *tp);