From a4c85aab2676bbb3138f042ed5bc27a6df8b1903 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6tz=20Lindenmaier?= Date: Mon, 18 Dec 2000 16:08:47 +0000 Subject: [PATCH] *** empty log message *** [r78] --- Changes | 4 ++ ir/tr/type.c | 77 ++++++++++++++++--------------- ir/tr/type.h | 32 ++++++------- testprograms/Makefile | 2 +- testprograms/oo_program_example.c | 1 - 5 files changed, 60 insertions(+), 56 deletions(-) diff --git a/Changes b/Changes index 1638d1327..3b478280f 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,7 @@ + 18.12.2000 Goetz + Changed parameter of Methods in type.h and type.c from + class to clss. Class is a C++ keyword. + 7.9.2000 Goetz Finished implementation of dump_all_types. Added new testprogram inheritance_example. diff --git a/ir/tr/type.c b/ir/tr/type.c index 2c31539cc..829aed124 100644 --- a/ir/tr/type.c +++ b/ir/tr/type.c @@ -1,3 +1,4 @@ + /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe ** All rights reserved. ** @@ -45,105 +46,105 @@ new_type_class (ident *name)//, int members) /* manipulate fields of type_class */ const char * -get_class_name (type_class *class) { - assert(class); - return id_to_str(class->name); +get_class_name (type_class *clss) { + assert(clss); + return id_to_str(clss->name); } /* field: ident */ ident * -get_class_ident (type_class *class) { - assert(class); - return class->name; +get_class_ident (type_class *clss) { + assert(clss); + return clss->name; } /* -void set_class_name (type_class *class, char *name); -void set_class_ident (type_class *class, ident* ident); +void set_class_name (type_class *clss, char *name); +void set_class_ident (type_class *clss, ident* ident); */ /* field: member */ void -add_class_member (type_class *class, entity *member) +add_class_member (type_class *clss, entity *member) { - ARR_APP1 (entity *, class->members, member); + ARR_APP1 (entity *, clss->members, member); } entity * -get_class_member (type_class *class, int pos) +get_class_member (type_class *clss, int pos) { - assert (class); - return class->members[pos+1]; + assert (clss); + return clss->members[pos+1]; } void -set_class_member (type_class *class, entity *member, int pos) +set_class_member (type_class *clss, entity *member, int pos) { - class->members[pos+1] = member; + clss->members[pos+1] = member; } int -get_class_n_member (type_class *class) +get_class_n_member (type_class *clss) { int res; - assert(class); - res = (ARR_LEN (class->members))-1; + assert(clss); + res = (ARR_LEN (clss->members))-1; return res; } /* field: subtype */ void -add_class_subtype (type_class *class, type_class *subtype) +add_class_subtype (type_class *clss, type_class *subtype) { - ARR_APP1 (type_class *, class->subtypes, subtype); + ARR_APP1 (type_class *, clss->subtypes, subtype); } type_class * -get_class_subtype (type_class *class, int pos) +get_class_subtype (type_class *clss, int pos) { - assert (class); - return class->subtypes[pos+1]; + assert (clss); + return clss->subtypes[pos+1]; } void -set_class_subtype (type_class *class, type_class *subtype, int pos) +set_class_subtype (type_class *clss, type_class *subtype, int pos) { - class->subtypes[pos+1] = subtype; + clss->subtypes[pos+1] = subtype; } int -get_class_n_subtype (type_class *class) +get_class_n_subtype (type_class *clss) { - assert(class); - return (ARR_LEN (class->subtypes))-1; + assert(clss); + return (ARR_LEN (clss->subtypes))-1; } /* field: supertype */ void -add_class_supertype (type_class *class, type_class *supertype) +add_class_supertype (type_class *clss, type_class *supertype) { - ARR_APP1 (type_class *, class->supertypes, supertype); + ARR_APP1 (type_class *, clss->supertypes, supertype); } type_class * -get_class_supertype (type_class *class, int pos) +get_class_supertype (type_class *clss, int pos) { - assert (class); - return class->supertypes[pos+1]; + assert (clss); + return clss->supertypes[pos+1]; } void -set_class_supertype (type_class *class, type_class *supertype, int pos) +set_class_supertype (type_class *clss, type_class *supertype, int pos) { - class->supertypes[pos+1] = supertype; + clss->supertypes[pos+1] = supertype; } int -get_class_n_supertype (type_class *class) +get_class_n_supertype (type_class *clss) { - assert(class); - return (ARR_LEN (class->supertypes))-1; + assert(clss); + return (ARR_LEN (clss->supertypes))-1; } /*******************************************************************/ diff --git a/ir/tr/type.h b/ir/tr/type.h index 3ac64b396..ae883dcd2 100644 --- a/ir/tr/type.h +++ b/ir/tr/type.h @@ -225,28 +225,28 @@ type_class *new_type_class (ident *name); /* manipulate fields of type_class */ -const char *get_class_name (type_class *class); -ident *get_class_ident (type_class *class); +const char *get_class_name (type_class *clss); +ident *get_class_ident (type_class *clss); /* Not necessary now! -void set_class_name (type_class *class, char *name); -void set_class_ident (type_class *class, ident* ident); +void set_class_name (type_class *clss, char *name); +void set_class_ident (type_class *clss, ident* ident); */ -void add_class_member (type_class *class, entity *member); -int get_class_n_member (type_class *class); -entity *get_class_member (type_class *class, int pos); -void set_class_member (type_class *class, entity *member, int pos); +void add_class_member (type_class *clss, entity *member); +int get_class_n_member (type_class *clss); +entity *get_class_member (type_class *clss, int pos); +void set_class_member (type_class *clss, entity *member, int pos); -void add_class_subtype (type_class *class,type_class *subtype); -int get_class_n_subtype (type_class *class); -type_class *get_class_subtype (type_class *class, int pos); -void set_class_subtype (type_class *class, type_class *subtype, int pos); +void add_class_subtype (type_class *clss,type_class *subtype); +int get_class_n_subtype (type_class *clss); +type_class *get_class_subtype (type_class *clss, int pos); +void set_class_subtype (type_class *clss, type_class *subtype, int pos); -void add_class_supertype (type_class *class, type_class *supertype); -int get_class_n_supertype (type_class *class); -type_class *get_class_supertype (type_class *class, int pos); -void set_class_supertype (type_class *class, type_class *supertype, int pos); +void add_class_supertype (type_class *clss, type_class *supertype); +int get_class_n_supertype (type_class *clss); +type_class *get_class_supertype (type_class *clss, int pos); +void set_class_supertype (type_class *clss, type_class *supertype, int pos); /*******************************************************************/ /** TYPE_STRCT **/ diff --git a/testprograms/Makefile b/testprograms/Makefile index 16476bdf4..5ef9df06f 100644 --- a/testprograms/Makefile +++ b/testprograms/Makefile @@ -5,7 +5,7 @@ LIBDIRS=-L.. -L/usr/public/lib/gmp/ LIBS=-lfirm -lgmp -%.o: %.c +%.o: %.c ../libfirm.a gcc -c $(INCDIRS) -g $< all: empty const_eval_example \ diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c index 760086143..90d7d6927 100644 --- a/testprograms/oo_program_example.c +++ b/testprograms/oo_program_example.c @@ -13,7 +13,6 @@ *** *** class PRIMA *** a: int; -*** b: real; *** c(int): int; *** set_a(int): void; *** end -- 2.20.1