tons more renaming of stuff

1 files changed, 11 insertions, 11 deletions

diff --git a/compiler_and_linker/unsorted/CTemplateFunc.c b/compiler_and_linker/unsorted/CTemplateFunc.c
index 847b103..3c5de98 100644
--- a/compiler_and_linker/unsorted/CTemplateFunc.c
+++ b/compiler_and_linker/unsorted/CTemplateFunc.c
@@ -24,7 +24,7 @@ static Boolean CTempl_DeduceType1(Type *type1, UInt32 qual1, Type *type2, UInt32
 
 static void CTemplFunc_SetupTypeDeduce(TypeDeduce *deduce, TemplateFunction *templ, TemplArg *args) {
     memclrw(deduce, sizeof(TypeDeduce));
-    if (templ->tfunc->nspace->theclass && (templ->tfunc->nspace->theclass->flags & CLASS_FLAGS_100))
+    if (templ->tfunc->nspace->theclass && (templ->tfunc->nspace->theclass->flags & CLASS_IS_TEMPL))
         deduce->tmclass = TEMPL_CLASS(templ->tfunc->nspace->theclass);
     deduce->params = templ->params;
     deduce->args = args;
@@ -110,12 +110,12 @@ static TemplFuncInstance *CTempl_GetCreateFuncInstance(Object *funcobj, TemplArg
         instobj->access = funcobj->access;
         instobj->nspace = funcobj->nspace;
         instobj->sclass = funcobj->sclass;
-        instobj->qual = funcobj->qual | Q_80000;
+        instobj->qual = funcobj->qual | Q_MANGLE_NAME;
         instobj->name = templ->name;
         instobj->u.func.inst = inst;
 
         CTemplFunc_SetupTypeDeduce(&deduce, templ, inst->args);
-        if (funcobj->nspace->theclass && (funcobj->nspace->theclass->flags & CLASS_FLAGS_800)) {
+        if (funcobj->nspace->theclass && (funcobj->nspace->theclass->flags & CLASS_IS_TEMPL_INST)) {
             deduce.tmclass = TEMPL_CLASS_INST(funcobj->nspace->theclass)->templ;
             deduce.inst = TEMPL_CLASS_INST(funcobj->nspace->theclass);
         }
@@ -124,13 +124,13 @@ static TemplFuncInstance *CTempl_GetCreateFuncInstance(Object *funcobj, TemplArg
         inst->object = instobj;
 
         if (IS_TYPE_FUNC(instobj->type)) {
-            TYPE_FUNC(instobj->type)->flags &= ~FUNC_FLAGS_2;
-            if (TYPE_FUNC(instobj->type)->flags & FUNC_FLAGS_1000) {
+            TYPE_FUNC(instobj->type)->flags &= ~FUNC_DEFINED;
+            if (TYPE_FUNC(instobj->type)->flags & FUNC_IS_CTOR) {
                 FuncArg *funcarg;
-                CError_ASSERT(152, TYPE_FUNC(instobj->type)->flags & FUNC_FLAGS_METHOD);
+                CError_ASSERT(152, TYPE_FUNC(instobj->type)->flags & FUNC_METHOD);
                 CError_ASSERT(153, funcarg = TYPE_FUNC(instobj->type)->args);
 
-                if (TYPE_METHOD(instobj->type)->theclass->flags & CLASS_FLAGS_20)
+                if (TYPE_METHOD(instobj->type)->theclass->flags & CLASS_HAS_VBASES)
                     CError_ASSERT(156, funcarg = funcarg->next);
 
                 if (funcarg->next)
@@ -1268,7 +1268,7 @@ static int CTemplFunc_TemplateNestLevel(NameSpace *nspace) {
     int level = 0;
 
     while (nspace) {
-        if (nspace->theclass && (nspace->theclass->flags & CLASS_FLAGS_900))
+        if (nspace->theclass && (nspace->theclass->flags & CLASS_IS_TEMPL_ANY))
             level++;
         nspace = nspace->parent;
     }
@@ -1288,17 +1288,17 @@ static Boolean CTemplFunc_SameFuncType(TypeFunc *a, TypeFunc *b) {
     if (a->qual != b->qual)
         return 0;
 
-    if ((a->flags & (FUNC_FLAGS_PASCAL | FUNC_FLAGS_F0000000)) != (b->flags & (FUNC_FLAGS_PASCAL | FUNC_FLAGS_F0000000)))
+    if ((a->flags & FUNC_CALL_CONV_MASK) != (b->flags & FUNC_CALL_CONV_MASK))
         return 0;
 
     arg1 = a->args;
-    if ((a->flags & FUNC_FLAGS_METHOD) && !TYPE_METHOD(a)->x26) {
+    if ((a->flags & FUNC_METHOD) && !TYPE_METHOD(a)->is_static) {
         CError_ASSERT(1808, arg1);
         arg1 = arg1->next;
     }
 
     arg2 = b->args;
-    if ((b->flags & FUNC_FLAGS_METHOD) && !TYPE_METHOD(b)->x26) {
+    if ((b->flags & FUNC_METHOD) && !TYPE_METHOD(b)->is_static) {
         CError_ASSERT(1814, arg2);
         arg2 = arg2->next;
     }