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/CExprConvMatch.c | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'compiler_and_linker/unsorted/CExprConvMatch.c') diff --git a/compiler_and_linker/unsorted/CExprConvMatch.c b/compiler_and_linker/unsorted/CExprConvMatch.c index c01f54b..5cc145f 100644 --- a/compiler_and_linker/unsorted/CExprConvMatch.c +++ b/compiler_and_linker/unsorted/CExprConvMatch.c @@ -81,8 +81,8 @@ static Type *CExpr_GetImplictObjectParamType(Object *object, UInt32 *qual) { Type *type; CError_ASSERT(98, IS_TYPE_FUNC(object->type)); - CError_ASSERT(99, TYPE_FUNC(object->type)->flags & FUNC_FLAGS_METHOD); - CError_ASSERT(100, !TYPE_METHOD(object->type)->x26); + CError_ASSERT(99, TYPE_FUNC(object->type)->flags & FUNC_METHOD); + CError_ASSERT(100, !TYPE_METHOD(object->type)->is_static); CError_ASSERT(101, TYPE_METHOD(object->type)->args); type = CDecl_NewRefPointerType(TYPE(TYPE_METHOD(object->type)->theclass)); @@ -567,7 +567,7 @@ static Boolean CExpr_OverloadFuncMatch(NameSpaceObjectList *list, TemplArg *temp *outExpr = expr; expr->rtype = CDecl_NewPointerType(object26->type); expr->flags = object->qual & ENODE_FLAG_QUALS; - object26->flags |= OBJECT_FLAGS_1; + object26->flags |= OBJECT_USED; if (object26->datatype == DINLINEFUNC) CError_Error(CErrorStr175); } @@ -613,7 +613,7 @@ static Boolean CExpr_StandardConversionMatch(ENode *expr, Type *type2, UInt32 qu if ( IS_TYPE_INT(expr->rtype) && ENODE_IS_INDIRECT_TO(expr, EOBJREF) && - (expr->data.monadic->data.objref->qual & Q_10000) && + (expr->data.monadic->data.objref->qual & Q_INLINE_DATA) && CInt64_IsZero(&expr->data.monadic->data.objref->u.data.u.intconst) ) return CExpr_SetupStandardConversionResult(expr, type2, qual2, SSCR_2, x14, refFlag, result); @@ -912,7 +912,7 @@ static ENode *CExpr_UserConversion(ENode *expr, Type *type2, UInt32 qual2, Impli flag22 = 1; while ((object26 = CExpr_ConversionIteratorNext(&convIter))) { tfunc23 = TYPE_FUNC(object26->type); - if (tfunc23->flags & FUNC_FLAGS_100000) { + if (tfunc23->flags & FUNC_IS_TEMPL) { object26 = CTempl_DeduceFromConversion(object26, type2, qual2); if (!object26) continue; @@ -996,7 +996,7 @@ static ENode *CExpr_UserConversion(ENode *expr, Type *type2, UInt32 qual2, Impli (isExplicit || !(object26->qual & Q_EXPLICIT)) ) { - if (tfunc23->flags & FUNC_FLAGS_100000) { + if (tfunc23->flags & FUNC_IS_TEMPL) { myarglist.next = NULL; myarglist.node = expr; object26 = CTempl_DeduceFromFunctionCall(object26, NULL, &myarglist); @@ -1009,7 +1009,7 @@ static ENode *CExpr_UserConversion(ENode *expr, Type *type2, UInt32 qual2, Impli continue; if (!(arg21 = arg21->next)) continue; - if ((TYPE_CLASS(type2)->flags & CLASS_FLAGS_20) && !(arg21 = arg21->next)) + if ((TYPE_CLASS(type2)->flags & CLASS_HAS_VBASES) && !(arg21 = arg21->next)) continue; if (arg21 == &elipsis) continue; @@ -1086,7 +1086,7 @@ static ENode *CExpr_UserConversion(ENode *expr, Type *type2, UInt32 qual2, Impli CError_ASSERT(1416, IS_TYPEFUNC_METHOD(tfunc23)); funcref = create_objectrefnode(object28); - object28->flags |= OBJECT_FLAGS_1; + object28->flags |= OBJECT_USED; arglist = lalloc(sizeof(ENodeList)); arglist->next = NULL; @@ -1135,7 +1135,7 @@ static ENode *CExpr_UserConversion(ENode *expr, Type *type2, UInt32 qual2, Impli arglist->next = NULL; arglist->node = expr; - if (TYPE_CLASS(type2)->flags & CLASS_FLAGS_20) { + if (TYPE_CLASS(type2)->flags & CLASS_HAS_VBASES) { arglist->next = lalloc(sizeof(ENodeList)); arglist->next->node = expr; arglist->next->next = NULL; @@ -1616,11 +1616,11 @@ static Boolean CExpr_MatchArgs(Object *func, ENodeList *argexprs, ENode *expr, I args = TYPE_FUNC(func->type)->args; - if (!(TYPE_FUNC(func->type)->flags & FUNC_FLAGS_METHOD)) { + if (!(TYPE_FUNC(func->type)->flags & FUNC_METHOD)) { convs->type = ICT_0; - } else if (TYPE_METHOD(func->type)->x26) { + } else if (TYPE_METHOD(func->type)->is_static) { convs->type = ICT_0; - } else if (TYPE_FUNC(func->type)->flags & FUNC_FLAGS_1000) { + } else if (TYPE_FUNC(func->type)->flags & FUNC_IS_CTOR) { convs->type = ICT_0; args = args->next; } else { @@ -1770,7 +1770,7 @@ void CExpr_FuncArgMatch(NameSpaceObjectList *list, TemplArg *templargs, ENodeLis (!flag || !(object->qual & Q_EXPLICIT)) ) { - if (object->datatype == DALIAS && (TYPE_FUNC(object->type)->flags & FUNC_FLAGS_METHOD)) { + if (object->datatype == DALIAS && (TYPE_FUNC(object->type)->flags & FUNC_METHOD)) { for (j = list; j; j = j->next) { if (j == i) continue; @@ -1785,10 +1785,10 @@ void CExpr_FuncArgMatch(NameSpaceObjectList *list, TemplArg *templargs, ENodeLis FuncArg *argsA; FuncArg *argsB; argsA = TYPE_FUNC(object->type)->args; - if (argsA && !TYPE_METHOD(object->type)->x26) + if (argsA && !TYPE_METHOD(object->type)->is_static) argsA = argsA->next; argsB = TYPE_FUNC(object2->type)->args; - if (argsB && !TYPE_METHOD(object2->type)->x26) + if (argsB && !TYPE_METHOD(object2->type)->is_static) argsB = argsB->next; if (is_arglistsame(argsA, argsB)) break; @@ -1799,7 +1799,7 @@ void CExpr_FuncArgMatch(NameSpaceObjectList *list, TemplArg *templargs, ENodeLis continue; } - if (TYPE_FUNC(object->type)->flags & FUNC_FLAGS_100000) { + if (TYPE_FUNC(object->type)->flags & FUNC_IS_TEMPL) { specialfunc = object; object = CTempl_DeduceFromFunctionCall(object, templargs, argexprs); if (!object) @@ -2235,7 +2235,7 @@ Boolean CExpr_OperatorMatch(short token, ENode *left, ENode *right, Conversion * UInt32 leftQual; Type *rightType; UInt32 rightQual; - CScopeParseResult pr; + NameResult pr; NameSpaceObjectList myList; Match myMatch; @@ -2278,7 +2278,7 @@ Boolean CExpr_OperatorMatch(short token, ENode *left, ENode *right, Conversion * for (list = pr.nsol_14; list; list = list->next) { object = OBJECT(list->object); if (object->otype == OT_OBJECT && IS_TYPE_FUNC(object->type)) { - if (TYPE_FUNC(object->type)->flags & FUNC_FLAGS_100000) { + if (TYPE_FUNC(object->type)->flags & FUNC_IS_TEMPL) { specialfunc = object; object = CTempl_DeduceFromFunctionCall(object, NULL, argExprs->next); if (!object) @@ -2326,7 +2326,7 @@ Boolean CExpr_OperatorMatch(short token, ENode *left, ENode *right, Conversion * for (list = pr.nsol_14; list; list = list->next) { object = OBJECT(list->object); if (object->otype == OT_OBJECT && IS_TYPE_NONMETHOD(object->type)) { - if (TYPE_FUNC(object->type)->flags & FUNC_FLAGS_100000) { + if (TYPE_FUNC(object->type)->flags & FUNC_IS_TEMPL) { specialfunc = object; object = CTempl_DeduceFromFunctionCall(object, NULL, argExprs); if (!object) @@ -2422,7 +2422,7 @@ static ENode *CExpr_ClassCopyInit(TypeClass *tclass, ENode *expr1, ENode *expr2) CError_ASSERT(3199, arg); arg = arg->next; - if (tclass->flags & CLASS_FLAGS_20) { + if (tclass->flags & CLASS_HAS_VBASES) { CError_ASSERT(3203, arg); arg = arg->next; } @@ -2497,7 +2497,7 @@ static ENode *CExpr_ClassCopyInit(TypeClass *tclass, ENode *expr1, ENode *expr2) argExprs = lalloc(sizeof(ENodeList)); argExprs->node = expr2; - if (tclass->flags & CLASS_FLAGS_20) { + if (tclass->flags & CLASS_HAS_VBASES) { argExprs->next = lalloc(sizeof(ENodeList)); argExprs->next->next = NULL; argExprs->next->node = intconstnode(TYPE(&stsignedshort), 1); -- cgit v1.2.3