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

Improved some fixits, boxing fix

Browse source
This commit is contained in:
Brian Fiete 2020-01-30 10:25:16 -08:00
parent d6566982f2
commit 36bf9df1f5
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
IDEHelper/Compiler/BfModule.cpp
View file

@ -2708,8 +2708,14 @@ BfError* BfModule::Warn(int warningNum, const StringImpl& warning, BfAstNode* re
if (parser != NULL) if (parser != NULL)
{ {
int fileLoc = BfFixitFinder::FindLineStartBefore(refNode); int fileLoc = BfFixitFinder::FindLineStartBefore(refNode);
mCompiler->mResolvePassData->mAutoComplete->AddEntry(AutoCompleteEntry("fixit", StrFormat("#unwarn\tunwarn|%s|%d|#unwarn|", parser->mFileName.c_str(), fileLoc).c_str())); mCompiler->mResolvePassData->mAutoComplete->AddEntry(AutoCompleteEntry("fixit", StrFormat("#unwarn\tunwarn|%s|%d|#unwarn|", parser->mFileName.c_str(), fileLoc).c_str()));
}
if (warningNum != 0)
{
mCompiler->mResolvePassData->mAutoComplete->AddEntry(AutoCompleteEntry("fixit", StrFormat("#pragma warning disable %d\tusing|%s|%d||#pragma warning disable %d",
warningNum, parser->mFileName.c_str(), 0, warningNum).c_str()));
}
}
} }
} }
return bfError; return bfError;
@ -8428,10 +8434,13 @@ BfTypedValue BfModule::BoxValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
if (toType->IsBoxed()) if (toType->IsBoxed())
{ {
BfBoxedType* boxedType = (BfBoxedType*)toType; BfBoxedType* boxedType = (BfBoxedType*)toType;
if (typedVal.mType == boxedType->mElementType) if (boxedType->mElementType->IsGenericParam())
return BfTypedValue(mBfIRBuilder->GetFakeVal(), toType); {
else if (typedVal.mType == boxedType->mElementType)
return BfTypedValue(); return BfTypedValue(mBfIRBuilder->GetFakeVal(), toType);
else
return BfTypedValue();
}
} }
} }

3
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -9167,7 +9167,8 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
doWrap = true; doWrap = true;
} }
if ((srcNode->IsA<BfCastExpression>()) || if ((srcNode->IsA<BfCastExpression>()) ||
(srcNode->IsA<BfBinaryOperatorExpression>())) (srcNode->IsA<BfBinaryOperatorExpression>()) ||
(srcNode->IsA<BfConditionalExpression>()))
doWrap = true; doWrap = true;
BfParserData* parser = srcNode->GetSourceData()->ToParserData(); BfParserData* parser = srcNode->GetSourceData()->ToParserData();