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

We were failing on an invalid type lookup in a tuple bind

Browse source
This commit is contained in:
Brian Fiete 2019-09-29 07:42:58 -07:00
parent 4b2238337d
commit dfbf7a2792
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -2089,8 +2089,10 @@ void BfModule::HandleCaseEnumMatch_Tuple(BfTypedValue tupleVal, const BfSizedArr
if (!isVarOrLet) if (!isVarOrLet)
{ {
auto wantType = ResolveTypeRef(varDecl->mTypeRef); auto wantType = ResolveTypeRef(varDecl->mTypeRef);
if (wantType == NULL)
wantType = mContext->mBfObjectType;
if (wantType != NULL) if (wantType != NULL)
tupleElement = Cast(varDecl->mTypeRef, tupleElement, wantType); tupleElement = Cast(varDecl->mTypeRef, tupleElement, wantType);
if (!tupleElement) if (!tupleElement)
tupleElement = GetDefaultTypedValue(wantType); tupleElement = GetDefaultTypedValue(wantType);
} }
@ -4828,8 +4830,11 @@ void BfModule::Visit(BfUsingStatement* usingStmt)
AssertErrorState(); AssertErrorState();
failed = true; failed = true;
} }
else else
embeddedValue = BfTypedValue(localVar->mAddr, localVar->mResolvedType, true); {
embeddedValue = exprEvaluator.LoadLocal(localVar);
}
//exprEvaluator.CheckModifyResult(embeddedValue, usingStmt->mVariableDeclaration->mNameNode,);
} }
else else
{ {
@ -4839,7 +4844,7 @@ void BfModule::Visit(BfUsingStatement* usingStmt)
} }
if (!failed) if (!failed)
{ {
exprEvaluator.mFunctionBindResult = &functionBindResult; exprEvaluator.mFunctionBindResult = &functionBindResult;
BfResolvedArgs resolvedArgs; BfResolvedArgs resolvedArgs;
exprEvaluator.MatchMethod(usingStmt->mVariableDeclaration, NULL, embeddedValue, false, false, "Dispose", resolvedArgs, NULL); exprEvaluator.MatchMethod(usingStmt->mVariableDeclaration, NULL, embeddedValue, false, false, "Dispose", resolvedArgs, NULL);