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

Support for out variable declarations in mixin arguments

Browse source
This commit is contained in:
Brian Fiete 2020-09-22 13:41:18 -07:00
parent 8b8d7fd782
commit 9a7bb95107
2 changed files with 57 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

50
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -6498,8 +6498,8 @@ BfTypedValue BfExprEvaluator::ResolveArgValue(BfResolvedArg& resolvedArg, BfType
else if ((resolvedArg.mArgFlags & (BfArgFlag_VariableDeclaration | BfArgFlag_UninitializedExpr)) != 0)
{
auto variableDeclaration = BfNodeDynCast<BfVariableDeclaration>(resolvedArg.mExpression);
auto variableType = wantType;
auto variableType = wantType;
bool isLet = (variableDeclaration != NULL) && (variableDeclaration->mTypeRef->IsExact<BfLetTypeReference>());
bool isVar = (variableDeclaration == NULL) || (variableDeclaration->mTypeRef->IsExact<BfVarTypeReference>());
@ -6511,12 +6511,29 @@ BfTypedValue BfExprEvaluator::ResolveArgValue(BfResolvedArg& resolvedArg, BfType
if ((!isLet) && (!isVar))
{
mModule->Fail("Only 'ref' or 'var' variables can be declared in method arguments", variableDeclaration);
if (variableType->IsVar())
{
auto resolvedType = mModule->ResolveTypeRef(variableDeclaration->mTypeRef);
if (resolvedType != NULL)
variableType = resolvedType;
}
else
{
mModule->Fail("Only 'ref' or 'var' variables can be declared in method arguments", variableDeclaration);
auto autoComplete = GetAutoComplete();
if (autoComplete != NULL)
autoComplete->CheckTypeRef(variableDeclaration->mTypeRef, true, true);
auto autoComplete = GetAutoComplete();
if (autoComplete != NULL)
autoComplete->CheckTypeRef(variableDeclaration->mTypeRef, true, true);
}
}
else
{
if (variableType->IsVar())
{
mModule->Fail("Variable type required for 'var' parameter types", variableDeclaration);
}
}
if (wantType->IsRef())
{
@ -13529,7 +13546,19 @@ void BfExprEvaluator::InjectMixin(BfAstNode* targetSrc, BfTypedValue target, boo
BfExprEvaluator* exprEvaluator = argExprEvaluators.back();
exprEvaluator->mResolveGenericParam = false;
exprEvaluator->mBfEvalExprFlags = (BfEvalExprFlags)(exprEvaluator->mBfEvalExprFlags | BfEvalExprFlags_NoCast | BfEvalExprFlags_AllowRefExpr | BfEvalExprFlags_AllowOutExpr);
if (argExpr != NULL)
bool deferExpr = false;
if (auto variableDecl = BfNodeDynCast<BfVariableDeclaration>(argExpr))
{
deferExpr = true;
resolvedArg.mArgFlags = (BfArgFlags)(resolvedArg.mArgFlags | BfArgFlag_VariableDeclaration);
}
if (deferExpr)
{
//
}
else if (argExpr != NULL)
exprEvaluator->Evaluate(argExpr, false, false, true);
auto argValue = exprEvaluator->mResult;
mModule->FixIntUnknown(argValue);
@ -13779,7 +13808,12 @@ void BfExprEvaluator::InjectMixin(BfAstNode* targetSrc, BfTypedValue target, boo
BfType* wantType = methodInstance->mParams[paramIdx].mResolvedType;
auto& arg = args[argIdx];
if ((arg.mArgFlags & BfArgFlag_VariableDeclaration) != 0)
{
arg.mTypedValue = ResolveArgValue(arg, wantType);
}
if (wantType->IsGenericParam())
{
//

15
IDEHelper/Tests/src/Mixins.bf
View file

@ -37,6 +37,16 @@ namespace Tests
}
}
static mixin GetVal(var a)
{
a = 123;
}
static mixin GetVal2(out int a)
{
a = 234;
}
[Test]
public static void TestBasics()
{
@ -47,6 +57,11 @@ namespace Tests
Test.Assert(mc.mA == 120);
Test.Assert(MixClass.MixC!(30) == 230);
Test.Assert(cVal == 0x305);
GetVal!(int val1);
Test.Assert(val1 == 123);
GetVal2!(var val2);
Test.Assert(val2 == 234);
}
[Test]