From 0905072b3ccfcb394b1dca2405a55cff4e2b9271 Mon Sep 17 00:00:00 2001 From: Ash Wolf Date: Fri, 20 Jan 2023 11:56:38 +0000 Subject: tons more renaming of stuff --- compiler_and_linker/unsorted/CInline.c | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'compiler_and_linker/unsorted/CInline.c') diff --git a/compiler_and_linker/unsorted/CInline.c b/compiler_and_linker/unsorted/CInline.c index 1afbde8..de51ab7 100644 --- a/compiler_and_linker/unsorted/CInline.c +++ b/compiler_and_linker/unsorted/CInline.c @@ -3468,7 +3468,7 @@ void CInline_AddInlineFunctionAction(Object *object, TypeClass *tclass, FileOffs CError_ASSERT(4132, IS_TYPE_FUNC(object->type)); - TYPE_FUNC(object->type)->flags |= FUNC_FLAGS_800000; + TYPE_FUNC(object->type)->flags |= FUNC_IS_TEMPL_INSTANCE; action = galloc(sizeof(CI_Action)); memclrw(action, sizeof(CI_Action)); @@ -3539,7 +3539,7 @@ static void CInline_AddFRefList_Object(Object *object) { if ( !(object->datatype == DFUNC || object->datatype == DVFUNC) || - (object->flags & OBJECT_FLAGS_4) || + (object->flags & OBJECT_DEFINED) || IS_TEMPL_FUNC(object->type) ) return; @@ -3764,8 +3764,8 @@ void CInline_ObjectAddrRef(Object *object) { if ( (object->qual & Q_INLINE) && (funcdata = object->u.func.u.ifuncdata) && - !(object->flags & OBJECT_FLAGS_4) && - !(TYPE_FUNC(object->type)->flags & FUNC_FLAGS_100000) + !(object->flags & OBJECT_DEFINED) && + !(TYPE_FUNC(object->type)->flags & FUNC_IS_TEMPL) ) { CI_Export *export = galloc(sizeof(CI_Export)); @@ -3777,12 +3777,12 @@ void CInline_ObjectAddrRef(Object *object) { export->next = cinline_exportlist; cinline_exportlist = export; - object->flags |= OBJECT_FLAGS_4; + object->flags |= OBJECT_DEFINED; return; } else if ( - (TYPE_FUNC(object->type)->flags & FUNC_FLAGS_100) && - !(TYPE_FUNC(object->type)->flags & FUNC_FLAGS_2) + (TYPE_FUNC(object->type)->flags & FUNC_AUTO_GENERATED) && + !(TYPE_FUNC(object->type)->flags & FUNC_DEFINED) ) { CInline_AddDefaultFunctionAction(object); @@ -3800,11 +3800,11 @@ void CInline_ObjectAddrRef(Object *object) { return; case DDATA: - if (object->qual & Q_10000) + if (object->qual & Q_INLINE_DATA) CInit_ExportConst(object); - if (object->flags & OBJECT_FLAGS_8) { - object->flags &= ~OBJECT_FLAGS_8; + if (object->flags & OBJECT_LAZY) { + object->flags &= ~OBJECT_LAZY; CParser_CallBackAction(object); } return; @@ -3821,15 +3821,15 @@ static Boolean CInline_CheckDependencies(ObjectList *list) { object = list->object; if ( - (TYPE_FUNC(object->type)->flags & FUNC_FLAGS_100) && - !(TYPE_FUNC(object->type)->flags & FUNC_FLAGS_2) + (TYPE_FUNC(object->type)->flags & FUNC_AUTO_GENERATED) && + !(TYPE_FUNC(object->type)->flags & FUNC_DEFINED) ) { CInline_AddDefaultFunctionAction(object); result = 1; } else if ( - (object->qual & Q_400000) && + (object->qual & Q_IS_TEMPLATED) && CTempl_InlineFunctionCheck(object) ) { @@ -3934,7 +3934,7 @@ void CInline_GenFunc(Statement *stmt, Object *object, UInt8 unk) { } } - object->flags |= OBJECT_FLAGS_4; + object->flags |= OBJECT_DEFINED; cinline_freflist = NULL; CInline_AddFRefList_Statement(stmt); @@ -3972,8 +3972,8 @@ void CInline_GenFunc(Statement *stmt, Object *object, UInt8 unk) { static void CInline_GenerateDefaultFunc(Object *object) { TypeClass *tclass; - CError_ASSERT(4770, TYPE_FUNC(object->type)->flags & FUNC_FLAGS_100); - CError_ASSERT(4771, TYPE_FUNC(object->type)->flags & FUNC_FLAGS_METHOD); + CError_ASSERT(4770, TYPE_FUNC(object->type)->flags & FUNC_AUTO_GENERATED); + CError_ASSERT(4771, TYPE_FUNC(object->type)->flags & FUNC_METHOD); tclass = TYPE_METHOD(object->type)->theclass; @@ -3997,7 +3997,7 @@ static TemplClassInst *CInline_FindNestedTemplInst(TypeClass *tclass) { NameSpace *nspace; while (tclass) { - if ((tclass->flags & CLASS_FLAGS_800)) + if ((tclass->flags & CLASS_IS_TEMPL_INST)) return TEMPL_CLASS_INST(tclass); if (!copts.template_patch) @@ -4040,7 +4040,7 @@ static void CInline_GenerateInlineFunc(CI_Action *action) { symdecltoken = *CPrep_CurStreamElement(); - TYPE_FUNC(object->type)->flags &= ~FUNC_FLAGS_2; + TYPE_FUNC(object->type)->flags &= ~FUNC_DEFINED; if (IS_TYPE_METHOD(object->type) && (inst = CInline_FindNestedTemplInst(TYPE_METHOD(object->type)->theclass))) { CTempl_ParseInstanceScopeFunction(object, inst, NULL); } else { @@ -4086,17 +4086,17 @@ Boolean CInline_GenerateDeferredFuncs(void) { CInline_GenerateDefaultFunc(action->obj); break; case CI_ActionInlineFunc: - if (!(action->obj->flags & OBJECT_FLAGS_4)) + if (!(action->obj->flags & OBJECT_DEFINED)) CInline_GenerateInlineFunc(action); break; case CI_ActionMemberFunc: - if (!(TYPE_FUNC(action->obj->type)->flags & FUNC_FLAGS_2)) + if (!(TYPE_FUNC(action->obj->type)->flags & FUNC_DEFINED)) CTempl_InstantiateMember( action->u.memberfunc.templ, action->u.memberfunc.inst, action->u.memberfunc.tmemb, action->obj, 0); break; case CI_ActionTemplateFunc: - if (!(TYPE_FUNC(action->obj->type)->flags & FUNC_FLAGS_2) && !action->u.templatefunc.inst->is_specialized) + if (!(TYPE_FUNC(action->obj->type)->flags & FUNC_DEFINED) && !action->u.templatefunc.inst->is_specialized) CTempl_GenFuncInstance(action->u.templatefunc.func, action->u.templatefunc.inst, 0); break; default: @@ -4128,7 +4128,7 @@ static InitExpr *CInline_InitTemplateData(InitExpr *init) { data = CParser_NewCompilerDefDataObject(); data->type = TYPE(&stsignedchar); data->name = CParser_NameConcat("__init__", CMangler_GetLinkName(object)->name); - data->qual = Q_OVERLOAD; + data->qual = Q_WEAK; CInit_DeclareData(data, NULL, NULL, data->type->size); stmt = CFunc_AppendStatement(ST_IFGOTO); @@ -4180,7 +4180,7 @@ void CInline_Finish(void) { init = init_expressions; while (init) { - if (init->object->nspace->theclass && (init->object->nspace->theclass->flags & CLASS_FLAGS_800)) { + if (init->object->nspace->theclass && (init->object->nspace->theclass->flags & CLASS_IS_TEMPL_INST)) { init = CInline_InitTemplateData(init); } else { stmt = CFunc_AppendStatement(ST_EXPRESSION); -- cgit v1.2.3