tons more renaming of stuff

1 files changed, 15 insertions, 15 deletions

diff --git a/compiler_and_linker/unsorted/CTemplateTools.c b/compiler_and_linker/unsorted/CTemplateTools.c
index 03a51cb..0e77e74 100644
--- a/compiler_and_linker/unsorted/CTemplateTools.c
+++ b/compiler_and_linker/unsorted/CTemplateTools.c
@@ -376,7 +376,7 @@ static FuncArg *CTemplTool_GetFirstRealArg(TypeFunc *tfunc) {
     if (IS_TYPEFUNC_NONSTATIC_METHOD(tfunc)) {
         CError_ASSERT(502, arg);
         arg = arg->next;
-        if ((tfunc->flags & FUNC_FLAGS_1000) && (TYPE_METHOD(tfunc)->theclass->flags & CLASS_FLAGS_20)) {
+        if ((tfunc->flags & FUNC_IS_CTOR) && (TYPE_METHOD(tfunc)->theclass->flags & CLASS_HAS_VBASES)) {
             CError_ASSERT(507, arg);
             arg = arg->next;
         }
@@ -543,7 +543,7 @@ void CTemplTool_SetupOuterTemplateArgumentNameSpace(NameSpace *nspace) {
     NameSpace *newns;
 
     while (nspace) {
-        if (nspace->theclass && (nspace->theclass->flags & CLASS_FLAGS_800)) {
+        if (nspace->theclass && (nspace->theclass->flags & CLASS_IS_TEMPL_INST)) {
             newns = CTemplTool_SetupTemplateArgumentNameSpace(
                 TEMPL_CLASS_INST(nspace->theclass)->templ->templ__params,
                 TEMPL_CLASS_INST(nspace->theclass)->inst_args,
@@ -570,7 +570,7 @@ NameSpace *CTemplTool_InsertTemplateArgumentNameSpace(TemplParam *params, TemplC
 
 void CTemplTool_RemoveOuterTemplateArgumentNameSpace(NameSpace *nspace) {
     while (nspace->parent) {
-        if (nspace->theclass && (nspace->theclass->flags & CLASS_FLAGS_800) && nspace->parent->is_templ)
+        if (nspace->theclass && (nspace->theclass->flags & CLASS_IS_TEMPL_INST) && nspace->parent->is_templ)
             nspace->parent = nspace->parent->parent;
         nspace = nspace->parent;
     }
@@ -595,7 +595,7 @@ Boolean CTemplTool_IsTemplateArgumentDependentType(Type *type) {
             case TYPESTRUCT:
                 return 0;
             case TYPECLASS:
-                return (TYPE_CLASS(type)->flags & CLASS_FLAGS_100) ? 1 : 0;
+                return (TYPE_CLASS(type)->flags & CLASS_IS_TEMPL) ? 1 : 0;
             case TYPEMEMBERPOINTER:
                 if (CTemplTool_IsTemplateArgumentDependentType(TYPE_MEMBER_POINTER(type)->ty1))
                     return 1;
@@ -1004,7 +1004,7 @@ static TemplClassInst *CTemplTool_FindNestedClassInstance(TemplClass *a, TemplCl
         if (i < 0)
             break;
 
-        if ((inst->theclass.flags & (CLASS_FLAGS_2 | CLASS_FLAGS_800)) == CLASS_FLAGS_800)
+        if ((inst->theclass.flags & (CLASS_COMPLETED | CLASS_IS_TEMPL_INST)) == CLASS_IS_TEMPL_INST)
             CTempl_InstantiateTemplateClass(TYPE_CLASS(inst));
     }
 
@@ -1067,7 +1067,7 @@ static Type *CTemplTool_FindTemplateInstance(TypeDeduce *deduce, TemplClass *tem
 
     if (dtempl->flags & TEMPLCLASS_FLAGS_2) {
         scantempl = TEMPL_CLASS(dtempl->theclass.nspace->theclass);
-        CError_ASSERT(1422, scantempl->theclass.flags & CLASS_FLAGS_100);
+        CError_ASSERT(1422, scantempl->theclass.flags & CLASS_IS_TEMPL);
         scaninst = dinst;
 
         while (1) {
@@ -1127,7 +1127,7 @@ ENode *CTemplTool_DeduceExpr(TypeDeduce *deduce, ENode *expr) {
     ENode *newExpr;
     NameSpaceObjectList *nsObjectList;
     TStreamElement *saved;
-    CScopeParseResult pr;
+    NameResult pr;
     Type *type;
     UInt32 qual;
 
@@ -1310,7 +1310,7 @@ ENode *CTemplTool_DeduceDefaultArg(Object *func, ENode *expr) {
     if (func->u.func.inst)
         deduce.args = func->u.func.inst->args;
 
-    if ((TYPE_FUNC(func->type)->flags & FUNC_FLAGS_METHOD) && (TYPE_METHOD(func->type)->theclass->flags & CLASS_FLAGS_800)) {
+    if ((TYPE_FUNC(func->type)->flags & FUNC_METHOD) && (TYPE_METHOD(func->type)->theclass->flags & CLASS_IS_TEMPL_INST)) {
         deduce.inst = TEMPL_CLASS_INST(TYPE_METHOD(func->type)->theclass);
         deduce.tmclass = TEMPL_CLASS_INST(TYPE_METHOD(func->type)->theclass)->templ;
     }
@@ -1572,7 +1572,7 @@ static Type *CTemplTool_DeduceBitfieldCopy(TypeDeduce *deduce, Type *type, ENode
     tbitfield->type = TYPEBITFIELD;
     tbitfield->size = type->size;
     tbitfield->bitfieldtype = type;
-    tbitfield->unkB = sizeval;
+    tbitfield->bitlength = sizeval;
 
     return TYPE(tbitfield);
 }
@@ -1817,7 +1817,7 @@ Type *CTemplTool_DeduceTypeCopy(TypeDeduce *deduce, Type *type, UInt32 *resultQu
         case TYPEENUM:
             if (
                 TYPE_ENUM(type)->nspace->theclass &&
-                (TYPE_ENUM(type)->nspace->theclass->flags & CLASS_FLAGS_100) &&
+                (TYPE_ENUM(type)->nspace->theclass->flags & CLASS_IS_TEMPL) &&
                 !deduce->x14
                 )
             {
@@ -1834,10 +1834,10 @@ Type *CTemplTool_DeduceTypeCopy(TypeDeduce *deduce, Type *type, UInt32 *resultQu
 
         case TYPECLASS:
             if (!deduce->x14) {
-                if (TYPE_CLASS(type)->flags & CLASS_FLAGS_100)
+                if (TYPE_CLASS(type)->flags & CLASS_IS_TEMPL)
                     return CTemplTool_FindTemplateInstance(deduce, TEMPL_CLASS(type));
 
-                if (TYPE_CLASS(type)->nspace->theclass && (TYPE_CLASS(type)->nspace->theclass->flags & CLASS_FLAGS_100)) {
+                if (TYPE_CLASS(type)->nspace->theclass && (TYPE_CLASS(type)->nspace->theclass->flags & CLASS_IS_TEMPL)) {
                     CError_ASSERT(2492, deduce->inst);
                     CError_ASSERT(2493, TYPE_CLASS(type)->classname);
 
@@ -1904,11 +1904,11 @@ Type *CTemplTool_DeduceTypeCopy(TypeDeduce *deduce, Type *type, UInt32 *resultQu
             return deduced;
 
         case TYPEFUNC:
-            if (TYPE_FUNC(type)->flags & FUNC_FLAGS_METHOD) {
+            if (TYPE_FUNC(type)->flags & FUNC_METHOD) {
                 qual2 = 0;
                 deduced = galloc(sizeof(TypeMemberFunc));
                 *TYPE_METHOD(deduced) = *TYPE_METHOD(type);
-                TYPE_METHOD(deduced)->x22 = 0;
+                TYPE_METHOD(deduced)->funcid = 0;
                 TYPE_METHOD(deduced)->theclass = TYPE_CLASS(CTemplTool_DeduceTypeQualCopy(deduce, TYPE(TYPE_METHOD(type)->theclass), &qual2));
                 CError_ASSERT(2556, IS_TYPE_CLASS(TYPE_METHOD(deduced)->theclass));
             } else {
@@ -1916,7 +1916,7 @@ Type *CTemplTool_DeduceTypeCopy(TypeDeduce *deduce, Type *type, UInt32 *resultQu
                 *TYPE_FUNC(deduced) = *TYPE_FUNC(type);
             }
 
-            TYPE_FUNC(deduced)->flags &= ~FUNC_FLAGS_100000;
+            TYPE_FUNC(deduced)->flags &= ~FUNC_IS_TEMPL;
 
             qual2 = TYPE_FUNC(type)->qual;
             TYPE_FUNC(deduced)->functype = CTemplTool_DeduceTypeQualCopy(deduce, TYPE_FUNC(type)->functype, &qual2);