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

Deferred Import dynamic/static check, fix calling convention

Browse source
This commit is contained in:
Brian Fiete 2019-12-21 05:44:01 -08:00
parent fbb06862b3
commit 42452fe09c
15 changed files with 102 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

13
IDEHelper/Compiler/BfDefBuilder.cpp
View file

@ -717,7 +717,7 @@ void BfDefBuilder::ParseAttributes(BfAttributeDirective* attributes, BfMethodDef
}
else if (typeRefName == "Import")
{
methodDef->mImportKind = BfImportKind_Static;
methodDef ->mImportKind = BfImportKind_Import_Unknown;
if (!attributes->mArguments.IsEmpty())
{
if (auto literalExpr = BfNodeDynCast<BfLiteralExpression>(attributes->mArguments[0]))
@ -725,12 +725,7 @@ void BfDefBuilder::ParseAttributes(BfAttributeDirective* attributes, BfMethodDef
if (literalExpr->mValue.mTypeCode == BfTypeCode_CharPtr)
{
String filePath = *literalExpr->mValue.mString;
String fileExt = GetFileExtension(filePath);
if ((fileExt.Equals(".DLL", StringImpl::CompareKind_OrdinalIgnoreCase)) ||
(fileExt.Equals(".EXE", StringImpl::CompareKind_OrdinalIgnoreCase)))
{
methodDef->mImportKind = BfImportKind_Dynamic;
}
methodDef->mImportKind = BfMethodDef::GetImportKindFromPath(filePath);
}
}
}
@ -752,7 +747,7 @@ void BfDefBuilder::ParseAttributes(BfAttributeDirective* attributes, BfMethodDef
else
{
methodDef->mCommutableKind = BfCommutableKind_Forward;
}
}
}
}
@ -1799,7 +1794,7 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
}
}
if (method->mImportKind == BfImportKind_Dynamic)
if ((method->mImportKind == BfImportKind_Import_Dynamic) || (method->mImportKind == BfImportKind_Import_Unknown))
needsStaticInit = true;
}