rename TypeMethod and the struct type enums

1 files changed, 12 insertions, 12 deletions

diff --git a/compiler_and_linker/unsorted/CExpr.c b/compiler_and_linker/unsorted/CExpr.c
index 64002a9..992fc09 100644
--- a/compiler_and_linker/unsorted/CExpr.c
+++ b/compiler_and_linker/unsorted/CExpr.c
@@ -950,7 +950,7 @@ ENode *CExpr_MakeNameLookupResultExpr(CScopeParseResult *pr) {
 
 static Type *CExpr_NewPTMType(EMemberInfo *member, Object *obj) {
     TypeMemberPointer *ptm;
-    TypeMethod *tmethod;
+    TypeMemberFunc *tmethod;
     BClassList *path;
 
     ptm = galloc(sizeof(TypeMemberPointer));
@@ -971,8 +971,8 @@ static Type *CExpr_NewPTMType(EMemberInfo *member, Object *obj) {
             CError_ASSERT(1308, IS_TYPE_FUNC(obj->type));
         }
 
-        tmethod = galloc(sizeof(TypeMethod));
-        memclrw(tmethod, sizeof(TypeMethod));
+        tmethod = galloc(sizeof(TypeMemberFunc));
+        memclrw(tmethod, sizeof(TypeMemberFunc));
         *tmethod = *TYPE_METHOD(obj->type);
 
         CError_ASSERT(1312, tmethod->args);
@@ -1376,15 +1376,15 @@ static ENode *CExpr_ParseVecStep(void) {
         CDecl_CompleteType(type);
         if (IS_TYPE_VECTOR(type)) {
             switch (TYPE_STRUCT(type)->stype) {
-                case STRUCT_TYPE_4:
-                case STRUCT_TYPE_5:
-                case STRUCT_TYPE_6:
+                case STRUCT_VECTOR_UCHAR:
+                case STRUCT_VECTOR_SCHAR:
+                case STRUCT_VECTOR_BCHAR:
                     value = 16;
                     break;
-                case STRUCT_TYPE_7:
-                case STRUCT_TYPE_8:
-                case STRUCT_TYPE_9:
-                case STRUCT_TYPE_E:
+                case STRUCT_VECTOR_USHORT:
+                case STRUCT_VECTOR_SSHORT:
+                case STRUCT_VECTOR_BSHORT:
+                case STRUCT_VECTOR_PIXEL:
                     value = 8;
                     break;
                 default:
@@ -2013,7 +2013,7 @@ loop:
                 }
                 goto loop;
             }
-            if (!IS_TYPE_STRUCT(expr->rtype) || TYPE_STRUCT(expr->rtype)->stype > STRUCT_TYPE_3) {
+            if (!IS_TYPE_STRUCT(expr->rtype) || TYPE_STRUCT(expr->rtype)->stype > STRUCT_TYPE_MAX) {
                 if (copts.cplusplus && (subexpr = CExpr_DummyDestr(expr)))
                     return subexpr;
                 CError_ErrorSkip(CErrorStr149);
@@ -2296,7 +2296,7 @@ ENode *getpointertomemberfunc(ENode *expr, Type *type, Boolean flag) {
     Object *obj;
     Object *dataobj;
     Type *ptmtype;
-    TypeMethod *tmethod;
+    TypeMemberFunc *tmethod;
     OLinkList *olist;
     SInt32 data[3];