tons more renaming of stuff

1 files changed, 23 insertions, 23 deletions

diff --git a/compiler_and_linker/unsorted/CBrowse.c b/compiler_and_linker/unsorted/CBrowse.c
index a776a70..12ea4c8 100644
--- a/compiler_and_linker/unsorted/CBrowse.c
+++ b/compiler_and_linker/unsorted/CBrowse.c
@@ -202,7 +202,7 @@ void CBrowse_BeginClass(DeclInfo *di, GList *gl) {
         !di->file->recordbrowseinfo ||
         !di->file2 ||
         !di->file2->fileID ||
-        di->x60 <= 0
+        di->sourceoffset <= 0
         )
     {
         memclrw(&gClassData, sizeof(gClassData));
@@ -218,9 +218,9 @@ void CBrowse_BeginClass(DeclInfo *di, GList *gl) {
     AppendGListByte(&gClassData, browseClass);
     AppendGListWord(&gClassData, di->file->fileID);
     AppendGListWord(&gClassData, di->file2->fileID);
-    AppendGListLong(&gClassData, di->x60 - 1);
+    AppendGListLong(&gClassData, di->sourceoffset - 1);
     CError_ASSERT(270, gClassData.size == 9);
-    AppendGListLong(&gClassData, di->x60 - 1);
+    AppendGListLong(&gClassData, di->sourceoffset - 1);
     AppendGListLong(&gClassData, 0);
     RecordName(&gClassData, TYPE_CLASS(di->thetype)->classname->name, TYPE_CLASS(di->thetype)->classname->id);
 
@@ -254,7 +254,7 @@ void CBrowse_BeginClass(DeclInfo *di, GList *gl) {
         AppendGListByte(&gClassData, base->is_virtual);
 
         tclass = base->base;
-        if ((tclass->flags & CLASS_FLAGS_800) && !TEMPL_CLASS_INST(tclass)->is_specialized)
+        if ((tclass->flags & CLASS_IS_TEMPL_INST) && !TEMPL_CLASS_INST(tclass)->is_specialized)
             tclass = TYPE_CLASS(TEMPL_CLASS_INST(tclass)->templ);
 
         CMangler_MangleType(TYPE(tclass), 0);
@@ -315,30 +315,30 @@ void CBrowse_AddClassMemberFunction(Object *object, SInt32 startOffset, SInt32 e
         CError_ASSERT(391, object->type && IS_TYPE_FUNC(object->type));
         tfunc = TYPE_METHOD(object->type);
 
-        if (tfunc->flags & FUNC_FLAGS_100)
+        if (tfunc->flags & FUNC_AUTO_GENERATED)
             return;
 
         if (object->datatype == DVFUNC)
             flags |= kVirtual;
-        if (tfunc->flags & FUNC_FLAGS_8)
+        if (tfunc->flags & FUNC_PURE)
             flags |= kAbstract;
-        if (tfunc->x26)
+        if (tfunc->is_static)
             flags |= kStatic;
-        if (tfunc->flags & FUNC_FLAGS_1000)
+        if (tfunc->flags & FUNC_IS_CTOR)
             flags |= kCtor;
-        if (tfunc->flags & FUNC_FLAGS_2000)
+        if (tfunc->flags & FUNC_IS_DTOR)
             flags |= kDtor;
 
         AppendGListByte(&gClassData, memberFunction);
         AppendGListByte(&gClassData, gFromAccessType[object->access]);
         AppendGListLong(&gClassData, flags);
 
-        id = tfunc->x22;
+        id = tfunc->funcid;
         if (id <= 0) {
             // TODO: this is not 64-bit safe
-            if (!(tfunc->flags & FUNC_FLAGS_2) || id == -1)
+            if (!(tfunc->flags & FUNC_DEFINED) || id == -1)
                 AppendGListLong(&gMemberFuncList, (SInt32) object);
-            tfunc->x22 = id = gNextMemberFuncID++;
+            tfunc->funcid = id = gNextMemberFuncID++;
         }
 
         AppendGListLong(&gClassData, id);
@@ -398,7 +398,7 @@ void CBrowse_BeginStruct(DeclInfo *di, TypeStruct *tstruct, GList *gl) {
         !di->file->recordbrowseinfo ||
         !di->file2 ||
         !di->file2->fileID ||
-        di->x60 <= 0
+            di->sourceoffset <= 0
         )
     {
         memclrw(&gClassData, sizeof(gClassData));
@@ -415,9 +415,9 @@ void CBrowse_BeginStruct(DeclInfo *di, TypeStruct *tstruct, GList *gl) {
     AppendGListByte(&gClassData, browseClass);
     AppendGListWord(&gClassData, di->file->fileID);
     AppendGListWord(&gClassData, di->file2->fileID);
-    AppendGListLong(&gClassData, di->x60 - 1);
+    AppendGListLong(&gClassData, di->sourceoffset - 1);
     CError_ASSERT(521, gClassData.size == 9);
-    AppendGListLong(&gClassData, di->x60 - 1);
+    AppendGListLong(&gClassData, di->sourceoffset - 1);
     AppendGListLong(&gClassData, 0);
     RecordName(&gClassData, name->name, name->id);
     AppendGListWord(&gClassData, 0);
@@ -540,7 +540,7 @@ static void RecordFunction(Object *object, int fileID1, int fileID2, SInt32 star
         return;
 
     tfunc = TYPE_FUNC(object->type);
-    if ((tfunc->flags & (FUNC_FLAGS_100 | FUNC_FLAGS_200)) && (!fileID2 || startOffset < 0))
+    if ((tfunc->flags & (FUNC_AUTO_GENERATED | FUNC_INTRINSIC)) && (!fileID2 || startOffset < 0))
         return;
 
     linkname = object->name;
@@ -566,7 +566,7 @@ static void RecordFunction(Object *object, int fileID1, int fileID2, SInt32 star
         }
     } else {
         flag = 1;
-        if (tfunc->flags & (FUNC_FLAGS_1000 | FUNC_FLAGS_2000)) {
+        if (tfunc->flags & (FUNC_IS_CTOR | FUNC_IS_DTOR)) {
             tmp = TYPE_METHOD(tfunc)->theclass->classname->name;
             while (*tmp >= '0' && *tmp <= '9')
                 tmp++;
@@ -576,7 +576,7 @@ static void RecordFunction(Object *object, int fileID1, int fileID2, SInt32 star
             if ((tmp = strrchr(str29, ':')))
                 str29 = tmp + 1;
 
-            if (tfunc->flags & FUNC_FLAGS_2000) {
+            if (tfunc->flags & FUNC_IS_DTOR) {
                 buf2[0] = '~';
                 strncpy(&buf2[1], str29, sizeof(buf2) - 1);
                 namestr = buf2;
@@ -623,15 +623,15 @@ static void RecordFunction(Object *object, int fileID1, int fileID2, SInt32 star
         flags |= kAsm;
     if (object->sclass == TK_STATIC)
         flags |= kStatic;
-    if (tfunc->flags & FUNC_FLAGS_METHOD)
+    if (tfunc->flags & FUNC_METHOD)
         flags |= kMember;
     AppendGListLong(&gBrowseData, flags);
 
     funcid = 0;
-    if (tfunc->flags & FUNC_FLAGS_METHOD) {
-        funcid = TYPE_METHOD(tfunc)->x22;
+    if (tfunc->flags & FUNC_METHOD) {
+        funcid = TYPE_METHOD(tfunc)->funcid;
         if (funcid <= 0) {
-            TYPE_METHOD(tfunc)->x22 = funcid = gNextMemberFuncID++;
+            TYPE_METHOD(tfunc)->funcid = funcid = gNextMemberFuncID++;
         }
     }
     AppendGListLong(&gBrowseData, funcid);
@@ -729,7 +729,7 @@ static void RecordUndefinedMemberFunctions(void) {
     count = gMemberFuncList.size / sizeof(Object *);
     array = (Object **) *gMemberFuncList.data;
     for (i = 0; i < count; i++, array++) {
-        if (IS_TYPE_FUNC((*array)->type) && !(TYPE_FUNC((*array)->type)->flags & FUNC_FLAGS_2))
+        if (IS_TYPE_FUNC((*array)->type) && !(TYPE_FUNC((*array)->type)->flags & FUNC_DEFINED))
             RecordFunction(*array, 0, 0, -1, -1);
     }