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

Fixed binary operator selection issues

Browse source
This commit is contained in:
Brian Fiete 2021-01-22 06:41:41 -08:00
parent 9df5442a37
commit 2ee2860994
2 changed files with 104 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -20843,7 +20843,7 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
break; break;
bool foundExactMatch = false; bool foundExactMatch = false;
Array<BfOperatorDef*> oppositeOperatorDefs; SizedArray<BfOperatorDef*, 8> oppositeOperatorDefs;
for (auto operatorDef : checkType->mTypeDef->mOperators) for (auto operatorDef : checkType->mTypeDef->mOperators)
{ {
@ -21135,10 +21135,19 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
if (pass == 1) if (pass == 1)
break; break;
findBinaryOp = BfGetFlippedBinaryOp(findBinaryOp); auto flippedBinaryOp = BfGetFlippedBinaryOp(findBinaryOp);
if (findBinaryOp == BfBinaryOp_None) if (flippedBinaryOp != BfBinaryOp_None)
break; findBinaryOp = flippedBinaryOp;
} }
auto prevResultType = resultType;
if (leftValue.mType->IsPrimitiveType())
resultType = leftValue.mType;
if (rightValue.mType->IsPrimitiveType())
resultType = rightValue.mType;
if ((prevResultType->IsTypedPrimitive()) && (resultType->IsPrimitiveType()))
explicitCast = true;
} }
} }

90
IDEHelper/Tests/src/Operators.bf
View file

@ -102,6 +102,80 @@ namespace Tests
} }
} }
struct StructD
{
int mVal;
public this(int val)
{
mVal = val;
}
public static implicit operator int(StructD x)
{
return x.mVal;
}
public static implicit operator StructD(int x)
{
return default(StructD);
}
}
struct StructE
{
float mVal;
public this(float val)
{
mVal = val;
}
public static implicit operator float(StructE x)
{
return x.mVal;
}
public static implicit operator StructE(float x)
{
return .(x);
}
public static StructE operator+(StructE lhs, StructE rhs)
{
return .(1);
}
public static int operator+(StructE lhs, int rhs)
{
return 2;
}
public static int operator+(int lhs, StructE rhs)
{
return 3;
}
}
struct StructF
{
public static int operator+(StructF lhs, int rhs)
{
return 1;
}
public static int operator+(int lhs, StructF rhs)
{
return 2;
}
[Commutable]
public static int operator+(StructF lhs, float rhs)
{
return 3;
}
}
struct StructOp<T, T2> where T : operator T + T2 struct StructOp<T, T2> where T : operator T + T2
{ {
public T DoIt(T val, T2 val2) public T DoIt(T val, T2 val2)
@ -317,6 +391,22 @@ namespace Tests
FlagsRegister fr = .(true, false, true, true); FlagsRegister fr = .(true, false, true, true);
Test.Assert(fr == (uint8)0b10110000); Test.Assert(fr == (uint8)0b10110000);
StructD sd = .(9);
Test.Assert(sd + 10 == 19);
Test.Assert(10 + sd == 19);
StructE se = .(9);
Test.Assert(se + 10 == 2);
Test.Assert(10 + se == 3);
Test.Assert(se + 1.2f == 1);
Test.Assert(1.2f + se == 1);
StructF sf = default;
Test.Assert(sf + 10 == 1);
Test.Assert(10 + sf == 2);
Test.Assert(sf + 1.0f == 3);
Test.Assert(2.0f + sf == 3);
/*let oai = OuterOp<float>.InnerOp<int>.Op(1.0f, 100); /*let oai = OuterOp<float>.InnerOp<int>.Op(1.0f, 100);
Test.Assert(oai == 101.0f); Test.Assert(oai == 101.0f);