tons more renaming of stuff

1 files changed, 9 insertions, 9 deletions

diff --git a/compiler_and_linker/unsorted/CPrec.c b/compiler_and_linker/unsorted/CPrec.c
index 9872211..e61b96e 100644
--- a/compiler_and_linker/unsorted/CPrec.c
+++ b/compiler_and_linker/unsorted/CPrec.c
@@ -205,7 +205,7 @@ static OLinkList *CPrec_OLinkListCopy(OLinkList *list) {
 void PreComp_StaticData(Object *obj, const void *data, OLinkList *links, SInt32 size) {
     StaticData *entry;
 
-    if (obj->sclass != TK_STATIC && !(obj->qual & (Q_20000 | Q_OVERLOAD)))
+    if (obj->sclass != TK_STATIC && !(obj->qual & (Q_20000 | Q_WEAK)))
         CError_Error(CErrorStr180);
 
     entry = galloc(sizeof(StaticData));
@@ -702,7 +702,7 @@ static TypePointer *CPrec_GetTypePointerPatch(TypePointer *tptr) {
     TypePointer *scan1;
     TypePointer *scan2;
 
-    if (tptr->qual & Q_100000) {
+    if (tptr->qual & Q_IS_OBJC_ID) {
         p = CPrec_AppendAlign();
         CPrec_NewAddrPatch(tptr, p);
         CPrec_AppendData(tptr, sizeof(TypeObjCID));
@@ -872,14 +872,14 @@ static TypeFunc *CPrec_GetTypeFuncPatch(TypeFunc *type) {
     TypeFunc *p = CPrec_AppendAlign();
     CPrec_NewAddrPatch(type, p);
 
-    CPrec_AppendData(type, (type->flags & FUNC_FLAGS_METHOD) ? sizeof(TypeMemberFunc) : sizeof(TypeFunc));
+    CPrec_AppendData(type, (type->flags & FUNC_METHOD) ? sizeof(TypeMemberFunc) : sizeof(TypeFunc));
 
     CPrec_NewPointerPatch(&p->functype, CPrec_GetTypePatch(type->functype));
     if (type->args)
-        CPrec_NewPointerPatch(&p->args, CPrec_GetArgListPatch(type->args, (type->flags & FUNC_FLAGS_900000) != 0));
+        CPrec_NewPointerPatch(&p->args, CPrec_GetArgListPatch(type->args, (type->flags & FUNC_IS_TEMPL_ANY) != 0));
     if (type->exspecs)
         CPrec_NewPointerPatch(&p->exspecs, CPrec_GetExceptSpecPatch(type->exspecs));
-    if (type->flags & FUNC_FLAGS_METHOD)
+    if (type->flags & FUNC_METHOD)
         CPrec_NewPointerPatch(&TYPE_METHOD(p)->theclass, CPrec_GetTypePatch((Type *) TYPE_METHOD(type)->theclass));
 
     return p;
@@ -1683,7 +1683,7 @@ static TypeClass *CPrec_GetTypeClassPatch(TypeClass *tclass) {
     hasNextTempl = hasNextTemplInst = 0;
     CPrec_NewAddrPatch(tclass, current);
 
-    if (tclass->flags & CLASS_FLAGS_100) {
+    if (tclass->flags & CLASS_IS_TEMPL) {
         // template class
         CPrec_AppendData(tclass, sizeof(TemplClass));
         if (TEMPL_CLASS(tclass)->next)
@@ -1704,7 +1704,7 @@ static TypeClass *CPrec_GetTypeClassPatch(TypeClass *tclass) {
             CPrec_NewPointerPatch(&TEMPL_CLASS(current)->pspecs, CPrec_GetTemplPartialSpecPatch(TEMPL_CLASS(tclass)->pspecs));
         if (TEMPL_CLASS(tclass)->actions)
             CPrec_NewPointerPatch(&TEMPL_CLASS(current)->actions, CPrec_GetTemplateActionPatch(TEMPL_CLASS(tclass)->actions));
-    } else if (tclass->flags & CLASS_FLAGS_800) {
+    } else if (tclass->flags & CLASS_IS_TEMPL_INST) {
         // template class instance
         CPrec_AppendData(tclass, sizeof(TemplClassInst));
         if (TEMPL_CLASS_INST(tclass)->next)
@@ -2308,7 +2308,7 @@ static Object *CPrec_GetObjectPatch(Object *obj) {
 
     obj->toc = NULL;
 
-    if ((obj->qual & Q_400000) && obj->datatype != DALIAS) {
+    if ((obj->qual & Q_IS_TEMPLATED) && obj->datatype != DALIAS) {
         CPrec_AppendData(obj, sizeof(ObjectTemplated));
         CPrec_NewPointerPatch(&OBJECT_TEMPL(p)->parent, CPrec_GetObjectPatch(OBJECT_TEMPL(obj)->parent));
     } else {
@@ -2346,7 +2346,7 @@ static Object *CPrec_GetObjectPatch(Object *obj) {
 
         case DDATA:
             CError_ASSERT(3622, !obj->u.data.info);
-            if (obj->qual & Q_10000) {
+            if (obj->qual & Q_INLINE_DATA) {
                 switch (obj->type->type) {
                     case TYPEINT:
                     case TYPEENUM: