Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-17 23:56:05 +02:00
Code Activity

Fixed extern method generic arg case

Browse source
This commit is contained in:
Brian Fiete 2022-02-12 15:37:57 -05:00
parent 8c79e26d40
commit 6c714bacdc
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
IDE/Tests/CompileFail001/src/Generics.bf
View file

@ -99,9 +99,15 @@ namespace IDETest
TestGen(a); //FAIL Unable to determine generic argument 'TItem' TestGen(a); //FAIL Unable to determine generic argument 'TItem'
} }
static void Method7<T>() where T : var where comptype(typeof(T)) : class
{
}
public static void TestGenBug() public static void TestGenBug()
{ {
TestPreGen<List<int>>(); TestPreGen<List<int>>();
Method7<int>(); //FAIL The type 'int' must be a reference type in order to use it as parameter 'comptype(typeof(T))' for 'IDETest.Generics.Method7<int>()'
} }
} }
} }

3
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -2286,6 +2286,8 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* targetTypeInstance, BfTypeInst
{ {
auto genericParamType = (BfGenericParamType*)externType; auto genericParamType = (BfGenericParamType*)externType;
if (genericParamType->mGenericParamKind == BfGenericParamKind_Method) if (genericParamType->mGenericParamKind == BfGenericParamKind_Method)
{
if (genericArgumentsSubstitute != NULL)
{ {
auto genericArg = (*genericArgumentsSubstitute)[genericParamType->mGenericParamIdx]; auto genericArg = (*genericArgumentsSubstitute)[genericParamType->mGenericParamIdx];
if (genericArg == NULL) if (genericArg == NULL)
@ -2297,6 +2299,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* targetTypeInstance, BfTypeInst
externType = genericArg; externType = genericArg;
} }
} }
}
if (!mModule->CheckGenericConstraints(BfGenericParamSource(methodInstance), externType, NULL, genericParam, externGenericArgumentsSubstitute, NULL)) if (!mModule->CheckGenericConstraints(BfGenericParamSource(methodInstance), externType, NULL, genericParam, externGenericArgumentsSubstitute, NULL))
goto NoMatch; goto NoMatch;

11
IDEHelper/Tests/src/Generics.bf
View file

@ -331,6 +331,16 @@ namespace Tests
return (TOut)val; return (TOut)val;
} }
static void MethodH<T, T2>(T val) where T2 : List<T>
{
}
static void MethodI<T, T2>(T val) where comptype(typeof(T2)) : List<T>
{
}
[Test] [Test]
public static void TestBasics() public static void TestBasics()
{ {
@ -404,6 +414,7 @@ namespace Tests
Test.Assert(Conv<int...>(12.34f) == 12); Test.Assert(Conv<int...>(12.34f) == 12);
Test.Assert(Conv<int,?>(12.34f) == 12); Test.Assert(Conv<int,?>(12.34f) == 12);
//MethodH(scope List<int>());
} }
} }