X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=testprograms%2Foo_inline_example.c;h=d8ba70c3192a484f8d34a2dbeca25585e97ab7cf;hb=0eb9e8a7def8f3003527c59013190344d27f38f2;hp=b3aded472c603f27ebba18498c6c14a61a20fbb2;hpb=13588bfa29b57530c70851264dd5ea05184b9486;p=libfirm

diff --git a/testprograms/oo_inline_example.c b/testprograms/oo_inline_example.c
index b3aded472..d8ba70c31 100644
--- a/testprograms/oo_inline_example.c
+++ b/testprograms/oo_inline_example.c
@@ -1,13 +1,14 @@
-/* Copyright (C)2002 by Universitaet Karlsruhe
-* All rights reserved.
-*
-* Authors: Goetz Lindenmaier
-*
-* testprogram.
-*/
-
-/* $ID$ */
-
+/*
+ * Project:     libFIRM
+ * File name:   testprograms/oo_inline_example.c
+ * Purpose:     Test inlineing.
+ * Author:      Goetz Lindenmaier
+ * Modified by:
+ * Created:
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 1999-2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
 
 # include <stdio.h>
 # include <string.h>
@@ -71,7 +72,7 @@ main(void)
 
   /*** Make type information for the class (PRIMA). ***/
   /* The type of the class */
-  class_prima = new_type_class(id_from_str ("PRIMA_INLINE", 5));
+  class_prima = new_type_class(new_id_from_str ("PRIMA_INLINE"));
   /* We need type information for pointers to the class: */
   class_p_ptr = new_type_pointer (id_from_str ("class_prima_ptr", 15),
 				  class_prima);
@@ -120,7 +121,8 @@ main(void)
 
   /* There is only one block in main, it contains the allocation and the calls. */
   /* Allocate the defined object and generate the type information. */
-  obj_size = new_SymConst((type_or_id_p)class_prima, size);
+  symconst_symbol sym = { class_prima };
+  obj_size = new_SymConst(sym, symconst_size);
   obj_o    = new_Alloc(get_store(), obj_size, class_prima, heap_alloc);
   set_store(new_Proj(obj_o, mode_M, 0));  /* make the changed memory visible */
   obj_o    = new_Proj(obj_o, mode_P, 2);  /* remember the pointer to the object */
@@ -282,7 +284,7 @@ main(void)
   current_ir_graph = main_irg;
   printf("Inlining set_a ...\n");
   inline_method(set_a_call, set_a_irg);
-  printf("INLINEing c ...\n");
+  printf("Inlineing c ...\n");
   inline_method(c_call, c_irg);
 
   printf("Optimizing ...\n");
@@ -293,6 +295,9 @@ main(void)
   }
 
   printf("Dumping graphs of all procedures and a type graph.\n");
+  /* Touch ld names to distinguish names from oo_inline names. */
+  get_entity_ld_ident(proc_set_a_e);
+  get_entity_ld_ident(proc_c_e);
   turn_off_edge_labels();
   dump_all_ir_graphs(dump_ir_block_graph);
   dump_all_ir_graphs(dump_ir_block_graph_w_types);