From 7e59c7fb9345894aa6ab170a23b7a88bed1e8885 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 17 Apr 2022 10:34:42 -0700 Subject: [PATCH] Added static search lookup for mixins --- IDEHelper/Compiler/BfExprEvaluator.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/IDEHelper/Compiler/BfExprEvaluator.cpp b/IDEHelper/Compiler/BfExprEvaluator.cpp index b4ededd0..8e21cf33 100644 --- a/IDEHelper/Compiler/BfExprEvaluator.cpp +++ b/IDEHelper/Compiler/BfExprEvaluator.cpp @@ -16332,6 +16332,22 @@ void BfExprEvaluator::InjectMixin(BfAstNode* targetSrc, BfTypedValue target, boo break; } } + + if (methodMatcher.mBestMethodDef == NULL) + { + BfStaticSearch* staticSearch = mModule->GetStaticSearch(); + if (staticSearch != NULL) + { + for (auto typeInst : staticSearch->mStaticTypes) + { + if (methodMatcher.CheckType(typeInst, BfTypedValue(), false)) + { + if (methodMatcher.mBestMethodDef != NULL) + break; + } + } + } + } if (methodMatcher.mBestMethodDef == NULL) {