rename TypeMethod and the struct type enums

1 files changed, 19 insertions, 19 deletions

diff --git a/compiler_and_linker/unsorted/CDecl.c b/compiler_and_linker/unsorted/CDecl.c
index 7aee542..8ad16a8 100644
--- a/compiler_and_linker/unsorted/CDecl.c
+++ b/compiler_and_linker/unsorted/CDecl.c
@@ -1413,7 +1413,7 @@ Object *CDecl_GetFunctionObject(DeclInfo *declinfo, NameSpace *nspace, Boolean *
     Type *type;
     NameSpace *nspace2;
     NameSpaceObjectList *list;
-    TypeMethod tmp;
+    TypeMemberFunc tmp;
     Boolean outflag;
 
     r27 = 0;
@@ -3138,11 +3138,11 @@ void CDecl_ExtractClassExportFlags(DeclInfo *declinfo, UInt8 flags) {
         declinfo->exportflags |= EXPORT_FLAGS_EXPORT;
 }
 
-TypeMethod *CDecl_MakeTypeMemberFunc(TypeFunc *tfunc, TypeClass *tclass, Boolean flag) {
-    TypeMethod *method;
+TypeMemberFunc *CDecl_MakeTypeMemberFunc(TypeFunc *tfunc, TypeClass *tclass, Boolean flag) {
+    TypeMemberFunc *method;
 
-    method = galloc(sizeof(TypeMethod));
-    memclrw(method, sizeof(TypeMethod));
+    method = galloc(sizeof(TypeMemberFunc));
+    memclrw(method, sizeof(TypeMemberFunc));
     *TYPE_FUNC(method) = *tfunc;
     method->theclass = tclass;
     method->x26 = flag;
@@ -3167,7 +3167,7 @@ static void CDecl_MakeFunctionVirtual(TypeClass *tclass, Object *func) {
 static void CDecl_AddFunctionMember(DeclE *decle, TypeClass *tclass, DeclInfo *declinfo, short access, Boolean flag1, Boolean flag2, Boolean flag3, Boolean flag4) {
     NameSpaceObjectList *list; // r20
     Object *obj; // also r20
-    TypeMethod *tfunc; // r19
+    TypeMemberFunc *tfunc; // r19
     Boolean r31;
     Boolean outflag;
 
@@ -4200,9 +4200,9 @@ static short getaccesstype(AccessType a, AccessType b, AccessType c) {
     return ACCESSPUBLIC;
 }
 
-static TypeMethod *CDecl_MakeDefaultCtorType(TypeClass *tclass) {
-    TypeMethod *tmeth = galloc(sizeof(TypeMethod));
-    memclrw(tmeth, sizeof(TypeMethod));
+static TypeMemberFunc *CDecl_MakeDefaultCtorType(TypeClass *tclass) {
+    TypeMemberFunc *tmeth = galloc(sizeof(TypeMemberFunc));
+    memclrw(tmeth, sizeof(TypeMemberFunc));
     tmeth->type = TYPEFUNC;
     tmeth->functype = TYPE(&void_ptr);
     tmeth->flags = FUNC_FLAGS_1000 | FUNC_FLAGS_100 | FUNC_FLAGS_METHOD;
@@ -4220,7 +4220,7 @@ static void CDecl_AddDefArgConstructor(TypeClass *tclass) {
     // empty
 }
 
-static void CDecl_AddMemberFunctionObject(TypeClass *tclass, HashNameNode *name, TypeMethod *tmeth, short access) {
+static void CDecl_AddMemberFunctionObject(TypeClass *tclass, HashNameNode *name, TypeMemberFunc *tmeth, short access) {
     Object *obj = CParser_NewCompilerDefFunctionObject();
     obj->name = name;
     obj->type = TYPE(tmeth);
@@ -4272,10 +4272,10 @@ static void CDecl_AddDefaultConstructor(DeclE *decle, TypeClass *tclass) {
     }
 }
 
-static TypeMethod *CDecl_MakeCopyCtorType(TypeClass *tclass, Boolean is_const) {
+static TypeMemberFunc *CDecl_MakeCopyCtorType(TypeClass *tclass, Boolean is_const) {
     FuncArg *arg;
-    TypeMethod *tmeth = galloc(sizeof(TypeMethod));
-    memclrw(tmeth, sizeof(TypeMethod));
+    TypeMemberFunc *tmeth = galloc(sizeof(TypeMemberFunc));
+    memclrw(tmeth, sizeof(TypeMemberFunc));
     tmeth->type = TYPEFUNC;
     tmeth->functype = TYPE(&void_ptr);
     tmeth->flags = FUNC_FLAGS_1000 | FUNC_FLAGS_100 | FUNC_FLAGS_METHOD;
@@ -4353,10 +4353,10 @@ static void CDecl_AddDefaultCopyConstructor(DeclE *decle, TypeClass *tclass) {
     }
 }
 
-static TypeMethod *CDecl_MakeAssignmentOperatorType(TypeClass *tclass, Boolean is_const) {
+static TypeMemberFunc *CDecl_MakeAssignmentOperatorType(TypeClass *tclass, Boolean is_const) {
     FuncArg *arg;
-    TypeMethod *tmeth = galloc(sizeof(TypeMethod));
-    memclrw(tmeth, sizeof(TypeMethod));
+    TypeMemberFunc *tmeth = galloc(sizeof(TypeMemberFunc));
+    memclrw(tmeth, sizeof(TypeMemberFunc));
     tmeth->type = TYPEFUNC;
     tmeth->functype = CDecl_NewRefPointerType(TYPE(tclass));
     tmeth->flags = FUNC_FLAGS_100 | FUNC_FLAGS_METHOD;
@@ -4424,9 +4424,9 @@ static void CDecl_AddDefaultAssignmentOperator(DeclE *decle, TypeClass *tclass)
     }
 }
 
-TypeMethod *CDecl_MakeDefaultDtorType(TypeClass *tclass, Boolean is_virtual) {
-    TypeMethod *tmeth = galloc(sizeof(TypeMethod));
-    memclrw(tmeth, sizeof(TypeMethod));
+TypeMemberFunc *CDecl_MakeDefaultDtorType(TypeClass *tclass, Boolean is_virtual) {
+    TypeMemberFunc *tmeth = galloc(sizeof(TypeMemberFunc));
+    memclrw(tmeth, sizeof(TypeMemberFunc));
     tmeth->type = TYPEFUNC;
     tmeth->functype = (Type *) &void_ptr;
     tmeth->flags = FUNC_FLAGS_2000 | FUNC_FLAGS_100 | FUNC_FLAGS_METHOD;