Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Allow warn/error attribute on fields

Browse source
This commit is contained in:
Brian Fiete 2022-08-27 09:23:31 -07:00
parent db73305d2c
commit f8f95e9de3
4 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
IDEHelper/Compiler/BfModule.cpp
View file

@ -478,7 +478,8 @@ public:
void EmitAppendAlign(int align, int sizeMultiple = 0)
{
BF_ASSERT(align > 0);
if (align <= 1)
return;
if (mIsFirstConstPass)
mModule->mCurMethodInstance->mAppendAllocAlign = BF_MAX((int)mModule->mCurMethodInstance->mAppendAllocAlign, align);
@ -3387,7 +3388,7 @@ BfError* BfModule::Warn(int warningNum, const StringImpl& warning, BfAstNode* re
return bfError;
}
void BfModule::CheckErrorAttributes(BfTypeInstance* typeInstance, BfMethodInstance* methodInstance, BfCustomAttributes* customAttributes, BfAstNode* targetSrc)
void BfModule::CheckErrorAttributes(BfTypeInstance* typeInstance, BfMethodInstance* methodInstance, BfFieldInstance* fieldInstance, BfCustomAttributes* customAttributes, BfAstNode* targetSrc)
{
if (customAttributes == NULL)
return;
@ -3414,7 +3415,9 @@ void BfModule::CheckErrorAttributes(BfTypeInstance* typeInstance, BfMethodInstan
if ((customAttribute != NULL) && (!customAttribute->mCtorArgs.IsEmpty()) && (targetSrc != NULL))
{
String err;
if (methodInstance != NULL)
if (fieldInstance != NULL)
err = StrFormat("'%s' is obsolete", FieldToString(fieldInstance).c_str());
else if (methodInstance != NULL)
err = StrFormat("'%s' is obsolete", MethodToString(methodInstance).c_str());
else
err = StrFormat("'%s' is obsolete", TypeToString(typeInstance, BfTypeNameFlag_UseUnspecializedGenericParamNames).c_str());
@ -3453,7 +3456,9 @@ void BfModule::CheckErrorAttributes(BfTypeInstance* typeInstance, BfMethodInstan
if ((customAttribute != NULL) && (!customAttribute->mCtorArgs.IsEmpty()))
{
String err;
if (methodInstance != NULL)
if (fieldInstance != NULL)
err += StrFormat("Method error: '", FieldToString(fieldInstance).c_str());
else if (methodInstance != NULL)
err += StrFormat("Method error: '", MethodToString(methodInstance).c_str());
else
err += StrFormat("Type error: '", TypeToString(typeInstance, BfTypeNameFlag_UseUnspecializedGenericParamNames).c_str());
@ -3469,7 +3474,9 @@ void BfModule::CheckErrorAttributes(BfTypeInstance* typeInstance, BfMethodInstan
if ((customAttribute != NULL) && (!customAttribute->mCtorArgs.IsEmpty()) && (targetSrc != NULL))
{
String err;
if (methodInstance != NULL)
if (fieldInstance != NULL)
err += StrFormat("Field warning: '", FieldToString(fieldInstance).c_str());
else if (methodInstance != NULL)
err += StrFormat("Method warning: '", MethodToString(methodInstance).c_str());
else
err += StrFormat("Type warning: '", TypeToString(typeInstance, BfTypeNameFlag_UseUnspecializedGenericParamNames).c_str());
@ -10022,6 +10029,9 @@ void BfModule::ValidateAllocation(BfType* type, BfAstNode* refNode)
void BfModule::EmitAppendAlign(int align, int sizeMultiple)
{
if (align <= 1)
return;
if (sizeMultiple == 0)
sizeMultiple = align;
if ((mCurMethodState->mCurAppendAlign != 0) && (mCurMethodState->mCurAppendAlign % align != 0))
@ -11177,6 +11187,18 @@ bool BfModule::HasMixin(BfTypeInstance* typeInstance, const StringImpl& methodNa
return BfModuleMethodInstance();
}
String BfModule::FieldToString(BfFieldInstance* fieldInstance)
{
auto result = TypeToString(fieldInstance->mOwner);
result += ".";
auto fieldDef = fieldInstance->GetFieldDef();
if (fieldDef != NULL)
result += fieldDef->mName;
else
result += "???";
return result;
}
StringT<128> BfModule::MethodToString(BfMethodInstance* methodInst, BfMethodNameFlags methodNameFlags, BfTypeVector* typeGenericArgs, BfTypeVector* methodGenericArgs)
{
auto methodDef = methodInst->mMethodDef;